diff --git a/src/ObjCommon/Model/Obj/ObjCommon.cpp b/src/ObjCommon/XModel/Obj/ObjCommon.cpp
similarity index 100%
rename from src/ObjCommon/Model/Obj/ObjCommon.cpp
rename to src/ObjCommon/XModel/Obj/ObjCommon.cpp
diff --git a/src/ObjCommon/Model/Obj/ObjCommon.h b/src/ObjCommon/XModel/Obj/ObjCommon.h
similarity index 100%
rename from src/ObjCommon/Model/Obj/ObjCommon.h
rename to src/ObjCommon/XModel/Obj/ObjCommon.h
diff --git a/src/ObjCommon/Model/XModel/XModelCommon.cpp b/src/ObjCommon/XModel/XModelCommon.cpp
similarity index 100%
rename from src/ObjCommon/Model/XModel/XModelCommon.cpp
rename to src/ObjCommon/XModel/XModelCommon.cpp
diff --git a/src/ObjCommon/Model/XModel/XModelCommon.h b/src/ObjCommon/XModel/XModelCommon.h
similarity index 100%
rename from src/ObjCommon/Model/XModel/XModelCommon.h
rename to src/ObjCommon/XModel/XModelCommon.h
diff --git a/src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperXModel.cpp b/src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperXModel.cpp
index 45d031fd..776f68bb 100644
--- a/src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperXModel.cpp
+++ b/src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperXModel.cpp
@@ -2,10 +2,10 @@
 
 #include "Game/IW3/CommonIW3.h"
 #include "Math/Quaternion.h"
-#include "Model/XModel/XModelExportWriter.h"
 #include "ObjWriting.h"
 #include "Utils/HalfFloat.h"
 #include "Utils/QuatInt16.h"
+#include "XModel/Export/XModelExportWriter.h"
 
 #include <cassert>
 #include <sstream>
diff --git a/src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperXModel.h b/src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperXModel.h
index 66569386..a304d3b9 100644
--- a/src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperXModel.h
+++ b/src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperXModel.h
@@ -2,9 +2,9 @@
 
 #include "Dumping/AbstractAssetDumper.h"
 #include "Game/IW3/IW3.h"
-#include "Model/Obj/ObjWriter.h"
-#include "Model/XModel/AbstractXModelWriter.h"
 #include "Utils/DistinctMapper.h"
+#include "XModel/AbstractXModelWriter.h"
+#include "XModel/Obj/ObjWriter.h"
 
 namespace IW3
 {
diff --git a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperXModel.cpp b/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperXModel.cpp
index 43f565cf..da956c9b 100644
--- a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperXModel.cpp
+++ b/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperXModel.cpp
@@ -2,10 +2,10 @@
 
 #include "Game/IW4/CommonIW4.h"
 #include "Math/Quaternion.h"
-#include "Model/XModel/XModelExportWriter.h"
 #include "ObjWriting.h"
 #include "Utils/HalfFloat.h"
 #include "Utils/QuatInt16.h"
+#include "XModel/Export/XModelExportWriter.h"
 
 #include <cassert>
 
diff --git a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperXModel.h b/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperXModel.h
index 647ce28c..0d2b058d 100644
--- a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperXModel.h
+++ b/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperXModel.h
@@ -2,9 +2,9 @@
 
 #include "Dumping/AbstractAssetDumper.h"
 #include "Game/IW4/IW4.h"
-#include "Model/Obj/ObjWriter.h"
-#include "Model/XModel/AbstractXModelWriter.h"
 #include "Utils/DistinctMapper.h"
+#include "XModel/AbstractXModelWriter.h"
+#include "XModel/Obj/ObjWriter.h"
 
 namespace IW4
 {
diff --git a/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperXModel.cpp b/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperXModel.cpp
index 865831ca..b5aef51c 100644
--- a/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperXModel.cpp
+++ b/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperXModel.cpp
@@ -2,10 +2,10 @@
 
 #include "Game/IW5/CommonIW5.h"
 #include "Math/Quaternion.h"
-#include "Model/XModel/XModelExportWriter.h"
 #include "ObjWriting.h"
 #include "Utils/HalfFloat.h"
 #include "Utils/QuatInt16.h"
+#include "XModel/Export/XModelExportWriter.h"
 
 #include <cassert>
 
diff --git a/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperXModel.h b/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperXModel.h
index 458caba8..6a6196a5 100644
--- a/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperXModel.h
+++ b/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperXModel.h
@@ -2,9 +2,9 @@
 
 #include "Dumping/AbstractAssetDumper.h"
 #include "Game/IW5/IW5.h"
-#include "Model/Obj/ObjWriter.h"
-#include "Model/XModel/AbstractXModelWriter.h"
 #include "Utils/DistinctMapper.h"
+#include "XModel/AbstractXModelWriter.h"
+#include "XModel/Obj/ObjWriter.h"
 
 namespace IW5
 {
diff --git a/src/ObjWriting/Game/T5/AssetDumpers/AssetDumperXModel.cpp b/src/ObjWriting/Game/T5/AssetDumpers/AssetDumperXModel.cpp
index 5997be6b..ef75590a 100644
--- a/src/ObjWriting/Game/T5/AssetDumpers/AssetDumperXModel.cpp
+++ b/src/ObjWriting/Game/T5/AssetDumpers/AssetDumperXModel.cpp
@@ -2,10 +2,10 @@
 
 #include "Game/T5/CommonT5.h"
 #include "Math/Quaternion.h"
-#include "Model/XModel/XModelExportWriter.h"
 #include "ObjWriting.h"
 #include "Utils/HalfFloat.h"
 #include "Utils/QuatInt16.h"
+#include "XModel/Export/XModelExportWriter.h"
 
 #include <cassert>
 #include <sstream>
diff --git a/src/ObjWriting/Game/T5/AssetDumpers/AssetDumperXModel.h b/src/ObjWriting/Game/T5/AssetDumpers/AssetDumperXModel.h
index bd96b00e..155d79d0 100644
--- a/src/ObjWriting/Game/T5/AssetDumpers/AssetDumperXModel.h
+++ b/src/ObjWriting/Game/T5/AssetDumpers/AssetDumperXModel.h
@@ -2,9 +2,9 @@
 
 #include "Dumping/AbstractAssetDumper.h"
 #include "Game/T5/T5.h"
-#include "Model/Obj/ObjWriter.h"
-#include "Model/XModel/AbstractXModelWriter.h"
 #include "Utils/DistinctMapper.h"
+#include "XModel/AbstractXModelWriter.h"
+#include "XModel/Obj/ObjWriter.h"
 
 namespace T5
 {
diff --git a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperXModel.cpp b/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperXModel.cpp
index 03884831..712cf309 100644
--- a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperXModel.cpp
+++ b/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperXModel.cpp
@@ -2,10 +2,10 @@
 
 #include "Game/T6/CommonT6.h"
 #include "Math/Quaternion.h"
-#include "Model/XModel/XModelExportWriter.h"
 #include "ObjWriting.h"
 #include "Utils/HalfFloat.h"
 #include "Utils/QuatInt16.h"
+#include "XModel/Export/XModelExportWriter.h"
 
 #include <cassert>
 #include <sstream>
diff --git a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperXModel.h b/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperXModel.h
index a39bdaff..fd56c376 100644
--- a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperXModel.h
+++ b/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperXModel.h
@@ -2,9 +2,9 @@
 
 #include "Dumping/AbstractAssetDumper.h"
 #include "Game/T6/T6.h"
-#include "Model/Obj/ObjWriter.h"
-#include "Model/XModel/AbstractXModelWriter.h"
 #include "Utils/DistinctMapper.h"
+#include "XModel/AbstractXModelWriter.h"
+#include "XModel/Obj/ObjWriter.h"
 
 namespace T6
 {
diff --git a/src/ObjWriting/Model/XModel/AbstractXModelWriter.cpp b/src/ObjWriting/XModel/AbstractXModelWriter.cpp
similarity index 100%
rename from src/ObjWriting/Model/XModel/AbstractXModelWriter.cpp
rename to src/ObjWriting/XModel/AbstractXModelWriter.cpp
diff --git a/src/ObjWriting/Model/XModel/AbstractXModelWriter.h b/src/ObjWriting/XModel/AbstractXModelWriter.h
similarity index 94%
rename from src/ObjWriting/Model/XModel/AbstractXModelWriter.h
rename to src/ObjWriting/XModel/AbstractXModelWriter.h
index 277b5282..e825d92a 100644
--- a/src/ObjWriting/Model/XModel/AbstractXModelWriter.h
+++ b/src/ObjWriting/XModel/AbstractXModelWriter.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Model/XModel/XModelCommon.h"
+#include "XModel/XModelCommon.h"
 
 #include <vector>
 
diff --git a/src/ObjWriting/Model/XModel/XModelBinWriter.cpp b/src/ObjWriting/XModel/Export/XModelBinWriter.cpp
similarity index 100%
rename from src/ObjWriting/Model/XModel/XModelBinWriter.cpp
rename to src/ObjWriting/XModel/Export/XModelBinWriter.cpp
diff --git a/src/ObjWriting/Model/XModel/XModelBinWriter.h b/src/ObjWriting/XModel/Export/XModelBinWriter.h
similarity index 100%
rename from src/ObjWriting/Model/XModel/XModelBinWriter.h
rename to src/ObjWriting/XModel/Export/XModelBinWriter.h
diff --git a/src/ObjWriting/Model/XModel/XModelExportWriter.cpp b/src/ObjWriting/XModel/Export/XModelExportWriter.cpp
similarity index 100%
rename from src/ObjWriting/Model/XModel/XModelExportWriter.cpp
rename to src/ObjWriting/XModel/Export/XModelExportWriter.cpp
diff --git a/src/ObjWriting/Model/XModel/XModelExportWriter.h b/src/ObjWriting/XModel/Export/XModelExportWriter.h
similarity index 94%
rename from src/ObjWriting/Model/XModel/XModelExportWriter.h
rename to src/ObjWriting/XModel/Export/XModelExportWriter.h
index 5535f579..175bc1ef 100644
--- a/src/ObjWriting/Model/XModel/XModelExportWriter.h
+++ b/src/ObjWriting/XModel/Export/XModelExportWriter.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "AbstractXModelWriter.h"
+#include "XModel/AbstractXModelWriter.h"
 
 #include <memory>
 #include <ostream>
diff --git a/src/ObjWriting/Model/Obj/ObjWriter.cpp b/src/ObjWriting/XModel/Obj/ObjWriter.cpp
similarity index 100%
rename from src/ObjWriting/Model/Obj/ObjWriter.cpp
rename to src/ObjWriting/XModel/Obj/ObjWriter.cpp
diff --git a/src/ObjWriting/Model/Obj/ObjWriter.h b/src/ObjWriting/XModel/Obj/ObjWriter.h
similarity index 97%
rename from src/ObjWriting/Model/Obj/ObjWriter.h
rename to src/ObjWriting/XModel/Obj/ObjWriter.h
index 157ffc87..8f809282 100644
--- a/src/ObjWriting/Model/Obj/ObjWriter.h
+++ b/src/ObjWriting/XModel/Obj/ObjWriter.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Model/Obj/ObjCommon.h"
 #include "Utils/DistinctMapper.h"
+#include "XModel/Obj/ObjCommon.h"
 
 #include <ostream>
 #include <vector>