diff --git a/bc/CMakeLists.txt b/bc/CMakeLists.txt
index c8a8aa4..e79e12c 100644
--- a/bc/CMakeLists.txt
+++ b/bc/CMakeLists.txt
@@ -1,6 +1,7 @@
 file(GLOB BC_SOURCES
     "*.cpp"
     "lock/*.cpp"
+    "system/**.cpp"
 )
 
 add_library(bc STATIC
diff --git a/bc/Debug.hpp b/bc/Debug.hpp
index 119603a..c350823 100644
--- a/bc/Debug.hpp
+++ b/bc/Debug.hpp
@@ -1,7 +1,7 @@
 #ifndef BC_DEBUG_HPP
 #define BC_DEBUG_HPP
 
-#include "bc/System_Debug.hpp"
+#include "bc/system/System_Debug.hpp"
 #include <cstdint>
 
 #if defined(NDEBUG)
diff --git a/bc/Lock.cpp b/bc/Lock.cpp
index 6f6f340..d405b13 100644
--- a/bc/Lock.cpp
+++ b/bc/Lock.cpp
@@ -1,7 +1,7 @@
 #include "bc/Lock.hpp"
 #include "bc/Debug.hpp"
 #include "bc/Process.hpp"
-#include "bc/System_Lock.hpp"
+#include "bc/system/System_Lock.hpp"
 
 void Blizzard::Lock::DoOnce(DoOnceData& a1, void (*a2)(void*), void* a3) {
     if (!a1.done) {
diff --git a/bc/Thread.cpp b/bc/Thread.cpp
index ae5c2cf..434d796 100644
--- a/bc/Thread.cpp
+++ b/bc/Thread.cpp
@@ -1,6 +1,6 @@
 #include "bc/Thread.hpp"
 #include "bc/Debug.hpp"
-#include "bc/System_Thread.hpp"
+#include "bc/system/System_Thread.hpp"
 
 void Blizzard::Thread::AllocateLocalStorage(TLSSlot* slot) {
     System_Thread::AllocateLocalStorage(slot, nullptr);
diff --git a/bc/System_Debug.cpp b/bc/system/System_Debug.cpp
similarity index 68%
rename from bc/System_Debug.cpp
rename to bc/system/System_Debug.cpp
index 485c453..1238b8d 100644
--- a/bc/System_Debug.cpp
+++ b/bc/system/System_Debug.cpp
@@ -1,3 +1,3 @@
-#include "bc/System_Debug.hpp"
+#include "bc/system/System_Debug.hpp"
 
 Blizzard::System_Debug::AssertCallback Blizzard::System_Debug::s_assertCallback;
diff --git a/bc/System_Debug.hpp b/bc/system/System_Debug.hpp
similarity index 100%
rename from bc/System_Debug.hpp
rename to bc/system/System_Debug.hpp
diff --git a/bc/System_Lock.cpp b/bc/system/System_Lock.cpp
similarity index 92%
rename from bc/System_Lock.cpp
rename to bc/system/System_Lock.cpp
index effec30..8b0db26 100644
--- a/bc/System_Lock.cpp
+++ b/bc/system/System_Lock.cpp
@@ -1,4 +1,4 @@
-#include "bc/System_Lock.hpp"
+#include "bc/system/System_Lock.hpp"
 
 #if defined(WHOA_SYSTEM_MAC) || defined(WHOA_SYSTEM_LINUX)
 Blizzard::Lock::DoOnceData Blizzard::System_Lock::s_initMutexAttrOnce;
diff --git a/bc/System_Lock.hpp b/bc/system/System_Lock.hpp
similarity index 100%
rename from bc/System_Lock.hpp
rename to bc/system/System_Lock.hpp
diff --git a/bc/System_Thread.cpp b/bc/system/System_Thread.cpp
similarity index 99%
rename from bc/System_Thread.cpp
rename to bc/system/System_Thread.cpp
index 2dbff92..bdfcbac 100644
--- a/bc/System_Thread.cpp
+++ b/bc/system/System_Thread.cpp
@@ -1,4 +1,4 @@
-#include "bc/System_Thread.hpp"
+#include "bc/system/System_Thread.hpp"
 #include "bc/Debug.hpp"
 #include "bc/Memory.hpp"
 #include "bc/String.hpp"
diff --git a/bc/System_Thread.hpp b/bc/system/System_Thread.hpp
similarity index 100%
rename from bc/System_Thread.hpp
rename to bc/system/System_Thread.hpp