From 5d7c3f4f9a7ead7b56726ec158356c9081d48248 Mon Sep 17 00:00:00 2001
From: Nomango <nomango@qq.com>
Date: Sun, 24 May 2020 11:26:21 +0800
Subject: [PATCH] refactoring project

---
 projects/kiwano/kiwano.vcxproj                |  47 +++---
 projects/kiwano/kiwano.vcxproj.filters        | 150 +++++++++---------
 src/kiwano-audio/AudioModule.cpp              |   2 +-
 src/kiwano-audio/AudioModule.h                |   2 +-
 src/kiwano-audio/Sound.cpp                    |   2 +-
 src/kiwano-audio/Sound.h                      |   2 +-
 src/kiwano-audio/SoundPlayer.h                |   2 +-
 src/kiwano-audio/Transcoder.cpp               |   3 +-
 src/kiwano-imgui/ImGuiModule.cpp              |   3 +-
 src/kiwano-imgui/ImGuiModule.h                |   2 +-
 src/kiwano-network/HttpModule.cpp             |   2 +-
 src/kiwano-network/HttpModule.h               |   2 +-
 src/kiwano-network/HttpRequest.h              |   2 +-
 src/kiwano/2d/Actor.cpp                       |   2 +-
 src/kiwano/2d/Actor.h                         |   4 +-
 src/kiwano/2d/Canvas.cpp                      |   2 +-
 src/kiwano/2d/Component.h                     |   2 +-
 src/kiwano/2d/DebugActor.cpp                  |   2 +-
 src/kiwano/2d/ShapeActor.cpp                  |   2 +-
 src/kiwano/2d/Stage.cpp                       |   2 +-
 src/kiwano/2d/TextActor.cpp                   |   2 +-
 src/kiwano/2d/Transition.cpp                  |   2 +-
 src/kiwano/2d/action/Action.h                 |   2 +-
 src/kiwano/2d/action/ActionGroup.cpp          |   2 +-
 src/kiwano/2d/action/ActionScheduler.cpp      |   2 +-
 src/kiwano/2d/action/ActionTween.h            |   2 +-
 src/kiwano/{core => base}/Director.cpp        |   2 +-
 src/kiwano/{core => base}/Director.h          |   2 +-
 src/kiwano/{core => base}/Module.cpp          |   2 +-
 src/kiwano/{core => base}/Module.h            |   0
 src/kiwano/{core => base}/ObjectBase.cpp      |   4 +-
 src/kiwano/{core => base}/ObjectBase.h        |   4 +-
 src/kiwano/{core => base}/RefCounter.cpp      |   2 +-
 src/kiwano/{core => base}/RefCounter.h        |   0
 src/kiwano/core/Exception.cpp                 |   2 +-
 src/kiwano/core/Exception.h                   |   2 +-
 src/kiwano/core/Resource.cpp                  |   2 +-
 src/kiwano/core/SmartPtr.hpp                  |   2 +-
 src/kiwano/core/Time.cpp                      |   2 +-
 src/kiwano/{core => }/event/Event.cpp         |   2 +-
 src/kiwano/{core => }/event/Event.h           |   2 +-
 .../{core => event}/EventDispatcher.cpp       |   4 +-
 src/kiwano/{core => event}/EventDispatcher.h  |   2 +-
 src/kiwano/{core => event}/EventListener.cpp  |   2 +-
 src/kiwano/{core => event}/EventListener.h    |   7 +-
 src/kiwano/{core => }/event/EventType.h       |   0
 src/kiwano/event/Events.h                     |  26 +++
 src/kiwano/{core => }/event/KeyEvent.cpp      |   2 +-
 src/kiwano/{core => }/event/KeyEvent.h        |   2 +-
 src/kiwano/{core => }/event/MouseEvent.cpp    |   2 +-
 src/kiwano/{core => }/event/MouseEvent.h      |   2 +-
 src/kiwano/{core => }/event/WindowEvent.cpp   |   2 +-
 src/kiwano/{core => }/event/WindowEvent.h     |   2 +-
 src/kiwano/kiwano.h                           |  31 ++--
 src/kiwano/platform/Application.cpp           |   4 +-
 src/kiwano/platform/Application.h             |   4 +-
 src/kiwano/platform/Input.cpp                 |   5 +-
 src/kiwano/platform/Input.h                   |   4 +-
 src/kiwano/platform/Window.h                  |   4 +-
 src/kiwano/platform/win32/WindowImpl.cpp      |   6 +-
 src/kiwano/platform/win32/libraries.cpp       |   2 +-
 src/kiwano/render/Brush.cpp                   |   2 +-
 .../render/DirectX/D2DDeviceResources.cpp     |   2 +-
 .../render/DirectX/D3D10DeviceResources.cpp   |   2 +-
 .../render/DirectX/D3D11DeviceResources.cpp   |   2 +-
 .../render/DirectX/RenderContextImpl.cpp      |   2 +-
 src/kiwano/render/DirectX/RendererImpl.cpp    |   4 +-
 src/kiwano/render/Frame.h                     |   2 +-
 src/kiwano/render/FrameSequence.cpp           |   2 +-
 src/kiwano/render/GifImage.cpp                |   2 +-
 src/kiwano/render/NativeObject.h              |   2 +-
 src/kiwano/render/Renderer.cpp                |   2 +-
 src/kiwano/render/Renderer.h                  |   2 +-
 src/kiwano/render/TextureCache.cpp            |   2 +-
 src/kiwano/utils/EventTicker.h                |   4 +-
 src/kiwano/utils/LocalStorage.h               |   2 +-
 src/kiwano/{core => utils}/Logger.cpp         |   2 +-
 src/kiwano/{core => utils}/Logger.h           |   0
 src/kiwano/utils/ResourceCache.cpp            |   2 +-
 src/kiwano/utils/TaskScheduler.cpp            |   2 +-
 src/kiwano/utils/Timer.h                      |   2 +-
 81 files changed, 236 insertions(+), 198 deletions(-)
 rename src/kiwano/{core => base}/Director.cpp (99%)
 rename src/kiwano/{core => base}/Director.h (98%)
 rename src/kiwano/{core => base}/Module.cpp (97%)
 rename src/kiwano/{core => base}/Module.h (100%)
 rename src/kiwano/{core => base}/ObjectBase.cpp (98%)
 rename src/kiwano/{core => base}/ObjectBase.h (98%)
 rename src/kiwano/{core => base}/RefCounter.cpp (97%)
 rename src/kiwano/{core => base}/RefCounter.h (100%)
 rename src/kiwano/{core => }/event/Event.cpp (76%)
 rename src/kiwano/{core => }/event/Event.h (98%)
 rename src/kiwano/{core => event}/EventDispatcher.cpp (98%)
 rename src/kiwano/{core => event}/EventDispatcher.h (98%)
 rename src/kiwano/{core => event}/EventListener.cpp (97%)
 rename src/kiwano/{core => event}/EventListener.h (96%)
 rename src/kiwano/{core => }/event/EventType.h (100%)
 create mode 100644 src/kiwano/event/Events.h
 rename src/kiwano/{core => }/event/KeyEvent.cpp (90%)
 rename src/kiwano/{core => }/event/KeyEvent.h (98%)
 rename src/kiwano/{core => }/event/MouseEvent.cpp (94%)
 rename src/kiwano/{core => }/event/MouseEvent.h (98%)
 rename src/kiwano/{core => }/event/WindowEvent.cpp (94%)
 rename src/kiwano/{core => }/event/WindowEvent.h (98%)
 rename src/kiwano/{core => utils}/Logger.cpp (99%)
 rename src/kiwano/{core => utils}/Logger.h (100%)

diff --git a/projects/kiwano/kiwano.vcxproj b/projects/kiwano/kiwano.vcxproj
index 2161d336..3946e0bf 100644
--- a/projects/kiwano/kiwano.vcxproj
+++ b/projects/kiwano/kiwano.vcxproj
@@ -12,16 +12,14 @@
     <ClInclude Include="..\..\src\kiwano\2d\Button.h" />
     <ClInclude Include="..\..\src\kiwano\2d\Component.h" />
     <ClInclude Include="..\..\src\kiwano\2d\GifSprite.h" />
+    <ClInclude Include="..\..\src\kiwano\base\Director.h" />
+    <ClInclude Include="..\..\src\kiwano\base\Module.h" />
+    <ClInclude Include="..\..\src\kiwano\base\ObjectBase.h" />
+    <ClInclude Include="..\..\src\kiwano\base\RefCounter.h" />
     <ClInclude Include="..\..\src\kiwano\core\Allocator.h" />
     <ClInclude Include="..\..\src\kiwano\core\Any.h" />
     <ClInclude Include="..\..\src\kiwano\core\Cloneable.h" />
     <ClInclude Include="..\..\src\kiwano\core\Common.h" />
-    <ClInclude Include="..\..\src\kiwano\core\Director.h" />
-    <ClInclude Include="..\..\src\kiwano\core\event\Event.h" />
-    <ClInclude Include="..\..\src\kiwano\core\event\EventType.h" />
-    <ClInclude Include="..\..\src\kiwano\core\event\KeyEvent.h" />
-    <ClInclude Include="..\..\src\kiwano\core\event\MouseEvent.h" />
-    <ClInclude Include="..\..\src\kiwano\core\event\WindowEvent.h" />
     <ClInclude Include="..\..\src\kiwano\core\Exception.h" />
     <ClInclude Include="..\..\src\kiwano\core\Function.h" />
     <ClInclude Include="..\..\src\kiwano\core\IntrusiveList.h" />
@@ -31,6 +29,14 @@
     <ClInclude Include="..\..\src\kiwano\core\Singleton.h" />
     <ClInclude Include="..\..\src\kiwano\core\String.h" />
     <ClInclude Include="..\..\src\kiwano\core\Time.h" />
+    <ClInclude Include="..\..\src\kiwano\event\Event.h" />
+    <ClInclude Include="..\..\src\kiwano\event\EventDispatcher.h" />
+    <ClInclude Include="..\..\src\kiwano\event\EventListener.h" />
+    <ClInclude Include="..\..\src\kiwano\event\Events.h" />
+    <ClInclude Include="..\..\src\kiwano\event\EventType.h" />
+    <ClInclude Include="..\..\src\kiwano\event\KeyEvent.h" />
+    <ClInclude Include="..\..\src\kiwano\event\MouseEvent.h" />
+    <ClInclude Include="..\..\src\kiwano\event\WindowEvent.h" />
     <ClInclude Include="..\..\src\kiwano\kiwano.h" />
     <ClInclude Include="..\..\src\kiwano\config.h" />
     <ClInclude Include="..\..\src\kiwano\macros.h" />
@@ -43,12 +49,6 @@
     <ClInclude Include="..\..\src\kiwano\2d\Sprite.h" />
     <ClInclude Include="..\..\src\kiwano\2d\TextActor.h" />
     <ClInclude Include="..\..\src\kiwano\2d\Transition.h" />
-    <ClInclude Include="..\..\src\kiwano\core\Module.h" />
-    <ClInclude Include="..\..\src\kiwano\core\EventDispatcher.h" />
-    <ClInclude Include="..\..\src\kiwano\core\EventListener.h" />
-    <ClInclude Include="..\..\src\kiwano\core\Logger.h" />
-    <ClInclude Include="..\..\src\kiwano\core\ObjectBase.h" />
-    <ClInclude Include="..\..\src\kiwano\core\RefCounter.h" />
     <ClInclude Include="..\..\src\kiwano\core\Resource.h" />
     <ClInclude Include="..\..\src\kiwano\core\SmartPtr.hpp" />
     <ClInclude Include="..\..\src\kiwano\math\Constants.h" />
@@ -98,6 +98,7 @@
     <ClInclude Include="..\..\src\kiwano\utils\EventTicker.h" />
     <ClInclude Include="..\..\src\kiwano\utils\Json.h" />
     <ClInclude Include="..\..\src\kiwano\utils\LocalStorage.h" />
+    <ClInclude Include="..\..\src\kiwano\utils\Logger.h" />
     <ClInclude Include="..\..\src\kiwano\utils\ResourceCache.h" />
     <ClInclude Include="..\..\src\kiwano\utils\Task.h" />
     <ClInclude Include="..\..\src\kiwano\utils\TaskScheduler.h" />
@@ -126,23 +127,22 @@
     <ClCompile Include="..\..\src\kiwano\2d\Sprite.cpp" />
     <ClCompile Include="..\..\src\kiwano\2d\TextActor.cpp" />
     <ClCompile Include="..\..\src\kiwano\2d\Transition.cpp" />
+    <ClCompile Include="..\..\src\kiwano\base\Director.cpp" />
+    <ClCompile Include="..\..\src\kiwano\base\Module.cpp" />
+    <ClCompile Include="..\..\src\kiwano\base\ObjectBase.cpp" />
+    <ClCompile Include="..\..\src\kiwano\base\RefCounter.cpp" />
     <ClCompile Include="..\..\src\kiwano\core\Allocator.cpp" />
-    <ClCompile Include="..\..\src\kiwano\core\Module.cpp" />
-    <ClCompile Include="..\..\src\kiwano\core\Director.cpp" />
-    <ClCompile Include="..\..\src\kiwano\core\EventDispatcher.cpp" />
-    <ClCompile Include="..\..\src\kiwano\core\EventListener.cpp" />
-    <ClCompile Include="..\..\src\kiwano\core\event\Event.cpp" />
-    <ClCompile Include="..\..\src\kiwano\core\event\KeyEvent.cpp" />
-    <ClCompile Include="..\..\src\kiwano\core\event\MouseEvent.cpp" />
-    <ClCompile Include="..\..\src\kiwano\core\event\WindowEvent.cpp" />
     <ClCompile Include="..\..\src\kiwano\core\Exception.cpp" />
     <ClCompile Include="..\..\src\kiwano\core\Library.cpp" />
-    <ClCompile Include="..\..\src\kiwano\core\Logger.cpp" />
-    <ClCompile Include="..\..\src\kiwano\core\ObjectBase.cpp" />
-    <ClCompile Include="..\..\src\kiwano\core\RefCounter.cpp" />
     <ClCompile Include="..\..\src\kiwano\core\Resource.cpp" />
     <ClCompile Include="..\..\src\kiwano\core\String.cpp" />
     <ClCompile Include="..\..\src\kiwano\core\Time.cpp" />
+    <ClCompile Include="..\..\src\kiwano\event\Event.cpp" />
+    <ClCompile Include="..\..\src\kiwano\event\EventDispatcher.cpp" />
+    <ClCompile Include="..\..\src\kiwano\event\EventListener.cpp" />
+    <ClCompile Include="..\..\src\kiwano\event\KeyEvent.cpp" />
+    <ClCompile Include="..\..\src\kiwano\event\MouseEvent.cpp" />
+    <ClCompile Include="..\..\src\kiwano\event\WindowEvent.cpp" />
     <ClCompile Include="..\..\src\kiwano\platform\Application.cpp" />
     <ClCompile Include="..\..\src\kiwano\platform\FileSystem.cpp" />
     <ClCompile Include="..\..\src\kiwano\platform\Input.cpp" />
@@ -174,6 +174,7 @@
     <ClCompile Include="..\..\src\kiwano\render\TextureCache.cpp" />
     <ClCompile Include="..\..\src\kiwano\utils\EventTicker.cpp" />
     <ClCompile Include="..\..\src\kiwano\utils\LocalStorage.cpp" />
+    <ClCompile Include="..\..\src\kiwano\utils\Logger.cpp" />
     <ClCompile Include="..\..\src\kiwano\utils\ResourceCache.cpp" />
     <ClCompile Include="..\..\src\kiwano\utils\Task.cpp" />
     <ClCompile Include="..\..\src\kiwano\utils\TaskScheduler.cpp" />
diff --git a/projects/kiwano/kiwano.vcxproj.filters b/projects/kiwano/kiwano.vcxproj.filters
index 4bbf8004..06293856 100644
--- a/projects/kiwano/kiwano.vcxproj.filters
+++ b/projects/kiwano/kiwano.vcxproj.filters
@@ -22,15 +22,18 @@
     <Filter Include="platform\win32">
       <UniqueIdentifier>{e84dcf9a-e650-473e-8c9c-193804ab9e76}</UniqueIdentifier>
     </Filter>
-    <Filter Include="core\event">
-      <UniqueIdentifier>{c629aedd-ffb9-4bc1-82c3-f50e77c82e77}</UniqueIdentifier>
-    </Filter>
     <Filter Include="render">
       <UniqueIdentifier>{adb44ca9-674a-4b77-993f-d65193d8ab06}</UniqueIdentifier>
     </Filter>
     <Filter Include="render\DirectX">
       <UniqueIdentifier>{fd281702-0006-46d2-8fd1-28c502464164}</UniqueIdentifier>
     </Filter>
+    <Filter Include="base">
+      <UniqueIdentifier>{f514ae4f-2f6a-4d47-aa38-245628d6e01c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="event">
+      <UniqueIdentifier>{b0d28d20-bfaf-4816-8415-28c20ecf9fac}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\kiwano\2d\Canvas.h">
@@ -42,12 +45,6 @@
     <ClInclude Include="..\..\src\kiwano\2d\Transition.h">
       <Filter>2d</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\kiwano\core\EventDispatcher.h">
-      <Filter>core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\kiwano\core\EventListener.h">
-      <Filter>core</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\kiwano\core\Resource.h">
       <Filter>core</Filter>
     </ClInclude>
@@ -108,12 +105,6 @@
     <ClInclude Include="..\..\src\kiwano\2d\action\ActionWalk.h">
       <Filter>2d\action</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\kiwano\core\Logger.h">
-      <Filter>core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\kiwano\core\ObjectBase.h">
-      <Filter>core</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\kiwano\utils\LocalStorage.h">
       <Filter>utils</Filter>
     </ClInclude>
@@ -135,36 +126,15 @@
     <ClInclude Include="..\..\src\kiwano\2d\TextActor.h">
       <Filter>2d</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\kiwano\core\RefCounter.h">
-      <Filter>core</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\kiwano\platform\win32\ComPtr.hpp">
       <Filter>platform\win32</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\kiwano\platform\win32\libraries.h">
       <Filter>platform\win32</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\kiwano\core\event\Event.h">
-      <Filter>core\event</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\kiwano\core\event\EventType.h">
-      <Filter>core\event</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\kiwano\core\event\KeyEvent.h">
-      <Filter>core\event</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\kiwano\core\event\MouseEvent.h">
-      <Filter>core\event</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\kiwano\core\event\WindowEvent.h">
-      <Filter>core\event</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\kiwano\2d\Button.h">
       <Filter>2d</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\kiwano\core\Director.h">
-      <Filter>core</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\kiwano\core\Singleton.h">
       <Filter>core</Filter>
     </ClInclude>
@@ -267,9 +237,6 @@
     <ClInclude Include="..\..\src\kiwano\render\Layer.h">
       <Filter>render</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\kiwano\core\Module.h">
-      <Filter>core</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\kiwano\platform\Runner.h">
       <Filter>platform</Filter>
     </ClInclude>
@@ -339,6 +306,45 @@
     <ClInclude Include="..\..\src\kiwano\render\DirectX\D3DDeviceResources.h">
       <Filter>render\DirectX</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\kiwano\utils\Logger.h">
+      <Filter>utils</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\kiwano\base\Director.h">
+      <Filter>base</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\kiwano\base\Module.h">
+      <Filter>base</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\kiwano\base\ObjectBase.h">
+      <Filter>base</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\kiwano\base\RefCounter.h">
+      <Filter>base</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\kiwano\event\Event.h">
+      <Filter>event</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\kiwano\event\EventDispatcher.h">
+      <Filter>event</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\kiwano\event\EventListener.h">
+      <Filter>event</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\kiwano\event\Events.h">
+      <Filter>event</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\kiwano\event\EventType.h">
+      <Filter>event</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\kiwano\event\KeyEvent.h">
+      <Filter>event</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\kiwano\event\MouseEvent.h">
+      <Filter>event</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\kiwano\event\WindowEvent.h">
+      <Filter>event</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\kiwano\2d\Canvas.cpp">
@@ -350,12 +356,6 @@
     <ClCompile Include="..\..\src\kiwano\2d\Transition.cpp">
       <Filter>2d</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\kiwano\core\EventDispatcher.cpp">
-      <Filter>core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\kiwano\core\EventListener.cpp">
-      <Filter>core</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\kiwano\core\Resource.cpp">
       <Filter>core</Filter>
     </ClCompile>
@@ -398,12 +398,6 @@
     <ClCompile Include="..\..\src\kiwano\2d\action\ActionWalk.cpp">
       <Filter>2d\action</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\kiwano\core\Logger.cpp">
-      <Filter>core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\kiwano\core\ObjectBase.cpp">
-      <Filter>core</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\kiwano\utils\LocalStorage.cpp">
       <Filter>utils</Filter>
     </ClCompile>
@@ -425,30 +419,12 @@
     <ClCompile Include="..\..\src\kiwano\2d\TextActor.cpp">
       <Filter>2d</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\kiwano\core\RefCounter.cpp">
-      <Filter>core</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\kiwano\platform\win32\libraries.cpp">
       <Filter>platform\win32</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\kiwano\core\event\Event.cpp">
-      <Filter>core\event</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\kiwano\core\event\KeyEvent.cpp">
-      <Filter>core\event</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\kiwano\core\event\MouseEvent.cpp">
-      <Filter>core\event</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\kiwano\core\event\WindowEvent.cpp">
-      <Filter>core\event</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\kiwano\2d\Button.cpp">
       <Filter>2d</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\kiwano\core\Director.cpp">
-      <Filter>core</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\kiwano\platform\win32\WindowImpl.cpp">
       <Filter>platform\win32</Filter>
     </ClCompile>
@@ -518,9 +494,6 @@
     <ClCompile Include="..\..\src\kiwano\render\Layer.cpp">
       <Filter>render</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\kiwano\core\Module.cpp">
-      <Filter>core</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\kiwano\platform\Runner.cpp">
       <Filter>platform</Filter>
     </ClCompile>
@@ -560,6 +533,39 @@
     <ClCompile Include="..\..\src\kiwano\2d\action\ActionScheduler.cpp">
       <Filter>2d\action</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\kiwano\utils\Logger.cpp">
+      <Filter>utils</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\kiwano\base\Director.cpp">
+      <Filter>base</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\kiwano\base\Module.cpp">
+      <Filter>base</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\kiwano\base\ObjectBase.cpp">
+      <Filter>base</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\kiwano\base\RefCounter.cpp">
+      <Filter>base</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\kiwano\event\Event.cpp">
+      <Filter>event</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\kiwano\event\EventDispatcher.cpp">
+      <Filter>event</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\kiwano\event\EventListener.cpp">
+      <Filter>event</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\kiwano\event\KeyEvent.cpp">
+      <Filter>event</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\kiwano\event\MouseEvent.cpp">
+      <Filter>event</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\kiwano\event\WindowEvent.cpp">
+      <Filter>event</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="suppress_warning.ruleset" />
diff --git a/src/kiwano-audio/AudioModule.cpp b/src/kiwano-audio/AudioModule.cpp
index 8b0fbeb2..d8d2c189 100644
--- a/src/kiwano-audio/AudioModule.cpp
+++ b/src/kiwano-audio/AudioModule.cpp
@@ -20,8 +20,8 @@
 
 #include <kiwano-audio/AudioModule.h>
 #include <kiwano-audio/libraries.h>
-#include <kiwano/core/Logger.h>
 #include <kiwano/core/Exception.h>
+#include <kiwano/utils/Logger.h>
 
 namespace kiwano
 {
diff --git a/src/kiwano-audio/AudioModule.h b/src/kiwano-audio/AudioModule.h
index 9d69c4de..a97e4078 100644
--- a/src/kiwano-audio/AudioModule.h
+++ b/src/kiwano-audio/AudioModule.h
@@ -22,7 +22,7 @@
 #include <kiwano-audio/Sound.h>
 #include <kiwano-audio/Transcoder.h>
 #include <kiwano/core/Common.h>
-#include <kiwano/core/Module.h>
+#include <kiwano/base/Module.h>
 #include <xaudio2.h>
 
 namespace kiwano
diff --git a/src/kiwano-audio/Sound.cpp b/src/kiwano-audio/Sound.cpp
index f344e118..99a590c3 100644
--- a/src/kiwano-audio/Sound.cpp
+++ b/src/kiwano-audio/Sound.cpp
@@ -20,7 +20,7 @@
 
 #include <kiwano-audio/AudioModule.h>
 #include <kiwano-audio/Sound.h>
-#include <kiwano/core/Logger.h>
+#include <kiwano/utils/Logger.h>
 #include <kiwano/platform/FileSystem.h>
 
 namespace kiwano
diff --git a/src/kiwano-audio/Sound.h b/src/kiwano-audio/Sound.h
index 375da28d..299d9083 100644
--- a/src/kiwano-audio/Sound.h
+++ b/src/kiwano-audio/Sound.h
@@ -20,8 +20,8 @@
 
 #pragma once
 #include <kiwano-audio/Transcoder.h>
-#include <kiwano/core/ObjectBase.h>
 #include <kiwano/core/Resource.h>
+#include <kiwano/base/ObjectBase.h>
 #include <kiwano/platform/win32/ComPtr.hpp>
 #include <xaudio2.h>
 
diff --git a/src/kiwano-audio/SoundPlayer.h b/src/kiwano-audio/SoundPlayer.h
index 62d4e25c..789c66b5 100644
--- a/src/kiwano-audio/SoundPlayer.h
+++ b/src/kiwano-audio/SoundPlayer.h
@@ -20,7 +20,7 @@
 
 #pragma once
 #include <kiwano-audio/Sound.h>
-#include <kiwano/core/ObjectBase.h>
+#include <kiwano/base/ObjectBase.h>
 
 namespace kiwano
 {
diff --git a/src/kiwano-audio/Transcoder.cpp b/src/kiwano-audio/Transcoder.cpp
index 64af27c7..448e999e 100644
--- a/src/kiwano-audio/Transcoder.cpp
+++ b/src/kiwano-audio/Transcoder.cpp
@@ -25,9 +25,8 @@
 #include <kiwano-audio/Transcoder.h>
 #include <kiwano-audio/libraries.h>
 #include <kiwano/core/Common.h>
-#include <kiwano/core/Logger.h>
 #include <kiwano/core/Resource.h>
-#include <kiwano/macros.h>
+#include <kiwano/utils/Logger.h>
 #include <kiwano/platform/win32/ComPtr.hpp>
 #include <kiwano/platform/win32/libraries.h>
 
diff --git a/src/kiwano-imgui/ImGuiModule.cpp b/src/kiwano-imgui/ImGuiModule.cpp
index 4d9763f9..d5025254 100644
--- a/src/kiwano-imgui/ImGuiModule.cpp
+++ b/src/kiwano-imgui/ImGuiModule.cpp
@@ -2,8 +2,7 @@
 
 
 #include <kiwano/core/Common.h>
-#include <kiwano/core/event/KeyEvent.h>
-#include <kiwano/core/event/MouseEvent.h>
+#include <kiwano/event/Events.h>
 #include <kiwano/platform/Input.h>
 #include <kiwano/platform/Application.h>
 #include <kiwano/render/Renderer.h>
diff --git a/src/kiwano-imgui/ImGuiModule.h b/src/kiwano-imgui/ImGuiModule.h
index ce4ac610..b5c2d159 100644
--- a/src/kiwano-imgui/ImGuiModule.h
+++ b/src/kiwano-imgui/ImGuiModule.h
@@ -20,7 +20,7 @@
 
 #pragma once
 #include <kiwano/core/Common.h>
-#include <kiwano/core/Module.h>
+#include <kiwano/base/Module.h>
 #include <kiwano/platform/Window.h>
 
 namespace kiwano
diff --git a/src/kiwano-network/HttpModule.cpp b/src/kiwano-network/HttpModule.cpp
index 6b3865e2..7bd9f26a 100644
--- a/src/kiwano-network/HttpModule.cpp
+++ b/src/kiwano-network/HttpModule.cpp
@@ -20,7 +20,7 @@
 
 #include <chrono>
 #include <thread>
-#include <kiwano/core/Logger.h>
+#include <kiwano/utils/Logger.h>
 #include <kiwano/platform/Application.h>
 #include <kiwano-network/HttpRequest.h>
 #include <kiwano-network/HttpResponse.hpp>
diff --git a/src/kiwano-network/HttpModule.h b/src/kiwano-network/HttpModule.h
index 59264e64..60d326d2 100644
--- a/src/kiwano-network/HttpModule.h
+++ b/src/kiwano-network/HttpModule.h
@@ -23,7 +23,7 @@
 #include <mutex>
 #include <condition_variable>
 #include <kiwano/core/Common.h>
-#include <kiwano/core/Module.h>
+#include <kiwano/base/Module.h>
 
 namespace kiwano
 {
diff --git a/src/kiwano-network/HttpRequest.h b/src/kiwano-network/HttpRequest.h
index 626c3b56..1760c3ea 100644
--- a/src/kiwano-network/HttpRequest.h
+++ b/src/kiwano-network/HttpRequest.h
@@ -20,7 +20,7 @@
 
 #pragma once
 #include <kiwano/core/Common.h>
-#include <kiwano/core/ObjectBase.h>
+#include <kiwano/base/ObjectBase.h>
 #include <kiwano/utils/Json.h>
 
 namespace kiwano
diff --git a/src/kiwano/2d/Actor.cpp b/src/kiwano/2d/Actor.cpp
index 85cc83c3..f94ae3fa 100644
--- a/src/kiwano/2d/Actor.cpp
+++ b/src/kiwano/2d/Actor.cpp
@@ -20,7 +20,7 @@
 
 #include <kiwano/2d/Actor.h>
 #include <kiwano/2d/Stage.h>
-#include <kiwano/core/Logger.h>
+#include <kiwano/utils/Logger.h>
 #include <kiwano/render/Renderer.h>
 
 namespace kiwano
diff --git a/src/kiwano/2d/Actor.h b/src/kiwano/2d/Actor.h
index 8ebc92d2..802a70ed 100644
--- a/src/kiwano/2d/Actor.h
+++ b/src/kiwano/2d/Actor.h
@@ -20,9 +20,9 @@
 
 #pragma once
 #include <kiwano/math/Math.h>
-#include <kiwano/core/ObjectBase.h>
+#include <kiwano/base/ObjectBase.h>
 #include <kiwano/core/Time.h>
-#include <kiwano/core/EventDispatcher.h>
+#include <kiwano/event/EventDispatcher.h>
 #include <kiwano/utils/TaskScheduler.h>
 #include <kiwano/2d/action/ActionScheduler.h>
 #include <kiwano/2d/Component.h>
diff --git a/src/kiwano/2d/Canvas.cpp b/src/kiwano/2d/Canvas.cpp
index 0a272d3e..aa9a0694 100644
--- a/src/kiwano/2d/Canvas.cpp
+++ b/src/kiwano/2d/Canvas.cpp
@@ -19,7 +19,7 @@
 // THE SOFTWARE.
 
 #include <kiwano/2d/Canvas.h>
-#include <kiwano/core/Logger.h>
+#include <kiwano/utils/Logger.h>
 
 namespace kiwano
 {
diff --git a/src/kiwano/2d/Component.h b/src/kiwano/2d/Component.h
index 3830b8ba..9d486cc6 100644
--- a/src/kiwano/2d/Component.h
+++ b/src/kiwano/2d/Component.h
@@ -20,7 +20,7 @@
 
 #pragma once
 #include <kiwano/core/Time.h>
-#include <kiwano/core/ObjectBase.h>
+#include <kiwano/base/ObjectBase.h>
 #include <kiwano/core/IntrusiveList.h>
 #include <kiwano/render/RenderContext.h>
 
diff --git a/src/kiwano/2d/DebugActor.cpp b/src/kiwano/2d/DebugActor.cpp
index 65d78975..9e39f268 100644
--- a/src/kiwano/2d/DebugActor.cpp
+++ b/src/kiwano/2d/DebugActor.cpp
@@ -19,7 +19,7 @@
 // THE SOFTWARE.
 
 #include <kiwano/2d/DebugActor.h>
-#include <kiwano/core/Logger.h>
+#include <kiwano/utils/Logger.h>
 #include <kiwano/render/Renderer.h>
 #include <psapi.h>
 
diff --git a/src/kiwano/2d/ShapeActor.cpp b/src/kiwano/2d/ShapeActor.cpp
index a9714e48..5186451a 100644
--- a/src/kiwano/2d/ShapeActor.cpp
+++ b/src/kiwano/2d/ShapeActor.cpp
@@ -19,7 +19,7 @@
 // THE SOFTWARE.
 
 #include <kiwano/2d/ShapeActor.h>
-#include <kiwano/core/Logger.h>
+#include <kiwano/utils/Logger.h>
 #include <kiwano/render/Renderer.h>
 
 namespace kiwano
diff --git a/src/kiwano/2d/Stage.cpp b/src/kiwano/2d/Stage.cpp
index 24ae8606..ad4b3d36 100644
--- a/src/kiwano/2d/Stage.cpp
+++ b/src/kiwano/2d/Stage.cpp
@@ -19,7 +19,7 @@
 // THE SOFTWARE.
 
 #include <kiwano/2d/Stage.h>
-#include <kiwano/core/Logger.h>
+#include <kiwano/utils/Logger.h>
 #include <kiwano/render/Renderer.h>
 
 namespace kiwano
diff --git a/src/kiwano/2d/TextActor.cpp b/src/kiwano/2d/TextActor.cpp
index 5c8b7ea4..dfe0010d 100644
--- a/src/kiwano/2d/TextActor.cpp
+++ b/src/kiwano/2d/TextActor.cpp
@@ -19,7 +19,7 @@
 // THE SOFTWARE.
 
 #include <kiwano/2d/TextActor.h>
-#include <kiwano/core/Logger.h>
+#include <kiwano/utils/Logger.h>
 #include <kiwano/render/Renderer.h>
 
 namespace kiwano
diff --git a/src/kiwano/2d/Transition.cpp b/src/kiwano/2d/Transition.cpp
index d831bc10..acf0c722 100644
--- a/src/kiwano/2d/Transition.cpp
+++ b/src/kiwano/2d/Transition.cpp
@@ -21,7 +21,7 @@
 #include <kiwano/2d/Actor.h>
 #include <kiwano/2d/Stage.h>
 #include <kiwano/2d/Transition.h>
-#include <kiwano/core/Logger.h>
+#include <kiwano/utils/Logger.h>
 #include <kiwano/platform/Window.h>
 #include <kiwano/render/Renderer.h>
 
diff --git a/src/kiwano/2d/action/Action.h b/src/kiwano/2d/action/Action.h
index 8bc67bbb..0df4595a 100644
--- a/src/kiwano/2d/action/Action.h
+++ b/src/kiwano/2d/action/Action.h
@@ -21,7 +21,7 @@
 #pragma once
 #include <kiwano/core/Common.h>
 #include <kiwano/core/Cloneable.h>
-#include <kiwano/core/ObjectBase.h>
+#include <kiwano/base/ObjectBase.h>
 #include <kiwano/core/SmartPtr.hpp>
 #include <kiwano/core/Time.h>
 #include <kiwano/core/IntrusiveList.h>
diff --git a/src/kiwano/2d/action/ActionGroup.cpp b/src/kiwano/2d/action/ActionGroup.cpp
index 520065c3..3aa633d5 100644
--- a/src/kiwano/2d/action/ActionGroup.cpp
+++ b/src/kiwano/2d/action/ActionGroup.cpp
@@ -20,7 +20,7 @@
 
 #include <kiwano/2d/Actor.h>
 #include <kiwano/2d/action/ActionGroup.h>
-#include <kiwano/core/Logger.h>
+#include <kiwano/utils/Logger.h>
 
 namespace kiwano
 {
diff --git a/src/kiwano/2d/action/ActionScheduler.cpp b/src/kiwano/2d/action/ActionScheduler.cpp
index 4d8b8765..4e1fb3fb 100644
--- a/src/kiwano/2d/action/ActionScheduler.cpp
+++ b/src/kiwano/2d/action/ActionScheduler.cpp
@@ -20,7 +20,7 @@
 
 #include <kiwano/2d/Actor.h>
 #include <kiwano/2d/action/ActionScheduler.h>
-#include <kiwano/core/Logger.h>
+#include <kiwano/utils/Logger.h>
 
 namespace kiwano
 {
diff --git a/src/kiwano/2d/action/ActionTween.h b/src/kiwano/2d/action/ActionTween.h
index 6f271cd9..82b777ed 100644
--- a/src/kiwano/2d/action/ActionTween.h
+++ b/src/kiwano/2d/action/ActionTween.h
@@ -20,7 +20,7 @@
 
 #pragma once
 #include <kiwano/2d/action/Action.h>
-#include <kiwano/core/Logger.h>
+#include <kiwano/utils/Logger.h>
 
 namespace kiwano
 {
diff --git a/src/kiwano/core/Director.cpp b/src/kiwano/base/Director.cpp
similarity index 99%
rename from src/kiwano/core/Director.cpp
rename to src/kiwano/base/Director.cpp
index 84f4612f..6b221030 100644
--- a/src/kiwano/core/Director.cpp
+++ b/src/kiwano/base/Director.cpp
@@ -22,7 +22,7 @@
 #include <kiwano/2d/DebugActor.h>
 #include <kiwano/2d/Stage.h>
 #include <kiwano/2d/Transition.h>
-#include <kiwano/core/Director.h>
+#include <kiwano/base/Director.h>
 #include <kiwano/render/RenderContext.h>
 
 namespace kiwano
diff --git a/src/kiwano/core/Director.h b/src/kiwano/base/Director.h
similarity index 98%
rename from src/kiwano/core/Director.h
rename to src/kiwano/base/Director.h
index 8aca9387..fd054672 100644
--- a/src/kiwano/core/Director.h
+++ b/src/kiwano/base/Director.h
@@ -22,7 +22,7 @@
 #include <kiwano/2d/Actor.h>
 #include <kiwano/2d/Stage.h>
 #include <kiwano/2d/Transition.h>
-#include <kiwano/core/Module.h>
+#include <kiwano/base/Module.h>
 
 namespace kiwano
 {
diff --git a/src/kiwano/core/Module.cpp b/src/kiwano/base/Module.cpp
similarity index 97%
rename from src/kiwano/core/Module.cpp
rename to src/kiwano/base/Module.cpp
index 38a3182b..009100bb 100644
--- a/src/kiwano/core/Module.cpp
+++ b/src/kiwano/base/Module.cpp
@@ -18,7 +18,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#include <kiwano/core/Module.h>
+#include <kiwano/base/Module.h>
 
 namespace kiwano
 {
diff --git a/src/kiwano/core/Module.h b/src/kiwano/base/Module.h
similarity index 100%
rename from src/kiwano/core/Module.h
rename to src/kiwano/base/Module.h
diff --git a/src/kiwano/core/ObjectBase.cpp b/src/kiwano/base/ObjectBase.cpp
similarity index 98%
rename from src/kiwano/core/ObjectBase.cpp
rename to src/kiwano/base/ObjectBase.cpp
index 7fa059f2..588e0a6e 100644
--- a/src/kiwano/core/ObjectBase.cpp
+++ b/src/kiwano/base/ObjectBase.cpp
@@ -18,8 +18,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#include <kiwano/core/ObjectBase.h>
-#include <kiwano/core/Logger.h>
+#include <kiwano/base/ObjectBase.h>
+#include <kiwano/utils/Logger.h>
 #include <kiwano/utils/Json.h>
 #include <typeinfo>
 
diff --git a/src/kiwano/core/ObjectBase.h b/src/kiwano/base/ObjectBase.h
similarity index 98%
rename from src/kiwano/core/ObjectBase.h
rename to src/kiwano/base/ObjectBase.h
index 38f3d653..6761c77c 100644
--- a/src/kiwano/core/ObjectBase.h
+++ b/src/kiwano/base/ObjectBase.h
@@ -19,11 +19,11 @@
 // THE SOFTWARE.
 
 #pragma once
+#include <kiwano/macros.h>
 #include <kiwano/core/Common.h>
 #include <kiwano/core/Serializable.h>
-#include <kiwano/core/RefCounter.h>
 #include <kiwano/core/SmartPtr.hpp>
-#include <kiwano/macros.h>
+#include <kiwano/base/RefCounter.h>
 
 namespace kiwano
 {
diff --git a/src/kiwano/core/RefCounter.cpp b/src/kiwano/base/RefCounter.cpp
similarity index 97%
rename from src/kiwano/core/RefCounter.cpp
rename to src/kiwano/base/RefCounter.cpp
index dec905ba..27e44e5e 100644
--- a/src/kiwano/core/RefCounter.cpp
+++ b/src/kiwano/base/RefCounter.cpp
@@ -18,7 +18,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#include <kiwano/core/RefCounter.h>
+#include <kiwano/base/RefCounter.h>
 
 namespace kiwano
 {
diff --git a/src/kiwano/core/RefCounter.h b/src/kiwano/base/RefCounter.h
similarity index 100%
rename from src/kiwano/core/RefCounter.h
rename to src/kiwano/base/RefCounter.h
diff --git a/src/kiwano/core/Exception.cpp b/src/kiwano/core/Exception.cpp
index 09f454ac..f5346406 100644
--- a/src/kiwano/core/Exception.cpp
+++ b/src/kiwano/core/Exception.cpp
@@ -20,7 +20,7 @@
 
 #include <kiwano/core/Exception.h>
 #include <kiwano/core/Library.h>
-#include <kiwano/core/Logger.h>
+#include <kiwano/utils/Logger.h>
 
 #if defined(KGE_PLATFORM_WINDOWS)
 #include <memory>
diff --git a/src/kiwano/core/Exception.h b/src/kiwano/core/Exception.h
index 9994c376..3ad24cfc 100644
--- a/src/kiwano/core/Exception.h
+++ b/src/kiwano/core/Exception.h
@@ -20,7 +20,7 @@
 
 #pragma once
 #include <kiwano/core/Common.h>
-#include <kiwano/core/Logger.h>
+#include <kiwano/utils/Logger.h>
 #include <stdexcept>
 #include <system_error>
 
diff --git a/src/kiwano/core/Resource.cpp b/src/kiwano/core/Resource.cpp
index ad44a5ff..99424288 100644
--- a/src/kiwano/core/Resource.cpp
+++ b/src/kiwano/core/Resource.cpp
@@ -19,7 +19,7 @@
 // THE SOFTWARE.
 
 #include <iostream>
-#include <kiwano/core/Logger.h>
+#include <kiwano/utils/Logger.h>
 #include <kiwano/core/Resource.h>
 
 namespace kiwano
diff --git a/src/kiwano/core/SmartPtr.hpp b/src/kiwano/core/SmartPtr.hpp
index ad01496c..f569bb2b 100644
--- a/src/kiwano/core/SmartPtr.hpp
+++ b/src/kiwano/core/SmartPtr.hpp
@@ -22,7 +22,7 @@
 #include <utility>
 #include <type_traits>
 #include <kiwano/core/Common.h>
-#include <kiwano/core/RefCounter.h>
+#include <kiwano/base/RefCounter.h>
 
 namespace kiwano
 {
diff --git a/src/kiwano/core/Time.cpp b/src/kiwano/core/Time.cpp
index cd3a1f1d..e08fba77 100644
--- a/src/kiwano/core/Time.cpp
+++ b/src/kiwano/core/Time.cpp
@@ -19,7 +19,7 @@
 // THE SOFTWARE.
 
 #include <kiwano/core/Exception.h>
-#include <kiwano/core/Logger.h>
+#include <kiwano/utils/Logger.h>
 #include <kiwano/core/Time.h>
 #include <regex>
 #include <unordered_map>
diff --git a/src/kiwano/core/event/Event.cpp b/src/kiwano/event/Event.cpp
similarity index 76%
rename from src/kiwano/core/event/Event.cpp
rename to src/kiwano/event/Event.cpp
index d793f723..b39e0fb0 100644
--- a/src/kiwano/core/event/Event.cpp
+++ b/src/kiwano/event/Event.cpp
@@ -1,4 +1,4 @@
-#include <kiwano/core/event/Event.h>
+#include <kiwano/event/Event.h>
 
 namespace kiwano
 {
diff --git a/src/kiwano/core/event/Event.h b/src/kiwano/event/Event.h
similarity index 98%
rename from src/kiwano/core/event/Event.h
rename to src/kiwano/event/Event.h
index 09d182e4..16242d27 100644
--- a/src/kiwano/core/event/Event.h
+++ b/src/kiwano/event/Event.h
@@ -20,7 +20,7 @@
 
 #pragma once
 #include <kiwano/core/SmartPtr.hpp>
-#include <kiwano/core/event/EventType.h>
+#include <kiwano/event/EventType.h>
 #include <kiwano/math/Math.h>
 
 namespace kiwano
diff --git a/src/kiwano/core/EventDispatcher.cpp b/src/kiwano/event/EventDispatcher.cpp
similarity index 98%
rename from src/kiwano/core/EventDispatcher.cpp
rename to src/kiwano/event/EventDispatcher.cpp
index 8bde41f2..fa97b779 100644
--- a/src/kiwano/core/EventDispatcher.cpp
+++ b/src/kiwano/event/EventDispatcher.cpp
@@ -18,8 +18,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#include <kiwano/core/EventDispatcher.h>
-#include <kiwano/core/Logger.h>
+#include <kiwano/event/EventDispatcher.h>
+#include <kiwano/utils/Logger.h>
 
 namespace kiwano
 {
diff --git a/src/kiwano/core/EventDispatcher.h b/src/kiwano/event/EventDispatcher.h
similarity index 98%
rename from src/kiwano/core/EventDispatcher.h
rename to src/kiwano/event/EventDispatcher.h
index 2eff0bf2..3f53cd81 100644
--- a/src/kiwano/core/EventDispatcher.h
+++ b/src/kiwano/event/EventDispatcher.h
@@ -19,7 +19,7 @@
 // THE SOFTWARE.
 
 #pragma once
-#include <kiwano/core/EventListener.h>
+#include <kiwano/event/EventListener.h>
 
 namespace kiwano
 {
diff --git a/src/kiwano/core/EventListener.cpp b/src/kiwano/event/EventListener.cpp
similarity index 97%
rename from src/kiwano/core/EventListener.cpp
rename to src/kiwano/event/EventListener.cpp
index 79846f30..1549d5d3 100644
--- a/src/kiwano/core/EventListener.cpp
+++ b/src/kiwano/event/EventListener.cpp
@@ -19,7 +19,7 @@
 // THE SOFTWARE.
 
 #pragma once
-#include <kiwano/core/EventListener.h>
+#include <kiwano/event/EventListener.h>
 
 namespace kiwano
 {
diff --git a/src/kiwano/core/EventListener.h b/src/kiwano/event/EventListener.h
similarity index 96%
rename from src/kiwano/core/EventListener.h
rename to src/kiwano/event/EventListener.h
index 2aee0e19..59d9a10d 100644
--- a/src/kiwano/core/EventListener.h
+++ b/src/kiwano/event/EventListener.h
@@ -20,13 +20,10 @@
 
 #pragma once
 #include <kiwano/core/Common.h>
-#include <kiwano/core/ObjectBase.h>
+#include <kiwano/base/ObjectBase.h>
 #include <kiwano/core/SmartPtr.hpp>
 #include <kiwano/core/IntrusiveList.h>
-#include <kiwano/core/event/Event.h>
-#include <kiwano/core/event/KeyEvent.h>
-#include <kiwano/core/event/MouseEvent.h>
-#include <kiwano/core/event/WindowEvent.h>
+#include <kiwano/event/Events.h>
 
 namespace kiwano
 {
diff --git a/src/kiwano/core/event/EventType.h b/src/kiwano/event/EventType.h
similarity index 100%
rename from src/kiwano/core/event/EventType.h
rename to src/kiwano/event/EventType.h
diff --git a/src/kiwano/event/Events.h b/src/kiwano/event/Events.h
new file mode 100644
index 00000000..13312ad8
--- /dev/null
+++ b/src/kiwano/event/Events.h
@@ -0,0 +1,26 @@
+// Copyright (c) 2016-2018 Kiwano - Nomango
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#pragma once
+
+#include <kiwano/event/Event.h>
+#include <kiwano/event/KeyEvent.h>
+#include <kiwano/event/MouseEvent.h>
+#include <kiwano/event/WindowEvent.h>
diff --git a/src/kiwano/core/event/KeyEvent.cpp b/src/kiwano/event/KeyEvent.cpp
similarity index 90%
rename from src/kiwano/core/event/KeyEvent.cpp
rename to src/kiwano/event/KeyEvent.cpp
index 0d60eb22..f654ffd1 100644
--- a/src/kiwano/core/event/KeyEvent.cpp
+++ b/src/kiwano/event/KeyEvent.cpp
@@ -1,4 +1,4 @@
-#include <kiwano/core/event/KeyEvent.h>
+#include <kiwano/event/KeyEvent.h>
 
 namespace kiwano
 {
diff --git a/src/kiwano/core/event/KeyEvent.h b/src/kiwano/event/KeyEvent.h
similarity index 98%
rename from src/kiwano/core/event/KeyEvent.h
rename to src/kiwano/event/KeyEvent.h
index 66ac2cb7..a56ed119 100644
--- a/src/kiwano/core/event/KeyEvent.h
+++ b/src/kiwano/event/KeyEvent.h
@@ -20,7 +20,7 @@
 
 #pragma once
 #include <kiwano/core/Keys.h>
-#include <kiwano/core/event/Event.h>
+#include <kiwano/event/Event.h>
 
 namespace kiwano
 {
diff --git a/src/kiwano/core/event/MouseEvent.cpp b/src/kiwano/event/MouseEvent.cpp
similarity index 94%
rename from src/kiwano/core/event/MouseEvent.cpp
rename to src/kiwano/event/MouseEvent.cpp
index 81c84d1d..7833bea4 100644
--- a/src/kiwano/core/event/MouseEvent.cpp
+++ b/src/kiwano/event/MouseEvent.cpp
@@ -1,4 +1,4 @@
-#include <kiwano/core/event/MouseEvent.h>
+#include <kiwano/event/MouseEvent.h>
 
 namespace kiwano
 {
diff --git a/src/kiwano/core/event/MouseEvent.h b/src/kiwano/event/MouseEvent.h
similarity index 98%
rename from src/kiwano/core/event/MouseEvent.h
rename to src/kiwano/event/MouseEvent.h
index b6371797..29731d39 100644
--- a/src/kiwano/core/event/MouseEvent.h
+++ b/src/kiwano/event/MouseEvent.h
@@ -20,7 +20,7 @@
 
 #pragma once
 #include <kiwano/core/Keys.h>
-#include <kiwano/core/event/Event.h>
+#include <kiwano/event/Event.h>
 #include <kiwano/math/Math.h>
 
 namespace kiwano
diff --git a/src/kiwano/core/event/WindowEvent.cpp b/src/kiwano/event/WindowEvent.cpp
similarity index 94%
rename from src/kiwano/core/event/WindowEvent.cpp
rename to src/kiwano/event/WindowEvent.cpp
index 37cafb2b..1d07214d 100644
--- a/src/kiwano/core/event/WindowEvent.cpp
+++ b/src/kiwano/event/WindowEvent.cpp
@@ -1,4 +1,4 @@
-#include <kiwano/core/event/WindowEvent.h>
+#include <kiwano/event/WindowEvent.h>
 
 namespace kiwano
 {
diff --git a/src/kiwano/core/event/WindowEvent.h b/src/kiwano/event/WindowEvent.h
similarity index 98%
rename from src/kiwano/core/event/WindowEvent.h
rename to src/kiwano/event/WindowEvent.h
index 26a28e0d..4370422d 100644
--- a/src/kiwano/core/event/WindowEvent.h
+++ b/src/kiwano/event/WindowEvent.h
@@ -19,7 +19,7 @@
 // THE SOFTWARE.
 
 #pragma once
-#include <kiwano/core/event/Event.h>
+#include <kiwano/event/Event.h>
 
 namespace kiwano
 {
diff --git a/src/kiwano/kiwano.h b/src/kiwano/kiwano.h
index 86e32e0f..8062e660 100644
--- a/src/kiwano/kiwano.h
+++ b/src/kiwano/kiwano.h
@@ -44,18 +44,30 @@
 //
 
 #include <kiwano/core/Common.h>
-#include <kiwano/core/Director.h>
-#include <kiwano/core/EventDispatcher.h>
-#include <kiwano/core/EventListener.h>
-#include <kiwano/core/Logger.h>
-#include <kiwano/core/ObjectBase.h>
 #include <kiwano/core/Resource.h>
 #include <kiwano/core/SmartPtr.hpp>
 #include <kiwano/core/Time.h>
-#include <kiwano/core/event/Event.h>
-#include <kiwano/core/event/KeyEvent.h>
-#include <kiwano/core/event/MouseEvent.h>
-#include <kiwano/core/event/WindowEvent.h>
+
+//
+// base
+//
+
+#include <kiwano/base/RefCounter.h>
+#include <kiwano/base/ObjectBase.h>
+#include <kiwano/base/Director.h>
+#include <kiwano/base/Module.h>
+
+
+//
+// event
+//
+
+#include <kiwano/event/Event.h>
+#include <kiwano/event/KeyEvent.h>
+#include <kiwano/event/MouseEvent.h>
+#include <kiwano/event/WindowEvent.h>
+#include <kiwano/event/EventListener.h>
+#include <kiwano/event/EventDispatcher.h>
 
 //
 // renderer
@@ -112,6 +124,7 @@
 // utils
 //
 
+#include <kiwano/utils/Logger.h>
 #include <kiwano/utils/LocalStorage.h>
 #include <kiwano/utils/ResourceCache.h>
 #include <kiwano/utils/UserData.h>
diff --git a/src/kiwano/platform/Application.cpp b/src/kiwano/platform/Application.cpp
index b3f0c3c2..78ac7109 100644
--- a/src/kiwano/platform/Application.cpp
+++ b/src/kiwano/platform/Application.cpp
@@ -20,8 +20,8 @@
 
 #include <kiwano/platform/Application.h>
 #include <kiwano/platform/Input.h>
-#include <kiwano/core/Director.h>
-#include <kiwano/core/Logger.h>
+#include <kiwano/base/Director.h>
+#include <kiwano/utils/Logger.h>
 #include <kiwano/render/Renderer.h>
 #include <kiwano/render/TextureCache.h>
 #include <kiwano/utils/ResourceCache.h>
diff --git a/src/kiwano/platform/Application.h b/src/kiwano/platform/Application.h
index 5c2d4e87..2a803e1c 100644
--- a/src/kiwano/platform/Application.h
+++ b/src/kiwano/platform/Application.h
@@ -21,10 +21,10 @@
 #pragma once
 #include <mutex>
 #include <kiwano/core/Common.h>
-#include <kiwano/core/Module.h>
+#include <kiwano/base/Module.h>
 #include <kiwano/core/Time.h>
 #include <kiwano/core/Singleton.h>
-#include <kiwano/core/event/Event.h>
+#include <kiwano/event/Event.h>
 #include <kiwano/platform/Runner.h>
 #include <kiwano/platform/Window.h>
 #include <kiwano/utils/Timer.h>
diff --git a/src/kiwano/platform/Input.cpp b/src/kiwano/platform/Input.cpp
index d79c49a5..8dd82307 100644
--- a/src/kiwano/platform/Input.cpp
+++ b/src/kiwano/platform/Input.cpp
@@ -18,9 +18,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#include <kiwano/core/Logger.h>
-#include <kiwano/core/event/KeyEvent.h>
-#include <kiwano/core/event/MouseEvent.h>
+#include <kiwano/utils/Logger.h>
+#include <kiwano/event/Events.h>
 #include <kiwano/platform/Input.h>
 
 namespace kiwano
diff --git a/src/kiwano/platform/Input.h b/src/kiwano/platform/Input.h
index 0759bc55..d2a72793 100644
--- a/src/kiwano/platform/Input.h
+++ b/src/kiwano/platform/Input.h
@@ -21,9 +21,9 @@
 #pragma once
 #include <array>
 #include <kiwano/core/Common.h>
-#include <kiwano/core/Module.h>
+#include <kiwano/base/Module.h>
 #include <kiwano/core/Keys.h>
-#include <kiwano/core/event/Event.h>
+#include <kiwano/event/Event.h>
 #include <kiwano/macros.h>
 #include <kiwano/math/Math.h>
 
diff --git a/src/kiwano/platform/Window.h b/src/kiwano/platform/Window.h
index 284cb1db..61324ba9 100644
--- a/src/kiwano/platform/Window.h
+++ b/src/kiwano/platform/Window.h
@@ -20,8 +20,8 @@
 
 #pragma once
 #include <kiwano/core/Common.h>
-#include <kiwano/core/ObjectBase.h>
-#include <kiwano/core/event/Event.h>
+#include <kiwano/base/ObjectBase.h>
+#include <kiwano/event/Event.h>
 #include <kiwano/math/Math.h>
 
 namespace kiwano
diff --git a/src/kiwano/platform/win32/WindowImpl.cpp b/src/kiwano/platform/win32/WindowImpl.cpp
index 4bf1f36c..83116760 100644
--- a/src/kiwano/platform/win32/WindowImpl.cpp
+++ b/src/kiwano/platform/win32/WindowImpl.cpp
@@ -26,10 +26,8 @@
 #include <array>
 #include <kiwano/core/Keys.h>
 #include <kiwano/core/Exception.h>
-#include <kiwano/core/Logger.h>
-#include <kiwano/core/event/KeyEvent.h>
-#include <kiwano/core/event/MouseEvent.h>
-#include <kiwano/core/event/WindowEvent.h>
+#include <kiwano/utils/Logger.h>
+#include <kiwano/event/Events.h>
 #include <kiwano/platform/Application.h>
 #include <kiwano/render/Renderer.h>
 #include <kiwano/render/DirectX/D3DDeviceResources.h>
diff --git a/src/kiwano/platform/win32/libraries.cpp b/src/kiwano/platform/win32/libraries.cpp
index ac0f6bbb..4505ee66 100644
--- a/src/kiwano/platform/win32/libraries.cpp
+++ b/src/kiwano/platform/win32/libraries.cpp
@@ -19,7 +19,7 @@
 // THE SOFTWARE.
 
 #include <kiwano/core/Exception.h>
-#include <kiwano/core/Logger.h>
+#include <kiwano/utils/Logger.h>
 #include <kiwano/platform/win32/libraries.h>
 
 namespace kiwano
diff --git a/src/kiwano/render/Brush.cpp b/src/kiwano/render/Brush.cpp
index bab76f91..f106f2de 100644
--- a/src/kiwano/render/Brush.cpp
+++ b/src/kiwano/render/Brush.cpp
@@ -18,7 +18,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#include <kiwano/core/Logger.h>
+#include <kiwano/utils/Logger.h>
 #include <kiwano/render/Brush.h>
 #include <kiwano/render/Renderer.h>
 
diff --git a/src/kiwano/render/DirectX/D2DDeviceResources.cpp b/src/kiwano/render/DirectX/D2DDeviceResources.cpp
index 538725de..2062ac2d 100644
--- a/src/kiwano/render/DirectX/D2DDeviceResources.cpp
+++ b/src/kiwano/render/DirectX/D2DDeviceResources.cpp
@@ -19,7 +19,7 @@
 // THE SOFTWARE.
 
 #include <kiwano/render/DirectX/D2DDeviceResources.h>
-#include <kiwano/core/Logger.h>
+#include <kiwano/utils/Logger.h>
 
 #pragma comment(lib, "d2d1.lib")
 #pragma comment(lib, "dwrite.lib")
diff --git a/src/kiwano/render/DirectX/D3D10DeviceResources.cpp b/src/kiwano/render/DirectX/D3D10DeviceResources.cpp
index a5bc29e5..e10427db 100644
--- a/src/kiwano/render/DirectX/D3D10DeviceResources.cpp
+++ b/src/kiwano/render/DirectX/D3D10DeviceResources.cpp
@@ -18,7 +18,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#include <kiwano/core/Logger.h>
+#include <kiwano/utils/Logger.h>
 #include <kiwano/render/DirectX/D3D10DeviceResources.h>
 
 #pragma comment(lib, "d3d10_1.lib")
diff --git a/src/kiwano/render/DirectX/D3D11DeviceResources.cpp b/src/kiwano/render/DirectX/D3D11DeviceResources.cpp
index 65da7e5f..e767c848 100644
--- a/src/kiwano/render/DirectX/D3D11DeviceResources.cpp
+++ b/src/kiwano/render/DirectX/D3D11DeviceResources.cpp
@@ -18,7 +18,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#include <kiwano/core/Logger.h>
+#include <kiwano/utils/Logger.h>
 #include <kiwano/render/DirectX/D3D11DeviceResources.h>
 #include <memory>
 
diff --git a/src/kiwano/render/DirectX/RenderContextImpl.cpp b/src/kiwano/render/DirectX/RenderContextImpl.cpp
index cbf90978..25a4ada6 100644
--- a/src/kiwano/render/DirectX/RenderContextImpl.cpp
+++ b/src/kiwano/render/DirectX/RenderContextImpl.cpp
@@ -21,7 +21,7 @@
 #include <kiwano/render/DirectX/RenderContextImpl.h>
 #include <kiwano/render/DirectX/NativePtr.h>
 #include <kiwano/render/Renderer.h>
-#include <kiwano/core/Logger.h>
+#include <kiwano/utils/Logger.h>
 
 namespace kiwano
 {
diff --git a/src/kiwano/render/DirectX/RendererImpl.cpp b/src/kiwano/render/DirectX/RendererImpl.cpp
index de86e279..13e325b7 100644
--- a/src/kiwano/render/DirectX/RendererImpl.cpp
+++ b/src/kiwano/render/DirectX/RendererImpl.cpp
@@ -19,8 +19,8 @@
 // THE SOFTWARE.
 
 #include <kiwano/core/Exception.h>
-#include <kiwano/core/Logger.h>
-#include <kiwano/core/event/WindowEvent.h>
+#include <kiwano/utils/Logger.h>
+#include <kiwano/event/WindowEvent.h>
 #include <kiwano/platform/FileSystem.h>
 #include <kiwano/platform/Application.h>
 #include <kiwano/render/ShapeMaker.h>
diff --git a/src/kiwano/render/Frame.h b/src/kiwano/render/Frame.h
index a425f22b..f0679724 100644
--- a/src/kiwano/render/Frame.h
+++ b/src/kiwano/render/Frame.h
@@ -19,7 +19,7 @@
 // THE SOFTWARE.
 
 #pragma once
-#include <kiwano/core/ObjectBase.h>
+#include <kiwano/base/ObjectBase.h>
 #include <kiwano/render/Texture.h>
 
 namespace kiwano
diff --git a/src/kiwano/render/FrameSequence.cpp b/src/kiwano/render/FrameSequence.cpp
index a5ce48fa..03fd4a85 100644
--- a/src/kiwano/render/FrameSequence.cpp
+++ b/src/kiwano/render/FrameSequence.cpp
@@ -19,7 +19,7 @@
 // THE SOFTWARE.
 
 #include <kiwano/render/FrameSequence.h>
-#include <kiwano/core/Logger.h>
+#include <kiwano/utils/Logger.h>
 
 namespace kiwano
 {
diff --git a/src/kiwano/render/GifImage.cpp b/src/kiwano/render/GifImage.cpp
index 79e942f5..da775009 100644
--- a/src/kiwano/render/GifImage.cpp
+++ b/src/kiwano/render/GifImage.cpp
@@ -18,7 +18,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#include <kiwano/core/Logger.h>
+#include <kiwano/utils/Logger.h>
 #include <kiwano/render/GifImage.h>
 #include <kiwano/render/Renderer.h>
 
diff --git a/src/kiwano/render/NativeObject.h b/src/kiwano/render/NativeObject.h
index 4b83b322..fc020b23 100644
--- a/src/kiwano/render/NativeObject.h
+++ b/src/kiwano/render/NativeObject.h
@@ -19,7 +19,7 @@
 // THE SOFTWARE.
 
 #pragma once
-#include <kiwano/core/ObjectBase.h>
+#include <kiwano/base/ObjectBase.h>
 
 #if KGE_RENDER_ENGINE == KGE_RENDER_ENGINE_DIRECTX
 #include <kiwano/render/DirectX/D2DDeviceResources.h>
diff --git a/src/kiwano/render/Renderer.cpp b/src/kiwano/render/Renderer.cpp
index f25086ef..be2226b2 100644
--- a/src/kiwano/render/Renderer.cpp
+++ b/src/kiwano/render/Renderer.cpp
@@ -19,7 +19,7 @@
 // THE SOFTWARE.
 
 #include <kiwano/render/Renderer.h>
-#include <kiwano/core/event/WindowEvent.h>
+#include <kiwano/event/WindowEvent.h>
 #include <kiwano/platform/Application.h>
 
 namespace kiwano
diff --git a/src/kiwano/render/Renderer.h b/src/kiwano/render/Renderer.h
index 7b80dae3..68077fa1 100644
--- a/src/kiwano/render/Renderer.h
+++ b/src/kiwano/render/Renderer.h
@@ -19,7 +19,7 @@
 // THE SOFTWARE.
 
 #pragma once
-#include <kiwano/core/Module.h>
+#include <kiwano/base/Module.h>
 #include <kiwano/render/Font.h>
 #include <kiwano/render/GifImage.h>
 #include <kiwano/render/TextStyle.hpp>
diff --git a/src/kiwano/render/TextureCache.cpp b/src/kiwano/render/TextureCache.cpp
index 27b74545..847ece2b 100644
--- a/src/kiwano/render/TextureCache.cpp
+++ b/src/kiwano/render/TextureCache.cpp
@@ -18,7 +18,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#include <kiwano/core/Logger.h>
+#include <kiwano/utils/Logger.h>
 #include <kiwano/render/Renderer.h>
 #include <kiwano/render/TextureCache.h>
 
diff --git a/src/kiwano/utils/EventTicker.h b/src/kiwano/utils/EventTicker.h
index 3fffff84..c1fd82d3 100644
--- a/src/kiwano/utils/EventTicker.h
+++ b/src/kiwano/utils/EventTicker.h
@@ -20,8 +20,8 @@
 
 #pragma once
 #include <kiwano/utils/Ticker.h>
-#include <kiwano/core/EventDispatcher.h>
-#include <kiwano/core/event/Event.h>
+#include <kiwano/event/EventDispatcher.h>
+#include <kiwano/event/Event.h>
 
 namespace kiwano
 {
diff --git a/src/kiwano/utils/LocalStorage.h b/src/kiwano/utils/LocalStorage.h
index 6972a5c9..d3475cab 100644
--- a/src/kiwano/utils/LocalStorage.h
+++ b/src/kiwano/utils/LocalStorage.h
@@ -20,7 +20,7 @@
 
 #pragma once
 #include <kiwano/core/Common.h>
-#include <kiwano/core/ObjectBase.h>
+#include <kiwano/base/ObjectBase.h>
 
 namespace kiwano
 {
diff --git a/src/kiwano/core/Logger.cpp b/src/kiwano/utils/Logger.cpp
similarity index 99%
rename from src/kiwano/core/Logger.cpp
rename to src/kiwano/utils/Logger.cpp
index 25400f0a..cc1c42e9 100644
--- a/src/kiwano/core/Logger.cpp
+++ b/src/kiwano/utils/Logger.cpp
@@ -21,7 +21,7 @@
 #include <ctime>
 #include <fstream>
 #include <iostream>
-#include <kiwano/core/Logger.h>
+#include <kiwano/utils/Logger.h>
 
 namespace
 {
diff --git a/src/kiwano/core/Logger.h b/src/kiwano/utils/Logger.h
similarity index 100%
rename from src/kiwano/core/Logger.h
rename to src/kiwano/utils/Logger.h
diff --git a/src/kiwano/utils/ResourceCache.cpp b/src/kiwano/utils/ResourceCache.cpp
index 11398a40..be4b75bb 100644
--- a/src/kiwano/utils/ResourceCache.cpp
+++ b/src/kiwano/utils/ResourceCache.cpp
@@ -19,7 +19,7 @@
 // THE SOFTWARE.
 
 #include <fstream>
-#include <kiwano/core/Logger.h>
+#include <kiwano/utils/Logger.h>
 #include <kiwano/core/Exception.h>
 #include <kiwano/platform/FileSystem.h>
 #include <kiwano/utils/ResourceCache.h>
diff --git a/src/kiwano/utils/TaskScheduler.cpp b/src/kiwano/utils/TaskScheduler.cpp
index c06d88da..40030c4d 100644
--- a/src/kiwano/utils/TaskScheduler.cpp
+++ b/src/kiwano/utils/TaskScheduler.cpp
@@ -18,7 +18,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#include <kiwano/core/Logger.h>
+#include <kiwano/utils/Logger.h>
 #include <kiwano/utils/TaskScheduler.h>
 
 namespace kiwano
diff --git a/src/kiwano/utils/Timer.h b/src/kiwano/utils/Timer.h
index 29cb6a1a..ab20f4dc 100644
--- a/src/kiwano/utils/Timer.h
+++ b/src/kiwano/utils/Timer.h
@@ -20,7 +20,7 @@
 
 #pragma once
 #include <kiwano/core/Time.h>
-#include <kiwano/core/ObjectBase.h>
+#include <kiwano/base/ObjectBase.h>
 
 namespace kiwano
 {