Rename FS namespaces

src/LibHac/Cnmt.cs

@@ -1,6 +1,6 @@
 using System.IO;
 using System.Linq;
-using LibHac.Fs.NcaUtils;
+using LibHac.FsSystem.NcaUtils;
 using LibHac.Ncm;
 using ContentType = LibHac.Ncm.ContentType;
 

src/LibHac/Common/Id128.cs

@@ -35,7 +35,7 @@ namespace LibHac.Common
 
         public override bool Equals(object obj)
         {
-            return obj is Fs.UserId other && Equals(other);
+            return obj is FsSystem.UserId other && Equals(other);
         }
 
         public override int GetHashCode()

src/LibHac/Crypto.cs

@@ -2,7 +2,7 @@
 using System.IO;
 using System.Numerics;
 using System.Security.Cryptography;
-using LibHac.Fs;
+using LibHac.FsSystem;
 
 namespace LibHac
 {

src/LibHac/Fs/Accessors/DirectoryAccessor.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
-using LibHac.Fs;
+using LibHac.FsSystem;
 
-namespace LibHac.FsClient.Accessors
+namespace LibHac.Fs.Accessors
 {
     public class DirectoryAccessor : IDisposable
     {

src/LibHac/Fs/Accessors/FileAccessor.cs

@@ -1,7 +1,7 @@
 using System;
-using LibHac.Fs;
+using LibHac.FsSystem;
 
-namespace LibHac.FsClient.Accessors
+namespace LibHac.Fs.Accessors
 {
     public class FileAccessor : IFile
     {

src/LibHac/Fs/Accessors/FileSystemAccessor.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using LibHac.Fs;
+using LibHac.FsSystem;
 
-namespace LibHac.FsClient.Accessors
+namespace LibHac.Fs.Accessors
 {
     public class FileSystemAccessor
     {

src/LibHac/Fs/Accessors/MountTable.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
-using LibHac.Fs;
+using LibHac.FsSystem;
 
-namespace LibHac.FsClient.Accessors
+namespace LibHac.Fs.Accessors
 {
     public class MountTable
     {

src/LibHac/Fs/ContentStorage.cs

@@ -1,9 +1,9 @@
 using System;
 using LibHac.Common;
-using LibHac.Fs;
+using LibHac.FsSystem;
 using LibHac.FsService;
 
-namespace LibHac.FsClient
+namespace LibHac.Fs
 {
     public static class ContentStorage
     {

src/LibHac/Fs/DirectoryHandle.cs

@@ -1,7 +1,7 @@
 using System;
-using LibHac.FsClient.Accessors;
+using LibHac.Fs.Accessors;
 
-namespace LibHac.FsClient
+namespace LibHac.Fs
 {
     public struct DirectoryHandle : IDisposable
     {

src/LibHac/Fs/FileHandle.cs

@@ -1,7 +1,7 @@
 using System;
-using LibHac.FsClient.Accessors;
+using LibHac.Fs.Accessors;
 
-namespace LibHac.FsClient
+namespace LibHac.Fs
 {
     public struct FileHandle : IDisposable
     {

src/LibHac/Fs/FileSystemClient.Directory.cs

@@ -1,7 +1,7 @@
 using System;
-using LibHac.Fs;
+using LibHac.FsSystem;
 
-namespace LibHac.FsClient
+namespace LibHac.Fs
 {
     public partial class FileSystemClient
     {

src/LibHac/Fs/FileSystemClient.File.cs

@@ -1,7 +1,7 @@
 using System;
-using LibHac.Fs;
+using LibHac.FsSystem;
 
-namespace LibHac.FsClient
+namespace LibHac.Fs
 {
     public partial class FileSystemClient
     {

src/LibHac/Fs/FileSystemClient.FileSystem.cs

@@ -1,6 +1,6 @@
-using LibHac.Fs;
+using LibHac.FsSystem;
 
-namespace LibHac.FsClient
+namespace LibHac.Fs
 {
     public partial class FileSystemClient
     {

src/LibHac/Fs/FileSystemClient.Mount.cs

@@ -1,8 +1,8 @@
 using LibHac.Common;
-using LibHac.Fs;
+using LibHac.FsSystem;
 using LibHac.FsService;
 
-namespace LibHac.FsClient
+namespace LibHac.Fs
 {
     public partial class FileSystemClient
     {

src/LibHac/Fs/FileSystemClient.cs

@@ -1,8 +1,8 @@
 using LibHac.Common;
-using LibHac.Fs;
+using LibHac.FsSystem;
 using LibHac.FsService;
 
-namespace LibHac.FsClient
+namespace LibHac.Fs
 {
     public partial class FileSystemClient
     {

src/LibHac/Fs/FileSystemManager.cs

@@ -1,10 +1,10 @@
 using System;
 using System.Runtime.CompilerServices;
 using LibHac.Common;
-using LibHac.Fs;
+using LibHac.Fs.Accessors;
-using LibHac.FsClient.Accessors;
+using LibHac.FsSystem;
 
-namespace LibHac.FsClient
+namespace LibHac.Fs
 {
     // Todo: Access log for FindFileSystem
     public class FileSystemManager

src/LibHac/Fs/FileSystemManagerUtils.cs

@@ -2,10 +2,10 @@
 using System.Buffers;
 using System.Collections.Generic;
 using LibHac.Common;
-using LibHac.Fs;
+using LibHac.Fs.Accessors;
-using LibHac.FsClient.Accessors;
+using LibHac.FsSystem;
 
-namespace LibHac.FsClient
+namespace LibHac.Fs
 {
     public static class FileSystemManagerUtils
     {

src/LibHac/Fs/IAccessLog.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.CompilerServices;
 
-namespace LibHac.FsClient
+namespace LibHac.Fs
 {
     public interface IAccessLog
     {

src/LibHac/Fs/ICommonMountNameGenerator.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace LibHac.FsClient
+namespace LibHac.Fs
 {
     public interface ICommonMountNameGenerator
     {

src/LibHac/Fs/MountHelpers.cs

@@ -1,7 +1,7 @@
 using LibHac.Common;
-using LibHac.Fs;
+using LibHac.FsSystem;
 
-namespace LibHac.FsClient
+namespace LibHac.Fs
 {
     internal static class MountHelpers
     {

src/LibHac/Fs/SdCardAccessLog.cs

@@ -1,7 +1,7 @@
 using System;
 using LibHac.FsService;
 
-namespace LibHac.FsClient
+namespace LibHac.Fs
 {
     /// <summary>
     /// The default access logger that will output to the SD card via <see cref="FileSystemProxy"/>.

src/LibHac/FsService/Creators/EmulatedBisFileSystemCreator.cs

@@ -1,5 +1,5 @@
 using System.Diagnostics;
-using LibHac.Fs;
+using LibHac.FsSystem;
 
 namespace LibHac.FsService.Creators
 {

src/LibHac/FsService/Creators/EmulatedBisFileSystemCreatorConfig.cs

@@ -1,5 +1,5 @@
 using System.Diagnostics;
-using LibHac.Fs;
+using LibHac.FsSystem;
 
 namespace LibHac.FsService.Creators
 {

src/LibHac/FsService/Creators/EmulatedSdFileSystemCreator.cs

@@ -1,5 +1,5 @@
 using System;
-using LibHac.Fs;
+using LibHac.FsSystem;
 
 namespace LibHac.FsService.Creators
 {

src/LibHac/FsService/Creators/EncryptedFileSystemCreator.cs

@@ -1,5 +1,5 @@
 using System;
-using LibHac.Fs;
+using LibHac.FsSystem;
 
 namespace LibHac.FsService.Creators
 {

src/LibHac/FsService/Creators/FileSystemCreators.cs

@@ -1,4 +1,4 @@
-using LibHac.Fs;
+using LibHac.FsSystem;
 
 namespace LibHac.FsService.Creators
 {

src/LibHac/FsService/Creators/IBuiltInStorageCreator.cs

@@ -1,4 +1,4 @@
-using LibHac.Fs;
+using LibHac.FsSystem;
 
 namespace LibHac.FsService.Creators
 {

src/LibHac/FsService/Creators/IBuiltInStorageFileSystemCreator.cs

@@ -1,4 +1,4 @@
-using LibHac.Fs;
+using LibHac.FsSystem;
 
 namespace LibHac.FsService.Creators
 {

src/LibHac/FsService/Creators/IEncryptedFileSystemCreator.cs

@@ -1,5 +1,5 @@
 using System;
-using LibHac.Fs;
+using LibHac.FsSystem;
 
 namespace LibHac.FsService.Creators
 {

src/LibHac/FsService/Creators/IFatFileSystemCreator.cs

@@ -1,4 +1,4 @@
-using LibHac.Fs;
+using LibHac.FsSystem;
 
 namespace LibHac.FsService.Creators
 {

src/LibHac/FsService/Creators/IGameCardFileSystemCreator.cs

@@ -1,4 +1,4 @@
-using LibHac.Fs;
+using LibHac.FsSystem;
 
 namespace LibHac.FsService.Creators
 {

src/LibHac/FsService/Creators/IGameCardStorageCreator.cs

@@ -1,4 +1,4 @@
-using LibHac.Fs;
+using LibHac.FsSystem;
 
 namespace LibHac.FsService.Creators
 {

src/LibHac/FsService/Creators/IHostFileSystemCreator.cs

@@ -1,4 +1,4 @@
-using LibHac.Fs;
+using LibHac.FsSystem;
 
 namespace LibHac.FsService.Creators
 {

src/LibHac/FsService/Creators/IMemoryStorageCreator.cs

@@ -1,5 +1,5 @@
 using System;
-using LibHac.Fs;
+using LibHac.FsSystem;
 
 namespace LibHac.FsService.Creators
 {

src/LibHac/FsService/Creators/IPartitionFileSystemCreator.cs

@@ -1,4 +1,4 @@
-using LibHac.Fs;
+using LibHac.FsSystem;
 
 namespace LibHac.FsService.Creators
 {

src/LibHac/FsService/Creators/IRomFileSystemCreator.cs

@@ -1,4 +1,4 @@
-using LibHac.Fs;
+using LibHac.FsSystem;
 
 namespace LibHac.FsService.Creators
 {

src/LibHac/FsService/Creators/ISaveDataFileSystemCreator.cs

@@ -1,7 +1,7 @@
 using System;
 using LibHac.Common;
-using LibHac.Fs;
+using LibHac.FsSystem;
-using LibHac.Fs.Save;
+using LibHac.FsSystem.Save;
 
 namespace LibHac.FsService.Creators
 {

src/LibHac/FsService/Creators/ISdFileSystemCreator.cs

@@ -1,4 +1,4 @@
-using LibHac.Fs;
+using LibHac.FsSystem;
 
 namespace LibHac.FsService.Creators
 {

src/LibHac/FsService/Creators/ISdStorageCreator.cs

@@ -1,4 +1,4 @@
-using LibHac.Fs;
+using LibHac.FsSystem;
 
 namespace LibHac.FsService.Creators
 {

src/LibHac/FsService/Creators/IStorageOnNcaCreator.cs

@@ -1,5 +1,5 @@
-using LibHac.Fs;
+using LibHac.FsSystem;
-using LibHac.Fs.NcaUtils;
+using LibHac.FsSystem.NcaUtils;
 
 namespace LibHac.FsService.Creators
 {

src/LibHac/FsService/Creators/ISubDirectoryFileSystemCreator.cs

@@ -1,4 +1,4 @@
-using LibHac.Fs;
+using LibHac.FsSystem;
 
 namespace LibHac.FsService.Creators
 {

src/LibHac/FsService/Creators/ITargetManagerFileSystemCreator.cs

@@ -1,4 +1,4 @@
-using LibHac.Fs;
+using LibHac.FsSystem;
 
 namespace LibHac.FsService.Creators
 {

src/LibHac/FsService/Creators/SubDirectoryFileSystemCreator.cs

@@ -1,4 +1,4 @@
-using LibHac.Fs;
+using LibHac.FsSystem;
 
 namespace LibHac.FsService.Creators
 {

src/LibHac/FsService/FileSystemProxy.cs

@@ -1,7 +1,7 @@
 using System;
 using LibHac.Common;
 using LibHac.Fs;
-using LibHac.FsClient;
+using LibHac.FsSystem;
 
 namespace LibHac.FsService
 {

src/LibHac/FsService/FileSystemProxyCore.cs

@@ -1,6 +1,6 @@
 using System;
-using LibHac.Fs;
+using LibHac.FsSystem;
-using LibHac.Fs.Save;
+using LibHac.FsSystem.Save;
 using LibHac.FsService.Creators;
 
 namespace LibHac.FsService

src/LibHac/FsService/FileSystemServer.cs

@@ -1,4 +1,4 @@
-using LibHac.FsClient;
+using LibHac.Fs;
 using LibHac.FsService.Creators;
 
 namespace LibHac.FsService

src/LibHac/FsService/IFileSystemProxy.cs

@@ -1,6 +1,6 @@
 using System;
 using LibHac.Common;
-using LibHac.Fs;
+using LibHac.FsSystem;
 using LibHac.Ncm;
 using LibHac.Spl;
 

src/LibHac/FsService/Util.cs

@@ -1,5 +1,5 @@
 using System;
-using LibHac.Fs;
+using LibHac.FsSystem;
 
 namespace LibHac.FsService
 {

src/LibHac/FsSystem/Aes128CtrExStorage.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace LibHac.Fs
+namespace LibHac.FsSystem
 {
     public class Aes128CtrExStorage : Aes128CtrStorage
     {

src/LibHac/FsSystem/Aes128CtrStorage.cs

@@ -2,7 +2,7 @@
 using System.Buffers;
 using System.Buffers.Binary;
 
-namespace LibHac.Fs
+namespace LibHac.FsSystem
 {
     public class Aes128CtrStorage : SectorStorage
     {

src/LibHac/FsSystem/Aes128CtrTransform.cs

@@ -4,7 +4,7 @@ using System.Buffers.Binary;
 using System.Runtime.InteropServices;
 using System.Security.Cryptography;
 
-namespace LibHac.Fs
+namespace LibHac.FsSystem
 {
     public class Aes128CtrTransform
     {

src/LibHac/FsSystem/Aes128XtsStorage.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace LibHac.Fs
+namespace LibHac.FsSystem
 {
     public class Aes128XtsStorage : SectorStorage
     {

src/LibHac/FsSystem/Aes128XtsTransform.cs

@@ -29,7 +29,7 @@ using System.Buffers;
 using System.Runtime.InteropServices;
 using System.Security.Cryptography;
 
-namespace LibHac.Fs
+namespace LibHac.FsSystem
 {
     public class Aes128XtsTransform
     {

src/LibHac/FsSystem/AesXtsDirectory.cs

@@ -1,7 +1,7 @@
 using System;
 using LibHac.Common;
 
-namespace LibHac.Fs
+namespace LibHac.FsSystem
 {
     public class AesXtsDirectory : IDirectory
     {

src/LibHac/FsSystem/AesXtsFile.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace LibHac.Fs
+namespace LibHac.FsSystem
 {
     public class AesXtsFile : FileBase
     {

src/LibHac/FsSystem/AesXtsFileHeader.cs

@@ -3,7 +3,7 @@ using System.Runtime.InteropServices;
 using System.Security.Cryptography;
 using System.Text;
 
-namespace LibHac.Fs
+namespace LibHac.FsSystem
 {
     public class AesXtsFileHeader
     {

src/LibHac/FsSystem/AesXtsFileSystem.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Diagnostics;
 
-namespace LibHac.Fs
+namespace LibHac.FsSystem
 {
     public class AesXtsFileSystem : IFileSystem
     {

src/LibHac/FsSystem/BucketTree.cs

@@ -2,7 +2,7 @@
 using System.IO;
 using System.Linq;
 
-namespace LibHac.Fs
+namespace LibHac.FsSystem
 {
     public class BucketTree<T> where T : BucketTreeEntry<T>, new()
     {

src/LibHac/FsSystem/CachedStorage.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace LibHac.Fs
+namespace LibHac.FsSystem
 {
     public class CachedStorage : StorageBase
     {

src/LibHac/FsSystem/ConcatenationDirectory.cs

@@ -5,7 +5,7 @@ using LibHac.Common;
 using System.Runtime.InteropServices;
 #endif
 
-namespace LibHac.Fs
+namespace LibHac.FsSystem
 {
     public class ConcatenationDirectory : IDirectory
     {

src/LibHac/FsSystem/ConcatenationFile.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 
-namespace LibHac.Fs
+namespace LibHac.FsSystem
 {
     public class ConcatenationFile : FileBase
     {

src/LibHac/FsSystem/ConcatenationFileSystem.cs

@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.Runtime.InteropServices;
 #endif
 
-namespace LibHac.Fs
+namespace LibHac.FsSystem
 {
     /// <summary>
     /// An <see cref="IFileSystem"/> that stores large files as smaller, separate sub-files.

src/LibHac/FsSystem/ConcatenationStorage.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace LibHac.Fs
+namespace LibHac.FsSystem
 {
     public class ConcatenationStorage : StorageBase
     {

src/LibHac/FsSystem/ConcatenationStorageBuilder.cs

@@ -2,7 +2,7 @@
 using System.IO;
 using System.Linq;
 
-namespace LibHac.Fs
+namespace LibHac.FsSystem
 {
     public class ConcatenationStorageBuilder
     {

src/LibHac/FsSystem/Delta.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace LibHac.Fs
+namespace LibHac.FsSystem
 {
     public class Delta
     {

src/LibHac/FsSystem/DirectoryEntry.cs

@@ -2,7 +2,7 @@
 using System.Runtime.InteropServices;
 using LibHac.Common;
 
-namespace LibHac.Fs
+namespace LibHac.FsSystem
 {
     public class DirectoryEntryEx
     {

src/LibHac/FsSystem/DirectorySaveDataFile.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace LibHac.Fs
+namespace LibHac.FsSystem
 {
     public class DirectorySaveDataFile : FileBase
     {

src/LibHac/FsSystem/DirectorySaveDataFileSystem.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace LibHac.Fs
+namespace LibHac.FsSystem
 {
     public class DirectorySaveDataFileSystem : IFileSystem
     {

src/LibHac/FsSystem/DirectoryUtils.cs

@@ -1,7 +1,7 @@
 using System;
 using LibHac.Common;
 
-namespace LibHac.Fs
+namespace LibHac.FsSystem
 {
     public static class DirectoryUtils
     {

src/LibHac/FsSystem/FileBase.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace LibHac.Fs
+namespace LibHac.FsSystem
 {
     public abstract class FileBase : IFile
     {

src/LibHac/FsSystem/FileReader.cs

@@ -3,7 +3,7 @@ using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Text;
 
-namespace LibHac.Fs
+namespace LibHac.FsSystem
 {
     public class FileReader
     {

src/LibHac/FsSystem/FileStorage.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace LibHac.Fs
+namespace LibHac.FsSystem
 {
     public class FileStorage : StorageBase
     {

src/LibHac/FsSystem/FileSystemExtensions.cs

@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using System.IO;
 using LibHac.Common;
 
-namespace LibHac.Fs
+namespace LibHac.FsSystem
 {
     public static class FileSystemExtensions
     {

src/LibHac/FsSystem/FileTimeStamp.cs

@@ -1,4 +1,4 @@
-namespace LibHac.Fs
+namespace LibHac.FsSystem
 {
     public struct FileTimeStampRaw
     {

src/LibHac/FsSystem/FsEnums.cs

@@ -1,4 +1,4 @@
-namespace LibHac.Fs
+namespace LibHac.FsSystem
 {
     public enum BisPartitionId
     {

src/LibHac/FsSystem/FsPath.cs

@@ -3,7 +3,7 @@ using System.Diagnostics;
 using System.Runtime.InteropServices;
 using LibHac.Common;
 
-namespace LibHac.Fs
+namespace LibHac.FsSystem
 {
     [DebuggerDisplay("{ToString()}")]
     [StructLayout(LayoutKind.Explicit, Size = MaxLength + 1)]

src/LibHac/FsSystem/HierarchicalIntegrityVerificationStorage.cs

@@ -4,7 +4,7 @@ using System.IO;
 using System.Security.Cryptography;
 using System.Text;
 
-namespace LibHac.Fs
+namespace LibHac.FsSystem
 {
     public class HierarchicalIntegrityVerificationStorage : StorageBase
     {

src/LibHac/FsSystem/IAttributeFileSystem.cs

@@ -1,4 +1,4 @@
-namespace LibHac.Fs
+namespace LibHac.FsSystem
 {
     public interface IAttributeFileSystem : IFileSystem
     {

src/LibHac/FsSystem/IDirectory.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace LibHac.Fs
+namespace LibHac.FsSystem
 {
     /// <summary>
     /// Provides an interface for enumerating the child entries of a directory.

src/LibHac/FsSystem/IFile.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace LibHac.Fs
+namespace LibHac.FsSystem
 {
     /// <summary>
     /// Provides an interface for reading and writing a sequence of bytes.

src/LibHac/FsSystem/IFileSystem.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace LibHac.Fs
+namespace LibHac.FsSystem
 {
     /// <summary>
     /// Provides an interface for accessing a file system. <c>/</c> is used as the path delimiter.

src/LibHac/FsSystem/IStorage.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace LibHac.Fs
+namespace LibHac.FsSystem
 {
     /// <summary>
     /// Provides an interface for reading and writing a sequence of bytes.

src/LibHac/FsSystem/IndirectStorage.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace LibHac.Fs
+namespace LibHac.FsSystem
 {
     public class IndirectStorage : StorageBase
     {

src/LibHac/FsSystem/IntegrityVerificationStorage.cs

@@ -2,9 +2,9 @@
 using System.Buffers;
 using System.IO;
 using System.Security.Cryptography;
-using LibHac.Fs.Save;
+using LibHac.FsSystem.Save;
 
-namespace LibHac.Fs
+namespace LibHac.FsSystem
 {
     public class IntegrityVerificationStorage : SectorStorage
     {

src/LibHac/FsSystem/LayeredFileSystem.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace LibHac.Fs
+namespace LibHac.FsSystem
 {
     public class LayeredFileSystem : IFileSystem
     {

src/LibHac/FsSystem/LayeredFileSystemDirectory.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace LibHac.Fs
+namespace LibHac.FsSystem
 {
     public class LayeredFileSystemDirectory : IDirectory
     {

src/LibHac/FsSystem/LocalDirectory.cs

@@ -4,7 +4,7 @@ using System.IO;
 using System.Runtime.CompilerServices;
 using LibHac.Common;
 
-namespace LibHac.Fs
+namespace LibHac.FsSystem
 {
     public class LocalDirectory : IDirectory
     {

src/LibHac/FsSystem/LocalFile.cs

@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 
-namespace LibHac.Fs
+namespace LibHac.FsSystem
 {
     public class LocalFile : FileBase
     {

src/LibHac/FsSystem/LocalFileSystem.cs

@@ -2,7 +2,7 @@
 using System.IO;
 using System.Security;
 
-namespace LibHac.Fs
+namespace LibHac.FsSystem
 {
     public class LocalFileSystem : IAttributeFileSystem
     {

src/LibHac/FsSystem/LocalStorage.cs

@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 
-namespace LibHac.Fs
+namespace LibHac.FsSystem
 {
     public class LocalStorage : StorageBase
     {

src/LibHac/FsSystem/MemoryStorage.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace LibHac.Fs
+namespace LibHac.FsSystem
 {
     public class MemoryStorage : StorageBase
     {

src/LibHac/FsSystem/Messages.cs

@@ -1,4 +1,4 @@
-namespace LibHac.Fs
+namespace LibHac.FsSystem
 {
     internal static class Messages
     {

src/LibHac/FsSystem/NcaUtils/Nca.cs

@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
-using LibHac.Fs.RomFs;
+using LibHac.FsSystem.RomFs;
 
-namespace LibHac.Fs.NcaUtils
+namespace LibHac.FsSystem.NcaUtils
 {
     public class Nca
     {

src/LibHac/FsSystem/NcaUtils/NcaExtensions.cs

@@ -2,7 +2,7 @@
 using System.Buffers.Binary;
 using System.Diagnostics;
 
-namespace LibHac.Fs.NcaUtils
+namespace LibHac.FsSystem.NcaUtils
 {
     public static class NcaExtensions
     {

src/LibHac/FsSystem/NcaUtils/NcaFsHeader.cs

@@ -4,7 +4,7 @@ using System.Runtime.InteropServices;
 
 // ReSharper disable ImpureMethodCallOnReadonlyValueField
 
-namespace LibHac.Fs.NcaUtils
+namespace LibHac.FsSystem.NcaUtils
 {
     public struct NcaFsHeader
     {

src/LibHac/FsSystem/NcaUtils/NcaFsIntegrityInfoIvfc.cs

@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-namespace LibHac.Fs.NcaUtils
+namespace LibHac.FsSystem.NcaUtils
 {
     public struct NcaFsIntegrityInfoIvfc
     {

src/LibHac/FsSystem/NcaUtils/NcaFsIntegrityInfoSha256.cs

@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-namespace LibHac.Fs.NcaUtils
+namespace LibHac.FsSystem.NcaUtils
 {
     public struct NcaFsIntegrityInfoSha256
     {

src/LibHac/FsSystem/NcaUtils/NcaFsPatchInfo.cs

@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-namespace LibHac.Fs.NcaUtils
+namespace LibHac.FsSystem.NcaUtils
 {
     public struct NcaFsPatchInfo
     {

src/LibHac/FsSystem/NcaUtils/NcaHeader.cs

@@ -3,7 +3,7 @@ using System.IO;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-namespace LibHac.Fs.NcaUtils
+namespace LibHac.FsSystem.NcaUtils
 {
     public struct NcaHeader
     {

src/LibHac/FsSystem/NcaUtils/NcaKeyType.cs

@@ -1,4 +1,4 @@
-namespace LibHac.Fs.NcaUtils
+namespace LibHac.FsSystem.NcaUtils
 {
     internal enum NcaKeyType
     {