Fixed Xcode project.

Updated Xcode project, after a directory renames from the previous
commit.
Xcode project cleanup.

Removed unused files from xcode project. These files were deleted in
the previous commit, not sure why I was seeing them as added in the
previous commit.