Updated xcodeproj
Updated to single project.
Large reorg and fixup.
Xcode crud.