diff --git a/Boards/LilygoTLoraPager/Source/LilygoTloraPager.cpp b/Boards/LilygoTLoraPager/Source/LilygoTloraPager.cpp
index 3394eb0b..910663b8 100644
--- a/Boards/LilygoTLoraPager/Source/LilygoTloraPager.cpp
+++ b/Boards/LilygoTLoraPager/Source/LilygoTloraPager.cpp
@@ -1,10 +1,10 @@
 #include "Tactility/lvgl/LvglSync.h"
-#include "hal/TpagerDisplay.h"
-#include "hal/TpagerEncoder.h"
-#include "hal/TpagerDisplayConstants.h"
-#include "hal/TpagerKeyboard.h"
-#include "hal/TpagerPower.h"
-#include "hal/TpagerSdCard.h"
+#include "devices/TpagerDisplay.h"
+#include "devices/TpagerEncoder.h"
+#include "devices/TpagerDisplayConstants.h"
+#include "devices/TpagerKeyboard.h"
+#include "devices/TpagerPower.h"
+#include "devices/TpagerSdCard.h"
 
 #include <Bq25896.h>
 #include <Drv2605.h>
diff --git a/Boards/LilygoTLoraPager/Source/hal/TpagerDisplay.cpp b/Boards/LilygoTLoraPager/Source/devices/TpagerDisplay.cpp
similarity index 100%
rename from Boards/LilygoTLoraPager/Source/hal/TpagerDisplay.cpp
rename to Boards/LilygoTLoraPager/Source/devices/TpagerDisplay.cpp
diff --git a/Boards/LilygoTLoraPager/Source/hal/TpagerDisplay.h b/Boards/LilygoTLoraPager/Source/devices/TpagerDisplay.h
similarity index 100%
rename from Boards/LilygoTLoraPager/Source/hal/TpagerDisplay.h
rename to Boards/LilygoTLoraPager/Source/devices/TpagerDisplay.h
diff --git a/Boards/LilygoTLoraPager/Source/hal/TpagerDisplayConstants.h b/Boards/LilygoTLoraPager/Source/devices/TpagerDisplayConstants.h
similarity index 100%
rename from Boards/LilygoTLoraPager/Source/hal/TpagerDisplayConstants.h
rename to Boards/LilygoTLoraPager/Source/devices/TpagerDisplayConstants.h
diff --git a/Boards/LilygoTLoraPager/Source/hal/TpagerEncoder.cpp b/Boards/LilygoTLoraPager/Source/devices/TpagerEncoder.cpp
similarity index 100%
rename from Boards/LilygoTLoraPager/Source/hal/TpagerEncoder.cpp
rename to Boards/LilygoTLoraPager/Source/devices/TpagerEncoder.cpp
diff --git a/Boards/LilygoTLoraPager/Source/hal/TpagerEncoder.h b/Boards/LilygoTLoraPager/Source/devices/TpagerEncoder.h
similarity index 100%
rename from Boards/LilygoTLoraPager/Source/hal/TpagerEncoder.h
rename to Boards/LilygoTLoraPager/Source/devices/TpagerEncoder.h
diff --git a/Boards/LilygoTLoraPager/Source/hal/TpagerKeyboard.cpp b/Boards/LilygoTLoraPager/Source/devices/TpagerKeyboard.cpp
similarity index 100%
rename from Boards/LilygoTLoraPager/Source/hal/TpagerKeyboard.cpp
rename to Boards/LilygoTLoraPager/Source/devices/TpagerKeyboard.cpp
diff --git a/Boards/LilygoTLoraPager/Source/hal/TpagerKeyboard.h b/Boards/LilygoTLoraPager/Source/devices/TpagerKeyboard.h
similarity index 100%
rename from Boards/LilygoTLoraPager/Source/hal/TpagerKeyboard.h
rename to Boards/LilygoTLoraPager/Source/devices/TpagerKeyboard.h
diff --git a/Boards/LilygoTLoraPager/Source/hal/TpagerPower.cpp b/Boards/LilygoTLoraPager/Source/devices/TpagerPower.cpp
similarity index 100%
rename from Boards/LilygoTLoraPager/Source/hal/TpagerPower.cpp
rename to Boards/LilygoTLoraPager/Source/devices/TpagerPower.cpp
diff --git a/Boards/LilygoTLoraPager/Source/hal/TpagerPower.h b/Boards/LilygoTLoraPager/Source/devices/TpagerPower.h
similarity index 100%
rename from Boards/LilygoTLoraPager/Source/hal/TpagerPower.h
rename to Boards/LilygoTLoraPager/Source/devices/TpagerPower.h
diff --git a/Boards/LilygoTLoraPager/Source/hal/TpagerSdCard.cpp b/Boards/LilygoTLoraPager/Source/devices/TpagerSdCard.cpp
similarity index 100%
rename from Boards/LilygoTLoraPager/Source/hal/TpagerSdCard.cpp
rename to Boards/LilygoTLoraPager/Source/devices/TpagerSdCard.cpp
diff --git a/Boards/LilygoTLoraPager/Source/hal/TpagerSdCard.h b/Boards/LilygoTLoraPager/Source/devices/TpagerSdCard.h
similarity index 100%
rename from Boards/LilygoTLoraPager/Source/hal/TpagerSdCard.h
rename to Boards/LilygoTLoraPager/Source/devices/TpagerSdCard.h