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