Subfolder it

BurnOutSharp.Models/MicrosoftCabinet/MSZIP/Block.cs

@@ -1,4 +1,4 @@
-namespace BurnOutSharp.Models.MicrosoftCabinet
+namespace BurnOutSharp.Models.MicrosoftCabinet.MSZIP
 {
     /// <summary>
     /// Each MSZIP block MUST consist of a 2-byte MSZIP signature and one or more RFC 1951 blocks. The
@@ -6,7 +6,7 @@ namespace BurnOutSharp.Models.MicrosoftCabinet
     /// the first 2 bytes in the MSZIP block.The MSZIP signature is shown in the following packet diagram.
     /// </summary>
     /// <see href="https://interoperability.blob.core.windows.net/files/MS-MCI/%5bMS-MCI%5d.pdf"/>
-    public class MSZIPBlock
+    public class Block
     {
         /// <summary>
         /// 'CK'

BurnOutSharp.Models/MicrosoftCabinet/MSZIP/CompressedBlock.cs

@@ -1,10 +1,10 @@
-namespace BurnOutSharp.Models.MicrosoftCabinet
+namespace BurnOutSharp.Models.MicrosoftCabinet.MSZIP
 {
     /// <summary>
     /// Base class for compressed blocks
     /// </summary>
     /// <see href="https://www.rfc-editor.org/rfc/rfc1951"/>
-    public abstract class MSZIPCompressedBlock : IMSZIPBlockData
+    public abstract class CompressedBlock : IBlockData
     {
         /// <summary>
         /// Huffman code lengths for the literal / length alphabet

BurnOutSharp.Models/MicrosoftCabinet/MSZIP/DeflateBlock.cs

@@ -1,7 +1,7 @@
-namespace BurnOutSharp.Models.MicrosoftCabinet
+namespace BurnOutSharp.Models.MicrosoftCabinet.MSZIP
 {
     /// <see href="https://www.rfc-editor.org/rfc/rfc1951"/>
-    public class MSZIPDeflateBlock
+    public class DeflateBlock
     {
         /// <summary>
         /// Set if and only if this is the last block of the data set.
@@ -18,6 +18,6 @@ namespace BurnOutSharp.Models.MicrosoftCabinet
         /// <summary>
         /// Block data as defined by the compression type
         /// </summary>
-        public IMSZIPBlockData BlockData { get; set; }
+        public IBlockData BlockData { get; set; }
     }
 }

BurnOutSharp.Models/MicrosoftCabinet/MSZIP/DynamicHuffmanCompressedBlock.cs

@@ -1,10 +1,10 @@
-namespace BurnOutSharp.Models.MicrosoftCabinet
+namespace BurnOutSharp.Models.MicrosoftCabinet.MSZIP
 {
     /// <summary>
     /// Compression with dynamic Huffman codes (BTYPE=10)
     /// </summary>
     /// <see href="https://www.rfc-editor.org/rfc/rfc1951"/>
-    public class MSZIPDynamicHuffmanCompressedBlock : MSZIPCompressedBlock
+    public class DynamicHuffmanCompressedBlock : CompressedBlock
     {
         /// <inheritdoc/>
         public override int[] LiteralLengths { get; set; }

BurnOutSharp.Models/MicrosoftCabinet/MSZIP/FixedHuffmanCompressedBlock.cs

@@ -1,13 +1,13 @@
 using System;
 
-namespace BurnOutSharp.Models.MicrosoftCabinet
+namespace BurnOutSharp.Models.MicrosoftCabinet.MSZIP
 {
     /// <summary>
     /// Compression with fixed Huffman codes (BTYPE=01)
     /// </summary>
     /// <see href="https://interoperability.blob.core.windows.net/files/MS-MCI/%5bMS-MCI%5d.pdf"/>
     /// <see href="https://www.rfc-editor.org/rfc/rfc1951"/>
-    public class MSZIPFixedHuffmanCompressedBlock : MSZIPCompressedBlock
+    public class FixedHuffmanCompressedBlock : CompressedBlock
     {
         #region Properties
 

BurnOutSharp.Models/MicrosoftCabinet/MSZIP/IBlockData.cs

@@ -1,8 +1,8 @@
-namespace BurnOutSharp.Models.MicrosoftCabinet
+namespace BurnOutSharp.Models.MicrosoftCabinet.MSZIP
 {
     /// <summary>
     /// Empty interface defining block types
     /// </summary>
     /// <see href="https://www.rfc-editor.org/rfc/rfc1951"/>
-    public interface IMSZIPBlockData { }
+    public interface IBlockData { }
 }

BurnOutSharp.Models/MicrosoftCabinet/MSZIP/NonCompressedBlock.cs

@@ -1,10 +1,10 @@
-namespace BurnOutSharp.Models.MicrosoftCabinet
+namespace BurnOutSharp.Models.MicrosoftCabinet.MSZIP
 {
     /// <summary>
     /// Non-compressed blocks (BTYPE=00)
     /// </summary>
     /// <see href="https://www.rfc-editor.org/rfc/rfc1951"/>
-    public class MSZIPNonCompressedBlock : IMSZIPBlockData
+    public class NonCompressedBlock : IBlockData
     {
         /// <summary>
         /// The number of data bytes in the block