Added some grouping in the Xcode proj