Cut ColorViewController (from 2011)
Reorg Xcode group hiearchy