Moved around some files for a better structure.