diff --git a/templates/cocos2dx_files.json b/templates/cocos2dx_files.json
index 5cab9f5015..c39bed7595 100644
--- a/templates/cocos2dx_files.json
+++ b/templates/cocos2dx_files.json
@@ -278,6 +278,19 @@
         "cocos/base/CCConfiguration.h", 
         "cocos/base/CCConsole.cpp", 
         "cocos/base/CCConsole.h", 
+        "cocos/base/CCController-android.cpp", 
+        "cocos/base/CCController-iOS.mm", 
+        "cocos/base/CCController.h", 
+        "cocos/base/CCControllerAxisInput.cpp", 
+        "cocos/base/CCControllerAxisInput.h", 
+        "cocos/base/CCControllerButtonInput.cpp", 
+        "cocos/base/CCControllerButtonInput.h", 
+        "cocos/base/CCControllerDirectionPad.cpp", 
+        "cocos/base/CCControllerDirectionPad.h", 
+        "cocos/base/CCControllerElement.cpp", 
+        "cocos/base/CCControllerElement.h", 
+        "cocos/base/CCControllerThumbstick.cpp", 
+        "cocos/base/CCControllerThumbstick.h", 
         "cocos/base/CCData.cpp", 
         "cocos/base/CCData.h", 
         "cocos/base/CCDataVisitor.cpp", 
@@ -288,6 +301,8 @@
         "cocos/base/CCEvent.h", 
         "cocos/base/CCEventAcceleration.cpp", 
         "cocos/base/CCEventAcceleration.h", 
+        "cocos/base/CCEventController.cpp", 
+        "cocos/base/CCEventController.h", 
         "cocos/base/CCEventCustom.cpp", 
         "cocos/base/CCEventCustom.h", 
         "cocos/base/CCEventDispatcher.cpp", 
@@ -300,6 +315,8 @@
         "cocos/base/CCEventListener.h", 
         "cocos/base/CCEventListenerAcceleration.cpp", 
         "cocos/base/CCEventListenerAcceleration.h", 
+        "cocos/base/CCEventListenerController.cpp", 
+        "cocos/base/CCEventListenerController.h", 
         "cocos/base/CCEventListenerCustom.cpp", 
         "cocos/base/CCEventListenerCustom.h", 
         "cocos/base/CCEventListenerFocus.cpp", 
@@ -315,6 +332,9 @@
         "cocos/base/CCEventTouch.cpp", 
         "cocos/base/CCEventTouch.h", 
         "cocos/base/CCEventType.h", 
+        "cocos/base/CCGameController.h", 
+        "cocos/base/CCGamepad.cpp", 
+        "cocos/base/CCGamepad.h", 
         "cocos/base/CCIMEDelegate.h", 
         "cocos/base/CCIMEDispatcher.cpp", 
         "cocos/base/CCIMEDispatcher.h", 
@@ -727,12 +747,45 @@
         "cocos/platform/android/CCGLView.h", 
         "cocos/platform/android/CCPlatformDefine.h", 
         "cocos/platform/android/CCStdC.h", 
+        "cocos/platform/android/ControllerDelegate/.classpath", 
+        "cocos/platform/android/ControllerDelegate/.project", 
+        "cocos/platform/android/ControllerDelegate/.settings/org.eclipse.jdt.core.prefs", 
+        "cocos/platform/android/ControllerDelegate/AndroidManifest.xml", 
+        "cocos/platform/android/ControllerDelegate/ant.properties", 
+        "cocos/platform/android/ControllerDelegate/build.xml", 
+        "cocos/platform/android/ControllerDelegate/proguard-project.txt", 
+        "cocos/platform/android/ControllerDelegate/src/org/cocos2dx/lib/GameControllerDelegate.java", 
+        "cocos/platform/android/ControllerMoga/.classpath", 
+        "cocos/platform/android/ControllerMoga/.project", 
+        "cocos/platform/android/ControllerMoga/.settings/org.eclipse.jdt.core.prefs", 
+        "cocos/platform/android/ControllerMoga/AndroidManifest.xml", 
+        "cocos/platform/android/ControllerMoga/ant.properties", 
+        "cocos/platform/android/ControllerMoga/build.xml", 
+        "cocos/platform/android/ControllerMoga/proguard-project.txt", 
+        "cocos/platform/android/ControllerMoga/src/org/cocos2dx/lib/GameControllerMoga.java", 
+        "cocos/platform/android/ControllerNibiru/.classpath", 
+        "cocos/platform/android/ControllerNibiru/.project", 
+        "cocos/platform/android/ControllerNibiru/.settings/org.eclipse.jdt.core.prefs", 
+        "cocos/platform/android/ControllerNibiru/AndroidManifest.xml", 
+        "cocos/platform/android/ControllerNibiru/ant.properties", 
+        "cocos/platform/android/ControllerNibiru/build.xml", 
+        "cocos/platform/android/ControllerNibiru/proguard-project.txt", 
+        "cocos/platform/android/ControllerNibiru/src/org/cocos2dx/lib/GameControllerNibiru.java", 
+        "cocos/platform/android/ControllerOuya/.classpath", 
+        "cocos/platform/android/ControllerOuya/.project", 
+        "cocos/platform/android/ControllerOuya/.settings/org.eclipse.jdt.core.prefs", 
+        "cocos/platform/android/ControllerOuya/AndroidManifest.xml", 
+        "cocos/platform/android/ControllerOuya/ant.properties", 
+        "cocos/platform/android/ControllerOuya/build.xml", 
+        "cocos/platform/android/ControllerOuya/proguard-project.txt", 
+        "cocos/platform/android/ControllerOuya/src/org/cocos2dx/lib/GameControllerOuya.java", 
         "cocos/platform/android/java/.classpath", 
         "cocos/platform/android/java/.project", 
         "cocos/platform/android/java/.settings/org.eclipse.jdt.core.prefs", 
         "cocos/platform/android/java/AndroidManifest.xml", 
         "cocos/platform/android/java/ant.properties", 
         "cocos/platform/android/java/build.xml", 
+        "cocos/platform/android/java/lint.xml", 
         "cocos/platform/android/java/proguard-project.txt", 
         "cocos/platform/android/java/project.properties", 
         "cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxAccelerometer.java", 
@@ -753,6 +806,12 @@
         "cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxTypefaces.java", 
         "cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxVideoHelper.java", 
         "cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxVideoView.java", 
+        "cocos/platform/android/java/src/org/cocos2dx/lib/GameControllerAdapter.java", 
+        "cocos/platform/android/java/src/org/cocos2dx/lib/GameControllerHelper.java", 
+        "cocos/platform/android/java/src/org/cocos2dx/lib/GameControllerUtils.java", 
+        "cocos/platform/android/java/src/org/cocos2dx/lib/inputmanagercompat/InputManagerCompat.java", 
+        "cocos/platform/android/java/src/org/cocos2dx/lib/inputmanagercompat/InputManagerV16.java", 
+        "cocos/platform/android/java/src/org/cocos2dx/lib/inputmanagercompat/InputManagerV9.java", 
         "cocos/platform/android/javaactivity.cpp", 
         "cocos/platform/android/jni/DPIJni.cpp", 
         "cocos/platform/android/jni/DPIJni.h", 
@@ -1991,6 +2050,12 @@
         "external/linux-specific/fmod/prebuilt/64-bit/libfmodex64.so", 
         "external/linux-specific/fmod/prebuilt/64-bit/libfmodexL64-4.38.00.so", 
         "external/linux-specific/fmod/prebuilt/64-bit/libfmodexL64.so", 
+        "external/nslog/CCNSLog.h", 
+        "external/nslog/ios/CCNSLog.mm", 
+        "external/nslog/ios/LoggerClient.h", 
+        "external/nslog/ios/LoggerClient.m", 
+        "external/nslog/ios/LoggerCommon.h", 
+        "external/nslog/ios/NSLogger.h", 
         "external/png/include/android/png.h", 
         "external/png/include/android/pngconf.h", 
         "external/png/include/android/pnglibconf.h",