Added new files from last upstream merge to the Xcode project. Updated folder structure to reflect the moved files as well.