diff --git a/rwengine/include/objects/CharacterObject.hpp b/rwengine/include/objects/CharacterObject.hpp
index 090dcca9..8cb1d128 100644
--- a/rwengine/include/objects/CharacterObject.hpp
+++ b/rwengine/include/objects/CharacterObject.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #ifndef _CHARACTEROBJECT_HPP_
 #define _CHARACTEROBJECT_HPP_
-#include <engine/GameObject.hpp>
+#include <objects/GameObject.hpp>
 #include <bullet/BulletDynamics/Character/btKinematicCharacterController.h>
 #include <bullet/btBulletCollisionCommon.h>
 #include <BulletCollision/CollisionDispatch/btGhostObject.h>
diff --git a/rwengine/include/objects/CutsceneObject.hpp b/rwengine/include/objects/CutsceneObject.hpp
index 853cca4c..854b8a7b 100644
--- a/rwengine/include/objects/CutsceneObject.hpp
+++ b/rwengine/include/objects/CutsceneObject.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #ifndef _CUTSCENEOBJECT_HPP_
 #define _CUTSCENEOBJECT_HPP_
-#include <engine/GameObject.hpp>
+#include <objects/GameObject.hpp>
 
 /**
  * @brief Object type used for cutscene animations.
diff --git a/rwengine/include/engine/GameObject.hpp b/rwengine/include/objects/GameObject.hpp
similarity index 100%
rename from rwengine/include/engine/GameObject.hpp
rename to rwengine/include/objects/GameObject.hpp
diff --git a/rwengine/include/objects/InstanceObject.hpp b/rwengine/include/objects/InstanceObject.hpp
index acc5caed..9b686495 100644
--- a/rwengine/include/objects/InstanceObject.hpp
+++ b/rwengine/include/objects/InstanceObject.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #ifndef _OBJECTINSTANCE_HPP_
 #define _OBJECTINSTANCE_HPP_
-#include <engine/GameObject.hpp>
+#include <objects/GameObject.hpp>
 #include <btBulletDynamicsCommon.h>
 
 class CollisionInstance;
diff --git a/rwengine/include/objects/PickupObject.hpp b/rwengine/include/objects/PickupObject.hpp
index 72b5926c..802cc534 100644
--- a/rwengine/include/objects/PickupObject.hpp
+++ b/rwengine/include/objects/PickupObject.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #ifndef _PICKUPOBJECT_HPP_
 #define _PICKUPOBJECT_HPP_
-#include <engine/GameObject.hpp>
+#include <objects/GameObject.hpp>
 #include <bullet/btBulletCollisionCommon.h>
 #include <BulletCollision/CollisionDispatch/btGhostObject.h>
 #include <glm/glm.hpp>
diff --git a/rwengine/include/objects/ProjectileObject.hpp b/rwengine/include/objects/ProjectileObject.hpp
index 3e79c827..f1debe5d 100644
--- a/rwengine/include/objects/ProjectileObject.hpp
+++ b/rwengine/include/objects/ProjectileObject.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #ifndef _PROJECTILEOBJECT_HPP_
 #define _PROJECTILEOBJECT_HPP_
-#include <engine/GameObject.hpp>
+#include <objects/GameObject.hpp>
 #include <data/WeaponData.hpp>
 #include <bullet/btBulletDynamicsCommon.h>
 #include <BulletCollision/CollisionDispatch/btGhostObject.h>
diff --git a/rwengine/include/objects/VehicleObject.hpp b/rwengine/include/objects/VehicleObject.hpp
index 3e493fde..d2f0c239 100644
--- a/rwengine/include/objects/VehicleObject.hpp
+++ b/rwengine/include/objects/VehicleObject.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #ifndef _VEHICLEOBJECT_HPP_
 #define _VEHICLEOBJECT_HPP_
-#include <engine/GameObject.hpp>
+#include <objects/GameObject.hpp>
 #include <map>
 #include <objects/VehicleInfo.hpp>
 #include <dynamics/CollisionInstance.hpp>
diff --git a/rwengine/src/ai/AIGraph.cpp b/rwengine/src/ai/AIGraph.cpp
index 9ba881f0..76be8f2e 100644
--- a/rwengine/src/ai/AIGraph.cpp
+++ b/rwengine/src/ai/AIGraph.cpp
@@ -1,5 +1,5 @@
 #include "ai/AIGraph.hpp"
-#include "engine/GameObject.hpp"
+#include <objects/GameObject.hpp>
 #include <ai/AIGraphNode.hpp>
 #include <glm/gtx/norm.hpp>
 #include <iostream>
diff --git a/rwengine/src/ai/TrafficDirector.cpp b/rwengine/src/ai/TrafficDirector.cpp
index 0d64e3f8..3e9eec13 100644
--- a/rwengine/src/ai/TrafficDirector.cpp
+++ b/rwengine/src/ai/TrafficDirector.cpp
@@ -2,7 +2,7 @@
 #include <ai/AIGraphNode.hpp>
 #include <ai/CharacterController.hpp>
 #include <engine/GameWorld.hpp>
-#include <engine/GameObject.hpp>
+#include <objects/GameObject.hpp>
 #include <objects/CharacterObject.hpp>
 #include <core/Logger.hpp>
 
diff --git a/rwengine/src/dynamics/CollisionInstance.cpp b/rwengine/src/dynamics/CollisionInstance.cpp
index c25a3cac..3b52200a 100644
--- a/rwengine/src/dynamics/CollisionInstance.cpp
+++ b/rwengine/src/dynamics/CollisionInstance.cpp
@@ -1,6 +1,6 @@
 #include <dynamics/CollisionInstance.hpp>
 
-#include <engine/GameObject.hpp>
+#include <objects/GameObject.hpp>
 #include <engine/GameWorld.hpp>
 #include <engine/GameData.hpp>
 
diff --git a/rwengine/src/engine/GameObject.cpp b/rwengine/src/objects/GameObject.cpp
similarity index 95%
rename from rwengine/src/engine/GameObject.cpp
rename to rwengine/src/objects/GameObject.cpp
index 31099e25..0318c208 100644
--- a/rwengine/src/engine/GameObject.cpp
+++ b/rwengine/src/objects/GameObject.cpp
@@ -1,4 +1,4 @@
-#include <engine/GameObject.hpp>
+#include <objects/GameObject.hpp>
 #include <loaders/LoaderIFP.hpp>
 #include <loaders/LoaderDFF.hpp>
 #include <engine/Animator.hpp>
diff --git a/rwengine/src/script/modules/GameModule.cpp b/rwengine/src/script/modules/GameModule.cpp
index 23fd31e3..634326a3 100644
--- a/rwengine/src/script/modules/GameModule.cpp
+++ b/rwengine/src/script/modules/GameModule.cpp
@@ -11,8 +11,6 @@
 #include <engine/Animator.hpp>
 #include <engine/GameState.hpp>
 #include <engine/GameData.hpp>
-#include <engine/GameWorld.hpp>
-#include <engine/GameWorld.hpp>
 #include <ai/PlayerController.hpp>
 #include <ai/DefaultAIController.hpp>
 
diff --git a/rwengine/src/script/modules/ObjectModule.cpp b/rwengine/src/script/modules/ObjectModule.cpp
index bd77f522..eb33a360 100644
--- a/rwengine/src/script/modules/ObjectModule.cpp
+++ b/rwengine/src/script/modules/ObjectModule.cpp
@@ -11,8 +11,6 @@
 #include <render/Model.hpp>
 #include <render/GameRenderer.hpp>
 #include <engine/Animator.hpp>
-#include <engine/GameWorld.hpp>
-#include <engine/GameWorld.hpp>
 #include <ai/PlayerController.hpp>
 #include <ai/DefaultAIController.hpp>
 
diff --git a/rwgame/RWGame.cpp b/rwgame/RWGame.cpp
index ee994fb7..2dc83114 100644
--- a/rwgame/RWGame.cpp
+++ b/rwgame/RWGame.cpp
@@ -5,7 +5,7 @@
 #include "ingamestate.hpp"
 #include "menustate.hpp"
 
-#include <engine/GameObject.hpp>
+#include <objects/GameObject.hpp>
 #include <engine/GameState.hpp>
 #include <engine/GameWorld.hpp>
 #include <render/GameRenderer.hpp>
diff --git a/rwgame/game.hpp b/rwgame/game.hpp
index 10159beb..8ef36658 100644
--- a/rwgame/game.hpp
+++ b/rwgame/game.hpp
@@ -3,7 +3,7 @@
 
 #include <SFML/Window.hpp>
 #include <SFML/Graphics.hpp>
-#include <engine/GameObject.hpp>
+#include <objects/GameObject.hpp>
 #include <engine/GameWorld.hpp>
 
 constexpr double PiOver180 = 3.1415926535897932384626433832795028/180;
diff --git a/rwviewer/ViewerWidget.cpp b/rwviewer/ViewerWidget.cpp
index 9ba96dba..1339d447 100644
--- a/rwviewer/ViewerWidget.cpp
+++ b/rwviewer/ViewerWidget.cpp
@@ -4,7 +4,7 @@
 #include <render/OpenGLRenderer.hpp>
 #include <glm/gtc/type_ptr.hpp>
 #include <QMouseEvent>
-#include <engine/GameObject.hpp>
+#include <objects/GameObject.hpp>
 #include <engine/Animator.hpp>
 #include <QFileDialog>
 #include <algorithm>
diff --git a/rwviewer/views/ModelViewer.cpp b/rwviewer/views/ModelViewer.cpp
index d46d7135..62946130 100644
--- a/rwviewer/views/ModelViewer.cpp
+++ b/rwviewer/views/ModelViewer.cpp
@@ -2,7 +2,7 @@
 #include <widgets/ModelFramesWidget.hpp>
 #include "ViewerWidget.hpp"
 #include <data/Skeleton.hpp>
-#include <engine/GameObject.hpp>
+#include <objects/GameObject.hpp>
 #include <QDebug>
 
 ModelViewer::ModelViewer(ViewerWidget* viewer, QWidget* parent, Qt::WindowFlags f)