11 files changed, 13 insertions, 13 deletions
diff --git a/hw/lumintop/blf-gt-mini/cfg.h b/hw/lumintop/blf-gt-mini/cfg.h
index 083f18e..1e913a9 100644
--- a/hw/lumintop/blf-gt-mini/cfg.h
+++ b/hw/lumintop/blf-gt-mini/cfg.h
@@ -3,9 +3,9 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#include "hwdef-blf-gt-mini.h"
+#include "lumintop/blf-gt-mini/hwdef.h"
 // Same as an Emisar D1S, except it has a lighted button
-#include "cfg-emisar-d1s.h"
+#include "hank/emisar-d1s/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0322"
 
diff --git a/hw/lumintop/blf-gt-mini/hwdef.h b/hw/lumintop/blf-gt-mini/hwdef.h
index f4a4d7b..844abfe 100644
--- a/hw/lumintop/blf-gt-mini/hwdef.h
+++ b/hw/lumintop/blf-gt-mini/hwdef.h
@@ -5,7 +5,7 @@
 
 // exactly the same as a D1S, but with a lighted button
 // (which is the same hwdef as a D4)
-#include "hwdef-emisar-d4.h"
+#include "hank/emisar-d4/hwdef.h"
 
 // lighted button
 #ifndef AUXLED_PIN
diff --git a/hw/lumintop/blf-gt/cfg.h b/hw/lumintop/blf-gt/cfg.h
index 580318a..d06b1fa 100644
--- a/hw/lumintop/blf-gt/cfg.h
+++ b/hw/lumintop/blf-gt/cfg.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #define MODEL_NUMBER "0321"
-#include "hwdef-blf-gt.h"
+#include "lumintop/blf-gt/hwdef.h"
 // ATTINY: 85
 
 // the button lights up
diff --git a/hw/lumintop/blf-gt/hwdef.h b/hw/lumintop/blf-gt/hwdef.h
index fdb0cb6..bd23086 100644
--- a/hw/lumintop/blf-gt/hwdef.h
+++ b/hw/lumintop/blf-gt/hwdef.h
@@ -19,7 +19,7 @@
 #define ATTINY 85
 #include <avr/io.h>
 
-#define HWDEF_C_FILE hwdef-emisar-d4.c
+#define HWDEF_C_FILE hank/emisar-d4/hwdef.c
 
 // channel modes
 // * 0. main LEDs
diff --git a/hw/lumintop/fw3a-219/cfg.h b/hw/lumintop/fw3a-219/cfg.h
index 0bd5250..32cc020 100644
--- a/hw/lumintop/fw3a-219/cfg.h
+++ b/hw/lumintop/fw3a-219/cfg.h
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#include "cfg-fw3a.h"
+#include "lumintop/fw3a/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0312"
 
diff --git a/hw/lumintop/fw3a-nofet/cfg.h b/hw/lumintop/fw3a-nofet/cfg.h
index b5d4166..76f125b 100644
--- a/hw/lumintop/fw3a-nofet/cfg.h
+++ b/hw/lumintop/fw3a-nofet/cfg.h
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#include "cfg-fw3a.h"
+#include "lumintop/fw3a/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0313"
 
diff --git a/hw/lumintop/fw3a/cfg.h b/hw/lumintop/fw3a/cfg.h
index 53c4135..123a7e1 100644
--- a/hw/lumintop/fw3a/cfg.h
+++ b/hw/lumintop/fw3a/cfg.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #define MODEL_NUMBER "0311"
-#include "hwdef-fw3a.h"
+#include "lumintop/fw3a/hwdef.h"
 
 #define RAMP_SIZE 150
 
diff --git a/hw/lumintop/fw3a/hwdef.h b/hw/lumintop/fw3a/hwdef.h
index 519fb97..fc9ff2a 100644
--- a/hw/lumintop/fw3a/hwdef.h
+++ b/hw/lumintop/fw3a/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+7+1 stacked
diff --git a/hw/lumintop/fw3x-lume1/cfg.h b/hw/lumintop/fw3x-lume1/cfg.h
index 184ab8e..2ea540c 100644
--- a/hw/lumintop/fw3x-lume1/cfg.h
+++ b/hw/lumintop/fw3x-lume1/cfg.h
@@ -12,7 +12,7 @@
  */
 
 #define MODEL_NUMBER "0314"
-#include "hwdef-fw3x-lume1.h"
+#include "lumintop/fw3x-lume1/hwdef.h"
 // ATTINY: 1634
 
 // set this light for 50C thermal ceiling
diff --git a/hw/lumintop/fw3x-lume1/hwdef.c b/hw/lumintop/fw3x-lume1/hwdef.c
index 2f31ed0..71cd799 100644
--- a/hw/lumintop/fw3x-lume1/hwdef.c
+++ b/hw/lumintop/fw3x-lume1/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/lumintop/fw3x-lume1/hwdef.h b/hw/lumintop/fw3x-lume1/hwdef.h
index c03248b..8c673b3 100644
--- a/hw/lumintop/fw3x-lume1/hwdef.h
+++ b/hw/lumintop/fw3x-lume1/hwdef.h
@@ -37,10 +37,10 @@
 #define ATTINY 1634
 #include <avr/io.h>
 
-#define HWDEF_C_FILE hwdef-fw3x-lume1.c
+#define HWDEF_C_FILE lumintop/fw3x-lume1/hwdef.c
 
 // allow using aux LEDs as extra channel modes
-#include "chan-rgbaux.h"
+#include "fsm/chan-rgbaux.h"
 
 // channel modes:
 // * 0. main LEDs