Reorg Xcode group hierarchy