Renamed all of the top level directories so that they differ from the OS CPR directory names.