From 07f048eca71eeb853fbbcc8b76786f68a9a73d7c Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Wed, 18 Mar 2026 12:35:21 -0400 Subject: [PATCH] Rename directories to visually help determine real namespace --- SabreTools.IO.Test/Transform/SplitTests.cs | 20 ++++++------- .../BZip2/BZip2.cs | 0 .../BZip2/BZip2Compressor.cs | 0 .../BZip2/BZip2InputStream.cs | 0 .../BZip2/BZip2OutputStream.cs | 0 .../BZip2/BitWriter.cs | 0 .../BZip2/CRC32.cs | 0 .../BZip2/Rand.cs | 0 .../Blast/Constants.cs | 0 .../Blast/Decompressor.cs | 0 .../Blast/Huffman.cs | 0 .../Blast/State.cs | 0 .../Deflate/Adler.cs | 0 .../Deflate/BlockState.cs | 0 .../Deflate/CRC32.cs | 0 .../Deflate/CompressionLevel.cs | 0 .../Deflate/CompressionMode.cs | 0 .../Deflate/CompressionStrategy.cs | 0 .../Deflate/DeflateFlavor.cs | 0 .../Deflate/DeflateInfo.cs | 0 .../Deflate/DeflateManager.cs | 0 .../Deflate/DeflateStream.cs | 0 .../Deflate/Enums.cs | 0 .../Deflate/FlushType.cs | 0 .../Deflate/GZipStream.cs | 0 .../Deflate/InfTree.cs | 0 .../Deflate/InflateBlocks.cs | 0 .../Deflate/InflateCodes.cs | 0 .../Deflate/InflateManager.cs | 0 .../Deflate/InflateWrapper.cs | 0 .../Deflate/InternalConstants.cs | 0 .../Deflate/InternalInflateConstants.cs | 0 .../Deflate/LICENSE.jzlib.txt | 0 .../Deflate/License.zlib.txt | 0 .../Deflate/SharedUtils.cs | 0 .../Deflate/StaticTree.cs | 0 .../Deflate/Tree.cs | 0 .../Deflate/WorkItem.cs | 0 .../Deflate/ZlibBaseStream.cs | 0 .../Deflate/ZlibCodec.cs | 0 .../Deflate/ZlibConstants.cs | 0 .../Deflate/ZlibException.cs | 0 .../Deflate/ZlibStream.cs | 0 .../Deflate/ZlibStreamFlavor.cs | 0 .../LZX/AlignedOffsetBlockData.cs | 0 .../LZX/Block.cs | 0 .../LZX/BlockData.cs | 0 .../LZX/BlockHeader.cs | 0 .../LZX/Chunk.cs | 0 .../LZX/ChunkHeader.cs | 0 .../LZX/Constants.cs | 0 .../LZX/Enums.cs | 0 .../LZX/UncompressedBlockData.cs | 0 .../LZX/VerbatimBlockData.cs | 0 .../MSZIP/BlockHeader.cs | 0 .../MSZIP/Decompressor.cs | 0 .../Quantum/Constants.cs | 0 .../Quantum/Decompressor.cs | 0 .../Quantum/Enums.cs | 0 .../Quantum/Model.cs | 0 .../Quantum/ModelSymbol.cs | 0 .../SZDD/Decompressor.cs | 0 .../SZDD/Enums.cs | 0 .../zlib/Hebron.Runtime/CRuntime.cs | 0 .../zlib/Hebron.Runtime/MemoryStats.cs | 0 .../zlib/Hebron.Runtime/UnsafeArray1D.cs | 0 .../zlib/Hebron.Runtime/UnsafeArray2D.cs | 0 .../zlib/LICENSE | 0 .../zlib/README.md | 0 .../zlib/ZlibDeflateStream.cs | 0 .../zlib/ZlibInflateStream.cs | 0 .../zlib/zlib.cs | 0 .../zlib/zlibConst.cs | 0 .../AESCTR.cs | 0 .../MoPaQDecrypter.cs | 0 .../BinaryReaderExtensions.cs | 0 .../BinaryWriterExtensions.cs | 0 .../ByteArrayExtensions.cs | 0 .../ByteArrayReaderExtensions.cs | 0 .../ByteArrayWriterExtensions.cs | 0 .../DictionaryExtensions.cs | 0 .../EnumerableExtensions.cs | 0 .../IOExtensions.cs | 0 .../MarshalHelpers.cs | 0 .../NumericExtensions.cs | 0 .../StreamExtensions.cs | 0 .../StreamReaderExtensions.cs | 0 .../StreamWriterExtensions.cs | 0 .../StringExtensions.cs | 0 .../XmlTextWriterExtensions.cs | 0 .../IMatch.cs | 0 .../IMatchSet.cs | 0 .../Converters.cs | 0 .../Enums.cs | 0 .../InternalStopwatch.cs | 0 .../LogEventArgs.cs | 0 .../Logger.cs | 0 .../LoggerImpl.cs | 0 .../ContentMatch.cs | 0 .../ContentMatchSet.cs | 0 .../Delegates.cs | 0 .../FilePathMatch.cs | 0 .../PathMatch.cs | 0 .../PathMatchSet.cs | 0 .../ClrMameProReader.cs | 0 .../Enums.cs | 0 .../IniReader.cs | 0 .../SeparatedValueReader.cs | 0 .../BufferedStream.cs | 0 .../ReadOnlyBitStream.cs | 0 .../ReadOnlyCompositeStream.cs | 0 .../ViewStream.cs | 0 .../Combine.cs | 0 .../Enums.cs | 0 .../Split.cs | 28 ++++++++----------- .../Swap.cs | 0 .../ClrMameProWriter.cs | 0 .../IniWriter.cs | 0 .../SeparatedValueWriter.cs | 0 SabreTools.IO/{ => SabreTools.IO}/IniFile.cs | 0 .../{ => SabreTools.IO}/MatchUtil.cs | 0 .../{ => SabreTools.IO}/OldDotNet.cs | 0 .../{ => SabreTools.IO}/ParentablePath.cs | 0 SabreTools.IO/{ => SabreTools.IO}/PathTool.cs | 0 .../BothEndian.cs | 0 .../BothInt16.cs | 0 .../BothInt32.cs | 0 .../BothInt64.cs | 0 .../BothInt8.cs | 0 .../BothUInt16.cs | 0 .../BothUInt32.cs | 0 .../BothUInt64.cs | 0 .../BothUInt8.cs | 0 .../Int24.cs | 0 .../Int48.cs | 0 .../UInt24.cs | 0 .../UInt48.cs | 0 .../NaturalComparer.cs | 0 .../NaturalComparerUtil.cs | 0 .../NaturalReversedComparer.cs | 0 140 files changed, 21 insertions(+), 27 deletions(-) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/BZip2/BZip2.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/BZip2/BZip2Compressor.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/BZip2/BZip2InputStream.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/BZip2/BZip2OutputStream.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/BZip2/BitWriter.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/BZip2/CRC32.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/BZip2/Rand.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/Blast/Constants.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/Blast/Decompressor.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/Blast/Huffman.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/Blast/State.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/Deflate/Adler.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/Deflate/BlockState.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/Deflate/CRC32.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/Deflate/CompressionLevel.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/Deflate/CompressionMode.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/Deflate/CompressionStrategy.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/Deflate/DeflateFlavor.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/Deflate/DeflateInfo.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/Deflate/DeflateManager.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/Deflate/DeflateStream.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/Deflate/Enums.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/Deflate/FlushType.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/Deflate/GZipStream.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/Deflate/InfTree.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/Deflate/InflateBlocks.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/Deflate/InflateCodes.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/Deflate/InflateManager.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/Deflate/InflateWrapper.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/Deflate/InternalConstants.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/Deflate/InternalInflateConstants.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/Deflate/LICENSE.jzlib.txt (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/Deflate/License.zlib.txt (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/Deflate/SharedUtils.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/Deflate/StaticTree.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/Deflate/Tree.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/Deflate/WorkItem.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/Deflate/ZlibBaseStream.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/Deflate/ZlibCodec.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/Deflate/ZlibConstants.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/Deflate/ZlibException.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/Deflate/ZlibStream.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/Deflate/ZlibStreamFlavor.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/LZX/AlignedOffsetBlockData.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/LZX/Block.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/LZX/BlockData.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/LZX/BlockHeader.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/LZX/Chunk.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/LZX/ChunkHeader.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/LZX/Constants.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/LZX/Enums.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/LZX/UncompressedBlockData.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/LZX/VerbatimBlockData.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/MSZIP/BlockHeader.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/MSZIP/Decompressor.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/Quantum/Constants.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/Quantum/Decompressor.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/Quantum/Enums.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/Quantum/Model.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/Quantum/ModelSymbol.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/SZDD/Decompressor.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/SZDD/Enums.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/zlib/Hebron.Runtime/CRuntime.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/zlib/Hebron.Runtime/MemoryStats.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/zlib/Hebron.Runtime/UnsafeArray1D.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/zlib/Hebron.Runtime/UnsafeArray2D.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/zlib/LICENSE (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/zlib/README.md (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/zlib/ZlibDeflateStream.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/zlib/ZlibInflateStream.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/zlib/zlib.cs (100%) rename SabreTools.IO/{Compression => SabreTools.IO.Compression}/zlib/zlibConst.cs (100%) rename SabreTools.IO/{Encryption => SabreTools.IO.Encryption}/AESCTR.cs (100%) rename SabreTools.IO/{Encryption => SabreTools.IO.Encryption}/MoPaQDecrypter.cs (100%) rename SabreTools.IO/{Extensions => SabreTools.IO.Extensions}/BinaryReaderExtensions.cs (100%) rename SabreTools.IO/{Extensions => SabreTools.IO.Extensions}/BinaryWriterExtensions.cs (100%) rename SabreTools.IO/{Extensions => SabreTools.IO.Extensions}/ByteArrayExtensions.cs (100%) rename SabreTools.IO/{Extensions => SabreTools.IO.Extensions}/ByteArrayReaderExtensions.cs (100%) rename SabreTools.IO/{Extensions => SabreTools.IO.Extensions}/ByteArrayWriterExtensions.cs (100%) rename SabreTools.IO/{Extensions => SabreTools.IO.Extensions}/DictionaryExtensions.cs (100%) rename SabreTools.IO/{Extensions => SabreTools.IO.Extensions}/EnumerableExtensions.cs (100%) rename SabreTools.IO/{Extensions => SabreTools.IO.Extensions}/IOExtensions.cs (100%) rename SabreTools.IO/{Extensions => SabreTools.IO.Extensions}/MarshalHelpers.cs (100%) rename SabreTools.IO/{Extensions => SabreTools.IO.Extensions}/NumericExtensions.cs (100%) rename SabreTools.IO/{Extensions => SabreTools.IO.Extensions}/StreamExtensions.cs (100%) rename SabreTools.IO/{Extensions => SabreTools.IO.Extensions}/StreamReaderExtensions.cs (100%) rename SabreTools.IO/{Extensions => SabreTools.IO.Extensions}/StreamWriterExtensions.cs (100%) rename SabreTools.IO/{Extensions => SabreTools.IO.Extensions}/StringExtensions.cs (100%) rename SabreTools.IO/{Extensions => SabreTools.IO.Extensions}/XmlTextWriterExtensions.cs (100%) rename SabreTools.IO/{Interfaces => SabreTools.IO.Interfaces}/IMatch.cs (100%) rename SabreTools.IO/{Interfaces => SabreTools.IO.Interfaces}/IMatchSet.cs (100%) rename SabreTools.IO/{Logging => SabreTools.IO.Logging}/Converters.cs (100%) rename SabreTools.IO/{Logging => SabreTools.IO.Logging}/Enums.cs (100%) rename SabreTools.IO/{Logging => SabreTools.IO.Logging}/InternalStopwatch.cs (100%) rename SabreTools.IO/{Logging => SabreTools.IO.Logging}/LogEventArgs.cs (100%) rename SabreTools.IO/{Logging => SabreTools.IO.Logging}/Logger.cs (100%) rename SabreTools.IO/{Logging => SabreTools.IO.Logging}/LoggerImpl.cs (100%) rename SabreTools.IO/{Matching => SabreTools.IO.Matching}/ContentMatch.cs (100%) rename SabreTools.IO/{Matching => SabreTools.IO.Matching}/ContentMatchSet.cs (100%) rename SabreTools.IO/{Matching => SabreTools.IO.Matching}/Delegates.cs (100%) rename SabreTools.IO/{Matching => SabreTools.IO.Matching}/FilePathMatch.cs (100%) rename SabreTools.IO/{Matching => SabreTools.IO.Matching}/PathMatch.cs (100%) rename SabreTools.IO/{Matching => SabreTools.IO.Matching}/PathMatchSet.cs (100%) rename SabreTools.IO/{Readers => SabreTools.IO.Readers}/ClrMameProReader.cs (100%) rename SabreTools.IO/{Readers => SabreTools.IO.Readers}/Enums.cs (100%) rename SabreTools.IO/{Readers => SabreTools.IO.Readers}/IniReader.cs (100%) rename SabreTools.IO/{Readers => SabreTools.IO.Readers}/SeparatedValueReader.cs (100%) rename SabreTools.IO/{Streams => SabreTools.IO.Streams}/BufferedStream.cs (100%) rename SabreTools.IO/{Streams => SabreTools.IO.Streams}/ReadOnlyBitStream.cs (100%) rename SabreTools.IO/{Streams => SabreTools.IO.Streams}/ReadOnlyCompositeStream.cs (100%) rename SabreTools.IO/{Streams => SabreTools.IO.Streams}/ViewStream.cs (100%) rename SabreTools.IO/{Transform => SabreTools.IO.Transform}/Combine.cs (100%) rename SabreTools.IO/{Transform => SabreTools.IO.Transform}/Enums.cs (100%) rename SabreTools.IO/{Transform => SabreTools.IO.Transform}/Split.cs (86%) rename SabreTools.IO/{Transform => SabreTools.IO.Transform}/Swap.cs (100%) rename SabreTools.IO/{Writers => SabreTools.IO.Writers}/ClrMameProWriter.cs (100%) rename SabreTools.IO/{Writers => SabreTools.IO.Writers}/IniWriter.cs (100%) rename SabreTools.IO/{Writers => SabreTools.IO.Writers}/SeparatedValueWriter.cs (100%) rename SabreTools.IO/{ => SabreTools.IO}/IniFile.cs (100%) rename SabreTools.IO/{ => SabreTools.IO}/MatchUtil.cs (100%) rename SabreTools.IO/{ => SabreTools.IO}/OldDotNet.cs (100%) rename SabreTools.IO/{ => SabreTools.IO}/ParentablePath.cs (100%) rename SabreTools.IO/{ => SabreTools.IO}/PathTool.cs (100%) rename SabreTools.IO/{Numerics => SabreTools.Numerics}/BothEndian.cs (100%) rename SabreTools.IO/{Numerics => SabreTools.Numerics}/BothInt16.cs (100%) rename SabreTools.IO/{Numerics => SabreTools.Numerics}/BothInt32.cs (100%) rename SabreTools.IO/{Numerics => SabreTools.Numerics}/BothInt64.cs (100%) rename SabreTools.IO/{Numerics => SabreTools.Numerics}/BothInt8.cs (100%) rename SabreTools.IO/{Numerics => SabreTools.Numerics}/BothUInt16.cs (100%) rename SabreTools.IO/{Numerics => SabreTools.Numerics}/BothUInt32.cs (100%) rename SabreTools.IO/{Numerics => SabreTools.Numerics}/BothUInt64.cs (100%) rename SabreTools.IO/{Numerics => SabreTools.Numerics}/BothUInt8.cs (100%) rename SabreTools.IO/{Numerics => SabreTools.Numerics}/Int24.cs (100%) rename SabreTools.IO/{Numerics => SabreTools.Numerics}/Int48.cs (100%) rename SabreTools.IO/{Numerics => SabreTools.Numerics}/UInt24.cs (100%) rename SabreTools.IO/{Numerics => SabreTools.Numerics}/UInt48.cs (100%) rename SabreTools.IO/{Compare => SabreTools.Text.Compare}/NaturalComparer.cs (100%) rename SabreTools.IO/{Compare => SabreTools.Text.Compare}/NaturalComparerUtil.cs (100%) rename SabreTools.IO/{Compare => SabreTools.Text.Compare}/NaturalReversedComparer.cs (100%) diff --git a/SabreTools.IO.Test/Transform/SplitTests.cs b/SabreTools.IO.Test/Transform/SplitTests.cs index 5247f53..a8dc538 100644 --- a/SabreTools.IO.Test/Transform/SplitTests.cs +++ b/SabreTools.IO.Test/Transform/SplitTests.cs @@ -14,7 +14,7 @@ namespace SabreTools.IO.Test.Transform { string input = string.Empty; string outputDir = string.Empty; - bool actual = Split.BlockSplit(input, outputDir, BlockSize.Byte); + bool actual = Split.BlockSplit(input, outputDir, 1); Assert.False(actual); } @@ -23,31 +23,31 @@ namespace SabreTools.IO.Test.Transform { string input = "INVALID"; string outputDir = string.Empty; - bool actual = Split.BlockSplit(input, outputDir, BlockSize.Byte); + bool actual = Split.BlockSplit(input, outputDir, 1); Assert.False(actual); } [Fact] - public void BlockSplit_InvalidType_False() + public void BlockSplit_InvalidValue_False() { string input = Path.Combine(Environment.CurrentDirectory, "TestData", "ascii.txt"); string outputDir = Guid.NewGuid().ToString(); - bool actual = Split.BlockSplit(input, outputDir, (BlockSize)int.MaxValue); + bool actual = Split.BlockSplit(input, outputDir, -1); Assert.False(actual); } [Theory] - [InlineData(BlockSize.Byte, "Ti os' ac ntig", "hsdentmthayhn")] - [InlineData(BlockSize.Word, "Th dsn mchnyin", "isoe'tat athg")] - [InlineData(BlockSize.Dword, "Thissn'tch aing", " doe matnyth")] - [InlineData(BlockSize.Qword, "This doech anyth", "sn't mating")] - public void BlockSplit_ValidFile_True(BlockSize type, string expectedEven, string expectedOdd) + [InlineData(1, "Ti os' ac ntig", "hsdentmthayhn")] + [InlineData(2, "Th dsn mchnyin", "isoe'tat athg")] + [InlineData(4, "Thissn'tch aing", " doe matnyth")] + [InlineData(8, "This doech anyth", "sn't mating")] + public void BlockSplit_ValidFile_True(int blockSize, string expectedEven, string expectedOdd) { string input = Path.Combine(Environment.CurrentDirectory, "TestData", "ascii.txt"); string outputDir = Guid.NewGuid().ToString(); - bool actual = Split.BlockSplit(input, outputDir, type); + bool actual = Split.BlockSplit(input, outputDir, blockSize); Assert.True(actual); string baseFilename = Path.GetFileName(input); diff --git a/SabreTools.IO/Compression/BZip2/BZip2.cs b/SabreTools.IO/SabreTools.IO.Compression/BZip2/BZip2.cs similarity index 100% rename from SabreTools.IO/Compression/BZip2/BZip2.cs rename to SabreTools.IO/SabreTools.IO.Compression/BZip2/BZip2.cs diff --git a/SabreTools.IO/Compression/BZip2/BZip2Compressor.cs b/SabreTools.IO/SabreTools.IO.Compression/BZip2/BZip2Compressor.cs similarity index 100% rename from SabreTools.IO/Compression/BZip2/BZip2Compressor.cs rename to SabreTools.IO/SabreTools.IO.Compression/BZip2/BZip2Compressor.cs diff --git a/SabreTools.IO/Compression/BZip2/BZip2InputStream.cs b/SabreTools.IO/SabreTools.IO.Compression/BZip2/BZip2InputStream.cs similarity index 100% rename from SabreTools.IO/Compression/BZip2/BZip2InputStream.cs rename to SabreTools.IO/SabreTools.IO.Compression/BZip2/BZip2InputStream.cs diff --git a/SabreTools.IO/Compression/BZip2/BZip2OutputStream.cs b/SabreTools.IO/SabreTools.IO.Compression/BZip2/BZip2OutputStream.cs similarity index 100% rename from SabreTools.IO/Compression/BZip2/BZip2OutputStream.cs rename to SabreTools.IO/SabreTools.IO.Compression/BZip2/BZip2OutputStream.cs diff --git a/SabreTools.IO/Compression/BZip2/BitWriter.cs b/SabreTools.IO/SabreTools.IO.Compression/BZip2/BitWriter.cs similarity index 100% rename from SabreTools.IO/Compression/BZip2/BitWriter.cs rename to SabreTools.IO/SabreTools.IO.Compression/BZip2/BitWriter.cs diff --git a/SabreTools.IO/Compression/BZip2/CRC32.cs b/SabreTools.IO/SabreTools.IO.Compression/BZip2/CRC32.cs similarity index 100% rename from SabreTools.IO/Compression/BZip2/CRC32.cs rename to SabreTools.IO/SabreTools.IO.Compression/BZip2/CRC32.cs diff --git a/SabreTools.IO/Compression/BZip2/Rand.cs b/SabreTools.IO/SabreTools.IO.Compression/BZip2/Rand.cs similarity index 100% rename from SabreTools.IO/Compression/BZip2/Rand.cs rename to SabreTools.IO/SabreTools.IO.Compression/BZip2/Rand.cs diff --git a/SabreTools.IO/Compression/Blast/Constants.cs b/SabreTools.IO/SabreTools.IO.Compression/Blast/Constants.cs similarity index 100% rename from SabreTools.IO/Compression/Blast/Constants.cs rename to SabreTools.IO/SabreTools.IO.Compression/Blast/Constants.cs diff --git a/SabreTools.IO/Compression/Blast/Decompressor.cs b/SabreTools.IO/SabreTools.IO.Compression/Blast/Decompressor.cs similarity index 100% rename from SabreTools.IO/Compression/Blast/Decompressor.cs rename to SabreTools.IO/SabreTools.IO.Compression/Blast/Decompressor.cs diff --git a/SabreTools.IO/Compression/Blast/Huffman.cs b/SabreTools.IO/SabreTools.IO.Compression/Blast/Huffman.cs similarity index 100% rename from SabreTools.IO/Compression/Blast/Huffman.cs rename to SabreTools.IO/SabreTools.IO.Compression/Blast/Huffman.cs diff --git a/SabreTools.IO/Compression/Blast/State.cs b/SabreTools.IO/SabreTools.IO.Compression/Blast/State.cs similarity index 100% rename from SabreTools.IO/Compression/Blast/State.cs rename to SabreTools.IO/SabreTools.IO.Compression/Blast/State.cs diff --git a/SabreTools.IO/Compression/Deflate/Adler.cs b/SabreTools.IO/SabreTools.IO.Compression/Deflate/Adler.cs similarity index 100% rename from SabreTools.IO/Compression/Deflate/Adler.cs rename to SabreTools.IO/SabreTools.IO.Compression/Deflate/Adler.cs diff --git a/SabreTools.IO/Compression/Deflate/BlockState.cs b/SabreTools.IO/SabreTools.IO.Compression/Deflate/BlockState.cs similarity index 100% rename from SabreTools.IO/Compression/Deflate/BlockState.cs rename to SabreTools.IO/SabreTools.IO.Compression/Deflate/BlockState.cs diff --git a/SabreTools.IO/Compression/Deflate/CRC32.cs b/SabreTools.IO/SabreTools.IO.Compression/Deflate/CRC32.cs similarity index 100% rename from SabreTools.IO/Compression/Deflate/CRC32.cs rename to SabreTools.IO/SabreTools.IO.Compression/Deflate/CRC32.cs diff --git a/SabreTools.IO/Compression/Deflate/CompressionLevel.cs b/SabreTools.IO/SabreTools.IO.Compression/Deflate/CompressionLevel.cs similarity index 100% rename from SabreTools.IO/Compression/Deflate/CompressionLevel.cs rename to SabreTools.IO/SabreTools.IO.Compression/Deflate/CompressionLevel.cs diff --git a/SabreTools.IO/Compression/Deflate/CompressionMode.cs b/SabreTools.IO/SabreTools.IO.Compression/Deflate/CompressionMode.cs similarity index 100% rename from SabreTools.IO/Compression/Deflate/CompressionMode.cs rename to SabreTools.IO/SabreTools.IO.Compression/Deflate/CompressionMode.cs diff --git a/SabreTools.IO/Compression/Deflate/CompressionStrategy.cs b/SabreTools.IO/SabreTools.IO.Compression/Deflate/CompressionStrategy.cs similarity index 100% rename from SabreTools.IO/Compression/Deflate/CompressionStrategy.cs rename to SabreTools.IO/SabreTools.IO.Compression/Deflate/CompressionStrategy.cs diff --git a/SabreTools.IO/Compression/Deflate/DeflateFlavor.cs b/SabreTools.IO/SabreTools.IO.Compression/Deflate/DeflateFlavor.cs similarity index 100% rename from SabreTools.IO/Compression/Deflate/DeflateFlavor.cs rename to SabreTools.IO/SabreTools.IO.Compression/Deflate/DeflateFlavor.cs diff --git a/SabreTools.IO/Compression/Deflate/DeflateInfo.cs b/SabreTools.IO/SabreTools.IO.Compression/Deflate/DeflateInfo.cs similarity index 100% rename from SabreTools.IO/Compression/Deflate/DeflateInfo.cs rename to SabreTools.IO/SabreTools.IO.Compression/Deflate/DeflateInfo.cs diff --git a/SabreTools.IO/Compression/Deflate/DeflateManager.cs b/SabreTools.IO/SabreTools.IO.Compression/Deflate/DeflateManager.cs similarity index 100% rename from SabreTools.IO/Compression/Deflate/DeflateManager.cs rename to SabreTools.IO/SabreTools.IO.Compression/Deflate/DeflateManager.cs diff --git a/SabreTools.IO/Compression/Deflate/DeflateStream.cs b/SabreTools.IO/SabreTools.IO.Compression/Deflate/DeflateStream.cs similarity index 100% rename from SabreTools.IO/Compression/Deflate/DeflateStream.cs rename to SabreTools.IO/SabreTools.IO.Compression/Deflate/DeflateStream.cs diff --git a/SabreTools.IO/Compression/Deflate/Enums.cs b/SabreTools.IO/SabreTools.IO.Compression/Deflate/Enums.cs similarity index 100% rename from SabreTools.IO/Compression/Deflate/Enums.cs rename to SabreTools.IO/SabreTools.IO.Compression/Deflate/Enums.cs diff --git a/SabreTools.IO/Compression/Deflate/FlushType.cs b/SabreTools.IO/SabreTools.IO.Compression/Deflate/FlushType.cs similarity index 100% rename from SabreTools.IO/Compression/Deflate/FlushType.cs rename to SabreTools.IO/SabreTools.IO.Compression/Deflate/FlushType.cs diff --git a/SabreTools.IO/Compression/Deflate/GZipStream.cs b/SabreTools.IO/SabreTools.IO.Compression/Deflate/GZipStream.cs similarity index 100% rename from SabreTools.IO/Compression/Deflate/GZipStream.cs rename to SabreTools.IO/SabreTools.IO.Compression/Deflate/GZipStream.cs diff --git a/SabreTools.IO/Compression/Deflate/InfTree.cs b/SabreTools.IO/SabreTools.IO.Compression/Deflate/InfTree.cs similarity index 100% rename from SabreTools.IO/Compression/Deflate/InfTree.cs rename to SabreTools.IO/SabreTools.IO.Compression/Deflate/InfTree.cs diff --git a/SabreTools.IO/Compression/Deflate/InflateBlocks.cs b/SabreTools.IO/SabreTools.IO.Compression/Deflate/InflateBlocks.cs similarity index 100% rename from SabreTools.IO/Compression/Deflate/InflateBlocks.cs rename to SabreTools.IO/SabreTools.IO.Compression/Deflate/InflateBlocks.cs diff --git a/SabreTools.IO/Compression/Deflate/InflateCodes.cs b/SabreTools.IO/SabreTools.IO.Compression/Deflate/InflateCodes.cs similarity index 100% rename from SabreTools.IO/Compression/Deflate/InflateCodes.cs rename to SabreTools.IO/SabreTools.IO.Compression/Deflate/InflateCodes.cs diff --git a/SabreTools.IO/Compression/Deflate/InflateManager.cs b/SabreTools.IO/SabreTools.IO.Compression/Deflate/InflateManager.cs similarity index 100% rename from SabreTools.IO/Compression/Deflate/InflateManager.cs rename to SabreTools.IO/SabreTools.IO.Compression/Deflate/InflateManager.cs diff --git a/SabreTools.IO/Compression/Deflate/InflateWrapper.cs b/SabreTools.IO/SabreTools.IO.Compression/Deflate/InflateWrapper.cs similarity index 100% rename from SabreTools.IO/Compression/Deflate/InflateWrapper.cs rename to SabreTools.IO/SabreTools.IO.Compression/Deflate/InflateWrapper.cs diff --git a/SabreTools.IO/Compression/Deflate/InternalConstants.cs b/SabreTools.IO/SabreTools.IO.Compression/Deflate/InternalConstants.cs similarity index 100% rename from SabreTools.IO/Compression/Deflate/InternalConstants.cs rename to SabreTools.IO/SabreTools.IO.Compression/Deflate/InternalConstants.cs diff --git a/SabreTools.IO/Compression/Deflate/InternalInflateConstants.cs b/SabreTools.IO/SabreTools.IO.Compression/Deflate/InternalInflateConstants.cs similarity index 100% rename from SabreTools.IO/Compression/Deflate/InternalInflateConstants.cs rename to SabreTools.IO/SabreTools.IO.Compression/Deflate/InternalInflateConstants.cs diff --git a/SabreTools.IO/Compression/Deflate/LICENSE.jzlib.txt b/SabreTools.IO/SabreTools.IO.Compression/Deflate/LICENSE.jzlib.txt similarity index 100% rename from SabreTools.IO/Compression/Deflate/LICENSE.jzlib.txt rename to SabreTools.IO/SabreTools.IO.Compression/Deflate/LICENSE.jzlib.txt diff --git a/SabreTools.IO/Compression/Deflate/License.zlib.txt b/SabreTools.IO/SabreTools.IO.Compression/Deflate/License.zlib.txt similarity index 100% rename from SabreTools.IO/Compression/Deflate/License.zlib.txt rename to SabreTools.IO/SabreTools.IO.Compression/Deflate/License.zlib.txt diff --git a/SabreTools.IO/Compression/Deflate/SharedUtils.cs b/SabreTools.IO/SabreTools.IO.Compression/Deflate/SharedUtils.cs similarity index 100% rename from SabreTools.IO/Compression/Deflate/SharedUtils.cs rename to SabreTools.IO/SabreTools.IO.Compression/Deflate/SharedUtils.cs diff --git a/SabreTools.IO/Compression/Deflate/StaticTree.cs b/SabreTools.IO/SabreTools.IO.Compression/Deflate/StaticTree.cs similarity index 100% rename from SabreTools.IO/Compression/Deflate/StaticTree.cs rename to SabreTools.IO/SabreTools.IO.Compression/Deflate/StaticTree.cs diff --git a/SabreTools.IO/Compression/Deflate/Tree.cs b/SabreTools.IO/SabreTools.IO.Compression/Deflate/Tree.cs similarity index 100% rename from SabreTools.IO/Compression/Deflate/Tree.cs rename to SabreTools.IO/SabreTools.IO.Compression/Deflate/Tree.cs diff --git a/SabreTools.IO/Compression/Deflate/WorkItem.cs b/SabreTools.IO/SabreTools.IO.Compression/Deflate/WorkItem.cs similarity index 100% rename from SabreTools.IO/Compression/Deflate/WorkItem.cs rename to SabreTools.IO/SabreTools.IO.Compression/Deflate/WorkItem.cs diff --git a/SabreTools.IO/Compression/Deflate/ZlibBaseStream.cs b/SabreTools.IO/SabreTools.IO.Compression/Deflate/ZlibBaseStream.cs similarity index 100% rename from SabreTools.IO/Compression/Deflate/ZlibBaseStream.cs rename to SabreTools.IO/SabreTools.IO.Compression/Deflate/ZlibBaseStream.cs diff --git a/SabreTools.IO/Compression/Deflate/ZlibCodec.cs b/SabreTools.IO/SabreTools.IO.Compression/Deflate/ZlibCodec.cs similarity index 100% rename from SabreTools.IO/Compression/Deflate/ZlibCodec.cs rename to SabreTools.IO/SabreTools.IO.Compression/Deflate/ZlibCodec.cs diff --git a/SabreTools.IO/Compression/Deflate/ZlibConstants.cs b/SabreTools.IO/SabreTools.IO.Compression/Deflate/ZlibConstants.cs similarity index 100% rename from SabreTools.IO/Compression/Deflate/ZlibConstants.cs rename to SabreTools.IO/SabreTools.IO.Compression/Deflate/ZlibConstants.cs diff --git a/SabreTools.IO/Compression/Deflate/ZlibException.cs b/SabreTools.IO/SabreTools.IO.Compression/Deflate/ZlibException.cs similarity index 100% rename from SabreTools.IO/Compression/Deflate/ZlibException.cs rename to SabreTools.IO/SabreTools.IO.Compression/Deflate/ZlibException.cs diff --git a/SabreTools.IO/Compression/Deflate/ZlibStream.cs b/SabreTools.IO/SabreTools.IO.Compression/Deflate/ZlibStream.cs similarity index 100% rename from SabreTools.IO/Compression/Deflate/ZlibStream.cs rename to SabreTools.IO/SabreTools.IO.Compression/Deflate/ZlibStream.cs diff --git a/SabreTools.IO/Compression/Deflate/ZlibStreamFlavor.cs b/SabreTools.IO/SabreTools.IO.Compression/Deflate/ZlibStreamFlavor.cs similarity index 100% rename from SabreTools.IO/Compression/Deflate/ZlibStreamFlavor.cs rename to SabreTools.IO/SabreTools.IO.Compression/Deflate/ZlibStreamFlavor.cs diff --git a/SabreTools.IO/Compression/LZX/AlignedOffsetBlockData.cs b/SabreTools.IO/SabreTools.IO.Compression/LZX/AlignedOffsetBlockData.cs similarity index 100% rename from SabreTools.IO/Compression/LZX/AlignedOffsetBlockData.cs rename to SabreTools.IO/SabreTools.IO.Compression/LZX/AlignedOffsetBlockData.cs diff --git a/SabreTools.IO/Compression/LZX/Block.cs b/SabreTools.IO/SabreTools.IO.Compression/LZX/Block.cs similarity index 100% rename from SabreTools.IO/Compression/LZX/Block.cs rename to SabreTools.IO/SabreTools.IO.Compression/LZX/Block.cs diff --git a/SabreTools.IO/Compression/LZX/BlockData.cs b/SabreTools.IO/SabreTools.IO.Compression/LZX/BlockData.cs similarity index 100% rename from SabreTools.IO/Compression/LZX/BlockData.cs rename to SabreTools.IO/SabreTools.IO.Compression/LZX/BlockData.cs diff --git a/SabreTools.IO/Compression/LZX/BlockHeader.cs b/SabreTools.IO/SabreTools.IO.Compression/LZX/BlockHeader.cs similarity index 100% rename from SabreTools.IO/Compression/LZX/BlockHeader.cs rename to SabreTools.IO/SabreTools.IO.Compression/LZX/BlockHeader.cs diff --git a/SabreTools.IO/Compression/LZX/Chunk.cs b/SabreTools.IO/SabreTools.IO.Compression/LZX/Chunk.cs similarity index 100% rename from SabreTools.IO/Compression/LZX/Chunk.cs rename to SabreTools.IO/SabreTools.IO.Compression/LZX/Chunk.cs diff --git a/SabreTools.IO/Compression/LZX/ChunkHeader.cs b/SabreTools.IO/SabreTools.IO.Compression/LZX/ChunkHeader.cs similarity index 100% rename from SabreTools.IO/Compression/LZX/ChunkHeader.cs rename to SabreTools.IO/SabreTools.IO.Compression/LZX/ChunkHeader.cs diff --git a/SabreTools.IO/Compression/LZX/Constants.cs b/SabreTools.IO/SabreTools.IO.Compression/LZX/Constants.cs similarity index 100% rename from SabreTools.IO/Compression/LZX/Constants.cs rename to SabreTools.IO/SabreTools.IO.Compression/LZX/Constants.cs diff --git a/SabreTools.IO/Compression/LZX/Enums.cs b/SabreTools.IO/SabreTools.IO.Compression/LZX/Enums.cs similarity index 100% rename from SabreTools.IO/Compression/LZX/Enums.cs rename to SabreTools.IO/SabreTools.IO.Compression/LZX/Enums.cs diff --git a/SabreTools.IO/Compression/LZX/UncompressedBlockData.cs b/SabreTools.IO/SabreTools.IO.Compression/LZX/UncompressedBlockData.cs similarity index 100% rename from SabreTools.IO/Compression/LZX/UncompressedBlockData.cs rename to SabreTools.IO/SabreTools.IO.Compression/LZX/UncompressedBlockData.cs diff --git a/SabreTools.IO/Compression/LZX/VerbatimBlockData.cs b/SabreTools.IO/SabreTools.IO.Compression/LZX/VerbatimBlockData.cs similarity index 100% rename from SabreTools.IO/Compression/LZX/VerbatimBlockData.cs rename to SabreTools.IO/SabreTools.IO.Compression/LZX/VerbatimBlockData.cs diff --git a/SabreTools.IO/Compression/MSZIP/BlockHeader.cs b/SabreTools.IO/SabreTools.IO.Compression/MSZIP/BlockHeader.cs similarity index 100% rename from SabreTools.IO/Compression/MSZIP/BlockHeader.cs rename to SabreTools.IO/SabreTools.IO.Compression/MSZIP/BlockHeader.cs diff --git a/SabreTools.IO/Compression/MSZIP/Decompressor.cs b/SabreTools.IO/SabreTools.IO.Compression/MSZIP/Decompressor.cs similarity index 100% rename from SabreTools.IO/Compression/MSZIP/Decompressor.cs rename to SabreTools.IO/SabreTools.IO.Compression/MSZIP/Decompressor.cs diff --git a/SabreTools.IO/Compression/Quantum/Constants.cs b/SabreTools.IO/SabreTools.IO.Compression/Quantum/Constants.cs similarity index 100% rename from SabreTools.IO/Compression/Quantum/Constants.cs rename to SabreTools.IO/SabreTools.IO.Compression/Quantum/Constants.cs diff --git a/SabreTools.IO/Compression/Quantum/Decompressor.cs b/SabreTools.IO/SabreTools.IO.Compression/Quantum/Decompressor.cs similarity index 100% rename from SabreTools.IO/Compression/Quantum/Decompressor.cs rename to SabreTools.IO/SabreTools.IO.Compression/Quantum/Decompressor.cs diff --git a/SabreTools.IO/Compression/Quantum/Enums.cs b/SabreTools.IO/SabreTools.IO.Compression/Quantum/Enums.cs similarity index 100% rename from SabreTools.IO/Compression/Quantum/Enums.cs rename to SabreTools.IO/SabreTools.IO.Compression/Quantum/Enums.cs diff --git a/SabreTools.IO/Compression/Quantum/Model.cs b/SabreTools.IO/SabreTools.IO.Compression/Quantum/Model.cs similarity index 100% rename from SabreTools.IO/Compression/Quantum/Model.cs rename to SabreTools.IO/SabreTools.IO.Compression/Quantum/Model.cs diff --git a/SabreTools.IO/Compression/Quantum/ModelSymbol.cs b/SabreTools.IO/SabreTools.IO.Compression/Quantum/ModelSymbol.cs similarity index 100% rename from SabreTools.IO/Compression/Quantum/ModelSymbol.cs rename to SabreTools.IO/SabreTools.IO.Compression/Quantum/ModelSymbol.cs diff --git a/SabreTools.IO/Compression/SZDD/Decompressor.cs b/SabreTools.IO/SabreTools.IO.Compression/SZDD/Decompressor.cs similarity index 100% rename from SabreTools.IO/Compression/SZDD/Decompressor.cs rename to SabreTools.IO/SabreTools.IO.Compression/SZDD/Decompressor.cs diff --git a/SabreTools.IO/Compression/SZDD/Enums.cs b/SabreTools.IO/SabreTools.IO.Compression/SZDD/Enums.cs similarity index 100% rename from SabreTools.IO/Compression/SZDD/Enums.cs rename to SabreTools.IO/SabreTools.IO.Compression/SZDD/Enums.cs diff --git a/SabreTools.IO/Compression/zlib/Hebron.Runtime/CRuntime.cs b/SabreTools.IO/SabreTools.IO.Compression/zlib/Hebron.Runtime/CRuntime.cs similarity index 100% rename from SabreTools.IO/Compression/zlib/Hebron.Runtime/CRuntime.cs rename to SabreTools.IO/SabreTools.IO.Compression/zlib/Hebron.Runtime/CRuntime.cs diff --git a/SabreTools.IO/Compression/zlib/Hebron.Runtime/MemoryStats.cs b/SabreTools.IO/SabreTools.IO.Compression/zlib/Hebron.Runtime/MemoryStats.cs similarity index 100% rename from SabreTools.IO/Compression/zlib/Hebron.Runtime/MemoryStats.cs rename to SabreTools.IO/SabreTools.IO.Compression/zlib/Hebron.Runtime/MemoryStats.cs diff --git a/SabreTools.IO/Compression/zlib/Hebron.Runtime/UnsafeArray1D.cs b/SabreTools.IO/SabreTools.IO.Compression/zlib/Hebron.Runtime/UnsafeArray1D.cs similarity index 100% rename from SabreTools.IO/Compression/zlib/Hebron.Runtime/UnsafeArray1D.cs rename to SabreTools.IO/SabreTools.IO.Compression/zlib/Hebron.Runtime/UnsafeArray1D.cs diff --git a/SabreTools.IO/Compression/zlib/Hebron.Runtime/UnsafeArray2D.cs b/SabreTools.IO/SabreTools.IO.Compression/zlib/Hebron.Runtime/UnsafeArray2D.cs similarity index 100% rename from SabreTools.IO/Compression/zlib/Hebron.Runtime/UnsafeArray2D.cs rename to SabreTools.IO/SabreTools.IO.Compression/zlib/Hebron.Runtime/UnsafeArray2D.cs diff --git a/SabreTools.IO/Compression/zlib/LICENSE b/SabreTools.IO/SabreTools.IO.Compression/zlib/LICENSE similarity index 100% rename from SabreTools.IO/Compression/zlib/LICENSE rename to SabreTools.IO/SabreTools.IO.Compression/zlib/LICENSE diff --git a/SabreTools.IO/Compression/zlib/README.md b/SabreTools.IO/SabreTools.IO.Compression/zlib/README.md similarity index 100% rename from SabreTools.IO/Compression/zlib/README.md rename to SabreTools.IO/SabreTools.IO.Compression/zlib/README.md diff --git a/SabreTools.IO/Compression/zlib/ZlibDeflateStream.cs b/SabreTools.IO/SabreTools.IO.Compression/zlib/ZlibDeflateStream.cs similarity index 100% rename from SabreTools.IO/Compression/zlib/ZlibDeflateStream.cs rename to SabreTools.IO/SabreTools.IO.Compression/zlib/ZlibDeflateStream.cs diff --git a/SabreTools.IO/Compression/zlib/ZlibInflateStream.cs b/SabreTools.IO/SabreTools.IO.Compression/zlib/ZlibInflateStream.cs similarity index 100% rename from SabreTools.IO/Compression/zlib/ZlibInflateStream.cs rename to SabreTools.IO/SabreTools.IO.Compression/zlib/ZlibInflateStream.cs diff --git a/SabreTools.IO/Compression/zlib/zlib.cs b/SabreTools.IO/SabreTools.IO.Compression/zlib/zlib.cs similarity index 100% rename from SabreTools.IO/Compression/zlib/zlib.cs rename to SabreTools.IO/SabreTools.IO.Compression/zlib/zlib.cs diff --git a/SabreTools.IO/Compression/zlib/zlibConst.cs b/SabreTools.IO/SabreTools.IO.Compression/zlib/zlibConst.cs similarity index 100% rename from SabreTools.IO/Compression/zlib/zlibConst.cs rename to SabreTools.IO/SabreTools.IO.Compression/zlib/zlibConst.cs diff --git a/SabreTools.IO/Encryption/AESCTR.cs b/SabreTools.IO/SabreTools.IO.Encryption/AESCTR.cs similarity index 100% rename from SabreTools.IO/Encryption/AESCTR.cs rename to SabreTools.IO/SabreTools.IO.Encryption/AESCTR.cs diff --git a/SabreTools.IO/Encryption/MoPaQDecrypter.cs b/SabreTools.IO/SabreTools.IO.Encryption/MoPaQDecrypter.cs similarity index 100% rename from SabreTools.IO/Encryption/MoPaQDecrypter.cs rename to SabreTools.IO/SabreTools.IO.Encryption/MoPaQDecrypter.cs diff --git a/SabreTools.IO/Extensions/BinaryReaderExtensions.cs b/SabreTools.IO/SabreTools.IO.Extensions/BinaryReaderExtensions.cs similarity index 100% rename from SabreTools.IO/Extensions/BinaryReaderExtensions.cs rename to SabreTools.IO/SabreTools.IO.Extensions/BinaryReaderExtensions.cs diff --git a/SabreTools.IO/Extensions/BinaryWriterExtensions.cs b/SabreTools.IO/SabreTools.IO.Extensions/BinaryWriterExtensions.cs similarity index 100% rename from SabreTools.IO/Extensions/BinaryWriterExtensions.cs rename to SabreTools.IO/SabreTools.IO.Extensions/BinaryWriterExtensions.cs diff --git a/SabreTools.IO/Extensions/ByteArrayExtensions.cs b/SabreTools.IO/SabreTools.IO.Extensions/ByteArrayExtensions.cs similarity index 100% rename from SabreTools.IO/Extensions/ByteArrayExtensions.cs rename to SabreTools.IO/SabreTools.IO.Extensions/ByteArrayExtensions.cs diff --git a/SabreTools.IO/Extensions/ByteArrayReaderExtensions.cs b/SabreTools.IO/SabreTools.IO.Extensions/ByteArrayReaderExtensions.cs similarity index 100% rename from SabreTools.IO/Extensions/ByteArrayReaderExtensions.cs rename to SabreTools.IO/SabreTools.IO.Extensions/ByteArrayReaderExtensions.cs diff --git a/SabreTools.IO/Extensions/ByteArrayWriterExtensions.cs b/SabreTools.IO/SabreTools.IO.Extensions/ByteArrayWriterExtensions.cs similarity index 100% rename from SabreTools.IO/Extensions/ByteArrayWriterExtensions.cs rename to SabreTools.IO/SabreTools.IO.Extensions/ByteArrayWriterExtensions.cs diff --git a/SabreTools.IO/Extensions/DictionaryExtensions.cs b/SabreTools.IO/SabreTools.IO.Extensions/DictionaryExtensions.cs similarity index 100% rename from SabreTools.IO/Extensions/DictionaryExtensions.cs rename to SabreTools.IO/SabreTools.IO.Extensions/DictionaryExtensions.cs diff --git a/SabreTools.IO/Extensions/EnumerableExtensions.cs b/SabreTools.IO/SabreTools.IO.Extensions/EnumerableExtensions.cs similarity index 100% rename from SabreTools.IO/Extensions/EnumerableExtensions.cs rename to SabreTools.IO/SabreTools.IO.Extensions/EnumerableExtensions.cs diff --git a/SabreTools.IO/Extensions/IOExtensions.cs b/SabreTools.IO/SabreTools.IO.Extensions/IOExtensions.cs similarity index 100% rename from SabreTools.IO/Extensions/IOExtensions.cs rename to SabreTools.IO/SabreTools.IO.Extensions/IOExtensions.cs diff --git a/SabreTools.IO/Extensions/MarshalHelpers.cs b/SabreTools.IO/SabreTools.IO.Extensions/MarshalHelpers.cs similarity index 100% rename from SabreTools.IO/Extensions/MarshalHelpers.cs rename to SabreTools.IO/SabreTools.IO.Extensions/MarshalHelpers.cs diff --git a/SabreTools.IO/Extensions/NumericExtensions.cs b/SabreTools.IO/SabreTools.IO.Extensions/NumericExtensions.cs similarity index 100% rename from SabreTools.IO/Extensions/NumericExtensions.cs rename to SabreTools.IO/SabreTools.IO.Extensions/NumericExtensions.cs diff --git a/SabreTools.IO/Extensions/StreamExtensions.cs b/SabreTools.IO/SabreTools.IO.Extensions/StreamExtensions.cs similarity index 100% rename from SabreTools.IO/Extensions/StreamExtensions.cs rename to SabreTools.IO/SabreTools.IO.Extensions/StreamExtensions.cs diff --git a/SabreTools.IO/Extensions/StreamReaderExtensions.cs b/SabreTools.IO/SabreTools.IO.Extensions/StreamReaderExtensions.cs similarity index 100% rename from SabreTools.IO/Extensions/StreamReaderExtensions.cs rename to SabreTools.IO/SabreTools.IO.Extensions/StreamReaderExtensions.cs diff --git a/SabreTools.IO/Extensions/StreamWriterExtensions.cs b/SabreTools.IO/SabreTools.IO.Extensions/StreamWriterExtensions.cs similarity index 100% rename from SabreTools.IO/Extensions/StreamWriterExtensions.cs rename to SabreTools.IO/SabreTools.IO.Extensions/StreamWriterExtensions.cs diff --git a/SabreTools.IO/Extensions/StringExtensions.cs b/SabreTools.IO/SabreTools.IO.Extensions/StringExtensions.cs similarity index 100% rename from SabreTools.IO/Extensions/StringExtensions.cs rename to SabreTools.IO/SabreTools.IO.Extensions/StringExtensions.cs diff --git a/SabreTools.IO/Extensions/XmlTextWriterExtensions.cs b/SabreTools.IO/SabreTools.IO.Extensions/XmlTextWriterExtensions.cs similarity index 100% rename from SabreTools.IO/Extensions/XmlTextWriterExtensions.cs rename to SabreTools.IO/SabreTools.IO.Extensions/XmlTextWriterExtensions.cs diff --git a/SabreTools.IO/Interfaces/IMatch.cs b/SabreTools.IO/SabreTools.IO.Interfaces/IMatch.cs similarity index 100% rename from SabreTools.IO/Interfaces/IMatch.cs rename to SabreTools.IO/SabreTools.IO.Interfaces/IMatch.cs diff --git a/SabreTools.IO/Interfaces/IMatchSet.cs b/SabreTools.IO/SabreTools.IO.Interfaces/IMatchSet.cs similarity index 100% rename from SabreTools.IO/Interfaces/IMatchSet.cs rename to SabreTools.IO/SabreTools.IO.Interfaces/IMatchSet.cs diff --git a/SabreTools.IO/Logging/Converters.cs b/SabreTools.IO/SabreTools.IO.Logging/Converters.cs similarity index 100% rename from SabreTools.IO/Logging/Converters.cs rename to SabreTools.IO/SabreTools.IO.Logging/Converters.cs diff --git a/SabreTools.IO/Logging/Enums.cs b/SabreTools.IO/SabreTools.IO.Logging/Enums.cs similarity index 100% rename from SabreTools.IO/Logging/Enums.cs rename to SabreTools.IO/SabreTools.IO.Logging/Enums.cs diff --git a/SabreTools.IO/Logging/InternalStopwatch.cs b/SabreTools.IO/SabreTools.IO.Logging/InternalStopwatch.cs similarity index 100% rename from SabreTools.IO/Logging/InternalStopwatch.cs rename to SabreTools.IO/SabreTools.IO.Logging/InternalStopwatch.cs diff --git a/SabreTools.IO/Logging/LogEventArgs.cs b/SabreTools.IO/SabreTools.IO.Logging/LogEventArgs.cs similarity index 100% rename from SabreTools.IO/Logging/LogEventArgs.cs rename to SabreTools.IO/SabreTools.IO.Logging/LogEventArgs.cs diff --git a/SabreTools.IO/Logging/Logger.cs b/SabreTools.IO/SabreTools.IO.Logging/Logger.cs similarity index 100% rename from SabreTools.IO/Logging/Logger.cs rename to SabreTools.IO/SabreTools.IO.Logging/Logger.cs diff --git a/SabreTools.IO/Logging/LoggerImpl.cs b/SabreTools.IO/SabreTools.IO.Logging/LoggerImpl.cs similarity index 100% rename from SabreTools.IO/Logging/LoggerImpl.cs rename to SabreTools.IO/SabreTools.IO.Logging/LoggerImpl.cs diff --git a/SabreTools.IO/Matching/ContentMatch.cs b/SabreTools.IO/SabreTools.IO.Matching/ContentMatch.cs similarity index 100% rename from SabreTools.IO/Matching/ContentMatch.cs rename to SabreTools.IO/SabreTools.IO.Matching/ContentMatch.cs diff --git a/SabreTools.IO/Matching/ContentMatchSet.cs b/SabreTools.IO/SabreTools.IO.Matching/ContentMatchSet.cs similarity index 100% rename from SabreTools.IO/Matching/ContentMatchSet.cs rename to SabreTools.IO/SabreTools.IO.Matching/ContentMatchSet.cs diff --git a/SabreTools.IO/Matching/Delegates.cs b/SabreTools.IO/SabreTools.IO.Matching/Delegates.cs similarity index 100% rename from SabreTools.IO/Matching/Delegates.cs rename to SabreTools.IO/SabreTools.IO.Matching/Delegates.cs diff --git a/SabreTools.IO/Matching/FilePathMatch.cs b/SabreTools.IO/SabreTools.IO.Matching/FilePathMatch.cs similarity index 100% rename from SabreTools.IO/Matching/FilePathMatch.cs rename to SabreTools.IO/SabreTools.IO.Matching/FilePathMatch.cs diff --git a/SabreTools.IO/Matching/PathMatch.cs b/SabreTools.IO/SabreTools.IO.Matching/PathMatch.cs similarity index 100% rename from SabreTools.IO/Matching/PathMatch.cs rename to SabreTools.IO/SabreTools.IO.Matching/PathMatch.cs diff --git a/SabreTools.IO/Matching/PathMatchSet.cs b/SabreTools.IO/SabreTools.IO.Matching/PathMatchSet.cs similarity index 100% rename from SabreTools.IO/Matching/PathMatchSet.cs rename to SabreTools.IO/SabreTools.IO.Matching/PathMatchSet.cs diff --git a/SabreTools.IO/Readers/ClrMameProReader.cs b/SabreTools.IO/SabreTools.IO.Readers/ClrMameProReader.cs similarity index 100% rename from SabreTools.IO/Readers/ClrMameProReader.cs rename to SabreTools.IO/SabreTools.IO.Readers/ClrMameProReader.cs diff --git a/SabreTools.IO/Readers/Enums.cs b/SabreTools.IO/SabreTools.IO.Readers/Enums.cs similarity index 100% rename from SabreTools.IO/Readers/Enums.cs rename to SabreTools.IO/SabreTools.IO.Readers/Enums.cs diff --git a/SabreTools.IO/Readers/IniReader.cs b/SabreTools.IO/SabreTools.IO.Readers/IniReader.cs similarity index 100% rename from SabreTools.IO/Readers/IniReader.cs rename to SabreTools.IO/SabreTools.IO.Readers/IniReader.cs diff --git a/SabreTools.IO/Readers/SeparatedValueReader.cs b/SabreTools.IO/SabreTools.IO.Readers/SeparatedValueReader.cs similarity index 100% rename from SabreTools.IO/Readers/SeparatedValueReader.cs rename to SabreTools.IO/SabreTools.IO.Readers/SeparatedValueReader.cs diff --git a/SabreTools.IO/Streams/BufferedStream.cs b/SabreTools.IO/SabreTools.IO.Streams/BufferedStream.cs similarity index 100% rename from SabreTools.IO/Streams/BufferedStream.cs rename to SabreTools.IO/SabreTools.IO.Streams/BufferedStream.cs diff --git a/SabreTools.IO/Streams/ReadOnlyBitStream.cs b/SabreTools.IO/SabreTools.IO.Streams/ReadOnlyBitStream.cs similarity index 100% rename from SabreTools.IO/Streams/ReadOnlyBitStream.cs rename to SabreTools.IO/SabreTools.IO.Streams/ReadOnlyBitStream.cs diff --git a/SabreTools.IO/Streams/ReadOnlyCompositeStream.cs b/SabreTools.IO/SabreTools.IO.Streams/ReadOnlyCompositeStream.cs similarity index 100% rename from SabreTools.IO/Streams/ReadOnlyCompositeStream.cs rename to SabreTools.IO/SabreTools.IO.Streams/ReadOnlyCompositeStream.cs diff --git a/SabreTools.IO/Streams/ViewStream.cs b/SabreTools.IO/SabreTools.IO.Streams/ViewStream.cs similarity index 100% rename from SabreTools.IO/Streams/ViewStream.cs rename to SabreTools.IO/SabreTools.IO.Streams/ViewStream.cs diff --git a/SabreTools.IO/Transform/Combine.cs b/SabreTools.IO/SabreTools.IO.Transform/Combine.cs similarity index 100% rename from SabreTools.IO/Transform/Combine.cs rename to SabreTools.IO/SabreTools.IO.Transform/Combine.cs diff --git a/SabreTools.IO/Transform/Enums.cs b/SabreTools.IO/SabreTools.IO.Transform/Enums.cs similarity index 100% rename from SabreTools.IO/Transform/Enums.cs rename to SabreTools.IO/SabreTools.IO.Transform/Enums.cs diff --git a/SabreTools.IO/Transform/Split.cs b/SabreTools.IO/SabreTools.IO.Transform/Split.cs similarity index 86% rename from SabreTools.IO/Transform/Split.cs rename to SabreTools.IO/SabreTools.IO.Transform/Split.cs index d16f827..92b955f 100644 --- a/SabreTools.IO/Transform/Split.cs +++ b/SabreTools.IO/SabreTools.IO.Transform/Split.cs @@ -13,9 +13,9 @@ namespace SabreTools.IO.Transform /// /// Input file name /// Path to the output directory - /// representing how to process the inputs + /// Number of bytes read before switching output /// True if the file could be split, false otherwise - public static bool BlockSplit(string input, string? outputDir, BlockSize type) + public static bool BlockSplit(string input, string? outputDir, int blockSize) { // If the file does not exist if (!File.Exists(input)) @@ -27,7 +27,7 @@ namespace SabreTools.IO.Transform using var inputStream = File.Open(input, FileMode.Open, FileAccess.Read, FileShare.ReadWrite); // Split the stream - if (!BlockSplit(inputStream, type, out Stream? evenStream, out Stream? oddStream)) + if (!BlockSplit(inputStream, blockSize, out Stream? evenStream, out Stream? oddStream)) return false; else if (evenStream is null || oddStream is null) return false; @@ -65,14 +65,14 @@ namespace SabreTools.IO.Transform /// Split an input stream into two output streams /// /// Input stream - /// representing how to process the inputs + /// Number of bytes read before switching output /// Even block output stream on success, null otherwise /// Odd block output stream on success, null otherwise /// True if the stream could be split, false otherwise /// - /// Thrown if is not a recognized value. + /// Thrown if is non-positive. /// - public static bool BlockSplit(Stream input, BlockSize type, out Stream? even, out Stream? odd) + public static bool BlockSplit(Stream input, int blockSize, out Stream? even, out Stream? odd) { // Set default values for the outputs even = null; @@ -82,15 +82,9 @@ namespace SabreTools.IO.Transform if (!input.CanRead) return false; - // Get the number of bytes to process - int byteCount = type switch - { - BlockSize.Byte => 1, - BlockSize.Word => 2, - BlockSize.Dword => 4, - BlockSize.Qword => 8, - _ => throw new ArgumentOutOfRangeException(nameof(type)), - }; + // If the block size is invalid + if (blockSize <= 0) + throw new ArgumentOutOfRangeException(nameof(blockSize)); try { @@ -102,8 +96,8 @@ namespace SabreTools.IO.Transform bool useEven = true; while (input.Position < input.Length) { - byte[] read = new byte[byteCount]; - int actual = input.Read(read, 0, byteCount); + byte[] read = new byte[blockSize]; + int actual = input.Read(read, 0, blockSize); (useEven ? even : odd).Write(read, 0, actual); (useEven ? even : odd).Flush(); useEven = !useEven; diff --git a/SabreTools.IO/Transform/Swap.cs b/SabreTools.IO/SabreTools.IO.Transform/Swap.cs similarity index 100% rename from SabreTools.IO/Transform/Swap.cs rename to SabreTools.IO/SabreTools.IO.Transform/Swap.cs diff --git a/SabreTools.IO/Writers/ClrMameProWriter.cs b/SabreTools.IO/SabreTools.IO.Writers/ClrMameProWriter.cs similarity index 100% rename from SabreTools.IO/Writers/ClrMameProWriter.cs rename to SabreTools.IO/SabreTools.IO.Writers/ClrMameProWriter.cs diff --git a/SabreTools.IO/Writers/IniWriter.cs b/SabreTools.IO/SabreTools.IO.Writers/IniWriter.cs similarity index 100% rename from SabreTools.IO/Writers/IniWriter.cs rename to SabreTools.IO/SabreTools.IO.Writers/IniWriter.cs diff --git a/SabreTools.IO/Writers/SeparatedValueWriter.cs b/SabreTools.IO/SabreTools.IO.Writers/SeparatedValueWriter.cs similarity index 100% rename from SabreTools.IO/Writers/SeparatedValueWriter.cs rename to SabreTools.IO/SabreTools.IO.Writers/SeparatedValueWriter.cs diff --git a/SabreTools.IO/IniFile.cs b/SabreTools.IO/SabreTools.IO/IniFile.cs similarity index 100% rename from SabreTools.IO/IniFile.cs rename to SabreTools.IO/SabreTools.IO/IniFile.cs diff --git a/SabreTools.IO/MatchUtil.cs b/SabreTools.IO/SabreTools.IO/MatchUtil.cs similarity index 100% rename from SabreTools.IO/MatchUtil.cs rename to SabreTools.IO/SabreTools.IO/MatchUtil.cs diff --git a/SabreTools.IO/OldDotNet.cs b/SabreTools.IO/SabreTools.IO/OldDotNet.cs similarity index 100% rename from SabreTools.IO/OldDotNet.cs rename to SabreTools.IO/SabreTools.IO/OldDotNet.cs diff --git a/SabreTools.IO/ParentablePath.cs b/SabreTools.IO/SabreTools.IO/ParentablePath.cs similarity index 100% rename from SabreTools.IO/ParentablePath.cs rename to SabreTools.IO/SabreTools.IO/ParentablePath.cs diff --git a/SabreTools.IO/PathTool.cs b/SabreTools.IO/SabreTools.IO/PathTool.cs similarity index 100% rename from SabreTools.IO/PathTool.cs rename to SabreTools.IO/SabreTools.IO/PathTool.cs diff --git a/SabreTools.IO/Numerics/BothEndian.cs b/SabreTools.IO/SabreTools.Numerics/BothEndian.cs similarity index 100% rename from SabreTools.IO/Numerics/BothEndian.cs rename to SabreTools.IO/SabreTools.Numerics/BothEndian.cs diff --git a/SabreTools.IO/Numerics/BothInt16.cs b/SabreTools.IO/SabreTools.Numerics/BothInt16.cs similarity index 100% rename from SabreTools.IO/Numerics/BothInt16.cs rename to SabreTools.IO/SabreTools.Numerics/BothInt16.cs diff --git a/SabreTools.IO/Numerics/BothInt32.cs b/SabreTools.IO/SabreTools.Numerics/BothInt32.cs similarity index 100% rename from SabreTools.IO/Numerics/BothInt32.cs rename to SabreTools.IO/SabreTools.Numerics/BothInt32.cs diff --git a/SabreTools.IO/Numerics/BothInt64.cs b/SabreTools.IO/SabreTools.Numerics/BothInt64.cs similarity index 100% rename from SabreTools.IO/Numerics/BothInt64.cs rename to SabreTools.IO/SabreTools.Numerics/BothInt64.cs diff --git a/SabreTools.IO/Numerics/BothInt8.cs b/SabreTools.IO/SabreTools.Numerics/BothInt8.cs similarity index 100% rename from SabreTools.IO/Numerics/BothInt8.cs rename to SabreTools.IO/SabreTools.Numerics/BothInt8.cs diff --git a/SabreTools.IO/Numerics/BothUInt16.cs b/SabreTools.IO/SabreTools.Numerics/BothUInt16.cs similarity index 100% rename from SabreTools.IO/Numerics/BothUInt16.cs rename to SabreTools.IO/SabreTools.Numerics/BothUInt16.cs diff --git a/SabreTools.IO/Numerics/BothUInt32.cs b/SabreTools.IO/SabreTools.Numerics/BothUInt32.cs similarity index 100% rename from SabreTools.IO/Numerics/BothUInt32.cs rename to SabreTools.IO/SabreTools.Numerics/BothUInt32.cs diff --git a/SabreTools.IO/Numerics/BothUInt64.cs b/SabreTools.IO/SabreTools.Numerics/BothUInt64.cs similarity index 100% rename from SabreTools.IO/Numerics/BothUInt64.cs rename to SabreTools.IO/SabreTools.Numerics/BothUInt64.cs diff --git a/SabreTools.IO/Numerics/BothUInt8.cs b/SabreTools.IO/SabreTools.Numerics/BothUInt8.cs similarity index 100% rename from SabreTools.IO/Numerics/BothUInt8.cs rename to SabreTools.IO/SabreTools.Numerics/BothUInt8.cs diff --git a/SabreTools.IO/Numerics/Int24.cs b/SabreTools.IO/SabreTools.Numerics/Int24.cs similarity index 100% rename from SabreTools.IO/Numerics/Int24.cs rename to SabreTools.IO/SabreTools.Numerics/Int24.cs diff --git a/SabreTools.IO/Numerics/Int48.cs b/SabreTools.IO/SabreTools.Numerics/Int48.cs similarity index 100% rename from SabreTools.IO/Numerics/Int48.cs rename to SabreTools.IO/SabreTools.Numerics/Int48.cs diff --git a/SabreTools.IO/Numerics/UInt24.cs b/SabreTools.IO/SabreTools.Numerics/UInt24.cs similarity index 100% rename from SabreTools.IO/Numerics/UInt24.cs rename to SabreTools.IO/SabreTools.Numerics/UInt24.cs diff --git a/SabreTools.IO/Numerics/UInt48.cs b/SabreTools.IO/SabreTools.Numerics/UInt48.cs similarity index 100% rename from SabreTools.IO/Numerics/UInt48.cs rename to SabreTools.IO/SabreTools.Numerics/UInt48.cs diff --git a/SabreTools.IO/Compare/NaturalComparer.cs b/SabreTools.IO/SabreTools.Text.Compare/NaturalComparer.cs similarity index 100% rename from SabreTools.IO/Compare/NaturalComparer.cs rename to SabreTools.IO/SabreTools.Text.Compare/NaturalComparer.cs diff --git a/SabreTools.IO/Compare/NaturalComparerUtil.cs b/SabreTools.IO/SabreTools.Text.Compare/NaturalComparerUtil.cs similarity index 100% rename from SabreTools.IO/Compare/NaturalComparerUtil.cs rename to SabreTools.IO/SabreTools.Text.Compare/NaturalComparerUtil.cs diff --git a/SabreTools.IO/Compare/NaturalReversedComparer.cs b/SabreTools.IO/SabreTools.Text.Compare/NaturalReversedComparer.cs similarity index 100% rename from SabreTools.IO/Compare/NaturalReversedComparer.cs rename to SabreTools.IO/SabreTools.Text.Compare/NaturalReversedComparer.cs