workspace2

This includes commits from a contributor. Basically just restructuring of the XCode projects.