Renamed several files to make more sense