Class Renaming

Renamed classes so that the follow the standard project format.