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