Organize Xcode project folder.
Merge branch 'xcode' into development