Updated Xcode project to adapt new project structure