Renamed various files for simplification.