Fixing Xcode groups

My manual conflict resolution of the Xcode file resulted in a messy
project hierarchy.