diff --git a/core/Shape/Shape.cpp b/core/Shape/ShapeBase.cpp
similarity index 100%
rename from core/Shape/Shape.cpp
rename to core/Shape/ShapeBase.cpp
diff --git a/project/vs2012/Easy2D.vcxproj b/project/vs2012/Easy2D.vcxproj
index afbbc96d..af63fb15 100644
--- a/project/vs2012/Easy2D.vcxproj
+++ b/project/vs2012/Easy2D.vcxproj
@@ -32,8 +32,8 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\core\Action\Action.cpp" />
-    <ClCompile Include="..\..\core\Action\ActionCallback.cpp" />
     <ClCompile Include="..\..\core\Action\ActionDelay.cpp" />
+    <ClCompile Include="..\..\core\Action\ActionFunc.cpp" />
     <ClCompile Include="..\..\core\Action\ActionGradual.cpp" />
     <ClCompile Include="..\..\core\Action\ActionLoop.cpp" />
     <ClCompile Include="..\..\core\Action\ActionMoveBy.cpp" />
@@ -54,17 +54,17 @@
     <ClCompile Include="..\..\core\Base\Window.cpp" />
     <ClCompile Include="..\..\core\Common\Font.cpp" />
     <ClCompile Include="..\..\core\Common\Image.cpp" />
-    <ClCompile Include="..\..\core\Common\Listener.cpp" />
     <ClCompile Include="..\..\core\Common\Object.cpp" />
     <ClCompile Include="..\..\core\Common\Point.cpp" />
     <ClCompile Include="..\..\core\Common\Scene.cpp" />
     <ClCompile Include="..\..\core\Common\Size.cpp" />
     <ClCompile Include="..\..\core\Common\String.cpp" />
     <ClCompile Include="..\..\core\Manager\ActionManager.cpp" />
+    <ClCompile Include="..\..\core\Manager\CollisionManager.cpp" />
+    <ClCompile Include="..\..\core\Manager\InputManager.cpp" />
     <ClCompile Include="..\..\core\Manager\MusicManager.cpp" />
     <ClCompile Include="..\..\core\Manager\ObjectManager.cpp" />
     <ClCompile Include="..\..\core\Manager\SceneManager.cpp" />
-    <ClCompile Include="..\..\core\Manager\ShapeManager.cpp" />
     <ClCompile Include="..\..\core\Manager\TimerManager.cpp" />
     <ClCompile Include="..\..\core\Node\Button.cpp" />
     <ClCompile Include="..\..\core\Node\ButtonToggle.cpp" />
@@ -72,11 +72,14 @@
     <ClCompile Include="..\..\core\Node\Node.cpp" />
     <ClCompile Include="..\..\core\Node\Sprite.cpp" />
     <ClCompile Include="..\..\core\Node\Text.cpp" />
-    <ClCompile Include="..\..\core\Shape\Circle.cpp" />
-    <ClCompile Include="..\..\core\Shape\Ellipse.cpp" />
-    <ClCompile Include="..\..\core\Shape\Rect.cpp" />
-    <ClCompile Include="..\..\core\Shape\Shape.cpp" />
+    <ClCompile Include="..\..\core\Shape\ShapeBase.cpp" />
+    <ClCompile Include="..\..\core\Shape\ShapeCircle.cpp" />
+    <ClCompile Include="..\..\core\Shape\ShapeEllipse.cpp" />
+    <ClCompile Include="..\..\core\Shape\ShapeRectangle.cpp" />
+    <ClCompile Include="..\..\core\Tool\CollisionListener.cpp" />
     <ClCompile Include="..\..\core\Tool\Data.cpp" />
+    <ClCompile Include="..\..\core\Tool\InputListener.cpp" />
+    <ClCompile Include="..\..\core\Tool\Listener.cpp" />
     <ClCompile Include="..\..\core\Tool\Music.cpp" />
     <ClCompile Include="..\..\core\Tool\Path.cpp" />
     <ClCompile Include="..\..\core\Tool\Random.cpp" />
diff --git a/project/vs2012/Easy2D.vcxproj.filters b/project/vs2012/Easy2D.vcxproj.filters
index af474b94..65d1fc4f 100644
--- a/project/vs2012/Easy2D.vcxproj.filters
+++ b/project/vs2012/Easy2D.vcxproj.filters
@@ -42,9 +42,6 @@
     <ClCompile Include="..\..\core\Action\Action.cpp">
       <Filter>Action</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Action\ActionCallback.cpp">
-      <Filter>Action</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\core\Action\ActionDelay.cpp">
       <Filter>Action</Filter>
     </ClCompile>
@@ -156,33 +153,15 @@
     <ClCompile Include="..\..\core\Node\Text.cpp">
       <Filter>Node</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Shape\Circle.cpp">
-      <Filter>Shape</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Shape\Ellipse.cpp">
-      <Filter>Shape</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Shape\Shape.cpp">
-      <Filter>Shape</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\core\Manager\MusicManager.cpp">
       <Filter>Manager</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Manager\ShapeManager.cpp">
-      <Filter>Manager</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Shape\Rect.cpp">
-      <Filter>Shape</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\core\Common\Point.cpp">
       <Filter>Common</Filter>
     </ClCompile>
     <ClCompile Include="..\..\core\Common\Size.cpp">
       <Filter>Common</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Common\Listener.cpp">
-      <Filter>Common</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\core\Tool\Path.cpp">
       <Filter>Tool</Filter>
     </ClCompile>
@@ -201,5 +180,35 @@
     <ClCompile Include="..\..\core\Tool\Data.cpp">
       <Filter>Tool</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\core\Tool\CollisionListener.cpp">
+      <Filter>Tool</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Tool\InputListener.cpp">
+      <Filter>Tool</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Tool\Listener.cpp">
+      <Filter>Tool</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Shape\ShapeCircle.cpp">
+      <Filter>Shape</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Shape\ShapeEllipse.cpp">
+      <Filter>Shape</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Shape\ShapeRectangle.cpp">
+      <Filter>Shape</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Shape\ShapeBase.cpp">
+      <Filter>Shape</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Manager\CollisionManager.cpp">
+      <Filter>Manager</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Manager\InputManager.cpp">
+      <Filter>Manager</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Action\ActionFunc.cpp">
+      <Filter>Action</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/project/vs2013/Easy2D.vcxproj b/project/vs2013/Easy2D.vcxproj
index be50bb92..207a5d58 100644
--- a/project/vs2013/Easy2D.vcxproj
+++ b/project/vs2013/Easy2D.vcxproj
@@ -170,8 +170,8 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\core\Action\Action.cpp" />
-    <ClCompile Include="..\..\core\Action\ActionCallback.cpp" />
     <ClCompile Include="..\..\core\Action\ActionDelay.cpp" />
+    <ClCompile Include="..\..\core\Action\ActionFunc.cpp" />
     <ClCompile Include="..\..\core\Action\ActionGradual.cpp" />
     <ClCompile Include="..\..\core\Action\ActionLoop.cpp" />
     <ClCompile Include="..\..\core\Action\ActionMoveBy.cpp" />
@@ -192,17 +192,17 @@
     <ClCompile Include="..\..\core\Base\Window.cpp" />
     <ClCompile Include="..\..\core\Common\Font.cpp" />
     <ClCompile Include="..\..\core\Common\Image.cpp" />
-    <ClCompile Include="..\..\core\Common\Listener.cpp" />
     <ClCompile Include="..\..\core\Common\Object.cpp" />
     <ClCompile Include="..\..\core\Common\Point.cpp" />
     <ClCompile Include="..\..\core\Common\Scene.cpp" />
     <ClCompile Include="..\..\core\Common\Size.cpp" />
     <ClCompile Include="..\..\core\Common\String.cpp" />
     <ClCompile Include="..\..\core\Manager\ActionManager.cpp" />
+    <ClCompile Include="..\..\core\Manager\CollisionManager.cpp" />
+    <ClCompile Include="..\..\core\Manager\InputManager.cpp" />
     <ClCompile Include="..\..\core\Manager\MusicManager.cpp" />
     <ClCompile Include="..\..\core\Manager\ObjectManager.cpp" />
     <ClCompile Include="..\..\core\Manager\SceneManager.cpp" />
-    <ClCompile Include="..\..\core\Manager\ShapeManager.cpp" />
     <ClCompile Include="..\..\core\Manager\TimerManager.cpp" />
     <ClCompile Include="..\..\core\Node\Button.cpp" />
     <ClCompile Include="..\..\core\Node\ButtonToggle.cpp" />
@@ -210,11 +210,14 @@
     <ClCompile Include="..\..\core\Node\Node.cpp" />
     <ClCompile Include="..\..\core\Node\Sprite.cpp" />
     <ClCompile Include="..\..\core\Node\Text.cpp" />
-    <ClCompile Include="..\..\core\Shape\Circle.cpp" />
-    <ClCompile Include="..\..\core\Shape\Ellipse.cpp" />
-    <ClCompile Include="..\..\core\Shape\Rect.cpp" />
-    <ClCompile Include="..\..\core\Shape\Shape.cpp" />
+    <ClCompile Include="..\..\core\Shape\ShapeBase.cpp" />
+    <ClCompile Include="..\..\core\Shape\ShapeCircle.cpp" />
+    <ClCompile Include="..\..\core\Shape\ShapeEllipse.cpp" />
+    <ClCompile Include="..\..\core\Shape\ShapeRectangle.cpp" />
+    <ClCompile Include="..\..\core\Tool\CollisionListener.cpp" />
     <ClCompile Include="..\..\core\Tool\Data.cpp" />
+    <ClCompile Include="..\..\core\Tool\InputListener.cpp" />
+    <ClCompile Include="..\..\core\Tool\Listener.cpp" />
     <ClCompile Include="..\..\core\Tool\Music.cpp" />
     <ClCompile Include="..\..\core\Tool\Path.cpp" />
     <ClCompile Include="..\..\core\Tool\Random.cpp" />
diff --git a/project/vs2013/Easy2D.vcxproj.filters b/project/vs2013/Easy2D.vcxproj.filters
index 8f7d001b..243db43b 100644
--- a/project/vs2013/Easy2D.vcxproj.filters
+++ b/project/vs2013/Easy2D.vcxproj.filters
@@ -42,9 +42,6 @@
     <ClCompile Include="..\..\core\Action\Action.cpp">
       <Filter>Action</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Action\ActionCallback.cpp">
-      <Filter>Action</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\core\Action\ActionDelay.cpp">
       <Filter>Action</Filter>
     </ClCompile>
@@ -156,33 +153,15 @@
     <ClCompile Include="..\..\core\Node\Text.cpp">
       <Filter>Node</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Shape\Circle.cpp">
-      <Filter>Shape</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Shape\Ellipse.cpp">
-      <Filter>Shape</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Shape\Shape.cpp">
-      <Filter>Shape</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Manager\ShapeManager.cpp">
-      <Filter>Manager</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\core\Manager\MusicManager.cpp">
       <Filter>Manager</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Shape\Rect.cpp">
-      <Filter>Shape</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\core\Common\Point.cpp">
       <Filter>Common</Filter>
     </ClCompile>
     <ClCompile Include="..\..\core\Common\Size.cpp">
       <Filter>Common</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Common\Listener.cpp">
-      <Filter>Common</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\core\Tool\Path.cpp">
       <Filter>Tool</Filter>
     </ClCompile>
@@ -201,5 +180,35 @@
     <ClCompile Include="..\..\core\Tool\Data.cpp">
       <Filter>Tool</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\core\Tool\CollisionListener.cpp">
+      <Filter>Tool</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Tool\InputListener.cpp">
+      <Filter>Tool</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Tool\Listener.cpp">
+      <Filter>Tool</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Shape\ShapeBase.cpp">
+      <Filter>Shape</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Shape\ShapeCircle.cpp">
+      <Filter>Shape</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Shape\ShapeEllipse.cpp">
+      <Filter>Shape</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Shape\ShapeRectangle.cpp">
+      <Filter>Shape</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Manager\CollisionManager.cpp">
+      <Filter>Manager</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Manager\InputManager.cpp">
+      <Filter>Manager</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Action\ActionFunc.cpp">
+      <Filter>Action</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/project/vs2017/Easy2D.vcxproj b/project/vs2017/Easy2D.vcxproj
index 32d153ec..45e04270 100644
--- a/project/vs2017/Easy2D.vcxproj
+++ b/project/vs2017/Easy2D.vcxproj
@@ -231,10 +231,10 @@
     <ClCompile Include="..\..\core\Node\Node.cpp" />
     <ClCompile Include="..\..\core\Node\Sprite.cpp" />
     <ClCompile Include="..\..\core\Node\Text.cpp" />
+    <ClCompile Include="..\..\core\Shape\ShapeBase.cpp" />
     <ClCompile Include="..\..\core\Shape\ShapeCircle.cpp" />
     <ClCompile Include="..\..\core\Shape\ShapeEllipse.cpp" />
     <ClCompile Include="..\..\core\Shape\ShapeRectangle.cpp" />
-    <ClCompile Include="..\..\core\Shape\Shape.cpp" />
     <ClCompile Include="..\..\core\Tool\CollisionListener.cpp" />
     <ClCompile Include="..\..\core\Tool\Data.cpp" />
     <ClCompile Include="..\..\core\Tool\InputListener.cpp" />
diff --git a/project/vs2017/Easy2D.vcxproj.filters b/project/vs2017/Easy2D.vcxproj.filters
index 3b509560..7bf79952 100644
--- a/project/vs2017/Easy2D.vcxproj.filters
+++ b/project/vs2017/Easy2D.vcxproj.filters
@@ -144,9 +144,6 @@
     <ClCompile Include="..\..\core\Manager\MusicManager.cpp">
       <Filter>Manager</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Shape\Shape.cpp">
-      <Filter>Shape</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\core\Common\Point.cpp">
       <Filter>Common</Filter>
     </ClCompile>
@@ -198,6 +195,9 @@
     <ClCompile Include="..\..\core\Action\ActionFunc.cpp">
       <Filter>Action</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\core\Shape\ShapeBase.cpp">
+      <Filter>Shape</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\core\etools.h" />