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