Renamed some main folders.