Merge pull request #68 from Avamander/patch-1

Rename folders to follow a consistent style

151 files changed, 567 insertions, 526 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f65a4397..5346ccfb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ project(pinetime VERSION 0.8.2 LANGUAGES C CXX ASM)
 set(NRF_TARGET "nrf52")
 
 if (NOT ARM_NONE_EABI_TOOLCHAIN_PATH)
-  message(FATAL_ERROR "The path to the toolchain (arm-non-eabi) must be specified on the command line (add -DARM_NONE_EABI_TOOLCHAIN_PATH=<path>")
+  message(FATAL_ERROR "The path to the toolchain (arm-none-eabi) must be specified on the command line (add -DARM_NONE_EABI_TOOLCHAIN_PATH=<path>")
 endif ()
 
 if (NOT NRF5_SDK_PATH)
diff --git a/README.md b/README.md
index 3a1b7b56..a3a589f7 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@ As of now, here is the list of achievements of this project:
 ## Documentation
 
 ### Develop
- - [Generate the fonts and symbols](src/DisplayApp/Fonts/Readme.md)
+ - [Generate the fonts and symbols](src/displayapp/fonts/Readme.md)
 
 ### Build, flash and debug
  - [Project branches](doc/branches.md)
diff --git a/doc/CompanionApps/Amazfish.md b/doc/companionapps/Amazfish.md
index eb9daa04..eb9daa04 100644
--- a/doc/CompanionApps/Amazfish.md
+++ b/doc/companionapps/Amazfish.md
diff --git a/doc/CompanionApps/Gadgetbridge.md b/doc/companionapps/Gadgetbridge.md
index 1a25069c..1a25069c 100644
--- a/doc/CompanionApps/Gadgetbridge.md
+++ b/doc/companionapps/Gadgetbridge.md
diff --git a/doc/CompanionApps/NrfconnectOTA.md b/doc/companionapps/NrfconnectOTA.md
index 0fa3cd03..0fa3cd03 100644
--- a/doc/CompanionApps/NrfconnectOTA.md
+++ b/doc/companionapps/NrfconnectOTA.md
diff --git a/doc/CompanionApps/firmwareNoValidated.jpg b/doc/companionapps/firmwareNoValidated.jpg
index 28df7eaa..28df7eaa 100644
--- a/doc/CompanionApps/firmwareNoValidated.jpg
+++ b/doc/companionapps/firmwareNoValidated.jpg
diff --git a/doc/CompanionApps/firmwareValidated.jpg b/doc/companionapps/firmwareValidated.jpg
index 0d6f99b5..0d6f99b5 100644
--- a/doc/CompanionApps/firmwareValidated.jpg
+++ b/doc/companionapps/firmwareValidated.jpg
diff --git a/doc/CompanionApps/firmwareValidationApp.jpg b/doc/companionapps/firmwareValidationApp.jpg
index d78ad0c1..d78ad0c1 100644
--- a/doc/CompanionApps/firmwareValidationApp.jpg
+++ b/doc/companionapps/firmwareValidationApp.jpg
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index eee1d61a..2f38ec58 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -10,20 +10,20 @@ set(NRF_BOARD pca10040)
 if (NOT NRF5_SDK_PATH)
     message(FATAL_ERROR "The path to the nRF5 SDK (NRF5_SDK_PATH) must be set.")
 endif ()
-if(DEFINED ARM_NONE_EABI_TOOLCHAIN_PATH)
+if (DEFINED ARM_NONE_EABI_TOOLCHAIN_PATH)
     set(ARM_NONE_EABI_TOOLCHAIN_BIN_PATH ${ARM_NONE_EABI_TOOLCHAIN_PATH}/bin)
-endif()
+endif ()
 
 if (NOT NRF_TARGET MATCHES "nrf52")
     message(FATAL_ERROR "Only rRF52 boards are supported right now")
-endif()
+endif ()
 
 # Setup toolchain
 include(${CMAKE_SOURCE_DIR}/cmake-nRF5x/arm-gcc-toolchain.cmake)
 
-if(NOT DEFINED ARM_GCC_TOOLCHAIN)
+if (NOT DEFINED ARM_GCC_TOOLCHAIN)
     message(FATAL_ERROR "The toolchain must be set up before calling this macro")
-endif()
+endif ()
 set(CMAKE_OSX_SYSROOT "/")
 set(CMAKE_OSX_DEPLOYMENT_TARGET "")
 
@@ -84,399 +84,399 @@ set(SDK_SOURCE_FILES
 
         # GPIOTE
         "${NRF5_SDK_PATH}/components/libraries/gpiote/app_gpiote.c"
-)
+        )
 
 set(TINYCRYPT_SRC
-  libs/mynewt-nimble/ext/tinycrypt/src/aes_encrypt.c
-  libs/mynewt-nimble/ext/tinycrypt/src/utils.c
-  )
+        libs/mynewt-nimble/ext/tinycrypt/src/aes_encrypt.c
+        libs/mynewt-nimble/ext/tinycrypt/src/utils.c
+        )
 
 set(NIMBLE_SRC
-  libs/mynewt-nimble/porting/npl/freertos/src/nimble_port_freertos.c
-  libs/mynewt-nimble/porting/npl/freertos/src/npl_os_freertos.c
-  libs/mynewt-nimble/nimble/host/src/ble_hs.c
-  libs/mynewt-nimble/nimble/host/src/ble_hs_hci_evt.c
-  libs/mynewt-nimble/nimble/host/src/ble_l2cap_sig_cmd.c
-  libs/mynewt-nimble/nimble/host/src/ble_l2cap_sig.c
-  libs/mynewt-nimble/nimble/host/src/ble_l2cap.c
-  libs/mynewt-nimble/nimble/host/src/ble_hs_mbuf.c
-  libs/mynewt-nimble/nimble/host/src/ble_sm.c
-  libs/mynewt-nimble/nimble/host/src/ble_gap.c
-  libs/mynewt-nimble/nimble/host/src/ble_gatts.c
-  libs/mynewt-nimble/nimble/host/src/ble_gattc.c
-  libs/mynewt-nimble/nimble/host/src/ble_hs_conn.c
-  libs/mynewt-nimble/nimble/host/src/ble_att_svr.c
-  libs/mynewt-nimble/nimble/host/src/ble_store.c
-  libs/mynewt-nimble/nimble/host/src/ble_store_util.c
-  libs/mynewt-nimble/nimble/host/src/ble_hs_pvcy.c
-  libs/mynewt-nimble/nimble/host/src/ble_hs_hci.c
-  libs/mynewt-nimble/nimble/host/src/ble_hs_log.c
-  libs/mynewt-nimble/nimble/host/src/ble_hs_hci_util.c
-  libs/mynewt-nimble/nimble/host/src/ble_hs_hci_cmd.c
-  libs/mynewt-nimble/nimble/host/src/ble_hs_cfg.c
-  libs/mynewt-nimble/nimble/host/src/ble_uuid.c
-  libs/mynewt-nimble/nimble/host/src/ble_hs_id.c
-  libs/mynewt-nimble/nimble/host/src/ble_hs_misc.c
-  libs/mynewt-nimble/nimble/host/src/ble_att.c
-  libs/mynewt-nimble/nimble/host/src/ble_att_clt.c
-  libs/mynewt-nimble/nimble/host/src/ble_att_svr.c
-  libs/mynewt-nimble/nimble/host/src/ble_att_cmd.c
-  libs/mynewt-nimble/nimble/host/src/ble_hs_atomic.c
-  libs/mynewt-nimble/nimble/host/src/ble_hs_adv.c
-  libs/mynewt-nimble/nimble/host/src/ble_hs_flow.c
-  libs/mynewt-nimble/nimble/host/src/ble_sm.c
-  libs/mynewt-nimble/nimble/host/src/ble_sm_cmd.c
-  libs/mynewt-nimble/nimble/host/src/ble_sm_lgcy.c
-  libs/mynewt-nimble/nimble/host/src/ble_sm_alg.c
-  libs/mynewt-nimble/nimble/host/src/ble_hs_mqueue.c
-  libs/mynewt-nimble/nimble/host/src/ble_hs_stop.c
-  libs/mynewt-nimble/nimble/host/src/ble_hs_startup.c
-  libs/mynewt-nimble/nimble/host/store/ram/src/ble_store_ram.c
-  libs/mynewt-nimble/nimble/host/src/ble_monitor.c
-  libs/mynewt-nimble/nimble/transport/ram/src/ble_hci_ram.c
-  libs/mynewt-nimble/nimble/controller/src/ble_ll.c
-  libs/mynewt-nimble/nimble/controller/src/ble_ll_rand.c
-  libs/mynewt-nimble/nimble/controller/src/ble_ll_conn.c
-  libs/mynewt-nimble/nimble/controller/src/ble_ll_ctrl.c
-  libs/mynewt-nimble/nimble/controller/src/ble_ll_hci.c
-  libs/mynewt-nimble/nimble/controller/src/ble_ll_conn_hci.c
-  libs/mynewt-nimble/nimble/controller/src/ble_ll_utils.c
-  libs/mynewt-nimble/nimble/controller/src/ble_ll_scan.c
-  libs/mynewt-nimble/nimble/controller/src/ble_ll_whitelist.c
-  libs/mynewt-nimble/nimble/controller/src/ble_ll_adv.c
-  libs/mynewt-nimble/nimble/controller/src/ble_ll_sched.c
-  libs/mynewt-nimble/nimble/controller/src/ble_ll_supp_cmd.c
-  libs/mynewt-nimble/nimble/controller/src/ble_ll_hci_ev.c
-  libs/mynewt-nimble/nimble/controller/src/ble_ll_rfmgmt.c
-  libs/mynewt-nimble/porting/nimble/src/os_cputime.c
-  libs/mynewt-nimble/porting/nimble/src/os_cputime_pwr2.c
-  libs/mynewt-nimble/porting/nimble/src/os_mbuf.c
-  libs/mynewt-nimble/porting/nimble/src/os_mempool.c
-  libs/mynewt-nimble/porting/nimble/src/hal_timer.c
-  libs/mynewt-nimble/porting/nimble/src/mem.c
-  libs/mynewt-nimble/porting/nimble/src/endian.c
-  libs/mynewt-nimble/porting/nimble/src/os_msys_init.c
-  libs/mynewt-nimble/nimble/drivers/nrf52/src/ble_hw.c
-  libs/mynewt-nimble/nimble/drivers/nrf52/src/ble_phy.c
-  libs/mynewt-nimble/nimble/host/services/gap/src/ble_svc_gap.c
-  libs/mynewt-nimble/nimble/host/services/gatt/src/ble_svc_gatt.c
-  libs/mynewt-nimble/nimble/host/util/src/addr.c
-  )
+        libs/mynewt-nimble/porting/npl/freertos/src/nimble_port_freertos.c
+        libs/mynewt-nimble/porting/npl/freertos/src/npl_os_freertos.c
+        libs/mynewt-nimble/nimble/host/src/ble_hs.c
+        libs/mynewt-nimble/nimble/host/src/ble_hs_hci_evt.c
+        libs/mynewt-nimble/nimble/host/src/ble_l2cap_sig_cmd.c
+        libs/mynewt-nimble/nimble/host/src/ble_l2cap_sig.c
+        libs/mynewt-nimble/nimble/host/src/ble_l2cap.c
+        libs/mynewt-nimble/nimble/host/src/ble_hs_mbuf.c
+        libs/mynewt-nimble/nimble/host/src/ble_sm.c
+        libs/mynewt-nimble/nimble/host/src/ble_gap.c
+        libs/mynewt-nimble/nimble/host/src/ble_gatts.c
+        libs/mynewt-nimble/nimble/host/src/ble_gattc.c
+        libs/mynewt-nimble/nimble/host/src/ble_hs_conn.c
+        libs/mynewt-nimble/nimble/host/src/ble_att_svr.c
+        libs/mynewt-nimble/nimble/host/src/ble_store.c
+        libs/mynewt-nimble/nimble/host/src/ble_store_util.c
+        libs/mynewt-nimble/nimble/host/src/ble_hs_pvcy.c
+        libs/mynewt-nimble/nimble/host/src/ble_hs_hci.c
+        libs/mynewt-nimble/nimble/host/src/ble_hs_log.c
+        libs/mynewt-nimble/nimble/host/src/ble_hs_hci_util.c
+        libs/mynewt-nimble/nimble/host/src/ble_hs_hci_cmd.c
+        libs/mynewt-nimble/nimble/host/src/ble_hs_cfg.c
+        libs/mynewt-nimble/nimble/host/src/ble_uuid.c
+        libs/mynewt-nimble/nimble/host/src/ble_hs_id.c
+        libs/mynewt-nimble/nimble/host/src/ble_hs_misc.c
+        libs/mynewt-nimble/nimble/host/src/ble_att.c
+        libs/mynewt-nimble/nimble/host/src/ble_att_clt.c
+        libs/mynewt-nimble/nimble/host/src/ble_att_svr.c
+        libs/mynewt-nimble/nimble/host/src/ble_att_cmd.c
+        libs/mynewt-nimble/nimble/host/src/ble_hs_atomic.c
+        libs/mynewt-nimble/nimble/host/src/ble_hs_adv.c
+        libs/mynewt-nimble/nimble/host/src/ble_hs_flow.c
+        libs/mynewt-nimble/nimble/host/src/ble_sm.c
+        libs/mynewt-nimble/nimble/host/src/ble_sm_cmd.c
+        libs/mynewt-nimble/nimble/host/src/ble_sm_lgcy.c
+        libs/mynewt-nimble/nimble/host/src/ble_sm_alg.c
+        libs/mynewt-nimble/nimble/host/src/ble_hs_mqueue.c
+        libs/mynewt-nimble/nimble/host/src/ble_hs_stop.c
+        libs/mynewt-nimble/nimble/host/src/ble_hs_startup.c
+        libs/mynewt-nimble/nimble/host/store/ram/src/ble_store_ram.c
+        libs/mynewt-nimble/nimble/host/src/ble_monitor.c
+        libs/mynewt-nimble/nimble/transport/ram/src/ble_hci_ram.c
+        libs/mynewt-nimble/nimble/controller/src/ble_ll.c
+        libs/mynewt-nimble/nimble/controller/src/ble_ll_rand.c
+        libs/mynewt-nimble/nimble/controller/src/ble_ll_conn.c
+        libs/mynewt-nimble/nimble/controller/src/ble_ll_ctrl.c
+        libs/mynewt-nimble/nimble/controller/src/ble_ll_hci.c
+        libs/mynewt-nimble/nimble/controller/src/ble_ll_conn_hci.c
+        libs/mynewt-nimble/nimble/controller/src/ble_ll_utils.c
+        libs/mynewt-nimble/nimble/controller/src/ble_ll_scan.c
+        libs/mynewt-nimble/nimble/controller/src/ble_ll_whitelist.c
+        libs/mynewt-nimble/nimble/controller/src/ble_ll_adv.c
+        libs/mynewt-nimble/nimble/controller/src/ble_ll_sched.c
+        libs/mynewt-nimble/nimble/controller/src/ble_ll_supp_cmd.c
+        libs/mynewt-nimble/nimble/controller/src/ble_ll_hci_ev.c
+        libs/mynewt-nimble/nimble/controller/src/ble_ll_rfmgmt.c
+        libs/mynewt-nimble/porting/nimble/src/os_cputime.c
+        libs/mynewt-nimble/porting/nimble/src/os_cputime_pwr2.c
+        libs/mynewt-nimble/porting/nimble/src/os_mbuf.c
+        libs/mynewt-nimble/porting/nimble/src/os_mempool.c
+        libs/mynewt-nimble/porting/nimble/src/hal_timer.c
+        libs/mynewt-nimble/porting/nimble/src/mem.c
+        libs/mynewt-nimble/porting/nimble/src/endian.c
+        libs/mynewt-nimble/porting/nimble/src/os_msys_init.c
+        libs/mynewt-nimble/nimble/drivers/nrf52/src/ble_hw.c
+        libs/mynewt-nimble/nimble/drivers/nrf52/src/ble_phy.c
+        libs/mynewt-nimble/nimble/host/services/gap/src/ble_svc_gap.c
+        libs/mynewt-nimble/nimble/host/services/gatt/src/ble_svc_gatt.c
+        libs/mynewt-nimble/nimble/host/util/src/addr.c
+        )
 
 set(LVGL_SRC
-  libs/lv_conf.h
-  libs/lvgl/lvgl.h
-  libs/lvgl/src/lv_core/lv_obj.c
-  libs/lvgl/src/lv_core/lv_obj.h
-  libs/lvgl/src/lv_core/lv_group.c
-  libs/lvgl/src/lv_core/lv_group.h
-  libs/lvgl/src/lv_core/lv_disp.c
-  libs/lvgl/src/lv_core/lv_disp.h
-  libs/lvgl/src/lv_core/lv_debug.h
-  libs/lvgl/src/lv_core/lv_debug.c
-  libs/lvgl/src/lv_core/lv_indev.c
-  libs/lvgl/src/lv_core/lv_indev.h
-  libs/lvgl/src/lv_core/lv_refr.c
-  libs/lvgl/src/lv_core/lv_refr.h
-  libs/lvgl/src/lv_core/lv_style.c
-  libs/lvgl/src/lv_core/lv_style.h
-  libs/lvgl/src/lv_misc/lv_anim.c
-  libs/lvgl/src/lv_misc/lv_anim.h
-  libs/lvgl/src/lv_misc/lv_async.h
-  libs/lvgl/src/lv_misc/lv_async.c
-  libs/lvgl/src/lv_misc/lv_fs.c
-  libs/lvgl/src/lv_misc/lv_fs.h
-  libs/lvgl/src/lv_misc/lv_task.c
-  libs/lvgl/src/lv_misc/lv_task.h
-  libs/lvgl/src/lv_misc/lv_area.c
-  libs/lvgl/src/lv_misc/lv_area.h
-  libs/lvgl/src/lv_misc/lv_bidi.c
-  libs/lvgl/src/lv_misc/lv_bidi.h
-  libs/lvgl/src/lv_misc/lv_circ.c
-  libs/lvgl/src/lv_misc/lv_circ.h
-  libs/lvgl/src/lv_misc/lv_color.c
-  libs/lvgl/src/lv_misc/lv_color.h
-  libs/lvgl/src/lv_misc/lv_fs.c
-  libs/lvgl/src/lv_misc/lv_fs.h
-  libs/lvgl/src/lv_misc/lv_gc.c
-  libs/lvgl/src/lv_misc/lv_gc.h
-  libs/lvgl/src/lv_misc/lv_ll.c
-  libs/lvgl/src/lv_misc/lv_ll.h
-  libs/lvgl/src/lv_misc/lv_log.c
-  libs/lvgl/src/lv_misc/lv_log.h
-  libs/lvgl/src/lv_misc/lv_math.c
-  libs/lvgl/src/lv_misc/lv_math.h
-  libs/lvgl/src/lv_misc/lv_mem.c
-  libs/lvgl/src/lv_misc/lv_mem.h
-  libs/lvgl/src/lv_misc/lv_printf.c
-  libs/lvgl/src/lv_misc/lv_printf.h
-  libs/lvgl/src/lv_misc/lv_task.c
-  libs/lvgl/src/lv_misc/lv_task.h
-  libs/lvgl/src/lv_misc/lv_templ.c
-  libs/lvgl/src/lv_misc/lv_templ.h
-  libs/lvgl/src/lv_misc/lv_txt.c
-  libs/lvgl/src/lv_misc/lv_txt.h
-  libs/lvgl/src/lv_misc/lv_types.h
-  libs/lvgl/src/lv_misc/lv_utils.c
-  libs/lvgl/src/lv_misc/lv_utils.h
-  libs/lvgl/src/lv_draw/lv_draw.c
-  libs/lvgl/src/lv_draw/lv_draw.h
-  libs/lvgl/src/lv_draw/lv_draw_arc.c
-  libs/lvgl/src/lv_draw/lv_draw_arc.h
-  libs/lvgl/src/lv_draw/lv_draw_basic.c
-  libs/lvgl/src/lv_draw/lv_draw_basic.h
-  libs/lvgl/src/lv_draw/lv_draw_img.c
-  libs/lvgl/src/lv_draw/lv_draw_img.h
-  libs/lvgl/src/lv_draw/lv_draw_label.c
-  libs/lvgl/src/lv_draw/lv_draw_label.h
-  libs/lvgl/src/lv_draw/lv_draw_line.c
-  libs/lvgl/src/lv_draw/lv_draw_line.h
-  libs/lvgl/src/lv_draw/lv_draw_rect.c
-  libs/lvgl/src/lv_draw/lv_draw_rect.h
-  libs/lvgl/src/lv_draw/lv_draw_triangle.c
-  libs/lvgl/src/lv_draw/lv_draw_triangle.h
-  libs/lvgl/src/lv_draw/lv_img_cache.c
-  libs/lvgl/src/lv_draw/lv_img_cache.h
-  libs/lvgl/src/lv_draw/lv_img_decoder.c
-  libs/lvgl/src/lv_draw/lv_img_decoder.h
-  libs/lvgl/src/lv_hal/lv_hal.h
-  libs/lvgl/src/lv_hal/lv_hal_disp.c
-  libs/lvgl/src/lv_hal/lv_hal_disp.h
-  libs/lvgl/src/lv_hal/lv_hal_indev.c
-  libs/lvgl/src/lv_hal/lv_hal_indev.h
-  libs/lvgl/src/lv_hal/lv_hal_tick.c
-  libs/lvgl/src/lv_hal/lv_hal_tick.h
-  libs/lvgl/src/lv_font/lv_font.c
-  libs/lvgl/src/lv_font/lv_font.h
-  libs/lvgl/src/lv_font/lv_font_fmt_txt.c
-  libs/lvgl/src/lv_font/lv_font_fmt_txt.h
-  libs/lvgl/src/lv_font/lv_symbol_def.h
-  libs/lvgl/src/lv_themes/lv_theme.c
-  libs/lvgl/src/lv_themes/lv_theme.h
-  libs/lvgl/src/lv_objx/lv_btn.h
-  libs/lvgl/src/lv_objx/lv_btn.c
-  libs/lvgl/src/lv_objx/lv_cont.h
-  libs/lvgl/src/lv_objx/lv_cont.c
-  libs/lvgl/src/lv_objx/lv_label.h
-  libs/lvgl/src/lv_objx/lv_label.c
-  libs/lvgl/src/lv_themes/lv_theme.c
-  libs/lvgl/src/lv_themes/lv_theme.h
-  libs/lvgl/src/lv_themes/lv_theme_night.h
-  libs/lvgl/src/lv_themes/lv_theme_night.c
-  libs/lvgl/src/lv_objx/lv_list.c
-  libs/lvgl/src/lv_objx/lv_list.h
-  libs/lvgl/src/lv_objx/lv_tileview.c
-  libs/lvgl/src/lv_objx/lv_tileview.h
-  libs/lvgl/src/lv_objx/lv_tabview.c
-  libs/lvgl/src/lv_objx/lv_tabview.h
-  libs/lvgl/src/lv_objx/lv_btnm.c
-  libs/lvgl/src/lv_objx/lv_btnm.h
-  libs/lvgl/src/lv_objx/lv_page.c
-  libs/lvgl/src/lv_objx/lv_page.h
-  libs/lvgl/src/lv_objx/lv_img.c
-  libs/lvgl/src/lv_objx/lv_img.h
-  libs/lvgl/src/lv_objx/lv_lmeter.c
-  libs/lvgl/src/lv_objx/lv_lmeter.h
-  libs/lvgl/src/lv_objx/lv_arc.c
-  libs/lvgl/src/lv_objx/lv_arc.h
-  libs/lvgl/src/lv_objx/lv_gauge.c
-  libs/lvgl/src/lv_objx/lv_gauge.h
-  libs/lvgl/src/lv_objx/lv_mbox.c
-  libs/lvgl/src/lv_objx/lv_mbox.h
-  libs/lvgl/src/lv_objx/lv_bar.c
-  libs/lvgl/src/lv_objx/lv_bar.h
-  libs/lvgl/src/lv_objx/lv_slider.h
-  libs/lvgl/src/lv_objx/lv_slider.c
-    libs/lvgl/src/lv_objx/lv_ddlist.c
-    libs/lvgl/src/lv_objx/lv_ddlist.h
-  )
+        libs/lv_conf.h
+        libs/lvgl/lvgl.h
+        libs/lvgl/src/lv_core/lv_obj.c
+        libs/lvgl/src/lv_core/lv_obj.h
+        libs/lvgl/src/lv_core/lv_group.c
+        libs/lvgl/src/lv_core/lv_group.h
+        libs/lvgl/src/lv_core/lv_disp.c
+        libs/lvgl/src/lv_core/lv_disp.h
+        libs/lvgl/src/lv_core/lv_debug.h
+        libs/lvgl/src/lv_core/lv_debug.c
+        libs/lvgl/src/lv_core/lv_indev.c
+        libs/lvgl/src/lv_core/lv_indev.h
+        libs/lvgl/src/lv_core/lv_refr.c
+        libs/lvgl/src/lv_core/lv_refr.h
+        libs/lvgl/src/lv_core/lv_style.c
+        libs/lvgl/src/lv_core/lv_style.h
+        libs/lvgl/src/lv_misc/lv_anim.c
+        libs/lvgl/src/lv_misc/lv_anim.h
+        libs/lvgl/src/lv_misc/lv_async.h
+        libs/lvgl/src/lv_misc/lv_async.c
+        libs/lvgl/src/lv_misc/lv_fs.c
+        libs/lvgl/src/lv_misc/lv_fs.h
+        libs/lvgl/src/lv_misc/lv_task.c
+        libs/lvgl/src/lv_misc/lv_task.h
+        libs/lvgl/src/lv_misc/lv_area.c
+        libs/lvgl/src/lv_misc/lv_area.h
+        libs/lvgl/src/lv_misc/lv_bidi.c
+        libs/lvgl/src/lv_misc/lv_bidi.h
+        libs/lvgl/src/lv_misc/lv_circ.c
+        libs/lvgl/src/lv_misc/lv_circ.h
+        libs/lvgl/src/lv_misc/lv_color.c
+        libs/lvgl/src/lv_misc/lv_color.h
+        libs/lvgl/src/lv_misc/lv_fs.c
+        libs/lvgl/src/lv_misc/lv_fs.h
+        libs/lvgl/src/lv_misc/lv_gc.c
+        libs/lvgl/src/lv_misc/lv_gc.h
+        libs/lvgl/src/lv_misc/lv_ll.c
+        libs/lvgl/src/lv_misc/lv_ll.h
+        libs/lvgl/src/lv_misc/lv_log.c
+        libs/lvgl/src/lv_misc/lv_log.h
+        libs/lvgl/src/lv_misc/lv_math.c
+        libs/lvgl/src/lv_misc/lv_math.h
+        libs/lvgl/src/lv_misc/lv_mem.c
+        libs/lvgl/src/lv_misc/lv_mem.h
+        libs/lvgl/src/lv_misc/lv_printf.c
+        libs/lvgl/src/lv_misc/lv_printf.h
+        libs/lvgl/src/lv_misc/lv_task.c
+        libs/lvgl/src/lv_misc/lv_task.h
+        libs/lvgl/src/lv_misc/lv_templ.c
+        libs/lvgl/src/lv_misc/lv_templ.h
+        libs/lvgl/src/lv_misc/lv_txt.c
+        libs/lvgl/src/lv_misc/lv_txt.h
+        libs/lvgl/src/lv_misc/lv_types.h
+        libs/lvgl/src/lv_misc/lv_utils.c
+        libs/lvgl/src/lv_misc/lv_utils.h
+        libs/lvgl/src/lv_draw/lv_draw.c
+        libs/lvgl/src/lv_draw/lv_draw.h
+        libs/lvgl/src/lv_draw/lv_draw_arc.c
+        libs/lvgl/src/lv_draw/lv_draw_arc.h
+        libs/lvgl/src/lv_draw/lv_draw_basic.c
+        libs/lvgl/src/lv_draw/lv_draw_basic.h
+        libs/lvgl/src/lv_draw/lv_draw_img.c
+        libs/lvgl/src/lv_draw/lv_draw_img.h
+        libs/lvgl/src/lv_draw/lv_draw_label.c
+        libs/lvgl/src/lv_draw/lv_draw_label.h
+        libs/lvgl/src/lv_draw/lv_draw_line.c
+        libs/lvgl/src/lv_draw/lv_draw_line.h
+        libs/lvgl/src/lv_draw/lv_draw_rect.c
+        libs/lvgl/src/lv_draw/lv_draw_rect.h
+        libs/lvgl/src/lv_draw/lv_draw_triangle.c
+        libs/lvgl/src/lv_draw/lv_draw_triangle.h
+        libs/lvgl/src/lv_draw/lv_img_cache.c
+        libs/lvgl/src/lv_draw/lv_img_cache.h
+        libs/lvgl/src/lv_draw/lv_img_decoder.c
+        libs/lvgl/src/lv_draw/lv_img_decoder.h
+        libs/lvgl/src/lv_hal/lv_hal.h
+        libs/lvgl/src/lv_hal/lv_hal_disp.c
+        libs/lvgl/src/lv_hal/lv_hal_disp.h
+        libs/lvgl/src/lv_hal/lv_hal_indev.c
+        libs/lvgl/src/lv_hal/lv_hal_indev.h
+        libs/lvgl/src/lv_hal/lv_hal_tick.c
+        libs/lvgl/src/lv_hal/lv_hal_tick.h
+        libs/lvgl/src/lv_font/lv_font.c
+        libs/lvgl/src/lv_font/lv_font.h
+        libs/lvgl/src/lv_font/lv_font_fmt_txt.c
+        libs/lvgl/src/lv_font/lv_font_fmt_txt.h
+        libs/lvgl/src/lv_font/lv_symbol_def.h
+        libs/lvgl/src/lv_themes/lv_theme.c
+        libs/lvgl/src/lv_themes/lv_theme.h
+        libs/lvgl/src/lv_objx/lv_btn.h
+        libs/lvgl/src/lv_objx/lv_btn.c
+        libs/lvgl/src/lv_objx/lv_cont.h
+        libs/lvgl/src/lv_objx/lv_cont.c
+        libs/lvgl/src/lv_objx/lv_label.h
+        libs/lvgl/src/lv_objx/lv_label.c
+        libs/lvgl/src/lv_themes/lv_theme.c
+        libs/lvgl/src/lv_themes/lv_theme.h
+        libs/lvgl/src/lv_themes/lv_theme_night.h
+        libs/lvgl/src/lv_themes/lv_theme_night.c
+        libs/lvgl/src/lv_objx/lv_list.c
+        libs/lvgl/src/lv_objx/lv_list.h
+        libs/lvgl/src/lv_objx/lv_tileview.c
+        libs/lvgl/src/lv_objx/lv_tileview.h
+        libs/lvgl/src/lv_objx/lv_tabview.c
+        libs/lvgl/src/lv_objx/lv_tabview.h
+        libs/lvgl/src/lv_objx/lv_btnm.c
+        libs/lvgl/src/lv_objx/lv_btnm.h
+        libs/lvgl/src/lv_objx/lv_page.c
+        libs/lvgl/src/lv_objx/lv_page.h
+        libs/lvgl/src/lv_objx/lv_img.c
+        libs/lvgl/src/lv_objx/lv_img.h
+        libs/lvgl/src/lv_objx/lv_lmeter.c
+        libs/lvgl/src/lv_objx/lv_lmeter.h
+        libs/lvgl/src/lv_objx/lv_arc.c
+        libs/lvgl/src/lv_objx/lv_arc.h
+        libs/lvgl/src/lv_objx/lv_gauge.c
+        libs/lvgl/src/lv_objx/lv_gauge.h
+        libs/lvgl/src/lv_objx/lv_mbox.c
+        libs/lvgl/src/lv_objx/lv_mbox.h
+        libs/lvgl/src/lv_objx/lv_bar.c
+        libs/lvgl/src/lv_objx/lv_bar.h
+        libs/lvgl/src/lv_objx/lv_slider.h
+        libs/lvgl/src/lv_objx/lv_slider.c
+        libs/lvgl/src/lv_objx/lv_ddlist.c
+        libs/lvgl/src/lv_objx/lv_ddlist.h
+        )
 
 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_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/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/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
-  main.cpp
-  drivers/St7789.cpp
-  drivers/SpiNorFlash.cpp
-  drivers/SpiMaster.cpp
-  drivers/Spi.cpp
-  drivers/Watchdog.cpp
-  drivers/DebugPins.cpp
-  drivers/InternalFlash.cpp
-  Components/Battery/BatteryController.cpp
-  Components/Ble/BleController.cpp
-  Components/Ble/NotificationManager.cpp
-  Components/DateTime/DateTimeController.cpp
-  Components/Brightness/BrightnessController.cpp
-  Components/Ble/NimbleController.cpp
-  Components/Ble/DeviceInformationService.cpp
-  Components/Ble/CurrentTimeClient.cpp
-  Components/Ble/AlertNotificationClient.cpp
-  Components/Ble/DfuService.cpp
-  Components/Ble/CurrentTimeService.cpp
-  Components/Ble/AlertNotificationService.cpp
-  Components/Ble/MusicService.cpp
-  Components/Ble/BatteryInformationService.cpp
-  Components/Ble/ImmediateAlertService.cpp
-  Components/FirmwareValidator/FirmwareValidator.cpp
-  drivers/Cst816s.cpp
-  FreeRTOS/port.c
-  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
-
-  SystemTask/SystemTask.cpp
-    drivers/TwiMaster.cpp
-)
+        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
+        main.cpp
+        drivers/St7789.cpp
+        drivers/SpiNorFlash.cpp
+        drivers/SpiMaster.cpp
+        drivers/Spi.cpp
+        drivers/Watchdog.cpp
+        drivers/DebugPins.cpp
+        drivers/InternalFlash.cpp
+        components/battery/BatteryController.cpp
+        components/ble/BleController.cpp
+        components/ble/NotificationManager.cpp
+        components/datetime/DateTimeController.cpp
+        components/brightness/BrightnessController.cpp
+        components/ble/NimbleController.cpp
+        components/ble/DeviceInformationService.cpp
+        components/ble/CurrentTimeClient.cpp
+        components/ble/AlertNotificationClient.cpp
+        components/ble/DfuService.cpp
+        components/ble/CurrentTimeService.cpp
+        components/ble/AlertNotificationService.cpp
+        components/ble/MusicService.cpp
+        components/ble/BatteryInformationService.cpp
+        components/ble/ImmediateAlertService.cpp
+        components/firmwarevalidator/FirmwareValidator.cpp
+        drivers/Cst816s.cpp
+        FreeRTOS/port.c
+        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
+
+        systemtask/SystemTask.cpp
+        drivers/TwiMaster.cpp
+        )
 
 list(APPEND GRAPHICS_SOURCE_FILES
-    # FreeRTOS
-    FreeRTOS/port.c
-    FreeRTOS/port_cmsis_systick.c
-    FreeRTOS/port_cmsis.c
+        # FreeRTOS
+        FreeRTOS/port.c
+        FreeRTOS/port_cmsis_systick.c
+        FreeRTOS/port_cmsis.c
 
-    drivers/SpiNorFlash.cpp
-    drivers/SpiMaster.cpp
-    drivers/Spi.cpp
-    Logging/NrfLogger.cpp
+        drivers/SpiNorFlash.cpp
+        drivers/SpiMaster.cpp
+        drivers/Spi.cpp
+        logging/NrfLogger.cpp
 
-    Components/Gfx/Gfx.cpp
-    drivers/St7789.cpp
-    Components/Brightness/BrightnessController.cpp
+        components/gfx/Gfx.cpp
+        drivers/St7789.cpp
+        components/brightness/BrightnessController.cpp
 
-    graphics.cpp
-)
+        graphics.cpp
+        )
 
 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
-  drivers/St7789.h
-  drivers/SpiNorFlash.h
-  drivers/SpiMaster.h
-  drivers/Spi.h
-  drivers/Watchdog.h
-  drivers/DebugPins.h
-  drivers/InternalFlash.h
-  Components/Battery/BatteryController.h
-  Components/Ble/BleController.h
-  Components/Ble/NotificationManager.h
-  Components/DateTime/DateTimeController.h
-  Components/Brightness/BrightnessController.h
-  Components/Ble/NimbleController.h
-  Components/Ble/DeviceInformationService.h
-  Components/Ble/CurrentTimeClient.h
-  Components/Ble/AlertNotificationClient.h
-  Components/Ble/DfuService.h
-  Components/FirmwareValidator/FirmwareValidator.h
-  Components/Ble/BatteryInformationService.h
-  Components/Ble/ImmediateAlertService.h
-  drivers/Cst816s.h
-  FreeRTOS/portmacro.h
-  FreeRTOS/portmacro_cmsis.h
-  libs/date/includes/date/tz.h
-  libs/date/includes/date/chrono_io.h
-  libs/date/includes/date/date.h
-  libs/date/includes/date/islamic.h
-  libs/date/includes/date/iso_week.h
-  libs/date/includes/date/julian.h
-  libs/date/includes/date/ptz.h
-  libs/date/includes/date/tz_private.h
-  DisplayApp/LittleVgl.h
-  SystemTask/SystemTask.h
-  SystemTask/SystemMonitor.h
-  DisplayApp/Screens/Symbols.h
-    drivers/TwiMaster.h
-)
+        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
+        drivers/St7789.h
+        drivers/SpiNorFlash.h
+        drivers/SpiMaster.h
+        drivers/Spi.h
+        drivers/Watchdog.h
+        drivers/DebugPins.h
+        drivers/InternalFlash.h
+        components/battery/BatteryController.h
+        components/ble/BleController.h
+        components/ble/NotificationManager.h
+        components/datetime/DateTimeController.h
+        components/brightness/BrightnessController.h
+        components/ble/NimbleController.h
+        components/ble/DeviceInformationService.h
+        components/ble/CurrentTimeClient.h
+        components/ble/AlertNotificationClient.h
+        components/ble/DfuService.h
+        components/firmwarevalidator/FirmwareValidator.h
+        components/ble/BatteryInformationService.h
+        components/ble/ImmediateAlertService.h
+        drivers/Cst816s.h
+        FreeRTOS/portmacro.h
+        FreeRTOS/portmacro_cmsis.h
+        libs/date/includes/date/tz.h
+        libs/date/includes/date/chrono_io.h
+        libs/date/includes/date/date.h
+        libs/date/includes/date/islamic.h
+        libs/date/includes/date/iso_week.h
+        libs/date/includes/date/julian.h
+        libs/date/includes/date/ptz.h
+        libs/date/includes/date/tz_private.h
+        displayapp/LittleVgl.h
+        systemtask/SystemTask.h
+        systemtask/SystemMonitor.h
+        displayapp/screens/Symbols.h
+        drivers/TwiMaster.h
+        )
 
 include_directories(
-  .
-  ../
-  libs/
-  FreeRTOS/
-  libs/date/includes
-  libs/mynewt-nimble/porting/npl/freertos/include
-  libs/mynewt-nimble/nimble/include
-  libs/mynewt-nimble/porting/nimble/include
-  libs/mynewt-nimble/nimble/host/include
-  libs/mynewt-nimble/nimble/controller/include
-  libs/mynewt-nimble/nimble/transport/ram/include
-  libs/mynewt-nimble/nimble/drivers/nrf52/include
-  libs/mynewt-nimble/ext/tinycrypt/include
-  libs/mynewt-nimble/nimble/host/services/gap/include
-  libs/mynewt-nimble/nimble/host/services/gatt/include
-  libs/mynewt-nimble/nimble/host/util/include
-  libs/mynewt-nimble/nimble/host/store/ram/include
-
-  "${NRF5_SDK_PATH}/components/drivers_nrf/nrf_soc_nosd"
+        .
+        ../
+        libs/
+        FreeRTOS/
+        libs/date/includes
+        libs/mynewt-nimble/porting/npl/freertos/include
+        libs/mynewt-nimble/nimble/include
+        libs/mynewt-nimble/porting/nimble/include
+        libs/mynewt-nimble/nimble/host/include
+        libs/mynewt-nimble/nimble/controller/include
+        libs/mynewt-nimble/nimble/transport/ram/include
+        libs/mynewt-nimble/nimble/drivers/nrf52/include
+        libs/mynewt-nimble/ext/tinycrypt/include
+        libs/mynewt-nimble/nimble/host/services/gap/include
+        libs/mynewt-nimble/nimble/host/services/gatt/include
+        libs/mynewt-nimble/nimble/host/util/include
+        libs/mynewt-nimble/nimble/host/store/ram/include
+
+        "${NRF5_SDK_PATH}/components/drivers_nrf/nrf_soc_nosd"
         "${NRF5_SDK_PATH}/components"
         "${NRF5_SDK_PATH}/components/boards"
         "${NRF5_SDK_PATH}/components/softdevice/common"
@@ -548,7 +548,7 @@ include_directories(
 )
 
 link_directories(
-	../
+        ../
 )
 
 
@@ -563,52 +563,52 @@ add_definitions(-DDEBUG_NRF_USER)
 add_definitions(-D__STACK_SIZE=8192)
 add_definitions(-D__HEAP_SIZE=8192)
 
-if(NOT CMAKE_BUILD_TYPE)
-  set(CMAKE_BUILD_TYPE "Release")
-endif()
+if (NOT CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE "Release")
+endif ()
 
 # NRF SDK
 add_library(nrf-sdk STATIC ${SDK_SOURCE_FILES})
 target_include_directories(nrf-sdk SYSTEM PUBLIC . ../)
 target_include_directories(nrf-sdk SYSTEM PUBLIC ${INCLUDES_FROM_LIBS})
 target_compile_options(nrf-sdk PRIVATE
-    $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -O0 -g3>
-    $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -O3>
-    $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -O0>
-    $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -O3>
-    $<$<COMPILE_LANGUAGE:ASM>: -MP -MD -std=c99 -x assembler-with-cpp>
-    )
+        $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -O0 -g3>
+        $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -O3>
+        $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -O0>
+        $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -O3>
+        $<$<COMPILE_LANGUAGE:ASM>: -MP -MD -std=c99 -x assembler-with-cpp>
+        )
 
 # NimBLE
 add_library(nimble STATIC ${NIMBLE_SRC} ${TINYCRYPT_SRC})
 target_include_directories(nimble SYSTEM PUBLIC . ../)
 target_include_directories(nimble SYSTEM PUBLIC ${INCLUDES_FROM_LIBS})
 target_compile_options(nimble PRIVATE
-    $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -O0 -g3 -Wno-unused-but-set-variable -Wno-maybe-uninitialized>
-    $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -O3 -Wno-unused-but-set-variable -Wno-maybe-uninitialized>
-    $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -O0 -g3 -Wno-unused-but-set-variable -Wno-maybe-uninitialized>
-    $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -O3 -Wno-unused-but-set-variable -Wno-maybe-uninitialized>
-    $<$<COMPILE_LANGUAGE:ASM>: -MP -MD -std=c99 -x assembler-with-cpp>
-    )
+        $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -O0 -g3 -Wno-unused-but-set-variable -Wno-maybe-uninitialized>
+        $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -O3 -Wno-unused-but-set-variable -Wno-maybe-uninitialized>
+        $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -O0 -g3 -Wno-unused-but-set-variable -Wno-maybe-uninitialized>
+        $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -O3 -Wno-unused-but-set-variable -Wno-maybe-uninitialized>
+        $<$<COMPILE_LANGUAGE:ASM>: -MP -MD -std=c99 -x assembler-with-cpp>
+        )
 
 # lvgl
 add_library(lvgl STATIC ${LVGL_SRC})
 target_include_directories(lvgl SYSTEM PUBLIC . ../)
 target_include_directories(lvgl SYSTEM PUBLIC ${INCLUDES_FROM_LIBS})
 target_compile_options(lvgl PRIVATE
-    $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -O0 -g3>
-    $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -O3>
-    $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -O0 -g3>
-    $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -O3>
-    $<$<COMPILE_LANGUAGE:ASM>: -MP -MD -std=c99 -x assembler-with-cpp>
-    )
+        $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -O0 -g3>
+        $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -O3>
+        $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -O0 -g3>
+        $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -O3>
+        $<$<COMPILE_LANGUAGE:ASM>: -MP -MD -std=c99 -x assembler-with-cpp>
+        )
 
 # Build autonomous binary (without support for bootloader)
 set(EXECUTABLE_NAME "pinetime-app")
 set(EXECUTABLE_FILE_NAME ${EXECUTABLE_NAME}-${pinetime_VERSION_MAJOR}.${pinetime_VERSION_MINOR}.${pinetime_VERSION_PATCH})
 set(NRF5_LINKER_SCRIPT "${CMAKE_SOURCE_DIR}/gcc_nrf52.ld")
 add_executable(${EXECUTABLE_NAME} ${SOURCE_FILES})
-set_target_properties(${EXECUTABLE_NAME}  PROPERTIES OUTPUT_NAME ${EXECUTABLE_FILE_NAME})
+set_target_properties(${EXECUTABLE_NAME} PROPERTIES OUTPUT_NAME ${EXECUTABLE_FILE_NAME})
 target_link_libraries(${EXECUTABLE_NAME} nimble nrf-sdk lvgl)
 target_compile_options(${EXECUTABLE_NAME} PUBLIC
         $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -O0 -g3>
@@ -616,7 +616,7 @@ target_compile_options(${EXECUTABLE_NAME} PUBLIC
         $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -O0 -g3>
         $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -O3>
         $<$<COMPILE_LANGUAGE:ASM>: -MP -MD -std=c99 -x assembler-with-cpp>
-)
+        )
 
 set_target_properties(${EXECUTABLE_NAME} PROPERTIES
         SUFFIX ".out"
@@ -641,7 +641,7 @@ set(DFU_FILE_NAME dfu-${pinetime_VERSION_MAJOR}.${pinetime_VERSION_MINOR}.${pine
 set(NRF5_LINKER_SCRIPT_MCUBOOT "${CMAKE_SOURCE_DIR}/gcc_nrf52-mcuboot.ld")
 add_executable(${EXECUTABLE_MCUBOOT_NAME} ${SOURCE_FILES})
 target_link_libraries(${EXECUTABLE_MCUBOOT_NAME} nimble nrf-sdk lvgl)
-set_target_properties(${EXECUTABLE_MCUBOOT_NAME}  PROPERTIES OUTPUT_NAME ${EXECUTABLE_MCUBOOT_FILE_NAME})
+set_target_properties(${EXECUTABLE_MCUBOOT_NAME} PROPERTIES OUTPUT_NAME ${EXECUTABLE_MCUBOOT_FILE_NAME})
 target_compile_options(${EXECUTABLE_MCUBOOT_NAME} PUBLIC
         $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -O0 -g3>
         $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -O3>
@@ -663,39 +663,39 @@ add_custom_command(TARGET ${EXECUTABLE_MCUBOOT_NAME}
         COMMAND ${CMAKE_OBJCOPY} -O binary ${EXECUTABLE_MCUBOOT_FILE_NAME}.out "${EXECUTABLE_MCUBOOT_FILE_NAME}.bin"
         COMMAND ${CMAKE_OBJCOPY} -O ihex ${EXECUTABLE_MCUBOOT_FILE_NAME}.out "${EXECUTABLE_MCUBOOT_FILE_NAME}.hex"
         COMMENT "post build steps for ${EXECUTABLE_MCUBOOT_FILE_NAME}"
-)
+        )
 
 # Build binary that writes the graphic assets for the bootloader
 set(EXECUTABLE_GRAPHICS_NAME "pinetime-graphics")
 set(EXECUTABLE_GRAPHICS_FILE_NAME ${EXECUTABLE_GRAPHICS_NAME}-${pinetime_VERSION_MAJOR}.${pinetime_VERSION_MINOR}.${pinetime_VERSION_PATCH})
 add_executable(${EXECUTABLE_GRAPHICS_NAME} ${GRAPHICS_SOURCE_FILES})
 target_link_libraries(${EXECUTABLE_GRAPHICS_NAME} nrf-sdk)
-set_target_properties(${EXECUTABLE_GRAPHICS_NAME}  PROPERTIES OUTPUT_NAME ${EXECUTABLE_GRAPHICS_FILE_NAME})
+set_target_properties(${EXECUTABLE_GRAPHICS_NAME} PROPERTIES OUTPUT_NAME ${EXECUTABLE_GRAPHICS_FILE_NAME})
 target_compile_options(${EXECUTABLE_GRAPHICS_NAME} PUBLIC
-    $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -O0 -g3>
-    $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -O3>
-    $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -O0 -g3>
-    $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -O3>
-    $<$<COMPILE_LANGUAGE:ASM>: -MP -MD -std=c99 -x assembler-with-cpp>
-    )
+        $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -O0 -g3>
+        $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -O3>
+        $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -O0 -g3>
+        $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -O3>
+        $<$<COMPILE_LANGUAGE:ASM>: -MP -MD -std=c99 -x assembler-with-cpp>
+        )
 
 set_target_properties(${EXECUTABLE_GRAPHICS_NAME} PROPERTIES
-    SUFFIX ".out"
-    LINK_FLAGS "-mthumb -mabi=aapcs -std=gnu++98 -std=c99 -L ${NRF5_SDK_PATH}/modules/nrfx/mdk -T${NRF5_LINKER_SCRIPT} -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -Wl,--gc-sections --specs=nano.specs -lc -lnosys -lm -Wl,-Map=${EXECUTABLE_GRAPHICS_FILE_NAME}.map"
-    CXX_STANDARD 11
-    C_STANDARD 99
-    )
+        SUFFIX ".out"
+        LINK_FLAGS "-mthumb -mabi=aapcs -std=gnu++98 -std=c99 -L ${NRF5_SDK_PATH}/modules/nrfx/mdk -T${NRF5_LINKER_SCRIPT} -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -Wl,--gc-sections --specs=nano.specs -lc -lnosys -lm -Wl,-Map=${EXECUTABLE_GRAPHICS_FILE_NAME}.map"
+        CXX_STANDARD 11
+        C_STANDARD 99
+        )
 
 add_custom_command(TARGET ${EXECUTABLE_GRAPHICS_NAME}
-    POST_BUILD
-    COMMAND ${CMAKE_SIZE_UTIL} ${EXECUTABLE_GRAPHICS_FILE_NAME}.out
-    COMMAND ${CMAKE_OBJCOPY} -O binary ${EXECUTABLE_GRAPHICS_FILE_NAME}.out "${EXECUTABLE_GRAPHICS_FILE_NAME}.bin"
-    COMMAND ${CMAKE_OBJCOPY} -O ihex ${EXECUTABLE_GRAPHICS_FILE_NAME}.out "${EXECUTABLE_GRAPHICS_FILE_NAME}.hex"
-    COMMENT "post build steps for ${EXECUTABLE_GRAPHICS_FILE_NAME}"
-    )
+        POST_BUILD
+        COMMAND ${CMAKE_SIZE_UTIL} ${EXECUTABLE_GRAPHICS_FILE_NAME}.out
+        COMMAND ${CMAKE_OBJCOPY} -O binary ${EXECUTABLE_GRAPHICS_FILE_NAME}.out "${EXECUTABLE_GRAPHICS_FILE_NAME}.bin"
+        COMMAND ${CMAKE_OBJCOPY} -O ihex ${EXECUTABLE_GRAPHICS_FILE_NAME}.out "${EXECUTABLE_GRAPHICS_FILE_NAME}.hex"
+        COMMENT "post build steps for ${EXECUTABLE_GRAPHICS_FILE_NAME}"
+        )
 
 # FLASH
-if(USE_JLINK)
+if (USE_JLINK)
     add_custom_target(FLASH_ERASE
             COMMAND ${NRFJPROG} --eraseall -f ${NRF_TARGET}
             COMMENT "erasing flashing"
@@ -708,26 +708,54 @@ if(USE_JLINK)
             COMMENT "flashing ${EXECUTABLE_NAME}.hex"
             )
 
-elseif(USE_GDB_CLIENT)
+elseif (USE_GDB_CLIENT)
     add_custom_target(FLASH_ERASE
             COMMAND ${GDB_CLIENT_BIN_PATH} -nx --batch -ex 'target extended-remote ${GDB_CLIENT_TARGET_REMOTE}' -ex 'monitor swdp_scan' -ex 'attach 1' -ex 'mon erase_mass'
             COMMENT "erasing flashing"
             )
     add_custom_target("FLASH_${EXECUTABLE_NAME}"
             DEPENDS ${EXECUTABLE_NAME}
-            COMMAND ${GDB_CLIENT_BIN_PATH} -nx --batch -ex 'target extended-remote ${GDB_CLIENT_TARGET_REMOTE}' -ex 'monitor swdp_scan' -ex 'attach 1' -ex 'load' -ex 'kill'  ${EXECUTABLE_NAME}.hex
-            COMMENT "flashing ${EXECUTABLE_NAME}.hex"
-            )
-elseif(USE_OPENOCD)
-    add_custom_target(FLASH_ERASE
-            COMMAND ${OPENOCD_BIN_PATH}  -f interface/stlink.cfg -c 'transport select hla_swd' -f target/nrf52.cfg -c init -c halt -c 'nrf5 mass_erase' -c reset -c shutdown
-            COMMENT "erasing flashing"
-            )
-    add_custom_target("FLASH_${EXECUTABLE_NAME}"
-            DEPENDS ${EXECUTABLE_NAME}
-            COMMAND ${OPENOCD_BIN_PATH} -c "tcl_port disabled" -c "gdb_port 3333" -c "telnet_port 4444" -f interface/stlink.cfg -c 'transport select hla_swd' -f target/nrf52.cfg -c "program \"${EXECUTABLE_NAME}.hex\""  -c reset -c shutdown
+            COMMAND ${GDB_CLIENT_BIN_PATH} -nx --batch -ex 'target extended-remote ${GDB_CLIENT_TARGET_REMOTE}' -ex 'monitor swdp_scan' -ex 'attach 1' -ex 'load' -ex 'kill' ${EXECUTABLE_NAME}.hex
             COMMENT "flashing ${EXECUTABLE_NAME}.hex"
             )
-
-endif()
-
+elseif (USE_OPENOCD)
+    if (USE_CMSIS_DAP)
+        add_custom_target(FLASH_ERASE
+                COMMAND ${OPENOCD_BIN_PATH} -c 'source [find interface/cmsis-dap.cfg]' -c 'transport select swd'
+                -c 'source [find target/nrf52.cfg]'
+                -c 'init'
+                -c 'halt'
+                -c 'nrf5 mass_erase'
+                -c 'halt'
+                -c 'reset'
+                -c 'exit'
+                COMMENT "erasing flashing"
+                )
+        add_custom_target("FLASH_${EXECUTABLE_NAME}"
+                DEPENDS ${EXECUTABLE_NAME}
+                COMMAND ${OPENOCD_BIN_PATH}
+                -c 'tcl_port disabled'
+                -c 'gdb_port 3333'
+                -c 'telnet_port 4444'
+                -c 'source [find interface/cmsis-dap.cfg]'
+                -c 'transport select swd'
+                -c 'source [find target/nrf52.cfg]'
+                -c 'halt'
+                -c "program \"${EXECUTABLE_NAME}.hex\""
+                -c 'reset'
+                -c 'shutdown'
+                COMMENT "flashing ${EXECUTABLE_NAME}.hex"
+                )
+    else ()
+        message()
+        add_custom_target(FLASH_ERASE
+                COMMAND ${OPENOCD_BIN_PATH} -f interface/stlink.cfg -c 'transport select hla_swd' -f target/nrf52.cfg -c init -c halt -c 'nrf5 mass_erase' -c reset -c shutdown
+                COMMENT "erasing flashing"
+                )
+        add_custom_target("FLASH_${EXECUTABLE_NAME}"
+                DEPENDS ${EXECUTABLE_NAME}
+                COMMAND ${OPENOCD_BIN_PATH} -c "tcl_port disabled" -c "gdb_port 3333" -c "telnet_port 4444" -f interface/stlink.cfg -c 'transport select hla_swd' -f target/nrf52.cfg -c "program \"${EXECUTABLE_NAME}.hex\"" -c reset -c shutdown
+                COMMENT "flashing ${EXECUTABLE_NAME}.hex"
+                )
+    endif ()
+endif ()
diff --git a/src/Components/Battery/BatteryController.cpp b/src/components/battery/BatteryController.cpp
index 571efae6..571efae6 100644
--- a/src/Components/Battery/BatteryController.cpp
+++ b/src/components/battery/BatteryController.cpp
diff --git a/src/Components/Battery/BatteryController.h b/src/components/battery/BatteryController.h
index f07648a9..f07648a9 100644
--- a/src/Components/Battery/BatteryController.h
+++ b/src/components/battery/BatteryController.h
diff --git a/src/Components/Ble/AlertNotificationClient.cpp b/src/components/ble/AlertNotificationClient.cpp
index 3e4b495f..ddc72967 100644
--- a/src/Components/Ble/AlertNotificationClient.cpp
+++ b/src/components/ble/AlertNotificationClient.cpp
@@ -1,4 +1,4 @@
-#include <SystemTask/SystemTask.h>
+#include <systemtask/SystemTask.h>
 #include "NotificationManager.h"
 
 #include "AlertNotificationClient.h"
diff --git a/src/Components/Ble/AlertNotificationClient.h b/src/components/ble/AlertNotificationClient.h
index ca4f4e94..ca4f4e94 100644
--- a/src/Components/Ble/AlertNotificationClient.h
+++ b/src/components/ble/AlertNotificationClient.h
diff --git a/src/Components/Ble/AlertNotificationService.cpp b/src/components/ble/AlertNotificationService.cpp
index ce2f7dd7..9a9b535d 100644
--- a/src/Components/Ble/AlertNotificationService.cpp
+++ b/src/components/ble/AlertNotificationService.cpp
@@ -1,7 +1,7 @@
 
 #include <hal/nrf_rtc.h>
 #include "NotificationManager.h"
-#include <SystemTask/SystemTask.h>
+#include <systemtask/SystemTask.h>
 
 #include "AlertNotificationService.h"
 #include <cstring>
diff --git a/src/Components/Ble/AlertNotificationService.h b/src/components/ble/AlertNotificationService.h
index 53cb44cc..53cb44cc 100644
--- a/src/Components/Ble/AlertNotificationService.h
+++ b/src/components/ble/AlertNotificationService.h
diff --git a/src/Components/Ble/BatteryInformationService.cpp b/src/components/ble/BatteryInformationService.cpp
index c86830b8..f7d895c2 100644
--- a/src/Components/Ble/BatteryInformationService.cpp
+++ b/src/components/ble/BatteryInformationService.cpp
@@ -1,5 +1,5 @@
 #include "BatteryInformationService.h"
-#include "../Battery/BatteryController.h"
+#include "components/battery/BatteryController.h"
 
 using namespace Pinetime::Controllers;
 
diff --git a/src/Components/Ble/BatteryInformationService.h b/src/components/ble/BatteryInformationService.h
index 74b2222c..74b2222c 100644
--- a/src/Components/Ble/BatteryInformationService.h
+++ b/src/components/ble/BatteryInformationService.h
diff --git a/src/Components/Ble/BleController.cpp b/src/components/ble/BleController.cpp
index 2b396e12..2b396e12 100644
--- a/src/Components/Ble/BleController.cpp
+++ b/src/components/ble/BleController.cpp
diff --git a/src/Components/Ble/BleController.h b/src/components/ble/BleController.h
index 3f52ea25..3f52ea25 100644
--- a/src/Components/Ble/BleController.h
+++ b/src/components/ble/BleController.h
diff --git a/src/Components/Ble/CurrentTimeClient.cpp b/src/components/ble/CurrentTimeClient.cpp
index 7a225f4b..7a225f4b 100644
--- a/src/Components/Ble/CurrentTimeClient.cpp
+++ b/src/components/ble/CurrentTimeClient.cpp
diff --git a/src/Components/Ble/CurrentTimeClient.h b/src/components/ble/CurrentTimeClient.h
index fabcdaca..639ec831 100644
--- a/src/Components/Ble/CurrentTimeClient.h
+++ b/src/components/ble/CurrentTimeClient.h
@@ -1,7 +1,8 @@
 #pragma once
 #include <cstdint>
 #include <array>
-#include <Components/DateTime/DateTimeController.h>
+
+#include "components/datetime/DateTimeController.h"
 #include <host/ble_gap.h>
 
 namespace Pinetime {
diff --git a/src/Components/Ble/CurrentTimeService.cpp b/src/components/ble/CurrentTimeService.cpp
index 3a6264e2..3a6264e2 100644
--- a/src/Components/Ble/CurrentTimeService.cpp
+++ b/src/components/ble/CurrentTimeService.cpp
diff --git a/src/Components/Ble/CurrentTimeService.h b/src/components/ble/CurrentTimeService.h
index 58bc5ba6..a6be9647 100644
--- a/src/Components/Ble/CurrentTimeService.h
+++ b/src/components/ble/CurrentTimeService.h
@@ -1,7 +1,8 @@
 #pragma once
 #include <cstdint>
 #include <array>
-#include <Components/DateTime/DateTimeController.h>
+
+#include "components/datetime/DateTimeController.h"
 #include <host/ble_gap.h>
 
 namespace Pinetime {
diff --git a/src/Components/Ble/DeviceInformationService.cpp b/src/components/ble/DeviceInformationService.cpp
index 406db1cf..406db1cf 100644
--- a/src/Components/Ble/DeviceInformationService.cpp
+++ b/src/components/ble/DeviceInformationService.cpp
diff --git a/src/Components/Ble/DeviceInformationService.h b/src/components/ble/DeviceInformationService.h
index 25ab8402..25ab8402 100644
--- a/src/Components/Ble/DeviceInformationService.h
+++ b/src/components/ble/DeviceInformationService.h
diff --git a/src/Components/Ble/DfuService.cpp b/src/components/ble/DfuService.cpp
index fcbefdd0..4dec5141 100644
--- a/src/Components/Ble/DfuService.cpp
+++ b/src/components/ble/DfuService.cpp
@@ -1,6 +1,7 @@
-#include <Components/Ble/BleController.h>
-#include <SystemTask/SystemTask.h>
 #include <cstring>
+
+#include "components/ble/BleController.h"
+#include "systemtask/SystemTask.h"
 #include "DfuService.h"
 
 using namespace Pinetime::Controllers;
diff --git a/src/Components/Ble/DfuService.h b/src/components/ble/DfuService.h
index d7ba460c..d7ba460c 100644
--- a/src/Components/Ble/DfuService.h
+++ b/src/components/ble/DfuService.h
diff --git a/src/Components/Ble/ImmediateAlertService.cpp b/src/components/ble/ImmediateAlertService.cpp
index d2c4cffb..3b7f47bf 100644
--- a/src/Components/Ble/ImmediateAlertService.cpp
+++ b/src/components/ble/ImmediateAlertService.cpp
@@ -1,5 +1,5 @@
+#include <systemtask/SystemTask.h>
 #include "ImmediateAlertService.h"
-#include <SystemTask/SystemTask.h>
 #include "AlertNotificationService.h"
 
 using namespace Pinetime::Controllers;
diff --git a/src/Components/Ble/ImmediateAlertService.h b/src/components/ble/ImmediateAlertService.h
index c42846c4..c42846c4 100644
--- a/src/Components/Ble/ImmediateAlertService.h
+++ b/src/components/ble/ImmediateAlertService.h
diff --git a/src/Components/Ble/MusicService.cpp b/src/components/ble/MusicService.cpp
index b5fa5356..9105a8e6 100644
--- a/src/Components/Ble/MusicService.cpp
+++ b/src/components/ble/MusicService.cpp
@@ -1,4 +1,4 @@
-#include <SystemTask/SystemTask.h>
+#include <systemtask/SystemTask.h>
 #include "MusicService.h"
 
 int MSCallback(uint16_t conn_handle, uint16_t attr_handle, struct ble_gatt_access_ctxt *ctxt, void *arg) {
diff --git a/src/Components/Ble/MusicService.h b/src/components/ble/MusicService.h
index ab6db572..ab6db572 100644
--- a/src/Components/Ble/MusicService.h
+++ b/src/components/ble/MusicService.h
diff --git a/src/Components/Ble/NimbleController.cpp b/src/components/ble/NimbleController.cpp
index b13f9ce3..022cc510 100644
--- a/src/Components/Ble/NimbleController.cpp
+++ b/src/components/ble/NimbleController.cpp
@@ -1,8 +1,8 @@
 
-#include <Components/DateTime/DateTimeController.h>
+#include "components/datetime/DateTimeController.h"
 
-#include <SystemTask/SystemTask.h>
-#include <Components/Ble/NotificationManager.h>
+#include <systemtask/SystemTask.h>
+#include "components/ble/NotificationManager.h"
 #include <hal/nrf_rtc.h>
 
 #include "NimbleController.h"
diff --git a/src/Components/Ble/NimbleController.h b/src/components/ble/NimbleController.h
index 89fa4250..9d20caff 100644
--- a/src/Components/Ble/NimbleController.h
+++ b/src/components/ble/NimbleController.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <cstdint>
+
 #include "AlertNotificationService.h"
 #include "AlertNotificationClient.h"
 #include "DeviceInformationService.h"
diff --git a/src/Components/Ble/NotificationManager.cpp b/src/components/ble/NotificationManager.cpp
index 0aea0697..0aea0697 100644
--- a/src/Components/Ble/NotificationManager.cpp
+++ b/src/components/ble/NotificationManager.cpp
diff --git a/src/Components/Ble/NotificationManager.h b/src/components/ble/NotificationManager.h
index daa1571b..daa1571b 100644
--- a/src/Components/Ble/NotificationManager.h
+++ b/src/components/ble/NotificationManager.h
diff --git a/src/Components/Brightness/BrightnessController.cpp b/src/components/brightness/BrightnessController.cpp
index c8825d68..c8825d68 100644
--- a/src/Components/Brightness/BrightnessController.cpp
+++ b/src/components/brightness/BrightnessController.cpp
diff --git a/src/Components/Brightness/BrightnessController.h b/src/components/brightness/BrightnessController.h
index b8354ec0..b8354ec0 100644
--- a/src/Components/Brightness/BrightnessController.h
+++ b/src/components/brightness/BrightnessController.h
diff --git a/src/Components/DateTime/DateTimeController.cpp b/src/components/datetime/DateTimeController.cpp
index 30d9c13f..30d9c13f 100644
--- a/src/Components/DateTime/DateTimeController.cpp
+++ b/src/components/datetime/DateTimeController.cpp
diff --git a/src/Components/DateTime/DateTimeController.h b/src/components/datetime/DateTimeController.h
index d6020745..d6020745 100644
--- a/src/Components/DateTime/DateTimeController.h
+++ b/src/components/datetime/DateTimeController.h
diff --git a/src/Components/FirmwareValidator/FirmwareValidator.cpp b/src/components/firmwarevalidator/FirmwareValidator.cpp
index 244d5c06..244d5c06 100644
--- a/src/Components/FirmwareValidator/FirmwareValidator.cpp
+++ b/src/components/firmwarevalidator/FirmwareValidator.cpp
diff --git a/src/Components/FirmwareValidator/FirmwareValidator.h b/src/components/firmwarevalidator/FirmwareValidator.h
index aa576d88..aa576d88 100644
--- a/src/Components/FirmwareValidator/FirmwareValidator.h
+++ b/src/components/firmwarevalidator/FirmwareValidator.h
diff --git a/src/Components/Gfx/Gfx.cpp b/src/components/gfx/Gfx.cpp
index 3c5dbfb7..3c5dbfb7 100644
--- a/src/Components/Gfx/Gfx.cpp
+++ b/src/components/gfx/Gfx.cpp
diff --git a/src/Components/Gfx/Gfx.h b/src/components/gfx/Gfx.h
index 091f06f5..091f06f5 100644
--- a/src/Components/Gfx/Gfx.h
+++ b/src/components/gfx/Gfx.h
diff --git a/src/DisplayApp/Apps.h b/src/displayapp/Apps.h
index 3842e4e5..3842e4e5 100644
--- a/src/DisplayApp/Apps.h
+++ b/src/displayapp/Apps.h
diff --git a/src/DisplayApp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index f6138ec7..d65e4f92 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;
 
@@ -43,13 +44,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
@@ -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 345e06d4..2a0efde3 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/LittleVgl.cpp b/src/displayapp/LittleVgl.cpp
index 3483f8e8..3483f8e8 100644
--- a/src/DisplayApp/LittleVgl.cpp
+++ b/src/displayapp/LittleVgl.cpp
diff --git a/src/DisplayApp/LittleVgl.h b/src/displayapp/LittleVgl.h
index 5c1c4434..5c1c4434 100644
--- a/src/DisplayApp/LittleVgl.h
+++ b/src/displayapp/LittleVgl.h
diff --git a/src/DisplayApp/TouchEvents.h b/src/displayapp/TouchEvents.h
index cf2f88dd..cf2f88dd 100644
--- a/src/DisplayApp/TouchEvents.h
+++ b/src/displayapp/TouchEvents.h
diff --git a/src/DisplayApp/Fonts/Readme.md b/src/displayapp/fonts/Readme.md
index 7ebf2e23..7ebf2e23 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 27ad0055..27ad0055 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 c9917e40..c9917e40 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 64832b5c..64832b5c 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 963767be..963767be 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 f36b684b..f36b684b 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 68a9f406..68a9f406 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 3f648fb9..3f648fb9 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 32eca651..32eca651 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 4d5719b7..4d5719b7 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 aeb5eb1f..aeb5eb1f 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 0606fc35..0606fc35 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 d84fda40..d84fda40 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 8732dc7a..8732dc7a 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 224d38d6..224d38d6 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 a65936bf..a65936bf 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 e5e00eda..e5e00eda 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 949c0b8b..949c0b8b 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 dee969b8..dee969b8 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 f447370e..f447370e 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 3b13fbb2..3b13fbb2 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 6fa41b20..6fa41b20 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 d79f396b..d79f396b 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 92cf9a41..92cf9a41 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 dd0d306f..dd0d306f 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 af6aba5d..af6aba5d 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 4c7632fe..4c7632fe 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 1b0c71df..1b0c71df 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 f9545bc1..f9545bc1 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 304c0184..304c0184 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 04d5f820..04d5f820 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 1721be15..1721be15 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 6416e1e6..6416e1e6 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 83101fd9..83101fd9 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 96b44d2e..96b44d2e 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 02af00e5..02af00e5 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 5a42caf2..5a42caf2 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 d2eea829..d2eea829 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 ca0e04dd..ca0e04dd 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 05f8b975..05f8b975 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 2930068a..2930068a 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 ac3e319c..ac3e319c 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 7d5f55d7..7d5f55d7 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 cc1c1d23..cc1c1d23 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 cce5052f..cce5052f 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 85e1c260..85e1c260 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 fc7b443d..fc7b443d 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 8dec0cb5..8dec0cb5 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 7c8ce0c4..7c8ce0c4 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 53716115..53716115 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 3275895d..3275895d 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 d30dc9d0..d30dc9d0 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 53716115..53716115 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 930179b6..930179b6 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 3275895d..3275895d 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 eb85be4f..71ba91c4 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 a1e6811b..9c95acb8 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/BatteryIcon.cpp b/src/displayapp/screens/BatteryIcon.cpp
index 26939d18..26939d18 100644
--- a/src/DisplayApp/Screens/BatteryIcon.cpp
+++ b/src/displayapp/screens/BatteryIcon.cpp
diff --git a/src/DisplayApp/Screens/BatteryIcon.h b/src/displayapp/screens/BatteryIcon.h
index 58f04a87..58f04a87 100644
--- a/src/DisplayApp/Screens/BatteryIcon.h
+++ b/src/displayapp/screens/BatteryIcon.h
diff --git a/src/DisplayApp/Screens/BleIcon.cpp b/src/displayapp/screens/BleIcon.cpp
index 1bbbd053..1bbbd053 100644
--- a/src/DisplayApp/Screens/BleIcon.cpp
+++ b/src/displayapp/screens/BleIcon.cpp
diff --git a/src/DisplayApp/Screens/BleIcon.h b/src/displayapp/screens/BleIcon.h
index c1398d2a..c1398d2a 100644
--- a/src/DisplayApp/Screens/BleIcon.h
+++ b/src/displayapp/screens/BleIcon.h
diff --git a/src/DisplayApp/Screens/Brightness.cpp b/src/displayapp/screens/Brightness.cpp
index 9e3416c0..9e3416c0 100644
--- a/src/DisplayApp/Screens/Brightness.cpp
+++ b/src/displayapp/screens/Brightness.cpp
diff --git a/src/DisplayApp/Screens/Brightness.h b/src/displayapp/screens/Brightness.h
index 37cbcd7e..7d599acf 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 06fab9aa..243d4c04 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 7363fdaf..5753f6a3 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/DropDownDemo.cpp b/src/displayapp/screens/DropDownDemo.cpp
index 735a0cce..735a0cce 100644
--- a/src/DisplayApp/Screens/DropDownDemo.cpp
+++ b/src/displayapp/screens/DropDownDemo.cpp
diff --git a/src/DisplayApp/Screens/DropDownDemo.h b/src/displayapp/screens/DropDownDemo.h
index 7c75efc0..7c75efc0 100644
--- a/src/DisplayApp/Screens/DropDownDemo.h
+++ b/src/displayapp/screens/DropDownDemo.h
diff --git a/src/DisplayApp/Screens/FirmwareUpdate.cpp b/src/displayapp/screens/FirmwareUpdate.cpp
index e831114d..e831114d 100644
--- a/src/DisplayApp/Screens/FirmwareUpdate.cpp
+++ b/src/displayapp/screens/FirmwareUpdate.cpp
diff --git a/src/DisplayApp/Screens/FirmwareUpdate.h b/src/displayapp/screens/FirmwareUpdate.h
index faaf3953..893fe68c 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 fb2dd956..2300b41d 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/FirmwareValidation.h b/src/displayapp/screens/FirmwareValidation.h
index 947f5575..947f5575 100644
--- a/src/DisplayApp/Screens/FirmwareValidation.h
+++ b/src/displayapp/screens/FirmwareValidation.h
diff --git a/src/DisplayApp/Screens/Gauge.cpp b/src/displayapp/screens/Gauge.cpp
index fd905231..fd905231 100644
--- a/src/DisplayApp/Screens/Gauge.cpp
+++ b/src/displayapp/screens/Gauge.cpp
diff --git a/src/DisplayApp/Screens/Gauge.h b/src/displayapp/screens/Gauge.h
index 03c06bed..03c06bed 100644
--- a/src/DisplayApp/Screens/Gauge.h
+++ b/src/displayapp/screens/Gauge.h
diff --git a/src/DisplayApp/Screens/InfiniPaint.cpp b/src/displayapp/screens/InfiniPaint.cpp
index b340f5d8..b340f5d8 100644
--- a/src/DisplayApp/Screens/InfiniPaint.cpp
+++ b/src/displayapp/screens/InfiniPaint.cpp
diff --git a/src/DisplayApp/Screens/InfiniPaint.h b/src/displayapp/screens/InfiniPaint.h
index a1592f97..fb4f979b 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/Label.cpp b/src/displayapp/screens/Label.cpp
index 780ee88e..780ee88e 100644
--- a/src/DisplayApp/Screens/Label.cpp
+++ b/src/displayapp/screens/Label.cpp
diff --git a/src/DisplayApp/Screens/Label.h b/src/displayapp/screens/Label.h
index 3e7b3797..3e7b3797 100644
--- a/src/DisplayApp/Screens/Label.h
+++ b/src/displayapp/screens/Label.h
diff --git a/src/DisplayApp/Screens/Meter.cpp b/src/displayapp/screens/Meter.cpp
index c74b8bdf..c74b8bdf 100644
--- a/src/DisplayApp/Screens/Meter.cpp
+++ b/src/displayapp/screens/Meter.cpp
diff --git a/src/DisplayApp/Screens/Meter.h b/src/displayapp/screens/Meter.h
index ddf8be8d..ddf8be8d 100644
--- a/src/DisplayApp/Screens/Meter.h
+++ b/src/displayapp/screens/Meter.h
diff --git a/src/DisplayApp/Screens/Modal.cpp b/src/displayapp/screens/Modal.cpp
index 63ae70c0..63ae70c0 100644
--- a/src/DisplayApp/Screens/Modal.cpp
+++ b/src/displayapp/screens/Modal.cpp
diff --git a/src/DisplayApp/Screens/Modal.h b/src/displayapp/screens/Modal.h
index c616c294..c616c294 100644
--- a/src/DisplayApp/Screens/Modal.h
+++ b/src/displayapp/screens/Modal.h
diff --git a/src/DisplayApp/Screens/Music.cpp b/src/displayapp/screens/Music.cpp
index 9b7d198b..9b7d198b 100644
--- a/src/DisplayApp/Screens/Music.cpp
+++ b/src/displayapp/screens/Music.cpp
diff --git a/src/DisplayApp/Screens/Music.h b/src/displayapp/screens/Music.h
index 95cac0f0..d43d31cc 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/Screen.cpp b/src/displayapp/screens/Screen.cpp
index 1467df33..1467df33 100644
--- a/src/DisplayApp/Screens/Screen.cpp
+++ b/src/displayapp/screens/Screen.cpp
diff --git a/src/DisplayApp/Screens/Screen.h b/src/displayapp/screens/Screen.h
index dbf81a44..dbf81a44 100644
--- a/src/DisplayApp/Screens/Screen.h
+++ b/src/displayapp/screens/Screen.h
diff --git a/src/DisplayApp/Screens/ScreenList.h b/src/displayapp/screens/ScreenList.h
index d873336d..b198634f 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/Symbols.h b/src/displayapp/screens/Symbols.h
index aeea3243..aeea3243 100644
--- a/src/DisplayApp/Screens/Symbols.h
+++ b/src/displayapp/screens/Symbols.h
diff --git a/src/DisplayApp/Screens/SystemInfo.cpp b/src/displayapp/screens/SystemInfo.cpp
index fcafcf7d..8a3b8dbb 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 ac8abae5..987a584b 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/Tab.cpp b/src/displayapp/screens/Tab.cpp
index adc32578..adc32578 100644
--- a/src/DisplayApp/Screens/Tab.cpp
+++ b/src/displayapp/screens/Tab.cpp
diff --git a/src/DisplayApp/Screens/Tab.h b/src/displayapp/screens/Tab.h
index e16dbb96..e16dbb96 100644
--- a/src/DisplayApp/Screens/Tab.h
+++ b/src/displayapp/screens/Tab.h
diff --git a/src/DisplayApp/Screens/Tile.cpp b/src/displayapp/screens/Tile.cpp
index 1447d789..deb88472 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 3136d892..cf5fcf15 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 {
diff --git a/src/libs/lvgl/src/lv_core/lv_obj.c b/src/libs/lvgl/src/lv_core/lv_obj.c
index 510a8706..511e72db 100644
--- a/src/libs/lvgl/src/lv_core/lv_obj.c
+++ b/src/libs/lvgl/src/lv_core/lv_obj.c
@@ -163,7 +163,7 @@ lv_obj_t * lv_obj_create(lv_obj_t * parent, const lv_obj_t * copy)
         LV_ASSERT_MEM(new_obj);
         if(new_obj == NULL) return NULL;
 
-        new_obj->par = NULL; /*Screens has no a parent*/
+        new_obj->par = NULL; /*screens has no a parent*/
         lv_ll_init(&(new_obj->child_ll), sizeof(lv_obj_t));
 
         /*Set the callbacks*/
diff --git a/src/Logging/DummyLogger.h b/src/logging/DummyLogger.h
index 0aa72882..0aa72882 100644
--- a/src/Logging/DummyLogger.h
+++ b/src/logging/DummyLogger.h
diff --git a/src/Logging/Logger.h b/src/logging/Logger.h
index 95d21dc4..95d21dc4 100644
--- a/src/Logging/Logger.h
+++ b/src/logging/Logger.h
diff --git a/src/Logging/NrfLogger.cpp b/src/logging/NrfLogger.cpp
index 7ccacc82..7ccacc82 100644
--- a/src/Logging/NrfLogger.cpp
+++ b/src/logging/NrfLogger.cpp
diff --git a/src/Logging/NrfLogger.h b/src/logging/NrfLogger.h
index cb7089f2..cb7089f2 100644
--- a/src/Logging/NrfLogger.h
+++ b/src/logging/NrfLogger.h
diff --git a/src/main.cpp b/src/main.cpp
index fe413585..e3243362 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,29 +1,29 @@
 #include <FreeRTOS.h>
 #include <task.h>
+#include <timers.h>
 #include <legacy/nrf_drv_clock.h>
+#include <hal/nrf_rtc.h>
+#include <hal/nrf_wdt.h>
+#include <os/os_cputime.h>
 #include <libraries/timer/app_timer.h>
 #include <libraries/gpiote/app_gpiote.h>
-#include <DisplayApp/DisplayApp.h>
+#include "displayapp/DisplayApp.h"
 #include <softdevice/common/nrf_sdh.h>
-#include <hal/nrf_rtc.h>
-#include <timers.h>
-#include <Components/DateTime/DateTimeController.h>
-#include "Components/Battery/BatteryController.h"
-#include "Components/Ble/BleController.h"
+#include "components/datetime/DateTimeController.h"
+#include "components/battery/BatteryController.h"
+#include "components/ble/BleController.h"
+#include "components/ble/NotificationManager.h"
 #include <drivers/St7789.h>
 #include <drivers/SpiMaster.h>
 #include <drivers/Spi.h>
-#include <DisplayApp/LittleVgl.h>
-#include <SystemTask/SystemTask.h>
-#include <Components/Ble/NotificationManager.h>
+#include "displayapp/LittleVgl.h"
+#include <systemtask/SystemTask.h>
 #include <nimble/nimble_port_freertos.h>
 #include <nimble/npl_freertos.h>
 #include <nimble/nimble_port.h>
 #include <host/ble_hs.h>
 #include <controller/ble_ll.h>
-#include <os/os_cputime.h>
 #include <transport/ram/ble_hci_ram.h>
-#include <hal/nrf_wdt.h>
 #include <host/util/util.h>
 #include <services/gap/ble_svc_gap.h>
 
@@ -32,7 +32,7 @@
 #include "Logging/NrfLogger.h"
 Pinetime::Logging::NrfLogger logger;
 #else
-#include "Logging/DummyLogger.h"
+#include "logging/DummyLogger.h"
 Pinetime::Logging::DummyLogger logger;
 #endif
 
diff --git a/src/SystemTask/SystemMonitor.h b/src/systemtask/SystemMonitor.h
index ec1fd817..ec1fd817 100644
--- a/src/SystemTask/SystemMonitor.h
+++ b/src/systemtask/SystemMonitor.h
diff --git a/src/SystemTask/SystemTask.cpp b/src/systemtask/SystemTask.cpp
index 2070282b..68f8ab53 100644
--- a/src/SystemTask/SystemTask.cpp
+++ b/src/systemtask/SystemTask.cpp
@@ -1,9 +1,9 @@
 #include <libraries/log/nrf_log.h>
 #include <libraries/gpiote/app_gpiote.h>
 #include <drivers/Cst816s.h>
-#include <DisplayApp/LittleVgl.h>
+#include "displayapp/LittleVgl.h"
 #include <hal/nrf_rtc.h>
-#include <Components/Ble/NotificationManager.h>
+#include "components/ble/NotificationManager.h"
 #include <host/ble_gatt.h>
 #include <host/ble_hs_adv.h>
 #include "SystemTask.h"
@@ -12,7 +12,7 @@
 #include <host/util/util.h>
 #include <drivers/InternalFlash.h>
 #include "../main.h"
-#include "Components/Ble/NimbleController.h"
+#include "components/ble/NimbleController.h"
 
 using namespace Pinetime::System;
 
@@ -46,7 +46,7 @@ void SystemTask::Start() {
 
 void SystemTask::Process(void *instance) {
   auto *app = static_cast<SystemTask *>(instance);
-  NRF_LOG_INFO("SystemTask task started!");
+  NRF_LOG_INFO("systemtask task started!");
   app->Work();
 }
 
@@ -123,7 +123,7 @@ void SystemTask::Work() {
           break;
         case Messages::GoToSleep:
           isGoingToSleep = true;
-          NRF_LOG_INFO("[SystemTask] Going to sleep");
+          NRF_LOG_INFO("[systemtask] Going to sleep");
           xTimerStop(idleTimer, 0);
           displayApp->PushMessage(Pinetime::Applications::DisplayApp::Messages::GoToSleep);
           break;
@@ -196,13 +196,13 @@ void SystemTask::Work() {
 void SystemTask::OnButtonPushed() {
   if(isGoingToSleep) return;
   if(!isSleeping) {
-    NRF_LOG_INFO("[SystemTask] Button pushed");
+    NRF_LOG_INFO("[systemtask] Button pushed");
     PushMessage(Messages::OnButtonEvent);
     displayApp->PushMessage(Pinetime::Applications::DisplayApp::Messages::ButtonPushed);
   }
   else {
     if(!isWakingUp) {
-      NRF_LOG_INFO("[SystemTask] Button pushed, waking up");
+      NRF_LOG_INFO("[systemtask] Button pushed, waking up");
       GoToRunning();
     }
   }
@@ -215,7 +215,7 @@ void SystemTask::GoToRunning() {
 
 void SystemTask::OnTouchEvent() {
   if(isGoingToSleep) return ;
-  NRF_LOG_INFO("[SystemTask] Touch event");
+  NRF_LOG_INFO("[systemtask] Touch event");
   if(!isSleeping) {
     PushMessage(Messages::OnTouchEvent);
     displayApp->PushMessage(Pinetime::Applications::DisplayApp::Messages::TouchEvent);
diff --git a/src/SystemTask/SystemTask.h b/src/systemtask/SystemTask.h
index 40277cf3..1be28e3f 100644
--- a/src/SystemTask/SystemTask.h
+++ b/src/systemtask/SystemTask.h
@@ -1,16 +1,17 @@
 #pragma once
 
+#include <memory>
+
 #include <FreeRTOS.h>
 #include <task.h>
-#include <memory>
 #include <drivers/SpiMaster.h>
 #include <drivers/St7789.h>
-#include <Components/Battery/BatteryController.h>
-#include <DisplayApp/DisplayApp.h>
+#include "components/battery/BatteryController.h"
+#include "displayapp/DisplayApp.h"
 #include <drivers/Watchdog.h>
 #include <drivers/SpiNorFlash.h>
 #include "SystemMonitor.h"
-#include "Components/Ble/NimbleController.h"
+#include "components/ble/NimbleController.h"
 #include "timers.h"
 
 namespace Pinetime {