got things to compile again, renamed #includes

(also modified the build scripts to work with the new file structure)

66 files changed, 103 insertions, 103 deletions

diff --git a/hw/hank/hank-cfg.h b/hw/hank/cfg.h
index 86ac605..86ac605 100644
--- a/hw/hank/hank-cfg.h
+++ b/hw/hank/cfg.h
diff --git a/hw/hank/emisar-2ch-fet/cfg.h b/hw/hank/emisar-2ch-fet/cfg.h
index 4686483..14e8c45 100644
--- a/hw/hank/emisar-2ch-fet/cfg.h
+++ b/hw/hank/emisar-2ch-fet/cfg.h
@@ -4,8 +4,8 @@
 #pragma once
 
 #define MODEL_NUMBER "0136"
-#include "hwdef-emisar-2ch-fet.h"
-#include "hank-cfg.h"
+#include "hank/emisar-2ch-fet/hwdef.h"
+#include "hank/cfg.h"
 // ATTINY: 1634
 
 // this light has three aux LED channels: R, G, B
diff --git a/hw/hank/emisar-2ch-fet/hwdef.c b/hw/hank/emisar-2ch-fet/hwdef.c
index caf579d..4309a42 100644
--- a/hw/hank/emisar-2ch-fet/hwdef.c
+++ b/hw/hank/emisar-2ch-fet/hwdef.c
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "chan-rgbaux.c"
+#include "fsm/chan-rgbaux.c"
 
 
 void set_level_zero();
diff --git a/hw/hank/emisar-2ch-fet/hwdef.h b/hw/hank/emisar-2ch-fet/hwdef.h
index d756a0d..a429a6c 100644
--- a/hw/hank/emisar-2ch-fet/hwdef.h
+++ b/hw/hank/emisar-2ch-fet/hwdef.h
@@ -35,10 +35,10 @@
 #define ATTINY 1634
 #include <avr/io.h>
 
-#define HWDEF_C_FILE hwdef-emisar-2ch-fet.c
+#define HWDEF_C_FILE hank/emisar-2ch-fet/hwdef.c
 
 // allow using aux LEDs as extra channel modes
-#include "chan-rgbaux.h"
+#include "fsm/chan-rgbaux.h"
 
 // channel modes:
 // * 0. channel 1 only (linear + DD FET)
diff --git a/hw/hank/emisar-2ch/cfg.h b/hw/hank/emisar-2ch/cfg.h
index 4c3a329..da2c11c 100644
--- a/hw/hank/emisar-2ch/cfg.h
+++ b/hw/hank/emisar-2ch/cfg.h
@@ -4,8 +4,8 @@
 #pragma once
 
 #define MODEL_NUMBER "0135"
-#include "hwdef-emisar-2ch.h"
-#include "hank-cfg.h"
+#include "hank/emisar-2ch/hwdef.h"
+#include "hank/cfg.h"
 // ATTINY: 1634
 
 // this light has three aux LED channels: R, G, B
diff --git a/hw/hank/emisar-2ch/hwdef.c b/hw/hank/emisar-2ch/hwdef.c
index b09b681..24be5ad 100644
--- a/hw/hank/emisar-2ch/hwdef.c
+++ b/hw/hank/emisar-2ch/hwdef.c
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#include "chan-rgbaux.c"
+#include "fsm/chan-rgbaux.c"
 
 
 void set_level_zero();
diff --git a/hw/hank/emisar-2ch/hwdef.h b/hw/hank/emisar-2ch/hwdef.h
index 99e4945..e67fac8 100644
--- a/hw/hank/emisar-2ch/hwdef.h
+++ b/hw/hank/emisar-2ch/hwdef.h
@@ -34,10 +34,10 @@
 #define ATTINY 1634
 #include <avr/io.h>
 
-#define HWDEF_C_FILE hwdef-emisar-2ch.c
+#define HWDEF_C_FILE hank/emisar-2ch/hwdef.c
 
 // allow using aux LEDs as extra channel modes
-#include "chan-rgbaux.h"
+#include "fsm/chan-rgbaux.h"
 
 // channel modes:
 // * 0. channel 1 only
diff --git a/hw/hank/emisar-d1/cfg.h b/hw/hank/emisar-d1/cfg.h
index c81171c..6b75945 100644
--- a/hw/hank/emisar-d1/cfg.h
+++ b/hw/hank/emisar-d1/cfg.h
@@ -4,8 +4,8 @@
 #pragma once
 
 // same as Emisar D4, mostly
-#include "hwdef-emisar-d4.h"
-#include "cfg-emisar-d4.h"
+#include "hank/emisar-d4/hwdef.h"
+#include "hank/emisar-d4/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0121"
 
diff --git a/hw/hank/emisar-d18-219/cfg.h b/hw/hank/emisar-d18-219/cfg.h
index 126e9f4..97a833e 100644
--- a/hw/hank/emisar-d18-219/cfg.h
+++ b/hw/hank/emisar-d18-219/cfg.h
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#include "cfg-emisar-d18.h"
+#include "hank/emisar-d18/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0142"
 
diff --git a/hw/hank/emisar-d18/cfg.h b/hw/hank/emisar-d18/cfg.h
index 3e5d3ae..ff698a7 100644
--- a/hw/hank/emisar-d18/cfg.h
+++ b/hw/hank/emisar-d18/cfg.h
@@ -4,8 +4,8 @@
 #pragma once
 
 #define MODEL_NUMBER "0141"
-#include "hwdef-emisar-d18.h"
-#include "hank-cfg.h"
+#include "hank/emisar-d18/hwdef.h"
+#include "hank/cfg.h"
 
 #define RAMP_SIZE 150
 
diff --git a/hw/hank/emisar-d18/hwdef.h b/hw/hank/emisar-d18/hwdef.h
index df08221..942c5c0 100644
--- a/hw/hank/emisar-d18/hwdef.h
+++ b/hw/hank/emisar-d18/hwdef.h
@@ -15,7 +15,7 @@
 #define ATTINY 85
 #include <avr/io.h>
 
-#define HWDEF_C_FILE hwdef-fw3a.c
+#define HWDEF_C_FILE lumintop/fw3a/hwdef.c
 
 // channel modes
 // * 0. FET+N+1 stacked
diff --git a/hw/hank/emisar-d1s/cfg.h b/hw/hank/emisar-d1s/cfg.h
index 8b70a5d..9eddc05 100644
--- a/hw/hank/emisar-d1s/cfg.h
+++ b/hw/hank/emisar-d1s/cfg.h
@@ -4,8 +4,8 @@
 #pragma once
 
 // same as Emisar D4, mostly
-#include "hwdef-emisar-d4.h"
-#include "cfg-emisar-d4.h"
+#include "hank/emisar-d4/hwdef.h"
+#include "hank/emisar-d4/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0122"
 
diff --git a/hw/hank/emisar-d1v2-7135-fet/cfg.h b/hw/hank/emisar-d1v2-7135-fet/cfg.h
index 4022ba6..76095fe 100644
--- a/hw/hank/emisar-d1v2-7135-fet/cfg.h
+++ b/hw/hank/emisar-d1v2-7135-fet/cfg.h
@@ -6,7 +6,7 @@
 // ATTINY: 1634
 // same as Emisar D4v2, mostly
 // (was only made for a short time, not many people have one)
-#include "cfg-emisar-d4v2.h"
+#include "hank/emisar-d4v2/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0123"
 
diff --git a/hw/hank/emisar-d1v2-linear-fet/cfg.h b/hw/hank/emisar-d1v2-linear-fet/cfg.h
index 28c57f8..18217d1 100644
--- a/hw/hank/emisar-d1v2-linear-fet/cfg.h
+++ b/hw/hank/emisar-d1v2-linear-fet/cfg.h
@@ -6,7 +6,7 @@
 
 // ATTINY: 1634
 // similar to a Noctigon KR4, sort of
-#include "cfg-noctigon-kr4.h"
+#include "hank/noctigon-kr4/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0124"
 
diff --git a/hw/hank/emisar-d1v2-nofet/cfg.h b/hw/hank/emisar-d1v2-nofet/cfg.h
index 7f5bcc4..f5b1ef6 100644
--- a/hw/hank/emisar-d1v2-nofet/cfg.h
+++ b/hw/hank/emisar-d1v2-nofet/cfg.h
@@ -6,7 +6,7 @@
 
 // ATTINY: 1634
 // similar to a Noctigon KR4, sort of
-#include "cfg-noctigon-kr4-nofet.h"
+#include "hank/noctigon-kr4-nofet/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0125"
 
diff --git a/hw/hank/emisar-d4-219/cfg.h b/hw/hank/emisar-d4-219/cfg.h
index 65649e3..b26c1ab 100644
--- a/hw/hank/emisar-d4-219/cfg.h
+++ b/hw/hank/emisar-d4-219/cfg.h
@@ -5,7 +5,7 @@
 
 // same as D4 but with FET modes limited to 80% power
 // to avoid destroying the LEDs
-#include "cfg-emisar-d4.h"
+#include "hank/emisar-d4/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0112"
 
diff --git a/hw/hank/emisar-d4/cfg.h b/hw/hank/emisar-d4/cfg.h
index 4b3ae5a..b3fe836 100644
--- a/hw/hank/emisar-d4/cfg.h
+++ b/hw/hank/emisar-d4/cfg.h
@@ -4,8 +4,8 @@
 #pragma once
 
 #define MODEL_NUMBER "0111"
-#include "hwdef-emisar-d4.h"
-#include "hank-cfg.h"
+#include "hank/emisar-d4/hwdef.h"
+#include "hank/cfg.h"
 // ATTINY: 85
 
 #define RAMP_SIZE 150
diff --git a/hw/hank/emisar-d4/hwdef.c b/hw/hank/emisar-d4/hwdef.c
index 972f682..286f95a 100644
--- a/hw/hank/emisar-d4/hwdef.c
+++ b/hw/hank/emisar-d4/hwdef.c
@@ -6,7 +6,7 @@
 
 //#ifdef AUXLED_PIN
 #if 0
-#include "chan-aux.c"
+#include "fsm/chan-aux.c"
 #else
 #define AUX_CHANNELS
 #endif
diff --git a/hw/hank/emisar-d4/hwdef.h b/hw/hank/emisar-d4/hwdef.h
index 7be700a..ffdcbfd 100644
--- a/hw/hank/emisar-d4/hwdef.h
+++ b/hw/hank/emisar-d4/hwdef.h
@@ -15,12 +15,12 @@
 #define ATTINY 85
 #include <avr/io.h>
 
-#define HWDEF_C_FILE hwdef-emisar-d4.c
+#define HWDEF_C_FILE hank/emisar-d4/hwdef.c
 
 // allow using aux LEDs as extra channel modes (when they exist)
 //#ifdef AUXLED_PIN
 #if 0
-#include "chan-aux.h"
+#include "fsm/chan-aux.h"
 #else
 #define NUM_AUX_CHANNEL_MODES  0
 #endif
diff --git a/hw/hank/emisar-d4k-3ch/cfg.h b/hw/hank/emisar-d4k-3ch/cfg.h
index c39ac01..10aeb60 100644
--- a/hw/hank/emisar-d4k-3ch/cfg.h
+++ b/hw/hank/emisar-d4k-3ch/cfg.h
@@ -4,8 +4,8 @@
 #pragma once
 
 #define MODEL_NUMBER "0151"
-#include "hwdef-emisar-d4k-3ch.h"
-#include "hank-cfg.h"
+#include "hank/emisar-d4k-3ch/hwdef.h"
+#include "hank/cfg.h"
 // ATTINY: 1634
 
 // this light has three aux LED channels: R, G, B
diff --git a/hw/hank/emisar-d4k-3ch/hwdef.c b/hw/hank/emisar-d4k-3ch/hwdef.c
index e35af08..ba5273d 100644
--- a/hw/hank/emisar-d4k-3ch/hwdef.c
+++ b/hw/hank/emisar-d4k-3ch/hwdef.c
@@ -3,8 +3,8 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#include "spaghetti-monster/anduril/channel-modes.h"  //for circular_tint_3h()
-#include "chan-rgbaux.c"
+#include "anduril/channel-modes.h"  //for circular_tint_3h()
+#include "fsm/chan-rgbaux.c"
 
 void set_level_zero();
 
diff --git a/hw/hank/emisar-d4k-3ch/hwdef.h b/hw/hank/emisar-d4k-3ch/hwdef.h
index 2e83fbe..81a64ed 100644
--- a/hw/hank/emisar-d4k-3ch/hwdef.h
+++ b/hw/hank/emisar-d4k-3ch/hwdef.h
@@ -38,10 +38,10 @@
 #define ATTINY 1634
 #include <avr/io.h>
 
-#define HWDEF_C_FILE hwdef-emisar-d4k-3ch.c
+#define HWDEF_C_FILE hank/emisar-d4k-3ch/hwdef.c
 
 // allow using aux LEDs as extra channel modes
-#include "chan-rgbaux.h"
+#include "fsm/chan-rgbaux.h"
 
 // channel modes:
 // - 1. main 2 LEDs only (8/16/16 wiring) or LED 4 only (16/16/8)
diff --git a/hw/hank/emisar-d4s-219/cfg.h b/hw/hank/emisar-d4s-219/cfg.h
index f86c1b1..9d4fc87 100644
--- a/hw/hank/emisar-d4s-219/cfg.h
+++ b/hw/hank/emisar-d4s-219/cfg.h
@@ -5,7 +5,7 @@
 
 // same as D4S but with FET modes limited to 80% power
 // to avoid destroying the LEDs
-#include "cfg-emisar-d4s.h"
+#include "hank/emisar-d4s/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0132"
 
diff --git a/hw/hank/emisar-d4s/cfg.h b/hw/hank/emisar-d4s/cfg.h
index e966132..edfe462 100644
--- a/hw/hank/emisar-d4s/cfg.h
+++ b/hw/hank/emisar-d4s/cfg.h
@@ -4,8 +4,8 @@
 #pragma once
 
 #define MODEL_NUMBER "0131"
-#include "hwdef-emisar-d4s.h"
-#include "hank-cfg.h"
+#include "hank/emisar-d4s/hwdef.h"
+#include "hank/cfg.h"
 // ATTINY: 85
 
 // the button lights up (on some models)
diff --git a/hw/hank/emisar-d4s/hwdef.h b/hw/hank/emisar-d4s/hwdef.h
index 95789e6..ebb93f5 100644
--- a/hw/hank/emisar-d4s/hwdef.h
+++ b/hw/hank/emisar-d4s/hwdef.h
@@ -4,7 +4,7 @@
 #pragma once
 
 // same as a D4, basically
-#include "hwdef-emisar-d4.h"
+#include "hank/emisar-d4/hwdef.h"
 
 // ... except the D4S has aux LEDs under the optic
 #ifndef AUXLED_PIN
diff --git a/hw/hank/emisar-d4sv2-219/cfg.h b/hw/hank/emisar-d4sv2-219/cfg.h
index 22775cc..4af2b37 100644
--- a/hw/hank/emisar-d4sv2-219/cfg.h
+++ b/hw/hank/emisar-d4sv2-219/cfg.h
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#include "cfg-emisar-d4sv2.h"
+#include "hank/emisar-d4sv2/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0134"
 // ATTINY: 1634
diff --git a/hw/hank/emisar-d4sv2/cfg.h b/hw/hank/emisar-d4sv2/cfg.h
index 666b394..8b58a0b 100644
--- a/hw/hank/emisar-d4sv2/cfg.h
+++ b/hw/hank/emisar-d4sv2/cfg.h
@@ -4,8 +4,8 @@
 #pragma once
 
 #define MODEL_NUMBER "0133"
-#include "hwdef-emisar-d4sv2.h"
-#include "hank-cfg.h"
+#include "hank/emisar-d4sv2/hwdef.h"
+#include "hank/cfg.h"
 // ATTINY: 1634
 
 #define RAMP_SIZE 150
diff --git a/hw/hank/emisar-d4sv2/hwdef.c b/hw/hank/emisar-d4sv2/hwdef.c
index 6399fb8..36f3a8d 100644
--- a/hw/hank/emisar-d4sv2/hwdef.c
+++ b/hw/hank/emisar-d4sv2/hwdef.c
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "chan-rgbaux.c"
+#include "fsm/chan-rgbaux.c"
 
 void set_level_zero();
 
diff --git a/hw/hank/emisar-d4sv2/hwdef.h b/hw/hank/emisar-d4sv2/hwdef.h
index 11d1abb..3dae90d 100644
--- a/hw/hank/emisar-d4sv2/hwdef.h
+++ b/hw/hank/emisar-d4sv2/hwdef.h
@@ -33,10 +33,10 @@
 #define ATTINY 1634
 #include <avr/io.h>
 
-#define HWDEF_C_FILE hwdef-emisar-d4sv2.c
+#define HWDEF_C_FILE hank/emisar-d4sv2/hwdef.c
 
 // allow using aux LEDs as extra channel modes
-#include "chan-rgbaux.h"
+#include "fsm/chan-rgbaux.h"
 
 // channel modes:
 // * 0. FET+3+1 stacked
diff --git a/hw/hank/emisar-d4v2-219/cfg.h b/hw/hank/emisar-d4v2-219/cfg.h
index e9775ec..0fb9699 100644
--- a/hw/hank/emisar-d4v2-219/cfg.h
+++ b/hw/hank/emisar-d4v2-219/cfg.h
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#include "cfg-emisar-d4v2.h"
+#include "hank/emisar-d4v2/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0114"
 // ATTINY: 1634
diff --git a/hw/hank/emisar-d4v2-nofet/cfg.h b/hw/hank/emisar-d4v2-nofet/cfg.h
index 6eddb40..2420f09 100644
--- a/hw/hank/emisar-d4v2-nofet/cfg.h
+++ b/hw/hank/emisar-d4v2-nofet/cfg.h
@@ -4,9 +4,9 @@
 #pragma once
 
 // switch to 1-channel support functions
-#define HWDEF_C_FILE hwdef-emisar-d4v2-nofet.c
+#define HWDEF_C_FILE hank/emisar-d4v2-nofet/hwdef.c
 
-#include "cfg-emisar-d4v2.h"
+#include "hank/emisar-d4v2/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0115"
 // ATTINY: 1634
diff --git a/hw/hank/emisar-d4v2-nofet/hwdef.c b/hw/hank/emisar-d4v2-nofet/hwdef.c
index 24477a7..971c06e 100644
--- a/hw/hank/emisar-d4v2-nofet/hwdef.c
+++ b/hw/hank/emisar-d4v2-nofet/hwdef.c
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "chan-rgbaux.c"
+#include "fsm/chan-rgbaux.c"
 
 void set_level_zero();
 
diff --git a/hw/hank/emisar-d4v2/cfg.h b/hw/hank/emisar-d4v2/cfg.h
index 0f0bb17..5cd79b5 100644
--- a/hw/hank/emisar-d4v2/cfg.h
+++ b/hw/hank/emisar-d4v2/cfg.h
@@ -4,8 +4,8 @@
 #pragma once
 
 #define MODEL_NUMBER "0113"
-#include "hwdef-emisar-d4v2.h"
-#include "hank-cfg.h"
+#include "hank/emisar-d4v2/hwdef.h"
+#include "hank/cfg.h"
 // ATTINY: 1634
 
 #define RAMP_SIZE 150
diff --git a/hw/hank/emisar-d4v2/hwdef.c b/hw/hank/emisar-d4v2/hwdef.c
index 026b30d..b6ab081 100644
--- a/hw/hank/emisar-d4v2/hwdef.c
+++ b/hw/hank/emisar-d4v2/hwdef.c
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "chan-rgbaux.c"
+#include "fsm/chan-rgbaux.c"
 
 void set_level_zero();
 
diff --git a/hw/hank/emisar-d4v2/hwdef.h b/hw/hank/emisar-d4v2/hwdef.h
index 96c57a9..bda49bc 100644
--- a/hw/hank/emisar-d4v2/hwdef.h
+++ b/hw/hank/emisar-d4v2/hwdef.h
@@ -32,11 +32,11 @@
 #include <avr/io.h>
 
 #ifndef HWDEF_C_FILE
-#define HWDEF_C_FILE hwdef-emisar-d4v2.c
+#define HWDEF_C_FILE hank/emisar-d4v2/hwdef.c
 #endif
 
 // allow using aux LEDs as extra channel modes
-#include "chan-rgbaux.h"
+#include "fsm/chan-rgbaux.h"
 
 // channel modes:
 // * 0. FET+7135 stacked
diff --git a/hw/hank/noctigon-dm11-boost/cfg.h b/hw/hank/noctigon-dm11-boost/cfg.h
index 2174fdb..6a5a451 100644
--- a/hw/hank/noctigon-dm11-boost/cfg.h
+++ b/hw/hank/noctigon-dm11-boost/cfg.h
@@ -4,8 +4,8 @@
 #pragma once
 
 #define MODEL_NUMBER "0273"
-#include "hwdef-noctigon-dm11-boost.h"
-#include "hank-cfg.h"
+#include "hank/noctigon-dm11-boost/hwdef.h"
+#include "hank/cfg.h"
 // ATTINY: 1634
 
 #define RAMP_SIZE 150
diff --git a/hw/hank/noctigon-dm11-boost/hwdef.c b/hw/hank/noctigon-dm11-boost/hwdef.c
index 932323a..e601132 100644
--- a/hw/hank/noctigon-dm11-boost/hwdef.c
+++ b/hw/hank/noctigon-dm11-boost/hwdef.c
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#include "chan-rgbaux.c"
+#include "fsm/chan-rgbaux.c"
 
 
 void set_level_zero();
diff --git a/hw/hank/noctigon-dm11-boost/hwdef.h b/hw/hank/noctigon-dm11-boost/hwdef.h
index d56a5f5..dffd462 100644
--- a/hw/hank/noctigon-dm11-boost/hwdef.h
+++ b/hw/hank/noctigon-dm11-boost/hwdef.h
@@ -39,10 +39,10 @@
 #define ATTINY 1634
 #include <avr/io.h>
 
-#define HWDEF_C_FILE hwdef-noctigon-dm11-boost.c
+#define HWDEF_C_FILE hank/noctigon-dm11-boost/hwdef.c
 
 // allow using aux LEDs as extra channel modes
-#include "chan-rgbaux.h"
+#include "fsm/chan-rgbaux.h"
 
 // channel modes:
 // * 0. main LEDs
diff --git a/hw/hank/noctigon-dm11-nofet/cfg.h b/hw/hank/noctigon-dm11-nofet/cfg.h
index b2fdfdb..23fb40c 100644
--- a/hw/hank/noctigon-dm11-nofet/cfg.h
+++ b/hw/hank/noctigon-dm11-nofet/cfg.h
@@ -4,8 +4,8 @@
 #pragma once
 
 // same support functions as a KR4
-#define HWDEF_C_FILE hwdef-noctigon-kr4-nofet.c
-#include "cfg-noctigon-dm11.h"
+#define HWDEF_C_FILE hank/noctigon-kr4-nofet/hwdef.c
+#include "hank/noctigon-dm11/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0272"
 // ATTINY: 1634
diff --git a/hw/hank/noctigon-dm11-sbt90/cfg.h b/hw/hank/noctigon-dm11-sbt90/cfg.h
index 9fac446..802d839 100644
--- a/hw/hank/noctigon-dm11-sbt90/cfg.h
+++ b/hw/hank/noctigon-dm11-sbt90/cfg.h
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#include "cfg-noctigon-kr4.h"
+#include "hank/noctigon-kr4/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0274"
 // ATTINY: 1634
diff --git a/hw/hank/noctigon-dm11/cfg.h b/hw/hank/noctigon-dm11/cfg.h
index cd6bc9d..7782762 100644
--- a/hw/hank/noctigon-dm11/cfg.h
+++ b/hw/hank/noctigon-dm11/cfg.h
@@ -4,8 +4,8 @@
 #pragma once
 
 #define MODEL_NUMBER "0271"
-#include "hwdef-noctigon-dm11.h"
-#include "hank-cfg.h"
+#include "hank/noctigon-dm11/hwdef.h"
+#include "hank/cfg.h"
 // ATTINY: 1634
 
 // this light has three aux LED channels: R, G, B
diff --git a/hw/hank/noctigon-dm11/hwdef.h b/hw/hank/noctigon-dm11/hwdef.h
index b35b27f..9ce5629 100644
--- a/hw/hank/noctigon-dm11/hwdef.h
+++ b/hw/hank/noctigon-dm11/hwdef.h
@@ -41,11 +41,11 @@
 #include <avr/io.h>
 
 #ifndef HWDEF_C_FILE
-#define HWDEF_C_FILE hwdef-noctigon-kr4.c
+#define HWDEF_C_FILE hank/noctigon-kr4/hwdef.c
 #endif
 
 // allow using aux LEDs as extra channel modes
-#include "chan-rgbaux.h"
+#include "fsm/chan-rgbaux.h"
 
 // channel modes:
 // * 0. linear + DD FET stacked
diff --git a/hw/hank/noctigon-k1-boost/cfg.h b/hw/hank/noctigon-k1-boost/cfg.h
index 0684ce7..29b20d1 100644
--- a/hw/hank/noctigon-k1-boost/cfg.h
+++ b/hw/hank/noctigon-k1-boost/cfg.h
@@ -4,8 +4,8 @@
 #pragma once
 
 #define MODEL_NUMBER "0253"
-#include "hwdef-noctigon-k1-boost.h"
-#include "hank-cfg.h"
+#include "hank/noctigon-k1-boost/hwdef.h"
+#include "hank/cfg.h"
 // ATTINY: 1634
 
 // Most K1 lights can run hotter than default, but the 12V model
diff --git a/hw/hank/noctigon-k1-boost/hwdef.h b/hw/hank/noctigon-k1-boost/hwdef.h
index a2e693a..1c6a06d 100644
--- a/hw/hank/noctigon-k1-boost/hwdef.h
+++ b/hw/hank/noctigon-k1-boost/hwdef.h
@@ -37,10 +37,10 @@
 #define ATTINY 1634
 #include <avr/io.h>
 
-#define HWDEF_C_FILE hwdef-noctigon-dm11-boost.c
+#define HWDEF_C_FILE hank/noctigon-dm11-boost/hwdef.c
 
 // allow using aux LEDs as extra channel modes
-#include "chan-rgbaux.h"
+#include "fsm/chan-rgbaux.h"
 
 // channel modes:
 // * 0. main LEDs
diff --git a/hw/hank/noctigon-k1-sbt90/cfg.h b/hw/hank/noctigon-k1-sbt90/cfg.h
index 568ff95..99fa2cb 100644
--- a/hw/hank/noctigon-k1-sbt90/cfg.h
+++ b/hw/hank/noctigon-k1-sbt90/cfg.h
@@ -5,8 +5,8 @@
 
 // (is a K1 host with a KR4-like driver and a really high-powered LED)
 #define MODEL_NUMBER "0252"
-#include "hwdef-noctigon-k1-sbt90.h"
-#include "hank-cfg.h"
+#include "hank/noctigon-k1-sbt90/hwdef.h"
+#include "hank/cfg.h"
 // ATTINY: 1634
 
 // this light can safely run a bit hotter than most
diff --git a/hw/hank/noctigon-k1-sbt90/hwdef.h b/hw/hank/noctigon-k1-sbt90/hwdef.h
index c89c3fc..bdea32d 100644
--- a/hw/hank/noctigon-k1-sbt90/hwdef.h
+++ b/hw/hank/noctigon-k1-sbt90/hwdef.h
@@ -40,10 +40,10 @@
 #define ATTINY 1634
 #include <avr/io.h>
 
-#define HWDEF_C_FILE hwdef-noctigon-kr4.c
+#define HWDEF_C_FILE hank/noctigon-kr4/hwdef.c
 
 // allow using aux LEDs as extra channel modes
-#include "chan-rgbaux.h"
+#include "fsm/chan-rgbaux.h"
 
 // channel modes:
 // * 0. linear + DD FET stacked
diff --git a/hw/hank/noctigon-k1/cfg.h b/hw/hank/noctigon-k1/cfg.h
index b2d4697..f02e4ef 100644
--- a/hw/hank/noctigon-k1/cfg.h
+++ b/hw/hank/noctigon-k1/cfg.h
@@ -5,8 +5,8 @@
 
 #define MODEL_NUMBER "0251"
 // (originally known as Emisar D1S v2)
-#include "hwdef-noctigon-k1.h"
-#include "hank-cfg.h"
+#include "hank/noctigon-k1/hwdef.h"
+#include "hank/cfg.h"
 // ATTINY: 1634
 
 // this light can safely run a bit hotter than most
diff --git a/hw/hank/noctigon-k1/hwdef.c b/hw/hank/noctigon-k1/hwdef.c
index 5d61860..f2c4069 100644
--- a/hw/hank/noctigon-k1/hwdef.c
+++ b/hw/hank/noctigon-k1/hwdef.c
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "chan-rgbaux.c"
+#include "fsm/chan-rgbaux.c"
 
 void set_level_zero();
 
diff --git a/hw/hank/noctigon-k1/hwdef.h b/hw/hank/noctigon-k1/hwdef.h
index 6467567..f6e714d 100644
--- a/hw/hank/noctigon-k1/hwdef.h
+++ b/hw/hank/noctigon-k1/hwdef.h
@@ -40,11 +40,11 @@
 #include <avr/io.h>
 
 #ifndef HWDEF_C_FILE
-#define HWDEF_C_FILE hwdef-noctigon-k1.c
+#define HWDEF_C_FILE hank/noctigon-k1/hwdef.c
 #endif
 
 // allow using aux LEDs as extra channel modes
-#include "chan-rgbaux.h"
+#include "fsm/chan-rgbaux.h"
 
 // channel modes:
 // * 0. main LED
diff --git a/hw/hank/noctigon-k9.3-219/cfg.h b/hw/hank/noctigon-k9.3-219/cfg.h
index 88abf05..deb2f5b 100644
--- a/hw/hank/noctigon-k9.3-219/cfg.h
+++ b/hw/hank/noctigon-k9.3-219/cfg.h
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#include "cfg-noctigon-k9.3.h"
+#include "hank/noctigon-k9.3/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0263"
 // ATTINY: 1634
diff --git a/hw/hank/noctigon-k9.3-nofet/cfg.h b/hw/hank/noctigon-k9.3-nofet/cfg.h
index 16504fd..ab54133 100644
--- a/hw/hank/noctigon-k9.3-nofet/cfg.h
+++ b/hw/hank/noctigon-k9.3-nofet/cfg.h
@@ -5,7 +5,7 @@
 
 // no functional differences from generic emisar-2ch build
 // (just use that one instead, this is only here for legacy reasons)
-#include "cfg-emisar-2ch.h"
+#include "hank/emisar-2ch/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0262"
 // ATTINY: 1634
diff --git a/hw/hank/noctigon-k9.3/cfg.h b/hw/hank/noctigon-k9.3/cfg.h
index ba24504..bf5d29a 100644
--- a/hw/hank/noctigon-k9.3/cfg.h
+++ b/hw/hank/noctigon-k9.3/cfg.h
@@ -4,8 +4,8 @@
 #pragma once
 
 #define MODEL_NUMBER "0261"
-#include "hwdef-emisar-2ch-fet.h"
-#include "hank-cfg.h"
+#include "hank/emisar-2ch-fet/hwdef.h"
+#include "hank/cfg.h"
 // ATTINY: 1634
 
 // this light has three aux LED channels: R, G, B
diff --git a/hw/hank/noctigon-kr4-219/cfg.h b/hw/hank/noctigon-kr4-219/cfg.h
index 5d106ef..8b566f3 100644
--- a/hw/hank/noctigon-kr4-219/cfg.h
+++ b/hw/hank/noctigon-kr4-219/cfg.h
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#include "cfg-noctigon-kr4.h"
+#include "hank/noctigon-kr4/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0213"
 // ATTINY: 1634
diff --git a/hw/hank/noctigon-kr4-219b/cfg.h b/hw/hank/noctigon-kr4-219b/cfg.h
index b242048..99b6924 100644
--- a/hw/hank/noctigon-kr4-219b/cfg.h
+++ b/hw/hank/noctigon-kr4-219b/cfg.h
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#include "cfg-noctigon-kr4.h"
+#include "hank/noctigon-kr4/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0214"
 // ATTINY: 1634
diff --git a/hw/hank/noctigon-kr4-2ch/cfg.h b/hw/hank/noctigon-kr4-2ch/cfg.h
index 09dd604..d2f41f8 100644
--- a/hw/hank/noctigon-kr4-2ch/cfg.h
+++ b/hw/hank/noctigon-kr4-2ch/cfg.h
@@ -6,8 +6,8 @@
 // (basically the same as Emisar generic 2-channel build,
 // but switch on a different pin, and no lighted button)
 // ATTINY: 1634
-#include "hwdef-noctigon-kr4-2ch.h"
-#include "cfg-emisar-2ch.h"
+#include "hank/noctigon-kr4-2ch/hwdef.h"
+#include "hank/emisar-2ch/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0215"
 
diff --git a/hw/hank/noctigon-kr4-2ch/hwdef.h b/hw/hank/noctigon-kr4-2ch/hwdef.h
index a450693..081fccc 100644
--- a/hw/hank/noctigon-kr4-2ch/hwdef.h
+++ b/hw/hank/noctigon-kr4-2ch/hwdef.h
@@ -43,5 +43,5 @@
 #define PCINT_vect   PCINT1_vect  // ISR for PCINT[11:8]
 
 // the rest of the config is the same as the generic Emisar 2ch build
-#include "hwdef-emisar-2ch.h"
+#include "hank/emisar-2ch/hwdef.h"
 
diff --git a/hw/hank/noctigon-kr4-boost/cfg.h b/hw/hank/noctigon-kr4-boost/cfg.h
index 1603acf..3dd2283 100644
--- a/hw/hank/noctigon-kr4-boost/cfg.h
+++ b/hw/hank/noctigon-kr4-boost/cfg.h
@@ -7,10 +7,10 @@
 // the only things different from dm11-boost are:
 // - e-switch is on a different pin (defined in hwdef)
 // - different model number
-#include "cfg-noctigon-dm11-boost.h"
-#include "hwdef-noctigon-kr4-boost.h"
+#include "hank/noctigon-dm11-boost/cfg.h"
+#include "hank/noctigon-kr4-boost/hwdef.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0216"
-#include "hank-cfg.h"
+#include "hank/cfg.h"
 // ATTINY: 1634
 
diff --git a/hw/hank/noctigon-kr4-boost/hwdef.h b/hw/hank/noctigon-kr4-boost/hwdef.h
index 07c4f4b..1ee2627 100644
--- a/hw/hank/noctigon-kr4-boost/hwdef.h
+++ b/hw/hank/noctigon-kr4-boost/hwdef.h
@@ -37,7 +37,7 @@
  * not to change brightness.
  */
 
-#include "hwdef-noctigon-dm11-boost.h"
+#include "hank/noctigon-dm11-boost/hwdef.h"
 
 // e-switch is on a different pin
 #undef SWITCH_PIN
diff --git a/hw/hank/noctigon-kr4-nofet/cfg.h b/hw/hank/noctigon-kr4-nofet/cfg.h
index 6d49a8b..cc9e7e0 100644
--- a/hw/hank/noctigon-kr4-nofet/cfg.h
+++ b/hw/hank/noctigon-kr4-nofet/cfg.h
@@ -5,8 +5,8 @@
 
 // (and Noctigon KR1)
 // (and Emisar D4v2 E21A, a.k.a. "D4v2.5")
-#define HWDEF_C_FILE hwdef-noctigon-kr4-nofet.c
-#include "cfg-noctigon-kr4.h"
+#define HWDEF_C_FILE hank/noctigon-kr4-nofet/hwdef.c
+#include "hank/noctigon-kr4/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0212"
 // ATTINY: 1634
diff --git a/hw/hank/noctigon-kr4-nofet/hwdef.c b/hw/hank/noctigon-kr4-nofet/hwdef.c
index 0492def..783eeed 100644
--- a/hw/hank/noctigon-kr4-nofet/hwdef.c
+++ b/hw/hank/noctigon-kr4-nofet/hwdef.c
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "chan-rgbaux.c"
+#include "fsm/chan-rgbaux.c"
 
 void set_level_zero();
 
diff --git a/hw/hank/noctigon-kr4/cfg.h b/hw/hank/noctigon-kr4/cfg.h
index 5b24ef5..8a12b1f 100644
--- a/hw/hank/noctigon-kr4/cfg.h
+++ b/hw/hank/noctigon-kr4/cfg.h
@@ -5,8 +5,8 @@
 #pragma once
 
 #define MODEL_NUMBER "0211"
-#include "hwdef-noctigon-kr4.h"
-#include "hank-cfg.h"
+#include "hank/noctigon-kr4/hwdef.h"
+#include "hank/cfg.h"
 // ATTINY: 1634
 
 // brightness w/ SST-20 4000K LEDs:
diff --git a/hw/hank/noctigon-kr4/hwdef.c b/hw/hank/noctigon-kr4/hwdef.c
index 884151d..6e6435d 100644
--- a/hw/hank/noctigon-kr4/hwdef.c
+++ b/hw/hank/noctigon-kr4/hwdef.c
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#include "chan-rgbaux.c"
+#include "fsm/chan-rgbaux.c"
 
 void set_level_zero();
 
diff --git a/hw/hank/noctigon-kr4/hwdef.h b/hw/hank/noctigon-kr4/hwdef.h
index 5570fb7..a830910 100644
--- a/hw/hank/noctigon-kr4/hwdef.h
+++ b/hw/hank/noctigon-kr4/hwdef.h
@@ -39,11 +39,11 @@
 #include <avr/io.h>
 
 #ifndef HWDEF_C_FILE
-#define HWDEF_C_FILE hwdef-noctigon-kr4.c
+#define HWDEF_C_FILE hank/noctigon-kr4/hwdef.c
 #endif
 
 // allow using aux LEDs as extra channel modes
-#include "chan-rgbaux.h"
+#include "fsm/chan-rgbaux.h"
 
 // channel modes:
 // * 0. linear + DD FET stacked
diff --git a/hw/hank/noctigon-m44/cfg.h b/hw/hank/noctigon-m44/cfg.h
index 88bf628..3e80f66 100644
--- a/hw/hank/noctigon-m44/cfg.h
+++ b/hw/hank/noctigon-m44/cfg.h
@@ -4,8 +4,8 @@
 #pragma once
 
 #define MODEL_NUMBER "0143"
-#include "hwdef-noctigon-m44.h"
-#include "hank-cfg.h"
+#include "hank/noctigon-m44/hwdef.h"
+#include "hank/cfg.h"
 // ATTINY: 1634
 
 // this light has three aux LED channels: R, G, B
diff --git a/hw/hank/noctigon-m44/hwdef.c b/hw/hank/noctigon-m44/hwdef.c
index 395a7a2..c7e1435 100644
--- a/hw/hank/noctigon-m44/hwdef.c
+++ b/hw/hank/noctigon-m44/hwdef.c
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#include "chan-rgbaux.c"
+#include "fsm/chan-rgbaux.c"
 
 
 void set_level_zero();
diff --git a/hw/hank/noctigon-m44/hwdef.h b/hw/hank/noctigon-m44/hwdef.h
index 5658c9f..7bacfd1 100644
--- a/hw/hank/noctigon-m44/hwdef.h
+++ b/hw/hank/noctigon-m44/hwdef.h
@@ -31,10 +31,10 @@
 #define ATTINY 1634
 #include <avr/io.h>
 
-#define HWDEF_C_FILE hwdef-noctigon-m44.c
+#define HWDEF_C_FILE hank/noctigon-m44/hwdef.c
 
 // allow using aux LEDs as extra channel modes
-#include "chan-rgbaux.h"
+#include "fsm/chan-rgbaux.h"
 
 // channel modes:
 // * 0. channel 1 only