Renamed folders to more terse names