diff --git a/extensions/Android.mk b/extensions/Android.mk
index 1c7d37a369..d734526085 100644
--- a/extensions/Android.mk
+++ b/extensions/Android.mk
@@ -22,19 +22,19 @@ CCBReader/CCParticleSystemQuadLoader.cpp \
 CCBReader/CCScale9SpriteLoader.cpp \
 CCBReader/CCScrollViewLoader.cpp \
 CCBReader/CCSpriteLoader.cpp \
-UI/CCControlExtension/CCControl.cpp \
-UI/CCControlExtension/CCControlButton.cpp \
-UI/CCControlExtension/CCControlColourPicker.cpp \
-UI/CCControlExtension/CCControlHuePicker.cpp \
-UI/CCControlExtension/CCControlSaturationBrightnessPicker.cpp \
-UI/CCControlExtension/CCControlSlider.cpp \
-UI/CCControlExtension/CCControlSwitch.cpp \
-UI/CCControlExtension/CCControlUtils.cpp \
-UI/CCControlExtension/CCInvocation.cpp \
-UI/CCControlExtension/CCMenuPassive.cpp \
-UI/CCControlExtension/CCScale9Sprite.cpp \
-UI/CCControlExtension/CCSpacer.cpp \
-UI/CCScrollView/CCScrollView.cpp
+GUI/CCControlExtension/CCControl.cpp \
+GUI/CCControlExtension/CCControlButton.cpp \
+GUI/CCControlExtension/CCControlColourPicker.cpp \
+GUI/CCControlExtension/CCControlHuePicker.cpp \
+GUI/CCControlExtension/CCControlSaturationBrightnessPicker.cpp \
+GUI/CCControlExtension/CCControlSlider.cpp \
+GUI/CCControlExtension/CCControlSwitch.cpp \
+GUI/CCControlExtension/CCControlUtils.cpp \
+GUI/CCControlExtension/CCInvocation.cpp \
+GUI/CCControlExtension/CCMenuPassive.cpp \
+GUI/CCControlExtension/CCScale9Sprite.cpp \
+GUI/CCControlExtension/CCSpacer.cpp \
+GUI/CCScrollView/CCScrollView.cpp
 
 LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static
 
diff --git a/extensions/CCBReader/CCControlButtonLoader.h b/extensions/CCBReader/CCControlButtonLoader.h
index 40d41d6102..418d7153e3 100644
--- a/extensions/CCBReader/CCControlButtonLoader.h
+++ b/extensions/CCBReader/CCControlButtonLoader.h
@@ -2,7 +2,7 @@
 #define _CCB_CCCONTROLBUTTONLOADER_H_
 
 #include "CCControlLoader.h"
-#include "../UI/CCControlExtension/CCControlButton.h"
+#include "../GUI/CCControlExtension/CCControlButton.h"
 
 NS_CC_EXT_BEGIN
 
diff --git a/extensions/CCBReader/CCControlLoader.h b/extensions/CCBReader/CCControlLoader.h
index d097106aa8..9e8b9d2183 100644
--- a/extensions/CCBReader/CCControlLoader.h
+++ b/extensions/CCBReader/CCControlLoader.h
@@ -2,7 +2,7 @@
 #define _CCB_CCCONTROLLOADER_H_
 
 #include "CCNodeLoader.h"
-#include "../UI/CCControlExtension/CCControl.h"
+#include "../GUI/CCControlExtension/CCControl.h"
 
 NS_CC_EXT_BEGIN
 
diff --git a/extensions/CCBReader/CCNodeLoader.h b/extensions/CCBReader/CCNodeLoader.h
index 10b04b3456..e74e7c012a 100644
--- a/extensions/CCBReader/CCNodeLoader.h
+++ b/extensions/CCBReader/CCNodeLoader.h
@@ -1,7 +1,7 @@
 #ifndef _CCB_CCNODELOADER_H_
 #define _CCB_CCNODELOADER_H_
 
-#include "../UI/CCControlExtension/CCInvocation.h"
+#include "../GUI/CCControlExtension/CCInvocation.h"
 #include "cocos2d.h"
 #include "CCBReader.h"
 
diff --git a/extensions/CCBReader/CCScale9SpriteLoader.h b/extensions/CCBReader/CCScale9SpriteLoader.h
index 3b606f819a..042f8c1b67 100644
--- a/extensions/CCBReader/CCScale9SpriteLoader.h
+++ b/extensions/CCBReader/CCScale9SpriteLoader.h
@@ -3,7 +3,7 @@
 
 #include "CCNodeLoader.h"
 #include "CCScale9SpriteLoader.h"
-#include "../UI/CCControlExtension/CCScale9Sprite.h"
+#include "../GUI/CCControlExtension/CCScale9Sprite.h"
 
 NS_CC_EXT_BEGIN
 
diff --git a/extensions/CCBReader/CCScrollViewLoader.h b/extensions/CCBReader/CCScrollViewLoader.h
index b52ba6845d..b415e656b6 100644
--- a/extensions/CCBReader/CCScrollViewLoader.h
+++ b/extensions/CCBReader/CCScrollViewLoader.h
@@ -2,7 +2,7 @@
 #define _CCB_CCSCROLLVIEWLOADER_H_
 
 #include "CCNodeLoader.h"
-#include "../UI/CCScrollView/CCScrollView.h"
+#include "../GUI/CCScrollView/CCScrollView.h"
 
 NS_CC_EXT_BEGIN
 
diff --git a/extensions/UI/CCControlExtension/CCControl.cpp b/extensions/GUI/CCControlExtension/CCControl.cpp
similarity index 100%
rename from extensions/UI/CCControlExtension/CCControl.cpp
rename to extensions/GUI/CCControlExtension/CCControl.cpp
diff --git a/extensions/UI/CCControlExtension/CCControl.h b/extensions/GUI/CCControlExtension/CCControl.h
similarity index 100%
rename from extensions/UI/CCControlExtension/CCControl.h
rename to extensions/GUI/CCControlExtension/CCControl.h
diff --git a/extensions/UI/CCControlExtension/CCControlButton.cpp b/extensions/GUI/CCControlExtension/CCControlButton.cpp
similarity index 100%
rename from extensions/UI/CCControlExtension/CCControlButton.cpp
rename to extensions/GUI/CCControlExtension/CCControlButton.cpp
diff --git a/extensions/UI/CCControlExtension/CCControlButton.h b/extensions/GUI/CCControlExtension/CCControlButton.h
similarity index 100%
rename from extensions/UI/CCControlExtension/CCControlButton.h
rename to extensions/GUI/CCControlExtension/CCControlButton.h
diff --git a/extensions/UI/CCControlExtension/CCControlColourPicker.cpp b/extensions/GUI/CCControlExtension/CCControlColourPicker.cpp
similarity index 100%
rename from extensions/UI/CCControlExtension/CCControlColourPicker.cpp
rename to extensions/GUI/CCControlExtension/CCControlColourPicker.cpp
diff --git a/extensions/UI/CCControlExtension/CCControlColourPicker.h b/extensions/GUI/CCControlExtension/CCControlColourPicker.h
similarity index 100%
rename from extensions/UI/CCControlExtension/CCControlColourPicker.h
rename to extensions/GUI/CCControlExtension/CCControlColourPicker.h
diff --git a/extensions/UI/CCControlExtension/CCControlExtensions.h b/extensions/GUI/CCControlExtension/CCControlExtensions.h
similarity index 100%
rename from extensions/UI/CCControlExtension/CCControlExtensions.h
rename to extensions/GUI/CCControlExtension/CCControlExtensions.h
diff --git a/extensions/UI/CCControlExtension/CCControlHuePicker.cpp b/extensions/GUI/CCControlExtension/CCControlHuePicker.cpp
similarity index 100%
rename from extensions/UI/CCControlExtension/CCControlHuePicker.cpp
rename to extensions/GUI/CCControlExtension/CCControlHuePicker.cpp
diff --git a/extensions/UI/CCControlExtension/CCControlHuePicker.h b/extensions/GUI/CCControlExtension/CCControlHuePicker.h
similarity index 100%
rename from extensions/UI/CCControlExtension/CCControlHuePicker.h
rename to extensions/GUI/CCControlExtension/CCControlHuePicker.h
diff --git a/extensions/UI/CCControlExtension/CCControlSaturationBrightnessPicker.cpp b/extensions/GUI/CCControlExtension/CCControlSaturationBrightnessPicker.cpp
similarity index 100%
rename from extensions/UI/CCControlExtension/CCControlSaturationBrightnessPicker.cpp
rename to extensions/GUI/CCControlExtension/CCControlSaturationBrightnessPicker.cpp
diff --git a/extensions/UI/CCControlExtension/CCControlSaturationBrightnessPicker.h b/extensions/GUI/CCControlExtension/CCControlSaturationBrightnessPicker.h
similarity index 100%
rename from extensions/UI/CCControlExtension/CCControlSaturationBrightnessPicker.h
rename to extensions/GUI/CCControlExtension/CCControlSaturationBrightnessPicker.h
diff --git a/extensions/UI/CCControlExtension/CCControlSlider.cpp b/extensions/GUI/CCControlExtension/CCControlSlider.cpp
similarity index 100%
rename from extensions/UI/CCControlExtension/CCControlSlider.cpp
rename to extensions/GUI/CCControlExtension/CCControlSlider.cpp
diff --git a/extensions/UI/CCControlExtension/CCControlSlider.h b/extensions/GUI/CCControlExtension/CCControlSlider.h
similarity index 100%
rename from extensions/UI/CCControlExtension/CCControlSlider.h
rename to extensions/GUI/CCControlExtension/CCControlSlider.h
diff --git a/extensions/UI/CCControlExtension/CCControlSwitch.cpp b/extensions/GUI/CCControlExtension/CCControlSwitch.cpp
similarity index 100%
rename from extensions/UI/CCControlExtension/CCControlSwitch.cpp
rename to extensions/GUI/CCControlExtension/CCControlSwitch.cpp
diff --git a/extensions/UI/CCControlExtension/CCControlSwitch.h b/extensions/GUI/CCControlExtension/CCControlSwitch.h
similarity index 100%
rename from extensions/UI/CCControlExtension/CCControlSwitch.h
rename to extensions/GUI/CCControlExtension/CCControlSwitch.h
diff --git a/extensions/UI/CCControlExtension/CCControlUtils.cpp b/extensions/GUI/CCControlExtension/CCControlUtils.cpp
similarity index 100%
rename from extensions/UI/CCControlExtension/CCControlUtils.cpp
rename to extensions/GUI/CCControlExtension/CCControlUtils.cpp
diff --git a/extensions/UI/CCControlExtension/CCControlUtils.h b/extensions/GUI/CCControlExtension/CCControlUtils.h
similarity index 100%
rename from extensions/UI/CCControlExtension/CCControlUtils.h
rename to extensions/GUI/CCControlExtension/CCControlUtils.h
diff --git a/extensions/UI/CCControlExtension/CCInvocation.cpp b/extensions/GUI/CCControlExtension/CCInvocation.cpp
similarity index 100%
rename from extensions/UI/CCControlExtension/CCInvocation.cpp
rename to extensions/GUI/CCControlExtension/CCInvocation.cpp
diff --git a/extensions/UI/CCControlExtension/CCInvocation.h b/extensions/GUI/CCControlExtension/CCInvocation.h
similarity index 100%
rename from extensions/UI/CCControlExtension/CCInvocation.h
rename to extensions/GUI/CCControlExtension/CCInvocation.h
diff --git a/extensions/UI/CCControlExtension/CCMenuPassive.cpp b/extensions/GUI/CCControlExtension/CCMenuPassive.cpp
similarity index 100%
rename from extensions/UI/CCControlExtension/CCMenuPassive.cpp
rename to extensions/GUI/CCControlExtension/CCMenuPassive.cpp
diff --git a/extensions/UI/CCControlExtension/CCMenuPassive.h b/extensions/GUI/CCControlExtension/CCMenuPassive.h
similarity index 100%
rename from extensions/UI/CCControlExtension/CCMenuPassive.h
rename to extensions/GUI/CCControlExtension/CCMenuPassive.h
diff --git a/extensions/UI/CCControlExtension/CCScale9Sprite.cpp b/extensions/GUI/CCControlExtension/CCScale9Sprite.cpp
similarity index 100%
rename from extensions/UI/CCControlExtension/CCScale9Sprite.cpp
rename to extensions/GUI/CCControlExtension/CCScale9Sprite.cpp
diff --git a/extensions/UI/CCControlExtension/CCScale9Sprite.h b/extensions/GUI/CCControlExtension/CCScale9Sprite.h
similarity index 100%
rename from extensions/UI/CCControlExtension/CCScale9Sprite.h
rename to extensions/GUI/CCControlExtension/CCScale9Sprite.h
diff --git a/extensions/UI/CCControlExtension/CCSpacer.cpp b/extensions/GUI/CCControlExtension/CCSpacer.cpp
similarity index 100%
rename from extensions/UI/CCControlExtension/CCSpacer.cpp
rename to extensions/GUI/CCControlExtension/CCSpacer.cpp
diff --git a/extensions/UI/CCControlExtension/CCSpacer.h b/extensions/GUI/CCControlExtension/CCSpacer.h
similarity index 100%
rename from extensions/UI/CCControlExtension/CCSpacer.h
rename to extensions/GUI/CCControlExtension/CCSpacer.h
diff --git a/extensions/UI/CCScrollView/CCScrollView.cpp b/extensions/GUI/CCScrollView/CCScrollView.cpp
similarity index 100%
rename from extensions/UI/CCScrollView/CCScrollView.cpp
rename to extensions/GUI/CCScrollView/CCScrollView.cpp
diff --git a/extensions/UI/CCScrollView/CCScrollView.h b/extensions/GUI/CCScrollView/CCScrollView.h
similarity index 100%
rename from extensions/UI/CCScrollView/CCScrollView.h
rename to extensions/GUI/CCScrollView/CCScrollView.h
diff --git a/extensions/cocos-ext.h b/extensions/cocos-ext.h
index 71049409bd..4b9f2e4e84 100644
--- a/extensions/cocos-ext.h
+++ b/extensions/cocos-ext.h
@@ -1,8 +1,8 @@
-#ifndef __COCOS2D_EXT_H__
-#define __COCOS2D_EXT_H__
-
-#include "ExtensionMacros.h"
-
+#ifndef __COCOS2D_EXT_H__
+#define __COCOS2D_EXT_H__
+
+#include "ExtensionMacros.h"
+
 #include "CCBReader/CCBFileLoader.h"
 #include "CCBReader/CCBMemberVariableAssigner.h"
 #include "CCBReader/CCBReader.h"
@@ -23,10 +23,10 @@
 #include "CCBReader/CCParticleSystemQuadLoader.h"
 #include "CCBReader/CCScale9SpriteLoader.h"
 #include "CCBReader/CCScrollViewLoader.h"
-#include "CCBReader/CCSpriteLoader.h"
-
-#include "UI/CCControlExtension/CCControlExtensions.h"
-#include "UI/CCScrollView/CCScrollView.h"
-
-#endif /* __COCOS2D_EXT_H__ */
-
+#include "CCBReader/CCSpriteLoader.h"
+
+#include "GUI/CCControlExtension/CCControlExtensions.h"
+#include "GUI/CCScrollView/CCScrollView.h"
+
+#endif /* __COCOS2D_EXT_H__ */
+
diff --git a/extensions/proj.win32/libExtensions.vcproj b/extensions/proj.win32/libExtensions.vcproj
index b38aaacb34..9f38fd6c49 100644
--- a/extensions/proj.win32/libExtensions.vcproj
+++ b/extensions/proj.win32/libExtensions.vcproj
@@ -304,109 +304,109 @@
 			</File>
 		</Filter>
 		<Filter
-			Name="UI"
+			Name="GUI"
 			>
 			<Filter
 				Name="CCControlExtension"
 				>
 				<File
-					RelativePath="..\UI\CCControlExtension\CCControl.cpp"
+					RelativePath="..\GUI\CCControlExtension\CCControl.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\UI\CCControlExtension\CCControl.h"
+					RelativePath="..\GUI\CCControlExtension\CCControl.h"
 					>
 				</File>
 				<File
-					RelativePath="..\UI\CCControlExtension\CCControlButton.cpp"
+					RelativePath="..\GUI\CCControlExtension\CCControlButton.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\UI\CCControlExtension\CCControlButton.h"
+					RelativePath="..\GUI\CCControlExtension\CCControlButton.h"
 					>
 				</File>
 				<File
-					RelativePath="..\UI\CCControlExtension\CCControlColourPicker.cpp"
+					RelativePath="..\GUI\CCControlExtension\CCControlColourPicker.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\UI\CCControlExtension\CCControlColourPicker.h"
+					RelativePath="..\GUI\CCControlExtension\CCControlColourPicker.h"
 					>
 				</File>
 				<File
-					RelativePath="..\UI\CCControlExtension\CCControlExtensions.h"
+					RelativePath="..\GUI\CCControlExtension\CCControlExtensions.h"
 					>
 				</File>
 				<File
-					RelativePath="..\UI\CCControlExtension\CCControlHuePicker.cpp"
+					RelativePath="..\GUI\CCControlExtension\CCControlHuePicker.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\UI\CCControlExtension\CCControlHuePicker.h"
+					RelativePath="..\GUI\CCControlExtension\CCControlHuePicker.h"
 					>
 				</File>
 				<File
-					RelativePath="..\UI\CCControlExtension\CCControlSaturationBrightnessPicker.cpp"
+					RelativePath="..\GUI\CCControlExtension\CCControlSaturationBrightnessPicker.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\UI\CCControlExtension\CCControlSaturationBrightnessPicker.h"
+					RelativePath="..\GUI\CCControlExtension\CCControlSaturationBrightnessPicker.h"
 					>
 				</File>
 				<File
-					RelativePath="..\UI\CCControlExtension\CCControlSlider.cpp"
+					RelativePath="..\GUI\CCControlExtension\CCControlSlider.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\UI\CCControlExtension\CCControlSlider.h"
+					RelativePath="..\GUI\CCControlExtension\CCControlSlider.h"
 					>
 				</File>
 				<File
-					RelativePath="..\UI\CCControlExtension\CCControlSwitch.cpp"
+					RelativePath="..\GUI\CCControlExtension\CCControlSwitch.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\UI\CCControlExtension\CCControlSwitch.h"
+					RelativePath="..\GUI\CCControlExtension\CCControlSwitch.h"
 					>
 				</File>
 				<File
-					RelativePath="..\UI\CCControlExtension\CCControlUtils.cpp"
+					RelativePath="..\GUI\CCControlExtension\CCControlUtils.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\UI\CCControlExtension\CCControlUtils.h"
+					RelativePath="..\GUI\CCControlExtension\CCControlUtils.h"
 					>
 				</File>
 				<File
-					RelativePath="..\UI\CCControlExtension\CCInvocation.cpp"
+					RelativePath="..\GUI\CCControlExtension\CCInvocation.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\UI\CCControlExtension\CCInvocation.h"
+					RelativePath="..\GUI\CCControlExtension\CCInvocation.h"
 					>
 				</File>
 				<File
-					RelativePath="..\UI\CCControlExtension\CCMenuPassive.cpp"
+					RelativePath="..\GUI\CCControlExtension\CCMenuPassive.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\UI\CCControlExtension\CCMenuPassive.h"
+					RelativePath="..\GUI\CCControlExtension\CCMenuPassive.h"
 					>
 				</File>
 				<File
-					RelativePath="..\UI\CCControlExtension\CCScale9Sprite.cpp"
+					RelativePath="..\GUI\CCControlExtension\CCScale9Sprite.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\UI\CCControlExtension\CCScale9Sprite.h"
+					RelativePath="..\GUI\CCControlExtension\CCScale9Sprite.h"
 					>
 				</File>
 				<File
-					RelativePath="..\UI\CCControlExtension\CCSpacer.cpp"
+					RelativePath="..\GUI\CCControlExtension\CCSpacer.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\UI\CCControlExtension\CCSpacer.h"
+					RelativePath="..\GUI\CCControlExtension\CCSpacer.h"
 					>
 				</File>
 			</Filter>
@@ -414,11 +414,11 @@
 				Name="CCScrollView"
 				>
 				<File
-					RelativePath="..\UI\CCScrollView\CCScrollView.cpp"
+					RelativePath="..\GUI\CCScrollView\CCScrollView.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\UI\CCScrollView\CCScrollView.h"
+					RelativePath="..\GUI\CCScrollView\CCScrollView.h"
 					>
 				</File>
 			</Filter>
diff --git a/extensions/proj.win32/libExtensions.vcxproj b/extensions/proj.win32/libExtensions.vcxproj
index 7848846401..9d757e0d63 100644
--- a/extensions/proj.win32/libExtensions.vcxproj
+++ b/extensions/proj.win32/libExtensions.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -96,19 +96,19 @@
     <ClCompile Include="..\CCBReader\CCScale9SpriteLoader.cpp" />
     <ClCompile Include="..\CCBReader\CCScrollViewLoader.cpp" />
     <ClCompile Include="..\CCBReader\CCSpriteLoader.cpp" />
-    <ClCompile Include="..\UI\CCControlExtension\CCControl.cpp" />
-    <ClCompile Include="..\UI\CCControlExtension\CCControlButton.cpp" />
-    <ClCompile Include="..\UI\CCControlExtension\CCControlColourPicker.cpp" />
-    <ClCompile Include="..\UI\CCControlExtension\CCControlHuePicker.cpp" />
-    <ClCompile Include="..\UI\CCControlExtension\CCControlSaturationBrightnessPicker.cpp" />
-    <ClCompile Include="..\UI\CCControlExtension\CCControlSlider.cpp" />
-    <ClCompile Include="..\UI\CCControlExtension\CCControlSwitch.cpp" />
-    <ClCompile Include="..\UI\CCControlExtension\CCControlUtils.cpp" />
-    <ClCompile Include="..\UI\CCControlExtension\CCInvocation.cpp" />
-    <ClCompile Include="..\UI\CCControlExtension\CCMenuPassive.cpp" />
-    <ClCompile Include="..\UI\CCControlExtension\CCScale9Sprite.cpp" />
-    <ClCompile Include="..\UI\CCControlExtension\CCSpacer.cpp" />
-    <ClCompile Include="..\UI\CCScrollView\CCScrollView.cpp" />
+    <ClCompile Include="..\GUI\CCControlExtension\CCControl.cpp" />
+    <ClCompile Include="..\GUI\CCControlExtension\CCControlButton.cpp" />
+    <ClCompile Include="..\GUI\CCControlExtension\CCControlColourPicker.cpp" />
+    <ClCompile Include="..\GUI\CCControlExtension\CCControlHuePicker.cpp" />
+    <ClCompile Include="..\GUI\CCControlExtension\CCControlSaturationBrightnessPicker.cpp" />
+    <ClCompile Include="..\GUI\CCControlExtension\CCControlSlider.cpp" />
+    <ClCompile Include="..\GUI\CCControlExtension\CCControlSwitch.cpp" />
+    <ClCompile Include="..\GUI\CCControlExtension\CCControlUtils.cpp" />
+    <ClCompile Include="..\GUI\CCControlExtension\CCInvocation.cpp" />
+    <ClCompile Include="..\GUI\CCControlExtension\CCMenuPassive.cpp" />
+    <ClCompile Include="..\GUI\CCControlExtension\CCScale9Sprite.cpp" />
+    <ClCompile Include="..\GUI\CCControlExtension\CCSpacer.cpp" />
+    <ClCompile Include="..\GUI\CCScrollView\CCScrollView.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\CCBReader\CCBFileLoader.h" />
@@ -132,20 +132,20 @@
     <ClInclude Include="..\CCBReader\CCScale9SpriteLoader.h" />
     <ClInclude Include="..\CCBReader\CCScrollViewLoader.h" />
     <ClInclude Include="..\CCBReader\CCSpriteLoader.h" />
-    <ClInclude Include="..\UI\CCControlExtension\CCControl.h" />
-    <ClInclude Include="..\UI\CCControlExtension\CCControlButton.h" />
-    <ClInclude Include="..\UI\CCControlExtension\CCControlColourPicker.h" />
-    <ClInclude Include="..\UI\CCControlExtension\CCControlExtensions.h" />
-    <ClInclude Include="..\UI\CCControlExtension\CCControlHuePicker.h" />
-    <ClInclude Include="..\UI\CCControlExtension\CCControlSaturationBrightnessPicker.h" />
-    <ClInclude Include="..\UI\CCControlExtension\CCControlSlider.h" />
-    <ClInclude Include="..\UI\CCControlExtension\CCControlSwitch.h" />
-    <ClInclude Include="..\UI\CCControlExtension\CCControlUtils.h" />
-    <ClInclude Include="..\UI\CCControlExtension\CCInvocation.h" />
-    <ClInclude Include="..\UI\CCControlExtension\CCMenuPassive.h" />
-    <ClInclude Include="..\UI\CCControlExtension\CCScale9Sprite.h" />
-    <ClInclude Include="..\UI\CCControlExtension\CCSpacer.h" />
-    <ClInclude Include="..\UI\CCScrollView\CCScrollView.h" />
+    <ClInclude Include="..\GUI\CCControlExtension\CCControl.h" />
+    <ClInclude Include="..\GUI\CCControlExtension\CCControlButton.h" />
+    <ClInclude Include="..\GUI\CCControlExtension\CCControlColourPicker.h" />
+    <ClInclude Include="..\GUI\CCControlExtension\CCControlExtensions.h" />
+    <ClInclude Include="..\GUI\CCControlExtension\CCControlHuePicker.h" />
+    <ClInclude Include="..\GUI\CCControlExtension\CCControlSaturationBrightnessPicker.h" />
+    <ClInclude Include="..\GUI\CCControlExtension\CCControlSlider.h" />
+    <ClInclude Include="..\GUI\CCControlExtension\CCControlSwitch.h" />
+    <ClInclude Include="..\GUI\CCControlExtension\CCControlUtils.h" />
+    <ClInclude Include="..\GUI\CCControlExtension\CCInvocation.h" />
+    <ClInclude Include="..\GUI\CCControlExtension\CCMenuPassive.h" />
+    <ClInclude Include="..\GUI\CCControlExtension\CCScale9Sprite.h" />
+    <ClInclude Include="..\GUI\CCControlExtension\CCSpacer.h" />
+    <ClInclude Include="..\GUI\CCScrollView\CCScrollView.h" />
     <ClInclude Include="..\cocos-ext.h" />
     <ClInclude Include="..\ExtensionMacros.h" />
   </ItemGroup>
diff --git a/extensions/proj.win32/libExtensions.vcxproj.filters b/extensions/proj.win32/libExtensions.vcxproj.filters
index 5f60101601..19e11451ea 100644
--- a/extensions/proj.win32/libExtensions.vcxproj.filters
+++ b/extensions/proj.win32/libExtensions.vcxproj.filters
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="CCBReader">
@@ -66,43 +66,43 @@
     <ClCompile Include="..\CCBReader\CCSpriteLoader.cpp">
       <Filter>CCBReader</Filter>
     </ClCompile>
-    <ClCompile Include="..\UI\CCControlExtension\CCControl.cpp">
+    <ClCompile Include="..\GUI\CCControlExtension\CCControl.cpp">
       <Filter>UI\CCControlExtension</Filter>
     </ClCompile>
-    <ClCompile Include="..\UI\CCControlExtension\CCControlButton.cpp">
+    <ClCompile Include="..\GUI\CCControlExtension\CCControlButton.cpp">
       <Filter>UI\CCControlExtension</Filter>
     </ClCompile>
-    <ClCompile Include="..\UI\CCControlExtension\CCControlColourPicker.cpp">
+    <ClCompile Include="..\GUI\CCControlExtension\CCControlColourPicker.cpp">
       <Filter>UI\CCControlExtension</Filter>
     </ClCompile>
-    <ClCompile Include="..\UI\CCControlExtension\CCControlHuePicker.cpp">
+    <ClCompile Include="..\GUI\CCControlExtension\CCControlHuePicker.cpp">
       <Filter>UI\CCControlExtension</Filter>
     </ClCompile>
-    <ClCompile Include="..\UI\CCControlExtension\CCControlSaturationBrightnessPicker.cpp">
+    <ClCompile Include="..\GUI\CCControlExtension\CCControlSaturationBrightnessPicker.cpp">
       <Filter>UI\CCControlExtension</Filter>
     </ClCompile>
-    <ClCompile Include="..\UI\CCControlExtension\CCControlSlider.cpp">
+    <ClCompile Include="..\GUI\CCControlExtension\CCControlSlider.cpp">
       <Filter>UI\CCControlExtension</Filter>
     </ClCompile>
-    <ClCompile Include="..\UI\CCControlExtension\CCControlSwitch.cpp">
+    <ClCompile Include="..\GUI\CCControlExtension\CCControlSwitch.cpp">
       <Filter>UI\CCControlExtension</Filter>
     </ClCompile>
-    <ClCompile Include="..\UI\CCControlExtension\CCControlUtils.cpp">
+    <ClCompile Include="..\GUI\CCControlExtension\CCControlUtils.cpp">
       <Filter>UI\CCControlExtension</Filter>
     </ClCompile>
-    <ClCompile Include="..\UI\CCControlExtension\CCInvocation.cpp">
+    <ClCompile Include="..\GUI\CCControlExtension\CCInvocation.cpp">
       <Filter>UI\CCControlExtension</Filter>
     </ClCompile>
-    <ClCompile Include="..\UI\CCControlExtension\CCMenuPassive.cpp">
+    <ClCompile Include="..\GUI\CCControlExtension\CCMenuPassive.cpp">
       <Filter>UI\CCControlExtension</Filter>
     </ClCompile>
-    <ClCompile Include="..\UI\CCControlExtension\CCScale9Sprite.cpp">
+    <ClCompile Include="..\GUI\CCControlExtension\CCScale9Sprite.cpp">
       <Filter>UI\CCControlExtension</Filter>
     </ClCompile>
-    <ClCompile Include="..\UI\CCControlExtension\CCSpacer.cpp">
+    <ClCompile Include="..\GUI\CCControlExtension\CCSpacer.cpp">
       <Filter>UI\CCControlExtension</Filter>
     </ClCompile>
-    <ClCompile Include="..\UI\CCScrollView\CCScrollView.cpp">
+    <ClCompile Include="..\GUI\CCScrollView\CCScrollView.cpp">
       <Filter>UI\CCScrollView</Filter>
     </ClCompile>
   </ItemGroup>
@@ -170,46 +170,46 @@
     <ClInclude Include="..\CCBReader\CCSpriteLoader.h">
       <Filter>CCBReader</Filter>
     </ClInclude>
-    <ClInclude Include="..\UI\CCControlExtension\CCControl.h">
+    <ClInclude Include="..\GUI\CCControlExtension\CCControl.h">
       <Filter>UI\CCControlExtension</Filter>
     </ClInclude>
-    <ClInclude Include="..\UI\CCControlExtension\CCControlButton.h">
+    <ClInclude Include="..\GUI\CCControlExtension\CCControlButton.h">
       <Filter>UI\CCControlExtension</Filter>
     </ClInclude>
-    <ClInclude Include="..\UI\CCControlExtension\CCControlColourPicker.h">
+    <ClInclude Include="..\GUI\CCControlExtension\CCControlColourPicker.h">
       <Filter>UI\CCControlExtension</Filter>
     </ClInclude>
-    <ClInclude Include="..\UI\CCControlExtension\CCControlExtensions.h">
+    <ClInclude Include="..\GUI\CCControlExtension\CCControlExtensions.h">
       <Filter>UI\CCControlExtension</Filter>
     </ClInclude>
-    <ClInclude Include="..\UI\CCControlExtension\CCControlHuePicker.h">
+    <ClInclude Include="..\GUI\CCControlExtension\CCControlHuePicker.h">
       <Filter>UI\CCControlExtension</Filter>
     </ClInclude>
-    <ClInclude Include="..\UI\CCControlExtension\CCControlSaturationBrightnessPicker.h">
+    <ClInclude Include="..\GUI\CCControlExtension\CCControlSaturationBrightnessPicker.h">
       <Filter>UI\CCControlExtension</Filter>
     </ClInclude>
-    <ClInclude Include="..\UI\CCControlExtension\CCControlSlider.h">
+    <ClInclude Include="..\GUI\CCControlExtension\CCControlSlider.h">
       <Filter>UI\CCControlExtension</Filter>
     </ClInclude>
-    <ClInclude Include="..\UI\CCControlExtension\CCControlSwitch.h">
+    <ClInclude Include="..\GUI\CCControlExtension\CCControlSwitch.h">
       <Filter>UI\CCControlExtension</Filter>
     </ClInclude>
-    <ClInclude Include="..\UI\CCControlExtension\CCControlUtils.h">
+    <ClInclude Include="..\GUI\CCControlExtension\CCControlUtils.h">
       <Filter>UI\CCControlExtension</Filter>
     </ClInclude>
-    <ClInclude Include="..\UI\CCControlExtension\CCInvocation.h">
+    <ClInclude Include="..\GUI\CCControlExtension\CCInvocation.h">
       <Filter>UI\CCControlExtension</Filter>
     </ClInclude>
-    <ClInclude Include="..\UI\CCControlExtension\CCMenuPassive.h">
+    <ClInclude Include="..\GUI\CCControlExtension\CCMenuPassive.h">
       <Filter>UI\CCControlExtension</Filter>
     </ClInclude>
-    <ClInclude Include="..\UI\CCControlExtension\CCScale9Sprite.h">
+    <ClInclude Include="..\GUI\CCControlExtension\CCScale9Sprite.h">
       <Filter>UI\CCControlExtension</Filter>
     </ClInclude>
-    <ClInclude Include="..\UI\CCControlExtension\CCSpacer.h">
+    <ClInclude Include="..\GUI\CCControlExtension\CCSpacer.h">
       <Filter>UI\CCControlExtension</Filter>
     </ClInclude>
-    <ClInclude Include="..\UI\CCScrollView\CCScrollView.h">
+    <ClInclude Include="..\GUI\CCScrollView\CCScrollView.h">
       <Filter>UI\CCScrollView</Filter>
     </ClInclude>
     <ClInclude Include="..\cocos-ext.h" />
diff --git a/samples/TestCpp/proj.ios/TestCpp.xcodeproj/project.pbxproj.REMOVED.git-id b/samples/TestCpp/proj.ios/TestCpp.xcodeproj/project.pbxproj.REMOVED.git-id
index a7122f3cb8..d64a5dc114 100644
--- a/samples/TestCpp/proj.ios/TestCpp.xcodeproj/project.pbxproj.REMOVED.git-id
+++ b/samples/TestCpp/proj.ios/TestCpp.xcodeproj/project.pbxproj.REMOVED.git-id
@@ -1 +1 @@
-da857ec78bd3072e568563ae4ee25a23c63295f9
\ No newline at end of file
+7dea09f758e229595c7992fee3cc0a0f0fb49f79
\ No newline at end of file
diff --git a/samples/TestCpp/proj.mac/TestCpp.xcodeproj/project.pbxproj.REMOVED.git-id b/samples/TestCpp/proj.mac/TestCpp.xcodeproj/project.pbxproj.REMOVED.git-id
index 08a23bc302..f3891d0888 100644
--- a/samples/TestCpp/proj.mac/TestCpp.xcodeproj/project.pbxproj.REMOVED.git-id
+++ b/samples/TestCpp/proj.mac/TestCpp.xcodeproj/project.pbxproj.REMOVED.git-id
@@ -1 +1 @@
-a1f5db702a5ea17ba27ce7c12c5e4873be9c09e5
\ No newline at end of file
+8873b812fe12491ceee455a2c4f997fdaea432d6
\ No newline at end of file