diff --git a/src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperXModel.cpp b/src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperXModel.cpp
deleted file mode 100644
index 1491047c..00000000
--- a/src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperXModel.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "AssetDumperXModel.h"
-
-#include "Game/IW3/XModel/XModelDumperIW3.h"
-
-using namespace IW3;
-
-bool AssetDumperXModel::ShouldDump(XAssetInfo<XModel>* asset)
-{
-    return !asset->m_name.empty() && asset->m_name[0] != ',';
-}
-
-void AssetDumperXModel::DumpAsset(AssetDumpingContext& context, XAssetInfo<XModel>* asset)
-{
-    DumpXModel(context, asset);
-}
diff --git a/src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperXModel.h b/src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperXModel.h
deleted file mode 100644
index e8aa5df8..00000000
--- a/src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperXModel.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-
-#include "Dumping/AbstractAssetDumper.h"
-#include "Game/IW3/IW3.h"
-
-namespace IW3
-{
-    class AssetDumperXModel final : public AbstractAssetDumper<XModel>
-    {
-    protected:
-        bool ShouldDump(XAssetInfo<XModel>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<XModel>* asset) override;
-    };
-} // namespace IW3
diff --git a/src/ObjWriting/Game/IW3/ObjWriterIW3.cpp b/src/ObjWriting/Game/IW3/ObjWriterIW3.cpp
index 55da3a17..a878c2d3 100644
--- a/src/ObjWriting/Game/IW3/ObjWriterIW3.cpp
+++ b/src/ObjWriting/Game/IW3/ObjWriterIW3.cpp
@@ -7,8 +7,8 @@
 #include "AssetDumpers/AssetDumperRawFile.h"
 #include "AssetDumpers/AssetDumperStringTable.h"
 #include "AssetDumpers/AssetDumperWeapon.h"
-#include "AssetDumpers/AssetDumperXModel.h"
 #include "Game/IW3/GameAssetPoolIW3.h"
+#include "Game/IW3/XModel/XModelDumperIW3.h"
 #include "Material/DumperMaterialIW3.h"
 #include "ObjWriting.h"
 
diff --git a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperXModel.cpp b/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperXModel.cpp
deleted file mode 100644
index a82ddbd8..00000000
--- a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperXModel.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "AssetDumperXModel.h"
-
-#include "Game/IW4/XModel/XModelDumperIW4.h"
-
-using namespace IW4;
-
-bool AssetDumperXModel::ShouldDump(XAssetInfo<XModel>* asset)
-{
-    return !asset->m_name.empty() && asset->m_name[0] != ',';
-}
-
-void AssetDumperXModel::DumpAsset(AssetDumpingContext& context, XAssetInfo<XModel>* asset)
-{
-    DumpXModel(context, asset);
-}
diff --git a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperXModel.h b/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperXModel.h
deleted file mode 100644
index 84be5262..00000000
--- a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperXModel.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-
-#include "Dumping/AbstractAssetDumper.h"
-#include "Game/IW4/IW4.h"
-
-namespace IW4
-{
-    class AssetDumperXModel final : public AbstractAssetDumper<XModel>
-    {
-    protected:
-        bool ShouldDump(XAssetInfo<XModel>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<XModel>* asset) override;
-    };
-} // namespace IW4
diff --git a/src/ObjWriting/Game/IW4/ObjWriterIW4.cpp b/src/ObjWriting/Game/IW4/ObjWriterIW4.cpp
index 0516a4af..30a0dc9e 100644
--- a/src/ObjWriting/Game/IW4/ObjWriterIW4.cpp
+++ b/src/ObjWriting/Game/IW4/ObjWriterIW4.cpp
@@ -20,8 +20,8 @@
 #include "AssetDumpers/AssetDumperVehicle.h"
 #include "AssetDumpers/AssetDumperVertexShader.h"
 #include "AssetDumpers/AssetDumperWeapon.h"
-#include "AssetDumpers/AssetDumperXModel.h"
 #include "Game/IW4/GameAssetPoolIW4.h"
+#include "Game/IW4/XModel/XModelDumperIW4.h"
 #include "Material/DumperMaterialIW4.h"
 #include "ObjWriting.h"
 
diff --git a/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperXModel.cpp b/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperXModel.cpp
deleted file mode 100644
index bd882e41..00000000
--- a/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperXModel.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "AssetDumperXModel.h"
-
-#include "Game/IW5/XModel/XModelDumperIW5.h"
-
-using namespace IW5;
-
-bool AssetDumperXModel::ShouldDump(XAssetInfo<XModel>* asset)
-{
-    return !asset->m_name.empty() && asset->m_name[0] != ',';
-}
-
-void AssetDumperXModel::DumpAsset(AssetDumpingContext& context, XAssetInfo<XModel>* asset)
-{
-    DumpXModel(context, asset);
-}
diff --git a/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperXModel.h b/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperXModel.h
deleted file mode 100644
index 28880a59..00000000
--- a/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperXModel.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-
-#include "Dumping/AbstractAssetDumper.h"
-#include "Game/IW5/IW5.h"
-
-namespace IW5
-{
-    class AssetDumperXModel final : public AbstractAssetDumper<XModel>
-    {
-    protected:
-        bool ShouldDump(XAssetInfo<XModel>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<XModel>* asset) override;
-    };
-} // namespace IW5
diff --git a/src/ObjWriting/Game/IW5/ObjWriterIW5.cpp b/src/ObjWriting/Game/IW5/ObjWriterIW5.cpp
index 09a16378..8e239829 100644
--- a/src/ObjWriting/Game/IW5/ObjWriterIW5.cpp
+++ b/src/ObjWriting/Game/IW5/ObjWriterIW5.cpp
@@ -12,8 +12,8 @@
 #include "AssetDumpers/AssetDumperStringTable.h"
 #include "AssetDumpers/AssetDumperWeapon.h"
 #include "AssetDumpers/AssetDumperWeaponAttachment.h"
-#include "AssetDumpers/AssetDumperXModel.h"
 #include "Game/IW5/GameAssetPoolIW5.h"
+#include "Game/IW5/XModel/XModelDumperIW5.h"
 #include "Material/DumperMaterialIW5.h"
 #include "ObjWriting.h"
 
diff --git a/src/ObjWriting/Game/T5/AssetDumpers/AssetDumperXModel.cpp b/src/ObjWriting/Game/T5/AssetDumpers/AssetDumperXModel.cpp
deleted file mode 100644
index 8eb958bb..00000000
--- a/src/ObjWriting/Game/T5/AssetDumpers/AssetDumperXModel.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "AssetDumperXModel.h"
-
-#include "Game/T5/XModel/XModelDumperT5.h"
-
-using namespace T5;
-
-bool AssetDumperXModel::ShouldDump(XAssetInfo<XModel>* asset)
-{
-    return !asset->m_name.empty() && asset->m_name[0] != ',';
-}
-
-void AssetDumperXModel::DumpAsset(AssetDumpingContext& context, XAssetInfo<XModel>* asset)
-{
-    DumpXModel(context, asset);
-}
diff --git a/src/ObjWriting/Game/T5/AssetDumpers/AssetDumperXModel.h b/src/ObjWriting/Game/T5/AssetDumpers/AssetDumperXModel.h
deleted file mode 100644
index 08a1a274..00000000
--- a/src/ObjWriting/Game/T5/AssetDumpers/AssetDumperXModel.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-
-#include "Dumping/AbstractAssetDumper.h"
-#include "Game/T5/T5.h"
-
-namespace T5
-{
-    class AssetDumperXModel final : public AbstractAssetDumper<XModel>
-    {
-    protected:
-        bool ShouldDump(XAssetInfo<XModel>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<XModel>* asset) override;
-    };
-} // namespace T5
diff --git a/src/ObjWriting/Game/T5/ObjWriterT5.cpp b/src/ObjWriting/Game/T5/ObjWriterT5.cpp
index ce6dab53..4eafde5a 100644
--- a/src/ObjWriting/Game/T5/ObjWriterT5.cpp
+++ b/src/ObjWriting/Game/T5/ObjWriterT5.cpp
@@ -8,8 +8,8 @@
 #include "AssetDumpers/AssetDumperSndBank.h"
 #include "AssetDumpers/AssetDumperStringTable.h"
 #include "AssetDumpers/AssetDumperWeapon.h"
-#include "AssetDumpers/AssetDumperXModel.h"
 #include "Game/T5/GameAssetPoolT5.h"
+#include "Game/T5/XModel/XModelDumperT5.h"
 #include "Material/DumperMaterialT5.h"
 #include "ObjWriting.h"
 
diff --git a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperXModel.cpp b/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperXModel.cpp
deleted file mode 100644
index 24dc56dc..00000000
--- a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperXModel.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "AssetDumperXModel.h"
-
-#include "Game/T6/XModel/XModelDumperT6.h"
-
-using namespace T6;
-
-bool AssetDumperXModel::ShouldDump(XAssetInfo<XModel>* asset)
-{
-    return !asset->m_name.empty() && asset->m_name[0] != ',';
-}
-
-void AssetDumperXModel::DumpAsset(AssetDumpingContext& context, XAssetInfo<XModel>* asset)
-{
-    DumpXModel(context, asset);
-}
diff --git a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperXModel.h b/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperXModel.h
deleted file mode 100644
index 75218729..00000000
--- a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperXModel.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-
-#include "Dumping/AbstractAssetDumper.h"
-#include "Game/T6/T6.h"
-
-namespace T6
-{
-    class AssetDumperXModel final : public AbstractAssetDumper<XModel>
-    {
-    protected:
-        bool ShouldDump(XAssetInfo<XModel>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<XModel>* asset) override;
-    };
-} // namespace T6
diff --git a/src/ObjWriting/Game/T6/ObjWriterT6.cpp b/src/ObjWriting/Game/T6/ObjWriterT6.cpp
index 971462b8..03f1737b 100644
--- a/src/ObjWriting/Game/T6/ObjWriterT6.cpp
+++ b/src/ObjWriting/Game/T6/ObjWriterT6.cpp
@@ -20,10 +20,10 @@
 #include "AssetDumpers/AssetDumperWeaponAttachment.h"
 #include "AssetDumpers/AssetDumperWeaponAttachmentUnique.h"
 #include "AssetDumpers/AssetDumperWeaponCamo.h"
-#include "AssetDumpers/AssetDumperXModel.h"
 #include "AssetDumpers/AssetDumperZBarrier.h"
 #include "FontIcon/DumperFontIconT6.h"
 #include "Game/T6/GameAssetPoolT6.h"
+#include "Game/T6/XModel/XModelDumperT6.h"
 #include "Material/DumperMaterialT6.h"
 #include "ObjWriting.h"
 
diff --git a/src/ObjWriting/XModel/XModelDumper.cpp.template b/src/ObjWriting/XModel/XModelDumper.cpp.template
index 812e4c31..f8fcb3ab 100644
--- a/src/ObjWriting/XModel/XModelDumper.cpp.template
+++ b/src/ObjWriting/XModel/XModelDumper.cpp.template
@@ -839,11 +839,13 @@ namespace
     }
 } // namespace
 
-namespace GAME
+bool AssetDumperXModel::ShouldDump(XAssetInfo<XModel>* asset)
+{
+    return !asset->m_name.empty() && asset->m_name[0] != ',';
+}
+
+void AssetDumperXModel::DumpAsset(AssetDumpingContext& context, XAssetInfo<XModel>* asset)
 {
-    void DumpXModel(AssetDumpingContext& context, XAssetInfo<XModel>* asset)
-    {
         DumpXModelJson(context, asset);
         DumpXModelSurfs(context, asset);
-    }
-} // namespace GAME
+}
diff --git a/src/ObjWriting/XModel/XModelDumper.h.template b/src/ObjWriting/XModel/XModelDumper.h.template
index 5c4cecb2..0a758303 100644
--- a/src/ObjWriting/XModel/XModelDumper.h.template
+++ b/src/ObjWriting/XModel/XModelDumper.h.template
@@ -10,10 +10,15 @@
 
 #pragma once
 
-#include "Dumping/AssetDumpingContext.h"
+#include "Dumping/AbstractAssetDumper.h"
 #include GAME_HEADER
 
 namespace GAME
 {
-    void DumpXModel(AssetDumpingContext& context, XAssetInfo<XModel>* asset);
-}
+    class AssetDumperXModel final : public AbstractAssetDumper<XModel>
+    {
+    protected:
+        bool ShouldDump(XAssetInfo<XModel>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, XAssetInfo<XModel>* asset) override;
+    };
+} // namespace GAME