diff --git a/DiscImageChef.Devices/ChangeLog b/DiscImageChef.Devices/ChangeLog
index e896a189..84f4a516 100644
--- a/DiscImageChef.Devices/ChangeLog
+++ b/DiscImageChef.Devices/ChangeLog
@@ -1,3 +1,9 @@
+2015-10-06  Natalia Portillo  <claunia@claunia.com>
+
+	* Windows/Extern.cs:
+	* Windows/Structs.cs:
+	  Struct de-class
+
 2015-10-06  Natalia Portillo  <claunia@claunia.com>
 
 	* Windows/Extern.cs:
diff --git a/DiscImageChef.Devices/Windows/Extern.cs b/DiscImageChef.Devices/Windows/Extern.cs
index ce7c554f..ed17d07f 100644
--- a/DiscImageChef.Devices/Windows/Extern.cs
+++ b/DiscImageChef.Devices/Windows/Extern.cs
@@ -20,9 +20,9 @@ namespace DiscImageChef.Devices.Windows
         public static extern bool DeviceIoControl(
             SafeFileHandle hDevice,
             uint IoControlCode,
-            ref Structs.SCSI_PASS_THROUGH_DIRECT_AND_SENSE_BUFFER InBuffer,
+            ref ScsiPassThroughDirectAndSenseBuffer InBuffer,
             uint nInBufferSize,
-            ref Structs.SCSI_PASS_THROUGH_DIRECT_AND_SENSE_BUFFER OutBuffer,
+            ref ScsiPassThroughDirectAndSenseBuffer OutBuffer,
             uint nOutBufferSize,
             ref uint pBytesReturned,
             IntPtr Overlapped
diff --git a/DiscImageChef.Devices/Windows/Structs.cs b/DiscImageChef.Devices/Windows/Structs.cs
index c5f7b186..4db116f3 100644
--- a/DiscImageChef.Devices/Windows/Structs.cs
+++ b/DiscImageChef.Devices/Windows/Structs.cs
@@ -3,34 +3,31 @@ using System.Runtime.InteropServices;
 
 namespace DiscImageChef.Devices.Windows
 {
-    static class Structs
+    [StructLayout(LayoutKind.Sequential)]
+    struct ScsiPassThroughDirect
     {
-        [StructLayout(LayoutKind.Sequential)]
-        internal struct SCSI_PASS_THROUGH_DIRECT
-        {
-            public ushort Length;
-            public byte ScsiStatus;
-            public byte PathId;
-            public byte TargetId;
-            public byte Lun;
-            public byte CdbLength;
-            public byte SenseInfoLength;
-            [MarshalAs(UnmanagedType.U1)]
-            public ScsiIoctlDirection DataIn;
-            public uint DataTransferLength;
-            public uint TimeOutValue;
-            public IntPtr DataBuffer;
-            public uint SenseInfoOffset;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public byte[] Cdb;    
-        };
+        public ushort Length;
+        public byte ScsiStatus;
+        public byte PathId;
+        public byte TargetId;
+        public byte Lun;
+        public byte CdbLength;
+        public byte SenseInfoLength;
+        [MarshalAs(UnmanagedType.U1)]
+        public ScsiIoctlDirection DataIn;
+        public uint DataTransferLength;
+        public uint TimeOutValue;
+        public IntPtr DataBuffer;
+        public uint SenseInfoOffset;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public byte[] Cdb;    
+    };
 
-        [StructLayout(LayoutKind.Sequential)]
-        internal struct SCSI_PASS_THROUGH_DIRECT_AND_SENSE_BUFFER {
-            public SCSI_PASS_THROUGH_DIRECT sptd;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public byte[] SenseBuf;
-        }
+    [StructLayout(LayoutKind.Sequential)]
+    struct ScsiPassThroughDirectAndSenseBuffer {
+        public ScsiPassThroughDirect sptd;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public byte[] SenseBuf;
     }
 }