diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1b5cdcbe..f5366314 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -349,22 +349,22 @@ list(APPEND SOURCE_FILES
         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
+        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
@@ -389,9 +389,9 @@ list(APPEND GRAPHICS_SOURCE_FILES
         drivers/Spi.cpp
         Logging/NrfLogger.cpp
 
-        Components/Gfx/Gfx.cpp
+        components/Gfx/Gfx.cpp
         drivers/St7789.cpp
-        Components/Brightness/BrightnessController.cpp
+        components/Brightness/BrightnessController.cpp
 
         graphics.cpp
         )
@@ -426,19 +426,19 @@ set(INCLUDE_FILES
         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
+        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
diff --git a/src/Components/Battery/BatteryController.cpp b/src/components/Battery/BatteryController.cpp
similarity index 100%
rename from src/Components/Battery/BatteryController.cpp
rename to src/components/Battery/BatteryController.cpp
diff --git a/src/Components/Battery/BatteryController.h b/src/components/Battery/BatteryController.h
similarity index 100%
rename from src/Components/Battery/BatteryController.h
rename to src/components/Battery/BatteryController.h
diff --git a/src/Components/Ble/AlertNotificationClient.cpp b/src/components/Ble/AlertNotificationClient.cpp
similarity index 100%
rename from src/Components/Ble/AlertNotificationClient.cpp
rename to src/components/Ble/AlertNotificationClient.cpp
diff --git a/src/Components/Ble/AlertNotificationClient.h b/src/components/Ble/AlertNotificationClient.h
similarity index 100%
rename from src/Components/Ble/AlertNotificationClient.h
rename to src/components/Ble/AlertNotificationClient.h
diff --git a/src/Components/Ble/AlertNotificationService.cpp b/src/components/Ble/AlertNotificationService.cpp
similarity index 100%
rename from src/Components/Ble/AlertNotificationService.cpp
rename to src/components/Ble/AlertNotificationService.cpp
diff --git a/src/Components/Ble/AlertNotificationService.h b/src/components/Ble/AlertNotificationService.h
similarity index 100%
rename from src/Components/Ble/AlertNotificationService.h
rename to src/components/Ble/AlertNotificationService.h
diff --git a/src/Components/Ble/BatteryInformationService.cpp b/src/components/Ble/BatteryInformationService.cpp
similarity index 100%
rename from src/Components/Ble/BatteryInformationService.cpp
rename to src/components/Ble/BatteryInformationService.cpp
diff --git a/src/Components/Ble/BatteryInformationService.h b/src/components/Ble/BatteryInformationService.h
similarity index 100%
rename from src/Components/Ble/BatteryInformationService.h
rename to src/components/Ble/BatteryInformationService.h
diff --git a/src/Components/Ble/BleController.cpp b/src/components/Ble/BleController.cpp
similarity index 100%
rename from src/Components/Ble/BleController.cpp
rename to src/components/Ble/BleController.cpp
diff --git a/src/Components/Ble/BleController.h b/src/components/Ble/BleController.h
similarity index 100%
rename from src/Components/Ble/BleController.h
rename to src/components/Ble/BleController.h
diff --git a/src/Components/Ble/CurrentTimeClient.cpp b/src/components/Ble/CurrentTimeClient.cpp
similarity index 100%
rename from src/Components/Ble/CurrentTimeClient.cpp
rename to src/components/Ble/CurrentTimeClient.cpp
diff --git a/src/Components/Ble/CurrentTimeClient.h b/src/components/Ble/CurrentTimeClient.h
similarity index 100%
rename from src/Components/Ble/CurrentTimeClient.h
rename to src/components/Ble/CurrentTimeClient.h
diff --git a/src/Components/Ble/CurrentTimeService.cpp b/src/components/Ble/CurrentTimeService.cpp
similarity index 100%
rename from src/Components/Ble/CurrentTimeService.cpp
rename to src/components/Ble/CurrentTimeService.cpp
diff --git a/src/Components/Ble/CurrentTimeService.h b/src/components/Ble/CurrentTimeService.h
similarity index 100%
rename from src/Components/Ble/CurrentTimeService.h
rename to src/components/Ble/CurrentTimeService.h
diff --git a/src/Components/Ble/DeviceInformationService.cpp b/src/components/Ble/DeviceInformationService.cpp
similarity index 100%
rename from src/Components/Ble/DeviceInformationService.cpp
rename to src/components/Ble/DeviceInformationService.cpp
diff --git a/src/Components/Ble/DeviceInformationService.h b/src/components/Ble/DeviceInformationService.h
similarity index 100%
rename from src/Components/Ble/DeviceInformationService.h
rename to src/components/Ble/DeviceInformationService.h
diff --git a/src/Components/Ble/DfuService.cpp b/src/components/Ble/DfuService.cpp
similarity index 100%
rename from src/Components/Ble/DfuService.cpp
rename to src/components/Ble/DfuService.cpp
diff --git a/src/Components/Ble/DfuService.h b/src/components/Ble/DfuService.h
similarity index 100%
rename from src/Components/Ble/DfuService.h
rename to src/components/Ble/DfuService.h
diff --git a/src/Components/Ble/ImmediateAlertService.cpp b/src/components/Ble/ImmediateAlertService.cpp
similarity index 100%
rename from src/Components/Ble/ImmediateAlertService.cpp
rename to src/components/Ble/ImmediateAlertService.cpp
diff --git a/src/Components/Ble/ImmediateAlertService.h b/src/components/Ble/ImmediateAlertService.h
similarity index 100%
rename from src/Components/Ble/ImmediateAlertService.h
rename to src/components/Ble/ImmediateAlertService.h
diff --git a/src/Components/Ble/MusicService.cpp b/src/components/Ble/MusicService.cpp
similarity index 100%
rename from src/Components/Ble/MusicService.cpp
rename to src/components/Ble/MusicService.cpp
diff --git a/src/Components/Ble/MusicService.h b/src/components/Ble/MusicService.h
similarity index 100%
rename from src/Components/Ble/MusicService.h
rename to src/components/Ble/MusicService.h
diff --git a/src/Components/Ble/NimbleController.cpp b/src/components/Ble/NimbleController.cpp
similarity index 100%
rename from src/Components/Ble/NimbleController.cpp
rename to src/components/Ble/NimbleController.cpp
diff --git a/src/Components/Ble/NimbleController.h b/src/components/Ble/NimbleController.h
similarity index 100%
rename from src/Components/Ble/NimbleController.h
rename to src/components/Ble/NimbleController.h
diff --git a/src/Components/Ble/NotificationManager.cpp b/src/components/Ble/NotificationManager.cpp
similarity index 100%
rename from src/Components/Ble/NotificationManager.cpp
rename to src/components/Ble/NotificationManager.cpp
diff --git a/src/Components/Ble/NotificationManager.h b/src/components/Ble/NotificationManager.h
similarity index 100%
rename from src/Components/Ble/NotificationManager.h
rename to src/components/Ble/NotificationManager.h
diff --git a/src/Components/Brightness/BrightnessController.cpp b/src/components/Brightness/BrightnessController.cpp
similarity index 100%
rename from src/Components/Brightness/BrightnessController.cpp
rename to src/components/Brightness/BrightnessController.cpp
diff --git a/src/Components/Brightness/BrightnessController.h b/src/components/Brightness/BrightnessController.h
similarity index 100%
rename from src/Components/Brightness/BrightnessController.h
rename to src/components/Brightness/BrightnessController.h
diff --git a/src/Components/DateTime/DateTimeController.cpp b/src/components/DateTime/DateTimeController.cpp
similarity index 100%
rename from src/Components/DateTime/DateTimeController.cpp
rename to src/components/DateTime/DateTimeController.cpp
diff --git a/src/Components/DateTime/DateTimeController.h b/src/components/DateTime/DateTimeController.h
similarity index 100%
rename from src/Components/DateTime/DateTimeController.h
rename to src/components/DateTime/DateTimeController.h
diff --git a/src/Components/FirmwareValidator/FirmwareValidator.cpp b/src/components/FirmwareValidator/FirmwareValidator.cpp
similarity index 100%
rename from src/Components/FirmwareValidator/FirmwareValidator.cpp
rename to src/components/FirmwareValidator/FirmwareValidator.cpp
diff --git a/src/Components/FirmwareValidator/FirmwareValidator.h b/src/components/FirmwareValidator/FirmwareValidator.h
similarity index 100%
rename from src/Components/FirmwareValidator/FirmwareValidator.h
rename to src/components/FirmwareValidator/FirmwareValidator.h
diff --git a/src/Components/Gfx/Gfx.cpp b/src/components/Gfx/Gfx.cpp
similarity index 100%
rename from src/Components/Gfx/Gfx.cpp
rename to src/components/Gfx/Gfx.cpp
diff --git a/src/Components/Gfx/Gfx.h b/src/components/Gfx/Gfx.h
similarity index 100%
rename from src/Components/Gfx/Gfx.h
rename to src/components/Gfx/Gfx.h