diff --git a/src/KingSystem/ActorSystem/actBaseProc.h b/src/KingSystem/ActorSystem/actBaseProc.h
index 761acd4b..4d9a0c20 100644
--- a/src/KingSystem/ActorSystem/actBaseProc.h
+++ b/src/KingSystem/ActorSystem/actBaseProc.h
@@ -12,7 +12,7 @@
 #include <thread/seadAtomic.h>
 #include "KingSystem/ActorSystem/actBaseProcJob.h"
 #include "KingSystem/ActorSystem/actBaseProcMap.h"
-#include "KingSystem/Utils/StrTreeMap.h"
+#include "KingSystem/Utils/Container/StrTreeMap.h"
 #include "KingSystem/Utils/Types.h"
 
 namespace ksys::act {
diff --git a/src/KingSystem/ActorSystem/actBaseProcMap.h b/src/KingSystem/ActorSystem/actBaseProcMap.h
index cd900491..304a04cd 100644
--- a/src/KingSystem/ActorSystem/actBaseProcMap.h
+++ b/src/KingSystem/ActorSystem/actBaseProcMap.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "KingSystem/Utils/StrTreeMap.h"
+#include "KingSystem/Utils/Container/StrTreeMap.h"
 
 namespace ksys::act {
 
diff --git a/src/KingSystem/ActorSystem/actBaseProcMgr.h b/src/KingSystem/ActorSystem/actBaseProcMgr.h
index 3f0df876..4319437a 100644
--- a/src/KingSystem/ActorSystem/actBaseProcMgr.h
+++ b/src/KingSystem/ActorSystem/actBaseProcMgr.h
@@ -16,7 +16,7 @@
 #include "KingSystem/ActorSystem/actBaseProc.h"
 #include "KingSystem/ActorSystem/actBaseProcJob.h"
 #include "KingSystem/ActorSystem/actBaseProcMap.h"
-#include "KingSystem/Utils/StrTreeMap.h"
+#include "KingSystem/Utils/Container/StrTreeMap.h"
 #include "KingSystem/Utils/Thread/Task.h"
 #include "KingSystem/Utils/Types.h"
 
diff --git a/src/KingSystem/Resource/resCache.h b/src/KingSystem/Resource/resCache.h
index 3f01b5d9..8326ab30 100644
--- a/src/KingSystem/Resource/resCache.h
+++ b/src/KingSystem/Resource/resCache.h
@@ -3,7 +3,7 @@
 #include <hostio/seadHostIONode.h>
 #include "KingSystem/Resource/resHandle.h"
 #include "KingSystem/Resource/resUnit.h"
-#include "KingSystem/Utils/StrTreeMap.h"
+#include "KingSystem/Utils/Container/StrTreeMap.h"
 #include "KingSystem/Utils/Types.h"
 
 namespace ksys::res {
diff --git a/src/KingSystem/Resource/resUnit.h b/src/KingSystem/Resource/resUnit.h
index 26452773..981b7678 100644
--- a/src/KingSystem/Resource/resUnit.h
+++ b/src/KingSystem/Resource/resUnit.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <KingSystem/Utils/StrTreeMap.h>
 #include <hostio/seadHostIONode.h>
 #include <prim/seadEnum.h>
 #include <prim/seadRuntimeTypeInfo.h>
@@ -9,6 +8,7 @@
 #include <resource/seadResourceMgr.h>
 #include <thread/seadAtomic.h>
 #include "KingSystem/Resource/resHandle.h"
+#include "KingSystem/Utils/Container/StrTreeMap.h"
 #include "KingSystem/Utils/Thread/Event.h"
 #include "KingSystem/Utils/Thread/Task.h"
 #include "KingSystem/Utils/Types.h"
diff --git a/src/KingSystem/Utils/CMakeLists.txt b/src/KingSystem/Utils/CMakeLists.txt
index e452eea1..f9db2441 100644
--- a/src/KingSystem/Utils/CMakeLists.txt
+++ b/src/KingSystem/Utils/CMakeLists.txt
@@ -64,6 +64,9 @@ target_sources(uking PRIVATE
   Byaml/ByamlLocal.h
   Byaml/ByamlUtil.cpp
 
+  Container/StrTreeMap.h
+  Container/UniqueArrayPtr.h
+
   AtomicLongBitFlag.h
   Debug.h
   FixedString.h
@@ -74,8 +77,6 @@ target_sources(uking PRIVATE
   ParamIO.cpp
   ParamIO.h
   SafeDelete.h
-  StrTreeMap.h
   TypeTraits.h
   Types.h
-  UniqueArrayPtr.h
 )
diff --git a/src/KingSystem/Utils/StrTreeMap.h b/src/KingSystem/Utils/Container/StrTreeMap.h
similarity index 100%
rename from src/KingSystem/Utils/StrTreeMap.h
rename to src/KingSystem/Utils/Container/StrTreeMap.h
diff --git a/src/KingSystem/Utils/UniqueArrayPtr.h b/src/KingSystem/Utils/Container/UniqueArrayPtr.h
similarity index 100%
rename from src/KingSystem/Utils/UniqueArrayPtr.h
rename to src/KingSystem/Utils/Container/UniqueArrayPtr.h
diff --git a/src/KingSystem/Utils/Thread/MessageDispatcher.h b/src/KingSystem/Utils/Thread/MessageDispatcher.h
index d8867c9f..2a6706d5 100644
--- a/src/KingSystem/Utils/Thread/MessageDispatcher.h
+++ b/src/KingSystem/Utils/Thread/MessageDispatcher.h
@@ -7,10 +7,10 @@
 #include <prim/seadTypedBitFlag.h>
 #include <thread/seadAtomic.h>
 #include <thread/seadCriticalSection.h>
+#include "KingSystem/Utils/Container/UniqueArrayPtr.h"
 #include "KingSystem/Utils/Thread/Event.h"
 #include "KingSystem/Utils/Thread/MessageDispatcherBase.h"
 #include "KingSystem/Utils/Thread/MessageProcessor.h"
-#include "KingSystem/Utils/UniqueArrayPtr.h"
 
 namespace sead {
 class Thread;