Cleaned up file locations

Moved some files to appropriate folders.