34 files changed, 16 insertions, 12 deletions
diff --git a/src/components/Battery/BatteryController.cpp b/src/components/battery/BatteryController.cpp
index 571efae..571efae 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 f07648a..f07648a 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 3e4b495..ddc7296 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 ca4f4e9..ca4f4e9 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 ce2f7dd..9a9b535 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 53cb44c..53cb44c 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 c86830b..f7d895c 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 74b2222..74b2222 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 2b396e1..2b396e1 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 3f52ea2..3f52ea2 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 7a225f4..7a225f4 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 fabcdac..639ec83 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 3a6264e..3a6264e 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 58bc5ba..a6be964 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 406db1c..406db1c 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 25ab840..25ab840 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 fcbefdd..4dec514 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 d7ba460..d7ba460 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 d2c4cff..3b7f47b 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 c42846c..c42846c 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 b5fa535..9105a8e 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 ab6db57..ab6db57 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 b13f9ce..022cc51 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 89fa425..9d20caf 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 0aea069..0aea069 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 daa1571..daa1571 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 c8825d6..c8825d6 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 b8354ec..b8354ec 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 30d9c13..30d9c13 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 d602074..d602074 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 244d5c0..244d5c0 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 aa576d8..aa576d8 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 3c5dbfb..3c5dbfb 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 091f06f..091f06f 100644
--- a/src/components/Gfx/Gfx.h
+++ b/src/components/gfx/Gfx.h