Some basic organization

Took out some unnecessary code and put files in proper folder paths.