Renamed folders and whatnot