More changes to my classes
Renamed classes