diff --git a/SMBLibrary/SMBLibrary.csproj b/SMBLibrary/SMBLibrary.csproj
index a9f8617..7e0bdcf 100644
--- a/SMBLibrary/SMBLibrary.csproj
+++ b/SMBLibrary/SMBLibrary.csproj
@@ -51,9 +51,6 @@
     <Compile Include="Enums\SMBTransportType.cs" />
     <Compile Include="Enums\Win32Error.cs" />
     <Compile Include="EnumStructures\AccessMask.cs" />
-    <Compile Include="IOCTL\FileFullEAInformation.cs" />
-    <Compile Include="IOCTL\FileFullEAInformationList.cs" />
-    <Compile Include="IOCTL\ObjectIDBufferType1.cs" />
     <Compile Include="NetBios\NameServicePackets\Enums\NameRecordType.cs" />
     <Compile Include="NetBios\NameServicePackets\Enums\NameServiceOperation.cs" />
     <Compile Include="NetBios\NameServicePackets\Enums\NetBiosSuffix.cs" />
@@ -384,6 +381,9 @@
     <Compile Include="Structures\ACE\Enums\AceFlags.cs" />
     <Compile Include="Structures\ACE\Enums\AceType.cs" />
     <Compile Include="Structures\ACL.cs" />
+    <Compile Include="Structures\FileFullEAInformation.cs" />
+    <Compile Include="Structures\FileFullEAInformationList.cs" />
+    <Compile Include="Structures\ObjectIDBufferType1.cs" />
     <Compile Include="Structures\SecurityDescriptor.cs" />
     <Compile Include="Structures\SID.cs" />
     <Compile Include="Tests\AuthenticationTests.cs" />
diff --git a/SMBLibrary/IOCTL/FileFullEAInformation.cs b/SMBLibrary/Structures/FileFullEAInformation.cs
similarity index 70%
rename from SMBLibrary/IOCTL/FileFullEAInformation.cs
rename to SMBLibrary/Structures/FileFullEAInformation.cs
index 73e2de9..b80efc9 100644
--- a/SMBLibrary/IOCTL/FileFullEAInformation.cs
+++ b/SMBLibrary/Structures/FileFullEAInformation.cs
@@ -16,10 +16,12 @@ namespace SMBLibrary
     /// </summary>
     public class FileFullEAInformation
     {
+        public const int FixedLength = 8;
+
         public uint NextEntryOffset;
         public byte Flags;
-        //byte EaNameLength;
-        //ushort EaValueLength;
+        private byte EaNameLength;
+        private ushort EaValueLength;
         public string EaName; // ASCII
         public string EaValue; // ASCII
 
@@ -31,20 +33,20 @@ namespace SMBLibrary
         {
             NextEntryOffset = LittleEndianReader.ReadUInt32(buffer, ref offset);
             Flags = ByteReader.ReadByte(buffer, ref offset);
-            byte eaNameLength = ByteReader.ReadByte(buffer, ref offset);
-            ushort eaValueLength = LittleEndianReader.ReadUInt16(buffer, ref offset);
-            EaName = ByteReader.ReadAnsiString(buffer, ref offset, eaNameLength);
-            EaValue = ByteReader.ReadAnsiString(buffer, ref offset, eaValueLength);
+            EaNameLength = ByteReader.ReadByte(buffer, ref offset);
+            EaValueLength = LittleEndianReader.ReadUInt16(buffer, ref offset);
+            EaName = ByteReader.ReadAnsiString(buffer, ref offset, EaNameLength);
+            EaValue = ByteReader.ReadAnsiString(buffer, ref offset, EaValueLength);
         }
 
         public void WriteBytes(byte[] buffer, int offset)
         {
-            byte eaNameLength = (byte)EaName.Length;
-            ushort eaValueLength = (ushort)EaValue.Length;
+            EaNameLength = (byte)EaName.Length;
+            EaValueLength = (ushort)EaValue.Length;
             LittleEndianWriter.WriteUInt32(buffer, ref offset, NextEntryOffset);
             ByteWriter.WriteByte(buffer, ref offset, Flags);
-            ByteWriter.WriteByte(buffer, ref offset, eaNameLength);
-            LittleEndianWriter.WriteUInt16(buffer, ref offset, eaValueLength);
+            ByteWriter.WriteByte(buffer, ref offset, EaNameLength);
+            LittleEndianWriter.WriteUInt16(buffer, ref offset, EaValueLength);
             ByteWriter.WriteAnsiString(buffer, ref offset, EaName);
             ByteWriter.WriteAnsiString(buffer, ref offset, EaValue);
         }
@@ -53,7 +55,7 @@ namespace SMBLibrary
         {
             get
             {
-                return 8 + EaName.Length + EaValue.Length;
+                return FixedLength + EaName.Length + EaValue.Length;
             }
         }
     }
diff --git a/SMBLibrary/IOCTL/FileFullEAInformationList.cs b/SMBLibrary/Structures/FileFullEAInformationList.cs
similarity index 100%
rename from SMBLibrary/IOCTL/FileFullEAInformationList.cs
rename to SMBLibrary/Structures/FileFullEAInformationList.cs
diff --git a/SMBLibrary/IOCTL/ObjectIDBufferType1.cs b/SMBLibrary/Structures/ObjectIDBufferType1.cs
similarity index 100%
rename from SMBLibrary/IOCTL/ObjectIDBufferType1.cs
rename to SMBLibrary/Structures/ObjectIDBufferType1.cs