diff --git a/src/LibHac/IO/HierarchicalRomFileTable.cs b/src/LibHac/IO/RomFs/HierarchicalRomFileTable.cs
similarity index 99%
rename from src/LibHac/IO/HierarchicalRomFileTable.cs
rename to src/LibHac/IO/RomFs/HierarchicalRomFileTable.cs
index 2614790c..deb239e2 100644
--- a/src/LibHac/IO/HierarchicalRomFileTable.cs
+++ b/src/LibHac/IO/RomFs/HierarchicalRomFileTable.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace LibHac.IO
+namespace LibHac.IO.RomFs
 {
     public class HierarchicalRomFileTable
     {
diff --git a/src/LibHac/IO/RomFsDictionary.cs b/src/LibHac/IO/RomFs/RomFsDictionary.cs
similarity index 99%
rename from src/LibHac/IO/RomFsDictionary.cs
rename to src/LibHac/IO/RomFs/RomFsDictionary.cs
index bfd0903f..2c05416d 100644
--- a/src/LibHac/IO/RomFsDictionary.cs
+++ b/src/LibHac/IO/RomFs/RomFsDictionary.cs
@@ -4,7 +4,7 @@ using System.IO;
 using System.Runtime.InteropServices;
 using System.Text;
 
-namespace LibHac.IO
+namespace LibHac.IO.RomFs
 {
     internal class RomFsDictionary<T> where T : unmanaged
     {
diff --git a/src/LibHac/IO/RomFsDirectory.cs b/src/LibHac/IO/RomFs/RomFsDirectory.cs
similarity index 98%
rename from src/LibHac/IO/RomFsDirectory.cs
rename to src/LibHac/IO/RomFs/RomFsDirectory.cs
index 4a9f3ef8..a7b745c9 100644
--- a/src/LibHac/IO/RomFsDirectory.cs
+++ b/src/LibHac/IO/RomFs/RomFsDirectory.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace LibHac.IO
+namespace LibHac.IO.RomFs
 {
     public class RomFsDirectory : IDirectory
     {
diff --git a/src/LibHac/IO/RomFsFile.cs b/src/LibHac/IO/RomFs/RomFsFile.cs
similarity index 97%
rename from src/LibHac/IO/RomFsFile.cs
rename to src/LibHac/IO/RomFs/RomFsFile.cs
index 2f96586c..73a445fc 100644
--- a/src/LibHac/IO/RomFsFile.cs
+++ b/src/LibHac/IO/RomFs/RomFsFile.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace LibHac.IO
+namespace LibHac.IO.RomFs
 {
     public class RomFsFile : FileBase
     {
diff --git a/src/LibHac/IO/RomFsFileSystem.cs b/src/LibHac/IO/RomFs/RomFsFileSystem.cs
similarity index 99%
rename from src/LibHac/IO/RomFsFileSystem.cs
rename to src/LibHac/IO/RomFs/RomFsFileSystem.cs
index 6ed8166b..2ef69c1d 100644
--- a/src/LibHac/IO/RomFsFileSystem.cs
+++ b/src/LibHac/IO/RomFs/RomFsFileSystem.cs
@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 
-namespace LibHac.IO
+namespace LibHac.IO.RomFs
 {
     public class RomFsFileSystem : IFileSystem
     {
diff --git a/src/LibHac/Nca.cs b/src/LibHac/Nca.cs
index 655fb68f..6a0baf66 100644
--- a/src/LibHac/Nca.cs
+++ b/src/LibHac/Nca.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using LibHac.IO;
+using LibHac.IO.RomFs;
 
 namespace LibHac
 {
diff --git a/src/LibHac/SwitchFs.cs b/src/LibHac/SwitchFs.cs
index cb976017..89151044 100644
--- a/src/LibHac/SwitchFs.cs
+++ b/src/LibHac/SwitchFs.cs
@@ -4,6 +4,7 @@ using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using LibHac.IO;
+using LibHac.IO.RomFs;
 using LibHac.IO.Save;
 
 namespace LibHac
diff --git a/src/hactoolnet/ProcessNca.cs b/src/hactoolnet/ProcessNca.cs
index 51f40abc..18990437 100644
--- a/src/hactoolnet/ProcessNca.cs
+++ b/src/hactoolnet/ProcessNca.cs
@@ -3,6 +3,7 @@ using System.Linq;
 using System.Text;
 using LibHac;
 using LibHac.IO;
+using LibHac.IO.RomFs;
 using static hactoolnet.Print;
 
 namespace hactoolnet
diff --git a/src/hactoolnet/ProcessRomfs.cs b/src/hactoolnet/ProcessRomfs.cs
index 762e23d2..99b87e6a 100644
--- a/src/hactoolnet/ProcessRomfs.cs
+++ b/src/hactoolnet/ProcessRomfs.cs
@@ -1,5 +1,6 @@
 using System.IO;
 using LibHac.IO;
+using LibHac.IO.RomFs;
 
 namespace hactoolnet
 {
diff --git a/src/hactoolnet/ProcessSwitchFs.cs b/src/hactoolnet/ProcessSwitchFs.cs
index 3fbf1596..8f4ec823 100644
--- a/src/hactoolnet/ProcessSwitchFs.cs
+++ b/src/hactoolnet/ProcessSwitchFs.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using System.Text;
 using LibHac;
 using LibHac.IO;
+using LibHac.IO.RomFs;
 using LibHac.IO.Save;
 
 namespace hactoolnet
diff --git a/src/hactoolnet/ProcessXci.cs b/src/hactoolnet/ProcessXci.cs
index 62867d31..843381ae 100644
--- a/src/hactoolnet/ProcessXci.cs
+++ b/src/hactoolnet/ProcessXci.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Text;
 using LibHac;
 using LibHac.IO;
+using LibHac.IO.RomFs;
 using static hactoolnet.Print;
 
 namespace hactoolnet