Refactoring: File locations

Changed the location of some of the files to better represent their
type.