Update project structure (both on-disk and Xcode)
Update Xcode project
Merge pull request #2 from rodionovd/develop

Update project structure (from develop)