Renamed some files, did some cleanup.