From addbf7f31daaec51947ae07c9cdcb588154360d0 Mon Sep 17 00:00:00 2001
From: Eugene Wang <8755753+soukoku@users.noreply.github.com>
Date: Sun, 2 Apr 2023 07:56:54 -0400
Subject: [PATCH] Reorg'd things the way I like.

---
 src/NTwain/DSM/OSXLegacyDSM.cs                | 100 ++++++------------
 src/NTwain/DSM/OSXNewDSM.cs                   | 100 ++++++------------
 src/NTwain/DSM/WinLegacyDSM.cs                | 100 ++++++------------
 src/NTwain/DSM/WinNewDSM.cs                   | 100 ++++++------------
 .../Callback.cs}                              |   6 +-
 .../Callback2.cs}                             |   6 +-
 .../CustomDsData.cs}                          |   6 +-
 .../DeviceEvent.cs}                           |   6 +-
 .../EntryPoint.cs}                            |   6 +-
 .../Identity.cs}                              |   6 +-
 .../{DATParent.cs => ControlDATs/Parent.cs}   |   8 +-
 .../{DATStatus.cs => ControlDATs/Status.cs}   |   6 +-
 .../StatusUtf8.cs}                            |   6 +-
 src/NTwain/Triplets/DGControl.cs              |  40 +++----
 14 files changed, 169 insertions(+), 327 deletions(-)
 rename src/NTwain/Triplets/{DATCallback.cs => ControlDATs/Callback.cs} (91%)
 rename src/NTwain/Triplets/{DATCallback2.cs => ControlDATs/Callback2.cs} (91%)
 rename src/NTwain/Triplets/{DATCustomDsData.cs => ControlDATs/CustomDsData.cs} (92%)
 rename src/NTwain/Triplets/{DATDeviceEvent.cs => ControlDATs/DeviceEvent.cs} (91%)
 rename src/NTwain/Triplets/{DATEntryPoint.cs => ControlDATs/EntryPoint.cs} (94%)
 rename src/NTwain/Triplets/{DATIdentity.cs => ControlDATs/Identity.cs} (96%)
 rename src/NTwain/Triplets/{DATParent.cs => ControlDATs/Parent.cs} (93%)
 rename src/NTwain/Triplets/{DATStatus.cs => ControlDATs/Status.cs} (95%)
 rename src/NTwain/Triplets/{DATStatusUtf8.cs => ControlDATs/StatusUtf8.cs} (92%)

diff --git a/src/NTwain/DSM/OSXLegacyDSM.cs b/src/NTwain/DSM/OSXLegacyDSM.cs
index de65b24..3e7b2bf 100644
--- a/src/NTwain/DSM/OSXLegacyDSM.cs
+++ b/src/NTwain/DSM/OSXLegacyDSM.cs
@@ -9,110 +9,70 @@ namespace NTwain.DSM
     const string DsmName = "/System/Library/Frameworks/framework/TWAIN";
 
     [DllImport(DsmName, CharSet = CharSet.Ansi)]
-    internal static extern UInt16 DSM_Entry
+    internal static extern ushort DSM_Entry
     (
-        ref TW_IDENTITY_MACOSX origin,
-        IntPtr dest,
-        DG dg,
-        DAT dat,
-        MSG msg,
-        ref IntPtr hwnd
+        ref TW_IDENTITY_MACOSX origin, IntPtr dest,
+        DG dg, DAT dat, MSG msg, ref IntPtr hwnd
     );
 
     [DllImport(DsmName, CharSet = CharSet.Ansi)]
-    internal static extern UInt16 DSM_Entry
+    internal static extern ushort DSM_Entry
     (
-        ref TW_IDENTITY_MACOSX origin,
-        IntPtr dest,
-        DG dg,
-        DAT dat,
-        MSG msg,
-        ref TW_IDENTITY_MACOSX twidentity
+        ref TW_IDENTITY_MACOSX origin, IntPtr dest,
+        DG dg, DAT dat, MSG msg, ref TW_IDENTITY_MACOSX twidentity
     );
 
     [DllImport(DsmName, CharSet = CharSet.Ansi)]
-    internal static extern UInt16 DSM_Entry
+    internal static extern ushort DSM_Entry
     (
-        ref TW_IDENTITY_MACOSX origin,
-        ref TW_IDENTITY_MACOSX dest,
-        DG dg,
-        DAT dat,
-        MSG msg,
-        ref TW_STATUS twstatus
+        ref TW_IDENTITY_MACOSX origin, ref TW_IDENTITY_MACOSX dest,
+        DG dg, DAT dat, MSG msg, ref TW_STATUS twstatus
     );
     [DllImport(DsmName, CharSet = CharSet.Ansi)]
-    internal static extern UInt16 DSM_Entry
+    internal static extern ushort DSM_Entry
     (
-        ref TW_IDENTITY_MACOSX origin,
-        IntPtr dest,
-        DG dg,
-        DAT dat,
-        MSG msg,
-        ref TW_STATUS twstatus
+        ref TW_IDENTITY_MACOSX origin, IntPtr dest,
+        DG dg, DAT dat, MSG msg, ref TW_STATUS twstatus
     );
     [DllImport(DsmName, CharSet = CharSet.Ansi)]
-    internal static extern UInt16 DSM_Entry
+    internal static extern ushort DSM_Entry
     (
-        ref TW_IDENTITY_MACOSX origin,
-        IntPtr dest,
-        DG dg,
-        DAT dat,
-        MSG msg,
-        ref TW_STATUSUTF8 twstatusutf8
+        ref TW_IDENTITY_MACOSX origin, IntPtr dest,
+        DG dg, DAT dat, MSG msg, ref TW_STATUSUTF8 twstatusutf8
     );
 
     [DllImport(DsmName, CharSet = CharSet.Ansi)]
-    internal static extern UInt16 DSM_Entry
+    internal static extern ushort DSM_Entry
     (
-        ref TW_IDENTITY_MACOSX origin,
-        IntPtr dest,
-        DG dg,
-        DAT dat,
-        MSG msg,
-        ref TW_ENTRYPOINT twentrypoint
+        ref TW_IDENTITY_MACOSX origin, IntPtr dest,
+        DG dg, DAT dat, MSG msg, ref TW_ENTRYPOINT twentrypoint
     );
 
     [DllImport(DsmName, CharSet = CharSet.Ansi)]
-    internal static extern UInt16 DSM_Entry
+    internal static extern ushort DSM_Entry
     (
-        ref TW_IDENTITY_MACOSX origin,
-        ref TW_IDENTITY_MACOSX dest,
-        DG dg,
-        DAT dat,
-        MSG msg,
-        ref TW_DEVICEEVENT twdeviceevent
+        ref TW_IDENTITY_MACOSX origin, ref TW_IDENTITY_MACOSX dest,
+        DG dg, DAT dat, MSG msg, ref TW_DEVICEEVENT twdeviceevent
     );
 
     [DllImport(DsmName, CharSet = CharSet.Ansi)]
-    internal static extern UInt16 DSM_Entry
+    internal static extern ushort DSM_Entry
     (
-        ref TW_IDENTITY_MACOSX origin,
-        ref TW_IDENTITY_MACOSX dest,
-        DG dg,
-        DAT dat,
-        MSG msg,
-        ref TW_CUSTOMDSDATA twcustomedsdata
+        ref TW_IDENTITY_MACOSX origin, ref TW_IDENTITY_MACOSX dest,
+        DG dg, DAT dat, MSG msg, ref TW_CUSTOMDSDATA twcustomedsdata
     );
 
     [DllImport(DsmName, CharSet = CharSet.Ansi)]
-    internal static extern UInt16 DSM_Entry
+    internal static extern ushort DSM_Entry
     (
-        ref TW_IDENTITY_MACOSX origin,
-        ref TW_IDENTITY_MACOSX dest,
-        DG dg,
-        DAT dat,
-        MSG msg,
-        ref TW_CALLBACK twcallback
+        ref TW_IDENTITY_MACOSX origin, ref TW_IDENTITY_MACOSX dest,
+        DG dg, DAT dat, MSG msg, ref TW_CALLBACK twcallback
     );
     [DllImport(DsmName, CharSet = CharSet.Ansi)]
-    internal static extern UInt16 DSM_Entry
+    internal static extern ushort DSM_Entry
     (
-        ref TW_IDENTITY_MACOSX origin,
-        ref TW_IDENTITY_MACOSX dest,
-        DG dg,
-        DAT dat,
-        MSG msg,
-        ref TW_CALLBACK2 twcallback
+        ref TW_IDENTITY_MACOSX origin, ref TW_IDENTITY_MACOSX dest,
+        DG dg, DAT dat, MSG msg, ref TW_CALLBACK2 twcallback
     );
   }
 }
diff --git a/src/NTwain/DSM/OSXNewDSM.cs b/src/NTwain/DSM/OSXNewDSM.cs
index 05b159c..20f6318 100644
--- a/src/NTwain/DSM/OSXNewDSM.cs
+++ b/src/NTwain/DSM/OSXNewDSM.cs
@@ -9,110 +9,70 @@ namespace NTwain.DSM
     const string DsmName = "/Library/Frameworks/TWAINDSM.framework/TWAINDSM";
 
     [DllImport(DsmName, CharSet = CharSet.Ansi)]
-    internal static extern UInt16 DSM_Entry
+    internal static extern ushort DSM_Entry
     (
-        ref TW_IDENTITY_MACOSX origin,
-        IntPtr dest,
-        DG dg,
-        DAT dat,
-        MSG msg,
-        ref IntPtr hwnd
+        ref TW_IDENTITY_MACOSX origin, IntPtr dest,
+        DG dg, DAT dat, MSG msg, ref IntPtr hwnd
     );
 
     [DllImport(DsmName, CharSet = CharSet.Ansi)]
-    internal static extern UInt16 DSM_Entry
+    internal static extern ushort DSM_Entry
     (
-        ref TW_IDENTITY_MACOSX origin,
-        IntPtr dest,
-        DG dg,
-        DAT dat,
-        MSG msg,
-        ref TW_IDENTITY_MACOSX twidentity
+        ref TW_IDENTITY_MACOSX origin, IntPtr dest,
+        DG dg, DAT dat, MSG msg, ref TW_IDENTITY_MACOSX twidentity
     );
 
     [DllImport(DsmName, CharSet = CharSet.Ansi)]
-    internal static extern UInt16 DSM_Entry
+    internal static extern ushort DSM_Entry
     (
-        ref TW_IDENTITY_MACOSX origin,
-        ref TW_IDENTITY_MACOSX dest,
-        DG dg,
-        DAT dat,
-        MSG msg,
-        ref TW_STATUS twstatus
+        ref TW_IDENTITY_MACOSX origin, ref TW_IDENTITY_MACOSX dest,
+        DG dg, DAT dat, MSG msg, ref TW_STATUS twstatus
     );
     [DllImport(DsmName, CharSet = CharSet.Ansi)]
-    internal static extern UInt16 DSM_Entry
+    internal static extern ushort DSM_Entry
     (
-        ref TW_IDENTITY_MACOSX origin,
-        IntPtr dest,
-        DG dg,
-        DAT dat,
-        MSG msg,
-        ref TW_STATUS twstatus
+        ref TW_IDENTITY_MACOSX origin, IntPtr dest,
+        DG dg, DAT dat, MSG msg, ref TW_STATUS twstatus
     );
     [DllImport(DsmName, CharSet = CharSet.Ansi)]
-    internal static extern UInt16 DSM_Entry
+    internal static extern ushort DSM_Entry
     (
-        ref TW_IDENTITY_MACOSX origin,
-        IntPtr dest,
-        DG dg,
-        DAT dat,
-        MSG msg,
-        ref TW_STATUSUTF8 twstatusutf8
+        ref TW_IDENTITY_MACOSX origin, IntPtr dest,
+        DG dg, DAT dat, MSG msg, ref TW_STATUSUTF8 twstatusutf8
     );
 
     [DllImport(DsmName, CharSet = CharSet.Ansi)]
-    internal static extern UInt16 DSM_Entry
+    internal static extern ushort DSM_Entry
     (
-        ref TW_IDENTITY_MACOSX origin,
-        IntPtr dest,
-        DG dg,
-        DAT dat,
-        MSG msg,
-        ref TW_ENTRYPOINT twentrypoint
+        ref TW_IDENTITY_MACOSX origin, IntPtr dest,
+        DG dg, DAT dat, MSG msg, ref TW_ENTRYPOINT twentrypoint
     );
 
     [DllImport(DsmName, CharSet = CharSet.Ansi)]
-    internal static extern UInt16 DSM_Entry
+    internal static extern ushort DSM_Entry
     (
-        ref TW_IDENTITY_MACOSX origin,
-        ref TW_IDENTITY_MACOSX dest,
-        DG dg,
-        DAT dat,
-        MSG msg,
-        ref TW_DEVICEEVENT twdeviceevent
+        ref TW_IDENTITY_MACOSX origin, ref TW_IDENTITY_MACOSX dest,
+        DG dg, DAT dat, MSG msg, ref TW_DEVICEEVENT twdeviceevent
     );
 
     [DllImport(DsmName, CharSet = CharSet.Ansi)]
-    internal static extern UInt16 DSM_Entry
+    internal static extern ushort DSM_Entry
     (
-        ref TW_IDENTITY_MACOSX origin,
-        ref TW_IDENTITY_MACOSX dest,
-        DG dg,
-        DAT dat,
-        MSG msg,
-        ref TW_CUSTOMDSDATA twcustomedsdata
+        ref TW_IDENTITY_MACOSX origin, ref TW_IDENTITY_MACOSX dest,
+        DG dg, DAT dat, MSG msg, ref TW_CUSTOMDSDATA twcustomedsdata
     );
 
     [DllImport(DsmName, CharSet = CharSet.Ansi)]
-    internal static extern UInt16 DSM_Entry
+    internal static extern ushort DSM_Entry
     (
-        ref TW_IDENTITY_MACOSX origin,
-        ref TW_IDENTITY_MACOSX dest,
-        DG dg,
-        DAT dat,
-        MSG msg,
-        ref TW_CALLBACK twcallback
+        ref TW_IDENTITY_MACOSX origin, ref TW_IDENTITY_MACOSX dest,
+        DG dg, DAT dat, MSG msg, ref TW_CALLBACK twcallback
     );
     [DllImport(DsmName, CharSet = CharSet.Ansi)]
-    internal static extern UInt16 DSM_Entry
+    internal static extern ushort DSM_Entry
     (
-        ref TW_IDENTITY_MACOSX origin,
-        ref TW_IDENTITY_MACOSX dest,
-        DG dg,
-        DAT dat,
-        MSG msg,
-        ref TW_CALLBACK2 twcallback
+        ref TW_IDENTITY_MACOSX origin, ref TW_IDENTITY_MACOSX dest,
+        DG dg, DAT dat, MSG msg, ref TW_CALLBACK2 twcallback
     );
   }
 }
diff --git a/src/NTwain/DSM/WinLegacyDSM.cs b/src/NTwain/DSM/WinLegacyDSM.cs
index 6b19c09..cccc2de 100644
--- a/src/NTwain/DSM/WinLegacyDSM.cs
+++ b/src/NTwain/DSM/WinLegacyDSM.cs
@@ -9,110 +9,70 @@ namespace NTwain.DSM
     const string DsmName = "twain_32.dll";
 
     [DllImport(DsmName, CharSet = CharSet.Ansi)]
-    internal static extern UInt16 DSM_Entry
+    internal static extern ushort DSM_Entry
     (
-        ref TW_IDENTITY_LEGACY origin,
-        IntPtr dest,
-        DG dg,
-        DAT dat,
-        MSG msg,
-        ref IntPtr hwnd
+        ref TW_IDENTITY_LEGACY origin, IntPtr dest,
+        DG dg, DAT dat, MSG msg, ref IntPtr hwnd
     );
 
     [DllImport(DsmName, CharSet = CharSet.Ansi)]
-    internal static extern UInt16 DSM_Entry
+    internal static extern ushort DSM_Entry
     (
-        ref TW_IDENTITY_LEGACY origin,
-        IntPtr dest,
-        DG dg,
-        DAT dat,
-        MSG msg,
-        ref TW_IDENTITY_LEGACY twidentity
+        ref TW_IDENTITY_LEGACY origin, IntPtr dest,
+        DG dg, DAT dat, MSG msg, ref TW_IDENTITY_LEGACY twidentity
     );
 
     [DllImport(DsmName, CharSet = CharSet.Ansi)]
-    internal static extern UInt16 DSM_Entry
+    internal static extern ushort DSM_Entry
     (
-        ref TW_IDENTITY_LEGACY origin,
-        ref TW_IDENTITY_LEGACY dest,
-        DG dg,
-        DAT dat,
-        MSG msg,
-        ref TW_STATUS twstatus
+        ref TW_IDENTITY_LEGACY origin, ref TW_IDENTITY_LEGACY dest,
+        DG dg, DAT dat, MSG msg, ref TW_STATUS twstatus
     );
     [DllImport(DsmName, CharSet = CharSet.Ansi)]
-    internal static extern UInt16 DSM_Entry
+    internal static extern ushort DSM_Entry
     (
-        ref TW_IDENTITY_LEGACY origin,
-        IntPtr dest,
-        DG dg,
-        DAT dat,
-        MSG msg,
-        ref TW_STATUS twstatus
+        ref TW_IDENTITY_LEGACY origin, IntPtr dest,
+        DG dg, DAT dat, MSG msg, ref TW_STATUS twstatus
     );
     [DllImport(DsmName, CharSet = CharSet.Ansi)]
-    internal static extern UInt16 DSM_Entry
+    internal static extern ushort DSM_Entry
     (
-        ref TW_IDENTITY_LEGACY origin,
-        IntPtr dest,
-        DG dg,
-        DAT dat,
-        MSG msg,
-        ref TW_STATUSUTF8 twstatusutf8
+        ref TW_IDENTITY_LEGACY origin, IntPtr dest,
+        DG dg, DAT dat, MSG msg, ref TW_STATUSUTF8 twstatusutf8
     );
 
     [DllImport(DsmName, CharSet = CharSet.Ansi)]
-    internal static extern UInt16 DSM_Entry
+    internal static extern ushort DSM_Entry
     (
-        ref TW_IDENTITY_LEGACY origin,
-        IntPtr dest,
-        DG dg,
-        DAT dat,
-        MSG msg,
-        ref TW_ENTRYPOINT twentrypoint
+        ref TW_IDENTITY_LEGACY origin, IntPtr dest,
+        DG dg, DAT dat, MSG msg, ref TW_ENTRYPOINT twentrypoint
     );
 
     [DllImport(DsmName, CharSet = CharSet.Ansi)]
-    internal static extern UInt16 DSM_Entry
+    internal static extern ushort DSM_Entry
     (
-        ref TW_IDENTITY_LEGACY origin,
-        ref TW_IDENTITY_LEGACY dest,
-        DG dg,
-        DAT dat,
-        MSG msg,
-        ref TW_DEVICEEVENT twdeviceevent
+        ref TW_IDENTITY_LEGACY origin, ref TW_IDENTITY_LEGACY dest,
+        DG dg, DAT dat, MSG msg, ref TW_DEVICEEVENT twdeviceevent
     );
 
     [DllImport(DsmName, CharSet = CharSet.Ansi)]
-    internal static extern UInt16 DSM_Entry
+    internal static extern ushort DSM_Entry
     (
-        ref TW_IDENTITY_LEGACY origin,
-        ref TW_IDENTITY_LEGACY dest,
-        DG dg,
-        DAT dat,
-        MSG msg,
-        ref TW_CUSTOMDSDATA twcustomedsdata
+        ref TW_IDENTITY_LEGACY origin, ref TW_IDENTITY_LEGACY dest,
+        DG dg, DAT dat, MSG msg, ref TW_CUSTOMDSDATA twcustomedsdata
     );
 
     [DllImport(DsmName, CharSet = CharSet.Ansi)]
-    internal static extern UInt16 DSM_Entry
+    internal static extern ushort DSM_Entry
     (
-        ref TW_IDENTITY_LEGACY origin,
-        ref TW_IDENTITY_LEGACY dest,
-        DG dg,
-        DAT dat,
-        MSG msg,
-        ref TW_CALLBACK twcallback
+        ref TW_IDENTITY_LEGACY origin, ref TW_IDENTITY_LEGACY dest,
+        DG dg, DAT dat, MSG msg, ref TW_CALLBACK twcallback
     );
     [DllImport(DsmName, CharSet = CharSet.Ansi)]
-    internal static extern UInt16 DSM_Entry
+    internal static extern ushort DSM_Entry
     (
-        ref TW_IDENTITY_LEGACY origin,
-        ref TW_IDENTITY_LEGACY dest,
-        DG dg,
-        DAT dat,
-        MSG msg,
-        ref TW_CALLBACK2 twcallback
+        ref TW_IDENTITY_LEGACY origin, ref TW_IDENTITY_LEGACY dest,
+        DG dg, DAT dat, MSG msg, ref TW_CALLBACK2 twcallback
     );
   }
 }
diff --git a/src/NTwain/DSM/WinNewDSM.cs b/src/NTwain/DSM/WinNewDSM.cs
index 4eb42b5..930b54b 100644
--- a/src/NTwain/DSM/WinNewDSM.cs
+++ b/src/NTwain/DSM/WinNewDSM.cs
@@ -9,110 +9,70 @@ namespace NTwain.DSM
     const string DsmName = "twaindsm.dll";
 
     [DllImport(DsmName, CharSet = CharSet.Ansi)]
-    internal static extern UInt16 DSM_Entry
+    internal static extern ushort DSM_Entry
     (
-        ref TW_IDENTITY_LEGACY origin,
-        IntPtr dest,
-        DG dg,
-        DAT dat,
-        MSG msg,
-        ref IntPtr hwnd
+        ref TW_IDENTITY_LEGACY origin, IntPtr dest,
+        DG dg, DAT dat, MSG msg, ref IntPtr hwnd
     );
 
     [DllImport(DsmName, CharSet = CharSet.Ansi)]
-    internal static extern UInt16 DSM_Entry
+    internal static extern ushort DSM_Entry
     (
-        ref TW_IDENTITY_LEGACY origin,
-        IntPtr dest,
-        DG dg,
-        DAT dat,
-        MSG msg,
-        ref TW_IDENTITY_LEGACY twidentity
+        ref TW_IDENTITY_LEGACY origin, IntPtr dest,
+        DG dg, DAT dat, MSG msg, ref TW_IDENTITY_LEGACY twidentity
     );
 
     [DllImport(DsmName, CharSet = CharSet.Ansi)]
-    internal static extern UInt16 DSM_Entry
+    internal static extern ushort DSM_Entry
     (
-        ref TW_IDENTITY_LEGACY origin,
-        ref TW_IDENTITY_LEGACY dest,
-        DG dg,
-        DAT dat,
-        MSG msg,
-        ref TW_STATUS twstatus
+        ref TW_IDENTITY_LEGACY origin, ref TW_IDENTITY_LEGACY dest,
+        DG dg, DAT dat, MSG msg, ref TW_STATUS twstatus
     );
     [DllImport(DsmName, CharSet = CharSet.Ansi)]
-    internal static extern UInt16 DSM_Entry
+    internal static extern ushort DSM_Entry
     (
-        ref TW_IDENTITY_LEGACY origin,
-        IntPtr dest,
-        DG dg,
-        DAT dat,
-        MSG msg,
-        ref TW_STATUS twstatus
+        ref TW_IDENTITY_LEGACY origin, IntPtr dest,
+        DG dg, DAT dat, MSG msg, ref TW_STATUS twstatus
     );
     [DllImport(DsmName, CharSet = CharSet.Ansi)]
-    internal static extern UInt16 DSM_Entry
+    internal static extern ushort DSM_Entry
     (
-        ref TW_IDENTITY_LEGACY origin,
-        IntPtr dest,
-        DG dg,
-        DAT dat,
-        MSG msg,
-        ref TW_STATUSUTF8 twstatusutf8
+        ref TW_IDENTITY_LEGACY origin, IntPtr dest,
+        DG dg, DAT dat, MSG msg, ref TW_STATUSUTF8 twstatusutf8
     );
 
     [DllImport(DsmName, CharSet = CharSet.Ansi)]
-    internal static extern UInt16 DSM_Entry
+    internal static extern ushort DSM_Entry
     (
-        ref TW_IDENTITY_LEGACY origin,
-        IntPtr dest,
-        DG dg,
-        DAT dat,
-        MSG msg,
-        ref TW_ENTRYPOINT twentrypoint
+        ref TW_IDENTITY_LEGACY origin, IntPtr dest,
+        DG dg, DAT dat, MSG msg, ref TW_ENTRYPOINT twentrypoint
     );
 
     [DllImport(DsmName, CharSet = CharSet.Ansi)]
-    internal static extern UInt16 DSM_Entry
+    internal static extern ushort DSM_Entry
     (
-        ref TW_IDENTITY_LEGACY origin,
-        ref TW_IDENTITY_LEGACY dest,
-        DG dg,
-        DAT dat,
-        MSG msg,
-        ref TW_DEVICEEVENT twdeviceevent
+        ref TW_IDENTITY_LEGACY origin, ref TW_IDENTITY_LEGACY dest,
+        DG dg, DAT dat, MSG msg, ref TW_DEVICEEVENT twdeviceevent
     );
 
     [DllImport(DsmName, CharSet = CharSet.Ansi)]
-    internal static extern UInt16 DSM_Entry
+    internal static extern ushort DSM_Entry
     (
-        ref TW_IDENTITY_LEGACY origin,
-        ref TW_IDENTITY_LEGACY dest,
-        DG dg,
-        DAT dat,
-        MSG msg,
-        ref TW_CUSTOMDSDATA twcustomedsdata
+        ref TW_IDENTITY_LEGACY origin, ref TW_IDENTITY_LEGACY dest,
+        DG dg, DAT dat, MSG msg, ref TW_CUSTOMDSDATA twcustomedsdata
     );
 
     [DllImport(DsmName, CharSet = CharSet.Ansi)]
-    internal static extern UInt16 DSM_Entry
+    internal static extern ushort DSM_Entry
     (
-        ref TW_IDENTITY_LEGACY origin,
-        ref TW_IDENTITY_LEGACY dest,
-        DG dg,
-        DAT dat,
-        MSG msg,
-        ref TW_CALLBACK twcallback
+        ref TW_IDENTITY_LEGACY origin, ref TW_IDENTITY_LEGACY dest,
+        DG dg, DAT dat, MSG msg, ref TW_CALLBACK twcallback
     );
     [DllImport(DsmName, CharSet = CharSet.Ansi)]
-    internal static extern UInt16 DSM_Entry
+    internal static extern ushort DSM_Entry
     (
-        ref TW_IDENTITY_LEGACY origin,
-        ref TW_IDENTITY_LEGACY dest,
-        DG dg,
-        DAT dat,
-        MSG msg,
-        ref TW_CALLBACK2 twcallback
+        ref TW_IDENTITY_LEGACY origin, ref TW_IDENTITY_LEGACY dest,
+        DG dg, DAT dat, MSG msg, ref TW_CALLBACK2 twcallback
     );
   }
 }
diff --git a/src/NTwain/Triplets/DATCallback.cs b/src/NTwain/Triplets/ControlDATs/Callback.cs
similarity index 91%
rename from src/NTwain/Triplets/DATCallback.cs
rename to src/NTwain/Triplets/ControlDATs/Callback.cs
index 5f2d2aa..c9be18c 100644
--- a/src/NTwain/Triplets/DATCallback.cs
+++ b/src/NTwain/Triplets/ControlDATs/Callback.cs
@@ -1,14 +1,14 @@
 using NTwain.DSM;
 using TWAINWorkingGroup;
 
-namespace NTwain.Triplets
+namespace NTwain.Triplets.ControlDATs
 {
   /// <summary>
   /// Contains calls used with <see cref="DG.CONTROL"/> and <see cref="DAT.CALLBACK"/>.
   /// </summary>
-  public class DATCallback : TripletBase
+  public class Callback : TripletBase
   {
-    public DATCallback(TwainSession session) : base(session)
+    public Callback(TwainSession session) : base(session)
     {
     }
 
diff --git a/src/NTwain/Triplets/DATCallback2.cs b/src/NTwain/Triplets/ControlDATs/Callback2.cs
similarity index 91%
rename from src/NTwain/Triplets/DATCallback2.cs
rename to src/NTwain/Triplets/ControlDATs/Callback2.cs
index 130cf3f..88c1410 100644
--- a/src/NTwain/Triplets/DATCallback2.cs
+++ b/src/NTwain/Triplets/ControlDATs/Callback2.cs
@@ -1,14 +1,14 @@
 using NTwain.DSM;
 using TWAINWorkingGroup;
 
-namespace NTwain.Triplets
+namespace NTwain.Triplets.ControlDATs
 {
   /// <summary>
   /// Contains calls used with <see cref="DG.CONTROL"/> and <see cref="DAT.CALLBACK2"/>.
   /// </summary>
-  public class DATCallback2 : TripletBase
+  public class Callback2 : TripletBase
   {
-    public DATCallback2(TwainSession session) : base(session)
+    public Callback2(TwainSession session) : base(session)
     {
     }
 
diff --git a/src/NTwain/Triplets/DATCustomDsData.cs b/src/NTwain/Triplets/ControlDATs/CustomDsData.cs
similarity index 92%
rename from src/NTwain/Triplets/DATCustomDsData.cs
rename to src/NTwain/Triplets/ControlDATs/CustomDsData.cs
index 9862616..f08e8d8 100644
--- a/src/NTwain/Triplets/DATCustomDsData.cs
+++ b/src/NTwain/Triplets/ControlDATs/CustomDsData.cs
@@ -1,14 +1,14 @@
 using NTwain.DSM;
 using TWAINWorkingGroup;
 
-namespace NTwain.Triplets
+namespace NTwain.Triplets.ControlDATs
 {
   /// <summary>
   /// Contains calls used with <see cref="DG.CONTROL"/> and <see cref="DAT.CUSTOMDSDATA"/>.
   /// </summary>
-  public class DATCustomDsData : TripletBase
+  public class CustomDsData : TripletBase
   {
-    public DATCustomDsData(TwainSession session) : base(session)
+    public CustomDsData(TwainSession session) : base(session)
     {
     }
 
diff --git a/src/NTwain/Triplets/DATDeviceEvent.cs b/src/NTwain/Triplets/ControlDATs/DeviceEvent.cs
similarity index 91%
rename from src/NTwain/Triplets/DATDeviceEvent.cs
rename to src/NTwain/Triplets/ControlDATs/DeviceEvent.cs
index 86c92de..97e9274 100644
--- a/src/NTwain/Triplets/DATDeviceEvent.cs
+++ b/src/NTwain/Triplets/ControlDATs/DeviceEvent.cs
@@ -1,14 +1,14 @@
 using NTwain.DSM;
 using TWAINWorkingGroup;
 
-namespace NTwain.Triplets
+namespace NTwain.Triplets.ControlDATs
 {
   /// <summary>
   /// Contains calls used with <see cref="DG.CONTROL"/> and <see cref="DAT.DEVICEEVENT"/>.
   /// </summary>
-  public class DATDeviceEvent : TripletBase
+  public class DeviceEvent : TripletBase
   {
-    public DATDeviceEvent(TwainSession session) : base(session)
+    public DeviceEvent(TwainSession session) : base(session)
     {
     }
 
diff --git a/src/NTwain/Triplets/DATEntryPoint.cs b/src/NTwain/Triplets/ControlDATs/EntryPoint.cs
similarity index 94%
rename from src/NTwain/Triplets/DATEntryPoint.cs
rename to src/NTwain/Triplets/ControlDATs/EntryPoint.cs
index 308cbd3..78ecf23 100644
--- a/src/NTwain/Triplets/DATEntryPoint.cs
+++ b/src/NTwain/Triplets/ControlDATs/EntryPoint.cs
@@ -3,14 +3,14 @@ using System;
 using System.Runtime.InteropServices;
 using TWAINWorkingGroup;
 
-namespace NTwain.Triplets
+namespace NTwain.Triplets.ControlDATs
 {
   /// <summary>
   /// Contains calls used with <see cref="DG.CONTROL"/> and <see cref="DAT.ENTRYPOINT"/>.
   /// </summary>
-  public class DATEntryPoint : TripletBase
+  public class EntryPoint : TripletBase
   {
-    public DATEntryPoint(TwainSession session) : base(session)
+    public EntryPoint(TwainSession session) : base(session)
     {
     }
 
diff --git a/src/NTwain/Triplets/DATIdentity.cs b/src/NTwain/Triplets/ControlDATs/Identity.cs
similarity index 96%
rename from src/NTwain/Triplets/DATIdentity.cs
rename to src/NTwain/Triplets/ControlDATs/Identity.cs
index 421fc7f..221a109 100644
--- a/src/NTwain/Triplets/DATIdentity.cs
+++ b/src/NTwain/Triplets/ControlDATs/Identity.cs
@@ -2,14 +2,14 @@
 using System;
 using TWAINWorkingGroup;
 
-namespace NTwain.Triplets
+namespace NTwain.Triplets.ControlDATs
 {
   /// <summary>
   /// Contains calls used with <see cref="DG.CONTROL"/> and <see cref="DAT.IDENTITY"/>.
   /// </summary>
-  public class DATIdentity : TripletBase
+  public class Identity : TripletBase
   {
-    public DATIdentity(TwainSession session) : base(session)
+    public Identity(TwainSession session) : base(session)
     {
     }
 
diff --git a/src/NTwain/Triplets/DATParent.cs b/src/NTwain/Triplets/ControlDATs/Parent.cs
similarity index 93%
rename from src/NTwain/Triplets/DATParent.cs
rename to src/NTwain/Triplets/ControlDATs/Parent.cs
index ce810fa..8dd32a8 100644
--- a/src/NTwain/Triplets/DATParent.cs
+++ b/src/NTwain/Triplets/ControlDATs/Parent.cs
@@ -2,14 +2,14 @@
 using System;
 using TWAINWorkingGroup;
 
-namespace NTwain.Triplets
+namespace NTwain.Triplets.ControlDATs
 {
   /// <summary>
   /// Contains calls used with <see cref="DG.CONTROL"/> and <see cref="DAT.PARENT"/>.
   /// </summary>
-  public class DATParent : TripletBase
+  public class Parent : TripletBase
   {
-    public DATParent(TwainSession session) : base(session)
+    public Parent(TwainSession session) : base(session)
     {
     }
 
@@ -32,7 +32,7 @@ namespace NTwain.Triplets
         }
 
         // determine memory mgmt routines used
-        if ((((DG)Session.AppIdentity.SupportedGroups) & DG.DSM2) == DG.DSM2)
+        if (((DG)Session.AppIdentity.SupportedGroups & DG.DSM2) == DG.DSM2)
         {
           if (Session.DGControl.EntryPoint.Get(out TW_ENTRYPOINT_DELEGATES entry) == STS.SUCCESS)
           {
diff --git a/src/NTwain/Triplets/DATStatus.cs b/src/NTwain/Triplets/ControlDATs/Status.cs
similarity index 95%
rename from src/NTwain/Triplets/DATStatus.cs
rename to src/NTwain/Triplets/ControlDATs/Status.cs
index 9906abd..3cf047b 100644
--- a/src/NTwain/Triplets/DATStatus.cs
+++ b/src/NTwain/Triplets/ControlDATs/Status.cs
@@ -2,14 +2,14 @@
 using System;
 using TWAINWorkingGroup;
 
-namespace NTwain.Triplets
+namespace NTwain.Triplets.ControlDATs
 {
   /// <summary>
   /// Contains calls used with <see cref="DG.CONTROL"/> and <see cref="DAT.STATUS"/>.
   /// </summary>
-  public class DATStatus : TripletBase
+  public class Status : TripletBase
   {
-    public DATStatus(TwainSession session) : base(session)
+    public Status(TwainSession session) : base(session)
     {
     }
 
diff --git a/src/NTwain/Triplets/DATStatusUtf8.cs b/src/NTwain/Triplets/ControlDATs/StatusUtf8.cs
similarity index 92%
rename from src/NTwain/Triplets/DATStatusUtf8.cs
rename to src/NTwain/Triplets/ControlDATs/StatusUtf8.cs
index beb2d18..d4f5324 100644
--- a/src/NTwain/Triplets/DATStatusUtf8.cs
+++ b/src/NTwain/Triplets/ControlDATs/StatusUtf8.cs
@@ -2,14 +2,14 @@
 using System;
 using TWAINWorkingGroup;
 
-namespace NTwain.Triplets
+namespace NTwain.Triplets.ControlDATs
 {
   /// <summary>
   /// Contains calls used with <see cref="DG.CONTROL"/> and <see cref="DAT.STATUSUTF8"/>.
   /// </summary>
-  public class DATStatusUtf8 : TripletBase
+  public class StatusUtf8 : TripletBase
   {
-    public DATStatusUtf8(TwainSession session) : base(session)
+    public StatusUtf8(TwainSession session) : base(session)
     {
 
     }
diff --git a/src/NTwain/Triplets/DGControl.cs b/src/NTwain/Triplets/DGControl.cs
index 18ec0bc..fc9e994 100644
--- a/src/NTwain/Triplets/DGControl.cs
+++ b/src/NTwain/Triplets/DGControl.cs
@@ -1,4 +1,6 @@
-namespace NTwain.Triplets
+using NTwain.Triplets.ControlDATs;
+
+namespace NTwain.Triplets
 {
   /// <summary>
   /// Contains calls used with <see cref="DG.CONTROL"/>.
@@ -9,32 +11,32 @@
     {
     }
 
-    private DATParent? _parent;
-    public DATParent Parent => _parent ??= new DATParent(Session);
+    private Parent? _parent;
+    public Parent Parent => _parent ??= new Parent(Session);
 
-    private DATEntryPoint? _entryPoint;
-    public DATEntryPoint EntryPoint => _entryPoint ??= new DATEntryPoint(Session);
+    private EntryPoint? _entryPoint;
+    public EntryPoint EntryPoint => _entryPoint ??= new EntryPoint(Session);
 
-    private DATIdentity? _identity;
-    public DATIdentity Identity => _identity ??= new DATIdentity(Session);
+    private Identity? _identity;
+    public Identity Identity => _identity ??= new Identity(Session);
 
-    private DATStatus? _status;
-    public DATStatus Status => _status ??= new DATStatus(Session);
+    private Status? _status;
+    public Status Status => _status ??= new Status(Session);
 
-    private DATStatusUtf8? _statusUtf8;
-    public DATStatusUtf8 StatusUtf8 => _statusUtf8 ??= new DATStatusUtf8(Session);
+    private StatusUtf8? _statusUtf8;
+    public StatusUtf8 StatusUtf8 => _statusUtf8 ??= new StatusUtf8(Session);
 
-    private DATCustomDsData? _customDsData;
-    public DATCustomDsData CustomDsData => _customDsData ??= new DATCustomDsData(Session);
+    private CustomDsData? _customDsData;
+    public CustomDsData CustomDsData => _customDsData ??= new CustomDsData(Session);
 
-    private DATDeviceEvent? _deviceEvent;
-    public DATDeviceEvent DeviceEvent => _deviceEvent ??= new DATDeviceEvent(Session);
+    private DeviceEvent? _deviceEvent;
+    public DeviceEvent DeviceEvent => _deviceEvent ??= new DeviceEvent(Session);
 
-    private DATCallback? _callback;
-    public DATCallback Callback => _callback ??= new DATCallback(Session);
+    private Callback? _callback;
+    public Callback Callback => _callback ??= new Callback(Session);
 
-    private DATCallback2? _callback2;
-    public DATCallback2 Callback2 => _callback2 ??= new DATCallback2(Session);
+    private Callback2? _callback2;
+    public Callback2 Callback2 => _callback2 ??= new Callback2(Session);
 
   }
 }
\ No newline at end of file