diff --git a/src/main/dig/lib/74xx/basic/7407.dig b/src/main/dig/lib/74xx/basic/7407.dig
deleted file mode 100644
index 21caa80df..000000000
--- a/src/main/dig/lib/74xx/basic/7407.dig
+++ /dev/null
@@ -1,429 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<circuit>
-  <version>1</version>
-  <attributes>
-    <entry>
-      <string>isDIL</string>
-      <boolean>true</boolean>
-    </entry>
-    <entry>
-      <string>Description</string>
-      <string>hex buffer, open-collector output</string>
-    </entry>
-    <entry>
-      <string>lockedMode</string>
-      <boolean>true</boolean>
-    </entry>
-  </attributes>
-  <visualElements>
-    <visualElement>
-      <elementName>In</elementName>
-      <elementAttributes>
-        <entry>
-          <string>Label</string>
-          <string>1A</string>
-        </entry>
-        <entry>
-          <string>pinNumber</string>
-          <string>1</string>
-        </entry>
-      </elementAttributes>
-      <pos x="-40" y="80"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Out</elementName>
-      <elementAttributes>
-        <entry>
-          <string>Label</string>
-          <string>1Y</string>
-        </entry>
-        <entry>
-          <string>pinNumber</string>
-          <string>2</string>
-        </entry>
-      </elementAttributes>
-      <pos x="80" y="40"/>
-    </visualElement>
-    <visualElement>
-      <elementName>In</elementName>
-      <elementAttributes>
-        <entry>
-          <string>Label</string>
-          <string>2A</string>
-        </entry>
-        <entry>
-          <string>pinNumber</string>
-          <string>3</string>
-        </entry>
-      </elementAttributes>
-      <pos x="-40" y="160"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Out</elementName>
-      <elementAttributes>
-        <entry>
-          <string>Label</string>
-          <string>2Y</string>
-        </entry>
-        <entry>
-          <string>pinNumber</string>
-          <string>4</string>
-        </entry>
-      </elementAttributes>
-      <pos x="80" y="120"/>
-    </visualElement>
-    <visualElement>
-      <elementName>In</elementName>
-      <elementAttributes>
-        <entry>
-          <string>Label</string>
-          <string>3A</string>
-        </entry>
-        <entry>
-          <string>pinNumber</string>
-          <string>5</string>
-        </entry>
-      </elementAttributes>
-      <pos x="-40" y="240"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Out</elementName>
-      <elementAttributes>
-        <entry>
-          <string>Label</string>
-          <string>3Y</string>
-        </entry>
-        <entry>
-          <string>pinNumber</string>
-          <string>6</string>
-        </entry>
-      </elementAttributes>
-      <pos x="80" y="200"/>
-    </visualElement>
-    <visualElement>
-      <elementName>In</elementName>
-      <elementAttributes>
-        <entry>
-          <string>Label</string>
-          <string>4A</string>
-        </entry>
-        <entry>
-          <string>pinNumber</string>
-          <string>9</string>
-        </entry>
-      </elementAttributes>
-      <pos x="360" y="80"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Out</elementName>
-      <elementAttributes>
-        <entry>
-          <string>Label</string>
-          <string>4Y</string>
-        </entry>
-        <entry>
-          <string>pinNumber</string>
-          <string>8</string>
-        </entry>
-      </elementAttributes>
-      <pos x="480" y="40"/>
-    </visualElement>
-    <visualElement>
-      <elementName>In</elementName>
-      <elementAttributes>
-        <entry>
-          <string>Label</string>
-          <string>5A</string>
-        </entry>
-        <entry>
-          <string>pinNumber</string>
-          <string>11</string>
-        </entry>
-      </elementAttributes>
-      <pos x="360" y="160"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Out</elementName>
-      <elementAttributes>
-        <entry>
-          <string>Label</string>
-          <string>5Y</string>
-        </entry>
-        <entry>
-          <string>pinNumber</string>
-          <string>10</string>
-        </entry>
-      </elementAttributes>
-      <pos x="480" y="120"/>
-    </visualElement>
-    <visualElement>
-      <elementName>In</elementName>
-      <elementAttributes>
-        <entry>
-          <string>Label</string>
-          <string>6A</string>
-        </entry>
-        <entry>
-          <string>pinNumber</string>
-          <string>13</string>
-        </entry>
-      </elementAttributes>
-      <pos x="360" y="240"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Out</elementName>
-      <elementAttributes>
-        <entry>
-          <string>Label</string>
-          <string>6Y</string>
-        </entry>
-        <entry>
-          <string>pinNumber</string>
-          <string>12</string>
-        </entry>
-      </elementAttributes>
-      <pos x="480" y="200"/>
-    </visualElement>
-    <visualElement>
-      <elementName>PowerSupply</elementName>
-      <elementAttributes/>
-      <pos x="220" y="320"/>
-    </visualElement>
-    <visualElement>
-      <elementName>In</elementName>
-      <elementAttributes>
-        <entry>
-          <string>Label</string>
-          <string>VCC</string>
-        </entry>
-        <entry>
-          <string>pinNumber</string>
-          <string>14</string>
-        </entry>
-        <entry>
-          <string>InDefault</string>
-          <value v="1" z="false"/>
-        </entry>
-      </elementAttributes>
-      <pos x="180" y="320"/>
-    </visualElement>
-    <visualElement>
-      <elementName>In</elementName>
-      <elementAttributes>
-        <entry>
-          <string>Label</string>
-          <string>GND</string>
-        </entry>
-        <entry>
-          <string>pinNumber</string>
-          <string>7</string>
-        </entry>
-      </elementAttributes>
-      <pos x="180" y="360"/>
-    </visualElement>
-    <visualElement>
-      <elementName>NFET</elementName>
-      <elementAttributes/>
-      <pos x="40" y="40"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Ground</elementName>
-      <elementAttributes/>
-      <pos x="60" y="100"/>
-    </visualElement>
-    <visualElement>
-      <elementName>NFET</elementName>
-      <elementAttributes/>
-      <pos x="40" y="120"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Ground</elementName>
-      <elementAttributes/>
-      <pos x="60" y="180"/>
-    </visualElement>
-    <visualElement>
-      <elementName>NFET</elementName>
-      <elementAttributes/>
-      <pos x="40" y="200"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Ground</elementName>
-      <elementAttributes/>
-      <pos x="60" y="260"/>
-    </visualElement>
-    <visualElement>
-      <elementName>NFET</elementName>
-      <elementAttributes/>
-      <pos x="440" y="40"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Ground</elementName>
-      <elementAttributes/>
-      <pos x="460" y="100"/>
-    </visualElement>
-    <visualElement>
-      <elementName>NFET</elementName>
-      <elementAttributes/>
-      <pos x="440" y="120"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Ground</elementName>
-      <elementAttributes/>
-      <pos x="460" y="180"/>
-    </visualElement>
-    <visualElement>
-      <elementName>NFET</elementName>
-      <elementAttributes/>
-      <pos x="440" y="200"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Ground</elementName>
-      <elementAttributes/>
-      <pos x="460" y="260"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Not</elementName>
-      <elementAttributes/>
-      <pos x="380" y="80"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Not</elementName>
-      <elementAttributes/>
-      <pos x="380" y="160"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Not</elementName>
-      <elementAttributes/>
-      <pos x="380" y="240"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Not</elementName>
-      <elementAttributes/>
-      <pos x="-20" y="240"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Not</elementName>
-      <elementAttributes/>
-      <pos x="-20" y="160"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Not</elementName>
-      <elementAttributes/>
-      <pos x="-20" y="80"/>
-    </visualElement>
-  </visualElements>
-  <wires>
-    <wire>
-      <p1 x="20" y="160"/>
-      <p2 x="40" y="160"/>
-    </wire>
-    <wire>
-      <p1 x="420" y="160"/>
-      <p2 x="440" y="160"/>
-    </wire>
-    <wire>
-      <p1 x="360" y="160"/>
-      <p2 x="380" y="160"/>
-    </wire>
-    <wire>
-      <p1 x="-40" y="160"/>
-      <p2 x="-20" y="160"/>
-    </wire>
-    <wire>
-      <p1 x="20" y="80"/>
-      <p2 x="40" y="80"/>
-    </wire>
-    <wire>
-      <p1 x="420" y="80"/>
-      <p2 x="440" y="80"/>
-    </wire>
-    <wire>
-      <p1 x="360" y="80"/>
-      <p2 x="380" y="80"/>
-    </wire>
-    <wire>
-      <p1 x="-40" y="80"/>
-      <p2 x="-20" y="80"/>
-    </wire>
-    <wire>
-      <p1 x="20" y="240"/>
-      <p2 x="40" y="240"/>
-    </wire>
-    <wire>
-      <p1 x="420" y="240"/>
-      <p2 x="440" y="240"/>
-    </wire>
-    <wire>
-      <p1 x="360" y="240"/>
-      <p2 x="380" y="240"/>
-    </wire>
-    <wire>
-      <p1 x="-40" y="240"/>
-      <p2 x="-20" y="240"/>
-    </wire>
-    <wire>
-      <p1 x="180" y="320"/>
-      <p2 x="220" y="320"/>
-    </wire>
-    <wire>
-      <p1 x="200" y="340"/>
-      <p2 x="220" y="340"/>
-    </wire>
-    <wire>
-      <p1 x="180" y="360"/>
-      <p2 x="200" y="360"/>
-    </wire>
-    <wire>
-      <p1 x="60" y="40"/>
-      <p2 x="80" y="40"/>
-    </wire>
-    <wire>
-      <p1 x="460" y="40"/>
-      <p2 x="480" y="40"/>
-    </wire>
-    <wire>
-      <p1 x="60" y="200"/>
-      <p2 x="80" y="200"/>
-    </wire>
-    <wire>
-      <p1 x="460" y="200"/>
-      <p2 x="480" y="200"/>
-    </wire>
-    <wire>
-      <p1 x="60" y="120"/>
-      <p2 x="80" y="120"/>
-    </wire>
-    <wire>
-      <p1 x="460" y="120"/>
-      <p2 x="480" y="120"/>
-    </wire>
-    <wire>
-      <p1 x="200" y="340"/>
-      <p2 x="200" y="360"/>
-    </wire>
-    <wire>
-      <p1 x="460" y="80"/>
-      <p2 x="460" y="100"/>
-    </wire>
-    <wire>
-      <p1 x="460" y="160"/>
-      <p2 x="460" y="180"/>
-    </wire>
-    <wire>
-      <p1 x="460" y="240"/>
-      <p2 x="460" y="260"/>
-    </wire>
-    <wire>
-      <p1 x="60" y="240"/>
-      <p2 x="60" y="260"/>
-    </wire>
-    <wire>
-      <p1 x="60" y="160"/>
-      <p2 x="60" y="180"/>
-    </wire>
-    <wire>
-      <p1 x="60" y="80"/>
-      <p2 x="60" y="100"/>
-    </wire>
-  </wires>
-</circuit>
\ No newline at end of file
diff --git a/src/main/dig/lib/74xx/basic/7406.dig b/src/main/dig/lib/74xx/driver/7406.dig
similarity index 100%
rename from src/main/dig/lib/74xx/basic/7406.dig
rename to src/main/dig/lib/74xx/driver/7406.dig
diff --git a/src/main/dig/lib/74xx/driver/7407.dig b/src/main/dig/lib/74xx/driver/7407.dig
index 3708afa3d..21caa80df 100644
--- a/src/main/dig/lib/74xx/driver/7407.dig
+++ b/src/main/dig/lib/74xx/driver/7407.dig
@@ -8,7 +8,7 @@
     </entry>
     <entry>
       <string>Description</string>
-      <string>hex buffer</string>
+      <string>hex buffer, open-collector output</string>
     </entry>
     <entry>
       <string>lockedMode</string>
@@ -25,10 +25,10 @@
         </entry>
         <entry>
           <string>pinNumber</string>
-          <int>1</int>
+          <string>1</string>
         </entry>
       </elementAttributes>
-      <pos x="340" y="120"/>
+      <pos x="-40" y="80"/>
     </visualElement>
     <visualElement>
       <elementName>Out</elementName>
@@ -39,10 +39,10 @@
         </entry>
         <entry>
           <string>pinNumber</string>
-          <int>2</int>
+          <string>2</string>
         </entry>
       </elementAttributes>
-      <pos x="420" y="120"/>
+      <pos x="80" y="40"/>
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
@@ -53,10 +53,10 @@
         </entry>
         <entry>
           <string>pinNumber</string>
-          <int>3</int>
+          <string>3</string>
         </entry>
       </elementAttributes>
-      <pos x="340" y="160"/>
+      <pos x="-40" y="160"/>
     </visualElement>
     <visualElement>
       <elementName>Out</elementName>
@@ -67,10 +67,10 @@
         </entry>
         <entry>
           <string>pinNumber</string>
-          <int>4</int>
+          <string>4</string>
         </entry>
       </elementAttributes>
-      <pos x="420" y="160"/>
+      <pos x="80" y="120"/>
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
@@ -81,10 +81,10 @@
         </entry>
         <entry>
           <string>pinNumber</string>
-          <int>5</int>
+          <string>5</string>
         </entry>
       </elementAttributes>
-      <pos x="340" y="200"/>
+      <pos x="-40" y="240"/>
     </visualElement>
     <visualElement>
       <elementName>Out</elementName>
@@ -95,10 +95,10 @@
         </entry>
         <entry>
           <string>pinNumber</string>
-          <int>6</int>
+          <string>6</string>
         </entry>
       </elementAttributes>
-      <pos x="420" y="200"/>
+      <pos x="80" y="200"/>
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
@@ -109,10 +109,10 @@
         </entry>
         <entry>
           <string>pinNumber</string>
-          <int>9</int>
+          <string>9</string>
         </entry>
       </elementAttributes>
-      <pos x="340" y="240"/>
+      <pos x="360" y="80"/>
     </visualElement>
     <visualElement>
       <elementName>Out</elementName>
@@ -123,10 +123,10 @@
         </entry>
         <entry>
           <string>pinNumber</string>
-          <int>8</int>
+          <string>8</string>
         </entry>
       </elementAttributes>
-      <pos x="420" y="240"/>
+      <pos x="480" y="40"/>
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
@@ -137,10 +137,10 @@
         </entry>
         <entry>
           <string>pinNumber</string>
-          <int>11</int>
+          <string>11</string>
         </entry>
       </elementAttributes>
-      <pos x="340" y="280"/>
+      <pos x="360" y="160"/>
     </visualElement>
     <visualElement>
       <elementName>Out</elementName>
@@ -151,10 +151,10 @@
         </entry>
         <entry>
           <string>pinNumber</string>
-          <int>10</int>
+          <string>10</string>
         </entry>
       </elementAttributes>
-      <pos x="420" y="280"/>
+      <pos x="480" y="120"/>
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
@@ -165,10 +165,10 @@
         </entry>
         <entry>
           <string>pinNumber</string>
-          <int>13</int>
+          <string>13</string>
         </entry>
       </elementAttributes>
-      <pos x="340" y="320"/>
+      <pos x="360" y="240"/>
     </visualElement>
     <visualElement>
       <elementName>Out</elementName>
@@ -179,45 +179,15 @@
         </entry>
         <entry>
           <string>pinNumber</string>
-          <int>12</int>
+          <string>12</string>
         </entry>
       </elementAttributes>
-      <pos x="420" y="320"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Delay</elementName>
-      <elementAttributes/>
-      <pos x="360" y="120"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Delay</elementName>
-      <elementAttributes/>
-      <pos x="360" y="160"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Delay</elementName>
-      <elementAttributes/>
-      <pos x="360" y="200"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Delay</elementName>
-      <elementAttributes/>
-      <pos x="360" y="240"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Delay</elementName>
-      <elementAttributes/>
-      <pos x="360" y="280"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Delay</elementName>
-      <elementAttributes/>
-      <pos x="360" y="320"/>
+      <pos x="480" y="200"/>
     </visualElement>
     <visualElement>
       <elementName>PowerSupply</elementName>
       <elementAttributes/>
-      <pos x="380" y="380"/>
+      <pos x="220" y="320"/>
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
@@ -228,14 +198,14 @@
         </entry>
         <entry>
           <string>pinNumber</string>
-          <int>14</int>
+          <string>14</string>
         </entry>
         <entry>
           <string>InDefault</string>
           <value v="1" z="false"/>
         </entry>
       </elementAttributes>
-      <pos x="340" y="380"/>
+      <pos x="180" y="320"/>
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
@@ -246,76 +216,214 @@
         </entry>
         <entry>
           <string>pinNumber</string>
-          <int>7</int>
+          <string>7</string>
         </entry>
       </elementAttributes>
-      <pos x="340" y="420"/>
+      <pos x="180" y="360"/>
+    </visualElement>
+    <visualElement>
+      <elementName>NFET</elementName>
+      <elementAttributes/>
+      <pos x="40" y="40"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Ground</elementName>
+      <elementAttributes/>
+      <pos x="60" y="100"/>
+    </visualElement>
+    <visualElement>
+      <elementName>NFET</elementName>
+      <elementAttributes/>
+      <pos x="40" y="120"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Ground</elementName>
+      <elementAttributes/>
+      <pos x="60" y="180"/>
+    </visualElement>
+    <visualElement>
+      <elementName>NFET</elementName>
+      <elementAttributes/>
+      <pos x="40" y="200"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Ground</elementName>
+      <elementAttributes/>
+      <pos x="60" y="260"/>
+    </visualElement>
+    <visualElement>
+      <elementName>NFET</elementName>
+      <elementAttributes/>
+      <pos x="440" y="40"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Ground</elementName>
+      <elementAttributes/>
+      <pos x="460" y="100"/>
+    </visualElement>
+    <visualElement>
+      <elementName>NFET</elementName>
+      <elementAttributes/>
+      <pos x="440" y="120"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Ground</elementName>
+      <elementAttributes/>
+      <pos x="460" y="180"/>
+    </visualElement>
+    <visualElement>
+      <elementName>NFET</elementName>
+      <elementAttributes/>
+      <pos x="440" y="200"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Ground</elementName>
+      <elementAttributes/>
+      <pos x="460" y="260"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Not</elementName>
+      <elementAttributes/>
+      <pos x="380" y="80"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Not</elementName>
+      <elementAttributes/>
+      <pos x="380" y="160"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Not</elementName>
+      <elementAttributes/>
+      <pos x="380" y="240"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Not</elementName>
+      <elementAttributes/>
+      <pos x="-20" y="240"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Not</elementName>
+      <elementAttributes/>
+      <pos x="-20" y="160"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Not</elementName>
+      <elementAttributes/>
+      <pos x="-20" y="80"/>
     </visualElement>
   </visualElements>
   <wires>
     <wire>
-      <p1 x="340" y="160"/>
-      <p2 x="360" y="160"/>
+      <p1 x="20" y="160"/>
+      <p2 x="40" y="160"/>
     </wire>
     <wire>
-      <p1 x="400" y="160"/>
-      <p2 x="420" y="160"/>
+      <p1 x="420" y="160"/>
+      <p2 x="440" y="160"/>
     </wire>
     <wire>
-      <p1 x="340" y="240"/>
-      <p2 x="360" y="240"/>
+      <p1 x="360" y="160"/>
+      <p2 x="380" y="160"/>
     </wire>
     <wire>
-      <p1 x="400" y="240"/>
-      <p2 x="420" y="240"/>
+      <p1 x="-40" y="160"/>
+      <p2 x="-20" y="160"/>
     </wire>
     <wire>
-      <p1 x="340" y="320"/>
-      <p2 x="360" y="320"/>
+      <p1 x="20" y="80"/>
+      <p2 x="40" y="80"/>
     </wire>
     <wire>
-      <p1 x="400" y="320"/>
-      <p2 x="420" y="320"/>
+      <p1 x="420" y="80"/>
+      <p2 x="440" y="80"/>
     </wire>
     <wire>
-      <p1 x="360" y="400"/>
-      <p2 x="380" y="400"/>
+      <p1 x="360" y="80"/>
+      <p2 x="380" y="80"/>
     </wire>
     <wire>
-      <p1 x="340" y="420"/>
-      <p2 x="360" y="420"/>
+      <p1 x="-40" y="80"/>
+      <p2 x="-20" y="80"/>
     </wire>
     <wire>
-      <p1 x="340" y="120"/>
-      <p2 x="360" y="120"/>
+      <p1 x="20" y="240"/>
+      <p2 x="40" y="240"/>
     </wire>
     <wire>
-      <p1 x="400" y="120"/>
-      <p2 x="420" y="120"/>
+      <p1 x="420" y="240"/>
+      <p2 x="440" y="240"/>
     </wire>
     <wire>
-      <p1 x="340" y="200"/>
-      <p2 x="360" y="200"/>
+      <p1 x="360" y="240"/>
+      <p2 x="380" y="240"/>
     </wire>
     <wire>
-      <p1 x="400" y="200"/>
-      <p2 x="420" y="200"/>
+      <p1 x="-40" y="240"/>
+      <p2 x="-20" y="240"/>
     </wire>
     <wire>
-      <p1 x="340" y="280"/>
-      <p2 x="360" y="280"/>
+      <p1 x="180" y="320"/>
+      <p2 x="220" y="320"/>
     </wire>
     <wire>
-      <p1 x="400" y="280"/>
-      <p2 x="420" y="280"/>
+      <p1 x="200" y="340"/>
+      <p2 x="220" y="340"/>
     </wire>
     <wire>
-      <p1 x="340" y="380"/>
-      <p2 x="380" y="380"/>
+      <p1 x="180" y="360"/>
+      <p2 x="200" y="360"/>
     </wire>
     <wire>
-      <p1 x="360" y="400"/>
-      <p2 x="360" y="420"/>
+      <p1 x="60" y="40"/>
+      <p2 x="80" y="40"/>
+    </wire>
+    <wire>
+      <p1 x="460" y="40"/>
+      <p2 x="480" y="40"/>
+    </wire>
+    <wire>
+      <p1 x="60" y="200"/>
+      <p2 x="80" y="200"/>
+    </wire>
+    <wire>
+      <p1 x="460" y="200"/>
+      <p2 x="480" y="200"/>
+    </wire>
+    <wire>
+      <p1 x="60" y="120"/>
+      <p2 x="80" y="120"/>
+    </wire>
+    <wire>
+      <p1 x="460" y="120"/>
+      <p2 x="480" y="120"/>
+    </wire>
+    <wire>
+      <p1 x="200" y="340"/>
+      <p2 x="200" y="360"/>
+    </wire>
+    <wire>
+      <p1 x="460" y="80"/>
+      <p2 x="460" y="100"/>
+    </wire>
+    <wire>
+      <p1 x="460" y="160"/>
+      <p2 x="460" y="180"/>
+    </wire>
+    <wire>
+      <p1 x="460" y="240"/>
+      <p2 x="460" y="260"/>
+    </wire>
+    <wire>
+      <p1 x="60" y="240"/>
+      <p2 x="60" y="260"/>
+    </wire>
+    <wire>
+      <p1 x="60" y="160"/>
+      <p2 x="60" y="180"/>
+    </wire>
+    <wire>
+      <p1 x="60" y="80"/>
+      <p2 x="60" y="100"/>
     </wire>
   </wires>
 </circuit>
\ No newline at end of file
diff --git a/src/main/dig/lib/74xx/basic/7416.dig b/src/main/dig/lib/74xx/driver/7416.dig
similarity index 100%
rename from src/main/dig/lib/74xx/basic/7416.dig
rename to src/main/dig/lib/74xx/driver/7416.dig
diff --git a/src/main/dig/lib/74xx/basic/7417.dig b/src/main/dig/lib/74xx/driver/7417.dig
similarity index 100%
rename from src/main/dig/lib/74xx/basic/7417.dig
rename to src/main/dig/lib/74xx/driver/7417.dig