diff --git a/cocos/2d/cocos2d_wp8.vcxproj b/cocos/2d/cocos2d_wp8.vcxproj
index a932465d98..a3c29778b4 100644
--- a/cocos/2d/cocos2d_wp8.vcxproj
+++ b/cocos/2d/cocos2d_wp8.vcxproj
@@ -210,17 +210,36 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">NotUsing</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="..\base\atitc.cpp" />
-    <ClCompile Include="..\base\CCAffineTransform.cpp" />
+    <ClCompile Include="..\base\base64.cpp" />
     <ClCompile Include="..\base\CCAutoreleasePool.cpp" />
+    <ClCompile Include="..\base\CCConfiguration.cpp" />
     <ClCompile Include="..\base\CCConsole.cpp" />
     <ClCompile Include="..\base\CCData.cpp" />
     <ClCompile Include="..\base\CCDataVisitor.cpp" />
-    <ClCompile Include="..\base\CCGeometry.cpp" />
+    <ClCompile Include="..\base\CCDirector.cpp" />
+    <ClCompile Include="..\base\CCEvent.cpp" />
+    <ClCompile Include="..\base\CCEventAcceleration.cpp" />
+    <ClCompile Include="..\base\CCEventCustom.cpp" />
+    <ClCompile Include="..\base\CCEventDispatcher.cpp" />
+    <ClCompile Include="..\base\CCEventKeyboard.cpp" />
+    <ClCompile Include="..\base\CCEventListener.cpp" />
+    <ClCompile Include="..\base\CCEventListenerAcceleration.cpp" />
+    <ClCompile Include="..\base\CCEventListenerCustom.cpp" />
+    <ClCompile Include="..\base\CCEventListenerKeyboard.cpp" />
+    <ClCompile Include="..\base\CCEventListenerMouse.cpp" />
+    <ClCompile Include="..\base\CCEventListenerTouch.cpp" />
+    <ClCompile Include="..\base\CCEventMouse.cpp" />
+    <ClCompile Include="..\base\CCEventTouch.cpp" />
     <ClCompile Include="..\base\CCNS.cpp" />
+    <ClCompile Include="..\base\CCProfiling.cpp" />
     <ClCompile Include="..\base\CCRef.cpp" />
+    <ClCompile Include="..\base\CCScheduler.cpp" />
+    <ClCompile Include="..\base\CCTouch.cpp" />
+    <ClCompile Include="..\base\ccTypes.cpp" />
     <ClCompile Include="..\base\CCValue.cpp" />
     <ClCompile Include="..\base\etc1.cpp" />
     <ClCompile Include="..\base\s3tc.cpp" />
+    <ClCompile Include="..\base\ZipUtils.cpp" />
     <ClCompile Include="..\cocos2d.cpp" />
     <ClCompile Include="..\deprecated\CCArray.cpp" />
     <ClCompile Include="..\deprecated\CCDeprecated.cpp" />
@@ -228,9 +247,12 @@
     <ClCompile Include="..\deprecated\CCNotificationCenter.cpp" />
     <ClCompile Include="..\deprecated\CCSet.cpp" />
     <ClCompile Include="..\deprecated\CCString.cpp" />
+    <ClCompile Include="..\math\CCAffineTransform.cpp" />
+    <ClCompile Include="..\math\CCGeometry.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" />
@@ -244,7 +266,12 @@
     <ClCompile Include="..\physics\chipmunk\CCPhysicsJointInfo_chipmunk.cpp" />
     <ClCompile Include="..\physics\chipmunk\CCPhysicsShapeInfo_chipmunk.cpp" />
     <ClCompile Include="..\physics\chipmunk\CCPhysicsWorldInfo_chipmunk.cpp" />
-    <ClCompile Include="base64.cpp" />
+    <ClCompile Include="..\renderer\CCBatchCommand.cpp" />
+    <ClCompile Include="..\renderer\CCCustomCommand.cpp" />
+    <ClCompile Include="..\renderer\CCGroupCommand.cpp" />
+    <ClCompile Include="..\renderer\CCQuadCommand.cpp" />
+    <ClCompile Include="..\renderer\CCRenderCommand.cpp" />
+    <ClCompile Include="..\renderer\CCRenderer.cpp" />
     <ClCompile Include="CCAction.cpp" />
     <ClCompile Include="CCActionCamera.cpp" />
     <ClCompile Include="CCActionCatmullRom.cpp" />
@@ -265,23 +292,8 @@
     <ClCompile Include="CCClippingNode.cpp" />
     <ClCompile Include="CCComponent.cpp" />
     <ClCompile Include="CCComponentContainer.cpp" />
-    <ClCompile Include="CCConfiguration.cpp" />
-    <ClCompile Include="CCDirector.cpp" />
     <ClCompile Include="CCDrawingPrimitives.cpp" />
     <ClCompile Include="CCDrawNode.cpp" />
-    <ClCompile Include="CCEvent.cpp" />
-    <ClCompile Include="CCEventAcceleration.cpp" />
-    <ClCompile Include="CCEventCustom.cpp" />
-    <ClCompile Include="CCEventDispatcher.cpp" />
-    <ClCompile Include="CCEventKeyboard.cpp" />
-    <ClCompile Include="CCEventListener.cpp" />
-    <ClCompile Include="CCEventListenerAcceleration.cpp" />
-    <ClCompile Include="CCEventListenerCustom.cpp" />
-    <ClCompile Include="CCEventListenerKeyboard.cpp" />
-    <ClCompile Include="CCEventListenerMouse.cpp" />
-    <ClCompile Include="CCEventListenerTouch.cpp" />
-    <ClCompile Include="CCEventMouse.cpp" />
-    <ClCompile Include="CCEventTouch.cpp" />
     <ClCompile Include="CCFont.cpp" />
     <ClCompile Include="CCFontAtlas.cpp" />
     <ClCompile Include="CCFontAtlasCache.cpp" />
@@ -327,11 +339,9 @@
     <ClCompile Include="CCParticleExamples.cpp" />
     <ClCompile Include="CCParticleSystem.cpp" />
     <ClCompile Include="CCParticleSystemQuad.cpp" />
-    <ClCompile Include="CCProfiling.cpp" />
     <ClCompile Include="CCProgressTimer.cpp" />
     <ClCompile Include="CCRenderTexture.cpp" />
     <ClCompile Include="CCScene.cpp" />
-    <ClCompile Include="CCScheduler.cpp" />
     <ClCompile Include="CCScriptSupport.cpp" />
     <ClCompile Include="CCShaderCache.cpp" />
     <ClCompile Include="ccShaders.cpp" />
@@ -348,11 +358,9 @@
     <ClCompile Include="CCTMXObjectGroup.cpp" />
     <ClCompile Include="CCTMXTiledMap.cpp" />
     <ClCompile Include="CCTMXXMLParser.cpp" />
-    <ClCompile Include="CCTouch.cpp" />
     <ClCompile Include="CCTransition.cpp" />
     <ClCompile Include="CCTransitionPageTurn.cpp" />
     <ClCompile Include="CCTransitionProgress.cpp" />
-    <ClCompile Include="ccTypes.cpp" />
     <ClCompile Include="CCTweenFunction.cpp" />
     <ClCompile Include="CCUserDefault.cpp" />
     <ClCompile Include="ccUTF8.cpp" />
@@ -401,16 +409,7 @@
     <ClCompile Include="platform\winrt\sha1.cpp" />
     <ClCompile Include="platform\wp8\CCGLView.cpp" />
     <ClCompile Include="platform\wp8\DirectXBase.cpp" />
-    <ClCompile Include="renderer\CCBatchCommand.cpp" />
-    <ClCompile Include="renderer\CCCustomCommand.cpp" />
-    <ClCompile Include="renderer\CCGroupCommand.cpp" />
-    <ClCompile Include="renderer\CCMaterialManager.cpp" />
-    <ClCompile Include="renderer\CCQuadCommand.cpp" />
-    <ClCompile Include="renderer\CCRenderCommand.cpp" />
-    <ClCompile Include="renderer\CCRenderer.cpp" />
     <ClCompile Include="TGAlib.cpp" />
-    <ClCompile Include="TransformUtils.cpp" />
-    <ClCompile Include="ZipUtils.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\external\edtaa3func\edtaa3func.h" />
@@ -419,21 +418,44 @@
     <ClInclude Include="..\..\external\unzip\unzip.h" />
     <ClInclude Include="..\..\external\xxhash\xxhash.h" />
     <ClInclude Include="..\base\atitc.h" />
-    <ClInclude Include="..\base\CCAffineTransform.h" />
+    <ClInclude Include="..\base\base64.h" />
     <ClInclude Include="..\base\CCAutoreleasePool.h" />
+    <ClInclude Include="..\base\ccConfig.h" />
+    <ClInclude Include="..\base\CCConfiguration.h" />
     <ClInclude Include="..\base\CCConsole.h" />
     <ClInclude Include="..\base\CCData.h" />
     <ClInclude Include="..\base\CCDataVisitor.h" />
-    <ClInclude Include="..\base\CCGeometry.h" />
+    <ClInclude Include="..\base\CCDirector.h" />
+    <ClInclude Include="..\base\CCEvent.h" />
+    <ClInclude Include="..\base\CCEventAcceleration.h" />
+    <ClInclude Include="..\base\CCEventCustom.h" />
+    <ClInclude Include="..\base\CCEventDispatcher.h" />
+    <ClInclude Include="..\base\CCEventKeyboard.h" />
+    <ClInclude Include="..\base\CCEventListener.h" />
+    <ClInclude Include="..\base\CCEventListenerAcceleration.h" />
+    <ClInclude Include="..\base\CCEventListenerCustom.h" />
+    <ClInclude Include="..\base\CCEventListenerKeyboard.h" />
+    <ClInclude Include="..\base\CCEventListenerMouse.h" />
+    <ClInclude Include="..\base\CCEventListenerTouch.h" />
+    <ClInclude Include="..\base\CCEventMouse.h" />
+    <ClInclude Include="..\base\CCEventTouch.h" />
+    <ClInclude Include="..\base\CCEventType.h" />
+    <ClInclude Include="..\base\ccMacros.h" />
     <ClInclude Include="..\base\CCMap.h" />
     <ClInclude Include="..\base\CCNS.h" />
-    <ClInclude Include="..\base\CCRef.h" />
     <ClInclude Include="..\base\CCPlatformConfig.h" />
     <ClInclude Include="..\base\CCPlatformMacros.h" />
+    <ClInclude Include="..\base\CCProfiling.h" />
+    <ClInclude Include="..\base\CCRef.h" />
+    <ClInclude Include="..\base\CCRefPtr.h" />
+    <ClInclude Include="..\base\CCScheduler.h" />
+    <ClInclude Include="..\base\CCTouch.h" />
+    <ClInclude Include="..\base\ccTypes.h" />
     <ClInclude Include="..\base\CCValue.h" />
     <ClInclude Include="..\base\CCVector.h" />
     <ClInclude Include="..\base\etc1.h" />
     <ClInclude Include="..\base\s3tc.h" />
+    <ClInclude Include="..\base\ZipUtils.h" />
     <ClInclude Include="..\deprecated\CCArray.h" />
     <ClInclude Include="..\deprecated\CCBool.h" />
     <ClInclude Include="..\deprecated\CCDeprecated.h" />
@@ -444,11 +466,14 @@
     <ClInclude Include="..\deprecated\CCNotificationCenter.h" />
     <ClInclude Include="..\deprecated\CCSet.h" />
     <ClInclude Include="..\deprecated\CCString.h" />
+    <ClInclude Include="..\math\CCAffineTransform.h" />
+    <ClInclude Include="..\math\CCGeometry.h" />
     <ClInclude Include="..\math\CCMath.h" />
     <ClInclude Include="..\math\CCMathBase.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" />
@@ -463,7 +488,13 @@
     <ClInclude Include="..\physics\chipmunk\CCPhysicsJointInfo_chipmunk.h" />
     <ClInclude Include="..\physics\chipmunk\CCPhysicsShapeInfo_chipmunk.h" />
     <ClInclude Include="..\physics\chipmunk\CCPhysicsWorldInfo_chipmunk.h" />
-    <ClInclude Include="base64.h" />
+    <ClInclude Include="..\renderer\CCBatchCommand.h" />
+    <ClInclude Include="..\renderer\CCCustomCommand.h" />
+    <ClInclude Include="..\renderer\CCGroupCommand.h" />
+    <ClInclude Include="..\renderer\CCQuadCommand.h" />
+    <ClInclude Include="..\renderer\CCRenderCommand.h" />
+    <ClInclude Include="..\renderer\CCRenderCommandPool.h" />
+    <ClInclude Include="..\renderer\CCRenderer.h" />
     <ClInclude Include="CCAction.h" />
     <ClInclude Include="CCActionCamera.h" />
     <ClInclude Include="CCActionCatmullRom.h" />
@@ -485,23 +516,8 @@
     <ClInclude Include="CCComponent.h" />
     <ClInclude Include="CCComponentContainer.h" />
     <ClInclude Include="ccConfig.h" />
-    <ClInclude Include="CCConfiguration.h" />
-    <ClInclude Include="CCDirector.h" />
     <ClInclude Include="CCDrawingPrimitives.h" />
     <ClInclude Include="CCDrawNode.h" />
-    <ClInclude Include="CCEvent.h" />
-    <ClInclude Include="CCEventAcceleration.h" />
-    <ClInclude Include="CCEventCustom.h" />
-    <ClInclude Include="CCEventDispatcher.h" />
-    <ClInclude Include="CCEventKeyboard.h" />
-    <ClInclude Include="CCEventListener.h" />
-    <ClInclude Include="CCEventListenerAcceleration.h" />
-    <ClInclude Include="CCEventListenerCustom.h" />
-    <ClInclude Include="CCEventListenerKeyboard.h" />
-    <ClInclude Include="CCEventListenerMouse.h" />
-    <ClInclude Include="CCEventListenerTouch.h" />
-    <ClInclude Include="CCEventMouse.h" />
-    <ClInclude Include="CCEventTouch.h" />
     <ClInclude Include="CCEventType.h" />
     <ClInclude Include="CCFont.h" />
     <ClInclude Include="CCFontAtlas.h" />
@@ -533,12 +549,10 @@
     <ClInclude Include="CCParticleExamples.h" />
     <ClInclude Include="CCParticleSystem.h" />
     <ClInclude Include="CCParticleSystemQuad.h" />
-    <ClInclude Include="CCProfiling.h" />
     <ClInclude Include="CCProgressTimer.h" />
     <ClInclude Include="CCProtocols.h" />
     <ClInclude Include="CCRenderTexture.h" />
     <ClInclude Include="CCScene.h" />
-    <ClInclude Include="CCScheduler.h" />
     <ClInclude Include="CCScriptSupport.h" />
     <ClInclude Include="CCShaderCache.h" />
     <ClInclude Include="ccShaders.h" />
@@ -555,7 +569,6 @@
     <ClInclude Include="CCTMXObjectGroup.h" />
     <ClInclude Include="CCTMXTiledMap.h" />
     <ClInclude Include="CCTMXXMLParser.h" />
-    <ClInclude Include="CCTouch.h" />
     <ClInclude Include="CCTransition.h" />
     <ClInclude Include="CCTransitionPageTurn.h" />
     <ClInclude Include="CCTransitionProgress.h" />
@@ -590,20 +603,9 @@
     <ClInclude Include="platform\winrt\sha1.h" />
     <ClInclude Include="platform\wp8\CCGLView.h" />
     <ClInclude Include="platform\wp8\DirectXBase.h" />
-    <ClInclude Include="renderer\CCBatchCommand.h" />
-    <ClInclude Include="renderer\CCCustomCommand.h" />
-    <ClInclude Include="renderer\CCGroupCommand.h" />
-    <ClInclude Include="renderer\CCMaterialManager.h" />
-    <ClInclude Include="renderer\CCQuadCommand.h" />
-    <ClInclude Include="renderer\CCRenderCommand.h" />
-    <ClInclude Include="renderer\CCRenderCommandPool.h" />
-    <ClInclude Include="renderer\CCRenderer.h" />
-    <ClInclude Include="renderer\CCRenderMaterial.h" />
     <ClInclude Include="TGAlib.h" />
-    <ClInclude Include="TransformUtils.h" />
     <ClInclude Include="uthash.h" />
     <ClInclude Include="utlist.h" />
-    <ClInclude Include="ZipUtils.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\math\MathUtil.inl" />
@@ -614,4 +616,7 @@
     <None Include="..\math\Vector3.inl" />
     <None Include="..\math\Vector4.inl" />
   </ItemGroup>
+  <ItemGroup>
+    <Text Include="..\base\CMakeLists.txt" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/cocos/2d/cocos2d_wp8.vcxproj.filters b/cocos/2d/cocos2d_wp8.vcxproj.filters
index 6033b06ccf..bebc9d9acc 100644
--- a/cocos/2d/cocos2d_wp8.vcxproj.filters
+++ b/cocos/2d/cocos2d_wp8.vcxproj.filters
@@ -76,9 +76,6 @@
     <Filter Include="platform\etc">
       <UniqueIdentifier>{47fda93e-6eb4-4abc-b5bc-725bf667a395}</UniqueIdentifier>
     </Filter>
-    <Filter Include="event_dispatcher">
-      <UniqueIdentifier>{3ff2746c-a91b-4b86-93b7-43a9ec14825b}</UniqueIdentifier>
-    </Filter>
     <Filter Include="physics">
       <UniqueIdentifier>{08593631-5bf5-46aa-9436-62595c4f7bf6}</UniqueIdentifier>
     </Filter>
@@ -135,42 +132,6 @@
     <ClCompile Include="CCGrid.cpp">
       <Filter>effects</Filter>
     </ClCompile>
-    <ClCompile Include="CCEventDispatcher.cpp">
-      <Filter>event_dispatcher</Filter>
-    </ClCompile>
-    <ClCompile Include="CCEventKeyboard.cpp">
-      <Filter>event_dispatcher</Filter>
-    </ClCompile>
-    <ClCompile Include="CCEventListener.cpp">
-      <Filter>event_dispatcher</Filter>
-    </ClCompile>
-    <ClCompile Include="CCEventListenerAcceleration.cpp">
-      <Filter>event_dispatcher</Filter>
-    </ClCompile>
-    <ClCompile Include="CCEventListenerCustom.cpp">
-      <Filter>event_dispatcher</Filter>
-    </ClCompile>
-    <ClCompile Include="CCEventListenerKeyboard.cpp">
-      <Filter>event_dispatcher</Filter>
-    </ClCompile>
-    <ClCompile Include="CCEventListenerTouch.cpp">
-      <Filter>event_dispatcher</Filter>
-    </ClCompile>
-    <ClCompile Include="CCEventTouch.cpp">
-      <Filter>event_dispatcher</Filter>
-    </ClCompile>
-    <ClCompile Include="CCEvent.cpp">
-      <Filter>event_dispatcher</Filter>
-    </ClCompile>
-    <ClCompile Include="CCEventAcceleration.cpp">
-      <Filter>event_dispatcher</Filter>
-    </ClCompile>
-    <ClCompile Include="CCEventCustom.cpp">
-      <Filter>event_dispatcher</Filter>
-    </ClCompile>
-    <ClCompile Include="CCTouch.cpp">
-      <Filter>event_dispatcher</Filter>
-    </ClCompile>
     <ClCompile Include="CCLayer.cpp">
       <Filter>layers_scenes_transitions_nodes</Filter>
     </ClCompile>
@@ -378,26 +339,13 @@
     <ClCompile Include="CCParallaxNode.cpp">
       <Filter>tilemap_parallax_nodes</Filter>
     </ClCompile>
-    <ClCompile Include="CCConfiguration.cpp" />
-    <ClCompile Include="CCDirector.cpp" />
     <ClCompile Include="ccFPSImages.c" />
-    <ClCompile Include="CCScheduler.cpp" />
-    <ClCompile Include="ccTypes.cpp" />
-    <ClCompile Include="base64.cpp">
-      <Filter>support</Filter>
-    </ClCompile>
-    <ClCompile Include="CCProfiling.cpp">
-      <Filter>support</Filter>
-    </ClCompile>
     <ClCompile Include="ccUTF8.cpp">
       <Filter>support</Filter>
     </ClCompile>
     <ClCompile Include="CCVertex.cpp">
       <Filter>support</Filter>
     </ClCompile>
-    <ClCompile Include="TransformUtils.cpp">
-      <Filter>support</Filter>
-    </ClCompile>
     <ClCompile Include="CCComponent.cpp">
       <Filter>support\component</Filter>
     </ClCompile>
@@ -422,39 +370,9 @@
     <ClCompile Include="..\..\external\unzip\unzip.cpp">
       <Filter>support\zip_support</Filter>
     </ClCompile>
-    <ClCompile Include="ZipUtils.cpp">
-      <Filter>support\zip_support</Filter>
-    </ClCompile>
-    <ClCompile Include="..\base\CCAffineTransform.cpp">
-      <Filter>base</Filter>
-    </ClCompile>
-    <ClCompile Include="..\base\CCAutoreleasePool.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\CCGeometry.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="CCEventListenerMouse.cpp">
-      <Filter>event_dispatcher</Filter>
-    </ClCompile>
-    <ClCompile Include="CCEventMouse.cpp">
-      <Filter>event_dispatcher</Filter>
-    </ClCompile>
     <ClCompile Include="..\physics\chipmunk\CCPhysicsBodyInfo_chipmunk.cpp">
       <Filter>physics\chipmunk</Filter>
     </ClCompile>
@@ -470,36 +388,12 @@
     <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="renderer\CCCustomCommand.cpp">
-      <Filter>renderer</Filter>
-    </ClCompile>
-    <ClCompile Include="renderer\CCGroupCommand.cpp">
-      <Filter>renderer</Filter>
-    </ClCompile>
-    <ClCompile Include="renderer\CCMaterialManager.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\CCBatchCommand.cpp">
-      <Filter>renderer</Filter>
-    </ClCompile>
     <ClCompile Include="CCFontCharMap.cpp">
       <Filter>label_nodes</Filter>
     </ClCompile>
@@ -525,9 +419,6 @@
     <ClCompile Include="platform\winrt\CCStdC.cpp">
       <Filter>platform\winrt</Filter>
     </ClCompile>
-    <ClCompile Include="..\base\CCConsole.cpp">
-      <Filter>base</Filter>
-    </ClCompile>
     <ClCompile Include="platform\winrt\CCWinRTUtils.cpp">
       <Filter>platform\winrt</Filter>
     </ClCompile>
@@ -592,6 +483,117 @@
     <ClCompile Include="..\math\Vector4.cpp">
       <Filter>math</Filter>
     </ClCompile>
+    <ClCompile Include="..\base\base64.cpp">
+      <Filter>base</Filter>
+    </ClCompile>
+    <ClCompile Include="..\base\CCAutoreleasePool.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\CCDirector.cpp">
+      <Filter>base</Filter>
+    </ClCompile>
+    <ClCompile Include="..\base\CCEvent.cpp">
+      <Filter>base</Filter>
+    </ClCompile>
+    <ClCompile Include="..\base\CCEventAcceleration.cpp">
+      <Filter>base</Filter>
+    </ClCompile>
+    <ClCompile Include="..\base\CCEventCustom.cpp">
+      <Filter>base</Filter>
+    </ClCompile>
+    <ClCompile Include="..\base\CCEventDispatcher.cpp">
+      <Filter>base</Filter>
+    </ClCompile>
+    <ClCompile Include="..\base\CCEventKeyboard.cpp">
+      <Filter>base</Filter>
+    </ClCompile>
+    <ClCompile Include="..\base\CCEventListener.cpp">
+      <Filter>base</Filter>
+    </ClCompile>
+    <ClCompile Include="..\base\CCEventListenerAcceleration.cpp">
+      <Filter>base</Filter>
+    </ClCompile>
+    <ClCompile Include="..\base\CCEventListenerCustom.cpp">
+      <Filter>base</Filter>
+    </ClCompile>
+    <ClCompile Include="..\base\CCEventListenerKeyboard.cpp">
+      <Filter>base</Filter>
+    </ClCompile>
+    <ClCompile Include="..\base\CCEventListenerMouse.cpp">
+      <Filter>base</Filter>
+    </ClCompile>
+    <ClCompile Include="..\base\CCEventListenerTouch.cpp">
+      <Filter>base</Filter>
+    </ClCompile>
+    <ClCompile Include="..\base\CCEventMouse.cpp">
+      <Filter>base</Filter>
+    </ClCompile>
+    <ClCompile Include="..\base\CCEventTouch.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\CCTouch.cpp">
+      <Filter>base</Filter>
+    </ClCompile>
+    <ClCompile Include="..\base\ccTypes.cpp">
+      <Filter>base</Filter>
+    </ClCompile>
+    <ClCompile Include="..\base\CCValue.cpp">
+      <Filter>base</Filter>
+    </ClCompile>
+    <ClCompile Include="..\base\ZipUtils.cpp">
+      <Filter>base</Filter>
+    </ClCompile>
+    <ClCompile Include="..\renderer\CCBatchCommand.cpp">
+      <Filter>renderer</Filter>
+    </ClCompile>
+    <ClCompile Include="..\renderer\CCCustomCommand.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="..\math\CCAffineTransform.cpp">
+      <Filter>math</Filter>
+    </ClCompile>
+    <ClCompile Include="..\math\CCGeometry.cpp">
+      <Filter>math</Filter>
+    </ClCompile>
+    <ClCompile Include="..\math\TransformUtils.cpp">
+      <Filter>math</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\physics\CCPhysicsBody.h">
@@ -621,42 +623,6 @@
     <ClInclude Include="CCGrid.h">
       <Filter>effects</Filter>
     </ClInclude>
-    <ClInclude Include="CCEventDispatcher.h">
-      <Filter>event_dispatcher</Filter>
-    </ClInclude>
-    <ClInclude Include="CCEventKeyboard.h">
-      <Filter>event_dispatcher</Filter>
-    </ClInclude>
-    <ClInclude Include="CCEventListener.h">
-      <Filter>event_dispatcher</Filter>
-    </ClInclude>
-    <ClInclude Include="CCEventListenerAcceleration.h">
-      <Filter>event_dispatcher</Filter>
-    </ClInclude>
-    <ClInclude Include="CCEventListenerCustom.h">
-      <Filter>event_dispatcher</Filter>
-    </ClInclude>
-    <ClInclude Include="CCEventListenerKeyboard.h">
-      <Filter>event_dispatcher</Filter>
-    </ClInclude>
-    <ClInclude Include="CCEventListenerTouch.h">
-      <Filter>event_dispatcher</Filter>
-    </ClInclude>
-    <ClInclude Include="CCEventTouch.h">
-      <Filter>event_dispatcher</Filter>
-    </ClInclude>
-    <ClInclude Include="CCEvent.h">
-      <Filter>event_dispatcher</Filter>
-    </ClInclude>
-    <ClInclude Include="CCEventAcceleration.h">
-      <Filter>event_dispatcher</Filter>
-    </ClInclude>
-    <ClInclude Include="CCEventCustom.h">
-      <Filter>event_dispatcher</Filter>
-    </ClInclude>
-    <ClInclude Include="CCTouch.h">
-      <Filter>event_dispatcher</Filter>
-    </ClInclude>
     <ClInclude Include="ccConfig.h">
       <Filter>include</Filter>
     </ClInclude>
@@ -903,16 +869,7 @@
     <ClInclude Include="CCParallaxNode.h">
       <Filter>tilemap_parallax_nodes</Filter>
     </ClInclude>
-    <ClInclude Include="CCConfiguration.h" />
-    <ClInclude Include="CCDirector.h" />
     <ClInclude Include="ccFPSImages.h" />
-    <ClInclude Include="CCScheduler.h" />
-    <ClInclude Include="base64.h">
-      <Filter>support</Filter>
-    </ClInclude>
-    <ClInclude Include="CCProfiling.h">
-      <Filter>support</Filter>
-    </ClInclude>
     <ClInclude Include="ccUTF8.h">
       <Filter>support</Filter>
     </ClInclude>
@@ -922,9 +879,6 @@
     <ClInclude Include="CCVertex.h">
       <Filter>support</Filter>
     </ClInclude>
-    <ClInclude Include="TransformUtils.h">
-      <Filter>support</Filter>
-    </ClInclude>
     <ClInclude Include="CCComponent.h">
       <Filter>support\component</Filter>
     </ClInclude>
@@ -955,36 +909,6 @@
     <ClInclude Include="..\..\external\unzip\unzip.h">
       <Filter>support\zip_support</Filter>
     </ClInclude>
-    <ClInclude Include="ZipUtils.h">
-      <Filter>support\zip_support</Filter>
-    </ClInclude>
-    <ClInclude Include="..\base\CCAffineTransform.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\CCGeometry.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="CCEventListenerMouse.h">
-      <Filter>event_dispatcher</Filter>
-    </ClInclude>
-    <ClInclude Include="CCEventMouse.h">
-      <Filter>event_dispatcher</Filter>
-    </ClInclude>
     <ClInclude Include="..\physics\chipmunk\CCPhysicsBodyInfo_chipmunk.h">
       <Filter>physics\chipmunk</Filter>
     </ClInclude>
@@ -1003,48 +927,12 @@
     <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="renderer\CCCustomCommand.h">
-      <Filter>renderer</Filter>
-    </ClInclude>
-    <ClInclude Include="renderer\CCGroupCommand.h">
-      <Filter>renderer</Filter>
-    </ClInclude>
-    <ClInclude Include="renderer\CCMaterialManager.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\CCRenderMaterial.h">
-      <Filter>renderer</Filter>
-    </ClInclude>
-    <ClInclude Include="renderer\CCBatchCommand.h">
-      <Filter>renderer</Filter>
-    </ClInclude>
     <ClInclude Include="CCFontCharMap.h">
       <Filter>label_nodes</Filter>
     </ClInclude>
@@ -1073,9 +961,6 @@
     <ClInclude Include="platform\winrt\CCStdC.h">
       <Filter>platform\winrt</Filter>
     </ClInclude>
-    <ClInclude Include="..\base\CCConsole.h">
-      <Filter>base</Filter>
-    </ClInclude>
     <ClInclude Include="platform\winrt\CCWinRTUtils.h">
       <Filter>platform\winrt</Filter>
     </ClInclude>
@@ -1157,6 +1042,138 @@
     <ClInclude Include="..\math\Vector4.h">
       <Filter>math</Filter>
     </ClInclude>
+    <ClInclude Include="..\base\base64.h">
+      <Filter>base</Filter>
+    </ClInclude>
+    <ClInclude Include="..\base\CCAutoreleasePool.h">
+      <Filter>base</Filter>
+    </ClInclude>
+    <ClInclude Include="..\base\ccConfig.h">
+      <Filter>base</Filter>
+    </ClInclude>
+    <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>
+    <ClInclude Include="..\base\CCEvent.h">
+      <Filter>base</Filter>
+    </ClInclude>
+    <ClInclude Include="..\base\CCEventAcceleration.h">
+      <Filter>base</Filter>
+    </ClInclude>
+    <ClInclude Include="..\base\CCEventCustom.h">
+      <Filter>base</Filter>
+    </ClInclude>
+    <ClInclude Include="..\base\CCEventDispatcher.h">
+      <Filter>base</Filter>
+    </ClInclude>
+    <ClInclude Include="..\base\CCEventKeyboard.h">
+      <Filter>base</Filter>
+    </ClInclude>
+    <ClInclude Include="..\base\CCEventListener.h">
+      <Filter>base</Filter>
+    </ClInclude>
+    <ClInclude Include="..\base\CCEventListenerAcceleration.h">
+      <Filter>base</Filter>
+    </ClInclude>
+    <ClInclude Include="..\base\CCEventListenerCustom.h">
+      <Filter>base</Filter>
+    </ClInclude>
+    <ClInclude Include="..\base\CCEventListenerKeyboard.h">
+      <Filter>base</Filter>
+    </ClInclude>
+    <ClInclude Include="..\base\CCEventListenerMouse.h">
+      <Filter>base</Filter>
+    </ClInclude>
+    <ClInclude Include="..\base\CCEventListenerTouch.h">
+      <Filter>base</Filter>
+    </ClInclude>
+    <ClInclude Include="..\base\CCEventMouse.h">
+      <Filter>base</Filter>
+    </ClInclude>
+    <ClInclude Include="..\base\CCEventTouch.h">
+      <Filter>base</Filter>
+    </ClInclude>
+    <ClInclude Include="..\base\CCEventType.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\CCProfiling.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\CCTouch.h">
+      <Filter>base</Filter>
+    </ClInclude>
+    <ClInclude Include="..\base\ccTypes.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\ZipUtils.h">
+      <Filter>base</Filter>
+    </ClInclude>
+    <ClInclude Include="..\renderer\CCBatchCommand.h">
+      <Filter>renderer</Filter>
+    </ClInclude>
+    <ClInclude Include="..\renderer\CCCustomCommand.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="..\math\CCAffineTransform.h">
+      <Filter>math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\math\CCGeometry.h">
+      <Filter>math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\math\TransformUtils.h">
+      <Filter>math</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\math\MathUtil.inl">
@@ -1181,4 +1198,9 @@
       <Filter>math</Filter>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <Text Include="..\base\CMakeLists.txt">
+      <Filter>base</Filter>
+    </Text>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/cocos/2d/platform/wp8/CCGLView.h b/cocos/2d/platform/wp8/CCGLView.h
index 9dc2603b11..187c796ad9 100644
--- a/cocos/2d/platform/wp8/CCGLView.h
+++ b/cocos/2d/platform/wp8/CCGLView.h
@@ -28,7 +28,6 @@ THE SOFTWARE.
 
 #include "CCStdC.h"
 #include "platform/CCCommon.h"
-#include "CCGeometry.h"
 #include "platform/CCGLViewProtocol.h"
 #include "InputEvent.h"
 
diff --git a/extensions/GUI/CCEditBox/CCEditBoxImplWp8.cpp b/extensions/GUI/CCEditBox/CCEditBoxImplWp8.cpp
index 88a4f24f1f..1b0c4f68e9 100644
--- a/extensions/GUI/CCEditBox/CCEditBoxImplWp8.cpp
+++ b/extensions/GUI/CCEditBox/CCEditBoxImplWp8.cpp
@@ -25,7 +25,6 @@ THE SOFTWARE.
 #include "CCEditBoxImplWp8.h"
 #include "CCEditBox.h"
 #include "CCGLView.h"
-#include "CCGeometry.h"
 #include "CCScriptSupport.h"
 #include "ccUTF8.h"
 
diff --git a/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/AlignmentGrid.png b/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/AlignmentGrid.png
new file mode 100644
index 0000000000..f7d2e97804
Binary files /dev/null and b/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/AlignmentGrid.png differ
diff --git a/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/ApplicationIcon.png b/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/ApplicationIcon.png
new file mode 100644
index 0000000000..7d95d4e081
Binary files /dev/null and b/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/ApplicationIcon.png differ
diff --git a/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/Tiles/FlipCycleTileLarge.png b/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/Tiles/FlipCycleTileLarge.png
new file mode 100644
index 0000000000..e0c59ac014
Binary files /dev/null and b/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/Tiles/FlipCycleTileLarge.png differ
diff --git a/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/Tiles/FlipCycleTileMedium.png b/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/Tiles/FlipCycleTileMedium.png
new file mode 100644
index 0000000000..e93b89d600
Binary files /dev/null and b/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/Tiles/FlipCycleTileMedium.png differ
diff --git a/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/Tiles/FlipCycleTileSmall.png b/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/Tiles/FlipCycleTileSmall.png
new file mode 100644
index 0000000000..550b1b5e8d
Binary files /dev/null and b/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/Tiles/FlipCycleTileSmall.png differ
diff --git a/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/Tiles/IconicTileMediumLarge.png b/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/Tiles/IconicTileMediumLarge.png
new file mode 100644
index 0000000000..686e6b53f0
Binary files /dev/null and b/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/Tiles/IconicTileMediumLarge.png differ
diff --git a/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/Tiles/IconicTileSmall.png b/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/Tiles/IconicTileSmall.png
new file mode 100644
index 0000000000..d4b5ede1b5
Binary files /dev/null and b/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/Tiles/IconicTileSmall.png differ
diff --git a/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/Assets/AlignmentGrid.png b/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/Assets/AlignmentGrid.png
new file mode 100644
index 0000000000..f7d2e97804
Binary files /dev/null and b/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/Assets/AlignmentGrid.png differ
diff --git a/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/Assets/ApplicationIcon.png b/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/Assets/ApplicationIcon.png
new file mode 100644
index 0000000000..7d95d4e081
Binary files /dev/null and b/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/Assets/ApplicationIcon.png differ
diff --git a/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/Assets/Tiles/FlipCycleTileLarge.png b/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/Assets/Tiles/FlipCycleTileLarge.png
new file mode 100644
index 0000000000..e0c59ac014
Binary files /dev/null and b/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/Assets/Tiles/FlipCycleTileLarge.png differ
diff --git a/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/Assets/Tiles/FlipCycleTileMedium.png b/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/Assets/Tiles/FlipCycleTileMedium.png
new file mode 100644
index 0000000000..e93b89d600
Binary files /dev/null and b/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/Assets/Tiles/FlipCycleTileMedium.png differ
diff --git a/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/Assets/Tiles/FlipCycleTileSmall.png b/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/Assets/Tiles/FlipCycleTileSmall.png
new file mode 100644
index 0000000000..550b1b5e8d
Binary files /dev/null and b/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/Assets/Tiles/FlipCycleTileSmall.png differ
diff --git a/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/Assets/Tiles/IconicTileMediumLarge.png b/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/Assets/Tiles/IconicTileMediumLarge.png
new file mode 100644
index 0000000000..686e6b53f0
Binary files /dev/null and b/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/Assets/Tiles/IconicTileMediumLarge.png differ
diff --git a/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/Assets/Tiles/IconicTileSmall.png b/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/Assets/Tiles/IconicTileSmall.png
new file mode 100644
index 0000000000..d4b5ede1b5
Binary files /dev/null and b/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/Assets/Tiles/IconicTileSmall.png differ
diff --git a/tests/cpp-tests/proj.wp8-xaml/cpp-tests/Assets/AlignmentGrid.png b/tests/cpp-tests/proj.wp8-xaml/cpp-tests/Assets/AlignmentGrid.png
new file mode 100644
index 0000000000..f7d2e97804
Binary files /dev/null and b/tests/cpp-tests/proj.wp8-xaml/cpp-tests/Assets/AlignmentGrid.png differ
diff --git a/tests/cpp-tests/proj.wp8-xaml/cpp-tests/Assets/ApplicationIcon.png b/tests/cpp-tests/proj.wp8-xaml/cpp-tests/Assets/ApplicationIcon.png
new file mode 100644
index 0000000000..7d95d4e081
Binary files /dev/null and b/tests/cpp-tests/proj.wp8-xaml/cpp-tests/Assets/ApplicationIcon.png differ
diff --git a/tests/cpp-tests/proj.wp8-xaml/cpp-tests/Assets/Tiles/FlipCycleTileLarge.png b/tests/cpp-tests/proj.wp8-xaml/cpp-tests/Assets/Tiles/FlipCycleTileLarge.png
new file mode 100644
index 0000000000..e0c59ac014
Binary files /dev/null and b/tests/cpp-tests/proj.wp8-xaml/cpp-tests/Assets/Tiles/FlipCycleTileLarge.png differ
diff --git a/tests/cpp-tests/proj.wp8-xaml/cpp-tests/Assets/Tiles/FlipCycleTileMedium.png b/tests/cpp-tests/proj.wp8-xaml/cpp-tests/Assets/Tiles/FlipCycleTileMedium.png
new file mode 100644
index 0000000000..e93b89d600
Binary files /dev/null and b/tests/cpp-tests/proj.wp8-xaml/cpp-tests/Assets/Tiles/FlipCycleTileMedium.png differ
diff --git a/tests/cpp-tests/proj.wp8-xaml/cpp-tests/Assets/Tiles/FlipCycleTileSmall.png b/tests/cpp-tests/proj.wp8-xaml/cpp-tests/Assets/Tiles/FlipCycleTileSmall.png
new file mode 100644
index 0000000000..550b1b5e8d
Binary files /dev/null and b/tests/cpp-tests/proj.wp8-xaml/cpp-tests/Assets/Tiles/FlipCycleTileSmall.png differ
diff --git a/tests/cpp-tests/proj.wp8-xaml/cpp-tests/Assets/Tiles/IconicTileMediumLarge.png b/tests/cpp-tests/proj.wp8-xaml/cpp-tests/Assets/Tiles/IconicTileMediumLarge.png
new file mode 100644
index 0000000000..686e6b53f0
Binary files /dev/null and b/tests/cpp-tests/proj.wp8-xaml/cpp-tests/Assets/Tiles/IconicTileMediumLarge.png differ
diff --git a/tests/cpp-tests/proj.wp8-xaml/cpp-tests/Assets/Tiles/IconicTileSmall.png b/tests/cpp-tests/proj.wp8-xaml/cpp-tests/Assets/Tiles/IconicTileSmall.png
new file mode 100644
index 0000000000..d4b5ede1b5
Binary files /dev/null and b/tests/cpp-tests/proj.wp8-xaml/cpp-tests/Assets/Tiles/IconicTileSmall.png differ