Restructuing files for new Xcode project