diff --git a/Software/Software.ino b/Software/Software.ino
index cc1ed03a..cf963109 100644
--- a/Software/Software.ino
+++ b/Software/Software.ino
@@ -6,11 +6,11 @@
 #include "USER_SETTINGS.h"
 #include "src/battery/BATTERIES.h"
 #include "src/devboard/config.h"
-#include "src/devboard/modbus/mbServerFCs.h"
 #include "src/inverter/INVERTERS.h"
 #include "src/lib/adafruit-Adafruit_NeoPixel/Adafruit_NeoPixel.h"
 #include "src/lib/eModbus-eModbus/Logging.h"
 #include "src/lib/eModbus-eModbus/ModbusServerRTU.h"
+#include "src/lib/eModbus-eModbus/scripts/mbServerFCs.h"
 #include "src/lib/miwagner-ESP32-Arduino-CAN/CAN_config.h"
 #include "src/lib/miwagner-ESP32-Arduino-CAN/ESP32CAN.h"
 
diff --git a/Software/src/devboard/esp32.svd b/Software/src/devboard/debug/esp32.svd
similarity index 100%
rename from Software/src/devboard/esp32.svd
rename to Software/src/devboard/debug/esp32.svd
diff --git a/Software/src/devboard/esp.c b/Software/src/lib/adafruit-Adafruit_NeoPixel/esp.c
similarity index 100%
rename from Software/src/devboard/esp.c
rename to Software/src/lib/adafruit-Adafruit_NeoPixel/esp.c
diff --git a/Software/src/lib/eModbus-eModbus/scripts/README.md b/Software/src/lib/eModbus-eModbus/scripts/README.md
new file mode 100644
index 00000000..9028391d
--- /dev/null
+++ b/Software/src/lib/eModbus-eModbus/scripts/README.md
@@ -0,0 +1 @@
+The scripts in this folder originate from [eModbus discussion 147](https://github.com/eModbus/eModbus/discussions/147).
diff --git a/Software/src/devboard/modbus/mbServerFCs.cpp b/Software/src/lib/eModbus-eModbus/scripts/mbServerFCs.cpp
similarity index 96%
rename from Software/src/devboard/modbus/mbServerFCs.cpp
rename to Software/src/lib/eModbus-eModbus/scripts/mbServerFCs.cpp
index 576e01b9..aac77929 100644
--- a/Software/src/devboard/modbus/mbServerFCs.cpp
+++ b/Software/src/lib/eModbus-eModbus/scripts/mbServerFCs.cpp
@@ -1,5 +1,5 @@
 #include "mbServerFCs.h"
-#include "../../lib/eModbus-eModbus/Logging.h"
+#include "../Logging.h"
 
 //modbus register memory - declared in main.cpp
 
diff --git a/Software/src/devboard/modbus/mbServerFCs.h b/Software/src/lib/eModbus-eModbus/scripts/mbServerFCs.h
similarity index 79%
rename from Software/src/devboard/modbus/mbServerFCs.h
rename to Software/src/lib/eModbus-eModbus/scripts/mbServerFCs.h
index 97214757..a261d579 100644
--- a/Software/src/devboard/modbus/mbServerFCs.h
+++ b/Software/src/lib/eModbus-eModbus/scripts/mbServerFCs.h
@@ -1,4 +1,4 @@
-#include "../../lib/eModbus-eModbus/ModbusServerRTU.h"
+#include "../ModbusServerRTU.h"
 
 #define MBTCP_ID 21  // modbus TCP server ID
 #define MBPV_MAX 30000