Renamed some files
Moved stuff around some more