diff --git a/Platformio/HAL/Interface/HardwareInterface.cpp b/Platformio/HAL/HardwareAbstract.cpp
similarity index 93%
rename from Platformio/HAL/Interface/HardwareInterface.cpp
rename to Platformio/HAL/HardwareAbstract.cpp
index 9283e92..9e29e64 100644
--- a/Platformio/HAL/Interface/HardwareInterface.cpp
+++ b/Platformio/HAL/HardwareAbstract.cpp
@@ -1,4 +1,4 @@
-#include "HardwareInterface.h"
+#include "HardwareAbstract.hpp"
 
 HardwareAbstract::HardwareAbstract(std::shared_ptr<BatteryInterface> aBattery)
 : mBattery(std::move(aBattery)){
diff --git a/Platformio/HAL/Interface/HardwareInterface.h b/Platformio/HAL/HardwareAbstract.hpp
similarity index 100%
rename from Platformio/HAL/Interface/HardwareInterface.h
rename to Platformio/HAL/HardwareAbstract.hpp
diff --git a/Platformio/HAL/Interface/BatteryInterface.h b/Platformio/HAL/HardwareInterfaces/BatteryInterface.h
similarity index 100%
rename from Platformio/HAL/Interface/BatteryInterface.h
rename to Platformio/HAL/HardwareInterfaces/BatteryInterface.h
diff --git a/Platformio/HAL/Interface/DisplayInterface.h b/Platformio/HAL/HardwareInterfaces/DisplayInterface.h
similarity index 100%
rename from Platformio/HAL/Interface/DisplayInterface.h
rename to Platformio/HAL/HardwareInterfaces/DisplayInterface.h
diff --git a/Platformio/HAL/Interface/wifiHandlerInterface.h b/Platformio/HAL/HardwareInterfaces/wifiHandlerInterface.h
similarity index 100%
rename from Platformio/HAL/Interface/wifiHandlerInterface.h
rename to Platformio/HAL/HardwareInterfaces/wifiHandlerInterface.h
diff --git a/Platformio/HAL/Targets/ESP32/HardwareRevX.hpp b/Platformio/HAL/Targets/ESP32/HardwareRevX.hpp
index a8d9003..2667f6c 100644
--- a/Platformio/HAL/Targets/ESP32/HardwareRevX.hpp
+++ b/Platformio/HAL/Targets/ESP32/HardwareRevX.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include "SparkFunLIS3DH.h"
 
-#include "HardwareInterface.h"
+#include "HardwareAbstract.hpp"
 #include <WiFi.h>
 #include "Wire.h"
 #include "lvgl.h"
diff --git a/Platformio/HAL/Targets/Simulator/HardwareSimulator.hpp b/Platformio/HAL/Targets/Simulator/HardwareSimulator.hpp
index 55747fe..ecc73dd 100644
--- a/Platformio/HAL/Targets/Simulator/HardwareSimulator.hpp
+++ b/Platformio/HAL/Targets/Simulator/HardwareSimulator.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "HardwareInterface.h"
+#include "HardwareAbstract.hpp"
 #include <iostream>
 #include <string>
 
diff --git a/Platformio/OmoteUI/OmoteUI.hpp b/Platformio/OmoteUI/OmoteUI.hpp
index 9e8be0d..1e5f300 100644
--- a/Platformio/OmoteUI/OmoteUI.hpp
+++ b/Platformio/OmoteUI/OmoteUI.hpp
@@ -2,7 +2,7 @@
 // 2023 Matthew Colvin
 #pragma once
 
-#include "HardwareInterface.h"
+#include "HardwareAbstract.hpp"
 #include "Images.hpp"
 #include "lvgl.h"
 #include <algorithm>
diff --git a/Platformio/platformio.ini b/Platformio/platformio.ini
index 8064ff5..fdd19ea 100644
--- a/Platformio/platformio.ini
+++ b/Platformio/platformio.ini
@@ -40,14 +40,14 @@ build_flags =
   ; ------------- Includes ------------------------------------
   -I OmoteUI
   -I HAL
-  -I HAL/Interface
+  -I HAL/HardwareInterfaces
 
 lib_deps =
   lvgl/lvgl@^8.3.9
 lib_archive = false
 build_src_filter =
   +<../OmoteUI/*>
-  +<../HAL/Interface/*>
+  +<../HAL/HardwareAbstract.cpp>