File structure change

Tested moving the files around. Is it better?