refactored xcode project