Minor Aesthetic Changes

Renamed some files so there's less confusion