Renamed class folders