71 files changed, 54 insertions, 46 deletions

diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index 46e81f1..d65e4f9 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -1,24 +1,25 @@
+#include <string>
+
 #include "DisplayApp.h"
 #include <FreeRTOS.h>
 #include <task.h>
 #include <libraries/log/nrf_log.h>
 #include <nrf_font.h>
 #include <queue.h>
-#include <Components/DateTime/DateTimeController.h>
+#include "components/datetime/DateTimeController.h"
 #include <drivers/Cst816s.h>
-#include <string>
-#include <DisplayApp/Screens/Tile.h>
-#include <DisplayApp/Screens/Meter.h>
-#include <DisplayApp/Screens/Gauge.h>
-#include <DisplayApp/Screens/Brightness.h>
-#include <DisplayApp/Screens/SystemInfo.h>
-#include <DisplayApp/Screens/Music.h>
-#include <Components/Ble/NotificationManager.h>
-#include <DisplayApp/Screens/FirmwareUpdate.h>
-#include <DisplayApp/Screens/ApplicationList.h>
-#include <DisplayApp/Screens/FirmwareValidation.h>
-#include <DisplayApp/Screens/InfiniPaint.h>
-#include "../SystemTask/SystemTask.h"
+#include "displayapp/screens/Tile.h"
+#include "displayapp/screens/Meter.h"
+#include "displayapp/screens/Gauge.h"
+#include "displayapp/screens/Brightness.h"
+#include "displayapp/screens/SystemInfo.h"
+#include "displayapp/screens/Music.h"
+#include "components/ble/NotificationManager.h"
+#include "displayapp/screens/FirmwareUpdate.h"
+#include "displayapp/screens/ApplicationList.h"
+#include "displayapp/screens/FirmwareValidation.h"
+#include "displayapp/screens/InfiniPaint.h"
+#include "systemtask/SystemTask.h"
 
 using namespace Pinetime::Applications;
 
@@ -148,7 +149,7 @@ void DisplayApp::Refresh() {
           }
         }
 
-//        lvgl.SetFullRefresh(Components::LittleVgl::FullRefreshDirections::Down);
+//        lvgl.SetFullRefresh(components::LittleVgl::FullRefreshDirections::Down);
 //        currentScreen.reset(nullptr);
 //        if(toggle) {
 //          currentScreen.reset(new Screens::Tile(this));
diff --git a/src/displayapp/DisplayApp.h b/src/displayapp/DisplayApp.h
index 345e06d..2a0efde 100644
--- a/src/displayapp/DisplayApp.h
+++ b/src/displayapp/DisplayApp.h
@@ -3,21 +3,21 @@
 #include <task.h>
 #include <drivers/St7789.h>
 #include <drivers/SpiMaster.h>
-#include <Components/Gfx/Gfx.h>
 #include <bits/unique_ptr.h>
 #include <queue.h>
-#include <Components/Battery/BatteryController.h>
-#include <Components/Brightness/BrightnessController.h>
-#include <Components/Ble/BleController.h>
-#include <Components/DateTime/DateTimeController.h>
-#include "../drivers/Cst816s.h"
+#include "components/gfx/Gfx.h"
+#include "components/battery/BatteryController.h"
+#include "components/brightness/BrightnessController.h"
+#include "components/ble/BleController.h"
+#include "components/datetime/DateTimeController.h"
+#include "components/ble/NotificationManager.h"
+#include "components/firmwarevalidator/FirmwareValidator.h"
+#include "drivers/Cst816s.h"
 #include "LittleVgl.h"
 #include <date/date.h>
-#include <DisplayApp/Screens/Clock.h>
+#include "displayapp/screens/Clock.h"
+#include "displayapp/screens/Modal.h"
 #include <drivers/Watchdog.h>
-#include <DisplayApp/Screens/Modal.h>
-#include <Components/Ble/NotificationManager.h>
-#include <Components/FirmwareValidator/FirmwareValidator.h>
 #include "TouchEvents.h"
 #include "Apps.h"
 
diff --git a/src/displayapp/Fonts/Readme.md b/src/displayapp/fonts/Readme.md
index 7ebf2e2..7ebf2e2 100644
--- a/src/displayapp/Fonts/Readme.md
+++ b/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
index 27ad005..27ad005 100644
--- a/src/displayapp/Fonts/jetbrains_mono_bold_20.c
+++ b/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
index c9917e4..c9917e4 100644
--- a/src/displayapp/Fonts/jetbrains_mono_extrabold_compressed.c
+++ b/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
index 64832b5..64832b5 100644
--- a/src/displayapp/Icons/battery/os_battery_005.c
+++ b/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
index 963767b..963767b 100644
--- a/src/displayapp/Icons/battery/os_battery_005.png
+++ b/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
index f36b684..f36b684 100644
--- a/src/displayapp/Icons/battery/os_battery_010.c
+++ b/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
index 68a9f40..68a9f40 100644
--- a/src/displayapp/Icons/battery/os_battery_010.png
+++ b/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
index 3f648fb..3f648fb 100644
--- a/src/displayapp/Icons/battery/os_battery_020.c
+++ b/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
index 32eca65..32eca65 100644
--- a/src/displayapp/Icons/battery/os_battery_020.png
+++ b/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
index 4d5719b..4d5719b 100644
--- a/src/displayapp/Icons/battery/os_battery_030.c
+++ b/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
index aeb5eb1..aeb5eb1 100644
--- a/src/displayapp/Icons/battery/os_battery_030.png
+++ b/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
index 0606fc3..0606fc3 100644
--- a/src/displayapp/Icons/battery/os_battery_040.c
+++ b/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
index d84fda4..d84fda4 100644
--- a/src/displayapp/Icons/battery/os_battery_040.png
+++ b/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
index 8732dc7..8732dc7 100644
--- a/src/displayapp/Icons/battery/os_battery_050.c
+++ b/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
index 224d38d..224d38d 100644
--- a/src/displayapp/Icons/battery/os_battery_050.png
+++ b/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
index a65936b..a65936b 100644
--- a/src/displayapp/Icons/battery/os_battery_060.c
+++ b/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
index e5e00ed..e5e00ed 100644
--- a/src/displayapp/Icons/battery/os_battery_060.png
+++ b/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
index 949c0b8..949c0b8 100644
--- a/src/displayapp/Icons/battery/os_battery_070.c
+++ b/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
index dee969b..dee969b 100644
--- a/src/displayapp/Icons/battery/os_battery_070.png
+++ b/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
index f447370..f447370 100644
--- a/src/displayapp/Icons/battery/os_battery_080.c
+++ b/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
index 3b13fbb..3b13fbb 100644
--- a/src/displayapp/Icons/battery/os_battery_080.png
+++ b/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
index 6fa41b2..6fa41b2 100644
--- a/src/displayapp/Icons/battery/os_battery_090.c
+++ b/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
index d79f396..d79f396 100644
--- a/src/displayapp/Icons/battery/os_battery_090.png
+++ b/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
index 92cf9a4..92cf9a4 100644
--- a/src/displayapp/Icons/battery/os_battery_100.c
+++ b/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
index dd0d306..dd0d306 100644
--- a/src/displayapp/Icons/battery/os_battery_100.png
+++ b/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
index af6aba5..af6aba5 100644
--- a/src/displayapp/Icons/battery/os_battery_error.c
+++ b/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
index 4c7632f..4c7632f 100644
--- a/src/displayapp/Icons/battery/os_battery_error.png
+++ b/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
index 1b0c71d..1b0c71d 100644
--- a/src/displayapp/Icons/battery/os_batterycharging_005.c
+++ b/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
index f9545bc..f9545bc 100644
--- a/src/displayapp/Icons/battery/os_batterycharging_005.png
+++ b/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
index 304c018..304c018 100644
--- a/src/displayapp/Icons/battery/os_batterycharging_010.c
+++ b/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
index 04d5f82..04d5f82 100644
--- a/src/displayapp/Icons/battery/os_batterycharging_010.png
+++ b/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
index 1721be1..1721be1 100644
--- a/src/displayapp/Icons/battery/os_batterycharging_020.c
+++ b/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
index 6416e1e..6416e1e 100644
--- a/src/displayapp/Icons/battery/os_batterycharging_020.png
+++ b/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
index 83101fd..83101fd 100644
--- a/src/displayapp/Icons/battery/os_batterycharging_030.c
+++ b/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
index 96b44d2..96b44d2 100644
--- a/src/displayapp/Icons/battery/os_batterycharging_030.png
+++ b/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
index 02af00e..02af00e 100644
--- a/src/displayapp/Icons/battery/os_batterycharging_040.c
+++ b/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
index 5a42caf..5a42caf 100644
--- a/src/displayapp/Icons/battery/os_batterycharging_040.png
+++ b/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
index d2eea82..d2eea82 100644
--- a/src/displayapp/Icons/battery/os_batterycharging_050.c
+++ b/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
index ca0e04d..ca0e04d 100644
--- a/src/displayapp/Icons/battery/os_batterycharging_050.png
+++ b/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
index 05f8b97..05f8b97 100644
--- a/src/displayapp/Icons/battery/os_batterycharging_060.c
+++ b/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
index 2930068..2930068 100644
--- a/src/displayapp/Icons/battery/os_batterycharging_060.png
+++ b/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
index ac3e319..ac3e319 100644
--- a/src/displayapp/Icons/battery/os_batterycharging_070.c
+++ b/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
index 7d5f55d..7d5f55d 100644
--- a/src/displayapp/Icons/battery/os_batterycharging_070.png
+++ b/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
index cc1c1d2..cc1c1d2 100644
--- a/src/displayapp/Icons/battery/os_batterycharging_080.c
+++ b/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
index cce5052..cce5052 100644
--- a/src/displayapp/Icons/battery/os_batterycharging_080.png
+++ b/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
index 85e1c26..85e1c26 100644
--- a/src/displayapp/Icons/battery/os_batterycharging_090.c
+++ b/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
index fc7b443..fc7b443 100644
--- a/src/displayapp/Icons/battery/os_batterycharging_090.png
+++ b/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
index 8dec0cb..8dec0cb 100644
--- a/src/displayapp/Icons/battery/os_batterycharging_100.c
+++ b/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
index 7c8ce0c..7c8ce0c 100644
--- a/src/displayapp/Icons/battery/os_batterycharging_100.png
+++ b/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
index 5371611..5371611 100644
--- a/src/displayapp/Icons/bluetooth/ck_os_bt_connected.png
+++ b/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
index 3275895..3275895 100644
--- a/src/displayapp/Icons/bluetooth/ck_os_bt_disconnected.png
+++ b/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
index d30dc9d..d30dc9d 100644
--- a/src/displayapp/Icons/bluetooth/os_bt_connected.c
+++ b/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
index 5371611..5371611 100644
--- a/src/displayapp/Icons/bluetooth/os_bt_connected.png
+++ b/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
index 930179b..930179b 100644
--- a/src/displayapp/Icons/bluetooth/os_bt_disconnected.c
+++ b/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
index 3275895..3275895 100644
--- a/src/displayapp/Icons/bluetooth/os_bt_disconnected.png
+++ b/src/displayapp/icons/bluetooth/os_bt_disconnected.png
diff --git a/src/displayapp/screens/ApplicationList.cpp b/src/displayapp/screens/ApplicationList.cpp
index eb85be4..71ba91c 100644
--- a/src/displayapp/screens/ApplicationList.cpp
+++ b/src/displayapp/screens/ApplicationList.cpp
@@ -1,5 +1,5 @@
 #include <libs/lvgl/lvgl.h>
-#include <DisplayApp/DisplayApp.h>
+#include <displayapp/DisplayApp.h>
 #include <functional>
 #include "ApplicationList.h"
 #include "Tile.h"
diff --git a/src/displayapp/screens/ApplicationList.h b/src/displayapp/screens/ApplicationList.h
index a1e6811..9c95acb 100644
--- a/src/displayapp/screens/ApplicationList.h
+++ b/src/displayapp/screens/ApplicationList.h
@@ -1,13 +1,14 @@
 #pragma once
 
+#include <functional>
 #include <vector>
-#include <Components/Ble/NimbleController.h>
+
+#include "components/ble/NimbleController.h"
 #include "Screen.h"
 #include "Label.h"
 #include "ScreenList.h"
 #include "Gauge.h"
 #include "Meter.h"
-#include <functional>
 
 namespace Pinetime {
   namespace Applications {
diff --git a/src/displayapp/screens/Brightness.h b/src/displayapp/screens/Brightness.h
index 37cbcd7..7d599ac 100644
--- a/src/displayapp/screens/Brightness.h
+++ b/src/displayapp/screens/Brightness.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <libs/lvgl/src/lv_core/lv_obj.h>
-#include <Components/Brightness/BrightnessController.h>
+#include "components/brightness/BrightnessController.h"
 #include "Screen.h"
 
 namespace Pinetime {
diff --git a/src/displayapp/screens/Clock.cpp b/src/displayapp/screens/Clock.cpp
index 06fab9a..243d4c0 100644
--- a/src/displayapp/screens/Clock.cpp
+++ b/src/displayapp/screens/Clock.cpp
@@ -1,6 +1,7 @@
 #include <cstdio>
+
 #include <libs/date/includes/date/date.h>
-#include <Components/DateTime/DateTimeController.h>
+#include "components/datetime/DateTimeController.h"
 #include <libs/lvgl/lvgl.h>
 #include "Clock.h"
 #include "../DisplayApp.h"
diff --git a/src/displayapp/screens/Clock.h b/src/displayapp/screens/Clock.h
index 7363fda..5753f6a 100644
--- a/src/displayapp/screens/Clock.h
+++ b/src/displayapp/screens/Clock.h
@@ -2,12 +2,13 @@
 
 #include <cstdint>
 #include <chrono>
+
 #include "Screen.h"
 #include <bits/unique_ptr.h>
 #include <libs/lvgl/src/lv_core/lv_style.h>
 #include <libs/lvgl/src/lv_core/lv_obj.h>
-#include <Components/Battery/BatteryController.h>
-#include <Components/Ble/BleController.h>
+#include "components/battery/BatteryController.h"
+#include "components/ble/BleController.h"
 
 namespace Pinetime {
   namespace Applications {
diff --git a/src/displayapp/screens/FirmwareUpdate.h b/src/displayapp/screens/FirmwareUpdate.h
index faaf395..893fe68 100644
--- a/src/displayapp/screens/FirmwareUpdate.h
+++ b/src/displayapp/screens/FirmwareUpdate.h
@@ -2,11 +2,12 @@
 
 #include <cstdint>
 #include <chrono>
+
 #include "Screen.h"
 #include <bits/unique_ptr.h>
 #include <libs/lvgl/src/lv_core/lv_style.h>
 #include <libs/lvgl/src/lv_core/lv_obj.h>
-#include <Components/Ble/BleController.h>
+#include "components/ble/BleController.h"
 
 namespace Pinetime {
   namespace Applications {
diff --git a/src/displayapp/screens/FirmwareValidation.cpp b/src/displayapp/screens/FirmwareValidation.cpp
index fb2dd95..2300b41 100644
--- a/src/displayapp/screens/FirmwareValidation.cpp
+++ b/src/displayapp/screens/FirmwareValidation.cpp
@@ -2,7 +2,7 @@
 #include "FirmwareValidation.h"
 #include "../DisplayApp.h"
 #include "../../Version.h"
-#include "../../Components/FirmwareValidator/FirmwareValidator.h"
+#include "components/firmwarevalidator/FirmwareValidator.h"
 
 using namespace Pinetime::Applications::Screens;
 extern lv_font_t jetbrains_mono_extrabold_compressed;
diff --git a/src/displayapp/screens/InfiniPaint.h b/src/displayapp/screens/InfiniPaint.h
index a1592f9..fb4f979 100644
--- a/src/displayapp/screens/InfiniPaint.h
+++ b/src/displayapp/screens/InfiniPaint.h
@@ -6,7 +6,7 @@
 #include <libs/lvgl/src/lv_core/lv_style.h>
 #include <libs/lvgl/src/lv_core/lv_obj.h>
 #include <drivers/St7789.h>
-#include <DisplayApp/LittleVgl.h>
+#include "displayapp/LittleVgl.h"
 
 namespace Pinetime {
   namespace Applications {
diff --git a/src/displayapp/screens/Music.h b/src/displayapp/screens/Music.h
index 95cac0f..d43d31c 100644
--- a/src/displayapp/screens/Music.h
+++ b/src/displayapp/screens/Music.h
@@ -2,16 +2,17 @@
 
 #include <cstdint>
 #include <chrono>
-#include <Components/Gfx/Gfx.h>
+#include <string>
+
+#include "components/gfx/Gfx.h"
+#include "components/battery/BatteryController.h"
+#include "components/ble/BleController.h"
+#include "components/ble/MusicService.h"
 #include "Screen.h"
 #include <bits/unique_ptr.h>
 #include <libs/lvgl/src/lv_core/lv_style.h>
 #include <libs/lvgl/src/lv_core/lv_obj.h>
-#include <Components/Battery/BatteryController.h>
-#include <Components/Ble/BleController.h>
 #include "../../Version.h"
-#include <Components/Ble/MusicService.h>
-#include <string>
 
 namespace Pinetime {
   namespace Applications {
diff --git a/src/displayapp/screens/ScreenList.h b/src/displayapp/screens/ScreenList.h
index d873336..b198634 100644
--- a/src/displayapp/screens/ScreenList.h
+++ b/src/displayapp/screens/ScreenList.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <vector>
-#include <Components/Ble/NimbleController.h>
 #include <functional>
+#include "components/ble/NimbleController.h"
 #include "Screen.h"
 #include "Label.h"
 
diff --git a/src/displayapp/screens/SystemInfo.cpp b/src/displayapp/screens/SystemInfo.cpp
index fcafcf7..8a3b8db 100644
--- a/src/displayapp/screens/SystemInfo.cpp
+++ b/src/displayapp/screens/SystemInfo.cpp
@@ -1,5 +1,5 @@
 #include <libs/lvgl/lvgl.h>
-#include <DisplayApp/DisplayApp.h>
+#include <displayapp/DisplayApp.h>
 #include <functional>
 #include "SystemInfo.h"
 #include "../../Version.h"
diff --git a/src/displayapp/screens/SystemInfo.h b/src/displayapp/screens/SystemInfo.h
index ac8abae..987a584 100644
--- a/src/displayapp/screens/SystemInfo.h
+++ b/src/displayapp/screens/SystemInfo.h
@@ -1,13 +1,14 @@
 #pragma once
 
+#include <functional>
 #include <vector>
-#include <Components/Ble/NimbleController.h>
+
+#include "components/ble/NimbleController.h"
 #include "Screen.h"
 #include "Label.h"
 #include "ScreenList.h"
 #include "Gauge.h"
 #include "Meter.h"
-#include <functional>
 
 namespace Pinetime {
   namespace Applications {
diff --git a/src/displayapp/screens/Tile.cpp b/src/displayapp/screens/Tile.cpp
index 1447d78..deb8847 100644
--- a/src/displayapp/screens/Tile.cpp
+++ b/src/displayapp/screens/Tile.cpp
@@ -1,8 +1,9 @@
 #include <libs/lvgl/src/lv_core/lv_obj.h>
 #include <libs/lvgl/src/lv_font/lv_font.h>
 #include <libs/lvgl/lvgl.h>
+
 #include "Tile.h"
-#include <DisplayApp/DisplayApp.h>
+#include "displayapp/DisplayApp.h"
 #include "Symbols.h"
 #include "../../Version.h"
 
diff --git a/src/displayapp/screens/Tile.h b/src/displayapp/screens/Tile.h
index 3136d89..cf5fcf1 100644
--- a/src/displayapp/screens/Tile.h
+++ b/src/displayapp/screens/Tile.h
@@ -5,7 +5,7 @@
 #include <bits/unique_ptr.h>
 #include "Modal.h"
 #include <lvgl/src/lv_core/lv_style.h>
-#include <DisplayApp/Apps.h>
+#include <displayapp/Apps.h>
 
 namespace Pinetime {
   namespace Applications {