Project layout changes (single xcodeproj setup)