diff --git a/src/ObjLoading/Game/IW4/Leaderboard/LoaderLeaderboardIW4.cpp b/src/ObjLoading/Game/IW4/Leaderboard/LoaderLeaderboardIW4.cpp
index 49a0db9a..550472dc 100644
--- a/src/ObjLoading/Game/IW4/Leaderboard/LoaderLeaderboardIW4.cpp
+++ b/src/ObjLoading/Game/IW4/Leaderboard/LoaderLeaderboardIW4.cpp
@@ -1,4 +1,5 @@
-#include "AssetLoaderLeaderboardIW4.h"
+#include "LoaderLeaderboardIW4.h"
+
 #include "Game/IW4/IW4.h"
 #include "JsonLeaderboardDefLoader.h"
 
diff --git a/src/ObjLoading/Game/IW4/Localize/LoaderLocalizeIW4.cpp b/src/ObjLoading/Game/IW4/Localize/LoaderLocalizeIW4.cpp
index 7a04b520..795939ed 100644
--- a/src/ObjLoading/Game/IW4/Localize/LoaderLocalizeIW4.cpp
+++ b/src/ObjLoading/Game/IW4/Localize/LoaderLocalizeIW4.cpp
@@ -1,4 +1,5 @@
-#include "AssetLoaderLocalizeIW4.h"
+#include "LoaderLocalizeIW4.h"
+
 #include "Localize/CommonLocalizeLoader.h"
 
 using namespace IW4;
diff --git a/src/ObjLoading/Game/IW4/Material/LoaderMaterialIW4.cpp b/src/ObjLoading/Game/IW4/Material/LoaderMaterialIW4.cpp
index 0d5d27f1..45f6a954 100644
--- a/src/ObjLoading/Game/IW4/Material/LoaderMaterialIW4.cpp
+++ b/src/ObjLoading/Game/IW4/Material/LoaderMaterialIW4.cpp
@@ -1,6 +1,5 @@
 #include "LoaderMaterialIW4.h"
 
-#include "AssetLoaderTechniqueSet.h"
 #include "AssetLoading/AbstractGdtEntryReader.h"
 #include "Game/IW4/CommonIW4.h"
 #include "Game/IW4/IW4.h"
@@ -1321,7 +1320,12 @@ namespace
     class MaterialLoader final : public AssetCreator<AssetMaterial>
     {
     public:
-        MaterialLoader(MemoryManager& memory, ISearchPath& searchPath);
+        MaterialLoader(MemoryManager& memory, ISearchPath& searchPath, IGdtQueryable& gdt)
+            : m_memory(memory),
+              m_search_path(m_search_path),
+              m_gdt(gdt)
+        {
+        }
 
         AssetCreationResult CreateAsset(const std::string& assetName, AssetCreationContext& context) override
         {
diff --git a/src/ObjLoading/Game/IW4/Menu/LoaderMenuListIW4.cpp b/src/ObjLoading/Game/IW4/Menu/LoaderMenuListIW4.cpp
index 181c3821..fdeb0b25 100644
--- a/src/ObjLoading/Game/IW4/Menu/LoaderMenuListIW4.cpp
+++ b/src/ObjLoading/Game/IW4/Menu/LoaderMenuListIW4.cpp
@@ -1,4 +1,5 @@
-#include "AssetLoaderMenuListIW4.h"
+#include "LoaderMenuListIW4.h"
+
 #include "Game/IW4/IW4.h"
 #include "Game/IW4/Menu/MenuConversionZoneStateIW4.h"
 #include "Game/IW4/Menu/MenuConverterIW4.h"
diff --git a/src/ObjLoading/Game/IW4/Menu/MenuConverterIW4.cpp b/src/ObjLoading/Game/IW4/Menu/MenuConverterIW4.cpp
index fd037d21..895ca8fb 100644
--- a/src/ObjLoading/Game/IW4/Menu/MenuConverterIW4.cpp
+++ b/src/ObjLoading/Game/IW4/Menu/MenuConverterIW4.cpp
@@ -423,7 +423,7 @@ namespace
             ConvertExpressionEntry(statement, expressionEntries, expression, menu, item);
 
             auto* outputExpressionEntries = m_memory.Alloc<expressionEntry>(expressionEntries.size());
-            memcpy(outputExpressionEntries, expressionEntries.data(), sizeof(expressionEntry) * expressionEntries.size());
+            std::memcpy(outputExpressionEntries, expressionEntries.data(), sizeof(expressionEntry) * expressionEntries.size());
 
             statement->entries = outputExpressionEntries;
             statement->numEntries = static_cast<int>(expressionEntries.size());
@@ -431,10 +431,10 @@ namespace
             return statement;
         }
 
-        _NODISCARD Statement_s* ConvertOrApplyStatement(float& staticValue,
-                                                        const ISimpleExpression* expression,
-                                                        const CommonMenuDef* menu,
-                                                        const CommonItemDef* item = nullptr) const
+        [[nodiscard]] Statement_s* ConvertOrApplyStatement(float& staticValue,
+                                                           const ISimpleExpression* expression,
+                                                           const CommonMenuDef* menu,
+                                                           const CommonItemDef* item = nullptr) const
         {
             if (m_disable_optimizations)
                 return ConvertExpression(expression, menu, item);
@@ -462,10 +462,10 @@ namespace
             return ConvertExpression(expression, menu, item);
         }
 
-        _NODISCARD Statement_s* ConvertOrApplyStatement(const char*& staticValue,
-                                                        const ISimpleExpression* expression,
-                                                        const CommonMenuDef* menu,
-                                                        const CommonItemDef* item = nullptr) const
+        [[nodiscard]] Statement_s* ConvertOrApplyStatement(const char*& staticValue,
+                                                           const ISimpleExpression* expression,
+                                                           const CommonMenuDef* menu,
+                                                           const CommonItemDef* item = nullptr) const
         {
             if (m_disable_optimizations)
                 return ConvertExpression(expression, menu, item);
@@ -492,10 +492,10 @@ namespace
             return ConvertExpression(expression, menu, item);
         }
 
-        _NODISCARD Statement_s* ConvertOrApplyStatement(Material*& staticValue,
-                                                        const ISimpleExpression* expression,
-                                                        const CommonMenuDef* menu,
-                                                        const CommonItemDef* item = nullptr) const
+        [[nodiscard]] Statement_s* ConvertOrApplyStatement(Material*& staticValue,
+                                                           const ISimpleExpression* expression,
+                                                           const CommonMenuDef* menu,
+                                                           const CommonItemDef* item = nullptr) const
         {
             if (m_disable_optimizations)
                 return ConvertExpression(expression, menu, item);
@@ -522,10 +522,10 @@ namespace
             return ConvertExpression(expression, menu, item);
         }
 
-        _NODISCARD Statement_s* ConvertVisibleExpression(windowDef_t* window,
-                                                         const ISimpleExpression* expression,
-                                                         const CommonMenuDef* commonMenu,
-                                                         const CommonItemDef* commonItem = nullptr) const
+        [[nodiscard]] Statement_s* ConvertVisibleExpression(windowDef_t* window,
+                                                            const ISimpleExpression* expression,
+                                                            const CommonMenuDef* commonMenu,
+                                                            const CommonItemDef* commonItem = nullptr) const
         {
             if (expression == nullptr)
                 return nullptr;
@@ -556,7 +556,7 @@ namespace
             return ConvertExpression(expression, commonMenu, commonItem);
         }
 
-        _NODISCARD static EventType SetLocalVarTypeToEventType(const SetLocalVarType setLocalVarType)
+        [[nodiscard]] static EventType SetLocalVarTypeToEventType(const SetLocalVarType setLocalVarType)
         {
             switch (setLocalVarType)
             {
@@ -593,7 +593,7 @@ namespace
             outputSetLocalVar->localVarName = m_memory.Dup(setLocalVar->m_var_name.c_str());
             outputSetLocalVar->expression = ConvertExpression(setLocalVar->m_value.get(), menu, item);
 
-            elements.push_back(outputHandler);
+            elements.emplace_back(outputHandler);
         }
 
         void ConvertEventHandlerScript(std::vector<MenuEventHandler*>& elements, const CommonEventHandlerScript* script) const
@@ -606,7 +606,7 @@ namespace
             outputHandler->eventType = EVENT_UNCONDITIONAL;
             outputHandler->eventData.unconditionalScript = m_memory.Dup(script->m_script.c_str());
 
-            elements.push_back(outputHandler);
+            elements.emplace_back(outputHandler);
         }
 
         void ConvertEventHandlerCondition(std::vector<MenuEventHandler*>& elements,
@@ -685,7 +685,7 @@ namespace
                 ConvertEventHandler(elements, element.get(), menu, item);
         }
 
-        _NODISCARD MenuEventHandlerSet*
+        [[nodiscard]] MenuEventHandlerSet*
             ConvertEventHandlerSet(const CommonEventHandlerSet* eventHandlerSet, const CommonMenuDef* menu, const CommonItemDef* item = nullptr) const
         {
             if (!eventHandlerSet)
@@ -707,9 +707,9 @@ namespace
             return outputSet;
         }
 
-        _NODISCARD ItemKeyHandler* ConvertKeyHandler(const std::multimap<int, std::unique_ptr<CommonEventHandlerSet>>& keyHandlers,
-                                                     const CommonMenuDef* menu,
-                                                     const CommonItemDef* item = nullptr) const
+        [[nodiscard]] ItemKeyHandler* ConvertKeyHandler(const std::multimap<int, std::unique_ptr<CommonEventHandlerSet>>& keyHandlers,
+                                                        const CommonMenuDef* menu,
+                                                        const CommonItemDef* item = nullptr) const
         {
             if (keyHandlers.empty())
                 return nullptr;
@@ -844,7 +844,7 @@ namespace
             return floatExpressions;
         }
 
-        _NODISCARD const char* CreateEnableDvarString(const std::vector<std::string>& stringElements) const
+        [[nodiscard]] const char* CreateEnableDvarString(const std::vector<std::string>& stringElements) const
         {
             std::ostringstream ss;
 
@@ -856,7 +856,7 @@ namespace
             return m_memory.Dup(ss.str().c_str());
         }
 
-        _NODISCARD const char* ConvertEnableDvar(const CommonItemDef& commonItem, int& dvarFlags) const
+        [[nodiscard]] const char* ConvertEnableDvar(const CommonItemDef& commonItem, int& dvarFlags) const
         {
             dvarFlags = 0;
 
@@ -893,10 +893,10 @@ namespace
             return nullptr;
         }
 
-        _NODISCARD listBoxDef_s* ConvertListBoxFeatures(itemDef_s* item,
-                                                        CommonItemFeaturesListBox* commonListBox,
-                                                        const CommonMenuDef& parentMenu,
-                                                        const CommonItemDef& commonItem) const
+        [[nodiscard]] listBoxDef_s* ConvertListBoxFeatures(itemDef_s* item,
+                                                           CommonItemFeaturesListBox* commonListBox,
+                                                           const CommonMenuDef& parentMenu,
+                                                           const CommonItemDef& commonItem) const
         {
             if (commonListBox == nullptr)
                 return nullptr;
@@ -928,10 +928,10 @@ namespace
             return listBox;
         }
 
-        _NODISCARD editFieldDef_s* ConvertEditFieldFeatures(itemDef_s* item,
-                                                            CommonItemFeaturesEditField* commonEditField,
-                                                            const CommonMenuDef& parentMenu,
-                                                            const CommonItemDef& commonItem) const
+        [[nodiscard]] editFieldDef_s* ConvertEditFieldFeatures(itemDef_s* item,
+                                                               CommonItemFeaturesEditField* commonEditField,
+                                                               const CommonMenuDef& parentMenu,
+                                                               const CommonItemDef& commonItem) const
         {
             if (commonEditField == nullptr)
                 return nullptr;
@@ -948,10 +948,10 @@ namespace
             return editField;
         }
 
-        _NODISCARD multiDef_s* ConvertMultiValueFeatures(itemDef_s* item,
-                                                         CommonItemFeaturesMultiValue* commonMultiValue,
-                                                         const CommonMenuDef& parentMenu,
-                                                         const CommonItemDef& commonItem) const
+        [[nodiscard]] multiDef_s* ConvertMultiValueFeatures(itemDef_s* item,
+                                                            CommonItemFeaturesMultiValue* commonMultiValue,
+                                                            const CommonMenuDef& parentMenu,
+                                                            const CommonItemDef& commonItem) const
         {
             if (commonMultiValue == nullptr)
                 return nullptr;
@@ -979,10 +979,10 @@ namespace
             return multiValue;
         }
 
-        _NODISCARD newsTickerDef_s* ConvertNewsTickerFeatures(itemDef_s* item,
-                                                              CommonItemFeaturesNewsTicker* commonNewsTicker,
-                                                              const CommonMenuDef& parentMenu,
-                                                              const CommonItemDef& commonItem) const
+        [[nodiscard]] newsTickerDef_s* ConvertNewsTickerFeatures(itemDef_s* item,
+                                                                 CommonItemFeaturesNewsTicker* commonNewsTicker,
+                                                                 const CommonMenuDef& parentMenu,
+                                                                 const CommonItemDef& commonItem) const
         {
             if (commonNewsTicker == nullptr)
                 return nullptr;
@@ -995,7 +995,7 @@ namespace
             return newsTicker;
         }
 
-        _NODISCARD itemDef_s* ConvertItem(const CommonMenuDef& parentMenu, const CommonItemDef& commonItem) const
+        [[nodiscard]] itemDef_s* ConvertItem(const CommonMenuDef& parentMenu, const CommonItemDef& commonItem) const
         {
             auto* item = m_memory.Alloc<itemDef_s>();
 
diff --git a/src/ObjLoading/Game/IW4/RawFile/LoaderRawFileIW4.cpp b/src/ObjLoading/Game/IW4/RawFile/LoaderRawFileIW4.cpp
index 9f6c1da4..f4b788ad 100644
--- a/src/ObjLoading/Game/IW4/RawFile/LoaderRawFileIW4.cpp
+++ b/src/ObjLoading/Game/IW4/RawFile/LoaderRawFileIW4.cpp
@@ -1,4 +1,5 @@
-#include "AssetLoaderRawFileIW4.h"
+#include "LoaderRawFileIW4.h"
+
 #include "Game/IW4/IW4.h"
 
 #include <cstring>
diff --git a/src/ObjLoading/Game/IW4/Weapon/InfoStringLoaderWeaponIW4.cpp b/src/ObjLoading/Game/IW4/Weapon/InfoStringLoaderWeaponIW4.cpp
index 11ca729b..9bb01f8e 100644
--- a/src/ObjLoading/Game/IW4/Weapon/InfoStringLoaderWeaponIW4.cpp
+++ b/src/ObjLoading/Game/IW4/Weapon/InfoStringLoaderWeaponIW4.cpp
@@ -238,29 +238,29 @@ namespace
         }
     };
 
-    void InitWeaponFullDef(WeaponFullDef* weapon)
+    void InitWeaponFullDef(WeaponFullDef& weapon)
     {
-        weapon->weapCompleteDef.weapDef = &weapon->weapDef;
-        weapon->weapCompleteDef.hideTags = weapon->hideTags;
-        weapon->weapCompleteDef.szXAnims = weapon->szXAnims;
-        weapon->weapDef.gunXModel = weapon->gunXModel;
-        weapon->weapDef.szXAnimsRightHanded = weapon->szXAnimsRightHanded;
-        weapon->weapDef.szXAnimsLeftHanded = weapon->szXAnimsLeftHanded;
-        weapon->weapDef.notetrackSoundMapKeys = weapon->notetrackSoundMapKeys;
-        weapon->weapDef.notetrackSoundMapValues = weapon->notetrackSoundMapValues;
-        weapon->weapDef.notetrackRumbleMapKeys = weapon->notetrackRumbleMapKeys;
-        weapon->weapDef.notetrackRumbleMapValues = weapon->notetrackRumbleMapValues;
-        weapon->weapDef.worldModel = weapon->worldModel;
-        weapon->weapDef.parallelBounce = weapon->parallelBounce;
-        weapon->weapDef.perpendicularBounce = weapon->perpendicularBounce;
-        weapon->weapDef.locationDamageMultipliers = weapon->locationDamageMultipliers;
+        weapon.weapCompleteDef.weapDef = &weapon.weapDef;
+        weapon.weapCompleteDef.hideTags = weapon.hideTags;
+        weapon.weapCompleteDef.szXAnims = weapon.szXAnims;
+        weapon.weapDef.gunXModel = weapon.gunXModel;
+        weapon.weapDef.szXAnimsRightHanded = weapon.szXAnimsRightHanded;
+        weapon.weapDef.szXAnimsLeftHanded = weapon.szXAnimsLeftHanded;
+        weapon.weapDef.notetrackSoundMapKeys = weapon.notetrackSoundMapKeys;
+        weapon.weapDef.notetrackSoundMapValues = weapon.notetrackSoundMapValues;
+        weapon.weapDef.notetrackRumbleMapKeys = weapon.notetrackRumbleMapKeys;
+        weapon.weapDef.notetrackRumbleMapValues = weapon.notetrackRumbleMapValues;
+        weapon.weapDef.worldModel = weapon.worldModel;
+        weapon.weapDef.parallelBounce = weapon.parallelBounce;
+        weapon.weapDef.perpendicularBounce = weapon.perpendicularBounce;
+        weapon.weapDef.locationDamageMultipliers = weapon.locationDamageMultipliers;
 
         for (const auto& field : weapon_fields)
         {
             if (field.iFieldType != CSPFT_STRING)
                 continue;
 
-            *reinterpret_cast<const char**>(reinterpret_cast<char*>(weapon) + field.iOffset) = "";
+            *reinterpret_cast<const char**>(reinterpret_cast<char*>(&weapon) + field.iOffset) = "";
         }
     }
 
@@ -437,7 +437,7 @@ AssetCreationResult InfoStringLoaderWeapon::CreateAsset(const std::string& asset
 {
     auto* weaponFullDef = m_memory.Alloc<WeaponFullDef>();
 
-    InitWeaponFullDef(weaponFullDef);
+    InitWeaponFullDef(*weaponFullDef);
     weaponFullDef->weapCompleteDef.szInternalName = m_memory.Dup(assetName.c_str());
 
     AssetRegistration<AssetWeapon> registration(assetName, &weaponFullDef->weapCompleteDef);
diff --git a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperTracer.cpp b/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperTracer.cpp
index 57592ec2..3a903ebc 100644
--- a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperTracer.cpp
+++ b/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperTracer.cpp
@@ -2,8 +2,8 @@
 
 #include "Game/IW4/CommonIW4.h"
 #include "Game/IW4/InfoString/InfoStringFromStructConverter.h"
-#include "Game/IW4/InfoString/TracerFields.h"
 #include "Game/IW4/ObjConstantsIW4.h"
+#include "Game/IW4/Tracer/TracerFields.h"
 
 #include <cassert>
 #include <sstream>
diff --git a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperVehicle.cpp b/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperVehicle.cpp
index d70224c4..56ab8de7 100644
--- a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperVehicle.cpp
+++ b/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperVehicle.cpp
@@ -3,8 +3,8 @@
 #include "Game/IW4/CommonIW4.h"
 #include "Game/IW4/InfoString/EnumStrings.h"
 #include "Game/IW4/InfoString/InfoStringFromStructConverter.h"
-#include "Game/IW4/InfoString/VehicleFields.h"
 #include "Game/IW4/ObjConstantsIW4.h"
+#include "Game/IW4/Vehicle/VehicleFields.h"
 
 #include <cassert>
 #include <sstream>
diff --git a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperWeapon.cpp b/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperWeapon.cpp
index b61f03a3..e95f3ef5 100644
--- a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperWeapon.cpp
+++ b/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperWeapon.cpp
@@ -3,8 +3,8 @@
 #include "Game/IW4/CommonIW4.h"
 #include "Game/IW4/InfoString/EnumStrings.h"
 #include "Game/IW4/InfoString/InfoStringFromStructConverter.h"
-#include "Game/IW4/InfoString/WeaponFields.h"
 #include "Game/IW4/ObjConstantsIW4.h"
+#include "Game/IW4/Weapon/WeaponFields.h"
 #include "Weapon/AccuracyGraphWriter.h"
 
 #include <cassert>