diff --git a/src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperGfxImage.cpp b/src/ObjWriting/Game/IW3/Image/AssetDumperGfxImage.cpp
similarity index 100%
rename from src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperGfxImage.cpp
rename to src/ObjWriting/Game/IW3/Image/AssetDumperGfxImage.cpp
diff --git a/src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperGfxImage.h b/src/ObjWriting/Game/IW3/Image/AssetDumperGfxImage.h
similarity index 100%
rename from src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperGfxImage.h
rename to src/ObjWriting/Game/IW3/Image/AssetDumperGfxImage.h
diff --git a/src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperLocalizeEntry.cpp b/src/ObjWriting/Game/IW3/Localize/AssetDumperLocalizeEntry.cpp
similarity index 100%
rename from src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperLocalizeEntry.cpp
rename to src/ObjWriting/Game/IW3/Localize/AssetDumperLocalizeEntry.cpp
diff --git a/src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperLocalizeEntry.h b/src/ObjWriting/Game/IW3/Localize/AssetDumperLocalizeEntry.h
similarity index 100%
rename from src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperLocalizeEntry.h
rename to src/ObjWriting/Game/IW3/Localize/AssetDumperLocalizeEntry.h
diff --git a/src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperMapEnts.cpp b/src/ObjWriting/Game/IW3/Maps/AssetDumperMapEnts.cpp
similarity index 100%
rename from src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperMapEnts.cpp
rename to src/ObjWriting/Game/IW3/Maps/AssetDumperMapEnts.cpp
diff --git a/src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperMapEnts.h b/src/ObjWriting/Game/IW3/Maps/AssetDumperMapEnts.h
similarity index 100%
rename from src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperMapEnts.h
rename to src/ObjWriting/Game/IW3/Maps/AssetDumperMapEnts.h
diff --git a/src/ObjWriting/Game/IW3/ObjWriterIW3.cpp b/src/ObjWriting/Game/IW3/ObjWriterIW3.cpp
index a878c2d3..b2a605df 100644
--- a/src/ObjWriting/Game/IW3/ObjWriterIW3.cpp
+++ b/src/ObjWriting/Game/IW3/ObjWriterIW3.cpp
@@ -1,16 +1,16 @@
 #include "ObjWriterIW3.h"
 
-#include "AssetDumpers/AssetDumperGfxImage.h"
-#include "AssetDumpers/AssetDumperLoadedSound.h"
-#include "AssetDumpers/AssetDumperLocalizeEntry.h"
-#include "AssetDumpers/AssetDumperMapEnts.h"
-#include "AssetDumpers/AssetDumperRawFile.h"
-#include "AssetDumpers/AssetDumperStringTable.h"
-#include "AssetDumpers/AssetDumperWeapon.h"
 #include "Game/IW3/GameAssetPoolIW3.h"
 #include "Game/IW3/XModel/XModelDumperIW3.h"
+#include "Image/AssetDumperGfxImage.h"
+#include "Localize/AssetDumperLocalizeEntry.h"
+#include "Maps/AssetDumperMapEnts.h"
 #include "Material/DumperMaterialIW3.h"
 #include "ObjWriting.h"
+#include "RawFile/AssetDumperRawFile.h"
+#include "Sound/AssetDumperLoadedSound.h"
+#include "StringTable/AssetDumperStringTable.h"
+#include "Weapon/AssetDumperWeapon.h"
 
 using namespace IW3;
 
diff --git a/src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperRawFile.cpp b/src/ObjWriting/Game/IW3/RawFile/AssetDumperRawFile.cpp
similarity index 100%
rename from src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperRawFile.cpp
rename to src/ObjWriting/Game/IW3/RawFile/AssetDumperRawFile.cpp
diff --git a/src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperRawFile.h b/src/ObjWriting/Game/IW3/RawFile/AssetDumperRawFile.h
similarity index 100%
rename from src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperRawFile.h
rename to src/ObjWriting/Game/IW3/RawFile/AssetDumperRawFile.h
diff --git a/src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperLoadedSound.cpp b/src/ObjWriting/Game/IW3/Sound/AssetDumperLoadedSound.cpp
similarity index 100%
rename from src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperLoadedSound.cpp
rename to src/ObjWriting/Game/IW3/Sound/AssetDumperLoadedSound.cpp
diff --git a/src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperLoadedSound.h b/src/ObjWriting/Game/IW3/Sound/AssetDumperLoadedSound.h
similarity index 100%
rename from src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperLoadedSound.h
rename to src/ObjWriting/Game/IW3/Sound/AssetDumperLoadedSound.h
diff --git a/src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperStringTable.cpp b/src/ObjWriting/Game/IW3/StringTable/AssetDumperStringTable.cpp
similarity index 100%
rename from src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperStringTable.cpp
rename to src/ObjWriting/Game/IW3/StringTable/AssetDumperStringTable.cpp
diff --git a/src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperStringTable.h b/src/ObjWriting/Game/IW3/StringTable/AssetDumperStringTable.h
similarity index 100%
rename from src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperStringTable.h
rename to src/ObjWriting/Game/IW3/StringTable/AssetDumperStringTable.h
diff --git a/src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperWeapon.cpp b/src/ObjWriting/Game/IW3/Weapon/AssetDumperWeapon.cpp
similarity index 100%
rename from src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperWeapon.cpp
rename to src/ObjWriting/Game/IW3/Weapon/AssetDumperWeapon.cpp
diff --git a/src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperWeapon.h b/src/ObjWriting/Game/IW3/Weapon/AssetDumperWeapon.h
similarity index 100%
rename from src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperWeapon.h
rename to src/ObjWriting/Game/IW3/Weapon/AssetDumperWeapon.h
diff --git a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperGfxImage.cpp b/src/ObjWriting/Game/IW4/Image/AssetDumperGfxImage.cpp
similarity index 100%
rename from src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperGfxImage.cpp
rename to src/ObjWriting/Game/IW4/Image/AssetDumperGfxImage.cpp
diff --git a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperGfxImage.h b/src/ObjWriting/Game/IW4/Image/AssetDumperGfxImage.h
similarity index 100%
rename from src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperGfxImage.h
rename to src/ObjWriting/Game/IW4/Image/AssetDumperGfxImage.h
diff --git a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperLeaderboardDef.cpp b/src/ObjWriting/Game/IW4/Leaderboard/AssetDumperLeaderboardDef.cpp
similarity index 100%
rename from src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperLeaderboardDef.cpp
rename to src/ObjWriting/Game/IW4/Leaderboard/AssetDumperLeaderboardDef.cpp
diff --git a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperLeaderboardDef.h b/src/ObjWriting/Game/IW4/Leaderboard/AssetDumperLeaderboardDef.h
similarity index 100%
rename from src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperLeaderboardDef.h
rename to src/ObjWriting/Game/IW4/Leaderboard/AssetDumperLeaderboardDef.h
diff --git a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperGfxLightDef.cpp b/src/ObjWriting/Game/IW4/LightDef/AssetDumperGfxLightDef.cpp
similarity index 100%
rename from src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperGfxLightDef.cpp
rename to src/ObjWriting/Game/IW4/LightDef/AssetDumperGfxLightDef.cpp
diff --git a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperGfxLightDef.h b/src/ObjWriting/Game/IW4/LightDef/AssetDumperGfxLightDef.h
similarity index 100%
rename from src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperGfxLightDef.h
rename to src/ObjWriting/Game/IW4/LightDef/AssetDumperGfxLightDef.h
diff --git a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperLocalizeEntry.cpp b/src/ObjWriting/Game/IW4/Localize/AssetDumperLocalizeEntry.cpp
similarity index 100%
rename from src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperLocalizeEntry.cpp
rename to src/ObjWriting/Game/IW4/Localize/AssetDumperLocalizeEntry.cpp
diff --git a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperLocalizeEntry.h b/src/ObjWriting/Game/IW4/Localize/AssetDumperLocalizeEntry.h
similarity index 100%
rename from src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperLocalizeEntry.h
rename to src/ObjWriting/Game/IW4/Localize/AssetDumperLocalizeEntry.h
diff --git a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperAddonMapEnts.cpp b/src/ObjWriting/Game/IW4/Maps/AssetDumperAddonMapEnts.cpp
similarity index 100%
rename from src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperAddonMapEnts.cpp
rename to src/ObjWriting/Game/IW4/Maps/AssetDumperAddonMapEnts.cpp
diff --git a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperAddonMapEnts.h b/src/ObjWriting/Game/IW4/Maps/AssetDumperAddonMapEnts.h
similarity index 100%
rename from src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperAddonMapEnts.h
rename to src/ObjWriting/Game/IW4/Maps/AssetDumperAddonMapEnts.h
diff --git a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperMenuDef.cpp b/src/ObjWriting/Game/IW4/Menu/AssetDumperMenuDef.cpp
similarity index 100%
rename from src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperMenuDef.cpp
rename to src/ObjWriting/Game/IW4/Menu/AssetDumperMenuDef.cpp
diff --git a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperMenuDef.h b/src/ObjWriting/Game/IW4/Menu/AssetDumperMenuDef.h
similarity index 100%
rename from src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperMenuDef.h
rename to src/ObjWriting/Game/IW4/Menu/AssetDumperMenuDef.h
diff --git a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperMenuList.cpp b/src/ObjWriting/Game/IW4/Menu/AssetDumperMenuList.cpp
similarity index 100%
rename from src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperMenuList.cpp
rename to src/ObjWriting/Game/IW4/Menu/AssetDumperMenuList.cpp
diff --git a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperMenuList.h b/src/ObjWriting/Game/IW4/Menu/AssetDumperMenuList.h
similarity index 100%
rename from src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperMenuList.h
rename to src/ObjWriting/Game/IW4/Menu/AssetDumperMenuList.h
diff --git a/src/ObjWriting/Game/IW4/ObjWriterIW4.cpp b/src/ObjWriting/Game/IW4/ObjWriterIW4.cpp
index 30a0dc9e..84065df7 100644
--- a/src/ObjWriting/Game/IW4/ObjWriterIW4.cpp
+++ b/src/ObjWriting/Game/IW4/ObjWriterIW4.cpp
@@ -1,29 +1,29 @@
 #include "ObjWriterIW4.h"
 
-#include "AssetDumpers/AssetDumperAddonMapEnts.h"
-#include "AssetDumpers/AssetDumperGfxImage.h"
-#include "AssetDumpers/AssetDumperGfxLightDef.h"
-#include "AssetDumpers/AssetDumperLeaderboardDef.h"
-#include "AssetDumpers/AssetDumperLoadedSound.h"
-#include "AssetDumpers/AssetDumperLocalizeEntry.h"
-#include "AssetDumpers/AssetDumperMenuDef.h"
-#include "AssetDumpers/AssetDumperMenuList.h"
-#include "AssetDumpers/AssetDumperPhysCollmap.h"
-#include "AssetDumpers/AssetDumperPhysPreset.h"
-#include "AssetDumpers/AssetDumperPixelShader.h"
-#include "AssetDumpers/AssetDumperRawFile.h"
-#include "AssetDumpers/AssetDumperSndCurve.h"
-#include "AssetDumpers/AssetDumperStringTable.h"
-#include "AssetDumpers/AssetDumperStructuredDataDefSet.h"
-#include "AssetDumpers/AssetDumperTechniqueSet.h"
-#include "AssetDumpers/AssetDumperTracer.h"
-#include "AssetDumpers/AssetDumperVehicle.h"
-#include "AssetDumpers/AssetDumperVertexShader.h"
-#include "AssetDumpers/AssetDumperWeapon.h"
 #include "Game/IW4/GameAssetPoolIW4.h"
 #include "Game/IW4/XModel/XModelDumperIW4.h"
+#include "Image/AssetDumperGfxImage.h"
+#include "Leaderboard/AssetDumperLeaderboardDef.h"
+#include "LightDef/AssetDumperGfxLightDef.h"
+#include "Localize/AssetDumperLocalizeEntry.h"
+#include "Maps/AssetDumperAddonMapEnts.h"
 #include "Material/DumperMaterialIW4.h"
+#include "Menu/AssetDumperMenuDef.h"
+#include "Menu/AssetDumperMenuList.h"
 #include "ObjWriting.h"
+#include "PhysCollmap/AssetDumperPhysCollmap.h"
+#include "PhysPreset/AssetDumperPhysPreset.h"
+#include "RawFile/AssetDumperRawFile.h"
+#include "Shader/AssetDumperPixelShader.h"
+#include "Shader/AssetDumperVertexShader.h"
+#include "Sound/AssetDumperLoadedSound.h"
+#include "Sound/AssetDumperSndCurve.h"
+#include "StringTable/AssetDumperStringTable.h"
+#include "StructuredDataDef/AssetDumperStructuredDataDefSet.h"
+#include "Techset/AssetDumperTechniqueSet.h"
+#include "Tracer/AssetDumperTracer.h"
+#include "Vehicle/AssetDumperVehicle.h"
+#include "Weapon/AssetDumperWeapon.h"
 
 using namespace IW4;
 
diff --git a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperPhysCollmap.cpp b/src/ObjWriting/Game/IW4/PhysCollmap/AssetDumperPhysCollmap.cpp
similarity index 100%
rename from src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperPhysCollmap.cpp
rename to src/ObjWriting/Game/IW4/PhysCollmap/AssetDumperPhysCollmap.cpp
diff --git a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperPhysCollmap.h b/src/ObjWriting/Game/IW4/PhysCollmap/AssetDumperPhysCollmap.h
similarity index 100%
rename from src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperPhysCollmap.h
rename to src/ObjWriting/Game/IW4/PhysCollmap/AssetDumperPhysCollmap.h
diff --git a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperPhysPreset.cpp b/src/ObjWriting/Game/IW4/PhysPreset/AssetDumperPhysPreset.cpp
similarity index 100%
rename from src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperPhysPreset.cpp
rename to src/ObjWriting/Game/IW4/PhysPreset/AssetDumperPhysPreset.cpp
diff --git a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperPhysPreset.h b/src/ObjWriting/Game/IW4/PhysPreset/AssetDumperPhysPreset.h
similarity index 100%
rename from src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperPhysPreset.h
rename to src/ObjWriting/Game/IW4/PhysPreset/AssetDumperPhysPreset.h
diff --git a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperRawFile.cpp b/src/ObjWriting/Game/IW4/RawFile/AssetDumperRawFile.cpp
similarity index 100%
rename from src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperRawFile.cpp
rename to src/ObjWriting/Game/IW4/RawFile/AssetDumperRawFile.cpp
diff --git a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperRawFile.h b/src/ObjWriting/Game/IW4/RawFile/AssetDumperRawFile.h
similarity index 100%
rename from src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperRawFile.h
rename to src/ObjWriting/Game/IW4/RawFile/AssetDumperRawFile.h
diff --git a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperPixelShader.cpp b/src/ObjWriting/Game/IW4/Shader/AssetDumperPixelShader.cpp
similarity index 100%
rename from src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperPixelShader.cpp
rename to src/ObjWriting/Game/IW4/Shader/AssetDumperPixelShader.cpp
diff --git a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperPixelShader.h b/src/ObjWriting/Game/IW4/Shader/AssetDumperPixelShader.h
similarity index 100%
rename from src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperPixelShader.h
rename to src/ObjWriting/Game/IW4/Shader/AssetDumperPixelShader.h
diff --git a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperVertexShader.cpp b/src/ObjWriting/Game/IW4/Shader/AssetDumperVertexShader.cpp
similarity index 100%
rename from src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperVertexShader.cpp
rename to src/ObjWriting/Game/IW4/Shader/AssetDumperVertexShader.cpp
diff --git a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperVertexShader.h b/src/ObjWriting/Game/IW4/Shader/AssetDumperVertexShader.h
similarity index 100%
rename from src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperVertexShader.h
rename to src/ObjWriting/Game/IW4/Shader/AssetDumperVertexShader.h
diff --git a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperLoadedSound.cpp b/src/ObjWriting/Game/IW4/Sound/AssetDumperLoadedSound.cpp
similarity index 100%
rename from src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperLoadedSound.cpp
rename to src/ObjWriting/Game/IW4/Sound/AssetDumperLoadedSound.cpp
diff --git a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperLoadedSound.h b/src/ObjWriting/Game/IW4/Sound/AssetDumperLoadedSound.h
similarity index 100%
rename from src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperLoadedSound.h
rename to src/ObjWriting/Game/IW4/Sound/AssetDumperLoadedSound.h
diff --git a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperSndCurve.cpp b/src/ObjWriting/Game/IW4/Sound/AssetDumperSndCurve.cpp
similarity index 100%
rename from src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperSndCurve.cpp
rename to src/ObjWriting/Game/IW4/Sound/AssetDumperSndCurve.cpp
diff --git a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperSndCurve.h b/src/ObjWriting/Game/IW4/Sound/AssetDumperSndCurve.h
similarity index 100%
rename from src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperSndCurve.h
rename to src/ObjWriting/Game/IW4/Sound/AssetDumperSndCurve.h
diff --git a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperStringTable.cpp b/src/ObjWriting/Game/IW4/StringTable/AssetDumperStringTable.cpp
similarity index 100%
rename from src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperStringTable.cpp
rename to src/ObjWriting/Game/IW4/StringTable/AssetDumperStringTable.cpp
diff --git a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperStringTable.h b/src/ObjWriting/Game/IW4/StringTable/AssetDumperStringTable.h
similarity index 100%
rename from src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperStringTable.h
rename to src/ObjWriting/Game/IW4/StringTable/AssetDumperStringTable.h
diff --git a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperStructuredDataDefSet.cpp b/src/ObjWriting/Game/IW4/StructuredDataDef/AssetDumperStructuredDataDefSet.cpp
similarity index 100%
rename from src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperStructuredDataDefSet.cpp
rename to src/ObjWriting/Game/IW4/StructuredDataDef/AssetDumperStructuredDataDefSet.cpp
diff --git a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperStructuredDataDefSet.h b/src/ObjWriting/Game/IW4/StructuredDataDef/AssetDumperStructuredDataDefSet.h
similarity index 100%
rename from src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperStructuredDataDefSet.h
rename to src/ObjWriting/Game/IW4/StructuredDataDef/AssetDumperStructuredDataDefSet.h
diff --git a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperTechniqueSet.cpp b/src/ObjWriting/Game/IW4/Techset/AssetDumperTechniqueSet.cpp
similarity index 100%
rename from src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperTechniqueSet.cpp
rename to src/ObjWriting/Game/IW4/Techset/AssetDumperTechniqueSet.cpp
diff --git a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperTechniqueSet.h b/src/ObjWriting/Game/IW4/Techset/AssetDumperTechniqueSet.h
similarity index 100%
rename from src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperTechniqueSet.h
rename to src/ObjWriting/Game/IW4/Techset/AssetDumperTechniqueSet.h
diff --git a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperTracer.cpp b/src/ObjWriting/Game/IW4/Tracer/AssetDumperTracer.cpp
similarity index 100%
rename from src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperTracer.cpp
rename to src/ObjWriting/Game/IW4/Tracer/AssetDumperTracer.cpp
diff --git a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperTracer.h b/src/ObjWriting/Game/IW4/Tracer/AssetDumperTracer.h
similarity index 100%
rename from src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperTracer.h
rename to src/ObjWriting/Game/IW4/Tracer/AssetDumperTracer.h
diff --git a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperVehicle.cpp b/src/ObjWriting/Game/IW4/Vehicle/AssetDumperVehicle.cpp
similarity index 100%
rename from src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperVehicle.cpp
rename to src/ObjWriting/Game/IW4/Vehicle/AssetDumperVehicle.cpp
diff --git a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperVehicle.h b/src/ObjWriting/Game/IW4/Vehicle/AssetDumperVehicle.h
similarity index 100%
rename from src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperVehicle.h
rename to src/ObjWriting/Game/IW4/Vehicle/AssetDumperVehicle.h
diff --git a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperWeapon.cpp b/src/ObjWriting/Game/IW4/Weapon/AssetDumperWeapon.cpp
similarity index 100%
rename from src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperWeapon.cpp
rename to src/ObjWriting/Game/IW4/Weapon/AssetDumperWeapon.cpp
diff --git a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperWeapon.h b/src/ObjWriting/Game/IW4/Weapon/AssetDumperWeapon.h
similarity index 100%
rename from src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperWeapon.h
rename to src/ObjWriting/Game/IW4/Weapon/AssetDumperWeapon.h
diff --git a/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperGfxImage.cpp b/src/ObjWriting/Game/IW5/Image/AssetDumperGfxImage.cpp
similarity index 100%
rename from src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperGfxImage.cpp
rename to src/ObjWriting/Game/IW5/Image/AssetDumperGfxImage.cpp
diff --git a/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperGfxImage.h b/src/ObjWriting/Game/IW5/Image/AssetDumperGfxImage.h
similarity index 100%
rename from src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperGfxImage.h
rename to src/ObjWriting/Game/IW5/Image/AssetDumperGfxImage.h
diff --git a/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperLeaderboardDef.cpp b/src/ObjWriting/Game/IW5/Leaderboard/AssetDumperLeaderboardDef.cpp
similarity index 100%
rename from src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperLeaderboardDef.cpp
rename to src/ObjWriting/Game/IW5/Leaderboard/AssetDumperLeaderboardDef.cpp
diff --git a/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperLeaderboardDef.h b/src/ObjWriting/Game/IW5/Leaderboard/AssetDumperLeaderboardDef.h
similarity index 100%
rename from src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperLeaderboardDef.h
rename to src/ObjWriting/Game/IW5/Leaderboard/AssetDumperLeaderboardDef.h
diff --git a/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperLocalizeEntry.cpp b/src/ObjWriting/Game/IW5/Localize/AssetDumperLocalizeEntry.cpp
similarity index 100%
rename from src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperLocalizeEntry.cpp
rename to src/ObjWriting/Game/IW5/Localize/AssetDumperLocalizeEntry.cpp
diff --git a/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperLocalizeEntry.h b/src/ObjWriting/Game/IW5/Localize/AssetDumperLocalizeEntry.h
similarity index 100%
rename from src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperLocalizeEntry.h
rename to src/ObjWriting/Game/IW5/Localize/AssetDumperLocalizeEntry.h
diff --git a/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperAddonMapEnts.cpp b/src/ObjWriting/Game/IW5/Maps/AssetDumperAddonMapEnts.cpp
similarity index 100%
rename from src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperAddonMapEnts.cpp
rename to src/ObjWriting/Game/IW5/Maps/AssetDumperAddonMapEnts.cpp
diff --git a/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperAddonMapEnts.h b/src/ObjWriting/Game/IW5/Maps/AssetDumperAddonMapEnts.h
similarity index 100%
rename from src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperAddonMapEnts.h
rename to src/ObjWriting/Game/IW5/Maps/AssetDumperAddonMapEnts.h
diff --git a/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperMenuDef.cpp b/src/ObjWriting/Game/IW5/Menu/AssetDumperMenuDef.cpp
similarity index 100%
rename from src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperMenuDef.cpp
rename to src/ObjWriting/Game/IW5/Menu/AssetDumperMenuDef.cpp
diff --git a/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperMenuDef.h b/src/ObjWriting/Game/IW5/Menu/AssetDumperMenuDef.h
similarity index 100%
rename from src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperMenuDef.h
rename to src/ObjWriting/Game/IW5/Menu/AssetDumperMenuDef.h
diff --git a/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperMenuList.cpp b/src/ObjWriting/Game/IW5/Menu/AssetDumperMenuList.cpp
similarity index 100%
rename from src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperMenuList.cpp
rename to src/ObjWriting/Game/IW5/Menu/AssetDumperMenuList.cpp
diff --git a/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperMenuList.h b/src/ObjWriting/Game/IW5/Menu/AssetDumperMenuList.h
similarity index 100%
rename from src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperMenuList.h
rename to src/ObjWriting/Game/IW5/Menu/AssetDumperMenuList.h
diff --git a/src/ObjWriting/Game/IW5/ObjWriterIW5.cpp b/src/ObjWriting/Game/IW5/ObjWriterIW5.cpp
index 8e239829..46a3b354 100644
--- a/src/ObjWriting/Game/IW5/ObjWriterIW5.cpp
+++ b/src/ObjWriting/Game/IW5/ObjWriterIW5.cpp
@@ -1,21 +1,21 @@
 #include "ObjWriterIW5.h"
 
-#include "AssetDumpers/AssetDumperAddonMapEnts.h"
-#include "AssetDumpers/AssetDumperGfxImage.h"
-#include "AssetDumpers/AssetDumperLeaderboardDef.h"
-#include "AssetDumpers/AssetDumperLoadedSound.h"
-#include "AssetDumpers/AssetDumperLocalizeEntry.h"
-#include "AssetDumpers/AssetDumperMenuDef.h"
-#include "AssetDumpers/AssetDumperMenuList.h"
-#include "AssetDumpers/AssetDumperRawFile.h"
-#include "AssetDumpers/AssetDumperScriptFile.h"
-#include "AssetDumpers/AssetDumperStringTable.h"
-#include "AssetDumpers/AssetDumperWeapon.h"
-#include "AssetDumpers/AssetDumperWeaponAttachment.h"
 #include "Game/IW5/GameAssetPoolIW5.h"
 #include "Game/IW5/XModel/XModelDumperIW5.h"
+#include "Image/AssetDumperGfxImage.h"
+#include "Leaderboard/AssetDumperLeaderboardDef.h"
+#include "Localize/AssetDumperLocalizeEntry.h"
+#include "Maps/AssetDumperAddonMapEnts.h"
 #include "Material/DumperMaterialIW5.h"
+#include "Menu/AssetDumperMenuDef.h"
+#include "Menu/AssetDumperMenuList.h"
 #include "ObjWriting.h"
+#include "RawFile/AssetDumperRawFile.h"
+#include "Script/AssetDumperScriptFile.h"
+#include "Sound/AssetDumperLoadedSound.h"
+#include "StringTable/AssetDumperStringTable.h"
+#include "Weapon/AssetDumperWeapon.h"
+#include "Weapon/AssetDumperWeaponAttachment.h"
 
 using namespace IW5;
 
diff --git a/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperRawFile.cpp b/src/ObjWriting/Game/IW5/RawFile/AssetDumperRawFile.cpp
similarity index 100%
rename from src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperRawFile.cpp
rename to src/ObjWriting/Game/IW5/RawFile/AssetDumperRawFile.cpp
diff --git a/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperRawFile.h b/src/ObjWriting/Game/IW5/RawFile/AssetDumperRawFile.h
similarity index 100%
rename from src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperRawFile.h
rename to src/ObjWriting/Game/IW5/RawFile/AssetDumperRawFile.h
diff --git a/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperScriptFile.cpp b/src/ObjWriting/Game/IW5/Script/AssetDumperScriptFile.cpp
similarity index 100%
rename from src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperScriptFile.cpp
rename to src/ObjWriting/Game/IW5/Script/AssetDumperScriptFile.cpp
diff --git a/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperScriptFile.h b/src/ObjWriting/Game/IW5/Script/AssetDumperScriptFile.h
similarity index 100%
rename from src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperScriptFile.h
rename to src/ObjWriting/Game/IW5/Script/AssetDumperScriptFile.h
diff --git a/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperLoadedSound.cpp b/src/ObjWriting/Game/IW5/Sound/AssetDumperLoadedSound.cpp
similarity index 100%
rename from src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperLoadedSound.cpp
rename to src/ObjWriting/Game/IW5/Sound/AssetDumperLoadedSound.cpp
diff --git a/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperLoadedSound.h b/src/ObjWriting/Game/IW5/Sound/AssetDumperLoadedSound.h
similarity index 100%
rename from src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperLoadedSound.h
rename to src/ObjWriting/Game/IW5/Sound/AssetDumperLoadedSound.h
diff --git a/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperStringTable.cpp b/src/ObjWriting/Game/IW5/StringTable/AssetDumperStringTable.cpp
similarity index 100%
rename from src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperStringTable.cpp
rename to src/ObjWriting/Game/IW5/StringTable/AssetDumperStringTable.cpp
diff --git a/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperStringTable.h b/src/ObjWriting/Game/IW5/StringTable/AssetDumperStringTable.h
similarity index 100%
rename from src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperStringTable.h
rename to src/ObjWriting/Game/IW5/StringTable/AssetDumperStringTable.h
diff --git a/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperWeapon.cpp b/src/ObjWriting/Game/IW5/Weapon/AssetDumperWeapon.cpp
similarity index 100%
rename from src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperWeapon.cpp
rename to src/ObjWriting/Game/IW5/Weapon/AssetDumperWeapon.cpp
diff --git a/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperWeapon.h b/src/ObjWriting/Game/IW5/Weapon/AssetDumperWeapon.h
similarity index 100%
rename from src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperWeapon.h
rename to src/ObjWriting/Game/IW5/Weapon/AssetDumperWeapon.h
diff --git a/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperWeaponAttachment.cpp b/src/ObjWriting/Game/IW5/Weapon/AssetDumperWeaponAttachment.cpp
similarity index 100%
rename from src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperWeaponAttachment.cpp
rename to src/ObjWriting/Game/IW5/Weapon/AssetDumperWeaponAttachment.cpp
diff --git a/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperWeaponAttachment.h b/src/ObjWriting/Game/IW5/Weapon/AssetDumperWeaponAttachment.h
similarity index 100%
rename from src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperWeaponAttachment.h
rename to src/ObjWriting/Game/IW5/Weapon/AssetDumperWeaponAttachment.h
diff --git a/src/ObjWriting/Game/T5/AssetDumpers/AssetDumperGfxImage.cpp b/src/ObjWriting/Game/T5/Image/AssetDumperGfxImage.cpp
similarity index 100%
rename from src/ObjWriting/Game/T5/AssetDumpers/AssetDumperGfxImage.cpp
rename to src/ObjWriting/Game/T5/Image/AssetDumperGfxImage.cpp
diff --git a/src/ObjWriting/Game/T5/AssetDumpers/AssetDumperGfxImage.h b/src/ObjWriting/Game/T5/Image/AssetDumperGfxImage.h
similarity index 100%
rename from src/ObjWriting/Game/T5/AssetDumpers/AssetDumperGfxImage.h
rename to src/ObjWriting/Game/T5/Image/AssetDumperGfxImage.h
diff --git a/src/ObjWriting/Game/T5/AssetDumpers/AssetDumperLocalizeEntry.cpp b/src/ObjWriting/Game/T5/Localize/AssetDumperLocalizeEntry.cpp
similarity index 100%
rename from src/ObjWriting/Game/T5/AssetDumpers/AssetDumperLocalizeEntry.cpp
rename to src/ObjWriting/Game/T5/Localize/AssetDumperLocalizeEntry.cpp
diff --git a/src/ObjWriting/Game/T5/AssetDumpers/AssetDumperLocalizeEntry.h b/src/ObjWriting/Game/T5/Localize/AssetDumperLocalizeEntry.h
similarity index 100%
rename from src/ObjWriting/Game/T5/AssetDumpers/AssetDumperLocalizeEntry.h
rename to src/ObjWriting/Game/T5/Localize/AssetDumperLocalizeEntry.h
diff --git a/src/ObjWriting/Game/T5/ObjWriterT5.cpp b/src/ObjWriting/Game/T5/ObjWriterT5.cpp
index 4eafde5a..e37bc427 100644
--- a/src/ObjWriting/Game/T5/ObjWriterT5.cpp
+++ b/src/ObjWriting/Game/T5/ObjWriterT5.cpp
@@ -1,17 +1,17 @@
 #include "ObjWriterT5.h"
 
-#include "AssetDumpers/AssetDumperGfxImage.h"
-#include "AssetDumpers/AssetDumperLocalizeEntry.h"
-#include "AssetDumpers/AssetDumperPhysConstraints.h"
-#include "AssetDumpers/AssetDumperPhysPreset.h"
-#include "AssetDumpers/AssetDumperRawFile.h"
-#include "AssetDumpers/AssetDumperSndBank.h"
-#include "AssetDumpers/AssetDumperStringTable.h"
-#include "AssetDumpers/AssetDumperWeapon.h"
 #include "Game/T5/GameAssetPoolT5.h"
 #include "Game/T5/XModel/XModelDumperT5.h"
+#include "Image/AssetDumperGfxImage.h"
+#include "Localize/AssetDumperLocalizeEntry.h"
 #include "Material/DumperMaterialT5.h"
 #include "ObjWriting.h"
+#include "PhysConstraints/AssetDumperPhysConstraints.h"
+#include "PhysPreset/AssetDumperPhysPreset.h"
+#include "RawFile/AssetDumperRawFile.h"
+#include "Sound/AssetDumperSndBank.h"
+#include "StringTable/AssetDumperStringTable.h"
+#include "Weapon/AssetDumperWeapon.h"
 
 using namespace T5;
 
diff --git a/src/ObjWriting/Game/T5/AssetDumpers/AssetDumperPhysConstraints.cpp b/src/ObjWriting/Game/T5/PhysConstraints/AssetDumperPhysConstraints.cpp
similarity index 100%
rename from src/ObjWriting/Game/T5/AssetDumpers/AssetDumperPhysConstraints.cpp
rename to src/ObjWriting/Game/T5/PhysConstraints/AssetDumperPhysConstraints.cpp
diff --git a/src/ObjWriting/Game/T5/AssetDumpers/AssetDumperPhysConstraints.h b/src/ObjWriting/Game/T5/PhysConstraints/AssetDumperPhysConstraints.h
similarity index 100%
rename from src/ObjWriting/Game/T5/AssetDumpers/AssetDumperPhysConstraints.h
rename to src/ObjWriting/Game/T5/PhysConstraints/AssetDumperPhysConstraints.h
diff --git a/src/ObjWriting/Game/T5/AssetDumpers/AssetDumperPhysPreset.cpp b/src/ObjWriting/Game/T5/PhysPreset/AssetDumperPhysPreset.cpp
similarity index 100%
rename from src/ObjWriting/Game/T5/AssetDumpers/AssetDumperPhysPreset.cpp
rename to src/ObjWriting/Game/T5/PhysPreset/AssetDumperPhysPreset.cpp
diff --git a/src/ObjWriting/Game/T5/AssetDumpers/AssetDumperPhysPreset.h b/src/ObjWriting/Game/T5/PhysPreset/AssetDumperPhysPreset.h
similarity index 100%
rename from src/ObjWriting/Game/T5/AssetDumpers/AssetDumperPhysPreset.h
rename to src/ObjWriting/Game/T5/PhysPreset/AssetDumperPhysPreset.h
diff --git a/src/ObjWriting/Game/T5/AssetDumpers/AssetDumperRawFile.cpp b/src/ObjWriting/Game/T5/RawFile/AssetDumperRawFile.cpp
similarity index 100%
rename from src/ObjWriting/Game/T5/AssetDumpers/AssetDumperRawFile.cpp
rename to src/ObjWriting/Game/T5/RawFile/AssetDumperRawFile.cpp
diff --git a/src/ObjWriting/Game/T5/AssetDumpers/AssetDumperRawFile.h b/src/ObjWriting/Game/T5/RawFile/AssetDumperRawFile.h
similarity index 100%
rename from src/ObjWriting/Game/T5/AssetDumpers/AssetDumperRawFile.h
rename to src/ObjWriting/Game/T5/RawFile/AssetDumperRawFile.h
diff --git a/src/ObjWriting/Game/T5/AssetDumpers/AssetDumperSndBank.cpp b/src/ObjWriting/Game/T5/Sound/AssetDumperSndBank.cpp
similarity index 100%
rename from src/ObjWriting/Game/T5/AssetDumpers/AssetDumperSndBank.cpp
rename to src/ObjWriting/Game/T5/Sound/AssetDumperSndBank.cpp
diff --git a/src/ObjWriting/Game/T5/AssetDumpers/AssetDumperSndBank.h b/src/ObjWriting/Game/T5/Sound/AssetDumperSndBank.h
similarity index 100%
rename from src/ObjWriting/Game/T5/AssetDumpers/AssetDumperSndBank.h
rename to src/ObjWriting/Game/T5/Sound/AssetDumperSndBank.h
diff --git a/src/ObjWriting/Game/T5/AssetDumpers/AssetDumperStringTable.cpp b/src/ObjWriting/Game/T5/StringTable/AssetDumperStringTable.cpp
similarity index 100%
rename from src/ObjWriting/Game/T5/AssetDumpers/AssetDumperStringTable.cpp
rename to src/ObjWriting/Game/T5/StringTable/AssetDumperStringTable.cpp
diff --git a/src/ObjWriting/Game/T5/AssetDumpers/AssetDumperStringTable.h b/src/ObjWriting/Game/T5/StringTable/AssetDumperStringTable.h
similarity index 100%
rename from src/ObjWriting/Game/T5/AssetDumpers/AssetDumperStringTable.h
rename to src/ObjWriting/Game/T5/StringTable/AssetDumperStringTable.h
diff --git a/src/ObjWriting/Game/T5/AssetDumpers/AssetDumperWeapon.cpp b/src/ObjWriting/Game/T5/Weapon/AssetDumperWeapon.cpp
similarity index 100%
rename from src/ObjWriting/Game/T5/AssetDumpers/AssetDumperWeapon.cpp
rename to src/ObjWriting/Game/T5/Weapon/AssetDumperWeapon.cpp
diff --git a/src/ObjWriting/Game/T5/AssetDumpers/AssetDumperWeapon.h b/src/ObjWriting/Game/T5/Weapon/AssetDumperWeapon.h
similarity index 100%
rename from src/ObjWriting/Game/T5/AssetDumpers/AssetDumperWeapon.h
rename to src/ObjWriting/Game/T5/Weapon/AssetDumperWeapon.h
diff --git a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperGfxImage.cpp b/src/ObjWriting/Game/T6/Image/AssetDumperGfxImage.cpp
similarity index 100%
rename from src/ObjWriting/Game/T6/AssetDumpers/AssetDumperGfxImage.cpp
rename to src/ObjWriting/Game/T6/Image/AssetDumperGfxImage.cpp
diff --git a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperGfxImage.h b/src/ObjWriting/Game/T6/Image/AssetDumperGfxImage.h
similarity index 100%
rename from src/ObjWriting/Game/T6/AssetDumpers/AssetDumperGfxImage.h
rename to src/ObjWriting/Game/T6/Image/AssetDumperGfxImage.h
diff --git a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperLeaderboardDef.cpp b/src/ObjWriting/Game/T6/Leaderboard/AssetDumperLeaderboardDef.cpp
similarity index 100%
rename from src/ObjWriting/Game/T6/AssetDumpers/AssetDumperLeaderboardDef.cpp
rename to src/ObjWriting/Game/T6/Leaderboard/AssetDumperLeaderboardDef.cpp
diff --git a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperLeaderboardDef.h b/src/ObjWriting/Game/T6/Leaderboard/AssetDumperLeaderboardDef.h
similarity index 100%
rename from src/ObjWriting/Game/T6/AssetDumpers/AssetDumperLeaderboardDef.h
rename to src/ObjWriting/Game/T6/Leaderboard/AssetDumperLeaderboardDef.h
diff --git a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperLocalizeEntry.cpp b/src/ObjWriting/Game/T6/Localize/AssetDumperLocalizeEntry.cpp
similarity index 100%
rename from src/ObjWriting/Game/T6/AssetDumpers/AssetDumperLocalizeEntry.cpp
rename to src/ObjWriting/Game/T6/Localize/AssetDumperLocalizeEntry.cpp
diff --git a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperLocalizeEntry.h b/src/ObjWriting/Game/T6/Localize/AssetDumperLocalizeEntry.h
similarity index 100%
rename from src/ObjWriting/Game/T6/AssetDumpers/AssetDumperLocalizeEntry.h
rename to src/ObjWriting/Game/T6/Localize/AssetDumperLocalizeEntry.h
diff --git a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperMapEnts.cpp b/src/ObjWriting/Game/T6/Maps/AssetDumperMapEnts.cpp
similarity index 100%
rename from src/ObjWriting/Game/T6/AssetDumpers/AssetDumperMapEnts.cpp
rename to src/ObjWriting/Game/T6/Maps/AssetDumperMapEnts.cpp
diff --git a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperMapEnts.h b/src/ObjWriting/Game/T6/Maps/AssetDumperMapEnts.h
similarity index 100%
rename from src/ObjWriting/Game/T6/AssetDumpers/AssetDumperMapEnts.h
rename to src/ObjWriting/Game/T6/Maps/AssetDumperMapEnts.h
diff --git a/src/ObjWriting/Game/T6/ObjWriterT6.cpp b/src/ObjWriting/Game/T6/ObjWriterT6.cpp
index 03f1737b..48d3dd34 100644
--- a/src/ObjWriting/Game/T6/ObjWriterT6.cpp
+++ b/src/ObjWriting/Game/T6/ObjWriterT6.cpp
@@ -1,31 +1,32 @@
 #include "ObjWriterT6.h"
 
-#include "AssetDumpers/AssetDumperGfxImage.h"
-#include "AssetDumpers/AssetDumperLeaderboardDef.h"
-#include "AssetDumpers/AssetDumperLocalizeEntry.h"
-#include "AssetDumpers/AssetDumperMapEnts.h"
-#include "AssetDumpers/AssetDumperPhysConstraints.h"
-#include "AssetDumpers/AssetDumperPhysPreset.h"
-#include "AssetDumpers/AssetDumperQdb.h"
-#include "AssetDumpers/AssetDumperRawFile.h"
-#include "AssetDumpers/AssetDumperScriptParseTree.h"
-#include "AssetDumpers/AssetDumperSlug.h"
-#include "AssetDumpers/AssetDumperSndBank.h"
-#include "AssetDumpers/AssetDumperSndDriverGlobals.h"
-#include "AssetDumpers/AssetDumperStringTable.h"
-#include "AssetDumpers/AssetDumperTechniqueSet.h"
-#include "AssetDumpers/AssetDumperTracer.h"
-#include "AssetDumpers/AssetDumperVehicle.h"
-#include "AssetDumpers/AssetDumperWeapon.h"
-#include "AssetDumpers/AssetDumperWeaponAttachment.h"
-#include "AssetDumpers/AssetDumperWeaponAttachmentUnique.h"
-#include "AssetDumpers/AssetDumperWeaponCamo.h"
-#include "AssetDumpers/AssetDumperZBarrier.h"
 #include "FontIcon/DumperFontIconT6.h"
 #include "Game/T6/GameAssetPoolT6.h"
 #include "Game/T6/XModel/XModelDumperT6.h"
+#include "Image/AssetDumperGfxImage.h"
+#include "Leaderboard/AssetDumperLeaderboardDef.h"
+#include "Localize/AssetDumperLocalizeEntry.h"
+#include "Maps/AssetDumperMapEnts.h"
 #include "Material/DumperMaterialT6.h"
 #include "ObjWriting.h"
+#include "PhysConstraints/AssetDumperPhysConstraints.h"
+#include "PhysPreset/AssetDumperPhysPreset.h"
+#include "Qdb/AssetDumperQdb.h"
+#include "RawFile/AssetDumperRawFile.h"
+#include "Script/AssetDumperScriptParseTree.h"
+#include "Slug/AssetDumperSlug.h"
+#include "Sound/AssetDumperSndBank.h"
+#include "Sound/AssetDumperSndDriverGlobals.h"
+#include "StringTable/AssetDumperStringTable.h"
+#include "Techset/AssetDumperTechniqueSet.h"
+#include "Tracer/AssetDumperTracer.h"
+#include "Vehicle/AssetDumperVehicle.h"
+#include "Weapon/AssetDumperWeapon.h"
+#include "Weapon/AssetDumperWeaponAttachment.h"
+#include "Weapon/AssetDumperWeaponAttachmentUnique.h"
+#include "Weapon/AssetDumperWeaponCamo.h"
+#include "ZBarrier/AssetDumperZBarrier.h"
+
 
 using namespace T6;
 
diff --git a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperPhysConstraints.cpp b/src/ObjWriting/Game/T6/PhysConstraints/AssetDumperPhysConstraints.cpp
similarity index 100%
rename from src/ObjWriting/Game/T6/AssetDumpers/AssetDumperPhysConstraints.cpp
rename to src/ObjWriting/Game/T6/PhysConstraints/AssetDumperPhysConstraints.cpp
diff --git a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperPhysConstraints.h b/src/ObjWriting/Game/T6/PhysConstraints/AssetDumperPhysConstraints.h
similarity index 100%
rename from src/ObjWriting/Game/T6/AssetDumpers/AssetDumperPhysConstraints.h
rename to src/ObjWriting/Game/T6/PhysConstraints/AssetDumperPhysConstraints.h
diff --git a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperPhysPreset.cpp b/src/ObjWriting/Game/T6/PhysPreset/AssetDumperPhysPreset.cpp
similarity index 100%
rename from src/ObjWriting/Game/T6/AssetDumpers/AssetDumperPhysPreset.cpp
rename to src/ObjWriting/Game/T6/PhysPreset/AssetDumperPhysPreset.cpp
diff --git a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperPhysPreset.h b/src/ObjWriting/Game/T6/PhysPreset/AssetDumperPhysPreset.h
similarity index 100%
rename from src/ObjWriting/Game/T6/AssetDumpers/AssetDumperPhysPreset.h
rename to src/ObjWriting/Game/T6/PhysPreset/AssetDumperPhysPreset.h
diff --git a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperQdb.cpp b/src/ObjWriting/Game/T6/Qdb/AssetDumperQdb.cpp
similarity index 100%
rename from src/ObjWriting/Game/T6/AssetDumpers/AssetDumperQdb.cpp
rename to src/ObjWriting/Game/T6/Qdb/AssetDumperQdb.cpp
diff --git a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperQdb.h b/src/ObjWriting/Game/T6/Qdb/AssetDumperQdb.h
similarity index 100%
rename from src/ObjWriting/Game/T6/AssetDumpers/AssetDumperQdb.h
rename to src/ObjWriting/Game/T6/Qdb/AssetDumperQdb.h
diff --git a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperRawFile.cpp b/src/ObjWriting/Game/T6/RawFile/AssetDumperRawFile.cpp
similarity index 100%
rename from src/ObjWriting/Game/T6/AssetDumpers/AssetDumperRawFile.cpp
rename to src/ObjWriting/Game/T6/RawFile/AssetDumperRawFile.cpp
diff --git a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperRawFile.h b/src/ObjWriting/Game/T6/RawFile/AssetDumperRawFile.h
similarity index 100%
rename from src/ObjWriting/Game/T6/AssetDumpers/AssetDumperRawFile.h
rename to src/ObjWriting/Game/T6/RawFile/AssetDumperRawFile.h
diff --git a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperScriptParseTree.cpp b/src/ObjWriting/Game/T6/Script/AssetDumperScriptParseTree.cpp
similarity index 100%
rename from src/ObjWriting/Game/T6/AssetDumpers/AssetDumperScriptParseTree.cpp
rename to src/ObjWriting/Game/T6/Script/AssetDumperScriptParseTree.cpp
diff --git a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperScriptParseTree.h b/src/ObjWriting/Game/T6/Script/AssetDumperScriptParseTree.h
similarity index 100%
rename from src/ObjWriting/Game/T6/AssetDumpers/AssetDumperScriptParseTree.h
rename to src/ObjWriting/Game/T6/Script/AssetDumperScriptParseTree.h
diff --git a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperSlug.cpp b/src/ObjWriting/Game/T6/Slug/AssetDumperSlug.cpp
similarity index 100%
rename from src/ObjWriting/Game/T6/AssetDumpers/AssetDumperSlug.cpp
rename to src/ObjWriting/Game/T6/Slug/AssetDumperSlug.cpp
diff --git a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperSlug.h b/src/ObjWriting/Game/T6/Slug/AssetDumperSlug.h
similarity index 100%
rename from src/ObjWriting/Game/T6/AssetDumpers/AssetDumperSlug.h
rename to src/ObjWriting/Game/T6/Slug/AssetDumperSlug.h
diff --git a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperSndBank.cpp b/src/ObjWriting/Game/T6/Sound/AssetDumperSndBank.cpp
similarity index 100%
rename from src/ObjWriting/Game/T6/AssetDumpers/AssetDumperSndBank.cpp
rename to src/ObjWriting/Game/T6/Sound/AssetDumperSndBank.cpp
diff --git a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperSndBank.h b/src/ObjWriting/Game/T6/Sound/AssetDumperSndBank.h
similarity index 100%
rename from src/ObjWriting/Game/T6/AssetDumpers/AssetDumperSndBank.h
rename to src/ObjWriting/Game/T6/Sound/AssetDumperSndBank.h
diff --git a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperSndDriverGlobals.cpp b/src/ObjWriting/Game/T6/Sound/AssetDumperSndDriverGlobals.cpp
similarity index 100%
rename from src/ObjWriting/Game/T6/AssetDumpers/AssetDumperSndDriverGlobals.cpp
rename to src/ObjWriting/Game/T6/Sound/AssetDumperSndDriverGlobals.cpp
diff --git a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperSndDriverGlobals.h b/src/ObjWriting/Game/T6/Sound/AssetDumperSndDriverGlobals.h
similarity index 100%
rename from src/ObjWriting/Game/T6/AssetDumpers/AssetDumperSndDriverGlobals.h
rename to src/ObjWriting/Game/T6/Sound/AssetDumperSndDriverGlobals.h
diff --git a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperStringTable.cpp b/src/ObjWriting/Game/T6/StringTable/AssetDumperStringTable.cpp
similarity index 100%
rename from src/ObjWriting/Game/T6/AssetDumpers/AssetDumperStringTable.cpp
rename to src/ObjWriting/Game/T6/StringTable/AssetDumperStringTable.cpp
diff --git a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperStringTable.h b/src/ObjWriting/Game/T6/StringTable/AssetDumperStringTable.h
similarity index 100%
rename from src/ObjWriting/Game/T6/AssetDumpers/AssetDumperStringTable.h
rename to src/ObjWriting/Game/T6/StringTable/AssetDumperStringTable.h
diff --git a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperTechniqueSet.cpp b/src/ObjWriting/Game/T6/Techset/AssetDumperTechniqueSet.cpp
similarity index 100%
rename from src/ObjWriting/Game/T6/AssetDumpers/AssetDumperTechniqueSet.cpp
rename to src/ObjWriting/Game/T6/Techset/AssetDumperTechniqueSet.cpp
diff --git a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperTechniqueSet.h b/src/ObjWriting/Game/T6/Techset/AssetDumperTechniqueSet.h
similarity index 100%
rename from src/ObjWriting/Game/T6/AssetDumpers/AssetDumperTechniqueSet.h
rename to src/ObjWriting/Game/T6/Techset/AssetDumperTechniqueSet.h
diff --git a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperTracer.cpp b/src/ObjWriting/Game/T6/Tracer/AssetDumperTracer.cpp
similarity index 100%
rename from src/ObjWriting/Game/T6/AssetDumpers/AssetDumperTracer.cpp
rename to src/ObjWriting/Game/T6/Tracer/AssetDumperTracer.cpp
diff --git a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperTracer.h b/src/ObjWriting/Game/T6/Tracer/AssetDumperTracer.h
similarity index 100%
rename from src/ObjWriting/Game/T6/AssetDumpers/AssetDumperTracer.h
rename to src/ObjWriting/Game/T6/Tracer/AssetDumperTracer.h
diff --git a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperVehicle.cpp b/src/ObjWriting/Game/T6/Vehicle/AssetDumperVehicle.cpp
similarity index 100%
rename from src/ObjWriting/Game/T6/AssetDumpers/AssetDumperVehicle.cpp
rename to src/ObjWriting/Game/T6/Vehicle/AssetDumperVehicle.cpp
diff --git a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperVehicle.h b/src/ObjWriting/Game/T6/Vehicle/AssetDumperVehicle.h
similarity index 100%
rename from src/ObjWriting/Game/T6/AssetDumpers/AssetDumperVehicle.h
rename to src/ObjWriting/Game/T6/Vehicle/AssetDumperVehicle.h
diff --git a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperWeapon.cpp b/src/ObjWriting/Game/T6/Weapon/AssetDumperWeapon.cpp
similarity index 100%
rename from src/ObjWriting/Game/T6/AssetDumpers/AssetDumperWeapon.cpp
rename to src/ObjWriting/Game/T6/Weapon/AssetDumperWeapon.cpp
diff --git a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperWeapon.h b/src/ObjWriting/Game/T6/Weapon/AssetDumperWeapon.h
similarity index 100%
rename from src/ObjWriting/Game/T6/AssetDumpers/AssetDumperWeapon.h
rename to src/ObjWriting/Game/T6/Weapon/AssetDumperWeapon.h
diff --git a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperWeaponAttachment.cpp b/src/ObjWriting/Game/T6/Weapon/AssetDumperWeaponAttachment.cpp
similarity index 100%
rename from src/ObjWriting/Game/T6/AssetDumpers/AssetDumperWeaponAttachment.cpp
rename to src/ObjWriting/Game/T6/Weapon/AssetDumperWeaponAttachment.cpp
diff --git a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperWeaponAttachment.h b/src/ObjWriting/Game/T6/Weapon/AssetDumperWeaponAttachment.h
similarity index 100%
rename from src/ObjWriting/Game/T6/AssetDumpers/AssetDumperWeaponAttachment.h
rename to src/ObjWriting/Game/T6/Weapon/AssetDumperWeaponAttachment.h
diff --git a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperWeaponAttachmentUnique.cpp b/src/ObjWriting/Game/T6/Weapon/AssetDumperWeaponAttachmentUnique.cpp
similarity index 100%
rename from src/ObjWriting/Game/T6/AssetDumpers/AssetDumperWeaponAttachmentUnique.cpp
rename to src/ObjWriting/Game/T6/Weapon/AssetDumperWeaponAttachmentUnique.cpp
diff --git a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperWeaponAttachmentUnique.h b/src/ObjWriting/Game/T6/Weapon/AssetDumperWeaponAttachmentUnique.h
similarity index 100%
rename from src/ObjWriting/Game/T6/AssetDumpers/AssetDumperWeaponAttachmentUnique.h
rename to src/ObjWriting/Game/T6/Weapon/AssetDumperWeaponAttachmentUnique.h
diff --git a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperWeaponCamo.cpp b/src/ObjWriting/Game/T6/Weapon/AssetDumperWeaponCamo.cpp
similarity index 90%
rename from src/ObjWriting/Game/T6/AssetDumpers/AssetDumperWeaponCamo.cpp
rename to src/ObjWriting/Game/T6/Weapon/AssetDumperWeaponCamo.cpp
index 4631e962..4e485235 100644
--- a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperWeaponCamo.cpp
+++ b/src/ObjWriting/Game/T6/Weapon/AssetDumperWeaponCamo.cpp
@@ -1,6 +1,6 @@
 #include "AssetDumperWeaponCamo.h"
 
-#include "Game/T6/WeaponCamo/JsonWeaponCamoWriter.h"
+#include "JsonWeaponCamoWriter.h"
 
 #include <format>
 
diff --git a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperWeaponCamo.h b/src/ObjWriting/Game/T6/Weapon/AssetDumperWeaponCamo.h
similarity index 100%
rename from src/ObjWriting/Game/T6/AssetDumpers/AssetDumperWeaponCamo.h
rename to src/ObjWriting/Game/T6/Weapon/AssetDumperWeaponCamo.h
diff --git a/src/ObjWriting/Game/T6/WeaponCamo/JsonWeaponCamoWriter.cpp b/src/ObjWriting/Game/T6/Weapon/JsonWeaponCamoWriter.cpp
similarity index 100%
rename from src/ObjWriting/Game/T6/WeaponCamo/JsonWeaponCamoWriter.cpp
rename to src/ObjWriting/Game/T6/Weapon/JsonWeaponCamoWriter.cpp
diff --git a/src/ObjWriting/Game/T6/WeaponCamo/JsonWeaponCamoWriter.h b/src/ObjWriting/Game/T6/Weapon/JsonWeaponCamoWriter.h
similarity index 100%
rename from src/ObjWriting/Game/T6/WeaponCamo/JsonWeaponCamoWriter.h
rename to src/ObjWriting/Game/T6/Weapon/JsonWeaponCamoWriter.h
diff --git a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperZBarrier.cpp b/src/ObjWriting/Game/T6/ZBarrier/AssetDumperZBarrier.cpp
similarity index 100%
rename from src/ObjWriting/Game/T6/AssetDumpers/AssetDumperZBarrier.cpp
rename to src/ObjWriting/Game/T6/ZBarrier/AssetDumperZBarrier.cpp
diff --git a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperZBarrier.h b/src/ObjWriting/Game/T6/ZBarrier/AssetDumperZBarrier.h
similarity index 100%
rename from src/ObjWriting/Game/T6/AssetDumpers/AssetDumperZBarrier.h
rename to src/ObjWriting/Game/T6/ZBarrier/AssetDumperZBarrier.h