diff --git a/SabreTools.Models/Compression/LZ/Constants.cs b/SabreTools.Models/LZ/Constants.cs
similarity index 89%
rename from SabreTools.Models/Compression/LZ/Constants.cs
rename to SabreTools.Models/LZ/Constants.cs
index ef46eb7..c22e441 100644
--- a/SabreTools.Models/Compression/LZ/Constants.cs
+++ b/SabreTools.Models/LZ/Constants.cs
@@ -1,4 +1,4 @@
-namespace SabreTools.Models.Compression.LZ
+namespace SabreTools.Models.LZ
 {
     public static class Constants
     {
diff --git a/SabreTools.Models/Compression/LZ/Enums.cs b/SabreTools.Models/LZ/Enums.cs
similarity index 98%
rename from SabreTools.Models/Compression/LZ/Enums.cs
rename to SabreTools.Models/LZ/Enums.cs
index 2c47ee5..6603da0 100644
--- a/SabreTools.Models/Compression/LZ/Enums.cs
+++ b/SabreTools.Models/LZ/Enums.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace SabreTools.Models.Compression.LZ
+namespace SabreTools.Models.LZ
 {
     /// <see href="https://www.cabextract.org.uk/libmspack/doc/szdd_kwaj_format.html"/>
     public enum KWAJCompressionType : ushort
diff --git a/SabreTools.Models/LZ/ExpandFile.cs b/SabreTools.Models/LZ/ExpandFile.cs
new file mode 100644
index 0000000..7eba23e
--- /dev/null
+++ b/SabreTools.Models/LZ/ExpandFile.cs
@@ -0,0 +1,17 @@
+namespace SabreTools.Models.LZ
+{
+    /// <summary>
+    /// Standard LZ variant
+    /// </summary>
+    /// <see href="https://github.com/wine-mirror/wine/blob/master/dlls/kernel32/lzexpand.c"/>
+    /// <see href="https://www.cabextract.org.uk/libmspack/doc/szdd_kwaj_format.html"/>
+    public sealed class ExpandFile
+    {
+        /// <summary>
+        /// Header
+        /// </summary>
+        public ExpandHeader? Header { get; set; }
+
+        // Followed immediately by compressed data
+    }
+}
\ No newline at end of file
diff --git a/SabreTools.Models/Compression/LZ/ExpandHeader.cs b/SabreTools.Models/LZ/ExpandHeader.cs
similarity index 96%
rename from SabreTools.Models/Compression/LZ/ExpandHeader.cs
rename to SabreTools.Models/LZ/ExpandHeader.cs
index beb4903..00491e0 100644
--- a/SabreTools.Models/Compression/LZ/ExpandHeader.cs
+++ b/SabreTools.Models/LZ/ExpandHeader.cs
@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace SabreTools.Models.Compression.LZ
+namespace SabreTools.Models.LZ
 {
     /// <summary>
     /// Standard LZ variant
diff --git a/SabreTools.Models/LZ/KWAJFile.cs b/SabreTools.Models/LZ/KWAJFile.cs
new file mode 100644
index 0000000..bd16428
--- /dev/null
+++ b/SabreTools.Models/LZ/KWAJFile.cs
@@ -0,0 +1,21 @@
+namespace SabreTools.Models.LZ
+{
+    /// <summary>
+    /// LZ variant with variable compression
+    /// </summary>
+    /// <see href="https://www.cabextract.org.uk/libmspack/doc/szdd_kwaj_format.html"/>
+    public sealed class KWAJFile
+    {
+        /// <summary>
+        /// Header
+        /// </summary>
+        public KWAJHeader? Header { get; set; }
+
+        /// <summary>
+        /// Optional extensions defined by <see cref="KWAJHeader.HeaderFlags"/> 
+        /// </summary>
+        public KWAJHeaderExtensions? HeaderExtensions { get; set; }
+
+        // Followed immediately by compressed data
+    }
+}
\ No newline at end of file
diff --git a/SabreTools.Models/Compression/LZ/KWAJHeader.cs b/SabreTools.Models/LZ/KWAJHeader.cs
similarity index 95%
rename from SabreTools.Models/Compression/LZ/KWAJHeader.cs
rename to SabreTools.Models/LZ/KWAJHeader.cs
index 6a66085..e487277 100644
--- a/SabreTools.Models/Compression/LZ/KWAJHeader.cs
+++ b/SabreTools.Models/LZ/KWAJHeader.cs
@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace SabreTools.Models.Compression.LZ
+namespace SabreTools.Models.LZ
 {
     /// <summary>
     /// LZ variant with variable compression
diff --git a/SabreTools.Models/Compression/LZ/KWAJHeaderExtensions.cs b/SabreTools.Models/LZ/KWAJHeaderExtensions.cs
similarity index 97%
rename from SabreTools.Models/Compression/LZ/KWAJHeaderExtensions.cs
rename to SabreTools.Models/LZ/KWAJHeaderExtensions.cs
index 1b0576f..b2decd2 100644
--- a/SabreTools.Models/Compression/LZ/KWAJHeaderExtensions.cs
+++ b/SabreTools.Models/LZ/KWAJHeaderExtensions.cs
@@ -1,4 +1,4 @@
-namespace SabreTools.Models.Compression.LZ
+namespace SabreTools.Models.LZ
 {
     /// <summary>
     /// Additional information stored after the KWAJ header
diff --git a/SabreTools.Models/LZ/QBasicFile.cs b/SabreTools.Models/LZ/QBasicFile.cs
new file mode 100644
index 0000000..a46935f
--- /dev/null
+++ b/SabreTools.Models/LZ/QBasicFile.cs
@@ -0,0 +1,16 @@
+namespace SabreTools.Models.LZ
+{
+    /// <summary>
+    /// LZ variant used in QBasic 4.5 installer
+    /// </summary>
+    /// <see href="https://www.cabextract.org.uk/libmspack/doc/szdd_kwaj_format.html"/>
+    public sealed class QBasicFile
+    {
+        /// <summary>
+        /// Header
+        /// </summary>
+        public QBasicHeader? Header { get; set; }
+
+        // Followed immediately by compressed data
+    }
+}
\ No newline at end of file
diff --git a/SabreTools.Models/Compression/LZ/QBasicHeader.cs b/SabreTools.Models/LZ/QBasicHeader.cs
similarity index 93%
rename from SabreTools.Models/Compression/LZ/QBasicHeader.cs
rename to SabreTools.Models/LZ/QBasicHeader.cs
index de3e46f..9b25200 100644
--- a/SabreTools.Models/Compression/LZ/QBasicHeader.cs
+++ b/SabreTools.Models/LZ/QBasicHeader.cs
@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace SabreTools.Models.Compression.LZ
+namespace SabreTools.Models.LZ
 {
     /// <summary>
     /// LZ variant used in QBasic 4.5 installer