Xcode project refactor