Move CachedStorage, SectorStorage and derivatives

src/LibHac/Boot/Package1.cs

@@ -7,6 +7,7 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using LibHac.Common.Keys;
 using LibHac.Diag;
+using LibHac.Tools.FsSystem;
 using LibHac.Util;
 
 namespace LibHac.Boot;

src/LibHac/Boot/Package2StorageReader.cs

@@ -7,6 +7,7 @@ using LibHac.Crypto;
 using LibHac.Fs;
 using LibHac.FsSystem;
 using LibHac.Kernel;
+using LibHac.Tools.FsSystem;
 
 namespace LibHac.Boot;
 

src/LibHac/FsSystem/HierarchicalIntegrityVerificationStorage.cs

@@ -5,6 +5,7 @@ using System.Security.Cryptography;
 using System.Text;
 using LibHac.Common;
 using LibHac.Fs;
+using LibHac.Tools.FsSystem;
 using LibHac.Util;
 
 namespace LibHac.FsSystem;

src/LibHac/FsSystem/IntegrityVerificationStorage.cs

@@ -4,6 +4,7 @@ using System.IO;
 using LibHac.Common;
 using LibHac.Crypto;
 using LibHac.Fs;
+using LibHac.Tools.FsSystem;
 using LibHac.Tools.FsSystem.Save;
 
 namespace LibHac.FsSystem;

src/LibHac/Tools/FsSystem/Aes128CtrExStorage.cs

@@ -2,8 +2,9 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using LibHac.Fs;
+using LibHac.FsSystem;
 
-namespace LibHac.FsSystem;
+namespace LibHac.Tools.FsSystem;
 
 public class Aes128CtrExStorage : Aes128CtrStorage
 {

src/LibHac/Tools/FsSystem/Aes128CtrStorage.cs

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

src/LibHac/Tools/FsSystem/Aes128CtrTransform.cs

@@ -6,7 +6,7 @@ using System.Security.Cryptography;
 using LibHac.Common;
 using LibHac.Util;
 
-namespace LibHac.FsSystem;
+namespace LibHac.Tools.FsSystem;
 
 public class Aes128CtrTransform
 {

src/LibHac/Tools/FsSystem/Aes128XtsStorage.cs

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

src/LibHac/Tools/FsSystem/Aes128XtsTransform.cs

@@ -31,7 +31,7 @@ using System.Security.Cryptography;
 using LibHac.Common;
 using LibHac.Util;
 
-namespace LibHac.FsSystem;
+namespace LibHac.Tools.FsSystem;
 
 public class Aes128XtsTransform
 {

src/LibHac/Tools/FsSystem/AesCbcStorage.cs

@@ -1,9 +1,9 @@
-using LibHac.Crypto;
+using System;
-using LibHac.Fs;
-using System;
 using LibHac.Common;
+using LibHac.Crypto;
+using LibHac.Fs;
 
-namespace LibHac.FsSystem;
+namespace LibHac.Tools.FsSystem;
 
 public class AesCbcStorage : SectorStorage
 {

src/LibHac/Tools/FsSystem/CachedStorage.cs

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

src/LibHac/Tools/FsSystem/SectorStorage.cs

@@ -2,7 +2,7 @@
 using LibHac.Fs;
 using LibHac.Util;
 
-namespace LibHac.FsSystem;
+namespace LibHac.Tools.FsSystem;
 
 public class SectorStorage : IStorage
 {

src/hactoolnet/ProcessBench.cs

@@ -9,6 +9,7 @@ using LibHac.Crypto;
 using LibHac.Crypto.Impl;
 using LibHac.Fs;
 using LibHac.FsSystem;
+using LibHac.Tools.FsSystem;
 
 namespace hactoolnet;
 

src/hactoolnet/ProcessPackage.cs

@@ -6,6 +6,7 @@ using LibHac.Boot;
 using LibHac.Common;
 using LibHac.Fs;
 using LibHac.FsSystem;
+using LibHac.Tools.FsSystem;
 using static hactoolnet.Print;
 using Path = System.IO.Path;
 

tests/LibHac.Tests/AesXts.cs

@@ -1,5 +1,5 @@
 using System.Linq;
-using LibHac.FsSystem;
+using LibHac.Tools.FsSystem;
 using LibHac.Util;
 using Xunit;