Renamed folders and reorganized.