- Renamed and reorganized folders