diff --git a/10W/fp-lib-table b/10W/fp-lib-table
deleted file mode 100644
index f66580a8d7a0a655d222a07664ac17e7587e1150..0000000000000000000000000000000000000000
--- a/10W/fp-lib-table
+++ /dev/null
@@ -1,8 +0,0 @@
-(fp_lib_table
-  (lib (name TripwireHook)(type KiCad)(uri ${KIPRJMOD}/../TripwireHook/TripwireHook.pretty)(options "")(descr ""))
-  (lib (name TripwireHook_Connector)(type KiCad)(uri ${KIPRJMOD}/../TripwireHook/Connector.pretty)(options "")(descr ""))
-  (lib (name TripwireHook_Connector_Handmade)(type KiCad)(uri ${KIPRJMOD}/../TripwireHook/Connector_Handmade.pretty)(options "")(descr ""))
-  (lib (name TripwireHook_Capacitor)(type KiCad)(uri ${KIPRJMOD}/../TripwireHook/Capacitor.pretty)(options "")(descr ""))
-  (lib (name TripwireHook_Diode)(type KiCad)(uri ${KIPRJMOD}/../TripwireHook/Diode.pretty)(options "")(descr ""))
-  (lib (name TripwireHook_Inductor)(type KiCad)(uri ${KIPRJMOD}/../TripwireHook/Inductor.pretty)(options "")(descr ""))
-)
diff --git a/10W/sym-lib-table b/10W/sym-lib-table
deleted file mode 100644
index 84cb998d993a08819f3d7d858a52745a71b8a228..0000000000000000000000000000000000000000
--- a/10W/sym-lib-table
+++ /dev/null
@@ -1,3 +0,0 @@
-(sym_lib_table
-  (lib (name TripwireHook)(type Legacy)(uri ${KIPRJMOD}/../TripwireHook/TripwireHook.lib)(options "")(descr ""))
-)
diff --git a/CyanLightControl/fp-lib-table b/CyanLightControl/fp-lib-table
deleted file mode 100644
index f66580a8d7a0a655d222a07664ac17e7587e1150..0000000000000000000000000000000000000000
--- a/CyanLightControl/fp-lib-table
+++ /dev/null
@@ -1,8 +0,0 @@
-(fp_lib_table
-  (lib (name TripwireHook)(type KiCad)(uri ${KIPRJMOD}/../TripwireHook/TripwireHook.pretty)(options "")(descr ""))
-  (lib (name TripwireHook_Connector)(type KiCad)(uri ${KIPRJMOD}/../TripwireHook/Connector.pretty)(options "")(descr ""))
-  (lib (name TripwireHook_Connector_Handmade)(type KiCad)(uri ${KIPRJMOD}/../TripwireHook/Connector_Handmade.pretty)(options "")(descr ""))
-  (lib (name TripwireHook_Capacitor)(type KiCad)(uri ${KIPRJMOD}/../TripwireHook/Capacitor.pretty)(options "")(descr ""))
-  (lib (name TripwireHook_Diode)(type KiCad)(uri ${KIPRJMOD}/../TripwireHook/Diode.pretty)(options "")(descr ""))
-  (lib (name TripwireHook_Inductor)(type KiCad)(uri ${KIPRJMOD}/../TripwireHook/Inductor.pretty)(options "")(descr ""))
-)
diff --git a/CyanLightControl/sym-lib-table b/CyanLightControl/sym-lib-table
deleted file mode 100644
index 84cb998d993a08819f3d7d858a52745a71b8a228..0000000000000000000000000000000000000000
--- a/CyanLightControl/sym-lib-table
+++ /dev/null
@@ -1,3 +0,0 @@
-(sym_lib_table
-  (lib (name TripwireHook)(type Legacy)(uri ${KIPRJMOD}/../TripwireHook/TripwireHook.lib)(options "")(descr ""))
-)
diff --git a/CyanStripe/fp-lib-table b/CyanStripe/fp-lib-table
deleted file mode 100644
index f66580a8d7a0a655d222a07664ac17e7587e1150..0000000000000000000000000000000000000000
--- a/CyanStripe/fp-lib-table
+++ /dev/null
@@ -1,8 +0,0 @@
-(fp_lib_table
-  (lib (name TripwireHook)(type KiCad)(uri ${KIPRJMOD}/../TripwireHook/TripwireHook.pretty)(options "")(descr ""))
-  (lib (name TripwireHook_Connector)(type KiCad)(uri ${KIPRJMOD}/../TripwireHook/Connector.pretty)(options "")(descr ""))
-  (lib (name TripwireHook_Connector_Handmade)(type KiCad)(uri ${KIPRJMOD}/../TripwireHook/Connector_Handmade.pretty)(options "")(descr ""))
-  (lib (name TripwireHook_Capacitor)(type KiCad)(uri ${KIPRJMOD}/../TripwireHook/Capacitor.pretty)(options "")(descr ""))
-  (lib (name TripwireHook_Diode)(type KiCad)(uri ${KIPRJMOD}/../TripwireHook/Diode.pretty)(options "")(descr ""))
-  (lib (name TripwireHook_Inductor)(type KiCad)(uri ${KIPRJMOD}/../TripwireHook/Inductor.pretty)(options "")(descr ""))
-)
diff --git a/CyanStripe/sym-lib-table b/CyanStripe/sym-lib-table
deleted file mode 100644
index 84cb998d993a08819f3d7d858a52745a71b8a228..0000000000000000000000000000000000000000
--- a/CyanStripe/sym-lib-table
+++ /dev/null
@@ -1,3 +0,0 @@
-(sym_lib_table
-  (lib (name TripwireHook)(type Legacy)(uri ${KIPRJMOD}/../TripwireHook/TripwireHook.lib)(options "")(descr ""))
-)
diff --git a/DriverPCB/fp-lib-table b/DriverPCB/fp-lib-table
deleted file mode 100644
index f66580a8d7a0a655d222a07664ac17e7587e1150..0000000000000000000000000000000000000000
--- a/DriverPCB/fp-lib-table
+++ /dev/null
@@ -1,8 +0,0 @@
-(fp_lib_table
-  (lib (name TripwireHook)(type KiCad)(uri ${KIPRJMOD}/../TripwireHook/TripwireHook.pretty)(options "")(descr ""))
-  (lib (name TripwireHook_Connector)(type KiCad)(uri ${KIPRJMOD}/../TripwireHook/Connector.pretty)(options "")(descr ""))
-  (lib (name TripwireHook_Connector_Handmade)(type KiCad)(uri ${KIPRJMOD}/../TripwireHook/Connector_Handmade.pretty)(options "")(descr ""))
-  (lib (name TripwireHook_Capacitor)(type KiCad)(uri ${KIPRJMOD}/../TripwireHook/Capacitor.pretty)(options "")(descr ""))
-  (lib (name TripwireHook_Diode)(type KiCad)(uri ${KIPRJMOD}/../TripwireHook/Diode.pretty)(options "")(descr ""))
-  (lib (name TripwireHook_Inductor)(type KiCad)(uri ${KIPRJMOD}/../TripwireHook/Inductor.pretty)(options "")(descr ""))
-)
diff --git a/DriverPCB/sym-lib-table b/DriverPCB/sym-lib-table
deleted file mode 100644
index 84cb998d993a08819f3d7d858a52745a71b8a228..0000000000000000000000000000000000000000
--- a/DriverPCB/sym-lib-table
+++ /dev/null
@@ -1,3 +0,0 @@
-(sym_lib_table
-  (lib (name TripwireHook)(type Legacy)(uri ${KIPRJMOD}/../TripwireHook/TripwireHook.lib)(options "")(descr ""))
-)
diff --git a/HexPCB/fp-lib-table b/HexPCB/fp-lib-table
deleted file mode 100644
index 1fb1f52ec7f1214e36bd3e540821d509a829a48e..0000000000000000000000000000000000000000
--- a/HexPCB/fp-lib-table
+++ /dev/null
@@ -1,8 +0,0 @@
-(fp_lib_table
-  (lib (name TripwireHook)(type KiCad)(uri ${KIPRJMOD}/../TripwireHook/TripwireHook.pretty)(options "")(descr ""))
-  (lib (name TripwireHook_Connector)(type KiCad)(uri ${KIPRJMOD}/../TripwireHook/TripwireHook_Connector.pretty)(options "")(descr ""))
-  (lib (name TripwireHook_Connector_Handmade)(type KiCad)(uri ${KIPRJMOD}/../TripwireHook/TripwireHook_Connector_Handmade.pretty)(options "")(descr ""))
-  (lib (name TripwireHook_Capacitor)(type KiCad)(uri ${KIPRJMOD}/../TripwireHook/Capacitor.pretty)(options "")(descr ""))
-  (lib (name TripwireHook_Diode)(type KiCad)(uri ${KIPRJMOD}/../TripwireHook/Diode.pretty)(options "")(descr ""))
-  (lib (name TripwireHook_Inductor)(type KiCad)(uri ${KIPRJMOD}/../TripwireHook/Inductor.pretty)(options "")(descr ""))
-)
diff --git a/HexPCB/sym-lib-table b/HexPCB/sym-lib-table
deleted file mode 100644
index 84cb998d993a08819f3d7d858a52745a71b8a228..0000000000000000000000000000000000000000
--- a/HexPCB/sym-lib-table
+++ /dev/null
@@ -1,3 +0,0 @@
-(sym_lib_table
-  (lib (name TripwireHook)(type Legacy)(uri ${KIPRJMOD}/../TripwireHook/TripwireHook.lib)(options "")(descr ""))
-)
diff --git a/10W/.gitignore b/pcb/10W/.gitignore
similarity index 100%
rename from 10W/.gitignore
rename to pcb/10W/.gitignore
diff --git a/10W/CyanLight.kicad_pcb b/pcb/10W/CyanLight.kicad_pcb
similarity index 100%
rename from 10W/CyanLight.kicad_pcb
rename to pcb/10W/CyanLight.kicad_pcb
diff --git a/10W/CyanLight.pro b/pcb/10W/CyanLight.pro
similarity index 100%
rename from 10W/CyanLight.pro
rename to pcb/10W/CyanLight.pro
diff --git a/10W/CyanLight.sch b/pcb/10W/CyanLight.sch
similarity index 100%
rename from 10W/CyanLight.sch
rename to pcb/10W/CyanLight.sch
diff --git a/10W/TransportProtection.scad b/pcb/10W/TransportProtection.scad
similarity index 100%
rename from 10W/TransportProtection.scad
rename to pcb/10W/TransportProtection.scad
diff --git a/10W/TransportProtection_TODO:MERGE.scad b/pcb/10W/TransportProtection_TODO:MERGE.scad
similarity index 100%
rename from 10W/TransportProtection_TODO:MERGE.scad
rename to pcb/10W/TransportProtection_TODO:MERGE.scad
diff --git a/pcb/10W/fp-lib-table b/pcb/10W/fp-lib-table
new file mode 100644
index 0000000000000000000000000000000000000000..87c6f63538f5713b2c8e9b5f43e92fff162c69d6
--- /dev/null
+++ b/pcb/10W/fp-lib-table
@@ -0,0 +1,8 @@
+(fp_lib_table
+  (lib (name TripwireHook)(type KiCad)(uri ${KIPRJMOD}/../lib/TripwireHook/TripwireHook.pretty)(options "")(descr ""))
+  (lib (name TripwireHook_Connector)(type KiCad)(uri ${KIPRJMOD}/../lib/TripwireHook/Connector.pretty)(options "")(descr ""))
+  (lib (name TripwireHook_Connector_Handmade)(type KiCad)(uri ${KIPRJMOD}/../lib/TripwireHook/Connector_Handmade.pretty)(options "")(descr ""))
+  (lib (name TripwireHook_Capacitor)(type KiCad)(uri ${KIPRJMOD}/../lib/TripwireHook/Capacitor.pretty)(options "")(descr ""))
+  (lib (name TripwireHook_Diode)(type KiCad)(uri ${KIPRJMOD}/../lib/TripwireHook/Diode.pretty)(options "")(descr ""))
+  (lib (name TripwireHook_Inductor)(type KiCad)(uri ${KIPRJMOD}/../lib/TripwireHook/Inductor.pretty)(options "")(descr ""))
+)
diff --git a/10W/gerber.zip b/pcb/10W/gerber.zip
similarity index 100%
rename from 10W/gerber.zip
rename to pcb/10W/gerber.zip
diff --git a/pcb/10W/sym-lib-table b/pcb/10W/sym-lib-table
new file mode 100644
index 0000000000000000000000000000000000000000..b7b1ad05d3be04800943f9b9a65ee98440c482ec
--- /dev/null
+++ b/pcb/10W/sym-lib-table
@@ -0,0 +1,3 @@
+(sym_lib_table
+  (lib (name TripwireHook)(type Legacy)(uri ${KIPRJMOD}/../lib/TripwireHook/TripwireHook.lib)(options "")(descr ""))
+)
diff --git a/CyanLightControl/.gitignore b/pcb/CyanLightControl/.gitignore
similarity index 100%
rename from CyanLightControl/.gitignore
rename to pcb/CyanLightControl/.gitignore
diff --git a/CyanLightControl/CyanLightConnector.sch b/pcb/CyanLightControl/CyanLightConnector.sch
similarity index 100%
rename from CyanLightControl/CyanLightConnector.sch
rename to pcb/CyanLightControl/CyanLightConnector.sch
diff --git a/CyanLightControl/CyanLightControl.kicad_pcb b/pcb/CyanLightControl/CyanLightControl.kicad_pcb
similarity index 100%
rename from CyanLightControl/CyanLightControl.kicad_pcb
rename to pcb/CyanLightControl/CyanLightControl.kicad_pcb
diff --git a/CyanLightControl/CyanLightControl.pro b/pcb/CyanLightControl/CyanLightControl.pro
similarity index 100%
rename from CyanLightControl/CyanLightControl.pro
rename to pcb/CyanLightControl/CyanLightControl.pro
diff --git a/CyanLightControl/CyanLightControl.sch b/pcb/CyanLightControl/CyanLightControl.sch
similarity index 100%
rename from CyanLightControl/CyanLightControl.sch
rename to pcb/CyanLightControl/CyanLightControl.sch
diff --git a/CyanLightControl/LevelShifter.sch b/pcb/CyanLightControl/LevelShifter.sch
similarity index 100%
rename from CyanLightControl/LevelShifter.sch
rename to pcb/CyanLightControl/LevelShifter.sch
diff --git a/pcb/CyanLightControl/fp-lib-table b/pcb/CyanLightControl/fp-lib-table
new file mode 100644
index 0000000000000000000000000000000000000000..87c6f63538f5713b2c8e9b5f43e92fff162c69d6
--- /dev/null
+++ b/pcb/CyanLightControl/fp-lib-table
@@ -0,0 +1,8 @@
+(fp_lib_table
+  (lib (name TripwireHook)(type KiCad)(uri ${KIPRJMOD}/../lib/TripwireHook/TripwireHook.pretty)(options "")(descr ""))
+  (lib (name TripwireHook_Connector)(type KiCad)(uri ${KIPRJMOD}/../lib/TripwireHook/Connector.pretty)(options "")(descr ""))
+  (lib (name TripwireHook_Connector_Handmade)(type KiCad)(uri ${KIPRJMOD}/../lib/TripwireHook/Connector_Handmade.pretty)(options "")(descr ""))
+  (lib (name TripwireHook_Capacitor)(type KiCad)(uri ${KIPRJMOD}/../lib/TripwireHook/Capacitor.pretty)(options "")(descr ""))
+  (lib (name TripwireHook_Diode)(type KiCad)(uri ${KIPRJMOD}/../lib/TripwireHook/Diode.pretty)(options "")(descr ""))
+  (lib (name TripwireHook_Inductor)(type KiCad)(uri ${KIPRJMOD}/../lib/TripwireHook/Inductor.pretty)(options "")(descr ""))
+)
diff --git a/CyanLightControl/gerber.zip b/pcb/CyanLightControl/gerber.zip
similarity index 100%
rename from CyanLightControl/gerber.zip
rename to pcb/CyanLightControl/gerber.zip
diff --git a/pcb/CyanLightControl/sym-lib-table b/pcb/CyanLightControl/sym-lib-table
new file mode 100644
index 0000000000000000000000000000000000000000..b7b1ad05d3be04800943f9b9a65ee98440c482ec
--- /dev/null
+++ b/pcb/CyanLightControl/sym-lib-table
@@ -0,0 +1,3 @@
+(sym_lib_table
+  (lib (name TripwireHook)(type Legacy)(uri ${KIPRJMOD}/../lib/TripwireHook/TripwireHook.lib)(options "")(descr ""))
+)
diff --git a/CyanStripe/.gitignore b/pcb/CyanStripe/.gitignore
similarity index 100%
rename from CyanStripe/.gitignore
rename to pcb/CyanStripe/.gitignore
diff --git a/CyanStripe/CyanStripe.kicad_pcb b/pcb/CyanStripe/CyanStripe.kicad_pcb
similarity index 100%
rename from CyanStripe/CyanStripe.kicad_pcb
rename to pcb/CyanStripe/CyanStripe.kicad_pcb
diff --git a/CyanStripe/CyanStripe.pro b/pcb/CyanStripe/CyanStripe.pro
similarity index 100%
rename from CyanStripe/CyanStripe.pro
rename to pcb/CyanStripe/CyanStripe.pro
diff --git a/CyanStripe/CyanStripe.sch b/pcb/CyanStripe/CyanStripe.sch
similarity index 100%
rename from CyanStripe/CyanStripe.sch
rename to pcb/CyanStripe/CyanStripe.sch
diff --git a/CyanStripe/LED.sch b/pcb/CyanStripe/LED.sch
similarity index 100%
rename from CyanStripe/LED.sch
rename to pcb/CyanStripe/LED.sch
diff --git a/CyanStripe/LevelShifter.sch b/pcb/CyanStripe/LevelShifter.sch
similarity index 100%
rename from CyanStripe/LevelShifter.sch
rename to pcb/CyanStripe/LevelShifter.sch
diff --git a/CyanStripe/RT7272.sch b/pcb/CyanStripe/RT7272.sch
similarity index 100%
rename from CyanStripe/RT7272.sch
rename to pcb/CyanStripe/RT7272.sch
diff --git a/pcb/CyanStripe/fp-lib-table b/pcb/CyanStripe/fp-lib-table
new file mode 100644
index 0000000000000000000000000000000000000000..87c6f63538f5713b2c8e9b5f43e92fff162c69d6
--- /dev/null
+++ b/pcb/CyanStripe/fp-lib-table
@@ -0,0 +1,8 @@
+(fp_lib_table
+  (lib (name TripwireHook)(type KiCad)(uri ${KIPRJMOD}/../lib/TripwireHook/TripwireHook.pretty)(options "")(descr ""))
+  (lib (name TripwireHook_Connector)(type KiCad)(uri ${KIPRJMOD}/../lib/TripwireHook/Connector.pretty)(options "")(descr ""))
+  (lib (name TripwireHook_Connector_Handmade)(type KiCad)(uri ${KIPRJMOD}/../lib/TripwireHook/Connector_Handmade.pretty)(options "")(descr ""))
+  (lib (name TripwireHook_Capacitor)(type KiCad)(uri ${KIPRJMOD}/../lib/TripwireHook/Capacitor.pretty)(options "")(descr ""))
+  (lib (name TripwireHook_Diode)(type KiCad)(uri ${KIPRJMOD}/../lib/TripwireHook/Diode.pretty)(options "")(descr ""))
+  (lib (name TripwireHook_Inductor)(type KiCad)(uri ${KIPRJMOD}/../lib/TripwireHook/Inductor.pretty)(options "")(descr ""))
+)
diff --git a/pcb/CyanStripe/sym-lib-table b/pcb/CyanStripe/sym-lib-table
new file mode 100644
index 0000000000000000000000000000000000000000..b7b1ad05d3be04800943f9b9a65ee98440c482ec
--- /dev/null
+++ b/pcb/CyanStripe/sym-lib-table
@@ -0,0 +1,3 @@
+(sym_lib_table
+  (lib (name TripwireHook)(type Legacy)(uri ${KIPRJMOD}/../lib/TripwireHook/TripwireHook.lib)(options "")(descr ""))
+)
diff --git a/DriverPCB/.gitignore b/pcb/DriverPCB/.gitignore
similarity index 100%
rename from DriverPCB/.gitignore
rename to pcb/DriverPCB/.gitignore
diff --git a/DriverPCB/DriverPCB.kicad_pcb b/pcb/DriverPCB/DriverPCB.kicad_pcb
similarity index 100%
rename from DriverPCB/DriverPCB.kicad_pcb
rename to pcb/DriverPCB/DriverPCB.kicad_pcb
diff --git a/DriverPCB/DriverPCB.pro b/pcb/DriverPCB/DriverPCB.pro
similarity index 100%
rename from DriverPCB/DriverPCB.pro
rename to pcb/DriverPCB/DriverPCB.pro
diff --git a/DriverPCB/DriverPCB.sch b/pcb/DriverPCB/DriverPCB.sch
similarity index 100%
rename from DriverPCB/DriverPCB.sch
rename to pcb/DriverPCB/DriverPCB.sch
diff --git a/pcb/DriverPCB/fp-lib-table b/pcb/DriverPCB/fp-lib-table
new file mode 100644
index 0000000000000000000000000000000000000000..87c6f63538f5713b2c8e9b5f43e92fff162c69d6
--- /dev/null
+++ b/pcb/DriverPCB/fp-lib-table
@@ -0,0 +1,8 @@
+(fp_lib_table
+  (lib (name TripwireHook)(type KiCad)(uri ${KIPRJMOD}/../lib/TripwireHook/TripwireHook.pretty)(options "")(descr ""))
+  (lib (name TripwireHook_Connector)(type KiCad)(uri ${KIPRJMOD}/../lib/TripwireHook/Connector.pretty)(options "")(descr ""))
+  (lib (name TripwireHook_Connector_Handmade)(type KiCad)(uri ${KIPRJMOD}/../lib/TripwireHook/Connector_Handmade.pretty)(options "")(descr ""))
+  (lib (name TripwireHook_Capacitor)(type KiCad)(uri ${KIPRJMOD}/../lib/TripwireHook/Capacitor.pretty)(options "")(descr ""))
+  (lib (name TripwireHook_Diode)(type KiCad)(uri ${KIPRJMOD}/../lib/TripwireHook/Diode.pretty)(options "")(descr ""))
+  (lib (name TripwireHook_Inductor)(type KiCad)(uri ${KIPRJMOD}/../lib/TripwireHook/Inductor.pretty)(options "")(descr ""))
+)
diff --git a/pcb/DriverPCB/sym-lib-table b/pcb/DriverPCB/sym-lib-table
new file mode 100644
index 0000000000000000000000000000000000000000..b7b1ad05d3be04800943f9b9a65ee98440c482ec
--- /dev/null
+++ b/pcb/DriverPCB/sym-lib-table
@@ -0,0 +1,3 @@
+(sym_lib_table
+  (lib (name TripwireHook)(type Legacy)(uri ${KIPRJMOD}/../lib/TripwireHook/TripwireHook.lib)(options "")(descr ""))
+)
diff --git a/HexPCB/.gitignore b/pcb/HexPCB/.gitignore
similarity index 100%
rename from HexPCB/.gitignore
rename to pcb/HexPCB/.gitignore
diff --git a/HexPCB/CyanLight.kicad_pcb b/pcb/HexPCB/CyanLight.kicad_pcb
similarity index 100%
rename from HexPCB/CyanLight.kicad_pcb
rename to pcb/HexPCB/CyanLight.kicad_pcb
diff --git a/HexPCB/CyanLight.pro b/pcb/HexPCB/CyanLight.pro
similarity index 100%
rename from HexPCB/CyanLight.pro
rename to pcb/HexPCB/CyanLight.pro
diff --git a/HexPCB/CyanLight.sch b/pcb/HexPCB/CyanLight.sch
similarity index 100%
rename from HexPCB/CyanLight.sch
rename to pcb/HexPCB/CyanLight.sch
diff --git a/pcb/HexPCB/fp-lib-table b/pcb/HexPCB/fp-lib-table
new file mode 100644
index 0000000000000000000000000000000000000000..87c6f63538f5713b2c8e9b5f43e92fff162c69d6
--- /dev/null
+++ b/pcb/HexPCB/fp-lib-table
@@ -0,0 +1,8 @@
+(fp_lib_table
+  (lib (name TripwireHook)(type KiCad)(uri ${KIPRJMOD}/../lib/TripwireHook/TripwireHook.pretty)(options "")(descr ""))
+  (lib (name TripwireHook_Connector)(type KiCad)(uri ${KIPRJMOD}/../lib/TripwireHook/Connector.pretty)(options "")(descr ""))
+  (lib (name TripwireHook_Connector_Handmade)(type KiCad)(uri ${KIPRJMOD}/../lib/TripwireHook/Connector_Handmade.pretty)(options "")(descr ""))
+  (lib (name TripwireHook_Capacitor)(type KiCad)(uri ${KIPRJMOD}/../lib/TripwireHook/Capacitor.pretty)(options "")(descr ""))
+  (lib (name TripwireHook_Diode)(type KiCad)(uri ${KIPRJMOD}/../lib/TripwireHook/Diode.pretty)(options "")(descr ""))
+  (lib (name TripwireHook_Inductor)(type KiCad)(uri ${KIPRJMOD}/../lib/TripwireHook/Inductor.pretty)(options "")(descr ""))
+)
diff --git a/HexPCB/gerber.zip b/pcb/HexPCB/gerber.zip
similarity index 100%
rename from HexPCB/gerber.zip
rename to pcb/HexPCB/gerber.zip
diff --git a/HexPCB/outline.scad b/pcb/HexPCB/outline.scad
similarity index 100%
rename from HexPCB/outline.scad
rename to pcb/HexPCB/outline.scad
diff --git a/HexPCB/placement.py b/pcb/HexPCB/placement.py
similarity index 100%
rename from HexPCB/placement.py
rename to pcb/HexPCB/placement.py
diff --git a/pcb/HexPCB/sym-lib-table b/pcb/HexPCB/sym-lib-table
new file mode 100644
index 0000000000000000000000000000000000000000..b7b1ad05d3be04800943f9b9a65ee98440c482ec
--- /dev/null
+++ b/pcb/HexPCB/sym-lib-table
@@ -0,0 +1,3 @@
+(sym_lib_table
+  (lib (name TripwireHook)(type Legacy)(uri ${KIPRJMOD}/../lib/TripwireHook/TripwireHook.lib)(options "")(descr ""))
+)
diff --git a/pcb/lib/TripwireHook b/pcb/lib/TripwireHook
index eeddc717c79a9e58b0e8b45247fac64e459bd7b2..2a3514951c7f8e988f29d8b6bdd6ff567e84f202 160000
--- a/pcb/lib/TripwireHook
+++ b/pcb/lib/TripwireHook
@@ -1 +1 @@
-Subproject commit eeddc717c79a9e58b0e8b45247fac64e459bd7b2
+Subproject commit 2a3514951c7f8e988f29d8b6bdd6ff567e84f202