diff --git a/src/LibHac/FsSystem/LocalDirectory.cs b/src/LibHac/FsSystem/LocalDirectory.cs
index 462ffd4c..f737139b 100644
--- a/src/LibHac/FsSystem/LocalDirectory.cs
+++ b/src/LibHac/FsSystem/LocalDirectory.cs
@@ -4,6 +4,7 @@ using System.IO;
 using System.Runtime.CompilerServices;
 using LibHac.Fs;
 using LibHac.Fs.Fsa;
+using LibHac.Tools.FsSystem;
 using LibHac.Util;
 
 namespace LibHac.FsSystem;
@@ -74,4 +75,4 @@ public class LocalDirectory : IDirectory
         return isDir && (mode & OpenDirectoryMode.Directory) != 0 ||
                !isDir && (mode & OpenDirectoryMode.File) != 0;
     }
-}
+}
\ No newline at end of file
diff --git a/src/LibHac/FsSystem/LocalFileSystem.cs b/src/LibHac/FsSystem/LocalFileSystem.cs
index e8600daa..1fd0f4f2 100644
--- a/src/LibHac/FsSystem/LocalFileSystem.cs
+++ b/src/LibHac/FsSystem/LocalFileSystem.cs
@@ -8,6 +8,7 @@ using LibHac.Common;
 using LibHac.Fs;
 using LibHac.Fs.Fsa;
 using LibHac.FsSystem.Impl;
+using LibHac.Tools.FsSystem;
 using LibHac.Util;
 using static LibHac.Fs.StringTraits;
 using Path = LibHac.Fs.Path;
@@ -1062,4 +1063,4 @@ public class LocalFileSystem : IAttributeFileSystem
         casedPath = exactPath;
         return Result.Success;
     }
-}
+}
\ No newline at end of file
diff --git a/src/LibHac/FsSystem/PartitionFileSystemBuilder.cs b/src/LibHac/FsSystem/PartitionFileSystemBuilder.cs
index b5257334..ed088124 100644
--- a/src/LibHac/FsSystem/PartitionFileSystemBuilder.cs
+++ b/src/LibHac/FsSystem/PartitionFileSystemBuilder.cs
@@ -7,6 +7,7 @@ using LibHac.Common;
 using LibHac.Crypto;
 using LibHac.Fs;
 using LibHac.Fs.Fsa;
+using LibHac.Tools.FsSystem;
 using LibHac.Util;
 
 namespace LibHac.FsSystem;
@@ -184,4 +185,4 @@ public class PartitionFileSystemBuilder
         public long HashOffset;
         public byte[] Hash;
     }
-}
+}
\ No newline at end of file
diff --git a/src/LibHac/Tools/Fs/FileSystemClientUtils.cs b/src/LibHac/Tools/Fs/FileSystemClientUtils.cs
index d3db3d5e..bc0f4936 100644
--- a/src/LibHac/Tools/Fs/FileSystemClientUtils.cs
+++ b/src/LibHac/Tools/Fs/FileSystemClientUtils.cs
@@ -5,6 +5,7 @@ using LibHac.Common;
 using LibHac.Fs;
 using LibHac.Fs.Fsa;
 using LibHac.FsSystem;
+using LibHac.Tools.FsSystem;
 
 namespace LibHac.Tools.Fs;
 
diff --git a/src/LibHac/Tools/Fs/Xci.cs b/src/LibHac/Tools/Fs/Xci.cs
index eb61b66c..247870e4 100644
--- a/src/LibHac/Tools/Fs/Xci.cs
+++ b/src/LibHac/Tools/Fs/Xci.cs
@@ -3,6 +3,7 @@ using LibHac.Common.Keys;
 using LibHac.Fs;
 using LibHac.Fs.Fsa;
 using LibHac.FsSystem;
+using LibHac.Tools.FsSystem;
 
 namespace LibHac.Tools.Fs;
 
diff --git a/src/LibHac/Tools/FsSystem/AesXtsFile.cs b/src/LibHac/Tools/FsSystem/AesXtsFile.cs
index de0e5697..2b1efbb2 100644
--- a/src/LibHac/Tools/FsSystem/AesXtsFile.cs
+++ b/src/LibHac/Tools/FsSystem/AesXtsFile.cs
@@ -2,7 +2,6 @@
 using LibHac.Common;
 using LibHac.Fs;
 using LibHac.Fs.Fsa;
-using LibHac.FsSystem;
 using LibHac.Util;
 
 namespace LibHac.Tools.FsSystem;
diff --git a/src/LibHac/FsSystem/FileSystemExtensions.cs b/src/LibHac/Tools/FsSystem/FileSystemExtensions.cs
similarity index 99%
rename from src/LibHac/FsSystem/FileSystemExtensions.cs
rename to src/LibHac/Tools/FsSystem/FileSystemExtensions.cs
index 63886595..4557de46 100644
--- a/src/LibHac/FsSystem/FileSystemExtensions.cs
+++ b/src/LibHac/Tools/FsSystem/FileSystemExtensions.cs
@@ -6,11 +6,11 @@ using System.Runtime.CompilerServices;
 using LibHac.Common;
 using LibHac.Fs;
 using LibHac.Fs.Fsa;
-using LibHac.Tools.FsSystem;
+using LibHac.FsSystem;
 using LibHac.Util;
 using Path = LibHac.Fs.Path;
 
-namespace LibHac.FsSystem;
+namespace LibHac.Tools.FsSystem;
 
 public static class FileSystemExtensions
 {
diff --git a/src/LibHac/FsSystem/Messages.cs b/src/LibHac/Tools/FsSystem/Messages.cs
similarity index 93%
rename from src/LibHac/FsSystem/Messages.cs
rename to src/LibHac/Tools/FsSystem/Messages.cs
index 8fa16108..91297d28 100644
--- a/src/LibHac/FsSystem/Messages.cs
+++ b/src/LibHac/Tools/FsSystem/Messages.cs
@@ -1,4 +1,4 @@
-namespace LibHac.FsSystem;
+namespace LibHac.Tools.FsSystem;
 
 internal static class Messages
 {
@@ -7,4 +7,4 @@ internal static class Messages
     public static string DestPathIsSubPath => "The destination directory is a subdirectory of the source directory.";
     public static string DestPathAlreadyExists => "Destination path already exists.";
     public static string PartialPathNotFound => "Could not find a part of the path.";
-}
+}
\ No newline at end of file
diff --git a/src/LibHac/Tools/FsSystem/NxFileStream.cs b/src/LibHac/Tools/FsSystem/NxFileStream.cs
index c72ec9df..306f0e34 100644
--- a/src/LibHac/Tools/FsSystem/NxFileStream.cs
+++ b/src/LibHac/Tools/FsSystem/NxFileStream.cs
@@ -2,7 +2,6 @@
 using System.IO;
 using LibHac.Fs;
 using LibHac.Fs.Fsa;
-using LibHac.FsSystem;
 
 namespace LibHac.Tools.FsSystem;
 
diff --git a/src/hactoolnet/FsUtils.cs b/src/hactoolnet/FsUtils.cs
index ba0ad2c7..e7da5e1e 100644
--- a/src/hactoolnet/FsUtils.cs
+++ b/src/hactoolnet/FsUtils.cs
@@ -6,6 +6,7 @@ using LibHac.Fs;
 using LibHac.Fs.Fsa;
 using LibHac.FsSystem;
 using LibHac.Tools.Fs;
+using LibHac.Tools.FsSystem;
 
 namespace hactoolnet;
 
diff --git a/src/hactoolnet/ProcessNca.cs b/src/hactoolnet/ProcessNca.cs
index b088a703..398849d1 100644
--- a/src/hactoolnet/ProcessNca.cs
+++ b/src/hactoolnet/ProcessNca.cs
@@ -7,6 +7,7 @@ using LibHac.Fs.Fsa;
 using LibHac.Fs.Impl;
 using LibHac.FsSystem;
 using LibHac.Npdm;
+using LibHac.Tools.FsSystem;
 using LibHac.Tools.FsSystem.NcaUtils;
 using static hactoolnet.Print;
 
diff --git a/src/hactoolnet/ProcessPfs.cs b/src/hactoolnet/ProcessPfs.cs
index 57399a7d..ec6bef80 100644
--- a/src/hactoolnet/ProcessPfs.cs
+++ b/src/hactoolnet/ProcessPfs.cs
@@ -5,6 +5,7 @@ using LibHac.Fs;
 using LibHac.FsSystem;
 using LibHac.Tools.Es;
 using LibHac.Tools.Fs;
+using LibHac.Tools.FsSystem;
 using LibHac.Util;
 using static hactoolnet.Print;
 
diff --git a/src/hactoolnet/ProcessRomfs.cs b/src/hactoolnet/ProcessRomfs.cs
index 3a6b5d10..5603ae35 100644
--- a/src/hactoolnet/ProcessRomfs.cs
+++ b/src/hactoolnet/ProcessRomfs.cs
@@ -1,6 +1,7 @@
 using System.IO;
 using LibHac.Fs;
 using LibHac.FsSystem;
+using LibHac.Tools.FsSystem;
 using LibHac.Tools.FsSystem.RomFs;
 
 namespace hactoolnet;
diff --git a/src/hactoolnet/ProcessSave.cs b/src/hactoolnet/ProcessSave.cs
index ac831e74..e61e0b10 100644
--- a/src/hactoolnet/ProcessSave.cs
+++ b/src/hactoolnet/ProcessSave.cs
@@ -9,6 +9,7 @@ using LibHac.Fs;
 using LibHac.Fs.Fsa;
 using LibHac.Fs.Impl;
 using LibHac.FsSystem;
+using LibHac.Tools.FsSystem;
 using LibHac.Tools.FsSystem.Save;
 using static hactoolnet.Print;
 using Path = System.IO.Path;
diff --git a/src/hactoolnet/ProcessSwitchFs.cs b/src/hactoolnet/ProcessSwitchFs.cs
index 8aa532bd..2eb5a186 100644
--- a/src/hactoolnet/ProcessSwitchFs.cs
+++ b/src/hactoolnet/ProcessSwitchFs.cs
@@ -10,6 +10,7 @@ using LibHac.Fs.Fsa;
 using LibHac.FsSystem;
 using LibHac.Ns;
 using LibHac.Tools.Fs;
+using LibHac.Tools.FsSystem;
 using LibHac.Tools.FsSystem.Save;
 using Path = System.IO.Path;
 
diff --git a/src/hactoolnet/ProcessXci.cs b/src/hactoolnet/ProcessXci.cs
index d8bc0002..fd273dd0 100644
--- a/src/hactoolnet/ProcessXci.cs
+++ b/src/hactoolnet/ProcessXci.cs
@@ -5,6 +5,7 @@ using LibHac.Common;
 using LibHac.Fs;
 using LibHac.FsSystem;
 using LibHac.Tools.Fs;
+using LibHac.Tools.FsSystem;
 using LibHac.Tools.FsSystem.NcaUtils;
 using static hactoolnet.Print;