Changed the ordering of some of the files

Too many folders reaching the actual project. Moved them up one level.