diff --git a/include/BluetoothClient.h b/include/comms/BluetoothClient.h
similarity index 95%
rename from include/BluetoothClient.h
rename to include/comms/BluetoothClient.h
index 4de505d..056e08c 100644
--- a/include/BluetoothClient.h
+++ b/include/comms/BluetoothClient.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "SerialClient.h"
+#include "comms/SerialClient.h"
 #include <time.h>
 
 class BluetoothClient : public SerialClient
diff --git a/include/IClientBase.h b/include/comms/IClientBase.h
similarity index 100%
rename from include/IClientBase.h
rename to include/comms/IClientBase.h
diff --git a/include/MeshEnvelope.h b/include/comms/MeshEnvelope.h
similarity index 100%
rename from include/MeshEnvelope.h
rename to include/comms/MeshEnvelope.h
diff --git a/include/PacketClient.h b/include/comms/PacketClient.h
similarity index 95%
rename from include/PacketClient.h
rename to include/comms/PacketClient.h
index d4830ee..ef3b40d 100644
--- a/include/PacketClient.h
+++ b/include/comms/PacketClient.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "IClientBase.h"
+#include "comms/IClientBase.h"
 
 class SharedQueue;
 
diff --git a/include/PacketServer.h b/include/comms/PacketServer.h
similarity index 92%
rename from include/PacketServer.h
rename to include/comms/PacketServer.h
index ed44d01..196aa9b 100644
--- a/include/PacketServer.h
+++ b/include/comms/PacketServer.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Packet.h"
-#include "PacketQueue.h"
+#include "util/Packet.h"
+#include "util/PacketQueue.h"
 
 class SharedQueue;
 
diff --git a/include/SerialClient.h b/include/comms/SerialClient.h
similarity index 92%
rename from include/SerialClient.h
rename to include/comms/SerialClient.h
index f132441..c4b56a2 100644
--- a/include/SerialClient.h
+++ b/include/comms/SerialClient.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "IClientBase.h"
-#include "MeshEnvelope.h"
-#include "SharedQueue.h"
+#include "comms/IClientBase.h"
+#include "comms/MeshEnvelope.h"
+#include "util/SharedQueue.h"
 
 class SerialClient : public IClientBase
 {
diff --git a/include/UARTClient.h b/include/comms/UARTClient.h
similarity index 95%
rename from include/UARTClient.h
rename to include/comms/UARTClient.h
index d945be3..9bb22e9 100644
--- a/include/UARTClient.h
+++ b/include/comms/UARTClient.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "HardwareSerial.h"
-#include "SerialClient.h"
+#include "comms/SerialClient.h"
 #include <time.h>
 
 class UARTClient : public SerialClient
diff --git a/include/WLANClient.h b/include/comms/WLANClient.h
similarity index 95%
rename from include/WLANClient.h
rename to include/comms/WLANClient.h
index 4de9e83..93af25e 100644
--- a/include/WLANClient.h
+++ b/include/comms/WLANClient.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "SerialClient.h"
+#include "comms/SerialClient.h"
 #include <time.h>
 
 class WLANClient : public SerialClient
diff --git a/include/DeviceGUI.h b/include/graphics/DeviceGUI.h
similarity index 100%
rename from include/DeviceGUI.h
rename to include/graphics/DeviceGUI.h
diff --git a/include/DeviceScreen.h b/include/graphics/DeviceScreen.h
similarity index 80%
rename from include/DeviceScreen.h
rename to include/graphics/DeviceScreen.h
index fe4e659..982b048 100644
--- a/include/DeviceScreen.h
+++ b/include/graphics/DeviceScreen.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "DeviceGUI.h"
-#include "DisplayDriverConfig.h"
-#include "IClientBase.h"
+#include "comms/IClientBase.h"
+#include "graphics/DeviceGUI.h"
+#include "graphics/driver/DisplayDriverConfig.h"
 
 /**
  * @brief DeviceScreen - sets up the GUI and display drivers
diff --git a/include/LGFXConfig.h b/include/graphics/LGFX/LGFXConfig.h
similarity index 99%
rename from include/LGFXConfig.h
rename to include/graphics/LGFX/LGFXConfig.h
index 64a5892..75f32a3 100644
--- a/include/LGFXConfig.h
+++ b/include/graphics/LGFX/LGFXConfig.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "DisplayDriverConfig.h"
-#include "ILog.h"
+#include "graphics/driver/DisplayDriverConfig.h"
 #include "strings.h"
+#include "util/ILog.h"
 #include <LovyanGFX.hpp>
 
 #ifdef ARCH_PORTDUINO
diff --git a/include/LGFX_4848S040.h b/include/graphics/LGFX/LGFX_4848S040.h
similarity index 100%
rename from include/LGFX_4848S040.h
rename to include/graphics/LGFX/LGFX_4848S040.h
diff --git a/include/LGFX_ESP2432S022.h b/include/graphics/LGFX/LGFX_ESP2432S022.h
similarity index 100%
rename from include/LGFX_ESP2432S022.h
rename to include/graphics/LGFX/LGFX_ESP2432S022.h
diff --git a/include/LGFX_ESP2432S028RV1.h b/include/graphics/LGFX/LGFX_ESP2432S028RV1.h
similarity index 100%
rename from include/LGFX_ESP2432S028RV1.h
rename to include/graphics/LGFX/LGFX_ESP2432S028RV1.h
diff --git a/include/LGFX_ESP2432S028RV2.h b/include/graphics/LGFX/LGFX_ESP2432S028RV2.h
similarity index 100%
rename from include/LGFX_ESP2432S028RV2.h
rename to include/graphics/LGFX/LGFX_ESP2432S028RV2.h
diff --git a/include/LGFX_ESPILI9341XPT2046.h b/include/graphics/LGFX/LGFX_ESPILI9341XPT2046.h
similarity index 100%
rename from include/LGFX_ESPILI9341XPT2046.h
rename to include/graphics/LGFX/LGFX_ESPILI9341XPT2046.h
diff --git a/include/LGFX_GENERIC.h b/include/graphics/LGFX/LGFX_GENERIC.h
similarity index 100%
rename from include/LGFX_GENERIC.h
rename to include/graphics/LGFX/LGFX_GENERIC.h
diff --git a/include/LGFX_HELTEC_TRACKER.h b/include/graphics/LGFX/LGFX_HELTEC_TRACKER.h
similarity index 100%
rename from include/LGFX_HELTEC_TRACKER.h
rename to include/graphics/LGFX/LGFX_HELTEC_TRACKER.h
diff --git a/include/LGFX_INDICATOR.h b/include/graphics/LGFX/LGFX_INDICATOR.h
similarity index 100%
rename from include/LGFX_INDICATOR.h
rename to include/graphics/LGFX/LGFX_INDICATOR.h
diff --git a/include/LGFX_MAKERFABS480X480.h b/include/graphics/LGFX/LGFX_MAKERFABS480X480.h
similarity index 100%
rename from include/LGFX_MAKERFABS480X480.h
rename to include/graphics/LGFX/LGFX_MAKERFABS480X480.h
diff --git a/include/LGFX_PICOMPUTER_S3.h b/include/graphics/LGFX/LGFX_PICOMPUTER_S3.h
similarity index 100%
rename from include/LGFX_PICOMPUTER_S3.h
rename to include/graphics/LGFX/LGFX_PICOMPUTER_S3.h
diff --git a/include/LGFX_PICO_TFT_240x135.h b/include/graphics/LGFX/LGFX_PICO_TFT_240x135.h
similarity index 100%
rename from include/LGFX_PICO_TFT_240x135.h
rename to include/graphics/LGFX/LGFX_PICO_TFT_240x135.h
diff --git a/include/LGFX_T_DECK.h b/include/graphics/LGFX/LGFX_T_DECK.h
similarity index 95%
rename from include/LGFX_T_DECK.h
rename to include/graphics/LGFX/LGFX_T_DECK.h
index 4fb5edc..852933d 100644
--- a/include/LGFX_T_DECK.h
+++ b/include/graphics/LGFX/LGFX_T_DECK.h
@@ -10,19 +10,17 @@
 class Panel_TDeck : public lgfx::Panel_ST7789
 {
   protected:
-    const uint8_t* getInitCommands(uint8_t listno) const override
+    const uint8_t *getInitCommands(uint8_t listno) const override
     {
-      static uint8_t list[] = {
-          CMD_GAMMASET, 1, 0x01,  // Gamma set, curve 1
-          0xFF,0xFF
-      };
+        static uint8_t list[] = {CMD_GAMMASET, 1, 0x01, // Gamma set, curve 1
+                                 0xFF, 0xFF};
 
-      if (listno == 1) return list;
-      return Panel_ST7789::getInitCommands(listno);
+        if (listno == 1)
+            return list;
+        return Panel_ST7789::getInitCommands(listno);
     }
 };
 
-
 #ifdef CUSTOM_TOUCH_DRIVER
 #include <bb_captouch.h>
 
diff --git a/include/LGFX_T_HMI.h b/include/graphics/LGFX/LGFX_T_HMI.h
similarity index 100%
rename from include/LGFX_T_HMI.h
rename to include/graphics/LGFX/LGFX_T_HMI.h
diff --git a/include/LGFX_T_WATCH_S3.h b/include/graphics/LGFX/LGFX_T_WATCH_S3.h
similarity index 100%
rename from include/LGFX_T_WATCH_S3.h
rename to include/graphics/LGFX/LGFX_T_WATCH_S3.h
diff --git a/include/LGFX_UNPHONE.h b/include/graphics/LGFX/LGFX_UNPHONE.h
similarity index 100%
rename from include/LGFX_UNPHONE.h
rename to include/graphics/LGFX/LGFX_UNPHONE.h
diff --git a/include/LGFX_WT_SC01PLUS.h b/include/graphics/LGFX/LGFX_WT_SC01PLUS.h
similarity index 100%
rename from include/LGFX_WT_SC01PLUS.h
rename to include/graphics/LGFX/LGFX_WT_SC01PLUS.h
diff --git a/include/LVGLGraphics.h b/include/graphics/LVGL/LVGLGraphics.h
similarity index 100%
rename from include/LVGLGraphics.h
rename to include/graphics/LVGL/LVGLGraphics.h
diff --git a/include/BatteryLevel.h b/include/graphics/common/BatteryLevel.h
similarity index 100%
rename from include/BatteryLevel.h
rename to include/graphics/common/BatteryLevel.h
diff --git a/include/LoRaPresets.h b/include/graphics/common/LoRaPresets.h
similarity index 100%
rename from include/LoRaPresets.h
rename to include/graphics/common/LoRaPresets.h
diff --git a/include/MeshtasticView.h b/include/graphics/common/MeshtasticView.h
similarity index 97%
rename from include/MeshtasticView.h
rename to include/graphics/common/MeshtasticView.h
index 129a862..41d60bf 100644
--- a/include/MeshtasticView.h
+++ b/include/graphics/common/MeshtasticView.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include "DeviceGUI.h"
-#include "DisplayDriverConfig.h"
-#include "LogMessage.h"
-#include "ResponseHandler.h"
+#include "graphics/DeviceGUI.h"
+#include "graphics/common/ResponseHandler.h"
+#include "graphics/driver/DisplayDriverConfig.h"
 #include "lvgl.h"
 #include "mesh-pb-constants.h"
+#include "util/LogMessage.h"
 #include <array>
 #include <stdint.h>
 #include <string>
diff --git a/include/ResponseHandler.h b/include/graphics/common/ResponseHandler.h
similarity index 100%
rename from include/ResponseHandler.h
rename to include/graphics/common/ResponseHandler.h
diff --git a/include/Ringtones.h b/include/graphics/common/Ringtones.h
similarity index 100%
rename from include/Ringtones.h
rename to include/graphics/common/Ringtones.h
diff --git a/include/ViewController.h b/include/graphics/common/ViewController.h
similarity index 99%
rename from include/ViewController.h
rename to include/graphics/common/ViewController.h
index ba241a7..5785e9d 100644
--- a/include/ViewController.h
+++ b/include/graphics/common/ViewController.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "IClientBase.h"
-#include "LogRotate.h"
+#include "comms/IClientBase.h"
+#include "util/LogRotate.h"
 #include <time.h>
 
 class MeshtasticView;
diff --git a/include/ViewFactory.h b/include/graphics/common/ViewFactory.h
similarity index 80%
rename from include/ViewFactory.h
rename to include/graphics/common/ViewFactory.h
index e7921c2..3fffbd1 100644
--- a/include/ViewFactory.h
+++ b/include/graphics/common/ViewFactory.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "DisplayDriverConfig.h"
+#include "graphics/driver/DisplayDriverConfig.h"
 
 class DeviceGUI;
 
diff --git a/include/DisplayDriver.h b/include/graphics/driver/DisplayDriver.h
similarity index 94%
rename from include/DisplayDriver.h
rename to include/graphics/driver/DisplayDriver.h
index a76f21b..2a95d8c 100644
--- a/include/DisplayDriver.h
+++ b/include/graphics/driver/DisplayDriver.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "DeviceGUI.h"
-#include "LVGLGraphics.h"
+#include "graphics/DeviceGUI.h"
+#include "graphics/LVGL/LVGLGraphics.h"
 #include <cstdint>
 
 #define H_NORM_PX(h_scr_percent) ((int16_t)((screenWidth / 100.0) * (h_scr_percent)))
diff --git a/include/DisplayDriverConfig.h b/include/graphics/driver/DisplayDriverConfig.h
similarity index 100%
rename from include/DisplayDriverConfig.h
rename to include/graphics/driver/DisplayDriverConfig.h
diff --git a/include/DisplayDriverFactory.h b/include/graphics/driver/DisplayDriverFactory.h
similarity index 88%
rename from include/DisplayDriverFactory.h
rename to include/graphics/driver/DisplayDriverFactory.h
index 55c916b..d71f80a 100644
--- a/include/DisplayDriverFactory.h
+++ b/include/graphics/driver/DisplayDriverFactory.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "DisplayDriverConfig.h"
+#include "graphics/driver/DisplayDriverConfig.h"
 
 class DisplayDriver;
 
diff --git a/include/LGFXDriver.h b/include/graphics/driver/LGFXDriver.h
similarity index 99%
rename from include/LGFXDriver.h
rename to include/graphics/driver/LGFXDriver.h
index 49f4a68..930412a 100644
--- a/include/LGFXDriver.h
+++ b/include/graphics/driver/LGFXDriver.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include "DisplayDriverConfig.h"
-#include "ILog.h"
-#include "InputDriver.h"
 #include "LovyanGFX.h"
-#include "TFTDriver.h"
+#include "graphics/driver/DisplayDriverConfig.h"
+#include "graphics/driver/TFTDriver.h"
+#include "input/InputDriver.h"
 #include "lvgl_private.h"
+#include "util/ILog.h"
 #include <functional>
 
 constexpr uint32_t defaultLongPressTime = 600; // ms until long press is detected (lvgl default is 400)
diff --git a/include/OLEDDriver.h b/include/graphics/driver/OLEDDriver.h
similarity index 91%
rename from include/OLEDDriver.h
rename to include/graphics/driver/OLEDDriver.h
index 7e0e428..346958c 100644
--- a/include/OLEDDriver.h
+++ b/include/graphics/driver/OLEDDriver.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "DisplayDriver.h"
+#include "graphics/driver/DisplayDriver.h"
 
 template <class OLED> class OLEDDriver : public DisplayDriver
 {
diff --git a/include/TFTDriver.h b/include/graphics/driver/TFTDriver.h
similarity index 95%
rename from include/TFTDriver.h
rename to include/graphics/driver/TFTDriver.h
index 6d2c68f..56b0644 100644
--- a/include/TFTDriver.h
+++ b/include/graphics/driver/TFTDriver.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "DisplayDriver.h"
+#include "graphics/driver/DisplayDriver.h"
 
 template <class TFT> class TFTDriver : public DisplayDriver
 {
diff --git a/include/X11Driver.h b/include/graphics/driver/X11Driver.h
similarity index 92%
rename from include/X11Driver.h
rename to include/graphics/driver/X11Driver.h
index 3a33564..8df5f6f 100644
--- a/include/X11Driver.h
+++ b/include/graphics/driver/X11Driver.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "DisplayDriver.h"
+#include "graphics/driver/DisplayDriver.h"
 
 /**
  * @brief For simulation on pc/raspberry
diff --git a/include/OLEDViewController.h b/include/graphics/view/OLED/OLEDViewController.h
similarity index 77%
rename from include/OLEDViewController.h
rename to include/graphics/view/OLED/OLEDViewController.h
index a544de8..f7d9125 100644
--- a/include/OLEDViewController.h
+++ b/include/graphics/view/OLED/OLEDViewController.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "IClientBase.h"
-#include "ViewController.h"
+#include "comms/IClientBase.h"
+#include "graphics/common/ViewController.h"
 
 class DeviceGUI;
 
diff --git a/include/OLEDView_128x64.h b/include/graphics/view/OLED/OLEDView_128x64.h
similarity index 94%
rename from include/OLEDView_128x64.h
rename to include/graphics/view/OLED/OLEDView_128x64.h
index d2ee12a..8e49aac 100644
--- a/include/OLEDView_128x64.h
+++ b/include/graphics/view/OLED/OLEDView_128x64.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "DisplayDriverConfig.h"
-#include "MeshtasticView.h"
+#include "graphics/common/MeshtasticView.h"
+#include "graphics/driver/DisplayDriverConfig.h"
 
 /**
  * @brief GUI view for T-Watch-S3
diff --git a/include/TFTView_160x80.h b/include/graphics/view/TFT/TFTView_160x80.h
similarity index 96%
rename from include/TFTView_160x80.h
rename to include/graphics/view/TFT/TFTView_160x80.h
index 8f300a3..338a876 100644
--- a/include/TFTView_160x80.h
+++ b/include/graphics/view/TFT/TFTView_160x80.h
@@ -1,7 +1,6 @@
 #pragma once
 
-#include "DisplayDriverConfig.h"
-#include "MeshtasticView.h"
+#include "graphics/common/MeshtasticView.h"
 
 /**
  * @brief GUI view for e.g. Heltec-Tracker
diff --git a/include/TFTView_240x240.h b/include/graphics/view/TFT/TFTView_240x240.h
similarity index 97%
rename from include/TFTView_240x240.h
rename to include/graphics/view/TFT/TFTView_240x240.h
index 753696d..55afb41 100644
--- a/include/TFTView_240x240.h
+++ b/include/graphics/view/TFT/TFTView_240x240.h
@@ -1,7 +1,6 @@
 #pragma once
 
-#include "DisplayDriverConfig.h"
-#include "MeshtasticView.h"
+#include "graphics/common/MeshtasticView.h"
 
 /**
  * @brief GUI view for e.g. T-Watch-S3
diff --git a/include/TFTView_320x240.h b/include/graphics/view/TFT/TFTView_320x240.h
similarity index 99%
rename from include/TFTView_320x240.h
rename to include/graphics/view/TFT/TFTView_320x240.h
index 81ba8e5..92ad2dc 100644
--- a/include/TFTView_320x240.h
+++ b/include/graphics/view/TFT/TFTView_320x240.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "MeshtasticView.h"
+#include "graphics/common/MeshtasticView.h"
 #include "meshtastic/clientonly.pb.h"
 
 /**
diff --git a/include/TFTView_480x320.h b/include/graphics/view/TFT/TFTView_480x320.h
similarity index 96%
rename from include/TFTView_480x320.h
rename to include/graphics/view/TFT/TFTView_480x320.h
index ac23e97..365d583 100644
--- a/include/TFTView_480x320.h
+++ b/include/graphics/view/TFT/TFTView_480x320.h
@@ -1,7 +1,6 @@
 #pragma once
 
-#include "DisplayDriverConfig.h"
-#include "MeshtasticView.h"
+#include "graphics/common/MeshtasticView.h"
 
 /**
  * @brief GUI view for e.g. unPhone or WT32-SC01 Plus
diff --git a/include/Themes.h b/include/graphics/view/TFT/Themes.h
similarity index 100%
rename from include/Themes.h
rename to include/graphics/view/TFT/Themes.h
diff --git a/include/ButtonInputDriver.h b/include/input/ButtonInputDriver.h
similarity index 92%
rename from include/ButtonInputDriver.h
rename to include/input/ButtonInputDriver.h
index 921cc59..c34edaf 100644
--- a/include/ButtonInputDriver.h
+++ b/include/input/ButtonInputDriver.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "InputDriver.h"
+#include "input/InputDriver.h"
 
 /**
  * Button (if available) is used to wake up from display sleep
diff --git a/include/EncoderInputDriver.h b/include/input/EncoderInputDriver.h
similarity index 95%
rename from include/EncoderInputDriver.h
rename to include/input/EncoderInputDriver.h
index 0b231ba..369b142 100644
--- a/include/EncoderInputDriver.h
+++ b/include/input/EncoderInputDriver.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "InputDriver.h"
+#include "input/InputDriver.h"
 
 class EncoderInputDriver : public InputDriver
 {
diff --git a/include/I2CKeyboardInputDriver.h b/include/input/I2CKeyboardInputDriver.h
similarity index 91%
rename from include/I2CKeyboardInputDriver.h
rename to include/input/I2CKeyboardInputDriver.h
index 0c7d485..c4ed820 100644
--- a/include/I2CKeyboardInputDriver.h
+++ b/include/input/I2CKeyboardInputDriver.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "InputDriver.h"
+#include "input/InputDriver.h"
 
 class I2CKeyboardInputDriver : public InputDriver
 {
diff --git a/include/InputDriver.h b/include/input/InputDriver.h
similarity index 98%
rename from include/InputDriver.h
rename to include/input/InputDriver.h
index df12834..48a0e48 100644
--- a/include/InputDriver.h
+++ b/include/input/InputDriver.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "LVGLGraphics.h"
+#include "lvgl.h"
 #include <string>
 #include <vector>
 
diff --git a/include/KeyMatrixInputDriver.h b/include/input/KeyMatrixInputDriver.h
similarity index 89%
rename from include/KeyMatrixInputDriver.h
rename to include/input/KeyMatrixInputDriver.h
index df58643..4e7a481 100644
--- a/include/KeyMatrixInputDriver.h
+++ b/include/input/KeyMatrixInputDriver.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "InputDriver.h"
+#include "input/InputDriver.h"
 
 class KeyMatrixInputDriver : public InputDriver
 {
diff --git a/include/LinuxInputDriver.h b/include/input/LinuxInputDriver.h
similarity index 96%
rename from include/LinuxInputDriver.h
rename to include/input/LinuxInputDriver.h
index fd2d421..4c98ebd 100644
--- a/include/LinuxInputDriver.h
+++ b/include/input/LinuxInputDriver.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "InputDriver.h"
+#include "input/InputDriver.h"
 
 class LinuxInputDriver : public InputDriver
 {
diff --git a/include/ILog.h b/include/util/ILog.h
similarity index 100%
rename from include/ILog.h
rename to include/util/ILog.h
diff --git a/include/ILogEntry.h b/include/util/ILogEntry.h
similarity index 100%
rename from include/ILogEntry.h
rename to include/util/ILogEntry.h
diff --git a/include/LinuxHelper.h b/include/util/LinuxHelper.h
similarity index 100%
rename from include/LinuxHelper.h
rename to include/util/LinuxHelper.h
diff --git a/include/LogMessage.h b/include/util/LogMessage.h
similarity index 100%
rename from include/LogMessage.h
rename to include/util/LogMessage.h
diff --git a/include/LogRotate.h b/include/util/LogRotate.h
similarity index 100%
rename from include/LogRotate.h
rename to include/util/LogRotate.h
diff --git a/include/Packet.h b/include/util/Packet.h
similarity index 100%
rename from include/Packet.h
rename to include/util/Packet.h
diff --git a/include/PacketQueue.h b/include/util/PacketQueue.h
similarity index 100%
rename from include/PacketQueue.h
rename to include/util/PacketQueue.h
diff --git a/include/util/README.md b/include/util/README.md
new file mode 100644
index 0000000..9daf2ad
--- /dev/null
+++ b/include/util/README.md
@@ -0,0 +1,2 @@
+Note: files in this folder MUST NOT have any kind of dependency to any other files outside of this directory!!
+Goal is to put all files of this directory into a separate library for re-use in other projects.
diff --git a/include/SharedQueue.h b/include/util/SharedQueue.h
similarity index 100%
rename from include/SharedQueue.h
rename to include/util/SharedQueue.h
diff --git a/include/macaron_Base64.h b/include/util/macaron_Base64.h
similarity index 100%
rename from include/macaron_Base64.h
rename to include/util/macaron_Base64.h
diff --git a/source/comms/packet/PacketClient.cpp b/source/comms/packet/PacketClient.cpp
index 2142b9b..8ea5cf8 100644
--- a/source/comms/packet/PacketClient.cpp
+++ b/source/comms/packet/PacketClient.cpp
@@ -1,7 +1,7 @@
-#include "PacketClient.h"
-#include "ILog.h"
-#include "Packet.h"
-#include "SharedQueue.h"
+#include "comms/PacketClient.h"
+#include "util/ILog.h"
+#include "util/Packet.h"
+#include "util/SharedQueue.h"
 #include <assert.h>
 
 const uint32_t max_packet_queue_size = 25;
diff --git a/source/comms/packet/PacketServer.cpp b/source/comms/packet/PacketServer.cpp
index e388560..90cc496 100644
--- a/source/comms/packet/PacketServer.cpp
+++ b/source/comms/packet/PacketServer.cpp
@@ -1,5 +1,5 @@
-#include "PacketServer.h"
-#include "SharedQueue.h"
+#include "comms/PacketServer.h"
+#include "util/SharedQueue.h"
 #include <assert.h>
 
 const uint32_t max_packet_queue_size = 200;
diff --git a/source/comms/serial/BluetoothClient.cpp b/source/comms/serial/BluetoothClient.cpp
index 087804b..e592c52 100644
--- a/source/comms/serial/BluetoothClient.cpp
+++ b/source/comms/serial/BluetoothClient.cpp
@@ -1 +1 @@
-#include "BluetoothClient.h"
+#include "comms/BluetoothClient.h"
diff --git a/source/comms/serial/MeshEnvelope.cpp b/source/comms/serial/MeshEnvelope.cpp
index e9ec653..5a95e7d 100644
--- a/source/comms/serial/MeshEnvelope.cpp
+++ b/source/comms/serial/MeshEnvelope.cpp
@@ -1,6 +1,6 @@
-#include "MeshEnvelope.h"
-#include "ILog.h"
+#include "comms/MeshEnvelope.h"
 #include "mesh-pb-constants.h"
+#include "util/ILog.h"
 #include <pb_decode.h>
 #include <pb_encode.h>
 
diff --git a/source/comms/serial/SerialClient.cpp b/source/comms/serial/SerialClient.cpp
index 3fbe1f8..15fbdac 100644
--- a/source/comms/serial/SerialClient.cpp
+++ b/source/comms/serial/SerialClient.cpp
@@ -1,6 +1,6 @@
-#include "SerialClient.h"
-#include "ILog.h"
-#include "MeshEnvelope.h"
+#include "comms/SerialClient.h"
+#include "comms/MeshEnvelope.h"
+#include "util/ILog.h"
 #include <time.h>
 #ifdef ARCH_ESP32
 #include "driver/uart.h"
diff --git a/source/comms/serial/UARTClient.cpp b/source/comms/serial/UARTClient.cpp
index f5c5f33..30ecc97 100644
--- a/source/comms/serial/UARTClient.cpp
+++ b/source/comms/serial/UARTClient.cpp
@@ -1,7 +1,7 @@
 
-#include "UARTClient.h"
+#include "comms/UARTClient.h"
 #include "Arduino.h"
-#include "ILog.h"
+#include "util/ILog.h"
 
 #ifndef SERIAL_BAUD
 #define SERIAL_BAUD 38400
diff --git a/source/comms/serial/WLANClient.cpp b/source/comms/serial/WLANClient.cpp
index 95593f8..d7691e1 100644
--- a/source/comms/serial/WLANClient.cpp
+++ b/source/comms/serial/WLANClient.cpp
@@ -1 +1 @@
-#include "WLANClient.h"
+#include "comms/WLANClient.h"
diff --git a/source/DeviceGUI.cpp b/source/graphics/DeviceGUI.cpp
similarity index 85%
rename from source/DeviceGUI.cpp
rename to source/graphics/DeviceGUI.cpp
index 20ce5f1..827ede3 100644
--- a/source/DeviceGUI.cpp
+++ b/source/graphics/DeviceGUI.cpp
@@ -1,31 +1,32 @@
-#include "DeviceGUI.h"
-#include "DisplayDriver.h"
-#include "DisplayDriverConfig.h"
-#include "InputDriver.h"
+#include "graphics/DeviceGUI.h"
+#include "graphics/driver/DisplayDriver.h"
+#include "graphics/driver/DisplayDriverConfig.h"
+#include "input/InputDriver.h"
+
 #if LV_USE_LIBINPUT
-#include "LinuxInputDriver.h"
+#include "input/LinuxInputDriver.h"
 static LinuxInputDriver *linuxInputDriver = nullptr;
 #else
 #if defined(INPUTDRIVER_I2C_KBD_TYPE)
-#include "I2CKeyboardInputDriver.h"
+#include "input/I2CKeyboardInputDriver.h"
 static I2CKeyboardInputDriver *keyboardDriver = nullptr;
 #endif
 #if defined(INPUTDRIVER_ENCODER_TYPE)
-#include "EncoderInputDriver.h"
+#include "input/EncoderInputDriver.h"
 static EncoderInputDriver *encoderDriver = nullptr;
 #endif
 #if defined(INPUTDRIVER_MATRIX_TYPE)
-#include "KeyMatrixInputDriver.h"
+#include "input/KeyMatrixInputDriver.h"
 static KeyMatrixInputDriver *keyMatrixDriver = nullptr;
 #endif
 #if defined(INPUTDRIVER_BUTTON_TYPE)
-#include "ButtonInputDriver.h"
+#include "input/ButtonInputDriver.h"
 static ButtonInputDriver *buttonDriver = nullptr;
 #endif
 #endif
-#include "ILog.h"
 #include "lvgl.h"
 #include "ui.h"
+#include "util/ILog.h"
 
 DeviceGUI::DeviceGUI(const DisplayDriverConfig *cfg, DisplayDriver *driver) : displaydriver(driver), inputdriver(nullptr)
 {
diff --git a/source/DeviceScreen.cpp b/source/graphics/DeviceScreen.cpp
similarity index 91%
rename from source/DeviceScreen.cpp
rename to source/graphics/DeviceScreen.cpp
index 14d505c..f55fc89 100644
--- a/source/DeviceScreen.cpp
+++ b/source/graphics/DeviceScreen.cpp
@@ -1,7 +1,7 @@
-#include "DeviceScreen.h"
+#include "graphics/DeviceScreen.h"
 #include "Arduino.h"
-#include "ILog.h"
-#include "ViewFactory.h"
+#include "graphics/common/ViewFactory.h"
+#include "util/ILog.h"
 
 DeviceScreen &DeviceScreen::create(void)
 {
diff --git a/source/LVGLGraphics.cpp b/source/graphics/LVGL/LVGLGraphics.cpp
similarity index 93%
rename from source/LVGLGraphics.cpp
rename to source/graphics/LVGL/LVGLGraphics.cpp
index 37ef6b0..a037d59 100644
--- a/source/LVGLGraphics.cpp
+++ b/source/graphics/LVGL/LVGLGraphics.cpp
@@ -1,6 +1,6 @@
-#include "LVGLGraphics.h"
-#include "ILog.h"
+#include "graphics/LVGL/LVGLGraphics.h"
 #include "assert.h"
+#include "util/ILog.h"
 
 LVGLGraphics::LVGLGraphics(uint16_t width, uint16_t height) : screenWidth(width), screenHeight(height) {}
 
diff --git a/source/OLEDViewController.cpp b/source/graphics/OLED/OLEDViewController.cpp
similarity index 76%
rename from source/OLEDViewController.cpp
rename to source/graphics/OLED/OLEDViewController.cpp
index 39b329f..ab7cf6d 100644
--- a/source/OLEDViewController.cpp
+++ b/source/graphics/OLED/OLEDViewController.cpp
@@ -1,4 +1,4 @@
-#include "OLEDViewController.h"
+#include "graphics/view/OLED/OLEDViewController.h"
 
 OLEDViewController::OLEDViewController() {}
 
diff --git a/source/OLEDView_128x64.cpp b/source/graphics/OLED/OLEDView_128x64.cpp
similarity index 84%
rename from source/OLEDView_128x64.cpp
rename to source/graphics/OLED/OLEDView_128x64.cpp
index e153e2a..8d49100 100644
--- a/source/OLEDView_128x64.cpp
+++ b/source/graphics/OLED/OLEDView_128x64.cpp
@@ -1,10 +1,10 @@
 #if HAS_TFT // VIEW_128x64
 
-#include "OLEDView_128x64.h"
-#include "DisplayDriverFactory.h"
-#include "ILog.h"
-#include "OLEDViewController.h"
+#include "graphics/view/OLED/OLEDView_128x64.h"
+#include "graphics/driver/DisplayDriverFactory.h"
+#include "graphics/view/OLED/OLEDViewController.h"
 #include "ui.h" // this is the ui generated by eez-studio
+#include "util/ILog.h"
 #include <cstdio>
 #include <ctime>
 #include <functional>
diff --git a/source/TFTView_160x80.cpp b/source/graphics/TFT/TFTView_160x80.cpp
similarity index 84%
rename from source/TFTView_160x80.cpp
rename to source/graphics/TFT/TFTView_160x80.cpp
index 4c7738e..784eeb0 100644
--- a/source/TFTView_160x80.cpp
+++ b/source/graphics/TFT/TFTView_160x80.cpp
@@ -1,10 +1,10 @@
 #if HAS_TFT // VIEW_160x80
 
-#include "TFTView_160x80.h"
-#include "DisplayDriverFactory.h"
-#include "ILog.h"
-#include "ViewController.h"
+#include "graphics/view/TFT/TFTView_160x80.h"
+#include "graphics/common/ViewController.h"
+#include "graphics/driver/DisplayDriverFactory.h"
 #include "ui.h" // this is the ui generated by lvgl / squareline editor
+#include "util/ILog.h"
 #include <cstdio>
 #include <ctime>
 #include <functional>
diff --git a/source/TFTView_240x240.cpp b/source/graphics/TFT/TFTView_240x240.cpp
similarity index 86%
rename from source/TFTView_240x240.cpp
rename to source/graphics/TFT/TFTView_240x240.cpp
index 7c28aff..762d806 100644
--- a/source/TFTView_240x240.cpp
+++ b/source/graphics/TFT/TFTView_240x240.cpp
@@ -1,10 +1,10 @@
 #if HAS_TFT // VIEW_240x240
 
-#include "TFTView_240x240.h"
-#include "DisplayDriverFactory.h"
-#include "ILog.h"
-#include "ViewController.h"
+#include "graphics/view/TFT/TFTView_240x240.h"
+#include "graphics/common/ViewController.h"
+#include "graphics/driver/DisplayDriverFactory.h"
 #include "ui.h" // this is the ui generated by lvgl / squareline editor
+#include "util/ILog.h"
 #include <cstdio>
 #include <functional>
 
diff --git a/source/TFTView_320x240.cpp b/source/graphics/TFT/TFTView_320x240.cpp
similarity index 99%
rename from source/TFTView_320x240.cpp
rename to source/graphics/TFT/TFTView_320x240.cpp
index 76b4940..f58b89b 100644
--- a/source/TFTView_320x240.cpp
+++ b/source/graphics/TFT/TFTView_320x240.cpp
@@ -1,21 +1,21 @@
 #if HAS_TFT // VIEW_320x240
 
-#include "TFTView_320x240.h"
+#include "graphics/view/TFT/TFTView_320x240.h"
 #include "Arduino.h"
-#include "BatteryLevel.h"
-#include "DisplayDriver.h"
-#include "DisplayDriverFactory.h"
-#include "ILog.h"
-#include "InputDriver.h"
-#include "LoRaPresets.h"
-#include "Ringtones.h"
-#include "Themes.h"
-#include "ViewController.h"
+#include "graphics/common/BatteryLevel.h"
+#include "graphics/common/LoRaPresets.h"
+#include "graphics/common/Ringtones.h"
+#include "graphics/common/ViewController.h"
+#include "graphics/driver/DisplayDriver.h"
+#include "graphics/driver/DisplayDriverFactory.h"
+#include "graphics/view/TFT/Themes.h"
 #include "images.h"
+#include "input/InputDriver.h"
 #include "lv_i18n.h"
 #include "lvgl_private.h"
 #include "styles.h"
-#include "ui.h" // this is the ui generated by eez-studio
+#include "ui.h"
+#include "util/ILog.h"
 #include <algorithm>
 #include <cmath>
 #include <cstdio>
@@ -26,7 +26,7 @@
 #include <time.h>
 
 #ifdef ARCH_PORTDUINO
-#include "LinuxHelper.h"
+#include "util/LinuxHelper.h"
 #endif
 
 #ifndef MAX_NUM_NODES_VIEW
diff --git a/source/TFTView_480x320.cpp b/source/graphics/TFT/TFTView_480x320.cpp
similarity index 84%
rename from source/TFTView_480x320.cpp
rename to source/graphics/TFT/TFTView_480x320.cpp
index f76cca6..1090813 100644
--- a/source/TFTView_480x320.cpp
+++ b/source/graphics/TFT/TFTView_480x320.cpp
@@ -1,10 +1,10 @@
 #if HAS_TFT // VIEW_480x320
 
-#include "TFTView_480x320.h"
-#include "DisplayDriverFactory.h"
-#include "ILog.h"
-#include "ViewController.h"
+#include "graphics/view/TFT/TFTView_480x320.h"
+#include "graphics/common/ViewController.h"
+#include "graphics/driver/DisplayDriverFactory.h"
 #include "ui.h" // this is the ui generated by lvgl / squareline editor
+#include "util/ILog.h"
 #include <cstdio>
 #include <ctime>
 #include <functional>
diff --git a/source/Themes.cpp b/source/graphics/TFT/Themes.cpp
similarity index 99%
rename from source/Themes.cpp
rename to source/graphics/TFT/Themes.cpp
index e0f55a9..e5269cc 100644
--- a/source/Themes.cpp
+++ b/source/graphics/TFT/Themes.cpp
@@ -1,4 +1,4 @@
-#include "Themes.h"
+#include "graphics/view/TFT/Themes.h"
 #include "stdint.h"
 
 static enum Themes::Theme theme = Themes::eDark;
diff --git a/source/BatteryLevel.cpp b/source/graphics/common/BatteryLevel.cpp
similarity index 96%
rename from source/BatteryLevel.cpp
rename to source/graphics/common/BatteryLevel.cpp
index 9a643f3..f2f3d49 100644
--- a/source/BatteryLevel.cpp
+++ b/source/graphics/common/BatteryLevel.cpp
@@ -1,4 +1,4 @@
-#include "BatteryLevel.h"
+#include "graphics/common/BatteryLevel.h"
 
 BatteryLevel::BatteryLevel(void)
     : levels{
diff --git a/source/LoRaPresets.cpp b/source/graphics/common/LoRaPresets.cpp
similarity index 98%
rename from source/LoRaPresets.cpp
rename to source/graphics/common/LoRaPresets.cpp
index 1f0dfd1..300c991 100644
--- a/source/LoRaPresets.cpp
+++ b/source/graphics/common/LoRaPresets.cpp
@@ -1,4 +1,4 @@
-#include "LoRaPresets.h"
+#include "graphics/common/LoRaPresets.h"
 
 /**
  * LoRa Presets
diff --git a/source/MeshtasticView.cpp b/source/graphics/common/MeshtasticView.cpp
similarity index 97%
rename from source/MeshtasticView.cpp
rename to source/graphics/common/MeshtasticView.cpp
index 086b6a8..b537a13 100644
--- a/source/MeshtasticView.cpp
+++ b/source/graphics/common/MeshtasticView.cpp
@@ -1,9 +1,9 @@
-#include "MeshtasticView.h"
-#include "DisplayDriver.h"
-#include "ILog.h"
-#include "ViewController.h"
+#include "graphics/common/MeshtasticView.h"
+#include "graphics/common/ViewController.h"
+#include "graphics/driver/DisplayDriver.h"
 #include "lv_i18n.h"
 #include "ui.h"
+#include "util/ILog.h"
 #include <cstdio>
 
 MeshtasticView::MeshtasticView(const DisplayDriverConfig *cfg, DisplayDriver *driver, ViewController *_controller)
@@ -195,7 +195,7 @@ const char *MeshtasticView::deviceRoleToString(enum eRole role)
     };
 }
 
-#include "macaron_Base64.h"
+#include "util/macaron_Base64.h"
 #include <cstring>
 std::string MeshtasticView::pskToBase64(const meshtastic_ChannelSettings_psk_t &psk)
 {
diff --git a/source/ResponseHandler.cpp b/source/graphics/common/ResponseHandler.cpp
similarity index 97%
rename from source/ResponseHandler.cpp
rename to source/graphics/common/ResponseHandler.cpp
index 2bfae30..9cdc716 100644
--- a/source/ResponseHandler.cpp
+++ b/source/graphics/common/ResponseHandler.cpp
@@ -1,6 +1,6 @@
-#include "ResponseHandler.h"
+#include "graphics/common/ResponseHandler.h"
 #include "Arduino.h"
-#include "ILog.h"
+#include "util/ILog.h"
 
 uint32_t ResponseHandler::rollingPacketId = 0;
 
diff --git a/source/Ringtones.cpp b/source/graphics/common/Ringtones.cpp
similarity index 99%
rename from source/Ringtones.cpp
rename to source/graphics/common/Ringtones.cpp
index 15d0dd3..a3d5930 100644
--- a/source/Ringtones.cpp
+++ b/source/graphics/common/Ringtones.cpp
@@ -1,4 +1,4 @@
-#include "Ringtones.h"
+#include "graphics/common/Ringtones.h"
 
 const Rtttl ringtone[] = {
     {"Silent", "Silent:"},
diff --git a/source/ViewController.cpp b/source/graphics/common/ViewController.cpp
similarity index 99%
rename from source/ViewController.cpp
rename to source/graphics/common/ViewController.cpp
index 697decb..694e790 100644
--- a/source/ViewController.cpp
+++ b/source/graphics/common/ViewController.cpp
@@ -1,8 +1,8 @@
-#include "ViewController.h"
-#include "ILog.h"
-#include "LogMessage.h"
-#include "MeshtasticView.h"
+#include "graphics/common/ViewController.h"
 #include "assert.h"
+#include "graphics/common/MeshtasticView.h"
+#include "util/ILog.h"
+#include "util/LogMessage.h"
 #include <algorithm>
 
 #if defined(ARCH_PORTDUINO)
diff --git a/source/ViewFactory.cpp b/source/graphics/common/ViewFactory.cpp
similarity index 86%
rename from source/ViewFactory.cpp
rename to source/graphics/common/ViewFactory.cpp
index 8ede0c5..7c567af 100644
--- a/source/ViewFactory.cpp
+++ b/source/graphics/common/ViewFactory.cpp
@@ -1,20 +1,20 @@
-#include "ViewFactory.h"
+#include "graphics/common/ViewFactory.h"
 #if defined(VIEW_128x64) || defined(ARCH_PORTDUINO)
-#include "OLEDView_128x64.h"
+#include "graphics/view/OLED/OLEDView_128x64.h"
 #endif
 #if defined(VIEW_160x80) || defined(ARCH_PORTDUINO)
-#include "TFTView_160x80.h"
+#include "graphics/view/TFT/TFTView_160x80.h"
 #endif
 #if defined(VIEW_240x240) || defined(ARCH_PORTDUINO)
-#include "TFTView_240x240.h"
+#include "graphics/view/TFT/TFTView_240x240.h"
 #endif
 #if defined(VIEW_320x240) || defined(ARCH_PORTDUINO)
-#include "TFTView_320x240.h"
+#include "graphics/view/TFT/TFTView_320x240.h"
 #endif
 #if defined(VIEW_480x320) || defined(ARCH_PORTDUINO)
-#include "TFTView_480x320.h"
+#include "graphics/view/TFT/TFTView_480x320.h"
 #endif
-#include "ILog.h"
+#include "util/ILog.h"
 #include <assert.h>
 
 ViewFactory::ViewFactory(void) {}
diff --git a/source/DisplayDriver.cpp b/source/graphics/driver/DisplayDriver.cpp
similarity index 95%
rename from source/DisplayDriver.cpp
rename to source/graphics/driver/DisplayDriver.cpp
index 5ed78ad..204763e 100644
--- a/source/DisplayDriver.cpp
+++ b/source/graphics/driver/DisplayDriver.cpp
@@ -1,5 +1,5 @@
-#include "DisplayDriver.h"
-#include "ILog.h"
+#include "graphics/driver/DisplayDriver.h"
+#include "util/ILog.h"
 
 #if LV_USE_PROFILER
 #if defined(ARCH_PORTDUINO)
diff --git a/source/DisplayDriverConfig.cpp b/source/graphics/driver/DisplayDriverConfig.cpp
similarity index 96%
rename from source/DisplayDriverConfig.cpp
rename to source/graphics/driver/DisplayDriverConfig.cpp
index e17e2dd..3adf7ce 100644
--- a/source/DisplayDriverConfig.cpp
+++ b/source/graphics/driver/DisplayDriverConfig.cpp
@@ -1,4 +1,4 @@
-#include "DisplayDriverConfig.h"
+#include "graphics/driver/DisplayDriverConfig.h"
 
 DisplayDriverConfig::DisplayDriverConfig(void) : _device(device_t::NONE), _width(c_default_width), _height(c_default_height) {}
 
diff --git a/source/DisplayDriverFactory.cpp b/source/graphics/driver/DisplayDriverFactory.cpp
similarity index 82%
rename from source/DisplayDriverFactory.cpp
rename to source/graphics/driver/DisplayDriverFactory.cpp
index 9c41c9c..f511b53 100644
--- a/source/DisplayDriverFactory.cpp
+++ b/source/graphics/driver/DisplayDriverFactory.cpp
@@ -1,64 +1,64 @@
-#include "DisplayDriverFactory.h"
-#include "LGFXConfig.h"
+#include "graphics/driver/DisplayDriverFactory.h"
+#include "graphics/LGFX/LGFXConfig.h"
 #include <assert.h>
 #if defined(LGFX_DRIVER) || defined(ARCH_PORTDUINO)
-#include "LGFXDriver.h"
+#include "graphics/driver/LGFXDriver.h"
 #endif
 #if defined(OLED_DRIVER) || defined(ARCH_PORTDUINO)
-#include "OLEDDriver.h"
+#include "graphics/driver/OLEDDriver.h"
 #endif
 #if defined(EINK_DRIVER) || defined(ARCH_PORTDUINO)
-// TODO #include "EINKDriver.h"
+// TODO #include "graphics/driver/EINKDriver.h"
 #endif
 #if defined(USE_X11)
-#include "X11Driver.h"
+#include "graphics/driver/X11Driver.h"
 #endif
 
 #ifndef ARCH_PORTDUINO
 #ifdef LGFX_DRIVER_TEMPLATE
-#include "LGFX_GENERIC.h"
+#include "graphics/LGFX/LGFX_GENERIC.h"
 #endif
 #ifdef T_HMI
-#include "LGFX_T_HMI.h"
+#include "graphics/LGFX/LGFX_T_HMI.h"
 #endif
 #ifdef SENSECAP_INDICATOR
-#include "LGFX_INDICATOR.h"
+#include "graphics/LGFX/LGFX_INDICATOR.h"
 #endif
 #ifdef ESP_4848S040
-#include "LGFX_4848S040.h"
+#include "graphics/LGFX/LGFX_4848S040.h"
 #endif
 #ifdef MAKERFABS_480X480
-#include "LGFX_MAKERFABS480X480.h"
+#include "graphics/LGFX/LGFX_MAKERFABS480X480.h"
 #endif
 #ifdef T_DECK
-#include "LGFX_T_DECK.h"
+#include "graphics/LGFX/LGFX_T_DECK.h"
 #endif
 #ifdef PICOMPUTER_S3
-#include "LGFX_PICOMPUTER_S3.h"
+#include "graphics/LGFX/LGFX_PICOMPUTER_S3.h"
 #endif
 #ifdef T_WATCH_S3
-#include "LGFX_T_WATCH_S3.h"
+#include "graphics/LGFX/LGFX_T_WATCH_S3.h"
 #endif
 #ifdef UNPHONE
-#include "LGFX_UNPHONE.h"
+#include "graphics/LGFX/LGFX_UNPHONE.h"
 #endif
 #ifdef ESP32_2432S022
-#include "LGFX_ESP2432S022.h"
+#include "graphics/LGFX/LGFX_ESP2432S022.h"
 #endif
 #ifdef ESP32_2432S028RV1
-#include "LGFX_ESP2432S028RV1.h"
+#include "graphics/LGFX/LGFX_ESP2432S028RV1.h"
 #endif
 #ifdef ESP32_2432S028RV2
-#include "LGFX_ESP2432S028RV2.h"
+#include "graphics/LGFX/LGFX_ESP2432S028RV2.h"
 #endif
 #ifdef WT32_SC01
-#include "LGFX_WT_SC01PLUS.h"
+#include "graphics/LGFX/LGFX_WT_SC01PLUS.h"
 #endif
 #ifdef HELTEC_TRACKER
-#include "LGFX_HELTEC_TRACKER.h"
+#include "graphics/LGFX/LGFX_HELTEC_TRACKER.h"
 #endif
 #ifdef NODEMCU_32S
-#include "LGFX_ESPILI9341XPT2046.h"
+#include "graphics/LGFX/LGFX_ESPILI9341XPT2046.h"
 #endif
 #endif
 
diff --git a/source/X11Driver.cpp b/source/graphics/driver/X11Driver.cpp
similarity index 92%
rename from source/X11Driver.cpp
rename to source/graphics/driver/X11Driver.cpp
index c7cd39f..f9f80c5 100644
--- a/source/X11Driver.cpp
+++ b/source/graphics/driver/X11Driver.cpp
@@ -1,6 +1,6 @@
 #ifdef USE_X11
-#include "X11Driver.h"
-#include "ILog.h"
+#include "graphics/driver/X11Driver.h"
+#include "util/ILog.h"
 #include <stdio.h>
 
 LV_IMG_DECLARE(mouse_cursor_icon);
diff --git a/source/ButtonInputDriver.cpp b/source/input/ButtonInputDriver.cpp
similarity index 95%
rename from source/ButtonInputDriver.cpp
rename to source/input/ButtonInputDriver.cpp
index 397c606..49151a3 100644
--- a/source/ButtonInputDriver.cpp
+++ b/source/input/ButtonInputDriver.cpp
@@ -1,7 +1,7 @@
 #ifdef INPUTDRIVER_BUTTON_TYPE
 
-#include "ButtonInputDriver.h"
-#include "ILog.h"
+#include "input/ButtonInputDriver.h"
+#include "util/ILog.h"
 #include <Arduino.h>
 
 ButtonInputDriver::ButtonInputDriver(void) {}
diff --git a/source/EncoderInputDriver.cpp b/source/input/EncoderInputDriver.cpp
similarity index 98%
rename from source/EncoderInputDriver.cpp
rename to source/input/EncoderInputDriver.cpp
index f45cadc..b166220 100644
--- a/source/EncoderInputDriver.cpp
+++ b/source/input/EncoderInputDriver.cpp
@@ -1,8 +1,8 @@
 #ifdef INPUTDRIVER_ENCODER_TYPE
 
-#include "EncoderInputDriver.h"
+#include "input/EncoderInputDriver.h"
 #include "Arduino.h"
-#include "ILog.h"
+#include "util/ILog.h"
 
 volatile EncoderInputDriver::EncoderActionType EncoderInputDriver::action = TB_ACTION_NONE;
 
diff --git a/source/I2CKeyboardInputDriver.cpp b/source/input/I2CKeyboardInputDriver.cpp
similarity index 97%
rename from source/I2CKeyboardInputDriver.cpp
rename to source/input/I2CKeyboardInputDriver.cpp
index 61827c9..a8b7757 100644
--- a/source/I2CKeyboardInputDriver.cpp
+++ b/source/input/I2CKeyboardInputDriver.cpp
@@ -1,7 +1,7 @@
 #ifdef INPUTDRIVER_I2C_KBD_TYPE
 
-#include "I2CKeyboardInputDriver.h"
-#include "ILog.h"
+#include "input/I2CKeyboardInputDriver.h"
+#include "util/ILog.h"
 #include <Arduino.h>
 #include <Wire.h>
 
diff --git a/source/InputDriver.cpp b/source/input/InputDriver.cpp
similarity index 94%
rename from source/InputDriver.cpp
rename to source/input/InputDriver.cpp
index 28f0df9..4dd3b45 100644
--- a/source/InputDriver.cpp
+++ b/source/input/InputDriver.cpp
@@ -1,4 +1,4 @@
-#include "InputDriver.h"
+#include "input/InputDriver.h"
 
 InputDriver *InputDriver::driver = nullptr;
 lv_indev_t *InputDriver::keyboard = nullptr;
diff --git a/source/KeyMatrixInputDriver.cpp b/source/input/KeyMatrixInputDriver.cpp
similarity index 98%
rename from source/KeyMatrixInputDriver.cpp
rename to source/input/KeyMatrixInputDriver.cpp
index b9c2714..1e58640 100644
--- a/source/KeyMatrixInputDriver.cpp
+++ b/source/input/KeyMatrixInputDriver.cpp
@@ -1,8 +1,8 @@
 #ifdef INPUTDRIVER_MATRIX_TYPE
 
-#include "KeyMatrixInputDriver.h"
+#include "input/KeyMatrixInputDriver.h"
 #include "Arduino.h"
-#include "ILog.h"
+#include "util/ILog.h"
 
 // PICOmputer S3 keyboard matrix
 #if INPUTDRIVER_MATRIX_TYPE == 1
diff --git a/source/LinuxInputDriver.cpp b/source/input/LinuxInputDriver.cpp
similarity index 98%
rename from source/LinuxInputDriver.cpp
rename to source/input/LinuxInputDriver.cpp
index 93e568b..a24a017 100644
--- a/source/LinuxInputDriver.cpp
+++ b/source/input/LinuxInputDriver.cpp
@@ -1,8 +1,8 @@
 #ifdef ARCH_PORTDUINO
 
-#include "LinuxInputDriver.h"
-#include "ILog.h"
+#include "input/LinuxInputDriver.h"
 #include "screens.h"
+#include "util/ILog.h"
 #include <glob.h>
 #include <unistd.h>
 
diff --git a/source/ILog.cpp b/source/util/ILog.cpp
similarity index 70%
rename from source/ILog.cpp
rename to source/util/ILog.cpp
index 4f14e5c..84a1aa4 100644
--- a/source/ILog.cpp
+++ b/source/util/ILog.cpp
@@ -1,5 +1,5 @@
 #ifdef USE_ILOG
-#include "ILog.h"
+#include "util/ILog.h"
 
 ILog *ILog::_logger = nullptr;
 #endif
\ No newline at end of file
diff --git a/source/LinuxHelper.cpp b/source/util/LinuxHelper.cpp
similarity index 96%
rename from source/LinuxHelper.cpp
rename to source/util/LinuxHelper.cpp
index 21ba677..5844a4f 100644
--- a/source/LinuxHelper.cpp
+++ b/source/util/LinuxHelper.cpp
@@ -1,4 +1,4 @@
-#include "LinuxHelper.h"
+#include "util/LinuxHelper.h"
 #include <fstream>
 #include <limits>
 #include <string>
diff --git a/source/LogRotate.cpp b/source/util/LogRotate.cpp
similarity index 99%
rename from source/LogRotate.cpp
rename to source/util/LogRotate.cpp
index 604de2d..0bde23b 100644
--- a/source/LogRotate.cpp
+++ b/source/util/LogRotate.cpp
@@ -1,5 +1,5 @@
-#include "LogRotate.h"
-#include "ILog.h"
+#include "util/LogRotate.h"
+#include "util/ILog.h"
 #include <ctime>
 
 #define FILE_PREFIX "log_"
diff --git a/source/SharedQueue.cpp b/source/util/SharedQueue.cpp
similarity index 95%
rename from source/SharedQueue.cpp
rename to source/util/SharedQueue.cpp
index 7357318..05c6925 100644
--- a/source/SharedQueue.cpp
+++ b/source/util/SharedQueue.cpp
@@ -1,4 +1,4 @@
-#include "SharedQueue.h"
+#include "util/SharedQueue.h"
 
 SharedQueue::SharedQueue() {}