diff --git a/BurnOutSharp/ExecutableType/IMAGE_DATA_DIRECTORY.cs b/BurnOutSharp/ExecutableType/Microsoft/IMAGE_DATA_DIRECTORY.cs
similarity index 85%
rename from BurnOutSharp/ExecutableType/IMAGE_DATA_DIRECTORY.cs
rename to BurnOutSharp/ExecutableType/Microsoft/IMAGE_DATA_DIRECTORY.cs
index 375df76c..78faf6f5 100644
--- a/BurnOutSharp/ExecutableType/IMAGE_DATA_DIRECTORY.cs
+++ b/BurnOutSharp/ExecutableType/Microsoft/IMAGE_DATA_DIRECTORY.cs
@@ -1,7 +1,7 @@
 using System.Runtime.InteropServices;
 
 // Converted from https://github.com/wine-mirror/wine/blob/master/include/winnt.h
-namespace BurnOutSharp.ExecutableType
+namespace BurnOutSharp.ExecutableType.Microsoft
 {
     [StructLayout(LayoutKind.Sequential)]
     internal struct IMAGE_DATA_DIRECTORY
diff --git a/BurnOutSharp/ExecutableType/IMAGE_DOS_HEADER.cs b/BurnOutSharp/ExecutableType/Microsoft/IMAGE_DOS_HEADER.cs
similarity index 97%
rename from BurnOutSharp/ExecutableType/IMAGE_DOS_HEADER.cs
rename to BurnOutSharp/ExecutableType/Microsoft/IMAGE_DOS_HEADER.cs
index 383caa04..5792c260 100644
--- a/BurnOutSharp/ExecutableType/IMAGE_DOS_HEADER.cs
+++ b/BurnOutSharp/ExecutableType/Microsoft/IMAGE_DOS_HEADER.cs
@@ -1,7 +1,7 @@
 using System.Runtime.InteropServices;
 
 // Converted from https://github.com/wine-mirror/wine/blob/master/include/winnt.h
-namespace BurnOutSharp.ExecutableType
+namespace BurnOutSharp.ExecutableType.Microsoft
 {
     [StructLayout(LayoutKind.Sequential)]
     internal struct IMAGE_DOS_HEADER
diff --git a/BurnOutSharp/ExecutableType/IMAGE_FILE_HEADER.cs b/BurnOutSharp/ExecutableType/Microsoft/IMAGE_FILE_HEADER.cs
similarity index 91%
rename from BurnOutSharp/ExecutableType/IMAGE_FILE_HEADER.cs
rename to BurnOutSharp/ExecutableType/Microsoft/IMAGE_FILE_HEADER.cs
index d4428a1a..d282bb9e 100644
--- a/BurnOutSharp/ExecutableType/IMAGE_FILE_HEADER.cs
+++ b/BurnOutSharp/ExecutableType/Microsoft/IMAGE_FILE_HEADER.cs
@@ -1,7 +1,7 @@
 using System.Runtime.InteropServices;
 
 // Converted from https://github.com/wine-mirror/wine/blob/master/include/winnt.h
-namespace BurnOutSharp.ExecutableType
+namespace BurnOutSharp.ExecutableType.Microsoft
 {
     [StructLayout(LayoutKind.Sequential)]
     internal struct IMAGE_FILE_HEADER
diff --git a/BurnOutSharp/ExecutableType/IMAGE_NT_HEADERS32.cs b/BurnOutSharp/ExecutableType/Microsoft/IMAGE_NT_HEADERS32.cs
similarity index 89%
rename from BurnOutSharp/ExecutableType/IMAGE_NT_HEADERS32.cs
rename to BurnOutSharp/ExecutableType/Microsoft/IMAGE_NT_HEADERS32.cs
index 4f3a01ba..a91e00e7 100644
--- a/BurnOutSharp/ExecutableType/IMAGE_NT_HEADERS32.cs
+++ b/BurnOutSharp/ExecutableType/Microsoft/IMAGE_NT_HEADERS32.cs
@@ -1,7 +1,7 @@
 using System.Runtime.InteropServices;
 
 // Converted from https://github.com/wine-mirror/wine/blob/master/include/winnt.h
-namespace BurnOutSharp.ExecutableType
+namespace BurnOutSharp.ExecutableType.Microsoft
 {
     [StructLayout(LayoutKind.Sequential)]
     internal struct IMAGE_NT_HEADERS32
diff --git a/BurnOutSharp/ExecutableType/IMAGE_NT_HEADERS64.cs b/BurnOutSharp/ExecutableType/Microsoft/IMAGE_NT_HEADERS64.cs
similarity index 87%
rename from BurnOutSharp/ExecutableType/IMAGE_NT_HEADERS64.cs
rename to BurnOutSharp/ExecutableType/Microsoft/IMAGE_NT_HEADERS64.cs
index 7e8c45a6..d5a5ae94 100644
--- a/BurnOutSharp/ExecutableType/IMAGE_NT_HEADERS64.cs
+++ b/BurnOutSharp/ExecutableType/Microsoft/IMAGE_NT_HEADERS64.cs
@@ -1,7 +1,7 @@
 using System.Runtime.InteropServices;
 
 // Converted from https://github.com/wine-mirror/wine/blob/master/include/winnt.h
-namespace BurnOutSharp.ExecutableType
+namespace BurnOutSharp.ExecutableType.Microsoft
 {
     [StructLayout(LayoutKind.Sequential)]
     internal struct IMAGE_NT_HEADERS64
diff --git a/BurnOutSharp/ExecutableType/IMAGE_OPTIONAL_HEADER32.cs b/BurnOutSharp/ExecutableType/Microsoft/IMAGE_OPTIONAL_HEADER32.cs
similarity index 97%
rename from BurnOutSharp/ExecutableType/IMAGE_OPTIONAL_HEADER32.cs
rename to BurnOutSharp/ExecutableType/Microsoft/IMAGE_OPTIONAL_HEADER32.cs
index 3f4f9630..8f60f61e 100644
--- a/BurnOutSharp/ExecutableType/IMAGE_OPTIONAL_HEADER32.cs
+++ b/BurnOutSharp/ExecutableType/Microsoft/IMAGE_OPTIONAL_HEADER32.cs
@@ -1,7 +1,7 @@
 using System.Runtime.InteropServices;
 
 // Converted from https://github.com/wine-mirror/wine/blob/master/include/winnt.h
-namespace BurnOutSharp.ExecutableType
+namespace BurnOutSharp.ExecutableType.Microsoft
 {
     [StructLayout(LayoutKind.Sequential)]
     internal struct IMAGE_OPTIONAL_HEADER32
diff --git a/BurnOutSharp/ExecutableType/IMAGE_OPTIONAL_HEADER64.cs b/BurnOutSharp/ExecutableType/Microsoft/IMAGE_OPTIONAL_HEADER64.cs
similarity index 97%
rename from BurnOutSharp/ExecutableType/IMAGE_OPTIONAL_HEADER64.cs
rename to BurnOutSharp/ExecutableType/Microsoft/IMAGE_OPTIONAL_HEADER64.cs
index 1e696ed9..b70a0376 100644
--- a/BurnOutSharp/ExecutableType/IMAGE_OPTIONAL_HEADER64.cs
+++ b/BurnOutSharp/ExecutableType/Microsoft/IMAGE_OPTIONAL_HEADER64.cs
@@ -1,7 +1,7 @@
 using System.Runtime.InteropServices;
 
 // Converted from https://github.com/wine-mirror/wine/blob/master/include/winnt.h
-namespace BurnOutSharp.ExecutableType
+namespace BurnOutSharp.ExecutableType.Microsoft
 {
     [StructLayout(LayoutKind.Sequential)]
     internal struct IMAGE_OPTIONAL_HEADER64
diff --git a/BurnOutSharp/ExecutableType/IMAGE_OS2_HEADER.cs b/BurnOutSharp/ExecutableType/Microsoft/IMAGE_OS2_HEADER.cs
similarity index 98%
rename from BurnOutSharp/ExecutableType/IMAGE_OS2_HEADER.cs
rename to BurnOutSharp/ExecutableType/Microsoft/IMAGE_OS2_HEADER.cs
index 05e672be..b28af0e8 100644
--- a/BurnOutSharp/ExecutableType/IMAGE_OS2_HEADER.cs
+++ b/BurnOutSharp/ExecutableType/Microsoft/IMAGE_OS2_HEADER.cs
@@ -1,7 +1,7 @@
 using System.Runtime.InteropServices;
 
 // Converted from https://github.com/wine-mirror/wine/blob/master/include/winnt.h
-namespace BurnOutSharp.ExecutableType
+namespace BurnOutSharp.ExecutableType.Microsoft
 {
     [StructLayout(LayoutKind.Sequential)]
     internal struct IMAGE_OS2_HEADER
diff --git a/BurnOutSharp/ExecutableType/IMAGE_SECTION_HEADER.cs b/BurnOutSharp/ExecutableType/Microsoft/IMAGE_SECTION_HEADER.cs
similarity index 94%
rename from BurnOutSharp/ExecutableType/IMAGE_SECTION_HEADER.cs
rename to BurnOutSharp/ExecutableType/Microsoft/IMAGE_SECTION_HEADER.cs
index 60f4f764..5e74ee26 100644
--- a/BurnOutSharp/ExecutableType/IMAGE_SECTION_HEADER.cs
+++ b/BurnOutSharp/ExecutableType/Microsoft/IMAGE_SECTION_HEADER.cs
@@ -1,7 +1,7 @@
 using System.Runtime.InteropServices;
 
 // Converted from https://github.com/wine-mirror/wine/blob/master/include/winnt.h
-namespace BurnOutSharp.ExecutableType
+namespace BurnOutSharp.ExecutableType.Microsoft
 {
     [StructLayout(LayoutKind.Sequential)]
     internal struct IMAGE_SECTION_HEADER
diff --git a/BurnOutSharp/ExecutableType/IMAGE_VXD_HEADER.cs b/BurnOutSharp/ExecutableType/Microsoft/IMAGE_VXD_HEADER.cs
similarity index 97%
rename from BurnOutSharp/ExecutableType/IMAGE_VXD_HEADER.cs
rename to BurnOutSharp/ExecutableType/Microsoft/IMAGE_VXD_HEADER.cs
index 6dd518d2..ebb4dbfe 100644
--- a/BurnOutSharp/ExecutableType/IMAGE_VXD_HEADER.cs
+++ b/BurnOutSharp/ExecutableType/Microsoft/IMAGE_VXD_HEADER.cs
@@ -1,7 +1,7 @@
 using System.Runtime.InteropServices;
 
 // Converted from https://github.com/wine-mirror/wine/blob/master/include/winnt.h
-namespace BurnOutSharp.ExecutableType
+namespace BurnOutSharp.ExecutableType.Microsoft
 {
     [StructLayout(LayoutKind.Sequential)]
     internal struct IMAGE_VXD_HEADER
diff --git a/BurnOutSharp/ExecutableType/winnt.cs b/BurnOutSharp/ExecutableType/Microsoft/winnt.cs
similarity index 99%
rename from BurnOutSharp/ExecutableType/winnt.cs
rename to BurnOutSharp/ExecutableType/Microsoft/winnt.cs
index a42b384e..e521c20d 100644
--- a/BurnOutSharp/ExecutableType/winnt.cs
+++ b/BurnOutSharp/ExecutableType/Microsoft/winnt.cs
@@ -1,7 +1,7 @@
 using System;
 
 // Converted from https://github.com/wine-mirror/wine/blob/master/include/winnt.h
-namespace BurnOutSharp.ExecutableType
+namespace BurnOutSharp.ExecutableType.Microsoft
 {
     internal enum DirectoryEntries
     {