diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f7ff6178..546ce813 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -292,55 +292,55 @@ set(LVGL_SRC
         )
 
 list(APPEND IMAGE_FILES
-        DisplayApp/Icons/battery/os_battery_error.c
-        DisplayApp/Icons/battery/os_battery_100.c
-        DisplayApp/Icons/battery/os_battery_090.c
-        DisplayApp/Icons/battery/os_battery_080.c
-        DisplayApp/Icons/battery/os_battery_070.c
-        DisplayApp/Icons/battery/os_battery_060.c
-        DisplayApp/Icons/battery/os_battery_050.c
-        DisplayApp/Icons/battery/os_battery_040.c
-        DisplayApp/Icons/battery/os_battery_030.c
-        DisplayApp/Icons/battery/os_battery_020.c
-        DisplayApp/Icons/battery/os_battery_010.c
-        DisplayApp/Icons/battery/os_battery_005.c
+        displayapp/Icons/battery/os_battery_error.c
+        displayapp/Icons/battery/os_battery_100.c
+        displayapp/Icons/battery/os_battery_090.c
+        displayapp/Icons/battery/os_battery_080.c
+        displayapp/Icons/battery/os_battery_070.c
+        displayapp/Icons/battery/os_battery_060.c
+        displayapp/Icons/battery/os_battery_050.c
+        displayapp/Icons/battery/os_battery_040.c
+        displayapp/Icons/battery/os_battery_030.c
+        displayapp/Icons/battery/os_battery_020.c
+        displayapp/Icons/battery/os_battery_010.c
+        displayapp/Icons/battery/os_battery_005.c
 
-        DisplayApp/Icons/battery/os_batterycharging_100.c
-        DisplayApp/Icons/battery/os_batterycharging_090.c
-        DisplayApp/Icons/battery/os_batterycharging_080.c
-        DisplayApp/Icons/battery/os_batterycharging_070.c
-        DisplayApp/Icons/battery/os_batterycharging_060.c
-        DisplayApp/Icons/battery/os_batterycharging_050.c
-        DisplayApp/Icons/battery/os_batterycharging_040.c
-        DisplayApp/Icons/battery/os_batterycharging_030.c
-        DisplayApp/Icons/battery/os_batterycharging_020.c
-        DisplayApp/Icons/battery/os_batterycharging_010.c
-        DisplayApp/Icons/battery/os_batterycharging_005.c
+        displayapp/Icons/battery/os_batterycharging_100.c
+        displayapp/Icons/battery/os_batterycharging_090.c
+        displayapp/Icons/battery/os_batterycharging_080.c
+        displayapp/Icons/battery/os_batterycharging_070.c
+        displayapp/Icons/battery/os_batterycharging_060.c
+        displayapp/Icons/battery/os_batterycharging_050.c
+        displayapp/Icons/battery/os_batterycharging_040.c
+        displayapp/Icons/battery/os_batterycharging_030.c
+        displayapp/Icons/battery/os_batterycharging_020.c
+        displayapp/Icons/battery/os_batterycharging_010.c
+        displayapp/Icons/battery/os_batterycharging_005.c
 
-        DisplayApp/Icons/bluetooth/os_bt_connected.c
-        DisplayApp/Icons/bluetooth/os_bt_disconnected.c
+        displayapp/Icons/bluetooth/os_bt_connected.c
+        displayapp/Icons/bluetooth/os_bt_disconnected.c
         )
 
 list(APPEND SOURCE_FILES
         logging/NrfLogger.cpp
-        DisplayApp/DisplayApp.cpp
-        DisplayApp/Screens/Screen.cpp
-        DisplayApp/Screens/Clock.cpp
-        DisplayApp/Screens/Tile.cpp
-        DisplayApp/Screens/Meter.cpp
-        DisplayApp/Screens/Gauge.cpp
-        DisplayApp/Screens/InfiniPaint.cpp
-        DisplayApp/Screens/DropDownDemo.cpp
-        DisplayApp/Screens/Modal.cpp
-        DisplayApp/Screens/BatteryIcon.cpp
-        DisplayApp/Screens/BleIcon.cpp
-        DisplayApp/Screens/Brightness.cpp
-        DisplayApp/Screens/SystemInfo.cpp
-        DisplayApp/Screens/Label.cpp
-        DisplayApp/Screens/FirmwareUpdate.cpp
-        DisplayApp/Screens/Music.cpp
-        DisplayApp/Screens/FirmwareValidation.cpp
-        DisplayApp/Screens/ApplicationList.cpp
+        displayapp/DisplayApp.cpp
+        displayapp/Screens/Screen.cpp
+        displayapp/Screens/Clock.cpp
+        displayapp/Screens/Tile.cpp
+        displayapp/Screens/Meter.cpp
+        displayapp/Screens/Gauge.cpp
+        displayapp/Screens/InfiniPaint.cpp
+        displayapp/Screens/DropDownDemo.cpp
+        displayapp/Screens/Modal.cpp
+        displayapp/Screens/BatteryIcon.cpp
+        displayapp/Screens/BleIcon.cpp
+        displayapp/Screens/Brightness.cpp
+        displayapp/Screens/SystemInfo.cpp
+        displayapp/Screens/Label.cpp
+        displayapp/Screens/FirmwareUpdate.cpp
+        displayapp/Screens/Music.cpp
+        displayapp/Screens/FirmwareValidation.cpp
+        displayapp/Screens/ApplicationList.cpp
         main.cpp
         drivers/St7789.cpp
         drivers/SpiNorFlash.cpp
@@ -370,9 +370,9 @@ list(APPEND SOURCE_FILES
         FreeRTOS/port_cmsis_systick.c
         FreeRTOS/port_cmsis.c
 
-        DisplayApp/LittleVgl.cpp
-        DisplayApp/Fonts/jetbrains_mono_extrabold_compressed.c
-        DisplayApp/Fonts/jetbrains_mono_bold_20.c
+        displayapp/LittleVgl.cpp
+        displayapp/Fonts/jetbrains_mono_extrabold_compressed.c
+        displayapp/Fonts/jetbrains_mono_bold_20.c
 
         systemtask/SystemTask.cpp
         drivers/TwiMaster.cpp
@@ -399,26 +399,26 @@ list(APPEND GRAPHICS_SOURCE_FILES
 set(INCLUDE_FILES
         logging/Logger.h
         logging/NrfLogger.h
-        DisplayApp/DisplayApp.h
-        DisplayApp/TouchEvents.h
-        DisplayApp/Screens/Screen.h
-        DisplayApp/Screens/Clock.h
-        DisplayApp/Screens/Tile.h
-        DisplayApp/Screens/Meter.h
-        DisplayApp/Screens/Gauge.h
-        DisplayApp/Screens/InfiniPaint.h
-        DisplayApp/Screens/DropDownDemo.h
-        DisplayApp/Screens/Modal.h
-        DisplayApp/Screens/BatteryIcon.h
-        DisplayApp/Screens/BleIcon.cpp
-        DisplayApp/Screens/Brightness.h
-        DisplayApp/Screens/SystemInfo.h
-        DisplayApp/Screens/ScreenList.h
-        DisplayApp/Screens/Label.h
-        DisplayApp/Screens/FirmwareUpdate.h
-        DisplayApp/Screens/FirmwareValidation.h
-        DisplayApp/Screens/ApplicationList.h
-        DisplayApp/Apps.h
+        displayapp/DisplayApp.h
+        displayapp/TouchEvents.h
+        displayapp/Screens/Screen.h
+        displayapp/Screens/Clock.h
+        displayapp/Screens/Tile.h
+        displayapp/Screens/Meter.h
+        displayapp/Screens/Gauge.h
+        displayapp/Screens/InfiniPaint.h
+        displayapp/Screens/DropDownDemo.h
+        displayapp/Screens/Modal.h
+        displayapp/Screens/BatteryIcon.h
+        displayapp/Screens/BleIcon.cpp
+        displayapp/Screens/Brightness.h
+        displayapp/Screens/SystemInfo.h
+        displayapp/Screens/ScreenList.h
+        displayapp/Screens/Label.h
+        displayapp/Screens/FirmwareUpdate.h
+        displayapp/Screens/FirmwareValidation.h
+        displayapp/Screens/ApplicationList.h
+        displayapp/Apps.h
         drivers/St7789.h
         drivers/SpiNorFlash.h
         drivers/SpiMaster.h
@@ -450,10 +450,10 @@ set(INCLUDE_FILES
         libs/date/includes/date/julian.h
         libs/date/includes/date/ptz.h
         libs/date/includes/date/tz_private.h
-        DisplayApp/LittleVgl.h
+        displayapp/LittleVgl.h
         systemtask/SystemTask.h
         systemtask/SystemMonitor.h
-        DisplayApp/Screens/Symbols.h
+        displayapp/Screens/Symbols.h
         drivers/TwiMaster.h
         )
 
diff --git a/src/DisplayApp/Apps.h b/src/displayapp/Apps.h
similarity index 100%
rename from src/DisplayApp/Apps.h
rename to src/displayapp/Apps.h
diff --git a/src/DisplayApp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
similarity index 98%
rename from src/DisplayApp/DisplayApp.cpp
rename to src/displayapp/DisplayApp.cpp
index f6138ec7..46e81f1d 100644
--- a/src/DisplayApp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -43,13 +43,13 @@ DisplayApp::DisplayApp(Drivers::St7789 &lcd, Components::LittleVgl &lvgl, Driver
 }
 
 void DisplayApp::Start() {
-  if (pdPASS != xTaskCreate(DisplayApp::Process, "DisplayApp", 512, this, 0, &taskHandle))
+  if (pdPASS != xTaskCreate(DisplayApp::Process, "displayapp", 512, this, 0, &taskHandle))
     APP_ERROR_HANDLER(NRF_ERROR_NO_MEM);
 }
 
 void DisplayApp::Process(void *instance) {
   auto *app = static_cast<DisplayApp *>(instance);
-  NRF_LOG_INFO("DisplayApp task started!");
+  NRF_LOG_INFO("displayapp task started!");
   app->InitHw();
 
   // Send a dummy notification to unlock the lvgl display driver for the first iteration
diff --git a/src/DisplayApp/DisplayApp.h b/src/displayapp/DisplayApp.h
similarity index 100%
rename from src/DisplayApp/DisplayApp.h
rename to src/displayapp/DisplayApp.h
diff --git a/src/DisplayApp/Fonts/Readme.md b/src/displayapp/Fonts/Readme.md
similarity index 100%
rename from src/DisplayApp/Fonts/Readme.md
rename to src/displayapp/Fonts/Readme.md
diff --git a/src/DisplayApp/Fonts/jetbrains_mono_bold_20.c b/src/displayapp/Fonts/jetbrains_mono_bold_20.c
similarity index 100%
rename from src/DisplayApp/Fonts/jetbrains_mono_bold_20.c
rename to src/displayapp/Fonts/jetbrains_mono_bold_20.c
diff --git a/src/DisplayApp/Fonts/jetbrains_mono_extrabold_compressed.c b/src/displayapp/Fonts/jetbrains_mono_extrabold_compressed.c
similarity index 100%
rename from src/DisplayApp/Fonts/jetbrains_mono_extrabold_compressed.c
rename to src/displayapp/Fonts/jetbrains_mono_extrabold_compressed.c
diff --git a/src/DisplayApp/Icons/battery/os_battery_005.c b/src/displayapp/Icons/battery/os_battery_005.c
similarity index 100%
rename from src/DisplayApp/Icons/battery/os_battery_005.c
rename to src/displayapp/Icons/battery/os_battery_005.c
diff --git a/src/DisplayApp/Icons/battery/os_battery_005.png b/src/displayapp/Icons/battery/os_battery_005.png
similarity index 100%
rename from src/DisplayApp/Icons/battery/os_battery_005.png
rename to src/displayapp/Icons/battery/os_battery_005.png
diff --git a/src/DisplayApp/Icons/battery/os_battery_010.c b/src/displayapp/Icons/battery/os_battery_010.c
similarity index 100%
rename from src/DisplayApp/Icons/battery/os_battery_010.c
rename to src/displayapp/Icons/battery/os_battery_010.c
diff --git a/src/DisplayApp/Icons/battery/os_battery_010.png b/src/displayapp/Icons/battery/os_battery_010.png
similarity index 100%
rename from src/DisplayApp/Icons/battery/os_battery_010.png
rename to src/displayapp/Icons/battery/os_battery_010.png
diff --git a/src/DisplayApp/Icons/battery/os_battery_020.c b/src/displayapp/Icons/battery/os_battery_020.c
similarity index 100%
rename from src/DisplayApp/Icons/battery/os_battery_020.c
rename to src/displayapp/Icons/battery/os_battery_020.c
diff --git a/src/DisplayApp/Icons/battery/os_battery_020.png b/src/displayapp/Icons/battery/os_battery_020.png
similarity index 100%
rename from src/DisplayApp/Icons/battery/os_battery_020.png
rename to src/displayapp/Icons/battery/os_battery_020.png
diff --git a/src/DisplayApp/Icons/battery/os_battery_030.c b/src/displayapp/Icons/battery/os_battery_030.c
similarity index 100%
rename from src/DisplayApp/Icons/battery/os_battery_030.c
rename to src/displayapp/Icons/battery/os_battery_030.c
diff --git a/src/DisplayApp/Icons/battery/os_battery_030.png b/src/displayapp/Icons/battery/os_battery_030.png
similarity index 100%
rename from src/DisplayApp/Icons/battery/os_battery_030.png
rename to src/displayapp/Icons/battery/os_battery_030.png
diff --git a/src/DisplayApp/Icons/battery/os_battery_040.c b/src/displayapp/Icons/battery/os_battery_040.c
similarity index 100%
rename from src/DisplayApp/Icons/battery/os_battery_040.c
rename to src/displayapp/Icons/battery/os_battery_040.c
diff --git a/src/DisplayApp/Icons/battery/os_battery_040.png b/src/displayapp/Icons/battery/os_battery_040.png
similarity index 100%
rename from src/DisplayApp/Icons/battery/os_battery_040.png
rename to src/displayapp/Icons/battery/os_battery_040.png
diff --git a/src/DisplayApp/Icons/battery/os_battery_050.c b/src/displayapp/Icons/battery/os_battery_050.c
similarity index 100%
rename from src/DisplayApp/Icons/battery/os_battery_050.c
rename to src/displayapp/Icons/battery/os_battery_050.c
diff --git a/src/DisplayApp/Icons/battery/os_battery_050.png b/src/displayapp/Icons/battery/os_battery_050.png
similarity index 100%
rename from src/DisplayApp/Icons/battery/os_battery_050.png
rename to src/displayapp/Icons/battery/os_battery_050.png
diff --git a/src/DisplayApp/Icons/battery/os_battery_060.c b/src/displayapp/Icons/battery/os_battery_060.c
similarity index 100%
rename from src/DisplayApp/Icons/battery/os_battery_060.c
rename to src/displayapp/Icons/battery/os_battery_060.c
diff --git a/src/DisplayApp/Icons/battery/os_battery_060.png b/src/displayapp/Icons/battery/os_battery_060.png
similarity index 100%
rename from src/DisplayApp/Icons/battery/os_battery_060.png
rename to src/displayapp/Icons/battery/os_battery_060.png
diff --git a/src/DisplayApp/Icons/battery/os_battery_070.c b/src/displayapp/Icons/battery/os_battery_070.c
similarity index 100%
rename from src/DisplayApp/Icons/battery/os_battery_070.c
rename to src/displayapp/Icons/battery/os_battery_070.c
diff --git a/src/DisplayApp/Icons/battery/os_battery_070.png b/src/displayapp/Icons/battery/os_battery_070.png
similarity index 100%
rename from src/DisplayApp/Icons/battery/os_battery_070.png
rename to src/displayapp/Icons/battery/os_battery_070.png
diff --git a/src/DisplayApp/Icons/battery/os_battery_080.c b/src/displayapp/Icons/battery/os_battery_080.c
similarity index 100%
rename from src/DisplayApp/Icons/battery/os_battery_080.c
rename to src/displayapp/Icons/battery/os_battery_080.c
diff --git a/src/DisplayApp/Icons/battery/os_battery_080.png b/src/displayapp/Icons/battery/os_battery_080.png
similarity index 100%
rename from src/DisplayApp/Icons/battery/os_battery_080.png
rename to src/displayapp/Icons/battery/os_battery_080.png
diff --git a/src/DisplayApp/Icons/battery/os_battery_090.c b/src/displayapp/Icons/battery/os_battery_090.c
similarity index 100%
rename from src/DisplayApp/Icons/battery/os_battery_090.c
rename to src/displayapp/Icons/battery/os_battery_090.c
diff --git a/src/DisplayApp/Icons/battery/os_battery_090.png b/src/displayapp/Icons/battery/os_battery_090.png
similarity index 100%
rename from src/DisplayApp/Icons/battery/os_battery_090.png
rename to src/displayapp/Icons/battery/os_battery_090.png
diff --git a/src/DisplayApp/Icons/battery/os_battery_100.c b/src/displayapp/Icons/battery/os_battery_100.c
similarity index 100%
rename from src/DisplayApp/Icons/battery/os_battery_100.c
rename to src/displayapp/Icons/battery/os_battery_100.c
diff --git a/src/DisplayApp/Icons/battery/os_battery_100.png b/src/displayapp/Icons/battery/os_battery_100.png
similarity index 100%
rename from src/DisplayApp/Icons/battery/os_battery_100.png
rename to src/displayapp/Icons/battery/os_battery_100.png
diff --git a/src/DisplayApp/Icons/battery/os_battery_error.c b/src/displayapp/Icons/battery/os_battery_error.c
similarity index 100%
rename from src/DisplayApp/Icons/battery/os_battery_error.c
rename to src/displayapp/Icons/battery/os_battery_error.c
diff --git a/src/DisplayApp/Icons/battery/os_battery_error.png b/src/displayapp/Icons/battery/os_battery_error.png
similarity index 100%
rename from src/DisplayApp/Icons/battery/os_battery_error.png
rename to src/displayapp/Icons/battery/os_battery_error.png
diff --git a/src/DisplayApp/Icons/battery/os_batterycharging_005.c b/src/displayapp/Icons/battery/os_batterycharging_005.c
similarity index 100%
rename from src/DisplayApp/Icons/battery/os_batterycharging_005.c
rename to src/displayapp/Icons/battery/os_batterycharging_005.c
diff --git a/src/DisplayApp/Icons/battery/os_batterycharging_005.png b/src/displayapp/Icons/battery/os_batterycharging_005.png
similarity index 100%
rename from src/DisplayApp/Icons/battery/os_batterycharging_005.png
rename to src/displayapp/Icons/battery/os_batterycharging_005.png
diff --git a/src/DisplayApp/Icons/battery/os_batterycharging_010.c b/src/displayapp/Icons/battery/os_batterycharging_010.c
similarity index 100%
rename from src/DisplayApp/Icons/battery/os_batterycharging_010.c
rename to src/displayapp/Icons/battery/os_batterycharging_010.c
diff --git a/src/DisplayApp/Icons/battery/os_batterycharging_010.png b/src/displayapp/Icons/battery/os_batterycharging_010.png
similarity index 100%
rename from src/DisplayApp/Icons/battery/os_batterycharging_010.png
rename to src/displayapp/Icons/battery/os_batterycharging_010.png
diff --git a/src/DisplayApp/Icons/battery/os_batterycharging_020.c b/src/displayapp/Icons/battery/os_batterycharging_020.c
similarity index 100%
rename from src/DisplayApp/Icons/battery/os_batterycharging_020.c
rename to src/displayapp/Icons/battery/os_batterycharging_020.c
diff --git a/src/DisplayApp/Icons/battery/os_batterycharging_020.png b/src/displayapp/Icons/battery/os_batterycharging_020.png
similarity index 100%
rename from src/DisplayApp/Icons/battery/os_batterycharging_020.png
rename to src/displayapp/Icons/battery/os_batterycharging_020.png
diff --git a/src/DisplayApp/Icons/battery/os_batterycharging_030.c b/src/displayapp/Icons/battery/os_batterycharging_030.c
similarity index 100%
rename from src/DisplayApp/Icons/battery/os_batterycharging_030.c
rename to src/displayapp/Icons/battery/os_batterycharging_030.c
diff --git a/src/DisplayApp/Icons/battery/os_batterycharging_030.png b/src/displayapp/Icons/battery/os_batterycharging_030.png
similarity index 100%
rename from src/DisplayApp/Icons/battery/os_batterycharging_030.png
rename to src/displayapp/Icons/battery/os_batterycharging_030.png
diff --git a/src/DisplayApp/Icons/battery/os_batterycharging_040.c b/src/displayapp/Icons/battery/os_batterycharging_040.c
similarity index 100%
rename from src/DisplayApp/Icons/battery/os_batterycharging_040.c
rename to src/displayapp/Icons/battery/os_batterycharging_040.c
diff --git a/src/DisplayApp/Icons/battery/os_batterycharging_040.png b/src/displayapp/Icons/battery/os_batterycharging_040.png
similarity index 100%
rename from src/DisplayApp/Icons/battery/os_batterycharging_040.png
rename to src/displayapp/Icons/battery/os_batterycharging_040.png
diff --git a/src/DisplayApp/Icons/battery/os_batterycharging_050.c b/src/displayapp/Icons/battery/os_batterycharging_050.c
similarity index 100%
rename from src/DisplayApp/Icons/battery/os_batterycharging_050.c
rename to src/displayapp/Icons/battery/os_batterycharging_050.c
diff --git a/src/DisplayApp/Icons/battery/os_batterycharging_050.png b/src/displayapp/Icons/battery/os_batterycharging_050.png
similarity index 100%
rename from src/DisplayApp/Icons/battery/os_batterycharging_050.png
rename to src/displayapp/Icons/battery/os_batterycharging_050.png
diff --git a/src/DisplayApp/Icons/battery/os_batterycharging_060.c b/src/displayapp/Icons/battery/os_batterycharging_060.c
similarity index 100%
rename from src/DisplayApp/Icons/battery/os_batterycharging_060.c
rename to src/displayapp/Icons/battery/os_batterycharging_060.c
diff --git a/src/DisplayApp/Icons/battery/os_batterycharging_060.png b/src/displayapp/Icons/battery/os_batterycharging_060.png
similarity index 100%
rename from src/DisplayApp/Icons/battery/os_batterycharging_060.png
rename to src/displayapp/Icons/battery/os_batterycharging_060.png
diff --git a/src/DisplayApp/Icons/battery/os_batterycharging_070.c b/src/displayapp/Icons/battery/os_batterycharging_070.c
similarity index 100%
rename from src/DisplayApp/Icons/battery/os_batterycharging_070.c
rename to src/displayapp/Icons/battery/os_batterycharging_070.c
diff --git a/src/DisplayApp/Icons/battery/os_batterycharging_070.png b/src/displayapp/Icons/battery/os_batterycharging_070.png
similarity index 100%
rename from src/DisplayApp/Icons/battery/os_batterycharging_070.png
rename to src/displayapp/Icons/battery/os_batterycharging_070.png
diff --git a/src/DisplayApp/Icons/battery/os_batterycharging_080.c b/src/displayapp/Icons/battery/os_batterycharging_080.c
similarity index 100%
rename from src/DisplayApp/Icons/battery/os_batterycharging_080.c
rename to src/displayapp/Icons/battery/os_batterycharging_080.c
diff --git a/src/DisplayApp/Icons/battery/os_batterycharging_080.png b/src/displayapp/Icons/battery/os_batterycharging_080.png
similarity index 100%
rename from src/DisplayApp/Icons/battery/os_batterycharging_080.png
rename to src/displayapp/Icons/battery/os_batterycharging_080.png
diff --git a/src/DisplayApp/Icons/battery/os_batterycharging_090.c b/src/displayapp/Icons/battery/os_batterycharging_090.c
similarity index 100%
rename from src/DisplayApp/Icons/battery/os_batterycharging_090.c
rename to src/displayapp/Icons/battery/os_batterycharging_090.c
diff --git a/src/DisplayApp/Icons/battery/os_batterycharging_090.png b/src/displayapp/Icons/battery/os_batterycharging_090.png
similarity index 100%
rename from src/DisplayApp/Icons/battery/os_batterycharging_090.png
rename to src/displayapp/Icons/battery/os_batterycharging_090.png
diff --git a/src/DisplayApp/Icons/battery/os_batterycharging_100.c b/src/displayapp/Icons/battery/os_batterycharging_100.c
similarity index 100%
rename from src/DisplayApp/Icons/battery/os_batterycharging_100.c
rename to src/displayapp/Icons/battery/os_batterycharging_100.c
diff --git a/src/DisplayApp/Icons/battery/os_batterycharging_100.png b/src/displayapp/Icons/battery/os_batterycharging_100.png
similarity index 100%
rename from src/DisplayApp/Icons/battery/os_batterycharging_100.png
rename to src/displayapp/Icons/battery/os_batterycharging_100.png
diff --git a/src/DisplayApp/Icons/bluetooth/ck_os_bt_connected.png b/src/displayapp/Icons/bluetooth/ck_os_bt_connected.png
similarity index 100%
rename from src/DisplayApp/Icons/bluetooth/ck_os_bt_connected.png
rename to src/displayapp/Icons/bluetooth/ck_os_bt_connected.png
diff --git a/src/DisplayApp/Icons/bluetooth/ck_os_bt_disconnected.png b/src/displayapp/Icons/bluetooth/ck_os_bt_disconnected.png
similarity index 100%
rename from src/DisplayApp/Icons/bluetooth/ck_os_bt_disconnected.png
rename to src/displayapp/Icons/bluetooth/ck_os_bt_disconnected.png
diff --git a/src/DisplayApp/Icons/bluetooth/os_bt_connected.c b/src/displayapp/Icons/bluetooth/os_bt_connected.c
similarity index 100%
rename from src/DisplayApp/Icons/bluetooth/os_bt_connected.c
rename to src/displayapp/Icons/bluetooth/os_bt_connected.c
diff --git a/src/DisplayApp/Icons/bluetooth/os_bt_connected.png b/src/displayapp/Icons/bluetooth/os_bt_connected.png
similarity index 100%
rename from src/DisplayApp/Icons/bluetooth/os_bt_connected.png
rename to src/displayapp/Icons/bluetooth/os_bt_connected.png
diff --git a/src/DisplayApp/Icons/bluetooth/os_bt_disconnected.c b/src/displayapp/Icons/bluetooth/os_bt_disconnected.c
similarity index 100%
rename from src/DisplayApp/Icons/bluetooth/os_bt_disconnected.c
rename to src/displayapp/Icons/bluetooth/os_bt_disconnected.c
diff --git a/src/DisplayApp/Icons/bluetooth/os_bt_disconnected.png b/src/displayapp/Icons/bluetooth/os_bt_disconnected.png
similarity index 100%
rename from src/DisplayApp/Icons/bluetooth/os_bt_disconnected.png
rename to src/displayapp/Icons/bluetooth/os_bt_disconnected.png
diff --git a/src/DisplayApp/LittleVgl.cpp b/src/displayapp/LittleVgl.cpp
similarity index 100%
rename from src/DisplayApp/LittleVgl.cpp
rename to src/displayapp/LittleVgl.cpp
diff --git a/src/DisplayApp/LittleVgl.h b/src/displayapp/LittleVgl.h
similarity index 100%
rename from src/DisplayApp/LittleVgl.h
rename to src/displayapp/LittleVgl.h
diff --git a/src/DisplayApp/Screens/ApplicationList.cpp b/src/displayapp/Screens/ApplicationList.cpp
similarity index 100%
rename from src/DisplayApp/Screens/ApplicationList.cpp
rename to src/displayapp/Screens/ApplicationList.cpp
diff --git a/src/DisplayApp/Screens/ApplicationList.h b/src/displayapp/Screens/ApplicationList.h
similarity index 100%
rename from src/DisplayApp/Screens/ApplicationList.h
rename to src/displayapp/Screens/ApplicationList.h
diff --git a/src/DisplayApp/Screens/BatteryIcon.cpp b/src/displayapp/Screens/BatteryIcon.cpp
similarity index 100%
rename from src/DisplayApp/Screens/BatteryIcon.cpp
rename to src/displayapp/Screens/BatteryIcon.cpp
diff --git a/src/DisplayApp/Screens/BatteryIcon.h b/src/displayapp/Screens/BatteryIcon.h
similarity index 100%
rename from src/DisplayApp/Screens/BatteryIcon.h
rename to src/displayapp/Screens/BatteryIcon.h
diff --git a/src/DisplayApp/Screens/BleIcon.cpp b/src/displayapp/Screens/BleIcon.cpp
similarity index 100%
rename from src/DisplayApp/Screens/BleIcon.cpp
rename to src/displayapp/Screens/BleIcon.cpp
diff --git a/src/DisplayApp/Screens/BleIcon.h b/src/displayapp/Screens/BleIcon.h
similarity index 100%
rename from src/DisplayApp/Screens/BleIcon.h
rename to src/displayapp/Screens/BleIcon.h
diff --git a/src/DisplayApp/Screens/Brightness.cpp b/src/displayapp/Screens/Brightness.cpp
similarity index 100%
rename from src/DisplayApp/Screens/Brightness.cpp
rename to src/displayapp/Screens/Brightness.cpp
diff --git a/src/DisplayApp/Screens/Brightness.h b/src/displayapp/Screens/Brightness.h
similarity index 100%
rename from src/DisplayApp/Screens/Brightness.h
rename to src/displayapp/Screens/Brightness.h
diff --git a/src/DisplayApp/Screens/Clock.cpp b/src/displayapp/Screens/Clock.cpp
similarity index 100%
rename from src/DisplayApp/Screens/Clock.cpp
rename to src/displayapp/Screens/Clock.cpp
diff --git a/src/DisplayApp/Screens/Clock.h b/src/displayapp/Screens/Clock.h
similarity index 100%
rename from src/DisplayApp/Screens/Clock.h
rename to src/displayapp/Screens/Clock.h
diff --git a/src/DisplayApp/Screens/DropDownDemo.cpp b/src/displayapp/Screens/DropDownDemo.cpp
similarity index 100%
rename from src/DisplayApp/Screens/DropDownDemo.cpp
rename to src/displayapp/Screens/DropDownDemo.cpp
diff --git a/src/DisplayApp/Screens/DropDownDemo.h b/src/displayapp/Screens/DropDownDemo.h
similarity index 100%
rename from src/DisplayApp/Screens/DropDownDemo.h
rename to src/displayapp/Screens/DropDownDemo.h
diff --git a/src/DisplayApp/Screens/FirmwareUpdate.cpp b/src/displayapp/Screens/FirmwareUpdate.cpp
similarity index 100%
rename from src/DisplayApp/Screens/FirmwareUpdate.cpp
rename to src/displayapp/Screens/FirmwareUpdate.cpp
diff --git a/src/DisplayApp/Screens/FirmwareUpdate.h b/src/displayapp/Screens/FirmwareUpdate.h
similarity index 100%
rename from src/DisplayApp/Screens/FirmwareUpdate.h
rename to src/displayapp/Screens/FirmwareUpdate.h
diff --git a/src/DisplayApp/Screens/FirmwareValidation.cpp b/src/displayapp/Screens/FirmwareValidation.cpp
similarity index 100%
rename from src/DisplayApp/Screens/FirmwareValidation.cpp
rename to src/displayapp/Screens/FirmwareValidation.cpp
diff --git a/src/DisplayApp/Screens/FirmwareValidation.h b/src/displayapp/Screens/FirmwareValidation.h
similarity index 100%
rename from src/DisplayApp/Screens/FirmwareValidation.h
rename to src/displayapp/Screens/FirmwareValidation.h
diff --git a/src/DisplayApp/Screens/Gauge.cpp b/src/displayapp/Screens/Gauge.cpp
similarity index 100%
rename from src/DisplayApp/Screens/Gauge.cpp
rename to src/displayapp/Screens/Gauge.cpp
diff --git a/src/DisplayApp/Screens/Gauge.h b/src/displayapp/Screens/Gauge.h
similarity index 100%
rename from src/DisplayApp/Screens/Gauge.h
rename to src/displayapp/Screens/Gauge.h
diff --git a/src/DisplayApp/Screens/InfiniPaint.cpp b/src/displayapp/Screens/InfiniPaint.cpp
similarity index 100%
rename from src/DisplayApp/Screens/InfiniPaint.cpp
rename to src/displayapp/Screens/InfiniPaint.cpp
diff --git a/src/DisplayApp/Screens/InfiniPaint.h b/src/displayapp/Screens/InfiniPaint.h
similarity index 100%
rename from src/DisplayApp/Screens/InfiniPaint.h
rename to src/displayapp/Screens/InfiniPaint.h
diff --git a/src/DisplayApp/Screens/Label.cpp b/src/displayapp/Screens/Label.cpp
similarity index 100%
rename from src/DisplayApp/Screens/Label.cpp
rename to src/displayapp/Screens/Label.cpp
diff --git a/src/DisplayApp/Screens/Label.h b/src/displayapp/Screens/Label.h
similarity index 100%
rename from src/DisplayApp/Screens/Label.h
rename to src/displayapp/Screens/Label.h
diff --git a/src/DisplayApp/Screens/Meter.cpp b/src/displayapp/Screens/Meter.cpp
similarity index 100%
rename from src/DisplayApp/Screens/Meter.cpp
rename to src/displayapp/Screens/Meter.cpp
diff --git a/src/DisplayApp/Screens/Meter.h b/src/displayapp/Screens/Meter.h
similarity index 100%
rename from src/DisplayApp/Screens/Meter.h
rename to src/displayapp/Screens/Meter.h
diff --git a/src/DisplayApp/Screens/Modal.cpp b/src/displayapp/Screens/Modal.cpp
similarity index 100%
rename from src/DisplayApp/Screens/Modal.cpp
rename to src/displayapp/Screens/Modal.cpp
diff --git a/src/DisplayApp/Screens/Modal.h b/src/displayapp/Screens/Modal.h
similarity index 100%
rename from src/DisplayApp/Screens/Modal.h
rename to src/displayapp/Screens/Modal.h
diff --git a/src/DisplayApp/Screens/Music.cpp b/src/displayapp/Screens/Music.cpp
similarity index 100%
rename from src/DisplayApp/Screens/Music.cpp
rename to src/displayapp/Screens/Music.cpp
diff --git a/src/DisplayApp/Screens/Music.h b/src/displayapp/Screens/Music.h
similarity index 100%
rename from src/DisplayApp/Screens/Music.h
rename to src/displayapp/Screens/Music.h
diff --git a/src/DisplayApp/Screens/Screen.cpp b/src/displayapp/Screens/Screen.cpp
similarity index 100%
rename from src/DisplayApp/Screens/Screen.cpp
rename to src/displayapp/Screens/Screen.cpp
diff --git a/src/DisplayApp/Screens/Screen.h b/src/displayapp/Screens/Screen.h
similarity index 100%
rename from src/DisplayApp/Screens/Screen.h
rename to src/displayapp/Screens/Screen.h
diff --git a/src/DisplayApp/Screens/ScreenList.h b/src/displayapp/Screens/ScreenList.h
similarity index 100%
rename from src/DisplayApp/Screens/ScreenList.h
rename to src/displayapp/Screens/ScreenList.h
diff --git a/src/DisplayApp/Screens/Symbols.h b/src/displayapp/Screens/Symbols.h
similarity index 100%
rename from src/DisplayApp/Screens/Symbols.h
rename to src/displayapp/Screens/Symbols.h
diff --git a/src/DisplayApp/Screens/SystemInfo.cpp b/src/displayapp/Screens/SystemInfo.cpp
similarity index 100%
rename from src/DisplayApp/Screens/SystemInfo.cpp
rename to src/displayapp/Screens/SystemInfo.cpp
diff --git a/src/DisplayApp/Screens/SystemInfo.h b/src/displayapp/Screens/SystemInfo.h
similarity index 100%
rename from src/DisplayApp/Screens/SystemInfo.h
rename to src/displayapp/Screens/SystemInfo.h
diff --git a/src/DisplayApp/Screens/Tab.cpp b/src/displayapp/Screens/Tab.cpp
similarity index 100%
rename from src/DisplayApp/Screens/Tab.cpp
rename to src/displayapp/Screens/Tab.cpp
diff --git a/src/DisplayApp/Screens/Tab.h b/src/displayapp/Screens/Tab.h
similarity index 100%
rename from src/DisplayApp/Screens/Tab.h
rename to src/displayapp/Screens/Tab.h
diff --git a/src/DisplayApp/Screens/Tile.cpp b/src/displayapp/Screens/Tile.cpp
similarity index 100%
rename from src/DisplayApp/Screens/Tile.cpp
rename to src/displayapp/Screens/Tile.cpp
diff --git a/src/DisplayApp/Screens/Tile.h b/src/displayapp/Screens/Tile.h
similarity index 100%
rename from src/DisplayApp/Screens/Tile.h
rename to src/displayapp/Screens/Tile.h
diff --git a/src/DisplayApp/TouchEvents.h b/src/displayapp/TouchEvents.h
similarity index 100%
rename from src/DisplayApp/TouchEvents.h
rename to src/displayapp/TouchEvents.h