Fix misspellings in Xcode project name, fix duplicated files in new folder hierarchy.