Renamed folders and files to Peter's specifications.