Refactored group structure in Xcode.