Add better file structure