Reorganized xocde project

#573