diff --git a/cocos/2d/cocos2d_winrt.vcxproj b/cocos/2d/cocos2d_winrt.vcxproj
index e65209978d..c78b1a2102 100644
--- a/cocos/2d/cocos2d_winrt.vcxproj
+++ b/cocos/2d/cocos2d_winrt.vcxproj
@@ -265,6 +265,18 @@
   </ImportGroup>
   <ItemGroup>
     <ClCompile Include="..\..\external\ConvertUTF\ConvertUTF.c">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+      <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</CompileAsWinRT>
+      <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</CompileAsWinRT>
+      <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</CompileAsWinRT>
+      <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</CompileAsWinRT>
+      <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</CompileAsWinRT>
+      <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</CompileAsWinRT>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">CompileAsCpp</CompileAs>
@@ -278,34 +290,33 @@
     <ClCompile Include="..\..\external\unzip\ioapi.cpp" />
     <ClCompile Include="..\..\external\unzip\unzip.cpp" />
     <ClCompile Include="..\..\external\xxhash\xxhash.c">
-      <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
-      <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
-      <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
-      <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
-      <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsWinRT>
-      <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</CompileAsWinRT>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
-      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      </ForcedIncludeFiles>
-      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-      </ForcedIncludeFiles>
-      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-      </ForcedIncludeFiles>
-      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-      </ForcedIncludeFiles>
-      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-      </ForcedIncludeFiles>
-      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-      </ForcedIncludeFiles>
+      <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</CompileAsWinRT>
+      <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</CompileAsWinRT>
+      <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</CompileAsWinRT>
+      <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</CompileAsWinRT>
+      <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</CompileAsWinRT>
+      <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</CompileAsWinRT>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">CompileAsCpp</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">CompileAsCpp</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsCpp</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
     </ClCompile>
+    <ClCompile Include="..\3d\CCMesh.cpp" />
+    <ClCompile Include="..\3d\CCObjLoader.cpp" />
+    <ClCompile Include="..\3d\CCSprite3D.cpp" />
+    <ClCompile Include="..\3d\CCSprite3DDataCache.cpp" />
     <ClCompile Include="..\base\atitc.cpp" />
     <ClCompile Include="..\base\base64.cpp" />
     <ClCompile Include="..\base\CCAutoreleasePool.cpp" />
+    <ClCompile Include="..\base\ccCArray.cpp" />
     <ClCompile Include="..\base\CCConfiguration.cpp" />
     <ClCompile Include="..\base\CCConsole.cpp" />
     <ClCompile Include="..\base\CCData.cpp" />
@@ -326,15 +337,30 @@
     <ClCompile Include="..\base\CCEventListenerTouch.cpp" />
     <ClCompile Include="..\base\CCEventMouse.cpp" />
     <ClCompile Include="..\base\CCEventTouch.cpp" />
+    <ClCompile Include="..\base\ccFPSImages.c">
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">CompileAsCpp</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">CompileAsCpp</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsCpp</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
+    </ClCompile>
+    <ClCompile Include="..\base\CCIMEDispatcher.cpp" />
     <ClCompile Include="..\base\CCNS.cpp" />
     <ClCompile Include="..\base\CCProfiling.cpp" />
     <ClCompile Include="..\base\CCRef.cpp" />
     <ClCompile Include="..\base\CCScheduler.cpp" />
+    <ClCompile Include="..\base\CCScriptSupport.cpp" />
     <ClCompile Include="..\base\CCTouch.cpp" />
     <ClCompile Include="..\base\ccTypes.cpp" />
+    <ClCompile Include="..\base\CCUserDefault.cpp" />
+    <ClCompile Include="..\base\CCUserDefaultAndroid.cpp" />
+    <ClCompile Include="..\base\ccUTF8.cpp" />
+    <ClCompile Include="..\base\ccUtils.cpp" />
     <ClCompile Include="..\base\CCValue.cpp" />
     <ClCompile Include="..\base\etc1.cpp" />
     <ClCompile Include="..\base\s3tc.cpp" />
+    <ClCompile Include="..\base\TGAlib.cpp" />
     <ClCompile Include="..\base\ZipUtils.cpp" />
     <ClCompile Include="..\cocos2d.cpp" />
     <ClCompile Include="..\deprecated\CCArray.cpp" />
@@ -345,13 +371,14 @@
     <ClCompile Include="..\deprecated\CCString.cpp" />
     <ClCompile Include="..\math\CCAffineTransform.cpp" />
     <ClCompile Include="..\math\CCGeometry.cpp" />
+    <ClCompile Include="..\math\CCVertex.cpp" />
+    <ClCompile Include="..\math\Mat4.cpp" />
     <ClCompile Include="..\math\MathUtil.cpp" />
-    <ClCompile Include="..\math\Matrix.cpp" />
     <ClCompile Include="..\math\Quaternion.cpp" />
     <ClCompile Include="..\math\TransformUtils.cpp" />
-    <ClCompile Include="..\math\Vector2.cpp" />
-    <ClCompile Include="..\math\Vector3.cpp" />
-    <ClCompile Include="..\math\Vector4.cpp" />
+    <ClCompile Include="..\math\Vec2.cpp" />
+    <ClCompile Include="..\math\Vec3.cpp" />
+    <ClCompile Include="..\math\Vec4.cpp" />
     <ClCompile Include="..\physics\CCPhysicsBody.cpp" />
     <ClCompile Include="..\physics\CCPhysicsContact.cpp" />
     <ClCompile Include="..\physics\CCPhysicsJoint.cpp" />
@@ -362,6 +389,32 @@
     <ClCompile Include="..\physics\chipmunk\CCPhysicsJointInfo_chipmunk.cpp" />
     <ClCompile Include="..\physics\chipmunk\CCPhysicsShapeInfo_chipmunk.cpp" />
     <ClCompile Include="..\physics\chipmunk\CCPhysicsWorldInfo_chipmunk.cpp" />
+    <ClCompile Include="..\platform\CCFileUtils.cpp" />
+    <ClCompile Include="..\platform\CCGLViewProtocol.cpp" />
+    <ClCompile Include="..\platform\CCImage.cpp" />
+    <ClCompile Include="..\platform\CCSAXParser.cpp" />
+    <ClCompile Include="..\platform\CCThread.cpp" />
+    <ClCompile Include="..\platform\winrt\CCApplication.cpp" />
+    <ClCompile Include="..\platform\winrt\CCCommon.cpp" />
+    <ClCompile Include="..\platform\winrt\CCDevice.cpp" />
+    <ClCompile Include="..\platform\winrt\CCFileUtilsWinRT.cpp" />
+    <ClCompile Include="..\platform\winrt\CCFreeTypeFont.cpp" />
+    <ClCompile Include="..\platform\winrt\CCGLView.cpp" />
+    <ClCompile Include="..\platform\winrt\CCPrecompiledShaders.cpp" />
+    <ClCompile Include="..\platform\winrt\CCPThreadWinRT.cpp" />
+    <ClCompile Include="..\platform\winrt\CCStdC.cpp" />
+    <ClCompile Include="..\platform\winrt\CCWinRTUtils.cpp" />
+    <ClCompile Include="..\platform\winrt\DirectXBase.cpp" />
+    <ClCompile Include="..\platform\winrt\InputEvent.cpp" />
+    <ClCompile Include="..\platform\winrt\pch.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\platform\winrt\sha1.cpp" />
     <ClCompile Include="..\renderer\CCBatchCommand.cpp" />
     <ClCompile Include="..\renderer\CCCustomCommand.cpp" />
     <ClCompile Include="..\renderer\CCGLProgram.cpp" />
@@ -370,10 +423,14 @@
     <ClCompile Include="..\renderer\CCGLProgramStateCache.cpp" />
     <ClCompile Include="..\renderer\ccGLStateCache.cpp" />
     <ClCompile Include="..\renderer\CCGroupCommand.cpp" />
+    <ClCompile Include="..\renderer\CCMeshCommand.cpp" />
     <ClCompile Include="..\renderer\CCQuadCommand.cpp" />
     <ClCompile Include="..\renderer\CCRenderCommand.cpp" />
     <ClCompile Include="..\renderer\CCRenderer.cpp" />
     <ClCompile Include="..\renderer\ccShaders.cpp" />
+    <ClCompile Include="..\renderer\CCTexture2D.cpp" />
+    <ClCompile Include="..\renderer\CCTextureAtlas.cpp" />
+    <ClCompile Include="..\renderer\CCTextureCache.cpp" />
     <ClCompile Include="CCAction.cpp" />
     <ClCompile Include="CCActionCamera.cpp" />
     <ClCompile Include="CCActionCatmullRom.cpp" />
@@ -390,7 +447,6 @@
     <ClCompile Include="CCAnimation.cpp" />
     <ClCompile Include="CCAnimationCache.cpp" />
     <ClCompile Include="CCAtlasNode.cpp" />
-    <ClCompile Include="ccCArray.cpp" />
     <ClCompile Include="CCClippingNode.cpp" />
     <ClCompile Include="CCComponent.cpp" />
     <ClCompile Include="CCComponentContainer.cpp" />
@@ -402,36 +458,9 @@
     <ClCompile Include="CCFontCharMap.cpp" />
     <ClCompile Include="CCFontFNT.cpp" />
     <ClCompile Include="CCFontFreeType.cpp" />
-    <ClCompile Include="ccFPSImages.c">
-      <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
-      <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
-      <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
-      <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
-      <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsWinRT>
-      <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</CompileAsWinRT>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
-      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      </ForcedIncludeFiles>
-      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-      </ForcedIncludeFiles>
-      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-      </ForcedIncludeFiles>
-      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-      </ForcedIncludeFiles>
-      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-      </ForcedIncludeFiles>
-      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-      </ForcedIncludeFiles>
-    </ClCompile>
+    <ClCompile Include="CCGLBufferedNode.cpp" />
     <ClCompile Include="CCGrabber.cpp" />
     <ClCompile Include="CCGrid.cpp" />
-    <ClCompile Include="CCNodeGrid.cpp" />
-    <ClCompile Include="CCIMEDispatcher.cpp" />
     <ClCompile Include="CCLabel.cpp" />
     <ClCompile Include="CCLabelAtlas.cpp" />
     <ClCompile Include="CCLabelBMFont.cpp" />
@@ -442,6 +471,7 @@
     <ClCompile Include="CCMenuItem.cpp" />
     <ClCompile Include="CCMotionStreak.cpp" />
     <ClCompile Include="CCNode.cpp" />
+    <ClCompile Include="CCNodeGrid.cpp" />
     <ClCompile Include="CCParallaxNode.cpp" />
     <ClCompile Include="CCParticleBatchNode.cpp" />
     <ClCompile Include="CCParticleExamples.cpp" />
@@ -450,15 +480,11 @@
     <ClCompile Include="CCProgressTimer.cpp" />
     <ClCompile Include="CCRenderTexture.cpp" />
     <ClCompile Include="CCScene.cpp" />
-    <ClCompile Include="CCScriptSupport.cpp" />
     <ClCompile Include="CCSprite.cpp" />
     <ClCompile Include="CCSpriteBatchNode.cpp" />
     <ClCompile Include="CCSpriteFrame.cpp" />
     <ClCompile Include="CCSpriteFrameCache.cpp" />
     <ClCompile Include="CCTextFieldTTF.cpp" />
-    <ClCompile Include="CCTexture2D.cpp" />
-    <ClCompile Include="CCTextureAtlas.cpp" />
-    <ClCompile Include="CCTextureCache.cpp" />
     <ClCompile Include="CCTileMapAtlas.cpp" />
     <ClCompile Include="CCTMXLayer.cpp" />
     <ClCompile Include="CCTMXObjectGroup.cpp" />
@@ -468,37 +494,6 @@
     <ClCompile Include="CCTransitionPageTurn.cpp" />
     <ClCompile Include="CCTransitionProgress.cpp" />
     <ClCompile Include="CCTweenFunction.cpp" />
-    <ClCompile Include="CCUserDefault.cpp" />
-    <ClCompile Include="ccUTF8.cpp" />
-    <ClCompile Include="ccUtils.cpp" />
-    <ClCompile Include="CCVertex.cpp" />
-    <ClCompile Include="platform\CCGLViewProtocol.cpp" />
-    <ClCompile Include="platform\CCFileUtils.cpp" />
-    <ClCompile Include="platform\CCImage.cpp" />
-    <ClCompile Include="platform\CCSAXParser.cpp" />
-    <ClCompile Include="platform\CCThread.cpp" />
-    <ClCompile Include="platform\winrt\CCApplication.cpp" />
-    <ClCompile Include="platform\winrt\CCCommon.cpp" />
-    <ClCompile Include="platform\winrt\CCDevice.cpp" />
-    <ClCompile Include="platform\winrt\CCFileUtilsWinRT.cpp" />
-    <ClCompile Include="platform\winrt\CCFreeTypeFont.cpp" />
-    <ClCompile Include="platform\winrt\CCGLView.cpp" />
-    <ClCompile Include="platform\winrt\CCPrecompiledShaders.cpp" />
-    <ClCompile Include="platform\winrt\CCPThreadWinRT.cpp" />
-    <ClCompile Include="platform\winrt\CCStdC.cpp" />
-    <ClCompile Include="platform\winrt\CCWinRTUtils.cpp" />
-    <ClCompile Include="platform\winrt\DirectXBase.cpp" />
-    <ClCompile Include="platform\winrt\InputEvent.cpp" />
-    <ClCompile Include="platform\winrt\pch.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="platform\winrt\sha1.cpp" />
-    <ClCompile Include="TGAlib.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\external\ConvertUTF\ConvertUTF.h" />
@@ -507,9 +502,14 @@
     <ClInclude Include="..\..\external\unzip\ioapi.h" />
     <ClInclude Include="..\..\external\unzip\unzip.h" />
     <ClInclude Include="..\..\external\xxhash\xxhash.h" />
+    <ClInclude Include="..\3d\CCMesh.h" />
+    <ClInclude Include="..\3d\CCObjLoader.h" />
+    <ClInclude Include="..\3d\CCSprite3D.h" />
+    <ClInclude Include="..\3d\CCSprite3DDataCache.h" />
     <ClInclude Include="..\base\atitc.h" />
     <ClInclude Include="..\base\base64.h" />
     <ClInclude Include="..\base\CCAutoreleasePool.h" />
+    <ClInclude Include="..\base\ccCArray.h" />
     <ClInclude Include="..\base\ccConfig.h" />
     <ClInclude Include="..\base\CCConfiguration.h" />
     <ClInclude Include="..\base\CCConsole.h" />
@@ -532,21 +532,33 @@
     <ClInclude Include="..\base\CCEventMouse.h" />
     <ClInclude Include="..\base\CCEventTouch.h" />
     <ClInclude Include="..\base\CCEventType.h" />
+    <ClInclude Include="..\base\ccFPSImages.h" />
+    <ClInclude Include="..\base\CCIMEDelegate.h" />
+    <ClInclude Include="..\base\CCIMEDispatcher.h" />
     <ClInclude Include="..\base\ccMacros.h" />
     <ClInclude Include="..\base\CCMap.h" />
     <ClInclude Include="..\base\CCNS.h" />
-    <ClInclude Include="..\base\CCProfiling.h" />
-    <ClInclude Include="..\base\CCRef.h" />
     <ClInclude Include="..\base\CCPlatformConfig.h" />
     <ClInclude Include="..\base\CCPlatformMacros.h" />
+    <ClInclude Include="..\base\CCProfiling.h" />
+    <ClInclude Include="..\base\CCProtocols.h" />
+    <ClInclude Include="..\base\CCRef.h" />
     <ClInclude Include="..\base\CCRefPtr.h" />
     <ClInclude Include="..\base\CCScheduler.h" />
+    <ClInclude Include="..\base\CCScriptSupport.h" />
     <ClInclude Include="..\base\CCTouch.h" />
     <ClInclude Include="..\base\ccTypes.h" />
+    <ClInclude Include="..\base\CCUserDefault.h" />
+    <ClInclude Include="..\base\ccUTF8.h" />
+    <ClInclude Include="..\base\ccUtils.h" />
     <ClInclude Include="..\base\CCValue.h" />
     <ClInclude Include="..\base\CCVector.h" />
     <ClInclude Include="..\base\etc1.h" />
+    <ClInclude Include="..\base\firePngData.h" />
     <ClInclude Include="..\base\s3tc.h" />
+    <ClInclude Include="..\base\TGAlib.h" />
+    <ClInclude Include="..\base\uthash.h" />
+    <ClInclude Include="..\base\utlist.h" />
     <ClInclude Include="..\base\ZipUtils.h" />
     <ClInclude Include="..\cocos2d.h" />
     <ClInclude Include="..\deprecated\CCArray.h" />
@@ -563,13 +575,14 @@
     <ClInclude Include="..\math\CCGeometry.h" />
     <ClInclude Include="..\math\CCMath.h" />
     <ClInclude Include="..\math\CCMathBase.h" />
+    <ClInclude Include="..\math\CCVertex.h" />
+    <ClInclude Include="..\math\Mat4.h" />
     <ClInclude Include="..\math\MathUtil.h" />
-    <ClInclude Include="..\math\Matrix.h" />
     <ClInclude Include="..\math\Quaternion.h" />
     <ClInclude Include="..\math\TransformUtils.h" />
-    <ClInclude Include="..\math\Vector2.h" />
-    <ClInclude Include="..\math\Vector3.h" />
-    <ClInclude Include="..\math\Vector4.h" />
+    <ClInclude Include="..\math\Vec2.h" />
+    <ClInclude Include="..\math\Vec3.h" />
+    <ClInclude Include="..\math\Vec4.h" />
     <ClInclude Include="..\physics\CCPhysicsBody.h" />
     <ClInclude Include="..\physics\CCPhysicsContact.h" />
     <ClInclude Include="..\physics\CCPhysicsJoint.h" />
@@ -581,6 +594,31 @@
     <ClInclude Include="..\physics\chipmunk\CCPhysicsJointInfo_chipmunk.h" />
     <ClInclude Include="..\physics\chipmunk\CCPhysicsShapeInfo_chipmunk.h" />
     <ClInclude Include="..\physics\chipmunk\CCPhysicsWorldInfo_chipmunk.h" />
+    <ClInclude Include="..\platform\CCApplicationProtocol.h" />
+    <ClInclude Include="..\platform\CCCommon.h" />
+    <ClInclude Include="..\platform\CCDevice.h" />
+    <ClInclude Include="..\platform\CCFileUtils.h" />
+    <ClInclude Include="..\platform\CCGLViewProtocol.h" />
+    <ClInclude Include="..\platform\CCImage.h" />
+    <ClInclude Include="..\platform\CCSAXParser.h" />
+    <ClInclude Include="..\platform\CCThread.h" />
+    <ClInclude Include="..\platform\winrt\CCApplication.h" />
+    <ClInclude Include="..\platform\winrt\CCFileUtilsWinRT.h" />
+    <ClInclude Include="..\platform\winrt\CCFreeTypeFont.h" />
+    <ClInclude Include="..\platform\winrt\CCGL.h" />
+    <ClInclude Include="..\platform\winrt\CCGLView.h" />
+    <ClInclude Include="..\platform\winrt\CCGL_Angle.h" />
+    <ClInclude Include="..\platform\winrt\CCPlatformDefine.h" />
+    <ClInclude Include="..\platform\winrt\CCPrecompiledShaders.h" />
+    <ClInclude Include="..\platform\winrt\CCPThreadWinRT.h" />
+    <ClInclude Include="..\platform\winrt\CCStdC.h" />
+    <ClInclude Include="..\platform\winrt\CCWinRTUtils.h" />
+    <ClInclude Include="..\platform\winrt\DirectXBase.h" />
+    <ClInclude Include="..\platform\winrt\DirectXHelper.h" />
+    <ClInclude Include="..\platform\winrt\InputEvent.h" />
+    <ClInclude Include="..\platform\winrt\InputEventTypes.h" />
+    <ClInclude Include="..\platform\winrt\pch.h" />
+    <ClInclude Include="..\platform\winrt\sha1.h" />
     <ClInclude Include="..\renderer\CCBatchCommand.h" />
     <ClInclude Include="..\renderer\CCCustomCommand.h" />
     <ClInclude Include="..\renderer\CCGLProgram.h" />
@@ -589,11 +627,15 @@
     <ClInclude Include="..\renderer\CCGLProgramStateCache.h" />
     <ClInclude Include="..\renderer\ccGLStateCache.h" />
     <ClInclude Include="..\renderer\CCGroupCommand.h" />
+    <ClInclude Include="..\renderer\CCMeshCommand.h" />
     <ClInclude Include="..\renderer\CCQuadCommand.h" />
     <ClInclude Include="..\renderer\CCRenderCommand.h" />
     <ClInclude Include="..\renderer\CCRenderCommandPool.h" />
     <ClInclude Include="..\renderer\CCRenderer.h" />
     <ClInclude Include="..\renderer\ccShaders.h" />
+    <ClInclude Include="..\renderer\CCTexture2D.h" />
+    <ClInclude Include="..\renderer\CCTextureAtlas.h" />
+    <ClInclude Include="..\renderer\CCTextureCache.h" />
     <ClInclude Include="CCAction.h" />
     <ClInclude Include="CCActionCamera.h" />
     <ClInclude Include="CCActionCatmullRom.h" />
@@ -610,56 +652,44 @@
     <ClInclude Include="CCAnimation.h" />
     <ClInclude Include="CCAnimationCache.h" />
     <ClInclude Include="CCAtlasNode.h" />
-    <ClInclude Include="ccCArray.h" />
     <ClInclude Include="CCClippingNode.h" />
     <ClInclude Include="CCComponent.h" />
     <ClInclude Include="CCComponentContainer.h" />
-    <ClInclude Include="ccConfig.h" />
-    <ClInclude Include="CCDeprecated.h" />
     <ClInclude Include="CCDrawingPrimitives.h" />
     <ClInclude Include="CCDrawNode.h" />
-    <ClInclude Include="CCEventType.h" />
     <ClInclude Include="CCFont.h" />
     <ClInclude Include="CCFontAtlas.h" />
     <ClInclude Include="CCFontAtlasCache.h" />
     <ClInclude Include="CCFontCharMap.h" />
     <ClInclude Include="CCFontFNT.h" />
     <ClInclude Include="CCFontFreeType.h" />
-    <ClInclude Include="ccFPSImages.h" />
+    <ClInclude Include="CCGLBufferedNode.h" />
     <ClInclude Include="CCGrabber.h" />
     <ClInclude Include="CCGrid.h" />
-    <ClInclude Include="CCNodeGrid.h" />
-    <ClInclude Include="CCIMEDelegate.h" />
-    <ClInclude Include="CCIMEDispatcher.h" />
     <ClInclude Include="CCLabel.h" />
     <ClInclude Include="CCLabelAtlas.h" />
     <ClInclude Include="CCLabelBMFont.h" />
     <ClInclude Include="CCLabelTextFormatter.h" />
     <ClInclude Include="CCLabelTTF.h" />
     <ClInclude Include="CCLayer.h" />
-    <ClInclude Include="ccMacros.h" />
     <ClInclude Include="CCMenu.h" />
     <ClInclude Include="CCMenuItem.h" />
     <ClInclude Include="CCMotionStreak.h" />
     <ClInclude Include="CCNode.h" />
+    <ClInclude Include="CCNodeGrid.h" />
     <ClInclude Include="CCParallaxNode.h" />
     <ClInclude Include="CCParticleBatchNode.h" />
     <ClInclude Include="CCParticleExamples.h" />
     <ClInclude Include="CCParticleSystem.h" />
     <ClInclude Include="CCParticleSystemQuad.h" />
     <ClInclude Include="CCProgressTimer.h" />
-    <ClInclude Include="CCProtocols.h" />
     <ClInclude Include="CCRenderTexture.h" />
     <ClInclude Include="CCScene.h" />
-    <ClInclude Include="CCScriptSupport.h" />
     <ClInclude Include="CCSprite.h" />
     <ClInclude Include="CCSpriteBatchNode.h" />
     <ClInclude Include="CCSpriteFrame.h" />
     <ClInclude Include="CCSpriteFrameCache.h" />
     <ClInclude Include="CCTextFieldTTF.h" />
-    <ClInclude Include="CCTexture2D.h" />
-    <ClInclude Include="CCTextureAtlas.h" />
-    <ClInclude Include="CCTextureCache.h" />
     <ClInclude Include="CCTileMapAtlas.h" />
     <ClInclude Include="CCTMXLayer.h" />
     <ClInclude Include="CCTMXObjectGroup.h" />
@@ -668,53 +698,20 @@
     <ClInclude Include="CCTransition.h" />
     <ClInclude Include="CCTransitionPageTurn.h" />
     <ClInclude Include="CCTransitionProgress.h" />
-    <ClInclude Include="ccTypes.h" />
     <ClInclude Include="CCTweenFunction.h" />
-    <ClInclude Include="CCUserDefault.h" />
-    <ClInclude Include="ccUTF8.h" />
-    <ClInclude Include="ccUtils.h" />
-    <ClInclude Include="CCVertex.h" />
-    <ClInclude Include="cocos2d.h" />
-    <ClInclude Include="platform\CCApplicationProtocol.h" />
-    <ClInclude Include="platform\CCCommon.h" />
-    <ClInclude Include="platform\CCDevice.h" />
-    <ClInclude Include="platform\CCGLViewProtocol.h" />
-    <ClInclude Include="platform\CCFileUtils.h" />
-    <ClInclude Include="platform\CCImage.h" />
-    <ClInclude Include="platform\CCSAXParser.h" />
-    <ClInclude Include="platform\CCThread.h" />
-    <ClInclude Include="platform\winrt\CCApplication.h" />
-    <ClInclude Include="platform\winrt\CCFileUtilsWinRT.h" />
-    <ClInclude Include="platform\winrt\CCFreeTypeFont.h" />
-    <ClInclude Include="platform\winrt\CCGL.h" />
-    <ClInclude Include="platform\winrt\CCGLView.h" />
-    <ClInclude Include="platform\winrt\CCGL_Angle.h" />
-    <ClInclude Include="platform\winrt\CCPlatformDefine.h" />
-    <ClInclude Include="platform\winrt\CCPrecompiledShaders.h" />
-    <ClInclude Include="platform\winrt\CCPThreadWinRT.h" />
-    <ClInclude Include="platform\winrt\CCStdC.h" />
-    <ClInclude Include="platform\winrt\CCWinRTUtils.h" />
-    <ClInclude Include="platform\winrt\DirectXBase.h" />
-    <ClInclude Include="platform\winrt\DirectXHelper.h" />
-    <ClInclude Include="platform\winrt\InputEvent.h" />
-    <ClInclude Include="platform\winrt\InputEventTypes.h" />
-    <ClInclude Include="platform\winrt\pch.h" />
-    <ClInclude Include="platform\winrt\sha1.h" />
-    <ClInclude Include="TGAlib.h" />
-    <ClInclude Include="uthash.h" />
-    <ClInclude Include="utlist.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <Text Include="..\math\CMakeLists.txt" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="..\base\CCUserDefault.mm" />
+    <None Include="..\math\Mat4.inl" />
     <None Include="..\math\MathUtil.inl" />
     <None Include="..\math\MathUtilNeon.inl" />
-    <None Include="..\math\Matrix.inl" />
     <None Include="..\math\Quaternion.inl" />
-    <None Include="..\math\Vector2.inl" />
-    <None Include="..\math\Vector3.inl" />
-    <None Include="..\math\Vector4.inl" />
+    <None Include="..\math\Vec2.inl" />
+    <None Include="..\math\Vec3.inl" />
+    <None Include="..\math\Vec4.inl" />
+    <None Include="..\renderer\ccShader_3D_Color.frag" />
+    <None Include="..\renderer\ccShader_3D_ColorTex.frag" />
+    <None Include="..\renderer\ccShader_3D_PositionTex.vert" />
     <None Include="..\renderer\ccShader_Label.vert" />
     <None Include="..\renderer\ccShader_Label_df.frag" />
     <None Include="..\renderer\ccShader_Label_df_glow.frag" />
diff --git a/cocos/2d/cocos2d_winrt.vcxproj.filters b/cocos/2d/cocos2d_winrt.vcxproj.filters
index 77d7af3277..b641582cb4 100644
--- a/cocos/2d/cocos2d_winrt.vcxproj.filters
+++ b/cocos/2d/cocos2d_winrt.vcxproj.filters
@@ -1,536 +1,340 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="base_nodes">
-      <UniqueIdentifier>{cc64f5ad-2234-494c-9c51-b7a20c8887aa}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="effects">
-      <UniqueIdentifier>{736cf4ab-e0d6-40ba-912a-b062d28d318a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="actions">
-      <UniqueIdentifier>{1c7c61b8-3d36-4ba0-a87c-457eb4c782d0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="include">
-      <UniqueIdentifier>{0b3a64bd-79fa-476a-a461-6b97e5072453}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="label_nodes">
-      <UniqueIdentifier>{e455af5e-da09-4f41-b79f-df4dd311820d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="layers_scenes_transitions_nodes">
-      <UniqueIdentifier>{206bd96b-f80e-4722-8675-d7c6ff9b3639}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="menu_nodes">
-      <UniqueIdentifier>{075492ba-08bc-404c-92da-32029797a600}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="misc_nodes">
-      <UniqueIdentifier>{41abe422-1602-4fe0-ac1c-6b04a14c1abb}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="particle_nodes">
-      <UniqueIdentifier>{8bf0f517-2ac3-4fc3-a1ad-999d9ea103cd}</UniqueIdentifier>
-    </Filter>
     <Filter Include="platform">
       <UniqueIdentifier>{926fc31c-8742-4984-9940-c972dd02fc8a}</UniqueIdentifier>
     </Filter>
-    <Filter Include="sprite_nodes">
-      <UniqueIdentifier>{755e5282-111e-46a5-9169-7c12b37f5ffc}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="support">
-      <UniqueIdentifier>{d94bbf20-8de9-49a7-ae20-6a1140cf633b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="support\data_support">
-      <UniqueIdentifier>{4a64789e-cc8d-4f84-a869-e6dae2e0d58c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="support\image_support">
-      <UniqueIdentifier>{bb98a889-9a48-4e31-af2f-117f14da388a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="support\zip_support">
-      <UniqueIdentifier>{fdea327e-b905-47db-8c33-b70d7866166b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="textures">
-      <UniqueIdentifier>{46c8d130-b8b5-47f5-a063-ca700e1c32cc}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="tilemap_parallax_nodes">
-      <UniqueIdentifier>{f2671200-b2d8-4d2e-9728-06719cf6f835}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="text_input_node">
-      <UniqueIdentifier>{535c04b0-fe2b-44c9-9a8c-9029e2b6de5c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="script_support">
-      <UniqueIdentifier>{5b082c5c-d396-43ca-b3b1-997d0f6247d0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="draw_nodes">
-      <UniqueIdentifier>{1179d205-d065-49f0-8457-bc4c3f1d0cb3}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="support\tinyxml2">
-      <UniqueIdentifier>{cc25bb83-527d-4218-8d68-ebf963ce7698}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="support\component">
-      <UniqueIdentifier>{caa78ce0-9b58-4314-b117-1acae278691e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="platform\etc">
-      <UniqueIdentifier>{47fda93e-6eb4-4abc-b5bc-725bf667a395}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="physics">
-      <UniqueIdentifier>{08593631-5bf5-46aa-9436-62595c4f7bf6}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="physics\chipmunk">
-      <UniqueIdentifier>{aeadfa95-9c89-4212-98ae-89ad57db596a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="base">
-      <UniqueIdentifier>{aec8225f-81a7-4213-b97b-7004d5535398}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="renderer">
-      <UniqueIdentifier>{cba0f362-878c-438b-ad0f-43d287516357}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="deprecated">
-      <UniqueIdentifier>{6e394a3e-2c57-4988-bc51-bea18e491559}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="math">
-      <UniqueIdentifier>{0f5d437f-e972-4b3c-9e01-11802af452dc}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="support\tinyxml2\user_default">
-      <UniqueIdentifier>{c45b97e8-fa1f-4e58-8ec5-d46371c2dd26}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="ConvertUTF">
-      <UniqueIdentifier>{8357726f-36e1-4e1c-9fac-c86601307b1e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="platform\etc\winrt">
+    <Filter Include="platform\winrt">
       <UniqueIdentifier>{66fe0560-cca4-4b0c-a192-44aca8ad82af}</UniqueIdentifier>
     </Filter>
-    <Filter Include="xxhash">
-      <UniqueIdentifier>{b14b4bf9-3bc3-499b-b7a1-5e054aaf2ab0}</UniqueIdentifier>
+    <Filter Include="2d">
+      <UniqueIdentifier>{d3c53fc9-8678-4801-9a24-a619be0e761e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="3d">
+      <UniqueIdentifier>{929b5dfc-73f5-4094-9036-051078571248}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="base">
+      <UniqueIdentifier>{c883205c-736d-46a1-8626-8307d7c1967b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="deprecated">
+      <UniqueIdentifier>{ff74d35d-9d65-44b8-8569-36197c006c41}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="external">
+      <UniqueIdentifier>{8e9c8baf-8264-4016-bc90-ed547dfb524d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="external\ConvertUTF">
+      <UniqueIdentifier>{6063a842-a931-44fe-aea7-605af02302a4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="external\edtaa">
+      <UniqueIdentifier>{ebd488cd-3f7b-4d28-adfc-e70980a65199}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="external\tinyxml2">
+      <UniqueIdentifier>{b31e69bf-1430-4938-81a4-b88019ba6f70}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="external\unzip">
+      <UniqueIdentifier>{364e5ee6-3dee-4d24-baee-a59dd3519e8b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="external\xxhash">
+      <UniqueIdentifier>{7532fb96-9b65-44e6-a165-b78eb67e14e2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="math">
+      <UniqueIdentifier>{bb9fdcc1-d324-4e79-9d10-8698b0ea583d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="renderer">
+      <UniqueIdentifier>{7ca64aa2-f350-4bc9-a046-d24c4df4f0ad}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="renderer\shaders">
+      <UniqueIdentifier>{261eb0ec-d921-49ec-8ccd-f528d5a91abd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="physics">
+      <UniqueIdentifier>{bb14c2af-576d-4274-a21e-c518397fa0cf}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="physics\chipmunk">
+      <UniqueIdentifier>{4626742b-b8a8-4626-ac6c-17be46e1c3c1}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\physics\CCPhysicsBody.cpp">
-      <Filter>physics</Filter>
+    <ClCompile Include="..\cocos2d.cpp" />
+    <ClCompile Include="..\platform\winrt\pch.cpp" />
+    <ClCompile Include="..\platform\winrt\CCApplication.cpp">
+      <Filter>platform\winrt</Filter>
     </ClCompile>
-    <ClCompile Include="..\physics\CCPhysicsContact.cpp">
-      <Filter>physics</Filter>
+    <ClCompile Include="..\platform\winrt\CCCommon.cpp">
+      <Filter>platform\winrt</Filter>
     </ClCompile>
-    <ClCompile Include="..\physics\CCPhysicsJoint.cpp">
-      <Filter>physics</Filter>
+    <ClCompile Include="..\platform\winrt\CCDevice.cpp">
+      <Filter>platform\winrt</Filter>
     </ClCompile>
-    <ClCompile Include="..\physics\CCPhysicsShape.cpp">
-      <Filter>physics</Filter>
+    <ClCompile Include="..\platform\winrt\CCFileUtilsWinRT.cpp">
+      <Filter>platform\winrt</Filter>
     </ClCompile>
-    <ClCompile Include="..\physics\CCPhysicsWorld.cpp">
-      <Filter>physics</Filter>
+    <ClCompile Include="..\platform\winrt\CCFreeTypeFont.cpp">
+      <Filter>platform\winrt</Filter>
     </ClCompile>
-    <ClCompile Include="CCNode.cpp">
-      <Filter>base_nodes</Filter>
+    <ClCompile Include="..\platform\winrt\CCGLView.cpp">
+      <Filter>platform\winrt</Filter>
     </ClCompile>
-    <ClCompile Include="CCAtlasNode.cpp">
-      <Filter>base_nodes</Filter>
+    <ClCompile Include="..\platform\winrt\CCPrecompiledShaders.cpp">
+      <Filter>platform\winrt</Filter>
     </ClCompile>
-    <ClCompile Include="CCGrabber.cpp">
-      <Filter>effects</Filter>
+    <ClCompile Include="..\platform\winrt\CCPThreadWinRT.cpp">
+      <Filter>platform\winrt</Filter>
     </ClCompile>
-    <ClCompile Include="CCGrid.cpp">
-      <Filter>effects</Filter>
+    <ClCompile Include="..\platform\winrt\CCStdC.cpp">
+      <Filter>platform\winrt</Filter>
     </ClCompile>
-    <ClCompile Include="CCLayer.cpp">
-      <Filter>layers_scenes_transitions_nodes</Filter>
+    <ClCompile Include="..\platform\winrt\CCWinRTUtils.cpp">
+      <Filter>platform\winrt</Filter>
     </ClCompile>
-    <ClCompile Include="CCScene.cpp">
-      <Filter>layers_scenes_transitions_nodes</Filter>
+    <ClCompile Include="..\platform\winrt\DirectXBase.cpp">
+      <Filter>platform\winrt</Filter>
     </ClCompile>
-    <ClCompile Include="CCTransition.cpp">
-      <Filter>layers_scenes_transitions_nodes</Filter>
+    <ClCompile Include="..\platform\winrt\InputEvent.cpp">
+      <Filter>platform\winrt</Filter>
     </ClCompile>
-    <ClCompile Include="CCTransitionPageTurn.cpp">
-      <Filter>layers_scenes_transitions_nodes</Filter>
+    <ClCompile Include="..\platform\winrt\sha1.cpp">
+      <Filter>platform\winrt</Filter>
     </ClCompile>
-    <ClCompile Include="CCTransitionProgress.cpp">
-      <Filter>layers_scenes_transitions_nodes</Filter>
+    <ClCompile Include="..\platform\CCFileUtils.cpp">
+      <Filter>platform</Filter>
     </ClCompile>
-    <ClCompile Include="CCMenuItem.cpp">
-      <Filter>menu_nodes</Filter>
+    <ClCompile Include="..\platform\CCGLViewProtocol.cpp">
+      <Filter>platform</Filter>
     </ClCompile>
-    <ClCompile Include="CCMenu.cpp">
-      <Filter>menu_nodes</Filter>
+    <ClCompile Include="..\platform\CCImage.cpp">
+      <Filter>platform</Filter>
     </ClCompile>
-    <ClCompile Include="CCClippingNode.cpp">
-      <Filter>misc_nodes</Filter>
+    <ClCompile Include="..\platform\CCSAXParser.cpp">
+      <Filter>platform</Filter>
     </ClCompile>
-    <ClCompile Include="CCMotionStreak.cpp">
-      <Filter>misc_nodes</Filter>
-    </ClCompile>
-    <ClCompile Include="CCProgressTimer.cpp">
-      <Filter>misc_nodes</Filter>
-    </ClCompile>
-    <ClCompile Include="CCRenderTexture.cpp">
-      <Filter>misc_nodes</Filter>
-    </ClCompile>
-    <ClCompile Include="CCParticleBatchNode.cpp">
-      <Filter>particle_nodes</Filter>
-    </ClCompile>
-    <ClCompile Include="CCParticleExamples.cpp">
-      <Filter>particle_nodes</Filter>
-    </ClCompile>
-    <ClCompile Include="CCParticleSystem.cpp">
-      <Filter>particle_nodes</Filter>
-    </ClCompile>
-    <ClCompile Include="CCParticleSystemQuad.cpp">
-      <Filter>particle_nodes</Filter>
-    </ClCompile>
-    <ClCompile Include="CCScriptSupport.cpp">
-      <Filter>script_support</Filter>
+    <ClCompile Include="..\platform\CCThread.cpp">
+      <Filter>platform</Filter>
     </ClCompile>
     <ClCompile Include="CCAction.cpp">
-      <Filter>actions</Filter>
+      <Filter>2d</Filter>
     </ClCompile>
     <ClCompile Include="CCActionCamera.cpp">
-      <Filter>actions</Filter>
+      <Filter>2d</Filter>
     </ClCompile>
     <ClCompile Include="CCActionCatmullRom.cpp">
-      <Filter>actions</Filter>
+      <Filter>2d</Filter>
     </ClCompile>
     <ClCompile Include="CCActionEase.cpp">
-      <Filter>actions</Filter>
+      <Filter>2d</Filter>
     </ClCompile>
     <ClCompile Include="CCActionGrid.cpp">
-      <Filter>actions</Filter>
+      <Filter>2d</Filter>
     </ClCompile>
     <ClCompile Include="CCActionGrid3D.cpp">
-      <Filter>actions</Filter>
+      <Filter>2d</Filter>
     </ClCompile>
     <ClCompile Include="CCActionInstant.cpp">
-      <Filter>actions</Filter>
+      <Filter>2d</Filter>
     </ClCompile>
     <ClCompile Include="CCActionInterval.cpp">
-      <Filter>actions</Filter>
+      <Filter>2d</Filter>
     </ClCompile>
     <ClCompile Include="CCActionManager.cpp">
-      <Filter>actions</Filter>
+      <Filter>2d</Filter>
     </ClCompile>
     <ClCompile Include="CCActionPageTurn3D.cpp">
-      <Filter>actions</Filter>
+      <Filter>2d</Filter>
     </ClCompile>
     <ClCompile Include="CCActionProgressTimer.cpp">
-      <Filter>actions</Filter>
+      <Filter>2d</Filter>
     </ClCompile>
     <ClCompile Include="CCActionTiledGrid.cpp">
-      <Filter>actions</Filter>
+      <Filter>2d</Filter>
     </ClCompile>
     <ClCompile Include="CCActionTween.cpp">
-      <Filter>actions</Filter>
-    </ClCompile>
-    <ClCompile Include="CCDrawNode.cpp">
-      <Filter>draw_nodes</Filter>
-    </ClCompile>
-    <ClCompile Include="CCDrawingPrimitives.cpp">
-      <Filter>draw_nodes</Filter>
-    </ClCompile>
-    <ClCompile Include="CCFont.cpp">
-      <Filter>label_nodes</Filter>
-    </ClCompile>
-    <ClCompile Include="CCFontAtlas.cpp">
-      <Filter>label_nodes</Filter>
-    </ClCompile>
-    <ClCompile Include="CCFontAtlasCache.cpp">
-      <Filter>label_nodes</Filter>
-    </ClCompile>
-    <ClCompile Include="CCFontFNT.cpp">
-      <Filter>label_nodes</Filter>
-    </ClCompile>
-    <ClCompile Include="CCFontFreeType.cpp">
-      <Filter>label_nodes</Filter>
-    </ClCompile>
-    <ClCompile Include="CCLabel.cpp">
-      <Filter>label_nodes</Filter>
-    </ClCompile>
-    <ClCompile Include="CCLabelAtlas.cpp">
-      <Filter>label_nodes</Filter>
-    </ClCompile>
-    <ClCompile Include="CCLabelBMFont.cpp">
-      <Filter>label_nodes</Filter>
-    </ClCompile>
-    <ClCompile Include="CCLabelTextFormatter.cpp">
-      <Filter>label_nodes</Filter>
-    </ClCompile>
-    <ClCompile Include="CCLabelTTF.cpp">
-      <Filter>label_nodes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\base\etc1.cpp">
-      <Filter>platform\etc</Filter>
-    </ClCompile>
-    <ClCompile Include="platform\CCGLViewProtocol.cpp">
-      <Filter>platform</Filter>
-    </ClCompile>
-    <ClCompile Include="platform\CCFileUtils.cpp">
-      <Filter>platform</Filter>
-    </ClCompile>
-    <ClCompile Include="platform\CCSAXParser.cpp">
-      <Filter>platform</Filter>
-    </ClCompile>
-    <ClCompile Include="platform\CCThread.cpp">
-      <Filter>platform</Filter>
-    </ClCompile>
-    <ClCompile Include="..\base\atitc.cpp">
-      <Filter>platform</Filter>
-    </ClCompile>
-    <ClCompile Include="..\base\s3tc.cpp">
-      <Filter>platform</Filter>
-    </ClCompile>
-    <ClCompile Include="CCSpriteBatchNode.cpp">
-      <Filter>sprite_nodes</Filter>
-    </ClCompile>
-    <ClCompile Include="CCSpriteFrame.cpp">
-      <Filter>sprite_nodes</Filter>
-    </ClCompile>
-    <ClCompile Include="CCSpriteFrameCache.cpp">
-      <Filter>sprite_nodes</Filter>
-    </ClCompile>
-    <ClCompile Include="CCSprite.cpp">
-      <Filter>sprite_nodes</Filter>
+      <Filter>2d</Filter>
     </ClCompile>
     <ClCompile Include="CCAnimation.cpp">
-      <Filter>sprite_nodes</Filter>
+      <Filter>2d</Filter>
     </ClCompile>
     <ClCompile Include="CCAnimationCache.cpp">
-      <Filter>sprite_nodes</Filter>
+      <Filter>2d</Filter>
     </ClCompile>
-    <ClCompile Include="CCIMEDispatcher.cpp">
-      <Filter>text_input_node</Filter>
+    <ClCompile Include="CCAtlasNode.cpp">
+      <Filter>2d</Filter>
     </ClCompile>
-    <ClCompile Include="CCTextFieldTTF.cpp">
-      <Filter>text_input_node</Filter>
-    </ClCompile>
-    <ClCompile Include="CCTexture2D.cpp">
-      <Filter>textures</Filter>
-    </ClCompile>
-    <ClCompile Include="CCTextureAtlas.cpp">
-      <Filter>textures</Filter>
-    </ClCompile>
-    <ClCompile Include="CCTextureCache.cpp">
-      <Filter>textures</Filter>
-    </ClCompile>
-    <ClCompile Include="CCTMXLayer.cpp">
-      <Filter>tilemap_parallax_nodes</Filter>
-    </ClCompile>
-    <ClCompile Include="CCTMXObjectGroup.cpp">
-      <Filter>tilemap_parallax_nodes</Filter>
-    </ClCompile>
-    <ClCompile Include="CCTMXTiledMap.cpp">
-      <Filter>tilemap_parallax_nodes</Filter>
-    </ClCompile>
-    <ClCompile Include="CCTMXXMLParser.cpp">
-      <Filter>tilemap_parallax_nodes</Filter>
-    </ClCompile>
-    <ClCompile Include="CCTileMapAtlas.cpp">
-      <Filter>tilemap_parallax_nodes</Filter>
-    </ClCompile>
-    <ClCompile Include="CCParallaxNode.cpp">
-      <Filter>tilemap_parallax_nodes</Filter>
-    </ClCompile>
-    <ClCompile Include="ccFPSImages.c" />
-    <ClCompile Include="ccUTF8.cpp">
-      <Filter>support</Filter>
-    </ClCompile>
-    <ClCompile Include="CCVertex.cpp">
-      <Filter>support</Filter>
+    <ClCompile Include="CCClippingNode.cpp">
+      <Filter>2d</Filter>
     </ClCompile>
     <ClCompile Include="CCComponent.cpp">
-      <Filter>support\component</Filter>
+      <Filter>2d</Filter>
     </ClCompile>
     <ClCompile Include="CCComponentContainer.cpp">
-      <Filter>support\component</Filter>
+      <Filter>2d</Filter>
     </ClCompile>
-    <ClCompile Include="ccCArray.cpp">
-      <Filter>support\data_support</Filter>
+    <ClCompile Include="CCDrawingPrimitives.cpp">
+      <Filter>2d</Filter>
     </ClCompile>
-    <ClCompile Include="TGAlib.cpp">
-      <Filter>support\image_support</Filter>
+    <ClCompile Include="CCDrawNode.cpp">
+      <Filter>2d</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\external\tinyxml2\tinyxml2.cpp">
-      <Filter>support\tinyxml2</Filter>
+    <ClCompile Include="CCFont.cpp">
+      <Filter>2d</Filter>
     </ClCompile>
-    <ClCompile Include="CCUserDefault.cpp">
-      <Filter>support\tinyxml2\user_default</Filter>
+    <ClCompile Include="CCFontAtlas.cpp">
+      <Filter>2d</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\external\unzip\ioapi.cpp">
-      <Filter>support\zip_support</Filter>
+    <ClCompile Include="CCFontAtlasCache.cpp">
+      <Filter>2d</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\external\unzip\unzip.cpp">
-      <Filter>support\zip_support</Filter>
+    <ClCompile Include="CCFontCharMap.cpp">
+      <Filter>2d</Filter>
+    </ClCompile>
+    <ClCompile Include="CCFontFNT.cpp">
+      <Filter>2d</Filter>
+    </ClCompile>
+    <ClCompile Include="CCFontFreeType.cpp">
+      <Filter>2d</Filter>
+    </ClCompile>
+    <ClCompile Include="CCGLBufferedNode.cpp">
+      <Filter>2d</Filter>
+    </ClCompile>
+    <ClCompile Include="CCGrabber.cpp">
+      <Filter>2d</Filter>
+    </ClCompile>
+    <ClCompile Include="CCGrid.cpp">
+      <Filter>2d</Filter>
+    </ClCompile>
+    <ClCompile Include="CCLabel.cpp">
+      <Filter>2d</Filter>
+    </ClCompile>
+    <ClCompile Include="CCLabelAtlas.cpp">
+      <Filter>2d</Filter>
+    </ClCompile>
+    <ClCompile Include="CCLabelBMFont.cpp">
+      <Filter>2d</Filter>
+    </ClCompile>
+    <ClCompile Include="CCLabelTextFormatter.cpp">
+      <Filter>2d</Filter>
+    </ClCompile>
+    <ClCompile Include="CCLabelTTF.cpp">
+      <Filter>2d</Filter>
+    </ClCompile>
+    <ClCompile Include="CCLayer.cpp">
+      <Filter>2d</Filter>
+    </ClCompile>
+    <ClCompile Include="CCMenu.cpp">
+      <Filter>2d</Filter>
+    </ClCompile>
+    <ClCompile Include="CCMenuItem.cpp">
+      <Filter>2d</Filter>
+    </ClCompile>
+    <ClCompile Include="CCMotionStreak.cpp">
+      <Filter>2d</Filter>
+    </ClCompile>
+    <ClCompile Include="CCNode.cpp">
+      <Filter>2d</Filter>
+    </ClCompile>
+    <ClCompile Include="CCNodeGrid.cpp">
+      <Filter>2d</Filter>
+    </ClCompile>
+    <ClCompile Include="CCParallaxNode.cpp">
+      <Filter>2d</Filter>
+    </ClCompile>
+    <ClCompile Include="CCParticleBatchNode.cpp">
+      <Filter>2d</Filter>
+    </ClCompile>
+    <ClCompile Include="CCParticleExamples.cpp">
+      <Filter>2d</Filter>
+    </ClCompile>
+    <ClCompile Include="CCParticleSystem.cpp">
+      <Filter>2d</Filter>
+    </ClCompile>
+    <ClCompile Include="CCParticleSystemQuad.cpp">
+      <Filter>2d</Filter>
+    </ClCompile>
+    <ClCompile Include="CCProgressTimer.cpp">
+      <Filter>2d</Filter>
+    </ClCompile>
+    <ClCompile Include="CCRenderTexture.cpp">
+      <Filter>2d</Filter>
+    </ClCompile>
+    <ClCompile Include="CCScene.cpp">
+      <Filter>2d</Filter>
+    </ClCompile>
+    <ClCompile Include="CCSprite.cpp">
+      <Filter>2d</Filter>
+    </ClCompile>
+    <ClCompile Include="CCSpriteBatchNode.cpp">
+      <Filter>2d</Filter>
+    </ClCompile>
+    <ClCompile Include="CCSpriteFrame.cpp">
+      <Filter>2d</Filter>
+    </ClCompile>
+    <ClCompile Include="CCSpriteFrameCache.cpp">
+      <Filter>2d</Filter>
+    </ClCompile>
+    <ClCompile Include="CCTextFieldTTF.cpp">
+      <Filter>2d</Filter>
+    </ClCompile>
+    <ClCompile Include="CCTileMapAtlas.cpp">
+      <Filter>2d</Filter>
+    </ClCompile>
+    <ClCompile Include="CCTMXLayer.cpp">
+      <Filter>2d</Filter>
+    </ClCompile>
+    <ClCompile Include="CCTMXObjectGroup.cpp">
+      <Filter>2d</Filter>
+    </ClCompile>
+    <ClCompile Include="CCTMXTiledMap.cpp">
+      <Filter>2d</Filter>
+    </ClCompile>
+    <ClCompile Include="CCTMXXMLParser.cpp">
+      <Filter>2d</Filter>
+    </ClCompile>
+    <ClCompile Include="CCTransition.cpp">
+      <Filter>2d</Filter>
+    </ClCompile>
+    <ClCompile Include="CCTransitionPageTurn.cpp">
+      <Filter>2d</Filter>
+    </ClCompile>
+    <ClCompile Include="CCTransitionProgress.cpp">
+      <Filter>2d</Filter>
+    </ClCompile>
+    <ClCompile Include="CCTweenFunction.cpp">
+      <Filter>2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\3d\CCMesh.cpp">
+      <Filter>3d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\3d\CCObjLoader.cpp">
+      <Filter>3d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\3d\CCSprite3D.cpp">
+      <Filter>3d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\3d\CCSprite3DDataCache.cpp">
+      <Filter>3d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\base\atitc.cpp">
+      <Filter>base</Filter>
+    </ClCompile>
+    <ClCompile Include="..\base\base64.cpp">
+      <Filter>base</Filter>
     </ClCompile>
     <ClCompile Include="..\base\CCAutoreleasePool.cpp">
       <Filter>base</Filter>
     </ClCompile>
+    <ClCompile Include="..\base\ccCArray.cpp">
+      <Filter>base</Filter>
+    </ClCompile>
+    <ClCompile Include="..\base\CCConfiguration.cpp">
+      <Filter>base</Filter>
+    </ClCompile>
+    <ClCompile Include="..\base\CCConsole.cpp">
+      <Filter>base</Filter>
+    </ClCompile>
     <ClCompile Include="..\base\CCData.cpp">
       <Filter>base</Filter>
     </ClCompile>
     <ClCompile Include="..\base\CCDataVisitor.cpp">
       <Filter>base</Filter>
     </ClCompile>
-    <ClCompile Include="..\base\CCNS.cpp">
-      <Filter>base</Filter>
-    </ClCompile>
-    <ClCompile Include="..\base\CCRef.cpp">
-      <Filter>base</Filter>
-    </ClCompile>
-    <ClCompile Include="ccUtils.cpp">
-      <Filter>support</Filter>
-    </ClCompile>
-    <ClCompile Include="..\physics\chipmunk\CCPhysicsBodyInfo_chipmunk.cpp">
-      <Filter>physics\chipmunk</Filter>
-    </ClCompile>
-    <ClCompile Include="..\physics\chipmunk\CCPhysicsContactInfo_chipmunk.cpp">
-      <Filter>physics\chipmunk</Filter>
-    </ClCompile>
-    <ClCompile Include="..\physics\chipmunk\CCPhysicsJointInfo_chipmunk.cpp">
-      <Filter>physics\chipmunk</Filter>
-    </ClCompile>
-    <ClCompile Include="..\physics\chipmunk\CCPhysicsShapeInfo_chipmunk.cpp">
-      <Filter>physics\chipmunk</Filter>
-    </ClCompile>
-    <ClCompile Include="..\physics\chipmunk\CCPhysicsWorldInfo_chipmunk.cpp">
-      <Filter>physics\chipmunk</Filter>
-    </ClCompile>
-    <ClCompile Include="..\base\CCValue.cpp">
-      <Filter>base</Filter>
-    </ClCompile>
-    <ClCompile Include="CCNodeGrid.cpp">
-      <Filter>misc_nodes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\edtaa3func\edtaa3func.cpp">
-      <Filter>label_nodes</Filter>
-    </ClCompile>
-    <ClCompile Include="CCFontCharMap.cpp">
-      <Filter>label_nodes</Filter>
-    </ClCompile>
-    <ClCompile Include="platform\CCImage.cpp">
-      <Filter>platform</Filter>
-    </ClCompile>
-    <ClCompile Include="CCTweenFunction.cpp" />
-    <ClCompile Include="platform\winrt\CCApplication.cpp">
-      <Filter>platform\etc\winrt</Filter>
-    </ClCompile>
-    <ClCompile Include="platform\winrt\CCCommon.cpp">
-      <Filter>platform\etc\winrt</Filter>
-    </ClCompile>
-    <ClCompile Include="platform\winrt\CCDevice.cpp">
-      <Filter>platform\etc\winrt</Filter>
-    </ClCompile>
-    <ClCompile Include="platform\winrt\CCFileUtilsWinRT.cpp">
-      <Filter>platform\etc\winrt</Filter>
-    </ClCompile>
-    <ClCompile Include="platform\winrt\CCFreeTypeFont.cpp">
-      <Filter>platform\etc\winrt</Filter>
-    </ClCompile>
-    <ClCompile Include="platform\winrt\CCGLView.cpp">
-      <Filter>platform\etc\winrt</Filter>
-    </ClCompile>
-    <ClCompile Include="platform\winrt\CCPrecompiledShaders.cpp">
-      <Filter>platform\etc\winrt</Filter>
-    </ClCompile>
-    <ClCompile Include="platform\winrt\CCPThreadWinRT.cpp">
-      <Filter>platform\etc\winrt</Filter>
-    </ClCompile>
-    <ClCompile Include="platform\winrt\CCStdC.cpp">
-      <Filter>platform\etc\winrt</Filter>
-    </ClCompile>
-    <ClCompile Include="platform\winrt\CCWinRTUtils.cpp">
-      <Filter>platform\etc\winrt</Filter>
-    </ClCompile>
-    <ClCompile Include="platform\winrt\DirectXBase.cpp">
-      <Filter>platform\etc\winrt</Filter>
-    </ClCompile>
-    <ClCompile Include="platform\winrt\sha1.cpp">
-      <Filter>platform\etc\winrt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\base\CCConsole.cpp">
-      <Filter>base</Filter>
-    </ClCompile>
-    <ClCompile Include="..\deprecated\CCArray.cpp">
-      <Filter>deprecated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\deprecated\CCDeprecated.cpp">
-      <Filter>deprecated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\deprecated\CCDictionary.cpp">
-      <Filter>deprecated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\deprecated\CCNotificationCenter.cpp">
-      <Filter>deprecated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\deprecated\CCSet.cpp">
-      <Filter>deprecated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\deprecated\CCString.cpp">
-      <Filter>deprecated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\math\CCAffineTransform.cpp">
-      <Filter>math</Filter>
-    </ClCompile>
-    <ClCompile Include="..\math\CCGeometry.cpp">
-      <Filter>math</Filter>
-    </ClCompile>
-    <ClCompile Include="..\math\MathUtil.cpp">
-      <Filter>math</Filter>
-    </ClCompile>
-    <ClCompile Include="..\math\Matrix.cpp">
-      <Filter>math</Filter>
-    </ClCompile>
-    <ClCompile Include="..\math\Quaternion.cpp">
-      <Filter>math</Filter>
-    </ClCompile>
-    <ClCompile Include="..\math\TransformUtils.cpp">
-      <Filter>math</Filter>
-    </ClCompile>
-    <ClCompile Include="..\math\Vector2.cpp">
-      <Filter>math</Filter>
-    </ClCompile>
-    <ClCompile Include="..\math\Vector3.cpp">
-      <Filter>math</Filter>
-    </ClCompile>
-    <ClCompile Include="..\math\Vector4.cpp">
-      <Filter>math</Filter>
-    </ClCompile>
-    <ClCompile Include="..\renderer\CCBatchCommand.cpp">
-      <Filter>renderer</Filter>
-    </ClCompile>
-    <ClCompile Include="..\renderer\CCCustomCommand.cpp">
-      <Filter>renderer</Filter>
-    </ClCompile>
-    <ClCompile Include="..\renderer\CCGLProgram.cpp">
-      <Filter>renderer</Filter>
-    </ClCompile>
-    <ClCompile Include="..\renderer\CCGLProgramCache.cpp">
-      <Filter>renderer</Filter>
-    </ClCompile>
-    <ClCompile Include="..\renderer\CCGLProgramState.cpp">
-      <Filter>renderer</Filter>
-    </ClCompile>
-    <ClCompile Include="..\renderer\CCGLProgramStateCache.cpp">
-      <Filter>renderer</Filter>
-    </ClCompile>
-    <ClCompile Include="..\renderer\ccGLStateCache.cpp">
-      <Filter>renderer</Filter>
-    </ClCompile>
-    <ClCompile Include="..\renderer\CCGroupCommand.cpp">
-      <Filter>renderer</Filter>
-    </ClCompile>
-    <ClCompile Include="..\renderer\CCQuadCommand.cpp">
-      <Filter>renderer</Filter>
-    </ClCompile>
-    <ClCompile Include="..\renderer\CCRenderCommand.cpp">
-      <Filter>renderer</Filter>
-    </ClCompile>
-    <ClCompile Include="..\renderer\CCRenderer.cpp">
-      <Filter>renderer</Filter>
-    </ClCompile>
-    <ClCompile Include="..\renderer\ccShaders.cpp">
-      <Filter>renderer</Filter>
-    </ClCompile>
-    <ClCompile Include="platform\winrt\pch.cpp" />
-    <ClCompile Include="..\base\base64.cpp">
-      <Filter>base</Filter>
-    </ClCompile>
-    <ClCompile Include="..\base\CCConfiguration.cpp">
-      <Filter>base</Filter>
-    </ClCompile>
     <ClCompile Include="..\base\CCDirector.cpp">
       <Filter>base</Filter>
     </ClCompile>
@@ -579,541 +383,494 @@
     <ClCompile Include="..\base\CCEventTouch.cpp">
       <Filter>base</Filter>
     </ClCompile>
+    <ClCompile Include="..\base\ccFPSImages.c">
+      <Filter>base</Filter>
+    </ClCompile>
+    <ClCompile Include="..\base\CCIMEDispatcher.cpp">
+      <Filter>base</Filter>
+    </ClCompile>
+    <ClCompile Include="..\base\CCNS.cpp">
+      <Filter>base</Filter>
+    </ClCompile>
     <ClCompile Include="..\base\CCProfiling.cpp">
       <Filter>base</Filter>
     </ClCompile>
+    <ClCompile Include="..\base\CCRef.cpp">
+      <Filter>base</Filter>
+    </ClCompile>
     <ClCompile Include="..\base\CCScheduler.cpp">
       <Filter>base</Filter>
     </ClCompile>
+    <ClCompile Include="..\base\CCScriptSupport.cpp">
+      <Filter>base</Filter>
+    </ClCompile>
     <ClCompile Include="..\base\CCTouch.cpp">
       <Filter>base</Filter>
     </ClCompile>
     <ClCompile Include="..\base\ccTypes.cpp">
       <Filter>base</Filter>
     </ClCompile>
+    <ClCompile Include="..\base\CCUserDefault.cpp">
+      <Filter>base</Filter>
+    </ClCompile>
+    <ClCompile Include="..\base\CCUserDefaultAndroid.cpp">
+      <Filter>base</Filter>
+    </ClCompile>
+    <ClCompile Include="..\base\ccUTF8.cpp">
+      <Filter>base</Filter>
+    </ClCompile>
+    <ClCompile Include="..\base\ccUtils.cpp">
+      <Filter>base</Filter>
+    </ClCompile>
+    <ClCompile Include="..\base\CCValue.cpp">
+      <Filter>base</Filter>
+    </ClCompile>
+    <ClCompile Include="..\base\etc1.cpp">
+      <Filter>base</Filter>
+    </ClCompile>
+    <ClCompile Include="..\base\s3tc.cpp">
+      <Filter>base</Filter>
+    </ClCompile>
+    <ClCompile Include="..\base\TGAlib.cpp">
+      <Filter>base</Filter>
+    </ClCompile>
     <ClCompile Include="..\base\ZipUtils.cpp">
       <Filter>base</Filter>
     </ClCompile>
+    <ClCompile Include="..\deprecated\CCArray.cpp">
+      <Filter>deprecated</Filter>
+    </ClCompile>
+    <ClCompile Include="..\deprecated\CCDeprecated.cpp">
+      <Filter>deprecated</Filter>
+    </ClCompile>
+    <ClCompile Include="..\deprecated\CCDictionary.cpp">
+      <Filter>deprecated</Filter>
+    </ClCompile>
+    <ClCompile Include="..\deprecated\CCNotificationCenter.cpp">
+      <Filter>deprecated</Filter>
+    </ClCompile>
+    <ClCompile Include="..\deprecated\CCSet.cpp">
+      <Filter>deprecated</Filter>
+    </ClCompile>
+    <ClCompile Include="..\deprecated\CCString.cpp">
+      <Filter>deprecated</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\external\ConvertUTF\ConvertUTF.c">
-      <Filter>ConvertUTF</Filter>
+      <Filter>external\ConvertUTF</Filter>
     </ClCompile>
     <ClCompile Include="..\..\external\ConvertUTF\ConvertUTFWrapper.cpp">
-      <Filter>ConvertUTF</Filter>
+      <Filter>external\ConvertUTF</Filter>
     </ClCompile>
-    <ClCompile Include="platform\winrt\InputEvent.cpp">
-      <Filter>platform\etc\winrt</Filter>
+    <ClCompile Include="..\..\external\edtaa3func\edtaa3func.cpp">
+      <Filter>external\edtaa</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\external\tinyxml2\tinyxml2.cpp">
+      <Filter>external\tinyxml2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\external\unzip\ioapi.cpp">
+      <Filter>external\unzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\external\unzip\unzip.cpp">
+      <Filter>external\unzip</Filter>
     </ClCompile>
-    <ClCompile Include="..\cocos2d.cpp" />
     <ClCompile Include="..\..\external\xxhash\xxhash.c">
-      <Filter>xxhash</Filter>
+      <Filter>external\xxhash</Filter>
+    </ClCompile>
+    <ClCompile Include="..\math\CCAffineTransform.cpp">
+      <Filter>math</Filter>
+    </ClCompile>
+    <ClCompile Include="..\math\CCGeometry.cpp">
+      <Filter>math</Filter>
+    </ClCompile>
+    <ClCompile Include="..\math\CCVertex.cpp">
+      <Filter>math</Filter>
+    </ClCompile>
+    <ClCompile Include="..\math\Mat4.cpp">
+      <Filter>math</Filter>
+    </ClCompile>
+    <ClCompile Include="..\math\MathUtil.cpp">
+      <Filter>math</Filter>
+    </ClCompile>
+    <ClCompile Include="..\math\Quaternion.cpp">
+      <Filter>math</Filter>
+    </ClCompile>
+    <ClCompile Include="..\math\TransformUtils.cpp">
+      <Filter>math</Filter>
+    </ClCompile>
+    <ClCompile Include="..\math\Vec2.cpp">
+      <Filter>math</Filter>
+    </ClCompile>
+    <ClCompile Include="..\math\Vec3.cpp">
+      <Filter>math</Filter>
+    </ClCompile>
+    <ClCompile Include="..\math\Vec4.cpp">
+      <Filter>math</Filter>
+    </ClCompile>
+    <ClCompile Include="..\renderer\CCBatchCommand.cpp">
+      <Filter>renderer</Filter>
+    </ClCompile>
+    <ClCompile Include="..\renderer\CCCustomCommand.cpp">
+      <Filter>renderer</Filter>
+    </ClCompile>
+    <ClCompile Include="..\renderer\CCGLProgram.cpp">
+      <Filter>renderer</Filter>
+    </ClCompile>
+    <ClCompile Include="..\renderer\CCGLProgramCache.cpp">
+      <Filter>renderer</Filter>
+    </ClCompile>
+    <ClCompile Include="..\renderer\CCGLProgramState.cpp">
+      <Filter>renderer</Filter>
+    </ClCompile>
+    <ClCompile Include="..\renderer\CCGLProgramStateCache.cpp">
+      <Filter>renderer</Filter>
+    </ClCompile>
+    <ClCompile Include="..\renderer\ccGLStateCache.cpp">
+      <Filter>renderer</Filter>
+    </ClCompile>
+    <ClCompile Include="..\renderer\CCGroupCommand.cpp">
+      <Filter>renderer</Filter>
+    </ClCompile>
+    <ClCompile Include="..\renderer\CCMeshCommand.cpp">
+      <Filter>renderer</Filter>
+    </ClCompile>
+    <ClCompile Include="..\renderer\CCQuadCommand.cpp">
+      <Filter>renderer</Filter>
+    </ClCompile>
+    <ClCompile Include="..\renderer\CCRenderCommand.cpp">
+      <Filter>renderer</Filter>
+    </ClCompile>
+    <ClCompile Include="..\renderer\CCRenderer.cpp">
+      <Filter>renderer</Filter>
+    </ClCompile>
+    <ClCompile Include="..\renderer\ccShaders.cpp">
+      <Filter>renderer</Filter>
+    </ClCompile>
+    <ClCompile Include="..\renderer\CCTexture2D.cpp">
+      <Filter>renderer</Filter>
+    </ClCompile>
+    <ClCompile Include="..\renderer\CCTextureAtlas.cpp">
+      <Filter>renderer</Filter>
+    </ClCompile>
+    <ClCompile Include="..\renderer\CCTextureCache.cpp">
+      <Filter>renderer</Filter>
+    </ClCompile>
+    <ClCompile Include="..\physics\chipmunk\CCPhysicsBodyInfo_chipmunk.cpp">
+      <Filter>physics\chipmunk</Filter>
+    </ClCompile>
+    <ClCompile Include="..\physics\chipmunk\CCPhysicsContactInfo_chipmunk.cpp">
+      <Filter>physics\chipmunk</Filter>
+    </ClCompile>
+    <ClCompile Include="..\physics\chipmunk\CCPhysicsJointInfo_chipmunk.cpp">
+      <Filter>physics\chipmunk</Filter>
+    </ClCompile>
+    <ClCompile Include="..\physics\chipmunk\CCPhysicsShapeInfo_chipmunk.cpp">
+      <Filter>physics\chipmunk</Filter>
+    </ClCompile>
+    <ClCompile Include="..\physics\chipmunk\CCPhysicsWorldInfo_chipmunk.cpp">
+      <Filter>physics\chipmunk</Filter>
+    </ClCompile>
+    <ClCompile Include="..\physics\CCPhysicsBody.cpp">
+      <Filter>physics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\physics\CCPhysicsContact.cpp">
+      <Filter>physics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\physics\CCPhysicsJoint.cpp">
+      <Filter>physics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\physics\CCPhysicsShape.cpp">
+      <Filter>physics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\physics\CCPhysicsWorld.cpp">
+      <Filter>physics</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\physics\CCPhysicsBody.h">
-      <Filter>physics</Filter>
+    <ClInclude Include="..\cocos2d.h" />
+    <ClInclude Include="..\platform\winrt\pch.h" />
+    <ClInclude Include="..\platform\winrt\CCApplication.h">
+      <Filter>platform\winrt</Filter>
     </ClInclude>
-    <ClInclude Include="..\physics\CCPhysicsContact.h">
-      <Filter>physics</Filter>
+    <ClInclude Include="..\platform\winrt\CCFileUtilsWinRT.h">
+      <Filter>platform\winrt</Filter>
     </ClInclude>
-    <ClInclude Include="..\physics\CCPhysicsJoint.h">
-      <Filter>physics</Filter>
+    <ClInclude Include="..\platform\winrt\CCFreeTypeFont.h">
+      <Filter>platform\winrt</Filter>
     </ClInclude>
-    <ClInclude Include="..\physics\CCPhysicsShape.h">
-      <Filter>physics</Filter>
+    <ClInclude Include="..\platform\winrt\CCGL.h">
+      <Filter>platform\winrt</Filter>
     </ClInclude>
-    <ClInclude Include="..\physics\CCPhysicsWorld.h">
-      <Filter>physics</Filter>
+    <ClInclude Include="..\platform\winrt\CCGL_Angle.h">
+      <Filter>platform\winrt</Filter>
     </ClInclude>
-    <ClInclude Include="CCNode.h">
-      <Filter>base_nodes</Filter>
+    <ClInclude Include="..\platform\winrt\CCGLView.h">
+      <Filter>platform\winrt</Filter>
     </ClInclude>
-    <ClInclude Include="CCAtlasNode.h">
-      <Filter>base_nodes</Filter>
+    <ClInclude Include="..\platform\winrt\CCPlatformDefine.h">
+      <Filter>platform\winrt</Filter>
     </ClInclude>
-    <ClInclude Include="CCGrabber.h">
-      <Filter>effects</Filter>
+    <ClInclude Include="..\platform\winrt\CCPrecompiledShaders.h">
+      <Filter>platform\winrt</Filter>
     </ClInclude>
-    <ClInclude Include="CCGrid.h">
-      <Filter>effects</Filter>
+    <ClInclude Include="..\platform\winrt\CCPThreadWinRT.h">
+      <Filter>platform\winrt</Filter>
     </ClInclude>
-    <ClInclude Include="ccConfig.h">
-      <Filter>include</Filter>
+    <ClInclude Include="..\platform\winrt\CCStdC.h">
+      <Filter>platform\winrt</Filter>
     </ClInclude>
-    <ClInclude Include="CCDeprecated.h">
-      <Filter>include</Filter>
+    <ClInclude Include="..\platform\winrt\CCWinRTUtils.h">
+      <Filter>platform\winrt</Filter>
     </ClInclude>
-    <ClInclude Include="CCEventType.h">
-      <Filter>include</Filter>
+    <ClInclude Include="..\platform\winrt\DirectXBase.h">
+      <Filter>platform\winrt</Filter>
     </ClInclude>
-    <ClInclude Include="ccMacros.h">
-      <Filter>include</Filter>
+    <ClInclude Include="..\platform\winrt\DirectXHelper.h">
+      <Filter>platform\winrt</Filter>
     </ClInclude>
-    <ClInclude Include="CCProtocols.h">
-      <Filter>include</Filter>
+    <ClInclude Include="..\platform\winrt\InputEvent.h">
+      <Filter>platform\winrt</Filter>
     </ClInclude>
-    <ClInclude Include="ccTypes.h">
-      <Filter>include</Filter>
+    <ClInclude Include="..\platform\winrt\InputEventTypes.h">
+      <Filter>platform\winrt</Filter>
     </ClInclude>
-    <ClInclude Include="cocos2d.h">
-      <Filter>include</Filter>
+    <ClInclude Include="..\platform\winrt\sha1.h">
+      <Filter>platform\winrt</Filter>
     </ClInclude>
-    <ClInclude Include="CCLayer.h">
-      <Filter>layers_scenes_transitions_nodes</Filter>
+    <ClInclude Include="..\platform\CCApplicationProtocol.h">
+      <Filter>platform</Filter>
     </ClInclude>
-    <ClInclude Include="CCScene.h">
-      <Filter>layers_scenes_transitions_nodes</Filter>
+    <ClInclude Include="..\platform\CCCommon.h">
+      <Filter>platform</Filter>
     </ClInclude>
-    <ClInclude Include="CCTransition.h">
-      <Filter>layers_scenes_transitions_nodes</Filter>
+    <ClInclude Include="..\platform\CCDevice.h">
+      <Filter>platform</Filter>
     </ClInclude>
-    <ClInclude Include="CCTransitionPageTurn.h">
-      <Filter>layers_scenes_transitions_nodes</Filter>
+    <ClInclude Include="..\platform\CCFileUtils.h">
+      <Filter>platform</Filter>
     </ClInclude>
-    <ClInclude Include="CCTransitionProgress.h">
-      <Filter>layers_scenes_transitions_nodes</Filter>
+    <ClInclude Include="..\platform\CCGLViewProtocol.h">
+      <Filter>platform</Filter>
     </ClInclude>
-    <ClInclude Include="CCMenu.h">
-      <Filter>menu_nodes</Filter>
+    <ClInclude Include="..\platform\CCImage.h">
+      <Filter>platform</Filter>
     </ClInclude>
-    <ClInclude Include="CCMenuItem.h">
-      <Filter>menu_nodes</Filter>
+    <ClInclude Include="..\platform\CCSAXParser.h">
+      <Filter>platform</Filter>
     </ClInclude>
-    <ClInclude Include="CCClippingNode.h">
-      <Filter>misc_nodes</Filter>
-    </ClInclude>
-    <ClInclude Include="CCMotionStreak.h">
-      <Filter>misc_nodes</Filter>
-    </ClInclude>
-    <ClInclude Include="CCProgressTimer.h">
-      <Filter>misc_nodes</Filter>
-    </ClInclude>
-    <ClInclude Include="CCRenderTexture.h">
-      <Filter>misc_nodes</Filter>
-    </ClInclude>
-    <ClInclude Include="CCParticleBatchNode.h">
-      <Filter>particle_nodes</Filter>
-    </ClInclude>
-    <ClInclude Include="CCParticleExamples.h">
-      <Filter>particle_nodes</Filter>
-    </ClInclude>
-    <ClInclude Include="CCParticleSystem.h">
-      <Filter>particle_nodes</Filter>
-    </ClInclude>
-    <ClInclude Include="CCParticleSystemQuad.h">
-      <Filter>particle_nodes</Filter>
-    </ClInclude>
-    <ClInclude Include="CCScriptSupport.h">
-      <Filter>script_support</Filter>
+    <ClInclude Include="..\platform\CCThread.h">
+      <Filter>platform</Filter>
     </ClInclude>
     <ClInclude Include="CCAction.h">
-      <Filter>actions</Filter>
+      <Filter>2d</Filter>
     </ClInclude>
     <ClInclude Include="CCActionCamera.h">
-      <Filter>actions</Filter>
+      <Filter>2d</Filter>
     </ClInclude>
     <ClInclude Include="CCActionCatmullRom.h">
-      <Filter>actions</Filter>
+      <Filter>2d</Filter>
     </ClInclude>
     <ClInclude Include="CCActionEase.h">
-      <Filter>actions</Filter>
+      <Filter>2d</Filter>
     </ClInclude>
     <ClInclude Include="CCActionGrid.h">
-      <Filter>actions</Filter>
+      <Filter>2d</Filter>
     </ClInclude>
     <ClInclude Include="CCActionGrid3D.h">
-      <Filter>actions</Filter>
+      <Filter>2d</Filter>
     </ClInclude>
     <ClInclude Include="CCActionInstant.h">
-      <Filter>actions</Filter>
+      <Filter>2d</Filter>
     </ClInclude>
     <ClInclude Include="CCActionInterval.h">
-      <Filter>actions</Filter>
+      <Filter>2d</Filter>
     </ClInclude>
     <ClInclude Include="CCActionManager.h">
-      <Filter>actions</Filter>
+      <Filter>2d</Filter>
     </ClInclude>
     <ClInclude Include="CCActionPageTurn3D.h">
-      <Filter>actions</Filter>
+      <Filter>2d</Filter>
     </ClInclude>
     <ClInclude Include="CCActionProgressTimer.h">
-      <Filter>actions</Filter>
+      <Filter>2d</Filter>
     </ClInclude>
     <ClInclude Include="CCActionTiledGrid.h">
-      <Filter>actions</Filter>
+      <Filter>2d</Filter>
     </ClInclude>
     <ClInclude Include="CCActionTween.h">
-      <Filter>actions</Filter>
-    </ClInclude>
-    <ClInclude Include="CCDrawNode.h">
-      <Filter>draw_nodes</Filter>
-    </ClInclude>
-    <ClInclude Include="CCDrawingPrimitives.h">
-      <Filter>draw_nodes</Filter>
-    </ClInclude>
-    <ClInclude Include="CCFont.h">
-      <Filter>label_nodes</Filter>
-    </ClInclude>
-    <ClInclude Include="CCFontAtlas.h">
-      <Filter>label_nodes</Filter>
-    </ClInclude>
-    <ClInclude Include="CCFontAtlasCache.h">
-      <Filter>label_nodes</Filter>
-    </ClInclude>
-    <ClInclude Include="CCFontFNT.h">
-      <Filter>label_nodes</Filter>
-    </ClInclude>
-    <ClInclude Include="CCFontFreeType.h">
-      <Filter>label_nodes</Filter>
-    </ClInclude>
-    <ClInclude Include="CCLabel.h">
-      <Filter>label_nodes</Filter>
-    </ClInclude>
-    <ClInclude Include="CCLabelAtlas.h">
-      <Filter>label_nodes</Filter>
-    </ClInclude>
-    <ClInclude Include="CCLabelBMFont.h">
-      <Filter>label_nodes</Filter>
-    </ClInclude>
-    <ClInclude Include="CCLabelTextFormatter.h">
-      <Filter>label_nodes</Filter>
-    </ClInclude>
-    <ClInclude Include="CCLabelTTF.h">
-      <Filter>label_nodes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\base\etc1.h">
-      <Filter>platform\etc</Filter>
-    </ClInclude>
-    <ClInclude Include="platform\CCApplicationProtocol.h">
-      <Filter>platform</Filter>
-    </ClInclude>
-    <ClInclude Include="platform\CCCommon.h">
-      <Filter>platform</Filter>
-    </ClInclude>
-    <ClInclude Include="platform\CCDevice.h">
-      <Filter>platform</Filter>
-    </ClInclude>
-    <ClInclude Include="platform\CCGLViewProtocol.h">
-      <Filter>platform</Filter>
-    </ClInclude>
-    <ClInclude Include="platform\CCFileUtils.h">
-      <Filter>platform</Filter>
-    </ClInclude>
-    <ClInclude Include="platform\CCImage.h">
-      <Filter>platform</Filter>
-    </ClInclude>
-    <ClInclude Include="platform\CCSAXParser.h">
-      <Filter>platform</Filter>
-    </ClInclude>
-    <ClInclude Include="platform\CCThread.h">
-      <Filter>platform</Filter>
-    </ClInclude>
-    <ClInclude Include="..\base\atitc.h">
-      <Filter>platform</Filter>
-    </ClInclude>
-    <ClInclude Include="..\base\CCPlatformConfig.h">
-      <Filter>platform</Filter>
-    </ClInclude>
-    <ClInclude Include="..\base\CCPlatformMacros.h">
-      <Filter>platform</Filter>
-    </ClInclude>
-    <ClInclude Include="..\base\s3tc.h">
-      <Filter>platform</Filter>
-    </ClInclude>
-    <ClInclude Include="CCSpriteBatchNode.h">
-      <Filter>sprite_nodes</Filter>
-    </ClInclude>
-    <ClInclude Include="CCSpriteFrame.h">
-      <Filter>sprite_nodes</Filter>
-    </ClInclude>
-    <ClInclude Include="CCSpriteFrameCache.h">
-      <Filter>sprite_nodes</Filter>
-    </ClInclude>
-    <ClInclude Include="CCSprite.h">
-      <Filter>sprite_nodes</Filter>
+      <Filter>2d</Filter>
     </ClInclude>
     <ClInclude Include="CCAnimation.h">
-      <Filter>sprite_nodes</Filter>
+      <Filter>2d</Filter>
     </ClInclude>
     <ClInclude Include="CCAnimationCache.h">
-      <Filter>sprite_nodes</Filter>
+      <Filter>2d</Filter>
     </ClInclude>
-    <ClInclude Include="CCIMEDelegate.h">
-      <Filter>text_input_node</Filter>
+    <ClInclude Include="CCAtlasNode.h">
+      <Filter>2d</Filter>
     </ClInclude>
-    <ClInclude Include="CCIMEDispatcher.h">
-      <Filter>text_input_node</Filter>
-    </ClInclude>
-    <ClInclude Include="CCTextFieldTTF.h">
-      <Filter>text_input_node</Filter>
-    </ClInclude>
-    <ClInclude Include="CCTexture2D.h">
-      <Filter>textures</Filter>
-    </ClInclude>
-    <ClInclude Include="CCTextureAtlas.h">
-      <Filter>textures</Filter>
-    </ClInclude>
-    <ClInclude Include="CCTextureCache.h">
-      <Filter>textures</Filter>
-    </ClInclude>
-    <ClInclude Include="CCTMXLayer.h">
-      <Filter>tilemap_parallax_nodes</Filter>
-    </ClInclude>
-    <ClInclude Include="CCTMXObjectGroup.h">
-      <Filter>tilemap_parallax_nodes</Filter>
-    </ClInclude>
-    <ClInclude Include="CCTMXTiledMap.h">
-      <Filter>tilemap_parallax_nodes</Filter>
-    </ClInclude>
-    <ClInclude Include="CCTMXXMLParser.h">
-      <Filter>tilemap_parallax_nodes</Filter>
-    </ClInclude>
-    <ClInclude Include="CCTileMapAtlas.h">
-      <Filter>tilemap_parallax_nodes</Filter>
-    </ClInclude>
-    <ClInclude Include="CCParallaxNode.h">
-      <Filter>tilemap_parallax_nodes</Filter>
-    </ClInclude>
-    <ClInclude Include="ccFPSImages.h" />
-    <ClInclude Include="ccUTF8.h">
-      <Filter>support</Filter>
-    </ClInclude>
-    <ClInclude Include="ccUtils.h">
-      <Filter>support</Filter>
-    </ClInclude>
-    <ClInclude Include="CCVertex.h">
-      <Filter>support</Filter>
+    <ClInclude Include="CCClippingNode.h">
+      <Filter>2d</Filter>
     </ClInclude>
     <ClInclude Include="CCComponent.h">
-      <Filter>support\component</Filter>
+      <Filter>2d</Filter>
     </ClInclude>
     <ClInclude Include="CCComponentContainer.h">
-      <Filter>support\component</Filter>
+      <Filter>2d</Filter>
     </ClInclude>
-    <ClInclude Include="ccCArray.h">
-      <Filter>support\data_support</Filter>
+    <ClInclude Include="CCDrawingPrimitives.h">
+      <Filter>2d</Filter>
     </ClInclude>
-    <ClInclude Include="utlist.h">
-      <Filter>support\data_support</Filter>
+    <ClInclude Include="CCDrawNode.h">
+      <Filter>2d</Filter>
     </ClInclude>
-    <ClInclude Include="uthash.h">
-      <Filter>support\data_support</Filter>
+    <ClInclude Include="CCFont.h">
+      <Filter>2d</Filter>
     </ClInclude>
-    <ClInclude Include="TGAlib.h">
-      <Filter>support\image_support</Filter>
+    <ClInclude Include="CCFontAtlas.h">
+      <Filter>2d</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\external\tinyxml2\tinyxml2.h">
-      <Filter>support\tinyxml2</Filter>
+    <ClInclude Include="CCFontAtlasCache.h">
+      <Filter>2d</Filter>
     </ClInclude>
-    <ClInclude Include="CCUserDefault.h">
-      <Filter>support\tinyxml2\user_default</Filter>
+    <ClInclude Include="CCFontCharMap.h">
+      <Filter>2d</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\external\unzip\ioapi.h">
-      <Filter>support\zip_support</Filter>
+    <ClInclude Include="CCFontFNT.h">
+      <Filter>2d</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\external\unzip\unzip.h">
-      <Filter>support\zip_support</Filter>
+    <ClInclude Include="CCFontFreeType.h">
+      <Filter>2d</Filter>
+    </ClInclude>
+    <ClInclude Include="CCGLBufferedNode.h">
+      <Filter>2d</Filter>
+    </ClInclude>
+    <ClInclude Include="CCGrabber.h">
+      <Filter>2d</Filter>
+    </ClInclude>
+    <ClInclude Include="CCGrid.h">
+      <Filter>2d</Filter>
+    </ClInclude>
+    <ClInclude Include="CCLabel.h">
+      <Filter>2d</Filter>
+    </ClInclude>
+    <ClInclude Include="CCLabelAtlas.h">
+      <Filter>2d</Filter>
+    </ClInclude>
+    <ClInclude Include="CCLabelBMFont.h">
+      <Filter>2d</Filter>
+    </ClInclude>
+    <ClInclude Include="CCLabelTextFormatter.h">
+      <Filter>2d</Filter>
+    </ClInclude>
+    <ClInclude Include="CCLabelTTF.h">
+      <Filter>2d</Filter>
+    </ClInclude>
+    <ClInclude Include="CCLayer.h">
+      <Filter>2d</Filter>
+    </ClInclude>
+    <ClInclude Include="CCMenu.h">
+      <Filter>2d</Filter>
+    </ClInclude>
+    <ClInclude Include="CCMenuItem.h">
+      <Filter>2d</Filter>
+    </ClInclude>
+    <ClInclude Include="CCMotionStreak.h">
+      <Filter>2d</Filter>
+    </ClInclude>
+    <ClInclude Include="CCNode.h">
+      <Filter>2d</Filter>
+    </ClInclude>
+    <ClInclude Include="CCNodeGrid.h">
+      <Filter>2d</Filter>
+    </ClInclude>
+    <ClInclude Include="CCParallaxNode.h">
+      <Filter>2d</Filter>
+    </ClInclude>
+    <ClInclude Include="CCParticleBatchNode.h">
+      <Filter>2d</Filter>
+    </ClInclude>
+    <ClInclude Include="CCParticleExamples.h">
+      <Filter>2d</Filter>
+    </ClInclude>
+    <ClInclude Include="CCParticleSystem.h">
+      <Filter>2d</Filter>
+    </ClInclude>
+    <ClInclude Include="CCParticleSystemQuad.h">
+      <Filter>2d</Filter>
+    </ClInclude>
+    <ClInclude Include="CCProgressTimer.h">
+      <Filter>2d</Filter>
+    </ClInclude>
+    <ClInclude Include="CCRenderTexture.h">
+      <Filter>2d</Filter>
+    </ClInclude>
+    <ClInclude Include="CCScene.h">
+      <Filter>2d</Filter>
+    </ClInclude>
+    <ClInclude Include="CCSprite.h">
+      <Filter>2d</Filter>
+    </ClInclude>
+    <ClInclude Include="CCSpriteBatchNode.h">
+      <Filter>2d</Filter>
+    </ClInclude>
+    <ClInclude Include="CCSpriteFrame.h">
+      <Filter>2d</Filter>
+    </ClInclude>
+    <ClInclude Include="CCSpriteFrameCache.h">
+      <Filter>2d</Filter>
+    </ClInclude>
+    <ClInclude Include="CCTextFieldTTF.h">
+      <Filter>2d</Filter>
+    </ClInclude>
+    <ClInclude Include="CCTileMapAtlas.h">
+      <Filter>2d</Filter>
+    </ClInclude>
+    <ClInclude Include="CCTMXLayer.h">
+      <Filter>2d</Filter>
+    </ClInclude>
+    <ClInclude Include="CCTMXObjectGroup.h">
+      <Filter>2d</Filter>
+    </ClInclude>
+    <ClInclude Include="CCTMXTiledMap.h">
+      <Filter>2d</Filter>
+    </ClInclude>
+    <ClInclude Include="CCTMXXMLParser.h">
+      <Filter>2d</Filter>
+    </ClInclude>
+    <ClInclude Include="CCTransition.h">
+      <Filter>2d</Filter>
+    </ClInclude>
+    <ClInclude Include="CCTransitionPageTurn.h">
+      <Filter>2d</Filter>
+    </ClInclude>
+    <ClInclude Include="CCTransitionProgress.h">
+      <Filter>2d</Filter>
+    </ClInclude>
+    <ClInclude Include="CCTweenFunction.h">
+      <Filter>2d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\3d\CCMesh.h">
+      <Filter>3d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\3d\CCObjLoader.h">
+      <Filter>3d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\3d\CCSprite3D.h">
+      <Filter>3d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\3d\CCSprite3DDataCache.h">
+      <Filter>3d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\base\atitc.h">
+      <Filter>base</Filter>
+    </ClInclude>
+    <ClInclude Include="..\base\base64.h">
+      <Filter>base</Filter>
     </ClInclude>
     <ClInclude Include="..\base\CCAutoreleasePool.h">
       <Filter>base</Filter>
     </ClInclude>
-    <ClInclude Include="..\base\CCData.h">
-      <Filter>base</Filter>
-    </ClInclude>
-    <ClInclude Include="..\base\CCDataVisitor.h">
-      <Filter>base</Filter>
-    </ClInclude>
-    <ClInclude Include="..\base\CCNS.h">
-      <Filter>base</Filter>
-    </ClInclude>
-    <ClInclude Include="..\base\CCRef.h">
-      <Filter>base</Filter>
-    </ClInclude>
-    <ClInclude Include="..\physics\chipmunk\CCPhysicsBodyInfo_chipmunk.h">
-      <Filter>physics\chipmunk</Filter>
-    </ClInclude>
-    <ClInclude Include="..\physics\chipmunk\CCPhysicsContactInfo_chipmunk.h">
-      <Filter>physics\chipmunk</Filter>
-    </ClInclude>
-    <ClInclude Include="..\physics\chipmunk\CCPhysicsHelper_chipmunk.h">
-      <Filter>physics\chipmunk</Filter>
-    </ClInclude>
-    <ClInclude Include="..\physics\chipmunk\CCPhysicsJointInfo_chipmunk.h">
-      <Filter>physics\chipmunk</Filter>
-    </ClInclude>
-    <ClInclude Include="..\physics\chipmunk\CCPhysicsShapeInfo_chipmunk.h">
-      <Filter>physics\chipmunk</Filter>
-    </ClInclude>
-    <ClInclude Include="..\physics\chipmunk\CCPhysicsWorldInfo_chipmunk.h">
-      <Filter>physics\chipmunk</Filter>
-    </ClInclude>
-    <ClInclude Include="..\base\CCMap.h">
-      <Filter>base</Filter>
-    </ClInclude>
-    <ClInclude Include="..\base\CCValue.h">
-      <Filter>base</Filter>
-    </ClInclude>
-    <ClInclude Include="..\base\CCVector.h">
-      <Filter>base</Filter>
-    </ClInclude>
-    <ClInclude Include="CCNodeGrid.h">
-      <Filter>misc_nodes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\external\edtaa3func\edtaa3func.h">
-      <Filter>label_nodes</Filter>
-    </ClInclude>
-    <ClInclude Include="CCFontCharMap.h">
-      <Filter>label_nodes</Filter>
-    </ClInclude>
-    <ClInclude Include="CCTweenFunction.h" />
-    <ClInclude Include="platform\winrt\CCApplication.h">
-      <Filter>platform\etc\winrt</Filter>
-    </ClInclude>
-    <ClInclude Include="platform\winrt\CCFileUtilsWinRT.h">
-      <Filter>platform\etc\winrt</Filter>
-    </ClInclude>
-    <ClInclude Include="platform\winrt\CCFreeTypeFont.h">
-      <Filter>platform\etc\winrt</Filter>
-    </ClInclude>
-    <ClInclude Include="platform\winrt\CCGL.h">
-      <Filter>platform\etc\winrt</Filter>
-    </ClInclude>
-    <ClInclude Include="platform\winrt\CCGL_Angle.h">
-      <Filter>platform\etc\winrt</Filter>
-    </ClInclude>
-    <ClInclude Include="platform\winrt\CCGLView.h">
-      <Filter>platform\etc\winrt</Filter>
-    </ClInclude>
-    <ClInclude Include="platform\winrt\CCPlatformDefine.h">
-      <Filter>platform\etc\winrt</Filter>
-    </ClInclude>
-    <ClInclude Include="platform\winrt\CCPrecompiledShaders.h">
-      <Filter>platform\etc\winrt</Filter>
-    </ClInclude>
-    <ClInclude Include="platform\winrt\CCPThreadWinRT.h">
-      <Filter>platform\etc\winrt</Filter>
-    </ClInclude>
-    <ClInclude Include="platform\winrt\CCStdC.h">
-      <Filter>platform\etc\winrt</Filter>
-    </ClInclude>
-    <ClInclude Include="platform\winrt\CCWinRTUtils.h">
-      <Filter>platform\etc\winrt</Filter>
-    </ClInclude>
-    <ClInclude Include="platform\winrt\DirectXBase.h">
-      <Filter>platform\etc\winrt</Filter>
-    </ClInclude>
-    <ClInclude Include="platform\winrt\DirectXHelper.h">
-      <Filter>platform\etc\winrt</Filter>
-    </ClInclude>
-    <ClInclude Include="platform\winrt\sha1.h">
-      <Filter>platform\etc\winrt</Filter>
-    </ClInclude>
-    <ClInclude Include="..\base\CCConsole.h">
-      <Filter>base</Filter>
-    </ClInclude>
-    <ClInclude Include="..\deprecated\CCArray.h">
-      <Filter>deprecated</Filter>
-    </ClInclude>
-    <ClInclude Include="..\deprecated\CCBool.h">
-      <Filter>deprecated</Filter>
-    </ClInclude>
-    <ClInclude Include="..\deprecated\CCDeprecated.h">
-      <Filter>deprecated</Filter>
-    </ClInclude>
-    <ClInclude Include="..\deprecated\CCDictionary.h">
-      <Filter>deprecated</Filter>
-    </ClInclude>
-    <ClInclude Include="..\deprecated\CCDouble.h">
-      <Filter>deprecated</Filter>
-    </ClInclude>
-    <ClInclude Include="..\deprecated\CCFloat.h">
-      <Filter>deprecated</Filter>
-    </ClInclude>
-    <ClInclude Include="..\deprecated\CCInteger.h">
-      <Filter>deprecated</Filter>
-    </ClInclude>
-    <ClInclude Include="..\deprecated\CCNotificationCenter.h">
-      <Filter>deprecated</Filter>
-    </ClInclude>
-    <ClInclude Include="..\deprecated\CCSet.h">
-      <Filter>deprecated</Filter>
-    </ClInclude>
-    <ClInclude Include="..\deprecated\CCString.h">
-      <Filter>deprecated</Filter>
-    </ClInclude>
-    <ClInclude Include="..\math\CCAffineTransform.h">
-      <Filter>math</Filter>
-    </ClInclude>
-    <ClInclude Include="..\math\CCGeometry.h">
-      <Filter>math</Filter>
-    </ClInclude>
-    <ClInclude Include="..\math\CCMath.h">
-      <Filter>math</Filter>
-    </ClInclude>
-    <ClInclude Include="..\math\CCMathBase.h">
-      <Filter>math</Filter>
-    </ClInclude>
-    <ClInclude Include="..\math\MathUtil.h">
-      <Filter>math</Filter>
-    </ClInclude>
-    <ClInclude Include="..\math\Matrix.h">
-      <Filter>math</Filter>
-    </ClInclude>
-    <ClInclude Include="..\math\Quaternion.h">
-      <Filter>math</Filter>
-    </ClInclude>
-    <ClInclude Include="..\math\TransformUtils.h">
-      <Filter>math</Filter>
-    </ClInclude>
-    <ClInclude Include="..\math\Vector2.h">
-      <Filter>math</Filter>
-    </ClInclude>
-    <ClInclude Include="..\math\Vector3.h">
-      <Filter>math</Filter>
-    </ClInclude>
-    <ClInclude Include="..\math\Vector4.h">
-      <Filter>math</Filter>
-    </ClInclude>
-    <ClInclude Include="..\renderer\CCBatchCommand.h">
-      <Filter>renderer</Filter>
-    </ClInclude>
-    <ClInclude Include="..\renderer\CCCustomCommand.h">
-      <Filter>renderer</Filter>
-    </ClInclude>
-    <ClInclude Include="..\renderer\CCGLProgram.h">
-      <Filter>renderer</Filter>
-    </ClInclude>
-    <ClInclude Include="..\renderer\CCGLProgramCache.h">
-      <Filter>renderer</Filter>
-    </ClInclude>
-    <ClInclude Include="..\renderer\CCGLProgramState.h">
-      <Filter>renderer</Filter>
-    </ClInclude>
-    <ClInclude Include="..\renderer\CCGLProgramStateCache.h">
-      <Filter>renderer</Filter>
-    </ClInclude>
-    <ClInclude Include="..\renderer\ccGLStateCache.h">
-      <Filter>renderer</Filter>
-    </ClInclude>
-    <ClInclude Include="..\renderer\CCGroupCommand.h">
-      <Filter>renderer</Filter>
-    </ClInclude>
-    <ClInclude Include="..\renderer\CCQuadCommand.h">
-      <Filter>renderer</Filter>
-    </ClInclude>
-    <ClInclude Include="..\renderer\CCRenderCommand.h">
-      <Filter>renderer</Filter>
-    </ClInclude>
-    <ClInclude Include="..\renderer\CCRenderCommandPool.h">
-      <Filter>renderer</Filter>
-    </ClInclude>
-    <ClInclude Include="..\renderer\CCRenderer.h">
-      <Filter>renderer</Filter>
-    </ClInclude>
-    <ClInclude Include="..\renderer\ccShaders.h">
-      <Filter>renderer</Filter>
-    </ClInclude>
-    <ClInclude Include="platform\winrt\pch.h" />
-    <ClInclude Include="..\base\base64.h">
+    <ClInclude Include="..\base\ccCArray.h">
       <Filter>base</Filter>
     </ClInclude>
     <ClInclude Include="..\base\ccConfig.h">
@@ -1122,6 +879,15 @@
     <ClInclude Include="..\base\CCConfiguration.h">
       <Filter>base</Filter>
     </ClInclude>
+    <ClInclude Include="..\base\CCConsole.h">
+      <Filter>base</Filter>
+    </ClInclude>
+    <ClInclude Include="..\base\CCData.h">
+      <Filter>base</Filter>
+    </ClInclude>
+    <ClInclude Include="..\base\CCDataVisitor.h">
+      <Filter>base</Filter>
+    </ClInclude>
     <ClInclude Include="..\base\CCDirector.h">
       <Filter>base</Filter>
     </ClInclude>
@@ -1173,68 +939,293 @@
     <ClInclude Include="..\base\CCEventType.h">
       <Filter>base</Filter>
     </ClInclude>
+    <ClInclude Include="..\base\ccFPSImages.h">
+      <Filter>base</Filter>
+    </ClInclude>
+    <ClInclude Include="..\base\CCIMEDelegate.h">
+      <Filter>base</Filter>
+    </ClInclude>
+    <ClInclude Include="..\base\CCIMEDispatcher.h">
+      <Filter>base</Filter>
+    </ClInclude>
     <ClInclude Include="..\base\ccMacros.h">
       <Filter>base</Filter>
     </ClInclude>
+    <ClInclude Include="..\base\CCMap.h">
+      <Filter>base</Filter>
+    </ClInclude>
+    <ClInclude Include="..\base\CCNS.h">
+      <Filter>base</Filter>
+    </ClInclude>
+    <ClInclude Include="..\base\CCPlatformConfig.h">
+      <Filter>base</Filter>
+    </ClInclude>
+    <ClInclude Include="..\base\CCPlatformMacros.h">
+      <Filter>base</Filter>
+    </ClInclude>
     <ClInclude Include="..\base\CCProfiling.h">
       <Filter>base</Filter>
     </ClInclude>
+    <ClInclude Include="..\base\CCProtocols.h">
+      <Filter>base</Filter>
+    </ClInclude>
+    <ClInclude Include="..\base\CCRef.h">
+      <Filter>base</Filter>
+    </ClInclude>
     <ClInclude Include="..\base\CCRefPtr.h">
       <Filter>base</Filter>
     </ClInclude>
     <ClInclude Include="..\base\CCScheduler.h">
       <Filter>base</Filter>
     </ClInclude>
+    <ClInclude Include="..\base\CCScriptSupport.h">
+      <Filter>base</Filter>
+    </ClInclude>
     <ClInclude Include="..\base\CCTouch.h">
       <Filter>base</Filter>
     </ClInclude>
     <ClInclude Include="..\base\ccTypes.h">
       <Filter>base</Filter>
     </ClInclude>
+    <ClInclude Include="..\base\CCUserDefault.h">
+      <Filter>base</Filter>
+    </ClInclude>
+    <ClInclude Include="..\base\ccUTF8.h">
+      <Filter>base</Filter>
+    </ClInclude>
+    <ClInclude Include="..\base\ccUtils.h">
+      <Filter>base</Filter>
+    </ClInclude>
+    <ClInclude Include="..\base\CCValue.h">
+      <Filter>base</Filter>
+    </ClInclude>
+    <ClInclude Include="..\base\CCVector.h">
+      <Filter>base</Filter>
+    </ClInclude>
+    <ClInclude Include="..\base\etc1.h">
+      <Filter>base</Filter>
+    </ClInclude>
+    <ClInclude Include="..\base\firePngData.h">
+      <Filter>base</Filter>
+    </ClInclude>
+    <ClInclude Include="..\base\s3tc.h">
+      <Filter>base</Filter>
+    </ClInclude>
+    <ClInclude Include="..\base\TGAlib.h">
+      <Filter>base</Filter>
+    </ClInclude>
+    <ClInclude Include="..\base\uthash.h">
+      <Filter>base</Filter>
+    </ClInclude>
+    <ClInclude Include="..\base\utlist.h">
+      <Filter>base</Filter>
+    </ClInclude>
     <ClInclude Include="..\base\ZipUtils.h">
       <Filter>base</Filter>
     </ClInclude>
+    <ClInclude Include="..\deprecated\CCArray.h">
+      <Filter>deprecated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\deprecated\CCBool.h">
+      <Filter>deprecated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\deprecated\CCDeprecated.h">
+      <Filter>deprecated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\deprecated\CCDictionary.h">
+      <Filter>deprecated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\deprecated\CCDouble.h">
+      <Filter>deprecated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\deprecated\CCFloat.h">
+      <Filter>deprecated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\deprecated\CCInteger.h">
+      <Filter>deprecated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\deprecated\CCNotificationCenter.h">
+      <Filter>deprecated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\deprecated\CCSet.h">
+      <Filter>deprecated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\deprecated\CCString.h">
+      <Filter>deprecated</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\external\ConvertUTF\ConvertUTF.h">
-      <Filter>ConvertUTF</Filter>
+      <Filter>external\ConvertUTF</Filter>
     </ClInclude>
-    <ClInclude Include="platform\winrt\InputEvent.h">
-      <Filter>platform\etc\winrt</Filter>
+    <ClInclude Include="..\..\external\edtaa3func\edtaa3func.h">
+      <Filter>external\edtaa</Filter>
     </ClInclude>
-    <ClInclude Include="platform\winrt\InputEventTypes.h">
-      <Filter>platform\etc\winrt</Filter>
+    <ClInclude Include="..\..\external\tinyxml2\tinyxml2.h">
+      <Filter>external\tinyxml2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\external\unzip\ioapi.h">
+      <Filter>external\unzip</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\external\unzip\unzip.h">
+      <Filter>external\unzip</Filter>
     </ClInclude>
-    <ClInclude Include="..\cocos2d.h" />
     <ClInclude Include="..\..\external\xxhash\xxhash.h">
-      <Filter>xxhash</Filter>
+      <Filter>external\xxhash</Filter>
+    </ClInclude>
+    <ClInclude Include="..\math\CCAffineTransform.h">
+      <Filter>math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\math\CCGeometry.h">
+      <Filter>math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\math\CCMath.h">
+      <Filter>math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\math\CCMathBase.h">
+      <Filter>math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\math\CCVertex.h">
+      <Filter>math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\math\Mat4.h">
+      <Filter>math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\math\MathUtil.h">
+      <Filter>math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\math\Quaternion.h">
+      <Filter>math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\math\TransformUtils.h">
+      <Filter>math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\math\Vec2.h">
+      <Filter>math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\math\Vec3.h">
+      <Filter>math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\math\Vec4.h">
+      <Filter>math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\renderer\CCBatchCommand.h">
+      <Filter>renderer</Filter>
+    </ClInclude>
+    <ClInclude Include="..\renderer\CCCustomCommand.h">
+      <Filter>renderer</Filter>
+    </ClInclude>
+    <ClInclude Include="..\renderer\CCGLProgram.h">
+      <Filter>renderer</Filter>
+    </ClInclude>
+    <ClInclude Include="..\renderer\CCGLProgramCache.h">
+      <Filter>renderer</Filter>
+    </ClInclude>
+    <ClInclude Include="..\renderer\CCGLProgramState.h">
+      <Filter>renderer</Filter>
+    </ClInclude>
+    <ClInclude Include="..\renderer\CCGLProgramStateCache.h">
+      <Filter>renderer</Filter>
+    </ClInclude>
+    <ClInclude Include="..\renderer\ccGLStateCache.h">
+      <Filter>renderer</Filter>
+    </ClInclude>
+    <ClInclude Include="..\renderer\CCGroupCommand.h">
+      <Filter>renderer</Filter>
+    </ClInclude>
+    <ClInclude Include="..\renderer\CCMeshCommand.h">
+      <Filter>renderer</Filter>
+    </ClInclude>
+    <ClInclude Include="..\renderer\CCQuadCommand.h">
+      <Filter>renderer</Filter>
+    </ClInclude>
+    <ClInclude Include="..\renderer\CCRenderCommand.h">
+      <Filter>renderer</Filter>
+    </ClInclude>
+    <ClInclude Include="..\renderer\CCRenderCommandPool.h">
+      <Filter>renderer</Filter>
+    </ClInclude>
+    <ClInclude Include="..\renderer\CCRenderer.h">
+      <Filter>renderer</Filter>
+    </ClInclude>
+    <ClInclude Include="..\renderer\ccShaders.h">
+      <Filter>renderer</Filter>
+    </ClInclude>
+    <ClInclude Include="..\renderer\CCTexture2D.h">
+      <Filter>renderer</Filter>
+    </ClInclude>
+    <ClInclude Include="..\renderer\CCTextureAtlas.h">
+      <Filter>renderer</Filter>
+    </ClInclude>
+    <ClInclude Include="..\renderer\CCTextureCache.h">
+      <Filter>renderer</Filter>
+    </ClInclude>
+    <ClInclude Include="..\physics\chipmunk\CCPhysicsBodyInfo_chipmunk.h">
+      <Filter>physics\chipmunk</Filter>
+    </ClInclude>
+    <ClInclude Include="..\physics\chipmunk\CCPhysicsContactInfo_chipmunk.h">
+      <Filter>physics\chipmunk</Filter>
+    </ClInclude>
+    <ClInclude Include="..\physics\chipmunk\CCPhysicsHelper_chipmunk.h">
+      <Filter>physics\chipmunk</Filter>
+    </ClInclude>
+    <ClInclude Include="..\physics\chipmunk\CCPhysicsJointInfo_chipmunk.h">
+      <Filter>physics\chipmunk</Filter>
+    </ClInclude>
+    <ClInclude Include="..\physics\chipmunk\CCPhysicsShapeInfo_chipmunk.h">
+      <Filter>physics\chipmunk</Filter>
+    </ClInclude>
+    <ClInclude Include="..\physics\chipmunk\CCPhysicsWorldInfo_chipmunk.h">
+      <Filter>physics\chipmunk</Filter>
+    </ClInclude>
+    <ClInclude Include="..\physics\CCPhysicsBody.h">
+      <Filter>physics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\physics\CCPhysicsContact.h">
+      <Filter>physics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\physics\CCPhysicsJoint.h">
+      <Filter>physics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\physics\CCPhysicsShape.h">
+      <Filter>physics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\physics\CCPhysicsWorld.h">
+      <Filter>physics</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <Text Include="..\math\CMakeLists.txt">
+    <None Include="..\base\CCUserDefault.mm">
+      <Filter>base</Filter>
+    </None>
+    <None Include="..\math\Mat4.inl">
       <Filter>math</Filter>
-    </Text>
-  </ItemGroup>
-  <ItemGroup>
+    </None>
     <None Include="..\math\MathUtil.inl">
       <Filter>math</Filter>
     </None>
     <None Include="..\math\MathUtilNeon.inl">
       <Filter>math</Filter>
     </None>
-    <None Include="..\math\Matrix.inl">
-      <Filter>math</Filter>
-    </None>
     <None Include="..\math\Quaternion.inl">
       <Filter>math</Filter>
     </None>
-    <None Include="..\math\Vector2.inl">
+    <None Include="..\math\Vec2.inl">
       <Filter>math</Filter>
     </None>
-    <None Include="..\math\Vector3.inl">
+    <None Include="..\math\Vec3.inl">
       <Filter>math</Filter>
     </None>
-    <None Include="..\math\Vector4.inl">
+    <None Include="..\math\Vec4.inl">
       <Filter>math</Filter>
     </None>
+    <None Include="..\renderer\ccShader_3D_Color.frag">
+      <Filter>renderer</Filter>
+    </None>
+    <None Include="..\renderer\ccShader_3D_ColorTex.frag">
+      <Filter>renderer</Filter>
+    </None>
+    <None Include="..\renderer\ccShader_3D_PositionTex.vert">
+      <Filter>renderer</Filter>
+    </None>
     <None Include="..\renderer\ccShader_Label.vert">
       <Filter>renderer</Filter>
     </None>
diff --git a/cocos/2d/cocos2d_wp8.vcxproj b/cocos/2d/cocos2d_wp8.vcxproj
index 91de9b40b0..91aa5e52a8 100644
--- a/cocos/2d/cocos2d_wp8.vcxproj
+++ b/cocos/2d/cocos2d_wp8.vcxproj
@@ -75,7 +75,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
       <AdditionalIncludeDirectories>$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\curl\include\wp8;$(EngineRoot)external\curl\include\wp8\curl;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -100,7 +100,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PreprocessorDefinitions>_LIB;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
       <AdditionalIncludeDirectories>$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\curl\include\wp8;$(EngineRoot)external\curl\include\wp8\curl;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -125,7 +125,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
     <ClCompile>
       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
       <AdditionalIncludeDirectories>$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\curl\include\wp8;$(EngineRoot)external\curl\include\wp8\curl;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -151,7 +151,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
     <ClCompile>
       <PreprocessorDefinitions>_LIB;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
       <AdditionalIncludeDirectories>$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\curl\include\wp8;$(EngineRoot)external\curl\include\wp8\curl;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -261,6 +261,10 @@
       </ForcedIncludeFiles>
       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
       </ForcedIncludeFiles>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="..\base\CCIMEDispatcher.cpp" />
     <ClCompile Include="..\base\CCNS.cpp" />
@@ -327,6 +331,12 @@
     <ClCompile Include="..\platform\wp8\CCGLView.cpp" />
     <ClCompile Include="..\platform\wp8\Direct3DBase.cpp" />
     <ClCompile Include="..\platform\wp8\DirectXBase.cpp" />
+    <ClCompile Include="..\platform\wp8\pch.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+    </ClCompile>
     <ClCompile Include="..\renderer\CCBatchCommand.cpp" />
     <ClCompile Include="..\renderer\CCCustomCommand.cpp" />
     <ClCompile Include="..\renderer\CCGLProgram.cpp" />
@@ -532,6 +542,7 @@
     <ClInclude Include="..\platform\wp8\CCGLView.h" />
     <ClInclude Include="..\platform\wp8\Direct3DBase.h" />
     <ClInclude Include="..\platform\wp8\DirectXBase.h" />
+    <ClInclude Include="..\platform\wp8\pch.h" />
     <ClInclude Include="..\renderer\CCBatchCommand.h" />
     <ClInclude Include="..\renderer\CCCustomCommand.h" />
     <ClInclude Include="..\renderer\CCGLProgram.h" />
diff --git a/cocos/2d/cocos2d_wp8.vcxproj.filters b/cocos/2d/cocos2d_wp8.vcxproj.filters
index ee4a610d9f..33bbaae0a1 100644
--- a/cocos/2d/cocos2d_wp8.vcxproj.filters
+++ b/cocos/2d/cocos2d_wp8.vcxproj.filters
@@ -595,6 +595,7 @@
     <ClCompile Include="..\renderer\CCMeshCommand.cpp">
       <Filter>renderer</Filter>
     </ClCompile>
+    <ClCompile Include="..\platform\wp8\pch.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\physics\CCPhysicsBody.h">
@@ -1209,6 +1210,7 @@
     <ClInclude Include="..\renderer\CCMeshCommand.h">
       <Filter>renderer</Filter>
     </ClInclude>
+    <ClInclude Include="..\platform\wp8\pch.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\math\Mat4.inl">
diff --git a/cocos/platform/winrt/CCGLView.cpp b/cocos/platform/winrt/CCGLView.cpp
index 118449fa25..7fb7e1b9fd 100644
--- a/cocos/platform/winrt/CCGLView.cpp
+++ b/cocos/platform/winrt/CCGLView.cpp
@@ -30,7 +30,7 @@ THE SOFTWARE.
 #include "base/ccMacros.h"
 #include "base/CCDirector.h"
 #include "base/CCTouch.h"
-#include "2d/CCIMEDispatcher.h"
+#include "base/CCIMEDispatcher.h"
 #include "CCApplication.h"
 #include "CCWinRTUtils.h"