Preliminary re-organization of Xcode project