diff --git a/Makefile b/Makefile
index bd3303e..d77f816 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 .PHONY: web
 
-BOARDS = epdiy-v7 extension-cable
+BOARDS = epdiy-v7 epdiy-v6 extension-cable
 
 web: build/web/index.html
 
diff --git a/epaper-breakout/epaper-breakout-backups/epaper-breakout-2022-09-03_135247.zip b/epaper-breakout/epaper-breakout-backups/epaper-breakout-2022-09-03_135247.zip
deleted file mode 100644
index 935b9ef..0000000
Binary files a/epaper-breakout/epaper-breakout-backups/epaper-breakout-2022-09-03_135247.zip and /dev/null differ
diff --git a/epaper-breakout/epaper-breakout-backups/epaper-breakout-2022-09-03_140910.zip b/epaper-breakout/epaper-breakout-backups/epaper-breakout-2022-09-03_140910.zip
deleted file mode 100644
index 274613c..0000000
Binary files a/epaper-breakout/epaper-breakout-backups/epaper-breakout-2022-09-03_140910.zip and /dev/null differ
diff --git a/epaper-breakout/epaper-breakout-backups/epaper-breakout-2022-09-14_173524.zip b/epaper-breakout/epaper-breakout-backups/epaper-breakout-2022-09-14_173524.zip
deleted file mode 100644
index f8e11d7..0000000
Binary files a/epaper-breakout/epaper-breakout-backups/epaper-breakout-2022-09-14_173524.zip and /dev/null differ
diff --git a/epaper-breakout/epaper-breakout-backups/epaper-breakout-2022-11-27_211901.zip b/epaper-breakout/epaper-breakout-backups/epaper-breakout-2022-11-27_211901.zip
deleted file mode 100644
index f8e11d7..0000000
Binary files a/epaper-breakout/epaper-breakout-backups/epaper-breakout-2022-11-27_211901.zip and /dev/null differ
diff --git a/epaper-breakout/epaper-breakout-backups/epaper-breakout-2022-12-04_201510.zip b/epaper-breakout/epaper-breakout-backups/epaper-breakout-2022-12-04_201510.zip
deleted file mode 100644
index 1ec090f..0000000
Binary files a/epaper-breakout/epaper-breakout-backups/epaper-breakout-2022-12-04_201510.zip and /dev/null differ
diff --git a/epaper-breakout/esp32-wrover-kicad b/epaper-breakout/esp32-wrover-kicad
deleted file mode 160000
index 589929b..0000000
--- a/epaper-breakout/esp32-wrover-kicad
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 589929bfc5b46105146092abbb0b14e4c4e1bdd7
diff --git a/epaper-breakout/fp-lib-table b/epaper-breakout/fp-lib-table
deleted file mode 100644
index cb8e6da..0000000
--- a/epaper-breakout/fp-lib-table
+++ /dev/null
@@ -1,5 +0,0 @@
-(fp_lib_table
-  (lib (name epaper-breakout)(type KiCad)(uri ${KIPRJMOD}/epaper-breakout.pretty)(options "")(descr ""))
-  (lib (name esp32-wrover)(type KiCad)(uri ${KIPRJMOD}/esp32-wrover-kicad/esp32-wrover.pretty)(options "")(descr ""))
-  (lib (name tps65185)(type KiCad)(uri ${KIPRJMOD}/footprints.pretty)(options "")(descr ""))
-)
diff --git a/epaper-breakout/tp4056 b/epaper-breakout/tp4056
deleted file mode 160000
index e7b93bb..0000000
--- a/epaper-breakout/tp4056
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e7b93bb9a9130892846662c5067e02c71f93f93c
diff --git a/epaper-breakout/3dmodels/ESP32-WROVER-B.STEP b/epdiy-v6/3dmodels/ESP32-WROVER-B.STEP
similarity index 100%
rename from epaper-breakout/3dmodels/ESP32-WROVER-B.STEP
rename to epdiy-v6/3dmodels/ESP32-WROVER-B.STEP
diff --git a/epaper-breakout/3dmodels/FH12-33S-0.5SH.stp b/epdiy-v6/3dmodels/FH12-33S-0.5SH.stp
similarity index 100%
rename from epaper-breakout/3dmodels/FH12-33S-0.5SH.stp
rename to epdiy-v6/3dmodels/FH12-33S-0.5SH.stp
diff --git a/epaper-breakout/3dmodels/TPS651851RSLR-3D-VQFN-48_L6.0-W6.0-P0.40-TL-EP4.4.step b/epdiy-v6/3dmodels/TPS651851RSLR-3D-VQFN-48_L6.0-W6.0-P0.40-TL-EP4.4.step
similarity index 100%
rename from epaper-breakout/3dmodels/TPS651851RSLR-3D-VQFN-48_L6.0-W6.0-P0.40-TL-EP4.4.step
rename to epdiy-v6/3dmodels/TPS651851RSLR-3D-VQFN-48_L6.0-W6.0-P0.40-TL-EP4.4.step
diff --git a/epaper-breakout/3dmodels/Tactal Switch - SMD (5mmx 5mmx1.5mm).stp b/epdiy-v6/3dmodels/Tactal Switch - SMD (5mmx 5mmx1.5mm).stp
similarity index 100%
rename from epaper-breakout/3dmodels/Tactal Switch - SMD (5mmx 5mmx1.5mm).stp
rename to epdiy-v6/3dmodels/Tactal Switch - SMD (5mmx 5mmx1.5mm).stp
diff --git a/epaper-breakout/74HC4094.lib b/epdiy-v6/74HC4094.lib
similarity index 100%
rename from epaper-breakout/74HC4094.lib
rename to epdiy-v6/74HC4094.lib
diff --git a/epaper-breakout/TPS651851RSLR.dcm b/epdiy-v6/TPS651851RSLR.dcm
similarity index 100%
rename from epaper-breakout/TPS651851RSLR.dcm
rename to epdiy-v6/TPS651851RSLR.dcm
diff --git a/epaper-breakout/TPS651851RSLR.lib b/epdiy-v6/TPS651851RSLR.lib
similarity index 100%
rename from epaper-breakout/TPS651851RSLR.lib
rename to epdiy-v6/TPS651851RSLR.lib
diff --git a/epaper-breakout/bom2grouped_csv_jlcpcb.xsl b/epdiy-v6/bom2grouped_csv_jlcpcb.xsl
similarity index 100%
rename from epaper-breakout/bom2grouped_csv_jlcpcb.xsl
rename to epdiy-v6/bom2grouped_csv_jlcpcb.xsl
diff --git a/epaper-breakout/ed060sc4.lib b/epdiy-v6/ed060sc4.lib
similarity index 100%
rename from epaper-breakout/ed060sc4.lib
rename to epdiy-v6/ed060sc4.lib
diff --git a/epaper-breakout/epd_breakout.dcm b/epdiy-v6/epd_breakout.dcm
similarity index 100%
rename from epaper-breakout/epd_breakout.dcm
rename to epdiy-v6/epd_breakout.dcm
diff --git a/epaper-breakout/epd_breakout.lib b/epdiy-v6/epd_breakout.lib
similarity index 100%
rename from epaper-breakout/epd_breakout.lib
rename to epdiy-v6/epd_breakout.lib
diff --git a/epaper-breakout/epaper-breakout-cache.lib b/epdiy-v6/epdiy-v6-cache.lib
similarity index 100%
rename from epaper-breakout/epaper-breakout-cache.lib
rename to epdiy-v6/epdiy-v6-cache.lib
diff --git a/epaper-breakout/epaper-breakout-rescue.dcm b/epdiy-v6/epdiy-v6-rescue.dcm
similarity index 100%
rename from epaper-breakout/epaper-breakout-rescue.dcm
rename to epdiy-v6/epdiy-v6-rescue.dcm
diff --git a/epaper-breakout/epaper-breakout-rescue.kicad_sym b/epdiy-v6/epdiy-v6-rescue.kicad_sym
similarity index 100%
rename from epaper-breakout/epaper-breakout-rescue.kicad_sym
rename to epdiy-v6/epdiy-v6-rescue.kicad_sym
diff --git a/epaper-breakout/epaper-breakout-rescue.lib b/epdiy-v6/epdiy-v6-rescue.lib
similarity index 100%
rename from epaper-breakout/epaper-breakout-rescue.lib
rename to epdiy-v6/epdiy-v6-rescue.lib
diff --git a/epaper-breakout/epaper-breakout.kicad_pcb b/epdiy-v6/epdiy-v6.kicad_pcb
similarity index 100%
rename from epaper-breakout/epaper-breakout.kicad_pcb
rename to epdiy-v6/epdiy-v6.kicad_pcb
diff --git a/epaper-breakout/epaper-breakout.kicad_prl b/epdiy-v6/epdiy-v6.kicad_prl
similarity index 96%
rename from epaper-breakout/epaper-breakout.kicad_prl
rename to epdiy-v6/epdiy-v6.kicad_prl
index ebe36bc..3e720de 100644
--- a/epaper-breakout/epaper-breakout.kicad_prl
+++ b/epdiy-v6/epdiy-v6.kicad_prl
@@ -72,7 +72,7 @@
     "zone_display_mode": 1
   },
   "meta": {
-    "filename": "epaper-breakout.kicad_prl",
+    "filename": "epdiy-v6.kicad_prl",
     "version": 3
   },
   "project": {
diff --git a/epaper-breakout/epaper-breakout.kicad_pro b/epdiy-v6/epdiy-v6.kicad_pro
similarity index 99%
rename from epaper-breakout/epaper-breakout.kicad_pro
rename to epdiy-v6/epdiy-v6.kicad_pro
index 2790ead..d863835 100644
--- a/epaper-breakout/epaper-breakout.kicad_pro
+++ b/epdiy-v6/epdiy-v6.kicad_pro
@@ -412,7 +412,7 @@
     "pinned_symbol_libs": []
   },
   "meta": {
-    "filename": "epaper-breakout.kicad_pro",
+    "filename": "epdiy-v6.kicad_pro",
     "version": 1
   },
   "net_settings": {
diff --git a/epaper-breakout/epaper-breakout.kicad_sch b/epdiy-v6/epdiy-v6.kicad_sch
similarity index 100%
rename from epaper-breakout/epaper-breakout.kicad_sch
rename to epdiy-v6/epdiy-v6.kicad_sch
diff --git a/epaper-breakout/epaper-breakout.pretty/AXT334124.kicad_mod b/epdiy-v6/epdiy-v6.pretty/AXT334124.kicad_mod
similarity index 100%
rename from epaper-breakout/epaper-breakout.pretty/AXT334124.kicad_mod
rename to epdiy-v6/epdiy-v6.pretty/AXT334124.kicad_mod
diff --git a/epaper-breakout/epaper-breakout.pretty/CONN_ED097OC4.kicad_mod b/epdiy-v6/epdiy-v6.pretty/CONN_ED097OC4.kicad_mod
similarity index 100%
rename from epaper-breakout/epaper-breakout.pretty/CONN_ED097OC4.kicad_mod
rename to epdiy-v6/epdiy-v6.pretty/CONN_ED097OC4.kicad_mod
diff --git a/epaper-breakout/epaper-breakout.pretty/CONN_ED097OC4_mirrored.kicad_mod b/epdiy-v6/epdiy-v6.pretty/CONN_ED097OC4_mirrored.kicad_mod
similarity index 100%
rename from epaper-breakout/epaper-breakout.pretty/CONN_ED097OC4_mirrored.kicad_mod
rename to epdiy-v6/epdiy-v6.pretty/CONN_ED097OC4_mirrored.kicad_mod
diff --git a/epaper-breakout/epaper-breakout.pretty/EVM3ESX50B25.kicad_mod b/epdiy-v6/epdiy-v6.pretty/EVM3ESX50B25.kicad_mod
similarity index 100%
rename from epaper-breakout/epaper-breakout.pretty/EVM3ESX50B25.kicad_mod
rename to epdiy-v6/epdiy-v6.pretty/EVM3ESX50B25.kicad_mod
diff --git a/epaper-breakout/epaper-breakout.pretty/HRS_FH26W-39S-0.3SHW(60).kicad_mod b/epdiy-v6/epdiy-v6.pretty/HRS_FH26W-39S-0.3SHW(60).kicad_mod
similarity index 100%
rename from epaper-breakout/epaper-breakout.pretty/HRS_FH26W-39S-0.3SHW(60).kicad_mod
rename to epdiy-v6/epdiy-v6.pretty/HRS_FH26W-39S-0.3SHW(60).kicad_mod
diff --git a/epaper-breakout/epaper-breakout.pretty/SW_TS-1187A.kicad_mod b/epdiy-v6/epdiy-v6.pretty/SW_TS-1187A.kicad_mod
similarity index 100%
rename from epaper-breakout/epaper-breakout.pretty/SW_TS-1187A.kicad_mod
rename to epdiy-v6/epdiy-v6.pretty/SW_TS-1187A.kicad_mod
diff --git a/epaper-breakout/epaper-breakout.pretty/TP4056_SOP-8-PP.kicad_mod b/epdiy-v6/epdiy-v6.pretty/TP4056_SOP-8-PP.kicad_mod
similarity index 100%
rename from epaper-breakout/epaper-breakout.pretty/TP4056_SOP-8-PP.kicad_mod
rename to epdiy-v6/epdiy-v6.pretty/TP4056_SOP-8-PP.kicad_mod
diff --git a/epaper-breakout/epaper-breakout.pretty/TPS2113APW.kicad_mod b/epdiy-v6/epdiy-v6.pretty/TPS2113APW.kicad_mod
similarity index 100%
rename from epaper-breakout/epaper-breakout.pretty/TPS2113APW.kicad_mod
rename to epdiy-v6/epdiy-v6.pretty/TPS2113APW.kicad_mod
diff --git a/epaper-breakout/epaper-breakout.pretty/USB_Micro-B_A01SB141B1-067.kicad_mod b/epdiy-v6/epdiy-v6.pretty/USB_Micro-B_A01SB141B1-067.kicad_mod
similarity index 100%
rename from epaper-breakout/epaper-breakout.pretty/USB_Micro-B_A01SB141B1-067.kicad_mod
rename to epdiy-v6/epdiy-v6.pretty/USB_Micro-B_A01SB141B1-067.kicad_mod
diff --git a/epaper-breakout/epaper-breakout.pretty/X05A20H34G.kicad_mod b/epdiy-v6/epdiy-v6.pretty/X05A20H34G.kicad_mod
similarity index 100%
rename from epaper-breakout/epaper-breakout.pretty/X05A20H34G.kicad_mod
rename to epdiy-v6/epdiy-v6.pretty/X05A20H34G.kicad_mod
diff --git a/epaper-breakout/epaper-breakout.pretty/oshw_surface.kicad_mod b/epdiy-v6/epdiy-v6.pretty/oshw_surface.kicad_mod
similarity index 100%
rename from epaper-breakout/epaper-breakout.pretty/oshw_surface.kicad_mod
rename to epdiy-v6/epdiy-v6.pretty/oshw_surface.kicad_mod
diff --git a/epaper-breakout/epaper-breakout.xml b/epdiy-v6/epdiy-v6.xml
similarity index 100%
rename from epaper-breakout/epaper-breakout.xml
rename to epdiy-v6/epdiy-v6.xml
diff --git a/epaper-breakout/footprints.pretty/TPS651851RSLR.kicad_mod b/epdiy-v6/footprints.pretty/TPS651851RSLR.kicad_mod
similarity index 100%
rename from epaper-breakout/footprints.pretty/TPS651851RSLR.kicad_mod
rename to epdiy-v6/footprints.pretty/TPS651851RSLR.kicad_mod
diff --git a/epdiy-v6/fp-lib-table b/epdiy-v6/fp-lib-table
new file mode 100644
index 0000000..fe95189
--- /dev/null
+++ b/epdiy-v6/fp-lib-table
@@ -0,0 +1,6 @@
+(fp_lib_table
+  (version 7)
+  (lib (name "epaper-breakout")(type "KiCad")(uri "${KIPRJMOD}/epdiy-v6.pretty")(options "")(descr ""))
+  (lib (name "esp32-wrover")(type "KiCad")(uri "${KIPRJMOD}/esp32-wrover-kicad/esp32-wrover.pretty")(options "")(descr ""))
+  (lib (name "tps65185")(type "KiCad")(uri "${KIPRJMOD}/footprints.pretty")(options "")(descr ""))
+)
diff --git a/epaper-breakout/gerbers/epaper-breakout-bottom-pos.csv b/epdiy-v6/gerbers/epaper-breakout-bottom-pos.csv
similarity index 100%
rename from epaper-breakout/gerbers/epaper-breakout-bottom-pos.csv
rename to epdiy-v6/gerbers/epaper-breakout-bottom-pos.csv
diff --git a/epaper-breakout/gerbers/epaper-breakout-top-jlcpcb.csv b/epdiy-v6/gerbers/epaper-breakout-top-jlcpcb.csv
similarity index 100%
rename from epaper-breakout/gerbers/epaper-breakout-top-jlcpcb.csv
rename to epdiy-v6/gerbers/epaper-breakout-top-jlcpcb.csv
diff --git a/epaper-breakout/gerbers/epaper-breakout-top-pos.csv b/epdiy-v6/gerbers/epaper-breakout-top-pos.csv
similarity index 100%
rename from epaper-breakout/gerbers/epaper-breakout-top-pos.csv
rename to epdiy-v6/gerbers/epaper-breakout-top-pos.csv
diff --git a/epaper-breakout/gerbers/epaper-breakout-B_Cu.gbl b/epdiy-v6/gerbers/epdiy-v6-B_Cu.gbl
similarity index 100%
rename from epaper-breakout/gerbers/epaper-breakout-B_Cu.gbl
rename to epdiy-v6/gerbers/epdiy-v6-B_Cu.gbl
diff --git a/epaper-breakout/gerbers/epaper-breakout-B_Fab.gbr b/epdiy-v6/gerbers/epdiy-v6-B_Fab.gbr
similarity index 100%
rename from epaper-breakout/gerbers/epaper-breakout-B_Fab.gbr
rename to epdiy-v6/gerbers/epdiy-v6-B_Fab.gbr
diff --git a/epaper-breakout/gerbers/epaper-breakout-B_Mask.gbs b/epdiy-v6/gerbers/epdiy-v6-B_Mask.gbs
similarity index 100%
rename from epaper-breakout/gerbers/epaper-breakout-B_Mask.gbs
rename to epdiy-v6/gerbers/epdiy-v6-B_Mask.gbs
diff --git a/epaper-breakout/gerbers/epaper-breakout-B_Paste.gbp b/epdiy-v6/gerbers/epdiy-v6-B_Paste.gbp
similarity index 100%
rename from epaper-breakout/gerbers/epaper-breakout-B_Paste.gbp
rename to epdiy-v6/gerbers/epdiy-v6-B_Paste.gbp
diff --git a/epaper-breakout/gerbers/epaper-breakout-B_SilkS.gbo b/epdiy-v6/gerbers/epdiy-v6-B_SilkS.gbo
similarity index 100%
rename from epaper-breakout/gerbers/epaper-breakout-B_SilkS.gbo
rename to epdiy-v6/gerbers/epdiy-v6-B_SilkS.gbo
diff --git a/epaper-breakout/gerbers/epaper-breakout-Edge_Cuts.gm1 b/epdiy-v6/gerbers/epdiy-v6-Edge_Cuts.gm1
similarity index 100%
rename from epaper-breakout/gerbers/epaper-breakout-Edge_Cuts.gm1
rename to epdiy-v6/gerbers/epdiy-v6-Edge_Cuts.gm1
diff --git a/epaper-breakout/gerbers/epaper-breakout-F_Cu.gtl b/epdiy-v6/gerbers/epdiy-v6-F_Cu.gtl
similarity index 100%
rename from epaper-breakout/gerbers/epaper-breakout-F_Cu.gtl
rename to epdiy-v6/gerbers/epdiy-v6-F_Cu.gtl
diff --git a/epaper-breakout/gerbers/epaper-breakout-F_Fab.gbr b/epdiy-v6/gerbers/epdiy-v6-F_Fab.gbr
similarity index 100%
rename from epaper-breakout/gerbers/epaper-breakout-F_Fab.gbr
rename to epdiy-v6/gerbers/epdiy-v6-F_Fab.gbr
diff --git a/epaper-breakout/gerbers/epaper-breakout-F_Mask.gts b/epdiy-v6/gerbers/epdiy-v6-F_Mask.gts
similarity index 100%
rename from epaper-breakout/gerbers/epaper-breakout-F_Mask.gts
rename to epdiy-v6/gerbers/epdiy-v6-F_Mask.gts
diff --git a/epaper-breakout/gerbers/epaper-breakout-F_Paste.gtp b/epdiy-v6/gerbers/epdiy-v6-F_Paste.gtp
similarity index 100%
rename from epaper-breakout/gerbers/epaper-breakout-F_Paste.gtp
rename to epdiy-v6/gerbers/epdiy-v6-F_Paste.gtp
diff --git a/epaper-breakout/gerbers/epaper-breakout-F_SilkS.gto b/epdiy-v6/gerbers/epdiy-v6-F_SilkS.gto
similarity index 100%
rename from epaper-breakout/gerbers/epaper-breakout-F_SilkS.gto
rename to epdiy-v6/gerbers/epdiy-v6-F_SilkS.gto
diff --git a/epaper-breakout/gerbers/epaper-breakout-In1_Cu.g2 b/epdiy-v6/gerbers/epdiy-v6-In1_Cu.g2
similarity index 100%
rename from epaper-breakout/gerbers/epaper-breakout-In1_Cu.g2
rename to epdiy-v6/gerbers/epdiy-v6-In1_Cu.g2
diff --git a/epaper-breakout/gerbers/epaper-breakout-In2_Cu.g3 b/epdiy-v6/gerbers/epdiy-v6-In2_Cu.g3
similarity index 100%
rename from epaper-breakout/gerbers/epaper-breakout-In2_Cu.g3
rename to epdiy-v6/gerbers/epdiy-v6-In2_Cu.g3
diff --git a/epaper-breakout/gerbers/epaper-breakout-NPTH-drl_map.gbr b/epdiy-v6/gerbers/epdiy-v6-NPTH-drl_map.gbr
similarity index 100%
rename from epaper-breakout/gerbers/epaper-breakout-NPTH-drl_map.gbr
rename to epdiy-v6/gerbers/epdiy-v6-NPTH-drl_map.gbr
diff --git a/epaper-breakout/gerbers/epaper-breakout-NPTH.drl b/epdiy-v6/gerbers/epdiy-v6-NPTH.drl
similarity index 100%
rename from epaper-breakout/gerbers/epaper-breakout-NPTH.drl
rename to epdiy-v6/gerbers/epdiy-v6-NPTH.drl
diff --git a/epaper-breakout/gerbers/epaper-breakout-PTH-drl_map.gbr b/epdiy-v6/gerbers/epdiy-v6-PTH-drl_map.gbr
similarity index 100%
rename from epaper-breakout/gerbers/epaper-breakout-PTH-drl_map.gbr
rename to epdiy-v6/gerbers/epdiy-v6-PTH-drl_map.gbr
diff --git a/epaper-breakout/gerbers/epaper-breakout-PTH.drl b/epdiy-v6/gerbers/epdiy-v6-PTH.drl
similarity index 100%
rename from epaper-breakout/gerbers/epaper-breakout-PTH.drl
rename to epdiy-v6/gerbers/epdiy-v6-PTH.drl
diff --git a/epaper-breakout/sym-lib-table b/epdiy-v6/sym-lib-table
similarity index 100%
rename from epaper-breakout/sym-lib-table
rename to epdiy-v6/sym-lib-table