From 958ce4906c5386ad8aaa0e7e72697be7388ca9ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20Smoczy=C5=84ski?= <smoczynski.marcin@gmail.com>
Date: Mon, 20 Sep 2021 15:15:12 +0200
Subject: [PATCH] [BH-897] Split module-sys
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Split system module to better manage dependencies between system
components.

Signed-off-by: Marcin Smoczyński <smoczynski.marcin@gmail.com>
---
 .../ApplicationAntenna.cpp                    |  2 +-
 .../ApplicationAntenna.hpp                    |  2 +-
 .../application-call/ApplicationCall.cpp      |  2 +-
 .../application-call/ApplicationCall.hpp      |  2 +-
 .../application-clock/ApplicationClock.cpp    | 97 +++++++++++++++++++
 .../application-clock/ApplicationClock.hpp    | 51 ++++++++++
 module-apps/apps-common/ApplicationCommon.cpp | 10 +-
 module-apps/apps-common/CallbackStorage.hpp   |  2 +-
 module-apps/apps-common/GuiTimer.cpp          |  4 +-
 module-apps/apps-common/GuiTimer.hpp          |  4 +-
 .../locks/handlers/PhoneLockHandler.cpp       |  2 +-
 .../locks/handlers/PhoneLockHandler.hpp       |  2 +-
 .../locks/handlers/PhoneLockSubject.hpp       |  2 +-
 .../locks/handlers/SimLockHandler.cpp         |  8 +-
 .../locks/handlers/SimLockHandler.hpp         |  4 +-
 .../locks/handlers/SimLockSubject.hpp         |  2 +-
 .../popups/TetheringConfirmationPopup.cpp     |  2 +-
 .../apps-common/popups/WindowWithTimer.hpp    |  2 +-
 .../popups/data/BluetoothModeParams.hpp       |  2 +-
 .../popups/data/PhoneModeParams.hpp           |  2 +-
 .../popups/data/PopupRequestParams.hpp        |  2 +-
 .../popups/presenter/PowerOffPresenter.cpp    |  2 +-
 .../linux/watchdog/software_watchdog.cpp      |  2 +-
 module-bsp/bsp/vibrator/vibrator.hpp          |  6 +-
 module-gui/gui/widgets/Item.hpp               |  2 +-
 .../service-antenna/ServiceAntenna.cpp        |  4 +-
 .../service-antenna/ServiceAntenna.hpp        |  2 +-
 .../include/service-appmgr/Controller.hpp     |  2 +-
 .../service-audio/ServiceAudio.cpp            |  2 +-
 .../BluetoothDevicesModel.cpp                 |  2 +-
 .../CellularRequestHandler.cpp                |  6 +-
 .../service-cellular/handler/RawATHandler.cpp |  2 +-
 .../service-cellular/handler/RawATHandler.hpp |  2 +-
 .../service-cellular/ServiceCellular.hpp      |  2 +-
 .../connection-manager/ConnectionManager.hpp  |  2 +-
 .../test-settings-Interface.cpp               |  2 +-
 .../service-desktop/ServiceDesktop.cpp        |  8 +-
 .../developerMode/DeveloperModeHelper.cpp     |  4 +-
 .../ScreenLightControl.hpp                    |  2 +-
 .../service-evtmgr/BatteryMessages.hpp        |  2 +-
 .../service-evtmgr/KbdMessage.hpp             |  2 +-
 .../service-evtmgr/vibra/Vibra.cpp            |  5 +-
 .../service-time/AlarmRepository.hpp          |  7 +-
 .../include/service-time/AlarmServiceAPI.hpp  |  2 +-
 .../service-time/RTCCommandInterface.hpp      |  2 +-
 .../service-time/service-time/TimeMessage.hpp |  2 +-
 module-sys/CMakeLists.txt                     | 72 +++-----------
 module-sys/PhoneModes/CMakeLists.txt          | 22 +++++
 module-sys/PhoneModes/Observer.cpp            |  4 +-
 module-sys/PhoneModes/Subject.cpp             |  2 +-
 .../{ => include/PhoneModes}/Common.hpp       |  0
 .../{ => include/PhoneModes}/Observer.hpp     |  4 +-
 .../{ => include/PhoneModes}/Subject.hpp      |  0
 module-sys/Service/BusProxy.cpp               |  2 +-
 module-sys/Service/CMakeLists.txt             | 45 +++++++++
 module-sys/Service/CpuSentinel.cpp            |  2 +-
 module-sys/Service/Message.cpp                |  4 +-
 module-sys/Service/Service.cpp                | 39 ++++----
 module-sys/Service/Worker.cpp                 |  2 +-
 module-sys/Service/details/bus/Bus.cpp        |  4 +-
 module-sys/Service/details/bus/Bus.hpp        |  4 +-
 .../{ => include/Service}/BusProxy.hpp        |  4 +-
 .../Service/{ => include/Service}/Common.hpp  |  0
 .../{ => include/Service}/CpuSentinel.hpp     |  0
 .../Service/{ => include/Service}/Mailbox.hpp |  0
 .../Service/{ => include/Service}/Message.hpp |  0
 .../{ => include/Service}/MessageForward.hpp  |  0
 .../Service/{ => include/Service}/Service.hpp | 26 ++---
 .../{ => include/Service}/ServiceCreator.hpp  |  0
 .../{ => include/Service}/ServiceForward.hpp  |  0
 .../{ => include/Service}/ServiceManifest.hpp |  0
 .../{ => include/Service}/ServiceProxy.hpp    |  0
 .../Service}/SystemReturnCodes.hpp            |  0
 .../{ => include/Service}/Watchdog.hpp        |  0
 .../Service/{ => include/Service}/Worker.hpp  |  0
 .../Service/tests/test-system_messages.cpp    |  2 +-
 module-sys/SystemManager/CMakeLists.txt       | 44 +++++++++
 module-sys/SystemManager/CpuGovernor.cpp      |  2 +-
 module-sys/SystemManager/CpuStatistics.cpp    |  2 +-
 module-sys/SystemManager/DependencyGraph.cpp  |  2 +-
 module-sys/SystemManager/DeviceManager.cpp    |  2 +-
 module-sys/SystemManager/PowerManager.cpp     |  2 +-
 .../SystemManager/SystemManagerCommon.cpp     | 12 +--
 .../{ => include/SystemManager}/Constants.hpp |  0
 .../SystemManager}/CpuGovernor.hpp            |  0
 .../SystemManager}/CpuStatistics.hpp          |  0
 .../SystemManager}/DependencyGraph.hpp        |  2 +-
 .../SystemManager}/DeviceManager.hpp          |  0
 .../SystemManager}/PowerManager.hpp           |  0
 .../SystemManager}/SystemManagerCommon.hpp    |  0
 .../messages/CpuFrequencyMessage.hpp          |  0
 .../messages/DeviceRegistrationMessage.hpp    |  0
 .../messages/RequestCpuFrequencyMessage.hpp   |  0
 .../messages/SentinelRegistrationMessage.hpp  |  0
 .../messages/SystemManagerMessage.hpp         |  0
 .../messages/TetheringQuestionRequest.hpp     |  2 +-
 .../messages/TetheringStateRequest.hpp        |  2 +-
 module-sys/SystemWatchdog/CMakeLists.txt      | 22 +++++
 module-sys/SystemWatchdog/SystemWatchdog.cpp  |  2 +-
 .../SystemWatchdog}/SystemWatchdog.hpp        |  2 +-
 module-sys/Timers/CMakeLists.txt              | 25 +++++
 module-sys/Timers/SystemTimer.cpp             |  6 +-
 module-sys/Timers/TimerFactory.cpp            |  4 +-
 module-sys/Timers/TimerHandle.cpp             |  2 +-
 .../{ => include/Timers}/SystemTimer.hpp      |  2 +-
 .../Timers/{ => include/Timers}/Timer.hpp     |  0
 .../{ => include/Timers}/TimerFactory.hpp     |  0
 .../{ => include/Timers}/TimerHandle.hpp      |  0
 .../{ => include/Timers}/TimerMessage.hpp     |  2 +-
 .../alarms/src/actions/PlayToneAction.hpp     |  2 +-
 .../presenters/HomeScreenPresenter.cpp        |  4 +-
 .../presenters/HomeScreenPresenter.hpp        |  4 +-
 .../include/appmgr/messages/AlarmMessage.hpp  |  2 +-
 .../services/evtmgr/EventManager.cpp          |  2 +-
 .../ScreenLightControl.cpp                    |  2 +-
 .../sys/include/sys/SystemManager.hpp         |  2 +-
 .../services/appmgr/ApplicationManager.cpp    |  4 +-
 .../ScreenLightControl.cpp                    |  2 +-
 .../service-fileindexer/StartupIndexer.hpp    |  2 +-
 products/PurePhone/sys/SystemManager.cpp      |  6 +-
 .../sys/include/sys/SystemManager.hpp         |  4 +-
 .../include/sys/messages/PhoneModeRequest.hpp |  2 +-
 ...heringPhoneModeChangeProhibitedMessage.hpp |  2 +-
 .../test-service-db-settings-api.cpp          |  2 +-
 124 files changed, 480 insertions(+), 221 deletions(-)
 create mode 100644 module-apps/application-clock/ApplicationClock.cpp
 create mode 100644 module-apps/application-clock/ApplicationClock.hpp
 create mode 100644 module-sys/PhoneModes/CMakeLists.txt
 rename module-sys/PhoneModes/{ => include/PhoneModes}/Common.hpp (100%)
 rename module-sys/PhoneModes/{ => include/PhoneModes}/Observer.hpp (92%)
 rename module-sys/PhoneModes/{ => include/PhoneModes}/Subject.hpp (100%)
 create mode 100644 module-sys/Service/CMakeLists.txt
 rename module-sys/Service/{ => include/Service}/BusProxy.hpp (97%)
 rename module-sys/Service/{ => include/Service}/Common.hpp (100%)
 rename module-sys/Service/{ => include/Service}/CpuSentinel.hpp (100%)
 rename module-sys/Service/{ => include/Service}/Mailbox.hpp (100%)
 rename module-sys/Service/{ => include/Service}/Message.hpp (100%)
 rename module-sys/Service/{ => include/Service}/MessageForward.hpp (100%)
 rename module-sys/Service/{ => include/Service}/Service.hpp (82%)
 rename module-sys/Service/{ => include/Service}/ServiceCreator.hpp (100%)
 rename module-sys/Service/{ => include/Service}/ServiceForward.hpp (100%)
 rename module-sys/Service/{ => include/Service}/ServiceManifest.hpp (100%)
 rename module-sys/Service/{ => include/Service}/ServiceProxy.hpp (100%)
 rename module-sys/Service/{ => include/Service}/SystemReturnCodes.hpp (100%)
 rename module-sys/Service/{ => include/Service}/Watchdog.hpp (100%)
 rename module-sys/Service/{ => include/Service}/Worker.hpp (100%)
 create mode 100644 module-sys/SystemManager/CMakeLists.txt
 rename module-sys/SystemManager/{ => include/SystemManager}/Constants.hpp (100%)
 rename module-sys/SystemManager/{ => include/SystemManager}/CpuGovernor.hpp (100%)
 rename module-sys/SystemManager/{ => include/SystemManager}/CpuStatistics.hpp (100%)
 rename module-sys/SystemManager/{ => include/SystemManager}/DependencyGraph.hpp (96%)
 rename module-sys/SystemManager/{ => include/SystemManager}/DeviceManager.hpp (100%)
 rename module-sys/SystemManager/{ => include/SystemManager}/PowerManager.hpp (100%)
 rename module-sys/SystemManager/{ => include/SystemManager}/SystemManagerCommon.hpp (100%)
 rename module-sys/SystemManager/{ => include/SystemManager}/messages/CpuFrequencyMessage.hpp (100%)
 rename module-sys/SystemManager/{ => include/SystemManager}/messages/DeviceRegistrationMessage.hpp (100%)
 rename module-sys/SystemManager/{ => include/SystemManager}/messages/RequestCpuFrequencyMessage.hpp (100%)
 rename module-sys/SystemManager/{ => include/SystemManager}/messages/SentinelRegistrationMessage.hpp (100%)
 rename module-sys/SystemManager/{ => include/SystemManager}/messages/SystemManagerMessage.hpp (100%)
 rename module-sys/SystemManager/{ => include/SystemManager}/messages/TetheringQuestionRequest.hpp (97%)
 rename module-sys/SystemManager/{ => include/SystemManager}/messages/TetheringStateRequest.hpp (93%)
 create mode 100644 module-sys/SystemWatchdog/CMakeLists.txt
 rename module-sys/SystemWatchdog/{ => include/SystemWatchdog}/SystemWatchdog.hpp (97%)
 create mode 100644 module-sys/Timers/CMakeLists.txt
 rename module-sys/Timers/{ => include/Timers}/SystemTimer.hpp (98%)
 rename module-sys/Timers/{ => include/Timers}/Timer.hpp (100%)
 rename module-sys/Timers/{ => include/Timers}/TimerFactory.hpp (100%)
 rename module-sys/Timers/{ => include/Timers}/TimerHandle.hpp (100%)
 rename module-sys/Timers/{ => include/Timers}/TimerMessage.hpp (93%)

diff --git a/module-apps/application-antenna/ApplicationAntenna.cpp b/module-apps/application-antenna/ApplicationAntenna.cpp
index 000c314d9..79d39d5dd 100644
--- a/module-apps/application-antenna/ApplicationAntenna.cpp
+++ b/module-apps/application-antenna/ApplicationAntenna.cpp
@@ -13,7 +13,7 @@
 #include <windows/ScanModesWindow.hpp>
 #include <windows/AlgoParamsWindow.hpp>
 #include <module-cellular/at/response.hpp>
-#include <module-sys/Timers/TimerFactory.hpp>
+#include <Timers/TimerFactory.hpp>
 #include <service-cellular/CellularServiceAPI.hpp>
 #include <ticks.hpp>
 
diff --git a/module-apps/application-antenna/include/application-antenna/ApplicationAntenna.hpp b/module-apps/application-antenna/include/application-antenna/ApplicationAntenna.hpp
index 70a5ad45e..3e2f199ee 100644
--- a/module-apps/application-antenna/include/application-antenna/ApplicationAntenna.hpp
+++ b/module-apps/application-antenna/include/application-antenna/ApplicationAntenna.hpp
@@ -5,7 +5,7 @@
 
 #include <windows/AppWindow.hpp>
 #include <apps-common/ApplicationCommon.hpp>
-#include <module-sys/Timers/TimerHandle.hpp>
+#include <Timers/TimerHandle.hpp>
 #include <service-cellular/CellularServiceAPI.hpp>
 
 namespace app
diff --git a/module-apps/application-call/ApplicationCall.cpp b/module-apps/application-call/ApplicationCall.cpp
index f943afe2e..f99d0be3a 100644
--- a/module-apps/application-call/ApplicationCall.cpp
+++ b/module-apps/application-call/ApplicationCall.cpp
@@ -12,7 +12,7 @@
 #include <apps-common/windows/DialogMetadata.hpp>
 #include <log/log.hpp>
 #include <module-apps/application-phonebook/data/PhonebookItemData.hpp>
-#include <module-sys/Timers/TimerFactory.hpp>
+#include <Timers/TimerFactory.hpp>
 #include <PhoneNumber.hpp>
 #include <service-appmgr/Controller.hpp>
 #include <service-appmgr/data/MmiActionsParams.hpp>
diff --git a/module-apps/application-call/include/application-call/ApplicationCall.hpp b/module-apps/application-call/include/application-call/ApplicationCall.hpp
index 7908f525e..46bbbf40e 100644
--- a/module-apps/application-call/include/application-call/ApplicationCall.hpp
+++ b/module-apps/application-call/include/application-call/ApplicationCall.hpp
@@ -6,7 +6,7 @@
 #include "Application.hpp"
 #include "CallState.hpp"
 
-#include <module-sys/Timers/TimerHandle.hpp>
+#include <Timers/TimerHandle.hpp>
 #include <service-cellular/CellularMessage.hpp>
 #include <service-evtmgr/Constants.hpp>
 #include <service-evtmgr/EVMessages.hpp>
diff --git a/module-apps/application-clock/ApplicationClock.cpp b/module-apps/application-clock/ApplicationClock.cpp
new file mode 100644
index 000000000..fcd979b12
--- /dev/null
+++ b/module-apps/application-clock/ApplicationClock.cpp
@@ -0,0 +1,97 @@
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+// module-gui
+#include "AppWindow.hpp"
+#include "gui/widgets/Window.hpp"
+
+// module-utils
+#include <log.hpp>
+#include <service-evtmgr/EVMessages.hpp>
+#include <service-evtmgr/EventManagerCommon.hpp>
+#include <Timers/TimerFactory.hpp>
+// MessageType
+#include "MessageType.hpp"
+// this module
+#include "windows/ClockMainWindow.hpp"
+#include "ApplicationClock.hpp"
+
+namespace app
+{
+    ApplicationClock::ApplicationClock(std::string name,
+                                       std::string parent,
+                                       sys::phone_modes::PhoneMode phoneMode,
+                                       sys::bluetooth::BluetoothMode bluetoothMode,
+                                       StartInBackground startInBackground,
+                                       uint32_t stackDepth,
+                                       sys::ServicePriority priority)
+        : Application(name, parent, phoneMode, bluetoothMode, startInBackground, stackDepth, priority)
+    {
+        timerClock = sys::TimerFactory::createPeriodicTimer(
+            this, "Clock", std::chrono::milliseconds{1000}, [&](sys::Timer &) { timerClockCallback(); });
+        timerClock.start();
+    }
+
+    void ApplicationClock::timerClockCallback()
+    {
+        auto win = reinterpret_cast<gui::ClockMainWindow *>(windowsStack.get(gui::name::window::main_window));
+        win->incrementSecond();
+        win->updateLabels();
+        render(gui::RefreshModes::GUI_REFRESH_FAST);
+    }
+
+    // Invoked upon receiving data message
+    sys::MessagePointer ApplicationClock::DataReceivedHandler(sys::DataMessage *msgl, sys::ResponseMessage *resp)
+    {
+
+        auto retMsg = Application::DataReceivedHandler(msgl);
+        // if message was handled by application's template there is no need to process further.
+        if (reinterpret_cast<sys::ResponseMessage *>(retMsg.get())->retCode == sys::ReturnCodes::Success) {
+            return retMsg;
+        }
+
+        // this variable defines whether message was processed.
+        bool handled = false;
+        // if keyboard message received
+
+        if (handled)
+            return std::make_shared<sys::ResponseMessage>();
+        else
+            return std::make_shared<sys::ResponseMessage>(sys::ReturnCodes::Unresolved);
+    }
+
+    // Invoked during initialization
+    sys::ReturnCodes ApplicationClock::InitHandler()
+    {
+
+        auto ret = Application::InitHandler();
+        if (ret != sys::ReturnCodes::Success)
+            return ret;
+
+        createUserInterface();
+
+        setActiveWindow("MainWindow");
+
+        return ret;
+    }
+
+    sys::ReturnCodes ApplicationClock::DeinitHandler()
+    {
+        timerClock.stop();
+        return Application::DeinitHandler();
+    }
+
+    void ApplicationClock::createUserInterface()
+    {
+        windowsFactory.attach(gui::name::window::main_window, [](ApplicationCommon *app, const std::string &name) {
+            return std::make_unique<gui::ClockMainWindow>(app, name);
+        });
+
+        attachPopups(
+            {gui::popup::ID::Volume, gui::popup::ID::Tethering, gui::popup::ID::PhoneModes, gui::popup::ID::PhoneLock});
+    }
+
+    void ApplicationClock::destroyUserInterface()
+    {}
+
+} /* namespace app */
diff --git a/module-apps/application-clock/ApplicationClock.hpp b/module-apps/application-clock/ApplicationClock.hpp
new file mode 100644
index 000000000..09724eed7
--- /dev/null
+++ b/module-apps/application-clock/ApplicationClock.hpp
@@ -0,0 +1,51 @@
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#pragma once
+#include "Application.hpp"
+#include "Service/Message.hpp"
+#include "gui/widgets/Label.hpp"
+#include "gui/widgets/Image.hpp"
+#include "gui/widgets/ProgressBar.hpp"
+#include "Timers/TimerHandle.hpp"
+
+namespace app
+{
+    const inline std::string name_clock = "ApplicationClock";
+
+    class ApplicationClock : public Application
+    {
+        sys::TimerHandle timerClock;
+        void timerClockCallback();
+
+      public:
+        explicit ApplicationClock(std::string name                            = name_clock,
+                                  std::string parent                          = {},
+                                  sys::phone_modes::PhoneMode phoneMode       = sys::phone_modes::PhoneMode::Connected,
+                                  sys::bluetooth::BluetoothMode bluetoothMode = sys::bluetooth::BluetoothMode::Disabled,
+                                  StartInBackground startInBackground         = {false},
+                                  uint32_t stackDepth                         = 4096,
+                                  sys::ServicePriority priority               = sys::ServicePriority::Idle);
+
+        sys::MessagePointer DataReceivedHandler(sys::DataMessage *msgl, sys::ResponseMessage *resp) override;
+        sys::ReturnCodes InitHandler() override;
+        sys::ReturnCodes DeinitHandler() override;
+
+        sys::ReturnCodes SwitchPowerModeHandler(const sys::ServicePowerMode mode) override final
+        {
+            return sys::ReturnCodes::Success;
+        }
+
+        void createUserInterface() override;
+        void destroyUserInterface() override;
+    };
+
+    template <> struct ManifestTraits<ApplicationClock>
+    {
+        static auto GetManifest() -> manager::ApplicationManifest
+        {
+            return {
+                {manager::actions::Launch, manager::actions::PhoneModeChanged, manager::actions::BluetoothModeChanged}};
+        }
+    };
+} /* namespace app */
diff --git a/module-apps/apps-common/ApplicationCommon.cpp b/module-apps/apps-common/ApplicationCommon.cpp
index 43cd416c3..eee735640 100644
--- a/module-apps/apps-common/ApplicationCommon.cpp
+++ b/module-apps/apps-common/ApplicationCommon.cpp
@@ -2,11 +2,11 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "ApplicationCommon.hpp"
-#include "Common.hpp"                         // for RefreshModes
-#include "GuiTimer.hpp"                       // for GuiTimer
-#include "Item.hpp"                           // for Item
-#include "MessageType.hpp"                    // for MessageType
-#include "module-sys/Timers/TimerFactory.hpp" // for Timer
+#include "Common.hpp"              // for RefreshModes
+#include "GuiTimer.hpp"            // for GuiTimer
+#include "Item.hpp"                // for Item
+#include "MessageType.hpp"         // for MessageType
+#include "Timers/TimerFactory.hpp" // for Timer
 #include "StatusBar.hpp"
 #include "status-bar/Time.hpp"
 #include "Translator.hpp"                // for KeyInputSim...
diff --git a/module-apps/apps-common/CallbackStorage.hpp b/module-apps/apps-common/CallbackStorage.hpp
index f43311b93..6cc724078 100644
--- a/module-apps/apps-common/CallbackStorage.hpp
+++ b/module-apps/apps-common/CallbackStorage.hpp
@@ -5,7 +5,7 @@
 
 #include "AsyncTask.hpp"
 
-#include "module-sys/Service/Message.hpp"
+#include "Service/Message.hpp"
 
 #include <memory>
 #include <list>
diff --git a/module-apps/apps-common/GuiTimer.cpp b/module-apps/apps-common/GuiTimer.cpp
index 46374a2ab..1378e279d 100644
--- a/module-apps/apps-common/GuiTimer.cpp
+++ b/module-apps/apps-common/GuiTimer.cpp
@@ -6,8 +6,8 @@
 
 #include <apps-common/ApplicationCommon.hpp> // for Application
 
-#include "module-sys/Timers/SystemTimer.hpp" // for Timer, Timer::Type, Timer::Ty...
-#include "module-sys/Timers/TimerFactory.hpp"
+#include "Timers/SystemTimer.hpp" // for Timer, Timer::Type, Timer::Ty...
+#include "Timers/TimerFactory.hpp"
 
 #include <functional>
 
diff --git a/module-apps/apps-common/GuiTimer.hpp b/module-apps/apps-common/GuiTimer.hpp
index d1b28433d..9667ca61b 100644
--- a/module-apps/apps-common/GuiTimer.hpp
+++ b/module-apps/apps-common/GuiTimer.hpp
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include "module-sys/Timers/Timer.hpp"       // for Timer
-#include "module-sys/Timers/TimerHandle.hpp" // for TimerHandle
+#include "Timers/Timer.hpp"       // for Timer
+#include "Timers/TimerHandle.hpp" // for TimerHandle
 
 #include <memory>
 #include <string> // for string
diff --git a/module-apps/apps-common/locks/handlers/PhoneLockHandler.cpp b/module-apps/apps-common/locks/handlers/PhoneLockHandler.cpp
index b1f8aa3f9..5c340bc77 100644
--- a/module-apps/apps-common/locks/handlers/PhoneLockHandler.cpp
+++ b/module-apps/apps-common/locks/handlers/PhoneLockHandler.cpp
@@ -8,7 +8,7 @@
 #include <service-appmgr/Controller.hpp>
 #include <apps-common/popups/data/PopupRequestParams.hpp>
 #include <module-services/service-db/agents/settings/SystemSettings.hpp>
-#include <module-sys/Timers/TimerFactory.hpp>
+#include <Timers/TimerFactory.hpp>
 #include <time/time_conversion_factory.hpp>
 
 namespace locks
diff --git a/module-apps/apps-common/locks/handlers/PhoneLockHandler.hpp b/module-apps/apps-common/locks/handlers/PhoneLockHandler.hpp
index c0c12b6ed..b1ab0921c 100644
--- a/module-apps/apps-common/locks/handlers/PhoneLockHandler.hpp
+++ b/module-apps/apps-common/locks/handlers/PhoneLockHandler.hpp
@@ -8,7 +8,7 @@
 #include <locks/data/LockData.hpp>
 
 #include <service-db/Settings.hpp>
-#include <module-sys/Service/Service.hpp>
+#include <Service/Service.hpp>
 #include <Timers/TimerHandle.hpp>
 
 namespace locks
diff --git a/module-apps/apps-common/locks/handlers/PhoneLockSubject.hpp b/module-apps/apps-common/locks/handlers/PhoneLockSubject.hpp
index 12d5d2e17..7d8b01c7e 100644
--- a/module-apps/apps-common/locks/handlers/PhoneLockSubject.hpp
+++ b/module-apps/apps-common/locks/handlers/PhoneLockSubject.hpp
@@ -4,7 +4,7 @@
 #pragma once
 
 #include <locks/data/LockData.hpp>
-#include <module-sys/Service/Service.hpp>
+#include <Service/Service.hpp>
 
 namespace locks
 {
diff --git a/module-apps/apps-common/locks/handlers/SimLockHandler.cpp b/module-apps/apps-common/locks/handlers/SimLockHandler.cpp
index 8ec3325a1..82f0bc844 100644
--- a/module-apps/apps-common/locks/handlers/SimLockHandler.cpp
+++ b/module-apps/apps-common/locks/handlers/SimLockHandler.cpp
@@ -9,14 +9,14 @@
 
 #include <apps-common/popups/data/PopupRequestParams.hpp>
 #include <EventStore.hpp>
-#include <module-sys/Timers/TimerFactory.hpp>
+#include <Timers/TimerFactory.hpp>
 #include <service-cellular-api>
 
 namespace locks
 {
-    constexpr unsigned int default_attempts           = 4;
-    constexpr unsigned int max_input_size             = 8;
-    constexpr unsigned int min_input_size             = 4;
+    constexpr unsigned int default_attempts = 4;
+    constexpr unsigned int max_input_size   = 8;
+    constexpr unsigned int min_input_size   = 4;
 
     SimLockHandler::SimLockHandler(sys::Service *owner)
         : owner(owner), lock(Lock::LockState::Unlocked, default_attempts)
diff --git a/module-apps/apps-common/locks/handlers/SimLockHandler.hpp b/module-apps/apps-common/locks/handlers/SimLockHandler.hpp
index 77f9f8330..b3c206685 100644
--- a/module-apps/apps-common/locks/handlers/SimLockHandler.hpp
+++ b/module-apps/apps-common/locks/handlers/SimLockHandler.hpp
@@ -7,12 +7,12 @@
 #include <locks/data/SimLockMessages.hpp>
 #include <locks/data/LockData.hpp>
 
-#include <module-sys/Service/Service.hpp>
+#include <Service/Service.hpp>
 #include <Timers/TimerHandle.hpp>
 
 namespace locks
 {
-    using StoredLockInput               = std::vector<unsigned int>;
+    using StoredLockInput = std::vector<unsigned int>;
 
     class SimLockHandler
     {
diff --git a/module-apps/apps-common/locks/handlers/SimLockSubject.hpp b/module-apps/apps-common/locks/handlers/SimLockSubject.hpp
index 4df339a5c..3e2c75f31 100644
--- a/module-apps/apps-common/locks/handlers/SimLockSubject.hpp
+++ b/module-apps/apps-common/locks/handlers/SimLockSubject.hpp
@@ -5,7 +5,7 @@
 
 #include <locks/data/LockData.hpp>
 
-#include <module-sys/Service/Service.hpp>
+#include <Service/Service.hpp>
 #include <service-cellular-api>
 
 namespace locks
diff --git a/module-apps/apps-common/popups/TetheringConfirmationPopup.cpp b/module-apps/apps-common/popups/TetheringConfirmationPopup.cpp
index 670dc3c38..148df7a56 100644
--- a/module-apps/apps-common/popups/TetheringConfirmationPopup.cpp
+++ b/module-apps/apps-common/popups/TetheringConfirmationPopup.cpp
@@ -5,7 +5,7 @@
 #include "DialogMetadataMessage.hpp"
 #include "ApplicationCommon.hpp"
 
-#include <module-sys/SystemManager/messages/TetheringQuestionRequest.hpp>
+#include <SystemManager/messages/TetheringQuestionRequest.hpp>
 #include <service-appmgr/Controller.hpp>
 
 namespace gui
diff --git a/module-apps/apps-common/popups/WindowWithTimer.hpp b/module-apps/apps-common/popups/WindowWithTimer.hpp
index 244d356b6..f5f4ffc58 100644
--- a/module-apps/apps-common/popups/WindowWithTimer.hpp
+++ b/module-apps/apps-common/popups/WindowWithTimer.hpp
@@ -4,7 +4,7 @@
 #pragma once
 
 #include "AppWindow.hpp"
-#include <module-sys/Timers/TimerHandle.hpp>
+#include <Timers/TimerHandle.hpp>
 
 namespace gui
 {
diff --git a/module-apps/apps-common/popups/data/BluetoothModeParams.hpp b/module-apps/apps-common/popups/data/BluetoothModeParams.hpp
index a8a8e0dfa..591dbdd81 100644
--- a/module-apps/apps-common/popups/data/BluetoothModeParams.hpp
+++ b/module-apps/apps-common/popups/data/BluetoothModeParams.hpp
@@ -6,7 +6,7 @@
 #include "popups/Popups.hpp"
 
 #include <service-appmgr/Actions.hpp>
-#include <module-sys/PhoneModes/Common.hpp>
+#include <PhoneModes/Common.hpp>
 
 namespace gui
 {
diff --git a/module-apps/apps-common/popups/data/PhoneModeParams.hpp b/module-apps/apps-common/popups/data/PhoneModeParams.hpp
index 5814311b5..292295814 100644
--- a/module-apps/apps-common/popups/data/PhoneModeParams.hpp
+++ b/module-apps/apps-common/popups/data/PhoneModeParams.hpp
@@ -6,7 +6,7 @@
 #include "popups/Popups.hpp"
 
 #include <service-appmgr/Actions.hpp>
-#include <module-sys/PhoneModes/Common.hpp>
+#include <PhoneModes/Common.hpp>
 
 namespace gui
 {
diff --git a/module-apps/apps-common/popups/data/PopupRequestParams.hpp b/module-apps/apps-common/popups/data/PopupRequestParams.hpp
index f7064e4e5..bad23c91a 100644
--- a/module-apps/apps-common/popups/data/PopupRequestParams.hpp
+++ b/module-apps/apps-common/popups/data/PopupRequestParams.hpp
@@ -6,7 +6,7 @@
 #include "popups/Popups.hpp"
 
 #include <service-appmgr/Actions.hpp>
-#include <module-sys/PhoneModes/Common.hpp>
+#include <PhoneModes/Common.hpp>
 #include <module-audio/Audio/AudioCommon.hpp>
 #include <locks/widgets/Lock.hpp>
 #include <locks/data/LockData.hpp>
diff --git a/module-apps/apps-common/popups/presenter/PowerOffPresenter.cpp b/module-apps/apps-common/popups/presenter/PowerOffPresenter.cpp
index 80c8463b5..226dd52b9 100644
--- a/module-apps/apps-common/popups/presenter/PowerOffPresenter.cpp
+++ b/module-apps/apps-common/popups/presenter/PowerOffPresenter.cpp
@@ -3,7 +3,7 @@
 
 #include "PowerOffPresenter.hpp"
 #include <service-appmgr/messages/UserPowerDownRequest.hpp>
-#include <module-sys/SystemManager/Constants.hpp>
+#include <SystemManager/Constants.hpp>
 
 namespace gui
 {
diff --git a/module-bsp/board/linux/watchdog/software_watchdog.cpp b/module-bsp/board/linux/watchdog/software_watchdog.cpp
index 184b5dc6e..bf4b11c85 100644
--- a/module-bsp/board/linux/watchdog/software_watchdog.cpp
+++ b/module-bsp/board/linux/watchdog/software_watchdog.cpp
@@ -4,7 +4,7 @@
 #include "software_watchdog.hpp"
 #include <module-os/RTOSWrapper/include/critical.hpp>
 #include <module-os/RTOSWrapper/include/ticks.hpp>
-#include <module-sys/Service/Common.hpp>
+#include <Service/Common.hpp>
 #include <log.hpp>
 #include <cstdlib>
 
diff --git a/module-bsp/bsp/vibrator/vibrator.hpp b/module-bsp/bsp/vibrator/vibrator.hpp
index 25207d29a..bd3c643b2 100644
--- a/module-bsp/bsp/vibrator/vibrator.hpp
+++ b/module-bsp/bsp/vibrator/vibrator.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <module-sys/Timers/Timer.hpp>
+#include <Timers/Timer.hpp>
 #include <Utils.hpp>
 
 #include <chrono>
@@ -10,8 +10,8 @@ namespace bsp
 {
     namespace vibrator
     {
-        inline constexpr auto defaultVibraPulseMs = 1000;        /// default: 1000 ms vibra pulse
-        inline constexpr auto defaultVibraPauseMs = 1000;        /// default: 1000 ms vibra pause between pulses
+        inline constexpr auto defaultVibraPulseMs = 1000; /// default: 1000 ms vibra pulse
+        inline constexpr auto defaultVibraPauseMs = 1000; /// default: 1000 ms vibra pause between pulses
 
         enum class Action
         {
diff --git a/module-gui/gui/widgets/Item.hpp b/module-gui/gui/widgets/Item.hpp
index 66e569e83..9aa84508f 100644
--- a/module-gui/gui/widgets/Item.hpp
+++ b/module-gui/gui/widgets/Item.hpp
@@ -16,7 +16,7 @@
 #include <utility>              // for move
 #include <core/DrawCommandForward.hpp>
 #include <module-gui/gui/widgets/visitor/GuiVisitor.hpp>
-#include <module-sys/Timers/Timer.hpp>
+#include <Timers/Timer.hpp>
 
 namespace gui
 {
diff --git a/module-services/service-antenna/ServiceAntenna.cpp b/module-services/service-antenna/ServiceAntenna.cpp
index 513d14de6..aef027003 100644
--- a/module-services/service-antenna/ServiceAntenna.cpp
+++ b/module-services/service-antenna/ServiceAntenna.cpp
@@ -10,7 +10,7 @@
 #include <EventStore.hpp>
 #include <log.hpp>
 #include <MessageType.hpp>
-#include <module-sys/Timers/TimerFactory.hpp>
+#include <Timers/TimerFactory.hpp>
 #include <projdefs.h>
 #include <service-cellular/CellularMessage.hpp>
 #include <service-cellular/CellularServiceAPI.hpp>
@@ -352,7 +352,7 @@ bool ServiceAntenna::bandCheckStateHandler(void)
         LOG_INFO("QNWINFO: %s", qnwinfo.c_str());
         const auto bandFrequency = at::response::qnwinfo::parseNetworkFrequency(qnwinfo);
         LOG_INFO("Band frequency: %" PRIu32, bandFrequency);
-        constexpr uint32_t GHz = 1000;
+        constexpr uint32_t GHz  = 1000;
         const bool isBandSubGHz = bandFrequency < GHz;
         if (currentAntenna == bsp::cellular::antenna::highBand) {
             LOG_INFO("High band antenna.");
diff --git a/module-services/service-antenna/include/service-antenna/ServiceAntenna.hpp b/module-services/service-antenna/include/service-antenna/ServiceAntenna.hpp
index 6371e72bc..7afb4c901 100644
--- a/module-services/service-antenna/include/service-antenna/ServiceAntenna.hpp
+++ b/module-services/service-antenna/include/service-antenna/ServiceAntenna.hpp
@@ -8,7 +8,7 @@
 #include <bsp/cellular/bsp_cellular.hpp>
 #include <Timers/TimerHandle.hpp>
 #include <service-db/DBServiceName.hpp>
-#include <module-sys/PhoneModes/Observer.hpp>
+#include <PhoneModes/Observer.hpp>
 
 namespace service::name
 {
diff --git a/module-services/service-appmgr/include/service-appmgr/Controller.hpp b/module-services/service-appmgr/include/service-appmgr/Controller.hpp
index b1209e8c7..fb19e2ddd 100644
--- a/module-services/service-appmgr/include/service-appmgr/Controller.hpp
+++ b/module-services/service-appmgr/include/service-appmgr/Controller.hpp
@@ -6,7 +6,7 @@
 #include <service-appmgr/Actions.hpp>
 #include <service-appmgr/messages/Message.hpp>
 
-#include <module-sys/Service/Service.hpp>
+#include <Service/Service.hpp>
 #include <SwitchData.hpp>
 
 #include <i18n/i18n.hpp>
diff --git a/module-services/service-audio/ServiceAudio.cpp b/module-services/service-audio/ServiceAudio.cpp
index 320f52c0d..73adf3902 100644
--- a/module-services/service-audio/ServiceAudio.cpp
+++ b/module-services/service-audio/ServiceAudio.cpp
@@ -8,7 +8,7 @@
 #include <Audio/Operation/PlaybackOperation.hpp>
 #include <Bluetooth/audio/BluetoothAudioDevice.hpp>
 #include <module-audio/Audio/VolumeScaler.hpp>
-#include <module-sys/SystemManager/messages/SentinelRegistrationMessage.hpp>
+#include <SystemManager/messages/SentinelRegistrationMessage.hpp>
 #include <service-bluetooth/BluetoothMessage.hpp>
 #include <service-bluetooth/Constants.hpp>
 #include <service-bluetooth/messages/AudioRouting.hpp>
diff --git a/module-services/service-bluetooth/service-bluetooth/BluetoothDevicesModel.cpp b/module-services/service-bluetooth/service-bluetooth/BluetoothDevicesModel.cpp
index 1aef31d07..1d01eadd1 100644
--- a/module-services/service-bluetooth/service-bluetooth/BluetoothDevicesModel.cpp
+++ b/module-services/service-bluetooth/service-bluetooth/BluetoothDevicesModel.cpp
@@ -2,7 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "BluetoothDevicesModel.hpp"
-#include <module-sys/Service/Service.hpp>
+#include <Service/Service.hpp>
 #include <service-bluetooth/messages/BondedDevices.hpp>
 
 BluetoothDevicesModel::BluetoothDevicesModel(sys::Service *service) : service{service}
diff --git a/module-services/service-cellular/CellularRequestHandler.cpp b/module-services/service-cellular/CellularRequestHandler.cpp
index 8207a947e..40d1a0dc2 100644
--- a/module-services/service-cellular/CellularRequestHandler.cpp
+++ b/module-services/service-cellular/CellularRequestHandler.cpp
@@ -5,9 +5,9 @@
 #include "service-cellular/RequestFactory.hpp"
 #include "service-cellular/ServiceCellular.hpp"
 
-#include "Service/Message.hpp"
-#include "module-sys/Timers/TimerHandle.hpp"
-#include "module-sys/Timers/TimerFactory.hpp"
+#include <Service/Message.hpp>
+#include <Timers/TimerHandle.hpp>
+#include <Timers/TimerFactory.hpp>
 
 #include "service-cellular/requests/CallRequest.hpp"
 #include "service-cellular/requests/SupplementaryServicesRequest.hpp"
diff --git a/module-services/service-cellular/handler/RawATHandler.cpp b/module-services/service-cellular/handler/RawATHandler.cpp
index 30a2ca8b1..3ab1e1f78 100644
--- a/module-services/service-cellular/handler/RawATHandler.cpp
+++ b/module-services/service-cellular/handler/RawATHandler.cpp
@@ -3,7 +3,7 @@
 
 #include "RawATHandler.hpp"
 #include <modem/ATCommon.hpp>
-#include <module-sys/Service/Message.hpp>
+#include <Service/Message.hpp>
 #include <service-desktop/DeveloperModeMessage.hpp>
 #include <endpoints/developerMode/event/ATRequest.hpp>
 
diff --git a/module-services/service-cellular/handler/RawATHandler.hpp b/module-services/service-cellular/handler/RawATHandler.hpp
index e14d3285a..f6d904d33 100644
--- a/module-services/service-cellular/handler/RawATHandler.hpp
+++ b/module-services/service-cellular/handler/RawATHandler.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <module-sys/Service/MessageForward.hpp>
+#include <Service/MessageForward.hpp>
 
 namespace at
 {
diff --git a/module-services/service-cellular/service-cellular/ServiceCellular.hpp b/module-services/service-cellular/service-cellular/ServiceCellular.hpp
index 00139a84e..123b1e2bd 100644
--- a/module-services/service-cellular/service-cellular/ServiceCellular.hpp
+++ b/module-services/service-cellular/service-cellular/ServiceCellular.hpp
@@ -24,7 +24,7 @@
 #include <bsp/common.hpp>
 #include <utf8/UTF8.hpp>
 #include <service-db/Settings.hpp>
-#include <module-sys/PhoneModes/Observer.hpp>
+#include <PhoneModes/Observer.hpp>
 #include <service-db/DBServiceName.hpp>
 #include <service-db/DBNotificationMessage.hpp>
 
diff --git a/module-services/service-cellular/service-cellular/connection-manager/ConnectionManager.hpp b/module-services/service-cellular/service-cellular/connection-manager/ConnectionManager.hpp
index 69052f7c8..9df2b038a 100644
--- a/module-services/service-cellular/service-cellular/connection-manager/ConnectionManager.hpp
+++ b/module-services/service-cellular/service-cellular/connection-manager/ConnectionManager.hpp
@@ -5,7 +5,7 @@
 
 #include "ConnectionManagerCellularCommandsInterface.hpp"
 #include "module-services/service-cellular/service-cellular/ServiceCellular.hpp"
-#include <module-sys/PhoneModes/Observer.hpp>
+#include <PhoneModes/Observer.hpp>
 #include <functional>
 
 // connection timer period is 1 minute, connect to network for 5 minutes
diff --git a/module-services/service-db/test/test-settings-Settings/test-settings-Interface.cpp b/module-services/service-db/test/test-settings-Settings/test-settings-Interface.cpp
index b20dd2a68..0b04860a7 100644
--- a/module-services/service-db/test/test-settings-Settings/test-settings-Interface.cpp
+++ b/module-services/service-db/test/test-settings-Settings/test-settings-Interface.cpp
@@ -3,7 +3,7 @@
 
 #include <catch2/catch.hpp>
 #include <memory>
-#include <module-sys/Service/ServiceProxy.hpp>
+#include <Service/ServiceProxy.hpp>
 
 namespace sys
 {
diff --git a/module-services/service-desktop/ServiceDesktop.cpp b/module-services/service-desktop/ServiceDesktop.cpp
index d5cf52d68..04b92494f 100644
--- a/module-services/service-desktop/ServiceDesktop.cpp
+++ b/module-services/service-desktop/ServiceDesktop.cpp
@@ -21,11 +21,11 @@
 #include <service-evtmgr/EventManagerCommon.hpp>
 #include <service-evtmgr/EVMessages.hpp>
 #include <purefs/filesystem_paths.hpp>
-#include <module-sys/SystemManager/SystemManagerCommon.hpp>
-#include <module-sys/Timers/TimerFactory.hpp>
+#include <SystemManager/SystemManagerCommon.hpp>
+#include <Timers/TimerFactory.hpp>
 
-#include <module-sys/SystemManager/Constants.hpp>
-#include <module-sys/SystemManager/messages/TetheringStateRequest.hpp>
+#include <SystemManager/Constants.hpp>
+#include <SystemManager/messages/TetheringStateRequest.hpp>
 
 #include <sys/mount.h>
 #include <sys/statvfs.h>
diff --git a/module-services/service-desktop/endpoints/developerMode/DeveloperModeHelper.cpp b/module-services/service-desktop/endpoints/developerMode/DeveloperModeHelper.cpp
index ae60379b3..a8fa81d43 100644
--- a/module-services/service-desktop/endpoints/developerMode/DeveloperModeHelper.cpp
+++ b/module-services/service-desktop/endpoints/developerMode/DeveloperModeHelper.cpp
@@ -18,8 +18,8 @@
 #include <service-appmgr/Actions.hpp>
 #include <messages/AppMessage.hpp>
 
-#include <module-sys/SystemManager/messages/TetheringStateRequest.hpp>
-#include <module-sys/SystemManager/Constants.hpp>
+#include <SystemManager/messages/TetheringStateRequest.hpp>
+#include <SystemManager/Constants.hpp>
 
 #include <service-db/agents/settings/SystemSettings.hpp>
 #include <service-db/DBServiceAPI.hpp>
diff --git a/module-services/service-evtmgr/screen-light-control/ScreenLightControl.hpp b/module-services/service-evtmgr/screen-light-control/ScreenLightControl.hpp
index e4d24b3e9..1dd45805b 100644
--- a/module-services/service-evtmgr/screen-light-control/ScreenLightControl.hpp
+++ b/module-services/service-evtmgr/screen-light-control/ScreenLightControl.hpp
@@ -5,7 +5,7 @@
 
 #include "ScreenLightControlParameters.hpp"
 #include <memory>
-#include <module-sys/Timers/TimerHandle.hpp>
+#include <Timers/TimerHandle.hpp>
 namespace settings
 {
     class Settings;
diff --git a/module-services/service-evtmgr/service-evtmgr/BatteryMessages.hpp b/module-services/service-evtmgr/service-evtmgr/BatteryMessages.hpp
index 378336edd..d775df78f 100644
--- a/module-services/service-evtmgr/service-evtmgr/BatteryMessages.hpp
+++ b/module-services/service-evtmgr/service-evtmgr/BatteryMessages.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "module-sys/Service/Message.hpp"
+#include "Service/Message.hpp"
 
 #include <module-bsp/bsp/torch/torch.hpp>
 
diff --git a/module-services/service-evtmgr/service-evtmgr/KbdMessage.hpp b/module-services/service-evtmgr/service-evtmgr/KbdMessage.hpp
index c303442a5..1a13a6303 100644
--- a/module-services/service-evtmgr/service-evtmgr/KbdMessage.hpp
+++ b/module-services/service-evtmgr/service-evtmgr/KbdMessage.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "module-sys/Service/Message.hpp"
+#include "Service/Message.hpp"
 
 #include <common_data/RawKey.hpp>
 
diff --git a/module-services/service-evtmgr/vibra/Vibra.cpp b/module-services/service-evtmgr/vibra/Vibra.cpp
index ff12fe070..cc1be2900 100644
--- a/module-services/service-evtmgr/vibra/Vibra.cpp
+++ b/module-services/service-evtmgr/vibra/Vibra.cpp
@@ -3,13 +3,12 @@
 
 #include "Vibra.hpp"
 #include "SystemManager/Constants.hpp"
-#include <module-sys/Timers/TimerFactory.hpp>
+#include <Timers/TimerFactory.hpp>
 
 namespace vibra_handle
 {
     Vibra::Vibra(sys::Service *parent) : parent{parent}
-    {
-    }
+    {}
 
     void Vibra::intPulse(bool repetitive)
     {
diff --git a/module-services/service-time/AlarmRepository.hpp b/module-services/service-time/AlarmRepository.hpp
index cdb89a75f..a8645fa70 100644
--- a/module-services/service-time/AlarmRepository.hpp
+++ b/module-services/service-time/AlarmRepository.hpp
@@ -3,8 +3,7 @@
 
 #pragma once
 
-
-#include <module-sys/Service/Service.hpp>
+#include <Service/Service.hpp>
 #include <time/dateCommon.hpp>
 
 #include <ctime>
@@ -19,8 +18,8 @@ struct AlarmEventRecord;
  */
 namespace alarms
 {
-    using OnGetAlarmEventCallback          = std::function<void(AlarmEventRecord)>;
-    using OnGetAlarmEventsCallback         = std::function<void(std::vector<AlarmEventRecord>)>;
+    using OnGetAlarmEventCallback  = std::function<void(AlarmEventRecord)>;
+    using OnGetAlarmEventsCallback = std::function<void(std::vector<AlarmEventRecord>)>;
     using OnGetAlarmEventsInRangeCallback =
         std::function<void(std::pair<std::vector<AlarmEventRecord>, std::uint32_t>)>;
     using OnAddAlarmEventCallback          = std::function<void(bool)>;
diff --git a/module-services/service-time/include/service-time/AlarmServiceAPI.hpp b/module-services/service-time/include/service-time/AlarmServiceAPI.hpp
index 9028dbf7f..fd0611600 100644
--- a/module-services/service-time/include/service-time/AlarmServiceAPI.hpp
+++ b/module-services/service-time/include/service-time/AlarmServiceAPI.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <module-sys/Service/Service.hpp>
+#include <Service/Service.hpp>
 
 #include <time/dateCommon.hpp>
 
diff --git a/module-services/service-time/service-time/RTCCommandInterface.hpp b/module-services/service-time/service-time/RTCCommandInterface.hpp
index d5f7f9ac1..6e6f75089 100644
--- a/module-services/service-time/service-time/RTCCommandInterface.hpp
+++ b/module-services/service-time/service-time/RTCCommandInterface.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <module-sys/Service/Service.hpp>
+#include <Service/Service.hpp>
 
 #include <ctime>
 
diff --git a/module-services/service-time/service-time/TimeMessage.hpp b/module-services/service-time/service-time/TimeMessage.hpp
index 63d745856..47b26bd2a 100644
--- a/module-services/service-time/service-time/TimeMessage.hpp
+++ b/module-services/service-time/service-time/TimeMessage.hpp
@@ -4,7 +4,7 @@
 #pragma once
 
 #include <MessageType.hpp>
-#include <module-sys/Service/Message.hpp>
+#include <Service/Message.hpp>
 #include <time/time_locale.hpp>
 
 class TimeMessage : public sys::DataMessage
diff --git a/module-sys/CMakeLists.txt b/module-sys/CMakeLists.txt
index 3de3ff236..2349709e1 100644
--- a/module-sys/CMakeLists.txt
+++ b/module-sys/CMakeLists.txt
@@ -1,64 +1,18 @@
-project(module-sys VERSION 1.0
-        DESCRIPTION "Core module library")
+module_is_test_entity()
 
-module_is_test_entity()
+add_subdirectory(PhoneModes)
+add_subdirectory(Service)
+add_subdirectory(SystemManager)
+add_subdirectory(SystemWatchdog)
+add_subdirectory(Timers)
 
-set(BUS_IMPL_SOURCES
-        ${CMAKE_CURRENT_SOURCE_DIR}/Service/details/bus/Bus.cpp
-)
-
-set(SOURCES
-        ${CMAKE_CURRENT_SOURCE_DIR}/Service/BusProxy.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/Service/Worker.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/Service/Message.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/Service/Service.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/Timers/SystemTimer.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/Timers/TimerHandle.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/Timers/TimerFactory.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/Service/CpuSentinel.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/PhoneModes/Subject.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/PhoneModes/Observer.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/SystemManager/SystemManagerCommon.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/SystemManager/DependencyGraph.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/SystemManager/PowerManager.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/SystemManager/CpuStatistics.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/SystemManager/DeviceManager.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/SystemManager/CpuGovernor.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/SystemManager/graph/TopologicalSort.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/SystemWatchdog/SystemWatchdog.cpp
-
-        )
-
-add_library(bus STATIC ${BUS_IMPL_SOURCES})
-target_link_libraries(bus PRIVATE module-os)
-
-target_compile_definitions(bus PRIVATE ${PROJECT_CONFIG_DEFINITIONS})
-target_compile_definitions(bus PRIVATE ${PROJECT_TARGET})
-target_include_directories(bus PRIVATE ${PROJECT_INCLUDES})
-
-add_library(module-sys)
-target_sources(module-sys PRIVATE ${SOURCES})
+add_library(module-sys INTERFACE)
 
 target_link_libraries(module-sys
-    PRIVATE
-        apps-common
-        bus
-        service-evtmgr
-        messagetype
-        magic_enum
-        eventstore
-    PUBLIC
-        module-os
-        module-bsp
+    INTERFACE
+        sys-service
+        sys-timers
+        sys-phonemodes
+        sys-watchdog
+        sys-manager
     )
-
-# Board specific compilation definitions,options,include directories and features
-target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_CONFIG_DEFINITIONS})
-target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_TARGET})
-target_include_directories(${PROJECT_NAME} PUBLIC ${PROJECT_INCLUDES})
-target_include_directories(${PROJECT_NAME} PUBLIC ../module-services )
-
-if (${ENABLE_TESTS})
-    add_subdirectory(SystemManager/tests)
-    add_subdirectory(Service/tests)
-endif()
diff --git a/module-sys/PhoneModes/CMakeLists.txt b/module-sys/PhoneModes/CMakeLists.txt
new file mode 100644
index 000000000..897a9b3d2
--- /dev/null
+++ b/module-sys/PhoneModes/CMakeLists.txt
@@ -0,0 +1,22 @@
+add_library(sys-phonemodes STATIC)
+
+target_sources(sys-phonemodes
+    PUBLIC
+        include/PhoneModes/Common.hpp
+        include/PhoneModes/Observer.hpp
+        include/PhoneModes/Subject.hpp
+        
+    PRIVATE
+        Observer.cpp
+        Subject.cpp
+)
+
+target_include_directories(sys-phonemodes
+    PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>
+)
+
+target_link_libraries(sys-phonemodes
+    PUBLIC
+        sys-service
+)
diff --git a/module-sys/PhoneModes/Observer.cpp b/module-sys/PhoneModes/Observer.cpp
index 6a3d5d7d5..e0c214a73 100644
--- a/module-sys/PhoneModes/Observer.cpp
+++ b/module-sys/PhoneModes/Observer.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "Observer.hpp"
+#include <PhoneModes/Observer.hpp>
 
 #include <Service/Service.hpp>
 
@@ -71,7 +71,7 @@ namespace sys::phone_modes
 
     sys::MessagePointer Observer::handlePhoneModeChange(PhoneModeChanged *message)
     {
-        phoneMode     = message->getPhoneMode();
+        phoneMode = message->getPhoneMode();
         if (!onPhoneModeChangedCallback) {
             LOG_WARN("No subscriber on phone mode change.");
             return MessageNone{};
diff --git a/module-sys/PhoneModes/Subject.cpp b/module-sys/PhoneModes/Subject.cpp
index d8949eaed..c2273d0f3 100644
--- a/module-sys/PhoneModes/Subject.cpp
+++ b/module-sys/PhoneModes/Subject.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "Subject.hpp"
+#include <PhoneModes/Subject.hpp>
 
 #include <Service/Service.hpp>
 
diff --git a/module-sys/PhoneModes/Common.hpp b/module-sys/PhoneModes/include/PhoneModes/Common.hpp
similarity index 100%
rename from module-sys/PhoneModes/Common.hpp
rename to module-sys/PhoneModes/include/PhoneModes/Common.hpp
diff --git a/module-sys/PhoneModes/Observer.hpp b/module-sys/PhoneModes/include/PhoneModes/Observer.hpp
similarity index 92%
rename from module-sys/PhoneModes/Observer.hpp
rename to module-sys/PhoneModes/include/PhoneModes/Observer.hpp
index d6c022df6..9d918b42f 100644
--- a/module-sys/PhoneModes/Observer.hpp
+++ b/module-sys/PhoneModes/include/PhoneModes/Observer.hpp
@@ -20,8 +20,8 @@ namespace sys::phone_modes
       public:
         using OnPhoneModeChangedCallback = std::function<void(PhoneMode)>;
         using OnTetheringChangedCallback = std::function<void(Tethering)>;
-        using OnCompleteCallback = std::function<void()>;
-        using OnErrorCallback    = std::function<void(const std::exception &)>;
+        using OnCompleteCallback         = std::function<void()>;
+        using OnErrorCallback            = std::function<void(const std::exception &)>;
         struct OnFinishedCallbacks
         {
             OnCompleteCallback onComplete;
diff --git a/module-sys/PhoneModes/Subject.hpp b/module-sys/PhoneModes/include/PhoneModes/Subject.hpp
similarity index 100%
rename from module-sys/PhoneModes/Subject.hpp
rename to module-sys/PhoneModes/include/PhoneModes/Subject.hpp
diff --git a/module-sys/Service/BusProxy.cpp b/module-sys/Service/BusProxy.cpp
index 645558231..7130ec88c 100644
--- a/module-sys/Service/BusProxy.cpp
+++ b/module-sys/Service/BusProxy.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "BusProxy.hpp"
+#include <Service/BusProxy.hpp>
 
 #include "details/bus/Bus.hpp"
 
diff --git a/module-sys/Service/CMakeLists.txt b/module-sys/Service/CMakeLists.txt
new file mode 100644
index 000000000..e9cdbb9f5
--- /dev/null
+++ b/module-sys/Service/CMakeLists.txt
@@ -0,0 +1,45 @@
+add_library(sys-service STATIC)
+
+target_sources(sys-service
+    PUBLIC
+        include/Service/BusProxy.hpp
+        include/Service/Common.hpp
+        include/Service/CpuSentinel.hpp
+        include/Service/Mailbox.hpp
+        include/Service/MessageForward.hpp
+        include/Service/Message.hpp
+        include/Service/ServiceCreator.hpp
+        include/Service/ServiceForward.hpp
+        include/Service/Service.hpp
+        include/Service/ServiceManifest.hpp
+        include/Service/ServiceProxy.hpp
+        include/Service/SystemReturnCodes.hpp
+        include/Service/Watchdog.hpp
+        include/Service/Worker.hpp
+
+    PRIVATE
+        details/bus/Bus.cpp
+        details/bus/Bus.hpp
+
+        BusProxy.cpp
+        CpuSentinel.cpp
+        Message.cpp
+        Service.cpp
+        Worker.cpp
+)
+
+target_include_directories(sys-service
+    PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>
+)
+
+target_link_libraries(sys-service
+    PUBLIC
+        messagetype
+        magic_enum::magic_enum
+        module-os
+)
+
+if (${ENABLE_TESTS})
+    add_subdirectory(tests)
+endif()
diff --git a/module-sys/Service/CpuSentinel.cpp b/module-sys/Service/CpuSentinel.cpp
index 7dd516a37..b05e33125 100644
--- a/module-sys/Service/CpuSentinel.cpp
+++ b/module-sys/Service/CpuSentinel.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "CpuSentinel.hpp"
+#include <Service/CpuSentinel.hpp>
 #include "SystemManager/messages/RequestCpuFrequencyMessage.hpp"
 #include "SystemManager/Constants.hpp"
 #include <memory>
diff --git a/module-sys/Service/Message.cpp b/module-sys/Service/Message.cpp
index 41871d5be..6a485bc13 100644
--- a/module-sys/Service/Message.cpp
+++ b/module-sys/Service/Message.cpp
@@ -1,8 +1,8 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "Message.hpp"
-#include "Service.hpp"
+#include <Service/Message.hpp>
+#include <Service/Service.hpp>
 
 namespace sys
 {
diff --git a/module-sys/Service/Service.cpp b/module-sys/Service/Service.cpp
index 895c5212a..a8f1d0ccb 100644
--- a/module-sys/Service/Service.cpp
+++ b/module-sys/Service/Service.cpp
@@ -1,26 +1,26 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "Service.hpp"
+#include <Service/Service.hpp>
 #include "FreeRTOSConfig.h"    // for configASSERT
 #include "MessageType.hpp"     // for MessageType, MessageType::MessageType...
-#include "Service/Common.hpp"  // for BusChannels, ReturnCodes, ReturnCodes...
+#include <Service/Common.hpp>  // for BusChannels, ReturnCodes, ReturnCodes...
 #include "Service/Mailbox.hpp" // for Mailbox
-#include "Service/Message.hpp" // for Message, MessagePointer, DataMessage, Resp...
+#include <Service/Message.hpp> // for Message, MessagePointer, DataMessage, Resp...
 #include "Timers/SystemTimer.hpp"
-#include "module-sys/Timers/TimerHandle.hpp"  // for Timer
-#include "module-sys/Timers/TimerMessage.hpp" // for TimerMessage
-#include "log/debug.hpp"       // for DEBUG_SERVICE_MESSAGES
-#include <log.hpp>             // for LOG_ERROR, LOG_DEBUG, LOG_FATAL
-#include "mutex.hpp"           // for cpp_freertos
-#include "portmacro.h"         // for UBaseType_t
-#include "thread.hpp"          // for Thread
-#include "ticks.hpp"           // for Ticks
-#include <algorithm>           // for remove_if
-#include <cstdint>             // for uint32_t, uint64_t, UINT32_MAX
-#include <iosfwd>              // for std
-#include <typeinfo>            // for type_info
-#include <module-sys/SystemManager/Constants.hpp>
+#include "Timers/TimerHandle.hpp"  // for Timer
+#include "Timers/TimerMessage.hpp" // for TimerMessage
+#include "log/debug.hpp"           // for DEBUG_SERVICE_MESSAGES
+#include <log.hpp>                 // for LOG_ERROR, LOG_DEBUG, LOG_FATAL
+#include "mutex.hpp"               // for cpp_freertos
+#include "portmacro.h"             // for UBaseType_t
+#include "thread.hpp"              // for Thread
+#include "ticks.hpp"               // for Ticks
+#include <algorithm>               // for remove_if
+#include <cstdint>                 // for uint32_t, uint64_t, UINT32_MAX
+#include <iosfwd>                  // for std
+#include <typeinfo>                // for type_info
+#include <SystemManager/Constants.hpp>
 
 #if (DEBUG_SERVICE_MESSAGES > 0)
 #include <cxxabi.h>
@@ -44,9 +44,10 @@ void debug_msg(sys::Service *srvc, const sys::Message *ptr)
               srvc ? srvc->GetName().c_str() : "",
               status == 0 ? demangled ? demangled : realname : realname,
               std::string(*ptr).c_str(),
-              status != 0 ? status == -1
-                                ? "!mem fail!"
-                                : status == -2 ? "name ABI fail" : status == -3 ? "arg invalid" : "other failure!"
+              status != 0 ? status == -1   ? "!mem fail!"
+                            : status == -2 ? "name ABI fail"
+                            : status == -3 ? "arg invalid"
+                                           : "other failure!"
                           : "");
 
     free(demangled);
diff --git a/module-sys/Service/Worker.cpp b/module-sys/Service/Worker.cpp
index f3cf4f5da..9c166f293 100644
--- a/module-sys/Service/Worker.cpp
+++ b/module-sys/Service/Worker.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "Worker.hpp"
+#include <Service/Worker.hpp>
 
 extern "C"
 {
diff --git a/module-sys/Service/details/bus/Bus.cpp b/module-sys/Service/details/bus/Bus.cpp
index a74281532..13a8227b1 100644
--- a/module-sys/Service/details/bus/Bus.cpp
+++ b/module-sys/Service/details/bus/Bus.cpp
@@ -3,8 +3,8 @@
 
 #include "Bus.hpp"
 
-#include "module-sys/Service/Service.hpp"
-#include "module-sys/SystemWatchdog/SystemWatchdog.hpp"
+#include <Service/Service.hpp>
+#include "SystemWatchdog/SystemWatchdog.hpp"
 #include "module-os/CriticalSectionGuard.hpp"
 
 #include "ticks.hpp"
diff --git a/module-sys/Service/details/bus/Bus.hpp b/module-sys/Service/details/bus/Bus.hpp
index 4b20fa87b..378c6287a 100644
--- a/module-sys/Service/details/bus/Bus.hpp
+++ b/module-sys/Service/details/bus/Bus.hpp
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include "module-sys/Service/Common.hpp"
-#include "module-sys/Service/Message.hpp"
+#include "Service/Common.hpp"
+#include "Service/Message.hpp"
 
 #include <cstdint>
 #include <memory>
diff --git a/module-sys/Service/BusProxy.hpp b/module-sys/Service/include/Service/BusProxy.hpp
similarity index 97%
rename from module-sys/Service/BusProxy.hpp
rename to module-sys/Service/include/Service/BusProxy.hpp
index 3f6668ef3..4e21c5d22 100644
--- a/module-sys/Service/BusProxy.hpp
+++ b/module-sys/Service/include/Service/BusProxy.hpp
@@ -30,7 +30,7 @@ namespace sys
         void sendMulticast(std::shared_ptr<Message> message, BusChannel channel);
         void sendBroadcast(std::shared_ptr<Message> message);
 
-        template <typename Msg, typename... Params> bool sendUnicast(Params &&... params)
+        template <typename Msg, typename... Params> bool sendUnicast(Params &&...params)
         {
             static_assert(std::is_base_of<sys::msg::Request, Msg>::value,
                           "Only sys::msg::Request can be sent via Unicast<>");
@@ -38,7 +38,7 @@ namespace sys
             return sendUnicast(msg, msg->target());
         }
 
-        template <typename Msg, typename... Params> void sendMulticast(Params &&... params)
+        template <typename Msg, typename... Params> void sendMulticast(Params &&...params)
         {
             static_assert(std::is_base_of<sys::msg::Notification, Msg>::value,
                           "Only sys::msg::Notification can be sent via Multicast<>");
diff --git a/module-sys/Service/Common.hpp b/module-sys/Service/include/Service/Common.hpp
similarity index 100%
rename from module-sys/Service/Common.hpp
rename to module-sys/Service/include/Service/Common.hpp
diff --git a/module-sys/Service/CpuSentinel.hpp b/module-sys/Service/include/Service/CpuSentinel.hpp
similarity index 100%
rename from module-sys/Service/CpuSentinel.hpp
rename to module-sys/Service/include/Service/CpuSentinel.hpp
diff --git a/module-sys/Service/Mailbox.hpp b/module-sys/Service/include/Service/Mailbox.hpp
similarity index 100%
rename from module-sys/Service/Mailbox.hpp
rename to module-sys/Service/include/Service/Mailbox.hpp
diff --git a/module-sys/Service/Message.hpp b/module-sys/Service/include/Service/Message.hpp
similarity index 100%
rename from module-sys/Service/Message.hpp
rename to module-sys/Service/include/Service/Message.hpp
diff --git a/module-sys/Service/MessageForward.hpp b/module-sys/Service/include/Service/MessageForward.hpp
similarity index 100%
rename from module-sys/Service/MessageForward.hpp
rename to module-sys/Service/include/Service/MessageForward.hpp
diff --git a/module-sys/Service/Service.hpp b/module-sys/Service/include/Service/Service.hpp
similarity index 82%
rename from module-sys/Service/Service.hpp
rename to module-sys/Service/include/Service/Service.hpp
index 55fe9737c..c26f8cdf3 100644
--- a/module-sys/Service/Service.hpp
+++ b/module-sys/Service/include/Service/Service.hpp
@@ -10,19 +10,19 @@
 #include "Message.hpp" // for MessagePointer
 #include "ServiceManifest.hpp"
 #include "Watchdog.hpp"
-#include "thread.hpp"                                   // for Thread
-#include <module-sys/SystemWatchdog/SystemWatchdog.hpp> // for SystemWatchdog
-#include <algorithm>                                    // for find, max
-#include <cstdint>                                      // for uint32_t, uint64_t
-#include <functional>                                   // for function
-#include <iterator>                                     // for end
-#include <map>                                          // for map
-#include <memory>                                       // for allocator, shared_ptr, enable_shared_from_this
-#include <string>                                       // for string
-#include <typeindex>                                    // for type_index
-#include <utility>                                      // for pair
-#include <vector>                                       // for vector<>::iterator, vector
-#include <typeinfo>                                     // for connect by type
+#include "thread.hpp"                        // for Thread
+#include <SystemWatchdog/SystemWatchdog.hpp> // for SystemWatchdog
+#include <algorithm>                         // for find, max
+#include <cstdint>                           // for uint32_t, uint64_t
+#include <functional>                        // for function
+#include <iterator>                          // for end
+#include <map>                               // for map
+#include <memory>                            // for allocator, shared_ptr, enable_shared_from_this
+#include <string>                            // for string
+#include <typeindex>                         // for type_index
+#include <utility>                           // for pair
+#include <vector>                            // for vector<>::iterator, vector
+#include <typeinfo>                          // for connect by type
 
 namespace sys
 {
diff --git a/module-sys/Service/ServiceCreator.hpp b/module-sys/Service/include/Service/ServiceCreator.hpp
similarity index 100%
rename from module-sys/Service/ServiceCreator.hpp
rename to module-sys/Service/include/Service/ServiceCreator.hpp
diff --git a/module-sys/Service/ServiceForward.hpp b/module-sys/Service/include/Service/ServiceForward.hpp
similarity index 100%
rename from module-sys/Service/ServiceForward.hpp
rename to module-sys/Service/include/Service/ServiceForward.hpp
diff --git a/module-sys/Service/ServiceManifest.hpp b/module-sys/Service/include/Service/ServiceManifest.hpp
similarity index 100%
rename from module-sys/Service/ServiceManifest.hpp
rename to module-sys/Service/include/Service/ServiceManifest.hpp
diff --git a/module-sys/Service/ServiceProxy.hpp b/module-sys/Service/include/Service/ServiceProxy.hpp
similarity index 100%
rename from module-sys/Service/ServiceProxy.hpp
rename to module-sys/Service/include/Service/ServiceProxy.hpp
diff --git a/module-sys/Service/SystemReturnCodes.hpp b/module-sys/Service/include/Service/SystemReturnCodes.hpp
similarity index 100%
rename from module-sys/Service/SystemReturnCodes.hpp
rename to module-sys/Service/include/Service/SystemReturnCodes.hpp
diff --git a/module-sys/Service/Watchdog.hpp b/module-sys/Service/include/Service/Watchdog.hpp
similarity index 100%
rename from module-sys/Service/Watchdog.hpp
rename to module-sys/Service/include/Service/Watchdog.hpp
diff --git a/module-sys/Service/Worker.hpp b/module-sys/Service/include/Service/Worker.hpp
similarity index 100%
rename from module-sys/Service/Worker.hpp
rename to module-sys/Service/include/Service/Worker.hpp
diff --git a/module-sys/Service/tests/test-system_messages.cpp b/module-sys/Service/tests/test-system_messages.cpp
index a5403bda1..92a7fa730 100644
--- a/module-sys/Service/tests/test-system_messages.cpp
+++ b/module-sys/Service/tests/test-system_messages.cpp
@@ -2,7 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include <catch2/catch.hpp>
-#include "Service/Message.hpp"
+#include <Service/Message.hpp>
 
 class MockedMessageUID : public sys::MessageUID
 {
diff --git a/module-sys/SystemManager/CMakeLists.txt b/module-sys/SystemManager/CMakeLists.txt
new file mode 100644
index 000000000..5090f4c85
--- /dev/null
+++ b/module-sys/SystemManager/CMakeLists.txt
@@ -0,0 +1,44 @@
+add_library(sys-manager STATIC)
+
+target_sources(sys-manager
+    PUBLIC
+        include/SystemManager/DependencyGraph.hpp
+        include/SystemManager/CpuStatistics.hpp
+        include/SystemManager/Constants.hpp
+        include/SystemManager/messages/TetheringQuestionRequest.hpp
+        include/SystemManager/messages/RequestCpuFrequencyMessage.hpp
+        include/SystemManager/messages/SentinelRegistrationMessage.hpp
+        include/SystemManager/messages/DeviceRegistrationMessage.hpp
+        include/SystemManager/messages/TetheringStateRequest.hpp
+        include/SystemManager/messages/SystemManagerMessage.hpp
+        include/SystemManager/messages/CpuFrequencyMessage.hpp
+        include/SystemManager/SystemManagerCommon.hpp
+        include/SystemManager/CpuGovernor.hpp
+        include/SystemManager/PowerManager.hpp
+        include/SystemManager/DeviceManager.hpp
+
+    PRIVATE
+        CpuGovernor.cpp
+        CpuStatistics.cpp
+        data/SystemManagerActionsParams.hpp
+        DependencyGraph.cpp
+        DeviceManager.cpp
+        graph/TopologicalSort.cpp
+        graph/TopologicalSort.hpp
+        PowerManager.cpp
+        SystemManagerCommon.cpp
+)
+
+target_include_directories(sys-manager
+    PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>
+)
+
+target_link_libraries(sys-manager
+    PUBLIC
+        sys-service
+)
+
+if (${ENABLE_TESTS})
+    add_subdirectory(tests)
+endif()
diff --git a/module-sys/SystemManager/CpuGovernor.cpp b/module-sys/SystemManager/CpuGovernor.cpp
index 28e78e3c4..5eaecebfd 100644
--- a/module-sys/SystemManager/CpuGovernor.cpp
+++ b/module-sys/SystemManager/CpuGovernor.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "CpuGovernor.hpp"
+#include <SystemManager/CpuGovernor.hpp>
 #include <algorithm>
 #include <log.hpp>
 
diff --git a/module-sys/SystemManager/CpuStatistics.cpp b/module-sys/SystemManager/CpuStatistics.cpp
index 659e2c7d6..978631b73 100644
--- a/module-sys/SystemManager/CpuStatistics.cpp
+++ b/module-sys/SystemManager/CpuStatistics.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "CpuStatistics.hpp"
+#include <SystemManager/CpuStatistics.hpp>
 #include <log.hpp>
 #include <FreeRTOS.h>
 #include <task.h>
diff --git a/module-sys/SystemManager/DependencyGraph.cpp b/module-sys/SystemManager/DependencyGraph.cpp
index eb7954942..a16d34371 100644
--- a/module-sys/SystemManager/DependencyGraph.cpp
+++ b/module-sys/SystemManager/DependencyGraph.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "DependencyGraph.hpp"
+#include <SystemManager/DependencyGraph.hpp>
 
 #include <algorithm>
 #include <cassert>
diff --git a/module-sys/SystemManager/DeviceManager.cpp b/module-sys/SystemManager/DeviceManager.cpp
index 09c126b12..26bd8dff8 100644
--- a/module-sys/SystemManager/DeviceManager.cpp
+++ b/module-sys/SystemManager/DeviceManager.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "DeviceManager.hpp"
+#include <SystemManager/DeviceManager.hpp>
 #include <algorithm>
 #include <log.hpp>
 
diff --git a/module-sys/SystemManager/PowerManager.cpp b/module-sys/SystemManager/PowerManager.cpp
index 42d64e1e7..a96745d39 100644
--- a/module-sys/SystemManager/PowerManager.cpp
+++ b/module-sys/SystemManager/PowerManager.cpp
@@ -3,7 +3,7 @@
 
 #include <log.hpp>
 
-#include "PowerManager.hpp"
+#include <SystemManager/PowerManager.hpp>
 
 namespace sys
 {
diff --git a/module-sys/SystemManager/SystemManagerCommon.cpp b/module-sys/SystemManager/SystemManagerCommon.cpp
index 451894325..cb4983426 100644
--- a/module-sys/SystemManager/SystemManagerCommon.cpp
+++ b/module-sys/SystemManager/SystemManagerCommon.cpp
@@ -1,10 +1,10 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "SystemManagerCommon.hpp"
+#include <SystemManager/SystemManagerCommon.hpp>
 
 #include <apps-common/ApplicationCommon.hpp>
-#include "DependencyGraph.hpp"
+#include <SystemManager/DependencyGraph.hpp>
 #include "graph/TopologicalSort.hpp"
 
 #include "thread.hpp"
@@ -20,10 +20,10 @@
 #include <service-desktop/Constants.hpp>
 #include <service-appmgr/Constants.hpp>
 #include <service-appmgr/Controller.hpp>
-#include "messages/CpuFrequencyMessage.hpp"
-#include "messages/DeviceRegistrationMessage.hpp"
-#include "messages/SentinelRegistrationMessage.hpp"
-#include "messages/RequestCpuFrequencyMessage.hpp"
+#include <SystemManager/messages/CpuFrequencyMessage.hpp>
+#include <SystemManager/messages/DeviceRegistrationMessage.hpp>
+#include <SystemManager/messages/SentinelRegistrationMessage.hpp>
+#include <SystemManager/messages/RequestCpuFrequencyMessage.hpp>
 #include <time/ScopedTime.hpp>
 #include "Timers/TimerFactory.hpp"
 #include <service-appmgr/StartupType.hpp>
diff --git a/module-sys/SystemManager/Constants.hpp b/module-sys/SystemManager/include/SystemManager/Constants.hpp
similarity index 100%
rename from module-sys/SystemManager/Constants.hpp
rename to module-sys/SystemManager/include/SystemManager/Constants.hpp
diff --git a/module-sys/SystemManager/CpuGovernor.hpp b/module-sys/SystemManager/include/SystemManager/CpuGovernor.hpp
similarity index 100%
rename from module-sys/SystemManager/CpuGovernor.hpp
rename to module-sys/SystemManager/include/SystemManager/CpuGovernor.hpp
diff --git a/module-sys/SystemManager/CpuStatistics.hpp b/module-sys/SystemManager/include/SystemManager/CpuStatistics.hpp
similarity index 100%
rename from module-sys/SystemManager/CpuStatistics.hpp
rename to module-sys/SystemManager/include/SystemManager/CpuStatistics.hpp
diff --git a/module-sys/SystemManager/DependencyGraph.hpp b/module-sys/SystemManager/include/SystemManager/DependencyGraph.hpp
similarity index 96%
rename from module-sys/SystemManager/DependencyGraph.hpp
rename to module-sys/SystemManager/include/SystemManager/DependencyGraph.hpp
index 70165cf93..27f023663 100644
--- a/module-sys/SystemManager/DependencyGraph.hpp
+++ b/module-sys/SystemManager/include/SystemManager/DependencyGraph.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "Service/ServiceCreator.hpp"
+#include <Service/ServiceCreator.hpp>
 
 #include <memory>
 #include <vector>
diff --git a/module-sys/SystemManager/DeviceManager.hpp b/module-sys/SystemManager/include/SystemManager/DeviceManager.hpp
similarity index 100%
rename from module-sys/SystemManager/DeviceManager.hpp
rename to module-sys/SystemManager/include/SystemManager/DeviceManager.hpp
diff --git a/module-sys/SystemManager/PowerManager.hpp b/module-sys/SystemManager/include/SystemManager/PowerManager.hpp
similarity index 100%
rename from module-sys/SystemManager/PowerManager.hpp
rename to module-sys/SystemManager/include/SystemManager/PowerManager.hpp
diff --git a/module-sys/SystemManager/SystemManagerCommon.hpp b/module-sys/SystemManager/include/SystemManager/SystemManagerCommon.hpp
similarity index 100%
rename from module-sys/SystemManager/SystemManagerCommon.hpp
rename to module-sys/SystemManager/include/SystemManager/SystemManagerCommon.hpp
diff --git a/module-sys/SystemManager/messages/CpuFrequencyMessage.hpp b/module-sys/SystemManager/include/SystemManager/messages/CpuFrequencyMessage.hpp
similarity index 100%
rename from module-sys/SystemManager/messages/CpuFrequencyMessage.hpp
rename to module-sys/SystemManager/include/SystemManager/messages/CpuFrequencyMessage.hpp
diff --git a/module-sys/SystemManager/messages/DeviceRegistrationMessage.hpp b/module-sys/SystemManager/include/SystemManager/messages/DeviceRegistrationMessage.hpp
similarity index 100%
rename from module-sys/SystemManager/messages/DeviceRegistrationMessage.hpp
rename to module-sys/SystemManager/include/SystemManager/messages/DeviceRegistrationMessage.hpp
diff --git a/module-sys/SystemManager/messages/RequestCpuFrequencyMessage.hpp b/module-sys/SystemManager/include/SystemManager/messages/RequestCpuFrequencyMessage.hpp
similarity index 100%
rename from module-sys/SystemManager/messages/RequestCpuFrequencyMessage.hpp
rename to module-sys/SystemManager/include/SystemManager/messages/RequestCpuFrequencyMessage.hpp
diff --git a/module-sys/SystemManager/messages/SentinelRegistrationMessage.hpp b/module-sys/SystemManager/include/SystemManager/messages/SentinelRegistrationMessage.hpp
similarity index 100%
rename from module-sys/SystemManager/messages/SentinelRegistrationMessage.hpp
rename to module-sys/SystemManager/include/SystemManager/messages/SentinelRegistrationMessage.hpp
diff --git a/module-sys/SystemManager/messages/SystemManagerMessage.hpp b/module-sys/SystemManager/include/SystemManager/messages/SystemManagerMessage.hpp
similarity index 100%
rename from module-sys/SystemManager/messages/SystemManagerMessage.hpp
rename to module-sys/SystemManager/include/SystemManager/messages/SystemManagerMessage.hpp
diff --git a/module-sys/SystemManager/messages/TetheringQuestionRequest.hpp b/module-sys/SystemManager/include/SystemManager/messages/TetheringQuestionRequest.hpp
similarity index 97%
rename from module-sys/SystemManager/messages/TetheringQuestionRequest.hpp
rename to module-sys/SystemManager/include/SystemManager/messages/TetheringQuestionRequest.hpp
index d3ac43a29..107351b5a 100644
--- a/module-sys/SystemManager/messages/TetheringQuestionRequest.hpp
+++ b/module-sys/SystemManager/include/SystemManager/messages/TetheringQuestionRequest.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <module-sys/Service/Message.hpp>
+#include <Service/Message.hpp>
 
 #include <apps-common/popups/data/PopupRequestParams.hpp>
 
diff --git a/module-sys/SystemManager/messages/TetheringStateRequest.hpp b/module-sys/SystemManager/include/SystemManager/messages/TetheringStateRequest.hpp
similarity index 93%
rename from module-sys/SystemManager/messages/TetheringStateRequest.hpp
rename to module-sys/SystemManager/include/SystemManager/messages/TetheringStateRequest.hpp
index 6609dd7ad..bb28fad6b 100644
--- a/module-sys/SystemManager/messages/TetheringStateRequest.hpp
+++ b/module-sys/SystemManager/include/SystemManager/messages/TetheringStateRequest.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <module-sys/PhoneModes/Common.hpp>
+#include <PhoneModes/Common.hpp>
 
 namespace sys
 {
diff --git a/module-sys/SystemWatchdog/CMakeLists.txt b/module-sys/SystemWatchdog/CMakeLists.txt
new file mode 100644
index 000000000..28d269254
--- /dev/null
+++ b/module-sys/SystemWatchdog/CMakeLists.txt
@@ -0,0 +1,22 @@
+add_library(sys-watchdog STATIC)
+
+target_sources(sys-watchdog
+    PUBLIC
+        include/SystemWatchdog/SystemWatchdog.hpp
+
+    PRIVATE
+        SystemWatchdog.cpp
+)
+
+target_include_directories(sys-watchdog
+    PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>
+)
+
+target_link_libraries(sys-watchdog
+    PUBLIC
+        sys-service
+
+    PRIVATE
+        module-bsp
+)
diff --git a/module-sys/SystemWatchdog/SystemWatchdog.cpp b/module-sys/SystemWatchdog/SystemWatchdog.cpp
index 4245b4e48..5e37f462f 100644
--- a/module-sys/SystemWatchdog/SystemWatchdog.cpp
+++ b/module-sys/SystemWatchdog/SystemWatchdog.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "SystemWatchdog.hpp"
+#include <SystemWatchdog/SystemWatchdog.hpp>
 #include "Service/Common.hpp"
 #include "critical.hpp"
 #include "ticks.hpp"
diff --git a/module-sys/SystemWatchdog/SystemWatchdog.hpp b/module-sys/SystemWatchdog/include/SystemWatchdog/SystemWatchdog.hpp
similarity index 97%
rename from module-sys/SystemWatchdog/SystemWatchdog.hpp
rename to module-sys/SystemWatchdog/include/SystemWatchdog/SystemWatchdog.hpp
index 56c5d7319..9a54da8c3 100644
--- a/module-sys/SystemWatchdog/SystemWatchdog.hpp
+++ b/module-sys/SystemWatchdog/include/SystemWatchdog/SystemWatchdog.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <module-sys/Service/Watchdog.hpp>
+#include <Service/Watchdog.hpp>
 #include "thread.hpp"
 
 namespace sys
diff --git a/module-sys/Timers/CMakeLists.txt b/module-sys/Timers/CMakeLists.txt
new file mode 100644
index 000000000..85c7d6388
--- /dev/null
+++ b/module-sys/Timers/CMakeLists.txt
@@ -0,0 +1,25 @@
+add_library(sys-timers STATIC)
+
+target_sources(sys-timers
+    PUBLIC
+        include/Timers/SystemTimer.hpp
+        include/Timers/TimerFactory.hpp
+        include/Timers/Timer.hpp
+        include/Timers/TimerMessage.hpp
+        include/Timers/TimerHandle.hpp
+
+    PRIVATE
+        SystemTimer.cpp
+        TimerFactory.cpp
+        TimerHandle.cpp
+)
+
+target_include_directories(sys-timers
+    PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>
+)
+
+target_link_libraries(sys-timers
+    PUBLIC
+        module-os
+)
diff --git a/module-sys/Timers/SystemTimer.cpp b/module-sys/Timers/SystemTimer.cpp
index c930a807f..fcaa39f31 100644
--- a/module-sys/Timers/SystemTimer.cpp
+++ b/module-sys/Timers/SystemTimer.cpp
@@ -1,9 +1,9 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "SystemTimer.hpp"
-#include "module-sys/Service/Service.hpp"
-#include "TimerMessage.hpp"
+#include <Timers/SystemTimer.hpp>
+#include <Service/Service.hpp>
+#include <Timers/TimerMessage.hpp>
 #include <log.hpp>
 #include <projdefs.h>
 #include <memory>
diff --git a/module-sys/Timers/TimerFactory.cpp b/module-sys/Timers/TimerFactory.cpp
index bc9ec89c3..8d7555c60 100644
--- a/module-sys/Timers/TimerFactory.cpp
+++ b/module-sys/Timers/TimerFactory.cpp
@@ -1,9 +1,9 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "TimerFactory.hpp"
+#include <Timers/TimerFactory.hpp>
 
-#include "SystemTimer.hpp"
+#include <Timers/SystemTimer.hpp>
 
 namespace sys
 {
diff --git a/module-sys/Timers/TimerHandle.cpp b/module-sys/Timers/TimerHandle.cpp
index 7dda12763..655418300 100644
--- a/module-sys/Timers/TimerHandle.cpp
+++ b/module-sys/Timers/TimerHandle.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "TimerHandle.hpp"
+#include <Timers/TimerHandle.hpp>
 #include <module-utils/log/log.hpp>
 
 namespace sys
diff --git a/module-sys/Timers/SystemTimer.hpp b/module-sys/Timers/include/Timers/SystemTimer.hpp
similarity index 98%
rename from module-sys/Timers/SystemTimer.hpp
rename to module-sys/Timers/include/Timers/SystemTimer.hpp
index e449ba298..63f80906c 100644
--- a/module-sys/Timers/SystemTimer.hpp
+++ b/module-sys/Timers/include/Timers/SystemTimer.hpp
@@ -6,7 +6,7 @@
 #include "FreeRTOS.h"
 #include "portmacro.h"                             // for TickType_t
 #include <module-os/RTOSWrapper/include/timer.hpp> // for Timer
-#include "Timer.hpp"
+#include <Timers/Timer.hpp>
 #include <functional> // for function
 #include <string>     // for string
 #include <atomic>
diff --git a/module-sys/Timers/Timer.hpp b/module-sys/Timers/include/Timers/Timer.hpp
similarity index 100%
rename from module-sys/Timers/Timer.hpp
rename to module-sys/Timers/include/Timers/Timer.hpp
diff --git a/module-sys/Timers/TimerFactory.hpp b/module-sys/Timers/include/Timers/TimerFactory.hpp
similarity index 100%
rename from module-sys/Timers/TimerFactory.hpp
rename to module-sys/Timers/include/Timers/TimerFactory.hpp
diff --git a/module-sys/Timers/TimerHandle.hpp b/module-sys/Timers/include/Timers/TimerHandle.hpp
similarity index 100%
rename from module-sys/Timers/TimerHandle.hpp
rename to module-sys/Timers/include/Timers/TimerHandle.hpp
diff --git a/module-sys/Timers/TimerMessage.hpp b/module-sys/Timers/include/Timers/TimerMessage.hpp
similarity index 93%
rename from module-sys/Timers/TimerMessage.hpp
rename to module-sys/Timers/include/Timers/TimerMessage.hpp
index 00ac18c17..62f3efccd 100644
--- a/module-sys/Timers/TimerMessage.hpp
+++ b/module-sys/Timers/include/Timers/TimerMessage.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "module-sys/Service/Message.hpp"
+#include "Service/Message.hpp"
 
 namespace sys
 {
diff --git a/products/BellHybrid/alarms/src/actions/PlayToneAction.hpp b/products/BellHybrid/alarms/src/actions/PlayToneAction.hpp
index 34e964750..a3b525d8e 100644
--- a/products/BellHybrid/alarms/src/actions/PlayToneAction.hpp
+++ b/products/BellHybrid/alarms/src/actions/PlayToneAction.hpp
@@ -5,7 +5,7 @@
 
 #include "AbstractAlarmAction.hpp"
 #include <service-db/Settings.hpp>
-#include <module-sys/Timers/TimerHandle.hpp>
+#include <Timers/TimerHandle.hpp>
 #include <Service/Service.hpp>
 
 namespace alarms
diff --git a/products/BellHybrid/apps/application-bell-main/presenters/HomeScreenPresenter.cpp b/products/BellHybrid/apps/application-bell-main/presenters/HomeScreenPresenter.cpp
index 3f179e6e6..0b4b81ff0 100644
--- a/products/BellHybrid/apps/application-bell-main/presenters/HomeScreenPresenter.cpp
+++ b/products/BellHybrid/apps/application-bell-main/presenters/HomeScreenPresenter.cpp
@@ -7,8 +7,8 @@
 
 #include <apps-common/ApplicationCommon.hpp>
 #include <common/models/TimeModel.hpp>
-#include <module-sys/Timers/SystemTimer.hpp>
-#include <module-sys/Timers/TimerFactory.hpp>
+#include <Timers/SystemTimer.hpp>
+#include <Timers/TimerFactory.hpp>
 #include <time/time_constants.hpp>
 #include <service-db/DBNotificationMessage.hpp>
 
diff --git a/products/BellHybrid/apps/application-bell-main/presenters/HomeScreenPresenter.hpp b/products/BellHybrid/apps/application-bell-main/presenters/HomeScreenPresenter.hpp
index b78a7fff8..9486ac370 100644
--- a/products/BellHybrid/apps/application-bell-main/presenters/HomeScreenPresenter.hpp
+++ b/products/BellHybrid/apps/application-bell-main/presenters/HomeScreenPresenter.hpp
@@ -8,7 +8,7 @@
 #include <apps-common/BasePresenter.hpp>
 #include <common/models/AbstractAlarmModel.hpp>
 #include <gui/input/InputEvent.hpp>
-#include <module-sys/Timers/TimerHandle.hpp>
+#include <Timers/TimerHandle.hpp>
 #include <module-utils/Temperature.hpp>
 #include <time/time_locale.hpp>
 #include <utf8/UTF8.hpp>
@@ -20,7 +20,7 @@ namespace app
 {
     class AbstractTimeModel;
     class ApplicationCommon;
-}
+} // namespace app
 
 namespace gui
 {
diff --git a/products/BellHybrid/services/appmgr/include/appmgr/messages/AlarmMessage.hpp b/products/BellHybrid/services/appmgr/include/appmgr/messages/AlarmMessage.hpp
index fcf6238eb..6187e8848 100644
--- a/products/BellHybrid/services/appmgr/include/appmgr/messages/AlarmMessage.hpp
+++ b/products/BellHybrid/services/appmgr/include/appmgr/messages/AlarmMessage.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <module-sys/Service/Message.hpp>
+#include <Service/Message.hpp>
 #include <popups/AlarmActivatedPopupRequestParams.hpp>
 #include <popups/AlarmDeactivatedPopupRequestParams.hpp>
 #include <service-appmgr/Actions.hpp>
diff --git a/products/BellHybrid/services/evtmgr/EventManager.cpp b/products/BellHybrid/services/evtmgr/EventManager.cpp
index 065d7e614..5f871e194 100644
--- a/products/BellHybrid/services/evtmgr/EventManager.cpp
+++ b/products/BellHybrid/services/evtmgr/EventManager.cpp
@@ -7,7 +7,7 @@
 #include <evtmgr/EventManager.hpp>
 #include <keymap/KeyMap.hpp>
 #include <module-bsp/hal/temperature_source/TemperatureSource.hpp>
-#include <module-sys/SystemManager/Constants.hpp>
+#include <SystemManager/Constants.hpp>
 #include <screen-light-control/ScreenLightControl.hpp>
 #include <service-evtmgr/KbdMessage.hpp>
 #include <service-evtmgr/ScreenLightControlMessage.hpp>
diff --git a/products/BellHybrid/services/evtmgr/screen-light-control/ScreenLightControl.cpp b/products/BellHybrid/services/evtmgr/screen-light-control/ScreenLightControl.cpp
index 6d0d701d4..707b4b0b5 100644
--- a/products/BellHybrid/services/evtmgr/screen-light-control/ScreenLightControl.cpp
+++ b/products/BellHybrid/services/evtmgr/screen-light-control/ScreenLightControl.cpp
@@ -3,7 +3,7 @@
 
 #include <service-evtmgr/screen-light-control/ScreenLightControl.hpp>
 #include <service-evtmgr/screen-light-control/ScreenLightControlParameters.hpp>
-#include <module-sys/Timers/TimerFactory.hpp>
+#include <Timers/TimerFactory.hpp>
 #include <Service/Service.hpp>
 
 namespace screen_light_control
diff --git a/products/BellHybrid/sys/include/sys/SystemManager.hpp b/products/BellHybrid/sys/include/sys/SystemManager.hpp
index bdee33454..2fd048ce1 100644
--- a/products/BellHybrid/sys/include/sys/SystemManager.hpp
+++ b/products/BellHybrid/sys/include/sys/SystemManager.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <module-sys/SystemManager/SystemManagerCommon.hpp>
+#include <SystemManager/SystemManagerCommon.hpp>
 
 namespace sys
 {
diff --git a/products/PurePhone/services/appmgr/ApplicationManager.cpp b/products/PurePhone/services/appmgr/ApplicationManager.cpp
index 76af1882b..0b1d4a588 100644
--- a/products/PurePhone/services/appmgr/ApplicationManager.cpp
+++ b/products/PurePhone/services/appmgr/ApplicationManager.cpp
@@ -10,8 +10,8 @@
 #include <apps-common/popups/data/PhoneModeParams.hpp>
 #include <apps-common/popups/data/PopupRequestParams.hpp>
 #include <module-db/queries/notifications/QueryNotificationsGetAll.hpp>
-#include <module-sys/SystemManager/messages/TetheringQuestionRequest.hpp>
-#include <module-sys/Timers/TimerFactory.hpp>
+#include <SystemManager/messages/TetheringQuestionRequest.hpp>
+#include <Timers/TimerFactory.hpp>
 #include <service-appmgr/Constants.hpp>
 #include <service-appmgr/messages/AutoLockRequests.hpp>
 #include <service-appmgr/messages/GetAllNotificationsRequest.hpp>
diff --git a/products/PurePhone/services/evtmgr/screen-light-control/ScreenLightControl.cpp b/products/PurePhone/services/evtmgr/screen-light-control/ScreenLightControl.cpp
index fbb5d0729..2d3e061e5 100644
--- a/products/PurePhone/services/evtmgr/screen-light-control/ScreenLightControl.cpp
+++ b/products/PurePhone/services/evtmgr/screen-light-control/ScreenLightControl.cpp
@@ -3,7 +3,7 @@
 
 #include <service-evtmgr/screen-light-control/ScreenLightControl.hpp>
 #include <service-evtmgr/screen-light-control/ScreenLightControlParameters.hpp>
-#include <module-sys/Timers/TimerFactory.hpp>
+#include <Timers/TimerFactory.hpp>
 #include <Service/Service.hpp>
 
 namespace screen_light_control
diff --git a/products/PurePhone/services/service-fileindexer/include/service-fileindexer/StartupIndexer.hpp b/products/PurePhone/services/service-fileindexer/include/service-fileindexer/StartupIndexer.hpp
index a29b73a72..4338d7e66 100644
--- a/products/PurePhone/services/service-fileindexer/include/service-fileindexer/StartupIndexer.hpp
+++ b/products/PurePhone/services/service-fileindexer/include/service-fileindexer/StartupIndexer.hpp
@@ -4,7 +4,7 @@
 #pragma once
 
 #include <Service/Service.hpp>
-#include <module-sys/Timers/TimerHandle.hpp>
+#include <Timers/TimerHandle.hpp>
 #include <filesystem>
 
 namespace service::detail
diff --git a/products/PurePhone/sys/SystemManager.cpp b/products/PurePhone/sys/SystemManager.cpp
index ca0823de5..d23ac4233 100644
--- a/products/PurePhone/sys/SystemManager.cpp
+++ b/products/PurePhone/sys/SystemManager.cpp
@@ -6,9 +6,9 @@
 #include <sys/messages/TetheringPhoneModeChangeProhibitedMessage.hpp>
 
 #include <evtmgr/EVMessages.hpp>
-#include <module-sys/SystemManager/messages/SystemManagerMessage.hpp>
-#include <module-sys/SystemManager/messages/TetheringQuestionRequest.hpp>
-#include <module-sys/SystemManager/messages/TetheringStateRequest.hpp>
+#include <SystemManager/messages/SystemManagerMessage.hpp>
+#include <SystemManager/messages/TetheringQuestionRequest.hpp>
+#include <SystemManager/messages/TetheringStateRequest.hpp>
 #include <module-utils/EventStore/EventStore.hpp>
 #include <service-appmgr/Constants.hpp>
 #include <service-cellular/CellularMessage.hpp>
diff --git a/products/PurePhone/sys/include/sys/SystemManager.hpp b/products/PurePhone/sys/include/sys/SystemManager.hpp
index 8705a3260..b11297932 100644
--- a/products/PurePhone/sys/include/sys/SystemManager.hpp
+++ b/products/PurePhone/sys/include/sys/SystemManager.hpp
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <module-sys/PhoneModes/Subject.hpp>
-#include <module-sys/SystemManager/SystemManagerCommon.hpp>
+#include <PhoneModes/Subject.hpp>
+#include <SystemManager/SystemManagerCommon.hpp>
 
 namespace sys
 {
diff --git a/products/PurePhone/sys/include/sys/messages/PhoneModeRequest.hpp b/products/PurePhone/sys/include/sys/messages/PhoneModeRequest.hpp
index b7b3c5d04..f810b7705 100644
--- a/products/PurePhone/sys/include/sys/messages/PhoneModeRequest.hpp
+++ b/products/PurePhone/sys/include/sys/messages/PhoneModeRequest.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <module-sys/PhoneModes/Common.hpp>
+#include <PhoneModes/Common.hpp>
 
 namespace sys
 {
diff --git a/products/PurePhone/sys/include/sys/messages/TetheringPhoneModeChangeProhibitedMessage.hpp b/products/PurePhone/sys/include/sys/messages/TetheringPhoneModeChangeProhibitedMessage.hpp
index 6e6200480..d40aae69a 100644
--- a/products/PurePhone/sys/include/sys/messages/TetheringPhoneModeChangeProhibitedMessage.hpp
+++ b/products/PurePhone/sys/include/sys/messages/TetheringPhoneModeChangeProhibitedMessage.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <module-sys/Service/Message.hpp>
+#include <Service/Message.hpp>
 
 #include <service-appmgr/Actions.hpp>
 #include <service-appmgr/messages/ActionRequest.hpp>
diff --git a/products/PurePhone/test/test-settings/test-service-db-settings-api.cpp b/products/PurePhone/test/test-settings/test-service-db-settings-api.cpp
index 3c1a09b41..bf1d025c2 100644
--- a/products/PurePhone/test/test-settings/test-service-db-settings-api.cpp
+++ b/products/PurePhone/test/test-settings/test-service-db-settings-api.cpp
@@ -10,7 +10,7 @@
 
 #include <db/ServiceDB.hpp>
 #include <evtmgr/EventManager.hpp>
-#include <module-sys/SystemManager/SystemManagerCommon.hpp>
+#include <SystemManager/SystemManagerCommon.hpp>
 
 #include <service-evtmgr/Constants.hpp>