28.05.2025

sdk/include/source2sdk/animationsystem/AnimParamButton_t.hpp

@@ -1,4 +1,7 @@
 #pragma once
+
+#include "source2sdk/source2gen/source2gen.hpp"
+#include <cstddef>
 #include <cstdint>
 
 // /////////////////////////////////////////////////////////////
@@ -6,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Enumerator count: 13
         // Alignment: 4
         // Size: 0x4
@@ -40,4 +45,5 @@ namespace source2sdk::animationsystem
             // MPropertyFriendlyName "Right Trigger"
             ANIMPARAM_BUTTON_RTRIGGER = 0xc,
         };
+    };
 };

sdk/include/source2sdk/animationsystem/AnimParamNetworkSetting.hpp

@@ -1,4 +1,7 @@
 #pragma once
+
+#include "source2sdk/source2gen/source2gen.hpp"
+#include <cstddef>
 #include <cstdint>
 
 // /////////////////////////////////////////////////////////////
@@ -6,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Enumerator count: 3
         // Alignment: 4
         // Size: 0x4
@@ -20,4 +25,5 @@ namespace source2sdk::animationsystem
             // MPropertyFriendlyName "Never Network"
             NeverNetwork = 0x2,
         };
+    };
 };

sdk/include/source2sdk/animationsystem/AnimParamType_t.hpp

@@ -1,4 +1,7 @@
 #pragma once
+
+#include "source2sdk/source2gen/source2gen.hpp"
+#include <cstddef>
 #include <cstdint>
 
 // /////////////////////////////////////////////////////////////
@@ -6,21 +9,24 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Enumerator count: 9
         // Alignment: 1
         // Size: 0x1
         enum class AnimParamType_t : std::uint8_t
         {
-        ANIMPARAM_UNKNOWN = 0,
-        ANIMPARAM_BOOL = 1,
-        ANIMPARAM_ENUM = 2,
-        ANIMPARAM_INT = 3,
-        ANIMPARAM_FLOAT = 4,
-        ANIMPARAM_VECTOR = 5,
-        ANIMPARAM_QUATERNION = 6,
-        ANIMPARAM_GLOBALSYMBOL = 7,
-        ANIMPARAM_COUNT = 8,
+            ANIMPARAM_UNKNOWN = 0x0,
+            ANIMPARAM_BOOL = 0x1,
+            ANIMPARAM_ENUM = 0x2,
+            ANIMPARAM_INT = 0x3,
+            ANIMPARAM_FLOAT = 0x4,
+            ANIMPARAM_VECTOR = 0x5,
+            ANIMPARAM_QUATERNION = 0x6,
+            ANIMPARAM_GLOBALSYMBOL = 0x7,
+            ANIMPARAM_COUNT = 0x8,
+        };
     };
 };

sdk/include/source2sdk/animationsystem/AnimPoseControl.hpp

@@ -1,23 +0,0 @@
-#pragma once
-#include <cstdint>
-
-// /////////////////////////////////////////////////////////////
-// Module: animationsystem
-// Created using source2gen - github.com/neverlosecc/source2gen
-// /////////////////////////////////////////////////////////////
-
-namespace source2sdk::animationsystem
-{
-    // Enumerator count: 3
-    // Alignment: 4
-    // Size: 0x4
-    enum class AnimPoseControl : std::uint32_t
-    {
-        // MPropertyFriendlyName "None"
-        NoPoseControl = 0x0,
-        // MPropertyFriendlyName "Absolute"
-        AbsolutePoseControl = 0x1,
-        // MPropertyFriendlyName "Relative"
-        RelativePoseControl = 0x2,
-    };
-};

sdk/include/source2sdk/animationsystem/AnimationDecodeDebugDumpElement_t.hpp

@@ -1,5 +1,6 @@
 #pragma once
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
 
@@ -8,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Registered alignment: 0x8
         // Alignment: 0x8
         // Standard-layout class: true
@@ -20,8 +23,8 @@ namespace source2sdk::animationsystem
         struct AnimationDecodeDebugDumpElement_t
         {
         public:
-        int32_t m_nEntityIndex; // 0x0        
-        [[maybe_unused]] std::uint8_t pad_0x04[0x4]; // 0x4
+            std::int32_t m_nEntityIndex; // 0x0            
+            uint8_t _pad0004[0x4]; // 0x4
             CUtlString m_modelName; // 0x8            
             // m_poseParams has a template type with potentially unknown template parameters. You can try uncommenting the field below.
             // CUtlVector<CUtlString> m_poseParams;
@@ -38,12 +41,13 @@ namespace source2sdk::animationsystem
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(AnimationDecodeDebugDumpElement_t, m_nEntityIndex) == 0x0);
-    static_assert(offsetof(AnimationDecodeDebugDumpElement_t, m_modelName) == 0x8);
-    static_assert(offsetof(AnimationDecodeDebugDumpElement_t, m_poseParams) == 0x10);
-    static_assert(offsetof(AnimationDecodeDebugDumpElement_t, m_decodeOps) == 0x28);
-    static_assert(offsetof(AnimationDecodeDebugDumpElement_t, m_internalOps) == 0x40);
-    static_assert(offsetof(AnimationDecodeDebugDumpElement_t, m_decodedAnims) == 0x58);
+        static_assert(offsetof(source2sdk::animationsystem::AnimationDecodeDebugDumpElement_t, m_nEntityIndex) == 0x0);
+        static_assert(offsetof(source2sdk::animationsystem::AnimationDecodeDebugDumpElement_t, m_modelName) == 0x8);
+        static_assert(offsetof(source2sdk::animationsystem::AnimationDecodeDebugDumpElement_t, m_poseParams) == 0x10);
+        static_assert(offsetof(source2sdk::animationsystem::AnimationDecodeDebugDumpElement_t, m_decodeOps) == 0x28);
+        static_assert(offsetof(source2sdk::animationsystem::AnimationDecodeDebugDumpElement_t, m_internalOps) == 0x40);
+        static_assert(offsetof(source2sdk::animationsystem::AnimationDecodeDebugDumpElement_t, m_decodedAnims) == 0x58);
         
-    static_assert(sizeof(AnimationDecodeDebugDumpElement_t) == 0x70);
+        static_assert(sizeof(source2sdk::animationsystem::AnimationDecodeDebugDumpElement_t) == 0x70);
+    };
 };

sdk/include/source2sdk/animationsystem/AnimationDecodeDebugDump_t.hpp

@@ -1,17 +1,20 @@
 #pragma once
-#include "source2sdk/animationsystem/AnimationDecodeDebugDumpElement_t.hpp"
-#include "source2sdk/animationsystem/AnimationProcessingType_t.hpp"
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
+#include "source2sdk/animationsystem/AnimationDecodeDebugDumpElement_t.hpp"
+#include "source2sdk/animationsystem/AnimationProcessingType_t.hpp"
 
 // /////////////////////////////////////////////////////////////
 // Module: animationsystem
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Registered alignment: 0x8
         // Alignment: 0x8
         // Standard-layout class: true
@@ -22,16 +25,17 @@ namespace source2sdk::animationsystem
         struct AnimationDecodeDebugDump_t
         {
         public:
-        animationsystem::AnimationProcessingType_t m_processingType; // 0x0        
-        [[maybe_unused]] std::uint8_t pad_0x04[0x4]; // 0x4
+            source2sdk::animationsystem::AnimationProcessingType_t m_processingType; // 0x0            
+            uint8_t _pad0004[0x4]; // 0x4
             // m_elems has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<animationsystem::AnimationDecodeDebugDumpElement_t> m_elems;
+            // CUtlVector<source2sdk::animationsystem::AnimationDecodeDebugDumpElement_t> m_elems;
             char m_elems[0x18]; // 0x8            
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(AnimationDecodeDebugDump_t, m_processingType) == 0x0);
-    static_assert(offsetof(AnimationDecodeDebugDump_t, m_elems) == 0x8);
+        static_assert(offsetof(source2sdk::animationsystem::AnimationDecodeDebugDump_t, m_processingType) == 0x0);
+        static_assert(offsetof(source2sdk::animationsystem::AnimationDecodeDebugDump_t, m_elems) == 0x8);
         
-    static_assert(sizeof(AnimationDecodeDebugDump_t) == 0x20);
+        static_assert(sizeof(source2sdk::animationsystem::AnimationDecodeDebugDump_t) == 0x20);
+    };
 };

sdk/include/source2sdk/animationsystem/AnimationProcessingType_t.hpp

@@ -1,4 +1,7 @@
 #pragma once
+
+#include "source2sdk/source2gen/source2gen.hpp"
+#include <cstddef>
 #include <cstdint>
 
 // /////////////////////////////////////////////////////////////
@@ -6,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Enumerator count: 6
         // Alignment: 4
         // Size: 0x4
@@ -20,4 +25,5 @@ namespace source2sdk::animationsystem
             ANIMATION_PROCESSING_CLIENT_RENDER = 0x4,
             ANIMATION_PROCESSING_MAX = 0x5,
         };
+    };
 };

sdk/include/source2sdk/animationsystem/AnimationSnapshotBase_t.hpp

@@ -1,17 +1,20 @@
 #pragma once
-#include "source2sdk/animationsystem/AnimationDecodeDebugDumpElement_t.hpp"
-#include "source2sdk/animationsystem/AnimationSnapshotType_t.hpp"
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
+#include "source2sdk/animationsystem/AnimationDecodeDebugDumpElement_t.hpp"
+#include "source2sdk/animationsystem/AnimationSnapshotType_t.hpp"
 
 // /////////////////////////////////////////////////////////////
 // Module: animationsystem
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Registered alignment: 0x10
         // Alignment: 0x10
         // Standard-layout class: true
@@ -23,12 +26,12 @@ namespace source2sdk::animationsystem
         {
         public:
             float m_flRealTime; // 0x0            
-        [[maybe_unused]] std::uint8_t pad_0x04[0xc]; // 0x4
+            uint8_t _pad0004[0xc]; // 0x4
             matrix3x4a_t m_rootToWorld; // 0x10            
             bool m_bBonesInWorldSpace; // 0x40            
-        [[maybe_unused]] std::uint8_t pad_0x41[0x7]; // 0x41
+            uint8_t _pad0041[0x7]; // 0x41
             // m_boneSetupMask has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<uint32_t> m_boneSetupMask;
+            // CUtlVector<std::uint32_t> m_boneSetupMask;
             char m_boneSetupMask[0x18]; // 0x48            
             // m_boneTransforms has a template type with potentially unknown template parameters. You can try uncommenting the field below.
             // CUtlVector<matrix3x4a_t> m_boneTransforms;
@@ -36,23 +39,24 @@ namespace source2sdk::animationsystem
             // m_flexControllers has a template type with potentially unknown template parameters. You can try uncommenting the field below.
             // CUtlVector<float> m_flexControllers;
             char m_flexControllers[0x18]; // 0x78            
-        animationsystem::AnimationSnapshotType_t m_SnapshotType; // 0x90        
+            source2sdk::animationsystem::AnimationSnapshotType_t m_SnapshotType; // 0x90            
             bool m_bHasDecodeDump; // 0x94            
-        [[maybe_unused]] std::uint8_t pad_0x95[0x3]; // 0x95
-        animationsystem::AnimationDecodeDebugDumpElement_t m_DecodeDump; // 0x98        
-        [[maybe_unused]] std::uint8_t pad_0x108[0x8];
+            uint8_t _pad0095[0x3]; // 0x95
+            source2sdk::animationsystem::AnimationDecodeDebugDumpElement_t m_DecodeDump; // 0x98            
+            uint8_t _pad0108[0x8];
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(AnimationSnapshotBase_t, m_flRealTime) == 0x0);
-    static_assert(offsetof(AnimationSnapshotBase_t, m_rootToWorld) == 0x10);
-    static_assert(offsetof(AnimationSnapshotBase_t, m_bBonesInWorldSpace) == 0x40);
-    static_assert(offsetof(AnimationSnapshotBase_t, m_boneSetupMask) == 0x48);
-    static_assert(offsetof(AnimationSnapshotBase_t, m_boneTransforms) == 0x60);
-    static_assert(offsetof(AnimationSnapshotBase_t, m_flexControllers) == 0x78);
-    static_assert(offsetof(AnimationSnapshotBase_t, m_SnapshotType) == 0x90);
-    static_assert(offsetof(AnimationSnapshotBase_t, m_bHasDecodeDump) == 0x94);
-    static_assert(offsetof(AnimationSnapshotBase_t, m_DecodeDump) == 0x98);
+        static_assert(offsetof(source2sdk::animationsystem::AnimationSnapshotBase_t, m_flRealTime) == 0x0);
+        static_assert(offsetof(source2sdk::animationsystem::AnimationSnapshotBase_t, m_rootToWorld) == 0x10);
+        static_assert(offsetof(source2sdk::animationsystem::AnimationSnapshotBase_t, m_bBonesInWorldSpace) == 0x40);
+        static_assert(offsetof(source2sdk::animationsystem::AnimationSnapshotBase_t, m_boneSetupMask) == 0x48);
+        static_assert(offsetof(source2sdk::animationsystem::AnimationSnapshotBase_t, m_boneTransforms) == 0x60);
+        static_assert(offsetof(source2sdk::animationsystem::AnimationSnapshotBase_t, m_flexControllers) == 0x78);
+        static_assert(offsetof(source2sdk::animationsystem::AnimationSnapshotBase_t, m_SnapshotType) == 0x90);
+        static_assert(offsetof(source2sdk::animationsystem::AnimationSnapshotBase_t, m_bHasDecodeDump) == 0x94);
+        static_assert(offsetof(source2sdk::animationsystem::AnimationSnapshotBase_t, m_DecodeDump) == 0x98);
         
-    static_assert(sizeof(AnimationSnapshotBase_t) == 0x110);
+        static_assert(sizeof(source2sdk::animationsystem::AnimationSnapshotBase_t) == 0x110);
+    };
 };

sdk/include/source2sdk/animationsystem/AnimationSnapshotType_t.hpp

@@ -1,4 +1,7 @@
 #pragma once
+
+#include "source2sdk/source2gen/source2gen.hpp"
+#include <cstddef>
 #include <cstdint>
 
 // /////////////////////////////////////////////////////////////
@@ -6,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Enumerator count: 7
         // Alignment: 4
         // Size: 0x4
@@ -21,4 +26,5 @@ namespace source2sdk::animationsystem
             ANIMATION_SNAPSHOT_FINAL_COMPOSITE = 0x5,
             ANIMATION_SNAPSHOT_MAX = 0x6,
         };
+    };
 };

sdk/include/source2sdk/animationsystem/AnimationSnapshot_t.hpp

@@ -1,16 +1,19 @@
 #pragma once
-#include "source2sdk/animationsystem/AnimationSnapshotBase_t.hpp"
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
+#include "source2sdk/animationsystem/AnimationSnapshotBase_t.hpp"
 
 // /////////////////////////////////////////////////////////////
 // Module: animationsystem
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Registered alignment: 0x10
         // Alignment: 0x10
         // Standard-layout class: false
@@ -18,15 +21,17 @@ namespace source2sdk::animationsystem
         // 
         // static metadata: MGetKV3ClassDefaults
         #pragma pack(push, 1)
-    struct AnimationSnapshot_t : public animationsystem::AnimationSnapshotBase_t
+        struct AnimationSnapshot_t : public source2sdk::animationsystem::AnimationSnapshotBase_t
         {
         public:
-        int32_t m_nEntIndex; // 0x110        
-        [[maybe_unused]] std::uint8_t pad_0x114[0x4]; // 0x114
+            std::int32_t m_nEntIndex; // 0x110            
+            uint8_t _pad0114[0x4]; // 0x114
             CUtlString m_modelName; // 0x118            
         };
         #pragma pack(pop)
         
         // Cannot assert offsets of fields in AnimationSnapshot_t because it is not a standard-layout class
-    static_assert(sizeof(AnimationSnapshot_t) == 0x120);
+        
+        static_assert(sizeof(source2sdk::animationsystem::AnimationSnapshot_t) == 0x120);
+    };
 };

sdk/include/source2sdk/animationsystem/BoneTransformSpace_t.hpp

@@ -1,4 +1,7 @@
 #pragma once
+
+#include "source2sdk/source2gen/source2gen.hpp"
+#include <cstddef>
 #include <cstdint>
 
 // /////////////////////////////////////////////////////////////
@@ -6,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Enumerator count: 4
         // Alignment: 4
         // Size: 0x4
@@ -22,4 +27,5 @@ namespace source2sdk::animationsystem
             // MPropertyFriendlyName "World Space"
             BoneTransformSpace_World = 0x2,
         };
+    };
 };

sdk/include/source2sdk/animationsystem/CAnimActivity.hpp

@@ -1,5 +1,6 @@
 #pragma once
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
 
@@ -8,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Registered alignment: 0x8
         // Alignment: 0x8
         // Standard-layout class: true
@@ -21,17 +24,18 @@ namespace source2sdk::animationsystem
         {
         public:
             CBufferString m_name; // 0x0            
-        int32_t m_nActivity; // 0x10        
-        int32_t m_nFlags; // 0x14        
-        int32_t m_nWeight; // 0x18        
-        [[maybe_unused]] std::uint8_t pad_0x1c[0x4];
+            std::int32_t m_nActivity; // 0x10            
+            std::int32_t m_nFlags; // 0x14            
+            std::int32_t m_nWeight; // 0x18            
+            uint8_t _pad001c[0x4];
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CAnimActivity, m_name) == 0x0);
-    static_assert(offsetof(CAnimActivity, m_nActivity) == 0x10);
-    static_assert(offsetof(CAnimActivity, m_nFlags) == 0x14);
-    static_assert(offsetof(CAnimActivity, m_nWeight) == 0x18);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimActivity, m_name) == 0x0);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimActivity, m_nActivity) == 0x10);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimActivity, m_nFlags) == 0x14);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimActivity, m_nWeight) == 0x18);
         
-    static_assert(sizeof(CAnimActivity) == 0x20);
+        static_assert(sizeof(source2sdk::animationsystem::CAnimActivity) == 0x20);
+    };
 };

sdk/include/source2sdk/animationsystem/CAnimBone.hpp

@@ -1,5 +1,6 @@
 #pragma once
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
 
@@ -8,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Registered alignment: 0x8
         // Alignment: 0x8
         // Standard-layout class: true
@@ -21,22 +24,23 @@ namespace source2sdk::animationsystem
         {
         public:
             CBufferString m_name; // 0x0            
-        int32_t m_parent; // 0x10        
+            std::int32_t m_parent; // 0x10            
             Vector m_pos; // 0x14            
             QuaternionStorage m_quat; // 0x20            
             float m_scale; // 0x30            
             QuaternionStorage m_qAlignment; // 0x34            
-        int32_t m_flags; // 0x44        
+            std::int32_t m_flags; // 0x44            
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CAnimBone, m_name) == 0x0);
-    static_assert(offsetof(CAnimBone, m_parent) == 0x10);
-    static_assert(offsetof(CAnimBone, m_pos) == 0x14);
-    static_assert(offsetof(CAnimBone, m_quat) == 0x20);
-    static_assert(offsetof(CAnimBone, m_scale) == 0x30);
-    static_assert(offsetof(CAnimBone, m_qAlignment) == 0x34);
-    static_assert(offsetof(CAnimBone, m_flags) == 0x44);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimBone, m_name) == 0x0);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimBone, m_parent) == 0x10);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimBone, m_pos) == 0x14);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimBone, m_quat) == 0x20);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimBone, m_scale) == 0x30);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimBone, m_qAlignment) == 0x34);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimBone, m_flags) == 0x44);
         
-    static_assert(sizeof(CAnimBone) == 0x48);
+        static_assert(sizeof(source2sdk::animationsystem::CAnimBone) == 0x48);
+    };
 };

sdk/include/source2sdk/animationsystem/CAnimBoneDifference.hpp

@@ -1,5 +1,6 @@
 #pragma once
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
 
@@ -8,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Registered alignment: 0x8
         // Alignment: 0x8
         // Standard-layout class: true
@@ -25,15 +28,16 @@ namespace source2sdk::animationsystem
             Vector m_posError; // 0x20            
             bool m_bHasRotation; // 0x2c            
             bool m_bHasMovement; // 0x2d            
-        [[maybe_unused]] std::uint8_t pad_0x2e[0x2];
+            uint8_t _pad002e[0x2];
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CAnimBoneDifference, m_name) == 0x0);
-    static_assert(offsetof(CAnimBoneDifference, m_parent) == 0x10);
-    static_assert(offsetof(CAnimBoneDifference, m_posError) == 0x20);
-    static_assert(offsetof(CAnimBoneDifference, m_bHasRotation) == 0x2c);
-    static_assert(offsetof(CAnimBoneDifference, m_bHasMovement) == 0x2d);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimBoneDifference, m_name) == 0x0);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimBoneDifference, m_parent) == 0x10);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimBoneDifference, m_posError) == 0x20);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimBoneDifference, m_bHasRotation) == 0x2c);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimBoneDifference, m_bHasMovement) == 0x2d);
         
-    static_assert(sizeof(CAnimBoneDifference) == 0x30);
+        static_assert(sizeof(source2sdk::animationsystem::CAnimBoneDifference) == 0x30);
+    };
 };

sdk/include/source2sdk/animationsystem/CAnimData.hpp

@@ -1,18 +1,21 @@
 #pragma once
+
+#include "source2sdk/source2gen/source2gen.hpp"
+#include <cstddef>
+#include <cstdint>
 #include "source2sdk/animationsystem/CAnimDecoder.hpp"
 #include "source2sdk/animationsystem/CAnimDesc.hpp"
 #include "source2sdk/animationsystem/CAnimFrameSegment.hpp"
-#include "source2sdk/source2gen.hpp"
-#include <cstddef>
-#include <cstdint>
 
 // /////////////////////////////////////////////////////////////
 // Module: animationsystem
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Registered alignment: 0x8
         // Alignment: 0x8
         // Standard-layout class: true
@@ -24,27 +27,28 @@ namespace source2sdk::animationsystem
         class CAnimData
         {
         public:
-        [[maybe_unused]] std::uint8_t pad_0x00[0x10]; // 0x0
+            uint8_t _pad0000[0x10]; // 0x0
             CBufferString m_name; // 0x10            
             // m_animArray has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<animationsystem::CAnimDesc> m_animArray;
+            // CUtlVector<source2sdk::animationsystem::CAnimDesc> m_animArray;
             char m_animArray[0x18]; // 0x20            
             // m_decoderArray has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<animationsystem::CAnimDecoder> m_decoderArray;
+            // CUtlVector<source2sdk::animationsystem::CAnimDecoder> m_decoderArray;
             char m_decoderArray[0x18]; // 0x38            
-        int32_t m_nMaxUniqueFrameIndex; // 0x50        
-        [[maybe_unused]] std::uint8_t pad_0x54[0x4]; // 0x54
+            std::int32_t m_nMaxUniqueFrameIndex; // 0x50            
+            uint8_t _pad0054[0x4]; // 0x54
             // m_segmentArray has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<animationsystem::CAnimFrameSegment> m_segmentArray;
+            // CUtlVector<source2sdk::animationsystem::CAnimFrameSegment> m_segmentArray;
             char m_segmentArray[0x18]; // 0x58            
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CAnimData, m_name) == 0x10);
-    static_assert(offsetof(CAnimData, m_animArray) == 0x20);
-    static_assert(offsetof(CAnimData, m_decoderArray) == 0x38);
-    static_assert(offsetof(CAnimData, m_nMaxUniqueFrameIndex) == 0x50);
-    static_assert(offsetof(CAnimData, m_segmentArray) == 0x58);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimData, m_name) == 0x10);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimData, m_animArray) == 0x20);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimData, m_decoderArray) == 0x38);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimData, m_nMaxUniqueFrameIndex) == 0x50);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimData, m_segmentArray) == 0x58);
         
-    static_assert(sizeof(CAnimData) == 0x70);
+        static_assert(sizeof(source2sdk::animationsystem::CAnimData) == 0x70);
+    };
 };

sdk/include/source2sdk/animationsystem/CAnimDataChannelDesc.hpp

@@ -1,5 +1,6 @@
 #pragma once
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
 
@@ -8,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Registered alignment: 0x8
         // Alignment: 0x8
         // Standard-layout class: true
@@ -22,31 +25,32 @@ namespace source2sdk::animationsystem
         public:
             CBufferString m_szChannelClass; // 0x0            
             CBufferString m_szVariableName; // 0x10            
-        int32_t m_nFlags; // 0x20        
-        int32_t m_nType; // 0x24        
+            std::int32_t m_nFlags; // 0x20            
+            std::int32_t m_nType; // 0x24            
             CBufferString m_szGrouping; // 0x28            
             CBufferString m_szDescription; // 0x38            
             // m_szElementNameArray has a template type with potentially unknown template parameters. You can try uncommenting the field below.
             // CUtlVector<CBufferString> m_szElementNameArray;
             char m_szElementNameArray[0x18]; // 0x48            
             // m_nElementIndexArray has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<int32_t> m_nElementIndexArray;
+            // CUtlVector<std::int32_t> m_nElementIndexArray;
             char m_nElementIndexArray[0x18]; // 0x60            
             // m_nElementMaskArray has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<uint32_t> m_nElementMaskArray;
+            // CUtlVector<std::uint32_t> m_nElementMaskArray;
             char m_nElementMaskArray[0x18]; // 0x78            
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CAnimDataChannelDesc, m_szChannelClass) == 0x0);
-    static_assert(offsetof(CAnimDataChannelDesc, m_szVariableName) == 0x10);
-    static_assert(offsetof(CAnimDataChannelDesc, m_nFlags) == 0x20);
-    static_assert(offsetof(CAnimDataChannelDesc, m_nType) == 0x24);
-    static_assert(offsetof(CAnimDataChannelDesc, m_szGrouping) == 0x28);
-    static_assert(offsetof(CAnimDataChannelDesc, m_szDescription) == 0x38);
-    static_assert(offsetof(CAnimDataChannelDesc, m_szElementNameArray) == 0x48);
-    static_assert(offsetof(CAnimDataChannelDesc, m_nElementIndexArray) == 0x60);
-    static_assert(offsetof(CAnimDataChannelDesc, m_nElementMaskArray) == 0x78);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimDataChannelDesc, m_szChannelClass) == 0x0);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimDataChannelDesc, m_szVariableName) == 0x10);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimDataChannelDesc, m_nFlags) == 0x20);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimDataChannelDesc, m_nType) == 0x24);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimDataChannelDesc, m_szGrouping) == 0x28);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimDataChannelDesc, m_szDescription) == 0x38);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimDataChannelDesc, m_szElementNameArray) == 0x48);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimDataChannelDesc, m_nElementIndexArray) == 0x60);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimDataChannelDesc, m_nElementMaskArray) == 0x78);
         
-    static_assert(sizeof(CAnimDataChannelDesc) == 0x90);
+        static_assert(sizeof(source2sdk::animationsystem::CAnimDataChannelDesc) == 0x90);
+    };
 };

sdk/include/source2sdk/animationsystem/CAnimDecoder.hpp

@@ -1,5 +1,6 @@
 #pragma once
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
 
@@ -8,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Registered alignment: 0x8
         // Alignment: 0x8
         // Standard-layout class: true
@@ -21,14 +24,15 @@ namespace source2sdk::animationsystem
         {
         public:
             CBufferString m_szName; // 0x0            
-        int32_t m_nVersion; // 0x10        
-        int32_t m_nType; // 0x14        
+            std::int32_t m_nVersion; // 0x10            
+            std::int32_t m_nType; // 0x14            
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CAnimDecoder, m_szName) == 0x0);
-    static_assert(offsetof(CAnimDecoder, m_nVersion) == 0x10);
-    static_assert(offsetof(CAnimDecoder, m_nType) == 0x14);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimDecoder, m_szName) == 0x0);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimDecoder, m_nVersion) == 0x10);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimDecoder, m_nType) == 0x14);
         
-    static_assert(sizeof(CAnimDecoder) == 0x18);
+        static_assert(sizeof(source2sdk::animationsystem::CAnimDecoder) == 0x18);
+    };
 };

sdk/include/source2sdk/animationsystem/CAnimDesc.hpp

@@ -1,4 +1,8 @@
 #pragma once
+
+#include "source2sdk/source2gen/source2gen.hpp"
+#include <cstddef>
+#include <cstdint>
 #include "source2sdk/animationsystem/CAnimActivity.hpp"
 #include "source2sdk/animationsystem/CAnimDesc_Flag.hpp"
 #include "source2sdk/animationsystem/CAnimEncodedFrames.hpp"
@@ -6,17 +10,16 @@
 #include "source2sdk/animationsystem/CAnimLocalHierarchy.hpp"
 #include "source2sdk/animationsystem/CAnimMovement.hpp"
 #include "source2sdk/animationsystem/CAnimSequenceParams.hpp"
-#include "source2sdk/source2gen.hpp"
-#include <cstddef>
-#include <cstdint>
 
 // /////////////////////////////////////////////////////////////
 // Module: animationsystem
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Registered alignment: 0x10
         // Alignment: 0x10
         // Standard-layout class: true
@@ -28,53 +31,54 @@ namespace source2sdk::animationsystem
         {
         public:
             CBufferString m_name; // 0x0            
-        animationsystem::CAnimDesc_Flag m_flags; // 0x10        
+            source2sdk::animationsystem::CAnimDesc_Flag m_flags; // 0x10            
             float fps; // 0x18            
-        [[maybe_unused]] std::uint8_t pad_0x1c[0x4]; // 0x1c
+            uint8_t _pad001c[0x4]; // 0x1c
             // metadata: MKV3TransferName "m_pData"
-        animationsystem::CAnimEncodedFrames m_Data; // 0x20        
+            source2sdk::animationsystem::CAnimEncodedFrames m_Data; // 0x20            
             // m_movementArray has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<animationsystem::CAnimMovement> m_movementArray;
+            // CUtlVector<source2sdk::animationsystem::CAnimMovement> m_movementArray;
             char m_movementArray[0x18]; // 0xf8            
             CTransform m_xInitialOffset; // 0x110            
             // m_eventArray has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<animationsystem::CAnimEventDefinition> m_eventArray;
+            // CUtlVector<source2sdk::animationsystem::CAnimEventDefinition> m_eventArray;
             char m_eventArray[0x18]; // 0x130            
             // m_activityArray has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<animationsystem::CAnimActivity> m_activityArray;
+            // CUtlVector<source2sdk::animationsystem::CAnimActivity> m_activityArray;
             char m_activityArray[0x18]; // 0x148            
             // m_hierarchyArray has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<animationsystem::CAnimLocalHierarchy> m_hierarchyArray;
+            // CUtlVector<source2sdk::animationsystem::CAnimLocalHierarchy> m_hierarchyArray;
             char m_hierarchyArray[0x18]; // 0x160            
             float framestalltime; // 0x178            
             Vector m_vecRootMin; // 0x17c            
             Vector m_vecRootMax; // 0x188            
-        [[maybe_unused]] std::uint8_t pad_0x194[0x4]; // 0x194
+            uint8_t _pad0194[0x4]; // 0x194
             // m_vecBoneWorldMin has a template type with potentially unknown template parameters. You can try uncommenting the field below.
             // CUtlVector<Vector> m_vecBoneWorldMin;
             char m_vecBoneWorldMin[0x18]; // 0x198            
             // m_vecBoneWorldMax has a template type with potentially unknown template parameters. You can try uncommenting the field below.
             // CUtlVector<Vector> m_vecBoneWorldMax;
             char m_vecBoneWorldMax[0x18]; // 0x1b0            
-        animationsystem::CAnimSequenceParams m_sequenceParams; // 0x1c8        
+            source2sdk::animationsystem::CAnimSequenceParams m_sequenceParams; // 0x1c8            
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CAnimDesc, m_name) == 0x0);
-    static_assert(offsetof(CAnimDesc, m_flags) == 0x10);
-    static_assert(offsetof(CAnimDesc, fps) == 0x18);
-    static_assert(offsetof(CAnimDesc, m_Data) == 0x20);
-    static_assert(offsetof(CAnimDesc, m_movementArray) == 0xf8);
-    static_assert(offsetof(CAnimDesc, m_xInitialOffset) == 0x110);
-    static_assert(offsetof(CAnimDesc, m_eventArray) == 0x130);
-    static_assert(offsetof(CAnimDesc, m_activityArray) == 0x148);
-    static_assert(offsetof(CAnimDesc, m_hierarchyArray) == 0x160);
-    static_assert(offsetof(CAnimDesc, framestalltime) == 0x178);
-    static_assert(offsetof(CAnimDesc, m_vecRootMin) == 0x17c);
-    static_assert(offsetof(CAnimDesc, m_vecRootMax) == 0x188);
-    static_assert(offsetof(CAnimDesc, m_vecBoneWorldMin) == 0x198);
-    static_assert(offsetof(CAnimDesc, m_vecBoneWorldMax) == 0x1b0);
-    static_assert(offsetof(CAnimDesc, m_sequenceParams) == 0x1c8);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimDesc, m_name) == 0x0);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimDesc, m_flags) == 0x10);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimDesc, fps) == 0x18);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimDesc, m_Data) == 0x20);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimDesc, m_movementArray) == 0xf8);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimDesc, m_xInitialOffset) == 0x110);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimDesc, m_eventArray) == 0x130);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimDesc, m_activityArray) == 0x148);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimDesc, m_hierarchyArray) == 0x160);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimDesc, framestalltime) == 0x178);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimDesc, m_vecRootMin) == 0x17c);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimDesc, m_vecRootMax) == 0x188);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimDesc, m_vecBoneWorldMin) == 0x198);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimDesc, m_vecBoneWorldMax) == 0x1b0);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimDesc, m_sequenceParams) == 0x1c8);
         
-    static_assert(sizeof(CAnimDesc) == 0x1d0);
+        static_assert(sizeof(source2sdk::animationsystem::CAnimDesc) == 0x1d0);
+    };
 };

sdk/include/source2sdk/animationsystem/CAnimDesc_Flag.hpp

@@ -1,5 +1,6 @@
 #pragma once
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
 
@@ -8,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Registered alignment: 0x1
         // Alignment: 0x1
         // Standard-layout class: true
@@ -32,14 +35,15 @@ namespace source2sdk::animationsystem
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CAnimDesc_Flag, m_bLooping) == 0x0);
-    static_assert(offsetof(CAnimDesc_Flag, m_bAllZeros) == 0x1);
-    static_assert(offsetof(CAnimDesc_Flag, m_bHidden) == 0x2);
-    static_assert(offsetof(CAnimDesc_Flag, m_bDelta) == 0x3);
-    static_assert(offsetof(CAnimDesc_Flag, m_bLegacyWorldspace) == 0x4);
-    static_assert(offsetof(CAnimDesc_Flag, m_bModelDoc) == 0x5);
-    static_assert(offsetof(CAnimDesc_Flag, m_bImplicitSeqIgnoreDelta) == 0x6);
-    static_assert(offsetof(CAnimDesc_Flag, m_bAnimGraphAdditive) == 0x7);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimDesc_Flag, m_bLooping) == 0x0);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimDesc_Flag, m_bAllZeros) == 0x1);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimDesc_Flag, m_bHidden) == 0x2);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimDesc_Flag, m_bDelta) == 0x3);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimDesc_Flag, m_bLegacyWorldspace) == 0x4);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimDesc_Flag, m_bModelDoc) == 0x5);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimDesc_Flag, m_bImplicitSeqIgnoreDelta) == 0x6);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimDesc_Flag, m_bAnimGraphAdditive) == 0x7);
         
-    static_assert(sizeof(CAnimDesc_Flag) == 0x8);
+        static_assert(sizeof(source2sdk::animationsystem::CAnimDesc_Flag) == 0x8);
+    };
 };

sdk/include/source2sdk/animationsystem/CAnimEncodeDifference.hpp

@@ -1,18 +1,21 @@
 #pragma once
+
+#include "source2sdk/source2gen/source2gen.hpp"
+#include <cstddef>
+#include <cstdint>
 #include "source2sdk/animationsystem/CAnimBoneDifference.hpp"
 #include "source2sdk/animationsystem/CAnimMorphDifference.hpp"
 #include "source2sdk/animationsystem/CAnimUserDifference.hpp"
-#include "source2sdk/source2gen.hpp"
-#include <cstddef>
-#include <cstdint>
 
 // /////////////////////////////////////////////////////////////
 // Module: animationsystem
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Registered alignment: 0x8
         // Alignment: 0x8
         // Standard-layout class: true
@@ -24,36 +27,37 @@ namespace source2sdk::animationsystem
         {
         public:
             // m_boneArray has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<animationsystem::CAnimBoneDifference> m_boneArray;
+            // CUtlVector<source2sdk::animationsystem::CAnimBoneDifference> m_boneArray;
             char m_boneArray[0x18]; // 0x0            
             // m_morphArray has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<animationsystem::CAnimMorphDifference> m_morphArray;
+            // CUtlVector<source2sdk::animationsystem::CAnimMorphDifference> m_morphArray;
             char m_morphArray[0x18]; // 0x18            
             // m_userArray has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<animationsystem::CAnimUserDifference> m_userArray;
+            // CUtlVector<source2sdk::animationsystem::CAnimUserDifference> m_userArray;
             char m_userArray[0x18]; // 0x30            
             // m_bHasRotationBitArray has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<uint8_t> m_bHasRotationBitArray;
+            // CUtlVector<std::uint8_t> m_bHasRotationBitArray;
             char m_bHasRotationBitArray[0x18]; // 0x48            
             // m_bHasMovementBitArray has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<uint8_t> m_bHasMovementBitArray;
+            // CUtlVector<std::uint8_t> m_bHasMovementBitArray;
             char m_bHasMovementBitArray[0x18]; // 0x60            
             // m_bHasMorphBitArray has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<uint8_t> m_bHasMorphBitArray;
+            // CUtlVector<std::uint8_t> m_bHasMorphBitArray;
             char m_bHasMorphBitArray[0x18]; // 0x78            
             // m_bHasUserBitArray has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<uint8_t> m_bHasUserBitArray;
+            // CUtlVector<std::uint8_t> m_bHasUserBitArray;
             char m_bHasUserBitArray[0x18]; // 0x90            
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CAnimEncodeDifference, m_boneArray) == 0x0);
-    static_assert(offsetof(CAnimEncodeDifference, m_morphArray) == 0x18);
-    static_assert(offsetof(CAnimEncodeDifference, m_userArray) == 0x30);
-    static_assert(offsetof(CAnimEncodeDifference, m_bHasRotationBitArray) == 0x48);
-    static_assert(offsetof(CAnimEncodeDifference, m_bHasMovementBitArray) == 0x60);
-    static_assert(offsetof(CAnimEncodeDifference, m_bHasMorphBitArray) == 0x78);
-    static_assert(offsetof(CAnimEncodeDifference, m_bHasUserBitArray) == 0x90);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimEncodeDifference, m_boneArray) == 0x0);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimEncodeDifference, m_morphArray) == 0x18);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimEncodeDifference, m_userArray) == 0x30);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimEncodeDifference, m_bHasRotationBitArray) == 0x48);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimEncodeDifference, m_bHasMovementBitArray) == 0x60);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimEncodeDifference, m_bHasMorphBitArray) == 0x78);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimEncodeDifference, m_bHasUserBitArray) == 0x90);
         
-    static_assert(sizeof(CAnimEncodeDifference) == 0xa8);
+        static_assert(sizeof(source2sdk::animationsystem::CAnimEncodeDifference) == 0xa8);
+    };
 };

sdk/include/source2sdk/animationsystem/CAnimEncodedFrames.hpp

@@ -1,17 +1,20 @@
 #pragma once
-#include "source2sdk/animationsystem/CAnimEncodeDifference.hpp"
-#include "source2sdk/animationsystem/CAnimFrameBlockAnim.hpp"
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
+#include "source2sdk/animationsystem/CAnimEncodeDifference.hpp"
+#include "source2sdk/animationsystem/CAnimFrameBlockAnim.hpp"
 
 // /////////////////////////////////////////////////////////////
 // Module: animationsystem
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Registered alignment: 0x8
         // Alignment: 0x8
         // Standard-layout class: true
@@ -23,20 +26,21 @@ namespace source2sdk::animationsystem
         {
         public:
             CBufferString m_fileName; // 0x0            
-        int32_t m_nFrames; // 0x10        
-        int32_t m_nFramesPerBlock; // 0x14        
+            std::int32_t m_nFrames; // 0x10            
+            std::int32_t m_nFramesPerBlock; // 0x14            
             // m_frameblockArray has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<animationsystem::CAnimFrameBlockAnim> m_frameblockArray;
+            // CUtlVector<source2sdk::animationsystem::CAnimFrameBlockAnim> m_frameblockArray;
             char m_frameblockArray[0x18]; // 0x18            
-        animationsystem::CAnimEncodeDifference m_usageDifferences; // 0x30        
+            source2sdk::animationsystem::CAnimEncodeDifference m_usageDifferences; // 0x30            
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CAnimEncodedFrames, m_fileName) == 0x0);
-    static_assert(offsetof(CAnimEncodedFrames, m_nFrames) == 0x10);
-    static_assert(offsetof(CAnimEncodedFrames, m_nFramesPerBlock) == 0x14);
-    static_assert(offsetof(CAnimEncodedFrames, m_frameblockArray) == 0x18);
-    static_assert(offsetof(CAnimEncodedFrames, m_usageDifferences) == 0x30);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimEncodedFrames, m_fileName) == 0x0);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimEncodedFrames, m_nFrames) == 0x10);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimEncodedFrames, m_nFramesPerBlock) == 0x14);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimEncodedFrames, m_frameblockArray) == 0x18);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimEncodedFrames, m_usageDifferences) == 0x30);
         
-    static_assert(sizeof(CAnimEncodedFrames) == 0xd8);
+        static_assert(sizeof(source2sdk::animationsystem::CAnimEncodedFrames) == 0xd8);
+    };
 };

sdk/include/source2sdk/animationsystem/CAnimEnum.hpp

@@ -1,5 +1,6 @@
 #pragma once
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
 
@@ -8,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Registered alignment: unknown
         // Alignment: 0x1
         // Standard-layout class: true
@@ -21,11 +24,12 @@ namespace source2sdk::animationsystem
         class CAnimEnum
         {
         public:
-        uint8_t m_value; // 0x0        
+            std::uint8_t m_value; // 0x0            
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CAnimEnum, m_value) == 0x0);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimEnum, m_value) == 0x0);
         
-    static_assert(sizeof(CAnimEnum) == 0x1);
+        static_assert(sizeof(source2sdk::animationsystem::CAnimEnum) == 0x1);
+    };
 };

sdk/include/source2sdk/animationsystem/CAnimEventDefinition.hpp

@@ -1,5 +1,6 @@
 #pragma once
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
 
@@ -8,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Registered alignment: 0x8
         // Alignment: 0x8
         // Standard-layout class: true
@@ -20,9 +23,9 @@ namespace source2sdk::animationsystem
         class CAnimEventDefinition
         {
         public:
-        [[maybe_unused]] std::uint8_t pad_0x00[0x8]; // 0x0
-        int32_t m_nFrame; // 0x8        
-        int32_t m_nEndFrame; // 0xc        
+            uint8_t _pad0000[0x8]; // 0x0
+            std::int32_t m_nFrame; // 0x8            
+            std::int32_t m_nEndFrame; // 0xc            
             float m_flCycle; // 0x10            
             float m_flDuration; // 0x14            
             KeyValues3 m_EventData; // 0x18            
@@ -32,13 +35,14 @@ namespace source2sdk::animationsystem
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CAnimEventDefinition, m_nFrame) == 0x8);
-    static_assert(offsetof(CAnimEventDefinition, m_nEndFrame) == 0xc);
-    static_assert(offsetof(CAnimEventDefinition, m_flCycle) == 0x10);
-    static_assert(offsetof(CAnimEventDefinition, m_flDuration) == 0x14);
-    static_assert(offsetof(CAnimEventDefinition, m_EventData) == 0x18);
-    static_assert(offsetof(CAnimEventDefinition, m_sLegacyOptions) == 0x28);
-    static_assert(offsetof(CAnimEventDefinition, m_sEventName) == 0x38);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimEventDefinition, m_nFrame) == 0x8);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimEventDefinition, m_nEndFrame) == 0xc);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimEventDefinition, m_flCycle) == 0x10);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimEventDefinition, m_flDuration) == 0x14);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimEventDefinition, m_EventData) == 0x18);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimEventDefinition, m_sLegacyOptions) == 0x28);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimEventDefinition, m_sEventName) == 0x38);
         
-    static_assert(sizeof(CAnimEventDefinition) == 0x40);
+        static_assert(sizeof(source2sdk::animationsystem::CAnimEventDefinition) == 0x40);
+    };
 };

sdk/include/source2sdk/animationsystem/CAnimFrameBlockAnim.hpp

@@ -1,5 +1,6 @@
 #pragma once
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
 
@@ -8,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Registered alignment: 0x8
         // Alignment: 0x8
         // Standard-layout class: true
@@ -20,17 +23,18 @@ namespace source2sdk::animationsystem
         class CAnimFrameBlockAnim
         {
         public:
-        int32_t m_nStartFrame; // 0x0        
-        int32_t m_nEndFrame; // 0x4        
+            std::int32_t m_nStartFrame; // 0x0            
+            std::int32_t m_nEndFrame; // 0x4            
             // m_segmentIndexArray has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<int32_t> m_segmentIndexArray;
+            // CUtlVector<std::int32_t> m_segmentIndexArray;
             char m_segmentIndexArray[0x18]; // 0x8            
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CAnimFrameBlockAnim, m_nStartFrame) == 0x0);
-    static_assert(offsetof(CAnimFrameBlockAnim, m_nEndFrame) == 0x4);
-    static_assert(offsetof(CAnimFrameBlockAnim, m_segmentIndexArray) == 0x8);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimFrameBlockAnim, m_nStartFrame) == 0x0);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimFrameBlockAnim, m_nEndFrame) == 0x4);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimFrameBlockAnim, m_segmentIndexArray) == 0x8);
         
-    static_assert(sizeof(CAnimFrameBlockAnim) == 0x20);
+        static_assert(sizeof(source2sdk::animationsystem::CAnimFrameBlockAnim) == 0x20);
+    };
 };

sdk/include/source2sdk/animationsystem/CAnimFrameSegment.hpp

@@ -1,5 +1,6 @@
 #pragma once
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
 
@@ -8,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Registered alignment: 0x8
         // Alignment: 0x8
         // Standard-layout class: true
@@ -20,18 +23,19 @@ namespace source2sdk::animationsystem
         class CAnimFrameSegment
         {
         public:
-        int32_t m_nUniqueFrameIndex; // 0x0        
-        uint32_t m_nLocalElementMasks; // 0x4        
-        int32_t m_nLocalChannel; // 0x8        
-        [[maybe_unused]] std::uint8_t pad_0x0c[0x4]; // 0xc
+            std::int32_t m_nUniqueFrameIndex; // 0x0            
+            std::uint32_t m_nLocalElementMasks; // 0x4            
+            std::int32_t m_nLocalChannel; // 0x8            
+            uint8_t _pad000c[0x4]; // 0xc
             CUtlBinaryBlock m_container; // 0x10            
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CAnimFrameSegment, m_nUniqueFrameIndex) == 0x0);
-    static_assert(offsetof(CAnimFrameSegment, m_nLocalElementMasks) == 0x4);
-    static_assert(offsetof(CAnimFrameSegment, m_nLocalChannel) == 0x8);
-    static_assert(offsetof(CAnimFrameSegment, m_container) == 0x10);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimFrameSegment, m_nUniqueFrameIndex) == 0x0);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimFrameSegment, m_nLocalElementMasks) == 0x4);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimFrameSegment, m_nLocalChannel) == 0x8);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimFrameSegment, m_container) == 0x10);
         
-    static_assert(sizeof(CAnimFrameSegment) == 0x28);
+        static_assert(sizeof(source2sdk::animationsystem::CAnimFrameSegment) == 0x28);
+    };
 };

sdk/include/source2sdk/animationsystem/CAnimKeyData.hpp

@@ -1,18 +1,21 @@
 #pragma once
+
+#include "source2sdk/source2gen/source2gen.hpp"
+#include <cstddef>
+#include <cstdint>
 #include "source2sdk/animationsystem/CAnimBone.hpp"
 #include "source2sdk/animationsystem/CAnimDataChannelDesc.hpp"
 #include "source2sdk/animationsystem/CAnimUser.hpp"
-#include "source2sdk/source2gen.hpp"
-#include <cstddef>
-#include <cstdint>
 
 // /////////////////////////////////////////////////////////////
 // Module: animationsystem
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Registered alignment: 0x8
         // Alignment: 0x8
         // Standard-layout class: true
@@ -25,28 +28,29 @@ namespace source2sdk::animationsystem
         public:
             CBufferString m_name; // 0x0            
             // m_boneArray has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<animationsystem::CAnimBone> m_boneArray;
+            // CUtlVector<source2sdk::animationsystem::CAnimBone> m_boneArray;
             char m_boneArray[0x18]; // 0x10            
             // m_userArray has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<animationsystem::CAnimUser> m_userArray;
+            // CUtlVector<source2sdk::animationsystem::CAnimUser> m_userArray;
             char m_userArray[0x18]; // 0x28            
             // m_morphArray has a template type with potentially unknown template parameters. You can try uncommenting the field below.
             // CUtlVector<CBufferString> m_morphArray;
             char m_morphArray[0x18]; // 0x40            
-        int32_t m_nChannelElements; // 0x58        
-        [[maybe_unused]] std::uint8_t pad_0x5c[0x4]; // 0x5c
+            std::int32_t m_nChannelElements; // 0x58            
+            uint8_t _pad005c[0x4]; // 0x5c
             // m_dataChannelArray has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<animationsystem::CAnimDataChannelDesc> m_dataChannelArray;
+            // CUtlVector<source2sdk::animationsystem::CAnimDataChannelDesc> m_dataChannelArray;
             char m_dataChannelArray[0x18]; // 0x60            
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CAnimKeyData, m_name) == 0x0);
-    static_assert(offsetof(CAnimKeyData, m_boneArray) == 0x10);
-    static_assert(offsetof(CAnimKeyData, m_userArray) == 0x28);
-    static_assert(offsetof(CAnimKeyData, m_morphArray) == 0x40);
-    static_assert(offsetof(CAnimKeyData, m_nChannelElements) == 0x58);
-    static_assert(offsetof(CAnimKeyData, m_dataChannelArray) == 0x60);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimKeyData, m_name) == 0x0);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimKeyData, m_boneArray) == 0x10);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimKeyData, m_userArray) == 0x28);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimKeyData, m_morphArray) == 0x40);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimKeyData, m_nChannelElements) == 0x58);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimKeyData, m_dataChannelArray) == 0x60);
         
-    static_assert(sizeof(CAnimKeyData) == 0x78);
+        static_assert(sizeof(source2sdk::animationsystem::CAnimKeyData) == 0x78);
+    };
 };

sdk/include/source2sdk/animationsystem/CAnimLocalHierarchy.hpp

@@ -1,5 +1,6 @@
 #pragma once
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
 
@@ -8,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Registered alignment: 0x8
         // Alignment: 0x8
         // Standard-layout class: true
@@ -22,19 +25,20 @@ namespace source2sdk::animationsystem
         public:
             CBufferString m_sBone; // 0x0            
             CBufferString m_sNewParent; // 0x10            
-        int32_t m_nStartFrame; // 0x20        
-        int32_t m_nPeakFrame; // 0x24        
-        int32_t m_nTailFrame; // 0x28        
-        int32_t m_nEndFrame; // 0x2c        
+            std::int32_t m_nStartFrame; // 0x20            
+            std::int32_t m_nPeakFrame; // 0x24            
+            std::int32_t m_nTailFrame; // 0x28            
+            std::int32_t m_nEndFrame; // 0x2c            
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CAnimLocalHierarchy, m_sBone) == 0x0);
-    static_assert(offsetof(CAnimLocalHierarchy, m_sNewParent) == 0x10);
-    static_assert(offsetof(CAnimLocalHierarchy, m_nStartFrame) == 0x20);
-    static_assert(offsetof(CAnimLocalHierarchy, m_nPeakFrame) == 0x24);
-    static_assert(offsetof(CAnimLocalHierarchy, m_nTailFrame) == 0x28);
-    static_assert(offsetof(CAnimLocalHierarchy, m_nEndFrame) == 0x2c);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimLocalHierarchy, m_sBone) == 0x0);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimLocalHierarchy, m_sNewParent) == 0x10);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimLocalHierarchy, m_nStartFrame) == 0x20);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimLocalHierarchy, m_nPeakFrame) == 0x24);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimLocalHierarchy, m_nTailFrame) == 0x28);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimLocalHierarchy, m_nEndFrame) == 0x2c);
         
-    static_assert(sizeof(CAnimLocalHierarchy) == 0x30);
+        static_assert(sizeof(source2sdk::animationsystem::CAnimLocalHierarchy) == 0x30);
+    };
 };

sdk/include/source2sdk/animationsystem/CAnimMorphDifference.hpp

@@ -1,5 +1,6 @@
 #pragma once
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
 
@@ -8,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Registered alignment: 0x8
         // Alignment: 0x8
         // Standard-layout class: true
@@ -24,7 +27,8 @@ namespace source2sdk::animationsystem
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CAnimMorphDifference, m_name) == 0x0);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimMorphDifference, m_name) == 0x0);
         
-    static_assert(sizeof(CAnimMorphDifference) == 0x10);
+        static_assert(sizeof(source2sdk::animationsystem::CAnimMorphDifference) == 0x10);
+    };
 };

sdk/include/source2sdk/animationsystem/CAnimMovement.hpp

@@ -1,5 +1,6 @@
 #pragma once
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
 
@@ -8,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Registered alignment: 0x4
         // Alignment: 0x4
         // Standard-layout class: true
@@ -21,8 +24,8 @@ namespace source2sdk::animationsystem
         class CAnimMovement
         {
         public:
-        int32_t endframe; // 0x0        
-        int32_t motionflags; // 0x4        
+            std::int32_t endframe; // 0x0            
+            std::int32_t motionflags; // 0x4            
             float v0; // 0x8            
             float v1; // 0xc            
             float angle; // 0x10            
@@ -31,13 +34,14 @@ namespace source2sdk::animationsystem
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CAnimMovement, endframe) == 0x0);
-    static_assert(offsetof(CAnimMovement, motionflags) == 0x4);
-    static_assert(offsetof(CAnimMovement, v0) == 0x8);
-    static_assert(offsetof(CAnimMovement, v1) == 0xc);
-    static_assert(offsetof(CAnimMovement, angle) == 0x10);
-    static_assert(offsetof(CAnimMovement, vector) == 0x14);
-    static_assert(offsetof(CAnimMovement, position) == 0x20);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimMovement, endframe) == 0x0);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimMovement, motionflags) == 0x4);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimMovement, v0) == 0x8);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimMovement, v1) == 0xc);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimMovement, angle) == 0x10);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimMovement, vector) == 0x14);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimMovement, position) == 0x20);
         
-    static_assert(sizeof(CAnimMovement) == 0x2c);
+        static_assert(sizeof(source2sdk::animationsystem::CAnimMovement) == 0x2c);
+    };
 };

sdk/include/source2sdk/animationsystem/CAnimSequenceParams.hpp

@@ -1,5 +1,6 @@
 #pragma once
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
 
@@ -8,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Registered alignment: 0x4
         // Alignment: 0x4
         // Standard-layout class: true
@@ -26,8 +29,9 @@ namespace source2sdk::animationsystem
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CAnimSequenceParams, m_flFadeInTime) == 0x0);
-    static_assert(offsetof(CAnimSequenceParams, m_flFadeOutTime) == 0x4);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimSequenceParams, m_flFadeInTime) == 0x0);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimSequenceParams, m_flFadeOutTime) == 0x4);
         
-    static_assert(sizeof(CAnimSequenceParams) == 0x8);
+        static_assert(sizeof(source2sdk::animationsystem::CAnimSequenceParams) == 0x8);
+    };
 };

sdk/include/source2sdk/animationsystem/CAnimUser.hpp

@@ -1,5 +1,6 @@
 #pragma once
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
 
@@ -8,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Registered alignment: 0x8
         // Alignment: 0x8
         // Standard-layout class: true
@@ -21,13 +24,14 @@ namespace source2sdk::animationsystem
         {
         public:
             CBufferString m_name; // 0x0            
-        int32_t m_nType; // 0x10        
-        [[maybe_unused]] std::uint8_t pad_0x14[0x4];
+            std::int32_t m_nType; // 0x10            
+            uint8_t _pad0014[0x4];
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CAnimUser, m_name) == 0x0);
-    static_assert(offsetof(CAnimUser, m_nType) == 0x10);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimUser, m_name) == 0x0);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimUser, m_nType) == 0x10);
         
-    static_assert(sizeof(CAnimUser) == 0x18);
+        static_assert(sizeof(source2sdk::animationsystem::CAnimUser) == 0x18);
+    };
 };

sdk/include/source2sdk/animationsystem/CAnimUserDifference.hpp

@@ -1,5 +1,6 @@
 #pragma once
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
 
@@ -8,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Registered alignment: 0x8
         // Alignment: 0x8
         // Standard-layout class: true
@@ -21,13 +24,14 @@ namespace source2sdk::animationsystem
         {
         public:
             CBufferString m_name; // 0x0            
-        int32_t m_nType; // 0x10        
-        [[maybe_unused]] std::uint8_t pad_0x14[0x4];
+            std::int32_t m_nType; // 0x10            
+            uint8_t _pad0014[0x4];
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CAnimUserDifference, m_name) == 0x0);
-    static_assert(offsetof(CAnimUserDifference, m_nType) == 0x10);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimUserDifference, m_name) == 0x0);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimUserDifference, m_nType) == 0x10);
         
-    static_assert(sizeof(CAnimUserDifference) == 0x18);
+        static_assert(sizeof(source2sdk::animationsystem::CAnimUserDifference) == 0x18);
+    };
 };

sdk/include/source2sdk/animationsystem/CAnimationGroup.hpp

@@ -1,19 +1,22 @@
 #pragma once
+
+#include "source2sdk/source2gen/source2gen.hpp"
+#include <cstddef>
+#include <cstdint>
 #include "source2sdk/animationsystem/CAnimKeyData.hpp"
 #include "source2sdk/resourcesystem/InfoForResourceTypeCAnimData.hpp"
 #include "source2sdk/resourcesystem/InfoForResourceTypeCAnimationGroup.hpp"
 #include "source2sdk/resourcesystem/InfoForResourceTypeCSequenceGroupData.hpp"
-#include "source2sdk/source2gen.hpp"
-#include <cstddef>
-#include <cstdint>
 
 // /////////////////////////////////////////////////////////////
 // Module: animationsystem
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Registered alignment: 0x8
         // Alignment: 0x8
         // Standard-layout class: true
@@ -25,42 +28,43 @@ namespace source2sdk::animationsystem
         class CAnimationGroup
         {
         public:
-        [[maybe_unused]] std::uint8_t pad_0x00[0x10]; // 0x0
-        uint32_t m_nFlags; // 0x10        
-        [[maybe_unused]] std::uint8_t pad_0x14[0x4]; // 0x14
+            uint8_t _pad0000[0x10]; // 0x0
+            std::uint32_t m_nFlags; // 0x10            
+            uint8_t _pad0014[0x4]; // 0x14
             CBufferString m_name; // 0x18            
-        [[maybe_unused]] std::uint8_t pad_0x28[0x38]; // 0x28
+            uint8_t _pad0028[0x38]; // 0x28
             // metadata: MKV3TransferName "m_localHAnimArray"
             // m_localHAnimArray_Handle has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<CStrongHandle<resourcesystem::InfoForResourceTypeCAnimData>> m_localHAnimArray_Handle;
+            // CUtlVector<CStrongHandle<source2sdk::resourcesystem::InfoForResourceTypeCAnimData>> m_localHAnimArray_Handle;
             char m_localHAnimArray_Handle[0x18]; // 0x60            
             // metadata: MKV3TransferName "m_includedGroupArray"
             // m_includedGroupArray_Handle has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<CStrongHandle<resourcesystem::InfoForResourceTypeCAnimationGroup>> m_includedGroupArray_Handle;
+            // CUtlVector<CStrongHandle<source2sdk::resourcesystem::InfoForResourceTypeCAnimationGroup>> m_includedGroupArray_Handle;
             char m_includedGroupArray_Handle[0x18]; // 0x78            
             // metadata: MKV3TransferName "m_directHSeqGroup"
             // m_directHSeqGroup_Handle has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CStrongHandle<resourcesystem::InfoForResourceTypeCSequenceGroupData> m_directHSeqGroup_Handle;
+            // CStrongHandle<source2sdk::resourcesystem::InfoForResourceTypeCSequenceGroupData> m_directHSeqGroup_Handle;
             char m_directHSeqGroup_Handle[0x8]; // 0x90            
-        animationsystem::CAnimKeyData m_decodeKey; // 0x98        
+            source2sdk::animationsystem::CAnimKeyData m_decodeKey; // 0x98            
             // m_szScripts has a template type with potentially unknown template parameters. You can try uncommenting the field below.
             // CUtlVector<CBufferString> m_szScripts;
             char m_szScripts[0x18]; // 0x110            
             // m_AdditionalExtRefs has a template type with potentially unknown template parameters. You can try uncommenting the field below.
             // CUtlVector<CStrongHandleVoid> m_AdditionalExtRefs;
             char m_AdditionalExtRefs[0x18]; // 0x128            
-        [[maybe_unused]] std::uint8_t pad_0x140[0x8];
+            uint8_t _pad0140[0x8];
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CAnimationGroup, m_nFlags) == 0x10);
-    static_assert(offsetof(CAnimationGroup, m_name) == 0x18);
-    static_assert(offsetof(CAnimationGroup, m_localHAnimArray_Handle) == 0x60);
-    static_assert(offsetof(CAnimationGroup, m_includedGroupArray_Handle) == 0x78);
-    static_assert(offsetof(CAnimationGroup, m_directHSeqGroup_Handle) == 0x90);
-    static_assert(offsetof(CAnimationGroup, m_decodeKey) == 0x98);
-    static_assert(offsetof(CAnimationGroup, m_szScripts) == 0x110);
-    static_assert(offsetof(CAnimationGroup, m_AdditionalExtRefs) == 0x128);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimationGroup, m_nFlags) == 0x10);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimationGroup, m_name) == 0x18);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimationGroup, m_localHAnimArray_Handle) == 0x60);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimationGroup, m_includedGroupArray_Handle) == 0x78);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimationGroup, m_directHSeqGroup_Handle) == 0x90);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimationGroup, m_decodeKey) == 0x98);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimationGroup, m_szScripts) == 0x110);
+        static_assert(offsetof(source2sdk::animationsystem::CAnimationGroup, m_AdditionalExtRefs) == 0x128);
         
-    static_assert(sizeof(CAnimationGroup) == 0x148);
+        static_assert(sizeof(source2sdk::animationsystem::CAnimationGroup) == 0x148);
+    };
 };

sdk/include/source2sdk/animationsystem/CCompressorGroup.hpp

@@ -1,16 +1,19 @@
 #pragma once
-#include "source2sdk/mathlib_extended/fieldtype_t.hpp"
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
+#include "source2sdk/mathlib_extended/fieldtype_t.hpp"
 
 // /////////////////////////////////////////////////////////////
 // Module: animationsystem
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Registered alignment: unknown
         // Alignment: 0x8
         // Standard-layout class: true
@@ -19,8 +22,8 @@ namespace source2sdk::animationsystem
         class CCompressorGroup
         {
         public:
-        int32_t m_nTotalElementCount; // 0x0        
-        [[maybe_unused]] std::uint8_t pad_0x04[0x4]; // 0x4
+            std::int32_t m_nTotalElementCount; // 0x0            
+            uint8_t _pad0004[0x4]; // 0x4
             // m_szChannelClass has a template type with potentially unknown template parameters. You can try uncommenting the field below.
             // CUtlVector<char*> m_szChannelClass;
             char m_szChannelClass[0x18]; // 0x8            
@@ -28,27 +31,27 @@ namespace source2sdk::animationsystem
             // CUtlVector<char*> m_szVariableName;
             char m_szVariableName[0x18]; // 0x20            
             // m_nType has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<mathlib_extended::fieldtype_t> m_nType;
+            // CUtlVector<source2sdk::mathlib_extended::fieldtype_t> m_nType;
             char m_nType[0x18]; // 0x38            
             // m_nFlags has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<int32_t> m_nFlags;
+            // CUtlVector<std::int32_t> m_nFlags;
             char m_nFlags[0x18]; // 0x50            
             // m_szGrouping has a template type with potentially unknown template parameters. You can try uncommenting the field below.
             // CUtlVector<CUtlString> m_szGrouping;
             char m_szGrouping[0x18]; // 0x68            
             // m_nCompressorIndex has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<int32_t> m_nCompressorIndex;
+            // CUtlVector<std::int32_t> m_nCompressorIndex;
             char m_nCompressorIndex[0x18]; // 0x80            
             // m_szElementNames has a template type with potentially unknown template parameters. You can try uncommenting the field below.
             // CUtlVector<CUtlVector<char*>> m_szElementNames;
             char m_szElementNames[0x18]; // 0x98            
             // m_nElementUniqueID has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<CUtlVector<int32_t>> m_nElementUniqueID;
+            // CUtlVector<CUtlVector<std::int32_t>> m_nElementUniqueID;
             char m_nElementUniqueID[0x18]; // 0xb0            
             // m_nElementMask has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<uint32_t> m_nElementMask;
+            // CUtlVector<std::uint32_t> m_nElementMask;
             char m_nElementMask[0x18]; // 0xc8            
-        [[maybe_unused]] std::uint8_t pad_0xe0[0x18]; // 0xe0
+            uint8_t _pad00e0[0x18]; // 0xe0
             // m_vectorCompressor has a template type with potentially unknown template parameters. You can try uncommenting the field below.
             // CUtlVector<CCompressor<Vector>*> m_vectorCompressor;
             char m_vectorCompressor[0x18]; // 0xf8            
@@ -56,7 +59,7 @@ namespace source2sdk::animationsystem
             // CUtlVector<CCompressor<QuaternionStorage>*> m_quaternionCompressor;
             char m_quaternionCompressor[0x18]; // 0x110            
             // m_intCompressor has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<CCompressor<int32_t>*> m_intCompressor;
+            // CUtlVector<CCompressor<std::int32_t>*> m_intCompressor;
             char m_intCompressor[0x18]; // 0x128            
             // m_boolCompressor has a template type with potentially unknown template parameters. You can try uncommenting the field below.
             // CUtlVector<CCompressor<bool>*> m_boolCompressor;
@@ -73,23 +76,24 @@ namespace source2sdk::animationsystem
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CCompressorGroup, m_nTotalElementCount) == 0x0);
-    static_assert(offsetof(CCompressorGroup, m_szChannelClass) == 0x8);
-    static_assert(offsetof(CCompressorGroup, m_szVariableName) == 0x20);
-    static_assert(offsetof(CCompressorGroup, m_nType) == 0x38);
-    static_assert(offsetof(CCompressorGroup, m_nFlags) == 0x50);
-    static_assert(offsetof(CCompressorGroup, m_szGrouping) == 0x68);
-    static_assert(offsetof(CCompressorGroup, m_nCompressorIndex) == 0x80);
-    static_assert(offsetof(CCompressorGroup, m_szElementNames) == 0x98);
-    static_assert(offsetof(CCompressorGroup, m_nElementUniqueID) == 0xb0);
-    static_assert(offsetof(CCompressorGroup, m_nElementMask) == 0xc8);
-    static_assert(offsetof(CCompressorGroup, m_vectorCompressor) == 0xf8);
-    static_assert(offsetof(CCompressorGroup, m_quaternionCompressor) == 0x110);
-    static_assert(offsetof(CCompressorGroup, m_intCompressor) == 0x128);
-    static_assert(offsetof(CCompressorGroup, m_boolCompressor) == 0x140);
-    static_assert(offsetof(CCompressorGroup, m_colorCompressor) == 0x158);
-    static_assert(offsetof(CCompressorGroup, m_vector2DCompressor) == 0x170);
-    static_assert(offsetof(CCompressorGroup, m_vector4DCompressor) == 0x188);
+        static_assert(offsetof(source2sdk::animationsystem::CCompressorGroup, m_nTotalElementCount) == 0x0);
+        static_assert(offsetof(source2sdk::animationsystem::CCompressorGroup, m_szChannelClass) == 0x8);
+        static_assert(offsetof(source2sdk::animationsystem::CCompressorGroup, m_szVariableName) == 0x20);
+        static_assert(offsetof(source2sdk::animationsystem::CCompressorGroup, m_nType) == 0x38);
+        static_assert(offsetof(source2sdk::animationsystem::CCompressorGroup, m_nFlags) == 0x50);
+        static_assert(offsetof(source2sdk::animationsystem::CCompressorGroup, m_szGrouping) == 0x68);
+        static_assert(offsetof(source2sdk::animationsystem::CCompressorGroup, m_nCompressorIndex) == 0x80);
+        static_assert(offsetof(source2sdk::animationsystem::CCompressorGroup, m_szElementNames) == 0x98);
+        static_assert(offsetof(source2sdk::animationsystem::CCompressorGroup, m_nElementUniqueID) == 0xb0);
+        static_assert(offsetof(source2sdk::animationsystem::CCompressorGroup, m_nElementMask) == 0xc8);
+        static_assert(offsetof(source2sdk::animationsystem::CCompressorGroup, m_vectorCompressor) == 0xf8);
+        static_assert(offsetof(source2sdk::animationsystem::CCompressorGroup, m_quaternionCompressor) == 0x110);
+        static_assert(offsetof(source2sdk::animationsystem::CCompressorGroup, m_intCompressor) == 0x128);
+        static_assert(offsetof(source2sdk::animationsystem::CCompressorGroup, m_boolCompressor) == 0x140);
+        static_assert(offsetof(source2sdk::animationsystem::CCompressorGroup, m_colorCompressor) == 0x158);
+        static_assert(offsetof(source2sdk::animationsystem::CCompressorGroup, m_vector2DCompressor) == 0x170);
+        static_assert(offsetof(source2sdk::animationsystem::CCompressorGroup, m_vector4DCompressor) == 0x188);
         
-    static_assert(sizeof(CCompressorGroup) == 0x1a0);
+        static_assert(sizeof(source2sdk::animationsystem::CCompressorGroup) == 0x1a0);
+    };
 };

sdk/include/source2sdk/animationsystem/CMoodVData.hpp

@@ -1,18 +1,21 @@
 #pragma once
+
+#include "source2sdk/source2gen/source2gen.hpp"
+#include <cstddef>
+#include <cstdint>
 #include "source2sdk/animationsystem/MoodAnimationLayer_t.hpp"
 #include "source2sdk/animationsystem/MoodType_t.hpp"
 #include "source2sdk/resourcesystem/InfoForResourceTypeCModel.hpp"
-#include "source2sdk/source2gen.hpp"
-#include <cstddef>
-#include <cstdint>
 
 // /////////////////////////////////////////////////////////////
 // Module: animationsystem
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Registered alignment: 0x8
         // Alignment: 0x8
         // Standard-layout class: true
@@ -28,21 +31,22 @@ namespace source2sdk::animationsystem
             // metadata: MPropertyDescription "Model to get the animation list from"
             // metadata: MPropertyAutoRebuildOnChange
             // m_sModelName has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CResourceNameTyped<CWeakHandle<resourcesystem::InfoForResourceTypeCModel>> m_sModelName;
+            // CResourceNameTyped<CWeakHandle<source2sdk::resourcesystem::InfoForResourceTypeCModel>> m_sModelName;
             char m_sModelName[0xe0]; // 0x0            
             // metadata: MPropertyDescription "Type of mood"
-        animationsystem::MoodType_t m_nMoodType; // 0xe0        
-        [[maybe_unused]] std::uint8_t pad_0xe4[0x4]; // 0xe4
+            source2sdk::animationsystem::MoodType_t m_nMoodType; // 0xe0            
+            uint8_t _pad00e4[0x4]; // 0xe4
             // metadata: MPropertyDescription "Layers for this mood"
             // m_animationLayers has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<animationsystem::MoodAnimationLayer_t> m_animationLayers;
+            // CUtlVector<source2sdk::animationsystem::MoodAnimationLayer_t> m_animationLayers;
             char m_animationLayers[0x18]; // 0xe8            
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CMoodVData, m_sModelName) == 0x0);
-    static_assert(offsetof(CMoodVData, m_nMoodType) == 0xe0);
-    static_assert(offsetof(CMoodVData, m_animationLayers) == 0xe8);
+        static_assert(offsetof(source2sdk::animationsystem::CMoodVData, m_sModelName) == 0x0);
+        static_assert(offsetof(source2sdk::animationsystem::CMoodVData, m_nMoodType) == 0xe0);
+        static_assert(offsetof(source2sdk::animationsystem::CMoodVData, m_animationLayers) == 0xe8);
         
-    static_assert(sizeof(CMoodVData) == 0x100);
+        static_assert(sizeof(source2sdk::animationsystem::CMoodVData) == 0x100);
+    };
 };

sdk/include/source2sdk/animationsystem/CSeqAutoLayer.hpp

@@ -1,16 +1,19 @@
 #pragma once
-#include "source2sdk/animationsystem/CSeqAutoLayerFlag.hpp"
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
+#include "source2sdk/animationsystem/CSeqAutoLayerFlag.hpp"
 
 // /////////////////////////////////////////////////////////////
 // Module: animationsystem
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Registered alignment: 0x4
         // Alignment: 0x4
         // Standard-layout class: true
@@ -22,9 +25,9 @@ namespace source2sdk::animationsystem
         class CSeqAutoLayer
         {
         public:
-        int16_t m_nLocalReference; // 0x0        
-        int16_t m_nLocalPose; // 0x2        
-        animationsystem::CSeqAutoLayerFlag m_flags; // 0x4        
+            std::int16_t m_nLocalReference; // 0x0            
+            std::int16_t m_nLocalPose; // 0x2            
+            source2sdk::animationsystem::CSeqAutoLayerFlag m_flags; // 0x4            
             float m_start; // 0xc            
             float m_peak; // 0x10            
             float m_tail; // 0x14            
@@ -32,13 +35,14 @@ namespace source2sdk::animationsystem
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CSeqAutoLayer, m_nLocalReference) == 0x0);
-    static_assert(offsetof(CSeqAutoLayer, m_nLocalPose) == 0x2);
-    static_assert(offsetof(CSeqAutoLayer, m_flags) == 0x4);
-    static_assert(offsetof(CSeqAutoLayer, m_start) == 0xc);
-    static_assert(offsetof(CSeqAutoLayer, m_peak) == 0x10);
-    static_assert(offsetof(CSeqAutoLayer, m_tail) == 0x14);
-    static_assert(offsetof(CSeqAutoLayer, m_end) == 0x18);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqAutoLayer, m_nLocalReference) == 0x0);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqAutoLayer, m_nLocalPose) == 0x2);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqAutoLayer, m_flags) == 0x4);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqAutoLayer, m_start) == 0xc);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqAutoLayer, m_peak) == 0x10);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqAutoLayer, m_tail) == 0x14);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqAutoLayer, m_end) == 0x18);
         
-    static_assert(sizeof(CSeqAutoLayer) == 0x1c);
+        static_assert(sizeof(source2sdk::animationsystem::CSeqAutoLayer) == 0x1c);
+    };
 };

sdk/include/source2sdk/animationsystem/CSeqAutoLayerFlag.hpp

@@ -1,5 +1,6 @@
 #pragma once
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
 
@@ -8,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Registered alignment: 0x1
         // Alignment: 0x1
         // Standard-layout class: true
@@ -32,14 +35,15 @@ namespace source2sdk::animationsystem
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CSeqAutoLayerFlag, m_bPost) == 0x0);
-    static_assert(offsetof(CSeqAutoLayerFlag, m_bSpline) == 0x1);
-    static_assert(offsetof(CSeqAutoLayerFlag, m_bXFade) == 0x2);
-    static_assert(offsetof(CSeqAutoLayerFlag, m_bNoBlend) == 0x3);
-    static_assert(offsetof(CSeqAutoLayerFlag, m_bLocal) == 0x4);
-    static_assert(offsetof(CSeqAutoLayerFlag, m_bPose) == 0x5);
-    static_assert(offsetof(CSeqAutoLayerFlag, m_bFetchFrame) == 0x6);
-    static_assert(offsetof(CSeqAutoLayerFlag, m_bSubtract) == 0x7);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqAutoLayerFlag, m_bPost) == 0x0);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqAutoLayerFlag, m_bSpline) == 0x1);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqAutoLayerFlag, m_bXFade) == 0x2);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqAutoLayerFlag, m_bNoBlend) == 0x3);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqAutoLayerFlag, m_bLocal) == 0x4);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqAutoLayerFlag, m_bPose) == 0x5);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqAutoLayerFlag, m_bFetchFrame) == 0x6);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqAutoLayerFlag, m_bSubtract) == 0x7);
         
-    static_assert(sizeof(CSeqAutoLayerFlag) == 0x8);
+        static_assert(sizeof(source2sdk::animationsystem::CSeqAutoLayerFlag) == 0x8);
+    };
 };

sdk/include/source2sdk/animationsystem/CSeqBoneMaskList.hpp

@@ -1,5 +1,6 @@
 #pragma once
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
 
@@ -8,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Registered alignment: 0x8
         // Alignment: 0x8
         // Standard-layout class: true
@@ -22,24 +25,25 @@ namespace source2sdk::animationsystem
         public:
             CBufferString m_sName; // 0x0            
             // m_nLocalBoneArray has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<int16_t> m_nLocalBoneArray;
+            // CUtlVector<std::int16_t> m_nLocalBoneArray;
             char m_nLocalBoneArray[0x18]; // 0x10            
             // m_flBoneWeightArray has a template type with potentially unknown template parameters. You can try uncommenting the field below.
             // CUtlVector<float> m_flBoneWeightArray;
             char m_flBoneWeightArray[0x18]; // 0x28            
             float m_flDefaultMorphCtrlWeight; // 0x40            
-        [[maybe_unused]] std::uint8_t pad_0x44[0x4]; // 0x44
+            uint8_t _pad0044[0x4]; // 0x44
             // m_morphCtrlWeightArray has a template type with potentially unknown template parameters. You can try uncommenting the field below.
             // CUtlVector<CUtlPair<CBufferString,float>> m_morphCtrlWeightArray;
             char m_morphCtrlWeightArray[0x18]; // 0x48            
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CSeqBoneMaskList, m_sName) == 0x0);
-    static_assert(offsetof(CSeqBoneMaskList, m_nLocalBoneArray) == 0x10);
-    static_assert(offsetof(CSeqBoneMaskList, m_flBoneWeightArray) == 0x28);
-    static_assert(offsetof(CSeqBoneMaskList, m_flDefaultMorphCtrlWeight) == 0x40);
-    static_assert(offsetof(CSeqBoneMaskList, m_morphCtrlWeightArray) == 0x48);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqBoneMaskList, m_sName) == 0x0);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqBoneMaskList, m_nLocalBoneArray) == 0x10);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqBoneMaskList, m_flBoneWeightArray) == 0x28);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqBoneMaskList, m_flDefaultMorphCtrlWeight) == 0x40);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqBoneMaskList, m_morphCtrlWeightArray) == 0x48);
         
-    static_assert(sizeof(CSeqBoneMaskList) == 0x60);
+        static_assert(sizeof(source2sdk::animationsystem::CSeqBoneMaskList) == 0x60);
+    };
 };

sdk/include/source2sdk/animationsystem/CSeqCmdLayer.hpp

@@ -1,5 +1,6 @@
 #pragma once
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
 
@@ -8,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Registered alignment: 0x4
         // Alignment: 0x4
         // Standard-layout class: true
@@ -21,29 +24,30 @@ namespace source2sdk::animationsystem
         class CSeqCmdLayer
         {
         public:
-        int16_t m_cmd; // 0x0        
-        int16_t m_nLocalReference; // 0x2        
-        int16_t m_nLocalBonemask; // 0x4        
-        int16_t m_nDstResult; // 0x6        
-        int16_t m_nSrcResult; // 0x8        
+            std::int16_t m_cmd; // 0x0            
+            std::int16_t m_nLocalReference; // 0x2            
+            std::int16_t m_nLocalBonemask; // 0x4            
+            std::int16_t m_nDstResult; // 0x6            
+            std::int16_t m_nSrcResult; // 0x8            
             bool m_bSpline; // 0xa            
-        [[maybe_unused]] std::uint8_t pad_0x0b[0x1]; // 0xb
+            uint8_t _pad000b[0x1]; // 0xb
             float m_flVar1; // 0xc            
             float m_flVar2; // 0x10            
-        int16_t m_nLineNumber; // 0x14        
-        [[maybe_unused]] std::uint8_t pad_0x16[0x2];
+            std::int16_t m_nLineNumber; // 0x14            
+            uint8_t _pad0016[0x2];
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CSeqCmdLayer, m_cmd) == 0x0);
-    static_assert(offsetof(CSeqCmdLayer, m_nLocalReference) == 0x2);
-    static_assert(offsetof(CSeqCmdLayer, m_nLocalBonemask) == 0x4);
-    static_assert(offsetof(CSeqCmdLayer, m_nDstResult) == 0x6);
-    static_assert(offsetof(CSeqCmdLayer, m_nSrcResult) == 0x8);
-    static_assert(offsetof(CSeqCmdLayer, m_bSpline) == 0xa);
-    static_assert(offsetof(CSeqCmdLayer, m_flVar1) == 0xc);
-    static_assert(offsetof(CSeqCmdLayer, m_flVar2) == 0x10);
-    static_assert(offsetof(CSeqCmdLayer, m_nLineNumber) == 0x14);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqCmdLayer, m_cmd) == 0x0);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqCmdLayer, m_nLocalReference) == 0x2);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqCmdLayer, m_nLocalBonemask) == 0x4);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqCmdLayer, m_nDstResult) == 0x6);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqCmdLayer, m_nSrcResult) == 0x8);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqCmdLayer, m_bSpline) == 0xa);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqCmdLayer, m_flVar1) == 0xc);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqCmdLayer, m_flVar2) == 0x10);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqCmdLayer, m_nLineNumber) == 0x14);
         
-    static_assert(sizeof(CSeqCmdLayer) == 0x18);
+        static_assert(sizeof(source2sdk::animationsystem::CSeqCmdLayer) == 0x18);
+    };
 };

sdk/include/source2sdk/animationsystem/CSeqCmdSeqDesc.hpp

@@ -1,21 +1,24 @@
 #pragma once
+
+#include "source2sdk/source2gen/source2gen.hpp"
+#include <cstddef>
+#include <cstdint>
 #include "source2sdk/animationsystem/CAnimActivity.hpp"
 #include "source2sdk/animationsystem/CAnimEventDefinition.hpp"
 #include "source2sdk/animationsystem/CSeqCmdLayer.hpp"
 #include "source2sdk/animationsystem/CSeqPoseSetting.hpp"
 #include "source2sdk/animationsystem/CSeqSeqDescFlag.hpp"
 #include "source2sdk/animationsystem/CSeqTransition.hpp"
-#include "source2sdk/source2gen.hpp"
-#include <cstddef>
-#include <cstdint>
 
 // /////////////////////////////////////////////////////////////
 // Module: animationsystem
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Registered alignment: 0x8
         // Alignment: 0x8
         // Standard-layout class: true
@@ -27,41 +30,42 @@ namespace source2sdk::animationsystem
         {
         public:
             CBufferString m_sName; // 0x0            
-        animationsystem::CSeqSeqDescFlag m_flags; // 0x10        
-        [[maybe_unused]] std::uint8_t pad_0x1b[0x1]; // 0x1b
-        animationsystem::CSeqTransition m_transition; // 0x1c        
-        int16_t m_nFrameRangeSequence; // 0x24        
-        int16_t m_nFrameCount; // 0x26        
+            source2sdk::animationsystem::CSeqSeqDescFlag m_flags; // 0x10            
+            uint8_t _pad001b[0x1]; // 0x1b
+            source2sdk::animationsystem::CSeqTransition m_transition; // 0x1c            
+            std::int16_t m_nFrameRangeSequence; // 0x24            
+            std::int16_t m_nFrameCount; // 0x26            
             float m_flFPS; // 0x28            
-        int16_t m_nSubCycles; // 0x2c        
-        int16_t m_numLocalResults; // 0x2e        
+            std::int16_t m_nSubCycles; // 0x2c            
+            std::int16_t m_numLocalResults; // 0x2e            
             // m_cmdLayerArray has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<animationsystem::CSeqCmdLayer> m_cmdLayerArray;
+            // CUtlVector<source2sdk::animationsystem::CSeqCmdLayer> m_cmdLayerArray;
             char m_cmdLayerArray[0x18]; // 0x30            
             // m_eventArray has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<animationsystem::CAnimEventDefinition> m_eventArray;
+            // CUtlVector<source2sdk::animationsystem::CAnimEventDefinition> m_eventArray;
             char m_eventArray[0x18]; // 0x48            
             // m_activityArray has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<animationsystem::CAnimActivity> m_activityArray;
+            // CUtlVector<source2sdk::animationsystem::CAnimActivity> m_activityArray;
             char m_activityArray[0x18]; // 0x60            
             // m_poseSettingArray has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<animationsystem::CSeqPoseSetting> m_poseSettingArray;
+            // CUtlVector<source2sdk::animationsystem::CSeqPoseSetting> m_poseSettingArray;
             char m_poseSettingArray[0x18]; // 0x78            
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CSeqCmdSeqDesc, m_sName) == 0x0);
-    static_assert(offsetof(CSeqCmdSeqDesc, m_flags) == 0x10);
-    static_assert(offsetof(CSeqCmdSeqDesc, m_transition) == 0x1c);
-    static_assert(offsetof(CSeqCmdSeqDesc, m_nFrameRangeSequence) == 0x24);
-    static_assert(offsetof(CSeqCmdSeqDesc, m_nFrameCount) == 0x26);
-    static_assert(offsetof(CSeqCmdSeqDesc, m_flFPS) == 0x28);
-    static_assert(offsetof(CSeqCmdSeqDesc, m_nSubCycles) == 0x2c);
-    static_assert(offsetof(CSeqCmdSeqDesc, m_numLocalResults) == 0x2e);
-    static_assert(offsetof(CSeqCmdSeqDesc, m_cmdLayerArray) == 0x30);
-    static_assert(offsetof(CSeqCmdSeqDesc, m_eventArray) == 0x48);
-    static_assert(offsetof(CSeqCmdSeqDesc, m_activityArray) == 0x60);
-    static_assert(offsetof(CSeqCmdSeqDesc, m_poseSettingArray) == 0x78);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqCmdSeqDesc, m_sName) == 0x0);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqCmdSeqDesc, m_flags) == 0x10);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqCmdSeqDesc, m_transition) == 0x1c);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqCmdSeqDesc, m_nFrameRangeSequence) == 0x24);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqCmdSeqDesc, m_nFrameCount) == 0x26);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqCmdSeqDesc, m_flFPS) == 0x28);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqCmdSeqDesc, m_nSubCycles) == 0x2c);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqCmdSeqDesc, m_numLocalResults) == 0x2e);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqCmdSeqDesc, m_cmdLayerArray) == 0x30);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqCmdSeqDesc, m_eventArray) == 0x48);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqCmdSeqDesc, m_activityArray) == 0x60);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqCmdSeqDesc, m_poseSettingArray) == 0x78);
         
-    static_assert(sizeof(CSeqCmdSeqDesc) == 0x90);
+        static_assert(sizeof(source2sdk::animationsystem::CSeqCmdSeqDesc) == 0x90);
+    };
 };

sdk/include/source2sdk/animationsystem/CSeqIKLock.hpp

@@ -1,5 +1,6 @@
 #pragma once
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
 
@@ -8,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Registered alignment: 0x4
         // Alignment: 0x4
         // Standard-layout class: true
@@ -23,16 +26,17 @@ namespace source2sdk::animationsystem
         public:
             float m_flPosWeight; // 0x0            
             float m_flAngleWeight; // 0x4            
-        int16_t m_nLocalBone; // 0x8        
+            std::int16_t m_nLocalBone; // 0x8            
             bool m_bBonesOrientedAlongPositiveX; // 0xa            
-        [[maybe_unused]] std::uint8_t pad_0x0b[0x1];
+            uint8_t _pad000b[0x1];
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CSeqIKLock, m_flPosWeight) == 0x0);
-    static_assert(offsetof(CSeqIKLock, m_flAngleWeight) == 0x4);
-    static_assert(offsetof(CSeqIKLock, m_nLocalBone) == 0x8);
-    static_assert(offsetof(CSeqIKLock, m_bBonesOrientedAlongPositiveX) == 0xa);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqIKLock, m_flPosWeight) == 0x0);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqIKLock, m_flAngleWeight) == 0x4);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqIKLock, m_nLocalBone) == 0x8);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqIKLock, m_bBonesOrientedAlongPositiveX) == 0xa);
         
-    static_assert(sizeof(CSeqIKLock) == 0xc);
+        static_assert(sizeof(source2sdk::animationsystem::CSeqIKLock) == 0xc);
+    };
 };

sdk/include/source2sdk/animationsystem/CSeqMultiFetch.hpp

@@ -1,16 +1,19 @@
 #pragma once
-#include "source2sdk/animationsystem/CSeqMultiFetchFlag.hpp"
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
+#include "source2sdk/animationsystem/CSeqMultiFetchFlag.hpp"
 
 // /////////////////////////////////////////////////////////////
 // Module: animationsystem
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Registered alignment: 0x8
         // Alignment: 0x8
         // Standard-layout class: true
@@ -21,37 +24,38 @@ namespace source2sdk::animationsystem
         class CSeqMultiFetch
         {
         public:
-        animationsystem::CSeqMultiFetchFlag m_flags; // 0x0        
-        [[maybe_unused]] std::uint8_t pad_0x06[0x2]; // 0x6
+            source2sdk::animationsystem::CSeqMultiFetchFlag m_flags; // 0x0            
+            uint8_t _pad0006[0x2]; // 0x6
             // m_localReferenceArray has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<int16_t> m_localReferenceArray;
+            // CUtlVector<std::int16_t> m_localReferenceArray;
             char m_localReferenceArray[0x18]; // 0x8            
-        int32_t m_nGroupSize[2]; // 0x20        
-        int32_t m_nLocalPose[2]; // 0x28        
+            std::int32_t m_nGroupSize[2]; // 0x20            
+            std::int32_t m_nLocalPose[2]; // 0x28            
             // m_poseKeyArray0 has a template type with potentially unknown template parameters. You can try uncommenting the field below.
             // CUtlVector<float> m_poseKeyArray0;
             char m_poseKeyArray0[0x18]; // 0x30            
             // m_poseKeyArray1 has a template type with potentially unknown template parameters. You can try uncommenting the field below.
             // CUtlVector<float> m_poseKeyArray1;
             char m_poseKeyArray1[0x18]; // 0x48            
-        int32_t m_nLocalCyclePoseParameter; // 0x60        
+            std::int32_t m_nLocalCyclePoseParameter; // 0x60            
             bool m_bCalculatePoseParameters; // 0x64            
             bool m_bFixedBlendWeight; // 0x65            
-        [[maybe_unused]] std::uint8_t pad_0x66[0x2]; // 0x66
+            uint8_t _pad0066[0x2]; // 0x66
             float m_flFixedBlendWeightVals[2]; // 0x68            
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CSeqMultiFetch, m_flags) == 0x0);
-    static_assert(offsetof(CSeqMultiFetch, m_localReferenceArray) == 0x8);
-    static_assert(offsetof(CSeqMultiFetch, m_nGroupSize) == 0x20);
-    static_assert(offsetof(CSeqMultiFetch, m_nLocalPose) == 0x28);
-    static_assert(offsetof(CSeqMultiFetch, m_poseKeyArray0) == 0x30);
-    static_assert(offsetof(CSeqMultiFetch, m_poseKeyArray1) == 0x48);
-    static_assert(offsetof(CSeqMultiFetch, m_nLocalCyclePoseParameter) == 0x60);
-    static_assert(offsetof(CSeqMultiFetch, m_bCalculatePoseParameters) == 0x64);
-    static_assert(offsetof(CSeqMultiFetch, m_bFixedBlendWeight) == 0x65);
-    static_assert(offsetof(CSeqMultiFetch, m_flFixedBlendWeightVals) == 0x68);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqMultiFetch, m_flags) == 0x0);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqMultiFetch, m_localReferenceArray) == 0x8);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqMultiFetch, m_nGroupSize) == 0x20);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqMultiFetch, m_nLocalPose) == 0x28);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqMultiFetch, m_poseKeyArray0) == 0x30);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqMultiFetch, m_poseKeyArray1) == 0x48);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqMultiFetch, m_nLocalCyclePoseParameter) == 0x60);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqMultiFetch, m_bCalculatePoseParameters) == 0x64);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqMultiFetch, m_bFixedBlendWeight) == 0x65);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqMultiFetch, m_flFixedBlendWeightVals) == 0x68);
         
-    static_assert(sizeof(CSeqMultiFetch) == 0x70);
+        static_assert(sizeof(source2sdk::animationsystem::CSeqMultiFetch) == 0x70);
+    };
 };

sdk/include/source2sdk/animationsystem/CSeqMultiFetchFlag.hpp

@@ -1,5 +1,6 @@
 #pragma once
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
 
@@ -8,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Registered alignment: 0x1
         // Alignment: 0x1
         // Standard-layout class: true
@@ -30,12 +33,13 @@ namespace source2sdk::animationsystem
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CSeqMultiFetchFlag, m_bRealtime) == 0x0);
-    static_assert(offsetof(CSeqMultiFetchFlag, m_bCylepose) == 0x1);
-    static_assert(offsetof(CSeqMultiFetchFlag, m_b0D) == 0x2);
-    static_assert(offsetof(CSeqMultiFetchFlag, m_b1D) == 0x3);
-    static_assert(offsetof(CSeqMultiFetchFlag, m_b2D) == 0x4);
-    static_assert(offsetof(CSeqMultiFetchFlag, m_b2D_TRI) == 0x5);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqMultiFetchFlag, m_bRealtime) == 0x0);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqMultiFetchFlag, m_bCylepose) == 0x1);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqMultiFetchFlag, m_b0D) == 0x2);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqMultiFetchFlag, m_b1D) == 0x3);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqMultiFetchFlag, m_b2D) == 0x4);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqMultiFetchFlag, m_b2D_TRI) == 0x5);
         
-    static_assert(sizeof(CSeqMultiFetchFlag) == 0x6);
+        static_assert(sizeof(source2sdk::animationsystem::CSeqMultiFetchFlag) == 0x6);
+    };
 };

sdk/include/source2sdk/animationsystem/CSeqPoseParamDesc.hpp

@@ -1,5 +1,6 @@
 #pragma once
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
 
@@ -8,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Registered alignment: 0x8
         // Alignment: 0x8
         // Standard-layout class: true
@@ -25,15 +28,16 @@ namespace source2sdk::animationsystem
             float m_flEnd; // 0x14            
             float m_flLoop; // 0x18            
             bool m_bLooping; // 0x1c            
-        [[maybe_unused]] std::uint8_t pad_0x1d[0x3];
+            uint8_t _pad001d[0x3];
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CSeqPoseParamDesc, m_sName) == 0x0);
-    static_assert(offsetof(CSeqPoseParamDesc, m_flStart) == 0x10);
-    static_assert(offsetof(CSeqPoseParamDesc, m_flEnd) == 0x14);
-    static_assert(offsetof(CSeqPoseParamDesc, m_flLoop) == 0x18);
-    static_assert(offsetof(CSeqPoseParamDesc, m_bLooping) == 0x1c);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqPoseParamDesc, m_sName) == 0x0);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqPoseParamDesc, m_flStart) == 0x10);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqPoseParamDesc, m_flEnd) == 0x14);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqPoseParamDesc, m_flLoop) == 0x18);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqPoseParamDesc, m_bLooping) == 0x1c);
         
-    static_assert(sizeof(CSeqPoseParamDesc) == 0x20);
+        static_assert(sizeof(source2sdk::animationsystem::CSeqPoseParamDesc) == 0x20);
+    };
 };

sdk/include/source2sdk/animationsystem/CSeqPoseSetting.hpp

@@ -1,5 +1,6 @@
 #pragma once
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
 
@@ -8,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Registered alignment: 0x8
         // Alignment: 0x8
         // Standard-layout class: true
@@ -27,20 +30,21 @@ namespace source2sdk::animationsystem
             bool m_bX; // 0x34            
             bool m_bY; // 0x35            
             bool m_bZ; // 0x36            
-        [[maybe_unused]] std::uint8_t pad_0x37[0x1]; // 0x37
-        int32_t m_eType; // 0x38        
-        [[maybe_unused]] std::uint8_t pad_0x3c[0x4];
+            uint8_t _pad0037[0x1]; // 0x37
+            std::int32_t m_eType; // 0x38            
+            uint8_t _pad003c[0x4];
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CSeqPoseSetting, m_sPoseParameter) == 0x0);
-    static_assert(offsetof(CSeqPoseSetting, m_sAttachment) == 0x10);
-    static_assert(offsetof(CSeqPoseSetting, m_sReferenceSequence) == 0x20);
-    static_assert(offsetof(CSeqPoseSetting, m_flValue) == 0x30);
-    static_assert(offsetof(CSeqPoseSetting, m_bX) == 0x34);
-    static_assert(offsetof(CSeqPoseSetting, m_bY) == 0x35);
-    static_assert(offsetof(CSeqPoseSetting, m_bZ) == 0x36);
-    static_assert(offsetof(CSeqPoseSetting, m_eType) == 0x38);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqPoseSetting, m_sPoseParameter) == 0x0);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqPoseSetting, m_sAttachment) == 0x10);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqPoseSetting, m_sReferenceSequence) == 0x20);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqPoseSetting, m_flValue) == 0x30);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqPoseSetting, m_bX) == 0x34);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqPoseSetting, m_bY) == 0x35);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqPoseSetting, m_bZ) == 0x36);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqPoseSetting, m_eType) == 0x38);
         
-    static_assert(sizeof(CSeqPoseSetting) == 0x40);
+        static_assert(sizeof(source2sdk::animationsystem::CSeqPoseSetting) == 0x40);
+    };
 };

sdk/include/source2sdk/animationsystem/CSeqS1SeqDesc.hpp

@@ -1,4 +1,8 @@
 #pragma once
+
+#include "source2sdk/source2gen/source2gen.hpp"
+#include <cstddef>
+#include <cstdint>
 #include "source2sdk/animationsystem/CAnimActivity.hpp"
 #include "source2sdk/animationsystem/CSeqAutoLayer.hpp"
 #include "source2sdk/animationsystem/CSeqIKLock.hpp"
@@ -6,17 +10,16 @@
 #include "source2sdk/animationsystem/CSeqSeqDescFlag.hpp"
 #include "source2sdk/animationsystem/CSeqTransition.hpp"
 #include "source2sdk/modellib/CFootMotion.hpp"
-#include "source2sdk/source2gen.hpp"
-#include <cstddef>
-#include <cstdint>
 
 // /////////////////////////////////////////////////////////////
 // Module: animationsystem
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Registered alignment: 0x8
         // Alignment: 0x8
         // Standard-layout class: true
@@ -28,41 +31,42 @@ namespace source2sdk::animationsystem
         {
         public:
             CBufferString m_sName; // 0x0            
-        animationsystem::CSeqSeqDescFlag m_flags; // 0x10        
-        [[maybe_unused]] std::uint8_t pad_0x1b[0x5]; // 0x1b
-        animationsystem::CSeqMultiFetch m_fetch; // 0x20        
-        int32_t m_nLocalWeightlist; // 0x90        
-        [[maybe_unused]] std::uint8_t pad_0x94[0x4]; // 0x94
+            source2sdk::animationsystem::CSeqSeqDescFlag m_flags; // 0x10            
+            uint8_t _pad001b[0x5]; // 0x1b
+            source2sdk::animationsystem::CSeqMultiFetch m_fetch; // 0x20            
+            std::int32_t m_nLocalWeightlist; // 0x90            
+            uint8_t _pad0094[0x4]; // 0x94
             // m_autoLayerArray has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<animationsystem::CSeqAutoLayer> m_autoLayerArray;
+            // CUtlVector<source2sdk::animationsystem::CSeqAutoLayer> m_autoLayerArray;
             char m_autoLayerArray[0x18]; // 0x98            
             // m_IKLockArray has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<animationsystem::CSeqIKLock> m_IKLockArray;
+            // CUtlVector<source2sdk::animationsystem::CSeqIKLock> m_IKLockArray;
             char m_IKLockArray[0x18]; // 0xb0            
-        animationsystem::CSeqTransition m_transition; // 0xc8        
+            source2sdk::animationsystem::CSeqTransition m_transition; // 0xc8            
             KeyValues3 m_SequenceKeys; // 0xd0            
             // metadata: MKV3TransferName "m_keyValueText"
             CBufferString m_LegacyKeyValueText; // 0xe0            
             // m_activityArray has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<animationsystem::CAnimActivity> m_activityArray;
+            // CUtlVector<source2sdk::animationsystem::CAnimActivity> m_activityArray;
             char m_activityArray[0x18]; // 0xf0            
             // m_footMotion has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<modellib::CFootMotion> m_footMotion;
+            // CUtlVector<source2sdk::modellib::CFootMotion> m_footMotion;
             char m_footMotion[0x18]; // 0x108            
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CSeqS1SeqDesc, m_sName) == 0x0);
-    static_assert(offsetof(CSeqS1SeqDesc, m_flags) == 0x10);
-    static_assert(offsetof(CSeqS1SeqDesc, m_fetch) == 0x20);
-    static_assert(offsetof(CSeqS1SeqDesc, m_nLocalWeightlist) == 0x90);
-    static_assert(offsetof(CSeqS1SeqDesc, m_autoLayerArray) == 0x98);
-    static_assert(offsetof(CSeqS1SeqDesc, m_IKLockArray) == 0xb0);
-    static_assert(offsetof(CSeqS1SeqDesc, m_transition) == 0xc8);
-    static_assert(offsetof(CSeqS1SeqDesc, m_SequenceKeys) == 0xd0);
-    static_assert(offsetof(CSeqS1SeqDesc, m_LegacyKeyValueText) == 0xe0);
-    static_assert(offsetof(CSeqS1SeqDesc, m_activityArray) == 0xf0);
-    static_assert(offsetof(CSeqS1SeqDesc, m_footMotion) == 0x108);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqS1SeqDesc, m_sName) == 0x0);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqS1SeqDesc, m_flags) == 0x10);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqS1SeqDesc, m_fetch) == 0x20);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqS1SeqDesc, m_nLocalWeightlist) == 0x90);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqS1SeqDesc, m_autoLayerArray) == 0x98);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqS1SeqDesc, m_IKLockArray) == 0xb0);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqS1SeqDesc, m_transition) == 0xc8);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqS1SeqDesc, m_SequenceKeys) == 0xd0);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqS1SeqDesc, m_LegacyKeyValueText) == 0xe0);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqS1SeqDesc, m_activityArray) == 0xf0);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqS1SeqDesc, m_footMotion) == 0x108);
         
-    static_assert(sizeof(CSeqS1SeqDesc) == 0x120);
+        static_assert(sizeof(source2sdk::animationsystem::CSeqS1SeqDesc) == 0x120);
+    };
 };

sdk/include/source2sdk/animationsystem/CSeqScaleSet.hpp

@@ -1,5 +1,6 @@
 #pragma once
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
 
@@ -8,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Registered alignment: 0x8
         // Alignment: 0x8
         // Standard-layout class: true
@@ -22,10 +25,10 @@ namespace source2sdk::animationsystem
         public:
             CBufferString m_sName; // 0x0            
             bool m_bRootOffset; // 0x10            
-        [[maybe_unused]] std::uint8_t pad_0x11[0x3]; // 0x11
+            uint8_t _pad0011[0x3]; // 0x11
             Vector m_vRootOffset; // 0x14            
             // m_nLocalBoneArray has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<int16_t> m_nLocalBoneArray;
+            // CUtlVector<std::int16_t> m_nLocalBoneArray;
             char m_nLocalBoneArray[0x18]; // 0x20            
             // m_flBoneScaleArray has a template type with potentially unknown template parameters. You can try uncommenting the field below.
             // CUtlVector<float> m_flBoneScaleArray;
@@ -33,11 +36,12 @@ namespace source2sdk::animationsystem
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CSeqScaleSet, m_sName) == 0x0);
-    static_assert(offsetof(CSeqScaleSet, m_bRootOffset) == 0x10);
-    static_assert(offsetof(CSeqScaleSet, m_vRootOffset) == 0x14);
-    static_assert(offsetof(CSeqScaleSet, m_nLocalBoneArray) == 0x20);
-    static_assert(offsetof(CSeqScaleSet, m_flBoneScaleArray) == 0x38);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqScaleSet, m_sName) == 0x0);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqScaleSet, m_bRootOffset) == 0x10);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqScaleSet, m_vRootOffset) == 0x14);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqScaleSet, m_nLocalBoneArray) == 0x20);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqScaleSet, m_flBoneScaleArray) == 0x38);
         
-    static_assert(sizeof(CSeqScaleSet) == 0x50);
+        static_assert(sizeof(source2sdk::animationsystem::CSeqScaleSet) == 0x50);
+    };
 };

sdk/include/source2sdk/animationsystem/CSeqSeqDescFlag.hpp

@@ -1,5 +1,6 @@
 #pragma once
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
 
@@ -8,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Registered alignment: 0x1
         // Alignment: 0x1
         // Standard-layout class: true
@@ -35,17 +38,18 @@ namespace source2sdk::animationsystem
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CSeqSeqDescFlag, m_bLooping) == 0x0);
-    static_assert(offsetof(CSeqSeqDescFlag, m_bSnap) == 0x1);
-    static_assert(offsetof(CSeqSeqDescFlag, m_bAutoplay) == 0x2);
-    static_assert(offsetof(CSeqSeqDescFlag, m_bPost) == 0x3);
-    static_assert(offsetof(CSeqSeqDescFlag, m_bHidden) == 0x4);
-    static_assert(offsetof(CSeqSeqDescFlag, m_bMulti) == 0x5);
-    static_assert(offsetof(CSeqSeqDescFlag, m_bLegacyDelta) == 0x6);
-    static_assert(offsetof(CSeqSeqDescFlag, m_bLegacyWorldspace) == 0x7);
-    static_assert(offsetof(CSeqSeqDescFlag, m_bLegacyCyclepose) == 0x8);
-    static_assert(offsetof(CSeqSeqDescFlag, m_bLegacyRealtime) == 0x9);
-    static_assert(offsetof(CSeqSeqDescFlag, m_bModelDoc) == 0xa);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqSeqDescFlag, m_bLooping) == 0x0);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqSeqDescFlag, m_bSnap) == 0x1);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqSeqDescFlag, m_bAutoplay) == 0x2);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqSeqDescFlag, m_bPost) == 0x3);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqSeqDescFlag, m_bHidden) == 0x4);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqSeqDescFlag, m_bMulti) == 0x5);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqSeqDescFlag, m_bLegacyDelta) == 0x6);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqSeqDescFlag, m_bLegacyWorldspace) == 0x7);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqSeqDescFlag, m_bLegacyCyclepose) == 0x8);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqSeqDescFlag, m_bLegacyRealtime) == 0x9);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqSeqDescFlag, m_bModelDoc) == 0xa);
         
-    static_assert(sizeof(CSeqSeqDescFlag) == 0xb);
+        static_assert(sizeof(source2sdk::animationsystem::CSeqSeqDescFlag) == 0xb);
+    };
 };

sdk/include/source2sdk/animationsystem/CSeqSynthAnimDesc.hpp

@@ -1,18 +1,21 @@
 #pragma once
+
+#include "source2sdk/source2gen/source2gen.hpp"
+#include <cstddef>
+#include <cstdint>
 #include "source2sdk/animationsystem/CAnimActivity.hpp"
 #include "source2sdk/animationsystem/CSeqSeqDescFlag.hpp"
 #include "source2sdk/animationsystem/CSeqTransition.hpp"
-#include "source2sdk/source2gen.hpp"
-#include <cstddef>
-#include <cstdint>
 
 // /////////////////////////////////////////////////////////////
 // Module: animationsystem
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Registered alignment: 0x8
         // Alignment: 0x8
         // Standard-layout class: true
@@ -24,23 +27,24 @@ namespace source2sdk::animationsystem
         {
         public:
             CBufferString m_sName; // 0x0            
-        animationsystem::CSeqSeqDescFlag m_flags; // 0x10        
-        [[maybe_unused]] std::uint8_t pad_0x1b[0x1]; // 0x1b
-        animationsystem::CSeqTransition m_transition; // 0x1c        
-        int16_t m_nLocalBaseReference; // 0x24        
-        int16_t m_nLocalBoneMask; // 0x26        
+            source2sdk::animationsystem::CSeqSeqDescFlag m_flags; // 0x10            
+            uint8_t _pad001b[0x1]; // 0x1b
+            source2sdk::animationsystem::CSeqTransition m_transition; // 0x1c            
+            std::int16_t m_nLocalBaseReference; // 0x24            
+            std::int16_t m_nLocalBoneMask; // 0x26            
             // m_activityArray has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<animationsystem::CAnimActivity> m_activityArray;
+            // CUtlVector<source2sdk::animationsystem::CAnimActivity> m_activityArray;
             char m_activityArray[0x18]; // 0x28            
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CSeqSynthAnimDesc, m_sName) == 0x0);
-    static_assert(offsetof(CSeqSynthAnimDesc, m_flags) == 0x10);
-    static_assert(offsetof(CSeqSynthAnimDesc, m_transition) == 0x1c);
-    static_assert(offsetof(CSeqSynthAnimDesc, m_nLocalBaseReference) == 0x24);
-    static_assert(offsetof(CSeqSynthAnimDesc, m_nLocalBoneMask) == 0x26);
-    static_assert(offsetof(CSeqSynthAnimDesc, m_activityArray) == 0x28);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqSynthAnimDesc, m_sName) == 0x0);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqSynthAnimDesc, m_flags) == 0x10);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqSynthAnimDesc, m_transition) == 0x1c);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqSynthAnimDesc, m_nLocalBaseReference) == 0x24);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqSynthAnimDesc, m_nLocalBoneMask) == 0x26);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqSynthAnimDesc, m_activityArray) == 0x28);
         
-    static_assert(sizeof(CSeqSynthAnimDesc) == 0x40);
+        static_assert(sizeof(source2sdk::animationsystem::CSeqSynthAnimDesc) == 0x40);
+    };
 };

sdk/include/source2sdk/animationsystem/CSeqTransition.hpp

@@ -1,5 +1,6 @@
 #pragma once
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
 
@@ -8,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Registered alignment: 0x4
         // Alignment: 0x4
         // Standard-layout class: true
@@ -26,8 +29,9 @@ namespace source2sdk::animationsystem
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CSeqTransition, m_flFadeInTime) == 0x0);
-    static_assert(offsetof(CSeqTransition, m_flFadeOutTime) == 0x4);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqTransition, m_flFadeInTime) == 0x0);
+        static_assert(offsetof(source2sdk::animationsystem::CSeqTransition, m_flFadeOutTime) == 0x4);
         
-    static_assert(sizeof(CSeqTransition) == 0x8);
+        static_assert(sizeof(source2sdk::animationsystem::CSeqTransition) == 0x8);
+    };
 };

sdk/include/source2sdk/animationsystem/CSequenceGroupData.hpp

@@ -1,4 +1,8 @@
 #pragma once
+
+#include "source2sdk/source2gen/source2gen.hpp"
+#include <cstddef>
+#include <cstdint>
 #include "source2sdk/animationsystem/CSeqBoneMaskList.hpp"
 #include "source2sdk/animationsystem/CSeqCmdSeqDesc.hpp"
 #include "source2sdk/animationsystem/CSeqIKLock.hpp"
@@ -6,17 +10,16 @@
 #include "source2sdk/animationsystem/CSeqS1SeqDesc.hpp"
 #include "source2sdk/animationsystem/CSeqScaleSet.hpp"
 #include "source2sdk/animationsystem/CSeqSynthAnimDesc.hpp"
-#include "source2sdk/source2gen.hpp"
-#include <cstddef>
-#include <cstdint>
 
 // /////////////////////////////////////////////////////////////
 // Module: animationsystem
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Registered alignment: 0x8
         // Alignment: 0x8
         // Standard-layout class: true
@@ -28,59 +31,60 @@ namespace source2sdk::animationsystem
         class CSequenceGroupData
         {
         public:
-        [[maybe_unused]] std::uint8_t pad_0x00[0x10]; // 0x0
+            uint8_t _pad0000[0x10]; // 0x0
             CBufferString m_sName; // 0x10            
-        uint32_t m_nFlags; // 0x20        
-        [[maybe_unused]] std::uint8_t pad_0x24[0x4]; // 0x24
+            std::uint32_t m_nFlags; // 0x20            
+            uint8_t _pad0024[0x4]; // 0x24
             // m_localSequenceNameArray has a template type with potentially unknown template parameters. You can try uncommenting the field below.
             // CUtlVector<CBufferString> m_localSequenceNameArray;
             char m_localSequenceNameArray[0x18]; // 0x28            
             // m_localS1SeqDescArray has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<animationsystem::CSeqS1SeqDesc> m_localS1SeqDescArray;
+            // CUtlVector<source2sdk::animationsystem::CSeqS1SeqDesc> m_localS1SeqDescArray;
             char m_localS1SeqDescArray[0x18]; // 0x40            
             // m_localMultiSeqDescArray has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<animationsystem::CSeqS1SeqDesc> m_localMultiSeqDescArray;
+            // CUtlVector<source2sdk::animationsystem::CSeqS1SeqDesc> m_localMultiSeqDescArray;
             char m_localMultiSeqDescArray[0x18]; // 0x58            
             // m_localSynthAnimDescArray has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<animationsystem::CSeqSynthAnimDesc> m_localSynthAnimDescArray;
+            // CUtlVector<source2sdk::animationsystem::CSeqSynthAnimDesc> m_localSynthAnimDescArray;
             char m_localSynthAnimDescArray[0x18]; // 0x70            
             // m_localCmdSeqDescArray has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<animationsystem::CSeqCmdSeqDesc> m_localCmdSeqDescArray;
+            // CUtlVector<source2sdk::animationsystem::CSeqCmdSeqDesc> m_localCmdSeqDescArray;
             char m_localCmdSeqDescArray[0x18]; // 0x88            
             // m_localBoneMaskArray has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<animationsystem::CSeqBoneMaskList> m_localBoneMaskArray;
+            // CUtlVector<source2sdk::animationsystem::CSeqBoneMaskList> m_localBoneMaskArray;
             char m_localBoneMaskArray[0x18]; // 0xa0            
             // m_localScaleSetArray has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<animationsystem::CSeqScaleSet> m_localScaleSetArray;
+            // CUtlVector<source2sdk::animationsystem::CSeqScaleSet> m_localScaleSetArray;
             char m_localScaleSetArray[0x18]; // 0xb8            
             // m_localBoneNameArray has a template type with potentially unknown template parameters. You can try uncommenting the field below.
             // CUtlVector<CBufferString> m_localBoneNameArray;
             char m_localBoneNameArray[0x18]; // 0xd0            
             CBufferString m_localNodeName; // 0xe8            
             // m_localPoseParamArray has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<animationsystem::CSeqPoseParamDesc> m_localPoseParamArray;
+            // CUtlVector<source2sdk::animationsystem::CSeqPoseParamDesc> m_localPoseParamArray;
             char m_localPoseParamArray[0x18]; // 0xf8            
             KeyValues3 m_keyValues; // 0x110            
             // m_localIKAutoplayLockArray has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<animationsystem::CSeqIKLock> m_localIKAutoplayLockArray;
+            // CUtlVector<source2sdk::animationsystem::CSeqIKLock> m_localIKAutoplayLockArray;
             char m_localIKAutoplayLockArray[0x18]; // 0x120            
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CSequenceGroupData, m_sName) == 0x10);
-    static_assert(offsetof(CSequenceGroupData, m_nFlags) == 0x20);
-    static_assert(offsetof(CSequenceGroupData, m_localSequenceNameArray) == 0x28);
-    static_assert(offsetof(CSequenceGroupData, m_localS1SeqDescArray) == 0x40);
-    static_assert(offsetof(CSequenceGroupData, m_localMultiSeqDescArray) == 0x58);
-    static_assert(offsetof(CSequenceGroupData, m_localSynthAnimDescArray) == 0x70);
-    static_assert(offsetof(CSequenceGroupData, m_localCmdSeqDescArray) == 0x88);
-    static_assert(offsetof(CSequenceGroupData, m_localBoneMaskArray) == 0xa0);
-    static_assert(offsetof(CSequenceGroupData, m_localScaleSetArray) == 0xb8);
-    static_assert(offsetof(CSequenceGroupData, m_localBoneNameArray) == 0xd0);
-    static_assert(offsetof(CSequenceGroupData, m_localNodeName) == 0xe8);
-    static_assert(offsetof(CSequenceGroupData, m_localPoseParamArray) == 0xf8);
-    static_assert(offsetof(CSequenceGroupData, m_keyValues) == 0x110);
-    static_assert(offsetof(CSequenceGroupData, m_localIKAutoplayLockArray) == 0x120);
+        static_assert(offsetof(source2sdk::animationsystem::CSequenceGroupData, m_sName) == 0x10);
+        static_assert(offsetof(source2sdk::animationsystem::CSequenceGroupData, m_nFlags) == 0x20);
+        static_assert(offsetof(source2sdk::animationsystem::CSequenceGroupData, m_localSequenceNameArray) == 0x28);
+        static_assert(offsetof(source2sdk::animationsystem::CSequenceGroupData, m_localS1SeqDescArray) == 0x40);
+        static_assert(offsetof(source2sdk::animationsystem::CSequenceGroupData, m_localMultiSeqDescArray) == 0x58);
+        static_assert(offsetof(source2sdk::animationsystem::CSequenceGroupData, m_localSynthAnimDescArray) == 0x70);
+        static_assert(offsetof(source2sdk::animationsystem::CSequenceGroupData, m_localCmdSeqDescArray) == 0x88);
+        static_assert(offsetof(source2sdk::animationsystem::CSequenceGroupData, m_localBoneMaskArray) == 0xa0);
+        static_assert(offsetof(source2sdk::animationsystem::CSequenceGroupData, m_localScaleSetArray) == 0xb8);
+        static_assert(offsetof(source2sdk::animationsystem::CSequenceGroupData, m_localBoneNameArray) == 0xd0);
+        static_assert(offsetof(source2sdk::animationsystem::CSequenceGroupData, m_localNodeName) == 0xe8);
+        static_assert(offsetof(source2sdk::animationsystem::CSequenceGroupData, m_localPoseParamArray) == 0xf8);
+        static_assert(offsetof(source2sdk::animationsystem::CSequenceGroupData, m_keyValues) == 0x110);
+        static_assert(offsetof(source2sdk::animationsystem::CSequenceGroupData, m_localIKAutoplayLockArray) == 0x120);
         
-    static_assert(sizeof(CSequenceGroupData) == 0x138);
+        static_assert(sizeof(source2sdk::animationsystem::CSequenceGroupData) == 0x138);
+    };
 };

sdk/include/source2sdk/animationsystem/FollowAttachmentData.hpp

@@ -1,16 +1,19 @@
 #pragma once
-#include "source2sdk/modellib/AttachmentHandle_t.hpp"
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
+#include "source2sdk/modellib/AttachmentHandle_t.hpp"
 
 // /////////////////////////////////////////////////////////////
 // Module: animationsystem
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Registered alignment: 0x4
         // Alignment: 0x4
         // Standard-layout class: true
@@ -22,14 +25,15 @@ namespace source2sdk::animationsystem
         class FollowAttachmentData
         {
         public:
-        int32_t m_boneIndex; // 0x0        
-        modellib::AttachmentHandle_t m_attachmentHandle; // 0x4        
-        [[maybe_unused]] std::uint8_t pad_0x05[0x3];
+            std::int32_t m_boneIndex; // 0x0            
+            source2sdk::modellib::AttachmentHandle_t m_attachmentHandle; // 0x4            
+            uint8_t _pad0005[0x3];
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(FollowAttachmentData, m_boneIndex) == 0x0);
-    static_assert(offsetof(FollowAttachmentData, m_attachmentHandle) == 0x4);
+        static_assert(offsetof(source2sdk::animationsystem::FollowAttachmentData, m_boneIndex) == 0x0);
+        static_assert(offsetof(source2sdk::animationsystem::FollowAttachmentData, m_attachmentHandle) == 0x4);
         
-    static_assert(sizeof(FollowAttachmentData) == 0x8);
+        static_assert(sizeof(source2sdk::animationsystem::FollowAttachmentData) == 0x8);
+    };
 };

sdk/include/source2sdk/animationsystem/FootstepLandedFootSoundType_t.hpp

@@ -1,4 +1,7 @@
 #pragma once
+
+#include "source2sdk/source2gen/source2gen.hpp"
+#include <cstddef>
 #include <cstdint>
 
 // /////////////////////////////////////////////////////////////
@@ -6,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Enumerator count: 3
         // Alignment: 4
         // Size: 0x4
@@ -17,4 +22,5 @@ namespace source2sdk::animationsystem
             FOOTSOUND_Right = 0x1,
             FOOTSOUND_UseOverrideSound = 0x2,
         };
+    };
 };

sdk/include/source2sdk/animationsystem/HSequence.hpp

@@ -1,5 +1,6 @@
 #pragma once
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
 
@@ -8,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Registered alignment: unknown
         // Alignment: 0x4
         // Standard-layout class: true
@@ -21,11 +24,12 @@ namespace source2sdk::animationsystem
         class HSequence
         {
         public:
-        int32_t m_Value; // 0x0        
+            std::int32_t m_Value; // 0x0            
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(HSequence, m_Value) == 0x0);
+        static_assert(offsetof(source2sdk::animationsystem::HSequence, m_Value) == 0x0);
         
-    static_assert(sizeof(HSequence) == 0x4);
+        static_assert(sizeof(source2sdk::animationsystem::HSequence) == 0x4);
+    };
 };

sdk/include/source2sdk/animationsystem/MoodAnimationLayer_t.hpp

@@ -1,17 +1,20 @@
 #pragma once
-#include "source2sdk/animationsystem/MoodAnimation_t.hpp"
-#include "source2sdk/tier2/CRangeFloat.hpp"
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
+#include "source2sdk/animationsystem/MoodAnimation_t.hpp"
+#include "source2sdk/tier2/CRangeFloat.hpp"
 
 // /////////////////////////////////////////////////////////////
 // Module: animationsystem
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Registered alignment: 0x8
         // Alignment: 0x8
         // Standard-layout class: true
@@ -32,45 +35,46 @@ namespace source2sdk::animationsystem
             // metadata: MPropertyFriendlyName "Active When Talking"
             // metadata: MPropertyDescription "Sets the mood's animation buckets to be active when the character is talking"
             bool m_bActiveTalking; // 0x9            
-        [[maybe_unused]] std::uint8_t pad_0x0a[0x6]; // 0xa
+            uint8_t _pad000a[0x6]; // 0xa
             // metadata: MPropertyDescription "List of animations to choose from"
             // m_layerAnimations has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<animationsystem::MoodAnimation_t> m_layerAnimations;
+            // CUtlVector<source2sdk::animationsystem::MoodAnimation_t> m_layerAnimations;
             char m_layerAnimations[0x18]; // 0x10            
             // metadata: MPropertyDescription "Intensity of the animation"
             // metadata: MPropertyAttributeRange "0 1"
-        tier2::CRangeFloat m_flIntensity; // 0x28        
+            source2sdk::tier2::CRangeFloat m_flIntensity; // 0x28            
             // metadata: MPropertyDescription "Multiplier of the animation duration"
-        tier2::CRangeFloat m_flDurationScale; // 0x30        
+            source2sdk::tier2::CRangeFloat m_flDurationScale; // 0x30            
             // metadata: MPropertyDescription "When scaling an animation, grab the scale value as in int. Used for gestures/postures to control number of looping sections"
             bool m_bScaleWithInts; // 0x38            
-        [[maybe_unused]] std::uint8_t pad_0x39[0x3]; // 0x39
+            uint8_t _pad0039[0x3]; // 0x39
             // metadata: MPropertyDescription "Time before the next animation can start"
-        tier2::CRangeFloat m_flNextStart; // 0x3c        
+            source2sdk::tier2::CRangeFloat m_flNextStart; // 0x3c            
             // metadata: MPropertyDescription "Time from the start of the mood before an animation can start"
-        tier2::CRangeFloat m_flStartOffset; // 0x44        
+            source2sdk::tier2::CRangeFloat m_flStartOffset; // 0x44            
             // metadata: MPropertyDescription "Time from the end of the mood when an animation cannot play"
-        tier2::CRangeFloat m_flEndOffset; // 0x4c        
+            source2sdk::tier2::CRangeFloat m_flEndOffset; // 0x4c            
             // metadata: MPropertyDescription "Fade in time of the animation"
             float m_flFadeIn; // 0x54            
             // metadata: MPropertyDescription "Fade out time of the animation"
             float m_flFadeOut; // 0x58            
-        [[maybe_unused]] std::uint8_t pad_0x5c[0x4];
+            uint8_t _pad005c[0x4];
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(MoodAnimationLayer_t, m_sName) == 0x0);
-    static_assert(offsetof(MoodAnimationLayer_t, m_bActiveListening) == 0x8);
-    static_assert(offsetof(MoodAnimationLayer_t, m_bActiveTalking) == 0x9);
-    static_assert(offsetof(MoodAnimationLayer_t, m_layerAnimations) == 0x10);
-    static_assert(offsetof(MoodAnimationLayer_t, m_flIntensity) == 0x28);
-    static_assert(offsetof(MoodAnimationLayer_t, m_flDurationScale) == 0x30);
-    static_assert(offsetof(MoodAnimationLayer_t, m_bScaleWithInts) == 0x38);
-    static_assert(offsetof(MoodAnimationLayer_t, m_flNextStart) == 0x3c);
-    static_assert(offsetof(MoodAnimationLayer_t, m_flStartOffset) == 0x44);
-    static_assert(offsetof(MoodAnimationLayer_t, m_flEndOffset) == 0x4c);
-    static_assert(offsetof(MoodAnimationLayer_t, m_flFadeIn) == 0x54);
-    static_assert(offsetof(MoodAnimationLayer_t, m_flFadeOut) == 0x58);
+        static_assert(offsetof(source2sdk::animationsystem::MoodAnimationLayer_t, m_sName) == 0x0);
+        static_assert(offsetof(source2sdk::animationsystem::MoodAnimationLayer_t, m_bActiveListening) == 0x8);
+        static_assert(offsetof(source2sdk::animationsystem::MoodAnimationLayer_t, m_bActiveTalking) == 0x9);
+        static_assert(offsetof(source2sdk::animationsystem::MoodAnimationLayer_t, m_layerAnimations) == 0x10);
+        static_assert(offsetof(source2sdk::animationsystem::MoodAnimationLayer_t, m_flIntensity) == 0x28);
+        static_assert(offsetof(source2sdk::animationsystem::MoodAnimationLayer_t, m_flDurationScale) == 0x30);
+        static_assert(offsetof(source2sdk::animationsystem::MoodAnimationLayer_t, m_bScaleWithInts) == 0x38);
+        static_assert(offsetof(source2sdk::animationsystem::MoodAnimationLayer_t, m_flNextStart) == 0x3c);
+        static_assert(offsetof(source2sdk::animationsystem::MoodAnimationLayer_t, m_flStartOffset) == 0x44);
+        static_assert(offsetof(source2sdk::animationsystem::MoodAnimationLayer_t, m_flEndOffset) == 0x4c);
+        static_assert(offsetof(source2sdk::animationsystem::MoodAnimationLayer_t, m_flFadeIn) == 0x54);
+        static_assert(offsetof(source2sdk::animationsystem::MoodAnimationLayer_t, m_flFadeOut) == 0x58);
         
-    static_assert(sizeof(MoodAnimationLayer_t) == 0x60);
+        static_assert(sizeof(source2sdk::animationsystem::MoodAnimationLayer_t) == 0x60);
+    };
 };

sdk/include/source2sdk/animationsystem/MoodAnimation_t.hpp

@@ -1,5 +1,6 @@
 #pragma once
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
 
@@ -8,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Registered alignment: 0x8
         // Alignment: 0x8
         // Standard-layout class: true
@@ -26,12 +29,13 @@ namespace source2sdk::animationsystem
             CUtlString m_sName; // 0x0            
             // metadata: MPropertyDescription "Weight of the animation, higher numbers get picked more"
             float m_flWeight; // 0x8            
-        [[maybe_unused]] std::uint8_t pad_0x0c[0x4];
+            uint8_t _pad000c[0x4];
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(MoodAnimation_t, m_sName) == 0x0);
-    static_assert(offsetof(MoodAnimation_t, m_flWeight) == 0x8);
+        static_assert(offsetof(source2sdk::animationsystem::MoodAnimation_t, m_sName) == 0x0);
+        static_assert(offsetof(source2sdk::animationsystem::MoodAnimation_t, m_flWeight) == 0x8);
         
-    static_assert(sizeof(MoodAnimation_t) == 0x10);
+        static_assert(sizeof(source2sdk::animationsystem::MoodAnimation_t) == 0x10);
+    };
 };

sdk/include/source2sdk/animationsystem/MoodType_t.hpp

@@ -1,4 +1,7 @@
 #pragma once
+
+#include "source2sdk/source2gen/source2gen.hpp"
+#include <cstddef>
 #include <cstdint>
 
 // /////////////////////////////////////////////////////////////
@@ -6,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Enumerator count: 2
         // Alignment: 4
         // Size: 0x4
@@ -18,4 +23,5 @@ namespace source2sdk::animationsystem
             // MPropertyFriendlyName "Body"
             eMoodType_Body = 0x1,
         };
+    };
 };

sdk/include/source2sdk/animationsystem/ParticleAttachment_t.hpp

@@ -1,4 +1,7 @@
 #pragma once
+
+#include "source2sdk/source2gen/source2gen.hpp"
+#include <cstddef>
 #include <cstdint>
 
 // /////////////////////////////////////////////////////////////
@@ -6,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Enumerator count: 18
         // Alignment: 4
         // Size: 0x4
@@ -32,4 +37,5 @@ namespace source2sdk::animationsystem
             PATTACH_HEALTHBAR = 0xf,
             MAX_PATTACH_TYPES = 0x10,
         };
+    };
 };

sdk/include/source2sdk/animationsystem/RagdollPoseControl.hpp

@@ -1,4 +1,7 @@
 #pragma once
+
+#include "source2sdk/source2gen/source2gen.hpp"
+#include <cstddef>
 #include <cstdint>
 
 // /////////////////////////////////////////////////////////////
@@ -6,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Enumerator count: 1
         // Alignment: 4
         // Size: 0x4
@@ -15,4 +20,5 @@ namespace source2sdk::animationsystem
         {
             Absolute = 0x0,
         };
+    };
 };

sdk/include/source2sdk/animationsystem/SeqCmd_t.hpp

@@ -1,4 +1,7 @@
 #pragma once
+
+#include "source2sdk/source2gen/source2gen.hpp"
+#include <cstddef>
 #include <cstdint>
 
 // /////////////////////////////////////////////////////////////
@@ -6,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Enumerator count: 17
         // Alignment: 4
         // Size: 0x4
@@ -31,4 +36,5 @@ namespace source2sdk::animationsystem
             SeqCmd_ReverseSequence = 0xf,
             SeqCmd_Transform = 0x10,
         };
+    };
 };

sdk/include/source2sdk/animationsystem/SeqPoseSetting_t.hpp

@@ -1,4 +1,7 @@
 #pragma once
+
+#include "source2sdk/source2gen/source2gen.hpp"
+#include <cstddef>
 #include <cstdint>
 
 // /////////////////////////////////////////////////////////////
@@ -6,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animationsystem
+namespace source2sdk
 {
+    namespace animationsystem
+    {
         // Enumerator count: 4
         // Alignment: 4
         // Size: 0x4
@@ -18,4 +23,5 @@ namespace source2sdk::animationsystem
             SEQ_POSE_SETTING_POSITION = 0x2,
             SEQ_POSE_SETTING_VELOCITY = 0x3,
         };
+    };
 };

sdk/include/source2sdk/animgraphlib/AimCameraOpFixedSettings_t.hpp

@@ -1,5 +1,6 @@
 #pragma once
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
 
@@ -8,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animgraphlib
+namespace source2sdk
 {
+    namespace animgraphlib
+    {
         // Registered alignment: 0x8
         // Alignment: 0x8
         // Standard-layout class: true
@@ -20,25 +23,26 @@ namespace source2sdk::animgraphlib
         struct AimCameraOpFixedSettings_t
         {
         public:
-        int32_t m_nChainIndex; // 0x0        
-        int32_t m_nCameraJointIndex; // 0x4        
-        int32_t m_nPelvisJointIndex; // 0x8        
-        int32_t m_nClavicleLeftJointIndex; // 0xc        
-        int32_t m_nClavicleRightJointIndex; // 0x10        
-        int32_t m_nDepenetrationJointIndex; // 0x14        
+            std::int32_t m_nChainIndex; // 0x0            
+            std::int32_t m_nCameraJointIndex; // 0x4            
+            std::int32_t m_nPelvisJointIndex; // 0x8            
+            std::int32_t m_nClavicleLeftJointIndex; // 0xc            
+            std::int32_t m_nClavicleRightJointIndex; // 0x10            
+            std::int32_t m_nDepenetrationJointIndex; // 0x14            
             // m_propJoints has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<int32_t> m_propJoints;
+            // CUtlVector<std::int32_t> m_propJoints;
             char m_propJoints[0x18]; // 0x18            
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(AimCameraOpFixedSettings_t, m_nChainIndex) == 0x0);
-    static_assert(offsetof(AimCameraOpFixedSettings_t, m_nCameraJointIndex) == 0x4);
-    static_assert(offsetof(AimCameraOpFixedSettings_t, m_nPelvisJointIndex) == 0x8);
-    static_assert(offsetof(AimCameraOpFixedSettings_t, m_nClavicleLeftJointIndex) == 0xc);
-    static_assert(offsetof(AimCameraOpFixedSettings_t, m_nClavicleRightJointIndex) == 0x10);
-    static_assert(offsetof(AimCameraOpFixedSettings_t, m_nDepenetrationJointIndex) == 0x14);
-    static_assert(offsetof(AimCameraOpFixedSettings_t, m_propJoints) == 0x18);
+        static_assert(offsetof(source2sdk::animgraphlib::AimCameraOpFixedSettings_t, m_nChainIndex) == 0x0);
+        static_assert(offsetof(source2sdk::animgraphlib::AimCameraOpFixedSettings_t, m_nCameraJointIndex) == 0x4);
+        static_assert(offsetof(source2sdk::animgraphlib::AimCameraOpFixedSettings_t, m_nPelvisJointIndex) == 0x8);
+        static_assert(offsetof(source2sdk::animgraphlib::AimCameraOpFixedSettings_t, m_nClavicleLeftJointIndex) == 0xc);
+        static_assert(offsetof(source2sdk::animgraphlib::AimCameraOpFixedSettings_t, m_nClavicleRightJointIndex) == 0x10);
+        static_assert(offsetof(source2sdk::animgraphlib::AimCameraOpFixedSettings_t, m_nDepenetrationJointIndex) == 0x14);
+        static_assert(offsetof(source2sdk::animgraphlib::AimCameraOpFixedSettings_t, m_propJoints) == 0x18);
         
-    static_assert(sizeof(AimCameraOpFixedSettings_t) == 0x30);
+        static_assert(sizeof(source2sdk::animgraphlib::AimCameraOpFixedSettings_t) == 0x30);
+    };
 };

sdk/include/source2sdk/animgraphlib/AimMatrixBlendMode.hpp

@@ -1,4 +1,7 @@
 #pragma once
+
+#include "source2sdk/source2gen/source2gen.hpp"
+#include <cstddef>
 #include <cstdint>
 
 // /////////////////////////////////////////////////////////////
@@ -6,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animgraphlib
+namespace source2sdk
 {
+    namespace animgraphlib
+    {
         // Enumerator count: 4
         // Alignment: 4
         // Size: 0x4
@@ -22,4 +27,5 @@ namespace source2sdk::animgraphlib
             // MPropertyFriendlyName "Bone Mask"
             AimMatrixBlendMode_BoneMask = 0x3,
         };
+    };
 };

sdk/include/source2sdk/animgraphlib/AimMatrixOpFixedSettings_t.hpp

@@ -1,20 +1,23 @@
 #pragma once
+
+#include "source2sdk/source2gen/source2gen.hpp"
+#include <cstddef>
+#include <cstdint>
 #include "source2sdk/animgraphlib/AimMatrixBlendMode.hpp"
 #include "source2sdk/animgraphlib/CAnimInputDamping.hpp"
 #include "source2sdk/animgraphlib/CBlendCurve.hpp"
 #include "source2sdk/animgraphlib/CPoseHandle.hpp"
 #include "source2sdk/modellib/CAnimAttachment.hpp"
-#include "source2sdk/source2gen.hpp"
-#include <cstddef>
-#include <cstdint>
 
 // /////////////////////////////////////////////////////////////
 // Module: animgraphlib
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animgraphlib
+namespace source2sdk
 {
+    namespace animgraphlib
+    {
         // Registered alignment: 0x10
         // Alignment: 0x10
         // Standard-layout class: true
@@ -26,37 +29,38 @@ namespace source2sdk::animgraphlib
         struct AimMatrixOpFixedSettings_t
         {
         public:
-        modellib::CAnimAttachment m_attachment; // 0x0        
-        animgraphlib::CAnimInputDamping m_damping; // 0x80        
-        animgraphlib::CPoseHandle m_poseCacheHandles[10]; // 0x98        
-        animgraphlib::AimMatrixBlendMode m_eBlendMode; // 0xc0        
+            source2sdk::modellib::CAnimAttachment m_attachment; // 0x0            
+            source2sdk::animgraphlib::CAnimInputDamping m_damping; // 0x80            
+            source2sdk::animgraphlib::CPoseHandle m_poseCacheHandles[10]; // 0x98            
+            source2sdk::animgraphlib::AimMatrixBlendMode m_eBlendMode; // 0xc0            
             float m_flMaxYawAngle; // 0xc4            
             float m_flMaxPitchAngle; // 0xc8            
-        int32_t m_nSequenceMaxFrame; // 0xcc        
-        int32_t m_nBoneMaskIndex; // 0xd0        
+            std::int32_t m_nSequenceMaxFrame; // 0xcc            
+            std::int32_t m_nBoneMaskIndex; // 0xd0            
             bool m_bTargetIsPosition; // 0xd4            
             bool m_bUseBiasAndClamp; // 0xd5            
-        [[maybe_unused]] std::uint8_t pad_0xd6[0x2]; // 0xd6
+            uint8_t _pad00d6[0x2]; // 0xd6
             float m_flBiasAndClampYawOffset; // 0xd8            
             float m_flBiasAndClampPitchOffset; // 0xdc            
-        animgraphlib::CBlendCurve m_biasAndClampBlendCurve; // 0xe0        
-        [[maybe_unused]] std::uint8_t pad_0xe8[0x8];
+            source2sdk::animgraphlib::CBlendCurve m_biasAndClampBlendCurve; // 0xe0            
+            uint8_t _pad00e8[0x8];
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(AimMatrixOpFixedSettings_t, m_attachment) == 0x0);
-    static_assert(offsetof(AimMatrixOpFixedSettings_t, m_damping) == 0x80);
-    static_assert(offsetof(AimMatrixOpFixedSettings_t, m_poseCacheHandles) == 0x98);
-    static_assert(offsetof(AimMatrixOpFixedSettings_t, m_eBlendMode) == 0xc0);
-    static_assert(offsetof(AimMatrixOpFixedSettings_t, m_flMaxYawAngle) == 0xc4);
-    static_assert(offsetof(AimMatrixOpFixedSettings_t, m_flMaxPitchAngle) == 0xc8);
-    static_assert(offsetof(AimMatrixOpFixedSettings_t, m_nSequenceMaxFrame) == 0xcc);
-    static_assert(offsetof(AimMatrixOpFixedSettings_t, m_nBoneMaskIndex) == 0xd0);
-    static_assert(offsetof(AimMatrixOpFixedSettings_t, m_bTargetIsPosition) == 0xd4);
-    static_assert(offsetof(AimMatrixOpFixedSettings_t, m_bUseBiasAndClamp) == 0xd5);
-    static_assert(offsetof(AimMatrixOpFixedSettings_t, m_flBiasAndClampYawOffset) == 0xd8);
-    static_assert(offsetof(AimMatrixOpFixedSettings_t, m_flBiasAndClampPitchOffset) == 0xdc);
-    static_assert(offsetof(AimMatrixOpFixedSettings_t, m_biasAndClampBlendCurve) == 0xe0);
+        static_assert(offsetof(source2sdk::animgraphlib::AimMatrixOpFixedSettings_t, m_attachment) == 0x0);
+        static_assert(offsetof(source2sdk::animgraphlib::AimMatrixOpFixedSettings_t, m_damping) == 0x80);
+        static_assert(offsetof(source2sdk::animgraphlib::AimMatrixOpFixedSettings_t, m_poseCacheHandles) == 0x98);
+        static_assert(offsetof(source2sdk::animgraphlib::AimMatrixOpFixedSettings_t, m_eBlendMode) == 0xc0);
+        static_assert(offsetof(source2sdk::animgraphlib::AimMatrixOpFixedSettings_t, m_flMaxYawAngle) == 0xc4);
+        static_assert(offsetof(source2sdk::animgraphlib::AimMatrixOpFixedSettings_t, m_flMaxPitchAngle) == 0xc8);
+        static_assert(offsetof(source2sdk::animgraphlib::AimMatrixOpFixedSettings_t, m_nSequenceMaxFrame) == 0xcc);
+        static_assert(offsetof(source2sdk::animgraphlib::AimMatrixOpFixedSettings_t, m_nBoneMaskIndex) == 0xd0);
+        static_assert(offsetof(source2sdk::animgraphlib::AimMatrixOpFixedSettings_t, m_bTargetIsPosition) == 0xd4);
+        static_assert(offsetof(source2sdk::animgraphlib::AimMatrixOpFixedSettings_t, m_bUseBiasAndClamp) == 0xd5);
+        static_assert(offsetof(source2sdk::animgraphlib::AimMatrixOpFixedSettings_t, m_flBiasAndClampYawOffset) == 0xd8);
+        static_assert(offsetof(source2sdk::animgraphlib::AimMatrixOpFixedSettings_t, m_flBiasAndClampPitchOffset) == 0xdc);
+        static_assert(offsetof(source2sdk::animgraphlib::AimMatrixOpFixedSettings_t, m_biasAndClampBlendCurve) == 0xe0);
         
-    static_assert(sizeof(AimMatrixOpFixedSettings_t) == 0xf0);
+        static_assert(sizeof(source2sdk::animgraphlib::AimMatrixOpFixedSettings_t) == 0xf0);
+    };
 };

sdk/include/source2sdk/animgraphlib/AnimNodeNetworkMode.hpp

@@ -1,4 +1,7 @@
 #pragma once
+
+#include "source2sdk/source2gen/source2gen.hpp"
+#include <cstddef>
 #include <cstdint>
 
 // /////////////////////////////////////////////////////////////
@@ -6,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animgraphlib
+namespace source2sdk
 {
+    namespace animgraphlib
+    {
         // Enumerator count: 2
         // Alignment: 4
         // Size: 0x4
@@ -18,4 +23,5 @@ namespace source2sdk::animgraphlib
             // MPropertyFriendlyName "Client Simulate"
             ClientSimulate = 0x1,
         };
+    };
 };

sdk/include/source2sdk/animgraphlib/AnimScriptType.hpp

@@ -1,4 +1,7 @@
 #pragma once
+
+#include "source2sdk/source2gen/source2gen.hpp"
+#include <cstddef>
 #include <cstdint>
 
 // /////////////////////////////////////////////////////////////
@@ -6,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animgraphlib
+namespace source2sdk
 {
+    namespace animgraphlib
+    {
         // Enumerator count: 3
         // Alignment: 2
         // Size: 0x2
@@ -17,4 +22,5 @@ namespace source2sdk::animgraphlib
             ANIMSCRIPT_FUSE_GENERAL = 0x0,
             ANIMSCRIPT_FUSE_STATEMACHINE = 0x1,
         };
+    };
 };

sdk/include/source2sdk/animgraphlib/AnimValueSource.hpp

@@ -1,4 +1,7 @@
 #pragma once
+
+#include "source2sdk/source2gen/source2gen.hpp"
+#include <cstddef>
 #include <cstdint>
 
 // /////////////////////////////////////////////////////////////
@@ -6,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animgraphlib
+namespace source2sdk
 {
+    namespace animgraphlib
+    {
         // Enumerator count: 37
         // Alignment: 4
         // Size: 0x4
@@ -88,4 +93,5 @@ namespace source2sdk::animgraphlib
             // MPropertyFriendlyName "Finger Splay - Ring:Pinky"
             FingerSplay_Ring_Pinky = 0x24,
         };
+    };
 };

sdk/include/source2sdk/animgraphlib/AnimVectorSource.hpp

@@ -1,4 +1,7 @@
 #pragma once
+
+#include "source2sdk/source2gen/source2gen.hpp"
+#include <cstddef>
 #include <cstdint>
 
 // /////////////////////////////////////////////////////////////
@@ -6,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animgraphlib
+namespace source2sdk
 {
+    namespace animgraphlib
+    {
         // Enumerator count: 14
         // Alignment: 4
         // Size: 0x4
@@ -42,4 +47,5 @@ namespace source2sdk::animgraphlib
             // MPropertyFriendlyName "Manual Target World Space"
             ManualTarget_WorldSpace = 0xd,
         };
+    };
 };

sdk/include/source2sdk/animgraphlib/BinaryNodeChildOption.hpp

@@ -1,4 +1,7 @@
 #pragma once
+
+#include "source2sdk/source2gen/source2gen.hpp"
+#include <cstddef>
 #include <cstdint>
 
 // /////////////////////////////////////////////////////////////
@@ -6,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animgraphlib
+namespace source2sdk
 {
+    namespace animgraphlib
+    {
         // Enumerator count: 2
         // Alignment: 4
         // Size: 0x4
@@ -18,4 +23,5 @@ namespace source2sdk::animgraphlib
             // MPropertyFriendlyName "Child 2"
             Child2 = 0x1,
         };
+    };
 };

sdk/include/source2sdk/animgraphlib/BinaryNodeTiming.hpp

@@ -1,4 +1,7 @@
 #pragma once
+
+#include "source2sdk/source2gen/source2gen.hpp"
+#include <cstddef>
 #include <cstdint>
 
 // /////////////////////////////////////////////////////////////
@@ -6,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animgraphlib
+namespace source2sdk
 {
+    namespace animgraphlib
+    {
         // Enumerator count: 3
         // Alignment: 4
         // Size: 0x4
@@ -20,4 +25,5 @@ namespace source2sdk::animgraphlib
             // MPropertyFriendlyName "Synchronize Children"
             SyncChildren = 0x2,
         };
+    };
 };

sdk/include/source2sdk/animgraphlib/Blend2DMode.hpp

@@ -1,4 +1,7 @@
 #pragma once
+
+#include "source2sdk/source2gen/source2gen.hpp"
+#include <cstddef>
 #include <cstdint>
 
 // /////////////////////////////////////////////////////////////
@@ -6,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animgraphlib
+namespace source2sdk
 {
+    namespace animgraphlib
+    {
         // Enumerator count: 2
         // Alignment: 4
         // Size: 0x4
@@ -18,4 +23,5 @@ namespace source2sdk::animgraphlib
             // MPropertyFriendlyName "Directional"
             Blend2DMode_Directional = 0x1,
         };
+    };
 };

sdk/include/source2sdk/animgraphlib/BlendItem_t.hpp

@@ -1,18 +1,21 @@
 #pragma once
+
+#include "source2sdk/source2gen/source2gen.hpp"
+#include <cstddef>
+#include <cstdint>
 #include "source2sdk/animationsystem/HSequence.hpp"
 #include "source2sdk/animgraphlib/CAnimUpdateNodeRef.hpp"
 #include "source2sdk/animgraphlib/TagSpan_t.hpp"
-#include "source2sdk/source2gen.hpp"
-#include <cstddef>
-#include <cstdint>
 
 // /////////////////////////////////////////////////////////////
 // Module: animgraphlib
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animgraphlib
+namespace source2sdk
 {
+    namespace animgraphlib
+    {
         // Registered alignment: 0x8
         // Alignment: 0x8
         // Standard-layout class: true
@@ -24,23 +27,24 @@ namespace source2sdk::animgraphlib
         {
         public:
             // m_tags has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<animgraphlib::TagSpan_t> m_tags;
+            // CUtlVector<source2sdk::animgraphlib::TagSpan_t> m_tags;
             char m_tags[0x18]; // 0x0            
-        animgraphlib::CAnimUpdateNodeRef m_pChild; // 0x18        
-        animationsystem::HSequence m_hSequence; // 0x28        
+            source2sdk::animgraphlib::CAnimUpdateNodeRef m_pChild; // 0x18            
+            source2sdk::animationsystem::HSequence m_hSequence; // 0x28            
             Vector2D m_vPos; // 0x2c            
             float m_flDuration; // 0x34            
             bool m_bUseCustomDuration; // 0x38            
-        [[maybe_unused]] std::uint8_t pad_0x39[0x7];
+            uint8_t _pad0039[0x7];
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(BlendItem_t, m_tags) == 0x0);
-    static_assert(offsetof(BlendItem_t, m_pChild) == 0x18);
-    static_assert(offsetof(BlendItem_t, m_hSequence) == 0x28);
-    static_assert(offsetof(BlendItem_t, m_vPos) == 0x2c);
-    static_assert(offsetof(BlendItem_t, m_flDuration) == 0x34);
-    static_assert(offsetof(BlendItem_t, m_bUseCustomDuration) == 0x38);
+        static_assert(offsetof(source2sdk::animgraphlib::BlendItem_t, m_tags) == 0x0);
+        static_assert(offsetof(source2sdk::animgraphlib::BlendItem_t, m_pChild) == 0x18);
+        static_assert(offsetof(source2sdk::animgraphlib::BlendItem_t, m_hSequence) == 0x28);
+        static_assert(offsetof(source2sdk::animgraphlib::BlendItem_t, m_vPos) == 0x2c);
+        static_assert(offsetof(source2sdk::animgraphlib::BlendItem_t, m_flDuration) == 0x34);
+        static_assert(offsetof(source2sdk::animgraphlib::BlendItem_t, m_bUseCustomDuration) == 0x38);
         
-    static_assert(sizeof(BlendItem_t) == 0x40);
+        static_assert(sizeof(source2sdk::animgraphlib::BlendItem_t) == 0x40);
+    };
 };

sdk/include/source2sdk/animgraphlib/BlendKeyType.hpp

@@ -1,4 +1,7 @@
 #pragma once
+
+#include "source2sdk/source2gen/source2gen.hpp"
+#include <cstddef>
 #include <cstdint>
 
 // /////////////////////////////////////////////////////////////
@@ -6,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animgraphlib
+namespace source2sdk
 {
+    namespace animgraphlib
+    {
         // Enumerator count: 4
         // Alignment: 4
         // Size: 0x4
@@ -22,4 +27,5 @@ namespace source2sdk::animgraphlib
             // MPropertyFriendlyName "Remaining Distance"
             BlendKey_RemainingDistance = 0x3,
         };
+    };
 };

sdk/include/source2sdk/animgraphlib/BoneDemoCaptureSettings_t.hpp

@@ -1,5 +1,6 @@
 #pragma once
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
 
@@ -8,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animgraphlib
+namespace source2sdk
 {
+    namespace animgraphlib
+    {
         // Registered alignment: 0x8
         // Alignment: 0x8
         // Standard-layout class: true
@@ -38,13 +41,14 @@ namespace source2sdk::animgraphlib
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(BoneDemoCaptureSettings_t, m_boneName) == 0x0);
-    static_assert(offsetof(BoneDemoCaptureSettings_t, m_flErrorSplineRotationMax) == 0x8);
-    static_assert(offsetof(BoneDemoCaptureSettings_t, m_flErrorSplineTranslationMax) == 0xc);
-    static_assert(offsetof(BoneDemoCaptureSettings_t, m_flErrorSplineScaleMax) == 0x10);
-    static_assert(offsetof(BoneDemoCaptureSettings_t, m_flErrorQuantizationRotationMax) == 0x14);
-    static_assert(offsetof(BoneDemoCaptureSettings_t, m_flErrorQuantizationTranslationMax) == 0x18);
-    static_assert(offsetof(BoneDemoCaptureSettings_t, m_flErrorQuantizationScaleMax) == 0x1c);
+        static_assert(offsetof(source2sdk::animgraphlib::BoneDemoCaptureSettings_t, m_boneName) == 0x0);
+        static_assert(offsetof(source2sdk::animgraphlib::BoneDemoCaptureSettings_t, m_flErrorSplineRotationMax) == 0x8);
+        static_assert(offsetof(source2sdk::animgraphlib::BoneDemoCaptureSettings_t, m_flErrorSplineTranslationMax) == 0xc);
+        static_assert(offsetof(source2sdk::animgraphlib::BoneDemoCaptureSettings_t, m_flErrorSplineScaleMax) == 0x10);
+        static_assert(offsetof(source2sdk::animgraphlib::BoneDemoCaptureSettings_t, m_flErrorQuantizationRotationMax) == 0x14);
+        static_assert(offsetof(source2sdk::animgraphlib::BoneDemoCaptureSettings_t, m_flErrorQuantizationTranslationMax) == 0x18);
+        static_assert(offsetof(source2sdk::animgraphlib::BoneDemoCaptureSettings_t, m_flErrorQuantizationScaleMax) == 0x1c);
         
-    static_assert(sizeof(BoneDemoCaptureSettings_t) == 0x20);
+        static_assert(sizeof(source2sdk::animgraphlib::BoneDemoCaptureSettings_t) == 0x20);
+    };
 };

sdk/include/source2sdk/animgraphlib/BoneMaskBlendSpace.hpp

@@ -1,4 +1,7 @@
 #pragma once
+
+#include "source2sdk/source2gen/source2gen.hpp"
+#include <cstddef>
 #include <cstdint>
 
 // /////////////////////////////////////////////////////////////
@@ -6,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animgraphlib
+namespace source2sdk
 {
+    namespace animgraphlib
+    {
         // Enumerator count: 4
         // Alignment: 4
         // Size: 0x4
@@ -22,4 +27,5 @@ namespace source2sdk::animgraphlib
             // MPropertyFriendlyName "Model Space, Translation Only"
             BlendSpace_Model_TranslationOnly = 0x3,
         };
+    };
 };

sdk/include/source2sdk/animgraphlib/CActionComponentUpdater.hpp

@@ -1,17 +1,20 @@
 #pragma once
-#include "source2sdk/animgraphlib/CAnimActionUpdater.hpp"
-#include "source2sdk/animgraphlib/CAnimComponentUpdater.hpp"
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
+#include "source2sdk/animgraphlib/CAnimActionUpdater.hpp"
+#include "source2sdk/animgraphlib/CAnimComponentUpdater.hpp"
 
 // /////////////////////////////////////////////////////////////
 // Module: animgraphlib
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animgraphlib
+namespace source2sdk
 {
+    namespace animgraphlib
+    {
         // Registered alignment: 0x8
         // Alignment: 0x8
         // Standard-layout class: false
@@ -20,15 +23,17 @@ namespace source2sdk::animgraphlib
         // 
         // static metadata: MGetKV3ClassDefaults
         #pragma pack(push, 1)
-    class CActionComponentUpdater : public animgraphlib::CAnimComponentUpdater
+        class CActionComponentUpdater : public source2sdk::animgraphlib::CAnimComponentUpdater
         {
         public:
             // m_actions has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<CSmartPtr<animgraphlib::CAnimActionUpdater>> m_actions;
+            // CUtlVector<CSmartPtr<source2sdk::animgraphlib::CAnimActionUpdater>> m_actions;
             char m_actions[0x18]; // 0x30            
         };
         #pragma pack(pop)
         
         // Cannot assert offsets of fields in CActionComponentUpdater because it is not a standard-layout class
-    static_assert(sizeof(CActionComponentUpdater) == 0x48);
+        
+        static_assert(sizeof(source2sdk::animgraphlib::CActionComponentUpdater) == 0x48);
+    };
 };

sdk/include/source2sdk/animgraphlib/CAddUpdateNode.hpp

@@ -1,17 +1,20 @@
 #pragma once
-#include "source2sdk/animgraphlib/BinaryNodeChildOption.hpp"
-#include "source2sdk/animgraphlib/CBinaryUpdateNode.hpp"
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
+#include "source2sdk/animgraphlib/BinaryNodeChildOption.hpp"
+#include "source2sdk/animgraphlib/CBinaryUpdateNode.hpp"
 
 // /////////////////////////////////////////////////////////////
 // Module: animgraphlib
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animgraphlib
+namespace source2sdk
 {
+    namespace animgraphlib
+    {
         // Registered alignment: 0x8
         // Alignment: 0x8
         // Standard-layout class: false
@@ -20,19 +23,21 @@ namespace source2sdk::animgraphlib
         // 
         // static metadata: MGetKV3ClassDefaults
         #pragma pack(push, 1)
-    class CAddUpdateNode : public animgraphlib::CBinaryUpdateNode
+        class CAddUpdateNode : public source2sdk::animgraphlib::CBinaryUpdateNode
         {
         public:
-        [[maybe_unused]] std::uint8_t pad_0x90[0x4]; // 0x90
-        animgraphlib::BinaryNodeChildOption m_footMotionTiming; // 0x94        
+            uint8_t _pad0090[0x4]; // 0x90
+            source2sdk::animgraphlib::BinaryNodeChildOption m_footMotionTiming; // 0x94            
             bool m_bApplyToFootMotion; // 0x98            
             bool m_bApplyChannelsSeparately; // 0x99            
             bool m_bUseModelSpace; // 0x9a            
             bool m_bApplyScale; // 0x9b            
-        [[maybe_unused]] std::uint8_t pad_0x9c[0x4];
+            uint8_t _pad009c[0x4];
         };
         #pragma pack(pop)
         
         // Cannot assert offsets of fields in CAddUpdateNode because it is not a standard-layout class
-    static_assert(sizeof(CAddUpdateNode) == 0xa0);
+        
+        static_assert(sizeof(source2sdk::animgraphlib::CAddUpdateNode) == 0xa0);
+    };
 };

sdk/include/source2sdk/animgraphlib/CAimCameraUpdateNode.hpp

@@ -1,18 +1,21 @@
 #pragma once
+
+#include "source2sdk/source2gen/source2gen.hpp"
+#include <cstddef>
+#include <cstdint>
 #include "source2sdk/animgraphlib/AimCameraOpFixedSettings_t.hpp"
 #include "source2sdk/animgraphlib/CAnimParamHandle.hpp"
 #include "source2sdk/animgraphlib/CUnaryUpdateNode.hpp"
-#include "source2sdk/source2gen.hpp"
-#include <cstddef>
-#include <cstdint>
 
 // /////////////////////////////////////////////////////////////
 // Module: animgraphlib
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animgraphlib
+namespace source2sdk
 {
+    namespace animgraphlib
+    {
         // Registered alignment: 0x8
         // Alignment: 0x8
         // Standard-layout class: false
@@ -21,24 +24,26 @@ namespace source2sdk::animgraphlib
         // 
         // static metadata: MGetKV3ClassDefaults
         #pragma pack(push, 1)
-    class CAimCameraUpdateNode : public animgraphlib::CUnaryUpdateNode
+        class CAimCameraUpdateNode : public source2sdk::animgraphlib::CUnaryUpdateNode
         {
         public:
-        animgraphlib::CAnimParamHandle m_hParameterPosition; // 0x70        
-        animgraphlib::CAnimParamHandle m_hParameterOrientation; // 0x72        
-        animgraphlib::CAnimParamHandle m_hParameterSpineRotationWeight; // 0x74        
-        animgraphlib::CAnimParamHandle m_hParameterPelvisOffset; // 0x76        
-        animgraphlib::CAnimParamHandle m_hParameterUseIK; // 0x78        
-        animgraphlib::CAnimParamHandle m_hParameterCameraOnly; // 0x7a        
-        animgraphlib::CAnimParamHandle m_hParameterWeaponDepenetrationDistance; // 0x7c        
-        animgraphlib::CAnimParamHandle m_hParameterWeaponDepenetrationDelta; // 0x7e        
-        animgraphlib::CAnimParamHandle m_hParameterCameraClearanceDistance; // 0x80        
-        [[maybe_unused]] std::uint8_t pad_0x82[0x6]; // 0x82
-        animgraphlib::AimCameraOpFixedSettings_t m_opFixedSettings; // 0x88        
-        [[maybe_unused]] std::uint8_t pad_0xb8[0x8];
+            source2sdk::animgraphlib::CAnimParamHandle m_hParameterPosition; // 0x70            
+            source2sdk::animgraphlib::CAnimParamHandle m_hParameterOrientation; // 0x72            
+            source2sdk::animgraphlib::CAnimParamHandle m_hParameterSpineRotationWeight; // 0x74            
+            source2sdk::animgraphlib::CAnimParamHandle m_hParameterPelvisOffset; // 0x76            
+            source2sdk::animgraphlib::CAnimParamHandle m_hParameterUseIK; // 0x78            
+            source2sdk::animgraphlib::CAnimParamHandle m_hParameterCameraOnly; // 0x7a            
+            source2sdk::animgraphlib::CAnimParamHandle m_hParameterWeaponDepenetrationDistance; // 0x7c            
+            source2sdk::animgraphlib::CAnimParamHandle m_hParameterWeaponDepenetrationDelta; // 0x7e            
+            source2sdk::animgraphlib::CAnimParamHandle m_hParameterCameraClearanceDistance; // 0x80            
+            uint8_t _pad0082[0x6]; // 0x82
+            source2sdk::animgraphlib::AimCameraOpFixedSettings_t m_opFixedSettings; // 0x88            
+            uint8_t _pad00b8[0x8];
         };
         #pragma pack(pop)
         
         // Cannot assert offsets of fields in CAimCameraUpdateNode because it is not a standard-layout class
-    static_assert(sizeof(CAimCameraUpdateNode) == 0xc0);
+        
+        static_assert(sizeof(source2sdk::animgraphlib::CAimCameraUpdateNode) == 0xc0);
+    };
 };

sdk/include/source2sdk/animgraphlib/CAimMatrixUpdateNode.hpp

@@ -1,20 +1,23 @@
 #pragma once
+
+#include "source2sdk/source2gen/source2gen.hpp"
+#include <cstddef>
+#include <cstdint>
 #include "source2sdk/animationsystem/HSequence.hpp"
 #include "source2sdk/animgraphlib/AimMatrixOpFixedSettings_t.hpp"
 #include "source2sdk/animgraphlib/AnimVectorSource.hpp"
 #include "source2sdk/animgraphlib/CAnimParamHandle.hpp"
 #include "source2sdk/animgraphlib/CUnaryUpdateNode.hpp"
-#include "source2sdk/source2gen.hpp"
-#include <cstddef>
-#include <cstdint>
 
 // /////////////////////////////////////////////////////////////
 // Module: animgraphlib
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animgraphlib
+namespace source2sdk
 {
+    namespace animgraphlib
+    {
         // Registered alignment: 0x10
         // Alignment: 0x10
         // Standard-layout class: false
@@ -23,21 +26,23 @@ namespace source2sdk::animgraphlib
         // 
         // static metadata: MGetKV3ClassDefaults
         #pragma pack(push, 1)
-    class CAimMatrixUpdateNode : public animgraphlib::CUnaryUpdateNode
+        class CAimMatrixUpdateNode : public source2sdk::animgraphlib::CUnaryUpdateNode
         {
         public:
-        animgraphlib::AimMatrixOpFixedSettings_t m_opFixedSettings; // 0x70        
-        [[maybe_unused]] std::uint8_t pad_0x160[0x8]; // 0x160
-        animgraphlib::AnimVectorSource m_target; // 0x168        
-        animgraphlib::CAnimParamHandle m_paramIndex; // 0x16c        
-        [[maybe_unused]] std::uint8_t pad_0x16e[0x2]; // 0x16e
-        animationsystem::HSequence m_hSequence; // 0x170        
+            source2sdk::animgraphlib::AimMatrixOpFixedSettings_t m_opFixedSettings; // 0x70            
+            uint8_t _pad0160[0x8]; // 0x160
+            source2sdk::animgraphlib::AnimVectorSource m_target; // 0x168            
+            source2sdk::animgraphlib::CAnimParamHandle m_paramIndex; // 0x16c            
+            uint8_t _pad016e[0x2]; // 0x16e
+            source2sdk::animationsystem::HSequence m_hSequence; // 0x170            
             bool m_bResetChild; // 0x174            
             bool m_bLockWhenWaning; // 0x175            
-        [[maybe_unused]] std::uint8_t pad_0x176[0xa];
+            uint8_t _pad0176[0xa];
         };
         #pragma pack(pop)
         
         // Cannot assert offsets of fields in CAimMatrixUpdateNode because it is not a standard-layout class
-    static_assert(sizeof(CAimMatrixUpdateNode) == 0x180);
+        
+        static_assert(sizeof(source2sdk::animgraphlib::CAimMatrixUpdateNode) == 0x180);
+    };
 };

sdk/include/source2sdk/animgraphlib/CAnimActionUpdater.hpp

@@ -1,5 +1,6 @@
 #pragma once
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
 
@@ -8,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animgraphlib
+namespace source2sdk
 {
+    namespace animgraphlib
+    {
         // Registered alignment: unknown
         // Alignment: 0x1
         // Standard-layout class: true
@@ -22,9 +25,11 @@ namespace source2sdk::animgraphlib
         class CAnimActionUpdater
         {
         public:
-        [[maybe_unused]] std::uint8_t pad_0x00[0x18];
+            uint8_t _pad0000[0x18];
         };
         #pragma pack(pop)
         
-    static_assert(sizeof(CAnimActionUpdater) == 0x18);
+        
+        static_assert(sizeof(source2sdk::animgraphlib::CAnimActionUpdater) == 0x18);
+    };
 };

sdk/include/source2sdk/animgraphlib/CAnimComponentUpdater.hpp

@@ -1,17 +1,20 @@
 #pragma once
-#include "source2sdk/animgraphlib/AnimNodeNetworkMode.hpp"
-#include "source2sdk/modellib/AnimComponentID.hpp"
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
+#include "source2sdk/animgraphlib/AnimNodeNetworkMode.hpp"
+#include "source2sdk/modellib/AnimComponentID.hpp"
 
 // /////////////////////////////////////////////////////////////
 // Module: animgraphlib
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animgraphlib
+namespace source2sdk
 {
+    namespace animgraphlib
+    {
         // Registered alignment: unknown
         // Alignment: 0x8
         // Standard-layout class: true
@@ -24,19 +27,20 @@ namespace source2sdk::animgraphlib
         class CAnimComponentUpdater
         {
         public:
-        [[maybe_unused]] std::uint8_t pad_0x00[0x18]; // 0x0
+            uint8_t _pad0000[0x18]; // 0x0
             CUtlString m_name; // 0x18            
-        modellib::AnimComponentID m_id; // 0x20        
-        animgraphlib::AnimNodeNetworkMode m_networkMode; // 0x24        
+            source2sdk::modellib::AnimComponentID m_id; // 0x20            
+            source2sdk::animgraphlib::AnimNodeNetworkMode m_networkMode; // 0x24            
             bool m_bStartEnabled; // 0x28            
-        [[maybe_unused]] std::uint8_t pad_0x29[0x7];
+            uint8_t _pad0029[0x7];
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CAnimComponentUpdater, m_name) == 0x18);
-    static_assert(offsetof(CAnimComponentUpdater, m_id) == 0x20);
-    static_assert(offsetof(CAnimComponentUpdater, m_networkMode) == 0x24);
-    static_assert(offsetof(CAnimComponentUpdater, m_bStartEnabled) == 0x28);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimComponentUpdater, m_name) == 0x18);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimComponentUpdater, m_id) == 0x20);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimComponentUpdater, m_networkMode) == 0x24);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimComponentUpdater, m_bStartEnabled) == 0x28);
         
-    static_assert(sizeof(CAnimComponentUpdater) == 0x30);
+        static_assert(sizeof(source2sdk::animgraphlib::CAnimComponentUpdater) == 0x30);
+    };
 };

sdk/include/source2sdk/animgraphlib/CAnimDemoCaptureSettings.hpp

@@ -1,18 +1,21 @@
 #pragma once
+
+#include "source2sdk/source2gen/source2gen.hpp"
+#include <cstddef>
+#include <cstdint>
 #include "source2sdk/animgraphlib/BoneDemoCaptureSettings_t.hpp"
 #include "source2sdk/animgraphlib/EDemoBoneSelectionMode.hpp"
 #include "source2sdk/animgraphlib/IKDemoCaptureSettings_t.hpp"
-#include "source2sdk/source2gen.hpp"
-#include <cstddef>
-#include <cstdint>
 
 // /////////////////////////////////////////////////////////////
 // Module: animgraphlib
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animgraphlib
+namespace source2sdk
 {
+    namespace animgraphlib
+    {
         // Registered alignment: 0x8
         // Alignment: 0x8
         // Standard-layout class: true
@@ -59,39 +62,40 @@ namespace source2sdk::animgraphlib
             CUtlString m_baseSequence; // 0x40            
             // metadata: MPropertyFriendlyName "Base Sequence Frame"
             // metadata: MPropertyGroupName "+Base Pose"
-        int32_t m_nBaseSequenceFrame; // 0x48        
+            std::int32_t m_nBaseSequenceFrame; // 0x48            
             // metadata: MPropertyFriendlyName "Bone Selection Mode"
             // metadata: MPropertyGroupName "+Bones"
             // metadata: MPropertyAttrChangeCallback
-        animgraphlib::EDemoBoneSelectionMode m_boneSelectionMode; // 0x4c        
+            source2sdk::animgraphlib::EDemoBoneSelectionMode m_boneSelectionMode; // 0x4c            
             // metadata: MPropertyFriendlyName "Bones"
             // metadata: MPropertyGroupName "+Bones"
             // metadata: MPropertyAttrStateCallback
             // m_bones has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<animgraphlib::BoneDemoCaptureSettings_t> m_bones;
+            // CUtlVector<source2sdk::animgraphlib::BoneDemoCaptureSettings_t> m_bones;
             char m_bones[0x18]; // 0x50            
             // metadata: MPropertyFriendlyName "IK Chains"
             // m_ikChains has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<animgraphlib::IKDemoCaptureSettings_t> m_ikChains;
+            // CUtlVector<source2sdk::animgraphlib::IKDemoCaptureSettings_t> m_ikChains;
             char m_ikChains[0x18]; // 0x68            
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CAnimDemoCaptureSettings, m_vecErrorRangeSplineRotation) == 0x0);
-    static_assert(offsetof(CAnimDemoCaptureSettings, m_vecErrorRangeSplineTranslation) == 0x8);
-    static_assert(offsetof(CAnimDemoCaptureSettings, m_vecErrorRangeSplineScale) == 0x10);
-    static_assert(offsetof(CAnimDemoCaptureSettings, m_flIkRotation_MaxSplineError) == 0x18);
-    static_assert(offsetof(CAnimDemoCaptureSettings, m_flIkTranslation_MaxSplineError) == 0x1c);
-    static_assert(offsetof(CAnimDemoCaptureSettings, m_vecErrorRangeQuantizationRotation) == 0x20);
-    static_assert(offsetof(CAnimDemoCaptureSettings, m_vecErrorRangeQuantizationTranslation) == 0x28);
-    static_assert(offsetof(CAnimDemoCaptureSettings, m_vecErrorRangeQuantizationScale) == 0x30);
-    static_assert(offsetof(CAnimDemoCaptureSettings, m_flIkRotation_MaxQuantizationError) == 0x38);
-    static_assert(offsetof(CAnimDemoCaptureSettings, m_flIkTranslation_MaxQuantizationError) == 0x3c);
-    static_assert(offsetof(CAnimDemoCaptureSettings, m_baseSequence) == 0x40);
-    static_assert(offsetof(CAnimDemoCaptureSettings, m_nBaseSequenceFrame) == 0x48);
-    static_assert(offsetof(CAnimDemoCaptureSettings, m_boneSelectionMode) == 0x4c);
-    static_assert(offsetof(CAnimDemoCaptureSettings, m_bones) == 0x50);
-    static_assert(offsetof(CAnimDemoCaptureSettings, m_ikChains) == 0x68);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimDemoCaptureSettings, m_vecErrorRangeSplineRotation) == 0x0);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimDemoCaptureSettings, m_vecErrorRangeSplineTranslation) == 0x8);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimDemoCaptureSettings, m_vecErrorRangeSplineScale) == 0x10);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimDemoCaptureSettings, m_flIkRotation_MaxSplineError) == 0x18);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimDemoCaptureSettings, m_flIkTranslation_MaxSplineError) == 0x1c);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimDemoCaptureSettings, m_vecErrorRangeQuantizationRotation) == 0x20);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimDemoCaptureSettings, m_vecErrorRangeQuantizationTranslation) == 0x28);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimDemoCaptureSettings, m_vecErrorRangeQuantizationScale) == 0x30);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimDemoCaptureSettings, m_flIkRotation_MaxQuantizationError) == 0x38);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimDemoCaptureSettings, m_flIkTranslation_MaxQuantizationError) == 0x3c);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimDemoCaptureSettings, m_baseSequence) == 0x40);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimDemoCaptureSettings, m_nBaseSequenceFrame) == 0x48);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimDemoCaptureSettings, m_boneSelectionMode) == 0x4c);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimDemoCaptureSettings, m_bones) == 0x50);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimDemoCaptureSettings, m_ikChains) == 0x68);
         
-    static_assert(sizeof(CAnimDemoCaptureSettings) == 0x80);
+        static_assert(sizeof(source2sdk::animgraphlib::CAnimDemoCaptureSettings) == 0x80);
+    };
 };

sdk/include/source2sdk/animgraphlib/CAnimGraphDebugReplay.hpp

@@ -1,16 +1,19 @@
 #pragma once
-#include "source2sdk/animgraphlib/CAnimReplayFrame.hpp"
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
+#include "source2sdk/animgraphlib/CAnimReplayFrame.hpp"
 
 // /////////////////////////////////////////////////////////////
 // Module: animgraphlib
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animgraphlib
+namespace source2sdk
 {
+    namespace animgraphlib
+    {
         // Registered alignment: 0x8
         // Alignment: 0x8
         // Standard-layout class: true
@@ -22,23 +25,24 @@ namespace source2sdk::animgraphlib
         class CAnimGraphDebugReplay
         {
         public:
-        [[maybe_unused]] std::uint8_t pad_0x00[0x40]; // 0x0
+            uint8_t _pad0000[0x40]; // 0x0
             CUtlString m_animGraphFileName; // 0x40            
             // m_frameList has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<CSmartPtr<animgraphlib::CAnimReplayFrame>> m_frameList;
+            // CUtlVector<CSmartPtr<source2sdk::animgraphlib::CAnimReplayFrame>> m_frameList;
             char m_frameList[0x18]; // 0x48            
-        int32_t m_startIndex; // 0x60        
-        int32_t m_writeIndex; // 0x64        
-        int32_t m_frameCount; // 0x68        
-        [[maybe_unused]] std::uint8_t pad_0x6c[0x4];
+            std::int32_t m_startIndex; // 0x60            
+            std::int32_t m_writeIndex; // 0x64            
+            std::int32_t m_frameCount; // 0x68            
+            uint8_t _pad006c[0x4];
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CAnimGraphDebugReplay, m_animGraphFileName) == 0x40);
-    static_assert(offsetof(CAnimGraphDebugReplay, m_frameList) == 0x48);
-    static_assert(offsetof(CAnimGraphDebugReplay, m_startIndex) == 0x60);
-    static_assert(offsetof(CAnimGraphDebugReplay, m_writeIndex) == 0x64);
-    static_assert(offsetof(CAnimGraphDebugReplay, m_frameCount) == 0x68);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimGraphDebugReplay, m_animGraphFileName) == 0x40);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimGraphDebugReplay, m_frameList) == 0x48);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimGraphDebugReplay, m_startIndex) == 0x60);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimGraphDebugReplay, m_writeIndex) == 0x64);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimGraphDebugReplay, m_frameCount) == 0x68);
         
-    static_assert(sizeof(CAnimGraphDebugReplay) == 0x70);
+        static_assert(sizeof(source2sdk::animgraphlib::CAnimGraphDebugReplay) == 0x70);
+    };
 };

sdk/include/source2sdk/animgraphlib/CAnimGraphModelBinding.hpp

@@ -1,16 +1,19 @@
 #pragma once
-#include "source2sdk/animgraphlib/CAnimUpdateSharedData.hpp"
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
+#include "source2sdk/animgraphlib/CAnimUpdateSharedData.hpp"
 
 // /////////////////////////////////////////////////////////////
 // Module: animgraphlib
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animgraphlib
+namespace source2sdk
 {
+    namespace animgraphlib
+    {
         // Registered alignment: 0x8
         // Alignment: 0x8
         // Standard-layout class: true
@@ -22,17 +25,18 @@ namespace source2sdk::animgraphlib
         class CAnimGraphModelBinding
         {
         public:
-        [[maybe_unused]] std::uint8_t pad_0x00[0x8]; // 0x0
+            uint8_t _pad0000[0x8]; // 0x0
             CUtlString m_modelName; // 0x8            
             // m_pSharedData has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CSmartPtr<animgraphlib::CAnimUpdateSharedData> m_pSharedData;
+            // CSmartPtr<source2sdk::animgraphlib::CAnimUpdateSharedData> m_pSharedData;
             char m_pSharedData[0x8]; // 0x10            
-        [[maybe_unused]] std::uint8_t pad_0x18[0x10];
+            uint8_t _pad0018[0x10];
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CAnimGraphModelBinding, m_modelName) == 0x8);
-    static_assert(offsetof(CAnimGraphModelBinding, m_pSharedData) == 0x10);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimGraphModelBinding, m_modelName) == 0x8);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimGraphModelBinding, m_pSharedData) == 0x10);
         
-    static_assert(sizeof(CAnimGraphModelBinding) == 0x28);
+        static_assert(sizeof(source2sdk::animgraphlib::CAnimGraphModelBinding) == 0x28);
+    };
 };

sdk/include/source2sdk/animgraphlib/CAnimGraphNetworkSettings.hpp

@@ -1,16 +1,19 @@
 #pragma once
-#include "source2sdk/animgraphlib/CAnimGraphSettingsGroup.hpp"
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
+#include "source2sdk/animgraphlib/CAnimGraphSettingsGroup.hpp"
 
 // /////////////////////////////////////////////////////////////
 // Module: animgraphlib
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animgraphlib
+namespace source2sdk
 {
+    namespace animgraphlib
+    {
         // Registered alignment: 0x8
         // Alignment: 0x8
         // Standard-layout class: false
@@ -20,15 +23,17 @@ namespace source2sdk::animgraphlib
         // static metadata: MGetKV3ClassDefaults
         // static metadata: MPropertyFriendlyName "Networking"
         #pragma pack(push, 1)
-    class CAnimGraphNetworkSettings : public animgraphlib::CAnimGraphSettingsGroup
+        class CAnimGraphNetworkSettings : public source2sdk::animgraphlib::CAnimGraphSettingsGroup
         {
         public:
             // metadata: MPropertyFriendlyName "Enable Networking"
             bool m_bNetworkingEnabled; // 0x20            
-        [[maybe_unused]] std::uint8_t pad_0x21[0x7];
+            uint8_t _pad0021[0x7];
         };
         #pragma pack(pop)
         
         // Cannot assert offsets of fields in CAnimGraphNetworkSettings because it is not a standard-layout class
-    static_assert(sizeof(CAnimGraphNetworkSettings) == 0x28);
+        
+        static_assert(sizeof(source2sdk::animgraphlib::CAnimGraphNetworkSettings) == 0x28);
+    };
 };

sdk/include/source2sdk/animgraphlib/CAnimGraphSettingsGroup.hpp

@@ -1,5 +1,6 @@
 #pragma once
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
 
@@ -8,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animgraphlib
+namespace source2sdk
 {
+    namespace animgraphlib
+    {
         // Registered alignment: 0x8
         // Alignment: 0x8
         // Standard-layout class: true
@@ -21,9 +24,11 @@ namespace source2sdk::animgraphlib
         class CAnimGraphSettingsGroup
         {
         public:
-        [[maybe_unused]] std::uint8_t pad_0x00[0x20];
+            uint8_t _pad0000[0x20];
         };
         #pragma pack(pop)
         
-    static_assert(sizeof(CAnimGraphSettingsGroup) == 0x20);
+        
+        static_assert(sizeof(source2sdk::animgraphlib::CAnimGraphSettingsGroup) == 0x20);
+    };
 };

sdk/include/source2sdk/animgraphlib/CAnimGraphSettingsManager.hpp

@@ -1,16 +1,19 @@
 #pragma once
-#include "source2sdk/animgraphlib/CAnimGraphSettingsGroup.hpp"
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
+#include "source2sdk/animgraphlib/CAnimGraphSettingsGroup.hpp"
 
 // /////////////////////////////////////////////////////////////
 // Module: animgraphlib
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animgraphlib
+namespace source2sdk
 {
+    namespace animgraphlib
+    {
         // Registered alignment: 0x8
         // Alignment: 0x8
         // Standard-layout class: true
@@ -22,14 +25,15 @@ namespace source2sdk::animgraphlib
         class CAnimGraphSettingsManager
         {
         public:
-        [[maybe_unused]] std::uint8_t pad_0x00[0x18]; // 0x0
+            uint8_t _pad0000[0x18]; // 0x0
             // m_settingsGroups has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<CSmartPtr<animgraphlib::CAnimGraphSettingsGroup>> m_settingsGroups;
+            // CUtlVector<CSmartPtr<source2sdk::animgraphlib::CAnimGraphSettingsGroup>> m_settingsGroups;
             char m_settingsGroups[0x18]; // 0x18            
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CAnimGraphSettingsManager, m_settingsGroups) == 0x18);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimGraphSettingsManager, m_settingsGroups) == 0x18);
         
-    static_assert(sizeof(CAnimGraphSettingsManager) == 0x30);
+        static_assert(sizeof(source2sdk::animgraphlib::CAnimGraphSettingsManager) == 0x30);
+    };
 };

sdk/include/source2sdk/animgraphlib/CAnimInputDamping.hpp

@@ -1,16 +1,19 @@
 #pragma once
-#include "source2sdk/animgraphlib/DampingSpeedFunction.hpp"
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
+#include "source2sdk/animgraphlib/DampingSpeedFunction.hpp"
 
 // /////////////////////////////////////////////////////////////
 // Module: animgraphlib
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animgraphlib
+namespace source2sdk
 {
+    namespace animgraphlib
+    {
         // Registered alignment: 0x8
         // Alignment: 0x8
         // Standard-layout class: true
@@ -24,20 +27,21 @@ namespace source2sdk::animgraphlib
         class CAnimInputDamping
         {
         public:
-        [[maybe_unused]] std::uint8_t pad_0x00[0x8]; // 0x0
+            uint8_t _pad0000[0x8]; // 0x0
             // metadata: MPropertyFriendlyName "Speed Function"
-        animgraphlib::DampingSpeedFunction m_speedFunction; // 0x8        
+            source2sdk::animgraphlib::DampingSpeedFunction m_speedFunction; // 0x8            
             // metadata: MPropertyFriendlyName "Speed Scale"
             float m_fSpeedScale; // 0xc            
             // metadata: MPropertyFriendlyName "Falling Speed Scale"
             float m_fFallingSpeedScale; // 0x10            
-        [[maybe_unused]] std::uint8_t pad_0x14[0x4];
+            uint8_t _pad0014[0x4];
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CAnimInputDamping, m_speedFunction) == 0x8);
-    static_assert(offsetof(CAnimInputDamping, m_fSpeedScale) == 0xc);
-    static_assert(offsetof(CAnimInputDamping, m_fFallingSpeedScale) == 0x10);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimInputDamping, m_speedFunction) == 0x8);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimInputDamping, m_fSpeedScale) == 0xc);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimInputDamping, m_fFallingSpeedScale) == 0x10);
         
-    static_assert(sizeof(CAnimInputDamping) == 0x18);
+        static_assert(sizeof(source2sdk::animgraphlib::CAnimInputDamping) == 0x18);
+    };
 };

sdk/include/source2sdk/animgraphlib/CAnimMotorUpdaterBase.hpp

@@ -1,5 +1,6 @@
 #pragma once
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
 
@@ -8,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animgraphlib
+namespace source2sdk
 {
+    namespace animgraphlib
+    {
         // Registered alignment: unknown
         // Alignment: 0x8
         // Standard-layout class: true
@@ -22,15 +25,16 @@ namespace source2sdk::animgraphlib
         class CAnimMotorUpdaterBase
         {
         public:
-        [[maybe_unused]] std::uint8_t pad_0x00[0x10]; // 0x0
+            uint8_t _pad0000[0x10]; // 0x0
             CUtlString m_name; // 0x10            
             bool m_bDefault; // 0x18            
-        [[maybe_unused]] std::uint8_t pad_0x19[0x7];
+            uint8_t _pad0019[0x7];
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CAnimMotorUpdaterBase, m_name) == 0x10);
-    static_assert(offsetof(CAnimMotorUpdaterBase, m_bDefault) == 0x18);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimMotorUpdaterBase, m_name) == 0x10);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimMotorUpdaterBase, m_bDefault) == 0x18);
         
-    static_assert(sizeof(CAnimMotorUpdaterBase) == 0x20);
+        static_assert(sizeof(source2sdk::animgraphlib::CAnimMotorUpdaterBase) == 0x20);
+    };
 };

sdk/include/source2sdk/animgraphlib/CAnimNodePath.hpp

@@ -1,16 +1,19 @@
 #pragma once
-#include "source2sdk/modellib/AnimNodeID.hpp"
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
+#include "source2sdk/modellib/AnimNodeID.hpp"
 
 // /////////////////////////////////////////////////////////////
 // Module: animgraphlib
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animgraphlib
+namespace source2sdk
 {
+    namespace animgraphlib
+    {
         // Registered alignment: 0x4
         // Alignment: 0x4
         // Standard-layout class: true
@@ -22,13 +25,14 @@ namespace source2sdk::animgraphlib
         class CAnimNodePath
         {
         public:
-        modellib::AnimNodeID m_path[11]; // 0x0        
-        int32_t m_nCount; // 0x2c        
+            source2sdk::modellib::AnimNodeID m_path[11]; // 0x0            
+            std::int32_t m_nCount; // 0x2c            
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CAnimNodePath, m_path) == 0x0);
-    static_assert(offsetof(CAnimNodePath, m_nCount) == 0x2c);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimNodePath, m_path) == 0x0);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimNodePath, m_nCount) == 0x2c);
         
-    static_assert(sizeof(CAnimNodePath) == 0x30);
+        static_assert(sizeof(source2sdk::animgraphlib::CAnimNodePath) == 0x30);
+    };
 };

sdk/include/source2sdk/animgraphlib/CAnimParamHandle.hpp

@@ -1,16 +1,19 @@
 #pragma once
-#include "source2sdk/animationsystem/AnimParamType_t.hpp"
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
+#include "source2sdk/animationsystem/AnimParamType_t.hpp"
 
 // /////////////////////////////////////////////////////////////
 // Module: animgraphlib
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animgraphlib
+namespace source2sdk
 {
+    namespace animgraphlib
+    {
         // Registered alignment: 0x1
         // Alignment: 0x1
         // Standard-layout class: true
@@ -22,13 +25,14 @@ namespace source2sdk::animgraphlib
         class CAnimParamHandle
         {
         public:
-        animationsystem::AnimParamType_t m_type; // 0x0        
-        uint8_t m_index; // 0x1        
+            source2sdk::animationsystem::AnimParamType_t m_type; // 0x0            
+            std::uint8_t m_index; // 0x1            
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CAnimParamHandle, m_type) == 0x0);
-    static_assert(offsetof(CAnimParamHandle, m_index) == 0x1);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimParamHandle, m_type) == 0x0);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimParamHandle, m_index) == 0x1);
         
-    static_assert(sizeof(CAnimParamHandle) == 0x2);
+        static_assert(sizeof(source2sdk::animgraphlib::CAnimParamHandle) == 0x2);
+    };
 };

sdk/include/source2sdk/animgraphlib/CAnimParamHandleMap.hpp

@@ -1,5 +1,6 @@
 #pragma once
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
 
@@ -8,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animgraphlib
+namespace source2sdk
 {
+    namespace animgraphlib
+    {
         // Registered alignment: 0x8
         // Alignment: 0x8
         // Standard-layout class: true
@@ -21,12 +24,13 @@ namespace source2sdk::animgraphlib
         {
         public:
             // m_list has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlHashtable<uint16_t,int16_t> m_list;
+            // CUtlHashtable<std::uint16_t,std::int16_t> m_list;
             char m_list[0x20]; // 0x0            
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CAnimParamHandleMap, m_list) == 0x0);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimParamHandleMap, m_list) == 0x0);
         
-    static_assert(sizeof(CAnimParamHandleMap) == 0x20);
+        static_assert(sizeof(source2sdk::animgraphlib::CAnimParamHandleMap) == 0x20);
+    };
 };

sdk/include/source2sdk/animgraphlib/CAnimParameterBase.hpp

@@ -1,16 +1,19 @@
 #pragma once
-#include "source2sdk/modellib/AnimParamID.hpp"
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
+#include "source2sdk/modellib/AnimParamID.hpp"
 
 // /////////////////////////////////////////////////////////////
 // Module: animgraphlib
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animgraphlib
+namespace source2sdk
 {
+    namespace animgraphlib
+    {
         // Registered alignment: unknown
         // Alignment: 0x8
         // Standard-layout class: true
@@ -23,7 +26,7 @@ namespace source2sdk::animgraphlib
         class CAnimParameterBase
         {
         public:
-        [[maybe_unused]] std::uint8_t pad_0x00[0x18]; // 0x0
+            uint8_t _pad0000[0x18]; // 0x0
             // metadata: MPropertyFriendlyName "Name"
             // metadata: MPropertySortPriority "100"
             CGlobalSymbol m_name; // 0x18            
@@ -34,27 +37,28 @@ namespace source2sdk::animgraphlib
             // metadata: MPropertyReadOnly
             CUtlString m_group; // 0x28            
             // metadata: MPropertyReadOnly
-        modellib::AnimParamID m_id; // 0x30        
-        [[maybe_unused]] std::uint8_t pad_0x34[0x14]; // 0x34
+            source2sdk::modellib::AnimParamID m_id; // 0x30            
+            uint8_t _pad0034[0x14]; // 0x34
             // metadata: MPropertyHideField
             // metadata: MPropertyAttrChangeCallback
             CUtlString m_componentName; // 0x48            
-        [[maybe_unused]] std::uint8_t pad_0x50[0x18]; // 0x50
+            uint8_t _pad0050[0x18]; // 0x50
             // metadata: MPropertyHideField
             bool m_bNetworkingRequested; // 0x68            
             // metadata: MPropertyHideField
             bool m_bIsReferenced; // 0x69            
-        [[maybe_unused]] std::uint8_t pad_0x6a[0x6];
+            uint8_t _pad006a[0x6];
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CAnimParameterBase, m_name) == 0x18);
-    static_assert(offsetof(CAnimParameterBase, m_sComment) == 0x20);
-    static_assert(offsetof(CAnimParameterBase, m_group) == 0x28);
-    static_assert(offsetof(CAnimParameterBase, m_id) == 0x30);
-    static_assert(offsetof(CAnimParameterBase, m_componentName) == 0x48);
-    static_assert(offsetof(CAnimParameterBase, m_bNetworkingRequested) == 0x68);
-    static_assert(offsetof(CAnimParameterBase, m_bIsReferenced) == 0x69);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimParameterBase, m_name) == 0x18);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimParameterBase, m_sComment) == 0x20);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimParameterBase, m_group) == 0x28);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimParameterBase, m_id) == 0x30);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimParameterBase, m_componentName) == 0x48);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimParameterBase, m_bNetworkingRequested) == 0x68);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimParameterBase, m_bIsReferenced) == 0x69);
         
-    static_assert(sizeof(CAnimParameterBase) == 0x70);
+        static_assert(sizeof(source2sdk::animgraphlib::CAnimParameterBase) == 0x70);
+    };
 };

sdk/include/source2sdk/animgraphlib/CAnimParameterManagerUpdater.hpp

@@ -1,18 +1,21 @@
 #pragma once
+
+#include "source2sdk/source2gen/source2gen.hpp"
+#include <cstddef>
+#include <cstdint>
 #include "source2sdk/animgraphlib/CAnimParamHandle.hpp"
 #include "source2sdk/animgraphlib/CAnimParameterBase.hpp"
 #include "source2sdk/modellib/AnimParamID.hpp"
-#include "source2sdk/source2gen.hpp"
-#include <cstddef>
-#include <cstdint>
 
 // /////////////////////////////////////////////////////////////
 // Module: animgraphlib
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animgraphlib
+namespace source2sdk
 {
+    namespace animgraphlib
+    {
         // Registered alignment: 0x8
         // Alignment: 0x8
         // Standard-layout class: true
@@ -24,35 +27,36 @@ namespace source2sdk::animgraphlib
         class CAnimParameterManagerUpdater
         {
         public:
-        [[maybe_unused]] std::uint8_t pad_0x00[0x18]; // 0x0
+            uint8_t _pad0000[0x18]; // 0x0
             // m_parameters has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<CSmartPtr<animgraphlib::CAnimParameterBase>> m_parameters;
+            // CUtlVector<CSmartPtr<source2sdk::animgraphlib::CAnimParameterBase>> m_parameters;
             char m_parameters[0x18]; // 0x18            
             // m_idToIndexMap has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlHashtable<modellib::AnimParamID,int32_t> m_idToIndexMap;
+            // CUtlHashtable<source2sdk::modellib::AnimParamID,std::int32_t> m_idToIndexMap;
             char m_idToIndexMap[0x20]; // 0x30            
             // m_nameToIndexMap has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlHashtable<CUtlString,int32_t> m_nameToIndexMap;
+            // CUtlHashtable<CUtlString,std::int32_t> m_nameToIndexMap;
             char m_nameToIndexMap[0x20]; // 0x50            
             // m_indexToHandle has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<animgraphlib::CAnimParamHandle> m_indexToHandle;
+            // CUtlVector<source2sdk::animgraphlib::CAnimParamHandle> m_indexToHandle;
             char m_indexToHandle[0x18]; // 0x70            
             // m_autoResetParams has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<CUtlPair<animgraphlib::CAnimParamHandle,CAnimVariant>> m_autoResetParams;
+            // CUtlVector<CUtlPair<source2sdk::animgraphlib::CAnimParamHandle,CAnimVariant>> m_autoResetParams;
             char m_autoResetParams[0x18]; // 0x88            
             // m_autoResetMap has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlHashtable<animgraphlib::CAnimParamHandle,int16_t> m_autoResetMap;
+            // CUtlHashtable<source2sdk::animgraphlib::CAnimParamHandle,std::int16_t> m_autoResetMap;
             char m_autoResetMap[0x20]; // 0xa0            
-        [[maybe_unused]] std::uint8_t pad_0xc0[0x40];
+            uint8_t _pad00c0[0x40];
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CAnimParameterManagerUpdater, m_parameters) == 0x18);
-    static_assert(offsetof(CAnimParameterManagerUpdater, m_idToIndexMap) == 0x30);
-    static_assert(offsetof(CAnimParameterManagerUpdater, m_nameToIndexMap) == 0x50);
-    static_assert(offsetof(CAnimParameterManagerUpdater, m_indexToHandle) == 0x70);
-    static_assert(offsetof(CAnimParameterManagerUpdater, m_autoResetParams) == 0x88);
-    static_assert(offsetof(CAnimParameterManagerUpdater, m_autoResetMap) == 0xa0);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimParameterManagerUpdater, m_parameters) == 0x18);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimParameterManagerUpdater, m_idToIndexMap) == 0x30);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimParameterManagerUpdater, m_nameToIndexMap) == 0x50);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimParameterManagerUpdater, m_indexToHandle) == 0x70);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimParameterManagerUpdater, m_autoResetParams) == 0x88);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimParameterManagerUpdater, m_autoResetMap) == 0xa0);
         
-    static_assert(sizeof(CAnimParameterManagerUpdater) == 0x100);
+        static_assert(sizeof(source2sdk::animgraphlib::CAnimParameterManagerUpdater) == 0x100);
+    };
 };

sdk/include/source2sdk/animgraphlib/CAnimReplayFrame.hpp

@@ -1,5 +1,6 @@
 #pragma once
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
 
@@ -8,8 +9,10 @@
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animgraphlib
+namespace source2sdk
 {
+    namespace animgraphlib
+    {
         // Registered alignment: 0x10
         // Alignment: 0x10
         // Standard-layout class: true
@@ -21,7 +24,7 @@ namespace source2sdk::animgraphlib
         class CAnimReplayFrame
         {
         public:
-        [[maybe_unused]] std::uint8_t pad_0x00[0x10]; // 0x0
+            uint8_t _pad0000[0x10]; // 0x0
             // m_inputDataBlocks has a template type with potentially unknown template parameters. You can try uncommenting the field below.
             // CUtlVector<CUtlBinaryBlock> m_inputDataBlocks;
             char m_inputDataBlocks[0x18]; // 0x10            
@@ -29,15 +32,16 @@ namespace source2sdk::animgraphlib
             CTransform m_startingLocalToWorldTransform; // 0x40            
             CTransform m_localToWorldTransform; // 0x60            
             float m_timeStamp; // 0x80            
-        [[maybe_unused]] std::uint8_t pad_0x84[0xc];
+            uint8_t _pad0084[0xc];
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CAnimReplayFrame, m_inputDataBlocks) == 0x10);
-    static_assert(offsetof(CAnimReplayFrame, m_instanceData) == 0x28);
-    static_assert(offsetof(CAnimReplayFrame, m_startingLocalToWorldTransform) == 0x40);
-    static_assert(offsetof(CAnimReplayFrame, m_localToWorldTransform) == 0x60);
-    static_assert(offsetof(CAnimReplayFrame, m_timeStamp) == 0x80);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimReplayFrame, m_inputDataBlocks) == 0x10);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimReplayFrame, m_instanceData) == 0x28);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimReplayFrame, m_startingLocalToWorldTransform) == 0x40);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimReplayFrame, m_localToWorldTransform) == 0x60);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimReplayFrame, m_timeStamp) == 0x80);
         
-    static_assert(sizeof(CAnimReplayFrame) == 0x90);
+        static_assert(sizeof(source2sdk::animgraphlib::CAnimReplayFrame) == 0x90);
+    };
 };

sdk/include/source2sdk/animgraphlib/CAnimScriptComponentUpdater.hpp

@@ -1,17 +1,20 @@
 #pragma once
-#include "source2sdk/animgraphlib/CAnimComponentUpdater.hpp"
-#include "source2sdk/modellib/AnimScriptHandle.hpp"
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
+#include "source2sdk/animgraphlib/CAnimComponentUpdater.hpp"
+#include "source2sdk/modellib/AnimScriptHandle.hpp"
 
 // /////////////////////////////////////////////////////////////
 // Module: animgraphlib
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animgraphlib
+namespace source2sdk
 {
+    namespace animgraphlib
+    {
         // Registered alignment: 0x8
         // Alignment: 0x8
         // Standard-layout class: false
@@ -20,14 +23,16 @@ namespace source2sdk::animgraphlib
         // 
         // static metadata: MGetKV3ClassDefaults
         #pragma pack(push, 1)
-    class CAnimScriptComponentUpdater : public animgraphlib::CAnimComponentUpdater
+        class CAnimScriptComponentUpdater : public source2sdk::animgraphlib::CAnimComponentUpdater
         {
         public:
-        modellib::AnimScriptHandle m_hScript; // 0x30        
-        [[maybe_unused]] std::uint8_t pad_0x34[0x4];
+            source2sdk::modellib::AnimScriptHandle m_hScript; // 0x30            
+            uint8_t _pad0034[0x4];
         };
         #pragma pack(pop)
         
         // Cannot assert offsets of fields in CAnimScriptComponentUpdater because it is not a standard-layout class
-    static_assert(sizeof(CAnimScriptComponentUpdater) == 0x38);
+        
+        static_assert(sizeof(source2sdk::animgraphlib::CAnimScriptComponentUpdater) == 0x38);
+    };
 };

sdk/include/source2sdk/animgraphlib/CAnimScriptManager.hpp

@@ -1,16 +1,19 @@
 #pragma once
-#include "source2sdk/animgraphlib/ScriptInfo_t.hpp"
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
+#include "source2sdk/animgraphlib/ScriptInfo_t.hpp"
 
 // /////////////////////////////////////////////////////////////
 // Module: animgraphlib
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animgraphlib
+namespace source2sdk
 {
+    namespace animgraphlib
+    {
         // Registered alignment: 0x8
         // Alignment: 0x8
         // Standard-layout class: true
@@ -22,15 +25,16 @@ namespace source2sdk::animgraphlib
         class CAnimScriptManager
         {
         public:
-        [[maybe_unused]] std::uint8_t pad_0x00[0x10]; // 0x0
+            uint8_t _pad0000[0x10]; // 0x0
             // m_scriptInfo has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<animgraphlib::ScriptInfo_t> m_scriptInfo;
+            // CUtlVector<source2sdk::animgraphlib::ScriptInfo_t> m_scriptInfo;
             char m_scriptInfo[0x18]; // 0x10            
-        [[maybe_unused]] std::uint8_t pad_0x28[0x178];
+            uint8_t _pad0028[0x178];
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CAnimScriptManager, m_scriptInfo) == 0x10);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimScriptManager, m_scriptInfo) == 0x10);
         
-    static_assert(sizeof(CAnimScriptManager) == 0x1a0);
+        static_assert(sizeof(source2sdk::animgraphlib::CAnimScriptManager) == 0x1a0);
+    };
 };

sdk/include/source2sdk/animgraphlib/CAnimStateMachineUpdater.hpp

@@ -1,17 +1,20 @@
 #pragma once
-#include "source2sdk/animgraphlib/CStateUpdateData.hpp"
-#include "source2sdk/animgraphlib/CTransitionUpdateData.hpp"
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
+#include "source2sdk/animgraphlib/CStateUpdateData.hpp"
+#include "source2sdk/animgraphlib/CTransitionUpdateData.hpp"
 
 // /////////////////////////////////////////////////////////////
 // Module: animgraphlib
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animgraphlib
+namespace source2sdk
 {
+    namespace animgraphlib
+    {
         // Registered alignment: 0x8
         // Alignment: 0x8
         // Standard-layout class: true
@@ -23,22 +26,23 @@ namespace source2sdk::animgraphlib
         class CAnimStateMachineUpdater
         {
         public:
-        [[maybe_unused]] std::uint8_t pad_0x00[0x8]; // 0x0
+            uint8_t _pad0000[0x8]; // 0x0
             // m_states has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<animgraphlib::CStateUpdateData> m_states;
+            // CUtlVector<source2sdk::animgraphlib::CStateUpdateData> m_states;
             char m_states[0x18]; // 0x8            
             // m_transitions has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<animgraphlib::CTransitionUpdateData> m_transitions;
+            // CUtlVector<source2sdk::animgraphlib::CTransitionUpdateData> m_transitions;
             char m_transitions[0x18]; // 0x20            
-        [[maybe_unused]] std::uint8_t pad_0x38[0x18]; // 0x38
-        int32_t m_startStateIndex; // 0x50        
-        [[maybe_unused]] std::uint8_t pad_0x54[0x4];
+            uint8_t _pad0038[0x18]; // 0x38
+            std::int32_t m_startStateIndex; // 0x50            
+            uint8_t _pad0054[0x4];
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CAnimStateMachineUpdater, m_states) == 0x8);
-    static_assert(offsetof(CAnimStateMachineUpdater, m_transitions) == 0x20);
-    static_assert(offsetof(CAnimStateMachineUpdater, m_startStateIndex) == 0x50);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimStateMachineUpdater, m_states) == 0x8);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimStateMachineUpdater, m_transitions) == 0x20);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimStateMachineUpdater, m_startStateIndex) == 0x50);
         
-    static_assert(sizeof(CAnimStateMachineUpdater) == 0x58);
+        static_assert(sizeof(source2sdk::animgraphlib::CAnimStateMachineUpdater) == 0x58);
+    };
 };

sdk/include/source2sdk/animgraphlib/CAnimTagBase.hpp

@@ -1,16 +1,19 @@
 #pragma once
-#include "source2sdk/modellib/AnimTagID.hpp"
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
+#include "source2sdk/modellib/AnimTagID.hpp"
 
 // /////////////////////////////////////////////////////////////
 // Module: animgraphlib
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animgraphlib
+namespace source2sdk
 {
+    namespace animgraphlib
+    {
         // Registered alignment: 0x8
         // Alignment: 0x8
         // Standard-layout class: true
@@ -22,7 +25,7 @@ namespace source2sdk::animgraphlib
         class CAnimTagBase
         {
         public:
-        [[maybe_unused]] std::uint8_t pad_0x00[0x18]; // 0x0
+            uint8_t _pad0000[0x18]; // 0x0
             // metadata: MPropertyFriendlyName "Name"
             // metadata: MPropertySortPriority "100"
             CGlobalSymbol m_name; // 0x18            
@@ -33,19 +36,20 @@ namespace source2sdk::animgraphlib
             // metadata: MPropertyHideField
             CGlobalSymbol m_group; // 0x28            
             // metadata: MPropertyHideField
-        modellib::AnimTagID m_tagID; // 0x30        
-        [[maybe_unused]] std::uint8_t pad_0x34[0x14]; // 0x34
+            source2sdk::modellib::AnimTagID m_tagID; // 0x30            
+            uint8_t _pad0034[0x14]; // 0x34
             // metadata: MPropertyHideField
             bool m_bIsReferenced; // 0x48            
-        [[maybe_unused]] std::uint8_t pad_0x49[0x7];
+            uint8_t _pad0049[0x7];
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CAnimTagBase, m_name) == 0x18);
-    static_assert(offsetof(CAnimTagBase, m_sComment) == 0x20);
-    static_assert(offsetof(CAnimTagBase, m_group) == 0x28);
-    static_assert(offsetof(CAnimTagBase, m_tagID) == 0x30);
-    static_assert(offsetof(CAnimTagBase, m_bIsReferenced) == 0x48);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimTagBase, m_name) == 0x18);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimTagBase, m_sComment) == 0x20);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimTagBase, m_group) == 0x28);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimTagBase, m_tagID) == 0x30);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimTagBase, m_bIsReferenced) == 0x48);
         
-    static_assert(sizeof(CAnimTagBase) == 0x50);
+        static_assert(sizeof(source2sdk::animgraphlib::CAnimTagBase) == 0x50);
+    };
 };

sdk/include/source2sdk/animgraphlib/CAnimTagManagerUpdater.hpp

@@ -1,16 +1,19 @@
 #pragma once
-#include "source2sdk/animgraphlib/CAnimTagBase.hpp"
-#include "source2sdk/source2gen.hpp"
+
+#include "source2sdk/source2gen/source2gen.hpp"
 #include <cstddef>
 #include <cstdint>
+#include "source2sdk/animgraphlib/CAnimTagBase.hpp"
 
 // /////////////////////////////////////////////////////////////
 // Module: animgraphlib
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
-namespace source2sdk::animgraphlib
+namespace source2sdk
 {
+    namespace animgraphlib
+    {
         // Registered alignment: 0x8
         // Alignment: 0x8
         // Standard-layout class: true
@@ -22,15 +25,16 @@ namespace source2sdk::animgraphlib
         class CAnimTagManagerUpdater
         {
         public:
-        [[maybe_unused]] std::uint8_t pad_0x00[0x38]; // 0x0
+            uint8_t _pad0000[0x38]; // 0x0
             // m_tags has a template type with potentially unknown template parameters. You can try uncommenting the field below.
-        // CUtlVector<CSmartPtr<animgraphlib::CAnimTagBase>> m_tags;
+            // CUtlVector<CSmartPtr<source2sdk::animgraphlib::CAnimTagBase>> m_tags;
             char m_tags[0x18]; // 0x38            
-        [[maybe_unused]] std::uint8_t pad_0x50[0x28];
+            uint8_t _pad0050[0x28];
         };
         #pragma pack(pop)
         
-    static_assert(offsetof(CAnimTagManagerUpdater, m_tags) == 0x38);
+        static_assert(offsetof(source2sdk::animgraphlib::CAnimTagManagerUpdater, m_tags) == 0x38);
         
-    static_assert(sizeof(CAnimTagManagerUpdater) == 0x78);
+        static_assert(sizeof(source2sdk::animgraphlib::CAnimTagManagerUpdater) == 0x78);
+    };
 };