Refactoring group creation
More Xcode project cleanup.