diff --git a/X86Disassembler/PE/DataDirectory.cs b/X86Disassembler/PE/DataDirectory.cs
new file mode 100644
index 0000000..c16221b
--- /dev/null
+++ b/X86Disassembler/PE/DataDirectory.cs
@@ -0,0 +1,9 @@
+namespace X86Disassembler.PE;
+/// <summary>
+/// Represents a data directory in the optional header
+/// </summary>
+public class DataDirectory
+{
+    public uint VirtualAddress;   // RVA of the table
+    public uint Size;             // Size of the table
+}
diff --git a/X86Disassembler/PE/ExportDirectory.cs b/X86Disassembler/PE/ExportDirectory.cs
index 5ac097b..c29086c 100644
--- a/X86Disassembler/PE/ExportDirectory.cs
+++ b/X86Disassembler/PE/ExportDirectory.cs
@@ -27,26 +27,4 @@ namespace X86Disassembler.PE
             DllName = string.Empty;
         }
     }
-    
-    /// <summary>
-    /// Represents an exported function in a PE file
-    /// </summary>
-    public class ExportedFunction
-    {
-        public string Name;           // Function name
-        public ushort Ordinal;        // Function ordinal
-        public uint Address;          // Function RVA
-        public bool IsForwarder;      // True if this is a forwarder
-        public string ForwarderName;  // Name of the forwarded function
-        
-        /// <summary>
-        /// Initializes a new instance of the ExportedFunction class
-        /// </summary>
-        public ExportedFunction()
-        {
-            // Initialize string fields to avoid nullability warnings
-            Name = string.Empty;
-            ForwarderName = string.Empty;
-        }
-    }
 }
diff --git a/X86Disassembler/PE/ExportedFunction.cs b/X86Disassembler/PE/ExportedFunction.cs
new file mode 100644
index 0000000..b1cc820
--- /dev/null
+++ b/X86Disassembler/PE/ExportedFunction.cs
@@ -0,0 +1,23 @@
+namespace X86Disassembler.PE;
+
+/// <summary>
+/// Represents an exported function in a PE file
+/// </summary>
+public class ExportedFunction
+{
+    public string Name;           // Function name
+    public ushort Ordinal;        // Function ordinal
+    public uint Address;          // Function RVA
+    public bool IsForwarder;      // True if this is a forwarder
+    public string ForwarderName;  // Name of the forwarded function
+    
+    /// <summary>
+    /// Initializes a new instance of the ExportedFunction class
+    /// </summary>
+    public ExportedFunction()
+    {
+        // Initialize string fields to avoid nullability warnings
+        Name = string.Empty;
+        ForwarderName = string.Empty;
+    }
+}
diff --git a/X86Disassembler/PE/ImportDescriptor.cs b/X86Disassembler/PE/ImportDescriptor.cs
index 5c8370a..0b5acdf 100644
--- a/X86Disassembler/PE/ImportDescriptor.cs
+++ b/X86Disassembler/PE/ImportDescriptor.cs
@@ -25,25 +25,4 @@ namespace X86Disassembler.PE
             DllName = string.Empty;
         }
     }
-    
-    /// <summary>
-    /// Represents an imported function in a PE file
-    /// </summary>
-    public class ImportedFunction
-    {
-        public string Name;         // Function name
-        public ushort Hint;         // Hint value
-        public bool IsOrdinal;      // True if imported by ordinal
-        public ushort Ordinal;      // Ordinal value (if imported by ordinal)
-        public uint ThunkRVA;       // RVA of the thunk for this function
-        
-        /// <summary>
-        /// Initializes a new instance of the ImportedFunction class
-        /// </summary>
-        public ImportedFunction()
-        {
-            // Initialize string field to avoid nullability warning
-            Name = string.Empty;
-        }
-    }
 }
diff --git a/X86Disassembler/PE/ImportedFunction.cs b/X86Disassembler/PE/ImportedFunction.cs
new file mode 100644
index 0000000..79e784e
--- /dev/null
+++ b/X86Disassembler/PE/ImportedFunction.cs
@@ -0,0 +1,22 @@
+namespace X86Disassembler.PE;
+
+/// <summary>
+/// Represents an imported function in a PE file
+/// </summary>
+public class ImportedFunction
+{
+    public string Name;         // Function name
+    public ushort Hint;         // Hint value
+    public bool IsOrdinal;      // True if imported by ordinal
+    public ushort Ordinal;      // Ordinal value (if imported by ordinal)
+    public uint ThunkRVA;       // RVA of the thunk for this function
+    
+    /// <summary>
+    /// Initializes a new instance of the ImportedFunction class
+    /// </summary>
+    public ImportedFunction()
+    {
+        // Initialize string field to avoid nullability warning
+        Name = string.Empty;
+    }
+}
diff --git a/X86Disassembler/PE/OptionalHeader.cs b/X86Disassembler/PE/OptionalHeader.cs
index 42c7fd4..a4e4b83 100644
--- a/X86Disassembler/PE/OptionalHeader.cs
+++ b/X86Disassembler/PE/OptionalHeader.cs
@@ -70,13 +70,4 @@ namespace X86Disassembler.PE
             return Magic == PE32PLUS_MAGIC;
         }
     }
-    
-    /// <summary>
-    /// Represents a data directory in the optional header
-    /// </summary>
-    public class DataDirectory
-    {
-        public uint VirtualAddress;   // RVA of the table
-        public uint Size;             // Size of the table
-    }
 }