diff --git a/src/LibHac/FsSrv/BaseFileSystemServiceImpl.cs b/src/LibHac/FsSrv/BaseFileSystemServiceImpl.cs
index 678f77aa..fad27a33 100644
--- a/src/LibHac/FsSrv/BaseFileSystemServiceImpl.cs
+++ b/src/LibHac/FsSrv/BaseFileSystemServiceImpl.cs
@@ -1,7 +1,7 @@
 using System;
 using LibHac.Common;
 using LibHac.Fs;
-using LibHac.FsSrv.Creators;
+using LibHac.FsSrv.FsCreator;
 using LibHac.FsSrv.Impl;
 using LibHac.FsSrv.Sf;
 using LibHac.Sf;
diff --git a/src/LibHac/FsSrv/BaseStorageService.cs b/src/LibHac/FsSrv/BaseStorageService.cs
index e3428adf..ea137467 100644
--- a/src/LibHac/FsSrv/BaseStorageService.cs
+++ b/src/LibHac/FsSrv/BaseStorageService.cs
@@ -1,7 +1,7 @@
 using System;
 using LibHac.Common;
 using LibHac.Fs;
-using LibHac.FsSrv.Creators;
+using LibHac.FsSrv.FsCreator;
 using LibHac.FsSrv.Impl;
 using LibHac.FsSrv.Sf;
 using LibHac.FsSystem;
diff --git a/src/LibHac/FsSrv/DefaultFsServerObjects.cs b/src/LibHac/FsSrv/DefaultFsServerObjects.cs
index d1642473..7d35453f 100644
--- a/src/LibHac/FsSrv/DefaultFsServerObjects.cs
+++ b/src/LibHac/FsSrv/DefaultFsServerObjects.cs
@@ -1,5 +1,5 @@
 using LibHac.Common.Keys;
-using LibHac.FsSrv.Creators;
+using LibHac.FsSrv.FsCreator;
 using LibHac.FsSrv.Sf;
 using IFileSystem = LibHac.Fs.Fsa.IFileSystem;
 
diff --git a/src/LibHac/FsSrv/FileSystemProxyConfiguration.cs b/src/LibHac/FsSrv/FileSystemProxyConfiguration.cs
index f6a04ea5..deced487 100644
--- a/src/LibHac/FsSrv/FileSystemProxyConfiguration.cs
+++ b/src/LibHac/FsSrv/FileSystemProxyConfiguration.cs
@@ -1,4 +1,4 @@
-using LibHac.FsSrv.Creators;
+using LibHac.FsSrv.FsCreator;
 
 namespace LibHac.FsSrv
 {
diff --git a/src/LibHac/FsSrv/FileSystemProxyCoreImpl.cs b/src/LibHac/FsSrv/FileSystemProxyCoreImpl.cs
index 08da2129..28509a22 100644
--- a/src/LibHac/FsSrv/FileSystemProxyCoreImpl.cs
+++ b/src/LibHac/FsSrv/FileSystemProxyCoreImpl.cs
@@ -3,7 +3,7 @@ using LibHac.Common;
 using LibHac.Fs;
 using LibHac.Fs.Fsa;
 using LibHac.Fs.Shim;
-using LibHac.FsSrv.Creators;
+using LibHac.FsSrv.FsCreator;
 using LibHac.FsSrv.Impl;
 
 namespace LibHac.FsSrv
diff --git a/src/LibHac/FsSrv/FileSystemServerInitializer.cs b/src/LibHac/FsSrv/FileSystemServerInitializer.cs
index 7c13ba50..7120c338 100644
--- a/src/LibHac/FsSrv/FileSystemServerInitializer.cs
+++ b/src/LibHac/FsSrv/FileSystemServerInitializer.cs
@@ -1,7 +1,7 @@
 using System;
 using LibHac.Fs.Impl;
 using LibHac.Fs.Shim;
-using LibHac.FsSrv.Creators;
+using LibHac.FsSrv.FsCreator;
 using LibHac.FsSrv.Impl;
 using LibHac.FsSrv.Sf;
 using LibHac.FsSrv.Storage;
diff --git a/src/LibHac/FsSrv/Creators/EmulatedBisFileSystemCreator.cs b/src/LibHac/FsSrv/FsCreator/EmulatedBisFileSystemCreator.cs
similarity index 99%
rename from src/LibHac/FsSrv/Creators/EmulatedBisFileSystemCreator.cs
rename to src/LibHac/FsSrv/FsCreator/EmulatedBisFileSystemCreator.cs
index cafce4a6..9d4d8328 100644
--- a/src/LibHac/FsSrv/Creators/EmulatedBisFileSystemCreator.cs
+++ b/src/LibHac/FsSrv/FsCreator/EmulatedBisFileSystemCreator.cs
@@ -4,7 +4,7 @@ using LibHac.Fs;
 using LibHac.Fs.Fsa;
 using LibHac.FsSrv.Impl;
 
-namespace LibHac.FsSrv.Creators
+namespace LibHac.FsSrv.FsCreator
 {
     /// <summary>
     /// Provides <see cref="IFileSystem"/> objects for the built-in storage (BIS) partitions.
diff --git a/src/LibHac/FsSrv/Creators/EmulatedBisFileSystemCreatorConfig.cs b/src/LibHac/FsSrv/FsCreator/EmulatedBisFileSystemCreatorConfig.cs
similarity index 98%
rename from src/LibHac/FsSrv/Creators/EmulatedBisFileSystemCreatorConfig.cs
rename to src/LibHac/FsSrv/FsCreator/EmulatedBisFileSystemCreatorConfig.cs
index a21760b2..7d3fb416 100644
--- a/src/LibHac/FsSrv/Creators/EmulatedBisFileSystemCreatorConfig.cs
+++ b/src/LibHac/FsSrv/FsCreator/EmulatedBisFileSystemCreatorConfig.cs
@@ -3,7 +3,7 @@ using LibHac.Common;
 using LibHac.Fs;
 using LibHac.Fs.Fsa;
 
-namespace LibHac.FsSrv.Creators
+namespace LibHac.FsSrv.FsCreator
 {
     /// <summary>
     /// Configuration for <see cref="EmulatedBisFileSystemCreator"/> that specifies how each
diff --git a/src/LibHac/FsSrv/Creators/EmulatedGameCardFsCreator.cs b/src/LibHac/FsSrv/FsCreator/EmulatedGameCardFsCreator.cs
similarity index 98%
rename from src/LibHac/FsSrv/Creators/EmulatedGameCardFsCreator.cs
rename to src/LibHac/FsSrv/FsCreator/EmulatedGameCardFsCreator.cs
index 1ed4f3e2..a7e4b830 100644
--- a/src/LibHac/FsSrv/Creators/EmulatedGameCardFsCreator.cs
+++ b/src/LibHac/FsSrv/FsCreator/EmulatedGameCardFsCreator.cs
@@ -2,7 +2,7 @@
 using LibHac.Fs;
 using LibHac.Fs.Fsa;
 
-namespace LibHac.FsSrv.Creators
+namespace LibHac.FsSrv.FsCreator
 {
     public class EmulatedGameCardFsCreator : IGameCardFileSystemCreator
     {
diff --git a/src/LibHac/FsSrv/Creators/EmulatedGameCardStorageCreator.cs b/src/LibHac/FsSrv/FsCreator/EmulatedGameCardStorageCreator.cs
similarity index 99%
rename from src/LibHac/FsSrv/Creators/EmulatedGameCardStorageCreator.cs
rename to src/LibHac/FsSrv/FsCreator/EmulatedGameCardStorageCreator.cs
index e5f1be57..2941bce4 100644
--- a/src/LibHac/FsSrv/Creators/EmulatedGameCardStorageCreator.cs
+++ b/src/LibHac/FsSrv/FsCreator/EmulatedGameCardStorageCreator.cs
@@ -2,7 +2,7 @@
 using LibHac.Common;
 using LibHac.Fs;
 
-namespace LibHac.FsSrv.Creators
+namespace LibHac.FsSrv.FsCreator
 {
     public class EmulatedGameCardStorageCreator : IGameCardStorageCreator
     {
diff --git a/src/LibHac/FsSrv/Creators/EmulatedSdCardFileSystemCreator.cs b/src/LibHac/FsSrv/FsCreator/EmulatedSdCardFileSystemCreator.cs
similarity index 98%
rename from src/LibHac/FsSrv/Creators/EmulatedSdCardFileSystemCreator.cs
rename to src/LibHac/FsSrv/FsCreator/EmulatedSdCardFileSystemCreator.cs
index d7140fb0..052fc865 100644
--- a/src/LibHac/FsSrv/Creators/EmulatedSdCardFileSystemCreator.cs
+++ b/src/LibHac/FsSrv/FsCreator/EmulatedSdCardFileSystemCreator.cs
@@ -3,7 +3,7 @@ using LibHac.Common;
 using LibHac.Fs;
 using LibHac.Fs.Fsa;
 
-namespace LibHac.FsSrv.Creators
+namespace LibHac.FsSrv.FsCreator
 {
     public class EmulatedSdCardFileSystemCreator : ISdCardProxyFileSystemCreator
     {
diff --git a/src/LibHac/FsSrv/Creators/EncryptedFileSystemCreator.cs b/src/LibHac/FsSrv/FsCreator/EncryptedFileSystemCreator.cs
similarity index 97%
rename from src/LibHac/FsSrv/Creators/EncryptedFileSystemCreator.cs
rename to src/LibHac/FsSrv/FsCreator/EncryptedFileSystemCreator.cs
index 1cbf9330..8a3a4083 100644
--- a/src/LibHac/FsSrv/Creators/EncryptedFileSystemCreator.cs
+++ b/src/LibHac/FsSrv/FsCreator/EncryptedFileSystemCreator.cs
@@ -4,7 +4,7 @@ using LibHac.Fs;
 using LibHac.Fs.Fsa;
 using LibHac.FsSystem;
 
-namespace LibHac.FsSrv.Creators
+namespace LibHac.FsSrv.FsCreator
 {
     public class EncryptedFileSystemCreator : IEncryptedFileSystemCreator
     {
diff --git a/src/LibHac/FsSrv/Creators/FileSystemCreatorInterfaces.cs b/src/LibHac/FsSrv/FsCreator/FileSystemCreatorInterfaces.cs
similarity index 97%
rename from src/LibHac/FsSrv/Creators/FileSystemCreatorInterfaces.cs
rename to src/LibHac/FsSrv/FsCreator/FileSystemCreatorInterfaces.cs
index def57d17..7168481b 100644
--- a/src/LibHac/FsSrv/Creators/FileSystemCreatorInterfaces.cs
+++ b/src/LibHac/FsSrv/FsCreator/FileSystemCreatorInterfaces.cs
@@ -1,4 +1,4 @@
-namespace LibHac.FsSrv.Creators
+namespace LibHac.FsSrv.FsCreator
 {
     public class FileSystemCreatorInterfaces
     {
diff --git a/src/LibHac/FsSrv/Creators/IBuiltInStorageCreator.cs b/src/LibHac/FsSrv/FsCreator/IBuiltInStorageCreator.cs
similarity index 86%
rename from src/LibHac/FsSrv/Creators/IBuiltInStorageCreator.cs
rename to src/LibHac/FsSrv/FsCreator/IBuiltInStorageCreator.cs
index 2b58c738..c4d3c045 100644
--- a/src/LibHac/FsSrv/Creators/IBuiltInStorageCreator.cs
+++ b/src/LibHac/FsSrv/FsCreator/IBuiltInStorageCreator.cs
@@ -1,6 +1,6 @@
 using LibHac.Fs;
 
-namespace LibHac.FsSrv.Creators
+namespace LibHac.FsSrv.FsCreator
 {
     public interface IBuiltInStorageCreator
     {
diff --git a/src/LibHac/FsSrv/Creators/IBuiltInStorageFileSystemCreator.cs b/src/LibHac/FsSrv/FsCreator/IBuiltInStorageFileSystemCreator.cs
similarity index 94%
rename from src/LibHac/FsSrv/Creators/IBuiltInStorageFileSystemCreator.cs
rename to src/LibHac/FsSrv/FsCreator/IBuiltInStorageFileSystemCreator.cs
index c36ab875..dc7782df 100644
--- a/src/LibHac/FsSrv/Creators/IBuiltInStorageFileSystemCreator.cs
+++ b/src/LibHac/FsSrv/FsCreator/IBuiltInStorageFileSystemCreator.cs
@@ -2,7 +2,7 @@
 using LibHac.Fs;
 using LibHac.Fs.Fsa;
 
-namespace LibHac.FsSrv.Creators
+namespace LibHac.FsSrv.FsCreator
 {
     public interface IBuiltInStorageFileSystemCreator
     {
diff --git a/src/LibHac/FsSrv/Creators/IEncryptedFileSystemCreator.cs b/src/LibHac/FsSrv/FsCreator/IEncryptedFileSystemCreator.cs
similarity index 93%
rename from src/LibHac/FsSrv/Creators/IEncryptedFileSystemCreator.cs
rename to src/LibHac/FsSrv/FsCreator/IEncryptedFileSystemCreator.cs
index 5262f4b6..a8337b05 100644
--- a/src/LibHac/FsSrv/Creators/IEncryptedFileSystemCreator.cs
+++ b/src/LibHac/FsSrv/FsCreator/IEncryptedFileSystemCreator.cs
@@ -1,7 +1,7 @@
 using LibHac.Fs;
 using LibHac.Fs.Fsa;
 
-namespace LibHac.FsSrv.Creators
+namespace LibHac.FsSrv.FsCreator
 {
     public interface IEncryptedFileSystemCreator
     {
diff --git a/src/LibHac/FsSrv/Creators/IFatFileSystemCreator.cs b/src/LibHac/FsSrv/FsCreator/IFatFileSystemCreator.cs
similarity index 94%
rename from src/LibHac/FsSrv/Creators/IFatFileSystemCreator.cs
rename to src/LibHac/FsSrv/FsCreator/IFatFileSystemCreator.cs
index 6ecf6d38..490acd2a 100644
--- a/src/LibHac/FsSrv/Creators/IFatFileSystemCreator.cs
+++ b/src/LibHac/FsSrv/FsCreator/IFatFileSystemCreator.cs
@@ -2,7 +2,7 @@
 using LibHac.Fs;
 using LibHac.Fs.Fsa;
 
-namespace LibHac.FsSrv.Creators
+namespace LibHac.FsSrv.FsCreator
 {
     public interface IFatFileSystemCreator
     {
diff --git a/src/LibHac/FsSrv/Creators/IGameCardFileSystemCreator.cs b/src/LibHac/FsSrv/FsCreator/IGameCardFileSystemCreator.cs
similarity index 91%
rename from src/LibHac/FsSrv/Creators/IGameCardFileSystemCreator.cs
rename to src/LibHac/FsSrv/FsCreator/IGameCardFileSystemCreator.cs
index d8f8cc18..8033b740 100644
--- a/src/LibHac/FsSrv/Creators/IGameCardFileSystemCreator.cs
+++ b/src/LibHac/FsSrv/FsCreator/IGameCardFileSystemCreator.cs
@@ -1,7 +1,7 @@
 using LibHac.Fs;
 using LibHac.Fs.Fsa;
 
-namespace LibHac.FsSrv.Creators
+namespace LibHac.FsSrv.FsCreator
 {
     public interface IGameCardFileSystemCreator
     {
diff --git a/src/LibHac/FsSrv/Creators/IGameCardStorageCreator.cs b/src/LibHac/FsSrv/FsCreator/IGameCardStorageCreator.cs
similarity index 92%
rename from src/LibHac/FsSrv/Creators/IGameCardStorageCreator.cs
rename to src/LibHac/FsSrv/FsCreator/IGameCardStorageCreator.cs
index a6874e41..747f7914 100644
--- a/src/LibHac/FsSrv/Creators/IGameCardStorageCreator.cs
+++ b/src/LibHac/FsSrv/FsCreator/IGameCardStorageCreator.cs
@@ -1,6 +1,6 @@
 using LibHac.Fs;
 
-namespace LibHac.FsSrv.Creators
+namespace LibHac.FsSrv.FsCreator
 {
     public interface IGameCardStorageCreator
     {
diff --git a/src/LibHac/FsSrv/Creators/IHostFileSystemCreator.cs b/src/LibHac/FsSrv/FsCreator/IHostFileSystemCreator.cs
similarity index 87%
rename from src/LibHac/FsSrv/Creators/IHostFileSystemCreator.cs
rename to src/LibHac/FsSrv/FsCreator/IHostFileSystemCreator.cs
index 37a95609..da53e495 100644
--- a/src/LibHac/FsSrv/Creators/IHostFileSystemCreator.cs
+++ b/src/LibHac/FsSrv/FsCreator/IHostFileSystemCreator.cs
@@ -1,6 +1,6 @@
 using LibHac.Fs.Fsa;
 
-namespace LibHac.FsSrv.Creators
+namespace LibHac.FsSrv.FsCreator
 {
     public interface IHostFileSystemCreator
     {
diff --git a/src/LibHac/FsSrv/Creators/IMemoryStorageCreator.cs b/src/LibHac/FsSrv/FsCreator/IMemoryStorageCreator.cs
similarity index 88%
rename from src/LibHac/FsSrv/Creators/IMemoryStorageCreator.cs
rename to src/LibHac/FsSrv/FsCreator/IMemoryStorageCreator.cs
index 0cc8c278..e153d645 100644
--- a/src/LibHac/FsSrv/Creators/IMemoryStorageCreator.cs
+++ b/src/LibHac/FsSrv/FsCreator/IMemoryStorageCreator.cs
@@ -1,7 +1,7 @@
 using System;
 using LibHac.Fs;
 
-namespace LibHac.FsSrv.Creators
+namespace LibHac.FsSrv.FsCreator
 {
     public interface IMemoryStorageCreator
     {
diff --git a/src/LibHac/FsSrv/Creators/IPartitionFileSystemCreator.cs b/src/LibHac/FsSrv/FsCreator/IPartitionFileSystemCreator.cs
similarity index 91%
rename from src/LibHac/FsSrv/Creators/IPartitionFileSystemCreator.cs
rename to src/LibHac/FsSrv/FsCreator/IPartitionFileSystemCreator.cs
index 31a3e5c1..112dde82 100644
--- a/src/LibHac/FsSrv/Creators/IPartitionFileSystemCreator.cs
+++ b/src/LibHac/FsSrv/FsCreator/IPartitionFileSystemCreator.cs
@@ -1,7 +1,7 @@
 using LibHac.Fs;
 using LibHac.Fs.Fsa;
 
-namespace LibHac.FsSrv.Creators
+namespace LibHac.FsSrv.FsCreator
 {
     public interface IPartitionFileSystemCreator
     {
diff --git a/src/LibHac/FsSrv/Creators/IRomFileSystemCreator.cs b/src/LibHac/FsSrv/FsCreator/IRomFileSystemCreator.cs
similarity index 87%
rename from src/LibHac/FsSrv/Creators/IRomFileSystemCreator.cs
rename to src/LibHac/FsSrv/FsCreator/IRomFileSystemCreator.cs
index 16ce296b..0f8a9e00 100644
--- a/src/LibHac/FsSrv/Creators/IRomFileSystemCreator.cs
+++ b/src/LibHac/FsSrv/FsCreator/IRomFileSystemCreator.cs
@@ -1,7 +1,7 @@
 using LibHac.Fs;
 using LibHac.Fs.Fsa;
 
-namespace LibHac.FsSrv.Creators
+namespace LibHac.FsSrv.FsCreator
 {
     public interface IRomFileSystemCreator
     {
diff --git a/src/LibHac/FsSrv/Creators/ISaveDataFileSystemCreator.cs b/src/LibHac/FsSrv/FsCreator/ISaveDataFileSystemCreator.cs
similarity index 95%
rename from src/LibHac/FsSrv/Creators/ISaveDataFileSystemCreator.cs
rename to src/LibHac/FsSrv/FsCreator/ISaveDataFileSystemCreator.cs
index 6c9abfb0..0f82429b 100644
--- a/src/LibHac/FsSrv/Creators/ISaveDataFileSystemCreator.cs
+++ b/src/LibHac/FsSrv/FsCreator/ISaveDataFileSystemCreator.cs
@@ -4,7 +4,7 @@ using LibHac.Fs;
 using LibHac.Fs.Fsa;
 using LibHac.FsSystem;
 
-namespace LibHac.FsSrv.Creators
+namespace LibHac.FsSrv.FsCreator
 {
     public interface ISaveDataFileSystemCreator
     {
diff --git a/src/LibHac/FsSrv/Creators/ISdCardProxyFileSystemCreator.cs b/src/LibHac/FsSrv/FsCreator/ISdCardProxyFileSystemCreator.cs
similarity index 95%
rename from src/LibHac/FsSrv/Creators/ISdCardProxyFileSystemCreator.cs
rename to src/LibHac/FsSrv/FsCreator/ISdCardProxyFileSystemCreator.cs
index 6a8c978b..ecd20873 100644
--- a/src/LibHac/FsSrv/Creators/ISdCardProxyFileSystemCreator.cs
+++ b/src/LibHac/FsSrv/FsCreator/ISdCardProxyFileSystemCreator.cs
@@ -1,6 +1,6 @@
 using LibHac.Fs.Fsa;
 
-namespace LibHac.FsSrv.Creators
+namespace LibHac.FsSrv.FsCreator
 {
     public interface ISdCardProxyFileSystemCreator
     {
diff --git a/src/LibHac/FsSrv/Creators/ISdStorageCreator.cs b/src/LibHac/FsSrv/FsCreator/ISdStorageCreator.cs
similarity index 78%
rename from src/LibHac/FsSrv/Creators/ISdStorageCreator.cs
rename to src/LibHac/FsSrv/FsCreator/ISdStorageCreator.cs
index 8fe86e2b..f52c0a8f 100644
--- a/src/LibHac/FsSrv/Creators/ISdStorageCreator.cs
+++ b/src/LibHac/FsSrv/FsCreator/ISdStorageCreator.cs
@@ -1,6 +1,6 @@
 using LibHac.Fs;
 
-namespace LibHac.FsSrv.Creators
+namespace LibHac.FsSrv.FsCreator
 {
     public interface ISdStorageCreator
     {
diff --git a/src/LibHac/FsSrv/Creators/IStorageOnNcaCreator.cs b/src/LibHac/FsSrv/FsCreator/IStorageOnNcaCreator.cs
similarity index 94%
rename from src/LibHac/FsSrv/Creators/IStorageOnNcaCreator.cs
rename to src/LibHac/FsSrv/FsCreator/IStorageOnNcaCreator.cs
index f312a3ad..cf0f93f6 100644
--- a/src/LibHac/FsSrv/Creators/IStorageOnNcaCreator.cs
+++ b/src/LibHac/FsSrv/FsCreator/IStorageOnNcaCreator.cs
@@ -2,7 +2,7 @@
 using LibHac.Fs.Fsa;
 using LibHac.FsSystem.NcaUtils;
 
-namespace LibHac.FsSrv.Creators
+namespace LibHac.FsSrv.FsCreator
 {
     public interface IStorageOnNcaCreator
     {
diff --git a/src/LibHac/FsSrv/Creators/ISubDirectoryFileSystemCreator.cs b/src/LibHac/FsSrv/FsCreator/ISubDirectoryFileSystemCreator.cs
similarity index 93%
rename from src/LibHac/FsSrv/Creators/ISubDirectoryFileSystemCreator.cs
rename to src/LibHac/FsSrv/FsCreator/ISubDirectoryFileSystemCreator.cs
index 2fd5b50f..9e4c4139 100644
--- a/src/LibHac/FsSrv/Creators/ISubDirectoryFileSystemCreator.cs
+++ b/src/LibHac/FsSrv/FsCreator/ISubDirectoryFileSystemCreator.cs
@@ -1,7 +1,7 @@
 using LibHac.Common;
 using LibHac.Fs.Fsa;
 
-namespace LibHac.FsSrv.Creators
+namespace LibHac.FsSrv.FsCreator
 {
     public interface ISubDirectoryFileSystemCreator
     {
diff --git a/src/LibHac/FsSrv/Creators/ITargetManagerFileSystemCreator.cs b/src/LibHac/FsSrv/FsCreator/ITargetManagerFileSystemCreator.cs
similarity index 92%
rename from src/LibHac/FsSrv/Creators/ITargetManagerFileSystemCreator.cs
rename to src/LibHac/FsSrv/FsCreator/ITargetManagerFileSystemCreator.cs
index e65e9fa4..63c300e6 100644
--- a/src/LibHac/FsSrv/Creators/ITargetManagerFileSystemCreator.cs
+++ b/src/LibHac/FsSrv/FsCreator/ITargetManagerFileSystemCreator.cs
@@ -1,7 +1,7 @@
 using System;
 using LibHac.Fs.Fsa;
 
-namespace LibHac.FsSrv.Creators
+namespace LibHac.FsSrv.FsCreator
 {
     public interface ITargetManagerFileSystemCreator
     {
diff --git a/src/LibHac/FsSrv/Creators/PartitionFileSystemCreator.cs b/src/LibHac/FsSrv/FsCreator/PartitionFileSystemCreator.cs
similarity index 97%
rename from src/LibHac/FsSrv/Creators/PartitionFileSystemCreator.cs
rename to src/LibHac/FsSrv/FsCreator/PartitionFileSystemCreator.cs
index aee3c74a..5e67fe7c 100644
--- a/src/LibHac/FsSrv/Creators/PartitionFileSystemCreator.cs
+++ b/src/LibHac/FsSrv/FsCreator/PartitionFileSystemCreator.cs
@@ -4,7 +4,7 @@ using LibHac.Fs.Fsa;
 using LibHac.FsSystem;
 using LibHac.FsSystem.Detail;
 
-namespace LibHac.FsSrv.Creators
+namespace LibHac.FsSrv.FsCreator
 {
     public class PartitionFileSystemCreator : IPartitionFileSystemCreator
     {
diff --git a/src/LibHac/FsSrv/Creators/RomFileSystemCreator.cs b/src/LibHac/FsSrv/FsCreator/RomFileSystemCreator.cs
similarity index 94%
rename from src/LibHac/FsSrv/Creators/RomFileSystemCreator.cs
rename to src/LibHac/FsSrv/FsCreator/RomFileSystemCreator.cs
index fa8a042e..585d01ea 100644
--- a/src/LibHac/FsSrv/Creators/RomFileSystemCreator.cs
+++ b/src/LibHac/FsSrv/FsCreator/RomFileSystemCreator.cs
@@ -2,7 +2,7 @@
 using LibHac.Fs.Fsa;
 using LibHac.FsSystem.RomFs;
 
-namespace LibHac.FsSrv.Creators
+namespace LibHac.FsSrv.FsCreator
 {
     public class RomFileSystemCreator : IRomFileSystemCreator
     {
diff --git a/src/LibHac/FsSrv/Creators/SaveDataFileSystemCreator.cs b/src/LibHac/FsSrv/FsCreator/SaveDataFileSystemCreator.cs
similarity index 98%
rename from src/LibHac/FsSrv/Creators/SaveDataFileSystemCreator.cs
rename to src/LibHac/FsSrv/FsCreator/SaveDataFileSystemCreator.cs
index 86503fda..d0769249 100644
--- a/src/LibHac/FsSrv/Creators/SaveDataFileSystemCreator.cs
+++ b/src/LibHac/FsSrv/FsCreator/SaveDataFileSystemCreator.cs
@@ -6,7 +6,7 @@ using LibHac.Fs.Fsa;
 using LibHac.FsSystem;
 using LibHac.FsSystem.Save;
 
-namespace LibHac.FsSrv.Creators
+namespace LibHac.FsSrv.FsCreator
 {
     public class SaveDataFileSystemCreator : ISaveDataFileSystemCreator
     {
diff --git a/src/LibHac/FsSrv/Creators/StorageOnNcaCreator.cs b/src/LibHac/FsSrv/FsCreator/StorageOnNcaCreator.cs
similarity index 98%
rename from src/LibHac/FsSrv/Creators/StorageOnNcaCreator.cs
rename to src/LibHac/FsSrv/FsCreator/StorageOnNcaCreator.cs
index f51d4eb8..8ce51a10 100644
--- a/src/LibHac/FsSrv/Creators/StorageOnNcaCreator.cs
+++ b/src/LibHac/FsSrv/FsCreator/StorageOnNcaCreator.cs
@@ -7,7 +7,7 @@ using LibHac.FsSystem;
 using LibHac.FsSystem.Detail;
 using LibHac.FsSystem.NcaUtils;
 
-namespace LibHac.FsSrv.Creators
+namespace LibHac.FsSrv.FsCreator
 {
     public class StorageOnNcaCreator : IStorageOnNcaCreator
     {
diff --git a/src/LibHac/FsSrv/Creators/SubDirectoryFileSystemCreator.cs b/src/LibHac/FsSrv/FsCreator/SubDirectoryFileSystemCreator.cs
similarity index 97%
rename from src/LibHac/FsSrv/Creators/SubDirectoryFileSystemCreator.cs
rename to src/LibHac/FsSrv/FsCreator/SubDirectoryFileSystemCreator.cs
index 26774529..16e2afa6 100644
--- a/src/LibHac/FsSrv/Creators/SubDirectoryFileSystemCreator.cs
+++ b/src/LibHac/FsSrv/FsCreator/SubDirectoryFileSystemCreator.cs
@@ -2,7 +2,7 @@
 using LibHac.Fs.Fsa;
 using LibHac.FsSystem;
 
-namespace LibHac.FsSrv.Creators
+namespace LibHac.FsSrv.FsCreator
 {
     public class SubDirectoryFileSystemCreator : ISubDirectoryFileSystemCreator
     {
diff --git a/src/LibHac/FsSrv/Creators/TargetManagerFileSystemCreator.cs b/src/LibHac/FsSrv/FsCreator/TargetManagerFileSystemCreator.cs
similarity index 94%
rename from src/LibHac/FsSrv/Creators/TargetManagerFileSystemCreator.cs
rename to src/LibHac/FsSrv/FsCreator/TargetManagerFileSystemCreator.cs
index e76866b1..653fbacb 100644
--- a/src/LibHac/FsSrv/Creators/TargetManagerFileSystemCreator.cs
+++ b/src/LibHac/FsSrv/FsCreator/TargetManagerFileSystemCreator.cs
@@ -1,7 +1,7 @@
 using System;
 using LibHac.Fs.Fsa;
 
-namespace LibHac.FsSrv.Creators
+namespace LibHac.FsSrv.FsCreator
 {
     public class TargetManagerFileSystemCreator : ITargetManagerFileSystemCreator
     {
diff --git a/src/LibHac/FsSrv/NcaFileSystemServiceImpl.cs b/src/LibHac/FsSrv/NcaFileSystemServiceImpl.cs
index 2415c381..2c63b02a 100644
--- a/src/LibHac/FsSrv/NcaFileSystemServiceImpl.cs
+++ b/src/LibHac/FsSrv/NcaFileSystemServiceImpl.cs
@@ -4,7 +4,7 @@ using System.Runtime.CompilerServices;
 using LibHac.Common;
 using LibHac.Fs;
 using LibHac.Fs.Fsa;
-using LibHac.FsSrv.Creators;
+using LibHac.FsSrv.FsCreator;
 using LibHac.FsSrv.Impl;
 using LibHac.FsSystem;
 using LibHac.FsSystem.NcaUtils;
diff --git a/src/LibHac/FsSrv/SaveDataFileSystemServiceImpl.cs b/src/LibHac/FsSrv/SaveDataFileSystemServiceImpl.cs
index 6ad04da3..90256358 100644
--- a/src/LibHac/FsSrv/SaveDataFileSystemServiceImpl.cs
+++ b/src/LibHac/FsSrv/SaveDataFileSystemServiceImpl.cs
@@ -3,7 +3,7 @@ using System.Runtime.CompilerServices;
 using LibHac.Common;
 using LibHac.Fs;
 using LibHac.Fs.Fsa;
-using LibHac.FsSrv.Creators;
+using LibHac.FsSrv.FsCreator;
 using LibHac.FsSrv.Impl;
 using LibHac.FsSystem;
 using LibHac.FsSystem.Save;