Reestructured xcode project