diff --git a/src/openrct2/world/Balloon.cpp b/src/openrct2/entity/Balloon.cpp
similarity index 100%
rename from src/openrct2/world/Balloon.cpp
rename to src/openrct2/entity/Balloon.cpp
diff --git a/src/openrct2/world/Balloon.h b/src/openrct2/entity/Balloon.h
similarity index 100%
rename from src/openrct2/world/Balloon.h
rename to src/openrct2/entity/Balloon.h
diff --git a/src/openrct2/world/Duck.cpp b/src/openrct2/entity/Duck.cpp
similarity index 100%
rename from src/openrct2/world/Duck.cpp
rename to src/openrct2/entity/Duck.cpp
diff --git a/src/openrct2/world/Duck.h b/src/openrct2/entity/Duck.h
similarity index 100%
rename from src/openrct2/world/Duck.h
rename to src/openrct2/entity/Duck.h
diff --git a/src/openrct2/world/Entity.cpp b/src/openrct2/entity/Entity.cpp
similarity index 100%
rename from src/openrct2/world/Entity.cpp
rename to src/openrct2/entity/Entity.cpp
diff --git a/src/openrct2/world/Entity.h b/src/openrct2/entity/Entity.h
similarity index 100%
rename from src/openrct2/world/Entity.h
rename to src/openrct2/entity/Entity.h
diff --git a/src/openrct2/world/EntityBase.h b/src/openrct2/entity/EntityBase.h
similarity index 100%
rename from src/openrct2/world/EntityBase.h
rename to src/openrct2/entity/EntityBase.h
diff --git a/src/openrct2/world/EntityList.h b/src/openrct2/entity/EntityList.h
similarity index 100%
rename from src/openrct2/world/EntityList.h
rename to src/openrct2/entity/EntityList.h
diff --git a/src/openrct2/world/EntityTweener.cpp b/src/openrct2/entity/EntityTweener.cpp
similarity index 100%
rename from src/openrct2/world/EntityTweener.cpp
rename to src/openrct2/entity/EntityTweener.cpp
diff --git a/src/openrct2/world/EntityTweener.h b/src/openrct2/entity/EntityTweener.h
similarity index 100%
rename from src/openrct2/world/EntityTweener.h
rename to src/openrct2/entity/EntityTweener.h
diff --git a/src/openrct2/world/Fountain.cpp b/src/openrct2/entity/Fountain.cpp
similarity index 100%
rename from src/openrct2/world/Fountain.cpp
rename to src/openrct2/entity/Fountain.cpp
diff --git a/src/openrct2/world/Fountain.h b/src/openrct2/entity/Fountain.h
similarity index 100%
rename from src/openrct2/world/Fountain.h
rename to src/openrct2/entity/Fountain.h
diff --git a/src/openrct2/world/Litter.cpp b/src/openrct2/entity/Litter.cpp
similarity index 100%
rename from src/openrct2/world/Litter.cpp
rename to src/openrct2/entity/Litter.cpp
diff --git a/src/openrct2/world/Litter.h b/src/openrct2/entity/Litter.h
similarity index 100%
rename from src/openrct2/world/Litter.h
rename to src/openrct2/entity/Litter.h
diff --git a/src/openrct2/world/MoneyEffect.cpp b/src/openrct2/entity/MoneyEffect.cpp
similarity index 100%
rename from src/openrct2/world/MoneyEffect.cpp
rename to src/openrct2/entity/MoneyEffect.cpp
diff --git a/src/openrct2/world/MoneyEffect.h b/src/openrct2/entity/MoneyEffect.h
similarity index 100%
rename from src/openrct2/world/MoneyEffect.h
rename to src/openrct2/entity/MoneyEffect.h
diff --git a/src/openrct2/world/Particle.cpp b/src/openrct2/entity/Particle.cpp
similarity index 100%
rename from src/openrct2/world/Particle.cpp
rename to src/openrct2/entity/Particle.cpp
diff --git a/src/openrct2/world/Particle.h b/src/openrct2/entity/Particle.h
similarity index 100%
rename from src/openrct2/world/Particle.h
rename to src/openrct2/entity/Particle.h
diff --git a/src/openrct2/world/Sprite.cpp b/src/openrct2/entity/Sprite.cpp
similarity index 100%
rename from src/openrct2/world/Sprite.cpp
rename to src/openrct2/entity/Sprite.cpp
diff --git a/src/openrct2/world/Sprite.h b/src/openrct2/entity/Sprite.h
similarity index 100%
rename from src/openrct2/world/Sprite.h
rename to src/openrct2/entity/Sprite.h
diff --git a/src/openrct2/libopenrct2.vcxproj b/src/openrct2/libopenrct2.vcxproj
index 2d5b2241db..731425205f 100644
--- a/src/openrct2/libopenrct2.vcxproj
+++ b/src/openrct2/libopenrct2.vcxproj
@@ -205,6 +205,17 @@
     <ClInclude Include="drawing\X8DrawingEngine.h" />
     <ClInclude Include="Editor.h" />
     <ClInclude Include="EditorObjectSelectionSession.h" />
+    <ClInclude Include="entity\Balloon.h" />
+    <ClInclude Include="entity\Duck.h" />
+    <ClInclude Include="entity\Entity.h" />
+    <ClInclude Include="entity\EntityBase.h" />
+    <ClInclude Include="entity\EntityList.h" />
+    <ClInclude Include="entity\EntityTweener.h" />
+    <ClInclude Include="entity\Fountain.h" />
+    <ClInclude Include="entity\Litter.h" />
+    <ClInclude Include="entity\MoneyEffect.h" />
+    <ClInclude Include="entity\Particle.h" />
+    <ClInclude Include="entity\Sprite.h" />
     <ClInclude Include="FileClassifier.h" />
     <ClInclude Include="Game.h" />
     <ClInclude Include="GameState.h" />
@@ -466,32 +477,21 @@
     <ClInclude Include="Version.h" />
     <ClInclude Include="windows\Intent.h" />
     <ClInclude Include="windows\tile_inspector.h" />
-    <ClInclude Include="world\Balloon.h" />
     <ClInclude Include="world\Banner.h" />
     <ClInclude Include="world\Climate.h" />
     <ClInclude Include="world\ConstructionClearance.h" />
-    <ClInclude Include="world\Duck.h" />
-    <ClInclude Include="world\Entity.h" />
-    <ClInclude Include="world\EntityList.h" />
-    <ClInclude Include="world\EntityTweener.h" />
     <ClInclude Include="world\Entrance.h" />
     <ClInclude Include="world\Footpath.h" />
-    <ClInclude Include="world\Fountain.h" />
     <ClInclude Include="world\LargeScenery.h" />
-    <ClInclude Include="world\Litter.h" />
     <ClInclude Include="world\Location.hpp" />
     <ClInclude Include="world\Map.h" />
     <ClInclude Include="world\MapAnimation.h" />
     <ClInclude Include="world\MapGen.h" />
     <ClInclude Include="world\MapHelpers.h" />
-    <ClInclude Include="world\MoneyEffect.h" />
     <ClInclude Include="world\Park.h" />
-    <ClInclude Include="world\Particle.h" />
     <ClInclude Include="world\Scenery.h" />
     <ClInclude Include="world\ScenerySelection.h" />
     <ClInclude Include="world\SmallScenery.h" />
-    <ClInclude Include="world\Sprite.h" />
-    <ClInclude Include="world\EntityBase.h" />
     <ClInclude Include="world\Surface.h" />
     <ClInclude Include="world\TileElement.h" />
     <ClInclude Include="world\TileElementsView.h" />
@@ -662,6 +662,15 @@
     <ClCompile Include="drawing\X8DrawingEngine.cpp" />
     <ClCompile Include="Editor.cpp" />
     <ClCompile Include="EditorObjectSelectionSession.cpp" />
+    <ClCompile Include="entity\Balloon.cpp" />
+    <ClCompile Include="entity\Duck.cpp" />
+    <ClCompile Include="entity\Entity.cpp" />
+    <ClCompile Include="entity\EntityTweener.cpp" />
+    <ClCompile Include="entity\Fountain.cpp" />
+    <ClCompile Include="entity\Litter.cpp" />
+    <ClCompile Include="entity\MoneyEffect.cpp" />
+    <ClCompile Include="entity\Particle.cpp" />
+    <ClCompile Include="entity\Sprite.cpp" />
     <ClCompile Include="FileClassifier.cpp" />
     <ClCompile Include="Game.cpp" />
     <ClCompile Include="GameState.cpp" />
@@ -913,28 +922,19 @@
     <ClCompile Include="Version.cpp" />
     <ClCompile Include="windows\Intent.cpp" />
     <ClCompile Include="windows\_legacy.cpp" />
-    <ClCompile Include="world\Balloon.cpp" />
     <ClCompile Include="world\Banner.cpp" />
     <ClCompile Include="world\Climate.cpp" />
     <ClCompile Include="world\ConstructionClearance.cpp" />
-    <ClCompile Include="world\Duck.cpp" />
-    <ClCompile Include="world\Entity.cpp" />
-    <ClCompile Include="world\EntityTweener.cpp" />
     <ClCompile Include="world\Entrance.cpp" />
     <ClCompile Include="world\Footpath.cpp" />
-    <ClCompile Include="world\Fountain.cpp" />
     <ClCompile Include="world\LargeScenery.cpp" />
-    <ClCompile Include="world\Litter.cpp" />
     <ClCompile Include="world\Map.cpp" />
     <ClCompile Include="world\MapAnimation.cpp" />
     <ClCompile Include="world\MapGen.cpp" />
     <ClCompile Include="world\MapHelpers.cpp" />
-    <ClCompile Include="world\MoneyEffect.cpp" />
     <ClCompile Include="world\Park.cpp" />
-    <ClCompile Include="world\Particle.cpp" />
     <ClCompile Include="world\Scenery.cpp" />
     <ClCompile Include="world\SmallScenery.cpp" />
-    <ClCompile Include="world\Sprite.cpp" />
     <ClCompile Include="world\Surface.cpp" />
     <ClCompile Include="world\TileElement.cpp" />
     <ClCompile Include="world/TileElementBase.cpp" />