diff --git a/src/KingSystem/Physics/CMakeLists.txt b/src/KingSystem/Physics/CMakeLists.txt
index 68940afd..58d78215 100644
--- a/src/KingSystem/Physics/CMakeLists.txt
+++ b/src/KingSystem/Physics/CMakeLists.txt
@@ -107,16 +107,12 @@ target_sources(uking PRIVATE
   System/physContactListener.h
   System/physContactMgr.cpp
   System/physContactMgr.h
-  System/physDefines.cpp
-  System/physDefines.h
   System/physEntityGroupFilter.cpp
   System/physEntityGroupFilter.h
   System/physGroupFilter.cpp
   System/physGroupFilter.h
   System/physInstanceSet.cpp
   System/physInstanceSet.h
-  System/physMaterialMask.cpp
-  System/physMaterialMask.h
   System/physMaterialTable.cpp
   System/physMaterialTable.h
   System/physParamSet.cpp
@@ -134,6 +130,10 @@ target_sources(uking PRIVATE
   System/physUserTag.cpp
   System/physUserTag.h
 
+  physDefines.cpp
+  physDefines.h
   physConversions.h
   physHeapUtil.h
+  physMaterialMask.cpp
+  physMaterialMask.h
 )
diff --git a/src/KingSystem/Physics/RigidBody/Shape/Box/physBoxShape.h b/src/KingSystem/Physics/RigidBody/Shape/Box/physBoxShape.h
index 86c5ba72..a1da021b 100644
--- a/src/KingSystem/Physics/RigidBody/Shape/Box/physBoxShape.h
+++ b/src/KingSystem/Physics/RigidBody/Shape/Box/physBoxShape.h
@@ -6,7 +6,7 @@
 #include "KingSystem/Physics/RigidBody/Shape/physShape.h"
 #include "KingSystem/Physics/RigidBody/physRigidBody.h"
 #include "KingSystem/Physics/RigidBody/physRigidBodyParam.h"
-#include "KingSystem/Physics/System/physMaterialMask.h"
+#include "KingSystem/Physics/physMaterialMask.h"
 
 class hkTransformf;
 class hkpBoxShape;
diff --git a/src/KingSystem/Physics/RigidBody/Shape/BoxWater/physBoxWaterShape.h b/src/KingSystem/Physics/RigidBody/Shape/BoxWater/physBoxWaterShape.h
index 1512bb5a..ec55eaed 100644
--- a/src/KingSystem/Physics/RigidBody/Shape/BoxWater/physBoxWaterShape.h
+++ b/src/KingSystem/Physics/RigidBody/Shape/BoxWater/physBoxWaterShape.h
@@ -4,7 +4,7 @@
 #include <prim/seadTypedBitFlag.h>
 #include <thread/seadAtomic.h>
 #include "KingSystem/Physics/RigidBody/Shape/physShape.h"
-#include "KingSystem/Physics/System/physMaterialMask.h"
+#include "KingSystem/Physics/physMaterialMask.h"
 
 class hkpPlaneShape;
 
diff --git a/src/KingSystem/Physics/RigidBody/Shape/Capsule/physCapsuleShape.h b/src/KingSystem/Physics/RigidBody/Shape/Capsule/physCapsuleShape.h
index 3a5618aa..5190f212 100644
--- a/src/KingSystem/Physics/RigidBody/Shape/Capsule/physCapsuleShape.h
+++ b/src/KingSystem/Physics/RigidBody/Shape/Capsule/physCapsuleShape.h
@@ -7,8 +7,8 @@
 #include "KingSystem/Physics/RigidBody/Shape/physShape.h"
 #include "KingSystem/Physics/RigidBody/physRigidBody.h"
 #include "KingSystem/Physics/RigidBody/physRigidBodyParam.h"
-#include "KingSystem/Physics/System/physDefines.h"
-#include "KingSystem/Physics/System/physMaterialMask.h"
+#include "KingSystem/Physics/physDefines.h"
+#include "KingSystem/Physics/physMaterialMask.h"
 
 class hkpShape;
 
diff --git a/src/KingSystem/Physics/RigidBody/Shape/Cylinder/physCylinderShape.h b/src/KingSystem/Physics/RigidBody/Shape/Cylinder/physCylinderShape.h
index 82ff0109..2e5cb723 100644
--- a/src/KingSystem/Physics/RigidBody/Shape/Cylinder/physCylinderShape.h
+++ b/src/KingSystem/Physics/RigidBody/Shape/Cylinder/physCylinderShape.h
@@ -6,7 +6,7 @@
 #include "KingSystem/Physics/RigidBody/Shape/physShape.h"
 #include "KingSystem/Physics/RigidBody/physRigidBody.h"
 #include "KingSystem/Physics/RigidBody/physRigidBodyParam.h"
-#include "KingSystem/Physics/System/physMaterialMask.h"
+#include "KingSystem/Physics/physMaterialMask.h"
 
 class hkTransformf;
 class hkpCylinderShape;
diff --git a/src/KingSystem/Physics/RigidBody/Shape/CylinderWater/physCylinderWaterShape.h b/src/KingSystem/Physics/RigidBody/Shape/CylinderWater/physCylinderWaterShape.h
index cf08bb2b..a06a2b8f 100644
--- a/src/KingSystem/Physics/RigidBody/Shape/CylinderWater/physCylinderWaterShape.h
+++ b/src/KingSystem/Physics/RigidBody/Shape/CylinderWater/physCylinderWaterShape.h
@@ -5,7 +5,7 @@
 #include "KingSystem/Physics/RigidBody/Shape/Cylinder/physCylinderShape.h"
 #include "KingSystem/Physics/RigidBody/physRigidBody.h"
 #include "KingSystem/Physics/RigidBody/physRigidBodyParam.h"
-#include "KingSystem/Physics/System/physMaterialMask.h"
+#include "KingSystem/Physics/physMaterialMask.h"
 
 namespace ksys::phys {
 
diff --git a/src/KingSystem/Physics/RigidBody/Shape/Polytope/physPolytopeShape.h b/src/KingSystem/Physics/RigidBody/Shape/Polytope/physPolytopeShape.h
index dc55ca0d..bc7a64f2 100644
--- a/src/KingSystem/Physics/RigidBody/Shape/Polytope/physPolytopeShape.h
+++ b/src/KingSystem/Physics/RigidBody/Shape/Polytope/physPolytopeShape.h
@@ -8,7 +8,7 @@
 #include <thread/seadCriticalSection.h>
 #include "KingSystem/Physics/RigidBody/Shape/physShape.h"
 #include "KingSystem/Physics/RigidBody/physRigidBodyParam.h"
-#include "KingSystem/Physics/System/physMaterialMask.h"
+#include "KingSystem/Physics/physMaterialMask.h"
 
 class hkpConvexTransformShape;
 class hkpConvexVerticesShape;
diff --git a/src/KingSystem/Physics/RigidBody/Shape/physShape.h b/src/KingSystem/Physics/RigidBody/Shape/physShape.h
index 672c6cb4..db53e44f 100644
--- a/src/KingSystem/Physics/RigidBody/Shape/physShape.h
+++ b/src/KingSystem/Physics/RigidBody/Shape/physShape.h
@@ -2,8 +2,8 @@
 
 #include <prim/seadRuntimeTypeInfo.h>
 #include <prim/seadSafeString.h>
-#include "KingSystem/Physics/System/physDefines.h"
-#include "KingSystem/Physics/System/physMaterialMask.h"
+#include "KingSystem/Physics/physDefines.h"
+#include "KingSystem/Physics/physMaterialMask.h"
 
 class hkpShape;
 
diff --git a/src/KingSystem/Physics/RigidBody/Shape/physShapeParamObj.h b/src/KingSystem/Physics/RigidBody/Shape/physShapeParamObj.h
index 7f781502..2f14c967 100644
--- a/src/KingSystem/Physics/RigidBody/Shape/physShapeParamObj.h
+++ b/src/KingSystem/Physics/RigidBody/Shape/physShapeParamObj.h
@@ -4,7 +4,7 @@
 #include <agl/Utils/aglParameterObj.h>
 #include <container/seadBuffer.h>
 #include <prim/seadSafeString.h>
-#include "KingSystem/Physics/System/physDefines.h"
+#include "KingSystem/Physics/physDefines.h"
 
 namespace ksys::phys {
 
diff --git a/src/KingSystem/Physics/RigidBody/physRigidBody.h b/src/KingSystem/Physics/RigidBody/physRigidBody.h
index e7925e35..84df78a1 100644
--- a/src/KingSystem/Physics/RigidBody/physRigidBody.h
+++ b/src/KingSystem/Physics/RigidBody/physRigidBody.h
@@ -10,7 +10,7 @@
 #include <thread/seadAtomic.h>
 #include <thread/seadCriticalSection.h>
 #include "KingSystem/Physics/RigidBody/physRigidBodyAccessor.h"
-#include "KingSystem/Physics/System/physDefines.h"
+#include "KingSystem/Physics/physDefines.h"
 #include "KingSystem/Utils/Types.h"
 
 enum hkpCollidableQualityType : int;
diff --git a/src/KingSystem/Physics/RigidBody/physRigidBodyAccessor.h b/src/KingSystem/Physics/RigidBody/physRigidBodyAccessor.h
index 8e32ed40..af47cac4 100644
--- a/src/KingSystem/Physics/RigidBody/physRigidBodyAccessor.h
+++ b/src/KingSystem/Physics/RigidBody/physRigidBodyAccessor.h
@@ -3,7 +3,7 @@
 #include <math/seadMatrix.h>
 #include <math/seadQuat.h>
 #include <math/seadVector.h>
-#include "KingSystem/Physics/System/physDefines.h"
+#include "KingSystem/Physics/physDefines.h"
 
 class hkpRigidBody;
 
diff --git a/src/KingSystem/Physics/RigidBody/physRigidBodyFromResource.cpp b/src/KingSystem/Physics/RigidBody/physRigidBodyFromResource.cpp
index 0299fa75..a17d16b9 100644
--- a/src/KingSystem/Physics/RigidBody/physRigidBodyFromResource.cpp
+++ b/src/KingSystem/Physics/RigidBody/physRigidBodyFromResource.cpp
@@ -5,8 +5,8 @@
 #include <Havok/Physics2012/Utilities/Dynamics/ScaleSystem/hkpSystemScalingUtility.h>
 #include <math/seadMathCalcCommon.h>
 #include "KingSystem/Physics/RigidBody/physRigidBodyParam.h"
-#include "KingSystem/Physics/System/physMaterialMask.h"
 #include "KingSystem/Physics/physConversions.h"
+#include "KingSystem/Physics/physMaterialMask.h"
 
 namespace ksys::phys {
 
diff --git a/src/KingSystem/Physics/RigidBody/physRigidBodyFromShape.cpp b/src/KingSystem/Physics/RigidBody/physRigidBodyFromShape.cpp
index 8d80917a..7e1de581 100644
--- a/src/KingSystem/Physics/RigidBody/physRigidBodyFromShape.cpp
+++ b/src/KingSystem/Physics/RigidBody/physRigidBodyFromShape.cpp
@@ -20,9 +20,9 @@
 #include "KingSystem/Physics/RigidBody/Shape/Sphere/physSphereShape.h"
 #include "KingSystem/Physics/RigidBody/Shape/physShape.h"
 #include "KingSystem/Physics/RigidBody/physRigidBodyParam.h"
-#include "KingSystem/Physics/System/physDefines.h"
 #include "KingSystem/Physics/System/physGroupFilter.h"
 #include "KingSystem/Physics/physConversions.h"
+#include "KingSystem/Physics/physDefines.h"
 #include "KingSystem/Utils/HeapUtil.h"
 
 namespace ksys::phys {
diff --git a/src/KingSystem/Physics/RigidBody/physRigidBodyParam.h b/src/KingSystem/Physics/RigidBody/physRigidBodyParam.h
index b367c1bf..d561b056 100644
--- a/src/KingSystem/Physics/RigidBody/physRigidBodyParam.h
+++ b/src/KingSystem/Physics/RigidBody/physRigidBodyParam.h
@@ -6,7 +6,7 @@
 #include <container/seadBuffer.h>
 #include <prim/seadRuntimeTypeInfo.h>
 #include "KingSystem/Physics/RigidBody/Shape/physShape.h"
-#include "KingSystem/Physics/System/physDefines.h"
+#include "KingSystem/Physics/physDefines.h"
 #include "KingSystem/Utils/Types.h"
 
 namespace ksys::phys {
diff --git a/src/KingSystem/Physics/RigidBody/physRigidBodyRequestMgr.cpp b/src/KingSystem/Physics/RigidBody/physRigidBodyRequestMgr.cpp
index 886da47b..7498f536 100644
--- a/src/KingSystem/Physics/RigidBody/physRigidBodyRequestMgr.cpp
+++ b/src/KingSystem/Physics/RigidBody/physRigidBodyRequestMgr.cpp
@@ -1,6 +1,6 @@
 #include "KingSystem/Physics/RigidBody/physRigidBodyRequestMgr.h"
 #include <prim/seadScopedLock.h>
-#include "KingSystem/Physics/System/physMaterialMask.h"
+#include "KingSystem/Physics/physMaterialMask.h"
 
 namespace ksys::phys {
 
diff --git a/src/KingSystem/Physics/RigidBody/physRigidBodyRequestMgr.h b/src/KingSystem/Physics/RigidBody/physRigidBodyRequestMgr.h
index ca53405b..880f7286 100644
--- a/src/KingSystem/Physics/RigidBody/physRigidBodyRequestMgr.h
+++ b/src/KingSystem/Physics/RigidBody/physRigidBodyRequestMgr.h
@@ -9,8 +9,8 @@
 #include <prim/seadDelegate.h>
 #include <thread/seadAtomic.h>
 #include <thread/seadCriticalSection.h>
-#include "KingSystem/Physics/System/physDefines.h"
 #include "KingSystem/Physics/System/physRigidContactPointsEx.h"
+#include "KingSystem/Physics/physDefines.h"
 #include "KingSystem/Utils/Container/LockFreeQueue.h"
 #include "KingSystem/Utils/Types.h"
 
diff --git a/src/KingSystem/Physics/RigidBody/physRigidBodySet.h b/src/KingSystem/Physics/RigidBody/physRigidBodySet.h
index aeb9aeaf..8de77946 100644
--- a/src/KingSystem/Physics/RigidBody/physRigidBodySet.h
+++ b/src/KingSystem/Physics/RigidBody/physRigidBodySet.h
@@ -5,7 +5,7 @@
 #include <math/seadMatrix.h>
 #include <prim/seadNamable.h>
 #include <prim/seadSafeString.h>
-#include "KingSystem/Physics/System/physDefines.h"
+#include "KingSystem/Physics/physDefines.h"
 
 namespace ksys::phys {
 
diff --git a/src/KingSystem/Physics/StaticCompound/physStaticCompoundInfo.h b/src/KingSystem/Physics/StaticCompound/physStaticCompoundInfo.h
index 2afe1ef5..dfd31ed9 100644
--- a/src/KingSystem/Physics/StaticCompound/physStaticCompoundInfo.h
+++ b/src/KingSystem/Physics/StaticCompound/physStaticCompoundInfo.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Havok/Common/Base/hkBase.h>
-#include "KingSystem/Physics/System/physDefines.h"
+#include "KingSystem/Physics/physDefines.h"
 
 class hkTypeInfo;
 
diff --git a/src/KingSystem/Physics/System/physContactListener.h b/src/KingSystem/Physics/System/physContactListener.h
index b5f3d057..a01218a3 100644
--- a/src/KingSystem/Physics/System/physContactListener.h
+++ b/src/KingSystem/Physics/System/physContactListener.h
@@ -6,7 +6,7 @@
 #include <hostio/seadHostIONode.h>
 #include <prim/seadRuntimeTypeInfo.h>
 #include <thread/seadCriticalSection.h>
-#include "KingSystem/Physics/System/physDefines.h"
+#include "KingSystem/Physics/physDefines.h"
 
 namespace ksys::phys {
 
diff --git a/src/KingSystem/Physics/System/physContactMgr.h b/src/KingSystem/Physics/System/physContactMgr.h
index 24971513..388f185d 100644
--- a/src/KingSystem/Physics/System/physContactMgr.h
+++ b/src/KingSystem/Physics/System/physContactMgr.h
@@ -12,8 +12,8 @@
 #include <prim/seadSafeString.h>
 #include <thread/seadAtomic.h>
 #include <thread/seadMutex.h>
-#include "KingSystem/Physics/System/physDefines.h"
-#include "KingSystem/Physics/System/physMaterialMask.h"
+#include "KingSystem/Physics/physDefines.h"
+#include "KingSystem/Physics/physMaterialMask.h"
 #include "KingSystem/Utils/Types.h"
 
 namespace sead {
diff --git a/src/KingSystem/Physics/System/physEntityGroupFilter.h b/src/KingSystem/Physics/System/physEntityGroupFilter.h
index ec10b4ee..a5a8689c 100644
--- a/src/KingSystem/Physics/System/physEntityGroupFilter.h
+++ b/src/KingSystem/Physics/System/physEntityGroupFilter.h
@@ -3,8 +3,8 @@
 #include <container/seadSafeArray.h>
 #include <prim/seadBitUtil.h>
 #include <prim/seadSafeString.h>
-#include "KingSystem/Physics/System/physDefines.h"
 #include "KingSystem/Physics/System/physGroupFilter.h"
+#include "KingSystem/Physics/physDefines.h"
 
 namespace ksys::phys {
 
diff --git a/src/KingSystem/Physics/System/physGroupFilter.h b/src/KingSystem/Physics/System/physGroupFilter.h
index 3ce5dd07..cb7843c1 100644
--- a/src/KingSystem/Physics/System/physGroupFilter.h
+++ b/src/KingSystem/Physics/System/physGroupFilter.h
@@ -6,7 +6,7 @@
 #include <container/seadSafeArray.h>
 #include <prim/seadRuntimeTypeInfo.h>
 #include <thread/seadCriticalSection.h>
-#include "KingSystem/Physics/System/physDefines.h"
+#include "KingSystem/Physics/physDefines.h"
 
 namespace ksys::phys {
 
diff --git a/src/KingSystem/Physics/System/physMaterialTable.h b/src/KingSystem/Physics/System/physMaterialTable.h
index 04240b0d..9d94bd81 100644
--- a/src/KingSystem/Physics/System/physMaterialTable.h
+++ b/src/KingSystem/Physics/System/physMaterialTable.h
@@ -6,7 +6,7 @@
 #include <agl/Utils/aglParameterObj.h>
 #include <agl/Utils/aglResParameter.h>
 #include <container/seadSafeArray.h>
-#include "KingSystem/Physics/System/physDefines.h"
+#include "KingSystem/Physics/physDefines.h"
 #include "KingSystem/Utils/Types.h"
 
 namespace ksys::phys {
diff --git a/src/KingSystem/Physics/System/physRigidContactPointsEx.h b/src/KingSystem/Physics/System/physRigidContactPointsEx.h
index 04f3bf90..305171af 100644
--- a/src/KingSystem/Physics/System/physRigidContactPointsEx.h
+++ b/src/KingSystem/Physics/System/physRigidContactPointsEx.h
@@ -4,8 +4,8 @@
 #include <math/seadVector.h>
 #include <prim/seadDelegate.h>
 #include <prim/seadTypedBitFlag.h>
-#include "KingSystem/Physics/System/physDefines.h"
 #include "KingSystem/Physics/System/physRigidContactPoints.h"
+#include "KingSystem/Physics/physDefines.h"
 #include "KingSystem/Utils/Types.h"
 
 namespace ksys::phys {
diff --git a/src/KingSystem/Physics/System/physSensorGroupFilter.h b/src/KingSystem/Physics/System/physSensorGroupFilter.h
index b8707d28..4762d65b 100644
--- a/src/KingSystem/Physics/System/physSensorGroupFilter.h
+++ b/src/KingSystem/Physics/System/physSensorGroupFilter.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "KingSystem/Physics/System/physDefines.h"
 #include "KingSystem/Physics/System/physGroupFilter.h"
+#include "KingSystem/Physics/physDefines.h"
 
 namespace ksys::phys {
 
diff --git a/src/KingSystem/Physics/System/physSystem.h b/src/KingSystem/Physics/System/physSystem.h
index efdc0d7a..06dbc551 100644
--- a/src/KingSystem/Physics/System/physSystem.h
+++ b/src/KingSystem/Physics/System/physSystem.h
@@ -4,7 +4,7 @@
 #include <container/seadPtrArray.h>
 #include <heap/seadDisposer.h>
 #include <thread/seadCriticalSection.h>
-#include "KingSystem/Physics/System/physDefines.h"
+#include "KingSystem/Physics/physDefines.h"
 #include "KingSystem/Utils/Types.h"
 
 namespace ksys::phys {
diff --git a/src/KingSystem/Physics/System/physSystemData.h b/src/KingSystem/Physics/System/physSystemData.h
index a759c72f..91267807 100644
--- a/src/KingSystem/Physics/System/physSystemData.h
+++ b/src/KingSystem/Physics/System/physSystemData.h
@@ -7,7 +7,7 @@
 #include <agl/Utils/aglResParameter.h>
 #include <container/seadSafeArray.h>
 #include <prim/seadEnum.h>
-#include "KingSystem/Physics/System/physDefines.h"
+#include "KingSystem/Physics/physDefines.h"
 #include "KingSystem/Utils/Types.h"
 
 namespace ksys::res {
diff --git a/src/KingSystem/Physics/System/physDefines.cpp b/src/KingSystem/Physics/physDefines.cpp
similarity index 97%
rename from src/KingSystem/Physics/System/physDefines.cpp
rename to src/KingSystem/Physics/physDefines.cpp
index 5f505dc6..a9d50e1d 100644
--- a/src/KingSystem/Physics/System/physDefines.cpp
+++ b/src/KingSystem/Physics/physDefines.cpp
@@ -1,4 +1,4 @@
-#include "KingSystem/Physics/System/physDefines.h"
+#include "KingSystem/Physics/physDefines.h"
 
 namespace ksys::phys {
 
diff --git a/src/KingSystem/Physics/System/physDefines.h b/src/KingSystem/Physics/physDefines.h
similarity index 100%
rename from src/KingSystem/Physics/System/physDefines.h
rename to src/KingSystem/Physics/physDefines.h
diff --git a/src/KingSystem/Physics/System/physMaterialMask.cpp b/src/KingSystem/Physics/physMaterialMask.cpp
similarity index 97%
rename from src/KingSystem/Physics/System/physMaterialMask.cpp
rename to src/KingSystem/Physics/physMaterialMask.cpp
index c468c76d..365248fa 100644
--- a/src/KingSystem/Physics/System/physMaterialMask.cpp
+++ b/src/KingSystem/Physics/physMaterialMask.cpp
@@ -1,4 +1,4 @@
-#include "KingSystem/Physics/System/physMaterialMask.h"
+#include "KingSystem/Physics/physMaterialMask.h"
 #include "KingSystem/Physics/System/physMaterialTable.h"
 #include "KingSystem/Physics/System/physSystem.h"
 
diff --git a/src/KingSystem/Physics/System/physMaterialMask.h b/src/KingSystem/Physics/physMaterialMask.h
similarity index 98%
rename from src/KingSystem/Physics/System/physMaterialMask.h
rename to src/KingSystem/Physics/physMaterialMask.h
index 8098cab5..8baa349a 100644
--- a/src/KingSystem/Physics/System/physMaterialMask.h
+++ b/src/KingSystem/Physics/physMaterialMask.h
@@ -3,7 +3,7 @@
 #include <basis/seadTypes.h>
 #include <prim/seadEnum.h>
 #include <prim/seadSafeString.h>
-#include "KingSystem/Physics/System/physDefines.h"
+#include "KingSystem/Physics/physDefines.h"
 #include "KingSystem/Utils/BitField.h"
 
 namespace ksys::phys {