diff --git a/src/LibHac/FsSrv/FsCreator/EncryptedFileSystemCreator.cs b/src/LibHac/FsSrv/FsCreator/EncryptedFileSystemCreator.cs
index 2a71193a..86aadc9f 100644
--- a/src/LibHac/FsSrv/FsCreator/EncryptedFileSystemCreator.cs
+++ b/src/LibHac/FsSrv/FsCreator/EncryptedFileSystemCreator.cs
@@ -2,7 +2,7 @@
 using LibHac.Common.Keys;
 using LibHac.Fs;
 using LibHac.Fs.Fsa;
-using LibHac.FsSystem;
+using LibHac.Tools.FsSystem;
 using static LibHac.FsSrv.FsCreator.IEncryptedFileSystemCreator;
 
 namespace LibHac.FsSrv.FsCreator;
@@ -33,4 +33,4 @@ public class EncryptedFileSystemCreator : IEncryptedFileSystemCreator
 
         return Result.Success;
     }
-}
+}
\ No newline at end of file
diff --git a/src/LibHac/Tools/Fs/SwitchFs.cs b/src/LibHac/Tools/Fs/SwitchFs.cs
index 3369cd02..3713029d 100644
--- a/src/LibHac/Tools/Fs/SwitchFs.cs
+++ b/src/LibHac/Tools/Fs/SwitchFs.cs
@@ -10,6 +10,7 @@ using LibHac.Fs.Fsa;
 using LibHac.FsSystem;
 using LibHac.Ncm;
 using LibHac.Ns;
+using LibHac.Tools.FsSystem;
 using LibHac.Tools.FsSystem.NcaUtils;
 using LibHac.Tools.FsSystem.Save;
 using LibHac.Tools.Ncm;
diff --git a/src/LibHac/FsSystem/AesXtsDirectory.cs b/src/LibHac/Tools/FsSystem/AesXtsDirectory.cs
similarity index 98%
rename from src/LibHac/FsSystem/AesXtsDirectory.cs
rename to src/LibHac/Tools/FsSystem/AesXtsDirectory.cs
index 260d5d3a..fa0d3b27 100644
--- a/src/LibHac/FsSystem/AesXtsDirectory.cs
+++ b/src/LibHac/Tools/FsSystem/AesXtsDirectory.cs
@@ -2,9 +2,10 @@
 using LibHac.Common;
 using LibHac.Fs;
 using LibHac.Fs.Fsa;
+using LibHac.FsSystem;
 using LibHac.Util;
 
-namespace LibHac.FsSystem;
+namespace LibHac.Tools.FsSystem;
 
 public class AesXtsDirectory : IDirectory
 {
@@ -93,4 +94,4 @@ public class AesXtsDirectory : IDirectory
             return 0;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/LibHac/FsSystem/AesXtsFile.cs b/src/LibHac/Tools/FsSystem/AesXtsFile.cs
similarity index 98%
rename from src/LibHac/FsSystem/AesXtsFile.cs
rename to src/LibHac/Tools/FsSystem/AesXtsFile.cs
index 05aaba79..de0e5697 100644
--- a/src/LibHac/FsSystem/AesXtsFile.cs
+++ b/src/LibHac/Tools/FsSystem/AesXtsFile.cs
@@ -2,9 +2,10 @@
 using LibHac.Common;
 using LibHac.Fs;
 using LibHac.Fs.Fsa;
+using LibHac.FsSystem;
 using LibHac.Util;
 
-namespace LibHac.FsSystem;
+namespace LibHac.Tools.FsSystem;
 
 public class AesXtsFile : IFile
 {
@@ -130,4 +131,4 @@ public class AesXtsFile : IFile
 
         base.Dispose();
     }
-}
+}
\ No newline at end of file
diff --git a/src/LibHac/FsSystem/AesXtsFileHeader.cs b/src/LibHac/Tools/FsSystem/AesXtsFileHeader.cs
similarity index 98%
rename from src/LibHac/FsSystem/AesXtsFileHeader.cs
rename to src/LibHac/Tools/FsSystem/AesXtsFileHeader.cs
index a1f432f2..839b8b62 100644
--- a/src/LibHac/FsSystem/AesXtsFileHeader.cs
+++ b/src/LibHac/Tools/FsSystem/AesXtsFileHeader.cs
@@ -5,10 +5,10 @@ using System.Text;
 using LibHac.Common;
 using LibHac.Fs;
 using LibHac.Fs.Fsa;
-
+using LibHac.FsSystem;
 using Aes = LibHac.Crypto.Aes;
 
-namespace LibHac.FsSystem;
+namespace LibHac.Tools.FsSystem;
 
 public class AesXtsFileHeader
 {
diff --git a/src/LibHac/FsSystem/AesXtsFileSystem.cs b/src/LibHac/Tools/FsSystem/AesXtsFileSystem.cs
similarity index 99%
rename from src/LibHac/FsSystem/AesXtsFileSystem.cs
rename to src/LibHac/Tools/FsSystem/AesXtsFileSystem.cs
index 9314190f..2c7e60bc 100644
--- a/src/LibHac/FsSystem/AesXtsFileSystem.cs
+++ b/src/LibHac/Tools/FsSystem/AesXtsFileSystem.cs
@@ -3,9 +3,10 @@ using System.Diagnostics;
 using LibHac.Common;
 using LibHac.Fs;
 using LibHac.Fs.Fsa;
+using LibHac.FsSystem;
 using LibHac.Util;
 
-namespace LibHac.FsSystem;
+namespace LibHac.Tools.FsSystem;
 
 public class AesXtsFileSystem : IFileSystem
 {
@@ -283,4 +284,4 @@ public class AesXtsFileSystem : IFileSystem
 
         file.Get.Write(0, header.ToBytes(false), WriteOption.Flush).ThrowIfFailure();
     }
-}
+}
\ No newline at end of file
diff --git a/src/hactoolnet/ProcessNax0.cs b/src/hactoolnet/ProcessNax0.cs
index 9b26798b..921afa6c 100644
--- a/src/hactoolnet/ProcessNax0.cs
+++ b/src/hactoolnet/ProcessNax0.cs
@@ -6,6 +6,7 @@ using LibHac.Crypto;
 using LibHac.Fs;
 using LibHac.Fs.Fsa;
 using LibHac.FsSystem;
+using LibHac.Tools.FsSystem;
 using LibHac.Util;
 using static hactoolnet.Print;
 
diff --git a/tests/LibHac.Tests/Fs/AesXtsFileSystemTests.cs b/tests/LibHac.Tests/Fs/AesXtsFileSystemTests.cs
index 67ca8505..b6bb24df 100644
--- a/tests/LibHac.Tests/Fs/AesXtsFileSystemTests.cs
+++ b/tests/LibHac.Tests/Fs/AesXtsFileSystemTests.cs
@@ -1,7 +1,7 @@
 using LibHac.Fs;
 using LibHac.Fs.Fsa;
-using LibHac.FsSystem;
 using LibHac.Tests.Fs.IFileSystemTestBase;
+using LibHac.Tools.FsSystem;
 
 namespace LibHac.Tests.Fs;
 
@@ -16,4 +16,4 @@ public class AesXtsFileSystemTests : IFileSystemTests
 
         return xtsFs;
     }
-}
+}
\ No newline at end of file