diff --git a/src/assets/assetload_funcs.cpp b/src/assets/assetload_funcs.cpp
index 68b0289c5..a7d258ec8 100644
--- a/src/assets/assetload_funcs.cpp
+++ b/src/assets/assetload_funcs.cpp
@@ -19,10 +19,10 @@
 #include "graphics/core/Atlas.hpp"
 #include "graphics/core/Font.hpp"
 #include "graphics/core/ImageData.hpp"
-#include "graphics/core/Model.hpp"
 #include "graphics/core/Shader.hpp"
 #include "graphics/core/Texture.hpp"
 #include "graphics/core/TextureAnimation.hpp"
+#include "graphics/commons/Model.hpp"
 #include "objects/rigging.hpp"
 #include "util/stringutil.hpp"
 #include "Assets.hpp"
diff --git a/src/coders/obj.cpp b/src/coders/obj.cpp
index 19d82f8c9..182415dff 100644
--- a/src/coders/obj.cpp
+++ b/src/coders/obj.cpp
@@ -1,6 +1,6 @@
 #include "obj.hpp"
 
-#include "graphics/core/Model.hpp"
+#include "graphics/commons/Model.hpp"
 #include "commons.hpp"
 
 using namespace model;
diff --git a/src/coders/vec3.cpp b/src/coders/vec3.cpp
index 63edc21eb..7d0c8c177 100644
--- a/src/coders/vec3.cpp
+++ b/src/coders/vec3.cpp
@@ -5,7 +5,7 @@
 #include "byte_utils.hpp"
 #include "util/data_io.hpp"
 #include "util/stringutil.hpp"
-#include "graphics/core/Model.hpp"
+#include "graphics/commons/Model.hpp"
 
 inline constexpr int VERSION = 1;
 
diff --git a/src/coders/vec3.hpp b/src/coders/vec3.hpp
index 1aa3ea9d2..dd0bee225 100644
--- a/src/coders/vec3.hpp
+++ b/src/coders/vec3.hpp
@@ -8,7 +8,7 @@
 
 #include "typedefs.hpp"
 #include "util/Buffer.hpp"
-#include "graphics/core/Model.hpp"
+#include "graphics/commons/Model.hpp"
 
 /// See /doc/specs/vec3_model_spec.md
 namespace vec3 {
diff --git a/src/graphics/core/Model.cpp b/src/graphics/commons/Model.cpp
similarity index 100%
rename from src/graphics/core/Model.cpp
rename to src/graphics/commons/Model.cpp
diff --git a/src/graphics/core/Model.hpp b/src/graphics/commons/Model.hpp
similarity index 100%
rename from src/graphics/core/Model.hpp
rename to src/graphics/commons/Model.hpp
diff --git a/src/graphics/render/ModelBatch.cpp b/src/graphics/render/ModelBatch.cpp
index 42ceb9214..48133ef98 100644
--- a/src/graphics/render/ModelBatch.cpp
+++ b/src/graphics/render/ModelBatch.cpp
@@ -1,8 +1,8 @@
 #include "ModelBatch.hpp"
 
 #include "assets/assets_util.hpp"
+#include "graphics/commons/Model.hpp"
 #include "graphics/core/Mesh.hpp"
-#include "graphics/core/Model.hpp"
 #include "graphics/core/Atlas.hpp"
 #include "graphics/core/Texture.hpp"
 #include "assets/Assets.hpp"
diff --git a/src/graphics/render/ModelsGenerator.hpp b/src/graphics/render/ModelsGenerator.hpp
index ec7ea873a..d0a2eb66e 100644
--- a/src/graphics/render/ModelsGenerator.hpp
+++ b/src/graphics/render/ModelsGenerator.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "graphics/core/Model.hpp"
+#include "graphics/commons/Model.hpp"
 
 struct ItemDef;
 class Assets;
diff --git a/src/graphics/render/WorldRenderer.cpp b/src/graphics/render/WorldRenderer.cpp
index 89b5474b3..565f1c428 100644
--- a/src/graphics/render/WorldRenderer.cpp
+++ b/src/graphics/render/WorldRenderer.cpp
@@ -31,12 +31,12 @@
 #include "world/Level.hpp"
 #include "world/LevelEvents.hpp"
 #include "world/World.hpp"
+#include "graphics/commons/Model.hpp"
 #include "graphics/core/Atlas.hpp"
 #include "graphics/core/Batch3D.hpp"
 #include "graphics/core/DrawContext.hpp"
 #include "graphics/core/LineBatch.hpp"
 #include "graphics/core/Mesh.hpp"
-#include "graphics/core/Model.hpp"
 #include "graphics/core/PostProcessing.hpp"
 #include "graphics/core/Shader.hpp"
 #include "graphics/core/Texture.hpp"
diff --git a/src/objects/Entities.cpp b/src/objects/Entities.cpp
index 7726ce5c2..ba7b0eecb 100644
--- a/src/objects/Entities.cpp
+++ b/src/objects/Entities.cpp
@@ -10,7 +10,7 @@
 #include "engine.hpp"
 #include "graphics/core/DrawContext.hpp"
 #include "graphics/core/LineBatch.hpp"
-#include "graphics/core/Model.hpp"
+#include "graphics/commons/Model.hpp"
 #include "graphics/render/ModelBatch.hpp"
 #include "logic/scripting/scripting.hpp"
 #include "maths/FrustumCulling.hpp"
diff --git a/src/objects/rigging.cpp b/src/objects/rigging.cpp
index 92912f01e..8a31aeb82 100644
--- a/src/objects/rigging.cpp
+++ b/src/objects/rigging.cpp
@@ -3,7 +3,7 @@
 #include "assets/Assets.hpp"
 #include "coders/json.hpp"
 #include "data/dv_util.hpp"
-#include "graphics/core/Model.hpp"
+#include "graphics/commons/Model.hpp"
 #include "graphics/render/ModelBatch.hpp"
 
 #define GLM_ENABLE_EXPERIMENTAL