Renamed folders and system rework