diff --git a/AppEsp32/Source/HelloWorld/HelloWorld.cpp b/AppEsp32/Source/HelloWorld/HelloWorld.cpp
index 79b3a05d..3d73a157 100644
--- a/AppEsp32/Source/HelloWorld/HelloWorld.cpp
+++ b/AppEsp32/Source/HelloWorld/HelloWorld.cpp
@@ -1,5 +1,5 @@
 #include "lvgl.h"
-#include "ui/Toolbar.h"
+#include "lvgl/Toolbar.h"
 
 static void app_show(tt::app::App app, lv_obj_t* parent) {
     lv_obj_t* toolbar = tt::lvgl::toolbar_create(parent, app);
diff --git a/AppSim/Source/HelloWorld/hello_world.cpp b/AppSim/Source/HelloWorld/hello_world.cpp
index f2848fd6..4f2e8478 100644
--- a/AppSim/Source/HelloWorld/hello_world.cpp
+++ b/AppSim/Source/HelloWorld/hello_world.cpp
@@ -1,4 +1,4 @@
-#include "ui/Toolbar.h"
+#include "lvgl/Toolbar.h"
 
 static void app_show(tt::app::App app, lv_obj_t* parent) {
     lv_obj_t* toolbar = tt::lvgl::toolbar_create(parent, app);
diff --git a/AppSim/Source/lvgl_hal.cpp b/AppSim/Source/lvgl_hal.cpp
index 88c70fd2..1bc28a7a 100644
--- a/AppSim/Source/lvgl_hal.cpp
+++ b/AppSim/Source/lvgl_hal.cpp
@@ -1,5 +1,5 @@
 #include "lvgl.h"
-#include "ui/LvglKeypad.h"
+#include "lvgl/LvglKeypad.h"
 
 lv_display_t* lvgl_hal_init() {
     static lv_display_t* display = NULL;
diff --git a/AppSim/Source/lvgl_task.cpp b/AppSim/Source/lvgl_task.cpp
index fd8aecb8..2a301085 100644
--- a/AppSim/Source/lvgl_task.cpp
+++ b/AppSim/Source/lvgl_task.cpp
@@ -5,7 +5,7 @@
 #include "lvgl_hal.h"
 #include "TactilityCore.h"
 #include "Thread.h"
-#include "ui/LvglSync.h"
+#include "lvgl/LvglSync.h"
 
 #include "Mutex.h"
 
diff --git a/Boards/LilygoTdeck/keyboard.cpp b/Boards/LilygoTdeck/keyboard.cpp
index d0adad6a..7406c4a0 100644
--- a/Boards/LilygoTdeck/keyboard.cpp
+++ b/Boards/LilygoTdeck/keyboard.cpp
@@ -2,7 +2,7 @@
 #include "config.h"
 #include "lvgl.h"
 #include "TactilityCore.h"
-#include "ui/LvglKeypad.h"
+#include "lvgl/LvglKeypad.h"
 #include "hal/i2c/I2c.h"
 #include <driver/i2c.h>
 
diff --git a/Boards/LilygoTdeck/lvgl.cpp b/Boards/LilygoTdeck/lvgl.cpp
index 8307f8a6..80a9bfd2 100644
--- a/Boards/LilygoTdeck/lvgl.cpp
+++ b/Boards/LilygoTdeck/lvgl.cpp
@@ -1,6 +1,6 @@
 #include "Log.h"
 #include "Thread.h"
-#include "ui/LvglSync.h"
+#include "lvgl/LvglSync.h"
 #include "config.h"
 #include "display.h"
 #include "esp_lvgl_port.h"
diff --git a/Boards/LilygoTdeck/sdcard.cpp b/Boards/LilygoTdeck/sdcard.cpp
index 2eb8c5e5..45578baa 100644
--- a/Boards/LilygoTdeck/sdcard.cpp
+++ b/Boards/LilygoTdeck/sdcard.cpp
@@ -5,7 +5,7 @@
 
 #include "esp_vfs_fat.h"
 #include "sdmmc_cmd.h"
-#include "ui/LvglSync.h"
+#include "lvgl/LvglSync.h"
 
 #define TAG "tdeck_sdcard"
 
diff --git a/Boards/M5stackShared/Source/Lvgl.cpp b/Boards/M5stackShared/Source/Lvgl.cpp
index f0f32003..38fe798d 100644
--- a/Boards/M5stackShared/Source/Lvgl.cpp
+++ b/Boards/M5stackShared/Source/Lvgl.cpp
@@ -1,7 +1,7 @@
 #include "esp_lvgl_port.h"
 #include "Log.h"
 #include "Thread.h"
-#include "ui/LvglSync.h"
+#include "lvgl/LvglSync.h"
 
 #define TAG "cores3_lvgl"
 
diff --git a/Boards/WaveshareS3Touch/lvgl.cpp b/Boards/WaveshareS3Touch/lvgl.cpp
index 285b9d4f..04d44673 100644
--- a/Boards/WaveshareS3Touch/lvgl.cpp
+++ b/Boards/WaveshareS3Touch/lvgl.cpp
@@ -2,7 +2,7 @@
 
 #include "display_i.h"
 #include "touch_i.h"
-#include "ui/LvglSync.h"
+#include "lvgl/LvglSync.h"
 
 bool ws3t_init_lvgl() {
     tt::lvgl::syncSet(&ws3t_display_lock, &ws3t_display_unlock);
diff --git a/Boards/YellowBoard/lvgl.cpp b/Boards/YellowBoard/lvgl.cpp
index 7dc274ac..6608cf58 100644
--- a/Boards/YellowBoard/lvgl.cpp
+++ b/Boards/YellowBoard/lvgl.cpp
@@ -1,6 +1,6 @@
 #include "esp_lvgl_port.h"
 #include "Log.h"
-#include "ui/LvglSync.h"
+#include "lvgl/LvglSync.h"
 #include "Thread.h"
 
 #define TAG "twodotfour_lvgl"
diff --git a/Tactility/Private/lvgl/Init_i.h b/Tactility/Private/lvgl/Init_i.h
new file mode 100644
index 00000000..bd412b5c
--- /dev/null
+++ b/Tactility/Private/lvgl/Init_i.h
@@ -0,0 +1,9 @@
+#pragma once
+
+#include "hal/Configuration.h"
+
+namespace tt::lvgl {
+
+void init(const hal::Configuration* config);
+
+} // namespace
diff --git a/Tactility/Private/ui/LvglInit_i.h b/Tactility/Private/ui/LvglInit_i.h
deleted file mode 100644
index 33d8ff33..00000000
--- a/Tactility/Private/ui/LvglInit_i.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-#include "hal/Configuration.h"
-
-namespace tt::ui {
-
-void initLvgl(const hal::Configuration* config);
-
-} // namespace
diff --git a/Tactility/Source/Tactility.cpp b/Tactility/Source/Tactility.cpp
index 5d0f0ddb..4e19e0ae 100644
--- a/Tactility/Source/Tactility.cpp
+++ b/Tactility/Source/Tactility.cpp
@@ -4,13 +4,13 @@
 #include "service/ServiceRegistry.h"
 #include "service/loader/Loader.h"
 #include "TactilityHeadless.h"
-#include "ui/LvglInit_i.h"
+#include "lvgl/Init_i.h"
 
 namespace tt {
 
 #define TAG "tactility"
 
-static const Configuration* config_instance = NULL;
+static const Configuration* config_instance = nullptr;
 
 // region Default services
 
@@ -38,16 +38,16 @@ namespace app {
     namespace desktop { extern const Manifest manifest; }
     namespace files { extern const Manifest manifest; }
     namespace gpio { extern const Manifest manifest; }
-    namespace image_viewer { extern const Manifest manifest; }
+    namespace imageviewer { extern const Manifest manifest; }
     namespace screenshot { extern const Manifest manifest; }
     namespace settings { extern const Manifest manifest; }
-    namespace settings::display { extern const Manifest manifest; }
-    namespace settings::i2c { extern const Manifest manifest; }
-    namespace settings::power { extern const Manifest manifest; }
-    namespace system_info { extern const Manifest manifest; }
-    namespace text_viewer { extern const Manifest manifest; }
-    namespace wifi_connect { extern const Manifest manifest; }
-    namespace wifi_manage { extern const Manifest manifest; }
+    namespace display { extern const Manifest manifest; }
+    namespace i2csettings { extern const Manifest manifest; }
+    namespace power { extern const Manifest manifest; }
+    namespace systeminfo { extern const Manifest manifest; }
+    namespace textviewer { extern const Manifest manifest; }
+    namespace wificonnect { extern const Manifest manifest; }
+    namespace wifimanage { extern const Manifest manifest; }
 }
 
 #ifndef ESP_PLATFORM
@@ -56,16 +56,16 @@ extern const app::Manifest screenshot_app;
 
 static const std::vector<const app::Manifest*> system_apps = {
     &app::desktop::manifest,
+    &app::display::manifest,
     &app::files::manifest,
     &app::gpio::manifest,
-    &app::image_viewer::manifest,
+    &app::i2csettings::manifest,
+    &app::imageviewer::manifest,
     &app::settings::manifest,
-    &app::settings::display::manifest,
-    &app::settings::i2c::manifest,
-    &app::system_info::manifest,
-    &app::text_viewer::manifest,
-    &app::wifi_connect::manifest,
-    &app::wifi_manage::manifest,
+    &app::systeminfo::manifest,
+    &app::textviewer::manifest,
+    &app::wificonnect::manifest,
+    &app::wifimanage::manifest,
 #ifndef ESP_PLATFORM
     &app::screenshot::manifest, // Screenshots don't work yet on ESP32
 #endif
@@ -80,7 +80,7 @@ static void register_system_apps() {
     }
 
     if (getConfiguration()->hardware->power != nullptr) {
-        app_manifest_registry_add(&app::settings::power::manifest);
+        app_manifest_registry_add(&app::power::manifest);
     }
 }
 
@@ -127,7 +127,7 @@ void init(const Configuration* config) {
 
     initHeadless(*config->hardware);
 
-    ui::initLvgl(config->hardware);
+    lvgl::init(config->hardware);
 
     app::app_manifest_registry_init();
 
diff --git a/Tactility/Source/app/Desktop/Desktop.cpp b/Tactility/Source/app/desktop/Desktop.cpp
similarity index 100%
rename from Tactility/Source/app/Desktop/Desktop.cpp
rename to Tactility/Source/app/desktop/Desktop.cpp
diff --git a/Tactility/Source/app/Display/Display.cpp b/Tactility/Source/app/display/Display.cpp
similarity index 98%
rename from Tactility/Source/app/Display/Display.cpp
rename to Tactility/Source/app/display/Display.cpp
index 7a76ce56..4ab494da 100644
--- a/Tactility/Source/app/Display/Display.cpp
+++ b/Tactility/Source/app/display/Display.cpp
@@ -2,11 +2,10 @@
 #include "Assets.h"
 #include "DisplayPreferences.h"
 #include "Tactility.h"
-#include "ui/Style.h"
-#include "ui/Toolbar.h"
+#include "lvgl/Toolbar.h"
 #include "lvgl.h"
 
-namespace tt::app::settings::display {
+namespace tt::app::display {
 
 #define TAG "display"
 
diff --git a/Tactility/Source/app/Display/DisplayPreferences.cpp b/Tactility/Source/app/display/DisplayPreferences.cpp
similarity index 95%
rename from Tactility/Source/app/Display/DisplayPreferences.cpp
rename to Tactility/Source/app/display/DisplayPreferences.cpp
index e0061ca7..c85aa59f 100644
--- a/Tactility/Source/app/Display/DisplayPreferences.cpp
+++ b/Tactility/Source/app/display/DisplayPreferences.cpp
@@ -1,7 +1,7 @@
 #include "DisplayPreferences.h"
 #include "Preferences.h"
 
-namespace tt::app::settings::display {
+namespace tt::app::display {
 
 tt::Preferences preferences("display");
 
diff --git a/Tactility/Source/app/Display/DisplayPreferences.h b/Tactility/Source/app/display/DisplayPreferences.h
similarity index 88%
rename from Tactility/Source/app/Display/DisplayPreferences.h
rename to Tactility/Source/app/display/DisplayPreferences.h
index 3155fa9c..719b0232 100644
--- a/Tactility/Source/app/Display/DisplayPreferences.h
+++ b/Tactility/Source/app/display/DisplayPreferences.h
@@ -3,7 +3,7 @@
 #include <cstdint>
 #include <src/display/lv_display.h>
 
-namespace tt::app::settings::display {
+namespace tt::app::display {
 
 void preferences_set_backlight_duty(uint8_t value);
 uint8_t preferences_get_backlight_duty();
diff --git a/Tactility/Source/app/Files/FileUtils.cpp b/Tactility/Source/app/files/FileUtils.cpp
similarity index 100%
rename from Tactility/Source/app/Files/FileUtils.cpp
rename to Tactility/Source/app/files/FileUtils.cpp
diff --git a/Tactility/Source/app/Files/FileUtils.h b/Tactility/Source/app/files/FileUtils.h
similarity index 100%
rename from Tactility/Source/app/Files/FileUtils.h
rename to Tactility/Source/app/files/FileUtils.h
diff --git a/Tactility/Source/app/Files/Files.cpp b/Tactility/Source/app/files/Files.cpp
similarity index 98%
rename from Tactility/Source/app/Files/Files.cpp
rename to Tactility/Source/app/files/Files.cpp
index 2c208bde..46c4d67b 100644
--- a/Tactility/Source/app/Files/Files.cpp
+++ b/Tactility/Source/app/files/Files.cpp
@@ -5,11 +5,11 @@
 #include "Check.h"
 #include "FileUtils.h"
 #include "StringUtils.h"
-#include "app/ImageViewer/ImageViewer.h"
-#include "app/TextViewer/TextViewer.h"
+#include "app/imageviewer/ImageViewer.h"
+#include "app/textviewer/TextViewer.h"
 #include "lvgl.h"
 #include "service/loader/Loader.h"
-#include "ui/Toolbar.h"
+#include "lvgl/Toolbar.h"
 #include <dirent.h>
 #include <unistd.h>
 
diff --git a/Tactility/Source/app/Files/FilesData.cpp b/Tactility/Source/app/files/FilesData.cpp
similarity index 100%
rename from Tactility/Source/app/Files/FilesData.cpp
rename to Tactility/Source/app/files/FilesData.cpp
diff --git a/Tactility/Source/app/Files/FilesData.h b/Tactility/Source/app/files/FilesData.h
similarity index 100%
rename from Tactility/Source/app/Files/FilesData.h
rename to Tactility/Source/app/files/FilesData.h
diff --git a/Tactility/Source/app/Gpio/Gpio.cpp b/Tactility/Source/app/gpio/Gpio.cpp
similarity index 99%
rename from Tactility/Source/app/Gpio/Gpio.cpp
rename to Tactility/Source/app/gpio/Gpio.cpp
index 315f3f38..d9051953 100644
--- a/Tactility/Source/app/Gpio/Gpio.cpp
+++ b/Tactility/Source/app/gpio/Gpio.cpp
@@ -2,10 +2,10 @@
 #include "Thread.h"
 #include "Tactility.h"
 #include "service/loader/Loader.h"
-#include "ui/Toolbar.h"
+#include "lvgl/Toolbar.h"
 
 #include "GpioHal.h"
-#include "ui/LvglSync.h"
+#include "lvgl/LvglSync.h"
 
 namespace tt::app::gpio {
 
diff --git a/Tactility/Source/app/Gpio/GpioHal.cpp b/Tactility/Source/app/gpio/GpioHal.cpp
similarity index 100%
rename from Tactility/Source/app/Gpio/GpioHal.cpp
rename to Tactility/Source/app/gpio/GpioHal.cpp
diff --git a/Tactility/Source/app/Gpio/GpioHal.h b/Tactility/Source/app/gpio/GpioHal.h
similarity index 100%
rename from Tactility/Source/app/Gpio/GpioHal.h
rename to Tactility/Source/app/gpio/GpioHal.h
diff --git a/Tactility/Source/app/I2cSettings/I2cSettings.cpp b/Tactility/Source/app/i2csettings/I2cSettings.cpp
similarity index 97%
rename from Tactility/Source/app/I2cSettings/I2cSettings.cpp
rename to Tactility/Source/app/i2csettings/I2cSettings.cpp
index 1e5656ba..20b715ca 100644
--- a/Tactility/Source/app/I2cSettings/I2cSettings.cpp
+++ b/Tactility/Source/app/i2csettings/I2cSettings.cpp
@@ -1,11 +1,11 @@
 #include "Assets.h"
 #include "hal/i2c/I2c.h"
 #include "Tactility.h"
-#include "ui/Style.h"
-#include "ui/Toolbar.h"
+#include "lvgl/Style.h"
+#include "lvgl/Toolbar.h"
 #include "lvgl.h"
 
-namespace tt::app::settings::i2c {
+namespace tt::app::i2csettings {
 
 static void on_switch_toggle(lv_event_t* event) {
     lv_event_code_t code = lv_event_get_code(event);
diff --git a/Tactility/Source/app/ImageViewer/ImageViewer.cpp b/Tactility/Source/app/imageviewer/ImageViewer.cpp
similarity index 92%
rename from Tactility/Source/app/ImageViewer/ImageViewer.cpp
rename to Tactility/Source/app/imageviewer/ImageViewer.cpp
index 7263aaeb..07996ebe 100644
--- a/Tactility/Source/app/ImageViewer/ImageViewer.cpp
+++ b/Tactility/Source/app/imageviewer/ImageViewer.cpp
@@ -1,10 +1,10 @@
 #include "ImageViewer.h"
 #include "Log.h"
 #include "lvgl.h"
-#include "ui/Style.h"
-#include "ui/Toolbar.h"
+#include "lvgl/Style.h"
+#include "lvgl/Toolbar.h"
 
-namespace tt::app::image_viewer {
+namespace tt::app::imageviewer {
 
 #define TAG "image_viewer"
 
diff --git a/Tactility/Source/app/ImageViewer/ImageViewer.h b/Tactility/Source/app/imageviewer/ImageViewer.h
similarity index 100%
rename from Tactility/Source/app/ImageViewer/ImageViewer.h
rename to Tactility/Source/app/imageviewer/ImageViewer.h
diff --git a/Tactility/Source/app/Power/Power.cpp b/Tactility/Source/app/power/Power.cpp
similarity index 97%
rename from Tactility/Source/app/Power/Power.cpp
rename to Tactility/Source/app/power/Power.cpp
index d77a41dc..d334fea8 100644
--- a/Tactility/Source/app/Power/Power.cpp
+++ b/Tactility/Source/app/power/Power.cpp
@@ -3,11 +3,11 @@
 #include "lvgl.h"
 #include "Tactility.h"
 #include "Timer.h"
-#include "ui/LvglSync.h"
-#include "ui/Style.h"
-#include "ui/Toolbar.h"
+#include "lvgl/LvglSync.h"
+#include "lvgl/Style.h"
+#include "lvgl/Toolbar.h"
 
-namespace tt::app::settings::power {
+namespace tt::app::power {
 
 #define TAG "power"
 
diff --git a/Tactility/Source/app/Screenshot/Screenshot.cpp b/Tactility/Source/app/screenshot/Screenshot.cpp
similarity index 100%
rename from Tactility/Source/app/Screenshot/Screenshot.cpp
rename to Tactility/Source/app/screenshot/Screenshot.cpp
diff --git a/Tactility/Source/app/Screenshot/ScreenshotUi.cpp b/Tactility/Source/app/screenshot/ScreenshotUi.cpp
similarity index 99%
rename from Tactility/Source/app/Screenshot/ScreenshotUi.cpp
rename to Tactility/Source/app/screenshot/ScreenshotUi.cpp
index 4f515b9f..3cb7e4fe 100644
--- a/Tactility/Source/app/Screenshot/ScreenshotUi.cpp
+++ b/Tactility/Source/app/screenshot/ScreenshotUi.cpp
@@ -4,7 +4,7 @@
 #include "hal/sdcard/Sdcard.h"
 #include "service/gui/Gui.h"
 #include "service/screenshot/Screenshot.h"
-#include "ui/Toolbar.h"
+#include "lvgl/Toolbar.h"
 
 namespace tt::app::screenshot {
 
diff --git a/Tactility/Source/app/Screenshot/ScreenshotUi.h b/Tactility/Source/app/screenshot/ScreenshotUi.h
similarity index 100%
rename from Tactility/Source/app/Screenshot/ScreenshotUi.h
rename to Tactility/Source/app/screenshot/ScreenshotUi.h
diff --git a/Tactility/Source/app/Settings/Settings.cpp b/Tactility/Source/app/settings/Settings.cpp
similarity index 98%
rename from Tactility/Source/app/Settings/Settings.cpp
rename to Tactility/Source/app/settings/Settings.cpp
index 0d2acec9..9449a6d3 100644
--- a/Tactility/Source/app/Settings/Settings.cpp
+++ b/Tactility/Source/app/settings/Settings.cpp
@@ -2,7 +2,7 @@
 #include "Assets.h"
 #include "Check.h"
 #include "service/loader/Loader.h"
-#include "ui/Toolbar.h"
+#include "lvgl/Toolbar.h"
 #include "lvgl.h"
 #include <algorithm>
 
diff --git a/Tactility/Source/app/SystemInfo/SystemInfo.cpp b/Tactility/Source/app/systeminfo/SystemInfo.cpp
similarity index 98%
rename from Tactility/Source/app/SystemInfo/SystemInfo.cpp
rename to Tactility/Source/app/systeminfo/SystemInfo.cpp
index bbfece81..b0f91827 100644
--- a/Tactility/Source/app/SystemInfo/SystemInfo.cpp
+++ b/Tactility/Source/app/systeminfo/SystemInfo.cpp
@@ -1,9 +1,9 @@
 #include "Assets.h"
 #include "lvgl.h"
 #include "Tactility.h"
-#include "ui/Toolbar.h"
+#include "lvgl/Toolbar.h"
 
-namespace tt::app::system_info {
+namespace tt::app::systeminfo {
 
 static size_t get_heap_free() {
 #ifdef ESP_PLATFORM
diff --git a/Tactility/Source/app/TextViewer/TextViewer.cpp b/Tactility/Source/app/textviewer/TextViewer.cpp
similarity index 90%
rename from Tactility/Source/app/TextViewer/TextViewer.cpp
rename to Tactility/Source/app/textviewer/TextViewer.cpp
index 69c4a015..b8e5edf4 100644
--- a/Tactility/Source/app/TextViewer/TextViewer.cpp
+++ b/Tactility/Source/app/textviewer/TextViewer.cpp
@@ -1,13 +1,13 @@
 #include "Log.h"
 #include "TextViewer.h"
 #include "lvgl.h"
-#include "ui/LabelUtils.h"
-#include "ui/Style.h"
-#include "ui/Toolbar.h"
+#include "lvgl/LabelUtils.h"
+#include "lvgl/Style.h"
+#include "lvgl/Toolbar.h"
 
 #define TAG "text_viewer"
 
-namespace tt::app::text_viewer {
+namespace tt::app::textviewer {
 
 static void on_show(App app, lv_obj_t* parent) {
     lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
diff --git a/Tactility/Source/app/TextViewer/TextViewer.h b/Tactility/Source/app/textviewer/TextViewer.h
similarity index 100%
rename from Tactility/Source/app/TextViewer/TextViewer.h
rename to Tactility/Source/app/textviewer/TextViewer.h
diff --git a/Tactility/Source/app/WifiConnect/WifiConnect.cpp b/Tactility/Source/app/wificonnect/WifiConnect.cpp
similarity index 98%
rename from Tactility/Source/app/WifiConnect/WifiConnect.cpp
rename to Tactility/Source/app/wificonnect/WifiConnect.cpp
index ddc1e1b0..28d542c7 100644
--- a/Tactility/Source/app/WifiConnect/WifiConnect.cpp
+++ b/Tactility/Source/app/wificonnect/WifiConnect.cpp
@@ -5,9 +5,9 @@
 #include "WifiConnectStateUpdating.h"
 #include "service/loader/Loader.h"
 #include "service/wifi/Wifi.h"
-#include "ui/LvglSync.h"
+#include "lvgl/LvglSync.h"
 
-namespace tt::app::wifi_connect {
+namespace tt::app::wificonnect {
 
 #define TAG "wifi_connect"
 
diff --git a/Tactility/Source/app/WifiConnect/WifiConnect.h b/Tactility/Source/app/wificonnect/WifiConnect.h
similarity index 93%
rename from Tactility/Source/app/WifiConnect/WifiConnect.h
rename to Tactility/Source/app/wificonnect/WifiConnect.h
index 12fd8067..5d0b5443 100644
--- a/Tactility/Source/app/WifiConnect/WifiConnect.h
+++ b/Tactility/Source/app/wificonnect/WifiConnect.h
@@ -6,7 +6,7 @@
 #include "WifiConnectView.h"
 #include "service/wifi/Wifi.h"
 
-namespace tt::app::wifi_connect {
+namespace tt::app::wificonnect {
 
 typedef struct {
     PubSubSubscription* wifi_subscription;
diff --git a/Tactility/Source/app/WifiConnect/WifiConnectBindings.h b/Tactility/Source/app/wificonnect/WifiConnectBindings.h
similarity index 89%
rename from Tactility/Source/app/WifiConnect/WifiConnectBindings.h
rename to Tactility/Source/app/wificonnect/WifiConnectBindings.h
index a68406c3..3025d573 100644
--- a/Tactility/Source/app/WifiConnect/WifiConnectBindings.h
+++ b/Tactility/Source/app/wificonnect/WifiConnectBindings.h
@@ -2,7 +2,7 @@
 
 #include "service/wifi/WifiSettings.h"
 
-namespace tt::app::wifi_connect {
+namespace tt::app::wificonnect {
 
 typedef void (*OnConnectSsid)(const service::wifi::settings::WifiApSettings* settings, bool store, void* context);
 
diff --git a/Tactility/Source/app/WifiConnect/WifiConnectBundle.h b/Tactility/Source/app/wificonnect/WifiConnectBundle.h
similarity index 100%
rename from Tactility/Source/app/WifiConnect/WifiConnectBundle.h
rename to Tactility/Source/app/wificonnect/WifiConnectBundle.h
diff --git a/Tactility/Source/app/WifiConnect/WifiConnectState.h b/Tactility/Source/app/wificonnect/WifiConnectState.h
similarity index 88%
rename from Tactility/Source/app/WifiConnect/WifiConnectState.h
rename to Tactility/Source/app/wificonnect/WifiConnectState.h
index e3c69487..fe6297cf 100644
--- a/Tactility/Source/app/WifiConnect/WifiConnectState.h
+++ b/Tactility/Source/app/wificonnect/WifiConnectState.h
@@ -3,7 +3,7 @@
 #include "service/wifi/Wifi.h"
 #include "service/wifi/WifiSettings.h"
 
-namespace tt::app::wifi_connect {
+namespace tt::app::wificonnect {
 
 /**
  * View's state
diff --git a/Tactility/Source/app/WifiConnect/WifiConnectStateUpdating.cpp b/Tactility/Source/app/wificonnect/WifiConnectStateUpdating.cpp
similarity index 94%
rename from Tactility/Source/app/WifiConnect/WifiConnectStateUpdating.cpp
rename to Tactility/Source/app/wificonnect/WifiConnectStateUpdating.cpp
index 23cd6ce8..10c09873 100644
--- a/Tactility/Source/app/WifiConnect/WifiConnectStateUpdating.cpp
+++ b/Tactility/Source/app/wificonnect/WifiConnectStateUpdating.cpp
@@ -1,6 +1,6 @@
 #include "WifiConnectStateUpdating.h"
 
-namespace tt::app::wifi_connect {
+namespace tt::app::wificonnect {
 
 void state_set_radio_error(WifiConnect* wifi, bool error) {
     lock(wifi);
diff --git a/Tactility/Source/app/WifiConnect/WifiConnectStateUpdating.h b/Tactility/Source/app/wificonnect/WifiConnectStateUpdating.h
similarity index 89%
rename from Tactility/Source/app/WifiConnect/WifiConnectStateUpdating.h
rename to Tactility/Source/app/wificonnect/WifiConnectStateUpdating.h
index 585a425d..ee934318 100644
--- a/Tactility/Source/app/WifiConnect/WifiConnectStateUpdating.h
+++ b/Tactility/Source/app/wificonnect/WifiConnectStateUpdating.h
@@ -2,7 +2,7 @@
 
 #include "WifiConnect.h"
 
-namespace tt::app::wifi_connect {
+namespace tt::app::wificonnect {
 
 void state_set_radio_error(WifiConnect* wifi, bool error);
 void state_set_ap_settings(WifiConnect* wifi, const service::wifi::settings::WifiApSettings* settings);
diff --git a/Tactility/Source/app/WifiConnect/WifiConnectView.cpp b/Tactility/Source/app/wificonnect/WifiConnectView.cpp
similarity index 99%
rename from Tactility/Source/app/WifiConnect/WifiConnectView.cpp
rename to Tactility/Source/app/wificonnect/WifiConnectView.cpp
index eceb78eb..778898dc 100644
--- a/Tactility/Source/app/WifiConnect/WifiConnectView.cpp
+++ b/Tactility/Source/app/wificonnect/WifiConnectView.cpp
@@ -8,10 +8,10 @@
 #include "lvgl.h"
 #include "service/gui/Gui.h"
 #include "service/wifi/WifiSettings.h"
-#include "ui/Style.h"
-#include "ui/Toolbar.h"
+#include "lvgl/Style.h"
+#include "lvgl/Toolbar.h"
 
-namespace tt::app::wifi_connect {
+namespace tt::app::wificonnect {
 
 #define TAG "wifi_connect"
 
diff --git a/Tactility/Source/app/WifiConnect/WifiConnectView.h b/Tactility/Source/app/wificonnect/WifiConnectView.h
similarity index 95%
rename from Tactility/Source/app/WifiConnect/WifiConnectView.h
rename to Tactility/Source/app/wificonnect/WifiConnectView.h
index 14c2f79a..84ad8e2d 100644
--- a/Tactility/Source/app/WifiConnect/WifiConnectView.h
+++ b/Tactility/Source/app/wificonnect/WifiConnectView.h
@@ -5,7 +5,7 @@
 #include "WifiConnectState.h"
 #include "lvgl.h"
 
-namespace tt::app::wifi_connect {
+namespace tt::app::wificonnect {
 
 typedef struct {
     lv_obj_t* ssid_textarea;
diff --git a/Tactility/Source/app/WifiManager/WifiManage.cpp b/Tactility/Source/app/wifimanage/WifiManage.cpp
similarity index 98%
rename from Tactility/Source/app/WifiManager/WifiManage.cpp
rename to Tactility/Source/app/wifimanage/WifiManage.cpp
index 7cfdc9b0..a3feccc8 100644
--- a/Tactility/Source/app/WifiManager/WifiManage.cpp
+++ b/Tactility/Source/app/wifimanage/WifiManage.cpp
@@ -1,15 +1,15 @@
 #include "WifiManage.h"
 
 #include "app/App.h"
-#include "app/WifiConnect/WifiConnectBundle.h"
+#include "app/wificonnect/WifiConnectBundle.h"
 #include "TactilityCore.h"
 #include "service/loader/Loader.h"
 #include "service/wifi/WifiSettings.h"
-#include "ui/LvglSync.h"
+#include "lvgl/LvglSync.h"
 #include "WifiManageStateUpdating.h"
 #include "WifiManageView.h"
 
-namespace tt::app::wifi_manage {
+namespace tt::app::wifimanage {
 
 #define TAG "wifi_manage"
 
diff --git a/Tactility/Source/app/WifiManager/WifiManage.h b/Tactility/Source/app/wifimanage/WifiManage.h
similarity index 92%
rename from Tactility/Source/app/WifiManager/WifiManage.h
rename to Tactility/Source/app/wifimanage/WifiManage.h
index 22f51b4a..036a44cf 100644
--- a/Tactility/Source/app/WifiManager/WifiManage.h
+++ b/Tactility/Source/app/wifimanage/WifiManage.h
@@ -4,7 +4,7 @@
 #include "WifiManageView.h"
 #include "service/wifi/Wifi.h"
 
-namespace tt::app::wifi_manage {
+namespace tt::app::wifimanage {
 
 typedef struct {
     PubSubSubscription* wifi_subscription;
diff --git a/Tactility/Source/app/WifiManager/WifiManageBindings.h b/Tactility/Source/app/wifimanage/WifiManageBindings.h
similarity index 90%
rename from Tactility/Source/app/WifiManager/WifiManageBindings.h
rename to Tactility/Source/app/wifimanage/WifiManageBindings.h
index e1501799..b0e79d74 100644
--- a/Tactility/Source/app/WifiManager/WifiManageBindings.h
+++ b/Tactility/Source/app/wifimanage/WifiManageBindings.h
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace tt::app::wifi_manage {
+namespace tt::app::wifimanage {
 
 typedef void (*OnWifiToggled)(bool enable);
 typedef void (*OnConnectSsid)(const char* ssid);
diff --git a/Tactility/Source/app/WifiManager/WifiManageState.h b/Tactility/Source/app/wifimanage/WifiManageState.h
similarity index 91%
rename from Tactility/Source/app/WifiManager/WifiManageState.h
rename to Tactility/Source/app/wifimanage/WifiManageState.h
index 119dd527..0aa71488 100644
--- a/Tactility/Source/app/WifiManager/WifiManageState.h
+++ b/Tactility/Source/app/wifimanage/WifiManageState.h
@@ -2,7 +2,7 @@
 
 #include "service/wifi/Wifi.h"
 
-namespace tt::app::wifi_manage {
+namespace tt::app::wifimanage {
 
 #define WIFI_SCAN_AP_RECORD_COUNT 16
 
diff --git a/Tactility/Source/app/WifiManager/WifiManageStateUpdating.cpp b/Tactility/Source/app/wifimanage/WifiManageStateUpdating.cpp
similarity index 94%
rename from Tactility/Source/app/WifiManager/WifiManageStateUpdating.cpp
rename to Tactility/Source/app/wifimanage/WifiManageStateUpdating.cpp
index a6d94a6f..49a46723 100644
--- a/Tactility/Source/app/WifiManager/WifiManageStateUpdating.cpp
+++ b/Tactility/Source/app/wifimanage/WifiManageStateUpdating.cpp
@@ -1,6 +1,6 @@
 #include "WifiManage.h"
 
-namespace tt::app::wifi_manage {
+namespace tt::app::wifimanage {
 
 void state_set_scanning(WifiManage* wifi, bool is_scanning) {
     lock(wifi);
diff --git a/Tactility/Source/app/WifiManager/WifiManageStateUpdating.h b/Tactility/Source/app/wifimanage/WifiManageStateUpdating.h
similarity index 88%
rename from Tactility/Source/app/WifiManager/WifiManageStateUpdating.h
rename to Tactility/Source/app/wifimanage/WifiManageStateUpdating.h
index 7cbdbce7..6fd4cd11 100644
--- a/Tactility/Source/app/WifiManager/WifiManageStateUpdating.h
+++ b/Tactility/Source/app/wifimanage/WifiManageStateUpdating.h
@@ -2,7 +2,7 @@
 
 #include "WifiManage.h"
 
-namespace tt::app::wifi_manage {
+namespace tt::app::wifimanage {
 
 void state_set_scanning(WifiManage* wifi, bool is_scanning);
 void state_set_radio_state(WifiManage* wifi, service::wifi::WifiRadioState state);
diff --git a/Tactility/Source/app/WifiManager/WifiManageView.cpp b/Tactility/Source/app/wifimanage/WifiManageView.cpp
similarity index 99%
rename from Tactility/Source/app/WifiManager/WifiManageView.cpp
rename to Tactility/Source/app/wifimanage/WifiManageView.cpp
index 6375c510..94a6e7ca 100644
--- a/Tactility/Source/app/WifiManager/WifiManageView.cpp
+++ b/Tactility/Source/app/wifimanage/WifiManageView.cpp
@@ -4,10 +4,10 @@
 #include "WifiManageState.h"
 #include "service/statusbar/Statusbar.h"
 #include "service/wifi/Wifi.h"
-#include "ui/Style.h"
-#include "ui/Toolbar.h"
+#include "lvgl/Style.h"
+#include "lvgl/Toolbar.h"
 
-namespace tt::app::wifi_manage {
+namespace tt::app::wifimanage {
 
 #define TAG "wifi_main_view"
 #define SPINNER_HEIGHT 40
diff --git a/Tactility/Source/app/WifiManager/WifiManageView.h b/Tactility/Source/app/wifimanage/WifiManageView.h
similarity index 94%
rename from Tactility/Source/app/WifiManager/WifiManageView.h
rename to Tactility/Source/app/wifimanage/WifiManageView.h
index 27bd73b5..7c64d067 100644
--- a/Tactility/Source/app/WifiManager/WifiManageView.h
+++ b/Tactility/Source/app/wifimanage/WifiManageView.h
@@ -5,7 +5,7 @@
 #include "WifiManageState.h"
 #include "lvgl.h"
 
-namespace tt::app::wifi_manage {
+namespace tt::app::wifimanage {
 
 typedef struct {
     lv_obj_t* root;
diff --git a/Tactility/Source/ui/LvglInit.cpp b/Tactility/Source/lvgl/Init.cpp
similarity index 58%
rename from Tactility/Source/ui/LvglInit.cpp
rename to Tactility/Source/lvgl/Init.cpp
index c492b9ab..6ce5bd25 100644
--- a/Tactility/Source/ui/LvglInit.cpp
+++ b/Tactility/Source/lvgl/Init.cpp
@@ -1,17 +1,17 @@
-#include "app/Display/DisplayPreferences.h"
+#include "app/display/DisplayPreferences.h"
 #include "lvgl.h"
 #include "hal/Configuration.h"
 
-namespace tt::ui {
+namespace tt::lvgl {
 
-void initLvgl(const hal::Configuration* config) {
+void init(const hal::Configuration* config) {
     hal::SetBacklightDuty set_backlight_duty = config->display.setBacklightDuty;
     if (set_backlight_duty != nullptr) {
-        int32_t backlight_duty = app::settings::display::preferences_get_backlight_duty();
+        int32_t backlight_duty = app::display::preferences_get_backlight_duty();
         set_backlight_duty(backlight_duty);
     }
 
-    lv_display_rotation_t rotation = app::settings::display::preferences_get_rotation();
+    lv_display_rotation_t rotation = app::display::preferences_get_rotation();
     if (rotation != lv_disp_get_rotation(lv_disp_get_default())) {
         lv_disp_set_rotation(lv_disp_get_default(), static_cast<lv_display_rotation_t>(rotation));
     }
diff --git a/Tactility/Source/ui/LabelUtils.cpp b/Tactility/Source/lvgl/LabelUtils.cpp
similarity index 100%
rename from Tactility/Source/ui/LabelUtils.cpp
rename to Tactility/Source/lvgl/LabelUtils.cpp
diff --git a/Tactility/Source/ui/LabelUtils.h b/Tactility/Source/lvgl/LabelUtils.h
similarity index 100%
rename from Tactility/Source/ui/LabelUtils.h
rename to Tactility/Source/lvgl/LabelUtils.h
diff --git a/Tactility/Source/ui/LvglKeypad.cpp b/Tactility/Source/lvgl/LvglKeypad.cpp
similarity index 100%
rename from Tactility/Source/ui/LvglKeypad.cpp
rename to Tactility/Source/lvgl/LvglKeypad.cpp
diff --git a/Tactility/Source/ui/LvglKeypad.h b/Tactility/Source/lvgl/LvglKeypad.h
similarity index 100%
rename from Tactility/Source/ui/LvglKeypad.h
rename to Tactility/Source/lvgl/LvglKeypad.h
diff --git a/Tactility/Source/ui/LvglSync.cpp b/Tactility/Source/lvgl/LvglSync.cpp
similarity index 100%
rename from Tactility/Source/ui/LvglSync.cpp
rename to Tactility/Source/lvgl/LvglSync.cpp
diff --git a/Tactility/Source/ui/LvglSync.h b/Tactility/Source/lvgl/LvglSync.h
similarity index 100%
rename from Tactility/Source/ui/LvglSync.h
rename to Tactility/Source/lvgl/LvglSync.h
diff --git a/Tactility/Source/ui/Spacer.cpp b/Tactility/Source/lvgl/Spacer.cpp
similarity index 100%
rename from Tactility/Source/ui/Spacer.cpp
rename to Tactility/Source/lvgl/Spacer.cpp
diff --git a/Tactility/Source/ui/Spacer.h b/Tactility/Source/lvgl/Spacer.h
similarity index 100%
rename from Tactility/Source/ui/Spacer.h
rename to Tactility/Source/lvgl/Spacer.h
diff --git a/Tactility/Source/ui/Statusbar.cpp b/Tactility/Source/lvgl/Statusbar.cpp
similarity index 99%
rename from Tactility/Source/ui/Statusbar.cpp
rename to Tactility/Source/lvgl/Statusbar.cpp
index 4f4909c0..8e9e6ff2 100644
--- a/Tactility/Source/ui/Statusbar.cpp
+++ b/Tactility/Source/lvgl/Statusbar.cpp
@@ -4,8 +4,8 @@
 #include "Mutex.h"
 #include "Pubsub.h"
 #include "TactilityCore.h"
-#include "ui/Spacer.h"
-#include "ui/Style.h"
+#include "lvgl/Spacer.h"
+#include "lvgl/Style.h"
 
 #include "LvglSync.h"
 #include "lvgl.h"
diff --git a/Tactility/Source/ui/Statusbar.h b/Tactility/Source/lvgl/Statusbar.h
similarity index 100%
rename from Tactility/Source/ui/Statusbar.h
rename to Tactility/Source/lvgl/Statusbar.h
diff --git a/Tactility/Source/ui/Style.cpp b/Tactility/Source/lvgl/Style.cpp
similarity index 100%
rename from Tactility/Source/ui/Style.cpp
rename to Tactility/Source/lvgl/Style.cpp
diff --git a/Tactility/Source/ui/Style.h b/Tactility/Source/lvgl/Style.h
similarity index 100%
rename from Tactility/Source/ui/Style.h
rename to Tactility/Source/lvgl/Style.h
diff --git a/Tactility/Source/ui/Toolbar.cpp b/Tactility/Source/lvgl/Toolbar.cpp
similarity index 98%
rename from Tactility/Source/ui/Toolbar.cpp
rename to Tactility/Source/lvgl/Toolbar.cpp
index 275877ff..17c15ae1 100644
--- a/Tactility/Source/ui/Toolbar.cpp
+++ b/Tactility/Source/lvgl/Toolbar.cpp
@@ -3,8 +3,8 @@
 #include "Tactility.h"
 
 #include "service/loader/Loader.h"
-#include "ui/Spacer.h"
-#include "ui/Style.h"
+#include "lvgl/Spacer.h"
+#include "lvgl/Style.h"
 
 namespace tt::lvgl {
 
diff --git a/Tactility/Source/ui/Toolbar.h b/Tactility/Source/lvgl/Toolbar.h
similarity index 100%
rename from Tactility/Source/ui/Toolbar.h
rename to Tactility/Source/lvgl/Toolbar.h
diff --git a/Tactility/Source/service/gui/Gui.cpp b/Tactility/Source/service/gui/Gui.cpp
index 898bbe26..7dbb60b9 100644
--- a/Tactility/Source/service/gui/Gui.cpp
+++ b/Tactility/Source/service/gui/Gui.cpp
@@ -1,8 +1,8 @@
 #include "Tactility.h"
 #include "service/gui/Gui_i.h"
 #include "service/loader/Loader.h"
-#include "ui/LvglKeypad.h"
-#include "ui/LvglSync.h"
+#include "lvgl/LvglKeypad.h"
+#include "lvgl/LvglSync.h"
 
 #ifdef ESP_PLATFORM
 #include "freertos/FreeRTOS.h"
diff --git a/Tactility/Source/service/gui/GuiDraw.cpp b/Tactility/Source/service/gui/GuiDraw.cpp
index 8e2cad71..a3def7c7 100644
--- a/Tactility/Source/service/gui/GuiDraw.cpp
+++ b/Tactility/Source/service/gui/GuiDraw.cpp
@@ -1,9 +1,9 @@
 #include "Check.h"
 #include "Log.h"
 #include "service/gui/Gui_i.h"
-#include "ui/LvglSync.h"
-#include "ui/Statusbar.h"
-#include "ui/Style.h"
+#include "lvgl/LvglSync.h"
+#include "lvgl/Statusbar.h"
+#include "lvgl/Style.h"
 
 namespace tt::service::gui {
 
diff --git a/Tactility/Source/service/gui/Keyboard.cpp b/Tactility/Source/service/gui/Keyboard.cpp
index 64b51e67..0effdc83 100644
--- a/Tactility/Source/service/gui/Keyboard.cpp
+++ b/Tactility/Source/service/gui/Keyboard.cpp
@@ -1,8 +1,8 @@
 #include "Check.h"
 #include "TactilityConfig.h"
 #include "service/gui/Gui_i.h"
-#include "ui/LvglKeypad.h"
-#include "ui/LvglSync.h"
+#include "lvgl/LvglKeypad.h"
+#include "lvgl/LvglSync.h"
 
 namespace tt::service::gui {
 
diff --git a/Tactility/Source/service/gui/ViewPort.cpp b/Tactility/Source/service/gui/ViewPort.cpp
index e825b50e..33ddf9d9 100644
--- a/Tactility/Source/service/gui/ViewPort.cpp
+++ b/Tactility/Source/service/gui/ViewPort.cpp
@@ -2,7 +2,7 @@
 
 #include "Check.h"
 #include "service/gui/ViewPort_i.h"
-#include "ui/Style.h"
+#include "lvgl/Style.h"
 
 namespace tt::service::gui {
 
diff --git a/Tactility/Source/service/loader/Loader.cpp b/Tactility/Source/service/loader/Loader.cpp
index a2a1263d..00e68ddb 100644
--- a/Tactility/Source/service/loader/Loader.cpp
+++ b/Tactility/Source/service/loader/Loader.cpp
@@ -10,7 +10,7 @@
 #include "freertos/FreeRTOS.h"
 #else
 #include "FreeRTOS.h"
-#include "ui/LvglSync.h"
+#include "lvgl/LvglSync.h"
 
 #endif
 
diff --git a/Tactility/Source/service/screenshot/ScreenshotTask.cpp b/Tactility/Source/service/screenshot/ScreenshotTask.cpp
index e55d562b..af8c47f7 100644
--- a/Tactility/Source/service/screenshot/ScreenshotTask.cpp
+++ b/Tactility/Source/service/screenshot/ScreenshotTask.cpp
@@ -6,7 +6,7 @@
 #include "TactilityCore.h"
 #include "Thread.h"
 #include "service/loader/Loader.h"
-#include "ui/LvglSync.h"
+#include "lvgl/LvglSync.h"
 
 namespace tt::service::screenshot {
 
diff --git a/Tactility/Source/service/statusbar/Statusbar.cpp b/Tactility/Source/service/statusbar/Statusbar.cpp
index 79b76ef4..762e5e8e 100644
--- a/Tactility/Source/service/statusbar/Statusbar.cpp
+++ b/Tactility/Source/service/statusbar/Statusbar.cpp
@@ -5,7 +5,7 @@
 #include "service/Service.h"
 #include "service/wifi/Wifi.h"
 #include "Tactility.h"
-#include "ui/Statusbar.h"
+#include "lvgl/Statusbar.h"
 
 namespace tt::service::statusbar {