diff --git a/bc/file/File.cpp b/bc/file/File.cpp
index 07005b9..86f9917 100644
--- a/bc/file/File.cpp
+++ b/bc/file/File.cpp
@@ -1,6 +1,6 @@
 #include "bc/file/File.hpp"
 #include "bc/file/Filesystem.hpp"
-#include "bc/file/system/Stacked.hpp"
+#include "bc/system/file/Stacked.hpp"
 
 #include <cstdio>
 #include <cinttypes>
diff --git a/bc/file/File.hpp b/bc/file/File.hpp
index ef83e25..da4399e 100644
--- a/bc/file/File.hpp
+++ b/bc/file/File.hpp
@@ -4,7 +4,7 @@
 #include "bc/Time.hpp"
 #include "bc/file/Defines.hpp"
 #include "bc/file/Types.hpp"
-#include "bc/file/system/System_File.hpp"
+#include "bc/system/file/System_File.hpp"
 
 namespace Blizzard {
 namespace File {
diff --git a/bc/file/Filesystem.hpp b/bc/file/Filesystem.hpp
index e51307a..008df43 100644
--- a/bc/file/Filesystem.hpp
+++ b/bc/file/Filesystem.hpp
@@ -1,7 +1,7 @@
 #ifndef BC_FILE_FILESYSTEM_HPP
 #define BC_FILE_FILESYSTEM_HPP
 
-#include "bc/file/system/Types.hpp"
+#include "bc/system/file/Types.hpp"
 #include <cstdint>
 
 namespace Blizzard {
diff --git a/bc/file/Types.hpp b/bc/file/Types.hpp
index 4b186f4..93c4bbd 100644
--- a/bc/file/Types.hpp
+++ b/bc/file/Types.hpp
@@ -1,7 +1,7 @@
 #ifndef BC_FILE_TYPES_HPP
 #define BC_FILE_TYPES_HPP
 
-#include "bc/file/system/Defines.hpp"
+#include "bc/system/file/Defines.hpp"
 #include "bc/time/Time.hpp"
 
 #if defined(WHOA_SYSTEM_WIN)
diff --git a/bc/system/file/Stacked.cpp b/bc/system/file/Stacked.cpp
index 397890a..acd3a00 100644
--- a/bc/system/file/Stacked.cpp
+++ b/bc/system/file/Stacked.cpp
@@ -1,7 +1,7 @@
 
 #include "bc/file/Filesystem.hpp"
-#include "bc/file/system/System_File.hpp"
-#include "bc/file/system/Stacked.hpp"
+#include "bc/system/file/System_File.hpp"
+#include "bc/system/file/Stacked.hpp"
 #include "bc/String.hpp"
 #include "bc/Memory.hpp"
 
diff --git a/bc/system/file/Stacked.hpp b/bc/system/file/Stacked.hpp
index e56f022..aed0b78 100644
--- a/bc/system/file/Stacked.hpp
+++ b/bc/system/file/Stacked.hpp
@@ -4,7 +4,7 @@
 #include "bc/file/Types.hpp"
 #include "bc/file/Filesystem.hpp"
 #include "bc/file/File.hpp"
-#include "bc/file/system/System_File.hpp"
+#include "bc/system/file/System_File.hpp"
 
 #include <cstdint>
 
diff --git a/bc/system/file/System_File.hpp b/bc/system/file/System_File.hpp
index 7dbe55a..a91f16f 100644
--- a/bc/system/file/System_File.hpp
+++ b/bc/system/file/System_File.hpp
@@ -2,11 +2,11 @@
 #define BC_FILE_SYSTEM_SYSTEM_FILE_HPP
 
 #include "bc/Debug.hpp"
-#include "bc/file/system/Types.hpp"
+#include "bc/system/file/Types.hpp"
 #include "bc/file/Filesystem.hpp"
 
 #if defined(WHOA_SYSTEM_WIN)
-#include "bc/file/system/win/Support.hpp"
+#include "bc/system/file/win/Support.hpp"
 #endif
 
 #include <cstdint>
diff --git a/bc/system/file/posix/Stacked.cpp b/bc/system/file/posix/Stacked.cpp
index 9826dfc..c4e0930 100644
--- a/bc/system/file/posix/Stacked.cpp
+++ b/bc/system/file/posix/Stacked.cpp
@@ -1,4 +1,4 @@
-#include "bc/file/system/Stacked.hpp"
+#include "bc/system/file/Stacked.hpp"
 #include "bc/file/Path.hpp"
 #include "bc/Debug.hpp"
 #include "bc/Memory.hpp"
diff --git a/bc/system/file/posix/System_File.cpp b/bc/system/file/posix/System_File.cpp
index 5402c80..ca59b98 100644
--- a/bc/system/file/posix/System_File.cpp
+++ b/bc/system/file/posix/System_File.cpp
@@ -1,5 +1,5 @@
-#include "bc/file/system/System_File.hpp"
-#include "bc/file/system/Stacked.hpp"
+#include "bc/system/file/System_File.hpp"
+#include "bc/system/file/Stacked.hpp"
 #include "bc/file/Path.hpp"
 #include "bc/String.hpp"
 #include "bc/Debug.hpp"
diff --git a/bc/system/file/win/Stacked.cpp b/bc/system/file/win/Stacked.cpp
index 8cd4185..74b52c0 100644
--- a/bc/system/file/win/Stacked.cpp
+++ b/bc/system/file/win/Stacked.cpp
@@ -1,8 +1,8 @@
 #include "bc/file/Defines.hpp"
 #include "bc/file/File.hpp"
 #include "bc/file/Path.hpp"
-#include "bc/file/system/Stacked.hpp"
-#include "bc/file/system/win/WinFile.hpp"
+#include "bc/system/file/Stacked.hpp"
+#include "bc/system/file/win/WinFile.hpp"
 #include "bc/Debug.hpp"
 #include "bc/Memory.hpp"
 #include "bc/String.hpp"
diff --git a/bc/system/file/win/System_File.cpp b/bc/system/file/win/System_File.cpp
index 5ef4664..fe6851c 100644
--- a/bc/system/file/win/System_File.cpp
+++ b/bc/system/file/win/System_File.cpp
@@ -1,5 +1,5 @@
-#include "bc/file/system/System_File.hpp"
-#include "bc/file/system/Stacked.hpp"
+#include "bc/system/file/System_File.hpp"
+#include "bc/system/file/Stacked.hpp"
 #include "bc/file/File.hpp"
 #include "bc/file/Defines.hpp"
 #include "bc/Debug.hpp"
diff --git a/bc/system/file/win/WinFile.cpp b/bc/system/file/win/WinFile.cpp
index fd2a780..d24ab53 100644
--- a/bc/system/file/win/WinFile.cpp
+++ b/bc/system/file/win/WinFile.cpp
@@ -1,5 +1,5 @@
 #include "bc/file/Defines.hpp"
-#include "bc/file/system/win/Utils.hpp"
+#include "bc/system/file/win/Utils.hpp"
 
 #include <windows.h>