diff --git a/src/LibHac/FsSrv/EmulatedGameCard.cs b/src/LibHac/FsSrv/EmulatedGameCard.cs
index 32ca0382..cbb6d994 100644
--- a/src/LibHac/FsSrv/EmulatedGameCard.cs
+++ b/src/LibHac/FsSrv/EmulatedGameCard.cs
@@ -2,6 +2,7 @@
 using LibHac.Common;
 using LibHac.Common.Keys;
 using LibHac.Fs;
+using LibHac.Tools.Fs;
 
 namespace LibHac.FsSrv;
 
@@ -120,4 +121,4 @@ public class EmulatedGameCard
 
         return info;
     }
-}
+}
\ No newline at end of file
diff --git a/src/LibHac/FsSrv/FsCreator/EmulatedGameCardFsCreator.cs b/src/LibHac/FsSrv/FsCreator/EmulatedGameCardFsCreator.cs
index a70b1d7d..550105c7 100644
--- a/src/LibHac/FsSrv/FsCreator/EmulatedGameCardFsCreator.cs
+++ b/src/LibHac/FsSrv/FsCreator/EmulatedGameCardFsCreator.cs
@@ -1,6 +1,7 @@
 using LibHac.Common;
 using LibHac.Fs;
 using LibHac.Fs.Fsa;
+using LibHac.Tools.Fs;
 
 namespace LibHac.FsSrv.FsCreator;
 
@@ -33,4 +34,4 @@ public class EmulatedGameCardFsCreator : IGameCardFileSystemCreator
         outFileSystem.Reset(fs);
         return Result.Success;
     }
-}
+}
\ No newline at end of file
diff --git a/src/LibHac/Xci.cs b/src/LibHac/Tools/Fs/Xci.cs
similarity index 98%
rename from src/LibHac/Xci.cs
rename to src/LibHac/Tools/Fs/Xci.cs
index ffe31bbe..ddc05c3f 100644
--- a/src/LibHac/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.Fs;
 
 namespace LibHac;
 
@@ -69,4 +70,4 @@ public class XciPartition : PartitionFileSystem
     public Validity HashValidity { get; set; } = Validity.Unchecked;
 
     public XciPartition(IStorage storage) : base(storage) { }
-}
+}
\ No newline at end of file
diff --git a/src/LibHac/XciHeader.cs b/src/LibHac/Tools/Fs/XciHeader.cs
similarity index 99%
rename from src/LibHac/XciHeader.cs
rename to src/LibHac/Tools/Fs/XciHeader.cs
index 9b03bd59..d27b3e1a 100644
--- a/src/LibHac/XciHeader.cs
+++ b/src/LibHac/Tools/Fs/XciHeader.cs
@@ -5,7 +5,7 @@ using LibHac.Common.Keys;
 using LibHac.Crypto;
 using LibHac.Fs;
 
-namespace LibHac;
+namespace LibHac.Tools.Fs;
 
 public class XciHeader
 {
@@ -174,4 +174,4 @@ public static class XciExtensions
                 throw new ArgumentOutOfRangeException(nameof(type), type, null);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/hactoolnet/EnumStrings.cs b/src/hactoolnet/EnumStrings.cs
index 8e21b014..da0033ce 100644
--- a/src/hactoolnet/EnumStrings.cs
+++ b/src/hactoolnet/EnumStrings.cs
@@ -2,6 +2,7 @@
 using LibHac.Fs;
 using LibHac.FsSystem.NcaUtils;
 using LibHac.Ncm;
+using LibHac.Tools.Fs;
 using ContentType = LibHac.Ncm.ContentType;
 
 namespace hactoolnet;
@@ -113,4 +114,4 @@ internal static class EnumStrings
             _ => value.ToString()
         };
     }
-}
+}
\ No newline at end of file
diff --git a/src/hactoolnet/ProcessXci.cs b/src/hactoolnet/ProcessXci.cs
index 2b7f30e3..4c60c9fc 100644
--- a/src/hactoolnet/ProcessXci.cs
+++ b/src/hactoolnet/ProcessXci.cs
@@ -5,6 +5,7 @@ using LibHac;
 using LibHac.Fs;
 using LibHac.FsSystem;
 using LibHac.FsSystem.NcaUtils;
+using LibHac.Tools.Fs;
 using static hactoolnet.Print;
 
 namespace hactoolnet;
@@ -205,4 +206,4 @@ internal static class ProcessXci
             default: return string.Empty;
         }
     }
-}
+}
\ No newline at end of file