diff --git a/install-templates.sh b/install-templates-xcode3.sh
similarity index 95%
rename from install-templates.sh
rename to install-templates-xcode3.sh
index 7aaf156ff5..261264bcca 100755
--- a/install-templates.sh
+++ b/install-templates-xcode3.sh
@@ -116,7 +116,7 @@ copy_project_templates(){
 	check_dst_dir
 
 	echo ...copying template files
-	copy_files template/ios_mac/cocos2d-x_app/ "$DST_DIR"
+	copy_files template/xcode3/cocos2d-x_app/ "$DST_DIR"
 
 	copy_base_files
 
@@ -130,7 +130,7 @@ copy_project_templates(){
                 check_dst_dir
         
                 echo ...copying template files
-	copy_files template/ios_mac/cocos2d-x_box2d_app/ "$DST_DIR"
+	copy_files template/xcode3/cocos2d-x_box2d_app/ "$DST_DIR"
     
                 copy_base_files
         
@@ -147,7 +147,7 @@ copy_project_templates(){
                 check_dst_dir
         
                 echo ...copying template files
-	copy_files template/ios_mac/cocos2d-x_chipmunk_app/ "$DST_DIR"
+	copy_files template/xcode3/cocos2d-x_chipmunk_app/ "$DST_DIR"
     
                 copy_base_files
         
diff --git a/template/ios_mac/cocos2d-x_app/Classes/HelloWorldScene.cpp b/template/xcode3/cocos2d-x_app/Classes/HelloWorldScene.cpp
similarity index 100%
rename from template/ios_mac/cocos2d-x_app/Classes/HelloWorldScene.cpp
rename to template/xcode3/cocos2d-x_app/Classes/HelloWorldScene.cpp
diff --git a/template/ios_mac/cocos2d-x_app/Classes/HelloWorldScene.h b/template/xcode3/cocos2d-x_app/Classes/HelloWorldScene.h
similarity index 100%
rename from template/ios_mac/cocos2d-x_app/Classes/HelloWorldScene.h
rename to template/xcode3/cocos2d-x_app/Classes/HelloWorldScene.h
diff --git a/template/ios_mac/cocos2d-x_app/Classes/___PROJECTNAMEASIDENTIFIER___AppDelegate.cpp b/template/xcode3/cocos2d-x_app/Classes/___PROJECTNAMEASIDENTIFIER___AppDelegate.cpp
similarity index 100%
rename from template/ios_mac/cocos2d-x_app/Classes/___PROJECTNAMEASIDENTIFIER___AppDelegate.cpp
rename to template/xcode3/cocos2d-x_app/Classes/___PROJECTNAMEASIDENTIFIER___AppDelegate.cpp
diff --git a/template/ios_mac/cocos2d-x_app/Classes/___PROJECTNAMEASIDENTIFIER___AppDelegate.h b/template/xcode3/cocos2d-x_app/Classes/___PROJECTNAMEASIDENTIFIER___AppDelegate.h
similarity index 100%
rename from template/ios_mac/cocos2d-x_app/Classes/___PROJECTNAMEASIDENTIFIER___AppDelegate.h
rename to template/xcode3/cocos2d-x_app/Classes/___PROJECTNAMEASIDENTIFIER___AppDelegate.h
diff --git a/template/ios_mac/cocos2d-x_app/LICENSE.cocos2d-x b/template/xcode3/cocos2d-x_app/LICENSE.cocos2d-x
similarity index 100%
rename from template/ios_mac/cocos2d-x_app/LICENSE.cocos2d-x
rename to template/xcode3/cocos2d-x_app/LICENSE.cocos2d-x
diff --git a/template/ios_mac/cocos2d-x_app/___PROJECTNAMEASIDENTIFIER____Prefix.pch b/template/xcode3/cocos2d-x_app/___PROJECTNAMEASIDENTIFIER____Prefix.pch
similarity index 100%
rename from template/ios_mac/cocos2d-x_app/___PROJECTNAMEASIDENTIFIER____Prefix.pch
rename to template/xcode3/cocos2d-x_app/___PROJECTNAMEASIDENTIFIER____Prefix.pch
diff --git a/template/ios_mac/cocos2d-x_app/___PROJECTNAME___.xcodeproj/TemplateIcon.icns b/template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/TemplateIcon.icns
similarity index 100%
rename from template/ios_mac/cocos2d-x_app/___PROJECTNAME___.xcodeproj/TemplateIcon.icns
rename to template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/TemplateIcon.icns
diff --git a/template/ios_mac/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id b/template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id
similarity index 100%
rename from template/ios_mac/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id
rename to template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id
diff --git a/template/ios_mac/cocos2d-x_app/ios/___PROJECTNAMEASIDENTIFIER___AppController.h b/template/xcode3/cocos2d-x_app/ios/___PROJECTNAMEASIDENTIFIER___AppController.h
similarity index 100%
rename from template/ios_mac/cocos2d-x_app/ios/___PROJECTNAMEASIDENTIFIER___AppController.h
rename to template/xcode3/cocos2d-x_app/ios/___PROJECTNAMEASIDENTIFIER___AppController.h
diff --git a/template/ios_mac/cocos2d-x_app/ios/___PROJECTNAMEASIDENTIFIER___AppController.mm b/template/xcode3/cocos2d-x_app/ios/___PROJECTNAMEASIDENTIFIER___AppController.mm
similarity index 100%
rename from template/ios_mac/cocos2d-x_app/ios/___PROJECTNAMEASIDENTIFIER___AppController.mm
rename to template/xcode3/cocos2d-x_app/ios/___PROJECTNAMEASIDENTIFIER___AppController.mm
diff --git a/template/ios_mac/cocos2d-x_app/ios/main.m b/template/xcode3/cocos2d-x_app/ios/main.m
similarity index 100%
rename from template/ios_mac/cocos2d-x_app/ios/main.m
rename to template/xcode3/cocos2d-x_app/ios/main.m
diff --git a/template/ios_mac/cocos2d-x_box2d_app/Classes/HelloWorldScene.cpp b/template/xcode3/cocos2d-x_box2d_app/Classes/HelloWorldScene.cpp
similarity index 100%
rename from template/ios_mac/cocos2d-x_box2d_app/Classes/HelloWorldScene.cpp
rename to template/xcode3/cocos2d-x_box2d_app/Classes/HelloWorldScene.cpp
diff --git a/template/ios_mac/cocos2d-x_box2d_app/Classes/HelloWorldScene.h b/template/xcode3/cocos2d-x_box2d_app/Classes/HelloWorldScene.h
similarity index 100%
rename from template/ios_mac/cocos2d-x_box2d_app/Classes/HelloWorldScene.h
rename to template/xcode3/cocos2d-x_box2d_app/Classes/HelloWorldScene.h
diff --git a/template/ios_mac/cocos2d-x_box2d_app/Classes/___PROJECTNAMEASIDENTIFIER___AppDelegate.cpp b/template/xcode3/cocos2d-x_box2d_app/Classes/___PROJECTNAMEASIDENTIFIER___AppDelegate.cpp
similarity index 100%
rename from template/ios_mac/cocos2d-x_box2d_app/Classes/___PROJECTNAMEASIDENTIFIER___AppDelegate.cpp
rename to template/xcode3/cocos2d-x_box2d_app/Classes/___PROJECTNAMEASIDENTIFIER___AppDelegate.cpp
diff --git a/template/ios_mac/cocos2d-x_box2d_app/Classes/___PROJECTNAMEASIDENTIFIER___AppDelegate.h b/template/xcode3/cocos2d-x_box2d_app/Classes/___PROJECTNAMEASIDENTIFIER___AppDelegate.h
similarity index 100%
rename from template/ios_mac/cocos2d-x_box2d_app/Classes/___PROJECTNAMEASIDENTIFIER___AppDelegate.h
rename to template/xcode3/cocos2d-x_box2d_app/Classes/___PROJECTNAMEASIDENTIFIER___AppDelegate.h
diff --git a/template/ios_mac/cocos2d-x_box2d_app/LICENSE.box2d b/template/xcode3/cocos2d-x_box2d_app/LICENSE.box2d
similarity index 100%
rename from template/ios_mac/cocos2d-x_box2d_app/LICENSE.box2d
rename to template/xcode3/cocos2d-x_box2d_app/LICENSE.box2d
diff --git a/template/ios_mac/cocos2d-x_box2d_app/LICENSE.cocos2d-x b/template/xcode3/cocos2d-x_box2d_app/LICENSE.cocos2d-x
similarity index 100%
rename from template/ios_mac/cocos2d-x_box2d_app/LICENSE.cocos2d-x
rename to template/xcode3/cocos2d-x_box2d_app/LICENSE.cocos2d-x
diff --git a/template/ios_mac/cocos2d-x_box2d_app/___PROJECTNAMEASIDENTIFIER____Prefix.pch b/template/xcode3/cocos2d-x_box2d_app/___PROJECTNAMEASIDENTIFIER____Prefix.pch
similarity index 100%
rename from template/ios_mac/cocos2d-x_box2d_app/___PROJECTNAMEASIDENTIFIER____Prefix.pch
rename to template/xcode3/cocos2d-x_box2d_app/___PROJECTNAMEASIDENTIFIER____Prefix.pch
diff --git a/template/ios_mac/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/TemplateIcon.icns b/template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/TemplateIcon.icns
similarity index 100%
rename from template/ios_mac/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/TemplateIcon.icns
rename to template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/TemplateIcon.icns
diff --git a/template/ios_mac/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id b/template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id
similarity index 100%
rename from template/ios_mac/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id
rename to template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id
diff --git a/template/ios_mac/cocos2d-x_box2d_app/ios/___PROJECTNAMEASIDENTIFIER___AppController.h b/template/xcode3/cocos2d-x_box2d_app/ios/___PROJECTNAMEASIDENTIFIER___AppController.h
similarity index 100%
rename from template/ios_mac/cocos2d-x_box2d_app/ios/___PROJECTNAMEASIDENTIFIER___AppController.h
rename to template/xcode3/cocos2d-x_box2d_app/ios/___PROJECTNAMEASIDENTIFIER___AppController.h
diff --git a/template/ios_mac/cocos2d-x_box2d_app/ios/___PROJECTNAMEASIDENTIFIER___AppController.mm b/template/xcode3/cocos2d-x_box2d_app/ios/___PROJECTNAMEASIDENTIFIER___AppController.mm
similarity index 100%
rename from template/ios_mac/cocos2d-x_box2d_app/ios/___PROJECTNAMEASIDENTIFIER___AppController.mm
rename to template/xcode3/cocos2d-x_box2d_app/ios/___PROJECTNAMEASIDENTIFIER___AppController.mm
diff --git a/template/ios_mac/cocos2d-x_box2d_app/ios/main.m b/template/xcode3/cocos2d-x_box2d_app/ios/main.m
similarity index 100%
rename from template/ios_mac/cocos2d-x_box2d_app/ios/main.m
rename to template/xcode3/cocos2d-x_box2d_app/ios/main.m
diff --git a/template/ios_mac/cocos2d-x_chipmunk_app/Classes/HelloWorldScene.cpp b/template/xcode3/cocos2d-x_chipmunk_app/Classes/HelloWorldScene.cpp
similarity index 100%
rename from template/ios_mac/cocos2d-x_chipmunk_app/Classes/HelloWorldScene.cpp
rename to template/xcode3/cocos2d-x_chipmunk_app/Classes/HelloWorldScene.cpp
diff --git a/template/ios_mac/cocos2d-x_chipmunk_app/Classes/HelloWorldScene.h b/template/xcode3/cocos2d-x_chipmunk_app/Classes/HelloWorldScene.h
similarity index 100%
rename from template/ios_mac/cocos2d-x_chipmunk_app/Classes/HelloWorldScene.h
rename to template/xcode3/cocos2d-x_chipmunk_app/Classes/HelloWorldScene.h
diff --git a/template/ios_mac/cocos2d-x_chipmunk_app/Classes/___PROJECTNAMEASIDENTIFIER___AppDelegate.cpp b/template/xcode3/cocos2d-x_chipmunk_app/Classes/___PROJECTNAMEASIDENTIFIER___AppDelegate.cpp
similarity index 100%
rename from template/ios_mac/cocos2d-x_chipmunk_app/Classes/___PROJECTNAMEASIDENTIFIER___AppDelegate.cpp
rename to template/xcode3/cocos2d-x_chipmunk_app/Classes/___PROJECTNAMEASIDENTIFIER___AppDelegate.cpp
diff --git a/template/ios_mac/cocos2d-x_chipmunk_app/Classes/___PROJECTNAMEASIDENTIFIER___AppDelegate.h b/template/xcode3/cocos2d-x_chipmunk_app/Classes/___PROJECTNAMEASIDENTIFIER___AppDelegate.h
similarity index 100%
rename from template/ios_mac/cocos2d-x_chipmunk_app/Classes/___PROJECTNAMEASIDENTIFIER___AppDelegate.h
rename to template/xcode3/cocos2d-x_chipmunk_app/Classes/___PROJECTNAMEASIDENTIFIER___AppDelegate.h
diff --git a/template/ios_mac/cocos2d-x_chipmunk_app/LICENSE.chipmunk b/template/xcode3/cocos2d-x_chipmunk_app/LICENSE.chipmunk
similarity index 100%
rename from template/ios_mac/cocos2d-x_chipmunk_app/LICENSE.chipmunk
rename to template/xcode3/cocos2d-x_chipmunk_app/LICENSE.chipmunk
diff --git a/template/ios_mac/cocos2d-x_chipmunk_app/LICENSE.cocos2d-x b/template/xcode3/cocos2d-x_chipmunk_app/LICENSE.cocos2d-x
similarity index 100%
rename from template/ios_mac/cocos2d-x_chipmunk_app/LICENSE.cocos2d-x
rename to template/xcode3/cocos2d-x_chipmunk_app/LICENSE.cocos2d-x
diff --git a/template/ios_mac/cocos2d-x_chipmunk_app/___PROJECTNAMEASIDENTIFIER____Prefix.pch b/template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAMEASIDENTIFIER____Prefix.pch
similarity index 100%
rename from template/ios_mac/cocos2d-x_chipmunk_app/___PROJECTNAMEASIDENTIFIER____Prefix.pch
rename to template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAMEASIDENTIFIER____Prefix.pch
diff --git a/template/ios_mac/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/TemplateIcon.icns b/template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/TemplateIcon.icns
similarity index 100%
rename from template/ios_mac/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/TemplateIcon.icns
rename to template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/TemplateIcon.icns
diff --git a/template/ios_mac/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id b/template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id
similarity index 100%
rename from template/ios_mac/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id
rename to template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id
diff --git a/template/ios_mac/cocos2d-x_chipmunk_app/ios/___PROJECTNAMEASIDENTIFIER___AppController.h b/template/xcode3/cocos2d-x_chipmunk_app/ios/___PROJECTNAMEASIDENTIFIER___AppController.h
similarity index 100%
rename from template/ios_mac/cocos2d-x_chipmunk_app/ios/___PROJECTNAMEASIDENTIFIER___AppController.h
rename to template/xcode3/cocos2d-x_chipmunk_app/ios/___PROJECTNAMEASIDENTIFIER___AppController.h
diff --git a/template/ios_mac/cocos2d-x_chipmunk_app/ios/___PROJECTNAMEASIDENTIFIER___AppController.mm b/template/xcode3/cocos2d-x_chipmunk_app/ios/___PROJECTNAMEASIDENTIFIER___AppController.mm
similarity index 100%
rename from template/ios_mac/cocos2d-x_chipmunk_app/ios/___PROJECTNAMEASIDENTIFIER___AppController.mm
rename to template/xcode3/cocos2d-x_chipmunk_app/ios/___PROJECTNAMEASIDENTIFIER___AppController.mm
diff --git a/template/ios_mac/cocos2d-x_chipmunk_app/ios/main.m b/template/xcode3/cocos2d-x_chipmunk_app/ios/main.m
similarity index 100%
rename from template/ios_mac/cocos2d-x_chipmunk_app/ios/main.m
rename to template/xcode3/cocos2d-x_chipmunk_app/ios/main.m