diff --git a/BFPK/Header.cs b/BFPK/Header.cs
index 5efbe70..ad13ad9 100644
--- a/BFPK/Header.cs
+++ b/BFPK/Header.cs
@@ -1,12 +1,9 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.BFPK
+namespace SabreTools.Models.BFPK
 {
     /// <summary>
     /// Header
     /// </summary>
     /// <see cref="https://forum.xentax.com/viewtopic.php?t=5102"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class Header
     {
         /// <summary>
diff --git a/LinearExecutable/DebugInformation.cs b/LinearExecutable/DebugInformation.cs
index 6725430..5f6b361 100644
--- a/LinearExecutable/DebugInformation.cs
+++ b/LinearExecutable/DebugInformation.cs
@@ -1,6 +1,4 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.LinearExecutable
+namespace SabreTools.Models.LinearExecutable
 {
     /// <summary>
     /// The debug information is defined by the debugger and is not controlled by
@@ -13,7 +11,6 @@ namespace SabreTools.Models.LinearExecutable
     /// </summary>
     /// <see href="https://faydoc.tripod.com/formats/exe-LE.htm"/>
     /// <see href="http://www.edm2.com/index.php/LX_-_Linear_eXecutable_Module_Format_Description"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class DebugInformation
     {
         /// <summary>
diff --git a/LinearExecutable/EntryTableBundle.cs b/LinearExecutable/EntryTableBundle.cs
index 9893ad2..638750e 100644
--- a/LinearExecutable/EntryTableBundle.cs
+++ b/LinearExecutable/EntryTableBundle.cs
@@ -1,6 +1,4 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.LinearExecutable
+namespace SabreTools.Models.LinearExecutable
 {
     /// <summary>
     /// The entry table contains object and offset information that is used to resolve
@@ -17,7 +15,6 @@ namespace SabreTools.Models.LinearExecutable
     /// </summary>
     /// <see href="https://faydoc.tripod.com/formats/exe-LE.htm"/>
     /// <see href="http://www.edm2.com/index.php/LX_-_Linear_eXecutable_Module_Format_Description"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class EntryTableBundle
     {
         /// <summary>
diff --git a/LinearExecutable/FixupPageTableEntry.cs b/LinearExecutable/FixupPageTableEntry.cs
index b1279ee..e386d1c 100644
--- a/LinearExecutable/FixupPageTableEntry.cs
+++ b/LinearExecutable/FixupPageTableEntry.cs
@@ -1,6 +1,4 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.LinearExecutable
+namespace SabreTools.Models.LinearExecutable
 {
     /// <summary>
     /// The Fixup Page Table provides a simple mapping of a logical page number
@@ -17,7 +15,6 @@ namespace SabreTools.Models.LinearExecutable
     /// </summary>
     /// <see href="https://faydoc.tripod.com/formats/exe-LE.htm"/>
     /// <see href="http://www.edm2.com/index.php/LX_-_Linear_eXecutable_Module_Format_Description"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class FixupPageTableEntry
     {
         /// <summary>
diff --git a/LinearExecutable/ImportModuleNameTableEntry.cs b/LinearExecutable/ImportModuleNameTableEntry.cs
index 7ef82d0..f202143 100644
--- a/LinearExecutable/ImportModuleNameTableEntry.cs
+++ b/LinearExecutable/ImportModuleNameTableEntry.cs
@@ -1,6 +1,4 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.LinearExecutable
+namespace SabreTools.Models.LinearExecutable
 {
     /// <summary>
     /// The import module name table defines the module name strings imported through
@@ -17,7 +15,6 @@ namespace SabreTools.Models.LinearExecutable
     /// </summary>
     /// <see href="https://faydoc.tripod.com/formats/exe-LE.htm"/>
     /// <see href="http://www.edm2.com/index.php/LX_-_Linear_eXecutable_Module_Format_Description"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class ImportModuleNameTableEntry
     {
         /// <summary>
diff --git a/LinearExecutable/ImportProcedureNameTableEntry.cs b/LinearExecutable/ImportProcedureNameTableEntry.cs
index fa26d2f..b52550d 100644
--- a/LinearExecutable/ImportProcedureNameTableEntry.cs
+++ b/LinearExecutable/ImportProcedureNameTableEntry.cs
@@ -1,6 +1,4 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.LinearExecutable
+namespace SabreTools.Models.LinearExecutable
 {
     /// <summary>
     /// The import procedure name table defines the procedure name strings imported
@@ -20,7 +18,6 @@ namespace SabreTools.Models.LinearExecutable
     /// </summary>
     /// <see href="https://faydoc.tripod.com/formats/exe-LE.htm"/>
     /// <see href="http://www.edm2.com/index.php/LX_-_Linear_eXecutable_Module_Format_Description"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class ImportModuleProcedureNameTableEntry
     {
         /// <summary>
diff --git a/LinearExecutable/InformationBlock.cs b/LinearExecutable/InformationBlock.cs
index b635376..3defb14 100644
--- a/LinearExecutable/InformationBlock.cs
+++ b/LinearExecutable/InformationBlock.cs
@@ -1,6 +1,4 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.LinearExecutable
+namespace SabreTools.Models.LinearExecutable
 {
     /// <summary>
     /// The `information block` in the LE header contains the linker version number,
@@ -12,7 +10,6 @@ namespace SabreTools.Models.LinearExecutable
     /// </summary>
     /// <see href="https://faydoc.tripod.com/formats/exe-LE.htm"/>
     /// <see href="http://www.edm2.com/index.php/LX_-_Linear_eXecutable_Module_Format_Description"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class InformationBlock
     {
         /// <summary>
diff --git a/LinearExecutable/ModuleFormatDirectivesTableEntry.cs b/LinearExecutable/ModuleFormatDirectivesTableEntry.cs
index 9530351..41aafcb 100644
--- a/LinearExecutable/ModuleFormatDirectivesTableEntry.cs
+++ b/LinearExecutable/ModuleFormatDirectivesTableEntry.cs
@@ -1,6 +1,4 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.LinearExecutable
+namespace SabreTools.Models.LinearExecutable
 {
     /// <summary>
     /// The Module Format Directives Table is an optional table that allows additional
@@ -15,7 +13,6 @@ namespace SabreTools.Models.LinearExecutable
     /// </summary>
     /// <see href="https://faydoc.tripod.com/formats/exe-LE.htm"/>
     /// <see href="http://www.edm2.com/index.php/LX_-_Linear_eXecutable_Module_Format_Description"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class ModuleFormatDirectivesTableEntry
     {
         /// <summary>
diff --git a/LinearExecutable/NonResidentNamesTableEntry.cs b/LinearExecutable/NonResidentNamesTableEntry.cs
index f72c358..2a5aefd 100644
--- a/LinearExecutable/NonResidentNamesTableEntry.cs
+++ b/LinearExecutable/NonResidentNamesTableEntry.cs
@@ -1,6 +1,4 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.LinearExecutable
+namespace SabreTools.Models.LinearExecutable
 {
     /// <summary>
     /// The resident and non-resident name tables define the ASCII names and ordinal
@@ -27,7 +25,6 @@ namespace SabreTools.Models.LinearExecutable
     /// </summary>
     /// <see href="https://faydoc.tripod.com/formats/exe-LE.htm"/>
     /// <see href="http://www.edm2.com/index.php/LX_-_Linear_eXecutable_Module_Format_Description"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class NonResidentNamesTableEntry
     {
         /// <summary>
diff --git a/LinearExecutable/ObjectPageMapEntry.cs b/LinearExecutable/ObjectPageMapEntry.cs
index 25f7525..29dd268 100644
--- a/LinearExecutable/ObjectPageMapEntry.cs
+++ b/LinearExecutable/ObjectPageMapEntry.cs
@@ -1,6 +1,4 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.LinearExecutable
+namespace SabreTools.Models.LinearExecutable
 {
     /// <summary>
     /// The Object page table provides information about a logical page in an object.
@@ -15,7 +13,6 @@ namespace SabreTools.Models.LinearExecutable
     /// </summary>
     /// <see href="https://faydoc.tripod.com/formats/exe-LE.htm"/>
     /// <see href="http://www.edm2.com/index.php/LX_-_Linear_eXecutable_Module_Format_Description"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class ObjectPageMapEntry
     {
         /// <summary>
diff --git a/LinearExecutable/ObjectTableEntry.cs b/LinearExecutable/ObjectTableEntry.cs
index acc15ed..e851e41 100644
--- a/LinearExecutable/ObjectTableEntry.cs
+++ b/LinearExecutable/ObjectTableEntry.cs
@@ -1,6 +1,4 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.LinearExecutable
+namespace SabreTools.Models.LinearExecutable
 {
     /// <summary>
     /// The object table contains information that describes each segment in
@@ -14,7 +12,6 @@ namespace SabreTools.Models.LinearExecutable
     /// </remarks>
     /// <see href="https://faydoc.tripod.com/formats/exe-LE.htm"/>
     /// <see href="http://www.edm2.com/index.php/LX_-_Linear_eXecutable_Module_Format_Description"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class ObjectTableEntry
     {
         /// <summary>
diff --git a/LinearExecutable/PerPageChecksumTableEntry.cs b/LinearExecutable/PerPageChecksumTableEntry.cs
index c07ef92..9ede004 100644
--- a/LinearExecutable/PerPageChecksumTableEntry.cs
+++ b/LinearExecutable/PerPageChecksumTableEntry.cs
@@ -1,6 +1,4 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.LinearExecutable
+namespace SabreTools.Models.LinearExecutable
 {
     /// <summary>
     /// The Per-Page Checksum table provides space for a cryptographic checksum for
@@ -13,7 +11,6 @@ namespace SabreTools.Models.LinearExecutable
     /// </summary>
     /// <see href="https://faydoc.tripod.com/formats/exe-LE.htm"/>
     /// <see href="http://www.edm2.com/index.php/LX_-_Linear_eXecutable_Module_Format_Description"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class PerPageChecksumTableEntry
     {
         /// <summary>
diff --git a/LinearExecutable/ResidentNamesTableEntry.cs b/LinearExecutable/ResidentNamesTableEntry.cs
index 80e292b..d52ba48 100644
--- a/LinearExecutable/ResidentNamesTableEntry.cs
+++ b/LinearExecutable/ResidentNamesTableEntry.cs
@@ -1,6 +1,4 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.LinearExecutable
+namespace SabreTools.Models.LinearExecutable
 {
     /// <summary>
     /// The resident and non-resident name tables define the ASCII names and ordinal
@@ -27,7 +25,6 @@ namespace SabreTools.Models.LinearExecutable
     /// </summary>
     /// <see href="https://faydoc.tripod.com/formats/exe-LE.htm"/>
     /// <see href="http://www.edm2.com/index.php/LX_-_Linear_eXecutable_Module_Format_Description"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class ResidentNamesTableEntry
     {
         /// <summary>
diff --git a/LinearExecutable/ResourceTableEntry.cs b/LinearExecutable/ResourceTableEntry.cs
index 7c08b4e..bd991ef 100644
--- a/LinearExecutable/ResourceTableEntry.cs
+++ b/LinearExecutable/ResourceTableEntry.cs
@@ -1,6 +1,4 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.LinearExecutable
+namespace SabreTools.Models.LinearExecutable
 {
     /// <summary>
     /// The resource table is an array of resource table entries. Each resource table
@@ -15,7 +13,6 @@ namespace SabreTools.Models.LinearExecutable
     /// </summary>
     /// <see href="https://faydoc.tripod.com/formats/exe-LE.htm"/>
     /// <see href="http://www.edm2.com/index.php/LX_-_Linear_eXecutable_Module_Format_Description"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class ResourceTableEntry
     {
         /// <summary>
diff --git a/LinearExecutable/VerifyRecordDirectiveTableEntry.cs b/LinearExecutable/VerifyRecordDirectiveTableEntry.cs
index 9b24b49..115892e 100644
--- a/LinearExecutable/VerifyRecordDirectiveTableEntry.cs
+++ b/LinearExecutable/VerifyRecordDirectiveTableEntry.cs
@@ -1,6 +1,4 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.LinearExecutable
+namespace SabreTools.Models.LinearExecutable
 {
     /// <summary>
     /// The Verify Record Directive Table is an optional table. It maintains a record
@@ -11,7 +9,6 @@ namespace SabreTools.Models.LinearExecutable
     /// </summary>
     /// <see href="https://faydoc.tripod.com/formats/exe-LE.htm"/>
     /// <see href="http://www.edm2.com/index.php/LX_-_Linear_eXecutable_Module_Format_Description"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class VerifyRecordDirectiveTableEntry
     {
         /// <summary>
diff --git a/MSDOS/ExecutableHeader.cs b/MSDOS/ExecutableHeader.cs
index ac2c9d8..452775a 100644
--- a/MSDOS/ExecutableHeader.cs
+++ b/MSDOS/ExecutableHeader.cs
@@ -1,5 +1,3 @@
-using System.Runtime.InteropServices;
-
 namespace SabreTools.Models.MSDOS
 {
     /// <summary>
@@ -8,7 +6,6 @@ namespace SabreTools.Models.MSDOS
     /// </summary>
     /// <see href="https://wiki.osdev.org/MZ"/>
     /// <see href="http://www.pinvoke.net/default.aspx/Structures.IMAGE_DOS_HEADER"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class ExecutableHeader
     {
         #region Standard Fields
@@ -16,11 +13,10 @@ namespace SabreTools.Models.MSDOS
         /// <summary>
         /// 0x5A4D (ASCII for 'M' and 'Z')
         /// </summary>
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
 #if NET48
-        public string Magic;
+        public string Magic { get; set; }
 #else
-        public string? Magic;
+        public string? Magic { get; set; }
 #endif
 
         /// <summary>
@@ -105,11 +101,10 @@ namespace SabreTools.Models.MSDOS
         /// <summary>
         /// Reserved words
         /// </summary>
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
 #if NET48
-        public ushort[] Reserved1;
+        public ushort[] Reserved1 { get; set; } = new ushort[4];
 #else
-        public ushort[]? Reserved1;
+        public ushort[]? Reserved1 { get; set; } = new ushort[4];
 #endif
 
         /// <summary>
@@ -125,11 +120,10 @@ namespace SabreTools.Models.MSDOS
         /// <summary>
         /// Reserved words
         /// </summary>
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 10)]
 #if NET48
-        public ushort[] Reserved2;
+        public ushort[] Reserved2 { get; set; } = new ushort[10];
 #else
-        public ushort[]? Reserved2;
+        public ushort[]? Reserved2 { get; set; } = new ushort[10];
 #endif
 
         /// <summary>
diff --git a/MSDOS/RelocationEntry.cs b/MSDOS/RelocationEntry.cs
index 81cbc86..53cf736 100644
--- a/MSDOS/RelocationEntry.cs
+++ b/MSDOS/RelocationEntry.cs
@@ -1,12 +1,9 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.MSDOS
+namespace SabreTools.Models.MSDOS
 {
     /// <summary>
     /// Each pointer in the relocation table looks as such
     /// </summary>
     /// <see href="https://wiki.osdev.org/MZ"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class RelocationEntry
     {
         /// <summary>
diff --git a/MicrosoftCabinet/CFDATA.cs b/MicrosoftCabinet/CFDATA.cs
index da28484..bb3315d 100644
--- a/MicrosoftCabinet/CFDATA.cs
+++ b/MicrosoftCabinet/CFDATA.cs
@@ -1,6 +1,4 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.MicrosoftCabinet
+namespace SabreTools.Models.MicrosoftCabinet
 {
     /// <summary>
     /// Each CFDATA structure describes some amount of compressed data, as shown in the following
@@ -9,7 +7,6 @@ namespace SabreTools.Models.MicrosoftCabinet
     /// contiguous.
     /// </summary>
     /// <see href="http://download.microsoft.com/download/5/0/1/501ED102-E53F-4CE0-AA6B-B0F93629DDC6/Exchange/%5BMS-CAB%5D.pdf"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class CFDATA
     {
         /// <summary>
diff --git a/MicrosoftCabinet/CFFILE.cs b/MicrosoftCabinet/CFFILE.cs
index 3a6f0e8..7664b34 100644
--- a/MicrosoftCabinet/CFFILE.cs
+++ b/MicrosoftCabinet/CFFILE.cs
@@ -1,6 +1,4 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.MicrosoftCabinet
+namespace SabreTools.Models.MicrosoftCabinet
 {
     /// <summary>
     /// Each CFFILE structure contains information about one of the files stored (or at least partially
@@ -12,7 +10,6 @@ namespace SabreTools.Models.MicrosoftCabinet
     /// will be last.
     /// </summary>
     /// <see href="http://download.microsoft.com/download/5/0/1/501ED102-E53F-4CE0-AA6B-B0F93629DDC6/Exchange/%5BMS-CAB%5D.pdf"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class CFFILE
     {
         /// <summary>
diff --git a/MicrosoftCabinet/CFFOLDER.cs b/MicrosoftCabinet/CFFOLDER.cs
index 8b69f27..e575c2d 100644
--- a/MicrosoftCabinet/CFFOLDER.cs
+++ b/MicrosoftCabinet/CFFOLDER.cs
@@ -1,6 +1,4 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.MicrosoftCabinet
+namespace SabreTools.Models.MicrosoftCabinet
 {
     /// <summary>
     /// Each CFFOLDER structure contains information about one of the folders or partial folders stored in
@@ -22,7 +20,6 @@ namespace SabreTools.Models.MicrosoftCabinet
     /// previous cabinet file.
     /// </summary>
     /// <see href="http://download.microsoft.com/download/5/0/1/501ED102-E53F-4CE0-AA6B-B0F93629DDC6/Exchange/%5BMS-CAB%5D.pdf"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class CFFOLDER
     {
         /// <summary>
diff --git a/MicrosoftCabinet/CFHEADER.cs b/MicrosoftCabinet/CFHEADER.cs
index 433aad7..720419b 100644
--- a/MicrosoftCabinet/CFHEADER.cs
+++ b/MicrosoftCabinet/CFHEADER.cs
@@ -1,13 +1,10 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.MicrosoftCabinet
+namespace SabreTools.Models.MicrosoftCabinet
 {
     /// <summary>
     /// The CFHEADER structure shown in the following packet diagram provides information about this
     /// cabinet (.cab) file.
     /// </summary>
     /// <see href="http://download.microsoft.com/download/5/0/1/501ED102-E53F-4CE0-AA6B-B0F93629DDC6/Exchange/%5BMS-CAB%5D.pdf"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class CFHEADER
     {
         /// <summary>
diff --git a/MoPaQ/ArchiveHeader.cs b/MoPaQ/ArchiveHeader.cs
index 8d0e550..15519b2 100644
--- a/MoPaQ/ArchiveHeader.cs
+++ b/MoPaQ/ArchiveHeader.cs
@@ -1,12 +1,9 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.MoPaQ
+namespace SabreTools.Models.MoPaQ
 {
     /// <summary>
     /// MoPaQ archive header
     /// </summary>
     /// <see href="http://zezula.net/en/mpq/mpqformat.html"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class ArchiveHeader
     {
         #region V1 Properties
diff --git a/MoPaQ/BetTable.cs b/MoPaQ/BetTable.cs
index 4abe8b9..2779d46 100644
--- a/MoPaQ/BetTable.cs
+++ b/MoPaQ/BetTable.cs
@@ -1,6 +1,4 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.MoPaQ
+namespace SabreTools.Models.MoPaQ
 {
     /// <summary>
     /// The BET table is present if the BetTablePos64 member of MPQ header is set
@@ -8,7 +6,6 @@ namespace SabreTools.Models.MoPaQ
     /// replace it. It is also supposed to be more effective.
     /// </summary>
     /// <see href="http://zezula.net/en/mpq/mpqformat.html"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class BetTable
     {
         // TODO: Extract this out and make in common between HET and BET
diff --git a/MoPaQ/BlockEntry.cs b/MoPaQ/BlockEntry.cs
index 5a49cdd..48b6904 100644
--- a/MoPaQ/BlockEntry.cs
+++ b/MoPaQ/BlockEntry.cs
@@ -1,6 +1,4 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.MoPaQ
+namespace SabreTools.Models.MoPaQ
 {
     /// <summary>
     /// Block table contains informations about file sizes and way of their storage within
@@ -8,7 +6,6 @@ namespace SabreTools.Models.MoPaQ
     /// of block table entry is (like hash table entry). The block table is also encrypted.
     /// </summary>
     /// <see href="http://zezula.net/en/mpq/mpqformat.html"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class BlockEntry
     {
         /// <summary>
diff --git a/MoPaQ/HashEntry.cs b/MoPaQ/HashEntry.cs
index ba282b4..67ccb91 100644
--- a/MoPaQ/HashEntry.cs
+++ b/MoPaQ/HashEntry.cs
@@ -1,6 +1,4 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.MoPaQ
+namespace SabreTools.Models.MoPaQ
 {
     /// <summary>
     /// Hash table is used for searching files by name. The file name is converted to
@@ -10,7 +8,6 @@ namespace SabreTools.Models.MoPaQ
     /// table is 16 bytes.
     /// </summary>
     /// <see href="http://zezula.net/en/mpq/mpqformat.html"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class HashEntry
     {
         /// <summary>
diff --git a/MoPaQ/HetTable.cs b/MoPaQ/HetTable.cs
index d826b5f..2a62c9d 100644
--- a/MoPaQ/HetTable.cs
+++ b/MoPaQ/HetTable.cs
@@ -1,6 +1,4 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.MoPaQ
+namespace SabreTools.Models.MoPaQ
 {
     /// <summary>
     /// The HET table is present if the HetTablePos64 member of MPQ header is
@@ -9,7 +7,6 @@ namespace SabreTools.Models.MoPaQ
     /// table. HET table can be encrypted and compressed.
     /// </summary>
     /// <see href="http://zezula.net/en/mpq/mpqformat.html"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class HetTable
     {
         // TODO: Extract this out and make in common between HET and BET
diff --git a/MoPaQ/PatchHeader.cs b/MoPaQ/PatchHeader.cs
index 8ab6e57..b5631fc 100644
--- a/MoPaQ/PatchHeader.cs
+++ b/MoPaQ/PatchHeader.cs
@@ -1,13 +1,10 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.MoPaQ
+namespace SabreTools.Models.MoPaQ
 {
     /// <summary>
     /// Each incremental patch file in a patch MPQ starts with a header. It is supposed
     /// to be a structure with variable length.
     /// </summary>
     /// <see href="http://zezula.net/en/mpq/mpqformat.html"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class PatchHeader
     {
         #region PATCH Header
diff --git a/MoPaQ/PatchInfo.cs b/MoPaQ/PatchInfo.cs
index cc6a84c..83e719e 100644
--- a/MoPaQ/PatchInfo.cs
+++ b/MoPaQ/PatchInfo.cs
@@ -1,12 +1,9 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.MoPaQ
+namespace SabreTools.Models.MoPaQ
 {
     /// <summary>
     /// This structure contains size of the patch, flags and also MD5 of the patch.
     /// </summary>
     /// <see href="http://zezula.net/en/mpq/mpqformat.html"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class PatchInfo
     {
         /// <summary>
diff --git a/MoPaQ/UserData.cs b/MoPaQ/UserData.cs
index f2651f7..f5b147b 100644
--- a/MoPaQ/UserData.cs
+++ b/MoPaQ/UserData.cs
@@ -1,6 +1,4 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.MoPaQ
+namespace SabreTools.Models.MoPaQ
 {
     /// <summary>
     /// MPQ User Data are optional, and is commonly used in custom maps for
@@ -8,7 +6,6 @@ namespace SabreTools.Models.MoPaQ
     /// from where the MPQ header should be searched.
     /// </summary>
     /// <see href="http://zezula.net/en/mpq/mpqformat.html"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class UserData
     {
         /// <summary>
diff --git a/NewExecutable/ExecutableHeader.cs b/NewExecutable/ExecutableHeader.cs
index 4f43e15..ebda8b7 100644
--- a/NewExecutable/ExecutableHeader.cs
+++ b/NewExecutable/ExecutableHeader.cs
@@ -1,5 +1,3 @@
-using System.Runtime.InteropServices;
-
 namespace SabreTools.Models.NewExecutable
 {
     /// <summary>
@@ -8,7 +6,6 @@ namespace SabreTools.Models.NewExecutable
     /// </summary>
     /// <see href="http://bytepointer.com/resources/win16_ne_exe_format_win3.0.htm"/>
     /// <see href="https://github.com/libyal/libexe/blob/main/documentation/Executable%20(EXE)%20file%20format.asciidoc#24-ne-extended-header"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class ExecutableHeader
     {
         /// <summary>
@@ -16,7 +13,6 @@ namespace SabreTools.Models.NewExecutable
         /// "N" is low-order byte.
         /// "E" is high-order byte.
         /// </summary>
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
 #if NET48
         public string Magic;
 #else
diff --git a/NewExecutable/ImportNameRelocationRecord.cs b/NewExecutable/ImportNameRelocationRecord.cs
index 2470d7d..a71bd3d 100644
--- a/NewExecutable/ImportNameRelocationRecord.cs
+++ b/NewExecutable/ImportNameRelocationRecord.cs
@@ -1,9 +1,6 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.NewExecutable
+namespace SabreTools.Models.NewExecutable
 {
     /// <see href="http://bytepointer.com/resources/win16_ne_exe_format_win3.0.htm"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class ImportNameRelocationRecord
     {
         /// <summary>
diff --git a/NewExecutable/ImportOrdinalRelocationRecord.cs b/NewExecutable/ImportOrdinalRelocationRecord.cs
index 1f3e05f..0d357b0 100644
--- a/NewExecutable/ImportOrdinalRelocationRecord.cs
+++ b/NewExecutable/ImportOrdinalRelocationRecord.cs
@@ -1,9 +1,6 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.NewExecutable
+namespace SabreTools.Models.NewExecutable
 {
     /// <see href="http://bytepointer.com/resources/win16_ne_exe_format_win3.0.htm"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class ImportOrdinalRelocationRecord
     {
         /// <summary>
diff --git a/NewExecutable/ImportedNameTableEntry.cs b/NewExecutable/ImportedNameTableEntry.cs
index 9ba08a0..3fe09f8 100644
--- a/NewExecutable/ImportedNameTableEntry.cs
+++ b/NewExecutable/ImportedNameTableEntry.cs
@@ -1,6 +1,4 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.NewExecutable
+namespace SabreTools.Models.NewExecutable
 {
     /// <summary>
     /// The imported-name table follows the module-reference table. This table
@@ -11,7 +9,6 @@ namespace SabreTools.Models.NewExecutable
     /// sensitive.
     /// </summary>
     /// <see href="http://bytepointer.com/resources/win16_ne_exe_format_win3.0.htm"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class ImportedNameTableEntry
     {
         /// <summary>
diff --git a/NewExecutable/InternalRefRelocationRecord.cs b/NewExecutable/InternalRefRelocationRecord.cs
index 16e8342..4a6b38c 100644
--- a/NewExecutable/InternalRefRelocationRecord.cs
+++ b/NewExecutable/InternalRefRelocationRecord.cs
@@ -1,9 +1,6 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.NewExecutable
+namespace SabreTools.Models.NewExecutable
 {
     /// <see href="http://bytepointer.com/resources/win16_ne_exe_format_win3.0.htm"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class InternalRefRelocationRecord
     {
         /// <summary>
diff --git a/NewExecutable/ModuleReferenceTableEntry.cs b/NewExecutable/ModuleReferenceTableEntry.cs
index 780a58b..2b1b23a 100644
--- a/NewExecutable/ModuleReferenceTableEntry.cs
+++ b/NewExecutable/ModuleReferenceTableEntry.cs
@@ -1,6 +1,4 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.NewExecutable
+namespace SabreTools.Models.NewExecutable
 {
     /// <summary>
     /// The module-reference table follows the resident-name table. Each entry
@@ -8,7 +6,6 @@ namespace SabreTools.Models.NewExecutable
     /// names table; each entry is 2 bytes long.
     /// </summary>
     /// <see href="http://bytepointer.com/resources/win16_ne_exe_format_win3.0.htm"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class ModuleReferenceTableEntry
     {
         /// <summary>
diff --git a/NewExecutable/NonResidentNameTableEntry.cs b/NewExecutable/NonResidentNameTableEntry.cs
index 48c161d..3e2e46b 100644
--- a/NewExecutable/NonResidentNameTableEntry.cs
+++ b/NewExecutable/NonResidentNameTableEntry.cs
@@ -1,6 +1,4 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.NewExecutable
+namespace SabreTools.Models.NewExecutable
 {
     /// <summary>
     /// The nonresident-name table follows the entry table, and contains a
@@ -11,7 +9,6 @@ namespace SabreTools.Models.NewExecutable
     /// table.
     /// </summary>
     /// <see href="http://bytepointer.com/resources/win16_ne_exe_format_win3.0.htm"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class NonResidentNameTableEntry
     {
         /// <summary>
diff --git a/NewExecutable/OSFixupRelocationRecord.cs b/NewExecutable/OSFixupRelocationRecord.cs
index 4b33637..b7a79b3 100644
--- a/NewExecutable/OSFixupRelocationRecord.cs
+++ b/NewExecutable/OSFixupRelocationRecord.cs
@@ -1,9 +1,6 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.NewExecutable
+namespace SabreTools.Models.NewExecutable
 {
     /// <see href="http://bytepointer.com/resources/win16_ne_exe_format_win3.0.htm"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class OSFixupRelocationRecord
     {
         /// <summary>
diff --git a/NewExecutable/RelocationRecord.cs b/NewExecutable/RelocationRecord.cs
index daccd21..22f37a2 100644
--- a/NewExecutable/RelocationRecord.cs
+++ b/NewExecutable/RelocationRecord.cs
@@ -1,13 +1,10 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.NewExecutable
+namespace SabreTools.Models.NewExecutable
 {
     /// <summary>
     /// A table of relocation records follows. The following is the format
     /// of each relocation record.
     /// </summary>
     /// <see href="http://bytepointer.com/resources/win16_ne_exe_format_win3.0.htm"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class RelocationRecord
     {
         /// <summary>
diff --git a/NewExecutable/ResidentNameTableEntry.cs b/NewExecutable/ResidentNameTableEntry.cs
index 642bc95..baabc86 100644
--- a/NewExecutable/ResidentNameTableEntry.cs
+++ b/NewExecutable/ResidentNameTableEntry.cs
@@ -1,6 +1,4 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.NewExecutable
+namespace SabreTools.Models.NewExecutable
 {
     /// <summary>
     /// The resident-name table follows the resource table, and contains this
@@ -10,7 +8,6 @@ namespace SabreTools.Models.NewExecutable
     /// describes the format of the name strings:
     /// </summary>
     /// <see href="http://bytepointer.com/resources/win16_ne_exe_format_win3.0.htm"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class ResidentNameTableEntry
     {
         /// <summary>
diff --git a/NewExecutable/ResourceTable.cs b/NewExecutable/ResourceTable.cs
index c279b90..6a4eb3c 100644
--- a/NewExecutable/ResourceTable.cs
+++ b/NewExecutable/ResourceTable.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Runtime.InteropServices;
 
 namespace SabreTools.Models.NewExecutable
 {
@@ -14,7 +13,6 @@ namespace SabreTools.Models.NewExecutable
     /// following describes the contents of each of these structures:
     /// </summary>
     /// <see href="http://bytepointer.com/resources/win16_ne_exe_format_win3.0.htm"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class ResourceTable
     {
         /// <summary>
diff --git a/NewExecutable/ResourceTypeAndNameString.cs b/NewExecutable/ResourceTypeAndNameString.cs
index b7f6089..2c2ce49 100644
--- a/NewExecutable/ResourceTypeAndNameString.cs
+++ b/NewExecutable/ResourceTypeAndNameString.cs
@@ -1,6 +1,4 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.NewExecutable
+namespace SabreTools.Models.NewExecutable
 {
     /// <summary>
     /// Resource type and name strings are stored at the end of the
@@ -8,7 +6,6 @@ namespace SabreTools.Models.NewExecutable
     /// are case sensitive.
     /// </summary>
     /// <see href="http://bytepointer.com/resources/win16_ne_exe_format_win3.0.htm"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class ResourceTypeAndNameString
     {
         /// <summary>
diff --git a/NewExecutable/ResourceTypeInformationEntry.cs b/NewExecutable/ResourceTypeInformationEntry.cs
index 6ed1f28..a1fe18a 100644
--- a/NewExecutable/ResourceTypeInformationEntry.cs
+++ b/NewExecutable/ResourceTypeInformationEntry.cs
@@ -1,13 +1,10 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.NewExecutable
+namespace SabreTools.Models.NewExecutable
 {
     /// <summary>
     /// A table of resource type information blocks follows. The following
     /// is the format of each type information block:
     /// </summary>
     /// <see href="http://bytepointer.com/resources/win16_ne_exe_format_win3.0.htm"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class ResourceTypeInformationEntry
     {
         /// <summary>
diff --git a/NewExecutable/ResourceTypeResourceEntry.cs b/NewExecutable/ResourceTypeResourceEntry.cs
index 53edb22..de25421 100644
--- a/NewExecutable/ResourceTypeResourceEntry.cs
+++ b/NewExecutable/ResourceTypeResourceEntry.cs
@@ -1,13 +1,10 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.NewExecutable
+namespace SabreTools.Models.NewExecutable
 {
     /// <summary>
     /// A table of resources for this type follows. The following is
     /// the format of each resource (8 bytes each):
     /// </summary>
     /// <see href="http://bytepointer.com/resources/win16_ne_exe_format_win3.0.htm"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class ResourceTypeResourceEntry
     {
         /// <summary>
diff --git a/NewExecutable/SegmentTableEntry.cs b/NewExecutable/SegmentTableEntry.cs
index b85a660..5d947a9 100644
--- a/NewExecutable/SegmentTableEntry.cs
+++ b/NewExecutable/SegmentTableEntry.cs
@@ -1,6 +1,4 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.NewExecutable
+namespace SabreTools.Models.NewExecutable
 {
     /// <summary>
     /// The segment table contains an entry for each segment in the executable
@@ -9,7 +7,6 @@ namespace SabreTools.Models.NewExecutable
     /// The following is the structure of a segment table entry.
     /// </summary>
     /// <see href="http://bytepointer.com/resources/win16_ne_exe_format_win3.0.htm"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class SegmentTableEntry
     {
         /// <summary>
diff --git a/PortableExecutable/AcceleratorTableEntry.cs b/PortableExecutable/AcceleratorTableEntry.cs
index f87c77a..23f8571 100644
--- a/PortableExecutable/AcceleratorTableEntry.cs
+++ b/PortableExecutable/AcceleratorTableEntry.cs
@@ -1,13 +1,10 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.PortableExecutable
+namespace SabreTools.Models.PortableExecutable
 {
     /// <summary>
     /// Describes the data in an individual accelerator table resource. The structure definition
     /// provided here is for explanation only; it is not present in any standard header file.
     /// </summary>
     /// <see href="https://learn.microsoft.com/en-us/windows/win32/menurc/acceltableentry"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class AcceleratorTableEntry
     {
         /// <summary>
diff --git a/PortableExecutable/COFFFileHeader.cs b/PortableExecutable/COFFFileHeader.cs
index 39fa94d..a283763 100644
--- a/PortableExecutable/COFFFileHeader.cs
+++ b/PortableExecutable/COFFFileHeader.cs
@@ -1,6 +1,4 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.PortableExecutable
+namespace SabreTools.Models.PortableExecutable
 {
     /// <summary>
     /// At the beginning of an object file, or immediately after the signature
@@ -8,7 +6,6 @@ namespace SabreTools.Models.PortableExecutable
     /// Note that the Windows loader limits the number of sections to 96.
     /// </summary>
     /// <see href="https://learn.microsoft.com/en-us/windows/win32/debug/pe-format"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class COFFFileHeader
     {
         /// <summary>
diff --git a/PortableExecutable/COFFRelocation.cs b/PortableExecutable/COFFRelocation.cs
index e8b6765..b7fb2eb 100644
--- a/PortableExecutable/COFFRelocation.cs
+++ b/PortableExecutable/COFFRelocation.cs
@@ -1,6 +1,4 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.PortableExecutable
+namespace SabreTools.Models.PortableExecutable
 {
     /// <summary>
     /// Object files contain COFF relocations, which specify how the section data
@@ -17,7 +15,6 @@ namespace SabreTools.Models.PortableExecutable
     /// specified in the section header.
     /// </summary>
     /// <see href="https://learn.microsoft.com/en-us/windows/win32/debug/pe-format"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class COFFRelocation
     {
         /// <summary>
diff --git a/PortableExecutable/DataDirectory.cs b/PortableExecutable/DataDirectory.cs
index 4886956..4bf4701 100644
--- a/PortableExecutable/DataDirectory.cs
+++ b/PortableExecutable/DataDirectory.cs
@@ -1,6 +1,4 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.PortableExecutable
+namespace SabreTools.Models.PortableExecutable
 {
     /// <summary>
     /// Each data directory gives the address and size of a table or string that Windows uses.
@@ -11,7 +9,6 @@ namespace SabreTools.Models.PortableExecutable
     /// that the sections that contain specific tables have specific names.
     /// </summary>
     /// <see href="https://learn.microsoft.com/en-us/windows/win32/debug/pe-format"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class DataDirectory
     {
         /// <summary>
diff --git a/PortableExecutable/DebugDirectoryEntry.cs b/PortableExecutable/DebugDirectoryEntry.cs
index f6c95ba..e96dced 100644
--- a/PortableExecutable/DebugDirectoryEntry.cs
+++ b/PortableExecutable/DebugDirectoryEntry.cs
@@ -1,6 +1,4 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.PortableExecutable
+namespace SabreTools.Models.PortableExecutable
 {
     /// <summary>
     /// Image files contain an optional debug directory that indicates what form
@@ -19,7 +17,6 @@ namespace SabreTools.Models.PortableExecutable
     /// RVA is its address.
     /// </summary>
     /// <see href="https://learn.microsoft.com/en-us/windows/win32/debug/pe-format"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class DebugDirectoryEntry
     {
         /// <summary>
diff --git a/PortableExecutable/DelayLoadDirectoryTable.cs b/PortableExecutable/DelayLoadDirectoryTable.cs
index 1b8b117..08b295a 100644
--- a/PortableExecutable/DelayLoadDirectoryTable.cs
+++ b/PortableExecutable/DelayLoadDirectoryTable.cs
@@ -1,6 +1,4 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.PortableExecutable
+namespace SabreTools.Models.PortableExecutable
 {
     /// <summary>
     /// The delay-load directory table is the counterpart to the import directory
@@ -8,7 +6,6 @@ namespace SabreTools.Models.PortableExecutable
     /// the optional header data directories list (offset 200).
     /// </summary>
     /// <see href="https://learn.microsoft.com/en-us/windows/win32/debug/pe-format"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class DelayLoadDirectoryTable
     {
         /// <summary>
diff --git a/PortableExecutable/DialogItemTemplate.cs b/PortableExecutable/DialogItemTemplate.cs
index 2b20890..a8d4f77 100644
--- a/PortableExecutable/DialogItemTemplate.cs
+++ b/PortableExecutable/DialogItemTemplate.cs
@@ -1,6 +1,4 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.PortableExecutable
+namespace SabreTools.Models.PortableExecutable
 {
     /// <summary>
     /// Defines the dimensions and style of a control in a dialog box. One or more of these
@@ -8,7 +6,6 @@ namespace SabreTools.Models.PortableExecutable
     /// for a dialog box.
     /// </summary>
     /// <see href="https://learn.microsoft.com/en-us/windows/win32/api/winuser/ns-winuser-dlgitemtemplate"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class DialogItemTemplate
     {
         /// <summary>
diff --git a/PortableExecutable/DialogItemTemplateExtended.cs b/PortableExecutable/DialogItemTemplateExtended.cs
index 871d659..3a81175 100644
--- a/PortableExecutable/DialogItemTemplateExtended.cs
+++ b/PortableExecutable/DialogItemTemplateExtended.cs
@@ -1,13 +1,10 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.PortableExecutable
+namespace SabreTools.Models.PortableExecutable
 {
     /// <summary>
     /// A block of text used by an extended dialog box template to describe the extended dialog box.
     /// For a description of the format of an extended dialog box template, see DLGTEMPLATEEX.
     /// </summary>
     /// <see href="https://learn.microsoft.com/en-us/windows/win32/dlgbox/dlgitemtemplateex"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class DialogItemTemplateExtended
     {
         /// <summary>
diff --git a/PortableExecutable/DialogTemplate.cs b/PortableExecutable/DialogTemplate.cs
index 05b170e..49865c8 100644
--- a/PortableExecutable/DialogTemplate.cs
+++ b/PortableExecutable/DialogTemplate.cs
@@ -1,6 +1,4 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.PortableExecutable
+namespace SabreTools.Models.PortableExecutable
 {
     /// <summary>
     /// Defines the dimensions and style of a dialog box. This structure, always the first
@@ -9,7 +7,6 @@ namespace SabreTools.Models.PortableExecutable
     /// structures in the template.
     /// </summary>
     /// <see href="https://learn.microsoft.com/en-us/windows/win32/api/winuser/ns-winuser-dlgtemplate"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class DialogTemplate
     {
         /// <summary>
diff --git a/PortableExecutable/DialogTemplateExtended.cs b/PortableExecutable/DialogTemplateExtended.cs
index 92e0c64..3e94aed 100644
--- a/PortableExecutable/DialogTemplateExtended.cs
+++ b/PortableExecutable/DialogTemplateExtended.cs
@@ -1,6 +1,4 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.PortableExecutable
+namespace SabreTools.Models.PortableExecutable
 {
     /// <summary>
     /// An extended dialog box template begins with a DLGTEMPLATEEX header that describes
@@ -13,7 +11,6 @@ namespace SabreTools.Models.PortableExecutable
     /// for a dialog box.
     /// </summary>
     /// <see href="https://learn.microsoft.com/en-us/windows/win32/dlgbox/dlgtemplateex"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class DialogTemplateExtended
     {
         /// <summary>
diff --git a/PortableExecutable/ExportDirectoryTable.cs b/PortableExecutable/ExportDirectoryTable.cs
index b3f853e..dbe4f98 100644
--- a/PortableExecutable/ExportDirectoryTable.cs
+++ b/PortableExecutable/ExportDirectoryTable.cs
@@ -1,6 +1,4 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.PortableExecutable
+namespace SabreTools.Models.PortableExecutable
 {
     /// <summary>
     /// The export symbol information begins with the export directory table,
@@ -9,7 +7,6 @@ namespace SabreTools.Models.PortableExecutable
     /// imports to the entry points within this image.
     /// </summary>
     /// <see href="https://learn.microsoft.com/en-us/windows/win32/debug/pe-format"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class ExportDirectoryTable
     {
         /// <summary>
diff --git a/PortableExecutable/FixedFileInfo.cs b/PortableExecutable/FixedFileInfo.cs
index 36b19a3..663cb18 100644
--- a/PortableExecutable/FixedFileInfo.cs
+++ b/PortableExecutable/FixedFileInfo.cs
@@ -1,13 +1,10 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.PortableExecutable
+namespace SabreTools.Models.PortableExecutable
 {
     /// <summary>
     /// Contains version information for a file. This information is language and
     /// code page independent.
     /// </summary>
     /// <see href="https://learn.microsoft.com/en-us/windows/win32/api/verrsrc/ns-verrsrc-vs_fixedfileinfo"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class FixedFileInfo
     {
         /// <summary>
diff --git a/PortableExecutable/ImportDirectoryTableEntry.cs b/PortableExecutable/ImportDirectoryTableEntry.cs
index bfbd2d0..feedb6e 100644
--- a/PortableExecutable/ImportDirectoryTableEntry.cs
+++ b/PortableExecutable/ImportDirectoryTableEntry.cs
@@ -1,6 +1,4 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.PortableExecutable
+namespace SabreTools.Models.PortableExecutable
 {
     /// <summary>
     /// The import information begins with the import directory table, which
@@ -12,7 +10,6 @@ namespace SabreTools.Models.PortableExecutable
     /// which indicates the end of the directory table.
     /// </summary>
     /// <see href="https://learn.microsoft.com/en-us/windows/win32/debug/pe-format"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class ImportDirectoryTableEntry
     {
         /// <summary>
diff --git a/PortableExecutable/MenuHeader.cs b/PortableExecutable/MenuHeader.cs
index 4d44da2..4a2f1f1 100644
--- a/PortableExecutable/MenuHeader.cs
+++ b/PortableExecutable/MenuHeader.cs
@@ -1,13 +1,10 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.PortableExecutable
+namespace SabreTools.Models.PortableExecutable
 {
     /// <summary>
     /// Contains version information for the menu resource. The structure definition provided
     /// here is for explanation only; it is not present in any standard header file.
     /// </summary>
     /// <see href="https://learn.microsoft.com/en-us/windows/win32/menurc/menuheader"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class MenuHeader
     {
         /// <summary>
diff --git a/PortableExecutable/MenuHeaderExtended.cs b/PortableExecutable/MenuHeaderExtended.cs
index f35eb1a..df3601d 100644
--- a/PortableExecutable/MenuHeaderExtended.cs
+++ b/PortableExecutable/MenuHeaderExtended.cs
@@ -1,13 +1,10 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.PortableExecutable
+namespace SabreTools.Models.PortableExecutable
 {
     /// <summary>
     /// Defines the header for an extended menu template. This structure definition is for
     /// explanation only; it is not present in any standard header file.
     /// </summary>
     /// <see href="https://learn.microsoft.com/en-us/windows/win32/menurc/menuex-template-header"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class MenuHeaderExtended
     {
         /// <summary>
diff --git a/PortableExecutable/NB10ProgramDatabase.cs b/PortableExecutable/NB10ProgramDatabase.cs
index 081b384..0b10a97 100644
--- a/PortableExecutable/NB10ProgramDatabase.cs
+++ b/PortableExecutable/NB10ProgramDatabase.cs
@@ -1,12 +1,9 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.PortableExecutable
+namespace SabreTools.Models.PortableExecutable
 {
     /// <summary>
     /// PDB 2.0 files
     /// </summary>
     /// <see href="https://www.debuginfo.com/articles/debuginfomatch.html"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class NB10ProgramDatabase
     {
         /// <summary>
diff --git a/PortableExecutable/NewHeader.cs b/PortableExecutable/NewHeader.cs
index 985f6ad..de0d522 100644
--- a/PortableExecutable/NewHeader.cs
+++ b/PortableExecutable/NewHeader.cs
@@ -1,6 +1,4 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.PortableExecutable
+namespace SabreTools.Models.PortableExecutable
 {
     /// <summary>
     /// Contains the number of icon or cursor components in a resource group. The
@@ -8,7 +6,6 @@ namespace SabreTools.Models.PortableExecutable
     /// in any standard header file.
     /// </summary>
     /// <see href="https://learn.microsoft.com/en-us/windows/win32/menurc/newheader"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class NewHeader
     {
         /// <summary>
diff --git a/PortableExecutable/RSDSProgramDatabase.cs b/PortableExecutable/RSDSProgramDatabase.cs
index 1248d10..23113e3 100644
--- a/PortableExecutable/RSDSProgramDatabase.cs
+++ b/PortableExecutable/RSDSProgramDatabase.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Runtime.InteropServices;
 
 namespace SabreTools.Models.PortableExecutable
 {
@@ -8,7 +7,6 @@ namespace SabreTools.Models.PortableExecutable
     /// or "DS" type which are emitted by Miscrosoft's link.exe from version 7 and above.
     /// </summary>
     /// <see href="http://www.godevtool.com/Other/pdb.htm"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class RSDSProgramDatabase
     {
         /// <summary>
diff --git a/PortableExecutable/ResourceDataEntry.cs b/PortableExecutable/ResourceDataEntry.cs
index b17069a..804649e 100644
--- a/PortableExecutable/ResourceDataEntry.cs
+++ b/PortableExecutable/ResourceDataEntry.cs
@@ -1,6 +1,4 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.PortableExecutable
+namespace SabreTools.Models.PortableExecutable
 {
     /// <summary>
     /// The resource directory string area consists of Unicode strings, which
@@ -10,7 +8,6 @@ namespace SabreTools.Models.PortableExecutable
     /// alignment of the fixed-size directory entries.
     /// </summary>
     /// <see href="https://learn.microsoft.com/en-us/windows/win32/debug/pe-format"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class ResourceDataEntry
     {
         /// <summary>
diff --git a/PortableExecutable/ResourceDirectoryTable.cs b/PortableExecutable/ResourceDirectoryTable.cs
index d311eda..eb7425f 100644
--- a/PortableExecutable/ResourceDirectoryTable.cs
+++ b/PortableExecutable/ResourceDirectoryTable.cs
@@ -1,6 +1,4 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.PortableExecutable
+namespace SabreTools.Models.PortableExecutable
 {
     /// <summary>
     /// Each directory table is followed by a series of directory entries that
@@ -15,7 +13,6 @@ namespace SabreTools.Models.PortableExecutable
     /// actually consists of directory entries.
     /// </summary>
     /// <see href="https://learn.microsoft.com/en-us/windows/win32/debug/pe-format"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class ResourceDirectoryTable
     {
         /// <summary>
diff --git a/PortableExecutable/SectionHeader.cs b/PortableExecutable/SectionHeader.cs
index d73f88a..4efb77c 100644
--- a/PortableExecutable/SectionHeader.cs
+++ b/PortableExecutable/SectionHeader.cs
@@ -1,6 +1,4 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.PortableExecutable
+namespace SabreTools.Models.PortableExecutable
 {
     /// <summary>
     /// Each row of the section table is, in effect, a section header. This table
@@ -20,7 +18,6 @@ namespace SabreTools.Models.PortableExecutable
     /// SectionAlignment value in the optional header.
     /// </summary>
     /// <see href="https://learn.microsoft.com/en-us/windows/win32/debug/pe-format"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class SectionHeader
     {
         /// <summary>
@@ -32,11 +29,10 @@ namespace SabreTools.Models.PortableExecutable
         /// characters. Long names in object files are truncated if they are emitted
         /// to an executable file. 
         /// </summary>
-        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 8)]
 #if NET48
-        public byte[] Name;
+        public byte[] Name { get; set; } = new byte[8];
 #else
-        public byte[]? Name;
+        public byte[]? Name { get; set; } = new byte[8];
 #endif
 
         /// <summary>
diff --git a/PortableExecutable/SecuROMAddD.cs b/PortableExecutable/SecuROMAddD.cs
index bf67970..b357765 100644
--- a/PortableExecutable/SecuROMAddD.cs
+++ b/PortableExecutable/SecuROMAddD.cs
@@ -1,6 +1,4 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.PortableExecutable
+namespace SabreTools.Models.PortableExecutable
 {
     /// <summary>
     /// Overlay data associated with SecuROM executables
@@ -10,7 +8,6 @@ namespace SabreTools.Models.PortableExecutable
     /// environment by using sample from legally obtained software that
     /// is protected by SecuROM.
     /// </remarks>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class SecuROMAddD
     {
         /// <summary>
diff --git a/PortableExecutable/SecuROMAddDEntry.cs b/PortableExecutable/SecuROMAddDEntry.cs
index a515b4b..bfc2659 100644
--- a/PortableExecutable/SecuROMAddDEntry.cs
+++ b/PortableExecutable/SecuROMAddDEntry.cs
@@ -1,6 +1,4 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.PortableExecutable
+namespace SabreTools.Models.PortableExecutable
 {
     /// <summary>
     /// Overlay data associated with SecuROM executables
@@ -10,7 +8,6 @@ namespace SabreTools.Models.PortableExecutable
     /// environment by using sample from legally obtained software that
     /// is protected by SecuROM.
     /// </remarks>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class SecuROMAddDEntry
     {
         /// <summary>
diff --git a/Quantum/Header.cs b/Quantum/Header.cs
index e88355b..dd4849b 100644
--- a/Quantum/Header.cs
+++ b/Quantum/Header.cs
@@ -1,12 +1,9 @@
-using System.Runtime.InteropServices;
-
 namespace SabreTools.Models.Quantum
 {
     /// <summary>
     /// Quantum archive file header
     /// </summary>
     /// <see href="https://handwiki.org/wiki/Software:Quantum_compression"/>
-    [StructLayout(LayoutKind.Sequential)]
     public class Header
     {
         /// <summary>
diff --git a/SFFS/FileEntry.cs b/SFFS/FileEntry.cs
index 069f281..62132c0 100644
--- a/SFFS/FileEntry.cs
+++ b/SFFS/FileEntry.cs
@@ -1,9 +1,6 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.SFFS
+namespace SabreTools.Models.SFFS
 {
     /// <see href="https://forum.xentax.com/viewtopic.php?f=21&t=2084"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class FileEntry
     {
         /// <summary>
diff --git a/SFFS/FileHeader.cs b/SFFS/FileHeader.cs
index a49c847..cbbadb7 100644
--- a/SFFS/FileHeader.cs
+++ b/SFFS/FileHeader.cs
@@ -1,9 +1,6 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.SFFS
+namespace SabreTools.Models.SFFS
 {
     /// <see href="https://forum.xentax.com/viewtopic.php?f=21&t=2084"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class FileHeader
     {
         /// <summary>
diff --git a/SFFS/Header.cs b/SFFS/Header.cs
index 66ada37..1204cd7 100644
--- a/SFFS/Header.cs
+++ b/SFFS/Header.cs
@@ -1,12 +1,9 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.SFFS
+namespace SabreTools.Models.SFFS
 {
     /// <summary>
     /// Header
     /// </summary>
     /// <see href="https://forum.xentax.com/viewtopic.php?f=21&t=2084"/>
-    [StructLayout(LayoutKind.Sequential)]
     public sealed class Header
     {
         /// <summary>