Misc. changes

Renamed some files