diff --git a/src/LibHac/FsSrv/FsCreator/SaveDataFileSystemCreator.cs b/src/LibHac/FsSrv/FsCreator/SaveDataFileSystemCreator.cs
index 9c706a84..5a32bb7f 100644
--- a/src/LibHac/FsSrv/FsCreator/SaveDataFileSystemCreator.cs
+++ b/src/LibHac/FsSrv/FsCreator/SaveDataFileSystemCreator.cs
@@ -6,6 +6,7 @@ using LibHac.Diag;
 using LibHac.Fs;
 using LibHac.Fs.Fsa;
 using LibHac.FsSystem;
+using LibHac.Tools.FsSystem;
 using LibHac.Tools.FsSystem.Save;
 using LibHac.Util;
 
diff --git a/src/LibHac/FsSrv/FsCreator/StorageOnNcaCreator.cs b/src/LibHac/FsSrv/FsCreator/StorageOnNcaCreator.cs
index 41e7e987..bf2ec6da 100644
--- a/src/LibHac/FsSrv/FsCreator/StorageOnNcaCreator.cs
+++ b/src/LibHac/FsSrv/FsCreator/StorageOnNcaCreator.cs
@@ -5,6 +5,7 @@ using LibHac.Fs;
 using LibHac.Fs.Fsa;
 using LibHac.FsSystem;
 using LibHac.FsSystem.Impl;
+using LibHac.Tools.FsSystem;
 using LibHac.Tools.FsSystem.NcaUtils;
 
 namespace LibHac.FsSrv.FsCreator;
diff --git a/src/LibHac/FsSystem/HierarchicalIntegrityVerificationStorage.cs b/src/LibHac/Tools/FsSystem/HierarchicalIntegrityVerificationStorage.cs
similarity index 99%
rename from src/LibHac/FsSystem/HierarchicalIntegrityVerificationStorage.cs
rename to src/LibHac/Tools/FsSystem/HierarchicalIntegrityVerificationStorage.cs
index 045de887..7a7bb652 100644
--- a/src/LibHac/FsSystem/HierarchicalIntegrityVerificationStorage.cs
+++ b/src/LibHac/Tools/FsSystem/HierarchicalIntegrityVerificationStorage.cs
@@ -5,10 +5,9 @@ using System.Security.Cryptography;
 using System.Text;
 using LibHac.Common;
 using LibHac.Fs;
-using LibHac.Tools.FsSystem;
 using LibHac.Util;
 
-namespace LibHac.FsSystem;
+namespace LibHac.Tools.FsSystem;
 
 public class HierarchicalIntegrityVerificationStorage : IStorage
 {
diff --git a/src/LibHac/FsSystem/IntegrityVerificationStorage.cs b/src/LibHac/Tools/FsSystem/IntegrityVerificationStorage.cs
similarity index 99%
rename from src/LibHac/FsSystem/IntegrityVerificationStorage.cs
rename to src/LibHac/Tools/FsSystem/IntegrityVerificationStorage.cs
index 77fc6877..f95009ec 100644
--- a/src/LibHac/FsSystem/IntegrityVerificationStorage.cs
+++ b/src/LibHac/Tools/FsSystem/IntegrityVerificationStorage.cs
@@ -4,10 +4,9 @@ using System.IO;
 using LibHac.Common;
 using LibHac.Crypto;
 using LibHac.Fs;
-using LibHac.Tools.FsSystem;
 using LibHac.Tools.FsSystem.Save;
 
-namespace LibHac.FsSystem;
+namespace LibHac.Tools.FsSystem;
 
 public class IntegrityVerificationStorage : SectorStorage
 {
diff --git a/src/LibHac/Tools/FsSystem/Save/Header.cs b/src/LibHac/Tools/FsSystem/Save/Header.cs
index 91e43630..e5418ef5 100644
--- a/src/LibHac/Tools/FsSystem/Save/Header.cs
+++ b/src/LibHac/Tools/FsSystem/Save/Header.cs
@@ -4,7 +4,6 @@ using LibHac.Common;
 using LibHac.Common.Keys;
 using LibHac.Crypto;
 using LibHac.Fs;
-using LibHac.FsSystem;
 
 namespace LibHac.Tools.FsSystem.Save;
 
diff --git a/src/LibHac/Tools/FsSystem/Save/SaveDataFileSystem.cs b/src/LibHac/Tools/FsSystem/Save/SaveDataFileSystem.cs
index 1e5e46e2..4d8c50ee 100644
--- a/src/LibHac/Tools/FsSystem/Save/SaveDataFileSystem.cs
+++ b/src/LibHac/Tools/FsSystem/Save/SaveDataFileSystem.cs
@@ -5,7 +5,6 @@ using LibHac.Common.Keys;
 using LibHac.Crypto;
 using LibHac.Fs;
 using LibHac.Fs.Fsa;
-using LibHac.FsSystem;
 using Path = LibHac.Fs.Path;
 
 namespace LibHac.Tools.FsSystem.Save;
diff --git a/src/hactoolnet/Options.cs b/src/hactoolnet/Options.cs
index 5fda4ee9..6439c816 100644
--- a/src/hactoolnet/Options.cs
+++ b/src/hactoolnet/Options.cs
@@ -1,7 +1,7 @@
 using LibHac;
 using LibHac.Common;
 using LibHac.Common.Keys;
-using LibHac.FsSystem;
+using LibHac.Tools.FsSystem;
 
 namespace hactoolnet;
 
diff --git a/src/hactoolnet/Print.cs b/src/hactoolnet/Print.cs
index 480cbc2f..d0c8d801 100644
--- a/src/hactoolnet/Print.cs
+++ b/src/hactoolnet/Print.cs
@@ -2,7 +2,7 @@
 using System.Buffers.Binary;
 using System.Text;
 using LibHac.Common;
-using LibHac.FsSystem;
+using LibHac.Tools.FsSystem;
 using LibHac.Tools.FsSystem.NcaUtils;
 
 namespace hactoolnet;