diff --git a/src/Makefile.am b/src/Makefile.am
index c84d39f2..4d4f5768 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,15 +6,14 @@ SUBDIRS = bullet lua data . t
 noinst_LIBRARIES = liblolcore.a
 
 liblolcore_a_SOURCES = \
-    tiler.cpp tiler.h dict.cpp dict.h \
+    tiler.cpp tiler.h dict.cpp dict.h lolgl.h \
     audio.cpp audio.h scene.cpp scene.h font.cpp font.h \
-    entity.cpp entity.h ticker.cpp ticker.h lolgl.h \
     textureimage.cpp textureimage.h tileset.cpp tileset.h \
     forge.cpp forge.h video.cpp video.h \
-    world.cpp world.h sample.cpp sample.h sampler.cpp sampler.h \
+    sample.cpp sample.h sampler.cpp sampler.h \
     profiler.cpp profiler.h text.cpp text.h emitter.cpp emitter.h \
     numeric.h utils.h messageservice.cpp messageservice.h \
-    worldentity.cpp worldentity.h gradient.cpp gradient.h gradient.lolfx \
+    gradient.cpp gradient.h gradient.lolfx \
     platform.cpp platform.h sprite.cpp sprite.h camera.cpp camera.h \
     light.cpp light.h lolimgui.cpp lolimgui.h \
     \
@@ -124,6 +123,11 @@ liblolcore_sources = \
     image/filter/dilate.cpp image/filter/median.cpp image/filter/yuv.cpp \
     image/movie.cpp \
     \
+    engine/ticker.cpp engine/ticker.h \
+    engine/entity.cpp engine/entity.h \
+    engine/world.cpp engine/world.h \
+    engine/worldentity.cpp engine/worldentity.h \
+    \
     loldebug.h \
     debug/fps.cpp debug/fps.h debug/lines.cpp \
     debug/record.cpp debug/record.h debug/stats.cpp debug/stats.h
diff --git a/src/camera.h b/src/camera.h
index bfe10d34..762cd5a4 100644
--- a/src/camera.h
+++ b/src/camera.h
@@ -17,7 +17,7 @@
 
 #include <lol/math/matrix.h>
 
-#include "worldentity.h"
+#include "engine/worldentity.h"
 
 namespace lol
 {
diff --git a/src/debug/fps.h b/src/debug/fps.h
index b0033eb1..8a7c154c 100644
--- a/src/debug/fps.h
+++ b/src/debug/fps.h
@@ -15,7 +15,7 @@
 // ------------------
 //
 
-#include "entity.h"
+#include "engine/entity.h"
 
 namespace lol
 {
diff --git a/src/debug/record.h b/src/debug/record.h
index fb63468b..04525542 100644
--- a/src/debug/record.h
+++ b/src/debug/record.h
@@ -15,7 +15,7 @@
 // ---------------------
 //
 
-#include "entity.h"
+#include "engine/entity.h"
 
 namespace lol
 {
diff --git a/src/debug/stats.h b/src/debug/stats.h
index 01ed197b..867dca8d 100644
--- a/src/debug/stats.h
+++ b/src/debug/stats.h
@@ -15,7 +15,7 @@
 // --------------------
 //
 
-#include "entity.h"
+#include "engine/entity.h"
 
 namespace lol
 {
diff --git a/src/dict.h b/src/dict.h
index 6e81bf75..4593067b 100644
--- a/src/dict.h
+++ b/src/dict.h
@@ -15,7 +15,7 @@
 // --------------
 //
 
-#include "entity.h"
+#include "engine/entity.h"
 
 namespace lol
 {
diff --git a/src/emitter.h b/src/emitter.h
index 41bdb69d..10a3c1fb 100644
--- a/src/emitter.h
+++ b/src/emitter.h
@@ -15,7 +15,7 @@
 // -----------------
 //
 
-#include "entity.h"
+#include "engine/entity.h"
 #include "tileset.h"
 
 namespace lol
diff --git a/src/entity.cpp b/src/engine/entity.cpp
similarity index 100%
rename from src/entity.cpp
rename to src/engine/entity.cpp
diff --git a/src/entity.h b/src/engine/entity.h
similarity index 100%
rename from src/entity.h
rename to src/engine/entity.h
diff --git a/src/ticker.cpp b/src/engine/ticker.cpp
similarity index 100%
rename from src/ticker.cpp
rename to src/engine/ticker.cpp
diff --git a/src/ticker.h b/src/engine/ticker.h
similarity index 97%
rename from src/ticker.h
rename to src/engine/ticker.h
index 14c61ff6..fd2b0282 100644
--- a/src/ticker.h
+++ b/src/engine/ticker.h
@@ -18,7 +18,7 @@
 
 #include <stdint.h>
 
-#include "entity.h"
+#include "engine/entity.h"
 
 namespace lol
 {
diff --git a/src/world.cpp b/src/engine/world.cpp
similarity index 100%
rename from src/world.cpp
rename to src/engine/world.cpp
diff --git a/src/world.h b/src/engine/world.h
similarity index 100%
rename from src/world.h
rename to src/engine/world.h
diff --git a/src/worldentity.cpp b/src/engine/worldentity.cpp
similarity index 100%
rename from src/worldentity.cpp
rename to src/engine/worldentity.cpp
diff --git a/src/worldentity.h b/src/engine/worldentity.h
similarity index 97%
rename from src/worldentity.h
rename to src/engine/worldentity.h
index 33e4580e..fc5c4fe8 100644
--- a/src/worldentity.h
+++ b/src/engine/worldentity.h
@@ -17,7 +17,7 @@
 
 #include <lol/math/transform.h>
 
-#include "entity.h"
+#include "engine/entity.h"
 
 namespace lol
 {
diff --git a/src/font.h b/src/font.h
index 50d6293b..0a93fc2f 100644
--- a/src/font.h
+++ b/src/font.h
@@ -15,7 +15,7 @@
 // --------------
 //
 
-#include "entity.h"
+#include "engine/entity.h"
 
 namespace lol
 {
diff --git a/src/gradient.h b/src/gradient.h
index 1c20b664..9679c157 100644
--- a/src/gradient.h
+++ b/src/gradient.h
@@ -15,7 +15,7 @@
 // ------------------
 //
 
-#include "worldentity.h"
+#include "engine/worldentity.h"
 
 namespace lol
 {
diff --git a/src/light.h b/src/light.h
index 6a04f995..548a1edb 100644
--- a/src/light.h
+++ b/src/light.h
@@ -17,7 +17,7 @@
 
 #include <cfloat> /* for FLT_MAX */
 
-#include "worldentity.h"
+#include "engine/worldentity.h"
 
 namespace lol
 {
diff --git a/src/lol/extras.h b/src/lol/extras.h
index ac59e275..62e62071 100644
--- a/src/lol/extras.h
+++ b/src/lol/extras.h
@@ -18,6 +18,9 @@
 #include <lol/../utils.h>
 #include <lol/../numeric.h>
 
+// Lua
+#include <lol/../lolua/baselua.h>
+
 // Static classes
 #include <lol/../platform.h>
 #include <lol/../video.h>
@@ -30,10 +33,13 @@
 #include <lol/../input/input.h>
 #include <lol/../input/controller.h>
 
-// Entities
-#include <lol/../entity.h>
-#include <lol/../worldentity.h>
+// Engine
+#include <lol/../engine/ticker.h>
+#include <lol/../engine/world.h>
+#include <lol/../engine/entity.h>
+#include <lol/../engine/worldentity.h>
 
+// Entities
 #include <lol/../camera.h>
 #include <lol/../light.h>
 #include <lol/../emitter.h>
@@ -44,8 +50,6 @@
 #include <lol/../text.h>
 #include <lol/../textureimage.h>
 #include <lol/../tileset.h>
-#include <lol/../lolua/baselua.h>
-#include <lol/../world.h>
 #include <lol/../lolimgui.h>
 
 // Other objects
@@ -58,7 +62,6 @@
 #include <lol/../easymesh/easymeshlua.h>
 
 // Managers
-#include <lol/../ticker.h>
 #include <lol/../forge.h>
 #include <lol/../tiler.h>
 #include <lol/../sampler.h>
diff --git a/src/lol/gpu/shader.h b/src/lol/gpu/shader.h
index 9a343d34..f191279e 100644
--- a/src/lol/gpu/shader.h
+++ b/src/lol/gpu/shader.h
@@ -17,7 +17,7 @@
 
 #include <stdint.h>
 
-#include "entity.h"
+#include "engine/entity.h"
 
 /* External declaration for LolFx files. */
 #define LOLFX_RESOURCE_DECLARE(name) \
diff --git a/src/lol/sys/thread.h b/src/lol/sys/thread.h
index 0fb917be..a6742040 100644
--- a/src/lol/sys/thread.h
+++ b/src/lol/sys/thread.h
@@ -18,7 +18,7 @@
 // ---------------------
 //
 
-#include "entity.h"
+#include "engine/entity.h"
 
 #include <functional>
 
diff --git a/src/lolcore.vcxproj b/src/lolcore.vcxproj
index 06f974fd..74818f4d 100644
--- a/src/lolcore.vcxproj
+++ b/src/lolcore.vcxproj
@@ -111,8 +111,11 @@
     <ClCompile Include="easymesh\easymeshrender.cpp" />
     <ClCompile Include="easymesh\easymeshtransform.cpp" />
     <ClCompile Include="eglapp.cpp" />
+    <ClCompile Include="engine\entity.cpp" />
+    <ClCompile Include="engine\ticker.cpp" />
+    <ClCompile Include="engine\world.cpp" />
+    <ClCompile Include="engine\worldentity.cpp" />
     <ClCompile Include="emitter.cpp" />
-    <ClCompile Include="entity.cpp" />
     <ClCompile Include="font.cpp" />
     <ClCompile Include="forge.cpp" />
     <ClCompile Include="gpu\framebuffer.cpp" />
@@ -227,12 +230,9 @@
     <ClCompile Include="sys\timer.cpp" />
     <ClCompile Include="text.cpp" />
     <ClCompile Include="textureimage.cpp" />
-    <ClCompile Include="ticker.cpp" />
     <ClCompile Include="tiler.cpp" />
     <ClCompile Include="tileset.cpp" />
     <ClCompile Include="video.cpp" />
-    <ClCompile Include="world.cpp" />
-    <ClCompile Include="worldentity.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="application\application.h" />
@@ -250,7 +250,10 @@
     <ClInclude Include="easymesh\easymeshrender.h" />
     <ClInclude Include="eglapp.h" />
     <ClInclude Include="emitter.h" />
-    <ClInclude Include="entity.h" />
+    <ClInclude Include="engine\entity.h" />
+    <ClInclude Include="engine\ticker.h" />
+    <ClInclude Include="engine\worldentity.h" />
+    <ClInclude Include="engine\world.h" />
     <ClInclude Include="font.h" />
     <ClInclude Include="forge.h" />
     <ClInclude Include="gradient.h" />
@@ -385,13 +388,10 @@
     <ClInclude Include="text.h" />
     <ClInclude Include="textureimage-private.h" />
     <ClInclude Include="textureimage.h" />
-    <ClInclude Include="ticker.h" />
     <ClInclude Include="tiler.h" />
     <ClInclude Include="tileset.h" />
     <ClInclude Include="utils.h" />
     <ClInclude Include="video.h" />
-    <ClInclude Include="world.h" />
-    <ClInclude Include="worldentity.h" />
   </ItemGroup>
   <ItemGroup>
     <LolFxCompile Include="easymesh\shiny.lolfx" />
diff --git a/src/lolcore.vcxproj.filters b/src/lolcore.vcxproj.filters
index 1100c209..6366e918 100644
--- a/src/lolcore.vcxproj.filters
+++ b/src/lolcore.vcxproj.filters
@@ -94,7 +94,7 @@
     <Filter Include="tileset">
       <UniqueIdentifier>{7fb4105d-4f17-4824-8d40-948553fdcde1}</UniqueIdentifier>
     </Filter>
-    <Filter Include="entities">
+    <Filter Include="engine">
       <UniqueIdentifier>{3bd5fe6f-c9cd-45f3-98a9-958d86d415e8}</UniqueIdentifier>
     </Filter>
     <Filter Include="display">
@@ -246,9 +246,6 @@
     <ClCompile Include="text.cpp">
       <Filter>...</Filter>
     </ClCompile>
-    <ClCompile Include="world.cpp">
-      <Filter>...</Filter>
-    </ClCompile>
     <ClCompile Include="gpu\framebuffer.cpp">
       <Filter>gpu</Filter>
     </ClCompile>
@@ -406,11 +403,17 @@
     <ClCompile Include="tileset.cpp">
       <Filter>tileset</Filter>
     </ClCompile>
-    <ClCompile Include="worldentity.cpp">
-      <Filter>entities</Filter>
+    <ClCompile Include="engine\entity.cpp">
+      <Filter>engine</Filter>
+    </ClCompile>
+    <ClCompile Include="engine\ticker.cpp">
+      <Filter>engine</Filter>
     </ClCompile>
-    <ClCompile Include="entity.cpp">
-      <Filter>entities</Filter>
+    <ClCompile Include="engine\world.cpp">
+      <Filter>engine</Filter>
+    </ClCompile>
+    <ClCompile Include="engine\worldentity.cpp">
+      <Filter>engine</Filter>
     </ClCompile>
     <ClCompile Include="textureimage.cpp">
       <Filter>tileset</Filter>
@@ -419,9 +422,6 @@
     <ClCompile Include="mesh\primitivemesh.cpp">
       <Filter>mesh</Filter>
     </ClCompile>
-    <ClCompile Include="ticker.cpp">
-      <Filter>display</Filter>
-    </ClCompile>
     <ClCompile Include="video.cpp">
       <Filter>display</Filter>
     </ClCompile>
@@ -589,7 +589,7 @@
     <ClInclude Include="text.h">
       <Filter>...</Filter>
     </ClInclude>
-    <ClInclude Include="world.h">
+    <ClInclude Include="engine\world.h">
       <Filter>...</Filter>
     </ClInclude>
     <ClInclude Include="easymesh\easymesh.h">
@@ -767,11 +767,17 @@
     <ClInclude Include="tileset.h">
       <Filter>tileset</Filter>
     </ClInclude>
-    <ClInclude Include="worldentity.h">
-      <Filter>entities</Filter>
+    <ClInclude Include="engine\entity.h">
+      <Filter>engine</Filter>
+    </ClInclude>
+    <ClInclude Include="engine\ticker.h">
+      <Filter>engine</Filter>
+    </ClInclude>
+    <ClInclude Include="engine\world.h">
+      <Filter>engine</Filter>
     </ClInclude>
-    <ClInclude Include="entity.h">
-      <Filter>entities</Filter>
+    <ClInclude Include="engine\worldentity.h">
+      <Filter>engine</Filter>
     </ClInclude>
     <ClInclude Include="textureimage.h">
       <Filter>tileset</Filter>
@@ -783,9 +789,6 @@
     <ClInclude Include="mesh\primitivemesh.h">
       <Filter>mesh</Filter>
     </ClInclude>
-    <ClInclude Include="ticker.h">
-      <Filter>display</Filter>
-    </ClInclude>
     <ClInclude Include="video.h">
       <Filter>display</Filter>
     </ClInclude>
diff --git a/src/platform/d3d9/d3d9input.h b/src/platform/d3d9/d3d9input.h
index 37f2fc2c..a44bc9f5 100644
--- a/src/platform/d3d9/d3d9input.h
+++ b/src/platform/d3d9/d3d9input.h
@@ -15,7 +15,7 @@
 // -------------------
 //
 
-#include "entity.h"
+#include "engine/entity.h"
 
 namespace lol
 {
diff --git a/src/platform/sdl/sdlinput.h b/src/platform/sdl/sdlinput.h
index 7baadcf4..c31446fd 100644
--- a/src/platform/sdl/sdlinput.h
+++ b/src/platform/sdl/sdlinput.h
@@ -15,7 +15,7 @@
 // ------------------
 //
 
-#include "entity.h"
+#include "engine/entity.h"
 
 namespace lol
 {
diff --git a/src/platform/xbox/xboxinput.h b/src/platform/xbox/xboxinput.h
index 6c2c2902..1820ad5f 100644
--- a/src/platform/xbox/xboxinput.h
+++ b/src/platform/xbox/xboxinput.h
@@ -15,7 +15,7 @@
 // -------------------
 //
 
-#include "entity.h"
+#include "engine/entity.h"
 
 namespace lol
 {
diff --git a/src/sample.h b/src/sample.h
index d89db435..fa3bfa2b 100644
--- a/src/sample.h
+++ b/src/sample.h
@@ -16,7 +16,7 @@
 // A Sample is a unique sound sample.
 //
 
-#include "entity.h"
+#include "engine/entity.h"
 
 #include <stdint.h>
 
diff --git a/src/sprite.h b/src/sprite.h
index 1ca36ee0..c0c04d75 100644
--- a/src/sprite.h
+++ b/src/sprite.h
@@ -15,7 +15,7 @@
 // ----------------
 //
 
-#include "worldentity.h"
+#include "engine/worldentity.h"
 #include "tileset.h"
 
 namespace lol
diff --git a/src/text.h b/src/text.h
index 76f4ad9f..52339e79 100644
--- a/src/text.h
+++ b/src/text.h
@@ -15,7 +15,7 @@
 // --------------
 //
 
-#include "entity.h"
+#include "engine/entity.h"
 
 namespace lol
 {
diff --git a/src/textureimage.h b/src/textureimage.h
index 14607f70..662586d6 100644
--- a/src/textureimage.h
+++ b/src/textureimage.h
@@ -23,7 +23,7 @@
 
 #include <stdint.h>
 
-#include "entity.h"
+#include "engine/entity.h"
 
 namespace lol
 {
diff --git a/src/tileset.h b/src/tileset.h
index 468fe958..2907878e 100644
--- a/src/tileset.h
+++ b/src/tileset.h
@@ -24,7 +24,7 @@
 
 #include <stdint.h>
 
-#include "entity.h"
+#include "engine/entity.h"
 */
 #include "textureimage.h"