Organize client source code to match new Xcode layouts