Renamed some of the directory and project file names.