From 57874cab33b0ed96b8a3f5a12f68d69cfeded699 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20Smoczy=C5=84ski?= <smoczynski.marcin@gmail.com>
Date: Thu, 23 Sep 2021 16:32:33 +0200
Subject: [PATCH] [BH-912] Improve sys module structure
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Improve structure of the module sys. Problems within this module
prevents from linking others.

Signed-off-by: Marcin Smoczyński <smoczynski.marcin@gmail.com>
---
 .../ApplicationDesktop.cpp                    |  2 +-
 module-apps/apps-common/ApplicationCommon.hpp |  2 +-
 .../popups/TetheringConfirmationPopup.cpp     |  2 +-
 .../apps-common/popups/TetheringOffPopup.cpp  |  2 +-
 .../popups/presenter/PowerOffPresenter.cpp    |  2 +-
 .../linux/watchdog/software_watchdog.cpp      |  2 +-
 module-cellular/modem/mux/CellularMux.cpp     |  4 +-
 module-gui/CMakeLists.txt                     |  6 +--
 module-gui/test/test-google/CMakeLists.txt    |  1 -
 .../model/ApplicationManagerCommon.hpp        |  2 +-
 .../model/ApplicationManagerCommon.cpp        |  2 +-
 .../service-audio/AudioServiceAPI.cpp         |  2 +-
 .../service-audio/ServiceAudio.cpp            |  2 +-
 .../service-bluetooth/ServiceBluetooth.cpp    |  2 +-
 .../service-bluetooth/ServiceBluetooth.hpp    |  4 +-
 .../service-cellular/CellularServiceAPI.cpp   |  2 +-
 .../service-cellular/ServiceCellular.cpp      |  2 +-
 .../service-cellular/CellularCall.hpp         |  6 +--
 .../service-cellular/ServiceCellular.hpp      |  4 +-
 module-services/service-db/DBServiceAPI.cpp   |  2 +-
 .../include/service-db/DBContactMessage.hpp   |  2 +-
 .../test-service-db-settings-messages.cpp     | 20 +++++-----
 .../service-desktop/ServiceDesktop.cpp        |  4 +-
 .../service-desktop/WorkerDesktop.cpp         |  2 +-
 .../service-desktop/WorkerDesktop.hpp         |  2 +-
 .../endpoints/contacts/ContactHelper.cpp      |  2 +-
 .../developerMode/DeveloperModeHelper.cpp     |  4 +-
 .../endpoints/backup/BackupEndpoint.hpp       |  2 +-
 .../endpoints/bluetooth/BluetoothHelper.hpp   |  2 +-
 .../endpoints/contacts/ContactHelper.hpp      |  2 +-
 .../endpoints/filesystem/FileContext.hpp      |  2 +-
 .../endpoints/messages/MessageHelper.cpp      |  2 +-
 .../service-desktop/ServiceDesktop.hpp        |  2 +-
 module-services/service-eink/EinkSentinel.hpp |  2 +-
 module-services/service-eink/ServiceEink.cpp  |  6 +--
 module-services/service-eink/ServiceEink.hpp  |  2 +-
 .../service-evtmgr/EventManager.cpp           |  4 +-
 .../service-evtmgr/WorkerEventCommon.cpp      |  2 +-
 .../api/EventManagerServiceAPI.cpp            |  2 +-
 .../BatteryBrownoutDetector.cpp               |  2 +-
 .../battery-level-check/BatteryLevelCheck.cpp |  2 +-
 .../service-evtmgr/EventManagerCommon.hpp     |  4 +-
 .../service-evtmgr/WorkerEventCommon.hpp      |  2 +-
 .../service-evtmgr/vibra/Vibra.cpp            |  2 +-
 .../service-gui/service-gui/ServiceGUI.hpp    |  2 +-
 module-services/service-time/ServiceTime.hpp  |  2 +-
 module-sys/CMakeLists.txt                     |  4 +-
 module-sys/Service/CMakeLists.txt             | 38 +++++++++----------
 module-sys/Service/Service.cpp                |  3 +-
 .../{Timers => Service}/SystemTimer.cpp       |  0
 .../{Timers => Service}/TimerFactory.cpp      |  0
 .../{Timers => Service}/TimerHandle.cpp       |  0
 module-sys/Service/details/bus/Bus.hpp        |  2 +-
 .../Service/include/Service/BusProxy.hpp      |  2 +-
 .../Service/include/Service/Message.hpp       |  2 +-
 .../include/Service/MessageForward.hpp        |  2 +-
 .../Service/include/Service/Service.hpp       |  4 +-
 .../include/Timers/SystemTimer.hpp            |  0
 .../include/Timers/Timer.hpp                  |  0
 .../include/Timers/TimerFactory.hpp           |  0
 .../include/Timers/TimerHandle.hpp            |  0
 .../include/Timers/TimerMessage.hpp           |  0
 module-sys/SystemManager/CMakeLists.txt       | 16 ++++----
 .../CpuSentinel.cpp                           |  6 +--
 .../SystemManager/SystemManagerCommon.cpp     |  6 +--
 .../include/SystemManager/CpuGovernor.hpp     |  2 +-
 .../include/SystemManager}/CpuSentinel.hpp    |  5 ++-
 .../SystemManager/SystemManagerCommon.hpp     |  2 +-
 .../tests/unittest_CpuSentinelsGovernor.cpp   |  2 +-
 module-sys/SystemWatchdog/CMakeLists.txt      |  3 +-
 module-sys/SystemWatchdog/SystemWatchdog.cpp  |  2 +-
 .../include/SystemWatchdog/SystemWatchdog.hpp |  2 +-
 .../include/SystemWatchdog}/Watchdog.hpp      |  0
 module-sys/Timers/CMakeLists.txt              | 26 -------------
 module-sys/common/CMakeLists.txt              | 19 ++++++++++
 .../include/system}/Common.hpp                |  2 +-
 .../include/system}/Constants.hpp             |  0
 .../include/system}/SystemReturnCodes.hpp     |  0
 .../messages/DeviceRegistrationMessage.hpp    |  0
 .../messages/RequestCpuFrequencyMessage.hpp   |  0
 .../messages/SentinelRegistrationMessage.hpp  |  2 +-
 .../system}/messages/SystemManagerMessage.hpp |  2 +-
 .../messages/TetheringQuestionRequest.hpp     |  0
 .../messages/TetheringStateRequest.hpp        |  0
 .../services/evtmgr/EventManager.cpp          |  2 +-
 .../services/appmgr/ApplicationManager.cpp    |  2 +-
 products/PurePhone/sys/SystemManager.cpp      |  6 +--
 87 files changed, 144 insertions(+), 155 deletions(-)
 rename module-sys/{Timers => Service}/SystemTimer.cpp (100%)
 rename module-sys/{Timers => Service}/TimerFactory.cpp (100%)
 rename module-sys/{Timers => Service}/TimerHandle.cpp (100%)
 rename module-sys/{Timers => Service}/include/Timers/SystemTimer.hpp (100%)
 rename module-sys/{Timers => Service}/include/Timers/Timer.hpp (100%)
 rename module-sys/{Timers => Service}/include/Timers/TimerFactory.hpp (100%)
 rename module-sys/{Timers => Service}/include/Timers/TimerHandle.hpp (100%)
 rename module-sys/{Timers => Service}/include/Timers/TimerMessage.hpp (100%)
 rename module-sys/{Service => SystemManager}/CpuSentinel.cpp (91%)
 rename module-sys/{Service/include/Service => SystemManager/include/SystemManager}/CpuSentinel.hpp (98%)
 rename module-sys/{Service/include/Service => SystemWatchdog/include/SystemWatchdog}/Watchdog.hpp (100%)
 delete mode 100644 module-sys/Timers/CMakeLists.txt
 create mode 100644 module-sys/common/CMakeLists.txt
 rename module-sys/{Service/include/Service => common/include/system}/Common.hpp (98%)
 rename module-sys/{SystemManager/include/SystemManager => common/include/system}/Constants.hpp (100%)
 rename module-sys/{Service/include/Service => common/include/system}/SystemReturnCodes.hpp (100%)
 rename module-sys/{SystemManager/include/SystemManager => common/include/system}/messages/DeviceRegistrationMessage.hpp (100%)
 rename module-sys/{SystemManager/include/SystemManager => common/include/system}/messages/RequestCpuFrequencyMessage.hpp (100%)
 rename module-sys/{SystemManager/include/SystemManager => common/include/system}/messages/SentinelRegistrationMessage.hpp (94%)
 rename module-sys/{SystemManager/include/SystemManager => common/include/system}/messages/SystemManagerMessage.hpp (97%)
 rename module-sys/{SystemManager/include/SystemManager => common/include/system}/messages/TetheringQuestionRequest.hpp (100%)
 rename module-sys/{SystemManager/include/SystemManager => common/include/system}/messages/TetheringStateRequest.hpp (100%)

diff --git a/module-apps/application-desktop/ApplicationDesktop.cpp b/module-apps/application-desktop/ApplicationDesktop.cpp
index cff3b7c03..4cb370bc6 100644
--- a/module-apps/application-desktop/ApplicationDesktop.cpp
+++ b/module-apps/application-desktop/ApplicationDesktop.cpp
@@ -27,7 +27,7 @@
 #include <service-cellular-api>
 #include <service-db/DBNotificationMessage.hpp>
 #include <service-db/QueryMessage.hpp>
-#include <SystemManager/messages/SystemManagerMessage.hpp>
+#include <system/messages/SystemManagerMessage.hpp>
 #include <windows/Dialog.hpp>
 #include <windows/DialogMetadata.hpp>
 
diff --git a/module-apps/apps-common/ApplicationCommon.hpp b/module-apps/apps-common/ApplicationCommon.hpp
index 6642581a4..39a8792ca 100644
--- a/module-apps/apps-common/ApplicationCommon.hpp
+++ b/module-apps/apps-common/ApplicationCommon.hpp
@@ -8,7 +8,7 @@
 #include "Audio/Profiles/Profile.hpp" // for Profile, Pro...
 #include "CallbackStorage.hpp"
 
-#include "Service/Common.hpp"  // for ReturnCodes
+#include "system/Common.hpp"   // for ReturnCodes
 #include "Service/Message.hpp" // for MessagePointer
 #include "Service/Service.hpp" // for Service
 #include "Timers/TimerHandle.hpp"
diff --git a/module-apps/apps-common/popups/TetheringConfirmationPopup.cpp b/module-apps/apps-common/popups/TetheringConfirmationPopup.cpp
index 148df7a56..29baf6574 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 <SystemManager/messages/TetheringQuestionRequest.hpp>
+#include <system/messages/TetheringQuestionRequest.hpp>
 #include <service-appmgr/Controller.hpp>
 
 namespace gui
diff --git a/module-apps/apps-common/popups/TetheringOffPopup.cpp b/module-apps/apps-common/popups/TetheringOffPopup.cpp
index c57abaef6..95f744124 100644
--- a/module-apps/apps-common/popups/TetheringOffPopup.cpp
+++ b/module-apps/apps-common/popups/TetheringOffPopup.cpp
@@ -6,7 +6,7 @@
 #include <log/log.hpp>
 #include <messages/DialogMetadataMessage.hpp>
 #include <apps-common/ApplicationCommon.hpp>
-#include <SystemManager/messages/TetheringStateRequest.hpp>
+#include <system/messages/TetheringStateRequest.hpp>
 #include <service-appmgr/Controller.hpp>
 
 namespace gui
diff --git a/module-apps/apps-common/popups/presenter/PowerOffPresenter.cpp b/module-apps/apps-common/popups/presenter/PowerOffPresenter.cpp
index 226dd52b9..b5a25b785 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 <SystemManager/Constants.hpp>
+#include <system/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 17e8ac2fc..00a8f57a4 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 <Service/Common.hpp>
+#include <system/Common.hpp>
 #include <log/log.hpp>
 #include <cstdlib>
 
diff --git a/module-cellular/modem/mux/CellularMux.cpp b/module-cellular/modem/mux/CellularMux.cpp
index 9df9a0eb7..cb7f5d720 100644
--- a/module-cellular/modem/mux/CellularMux.cpp
+++ b/module-cellular/modem/mux/CellularMux.cpp
@@ -14,7 +14,7 @@
 #include <service-cellular/CellularMessage.hpp>
 
 #include <RTOSWrapper/include/ticks.hpp>
-#include <SystemManager/messages/DeviceRegistrationMessage.hpp>
+#include <system/messages/DeviceRegistrationMessage.hpp>
 #include <time/time_constants.hpp>
 
 #include <gsl/util>
@@ -537,7 +537,7 @@ void CellularMux::processData(bsp::cellular::CellularDMAResultStruct &result)
     LOG_DEBUG("Worker start");
 
     constexpr auto waitForDataIndefinitely = std::chrono::milliseconds::max();
-    CellularMux *inst          = static_cast<CellularMux *>(ptr);
+    CellularMux *inst                      = static_cast<CellularMux *>(ptr);
 
     bsp::cellular::CellularDMAResultStruct result{};
 
diff --git a/module-gui/CMakeLists.txt b/module-gui/CMakeLists.txt
index b9a3f478c..a0acd822e 100644
--- a/module-gui/CMakeLists.txt
+++ b/module-gui/CMakeLists.txt
@@ -12,14 +12,14 @@ include(gui/dom/CMakeLists.txt)
 
 include_directories( ../module-utils )
 
-target_link_libraries(${PROJECT_NAME} 
-    PUBLIC 
+target_link_libraries(${PROJECT_NAME}
+    PUBLIC
         ${TARGET_LIBRARIES}
         module-bsp
         eventstore
         utils-math
         module-utils
-        sys-timers
+        sys-service
         sys-watchdog
         utf8
     PRIVATE
diff --git a/module-gui/test/test-google/CMakeLists.txt b/module-gui/test/test-google/CMakeLists.txt
index e4588d24f..b3995d68c 100644
--- a/module-gui/test/test-google/CMakeLists.txt
+++ b/module-gui/test/test-google/CMakeLists.txt
@@ -13,6 +13,5 @@ add_gtest_executable(
                 module-utils
                 module-gui
                 sys-service
-                sys-timers
         USE_FS
 )
diff --git a/module-services/service-appmgr/include/service-appmgr/model/ApplicationManagerCommon.hpp b/module-services/service-appmgr/include/service-appmgr/model/ApplicationManagerCommon.hpp
index 9e99d6ec7..e78aaa0da 100644
--- a/module-services/service-appmgr/include/service-appmgr/model/ApplicationManagerCommon.hpp
+++ b/module-services/service-appmgr/include/service-appmgr/model/ApplicationManagerCommon.hpp
@@ -12,7 +12,7 @@
 
 #include <apps-common/ApplicationLauncher.hpp>
 
-#include <Service/Common.hpp>
+#include <system/Common.hpp>
 #include <Service/Message.hpp>
 #include <Service/Service.hpp>
 #include <Timers/TimerHandle.hpp>
diff --git a/module-services/service-appmgr/model/ApplicationManagerCommon.cpp b/module-services/service-appmgr/model/ApplicationManagerCommon.cpp
index 953489993..3ef2816b5 100644
--- a/module-services/service-appmgr/model/ApplicationManagerCommon.cpp
+++ b/module-services/service-appmgr/model/ApplicationManagerCommon.cpp
@@ -10,7 +10,7 @@
 
 #include <Service/Message.hpp>
 #include <SystemManager/SystemManagerCommon.hpp>
-#include <SystemManager/messages/SystemManagerMessage.hpp>
+#include <system/messages/SystemManagerMessage.hpp>
 #include <apps-common/messages/OnBoardingMessages.hpp>
 #include <apps-common/messages/AppMessage.hpp>
 #include <apps-common/actions/AlarmTriggeredAction.hpp>
diff --git a/module-services/service-audio/AudioServiceAPI.cpp b/module-services/service-audio/AudioServiceAPI.cpp
index 558b945a9..c00168e85 100644
--- a/module-services/service-audio/AudioServiceAPI.cpp
+++ b/module-services/service-audio/AudioServiceAPI.cpp
@@ -7,7 +7,7 @@
 
 #include <Audio/decoder/Decoder.hpp>
 #include <log/log.hpp>
-#include <Service/Common.hpp>
+#include <system/Common.hpp>
 
 #include <utility>
 
diff --git a/module-services/service-audio/ServiceAudio.cpp b/module-services/service-audio/ServiceAudio.cpp
index 89f86a7c2..7cda543ac 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 <SystemManager/messages/SentinelRegistrationMessage.hpp>
+#include <system/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/ServiceBluetooth.cpp b/module-services/service-bluetooth/ServiceBluetooth.cpp
index b8b3b1b4c..47932256f 100644
--- a/module-services/service-bluetooth/ServiceBluetooth.cpp
+++ b/module-services/service-bluetooth/ServiceBluetooth.cpp
@@ -24,7 +24,7 @@
 #include "service-bluetooth/BluetoothDevicesModel.hpp"
 #include "service-bluetooth/messages/BluetoothModeChanged.hpp"
 
-#include "SystemManager/messages/SentinelRegistrationMessage.hpp"
+#include "system/messages/SentinelRegistrationMessage.hpp"
 
 #include <log/log.hpp>
 #include <bits/exception.h>
diff --git a/module-services/service-bluetooth/service-bluetooth/ServiceBluetooth.hpp b/module-services/service-bluetooth/service-bluetooth/ServiceBluetooth.hpp
index 2d7d1bc61..807e646f7 100644
--- a/module-services/service-bluetooth/service-bluetooth/ServiceBluetooth.hpp
+++ b/module-services/service-bluetooth/service-bluetooth/ServiceBluetooth.hpp
@@ -4,7 +4,7 @@
 #pragma once
 
 #include <service-bluetooth/Constants.hpp>
-#include <Service/Common.hpp>
+#include <system/Common.hpp>
 #include <Service/Message.hpp>
 #include <Service/Service.hpp>
 #include "service-bluetooth/SettingsHolder.hpp"
@@ -13,7 +13,7 @@
 #include <module-bluetooth/Bluetooth/CommandHandler.hpp>
 #include "ProfileManager.hpp"
 #include "BluetoothDevicesModel.hpp"
-#include <Service/CpuSentinel.hpp>
+#include <SystemManager/CpuSentinel.hpp>
 #include <Timers/TimerHandle.hpp>
 
 #include <memory> // for unique_ptr
diff --git a/module-services/service-cellular/CellularServiceAPI.cpp b/module-services/service-cellular/CellularServiceAPI.cpp
index 40d920f4c..82c6e1d50 100644
--- a/module-services/service-cellular/CellularServiceAPI.cpp
+++ b/module-services/service-cellular/CellularServiceAPI.cpp
@@ -8,7 +8,7 @@
 #include <MessageType.hpp>
 #include <modem/mux/CellularMux.h>
 #include <PhoneNumber.hpp>
-#include <Service/Common.hpp>
+#include <system/Common.hpp>
 #include <bsp/cellular/bsp_cellular.hpp>
 #include <log/log.hpp>
 
diff --git a/module-services/service-cellular/ServiceCellular.cpp b/module-services/service-cellular/ServiceCellular.cpp
index 2e8433f2f..016eefbe4 100644
--- a/module-services/service-cellular/ServiceCellular.cpp
+++ b/module-services/service-cellular/ServiceCellular.cpp
@@ -17,7 +17,7 @@
 #include "NetworkSettings.hpp"
 #include "service-cellular/RequestFactory.hpp"
 #include "service-cellular/CellularRequestHandler.hpp"
-#include "SystemManager/messages/SentinelRegistrationMessage.hpp"
+#include "system/messages/SentinelRegistrationMessage.hpp"
 
 #include <Audio/AudioCommon.hpp>
 #include <BaseInterface.hpp>
diff --git a/module-services/service-cellular/service-cellular/CellularCall.hpp b/module-services/service-cellular/service-cellular/CellularCall.hpp
index ccf729178..064031df7 100644
--- a/module-services/service-cellular/service-cellular/CellularCall.hpp
+++ b/module-services/service-cellular/service-cellular/CellularCall.hpp
@@ -15,7 +15,7 @@
 #include <iosfwd>
 #include <string>
 #include <sys/types.h>
-#include <Service/CpuSentinel.hpp>
+#include <SystemManager/CpuSentinel.hpp>
 
 namespace CellularCall
 {
@@ -47,8 +47,8 @@ namespace CellularCall
 
         void clear()
         {
-            call            = CalllogRecord();
-            isActiveCall    = false;
+            call         = CalllogRecord();
+            isActiveCall = false;
             startActiveTime.set_time(0);
         }
 
diff --git a/module-services/service-cellular/service-cellular/ServiceCellular.hpp b/module-services/service-cellular/service-cellular/ServiceCellular.hpp
index 123b1e2bd..dd7b1534d 100644
--- a/module-services/service-cellular/service-cellular/ServiceCellular.hpp
+++ b/module-services/service-cellular/service-cellular/ServiceCellular.hpp
@@ -16,10 +16,10 @@
 #include <modem/mux/CellularMux.h>
 #include <modem/mux/CellularMuxTypes.h>
 #include <SMSRecord.hpp>
-#include <Service/Common.hpp>
+#include <system/Common.hpp>
 #include <Service/Message.hpp>
 #include <Service/Service.hpp>
-#include <Service/CpuSentinel.hpp>
+#include <SystemManager/CpuSentinel.hpp>
 #include <Timers/TimerHandle.hpp>
 #include <bsp/common.hpp>
 #include <utf8/UTF8.hpp>
diff --git a/module-services/service-db/DBServiceAPI.cpp b/module-services/service-db/DBServiceAPI.cpp
index 8043fbecc..0e53166d3 100644
--- a/module-services/service-db/DBServiceAPI.cpp
+++ b/module-services/service-db/DBServiceAPI.cpp
@@ -13,7 +13,7 @@
 #include <MessageType.hpp>
 #include <PhoneNumber.hpp>
 #include <SMSTemplateRecord.hpp>
-#include <Service/Common.hpp>
+#include <system/Common.hpp>
 #include <Service/Service.hpp>
 #include <Tables/CountryCodesTable.hpp>
 #include <ThreadRecord.hpp>
diff --git a/module-services/service-db/include/service-db/DBContactMessage.hpp b/module-services/service-db/include/service-db/DBContactMessage.hpp
index e250119ea..fbf92b27e 100644
--- a/module-services/service-db/include/service-db/DBContactMessage.hpp
+++ b/module-services/service-db/include/service-db/DBContactMessage.hpp
@@ -8,7 +8,7 @@
 #include <Interface/ContactRecord.hpp>
 #include <MessageType.hpp>
 #include <PhoneNumber.hpp>
-#include <Service/Common.hpp>
+#include <system/Common.hpp>
 #include <Service/Message.hpp>
 
 #include <cstdint>
diff --git a/module-services/service-db/test/test-service-db-settings-messages.cpp b/module-services/service-db/test/test-service-db-settings-messages.cpp
index bfa151fce..f7da7d510 100644
--- a/module-services/service-db/test/test-service-db-settings-messages.cpp
+++ b/module-services/service-db/test/test-service-db-settings-messages.cpp
@@ -1,18 +1,18 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include <catch2/catch.hpp>           // for Section, SourceLineInfo, SECTION, SectionInfo, StringRef, TEST_CASE
-#include <Service/Service.hpp>        // for Service
-#include <Service/Message.hpp>        // for MessagePointer, ResponseMessage, DataMessage
-#include <functional>                 // for _Bind_helper<>::type, _Placeholder, bind, _1, _2
-#include <list>                       // for list
-#include <memory>                     // for make_shared, allocator, shared_ptr
-#include <optional>                   // for optional
-#include <string>                     // for string
-#include <utility>                    // for move
+#include <catch2/catch.hpp>    // for Section, SourceLineInfo, SECTION, SectionInfo, StringRef, TEST_CASE
+#include <Service/Service.hpp> // for Service
+#include <Service/Message.hpp> // for MessagePointer, ResponseMessage, DataMessage
+#include <functional>          // for _Bind_helper<>::type, _Placeholder, bind, _1, _2
+#include <list>                // for list
+#include <memory>              // for make_shared, allocator, shared_ptr
+#include <optional>            // for optional
+#include <string>              // for string
+#include <utility>             // for move
 
 #include <service-db/SettingsMessages.hpp> // for SetVariable, ListProfiles, GetVariable, AddMode, AddProfile, CurrentModeChanged, CurrentProfileChanged, EntryPath, GetCurrentMode, GetCurrentProfile, ListModes, ModeListResponse, ProfileListResponse, RegisterOnVariableChange, UnregisterOnVariableChange, VariableChanged, VariableResponse
-#include "Service/Common.hpp"            // for ReturnCodes, ReturnCodes::Success, ServicePowerMode
+#include "system/Common.hpp"               // for ReturnCodes, ReturnCodes::Success, ServicePowerMode
 
 namespace settings
 {
diff --git a/module-services/service-desktop/ServiceDesktop.cpp b/module-services/service-desktop/ServiceDesktop.cpp
index a61d4d009..cc87337aa 100644
--- a/module-services/service-desktop/ServiceDesktop.cpp
+++ b/module-services/service-desktop/ServiceDesktop.cpp
@@ -24,8 +24,8 @@
 #include <SystemManager/SystemManagerCommon.hpp>
 #include <Timers/TimerFactory.hpp>
 
-#include <SystemManager/Constants.hpp>
-#include <SystemManager/messages/TetheringStateRequest.hpp>
+#include <system/Constants.hpp>
+#include <system/messages/TetheringStateRequest.hpp>
 
 #include <sys/mount.h>
 #include <sys/statvfs.h>
diff --git a/module-services/service-desktop/WorkerDesktop.cpp b/module-services/service-desktop/WorkerDesktop.cpp
index 6f040dc52..f8330a0be 100644
--- a/module-services/service-desktop/WorkerDesktop.cpp
+++ b/module-services/service-desktop/WorkerDesktop.cpp
@@ -17,7 +17,7 @@
 #include <vector>
 #include <filesystem>
 #include <service-desktop/DesktopMessages.hpp>
-#include "SystemManager/messages/SentinelRegistrationMessage.hpp"
+#include "system/messages/SentinelRegistrationMessage.hpp"
 
 inline constexpr auto uploadFailedMessage = "file upload terminated before all data transferred";
 
diff --git a/module-services/service-desktop/WorkerDesktop.hpp b/module-services/service-desktop/WorkerDesktop.hpp
index ecfa731e5..617e57a18 100644
--- a/module-services/service-desktop/WorkerDesktop.hpp
+++ b/module-services/service-desktop/WorkerDesktop.hpp
@@ -6,7 +6,7 @@
 #include <Service/Message.hpp>
 #include <Service/Service.hpp>
 #include <Service/Worker.hpp>
-#include <Service/CpuSentinel.hpp>
+#include <SystemManager/CpuSentinel.hpp>
 #include <ParserFSM.hpp>
 #include <endpoints/EndpointFactory.hpp>
 #include <bsp/usb/usb.hpp>
diff --git a/module-services/service-desktop/endpoints/contacts/ContactHelper.cpp b/module-services/service-desktop/endpoints/contacts/ContactHelper.cpp
index 92dfdb2f1..9600bd210 100644
--- a/module-services/service-desktop/endpoints/contacts/ContactHelper.cpp
+++ b/module-services/service-desktop/endpoints/contacts/ContactHelper.cpp
@@ -13,7 +13,7 @@
 #include <Common/Query.hpp>
 #include <ContactRecord.hpp>
 #include <PhoneNumber.hpp>
-#include <Service/Common.hpp>
+#include <system/Common.hpp>
 #include <log/log.hpp>
 #include <queries/RecordQuery.hpp>
 #include <queries/phonebook/QueryContactGetByID.hpp>
diff --git a/module-services/service-desktop/endpoints/developerMode/DeveloperModeHelper.cpp b/module-services/service-desktop/endpoints/developerMode/DeveloperModeHelper.cpp
index a8fa81d43..92c7b6fd7 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 <SystemManager/messages/TetheringStateRequest.hpp>
-#include <SystemManager/Constants.hpp>
+#include <system/messages/TetheringStateRequest.hpp>
+#include <system/Constants.hpp>
 
 #include <service-db/agents/settings/SystemSettings.hpp>
 #include <service-db/DBServiceAPI.hpp>
diff --git a/module-services/service-desktop/endpoints/include/endpoints/backup/BackupEndpoint.hpp b/module-services/service-desktop/endpoints/include/endpoints/backup/BackupEndpoint.hpp
index c9afcc725..0b69f17c6 100644
--- a/module-services/service-desktop/endpoints/include/endpoints/backup/BackupEndpoint.hpp
+++ b/module-services/service-desktop/endpoints/include/endpoints/backup/BackupEndpoint.hpp
@@ -5,7 +5,7 @@
 
 #include <endpoints/Endpoint.hpp>
 
-#include <Service/Common.hpp>
+#include <system/Common.hpp>
 
 #include <string>
 
diff --git a/module-services/service-desktop/endpoints/include/endpoints/bluetooth/BluetoothHelper.hpp b/module-services/service-desktop/endpoints/include/endpoints/bluetooth/BluetoothHelper.hpp
index 9456685c2..9d6c864ef 100644
--- a/module-services/service-desktop/endpoints/include/endpoints/bluetooth/BluetoothHelper.hpp
+++ b/module-services/service-desktop/endpoints/include/endpoints/bluetooth/BluetoothHelper.hpp
@@ -3,7 +3,7 @@
 #pragma once
 
 #include <endpoints/Context.hpp>
-#include <Service/Common.hpp>
+#include <system/Common.hpp>
 #include <Service/Service.hpp>
 
 namespace sdesktop::endpoints
diff --git a/module-services/service-desktop/endpoints/include/endpoints/contacts/ContactHelper.hpp b/module-services/service-desktop/endpoints/include/endpoints/contacts/ContactHelper.hpp
index 0b0a9a3e5..e860c8656 100644
--- a/module-services/service-desktop/endpoints/include/endpoints/contacts/ContactHelper.hpp
+++ b/module-services/service-desktop/endpoints/include/endpoints/contacts/ContactHelper.hpp
@@ -6,7 +6,7 @@
 #include <endpoints/DBHelper.hpp>
 
 #include <ContactRecord.hpp>
-#include <Service/Common.hpp>
+#include <system/Common.hpp>
 #include <Service/Service.hpp>
 #include <json11.hpp>
 
diff --git a/module-services/service-desktop/endpoints/include/endpoints/filesystem/FileContext.hpp b/module-services/service-desktop/endpoints/include/endpoints/filesystem/FileContext.hpp
index d87d2842a..2260b863b 100644
--- a/module-services/service-desktop/endpoints/include/endpoints/filesystem/FileContext.hpp
+++ b/module-services/service-desktop/endpoints/include/endpoints/filesystem/FileContext.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "Service/SystemReturnCodes.hpp"
+#include "system/SystemReturnCodes.hpp"
 #include <crc32.h>
 
 #include <filesystem>
diff --git a/module-services/service-desktop/endpoints/messages/MessageHelper.cpp b/module-services/service-desktop/endpoints/messages/MessageHelper.cpp
index d5433d79b..6ea15e8c4 100644
--- a/module-services/service-desktop/endpoints/messages/MessageHelper.cpp
+++ b/module-services/service-desktop/endpoints/messages/MessageHelper.cpp
@@ -11,7 +11,7 @@
 #include <Common/Query.hpp>
 #include <SMSRecord.hpp>
 #include <SMSTemplateRecord.hpp>
-#include <Service/Common.hpp>
+#include <system/Common.hpp>
 #include <ThreadRecord.hpp>
 #include <queries/messages/sms/QuerySMSGet.hpp>
 #include <queries/messages/sms/QuerySMSGetByID.hpp>
diff --git a/module-services/service-desktop/include/service-desktop/ServiceDesktop.hpp b/module-services/service-desktop/include/service-desktop/ServiceDesktop.hpp
index e7b99d78a..2985bba19 100644
--- a/module-services/service-desktop/include/service-desktop/ServiceDesktop.hpp
+++ b/module-services/service-desktop/include/service-desktop/ServiceDesktop.hpp
@@ -5,7 +5,7 @@
 
 #include <memory> // for allocator, unique_ptr
 
-#include "Service/Common.hpp"  // for ReturnCodes, ServicePowerMode
+#include "system/Common.hpp"   // for ReturnCodes, ServicePowerMode
 #include "Service/Message.hpp" // for MessagePointer, DataMessage (ptr only), ResponseMessage (ptr only)
 #include "Service/Service.hpp" // for Service
 #include "Timers/TimerHandle.hpp"
diff --git a/module-services/service-eink/EinkSentinel.hpp b/module-services/service-eink/EinkSentinel.hpp
index da09e99c5..4425832a9 100644
--- a/module-services/service-eink/EinkSentinel.hpp
+++ b/module-services/service-eink/EinkSentinel.hpp
@@ -4,7 +4,7 @@
 #pragma once
 
 #include <Service/Service.hpp>
-#include <Service/CpuSentinel.hpp>
+#include <SystemManager/CpuSentinel.hpp>
 
 namespace service::eink
 {
diff --git a/module-services/service-eink/ServiceEink.cpp b/module-services/service-eink/ServiceEink.cpp
index fc676b855..8584f7cc3 100644
--- a/module-services/service-eink/ServiceEink.cpp
+++ b/module-services/service-eink/ServiceEink.cpp
@@ -12,9 +12,9 @@
 #include <log/log.hpp>
 #include <messages/EinkMessage.hpp>
 #include <messages/ImageMessage.hpp>
-#include <SystemManager/messages/DeviceRegistrationMessage.hpp>
-#include <SystemManager/messages/SentinelRegistrationMessage.hpp>
-#include <SystemManager/Constants.hpp>
+#include <system/messages/DeviceRegistrationMessage.hpp>
+#include <system/messages/SentinelRegistrationMessage.hpp>
+#include <system/Constants.hpp>
 
 #include <cstring>
 #include <memory>
diff --git a/module-services/service-eink/ServiceEink.hpp b/module-services/service-eink/ServiceEink.hpp
index e58eafd96..c024b6bc3 100644
--- a/module-services/service-eink/ServiceEink.hpp
+++ b/module-services/service-eink/ServiceEink.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <Service/Common.hpp>
+#include <system/Common.hpp>
 #include <Service/Message.hpp>
 #include <Service/Service.hpp>
 #include <Timers/TimerHandle.hpp>
diff --git a/module-services/service-evtmgr/EventManager.cpp b/module-services/service-evtmgr/EventManager.cpp
index 016c40f2a..d2c655841 100644
--- a/module-services/service-evtmgr/EventManager.cpp
+++ b/module-services/service-evtmgr/EventManager.cpp
@@ -14,7 +14,7 @@
 #include <MessageType.hpp>
 #include <Service/Worker.hpp>
 #include <Timers/TimerFactory.hpp>
-#include <SystemManager/Constants.hpp>
+#include <system/Constants.hpp>
 #include <SystemManager/SystemManagerCommon.hpp>
 #include <bsp/common.hpp>
 #include <bsp/rtc/rtc.hpp>
@@ -38,7 +38,7 @@
 #include <list>
 #include <ctime>
 #include <apps-common/messages/AppMessage.hpp>
-#include <SystemManager/messages/SentinelRegistrationMessage.hpp>
+#include <system/messages/SentinelRegistrationMessage.hpp>
 #include <EventStore.hpp>
 #include <ticks.hpp>
 #include <purefs/filesystem_paths.hpp>
diff --git a/module-services/service-evtmgr/WorkerEventCommon.cpp b/module-services/service-evtmgr/WorkerEventCommon.cpp
index 8ee7660f0..a5d691a74 100644
--- a/module-services/service-evtmgr/WorkerEventCommon.cpp
+++ b/module-services/service-evtmgr/WorkerEventCommon.cpp
@@ -28,7 +28,7 @@
 #include <service-desktop/Constants.hpp>
 #include <service-desktop/DesktopMessages.hpp>
 #include <SystemManager/SystemManagerCommon.hpp>
-#include <SystemManager/messages/SentinelRegistrationMessage.hpp>
+#include <system/messages/SentinelRegistrationMessage.hpp>
 
 extern "C"
 {
diff --git a/module-services/service-evtmgr/api/EventManagerServiceAPI.cpp b/module-services/service-evtmgr/api/EventManagerServiceAPI.cpp
index e44bfc8a0..9aecb79a6 100644
--- a/module-services/service-evtmgr/api/EventManagerServiceAPI.cpp
+++ b/module-services/service-evtmgr/api/EventManagerServiceAPI.cpp
@@ -6,7 +6,7 @@
 #include <service-evtmgr/Constants.hpp>
 
 #include <MessageType.hpp>
-#include <Service/Common.hpp>
+#include <system/Common.hpp>
 #include <Service/Message.hpp>
 
 #include <cstdint>
diff --git a/module-services/service-evtmgr/battery-brownout-detector/BatteryBrownoutDetector.cpp b/module-services/service-evtmgr/battery-brownout-detector/BatteryBrownoutDetector.cpp
index 648c82e37..58f0861b9 100644
--- a/module-services/service-evtmgr/battery-brownout-detector/BatteryBrownoutDetector.cpp
+++ b/module-services/service-evtmgr/battery-brownout-detector/BatteryBrownoutDetector.cpp
@@ -4,7 +4,7 @@
 #include "BatteryBrownoutDetector.hpp"
 
 #include <service-evtmgr/BatteryMessages.hpp>
-#include <SystemManager/Constants.hpp>
+#include <system/Constants.hpp>
 #include <Timers/TimerFactory.hpp>
 
 namespace
diff --git a/module-services/service-evtmgr/battery-level-check/BatteryLevelCheck.cpp b/module-services/service-evtmgr/battery-level-check/BatteryLevelCheck.cpp
index 89947433a..5d20f22ea 100644
--- a/module-services/service-evtmgr/battery-level-check/BatteryLevelCheck.cpp
+++ b/module-services/service-evtmgr/battery-level-check/BatteryLevelCheck.cpp
@@ -3,7 +3,7 @@
 
 #include "BatteryLevelCheck.hpp"
 #include "service-evtmgr/BatteryMessages.hpp"
-#include "SystemManager/Constants.hpp"
+#include "system/Constants.hpp"
 #include <service-db/agents/settings/SystemSettings.hpp>
 #include <EventStore.hpp>
 #include <Utils.hpp>
diff --git a/module-services/service-evtmgr/service-evtmgr/EventManagerCommon.hpp b/module-services/service-evtmgr/service-evtmgr/EventManagerCommon.hpp
index 60f8c2ccb..b740e2233 100644
--- a/module-services/service-evtmgr/service-evtmgr/EventManagerCommon.hpp
+++ b/module-services/service-evtmgr/service-evtmgr/EventManagerCommon.hpp
@@ -7,13 +7,13 @@
 
 #include <hal/key_input/RawKey.hpp>
 #include <MessageType.hpp>
-#include <Service/Common.hpp>
+#include <system/Common.hpp>
 #include <Service/Message.hpp>
 #include <Service/Service.hpp>
 #include <Service/Worker.hpp>
 #include <service-db/DBServiceName.hpp>
 #include <Timers/TimerHandle.hpp>
-#include <Service/CpuSentinel.hpp>
+#include <SystemManager/CpuSentinel.hpp>
 
 #include <cstdint>
 #include <memory>
diff --git a/module-services/service-evtmgr/service-evtmgr/WorkerEventCommon.hpp b/module-services/service-evtmgr/service-evtmgr/WorkerEventCommon.hpp
index 8aed68b9d..cc8e305ca 100644
--- a/module-services/service-evtmgr/service-evtmgr/WorkerEventCommon.hpp
+++ b/module-services/service-evtmgr/service-evtmgr/WorkerEventCommon.hpp
@@ -9,7 +9,7 @@
 #include <Service/Service.hpp>
 #include <Service/Worker.hpp>
 #include <bsp/common.hpp>
-#include <Service/CpuSentinel.hpp>
+#include <SystemManager/CpuSentinel.hpp>
 #include <hal/battery_charger/AbstractBatteryCharger.hpp>
 #include <hal/key_input/AbstractKeyInput.hpp>
 #include <battery/BatteryController.hpp>
diff --git a/module-services/service-evtmgr/vibra/Vibra.cpp b/module-services/service-evtmgr/vibra/Vibra.cpp
index cc1be2900..2d43cfdb9 100644
--- a/module-services/service-evtmgr/vibra/Vibra.cpp
+++ b/module-services/service-evtmgr/vibra/Vibra.cpp
@@ -2,7 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "Vibra.hpp"
-#include "SystemManager/Constants.hpp"
+#include "system/Constants.hpp"
 #include <Timers/TimerFactory.hpp>
 
 namespace vibra_handle
diff --git a/module-services/service-gui/service-gui/ServiceGUI.hpp b/module-services/service-gui/service-gui/ServiceGUI.hpp
index 98f879e9e..bb2e57d78 100644
--- a/module-services/service-gui/service-gui/ServiceGUI.hpp
+++ b/module-services/service-gui/service-gui/ServiceGUI.hpp
@@ -9,7 +9,7 @@
 #include "messages/RenderingFinished.hpp"
 #include "Common.hpp"
 
-#include <Service/Common.hpp>
+#include <system/Common.hpp>
 #include <Service/Message.hpp>
 #include <Service/Service.hpp>
 #include <Timers/TimerHandle.hpp>
diff --git a/module-services/service-time/ServiceTime.hpp b/module-services/service-time/ServiceTime.hpp
index 4cde670d2..e6acd6453 100644
--- a/module-services/service-time/ServiceTime.hpp
+++ b/module-services/service-time/ServiceTime.hpp
@@ -13,7 +13,7 @@
 #include <service-db/DBServiceName.hpp>
 
 #include <MessageType.hpp>
-#include <Service/Common.hpp>
+#include <system/Common.hpp>
 #include <Service/Message.hpp>
 #include <Service/Service.hpp>
 
diff --git a/module-sys/CMakeLists.txt b/module-sys/CMakeLists.txt
index 2349709e1..86b91b5e3 100644
--- a/module-sys/CMakeLists.txt
+++ b/module-sys/CMakeLists.txt
@@ -1,17 +1,17 @@
 module_is_test_entity()
 
+add_subdirectory(common)
 add_subdirectory(PhoneModes)
 add_subdirectory(Service)
 add_subdirectory(SystemManager)
 add_subdirectory(SystemWatchdog)
-add_subdirectory(Timers)
 
 add_library(module-sys INTERFACE)
 
 target_link_libraries(module-sys
     INTERFACE
+        sys-common
         sys-service
-        sys-timers
         sys-phonemodes
         sys-watchdog
         sys-manager
diff --git a/module-sys/Service/CMakeLists.txt b/module-sys/Service/CMakeLists.txt
index 19fbc9cc0..559088ccd 100644
--- a/module-sys/Service/CMakeLists.txt
+++ b/module-sys/Service/CMakeLists.txt
@@ -1,37 +1,33 @@
 add_library(sys-service STATIC)
-add_library(sys-service-common INTERFACE)
-
-target_sources(sys-service-common INTERFACE include/Service/Common.hpp)
-target_include_directories(sys-service-common
-    INTERFACE
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>
-)
 
 target_sources(sys-service
     PUBLIC
-        include/Service/BusProxy.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/Timers/SystemTimer.hpp
+        include/Timers/TimerFactory.hpp
+        include/Timers/Timer.hpp
+        include/Timers/TimerMessage.hpp
+        include/Timers/TimerHandle.hpp
         include/Service/ServiceManifest.hpp
-        include/Service/ServiceProxy.hpp
-        include/Service/SystemReturnCodes.hpp
-        include/Service/Watchdog.hpp
+        include/Service/ServiceCreator.hpp
+        include/Service/MessageForward.hpp
+        include/Service/BusProxy.hpp
+        include/Service/ServiceForward.hpp
         include/Service/Worker.hpp
+        include/Service/Service.hpp
+        include/Service/ServiceProxy.hpp
+        include/Service/Mailbox.hpp
+        include/Service/Message.hpp
 
     PRIVATE
         details/bus/Bus.cpp
         details/bus/Bus.hpp
 
         BusProxy.cpp
-        CpuSentinel.cpp
         Message.cpp
         Service.cpp
+        SystemTimer.cpp
+        TimerFactory.cpp
+        TimerHandle.cpp
         Worker.cpp
 )
 
@@ -45,7 +41,7 @@ target_link_libraries(sys-service
         messagetype
         module-bsp
         module-os
-        sys-service-common
+        sys-common
         sys-watchdog
 
         magic_enum::magic_enum
diff --git a/module-sys/Service/Service.cpp b/module-sys/Service/Service.cpp
index df7d30142..f952c1622 100644
--- a/module-sys/Service/Service.cpp
+++ b/module-sys/Service/Service.cpp
@@ -4,7 +4,6 @@
 #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/Mailbox.hpp" // for Mailbox
 #include <Service/Message.hpp> // for Message, MessagePointer, DataMessage, Resp...
 #include "Timers/SystemTimer.hpp"
@@ -20,7 +19,7 @@
 #include <cstdint>                 // for uint32_t, uint64_t, UINT32_MAX
 #include <iosfwd>                  // for std
 #include <typeinfo>                // for type_info
-#include <SystemManager/Constants.hpp>
+#include <system/Constants.hpp>
 
 #if (DEBUG_SERVICE_MESSAGES > 0)
 #include <cxxabi.h>
diff --git a/module-sys/Timers/SystemTimer.cpp b/module-sys/Service/SystemTimer.cpp
similarity index 100%
rename from module-sys/Timers/SystemTimer.cpp
rename to module-sys/Service/SystemTimer.cpp
diff --git a/module-sys/Timers/TimerFactory.cpp b/module-sys/Service/TimerFactory.cpp
similarity index 100%
rename from module-sys/Timers/TimerFactory.cpp
rename to module-sys/Service/TimerFactory.cpp
diff --git a/module-sys/Timers/TimerHandle.cpp b/module-sys/Service/TimerHandle.cpp
similarity index 100%
rename from module-sys/Timers/TimerHandle.cpp
rename to module-sys/Service/TimerHandle.cpp
diff --git a/module-sys/Service/details/bus/Bus.hpp b/module-sys/Service/details/bus/Bus.hpp
index 378c6287a..f4c4568a1 100644
--- a/module-sys/Service/details/bus/Bus.hpp
+++ b/module-sys/Service/details/bus/Bus.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "Service/Common.hpp"
+#include "system/Common.hpp"
 #include "Service/Message.hpp"
 
 #include <cstdint>
diff --git a/module-sys/Service/include/Service/BusProxy.hpp b/module-sys/Service/include/Service/BusProxy.hpp
index 4e21c5d22..797c8a1b1 100644
--- a/module-sys/Service/include/Service/BusProxy.hpp
+++ b/module-sys/Service/include/Service/BusProxy.hpp
@@ -4,7 +4,7 @@
 #pragma once
 
 #include "Message.hpp"
-#include "Watchdog.hpp"
+#include <SystemWatchdog/Watchdog.hpp>
 
 #include <cstdint>
 #include <memory>
diff --git a/module-sys/Service/include/Service/Message.hpp b/module-sys/Service/include/Service/Message.hpp
index c57f9f1b1..82ccd5c11 100644
--- a/module-sys/Service/include/Service/Message.hpp
+++ b/module-sys/Service/include/Service/Message.hpp
@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include "Common.hpp"
 #include "MessageForward.hpp"
 
+#include <system/Common.hpp>
 #include <MessageType.hpp>
 #include <magic_enum.hpp>
 
diff --git a/module-sys/Service/include/Service/MessageForward.hpp b/module-sys/Service/include/Service/MessageForward.hpp
index 0024a7bc4..2e630af73 100644
--- a/module-sys/Service/include/Service/MessageForward.hpp
+++ b/module-sys/Service/include/Service/MessageForward.hpp
@@ -7,7 +7,7 @@
 // This is straight forward declaration header for includes purposes
 
 #include <memory>
-#include "SystemReturnCodes.hpp"
+#include <system/SystemReturnCodes.hpp>
 
 namespace sys
 {
diff --git a/module-sys/Service/include/Service/Service.hpp b/module-sys/Service/include/Service/Service.hpp
index c26f8cdf3..c67d987ea 100644
--- a/module-sys/Service/include/Service/Service.hpp
+++ b/module-sys/Service/include/Service/Service.hpp
@@ -9,8 +9,8 @@
 #include "Mailbox.hpp" // for Mailbox
 #include "Message.hpp" // for MessagePointer
 #include "ServiceManifest.hpp"
-#include "Watchdog.hpp"
-#include "thread.hpp"                        // for Thread
+#include "thread.hpp" // for Thread
+#include <SystemWatchdog/Watchdog.hpp>
 #include <SystemWatchdog/SystemWatchdog.hpp> // for SystemWatchdog
 #include <algorithm>                         // for find, max
 #include <cstdint>                           // for uint32_t, uint64_t
diff --git a/module-sys/Timers/include/Timers/SystemTimer.hpp b/module-sys/Service/include/Timers/SystemTimer.hpp
similarity index 100%
rename from module-sys/Timers/include/Timers/SystemTimer.hpp
rename to module-sys/Service/include/Timers/SystemTimer.hpp
diff --git a/module-sys/Timers/include/Timers/Timer.hpp b/module-sys/Service/include/Timers/Timer.hpp
similarity index 100%
rename from module-sys/Timers/include/Timers/Timer.hpp
rename to module-sys/Service/include/Timers/Timer.hpp
diff --git a/module-sys/Timers/include/Timers/TimerFactory.hpp b/module-sys/Service/include/Timers/TimerFactory.hpp
similarity index 100%
rename from module-sys/Timers/include/Timers/TimerFactory.hpp
rename to module-sys/Service/include/Timers/TimerFactory.hpp
diff --git a/module-sys/Timers/include/Timers/TimerHandle.hpp b/module-sys/Service/include/Timers/TimerHandle.hpp
similarity index 100%
rename from module-sys/Timers/include/Timers/TimerHandle.hpp
rename to module-sys/Service/include/Timers/TimerHandle.hpp
diff --git a/module-sys/Timers/include/Timers/TimerMessage.hpp b/module-sys/Service/include/Timers/TimerMessage.hpp
similarity index 100%
rename from module-sys/Timers/include/Timers/TimerMessage.hpp
rename to module-sys/Service/include/Timers/TimerMessage.hpp
diff --git a/module-sys/SystemManager/CMakeLists.txt b/module-sys/SystemManager/CMakeLists.txt
index 065933e69..2e29dbc15 100644
--- a/module-sys/SystemManager/CMakeLists.txt
+++ b/module-sys/SystemManager/CMakeLists.txt
@@ -3,21 +3,16 @@ add_library(sys-manager STATIC)
 target_sources(sys-manager
     PUBLIC
         include/SystemManager/DependencyGraph.hpp
+        include/SystemManager/CpuSentinel.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/SystemManagerCommon.hpp
         include/SystemManager/CpuGovernor.hpp
         include/SystemManager/PowerManager.hpp
         include/SystemManager/DeviceManager.hpp
-
+    
     PRIVATE
         CpuGovernor.cpp
+        CpuSentinel.cpp
         CpuStatistics.cpp
         data/SystemManagerActionsParams.hpp
         DependencyGraph.cpp
@@ -34,9 +29,14 @@ target_include_directories(sys-manager
 )
 
 target_link_libraries(sys-manager
+    PRIVATE
+        apps-common
+        service-evtmgr
+
     PUBLIC
         eventstore
         sys-service
+        sys-common
 )
 
 if (${ENABLE_TESTS})
diff --git a/module-sys/Service/CpuSentinel.cpp b/module-sys/SystemManager/CpuSentinel.cpp
similarity index 91%
rename from module-sys/Service/CpuSentinel.cpp
rename to module-sys/SystemManager/CpuSentinel.cpp
index b05e33125..70153f857 100644
--- a/module-sys/Service/CpuSentinel.cpp
+++ b/module-sys/SystemManager/CpuSentinel.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 <Service/CpuSentinel.hpp>
-#include "SystemManager/messages/RequestCpuFrequencyMessage.hpp"
-#include "SystemManager/Constants.hpp"
+#include <SystemManager/CpuSentinel.hpp>
+#include "system/messages/RequestCpuFrequencyMessage.hpp"
+#include "system/Constants.hpp"
 #include <memory>
 
 namespace sys
diff --git a/module-sys/SystemManager/SystemManagerCommon.cpp b/module-sys/SystemManager/SystemManagerCommon.cpp
index 438317b3e..1cdb92e1e 100644
--- a/module-sys/SystemManager/SystemManagerCommon.cpp
+++ b/module-sys/SystemManager/SystemManagerCommon.cpp
@@ -20,9 +20,9 @@
 #include <service-desktop/Constants.hpp>
 #include <service-appmgr/Constants.hpp>
 #include <service-appmgr/Controller.hpp>
-#include <SystemManager/messages/DeviceRegistrationMessage.hpp>
-#include <SystemManager/messages/SentinelRegistrationMessage.hpp>
-#include <SystemManager/messages/RequestCpuFrequencyMessage.hpp>
+#include <system/messages/DeviceRegistrationMessage.hpp>
+#include <system/messages/SentinelRegistrationMessage.hpp>
+#include <system/messages/RequestCpuFrequencyMessage.hpp>
 #include <time/ScopedTime.hpp>
 #include "Timers/TimerFactory.hpp"
 #include <service-appmgr/StartupType.hpp>
diff --git a/module-sys/SystemManager/include/SystemManager/CpuGovernor.hpp b/module-sys/SystemManager/include/SystemManager/CpuGovernor.hpp
index 3f56dbce2..404d47ce0 100644
--- a/module-sys/SystemManager/include/SystemManager/CpuGovernor.hpp
+++ b/module-sys/SystemManager/include/SystemManager/CpuGovernor.hpp
@@ -5,7 +5,7 @@
 
 #include <memory>
 #include <vector>
-#include "Service/CpuSentinel.hpp"
+#include "SystemManager/CpuSentinel.hpp"
 
 namespace sys
 {
diff --git a/module-sys/Service/include/Service/CpuSentinel.hpp b/module-sys/SystemManager/include/SystemManager/CpuSentinel.hpp
similarity index 98%
rename from module-sys/Service/include/Service/CpuSentinel.hpp
rename to module-sys/SystemManager/include/SystemManager/CpuSentinel.hpp
index e63f62d21..6fa5d99dc 100644
--- a/module-sys/Service/include/Service/CpuSentinel.hpp
+++ b/module-sys/SystemManager/include/SystemManager/CpuSentinel.hpp
@@ -3,10 +3,11 @@
 
 #pragma once
 
+#include <Service/Service.hpp>
+#include <bsp/common.hpp>
+
 #include <string>
 #include <functional>
-#include <bsp/common.hpp>
-#include "Service.hpp"
 
 namespace sys
 {
diff --git a/module-sys/SystemManager/include/SystemManager/SystemManagerCommon.hpp b/module-sys/SystemManager/include/SystemManager/SystemManagerCommon.hpp
index 3d2f5efdc..b3bfb9339 100644
--- a/module-sys/SystemManager/include/SystemManager/SystemManagerCommon.hpp
+++ b/module-sys/SystemManager/include/SystemManager/SystemManagerCommon.hpp
@@ -14,7 +14,7 @@
 #include "Timers/TimerHandle.hpp"
 #include "PowerManager.hpp"
 #include <hal/key_input/RawKey.hpp>
-#include "Constants.hpp"
+#include <system/Constants.hpp>
 #include "CpuStatistics.hpp"
 #include "DeviceManager.hpp"
 #include <chrono>
diff --git a/module-sys/SystemManager/tests/unittest_CpuSentinelsGovernor.cpp b/module-sys/SystemManager/tests/unittest_CpuSentinelsGovernor.cpp
index 5c0832f27..93a25638a 100644
--- a/module-sys/SystemManager/tests/unittest_CpuSentinelsGovernor.cpp
+++ b/module-sys/SystemManager/tests/unittest_CpuSentinelsGovernor.cpp
@@ -5,7 +5,7 @@
 
 #include <catch2/catch.hpp>
 #include <SystemManager/CpuGovernor.hpp>
-#include <Service/CpuSentinel.hpp>
+#include <SystemManager/CpuSentinel.hpp>
 
 TEST_CASE("Power Manager CPU sentinels governor test")
 {
diff --git a/module-sys/SystemWatchdog/CMakeLists.txt b/module-sys/SystemWatchdog/CMakeLists.txt
index 6c52c544d..cc2c4eb33 100644
--- a/module-sys/SystemWatchdog/CMakeLists.txt
+++ b/module-sys/SystemWatchdog/CMakeLists.txt
@@ -3,6 +3,7 @@ add_library(sys-watchdog STATIC)
 target_sources(sys-watchdog
     PUBLIC
         include/SystemWatchdog/SystemWatchdog.hpp
+        include/SystemWatchdog/Watchdog.hpp
 
     PRIVATE
         SystemWatchdog.cpp
@@ -15,7 +16,7 @@ target_include_directories(sys-watchdog
 
 target_link_libraries(sys-watchdog
     PUBLIC
-        sys-service-common
+        sys-common
 
     PRIVATE
         module-bsp
diff --git a/module-sys/SystemWatchdog/SystemWatchdog.cpp b/module-sys/SystemWatchdog/SystemWatchdog.cpp
index 18bce80ca..d0bcdf106 100644
--- a/module-sys/SystemWatchdog/SystemWatchdog.cpp
+++ b/module-sys/SystemWatchdog/SystemWatchdog.cpp
@@ -2,7 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include <SystemWatchdog/SystemWatchdog.hpp>
-#include "Service/Common.hpp"
+#include "system/Common.hpp"
 #include "critical.hpp"
 #include "ticks.hpp"
 #include "bsp/watchdog/watchdog.hpp"
diff --git a/module-sys/SystemWatchdog/include/SystemWatchdog/SystemWatchdog.hpp b/module-sys/SystemWatchdog/include/SystemWatchdog/SystemWatchdog.hpp
index 9a54da8c3..ccad9caaa 100644
--- a/module-sys/SystemWatchdog/include/SystemWatchdog/SystemWatchdog.hpp
+++ b/module-sys/SystemWatchdog/include/SystemWatchdog/SystemWatchdog.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <Service/Watchdog.hpp>
+#include "Watchdog.hpp"
 #include "thread.hpp"
 
 namespace sys
diff --git a/module-sys/Service/include/Service/Watchdog.hpp b/module-sys/SystemWatchdog/include/SystemWatchdog/Watchdog.hpp
similarity index 100%
rename from module-sys/Service/include/Service/Watchdog.hpp
rename to module-sys/SystemWatchdog/include/SystemWatchdog/Watchdog.hpp
diff --git a/module-sys/Timers/CMakeLists.txt b/module-sys/Timers/CMakeLists.txt
deleted file mode 100644
index 05833d4b6..000000000
--- a/module-sys/Timers/CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-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
-        sys-service
-        module-os
-)
diff --git a/module-sys/common/CMakeLists.txt b/module-sys/common/CMakeLists.txt
new file mode 100644
index 000000000..4dfb93763
--- /dev/null
+++ b/module-sys/common/CMakeLists.txt
@@ -0,0 +1,19 @@
+add_library(sys-common INTERFACE)
+
+target_include_directories(sys-common
+    INTERFACE
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>
+)
+
+target_sources(sys-common
+    INTERFACE
+        include/system/Common.hpp
+        include/system/Constants.hpp
+        include/system/messages/TetheringQuestionRequest.hpp
+        include/system/messages/RequestCpuFrequencyMessage.hpp
+        include/system/messages/SentinelRegistrationMessage.hpp
+        include/system/messages/DeviceRegistrationMessage.hpp
+        include/system/messages/TetheringStateRequest.hpp
+        include/system/messages/SystemManagerMessage.hpp
+        include/system/SystemReturnCodes.hpp
+)
diff --git a/module-sys/Service/include/Service/Common.hpp b/module-sys/common/include/system/Common.hpp
similarity index 98%
rename from module-sys/Service/include/Service/Common.hpp
rename to module-sys/common/include/system/Common.hpp
index 81f97ed58..3916f5a96 100644
--- a/module-sys/Service/include/Service/Common.hpp
+++ b/module-sys/common/include/system/Common.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "SystemReturnCodes.hpp"
+#include <system/SystemReturnCodes.hpp>
 
 namespace sys
 {
diff --git a/module-sys/SystemManager/include/SystemManager/Constants.hpp b/module-sys/common/include/system/Constants.hpp
similarity index 100%
rename from module-sys/SystemManager/include/SystemManager/Constants.hpp
rename to module-sys/common/include/system/Constants.hpp
diff --git a/module-sys/Service/include/Service/SystemReturnCodes.hpp b/module-sys/common/include/system/SystemReturnCodes.hpp
similarity index 100%
rename from module-sys/Service/include/Service/SystemReturnCodes.hpp
rename to module-sys/common/include/system/SystemReturnCodes.hpp
diff --git a/module-sys/SystemManager/include/SystemManager/messages/DeviceRegistrationMessage.hpp b/module-sys/common/include/system/messages/DeviceRegistrationMessage.hpp
similarity index 100%
rename from module-sys/SystemManager/include/SystemManager/messages/DeviceRegistrationMessage.hpp
rename to module-sys/common/include/system/messages/DeviceRegistrationMessage.hpp
diff --git a/module-sys/SystemManager/include/SystemManager/messages/RequestCpuFrequencyMessage.hpp b/module-sys/common/include/system/messages/RequestCpuFrequencyMessage.hpp
similarity index 100%
rename from module-sys/SystemManager/include/SystemManager/messages/RequestCpuFrequencyMessage.hpp
rename to module-sys/common/include/system/messages/RequestCpuFrequencyMessage.hpp
diff --git a/module-sys/SystemManager/include/SystemManager/messages/SentinelRegistrationMessage.hpp b/module-sys/common/include/system/messages/SentinelRegistrationMessage.hpp
similarity index 94%
rename from module-sys/SystemManager/include/SystemManager/messages/SentinelRegistrationMessage.hpp
rename to module-sys/common/include/system/messages/SentinelRegistrationMessage.hpp
index 288f90953..8a5cb0c86 100644
--- a/module-sys/SystemManager/include/SystemManager/messages/SentinelRegistrationMessage.hpp
+++ b/module-sys/common/include/system/messages/SentinelRegistrationMessage.hpp
@@ -4,7 +4,7 @@
 #pragma once
 
 #include <Service/Message.hpp>
-#include "Service/CpuSentinel.hpp"
+#include "SystemManager/CpuSentinel.hpp"
 
 namespace sys
 {
diff --git a/module-sys/SystemManager/include/SystemManager/messages/SystemManagerMessage.hpp b/module-sys/common/include/system/messages/SystemManagerMessage.hpp
similarity index 97%
rename from module-sys/SystemManager/include/SystemManager/messages/SystemManagerMessage.hpp
rename to module-sys/common/include/system/messages/SystemManagerMessage.hpp
index 43f35a89a..b8e19921f 100644
--- a/module-sys/SystemManager/include/SystemManager/messages/SystemManagerMessage.hpp
+++ b/module-sys/common/include/system/messages/SystemManagerMessage.hpp
@@ -6,7 +6,7 @@
 #include <MessageType.hpp>
 #include <Service/Message.hpp>
 
-#include "SystemManager/Constants.hpp"
+#include "system/Constants.hpp"
 #include "SystemManager/data/SystemManagerActionsParams.hpp"
 #include <service-appmgr/Actions.hpp>
 
diff --git a/module-sys/SystemManager/include/SystemManager/messages/TetheringQuestionRequest.hpp b/module-sys/common/include/system/messages/TetheringQuestionRequest.hpp
similarity index 100%
rename from module-sys/SystemManager/include/SystemManager/messages/TetheringQuestionRequest.hpp
rename to module-sys/common/include/system/messages/TetheringQuestionRequest.hpp
diff --git a/module-sys/SystemManager/include/SystemManager/messages/TetheringStateRequest.hpp b/module-sys/common/include/system/messages/TetheringStateRequest.hpp
similarity index 100%
rename from module-sys/SystemManager/include/SystemManager/messages/TetheringStateRequest.hpp
rename to module-sys/common/include/system/messages/TetheringStateRequest.hpp
diff --git a/products/BellHybrid/services/evtmgr/EventManager.cpp b/products/BellHybrid/services/evtmgr/EventManager.cpp
index 6b9f3d0b0..24ae3e019 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 <hal/temperature_source/TemperatureSource.hpp>
-#include <SystemManager/Constants.hpp>
+#include <system/Constants.hpp>
 #include <screen-light-control/ScreenLightControl.hpp>
 #include <service-evtmgr/KbdMessage.hpp>
 #include <service-evtmgr/ScreenLightControlMessage.hpp>
diff --git a/products/PurePhone/services/appmgr/ApplicationManager.cpp b/products/PurePhone/services/appmgr/ApplicationManager.cpp
index 926d93753..cc7f7e635 100644
--- a/products/PurePhone/services/appmgr/ApplicationManager.cpp
+++ b/products/PurePhone/services/appmgr/ApplicationManager.cpp
@@ -11,7 +11,7 @@
 #include <apps-common/popups/data/PopupRequestParams.hpp>
 #include <apps-common/actions/AlarmClockStatusChangeParams.hpp>
 #include <module-db/queries/notifications/QueryNotificationsGetAll.hpp>
-#include <SystemManager/messages/TetheringQuestionRequest.hpp>
+#include <system/messages/TetheringQuestionRequest.hpp>
 #include <Timers/TimerFactory.hpp>
 #include <service-appmgr/Constants.hpp>
 #include <service-appmgr/messages/AutoLockRequests.hpp>
diff --git a/products/PurePhone/sys/SystemManager.cpp b/products/PurePhone/sys/SystemManager.cpp
index 591774be9..6fe7e9f91 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 <SystemManager/messages/SystemManagerMessage.hpp>
-#include <SystemManager/messages/TetheringQuestionRequest.hpp>
-#include <SystemManager/messages/TetheringStateRequest.hpp>
+#include <system/messages/SystemManagerMessage.hpp>
+#include <system/messages/TetheringQuestionRequest.hpp>
+#include <system/messages/TetheringStateRequest.hpp>
 #include <EventStore.hpp>
 #include <service-appmgr/Constants.hpp>
 #include <service-cellular/CellularMessage.hpp>