Merge pull request #612 from balabhv/vb573

Reorganized xocde project