Changed the project file structure, putting things in their correct place