Renamed folders to match topics.