Created more logical groups for Xcode project organization