11 files changed, 17 insertions, 17 deletions
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