diff --git a/Software/Software.ino b/Software/Software.ino
index a9083df0..0ea1fd5d 100644
--- a/Software/Software.ino
+++ b/Software/Software.ino
@@ -11,7 +11,7 @@
 #include "ESP32CAN.h"
 #include "CAN_config.h"
 #include "Adafruit_NeoPixel.h"
-#include "BATTERIES.h"
+#include "src/battery/BATTERIES.h"
 #include "INVERTERS.h"
 
 //CAN parameters
diff --git a/Software/BATTERIES.h b/Software/src/battery/BATTERIES.h
similarity index 100%
rename from Software/BATTERIES.h
rename to Software/src/battery/BATTERIES.h
diff --git a/Software/BMW-I3-BATTERY.cpp b/Software/src/battery/BMW-I3-BATTERY.cpp
similarity index 99%
rename from Software/BMW-I3-BATTERY.cpp
rename to Software/src/battery/BMW-I3-BATTERY.cpp
index 95804658..2f8ddd8b 100644
--- a/Software/BMW-I3-BATTERY.cpp
+++ b/Software/src/battery/BMW-I3-BATTERY.cpp
@@ -1,6 +1,6 @@
 #include "BMW-I3-BATTERY.h"
-#include "ESP32CAN.h"
-#include "CAN_config.h"
+#include "../../ESP32CAN.h"
+#include "../../CAN_config.h"
 
 //TODO before using
 // Map the final values in update_values_i3_battery, set some to static values if not available (current, discharge max , charge max)
diff --git a/Software/BMW-I3-BATTERY.h b/Software/src/battery/BMW-I3-BATTERY.h
similarity index 94%
rename from Software/BMW-I3-BATTERY.h
rename to Software/src/battery/BMW-I3-BATTERY.h
index 7d42010f..c6b47163 100644
--- a/Software/BMW-I3-BATTERY.h
+++ b/Software/src/battery/BMW-I3-BATTERY.h
@@ -1,8 +1,8 @@
 #ifndef BMW_I3_BATTERY_H
 #define BMW_I3_BATTERY_H
 #include <Arduino.h>
-#include "ESP32CAN.h"
-#include "USER_SETTINGS.h"
+#include "../../ESP32CAN.h"
+#include "../../USER_SETTINGS.h"
 
 #define ABSOLUTE_MAX_VOLTAGE 4040 // 404.4V,if battery voltage goes over this, charging is not possible (goes into forced discharge)
 #define ABSOLUTE_MIN_VOLTAGE 3100 // 310.0V if battery voltage goes under this, discharging further is disabled
diff --git a/Software/CHADEMO-BATTERY.cpp b/Software/src/battery/CHADEMO-BATTERY.cpp
similarity index 99%
rename from Software/CHADEMO-BATTERY.cpp
rename to Software/src/battery/CHADEMO-BATTERY.cpp
index c9f0c373..9933d22a 100644
--- a/Software/CHADEMO-BATTERY.cpp
+++ b/Software/src/battery/CHADEMO-BATTERY.cpp
@@ -1,6 +1,6 @@
 #include "CHADEMO-BATTERY.h"
-#include "ESP32CAN.h"
-#include "CAN_config.h"
+#include "../../ESP32CAN.h"
+#include "../../CAN_config.h"
 
 /* Do not change code below unless you are sure what you are doing */
 static unsigned long previousMillis100 = 0; // will store last time a 100ms CAN Message was send
diff --git a/Software/CHADEMO-BATTERY.h b/Software/src/battery/CHADEMO-BATTERY.h
similarity index 94%
rename from Software/CHADEMO-BATTERY.h
rename to Software/src/battery/CHADEMO-BATTERY.h
index e8a79205..5d330cd3 100644
--- a/Software/CHADEMO-BATTERY.h
+++ b/Software/src/battery/CHADEMO-BATTERY.h
@@ -1,8 +1,8 @@
 #ifndef CHADEMO_BATTERY_H
 #define CHADEMO_BATTERY_H
 #include <Arduino.h>
-#include "ESP32CAN.h"
-#include "USER_SETTINGS.h"
+#include "../../ESP32CAN.h"
+#include "../../USER_SETTINGS.h"
 
 #define ABSOLUTE_MAX_VOLTAGE 4040 // 404.4V,if battery voltage goes over this, charging is not possible (goes into forced discharge)
 #define ABSOLUTE_MIN_VOLTAGE 3100 // 310.0V if battery voltage goes under this, discharging further is disabled
diff --git a/Software/IMIEV-CZERO-ION-BATTERY.cpp b/Software/src/battery/IMIEV-CZERO-ION-BATTERY.cpp
similarity index 99%
rename from Software/IMIEV-CZERO-ION-BATTERY.cpp
rename to Software/src/battery/IMIEV-CZERO-ION-BATTERY.cpp
index c9a481c2..eed4cb3c 100644
--- a/Software/IMIEV-CZERO-ION-BATTERY.cpp
+++ b/Software/src/battery/IMIEV-CZERO-ION-BATTERY.cpp
@@ -1,6 +1,6 @@
 #include "IMIEV-CZERO-ION-BATTERY.h"
-#include "ESP32CAN.h"
-#include "CAN_config.h"
+#include "../../ESP32CAN.h"
+#include "../../CAN_config.h"
 
 //Code still work in progress, TODO:
 //Figure out if CAN messages need to be sent to keep the system happy?
diff --git a/Software/IMIEV-CZERO-ION-BATTERY.h b/Software/src/battery/IMIEV-CZERO-ION-BATTERY.h
similarity index 95%
rename from Software/IMIEV-CZERO-ION-BATTERY.h
rename to Software/src/battery/IMIEV-CZERO-ION-BATTERY.h
index 6ef5f399..5cb356e7 100644
--- a/Software/IMIEV-CZERO-ION-BATTERY.h
+++ b/Software/src/battery/IMIEV-CZERO-ION-BATTERY.h
@@ -1,8 +1,8 @@
 #ifndef IMIEV_CZERO_ION_BATTERY_H
 #define IMIEV_CZERO_ION_BATTERY_H
 #include <Arduino.h>
-#include "ESP32CAN.h"
-#include "USER_SETTINGS.h"
+#include "../../ESP32CAN.h"
+#include "../../USER_SETTINGS.h"
 
 #define ABSOLUTE_MAX_VOLTAGE 4040 // 404.4V,if battery voltage goes over this, charging is not possible (goes into forced discharge)
 #define ABSOLUTE_MIN_VOLTAGE 3100 // 310.0V if battery voltage goes under this, discharging further is disabled
diff --git a/Software/KIA-HYUNDAI-64-BATTERY.cpp b/Software/src/battery/KIA-HYUNDAI-64-BATTERY.cpp
similarity index 98%
rename from Software/KIA-HYUNDAI-64-BATTERY.cpp
rename to Software/src/battery/KIA-HYUNDAI-64-BATTERY.cpp
index 5ac5c353..b77fc8de 100644
--- a/Software/KIA-HYUNDAI-64-BATTERY.cpp
+++ b/Software/src/battery/KIA-HYUNDAI-64-BATTERY.cpp
@@ -1,6 +1,6 @@
 #include "KIA-HYUNDAI-64-BATTERY.h"
-#include "ESP32CAN.h"
-#include "CAN_config.h"
+#include "../../ESP32CAN.h"
+#include "../../CAN_config.h"
 
 /* Do not change code below unless you are sure what you are doing */
 static unsigned long previousMillis10 = 0; // will store last time a 10ms CAN Message was send
diff --git a/Software/KIA-HYUNDAI-64-BATTERY.h b/Software/src/battery/KIA-HYUNDAI-64-BATTERY.h
similarity index 95%
rename from Software/KIA-HYUNDAI-64-BATTERY.h
rename to Software/src/battery/KIA-HYUNDAI-64-BATTERY.h
index 3a610d25..052c6126 100644
--- a/Software/KIA-HYUNDAI-64-BATTERY.h
+++ b/Software/src/battery/KIA-HYUNDAI-64-BATTERY.h
@@ -1,8 +1,8 @@
 #ifndef KIA_HYUNDAI_64_BATTERY_H
 #define KIA_HYUNDAI_64_BATTERY_H
 #include <Arduino.h>
-#include "ESP32CAN.h"
-#include "USER_SETTINGS.h"
+#include "../../ESP32CAN.h"
+#include "../../USER_SETTINGS.h"
 
 #define ABSOLUTE_MAX_VOLTAGE 4040 // 404.4V,if battery voltage goes over this, charging is not possible (goes into forced discharge)
 #define ABSOLUTE_MIN_VOLTAGE 3100 // 310.0V if battery voltage goes under this, discharging further is disabled
diff --git a/Software/NISSAN-LEAF-BATTERY.cpp b/Software/src/battery/NISSAN-LEAF-BATTERY.cpp
similarity index 99%
rename from Software/NISSAN-LEAF-BATTERY.cpp
rename to Software/src/battery/NISSAN-LEAF-BATTERY.cpp
index 34354087..04ca7ed4 100644
--- a/Software/NISSAN-LEAF-BATTERY.cpp
+++ b/Software/src/battery/NISSAN-LEAF-BATTERY.cpp
@@ -1,6 +1,6 @@
 #include "NISSAN-LEAF-BATTERY.h"
-#include "ESP32CAN.h"
-#include "CAN_config.h"
+#include "../../ESP32CAN.h"
+#include "../../CAN_config.h"
 
 /* Do not change code below unless you are sure what you are doing */
 static unsigned long previousMillis10 = 0; // will store last time a 10ms CAN Message was send
diff --git a/Software/NISSAN-LEAF-BATTERY.h b/Software/src/battery/NISSAN-LEAF-BATTERY.h
similarity index 97%
rename from Software/NISSAN-LEAF-BATTERY.h
rename to Software/src/battery/NISSAN-LEAF-BATTERY.h
index 53fbb6db..e7eee7d1 100644
--- a/Software/NISSAN-LEAF-BATTERY.h
+++ b/Software/src/battery/NISSAN-LEAF-BATTERY.h
@@ -1,8 +1,8 @@
 #ifndef NISSAN_LEAF_BATTERY_H
 #define NISSAN_LEAF_BATTERY_H
 #include <Arduino.h>
-#include "ESP32CAN.h"
-#include "USER_SETTINGS.h"
+#include "../../ESP32CAN.h"
+#include "../../USER_SETTINGS.h"
 
 #define ABSOLUTE_MAX_VOLTAGE 4040 // 404.4V,if battery voltage goes over this, charging is not possible (goes into forced discharge)
 #define ABSOLUTE_MIN_VOLTAGE 3100 // 310.0V if battery voltage goes under this, discharging further is disabled
diff --git a/Software/RENAULT-ZOE-BATTERY.cpp b/Software/src/battery/RENAULT-ZOE-BATTERY.cpp
similarity index 99%
rename from Software/RENAULT-ZOE-BATTERY.cpp
rename to Software/src/battery/RENAULT-ZOE-BATTERY.cpp
index dfe953bb..9946e275 100644
--- a/Software/RENAULT-ZOE-BATTERY.cpp
+++ b/Software/src/battery/RENAULT-ZOE-BATTERY.cpp
@@ -1,6 +1,6 @@
 #include "RENAULT-ZOE-BATTERY.h"
-#include "ESP32CAN.h"
-#include "CAN_config.h"
+#include "../../ESP32CAN.h"
+#include "../../CAN_config.h"
 
 /* Do not change code below unless you are sure what you are doing */
 #define LB_MAX_SOC 1000  //BMS never goes over this value. We use this info to rescale SOC% sent to Fronius
diff --git a/Software/RENAULT-ZOE-BATTERY.h b/Software/src/battery/RENAULT-ZOE-BATTERY.h
similarity index 94%
rename from Software/RENAULT-ZOE-BATTERY.h
rename to Software/src/battery/RENAULT-ZOE-BATTERY.h
index 483fb96d..3eb8d311 100644
--- a/Software/RENAULT-ZOE-BATTERY.h
+++ b/Software/src/battery/RENAULT-ZOE-BATTERY.h
@@ -1,8 +1,8 @@
 #ifndef RENAULT_ZOE_BATTERY_H
 #define RENAULT_ZOE_BATTERY_H
 #include <Arduino.h>
-#include "ESP32CAN.h"
-#include "USER_SETTINGS.h"
+#include "../../ESP32CAN.h"
+#include "../../USER_SETTINGS.h"
 
 #define ABSOLUTE_MAX_VOLTAGE 4040 // 404.4V,if battery voltage goes over this, charging is not possible (goes into forced discharge)
 #define ABSOLUTE_MIN_VOLTAGE 3100 // 310.0V if battery voltage goes under this, discharging further is disabled
diff --git a/Software/TESLA-MODEL-3-BATTERY.cpp b/Software/src/battery/TESLA-MODEL-3-BATTERY.cpp
similarity index 99%
rename from Software/TESLA-MODEL-3-BATTERY.cpp
rename to Software/src/battery/TESLA-MODEL-3-BATTERY.cpp
index 49acd267..fb5d5c9e 100644
--- a/Software/TESLA-MODEL-3-BATTERY.cpp
+++ b/Software/src/battery/TESLA-MODEL-3-BATTERY.cpp
@@ -1,6 +1,6 @@
 #include "TESLA-MODEL-3-BATTERY.h"
-#include "ESP32CAN.h"
-#include "CAN_config.h"
+#include "../../ESP32CAN.h"
+#include "../../CAN_config.h"
 
 /* Do not change code below unless you are sure what you are doing */
 /* Credits: Most of the code comes from Per Carlen's bms_comms_tesla_model3.py (https://gitlab.com/pelle8/batt2gen24/) */
diff --git a/Software/TESLA-MODEL-3-BATTERY.h b/Software/src/battery/TESLA-MODEL-3-BATTERY.h
similarity index 95%
rename from Software/TESLA-MODEL-3-BATTERY.h
rename to Software/src/battery/TESLA-MODEL-3-BATTERY.h
index 3c680b19..e5ba3eb6 100644
--- a/Software/TESLA-MODEL-3-BATTERY.h
+++ b/Software/src/battery/TESLA-MODEL-3-BATTERY.h
@@ -1,8 +1,8 @@
 #ifndef TESLA_MODEL_3_BATTERY_H
 #define TESLA_MODEL_3_BATTERY_H
 #include <Arduino.h>
-#include "ESP32CAN.h"
-#include "USER_SETTINGS.h"
+#include "../../ESP32CAN.h"
+#include "../../USER_SETTINGS.h"
 
 #define ABSOLUTE_MAX_VOLTAGE 4030 // 403.0V,if battery voltage goes over this, charging is not possible (goes into forced discharge)
 #define ABSOLUTE_MIN_VOLTAGE 2450 // 245.0V if battery voltage goes under this, discharging further is disabled