Renamed main folders