Renamed some files and cleaned up titles