Reorg Xcode group hiearchy