Renamed classes and files properly