diff --git a/SabreTools.Models/Compression/MSZIP/DeflateBlockHeader.cs b/SabreTools.Models/Compression/Deflate/BlockHeader.cs
similarity index 84%
rename from SabreTools.Models/Compression/MSZIP/DeflateBlockHeader.cs
rename to SabreTools.Models/Compression/Deflate/BlockHeader.cs
index edec1a6..ab677cd 100644
--- a/SabreTools.Models/Compression/MSZIP/DeflateBlockHeader.cs
+++ b/SabreTools.Models/Compression/Deflate/BlockHeader.cs
@@ -1,7 +1,7 @@
-namespace SabreTools.Models.Compression.MSZIP
+namespace SabreTools.Models.Compression.Deflate
 {
     /// <see href="https://www.rfc-editor.org/rfc/rfc1951"/>
-    public class DeflateBlockHeader
+    public class BlockHeader
     {
         /// <summary>
         /// Set if and only if this is the last block of the data set.
diff --git a/SabreTools.Models/Compression/MSZIP/CompressedBlockHeader.cs b/SabreTools.Models/Compression/Deflate/CompressedDataHeader.cs
similarity index 93%
rename from SabreTools.Models/Compression/MSZIP/CompressedBlockHeader.cs
rename to SabreTools.Models/Compression/Deflate/CompressedDataHeader.cs
index f4ed51f..9803998 100644
--- a/SabreTools.Models/Compression/MSZIP/CompressedBlockHeader.cs
+++ b/SabreTools.Models/Compression/Deflate/CompressedDataHeader.cs
@@ -1,4 +1,4 @@
-namespace SabreTools.Models.Compression.MSZIP
+namespace SabreTools.Models.Compression.Deflate
 {
     /// <summary>
     /// Compression with Huffman codes (BTYPE=01 or BTYPE=02)
diff --git a/SabreTools.Models/Compression/MSZIP/DataHeader.cs b/SabreTools.Models/Compression/Deflate/DataHeader.cs
similarity index 85%
rename from SabreTools.Models/Compression/MSZIP/DataHeader.cs
rename to SabreTools.Models/Compression/Deflate/DataHeader.cs
index 6f6259b..d4bd244 100644
--- a/SabreTools.Models/Compression/MSZIP/DataHeader.cs
+++ b/SabreTools.Models/Compression/Deflate/DataHeader.cs
@@ -1,4 +1,4 @@
-namespace SabreTools.Models.Compression.MSZIP
+namespace SabreTools.Models.Compression.Deflate
 {
     /// <summary>
     /// Base class for all data headers (BTYPE=00, BTYPE=01, or BTYPE=02)
diff --git a/SabreTools.Models/Compression/MSZIP/DynamicCompressedDataHeader.cs b/SabreTools.Models/Compression/Deflate/DynamicCompressedDataHeader.cs
similarity index 85%
rename from SabreTools.Models/Compression/MSZIP/DynamicCompressedDataHeader.cs
rename to SabreTools.Models/Compression/Deflate/DynamicCompressedDataHeader.cs
index 8d92a7b..5cb51e9 100644
--- a/SabreTools.Models/Compression/MSZIP/DynamicCompressedDataHeader.cs
+++ b/SabreTools.Models/Compression/Deflate/DynamicCompressedDataHeader.cs
@@ -1,4 +1,4 @@
-namespace SabreTools.Models.Compression.MSZIP
+namespace SabreTools.Models.Compression.Deflate
 {
     /// <summary>
     /// Compression with dynamic Huffman codes (BTYPE=10)
diff --git a/SabreTools.Models/Compression/MSZIP/Enums.cs b/SabreTools.Models/Compression/Deflate/Enums.cs
similarity index 82%
rename from SabreTools.Models/Compression/MSZIP/Enums.cs
rename to SabreTools.Models/Compression/Deflate/Enums.cs
index 824568c..35b246a 100644
--- a/SabreTools.Models/Compression/MSZIP/Enums.cs
+++ b/SabreTools.Models/Compression/Deflate/Enums.cs
@@ -1,5 +1,6 @@
-namespace SabreTools.Models.Compression.MSZIP
+namespace SabreTools.Models.Compression.Deflate
 {
+    /// <see href="https://www.rfc-editor.org/rfc/rfc1951"/>
     public enum CompressionType : byte
     {
         /// <summary>
diff --git a/SabreTools.Models/Compression/MSZIP/FixedCompressedDataHeader.cs b/SabreTools.Models/Compression/Deflate/FixedCompressedDataHeader.cs
similarity index 98%
rename from SabreTools.Models/Compression/MSZIP/FixedCompressedDataHeader.cs
rename to SabreTools.Models/Compression/Deflate/FixedCompressedDataHeader.cs
index 56a72b4..d3e8d78 100644
--- a/SabreTools.Models/Compression/MSZIP/FixedCompressedDataHeader.cs
+++ b/SabreTools.Models/Compression/Deflate/FixedCompressedDataHeader.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace SabreTools.Models.Compression.MSZIP
+namespace SabreTools.Models.Compression.Deflate
 {
     /// <summary>
     /// Compression with fixed Huffman codes (BTYPE=01)
diff --git a/SabreTools.Models/Compression/MSZIP/NonCompressedDataHeader.cs b/SabreTools.Models/Compression/Deflate/NonCompressedDataHeader.cs
similarity index 92%
rename from SabreTools.Models/Compression/MSZIP/NonCompressedDataHeader.cs
rename to SabreTools.Models/Compression/Deflate/NonCompressedDataHeader.cs
index 2b82514..dce6c44 100644
--- a/SabreTools.Models/Compression/MSZIP/NonCompressedDataHeader.cs
+++ b/SabreTools.Models/Compression/Deflate/NonCompressedDataHeader.cs
@@ -1,4 +1,4 @@
-namespace SabreTools.Models.Compression.MSZIP
+namespace SabreTools.Models.Compression.Deflate
 {
     /// <summary>
     /// Non-compressed blocks (BTYPE=00)
diff --git a/SabreTools.Models/Compression/MSZIP/DeflateBlock.cs b/SabreTools.Models/Compression/MSZIP/DeflateBlock.cs
index 03fbc9b..9a6fcb3 100644
--- a/SabreTools.Models/Compression/MSZIP/DeflateBlock.cs
+++ b/SabreTools.Models/Compression/MSZIP/DeflateBlock.cs
@@ -15,12 +15,12 @@ namespace SabreTools.Models.Compression.MSZIP
         /// <summary>
         /// Deflate block (RFC-1951) header
         /// </summary>
-        public DeflateBlockHeader? Header { get; set; }
+        public Deflate.BlockHeader? Header { get; set; }
 
         /// <summary>
         /// Compression-specific data header
         /// </summary>
-        public DataHeader? DataHeader { get; set; }
+        public Deflate.DataHeader? DataHeader { get; set; }
 
         /// <summary>
         /// MSZIP data