Renamed classes and folder