diff --git a/CMakeLists.txt b/CMakeLists.txt
index e08502b59..390167c02 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -156,6 +156,10 @@ add_custom_target(
         "Generating version info"
     )
 
+add_library(version-header INTERFACE)
+target_include_directories(version-header INTERFACE $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/source/include>)
+add_dependencies(version-header version)
+
 fetch_ecoboot()
 fetch_updater()
 
diff --git a/Target_Linux.cmake b/Target_Linux.cmake
index cfee416d0..4c4b33f5e 100644
--- a/Target_Linux.cmake
+++ b/Target_Linux.cmake
@@ -8,6 +8,7 @@ set(TARGET_LIBRARIES
     portaudio
     CACHE INTERNAL "" )
 
+link_libraries(pthread rt)
 
 option (LINUX_ENABLE_SANITIZER "Enable address sanitizer for Linux" ON)
 if (LINUX_ENABLE_SANITIZER)
diff --git a/Target_RT1051.cmake b/Target_RT1051.cmake
index dcaeb8688..61eaeb1e5 100644
--- a/Target_RT1051.cmake
+++ b/Target_RT1051.cmake
@@ -23,6 +23,8 @@ set(LDSCRIPTSDIR "${CMAKE_CURRENT_LIST_DIR}/board/rt1051/ldscripts" CACHE INTERN
 
 set(PROJECT_TARGET "TARGET_RT1051" CACHE INTERNAL "")
 
+include_directories(${CMAKE_SOURCE_DIR}/board/rt1051/newlib/include)
+
 add_compile_definitions(
         CPU_MIMXRT1051DVL6B_cm7
         CPU_MIMXRT1051DVL6B
diff --git a/board/CMakeLists.txt b/board/CMakeLists.txt
index f3fc5db12..4a6667ac1 100644
--- a/board/CMakeLists.txt
+++ b/board/CMakeLists.txt
@@ -1,3 +1,3 @@
-add_library(board STATIC)
-
+add_library(board-config INTERFACE)
 add_board_subdirectory()
+target_link_libraries(board INTERFACE board-config)
diff --git a/board/linux/CMakeLists.txt b/board/linux/CMakeLists.txt
index aba400552..fd75e9a8e 100644
--- a/board/linux/CMakeLists.txt
+++ b/board/linux/CMakeLists.txt
@@ -1 +1,3 @@
+add_library(board INTERFACE)
 add_subdirectory(libiosyscalls)
+target_compile_definitions(board-config INTERFACE PROJECT_CONFIG_USER_DYNMEM_SIZE=0)
diff --git a/board/rt1051/CMakeLists.txt b/board/rt1051/CMakeLists.txt
index e8afdfd86..5ee3c2b38 100644
--- a/board/rt1051/CMakeLists.txt
+++ b/board/rt1051/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_library(board STATIC)
+
 add_subdirectory(cmsis)
 add_subdirectory(${BOARD})
 
@@ -24,11 +26,13 @@ target_include_directories(board
     PUBLIC
         $<BUILD_INTERFACE:
             ${CMAKE_CURRENT_SOURCE_DIR}
-            ${CMAKE_CURRENT_SOURCE_DIR}/newlib/include
         >
 )
 
 target_link_libraries(board
     PUBLIC
+        fsl
+        module-vfs
+        log-api
         CrashCatcher::CrashCatcher
 )
diff --git a/board/rt1051/bellpx/CMakeLists.txt b/board/rt1051/bellpx/CMakeLists.txt
index c97dfddb2..15487106e 100644
--- a/board/rt1051/bellpx/CMakeLists.txt
+++ b/board/rt1051/bellpx/CMakeLists.txt
@@ -1,6 +1,6 @@
 target_compile_definitions(
-   board
-      PUBLIC
+   board-config
+      INTERFACE
    PROJECT_CONFIG_USER_DYNMEM_SIZE=9*1024*1024
    HW_SDRAM_64_MB=0
 )
diff --git a/board/rt1051/crashdump/consoledump.cpp b/board/rt1051/crashdump/consoledump.cpp
index 9bbdcea8c..0a4023596 100644
--- a/board/rt1051/crashdump/consoledump.cpp
+++ b/board/rt1051/crashdump/consoledump.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 <log.hpp>
+#include <log/log.hpp>
 
 #include "consoledump.hpp"
 #include "MIMXRT1051.h"
diff --git a/board/rt1051/crashdump/crashcatcher_impl.cpp b/board/rt1051/crashdump/crashcatcher_impl.cpp
index 007dd16fe..04d810de0 100644
--- a/board/rt1051/crashdump/crashcatcher_impl.cpp
+++ b/board/rt1051/crashdump/crashcatcher_impl.cpp
@@ -5,7 +5,7 @@
 
 #include <CrashCatcher/CrashCatcher.h>
 
-#include <log.hpp>
+#include <log/log.hpp>
 #include <date/date.h>
 #include "crashdumpwriter.hpp"
 #include "consoledump.hpp"
diff --git a/board/rt1051/crashdump/crashdumpwriter_vfs.cpp b/board/rt1051/crashdump/crashdumpwriter_vfs.cpp
index e22bd0ba1..d8a562400 100644
--- a/board/rt1051/crashdump/crashdumpwriter_vfs.cpp
+++ b/board/rt1051/crashdump/crashdumpwriter_vfs.cpp
@@ -3,7 +3,7 @@
 
 #include "crashdumpwriter_vfs.hpp"
 
-#include <log.hpp>
+#include <log/log.hpp>
 #include <fcntl.h>
 #include "purefs/vfs_subsystem.hpp"
 
diff --git a/board/rt1051/puretx/CMakeLists.txt b/board/rt1051/puretx/CMakeLists.txt
index f2861e30d..4c6c031bd 100644
--- a/board/rt1051/puretx/CMakeLists.txt
+++ b/board/rt1051/puretx/CMakeLists.txt
@@ -1,16 +1,16 @@
 if (${BOARD_REVISION} EQUAL 7)
     set (MEMORY_LINKER_FILE_PATH "${CMAKE_CURRENT_LIST_DIR}/memory_pure_T7.ld" CACHE INTERNAL "")
     target_compile_definitions(
-        board
-            PUBLIC
+        board-config
+            INTERFACE
         PROJECT_CONFIG_USER_DYNMEM_SIZE=28*1024*1024
         HW_SDRAM_64_MB=1
     )
 elseif (${BOARD_REVISION} EQUAL 6)
     set (MEMORY_LINKER_FILE_PATH "${CMAKE_CURRENT_LIST_DIR}/memory_pure_T6.ld" CACHE INTERNAL "")
     target_compile_definitions(
-        board
-            PUBLIC
+        board-config
+            INTERFACE
         PROJECT_CONFIG_USER_DYNMEM_SIZE=9*1024*1024
         HW_SDRAM_64_MB=0
     )
diff --git a/cmake/modules/GenVersionHpp.cmake b/cmake/modules/GenVersionHpp.cmake
index 23a699d77..627dc6f34 100644
--- a/cmake/modules/GenVersionHpp.cmake
+++ b/cmake/modules/GenVersionHpp.cmake
@@ -5,7 +5,7 @@ list(APPEND CMAKE_MODULE_PATH "${SRC_DIR}/cmake/modules")
 include(Version)
 configure_file(
     ${SRC_DIR}/source/version.hpp.template
-    ${CMAKE_BINARY_DIR}/source/version.hpp
+    ${CMAKE_BINARY_DIR}/source/include/product/version.hpp
     )
 
 message("GIT_REV: ${GIT_REV}")
diff --git a/module-apps/CMakeLists.txt b/module-apps/CMakeLists.txt
index 8398d8b52..e737342a0 100644
--- a/module-apps/CMakeLists.txt
+++ b/module-apps/CMakeLists.txt
@@ -84,6 +84,7 @@ endif()
 target_link_libraries(${PROJECT_NAME}
     PRIVATE
         app
+        application-calendar
         application-messages
         application-settings
         apps-common
@@ -98,7 +99,8 @@ target_link_libraries(${PROJECT_NAME}
         service-cellular
         service-db
         service-evtmgr
-        time
+        service-time-api
+        utils-time
         utils-bootconfig
     PUBLIC
         module-audio
diff --git a/module-apps/application-alarm-clock/ApplicationAlarmClock.cpp b/module-apps/application-alarm-clock/ApplicationAlarmClock.cpp
index e25e47805..d7c43000f 100644
--- a/module-apps/application-alarm-clock/ApplicationAlarmClock.cpp
+++ b/module-apps/application-alarm-clock/ApplicationAlarmClock.cpp
@@ -13,6 +13,7 @@
 #include "windows/OptionWindow.hpp"
 #include <service-db/DBNotificationMessage.hpp>
 #include <service-db/QueryMessage.hpp>
+#include <service-time/api/TimeSettingsApi.hpp>
 
 namespace app
 {
diff --git a/module-apps/application-alarm-clock/models/AlarmsRepository.cpp b/module-apps/application-alarm-clock/models/AlarmsRepository.cpp
index b3ff5484b..34f76c767 100644
--- a/module-apps/application-alarm-clock/models/AlarmsRepository.cpp
+++ b/module-apps/application-alarm-clock/models/AlarmsRepository.cpp
@@ -6,7 +6,7 @@
 #include <service-time/Constants.hpp>
 
 #include "AsyncTask.hpp"
-#include "log.hpp"
+#include "log/log.hpp"
 
 namespace app::alarmClock
 {
@@ -72,6 +72,5 @@ namespace app::alarmClock
     }
 
     void AlarmsDBRepository::turnOffAll(const AbstractAlarmsRepository::OnResultCallback &callback)
-    {
-    }
+    {}
 } // namespace app::alarmClock
diff --git a/module-apps/application-alarm-clock/presenter/AlarmRRulePresenter.cpp b/module-apps/application-alarm-clock/presenter/AlarmRRulePresenter.cpp
index 409e4ca6b..049927433 100644
--- a/module-apps/application-alarm-clock/presenter/AlarmRRulePresenter.cpp
+++ b/module-apps/application-alarm-clock/presenter/AlarmRRulePresenter.cpp
@@ -2,7 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "AlarmRRulePresenter.hpp"
-#include "log.hpp"
+#include "log/log.hpp"
 
 namespace app::alarmClock
 {
diff --git a/module-apps/application-alarm-clock/presenter/AlarmRRulePresenter.hpp b/module-apps/application-alarm-clock/presenter/AlarmRRulePresenter.hpp
index 31369cbe0..8f0a44ddb 100644
--- a/module-apps/application-alarm-clock/presenter/AlarmRRulePresenter.hpp
+++ b/module-apps/application-alarm-clock/presenter/AlarmRRulePresenter.hpp
@@ -3,11 +3,11 @@
 
 #pragma once
 
-#include "log.hpp"
+#include "log/log.hpp"
 
 #include <AlarmEventRecord.hpp>
 #include <time/time_locale.hpp>
-#include <rrule/rrule/rrule.hpp>
+#include <rrule/rrule.hpp>
 #include <utf8/UTF8.hpp>
 
 #include <functional>
diff --git a/module-apps/application-alarm-clock/widgets/AlarmTimeItem.cpp b/module-apps/application-alarm-clock/widgets/AlarmTimeItem.cpp
index f61fbbb0e..de0ce6ab3 100644
--- a/module-apps/application-alarm-clock/widgets/AlarmTimeItem.cpp
+++ b/module-apps/application-alarm-clock/widgets/AlarmTimeItem.cpp
@@ -7,6 +7,7 @@
 #include <Style.hpp>
 #include <time/time_constants.hpp>
 #include <time/time_date_validation.hpp>
+#include <service-time/api/TimeSettingsApi.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-alarm-clock/windows/AlarmClockMainWindow.cpp b/module-apps/application-alarm-clock/windows/AlarmClockMainWindow.cpp
index 71e356ea2..fc8a0ca13 100644
--- a/module-apps/application-alarm-clock/windows/AlarmClockMainWindow.cpp
+++ b/module-apps/application-alarm-clock/windows/AlarmClockMainWindow.cpp
@@ -4,7 +4,7 @@
 #include "AlarmClockMainWindow.hpp"
 #include "application-alarm-clock/widgets/AlarmClockStyle.hpp"
 #include "application-alarm-clock/data/AlarmsData.hpp"
-#include "log.hpp"
+#include "log/log.hpp"
 #include "windows/DialogMetadata.hpp"
 #include "messages/DialogMetadataMessage.hpp"
 #include <InputEvent.hpp>
diff --git a/module-apps/application-calculator/data/CalculatorUtility.cpp b/module-apps/application-calculator/data/CalculatorUtility.cpp
index f68565b00..7dc97ac8c 100644
--- a/module-apps/application-calculator/data/CalculatorUtility.cpp
+++ b/module-apps/application-calculator/data/CalculatorUtility.cpp
@@ -5,7 +5,7 @@
 #include "CalculatorUtility.hpp"
 #include <widgets/CalculatorStyle.hpp>
 #include <i18n/i18n.hpp>
-#include <module-utils/Utils.hpp>
+#include <Utils.hpp>
 #include <tinyexpr.h>
 #include <cmath>
 
diff --git a/module-apps/application-call/CMakeLists.txt b/module-apps/application-call/CMakeLists.txt
index e09479e08..7327b4f6a 100644
--- a/module-apps/application-call/CMakeLists.txt
+++ b/module-apps/application-call/CMakeLists.txt
@@ -48,7 +48,7 @@ target_link_libraries(application-call
 		service-appmgr
 		service-audio
 		service-db
-		time
+		utils-time
 	PUBLIC
 		apps-common
 		module-sys
diff --git a/module-apps/application-call/widgets/StateIcon.hpp b/module-apps/application-call/widgets/StateIcon.hpp
index 8d0883d71..217b1ad51 100644
--- a/module-apps/application-call/widgets/StateIcon.hpp
+++ b/module-apps/application-call/widgets/StateIcon.hpp
@@ -6,7 +6,7 @@
 #include <i18n/i18n.hpp>
 #include <Image.hpp>
 #include <Label.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 #include <Style.hpp>
 
 #include <map>
@@ -46,7 +46,7 @@ namespace gui
         using IconMap = std::map<T, std::pair<const std::string, const std::string>>;
         StateIcon()   = delete;
         StateIcon(
-            Item * parent, const uint32_t &x, const uint32_t &y, const uint32_t &w_margin, T state, const IconMap &data)
+            Item *parent, const uint32_t &x, const uint32_t &y, const uint32_t &w_margin, T state, const IconMap &data)
             : Rect(parent, x, y, icon::w + 2 * w_margin, icon::h), data(data)
         {
             setEdges(RectangleEdge::None);
diff --git a/module-apps/application-call/windows/CallWindow.cpp b/module-apps/application-call/windows/CallWindow.cpp
index 1146fa634..7bbee57ed 100644
--- a/module-apps/application-call/windows/CallWindow.cpp
+++ b/module-apps/application-call/windows/CallWindow.cpp
@@ -14,7 +14,7 @@
 #include <InputEvent.hpp>
 #include <InputMode.hpp>
 #include <Label.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 #include <magic_enum.hpp>
 #include <Margins.hpp>
 #include <service-appmgr/Controller.hpp>
@@ -130,7 +130,7 @@ namespace gui
         };
         sendSmsIcon->activatedCallback = [=](gui::Item &item) {
             LOG_INFO("Send message template and reject the call");
-            constexpr auto preventAutoLock = true;
+            constexpr auto preventAutoLock  = true;
             auto msg                        = std::make_unique<SMSSendTemplateRequest>(phoneNumber, preventAutoLock);
             msg->ignoreCurrentWindowOnStack = true;
             return app::manager::Controller::sendAction(application,
diff --git a/module-apps/application-calllog/ApplicationCallLog.cpp b/module-apps/application-calllog/ApplicationCallLog.cpp
index a60e0940e..bc0328906 100644
--- a/module-apps/application-calllog/ApplicationCallLog.cpp
+++ b/module-apps/application-calllog/ApplicationCallLog.cpp
@@ -13,7 +13,7 @@
 #include <Dialog.hpp>
 #include <OptionWindow.hpp>
 #include <i18n/i18n.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 #include <MessageType.hpp>
 #include <module-db/queries/calllog/QueryCalllogSetAllRead.hpp>
 #include <module-db/queries/notifications/QueryNotificationsClear.hpp>
diff --git a/module-apps/application-calllog/CMakeLists.txt b/module-apps/application-calllog/CMakeLists.txt
index 6e852cf59..ac333b89b 100644
--- a/module-apps/application-calllog/CMakeLists.txt
+++ b/module-apps/application-calllog/CMakeLists.txt
@@ -47,7 +47,7 @@ target_link_libraries( application-calllog
 		module-utils
 		service-appmgr
 		service-db
-		time
+		utils-time
 	PUBLIC
 		apps-common
 		module-db
diff --git a/module-apps/application-clock/ApplicationClock.cpp b/module-apps/application-clock/ApplicationClock.cpp
index 3fecd728a..6556ea3ff 100644
--- a/module-apps/application-clock/ApplicationClock.cpp
+++ b/module-apps/application-clock/ApplicationClock.cpp
@@ -6,7 +6,7 @@
 #include "gui/widgets/Window.hpp"
 
 // module-utils
-#include <log.hpp>
+#include <log/log.hpp>
 #include <service-evtmgr/EVMessages.hpp>
 #include <service-evtmgr/EventManagerCommon.hpp>
 #include <Timers/TimerFactory.hpp>
diff --git a/module-apps/application-desktop/CMakeLists.txt b/module-apps/application-desktop/CMakeLists.txt
index 0e66a09d9..dd1b073b4 100644
--- a/module-apps/application-desktop/CMakeLists.txt
+++ b/module-apps/application-desktop/CMakeLists.txt
@@ -67,7 +67,7 @@ target_link_libraries(application-desktop
 		service-cellular
 		service-db
 		service-time
-		time
+		utils-time
 		utf8
 		utils-bootconfig
 	PUBLIC
diff --git a/module-apps/application-desktop/windows/ChargingBatteryWindow.cpp b/module-apps/application-desktop/windows/ChargingBatteryWindow.cpp
index 80f5cc2b9..5d6932619 100644
--- a/module-apps/application-desktop/windows/ChargingBatteryWindow.cpp
+++ b/module-apps/application-desktop/windows/ChargingBatteryWindow.cpp
@@ -6,7 +6,7 @@
 #include "Names.hpp"
 
 #include <gui/widgets/Image.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 #include <service-appmgr/Controller.hpp>
 
 namespace gui
diff --git a/module-apps/application-desktop/windows/DeadBatteryWindow.cpp b/module-apps/application-desktop/windows/DeadBatteryWindow.cpp
index 18ee1b96b..048377fc4 100644
--- a/module-apps/application-desktop/windows/DeadBatteryWindow.cpp
+++ b/module-apps/application-desktop/windows/DeadBatteryWindow.cpp
@@ -7,7 +7,7 @@
 #include <gui/widgets/Image.hpp>
 #include <Image.hpp>
 #include <InputEvent.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 #include <service-appmgr/Controller.hpp>
 
 namespace gui
diff --git a/module-apps/application-desktop/windows/DesktopMainWindow.cpp b/module-apps/application-desktop/windows/DesktopMainWindow.cpp
index d02368892..0010c40c4 100644
--- a/module-apps/application-desktop/windows/DesktopMainWindow.cpp
+++ b/module-apps/application-desktop/windows/DesktopMainWindow.cpp
@@ -7,7 +7,7 @@
 #include "DesktopStyle.hpp"
 
 #include <application-call/data/CallSwitchData.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 #include <messages/DialogMetadataMessage.hpp>
 #include <notifications/NotificationsModel.hpp>
 #include <service-appmgr/Controller.hpp>
@@ -234,9 +234,9 @@ namespace gui
     bool DesktopMainWindow::updateTime()
     {
         using namespace utils::time;
-        auto ret       = AppWindow::updateTime();
-        auto clock     = TimestampFactory().createTimestamp(TimestampType::Clock, std::time(nullptr));
-        auto date      = TimestampFactory().createTimestamp(TimestampType::DateText, std::time(nullptr));
+        auto ret   = AppWindow::updateTime();
+        auto clock = TimestampFactory().createTimestamp(TimestampType::Clock, std::time(nullptr));
+        auto date  = TimestampFactory().createTimestamp(TimestampType::DateText, std::time(nullptr));
         if (time != nullptr) {
             time->setText(clock->str());
         }
diff --git a/module-apps/application-desktop/windows/LogoWindow.cpp b/module-apps/application-desktop/windows/LogoWindow.cpp
index 18c1b33ca..aaab33298 100644
--- a/module-apps/application-desktop/windows/LogoWindow.cpp
+++ b/module-apps/application-desktop/windows/LogoWindow.cpp
@@ -5,7 +5,7 @@
 #include "Names.hpp"
 
 #include <gui/widgets/Image.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-meditation/CMakeLists.txt b/module-apps/application-meditation/CMakeLists.txt
index b776f65e1..980d60063 100644
--- a/module-apps/application-meditation/CMakeLists.txt
+++ b/module-apps/application-meditation/CMakeLists.txt
@@ -46,7 +46,7 @@ target_link_libraries(application-meditation
         module-utils
         module-vfs
         service-audio
-        time
+        utils-time
     PUBLIC
         apps-common
         module-gui
diff --git a/module-apps/application-meditation/widgets/TimerProperty.cpp b/module-apps/application-meditation/widgets/TimerProperty.cpp
index 7f5c22114..860bb9d73 100644
--- a/module-apps/application-meditation/widgets/TimerProperty.cpp
+++ b/module-apps/application-meditation/widgets/TimerProperty.cpp
@@ -5,7 +5,7 @@
 #include "TimerProperty.hpp"
 
 #include <i18n/i18n.hpp>
-#include <module-utils/Utils.hpp>
+#include <Utils.hpp>
 
 using namespace gui;
 
diff --git a/module-apps/application-messages/CMakeLists.txt b/module-apps/application-messages/CMakeLists.txt
index 36f114bd7..f7ba4a9f9 100644
--- a/module-apps/application-messages/CMakeLists.txt
+++ b/module-apps/application-messages/CMakeLists.txt
@@ -76,7 +76,7 @@ target_link_libraries(application-messages
         service-appmgr
         service-cellular
         service-db
-        time
+        utils-time
     PUBLIC
         apps-common
         module-db
diff --git a/module-apps/application-messages/models/ThreadsModel.cpp b/module-apps/application-messages/models/ThreadsModel.cpp
index aaff59fbb..113269a96 100644
--- a/module-apps/application-messages/models/ThreadsModel.cpp
+++ b/module-apps/application-messages/models/ThreadsModel.cpp
@@ -9,7 +9,7 @@
 
 #include <InputEvent.hpp>
 #include <ListView.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 #include <module-db/queries/messages/threads/QueryThreadsGet.hpp>
 #include <module-db/queries/messages/threads/QueryThreadsGetForList.hpp>
 #include <OptionsWindow.hpp>
diff --git a/module-apps/application-messages/windows/MessagesMainWindow.cpp b/module-apps/application-messages/windows/MessagesMainWindow.cpp
index 587dc1cac..fe4006f86 100644
--- a/module-apps/application-messages/windows/MessagesMainWindow.cpp
+++ b/module-apps/application-messages/windows/MessagesMainWindow.cpp
@@ -12,7 +12,7 @@
 #include <header/AddElementAction.hpp>
 #include <header/SearchAction.hpp>
 #include <i18n/i18n.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 #include <module-db/queries/messages/threads/QueryThreadGetByContactID.hpp>
 #include <module-db/queries/notifications/QueryNotificationsClear.hpp>
 #include <service-db/DBNotificationMessage.hpp>
diff --git a/module-apps/application-messages/windows/SMSTemplatesWindow.cpp b/module-apps/application-messages/windows/SMSTemplatesWindow.cpp
index 4cdc4e7ee..9148f5faf 100644
--- a/module-apps/application-messages/windows/SMSTemplatesWindow.cpp
+++ b/module-apps/application-messages/windows/SMSTemplatesWindow.cpp
@@ -7,7 +7,7 @@
 #include "SMSTemplatesWindow.hpp"
 
 #include <i18n/i18n.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 #include <service-appmgr/Controller.hpp>
 #include <Style.hpp>
 
@@ -73,7 +73,7 @@ namespace gui
     void SMSTemplatesWindow::smsSendTemplateRequestHandler(const SMSSendTemplateRequest *const switchData)
     {
         preventsAutoLock = switchData->isAutoLockPrevented();
-        auto app = dynamic_cast<app::ApplicationMessages *>(application);
+        auto app         = dynamic_cast<app::ApplicationMessages *>(application);
         assert(app != nullptr);
 
         auto phoneNumber       = switchData->getPhoneNumber();
diff --git a/module-apps/application-messages/windows/SMSThreadViewWindow.cpp b/module-apps/application-messages/windows/SMSThreadViewWindow.cpp
index 676713652..c407f3f0e 100644
--- a/module-apps/application-messages/windows/SMSThreadViewWindow.cpp
+++ b/module-apps/application-messages/windows/SMSThreadViewWindow.cpp
@@ -6,7 +6,7 @@
 #include "SMSdata.hpp"
 #include "SMSThreadViewWindow.hpp"
 
-#include <log.hpp>
+#include <log/log.hpp>
 #include <module-db/queries/phonebook/QueryContactGetByID.hpp>
 #include <OptionsMessages.hpp>
 #include <service-db/DBNotificationMessage.hpp>
diff --git a/module-apps/application-messages/windows/ThreadWindowOptions.cpp b/module-apps/application-messages/windows/ThreadWindowOptions.cpp
index e84b358d6..f5a2efe9c 100644
--- a/module-apps/application-messages/windows/ThreadWindowOptions.cpp
+++ b/module-apps/application-messages/windows/ThreadWindowOptions.cpp
@@ -4,7 +4,7 @@
 #include "ThreadWindowOptions.hpp"
 
 #include <i18n/i18n.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 #include <OptionCall.hpp>
 #include <OptionContact.hpp>
 #include <OptionWindow.hpp>
diff --git a/module-apps/application-music-player/ApplicationMusicPlayer.cpp b/module-apps/application-music-player/ApplicationMusicPlayer.cpp
index 4bd7f5699..d082eeddd 100644
--- a/module-apps/application-music-player/ApplicationMusicPlayer.cpp
+++ b/module-apps/application-music-player/ApplicationMusicPlayer.cpp
@@ -13,7 +13,7 @@
 #include <service-appmgr/Controller.hpp>
 
 #include <filesystem>
-#include <log.hpp>
+#include <log/log.hpp>
 #include <i18n/i18n.hpp>
 #include <purefs/filesystem_paths.hpp>
 #include <service-audio/AudioServiceAPI.hpp>
diff --git a/module-apps/application-music-player/CMakeLists.txt b/module-apps/application-music-player/CMakeLists.txt
index fb0b80c13..b47cd40cd 100644
--- a/module-apps/application-music-player/CMakeLists.txt
+++ b/module-apps/application-music-player/CMakeLists.txt
@@ -43,7 +43,7 @@ target_link_libraries(application-music-player
         log
         module-gui
         service-audio
-        time
+        utils-time
     PUBLIC
         apps-common
         module-audio
diff --git a/module-apps/application-music-player/models/SongsRepository.cpp b/module-apps/application-music-player/models/SongsRepository.cpp
index 6233e4b43..73f7a5005 100644
--- a/module-apps/application-music-player/models/SongsRepository.cpp
+++ b/module-apps/application-music-player/models/SongsRepository.cpp
@@ -4,7 +4,7 @@
 #include "SongsRepository.hpp"
 
 #include <algorithm>
-#include <log.hpp>
+#include <log/log.hpp>
 #include <service-audio/AudioServiceAPI.hpp>
 #include <service-audio/AudioServiceName.hpp>
 #include <time/ScopedTime.hpp>
diff --git a/module-apps/application-notes/CMakeLists.txt b/module-apps/application-notes/CMakeLists.txt
index 549ce94b9..810cd829b 100644
--- a/module-apps/application-notes/CMakeLists.txt
+++ b/module-apps/application-notes/CMakeLists.txt
@@ -63,6 +63,6 @@ target_link_libraries(application-notes
 		module-db
 		service-db
 		log
-		time
+		utils-time
 		i18n		
 )
diff --git a/module-apps/application-notes/model/NotesSearchListModel.cpp b/module-apps/application-notes/model/NotesSearchListModel.cpp
index d71fb220f..7dddcda12 100644
--- a/module-apps/application-notes/model/NotesSearchListModel.cpp
+++ b/module-apps/application-notes/model/NotesSearchListModel.cpp
@@ -2,7 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "NotesSearchListModel.hpp"
-#include <log.hpp>
+#include <log/log.hpp>
 
 namespace app::notes
 {
diff --git a/module-apps/application-onboarding/windows/UpdateDialogWindow.cpp b/module-apps/application-onboarding/windows/UpdateDialogWindow.cpp
index cadc5c01f..164da07b2 100644
--- a/module-apps/application-onboarding/windows/UpdateDialogWindow.cpp
+++ b/module-apps/application-onboarding/windows/UpdateDialogWindow.cpp
@@ -8,7 +8,7 @@
 
 #include <application-onboarding/ApplicationOnBoarding.hpp>
 #include <service-appmgr/Controller.hpp>
-#include <source/version.hpp>
+#include <product/version.hpp>
 
 namespace app::onBoarding
 {
diff --git a/module-apps/application-phonebook/CMakeLists.txt b/module-apps/application-phonebook/CMakeLists.txt
index 8bb2aa1c0..604d2f670 100644
--- a/module-apps/application-phonebook/CMakeLists.txt
+++ b/module-apps/application-phonebook/CMakeLists.txt
@@ -67,7 +67,7 @@ target_link_libraries(application-phonebook
         utf8
         module-gui
         module-utils
-        time
+        utils-time
         module-db
         service-appmgr
         service-db
diff --git a/module-apps/application-settings/models/system/TechnicalInformationModel.cpp b/module-apps/application-settings/models/system/TechnicalInformationModel.cpp
index b1473de38..4cd9ab5b9 100644
--- a/module-apps/application-settings/models/system/TechnicalInformationModel.cpp
+++ b/module-apps/application-settings/models/system/TechnicalInformationModel.cpp
@@ -8,7 +8,7 @@
 
 #include <ListView.hpp>
 #include <i18n/i18n.hpp>
-#include <source/version.hpp>
+#include <product/version.hpp>
 
 TechnicalInformationModel::TechnicalInformationModel(std::unique_ptr<AbstractFactoryData> &&factoryData,
                                                      std::unique_ptr<AbstractTechnicalInformationRepository> repository)
diff --git a/module-apps/application-settings/windows/advanced/InformationWindow.cpp b/module-apps/application-settings/windows/advanced/InformationWindow.cpp
index 30e77fdbe..f56a3c4d4 100644
--- a/module-apps/application-settings/windows/advanced/InformationWindow.cpp
+++ b/module-apps/application-settings/windows/advanced/InformationWindow.cpp
@@ -6,7 +6,7 @@
 #include <application-settings/windows/WindowNames.hpp>
 
 #include <service-cellular/CellularServiceAPI.hpp>
-#include <source/version.hpp>
+#include <product/version.hpp>
 
 namespace gui
 {
diff --git a/module-apps/apps-common/ApplicationCommon.cpp b/module-apps/apps-common/ApplicationCommon.cpp
index edf61561e..525a49a1c 100644
--- a/module-apps/apps-common/ApplicationCommon.cpp
+++ b/module-apps/apps-common/ApplicationCommon.cpp
@@ -9,12 +9,12 @@
 #include "Timers/TimerFactory.hpp" // for Timer
 #include "StatusBar.hpp"
 #include "status-bar/Time.hpp"
-#include "Translator.hpp"                // for KeyInputSim...
-#include <EventStore.hpp>                // for Battery
-#include "common_data/RawKey.hpp"        // for RawKey, key...
+#include "Translator.hpp" // for KeyInputSim...
+#include <EventStore.hpp> // for Battery
+#include <hal/key_input/RawKey.hpp>
 #include "gui/input/InputEvent.hpp"      // for InputEvent
-#include "log/debug.hpp"                 // for DEBUG_APPLI...
-#include <log.hpp>                       // for LOG_INFO
+#include <log/debug.hpp>                 // for DEBUG_APPLI...
+#include <log/log.hpp>                   // for LOG_INFO
 #include "messages/AppMessage.hpp"       // for AppSwitchMe...
 #include "service-appmgr/Controller.hpp" // for Controller
 #include "actions/AlarmClockStatusChangeParams.hpp"
@@ -36,7 +36,7 @@
 #include <type_traits> // for add_const<>...
 #include <WindowsFactory.hpp>
 #include <service-gui/Common.hpp>
-#include <module-utils/Utils.hpp>
+#include <Utils.hpp>
 #include <service-db/Settings.hpp>
 #include <service-db/agents/settings/SystemSettings.hpp>
 #include <service-audio/AudioServiceAPI.hpp> // for GetOutputVolume
diff --git a/module-apps/apps-common/AsyncTask.cpp b/module-apps/apps-common/AsyncTask.cpp
index bd0b3b6a4..a29426b0b 100644
--- a/module-apps/apps-common/AsyncTask.cpp
+++ b/module-apps/apps-common/AsyncTask.cpp
@@ -3,7 +3,7 @@
 
 #include "AsyncTask.hpp"
 #include <apps-common/ApplicationCommon.hpp>
-#include "log.hpp"
+#include "log/log.hpp"
 
 namespace app
 {
diff --git a/module-apps/apps-common/AudioOperations.cpp b/module-apps/apps-common/AudioOperations.cpp
index af69a9068..729ff15b0 100644
--- a/module-apps/apps-common/AudioOperations.cpp
+++ b/module-apps/apps-common/AudioOperations.cpp
@@ -3,7 +3,7 @@
 
 #include "AudioOperations.hpp"
 
-#include <log.hpp>
+#include <log/log.hpp>
 #include <service-audio/AudioServiceAPI.hpp>
 #include <service-audio/AudioServiceName.hpp>
 #include <time/ScopedTime.hpp>
diff --git a/module-apps/apps-common/CMakeLists.txt b/module-apps/apps-common/CMakeLists.txt
index f4a228223..7df925bd9 100644
--- a/module-apps/apps-common/CMakeLists.txt
+++ b/module-apps/apps-common/CMakeLists.txt
@@ -87,8 +87,9 @@ target_link_libraries(apps-common
         module-services
         module-sys
         module-utils
-        time
+        utils-time
         utf8
+        version-header
 )
 
 # Board specific compilation definitions,options,include directories and features
diff --git a/module-apps/apps-common/locks/handlers/LockPolicyHandler.cpp b/module-apps/apps-common/locks/handlers/LockPolicyHandler.cpp
index e5aa3565e..8a07f25d2 100644
--- a/module-apps/apps-common/locks/handlers/LockPolicyHandler.cpp
+++ b/module-apps/apps-common/locks/handlers/LockPolicyHandler.cpp
@@ -2,7 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "LockPolicyHandler.hpp"
-#include <log.hpp>
+#include <log/log.hpp>
 #include <ApplicationCommon.hpp>
 #include <gsl/assert>
 
diff --git a/module-apps/apps-common/locks/widgets/Lock.cpp b/module-apps/apps-common/locks/widgets/Lock.cpp
index 91f3b6adc..16987513f 100644
--- a/module-apps/apps-common/locks/widgets/Lock.cpp
+++ b/module-apps/apps-common/locks/widgets/Lock.cpp
@@ -2,7 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "Lock.hpp"
-#include <log.hpp>
+#include <log/log.hpp>
 
 namespace locks
 {
diff --git a/module-apps/apps-common/notifications/NotificationsHandler.cpp b/module-apps/apps-common/notifications/NotificationsHandler.cpp
index fd03f52d8..b9445efb5 100644
--- a/module-apps/apps-common/notifications/NotificationsHandler.cpp
+++ b/module-apps/apps-common/notifications/NotificationsHandler.cpp
@@ -3,7 +3,7 @@
 
 #include "NotificationsHandler.hpp"
 #include <service-db/DBServiceAPI.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 #include <service-cellular/service-cellular/CellularMessage.hpp>
 #include <service-appmgr/Controller.hpp>
 #include <service-audio/AudioServiceAPI.hpp>
diff --git a/module-apps/apps-common/popups/PowerOffWindow.cpp b/module-apps/apps-common/popups/PowerOffWindow.cpp
index 54a6fd39a..2c7493c44 100644
--- a/module-apps/apps-common/popups/PowerOffWindow.cpp
+++ b/module-apps/apps-common/popups/PowerOffWindow.cpp
@@ -4,7 +4,7 @@
 #include "PowerOffWindow.hpp"
 #include "Popups.hpp"
 
-#include <log.hpp>
+#include <log/log.hpp>
 #include <messages/DialogMetadataMessage.hpp>
 #include <i18n/i18n.hpp>
 
diff --git a/module-apps/apps-common/widgets/TimeWidget.cpp b/module-apps/apps-common/widgets/TimeWidget.cpp
index 51e035a7f..edf8feff3 100644
--- a/module-apps/apps-common/widgets/TimeWidget.cpp
+++ b/module-apps/apps-common/widgets/TimeWidget.cpp
@@ -8,6 +8,7 @@
 #include <time/time_date_validation.hpp>
 #include "DateAndTimeStyle.hpp"
 #include <time/TimeZone.hpp>
+#include <service-time/api/TimeSettingsApi.hpp>
 
 namespace gui
 {
diff --git a/module-audio/Audio/Audio.cpp b/module-audio/Audio/Audio.cpp
index 1a92faa2b..26aeea89b 100644
--- a/module-audio/Audio/Audio.cpp
+++ b/module-audio/Audio/Audio.cpp
@@ -4,7 +4,7 @@
 #include "Audio.hpp"
 #include "Operation/Operation.hpp"
 
-#include <log.hpp>
+#include <log/log.hpp>
 #include <bsp/headset/headset.hpp>
 
 namespace audio
diff --git a/module-audio/Audio/Operation/PlaybackOperation.cpp b/module-audio/Audio/Operation/PlaybackOperation.cpp
index 0635d521a..2b1c5e738 100644
--- a/module-audio/Audio/Operation/PlaybackOperation.cpp
+++ b/module-audio/Audio/Operation/PlaybackOperation.cpp
@@ -9,7 +9,7 @@
 
 #include "Audio/AudioCommon.hpp"
 
-#include <log.hpp>
+#include <log/log.hpp>
 
 namespace audio
 {
diff --git a/module-audio/Audio/Operation/RecorderOperation.cpp b/module-audio/Audio/Operation/RecorderOperation.cpp
index ee91c2330..90abe15ad 100644
--- a/module-audio/Audio/Operation/RecorderOperation.cpp
+++ b/module-audio/Audio/Operation/RecorderOperation.cpp
@@ -10,7 +10,7 @@
 #include "Audio/Profiles/ProfileRecordingOnBoardMic.hpp"
 #include "Audio/AudioCommon.hpp"
 
-#include <log.hpp>
+#include <log/log.hpp>
 #include "FreeRTOS.h"
 #include "task.h"
 
diff --git a/module-audio/Audio/Operation/RouterOperation.cpp b/module-audio/Audio/Operation/RouterOperation.cpp
index ce32f3c13..b051808fb 100644
--- a/module-audio/Audio/Operation/RouterOperation.cpp
+++ b/module-audio/Audio/Operation/RouterOperation.cpp
@@ -9,7 +9,7 @@
 #include <Audio/StreamFactory.hpp>
 #include <Audio/transcode/TransformFactory.hpp>
 
-#include <log.hpp>
+#include <log/log.hpp>
 #include <mutex.hpp>
 
 #include <algorithm>
diff --git a/module-audio/Audio/decoder/Decoder.hpp b/module-audio/Audio/decoder/Decoder.hpp
index febf47896..2fb41231d 100644
--- a/module-audio/Audio/decoder/Decoder.hpp
+++ b/module-audio/Audio/decoder/Decoder.hpp
@@ -8,7 +8,7 @@
 #include "Audio/Stream.hpp"
 #include "DecoderWorker.hpp"
 
-#include <log.hpp>
+#include <log/log.hpp>
 
 #include <memory>
 #include <optional>
diff --git a/module-audio/Audio/encoder/EncoderWAV.cpp b/module-audio/Audio/encoder/EncoderWAV.cpp
index 3f48fbe31..130fe496f 100644
--- a/module-audio/Audio/encoder/EncoderWAV.cpp
+++ b/module-audio/Audio/encoder/EncoderWAV.cpp
@@ -2,7 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "EncoderWAV.hpp"
-#include <log.hpp>
+#include <log/log.hpp>
 
 namespace audio
 {
diff --git a/module-audio/Audio/test/unittest_equalizer.cpp b/module-audio/Audio/test/unittest_equalizer.cpp
index 0f6cf4bf5..608849c44 100644
--- a/module-audio/Audio/test/unittest_equalizer.cpp
+++ b/module-audio/Audio/test/unittest_equalizer.cpp
@@ -5,7 +5,7 @@
 
 #include <catch2/catch.hpp>
 #include <module-audio/Audio/equalizer/Equalizer.hpp>
-#include <module-utils/Utils.hpp>
+#include <Utils.hpp>
 #include <stdexcept>
 
 SCENARIO("Calculate filter coeff")
diff --git a/module-audio/CMakeLists.txt b/module-audio/CMakeLists.txt
index 8561936e9..cad88d74f 100755
--- a/module-audio/CMakeLists.txt
+++ b/module-audio/CMakeLists.txt
@@ -71,7 +71,7 @@ target_link_libraries(${PROJECT_NAME}
                 tag
                 minimp3::minimp3
         PRIVATE
-                math
+                utils-math
                 tagsfetcher
 )
 
diff --git a/module-audio/board/linux/LinuxAudioDevice.cpp b/module-audio/board/linux/LinuxAudioDevice.cpp
index 3e34860bf..e4d392e8b 100644
--- a/module-audio/board/linux/LinuxAudioDevice.cpp
+++ b/module-audio/board/linux/LinuxAudioDevice.cpp
@@ -3,7 +3,7 @@
 
 #include "LinuxAudioDevice.hpp"
 #include <Audio/Stream.hpp>
-#include <module-utils/log/log.hpp>
+#include <log/log.hpp>
 
 namespace audio
 {
diff --git a/module-audio/board/rt1051/RT1051AudioCodec.cpp b/module-audio/board/rt1051/RT1051AudioCodec.cpp
index 76ac67044..bc1f936a9 100644
--- a/module-audio/board/rt1051/RT1051AudioCodec.cpp
+++ b/module-audio/board/rt1051/RT1051AudioCodec.cpp
@@ -4,7 +4,7 @@
 #include "RT1051AudioCodec.hpp"
 #include "board.h"
 #include "dma_config.h"
-#include <log.hpp>
+#include <log/log.hpp>
 
 #include "board/BoardDefinitions.hpp"
 #include "board/rt1051/common/audio.hpp"
diff --git a/module-audio/board/rt1051/RT1051CellularAudio.cpp b/module-audio/board/rt1051/RT1051CellularAudio.cpp
index 8e814ff00..a5748d998 100644
--- a/module-audio/board/rt1051/RT1051CellularAudio.cpp
+++ b/module-audio/board/rt1051/RT1051CellularAudio.cpp
@@ -4,7 +4,7 @@
 #include "RT1051CellularAudio.hpp"
 #include "board.h"
 #include "dma_config.h"
-#include <log.hpp>
+#include <log/log.hpp>
 
 #include "board/BoardDefinitions.hpp"
 
diff --git a/module-audio/tags_fetcher/CMakeLists.txt b/module-audio/tags_fetcher/CMakeLists.txt
index 7b07213dc..e45391489 100644
--- a/module-audio/tags_fetcher/CMakeLists.txt
+++ b/module-audio/tags_fetcher/CMakeLists.txt
@@ -8,11 +8,6 @@ target_sources(tagsfetcher
         PUBLIC
         TagsFetcher.hpp)
 
-target_include_directories(ucs2
-    PUBLIC
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-)
-
 target_link_libraries(tagsfetcher
     PRIVATE
     tag
diff --git a/module-bluetooth/Bluetooth/BluetoothWorker.cpp b/module-bluetooth/Bluetooth/BluetoothWorker.cpp
index 1da0ddc3c..0aedc7bed 100644
--- a/module-bluetooth/Bluetooth/BluetoothWorker.cpp
+++ b/module-bluetooth/Bluetooth/BluetoothWorker.cpp
@@ -4,7 +4,7 @@
 #include <service-bluetooth/ServiceBluetooth.hpp>
 #include "BluetoothWorker.hpp"
 #include "BtCommand.hpp"
-#include <log.hpp>
+#include <log/log.hpp>
 #include "interface/BluetoothDriverImpl.hpp"
 #include "interface/profiles/A2DP/A2DP.hpp"
 #include "interface/profiles/HSP/HSP.hpp"
diff --git a/module-bluetooth/Bluetooth/BtKeysStorage.cpp b/module-bluetooth/Bluetooth/BtKeysStorage.cpp
index 89f8efcb4..95bbb290d 100644
--- a/module-bluetooth/Bluetooth/BtKeysStorage.cpp
+++ b/module-bluetooth/Bluetooth/BtKeysStorage.cpp
@@ -3,7 +3,7 @@
 
 #include <algorithm>
 #include "BtKeysStorage.hpp"
-#include <log.hpp>
+#include <log/log.hpp>
 
 json11::Json bluetooth::KeyStorage::keysJson = json11::Json();
 btstack_link_key_db_t bluetooth::KeyStorage::keyStorage;
@@ -151,4 +151,4 @@ namespace bluetooth
         }
     }
 
-} // namespace Bt
+} // namespace bluetooth
diff --git a/module-bluetooth/Bluetooth/WorkerController.cpp b/module-bluetooth/Bluetooth/WorkerController.cpp
index 8151eb18c..3a90abceb 100644
--- a/module-bluetooth/Bluetooth/WorkerController.cpp
+++ b/module-bluetooth/Bluetooth/WorkerController.cpp
@@ -6,7 +6,7 @@
 #include "Device.hpp"
 #include "interface/profiles/ProfileManager.hpp"
 
-#include <log.hpp>
+#include <log/log.hpp>
 #define BOOST_SML_CFG_DISABLE_MIN_SIZE // GCC10 fix
 #include <boost/sml.hpp>
 #include <magic_enum.hpp>
diff --git a/module-bluetooth/Bluetooth/glucode/BluetoothRunLoop.hpp b/module-bluetooth/Bluetooth/glucode/BluetoothRunLoop.hpp
index 0eaf56ee8..18c3d6b73 100644
--- a/module-bluetooth/Bluetooth/glucode/BluetoothRunLoop.hpp
+++ b/module-bluetooth/Bluetooth/glucode/BluetoothRunLoop.hpp
@@ -2,7 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
-#include <log.hpp>
+#include <log/log.hpp>
 #include "queue.hpp"
 #include <btstack_run_loop.h>
 #include <timer.hpp>
diff --git a/module-bluetooth/Bluetooth/glucode/btstack_uart_block_rt1051.cpp b/module-bluetooth/Bluetooth/glucode/btstack_uart_block_rt1051.cpp
index b2eb02ce6..06c7053da 100644
--- a/module-bluetooth/Bluetooth/glucode/btstack_uart_block_rt1051.cpp
+++ b/module-bluetooth/Bluetooth/glucode/btstack_uart_block_rt1051.cpp
@@ -2,7 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include <bsp/bluetooth/Bluetooth.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 
 using namespace bsp;
 
diff --git a/module-bluetooth/Bluetooth/interface/profiles/A2DP/A2DP.cpp b/module-bluetooth/Bluetooth/interface/profiles/A2DP/A2DP.cpp
index 8dfbdae47..bbbb3156d 100644
--- a/module-bluetooth/Bluetooth/interface/profiles/A2DP/A2DP.cpp
+++ b/module-bluetooth/Bluetooth/interface/profiles/A2DP/A2DP.cpp
@@ -11,7 +11,7 @@
 #include "AVRCP.hpp"
 #include <Bluetooth/Device.hpp>
 #include <Bluetooth/Error.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 #include <service-bluetooth/BluetoothMessage.hpp>
 #include <Audio/AudioCommon.hpp>
 #include <service-audio/AudioMessage.hpp>
diff --git a/module-bluetooth/Bluetooth/interface/profiles/A2DP/A2DPImpl.hpp b/module-bluetooth/Bluetooth/interface/profiles/A2DP/A2DPImpl.hpp
index 816fc197b..d87c7bc1b 100644
--- a/module-bluetooth/Bluetooth/interface/profiles/A2DP/A2DPImpl.hpp
+++ b/module-bluetooth/Bluetooth/interface/profiles/A2DP/A2DPImpl.hpp
@@ -5,7 +5,7 @@
 #include "A2DP.hpp"
 #include <Bluetooth/Device.hpp>
 #include <Bluetooth/Error.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 #include <Audio/AudioCommon.hpp>
 #include <audio/BluetoothAudioDevice.hpp>
 
diff --git a/module-bluetooth/Bluetooth/interface/profiles/GAP/GAP.cpp b/module-bluetooth/Bluetooth/interface/profiles/GAP/GAP.cpp
index 352a425c0..789f6dfe4 100644
--- a/module-bluetooth/Bluetooth/interface/profiles/GAP/GAP.cpp
+++ b/module-bluetooth/Bluetooth/interface/profiles/GAP/GAP.cpp
@@ -3,7 +3,7 @@
 
 #include "GAP.hpp"
 
-#include <log.hpp>
+#include <log/log.hpp>
 #include <service-bluetooth/BluetoothMessage.hpp>
 #include <service-bluetooth/messages/ResponseVisibleDevices.hpp>
 #include <service-bluetooth/messages/Unpair.hpp>
@@ -156,8 +156,8 @@ namespace bluetooth
             LOG_INFO(", rssi %d dBm", static_cast<int8_t>(gap_event_inquiry_result_get_rssi(packet)));
         }
         if (gap_event_inquiry_result_get_name_available(packet) != 0u) {
-            auto name   = gap_event_inquiry_result_get_name(packet);
-            device.name = std::string{reinterpret_cast<const char *>(name)};
+            auto name    = gap_event_inquiry_result_get_name(packet);
+            device.name  = std::string{reinterpret_cast<const char *>(name)};
             device.state = REMOTE_NAME_FETCHED;
         }
         else {
diff --git a/module-bluetooth/Bluetooth/interface/profiles/HFP/HFP.cpp b/module-bluetooth/Bluetooth/interface/profiles/HFP/HFP.cpp
index a315f6f37..b0c08cf50 100644
--- a/module-bluetooth/Bluetooth/interface/profiles/HFP/HFP.cpp
+++ b/module-bluetooth/Bluetooth/interface/profiles/HFP/HFP.cpp
@@ -226,7 +226,7 @@ namespace bluetooth
             break;
         case HFP_SUBEVENT_SERVICE_LEVEL_CONNECTION_RELEASED:
             LOG_DEBUG("Service level connection released.\n");
-            aclHandle = HCI_CON_HANDLE_INVALID;
+            aclHandle   = HCI_CON_HANDLE_INVALID;
             isConnected = false;
             sendAudioEvent(audio::EventType::BlutoothHFPDeviceState, audio::Event::DeviceState::Disconnected);
 
@@ -258,7 +258,7 @@ namespace bluetooth
             // todo stop ringtone stream here
             break;
         case HFP_SUBEVENT_PLACE_CALL_WITH_NUMBER:
-                hfp_ag_outgoing_call_accepted();
+            hfp_ag_outgoing_call_accepted();
             break;
 
         case HFP_SUBEVENT_ATTACH_NUMBER_TO_VOICE_TAG:
diff --git a/module-bluetooth/Bluetooth/interface/profiles/HSP/HSP.cpp b/module-bluetooth/Bluetooth/interface/profiles/HSP/HSP.cpp
index 2a423595e..585e132ee 100644
--- a/module-bluetooth/Bluetooth/interface/profiles/HSP/HSP.cpp
+++ b/module-bluetooth/Bluetooth/interface/profiles/HSP/HSP.cpp
@@ -191,7 +191,7 @@ namespace bluetooth
                 LOG_DEBUG("Audio connection establishment failed with status %u\n",
                           hsp_subevent_audio_connection_complete_get_status(event));
                 sendAudioEvent(audio::EventType::BlutoothHSPDeviceState, audio::Event::DeviceState::Disconnected);
-                isConnected = false;
+                isConnected  = false;
                 callAnswered = false;
             }
             else {
@@ -203,7 +203,7 @@ namespace bluetooth
             break;
         case HSP_SUBEVENT_AUDIO_DISCONNECTION_COMPLETE:
             LOG_DEBUG("Audio connection released.\n\n");
-            scoHandle   = HCI_CON_HANDLE_INVALID;
+            scoHandle    = HCI_CON_HANDLE_INVALID;
             callAnswered = false;
             break;
         case HSP_SUBEVENT_MICROPHONE_GAIN_CHANGED:
diff --git a/module-bsp/CMakeLists.txt b/module-bsp/CMakeLists.txt
index 8ca5a72e8..b85ae4be8 100644
--- a/module-bsp/CMakeLists.txt
+++ b/module-bsp/CMakeLists.txt
@@ -23,12 +23,6 @@ target_sources(
         drivers/pwm/DriverPWM.cpp
         drivers/semc/DriverSEMC.cpp
         drivers/usdhc/DriverUSDHC.cpp
-
-    PUBLIC
-        hal/temperature_source/TemperatureSource.hpp
-        hal/battery_charger/AbstractBatteryCharger.hpp
-        hal/key_input/AbstractKeyInput.hpp
-        hal/key_input/KeyEventDefinitions.hpp
 )
 add_board_subdirectory(board)
 
@@ -69,8 +63,11 @@ target_include_directories(${PROJECT_NAME}
         >
 )
 
+add_subdirectory(hal)
+
 target_link_libraries(${PROJECT_NAME}
     PUBLIC
+        hal
         eventstore
         module-os
         service-bluetooth
diff --git a/module-bsp/board/linux/audio/LinuxCellularAudio.cpp b/module-bsp/board/linux/audio/LinuxCellularAudio.cpp
index 7b305aa88..cb30d75ce 100755
--- a/module-bsp/board/linux/audio/LinuxCellularAudio.cpp
+++ b/module-bsp/board/linux/audio/LinuxCellularAudio.cpp
@@ -5,7 +5,7 @@
 
 #include "linux_audiocodec.hpp"
 
-#include <log.hpp>
+#include <log/log.hpp>
 
 namespace bsp
 {
diff --git a/module-bsp/board/linux/audio/linux_audiocodec.cpp b/module-bsp/board/linux/audio/linux_audiocodec.cpp
index 51720106b..451114e09 100755
--- a/module-bsp/board/linux/audio/linux_audiocodec.cpp
+++ b/module-bsp/board/linux/audio/linux_audiocodec.cpp
@@ -3,7 +3,7 @@
 
 #include "linux_audiocodec.hpp"
 
-#include <log.hpp>
+#include <log/log.hpp>
 
 namespace bsp
 {
diff --git a/module-bsp/board/linux/bell_temp_sensor/bell_temp_sensor.cpp b/module-bsp/board/linux/bell_temp_sensor/bell_temp_sensor.cpp
index 20ffa781f..2a17d56e2 100644
--- a/module-bsp/board/linux/bell_temp_sensor/bell_temp_sensor.cpp
+++ b/module-bsp/board/linux/bell_temp_sensor/bell_temp_sensor.cpp
@@ -2,7 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "bsp/bell_temp_sensor/bell_temp_sensor.hpp"
-#include <log.hpp>
+#include <log/log.hpp>
 
 namespace bsp::bell_temp_sensor
 {
diff --git a/module-bsp/board/linux/bluetooth/Bluetooth.cpp b/module-bsp/board/linux/bluetooth/Bluetooth.cpp
index ff74f8497..1f9cdd398 100644
--- a/module-bsp/board/linux/bluetooth/Bluetooth.cpp
+++ b/module-bsp/board/linux/bluetooth/Bluetooth.cpp
@@ -3,7 +3,7 @@
 
 #include "bsp/bluetooth/Bluetooth.hpp"
 #include "BluetoothWorker.hpp"
-#include <log.hpp>
+#include <log/log.hpp>
 
 /// stubs
 
diff --git a/module-bsp/board/linux/cellular/linux_cellular.cpp b/module-bsp/board/linux/cellular/linux_cellular.cpp
index ad9c21e36..54e88950e 100644
--- a/module-bsp/board/linux/cellular/linux_cellular.cpp
+++ b/module-bsp/board/linux/cellular/linux_cellular.cpp
@@ -7,7 +7,7 @@
 #include <iostream>
 #include <algorithm>
 
-#include <log.hpp>
+#include <log/log.hpp>
 #include "mutex.hpp"
 #include <EventStore.hpp>
 #include <errno.h>
diff --git a/module-bsp/board/linux/hal/key_input/KeyInput.hpp b/module-bsp/board/linux/hal/key_input/KeyInput.hpp
index 3da450a8b..d16346408 100644
--- a/module-bsp/board/linux/hal/key_input/KeyInput.hpp
+++ b/module-bsp/board/linux/hal/key_input/KeyInput.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <module-bsp/hal/key_input/AbstractKeyInput.hpp>
+#include <hal/key_input/AbstractKeyInput.hpp>
 
 namespace hal::key_input
 {
diff --git a/module-bsp/board/linux/hal/temperature_source/TemperatureSource.cpp b/module-bsp/board/linux/hal/temperature_source/TemperatureSource.cpp
index d6ba94d4a..1f5c7e9a9 100644
--- a/module-bsp/board/linux/hal/temperature_source/TemperatureSource.cpp
+++ b/module-bsp/board/linux/hal/temperature_source/TemperatureSource.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 <module-bsp/hal/temperature_source/TemperatureSource.hpp>
+#include <hal/temperature_source/TemperatureSource.hpp>
 #include <hal/GenericFactory.hpp>
 
 namespace hal::temperature
diff --git a/module-bsp/board/linux/vibrator/vibrator.cpp b/module-bsp/board/linux/vibrator/vibrator.cpp
index 57aadf119..099a1a23d 100644
--- a/module-bsp/board/linux/vibrator/vibrator.cpp
+++ b/module-bsp/board/linux/vibrator/vibrator.cpp
@@ -2,7 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "bsp/vibrator/vibrator.hpp"
-#include <log.hpp>
+#include <log/log.hpp>
 
 namespace bsp
 {
diff --git a/module-bsp/board/linux/watchdog/software_watchdog.cpp b/module-bsp/board/linux/watchdog/software_watchdog.cpp
index bf4b11c85..17e8ac2fc 100644
--- a/module-bsp/board/linux/watchdog/software_watchdog.cpp
+++ b/module-bsp/board/linux/watchdog/software_watchdog.cpp
@@ -5,7 +5,7 @@
 #include <module-os/RTOSWrapper/include/critical.hpp>
 #include <module-os/RTOSWrapper/include/ticks.hpp>
 #include <Service/Common.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 #include <cstdlib>
 
 namespace bsp::watchdog
diff --git a/module-bsp/board/rt1051/bellpx/bsp/bell_temp_sensor/bell_temp_sensor.cpp b/module-bsp/board/rt1051/bellpx/bsp/bell_temp_sensor/bell_temp_sensor.cpp
index 1d2ac7fe0..83b9e661c 100644
--- a/module-bsp/board/rt1051/bellpx/bsp/bell_temp_sensor/bell_temp_sensor.cpp
+++ b/module-bsp/board/rt1051/bellpx/bsp/bell_temp_sensor/bell_temp_sensor.cpp
@@ -8,7 +8,7 @@
 #include "drivers/gpio/DriverGPIO.hpp"
 
 #include "fsl_common.h"
-#include <log.hpp>
+#include <log/log.hpp>
 
 namespace bsp::bell_temp_sensor
 {
diff --git a/module-bsp/board/rt1051/bellpx/bsp/switches/switches.cpp b/module-bsp/board/rt1051/bellpx/bsp/switches/switches.cpp
index b7fdeeec1..f2bd1acd0 100644
--- a/module-bsp/board/rt1051/bellpx/bsp/switches/switches.cpp
+++ b/module-bsp/board/rt1051/bellpx/bsp/switches/switches.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 <module-utils/Utils.hpp> // for byte conversion functions. it is included first because of magic enum define
+#include <Utils.hpp> // for byte conversion functions. it is included first because of magic enum define
 
 #include <FreeRTOS.h>
 #include <mutex.hpp>
diff --git a/module-bsp/board/rt1051/bellpx/clock_config.cpp b/module-bsp/board/rt1051/bellpx/clock_config.cpp
index 51aad0f81..3e39bfb4f 100644
--- a/module-bsp/board/rt1051/bellpx/clock_config.cpp
+++ b/module-bsp/board/rt1051/bellpx/clock_config.cpp
@@ -54,7 +54,7 @@
 #include "fsl_iomuxc.h"
 #include "fsl_dcdc.h"
 #include "fsl_gpc.h"
-#include <log.hpp>
+#include <log/log.hpp>
 
 /*******************************************************************************
  * Definitions
diff --git a/module-bsp/board/rt1051/bellpx/hal/key_input/KeyInput.hpp b/module-bsp/board/rt1051/bellpx/hal/key_input/KeyInput.hpp
index cbf785a02..a2953e367 100644
--- a/module-bsp/board/rt1051/bellpx/hal/key_input/KeyInput.hpp
+++ b/module-bsp/board/rt1051/bellpx/hal/key_input/KeyInput.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <module-bsp/hal/key_input/AbstractKeyInput.hpp>
+#include <hal/key_input/AbstractKeyInput.hpp>
 
 namespace hal::key_input
 {
diff --git a/module-bsp/board/rt1051/bellpx/hal/temperature_source/TemperatureSource.cpp b/module-bsp/board/rt1051/bellpx/hal/temperature_source/TemperatureSource.cpp
index 4beb59389..a57a16002 100644
--- a/module-bsp/board/rt1051/bellpx/hal/temperature_source/TemperatureSource.cpp
+++ b/module-bsp/board/rt1051/bellpx/hal/temperature_source/TemperatureSource.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 <module-bsp/hal/temperature_source/TemperatureSource.hpp>
+#include <hal/temperature_source/TemperatureSource.hpp>
 #include <hal/GenericFactory.hpp>
 #include "bsp/bell_temp_sensor/bell_temp_sensor.hpp"
 
diff --git a/module-bsp/board/rt1051/bellpx/irq_gpio.cpp b/module-bsp/board/rt1051/bellpx/irq_gpio.cpp
index 9c5e4036d..db0b75ca4 100644
--- a/module-bsp/board/rt1051/bellpx/irq_gpio.cpp
+++ b/module-bsp/board/rt1051/bellpx/irq_gpio.cpp
@@ -2,7 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "board/irq_gpio.hpp"
-#include <module-utils/Utils.hpp>
+#include <Utils.hpp>
 
 #include "board.h"
 #include "FreeRTOS.h"
diff --git a/module-bsp/board/rt1051/bluetooth/BlueKitchen.cpp b/module-bsp/board/rt1051/bluetooth/BlueKitchen.cpp
index 7b26941dd..ac66386a1 100644
--- a/module-bsp/board/rt1051/bluetooth/BlueKitchen.cpp
+++ b/module-bsp/board/rt1051/bluetooth/BlueKitchen.cpp
@@ -3,7 +3,7 @@
 
 #include "bsp/bluetooth/Bluetooth.hpp"
 #include "BluetoothWorker.hpp"
-#include <log.hpp>
+#include <log/log.hpp>
 #include "FreeRTOS.h"
 #include "fsl_lpuart.h"
 #include "board.h"
diff --git a/module-bsp/board/rt1051/bluetooth/BluetoothCommon.cpp b/module-bsp/board/rt1051/bluetooth/BluetoothCommon.cpp
index 39717f3db..254db2b91 100644
--- a/module-bsp/board/rt1051/bluetooth/BluetoothCommon.cpp
+++ b/module-bsp/board/rt1051/bluetooth/BluetoothCommon.cpp
@@ -3,7 +3,7 @@
 
 #include "BluetoothWorker.hpp"
 #include "bsp/bluetooth/Bluetooth.hpp"
-#include <log.hpp>
+#include <log/log.hpp>
 #include "FreeRTOS.h"
 #include "board.h"
 #include "fsl_lpuart_edma.h"
diff --git a/module-bsp/board/rt1051/bluetooth/Bluetopia.cpp b/module-bsp/board/rt1051/bluetooth/Bluetopia.cpp
index a80a75b7a..eb696970c 100644
--- a/module-bsp/board/rt1051/bluetooth/Bluetopia.cpp
+++ b/module-bsp/board/rt1051/bluetooth/Bluetopia.cpp
@@ -2,7 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "bluetooth/Bluetooth.hpp"
-#include <log.hpp>
+#include <log/log.hpp>
 #include "fsl_lpuart.h"
 #include "board.h"
 
diff --git a/module-bsp/board/rt1051/bsp/audio/CodecMAX98090.cpp b/module-bsp/board/rt1051/bsp/audio/CodecMAX98090.cpp
index 64b863ec6..52b749136 100644
--- a/module-bsp/board/rt1051/bsp/audio/CodecMAX98090.cpp
+++ b/module-bsp/board/rt1051/bsp/audio/CodecMAX98090.cpp
@@ -5,7 +5,7 @@
 #include "max98090_regs.hpp"
 #include "board/BoardDefinitions.hpp"
 
-#include <module-utils/Utils.hpp>
+#include <Utils.hpp>
 
 #include <map>
 
diff --git a/module-bsp/board/rt1051/bsp/eeprom/eeprom.cpp b/module-bsp/board/rt1051/bsp/eeprom/eeprom.cpp
index f6e680459..dcb2086d2 100644
--- a/module-bsp/board/rt1051/bsp/eeprom/eeprom.cpp
+++ b/module-bsp/board/rt1051/bsp/eeprom/eeprom.cpp
@@ -7,7 +7,7 @@
 #include "drivers/i2c/DriverI2C.hpp"
 
 #include "fsl_common.h"
-#include <log.hpp>
+#include <log/log.hpp>
 
 #include "task.h"
 
diff --git a/module-bsp/board/rt1051/bsp/light_sensor/light_sensor.cpp b/module-bsp/board/rt1051/bsp/light_sensor/light_sensor.cpp
index bca834d71..8ae1cc444 100644
--- a/module-bsp/board/rt1051/bsp/light_sensor/light_sensor.cpp
+++ b/module-bsp/board/rt1051/bsp/light_sensor/light_sensor.cpp
@@ -8,7 +8,7 @@
 #include "drivers/gpio/DriverGPIO.hpp"
 
 #include "fsl_common.h"
-#include <log.hpp>
+#include <log/log.hpp>
 
 namespace bsp::light_sensor
 {
diff --git a/module-bsp/board/rt1051/bsp/lpm/CpuFreqLPM.cpp b/module-bsp/board/rt1051/bsp/lpm/CpuFreqLPM.cpp
index 019a5c00b..c74ad290f 100644
--- a/module-bsp/board/rt1051/bsp/lpm/CpuFreqLPM.cpp
+++ b/module-bsp/board/rt1051/bsp/lpm/CpuFreqLPM.cpp
@@ -2,7 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "CpuFreqLPM.hpp"
-#include <log.hpp>
+#include <log/log.hpp>
 #include "fsl_dcdc.h"
 
 namespace bsp
diff --git a/module-bsp/board/rt1051/bsp/lpm/RT1051LPM.cpp b/module-bsp/board/rt1051/bsp/lpm/RT1051LPM.cpp
index 24c93591a..c3bc2e42f 100644
--- a/module-bsp/board/rt1051/bsp/lpm/RT1051LPM.cpp
+++ b/module-bsp/board/rt1051/bsp/lpm/RT1051LPM.cpp
@@ -5,7 +5,7 @@
 
 #include "board.h"
 #include "reboot_codes.hpp"
-#include <log.hpp>
+#include <log/log.hpp>
 #include "board/BoardDefinitions.hpp"
 #include "bsp/watchdog/watchdog.hpp"
 #include <board/clock_config.h>
diff --git a/module-bsp/board/rt1051/bsp/magnetometer/magnetometer.cpp b/module-bsp/board/rt1051/bsp/magnetometer/magnetometer.cpp
index e8a85b40d..1df0626b8 100644
--- a/module-bsp/board/rt1051/bsp/magnetometer/magnetometer.cpp
+++ b/module-bsp/board/rt1051/bsp/magnetometer/magnetometer.cpp
@@ -3,7 +3,7 @@
 
 #include "bsp/magnetometer/magnetometer.hpp"
 
-#include <module-utils/Utils.hpp> // for byte conversion functions. it is included first because of magic enum define
+#include <Utils.hpp> // for byte conversion functions. it is included first because of magic enum define
 
 #include "ALS31300.hpp"
 #include "board/BoardDefinitions.hpp"
diff --git a/module-bsp/board/rt1051/common/chip.cpp b/module-bsp/board/rt1051/common/chip.cpp
index aeb577eef..2740a3c76 100644
--- a/module-bsp/board/rt1051/common/chip.cpp
+++ b/module-bsp/board/rt1051/common/chip.cpp
@@ -3,7 +3,7 @@
 
 #include "chip.hpp"
 
-#include <log.hpp>
+#include <log/log.hpp>
 
 #include <map>
 #include <string>
diff --git a/module-bsp/board/rt1051/common/startup_mimxrt1052.cpp b/module-bsp/board/rt1051/common/startup_mimxrt1052.cpp
index 372e2b35b..453d73d9d 100644
--- a/module-bsp/board/rt1051/common/startup_mimxrt1052.cpp
+++ b/module-bsp/board/rt1051/common/startup_mimxrt1052.cpp
@@ -453,7 +453,7 @@ extern "C"
 
 #include "MIMXRT1051.h"
 #include "macros.h"
-#include <log.hpp>
+#include <log/log.hpp>
 #include <cinttypes>
 #include <cstdlib>
 #include <cstdint>
diff --git a/module-bsp/board/rt1051/drivers/RT1051DriverDMA.cpp b/module-bsp/board/rt1051/drivers/RT1051DriverDMA.cpp
index 6990b9929..c5a4b2750 100644
--- a/module-bsp/board/rt1051/drivers/RT1051DriverDMA.cpp
+++ b/module-bsp/board/rt1051/drivers/RT1051DriverDMA.cpp
@@ -3,7 +3,7 @@
 
 #include "RT1051DriverDMA.hpp"
 #include <algorithm>
-#include <log.hpp>
+#include <log/log.hpp>
 
 namespace drivers
 {
diff --git a/module-bsp/board/rt1051/drivers/RT1051DriverGPIO.cpp b/module-bsp/board/rt1051/drivers/RT1051DriverGPIO.cpp
index fb295cd63..82229c894 100644
--- a/module-bsp/board/rt1051/drivers/RT1051DriverGPIO.cpp
+++ b/module-bsp/board/rt1051/drivers/RT1051DriverGPIO.cpp
@@ -2,7 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "RT1051DriverGPIO.hpp"
-#include <log.hpp>
+#include <log/log.hpp>
 
 namespace drivers
 {
diff --git a/module-bsp/board/rt1051/drivers/RT1051DriverI2C.cpp b/module-bsp/board/rt1051/drivers/RT1051DriverI2C.cpp
index 957f0f0e9..f669459f5 100644
--- a/module-bsp/board/rt1051/drivers/RT1051DriverI2C.cpp
+++ b/module-bsp/board/rt1051/drivers/RT1051DriverI2C.cpp
@@ -2,7 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "RT1051DriverI2C.hpp"
-#include <log.hpp>
+#include <log/log.hpp>
 #include "../board.h"
 
 namespace drivers
diff --git a/module-bsp/board/rt1051/drivers/RT1051DriverPLL.cpp b/module-bsp/board/rt1051/drivers/RT1051DriverPLL.cpp
index 2acf70601..a9f37c68f 100644
--- a/module-bsp/board/rt1051/drivers/RT1051DriverPLL.cpp
+++ b/module-bsp/board/rt1051/drivers/RT1051DriverPLL.cpp
@@ -2,7 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "RT1051DriverPLL.hpp"
-#include <log.hpp>
+#include <log/log.hpp>
 #include "board/clock_config.h"
 
 namespace drivers
diff --git a/module-bsp/board/rt1051/drivers/RT1051DriverPWM.cpp b/module-bsp/board/rt1051/drivers/RT1051DriverPWM.cpp
index d53608f12..83b278234 100644
--- a/module-bsp/board/rt1051/drivers/RT1051DriverPWM.cpp
+++ b/module-bsp/board/rt1051/drivers/RT1051DriverPWM.cpp
@@ -3,7 +3,7 @@
 
 #include "RT1051DriverPWM.hpp"
 #include "RT1051DriverPWMhelper.hpp"
-#include <log.hpp>
+#include <log/log.hpp>
 #include "../board.h"
 #include <algorithm>
 
diff --git a/module-bsp/board/rt1051/puretx/clock_config.cpp b/module-bsp/board/rt1051/puretx/clock_config.cpp
index 0a0028100..46932daa0 100644
--- a/module-bsp/board/rt1051/puretx/clock_config.cpp
+++ b/module-bsp/board/rt1051/puretx/clock_config.cpp
@@ -54,7 +54,7 @@
 #include "fsl_iomuxc.h"
 #include "fsl_dcdc.h"
 #include "fsl_gpc.h"
-#include <log.hpp>
+#include <log/log.hpp>
 
 /*******************************************************************************
  * Definitions
diff --git a/module-bsp/board/rt1051/puretx/hal/key_input/KeyInput.hpp b/module-bsp/board/rt1051/puretx/hal/key_input/KeyInput.hpp
index 75506ec08..82ed9acea 100644
--- a/module-bsp/board/rt1051/puretx/hal/key_input/KeyInput.hpp
+++ b/module-bsp/board/rt1051/puretx/hal/key_input/KeyInput.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <module-bsp/hal/key_input/AbstractKeyInput.hpp>
+#include <hal/key_input/AbstractKeyInput.hpp>
 
 namespace hal::key_input
 {
diff --git a/module-bsp/bsp/cellular/CellularResult.hpp b/module-bsp/bsp/cellular/CellularResult.hpp
index e9ef77b19..64cbb87f4 100644
--- a/module-bsp/bsp/cellular/CellularResult.hpp
+++ b/module-bsp/bsp/cellular/CellularResult.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <memory>
-#include <module-utils/Utils.hpp>
+#include <Utils.hpp>
 #include <utility>
 
 namespace bsp::cellular
@@ -50,7 +50,7 @@ namespace bsp::cellular
 
         [[nodiscard]] auto serialize() const -> std::unique_ptr<uint8_t[]>
         {
-            auto serialized     = std::make_unique< uint8_t[]>(data.size() + sizeof(resultCode));
+            auto serialized     = std::make_unique<uint8_t[]>(data.size() + sizeof(resultCode));
             serialized.get()[0] = static_cast<unsigned char>(resultCode);
 
             if (data.size() > 0) {
diff --git a/module-bsp/bsp/usb/usb.hpp b/module-bsp/bsp/usb/usb.hpp
index 46d63c77e..00bc32dcd 100644
--- a/module-bsp/bsp/usb/usb.hpp
+++ b/module-bsp/bsp/usb/usb.hpp
@@ -12,7 +12,7 @@ extern "C"
 
 #include <errno.h>
 #include <iostream>
-#include <log.hpp>
+#include <log/log.hpp>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
@@ -29,7 +29,8 @@ namespace bsp
         Configured
     };
 
-    struct usbInitParams {
+    struct usbInitParams
+    {
         xQueueHandle queueHandle;
         xQueueHandle irqQueueHandle;
         const char *serialNumber;
diff --git a/module-bsp/hal/CMakeLists.txt b/module-bsp/hal/CMakeLists.txt
new file mode 100644
index 000000000..1e84c75b2
--- /dev/null
+++ b/module-bsp/hal/CMakeLists.txt
@@ -0,0 +1,17 @@
+add_library(hal INTERFACE)
+
+target_include_directories(hal
+    INTERFACE
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>
+)
+
+target_sources(hal
+    INTERFACE
+        include/hal/temperature_source/TemperatureSource.hpp
+        include/hal/GenericFactory.hpp
+        include/hal/battery_charger/AbstractBatteryCharger.hpp
+	include/hal/cellular/SIM.hpp
+        include/hal/key_input/RawKey.hpp
+        include/hal/key_input/KeyEventDefinitions.hpp
+        include/hal/key_input/AbstractKeyInput.hpp
+)
diff --git a/module-bsp/hal/GenericFactory.hpp b/module-bsp/hal/include/hal/GenericFactory.hpp
similarity index 100%
rename from module-bsp/hal/GenericFactory.hpp
rename to module-bsp/hal/include/hal/GenericFactory.hpp
diff --git a/module-bsp/hal/battery_charger/AbstractBatteryCharger.hpp b/module-bsp/hal/include/hal/battery_charger/AbstractBatteryCharger.hpp
similarity index 100%
rename from module-bsp/hal/battery_charger/AbstractBatteryCharger.hpp
rename to module-bsp/hal/include/hal/battery_charger/AbstractBatteryCharger.hpp
diff --git a/module-bsp/hal/include/hal/cellular/SIM.hpp b/module-bsp/hal/include/hal/cellular/SIM.hpp
new file mode 100644
index 000000000..b60573557
--- /dev/null
+++ b/module-bsp/hal/include/hal/cellular/SIM.hpp
@@ -0,0 +1,14 @@
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#pragma once
+
+namespace hal::cellular
+{
+    enum class SimSlot
+    {
+        SIM1 = 0,
+        SIM2 = 1
+    };
+
+} // namespace hal::cellular
diff --git a/module-bsp/hal/key_input/AbstractKeyInput.hpp b/module-bsp/hal/include/hal/key_input/AbstractKeyInput.hpp
similarity index 100%
rename from module-bsp/hal/key_input/AbstractKeyInput.hpp
rename to module-bsp/hal/include/hal/key_input/AbstractKeyInput.hpp
diff --git a/module-bsp/hal/key_input/KeyEventDefinitions.hpp b/module-bsp/hal/include/hal/key_input/KeyEventDefinitions.hpp
similarity index 100%
rename from module-bsp/hal/key_input/KeyEventDefinitions.hpp
rename to module-bsp/hal/include/hal/key_input/KeyEventDefinitions.hpp
diff --git a/module-utils/common_data/RawKey.hpp b/module-bsp/hal/include/hal/key_input/RawKey.hpp
similarity index 89%
rename from module-utils/common_data/RawKey.hpp
rename to module-bsp/hal/include/hal/key_input/RawKey.hpp
index 3f663863e..d0fae4978 100644
--- a/module-utils/common_data/RawKey.hpp
+++ b/module-bsp/hal/include/hal/key_input/RawKey.hpp
@@ -29,9 +29,9 @@ struct RawKey
     /// set all values to zero, set new keyCode and state
     void reset(bsp::KeyCodes keyCode = bsp::KeyCodes::Undefined, State state = State::Undefined)
     {
-        this->keyCode  = keyCode;
-        this->state    = state;
-        timePress      = 0;
-        timeRelease    = 0;
+        this->keyCode = keyCode;
+        this->state   = state;
+        timePress     = 0;
+        timeRelease   = 0;
     }
 };
diff --git a/module-bsp/hal/temperature_source/TemperatureSource.hpp b/module-bsp/hal/include/hal/temperature_source/TemperatureSource.hpp
similarity index 100%
rename from module-bsp/hal/temperature_source/TemperatureSource.hpp
rename to module-bsp/hal/include/hal/temperature_source/TemperatureSource.hpp
diff --git a/module-cellular/at/Urc.hpp b/module-cellular/at/Urc.hpp
index bcedd1a73..9571ddd06 100644
--- a/module-cellular/at/Urc.hpp
+++ b/module-cellular/at/Urc.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <module-utils/Utils.hpp>
+#include <Utils.hpp>
 #include "UrcHandler.hpp"
 
 namespace at::urc
diff --git a/module-cellular/at/cmd/src/CFUN.cpp b/module-cellular/at/cmd/src/CFUN.cpp
index 37a223592..8735c0e2c 100644
--- a/module-cellular/at/cmd/src/CFUN.cpp
+++ b/module-cellular/at/cmd/src/CFUN.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 <log.hpp>
+#include <log/log.hpp>
 #include <memory>
 #include <string>
 #include <type_traits>
diff --git a/module-cellular/at/cmd/src/CPBR.cpp b/module-cellular/at/cmd/src/CPBR.cpp
index 420d6d639..7b74c4eb7 100644
--- a/module-cellular/at/cmd/src/CPBR.cpp
+++ b/module-cellular/at/cmd/src/CPBR.cpp
@@ -3,7 +3,7 @@
 
 #include <at/cmd/CPBR.hpp>
 
-#include <log.hpp>
+#include <log/log.hpp>
 #include <memory>
 #include <string>
 
diff --git a/module-cellular/at/cmd/src/CPBS.cpp b/module-cellular/at/cmd/src/CPBS.cpp
index 658dfc70a..826def6b0 100644
--- a/module-cellular/at/cmd/src/CPBS.cpp
+++ b/module-cellular/at/cmd/src/CPBS.cpp
@@ -3,7 +3,7 @@
 
 #include <at/cmd/CPBS.hpp>
 
-#include <log.hpp>
+#include <log/log.hpp>
 #include <memory>
 #include <string>
 
diff --git a/module-cellular/at/cmd/src/CSCA.cpp b/module-cellular/at/cmd/src/CSCA.cpp
index f01deaf7e..bf9b1322c 100644
--- a/module-cellular/at/cmd/src/CSCA.cpp
+++ b/module-cellular/at/cmd/src/CSCA.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 <log.hpp>
+#include <log/log.hpp>
 #include <memory>
 #include <string>
 #include <type_traits>
diff --git a/module-cellular/at/cmd/src/QECCNUM.cpp b/module-cellular/at/cmd/src/QECCNUM.cpp
index 471da9f41..659a88d58 100644
--- a/module-cellular/at/cmd/src/QECCNUM.cpp
+++ b/module-cellular/at/cmd/src/QECCNUM.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 <log.hpp>
+#include <log/log.hpp>
 #include <memory>
 #include <string>
 #include <type_traits>
diff --git a/module-cellular/at/cmd/src/QNWINFO.cpp b/module-cellular/at/cmd/src/QNWINFO.cpp
index 6f87ff91c..5e4b5877c 100644
--- a/module-cellular/at/cmd/src/QNWINFO.cpp
+++ b/module-cellular/at/cmd/src/QNWINFO.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 <log.hpp>
+#include <log/log.hpp>
 #include <at/cmd/QNWINFO.hpp>
 #include <Utils.hpp>
 
diff --git a/module-cellular/at/cmd/src/QSIMSTAT.cpp b/module-cellular/at/cmd/src/QSIMSTAT.cpp
index 82446cef7..9099de2b0 100644
--- a/module-cellular/at/cmd/src/QSIMSTAT.cpp
+++ b/module-cellular/at/cmd/src/QSIMSTAT.cpp
@@ -3,7 +3,7 @@
 
 #include <at/cmd/QSIMSTAT.hpp>
 
-#include <log.hpp>
+#include <log/log.hpp>
 #include <memory>
 #include <string>
 
diff --git a/module-cellular/at/response.hpp b/module-cellular/at/response.hpp
index 2bad028f7..7e00f4aac 100644
--- a/module-cellular/at/response.hpp
+++ b/module-cellular/at/response.hpp
@@ -4,7 +4,7 @@
 #pragma once
 
 #include "Result.hpp"
-#include <log.hpp>
+#include <log/log.hpp>
 #include <map>
 #include <memory>
 #include <string>
diff --git a/module-cellular/at/src/UrcPoweredDown.cpp b/module-cellular/at/src/UrcPoweredDown.cpp
index 5de2a8f6a..cf5079098 100644
--- a/module-cellular/at/src/UrcPoweredDown.cpp
+++ b/module-cellular/at/src/UrcPoweredDown.cpp
@@ -2,7 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include <UrcPoweredDown.hpp>
-#include <module-utils/Utils.hpp>
+#include <Utils.hpp>
 
 using namespace at::urc;
 
diff --git a/module-cellular/at/src/UrcResponse.cpp b/module-cellular/at/src/UrcResponse.cpp
index 9ab308c61..f87d8a07d 100644
--- a/module-cellular/at/src/UrcResponse.cpp
+++ b/module-cellular/at/src/UrcResponse.cpp
@@ -2,7 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include <UrcResponse.hpp>
-#include <module-utils/Utils.hpp>
+#include <Utils.hpp>
 
 using namespace at::urc;
 
diff --git a/module-cellular/modem/ATCommon.cpp b/module-cellular/modem/ATCommon.cpp
index 163dbea8f..b9c14bb54 100644
--- a/module-cellular/modem/ATCommon.cpp
+++ b/module-cellular/modem/ATCommon.cpp
@@ -5,7 +5,7 @@
 #include <at/Cmd.hpp>
 #include "time/ScopedTime.hpp"
 #include <functional>
-#include <log.hpp>
+#include <log/log.hpp>
 #include <string>
 #include <Utils.hpp>
 #include "ATStream.hpp"
diff --git a/module-cellular/modem/mux/CellularMuxFrame.h b/module-cellular/modem/mux/CellularMuxFrame.h
index 24a3bec0c..fc5b058bc 100644
--- a/module-cellular/modem/mux/CellularMuxFrame.h
+++ b/module-cellular/modem/mux/CellularMuxFrame.h
@@ -7,7 +7,7 @@
 #include <inttypes.h>
 #include <vector>
 #include <iostream>
-#include <log.hpp>
+#include <log/log.hpp>
 
 #define TS0710_FLAG          0xF9
 #define TS0710_FRAME_HDR_LEN 6 // without extended address byte
diff --git a/module-cellular/modem/mux/DLCChannel.cpp b/module-cellular/modem/mux/DLCChannel.cpp
index 8a85f9f24..dcc055c75 100644
--- a/module-cellular/modem/mux/DLCChannel.cpp
+++ b/module-cellular/modem/mux/DLCChannel.cpp
@@ -6,7 +6,7 @@
 #include "CellularMuxData.h"
 #include "CellularMuxFrame.h"
 
-#include <log.hpp>
+#include <log/log.hpp>
 #include <ticks.hpp>
 #include <Utils.hpp>
 #include <magic_enum.hpp>
diff --git a/module-db/CMakeLists.txt b/module-db/CMakeLists.txt
index 47105b6f5..d3590561e 100644
--- a/module-db/CMakeLists.txt
+++ b/module-db/CMakeLists.txt
@@ -171,6 +171,7 @@ target_link_libraries(${PROJECT_NAME}
         application-calendar
         Microsoft.GSL::GSL
         rrule
+        board
 )
 
 # Host target configuration(mainly used for unit testing)
diff --git a/module-db/Database/Database.cpp b/module-db/Database/Database.cpp
index 2411cda0f..8834f05ba 100644
--- a/module-db/Database/Database.cpp
+++ b/module-db/Database/Database.cpp
@@ -4,7 +4,7 @@
 #include "Database.hpp"
 #include "DatabaseInitializer.hpp"
 
-#include <log.hpp>
+#include <log/log.hpp>
 
 #include <purefs/filesystem_paths.hpp>
 #include <gsl/util>
diff --git a/module-db/Database/DatabaseInitializer.cpp b/module-db/Database/DatabaseInitializer.cpp
index d836a3eca..9cff8298f 100644
--- a/module-db/Database/DatabaseInitializer.cpp
+++ b/module-db/Database/DatabaseInitializer.cpp
@@ -9,7 +9,7 @@
 #include <set>
 #include <string>
 #include <sstream>
-#include <log.hpp>
+#include <log/log.hpp>
 
 DatabaseInitializer::DatabaseInitializer(Database *db) : db(db)
 {}
diff --git a/module-db/Database/Field.cpp b/module-db/Database/Field.cpp
index a83d26d07..a86d34d0f 100644
--- a/module-db/Database/Field.cpp
+++ b/module-db/Database/Field.cpp
@@ -2,7 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "Field.hpp"
-#include <log.hpp>
+#include <log/log.hpp>
 #include <functional>
 
 const char *Field::getCString() const
diff --git a/module-db/Interface/CalllogRecord.cpp b/module-db/Interface/CalllogRecord.cpp
index 573f833f1..f6c4e1b34 100644
--- a/module-db/Interface/CalllogRecord.cpp
+++ b/module-db/Interface/CalllogRecord.cpp
@@ -4,7 +4,7 @@
 #include "CalllogRecord.hpp"
 
 #include <ContactRecord.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 #include <Tables/CalllogTable.hpp>
 #include <PhoneNumber.hpp>
 #include <Utils.hpp>
diff --git a/module-db/Interface/NotificationsRecord.cpp b/module-db/Interface/NotificationsRecord.cpp
index 3c6a89a64..8061dcd97 100644
--- a/module-db/Interface/NotificationsRecord.cpp
+++ b/module-db/Interface/NotificationsRecord.cpp
@@ -9,7 +9,7 @@
 #include "module-db/queries/notifications/QueryNotificationsGetAll.hpp"
 #include "Databases/NotificationsDB.hpp"
 
-#include <log.hpp>
+#include <log/log.hpp>
 #include <Utils.hpp>
 
 #include <cassert>
diff --git a/module-db/Interface/Record.cpp b/module-db/Interface/Record.cpp
index 23bdb010e..3a6fc7c1c 100644
--- a/module-db/Interface/Record.cpp
+++ b/module-db/Interface/Record.cpp
@@ -3,7 +3,7 @@
 
 #include "Record.hpp"
 #include <Common/Query.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 
 namespace db
 {
diff --git a/module-db/Interface/SMSRecord.cpp b/module-db/Interface/SMSRecord.cpp
index ac990117f..b50f15d72 100644
--- a/module-db/Interface/SMSRecord.cpp
+++ b/module-db/Interface/SMSRecord.cpp
@@ -19,7 +19,7 @@
 #include "queries/messages/sms/QuerySMSGetLastByThreadID.hpp"
 #include <queries/messages/sms/QuerySMSGetForList.hpp>
 
-#include <log.hpp>
+#include <log/log.hpp>
 
 #include <PhoneNumber.hpp>
 #include <optional>
@@ -205,8 +205,8 @@ void SMSRecordInterface::UpdateThreadSummary(ThreadRecord &threadToUpdate, const
 {
     threadToUpdate.snippet = rec.body.substr(
         0, std::min<size_t>({snippetLength, rec.body.length(), rec.body.find("\n"), rec.body.find("\r")}));
-    threadToUpdate.date    = rec.date;
-    threadToUpdate.type    = rec.type;
+    threadToUpdate.date = rec.date;
+    threadToUpdate.type = rec.type;
 }
 
 bool SMSRecordInterface::RemoveByID(uint32_t id)
@@ -464,7 +464,7 @@ std::unique_ptr<db::QueryResult> SMSRecordInterface::updateQuery(const std::shar
 auto SMSRecordInterface::getQueryRecords(const std::shared_ptr<db::Query> &query) -> std::vector<SMSRecord>
 {
     const auto localQuery = static_cast<const db::query::SMSGet *>(query.get());
-    auto smsVector    = smsDB->sms.getLimitOffset(localQuery->getOffset(), localQuery->getLimit());
+    auto smsVector        = smsDB->sms.getLimitOffset(localQuery->getOffset(), localQuery->getLimit());
     return std::vector<SMSRecord>(smsVector.begin(), smsVector.end());
 }
 
diff --git a/module-db/Interface/SMSTemplateRecord.cpp b/module-db/Interface/SMSTemplateRecord.cpp
index 3f901e5b5..ef562724d 100644
--- a/module-db/Interface/SMSTemplateRecord.cpp
+++ b/module-db/Interface/SMSTemplateRecord.cpp
@@ -10,7 +10,7 @@
 #include "queries/messages/templates/QuerySMSTemplateUpdate.hpp"
 #include <queries/messages/templates/QuerySMSTemplateGetForList.hpp>
 
-#include <log.hpp>
+#include <log/log.hpp>
 
 #include <cassert>
 
diff --git a/module-db/Interface/ThreadRecord.cpp b/module-db/Interface/ThreadRecord.cpp
index 0e7beaa3d..746d59cf2 100644
--- a/module-db/Interface/ThreadRecord.cpp
+++ b/module-db/Interface/ThreadRecord.cpp
@@ -15,7 +15,7 @@
 #include <queries/messages/threads/QueryThreadsGetCount.hpp>
 
 #include <cassert>
-#include <log.hpp>
+#include <log/log.hpp>
 
 ThreadRecordInterface::ThreadRecordInterface(SmsDB *smsDb, ContactsDB *contactsDb)
     : smsDB(smsDb), contactsDB(contactsDb)
@@ -241,7 +241,7 @@ std::unique_ptr<db::QueryResult> ThreadRecordInterface::markAsReadQuery(const st
 std::vector<ThreadRecord> ThreadRecordInterface::getThreads(const std::shared_ptr<db::Query> &query)
 {
     const auto localQuery = static_cast<const db::query::ThreadsGet *>(query.get());
-    auto dbResult = smsDB->threads.getLimitOffset(localQuery->offset, localQuery->limit);
+    auto dbResult         = smsDB->threads.getLimitOffset(localQuery->offset, localQuery->limit);
     return std::vector<ThreadRecord>(dbResult.begin(), dbResult.end());
 }
 
@@ -289,7 +289,7 @@ std::unique_ptr<db::QueryResult> ThreadRecordInterface::threadGetByIDQuery(const
 
     const auto ret = GetByID(localQuery->id);
     auto response  = std::make_unique<db::query::ThreadGetByIDResult>(ret.isValid() ? std::optional<ThreadRecord>{ret}
-                                                                                   : std::nullopt);
+                                                                                    : std::nullopt);
     response->setRequestQuery(query);
     return response;
 }
diff --git a/module-db/Tables/CalllogTable.cpp b/module-db/Tables/CalllogTable.cpp
index d1064a61c..8b861e9b5 100644
--- a/module-db/Tables/CalllogTable.cpp
+++ b/module-db/Tables/CalllogTable.cpp
@@ -2,7 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "CalllogTable.hpp"
-#include <log.hpp>
+#include <log/log.hpp>
 #include <Utils.hpp>
 
 CalllogTable::CalllogTable(Database *db) : Table(db)
diff --git a/module-db/Tables/ContactsTable.cpp b/module-db/Tables/ContactsTable.cpp
index 2d3b65496..eb7572fef 100644
--- a/module-db/Tables/ContactsTable.cpp
+++ b/module-db/Tables/ContactsTable.cpp
@@ -2,7 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "ContactsTable.hpp"
-#include <log.hpp>
+#include <log/log.hpp>
 #include <Utils.hpp>
 
 namespace ColumnName
diff --git a/module-db/Tables/NotesTable.cpp b/module-db/Tables/NotesTable.cpp
index 966fc9391..c45b978b1 100644
--- a/module-db/Tables/NotesTable.cpp
+++ b/module-db/Tables/NotesTable.cpp
@@ -2,7 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "NotesTable.hpp"
-#include <log.hpp>
+#include <log/log.hpp>
 #include <string>
 
 NotesTable::NotesTable(Database *db) : Table(db)
diff --git a/module-db/Tables/NotificationsTable.cpp b/module-db/Tables/NotificationsTable.cpp
index 727b43335..f22172171 100644
--- a/module-db/Tables/NotificationsTable.cpp
+++ b/module-db/Tables/NotificationsTable.cpp
@@ -4,7 +4,7 @@
 #include "NotificationsTable.hpp"
 #include "Database/Database.hpp"
 
-#include <log.hpp>
+#include <log/log.hpp>
 #include <Utils.hpp>
 #include <cassert>
 
diff --git a/module-db/Tables/Record.hpp b/module-db/Tables/Record.hpp
index 311474801..f3d9e36c0 100644
--- a/module-db/Tables/Record.hpp
+++ b/module-db/Tables/Record.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <log.hpp>
+#include <log/log.hpp>
 #include <cstdint>
 
 constexpr uint32_t DB_ID_NONE = 0;
diff --git a/module-db/Tables/SMSTable.cpp b/module-db/Tables/SMSTable.cpp
index 0f945a61d..c55a69f64 100644
--- a/module-db/Tables/SMSTable.cpp
+++ b/module-db/Tables/SMSTable.cpp
@@ -2,7 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "SMSTable.hpp"
-#include <log.hpp>
+#include <log/log.hpp>
 
 SMSTable::SMSTable(Database *db) : Table(db)
 {}
diff --git a/module-db/Tables/SMSTemplateTable.cpp b/module-db/Tables/SMSTemplateTable.cpp
index 08d5f1609..00396dc88 100644
--- a/module-db/Tables/SMSTemplateTable.cpp
+++ b/module-db/Tables/SMSTemplateTable.cpp
@@ -4,7 +4,7 @@
 #include "SMSTemplateTable.hpp"
 
 #include <Utils.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 
 #include <cassert>
 
diff --git a/module-db/Tables/ThreadsTable.cpp b/module-db/Tables/ThreadsTable.cpp
index a9bf1b25a..e56f2f332 100644
--- a/module-db/Tables/ThreadsTable.cpp
+++ b/module-db/Tables/ThreadsTable.cpp
@@ -2,7 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "ThreadsTable.hpp"
-#include <log.hpp>
+#include <log/log.hpp>
 
 ThreadsTable::ThreadsTable(Database *db) : Table(db)
 {}
diff --git a/module-db/tests/DbInitializer.cpp b/module-db/tests/DbInitializer.cpp
index 74518ee0e..ba16de06b 100644
--- a/module-db/tests/DbInitializer.cpp
+++ b/module-db/tests/DbInitializer.cpp
@@ -8,7 +8,7 @@
 #include <memory>
 #include <set>
 #include <string>
-#include <log.hpp>
+#include <log/log.hpp>
 
 DatabaseInitializer::DatabaseInitializer(Database *db) : db(db)
 {}
diff --git a/module-gui/CMakeLists.txt b/module-gui/CMakeLists.txt
index 072a4e07c..b9a3f478c 100644
--- a/module-gui/CMakeLists.txt
+++ b/module-gui/CMakeLists.txt
@@ -14,17 +14,20 @@ include_directories( ../module-utils )
 
 target_link_libraries(${PROJECT_NAME} 
     PUBLIC 
-        ${TARGET_LIBRARIES} 
+        ${TARGET_LIBRARIES}
+        module-bsp
         eventstore
-        math
-        module-utils 
+        utils-math
+        module-utils
+        sys-timers
+        sys-watchdog
         utf8
     PRIVATE
         i18n
         json::json
         Microsoft.GSL::GSL
         pugixml::pugixml
-        time
+        utils-time
 )
 
 # Board specific compilation definitions,options,include directories and features
diff --git a/module-gui/gui/core/DrawCommand.cpp b/module-gui/gui/core/DrawCommand.cpp
index c396c0a32..630e6965f 100644
--- a/module-gui/gui/core/DrawCommand.cpp
+++ b/module-gui/gui/core/DrawCommand.cpp
@@ -18,7 +18,7 @@
 #include "FontManager.hpp"
 #include "RawFont.hpp"
 // utils
-#include <log.hpp>
+#include <log/log.hpp>
 // module-utils
 #include <cmath>
 #include <cassert>
diff --git a/module-gui/gui/core/Font.cpp b/module-gui/gui/core/Font.cpp
index aa11b78a9..ec0bbcd98 100644
--- a/module-gui/gui/core/Font.cpp
+++ b/module-gui/gui/core/Font.cpp
@@ -4,7 +4,7 @@
 #include "Font.hpp"
 #include "FontManager.hpp" // for FontManager
 #include "RawFont.hpp"
-#include <log.hpp>
+#include <log/log.hpp>
 #include <algorithm>
 #include <sstream>
 
diff --git a/module-gui/gui/core/FontManager.cpp b/module-gui/gui/core/FontManager.cpp
index 55b6de95d..0fb161f90 100644
--- a/module-gui/gui/core/FontManager.cpp
+++ b/module-gui/gui/core/FontManager.cpp
@@ -5,7 +5,7 @@
 #include "Common.hpp"   // for Status, Status::GUI_SUCCESS
 #include "FontInfo.hpp" // for FontInfo
 #include "RawFont.hpp"  // for RawFont
-#include <log.hpp>      // for LOG_ERROR, LOG_INFO, LOG_WARN
+#include <log/log.hpp>  // for LOG_ERROR, LOG_INFO, LOG_WARN
 #include <Utils.hpp>
 #include <filesystem>
 #include <cstdio>
diff --git a/module-gui/gui/core/ImageManager.cpp b/module-gui/gui/core/ImageManager.cpp
index f5168b7ce..5b0d67f8e 100644
--- a/module-gui/gui/core/ImageManager.cpp
+++ b/module-gui/gui/core/ImageManager.cpp
@@ -7,7 +7,7 @@
 #include "PixMap.hpp"
 #include "DrawCommand.hpp"
 #include "Renderer.hpp"
-#include <log.hpp>
+#include <log/log.hpp>
 #include <set>
 #include <string>
 #include <filesystem>
@@ -28,8 +28,8 @@ namespace gui
 
     void ImageManager::loadImageMaps(std::string baseDirectory)
     {
-        mapFolder                            = baseDirectory + "/images";
-        auto [pixMapFiles, vecMapFiles]      = getImageMapList(".mpi", ".vpi");
+        mapFolder                       = baseDirectory + "/images";
+        auto [pixMapFiles, vecMapFiles] = getImageMapList(".mpi", ".vpi");
 
         for (std::string mapName : pixMapFiles) {
             loadPixMap(mapName);
diff --git a/module-gui/gui/core/RawFont.cpp b/module-gui/gui/core/RawFont.cpp
index d449abebc..75a6eb825 100644
--- a/module-gui/gui/core/RawFont.cpp
+++ b/module-gui/gui/core/RawFont.cpp
@@ -8,7 +8,7 @@
 #include "FontKerning.hpp"   // for FontKerning
 #include "Renderer.hpp"      // for Renderer
 #include "TextConstants.hpp" // for newline
-#include <log.hpp>           // for LOG_ERROR
+#include <log/log.hpp>       // for LOG_ERROR
 #include "utf8/UTF8.hpp"     // for UTF8
 #include <cstring>           // for memcpy
 #include <utility>           // for pair
diff --git a/module-gui/gui/input/InputEvent.hpp b/module-gui/gui/input/InputEvent.hpp
index 7c68c13e4..04647e44a 100644
--- a/module-gui/gui/input/InputEvent.hpp
+++ b/module-gui/gui/input/InputEvent.hpp
@@ -3,10 +3,11 @@
 
 #pragma once
 
+#include <hal/key_input/RawKey.hpp>
+
 #include <sstream>
 #include <cstdint>
 #include <type_traits>
-#include "common_data/RawKey.hpp"
 
 namespace gui
 {
diff --git a/module-gui/gui/input/Profile.cpp b/module-gui/gui/input/Profile.cpp
index 9f1876c44..1ff6fa4ba 100644
--- a/module-gui/gui/input/Profile.cpp
+++ b/module-gui/gui/input/Profile.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 <log.hpp>
+#include <log/log.hpp>
 #include "utf8/UTF8.hpp"
 #include "Profile.hpp"
 #include <Utils.hpp>
diff --git a/module-gui/gui/input/Translator.cpp b/module-gui/gui/input/Translator.cpp
index cb38d5323..9f4e22d8c 100644
--- a/module-gui/gui/input/Translator.cpp
+++ b/module-gui/gui/input/Translator.cpp
@@ -2,7 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "Translator.hpp"
-#include <log.hpp>
+#include <log/log.hpp>
 #include <algorithm>
 #include <filesystem>
 #include "i18n/i18n.hpp"
diff --git a/module-gui/gui/input/Translator.hpp b/module-gui/gui/input/Translator.hpp
index 4d4436e7e..a488e9fcd 100644
--- a/module-gui/gui/input/Translator.hpp
+++ b/module-gui/gui/input/Translator.hpp
@@ -5,7 +5,7 @@
 
 #include "InputEvent.hpp"
 #include "Profile.hpp"
-#include <common_data/RawKey.hpp>
+#include <hal/key_input/RawKey.hpp>
 #include <cstdint>
 #include <map>
 #include <memory>
diff --git a/module-gui/gui/widgets/Arc.cpp b/module-gui/gui/widgets/Arc.cpp
index b9a27cd5a..fd6b0ba6b 100644
--- a/module-gui/gui/widgets/Arc.cpp
+++ b/module-gui/gui/widgets/Arc.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 <log.hpp>
+#include <log/log.hpp>
 #include "Arc.hpp"
 #include "DrawCommand.hpp"
 
diff --git a/module-gui/gui/widgets/BottomBar.cpp b/module-gui/gui/widgets/BottomBar.cpp
index 8a62b8dcf..104260c15 100644
--- a/module-gui/gui/widgets/BottomBar.cpp
+++ b/module-gui/gui/widgets/BottomBar.cpp
@@ -12,7 +12,7 @@
 #include "Margins.hpp"
 #include "utf8/UTF8.hpp"
 #include <Style.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 
 namespace gui
 {
diff --git a/module-gui/gui/widgets/BoxLayout.cpp b/module-gui/gui/widgets/BoxLayout.cpp
index 478793d87..e9d458f26 100644
--- a/module-gui/gui/widgets/BoxLayout.cpp
+++ b/module-gui/gui/widgets/BoxLayout.cpp
@@ -5,7 +5,7 @@
 #include "BoxLayoutSizeStore.hpp"
 #include <InputEvent.hpp>
 #include <Label.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 #include "assert.h"
 
 namespace gui
diff --git a/module-gui/gui/widgets/BoxLayout.hpp b/module-gui/gui/widgets/BoxLayout.hpp
index a362590a2..156c15e9d 100644
--- a/module-gui/gui/widgets/BoxLayout.hpp
+++ b/module-gui/gui/widgets/BoxLayout.hpp
@@ -9,7 +9,7 @@
 #include "Rect.hpp"
 #include <Alignment.hpp>
 #include "LayoutSizeStore.hpp"
-#include <log.hpp>
+#include <log/log.hpp>
 
 namespace gui
 {
@@ -60,7 +60,7 @@ namespace gui
         };
 
         template <Axis axis> void resizeItems();
-        template <Axis axis>[[nodiscard]] Position getAxisAlignmentValue(Position calcPos, Length calcSize, Item *el);
+        template <Axis axis> [[nodiscard]] Position getAxisAlignmentValue(Position calcPos, Length calcSize, Item *el);
 
         std::list<Item *> outOfDrawAreaItems;
         void addToOutOfDrawAreaList(Item *item);
@@ -68,16 +68,16 @@ namespace gui
         virtual void resizeItems();
         bool reverseOrder = false;
 
-        template <Axis axis>[[nodiscard]] Length calculateElemResize(Item *el, Length &toSplit);
+        template <Axis axis> [[nodiscard]] Length calculateElemResize(Item *el, Length &toSplit);
         template <Axis axis>
         [[nodiscard]] Length calculateElemAxisSize(Item *el, Length calculatedResize, Length &toSplit);
-        template <Axis axis>[[nodiscard]] Length calculateElemOrtAxisSize(Item *el);
+        template <Axis axis> [[nodiscard]] Length calculateElemOrtAxisSize(Item *el);
         template <Axis axis>
         [[nodiscard]] Position calculateElemAxisPosition(Item *el,
                                                          Length axisItemSize,
                                                          Position &startingPosition,
                                                          Position &leftPosition);
-        template <Axis axis>[[nodiscard]] Position calculateElemOrtAxisPosition(Item *el, Length orthogonalItemSize);
+        template <Axis axis> [[nodiscard]] Position calculateElemOrtAxisPosition(Item *el, Length orthogonalItemSize);
 
         Item *getLastVisibleElement();
 
diff --git a/module-gui/gui/widgets/Circle.cpp b/module-gui/gui/widgets/Circle.cpp
index b4e4444ce..17bae51bb 100644
--- a/module-gui/gui/widgets/Circle.cpp
+++ b/module-gui/gui/widgets/Circle.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 <log.hpp>
+#include <log/log.hpp>
 #include "Circle.hpp"
 #include "DrawCommand.hpp"
 
diff --git a/module-gui/gui/widgets/GridLayout.cpp b/module-gui/gui/widgets/GridLayout.cpp
index eb76fe46b..735062601 100644
--- a/module-gui/gui/widgets/GridLayout.cpp
+++ b/module-gui/gui/widgets/GridLayout.cpp
@@ -4,7 +4,7 @@
 #include "GridLayout.hpp"
 #include "InputEvent.hpp"
 #include "Style.hpp"
-#include <log.hpp>
+#include <log/log.hpp>
 
 using namespace gui;
 
diff --git a/module-gui/gui/widgets/Image.cpp b/module-gui/gui/widgets/Image.cpp
index 696590b5c..8782d0b02 100644
--- a/module-gui/gui/widgets/Image.cpp
+++ b/module-gui/gui/widgets/Image.cpp
@@ -7,7 +7,7 @@
 #include "ImageManager.hpp"
 
 #include <utf8/UTF8.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 
 namespace gui
 {
diff --git a/module-gui/gui/widgets/InputMode.cpp b/module-gui/gui/widgets/InputMode.cpp
index 961c01b08..d0db5a732 100644
--- a/module-gui/gui/widgets/InputMode.cpp
+++ b/module-gui/gui/widgets/InputMode.cpp
@@ -4,7 +4,7 @@
 #include <InputMode.hpp>
 #include <i18n/i18n.hpp>
 #include <map>
-#include <log.hpp>
+#include <log/log.hpp>
 
 /// input mode strings - as these are stored in json (in files...)
 const std::map<InputMode::Mode, std::string> input_mode = {
diff --git a/module-gui/gui/widgets/Label.cpp b/module-gui/gui/widgets/Label.cpp
index 00d26f69d..35e63450b 100644
--- a/module-gui/gui/widgets/Label.cpp
+++ b/module-gui/gui/widgets/Label.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 <log.hpp>
+#include <log/log.hpp>
 #include "utf8/UTF8.hpp"
 
 #include "../core/DrawCommand.hpp"
diff --git a/module-gui/gui/widgets/ListItem.cpp b/module-gui/gui/widgets/ListItem.cpp
index 3f96c2873..a72f328b9 100644
--- a/module-gui/gui/widgets/ListItem.cpp
+++ b/module-gui/gui/widgets/ListItem.cpp
@@ -2,7 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "ListItem.hpp"
-#include <log.hpp>
+#include <log/log.hpp>
 #include <Style.hpp>
 
 namespace gui
diff --git a/module-gui/gui/widgets/ListView.cpp b/module-gui/gui/widgets/ListView.cpp
index b43248cbc..daa23d095 100644
--- a/module-gui/gui/widgets/ListView.cpp
+++ b/module-gui/gui/widgets/ListView.cpp
@@ -4,7 +4,7 @@
 #include "ListView.hpp"
 #include "InputEvent.hpp"
 #include "cassert"
-#include <log.hpp>
+#include <log/log.hpp>
 
 namespace gui
 {
diff --git a/module-gui/gui/widgets/ListViewEngine.cpp b/module-gui/gui/widgets/ListViewEngine.cpp
index c619d7106..3239433d5 100644
--- a/module-gui/gui/widgets/ListViewEngine.cpp
+++ b/module-gui/gui/widgets/ListViewEngine.cpp
@@ -4,7 +4,7 @@
 #include "ListViewEngine.hpp"
 
 #include <cassert>
-#include <log.hpp>
+#include <log/log.hpp>
 
 namespace gui
 {
@@ -436,7 +436,7 @@ namespace gui
             unsigned int diff = currentPageSize < body->getVisibleChildrenCount()
                                     ? 0
                                     : currentPageSize - body->getVisibleChildrenCount();
-            currentPageSize = body->getVisibleChildrenCount();
+            currentPageSize   = body->getVisibleChildrenCount();
 
             if (direction == listview::Direction::Top) {
                 startIndex += diff;
diff --git a/module-gui/gui/widgets/ProgressBar.cpp b/module-gui/gui/widgets/ProgressBar.cpp
index b7ef02590..fc0dab84d 100644
--- a/module-gui/gui/widgets/ProgressBar.cpp
+++ b/module-gui/gui/widgets/ProgressBar.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 <log.hpp>
+#include <log/log.hpp>
 #include <Math.hpp>
 
 #include "DrawCommand.hpp"
diff --git a/module-gui/gui/widgets/Rect.cpp b/module-gui/gui/widgets/Rect.cpp
index 775ca58aa..e9c90bfae 100644
--- a/module-gui/gui/widgets/Rect.cpp
+++ b/module-gui/gui/widgets/Rect.cpp
@@ -13,7 +13,7 @@
 
 #include "Rect.hpp"
 #include "Style.hpp"
-#include <log.hpp>
+#include <log/log.hpp>
 
 namespace gui
 {
diff --git a/module-gui/gui/widgets/RichTextParser.cpp b/module-gui/gui/widgets/RichTextParser.cpp
index 5af028c03..16df66887 100644
--- a/module-gui/gui/widgets/RichTextParser.cpp
+++ b/module-gui/gui/widgets/RichTextParser.cpp
@@ -9,11 +9,11 @@
 #include <sstream>
 #include <string>
 #include <map>
-#include <log.hpp>
+#include <log/log.hpp>
 #include "TextFormat.hpp"
 
 #include <pugixml.hpp>
-#include <module-utils/Utils.hpp>
+#include <Utils.hpp>
 #include <utility>
 
 #ifdef DEBUG_RTP
diff --git a/module-gui/gui/widgets/Text.cpp b/module-gui/gui/widgets/Text.cpp
index 0af90e59b..33d721451 100644
--- a/module-gui/gui/widgets/Text.cpp
+++ b/module-gui/gui/widgets/Text.cpp
@@ -15,7 +15,7 @@
 #include "TextDocument.hpp"
 #include "TextLine.hpp"
 #include "TextParse.hpp"
-#include <log.hpp>
+#include <log/log.hpp>
 #include "utf8/UTF8.hpp"
 #include <Style.hpp>
 #include <cassert>
diff --git a/module-gui/gui/widgets/TextBlock.cpp b/module-gui/gui/widgets/TextBlock.cpp
index 7f52cfbd9..ec79f08cc 100644
--- a/module-gui/gui/widgets/TextBlock.cpp
+++ b/module-gui/gui/widgets/TextBlock.cpp
@@ -3,7 +3,7 @@
 
 #include "TextBlock.hpp"
 #include "TextConstants.hpp"
-#include <log.hpp>
+#include <log/log.hpp>
 #include <cassert>
 #include <TextFormat.hpp>
 #include <RawFont.hpp>
diff --git a/module-gui/gui/widgets/TextBlockCursor.cpp b/module-gui/gui/widgets/TextBlockCursor.cpp
index 7e9e21386..8ec739400 100644
--- a/module-gui/gui/widgets/TextBlockCursor.cpp
+++ b/module-gui/gui/widgets/TextBlockCursor.cpp
@@ -5,7 +5,7 @@
 #include "TextBlock.hpp"
 #include "TextDocument.hpp"
 #include "TextParse.hpp"
-#include <log.hpp>
+#include <log/log.hpp>
 #include <cassert>
 
 static const int last_char_inclusive = 0; // if then -1 / else 0
diff --git a/module-gui/gui/widgets/TextCursor.cpp b/module-gui/gui/widgets/TextCursor.cpp
index aeb3053cc..ca7158c7d 100644
--- a/module-gui/gui/widgets/TextCursor.cpp
+++ b/module-gui/gui/widgets/TextCursor.cpp
@@ -6,7 +6,7 @@
 #include "Text.hpp"
 #include "TextBlockCursor.hpp"
 #include "TextDocument.hpp"
-#include <log.hpp>
+#include <log/log.hpp>
 #include "TextLine.hpp"
 #include <cassert>
 #include <RawFont.hpp>
diff --git a/module-gui/gui/widgets/TextLineCursor.cpp b/module-gui/gui/widgets/TextLineCursor.cpp
index 60bb2e10e..3c046188f 100644
--- a/module-gui/gui/widgets/TextLineCursor.cpp
+++ b/module-gui/gui/widgets/TextLineCursor.cpp
@@ -3,7 +3,7 @@
 
 #include "TextLineCursor.hpp"
 #include "Text.hpp"
-#include <log.hpp>
+#include <log/log.hpp>
 
 #define debug_text_cursor(...)
 // #define debug_text_cursor(...) LOG_DEBUG(__VA_ARGS__)
diff --git a/module-gui/gui/widgets/status-bar/PhoneMode.cpp b/module-gui/gui/widgets/status-bar/PhoneMode.cpp
index e51b51949..4fd50738c 100644
--- a/module-gui/gui/widgets/status-bar/PhoneMode.cpp
+++ b/module-gui/gui/widgets/status-bar/PhoneMode.cpp
@@ -3,7 +3,7 @@
 
 #include "PhoneMode.hpp"
 
-#include <log.hpp>
+#include <log/log.hpp>
 #include <i18n/i18n.hpp>
 
 #include "Item.hpp"
diff --git a/module-gui/gui/widgets/status-bar/StatusBarWidgetBase.hpp b/module-gui/gui/widgets/status-bar/StatusBarWidgetBase.hpp
index 5d3b11828..1c94e88d1 100644
--- a/module-gui/gui/widgets/status-bar/StatusBarWidgetBase.hpp
+++ b/module-gui/gui/widgets/status-bar/StatusBarWidgetBase.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <log.hpp>
+#include <log/log.hpp>
 
 namespace gui::status_bar
 {
diff --git a/module-gui/test/mock/TestListViewProvider.cpp b/module-gui/test/mock/TestListViewProvider.cpp
index a9c17c62c..ad2a1290e 100644
--- a/module-gui/test/mock/TestListViewProvider.cpp
+++ b/module-gui/test/mock/TestListViewProvider.cpp
@@ -2,7 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "TestListViewProvider.hpp"
-#include <log.hpp>
+#include <log/log.hpp>
 
 namespace gui
 {
diff --git a/module-gui/test/test-catch/test-context.cpp b/module-gui/test/test-catch/test-context.cpp
index a7e011117..dfd384484 100644
--- a/module-gui/test/test-catch/test-context.cpp
+++ b/module-gui/test/test-catch/test-context.cpp
@@ -6,7 +6,7 @@
 
 #include <catch2/catch.hpp>
 #include <module-gui/gui/core/Context.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 
 TEST_CASE("test context size and position")
 {
diff --git a/module-gui/test/test-catch/test-gui.cpp b/module-gui/test/test-catch/test-gui.cpp
index 7e6d41043..12ff192d2 100644
--- a/module-gui/test/test-catch/test-gui.cpp
+++ b/module-gui/test/test-catch/test-gui.cpp
@@ -17,7 +17,7 @@
 #include <fcntl.h>
 #include <catch2/catch.hpp>
 
-#include <log.hpp>
+#include <log/log.hpp>
 #include <utf8/UTF8.hpp>
 
 #include <module-gui/gui/core/ImageManager.hpp>
diff --git a/module-gui/test/test-google/CMakeLists.txt b/module-gui/test/test-google/CMakeLists.txt
index 135c5ec3f..e4588d24f 100644
--- a/module-gui/test/test-google/CMakeLists.txt
+++ b/module-gui/test/test-google/CMakeLists.txt
@@ -12,5 +12,7 @@ add_gtest_executable(
         LIBS
                 module-utils
                 module-gui
+                sys-service
+                sys-timers
         USE_FS
 )
diff --git a/module-gui/test/test-google/test-gui-boxlayout.cpp b/module-gui/test/test-google/test-gui-boxlayout.cpp
index 5c7a648ff..8100527c2 100644
--- a/module-gui/test/test-google/test-gui-boxlayout.cpp
+++ b/module-gui/test/test-google/test-gui-boxlayout.cpp
@@ -5,7 +5,7 @@
 
 #include "TestBoxLayout.hpp"
 
-#include <log.hpp>
+#include <log/log.hpp>
 #include <module-gui/test/mock/TestListViewProvider.hpp>
 #include <gui/input/InputEvent.hpp>
 
diff --git a/module-gui/test/test-google/test-gui-gridlayout.cpp b/module-gui/test/test-google/test-gui-gridlayout.cpp
index 0cdcdfc32..fcc7eb201 100644
--- a/module-gui/test/test-google/test-gui-gridlayout.cpp
+++ b/module-gui/test/test-google/test-gui-gridlayout.cpp
@@ -2,7 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "gtest/gtest.h"
-#include <log.hpp>
+#include <log/log.hpp>
 #include <module-gui/gui/widgets/BoxLayout.hpp>
 #include <module-gui/gui/widgets/GridLayout.hpp>
 #include <gui/input/InputEvent.hpp>
diff --git a/module-gui/test/test-google/test-gui-listview.cpp b/module-gui/test/test-google/test-gui-listview.cpp
index d59f9f34a..c235b9c79 100644
--- a/module-gui/test/test-google/test-gui-listview.cpp
+++ b/module-gui/test/test-google/test-gui-listview.cpp
@@ -9,7 +9,7 @@
 #include <gui/widgets/ListView.hpp>
 #include <test/mock/TestListViewProvider.hpp>
 
-#include <log.hpp>
+#include <log/log.hpp>
 
 class ListViewTesting : public ::testing::Test
 {
diff --git a/module-os/CMakeLists.txt b/module-os/CMakeLists.txt
index 97502e8fd..03f2794e7 100644
--- a/module-os/CMakeLists.txt
+++ b/module-os/CMakeLists.txt
@@ -79,4 +79,4 @@ if((${PROJECT_TARGET} STREQUAL "TARGET_RT1051") AND (${SYSTEM_VIEW_ENABLED}))
     target_link_libraries(${PROJECT_NAME} PUBLIC segger::systemview)
 endif()
 
-target_link_libraries(${PROJECT_NAME} PUBLIC module-utils)
+target_link_libraries(${PROJECT_NAME} PUBLIC log-api board-config)
diff --git a/module-os/FreeRTOS/application.c b/module-os/FreeRTOS/application.c
index 7de4052ec..b70db8de7 100644
--- a/module-os/FreeRTOS/application.c
+++ b/module-os/FreeRTOS/application.c
@@ -1,6 +1,6 @@
 #include "FreeRTOS.h"
 #include "task.h"
-#include <log.hpp>
+#include <log/log.hpp>
 
 #include <assert.h>
 #include <stdlib.h>
@@ -8,15 +8,15 @@
 /* configSUPPORT_STATIC_ALLOCATION is set to 1, so the application must provide an
 implementation of vApplicationGetIdleTaskMemory() to provide the memory that is
 used by the Idle task. */
-void vApplicationGetIdleTaskMemory( StaticTask_t **ppxIdleTaskTCBBuffer,
-                                    StackType_t **ppxIdleTaskStackBuffer,
-                                    uint32_t *pulIdleTaskStackSize )
+void vApplicationGetIdleTaskMemory(StaticTask_t **ppxIdleTaskTCBBuffer,
+                                   StackType_t **ppxIdleTaskStackBuffer,
+                                   uint32_t *pulIdleTaskStackSize)
 {
-/* If the buffers to be provided to the Idle task are declared inside this
-function then they must be declared static - otherwise they will be allocated on
-the stack and so not exists after this function exits. */
-static StaticTask_t xIdleTaskTCB;
-static StackType_t uxIdleTaskStack[ configMINIMAL_STACK_SIZE ];
+    /* If the buffers to be provided to the Idle task are declared inside this
+    function then they must be declared static - otherwise they will be allocated on
+    the stack and so not exists after this function exits. */
+    static StaticTask_t xIdleTaskTCB;
+    static StackType_t uxIdleTaskStack[configMINIMAL_STACK_SIZE];
 
     /* Pass out a pointer to the StaticTask_t structure in which the Idle task's
     state will be stored. */
@@ -35,15 +35,15 @@ static StackType_t uxIdleTaskStack[ configMINIMAL_STACK_SIZE ];
 /* configSUPPORT_STATIC_ALLOCATION and configUSE_TIMERS are both set to 1, so the
 application must provide an implementation of vApplicationGetTimerTaskMemory()
 to provide the memory that is used by the Timer service task. */
-void vApplicationGetTimerTaskMemory( StaticTask_t **ppxTimerTaskTCBBuffer,
-                                     StackType_t **ppxTimerTaskStackBuffer,
-                                     uint32_t *pulTimerTaskStackSize )
+void vApplicationGetTimerTaskMemory(StaticTask_t **ppxTimerTaskTCBBuffer,
+                                    StackType_t **ppxTimerTaskStackBuffer,
+                                    uint32_t *pulTimerTaskStackSize)
 {
-/* If the buffers to be provided to the Timer task are declared inside this
-function then they must be declared static - otherwise they will be allocated on
-the stack and so not exists after this function exits. */
-static StaticTask_t xTimerTaskTCB;
-static StackType_t uxTimerTaskStack[ configTIMER_TASK_STACK_DEPTH ];
+    /* If the buffers to be provided to the Timer task are declared inside this
+    function then they must be declared static - otherwise they will be allocated on
+    the stack and so not exists after this function exits. */
+    static StaticTask_t xTimerTaskTCB;
+    static StackType_t uxTimerTaskStack[configTIMER_TASK_STACK_DEPTH];
 
     /* Pass out a pointer to the StaticTask_t structure in which the Timer
     task's state will be stored. */
@@ -58,18 +58,18 @@ static StackType_t uxTimerTaskStack[ configTIMER_TASK_STACK_DEPTH ];
     *pulTimerTaskStackSize = configTIMER_TASK_STACK_DEPTH;
 }
 
-#if( configUSE_MALLOC_FAILED_HOOK == 1 )
+#if (configUSE_MALLOC_FAILED_HOOK == 1)
 /**
  * @brief Redefinition of FreeRTOS malloc failed hook.
  */
-void vApplicationMallocFailedHook( void )
+void vApplicationMallocFailedHook(void)
 {
-    //LOG_FATAL("Task %s malloc failed ! \n", pcTaskGetName(NULL));
+    // LOG_FATAL("Task %s malloc failed ! \n", pcTaskGetName(NULL));
     abort();
 }
 #endif
 
-#if(  configCHECK_FOR_STACK_OVERFLOW > 0 )
+#if (configCHECK_FOR_STACK_OVERFLOW > 0)
 /**
  * @brief Redefinition of FreeRTOS stack overflow hook.
  * Log error condition and invoke system restart procedure.
@@ -77,17 +77,16 @@ void vApplicationMallocFailedHook( void )
  * memory used by another task/tasks hence there is no certainty that
  * system will be in healthy condition after task restore.
  */
-void vApplicationStackOverflowHook( TaskHandle_t xTask,
-                                    signed char *pcTaskName )
+void vApplicationStackOverflowHook(TaskHandle_t xTask, signed char *pcTaskName)
 {
     (void)xTask;
-    LOG_FATAL("Stack overflow:%s",pcTaskName);
+    LOG_FATAL("Stack overflow:%s", pcTaskName);
     abort();
 }
 #endif
 
 void vApplicationTickHook()
 {
-//    static uint8_t status = 0;
-//    GPIO_PinWrite(base, pin, output)
+    //    static uint8_t status = 0;
+    //    GPIO_PinWrite(base, pin, output)
 }
diff --git a/module-os/FreeRTOS/include/FreeRTOSConfig.h b/module-os/FreeRTOS/include/FreeRTOSConfig.h
index 89f4fa630..aeb6408cd 100644
--- a/module-os/FreeRTOS/include/FreeRTOSConfig.h
+++ b/module-os/FreeRTOS/include/FreeRTOSConfig.h
@@ -39,101 +39,101 @@
  *----------------------------------------------------------*/
 #include <assert.h>
 #include <stdint.h>
-#include <log.hpp>
+#include <log/log.hpp>
 
-//TODO: Look at tasks.c: void vTaskStepTick( const TickType_t xTicksToJump ) before upgrading FreeRTOS
+// TODO: Look at tasks.c: void vTaskStepTick( const TickType_t xTicksToJump ) before upgrading FreeRTOS
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
-/* System clock frequency. */
-extern uint32_t SystemCoreClock;
+    /* System clock frequency. */
+    extern uint32_t SystemCoreClock;
 #ifdef __cplusplus
 }
 #endif
 
-#define configUSE_PREEMPTION                    1
-#define configUSE_TICKLESS_IDLE                 0
-#define configCPU_CLOCK_HZ                      (SystemCoreClock)
-#define configTICK_RATE_HZ                      ((TickType_t)1000)
-#define configMAX_PRIORITIES                    5
-#define configMINIMAL_STACK_SIZE                ((unsigned short)128)       //< Number of uint32_t's. So value of 128 will mean 512 bytes
-#define configMAX_TASK_NAME_LEN                 64
-#define configUSE_16_BIT_TICKS                  0
-#define configIDLE_SHOULD_YIELD                 1
-#define configUSE_TASK_NOTIFICATIONS            1
-#define configUSE_MUTEXES                       1
-#define configUSE_RECURSIVE_MUTEXES             1
-#define configUSE_COUNTING_SEMAPHORES           1
-#define configUSE_ALTERNATIVE_API               0 /* Deprecated! */
-#define configQUEUE_REGISTRY_SIZE               32
-#define configUSE_QUEUE_SETS                    1
-#define configUSE_TIME_SLICING                  1
+#define configUSE_PREEMPTION          1
+#define configUSE_TICKLESS_IDLE       0
+#define configCPU_CLOCK_HZ            (SystemCoreClock)
+#define configTICK_RATE_HZ            ((TickType_t)1000)
+#define configMAX_PRIORITIES          5
+#define configMINIMAL_STACK_SIZE      ((unsigned short)128) //< Number of uint32_t's. So value of 128 will mean 512 bytes
+#define configMAX_TASK_NAME_LEN       64
+#define configUSE_16_BIT_TICKS        0
+#define configIDLE_SHOULD_YIELD       1
+#define configUSE_TASK_NOTIFICATIONS  1
+#define configUSE_MUTEXES             1
+#define configUSE_RECURSIVE_MUTEXES   1
+#define configUSE_COUNTING_SEMAPHORES 1
+#define configUSE_ALTERNATIVE_API     0 /* Deprecated! */
+#define configQUEUE_REGISTRY_SIZE     32
+#define configUSE_QUEUE_SETS          1
+#define configUSE_TIME_SLICING        1
 #ifdef TARGET_Linux
-#	define configUSE_NEWLIB_REENTRANT              0
+#define configUSE_NEWLIB_REENTRANT 0
 #else
-#	define configUSE_NEWLIB_REENTRANT              1
+#define configUSE_NEWLIB_REENTRANT 1
 #endif
 #define configENABLE_BACKWARD_COMPATIBILITY     1
 #define configNUM_THREAD_LOCAL_STORAGE_POINTERS 5
 #define configUSE_APPLICATION_TASK_TAG          0
 
 /* Memory allocation related definitions. */
-#define configSUPPORT_STATIC_ALLOCATION         1
-#define configSUPPORT_DYNAMIC_ALLOCATION        1
+#define configSUPPORT_STATIC_ALLOCATION  1
+#define configSUPPORT_DYNAMIC_ALLOCATION 1
 #ifdef TARGET_Linux
-#   define configTOTAL_HEAP_SIZE                   ((size_t)(1024*512))
+#define configTOTAL_HEAP_SIZE ((size_t)(1024 * 512))
 #else
-#   define configTOTAL_HEAP_SIZE                   ((size_t)(1024*386))
+#define configTOTAL_HEAP_SIZE ((size_t)(1024 * 386))
 #endif
 
-#define configAPPLICATION_ALLOCATED_HEAP        0
+#define configAPPLICATION_ALLOCATED_HEAP 0
 
 /* Hook function related definitions. */
-#define configUSE_IDLE_HOOK                     0
-#define configUSE_TICK_HOOK                     0
-#define configCHECK_FOR_STACK_OVERFLOW          2
-#define configUSE_MALLOC_FAILED_HOOK            1
-#define configUSE_DAEMON_TASK_STARTUP_HOOK      0
+#define configUSE_IDLE_HOOK                0
+#define configUSE_TICK_HOOK                0
+#define configCHECK_FOR_STACK_OVERFLOW     2
+#define configUSE_MALLOC_FAILED_HOOK       1
+#define configUSE_DAEMON_TASK_STARTUP_HOOK 0
 
 /* Run time and task stats gathering related definitions. */
-#define configGENERATE_RUN_TIME_STATS           1
-#define configUSE_TRACE_FACILITY                1
-#define configUSE_STATS_FORMATTING_FUNCTIONS    1
-#define configRECORD_STACK_HIGH_ADDRESS		    1
+#define configGENERATE_RUN_TIME_STATS        1
+#define configUSE_TRACE_FACILITY             1
+#define configUSE_STATS_FORMATTING_FUNCTIONS 1
+#define configRECORD_STACK_HIGH_ADDRESS      1
 
 /* Co-routine related definitions. */
-#define configUSE_CO_ROUTINES                   0
-#define configMAX_CO_ROUTINE_PRIORITIES         2
+#define configUSE_CO_ROUTINES           0
+#define configMAX_CO_ROUTINE_PRIORITIES 2
 
 /* Software timer related definitions. */
-#define configUSE_TIMERS                        1
-#define configTIMER_TASK_PRIORITY               0
-#define configTIMER_QUEUE_LENGTH                48
-#define configTIMER_TASK_STACK_DEPTH            (1024)
+#define configUSE_TIMERS             1
+#define configTIMER_TASK_PRIORITY    0
+#define configTIMER_QUEUE_LENGTH     48
+#define configTIMER_TASK_STACK_DEPTH (1024)
 
 /* Define to trap errors during development. */
 #ifndef NDEBUG
-#   define configASSERT(x)                      assert(x)
+#define configASSERT(x) assert(x)
 #endif
 
-
 /* Optional functions - most linkers will remove unused functions anyway. */
-#define INCLUDE_vTaskPrioritySet                1
-#define INCLUDE_uxTaskPriorityGet               1
-#define INCLUDE_vTaskDelete                     1
-#define INCLUDE_vTaskSuspend                    1
-#define INCLUDE_vTaskDelayUntil                 1
-#define INCLUDE_vTaskDelay                      1
-#define INCLUDE_xTaskGetSchedulerState          1
-#define INCLUDE_xTaskGetCurrentTaskHandle       1
-#define INCLUDE_uxTaskGetStackHighWaterMark     1
-#define INCLUDE_uxTaskGetStackHighWaterMark2    1
-#define INCLUDE_xTaskGetIdleTaskHandle          1
-#define INCLUDE_eTaskGetState                   0
-#define INCLUDE_xTimerPendFunctionCall          1
-#define INCLUDE_xTaskAbortDelay                 0
-#define INCLUDE_xTaskGetHandle                  0
-#define INCLUDE_xTaskResumeFromISR              1
+#define INCLUDE_vTaskPrioritySet             1
+#define INCLUDE_uxTaskPriorityGet            1
+#define INCLUDE_vTaskDelete                  1
+#define INCLUDE_vTaskSuspend                 1
+#define INCLUDE_vTaskDelayUntil              1
+#define INCLUDE_vTaskDelay                   1
+#define INCLUDE_xTaskGetSchedulerState       1
+#define INCLUDE_xTaskGetCurrentTaskHandle    1
+#define INCLUDE_uxTaskGetStackHighWaterMark  1
+#define INCLUDE_uxTaskGetStackHighWaterMark2 1
+#define INCLUDE_xTaskGetIdleTaskHandle       1
+#define INCLUDE_eTaskGetState                0
+#define INCLUDE_xTimerPendFunctionCall       1
+#define INCLUDE_xTaskAbortDelay              0
+#define INCLUDE_xTaskGetHandle               0
+#define INCLUDE_xTaskResumeFromISR           1
 
 #ifdef __NVIC_PRIO_BITS
 /* __BVIC_PRIO_BITS will be specified when CMSIS is being used. */
@@ -161,30 +161,30 @@ See http://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html. */
 
 /* Definitions that map the FreeRTOS port interrupt handlers to their CMSIS
 standard names. */
-#define vPortSVCHandler SVC_Handler
-#define xPortPendSVHandler PendSV_Handler
+#define vPortSVCHandler     SVC_Handler
+#define xPortPendSVHandler  PendSV_Handler
 #define xPortSysTickHandler SysTick_Handler
 
 /* if this is 0 then tickless idle will not fire */
-#define configPRE_SLEEP_PROCESSING      vPortPRE_SLEEP_PROCESSING
-#define configPOST_SLEEP_PROCESSING     vPortPOST_SLEEP_PROCESSING
+#define configPRE_SLEEP_PROCESSING  vPortPRE_SLEEP_PROCESSING
+#define configPOST_SLEEP_PROCESSING vPortPOST_SLEEP_PROCESSING
 //#define configEXPECTED_IDLE_TIME_BEFORE_SLEEP 100
 
-#define configSYSTICK_CLOCK_HZ			(100000U)
+#define configSYSTICK_CLOCK_HZ (100000U)
 /* Low power Tickless idle. Low power timer (GPT) is initialized in application code. */
-#define configGPT_CLOCK_HZ                    (32768U)
+#define configGPT_CLOCK_HZ (32768U)
 
 /* system heap integrity check */
 #ifdef DEBUG_FREERTOS
-#define configSYSTEM_HEAP_STATS           (1)
-#define configUSER_HEAP_STATS             (1)
-#define configSYSTEM_HEAP_INTEGRITY_CHECK (1)
+#define configSYSTEM_HEAP_STATS              (1)
+#define configUSER_HEAP_STATS                (1)
+#define configSYSTEM_HEAP_INTEGRITY_CHECK    (1)
 #define PROJECT_CONFIG_HEAP_INTEGRITY_CHECKS (1)
 #endif
 
 extern void vConfigureTimerForRunTimeStats(void);
 extern uint32_t ulHighFrequencyTimerTicks(void);
 #define portCONFIGURE_TIMER_FOR_RUN_TIME_STATS() vConfigureTimerForRunTimeStats()
-#define portGET_RUN_TIME_COUNTER_VALUE() ulHighFrequencyTimerTicks()
+#define portGET_RUN_TIME_COUNTER_VALUE()         ulHighFrequencyTimerTicks()
 
 #endif /* FREERTOS_CONFIG_H */
diff --git a/module-os/board/rt1051/CMakeLists.txt b/module-os/board/rt1051/CMakeLists.txt
index 646e4a6c7..33dbb3878 100644
--- a/module-os/board/rt1051/CMakeLists.txt
+++ b/module-os/board/rt1051/CMakeLists.txt
@@ -31,5 +31,6 @@ target_include_directories(
 
 target_link_libraries(module-os
     PUBLIC
+        fsl
         cmsis
 )
diff --git a/module-os/board/rt1051/_exit.c b/module-os/board/rt1051/_exit.c
index 3cc195cc5..5c2600b2d 100644
--- a/module-os/board/rt1051/_exit.c
+++ b/module-os/board/rt1051/_exit.c
@@ -32,23 +32,22 @@
 
 #include <FreeRTOS.h>
 #include <MIMXRT1051.h>
-#include <log.hpp>
+#include <log/log.hpp>
 #include <task.h>
 #include <macros.h>
 // ----------------------------------------------------------------------------
 
 // Forward declaration
 
-void
-_exit(int code);
+void _exit(int code);
 
 // ----------------------------------------------------------------------------
 
-
 void __reset_hardware(void)
 {
-  // Let watchdog reset system
-  while(1);
+    // Let watchdog reset system
+    while (1)
+        ;
 }
 
 // On Release, call the hardware reset procedure.
@@ -64,7 +63,7 @@ void __attribute__((weak)) _exit(int code)
     haltIfDebugging();
     vTaskEndScheduler();
 #ifdef DEBUG
-    while(1){};
+    while (1) {};
 #endif
 }
 
diff --git a/module-os/board/rt1051/systemview/FreeRTOSConfig.h b/module-os/board/rt1051/systemview/FreeRTOSConfig.h
index d3bb49f9e..e0fa9477c 100644
--- a/module-os/board/rt1051/systemview/FreeRTOSConfig.h
+++ b/module-os/board/rt1051/systemview/FreeRTOSConfig.h
@@ -39,14 +39,15 @@
  *----------------------------------------------------------*/
 #include <assert.h>
 #include <stdint.h>
-#include <log.hpp>
+#include <log/log.hpp>
 
-//TODO: Look at tasks.c: void vTaskStepTick( const TickType_t xTicksToJump ) before upgrading FreeRTOS
+// TODO: Look at tasks.c: void vTaskStepTick( const TickType_t xTicksToJump ) before upgrading FreeRTOS
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
-/* System clock frequency. */
-extern uint32_t SystemCoreClock;
+    /* System clock frequency. */
+    extern uint32_t SystemCoreClock;
 #ifdef __cplusplus
 }
 #endif
@@ -56,7 +57,7 @@ extern uint32_t SystemCoreClock;
 #define configCPU_CLOCK_HZ                      (SystemCoreClock)
 #define configTICK_RATE_HZ                      ((TickType_t)1000)
 #define configMAX_PRIORITIES                    5
-#define configMINIMAL_STACK_SIZE                ((unsigned short)128)       //< Number of uint32_t's. So value of 128 will mean 512 bytes
+#define configMINIMAL_STACK_SIZE                ((unsigned short)128) //< Number of uint32_t's. So value of 128 will mean 512 bytes
 #define configMAX_TASK_NAME_LEN                 64
 #define configUSE_16_BIT_TICKS                  0
 #define configIDLE_SHOULD_YIELD                 1
@@ -74,55 +75,59 @@ extern uint32_t SystemCoreClock;
 #define configUSE_APPLICATION_TASK_TAG          0
 
 /* Memory allocation related definitions. */
-#define configSUPPORT_STATIC_ALLOCATION         1
-#define configSUPPORT_DYNAMIC_ALLOCATION        1
-#define configTOTAL_HEAP_SIZE                   ((size_t)(1024*324))
-#define configAPPLICATION_ALLOCATED_HEAP        0
+#define configSUPPORT_STATIC_ALLOCATION  1
+#define configSUPPORT_DYNAMIC_ALLOCATION 1
+#define configTOTAL_HEAP_SIZE            ((size_t)(1024 * 324))
+#define configAPPLICATION_ALLOCATED_HEAP 0
 
 /* Hook function related definitions. */
-#define configUSE_IDLE_HOOK                     0
-#define configUSE_TICK_HOOK                     0
-#define configCHECK_FOR_STACK_OVERFLOW          2
-#define configUSE_MALLOC_FAILED_HOOK            0
-#define configUSE_DAEMON_TASK_STARTUP_HOOK      0
+#define configUSE_IDLE_HOOK                0
+#define configUSE_TICK_HOOK                0
+#define configCHECK_FOR_STACK_OVERFLOW     2
+#define configUSE_MALLOC_FAILED_HOOK       0
+#define configUSE_DAEMON_TASK_STARTUP_HOOK 0
 
 /* Run time and task stats gathering related definitions. */
-#define configGENERATE_RUN_TIME_STATS           1
-#define configUSE_TRACE_FACILITY                1
-#define configUSE_STATS_FORMATTING_FUNCTIONS    1
-#define configRECORD_STACK_HIGH_ADDRESS		    1
+#define configGENERATE_RUN_TIME_STATS        1
+#define configUSE_TRACE_FACILITY             1
+#define configUSE_STATS_FORMATTING_FUNCTIONS 1
+#define configRECORD_STACK_HIGH_ADDRESS      1
 
 /* Co-routine related definitions. */
-#define configUSE_CO_ROUTINES                   0
-#define configMAX_CO_ROUTINE_PRIORITIES         2
+#define configUSE_CO_ROUTINES           0
+#define configMAX_CO_ROUTINE_PRIORITIES 2
 
 /* Software timer related definitions. */
-#define configUSE_TIMERS                        1
-#define configTIMER_TASK_PRIORITY               0
-#define configTIMER_QUEUE_LENGTH                48
-#define configTIMER_TASK_STACK_DEPTH            (1024)
+#define configUSE_TIMERS             1
+#define configTIMER_TASK_PRIORITY    0
+#define configTIMER_QUEUE_LENGTH     48
+#define configTIMER_TASK_STACK_DEPTH (1024)
 
 /* Define to trap errors during development. */
-#define configASSERT(x) if((x) == 0) {LOG_FATAL("Assertion: %s",x); while(1);}
-
+#define configASSERT(x)                                                                                                \
+    if ((x) == 0) {                                                                                                    \
+        LOG_FATAL("Assertion: %s", x);                                                                                 \
+        while (1)                                                                                                      \
+            ;                                                                                                          \
+    }
 
 /* Optional functions - most linkers will remove unused functions anyway. */
-#define INCLUDE_vTaskPrioritySet                1
-#define INCLUDE_uxTaskPriorityGet               1
-#define INCLUDE_vTaskDelete                     1
-#define INCLUDE_vTaskSuspend                    1
-#define INCLUDE_vTaskDelayUntil                 1
-#define INCLUDE_vTaskDelay                      1
-#define INCLUDE_xTaskGetSchedulerState          1
-#define INCLUDE_xTaskGetCurrentTaskHandle       1
-#define INCLUDE_uxTaskGetStackHighWaterMark     1
-#define INCLUDE_uxTaskGetStackHighWaterMark2    1
-#define INCLUDE_xTaskGetIdleTaskHandle          1
-#define INCLUDE_eTaskGetState                   0
-#define INCLUDE_xTimerPendFunctionCall          1
-#define INCLUDE_xTaskAbortDelay                 0
-#define INCLUDE_xTaskGetHandle                  0
-#define INCLUDE_xTaskResumeFromISR              1
+#define INCLUDE_vTaskPrioritySet             1
+#define INCLUDE_uxTaskPriorityGet            1
+#define INCLUDE_vTaskDelete                  1
+#define INCLUDE_vTaskSuspend                 1
+#define INCLUDE_vTaskDelayUntil              1
+#define INCLUDE_vTaskDelay                   1
+#define INCLUDE_xTaskGetSchedulerState       1
+#define INCLUDE_xTaskGetCurrentTaskHandle    1
+#define INCLUDE_uxTaskGetStackHighWaterMark  1
+#define INCLUDE_uxTaskGetStackHighWaterMark2 1
+#define INCLUDE_xTaskGetIdleTaskHandle       1
+#define INCLUDE_eTaskGetState                0
+#define INCLUDE_xTimerPendFunctionCall       1
+#define INCLUDE_xTaskAbortDelay              0
+#define INCLUDE_xTaskGetHandle               0
+#define INCLUDE_xTaskResumeFromISR           1
 
 #ifdef __NVIC_PRIO_BITS
 /* __BVIC_PRIO_BITS will be specified when CMSIS is being used. */
@@ -150,26 +155,25 @@ See http://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html. */
 
 /* Definitions that map the FreeRTOS port interrupt handlers to their CMSIS
 standard names. */
-#define vPortSVCHandler SVC_Handler
-#define xPortPendSVHandler PendSV_Handler
+#define vPortSVCHandler     SVC_Handler
+#define xPortPendSVHandler  PendSV_Handler
 #define xPortSysTickHandler SysTick_Handler
 
 /* if this is 0 then tickless idle will not fire */
-#define configPRE_SLEEP_PROCESSING      vPortPRE_SLEEP_PROCESSING
-#define configPOST_SLEEP_PROCESSING     vPortPOST_SLEEP_PROCESSING
+#define configPRE_SLEEP_PROCESSING  vPortPRE_SLEEP_PROCESSING
+#define configPOST_SLEEP_PROCESSING vPortPOST_SLEEP_PROCESSING
 //#define configEXPECTED_IDLE_TIME_BEFORE_SLEEP 100
 
-#define configSYSTICK_CLOCK_HZ			(100000U)
+#define configSYSTICK_CLOCK_HZ (100000U)
 /* Low power Tickless idle. Low power timer (GPT) is initialized in application code. */
-#define configGPT_CLOCK_HZ                    (32768U)
+#define configGPT_CLOCK_HZ (32768U)
 
 #if SYSTEM_VIEW_ENABLED
 #include <FreeRTOSV10/SEGGER_SYSVIEW_FreeRTOS.h>
 #endif
 
-
 extern uint32_t ulHighFrequencyTimerTicks(void);
 #define portCONFIGURE_TIMER_FOR_RUN_TIME_STATS() vConfigureTimerForRunTimeStats()
-#define portGET_RUN_TIME_COUNTER_VALUE() ulHighFrequencyTimerTicks()
+#define portGET_RUN_TIME_COUNTER_VALUE()         ulHighFrequencyTimerTicks()
 
 #endif /* FREERTOS_CONFIG_H */
diff --git a/module-os/memory/usermem.c b/module-os/memory/usermem.c
index 20fb0d6d8..9c57e2b85 100644
--- a/module-os/memory/usermem.c
+++ b/module-os/memory/usermem.c
@@ -16,7 +16,7 @@
  * Sets heap size in SDRAM
  */
 #ifndef PROJECT_CONFIG_USER_DYNMEM_SIZE
-#define USERMEM_TOTAL_HEAP_SIZE	0
+#error "Define user heap size!"
 #else
 #define USERMEM_TOTAL_HEAP_SIZE	PROJECT_CONFIG_USER_DYNMEM_SIZE
 #endif
diff --git a/module-platform/CMakeLists.txt b/module-platform/CMakeLists.txt
index 666a4fa1f..89f1daf02 100644
--- a/module-platform/CMakeLists.txt
+++ b/module-platform/CMakeLists.txt
@@ -19,6 +19,9 @@ target_sources(
 target_link_libraries(
         platform
 
+    PUBLIC
+        board
+
     PRIVATE
         module-bsp
 )
diff --git a/module-platform/linux/tests/CMakeLists.txt b/module-platform/linux/tests/CMakeLists.txt
index 1890ff406..edb3159e2 100644
--- a/module-platform/linux/tests/CMakeLists.txt
+++ b/module-platform/linux/tests/CMakeLists.txt
@@ -43,6 +43,7 @@ add_catch2_executable(
         ${CMAKE_CURRENT_LIST_DIR}/unittest_filesystem_littlefs.cpp
     LIBS
         platform
+        module-vfs
     DEPS
         ${LITTLEFS_IMAGE}
     USE_FS
@@ -54,6 +55,7 @@ add_catch2_executable(
         ${CMAKE_CURRENT_LIST_DIR}/unittest_filesystem_dualmount.cpp
     LIBS
         platform
+        module-vfs
     DEPS
         ${LITTLEFS_IMAGE}
     USE_FS
diff --git a/module-services/CMakeLists.txt b/module-services/CMakeLists.txt
index b82978727..98f436cff 100644
--- a/module-services/CMakeLists.txt
+++ b/module-services/CMakeLists.txt
@@ -33,7 +33,7 @@ target_link_libraries(${PROJECT_NAME}
         service-antenna
         ${TARGET_LIBRARIES}
     PRIVATE
-        time
+        utils-time
 )
 
 # Board specific compilation definitions,options,include directories and features
diff --git a/module-services/service-antenna/ServiceAntenna.cpp b/module-services/service-antenna/ServiceAntenna.cpp
index aef027003..54311c394 100644
--- a/module-services/service-antenna/ServiceAntenna.cpp
+++ b/module-services/service-antenna/ServiceAntenna.cpp
@@ -8,7 +8,7 @@
 
 #include <at/response.hpp>
 #include <EventStore.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 #include <MessageType.hpp>
 #include <Timers/TimerFactory.hpp>
 #include <projdefs.h>
diff --git a/module-services/service-appmgr/CMakeLists.txt b/module-services/service-appmgr/CMakeLists.txt
index 8e174aa01..fbd3fb5a4 100644
--- a/module-services/service-appmgr/CMakeLists.txt
+++ b/module-services/service-appmgr/CMakeLists.txt
@@ -72,7 +72,6 @@ target_sources(service-appmgr
 
 target_link_libraries(service-appmgr
     PRIVATE
-        apps-common
         application-special-input
         json::json
         module-audio
@@ -80,7 +79,8 @@ target_link_libraries(service-appmgr
         service-db
         service-gui
     PUBLIC
-        time
+        apps-common
+        utils-time
 )
 
 target_include_directories(service-appmgr
diff --git a/module-services/service-appmgr/model/ActionsRegistry.cpp b/module-services/service-appmgr/model/ActionsRegistry.cpp
index 3e237e216..f3dd0893f 100644
--- a/module-services/service-appmgr/model/ActionsRegistry.cpp
+++ b/module-services/service-appmgr/model/ActionsRegistry.cpp
@@ -3,7 +3,7 @@
 
 #include "ActionsRegistry.hpp"
 
-#include <log.hpp>
+#include <log/log.hpp>
 #include <magic_enum.hpp>
 
 #include <cassert>
diff --git a/module-services/service-appmgr/model/ApplicationManagerCommon.cpp b/module-services/service-appmgr/model/ApplicationManagerCommon.cpp
index 1dedf5d7d..953489993 100644
--- a/module-services/service-appmgr/model/ApplicationManagerCommon.cpp
+++ b/module-services/service-appmgr/model/ApplicationManagerCommon.cpp
@@ -18,7 +18,7 @@
 #include <log/log.hpp>
 #include <service-audio/AudioMessage.hpp>
 #include <service-db/agents/settings/SystemSettings.hpp>
-#include <module-utils/Utils.hpp>
+#include <Utils.hpp>
 #include <service-appmgr/Constants.hpp>
 #include <service-desktop/Constants.hpp>
 #include <service-desktop/DesktopMessages.hpp>
diff --git a/module-services/service-audio/AudioServiceAPI.cpp b/module-services/service-audio/AudioServiceAPI.cpp
index be33ea603..558b945a9 100644
--- a/module-services/service-audio/AudioServiceAPI.cpp
+++ b/module-services/service-audio/AudioServiceAPI.cpp
@@ -6,7 +6,7 @@
 #include <ServiceAudio.hpp>
 
 #include <Audio/decoder/Decoder.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 #include <Service/Common.hpp>
 
 #include <utility>
diff --git a/module-services/service-bluetooth/ServiceBluetooth.cpp b/module-services/service-bluetooth/ServiceBluetooth.cpp
index f1339813e..b8b3b1b4c 100644
--- a/module-services/service-bluetooth/ServiceBluetooth.cpp
+++ b/module-services/service-bluetooth/ServiceBluetooth.cpp
@@ -26,7 +26,7 @@
 
 #include "SystemManager/messages/SentinelRegistrationMessage.hpp"
 
-#include <log.hpp>
+#include <log/log.hpp>
 #include <bits/exception.h>
 #include <utility>
 #include <service-desktop/DesktopMessages.hpp>
diff --git a/module-services/service-bluetooth/service-bluetooth/SettingsHolder.hpp b/module-services/service-bluetooth/service-bluetooth/SettingsHolder.hpp
index 6c811de1c..1666570fb 100644
--- a/module-services/service-bluetooth/service-bluetooth/SettingsHolder.hpp
+++ b/module-services/service-bluetooth/service-bluetooth/SettingsHolder.hpp
@@ -5,7 +5,7 @@
 #include <string>
 #include <variant>
 #include <service-db/Settings.hpp>
-#include <module-utils/Utils.hpp>
+#include <Utils.hpp>
 #include "SettingsSerializer.hpp"
 
 namespace bluetooth
@@ -90,4 +90,4 @@ namespace bluetooth
         std::unique_ptr<settings::Settings> settingsProvider;
         std::map<Settings, SettingEntry> settingsMap;
     };
-} // namespace Bluetooth
+} // namespace bluetooth
diff --git a/module-services/service-bluetooth/service-bluetooth/SettingsSerializer.cpp b/module-services/service-bluetooth/service-bluetooth/SettingsSerializer.cpp
index d356417eb..26e770beb 100644
--- a/module-services/service-bluetooth/service-bluetooth/SettingsSerializer.cpp
+++ b/module-services/service-bluetooth/service-bluetooth/SettingsSerializer.cpp
@@ -3,7 +3,7 @@
 
 #include "SettingsSerializer.hpp"
 #include "btstack_util.h"
-#include <log.hpp>
+#include <log/log.hpp>
 
 namespace strings
 {
@@ -40,7 +40,7 @@ auto SettingsSerializer::fromString(const std::string &jsonStr) -> std::vector<D
     for (auto &device : devicesArray) {
         Devicei temp;
         sscanf_bd_addr(device[strings::addr].string_value().c_str(), temp.address);
-        temp.name = device[strings::name].string_value();
+        temp.name        = device[strings::name].string_value();
         temp.deviceState = DeviceState::Paired;
         devicesVector.emplace_back(temp);
     }
diff --git a/module-services/service-cellular/CMakeLists.txt b/module-services/service-cellular/CMakeLists.txt
index f39f6a411..bc222d3c2 100644
--- a/module-services/service-cellular/CMakeLists.txt
+++ b/module-services/service-cellular/CMakeLists.txt
@@ -62,10 +62,11 @@ target_link_libraries(${PROJECT_NAME}
         service-evtmgr
         ucs2
         json::json
-        time
+        utils-time
     PUBLIC
         eventstore
         utf8
+        hal
     )
 
 if (${ENABLE_TESTS})
diff --git a/module-services/service-cellular/CellularCall.cpp b/module-services/service-cellular/CellularCall.cpp
index dc8625a3a..3b4d54379 100644
--- a/module-services/service-cellular/CellularCall.cpp
+++ b/module-services/service-cellular/CellularCall.cpp
@@ -6,7 +6,7 @@
 #include <CalllogRecord.hpp>
 #include <PhoneNumber.hpp>
 #include <Utils.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 
 #include <cinttypes>
 #include <ctime>
diff --git a/module-services/service-cellular/RequestFactory.cpp b/module-services/service-cellular/RequestFactory.cpp
index 32ea74399..0686cefc1 100644
--- a/module-services/service-cellular/RequestFactory.cpp
+++ b/module-services/service-cellular/RequestFactory.cpp
@@ -6,7 +6,7 @@
 #include <re2/re2.h>
 
 #include <at/Commands.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 
 #include "service-cellular/requests/CallRequest.hpp"
 #include "service-cellular/requests/SupplementaryServicesRequest.hpp"
diff --git a/module-services/service-cellular/ServiceCellular.cpp b/module-services/service-cellular/ServiceCellular.cpp
index 97e327ad2..2e8433f2f 100644
--- a/module-services/service-cellular/ServiceCellular.cpp
+++ b/module-services/service-cellular/ServiceCellular.cpp
@@ -40,7 +40,7 @@
 #include <Tables/CalllogTable.hpp>
 #include <Tables/Record.hpp>
 #include <Utils.hpp>
-#include <utility/Utility.hpp>
+#include <Utility.hpp>
 #include <at/cmd/CLCC.hpp>
 #include <at/cmd/CFUN.hpp>
 #include <at/UrcClip.hpp>
@@ -54,7 +54,7 @@
 #include <bsp/cellular/bsp_cellular.hpp>
 #include <EventStore.hpp>
 #include <country.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 #include <at/UrcFactory.hpp>
 #include <queries/messages/sms/QuerySMSSearchByType.hpp>
 #include <queries/notifications/QueryNotificationsIncrement.hpp>
diff --git a/module-services/service-cellular/SignalStrength.cpp b/module-services/service-cellular/SignalStrength.cpp
index 69adbf27b..cd09f0b88 100644
--- a/module-services/service-cellular/SignalStrength.cpp
+++ b/module-services/service-cellular/SignalStrength.cpp
@@ -2,7 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "service-cellular/SignalStrength.hpp"
-#include <log.hpp>
+#include <log/log.hpp>
 
 SignalStrength::SignalStrength(int rssi)
 {
diff --git a/module-services/service-cellular/include/service-cellular/api/common.hpp b/module-services/service-cellular/include/service-cellular/api/common.hpp
index 7946f061f..7ce48d665 100644
--- a/module-services/service-cellular/include/service-cellular/api/common.hpp
+++ b/module-services/service-cellular/include/service-cellular/api/common.hpp
@@ -3,6 +3,8 @@
 
 #pragma once
 
+#include <hal/cellular/SIM.hpp>
+
 #include <vector>
 
 namespace cellular
@@ -26,11 +28,7 @@ namespace cellular
             Disabled
         };
 
-        enum class SimSlot
-        {
-            SIM1 = 0,
-            SIM2 = 1
-        };
+        using SimSlot = hal::cellular::SimSlot;
 
         enum class ModemState
         {
diff --git a/module-services/service-cellular/src/ImeiGetHandler.cpp b/module-services/service-cellular/src/ImeiGetHandler.cpp
index fafa01dcb..9b153c1ed 100644
--- a/module-services/service-cellular/src/ImeiGetHandler.cpp
+++ b/module-services/service-cellular/src/ImeiGetHandler.cpp
@@ -5,8 +5,6 @@
 #include <ATFactory.hpp>
 #include <modem/BaseChannel.hpp>
 
-#include <log/Logger.hpp>
-
 namespace
 {
     constexpr auto IMEIResonseSize = 2;
diff --git a/module-services/service-cellular/src/NetworkTime.cpp b/module-services/service-cellular/src/NetworkTime.cpp
index 75fe852c8..f493f1e8c 100644
--- a/module-services/service-cellular/src/NetworkTime.cpp
+++ b/module-services/service-cellular/src/NetworkTime.cpp
@@ -9,7 +9,6 @@
 
 #include <service-time/service-time/TimeMessage.hpp>
 
-#include <log/Logger.hpp>
 namespace cellular::service
 {
 
diff --git a/module-services/service-cellular/src/SMSPartsHandler.cpp b/module-services/service-cellular/src/SMSPartsHandler.cpp
index b80dc31bc..4f448659e 100644
--- a/module-services/service-cellular/src/SMSPartsHandler.cpp
+++ b/module-services/service-cellular/src/SMSPartsHandler.cpp
@@ -4,7 +4,7 @@
 #include "SMSPartsHandler.hpp"
 
 #include <service-cellular/service-cellular/MessageConstants.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 
 namespace cellular::internal::sms
 {
diff --git a/module-services/service-cellular/src/SimContacts.cpp b/module-services/service-cellular/src/SimContacts.cpp
index af1ef6d7a..eb1f77cd4 100644
--- a/module-services/service-cellular/src/SimContacts.cpp
+++ b/module-services/service-cellular/src/SimContacts.cpp
@@ -7,7 +7,6 @@
 #include <at/cmd/CPBS.hpp>
 #include <at/cmd/CPBR.hpp>
 
-#include <log/Logger.hpp>
 namespace cellular::service
 {
     void SimContacts::setChannel(at::BaseChannel *channel)
diff --git a/module-services/service-db/DBServiceAPI.cpp b/module-services/service-db/DBServiceAPI.cpp
index bce021309..8043fbecc 100644
--- a/module-services/service-db/DBServiceAPI.cpp
+++ b/module-services/service-db/DBServiceAPI.cpp
@@ -18,7 +18,7 @@
 #include <Tables/CountryCodesTable.hpp>
 #include <ThreadRecord.hpp>
 #include <Utils.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 #include <queries/messages/threads/QueryThreadGetByNumber.hpp>
 
 #include <utility>
diff --git a/module-services/service-db/agents/settings/FactorySettings.cpp b/module-services/service-db/agents/settings/FactorySettings.cpp
index bb994573e..c123ab95a 100644
--- a/module-services/service-db/agents/settings/FactorySettings.cpp
+++ b/module-services/service-db/agents/settings/FactorySettings.cpp
@@ -3,7 +3,7 @@
 
 #include "FactorySettings.hpp"
 
-#include <log.hpp>
+#include <log/log.hpp>
 #include <service-db/SettingsMessages.hpp>
 
 namespace settings
diff --git a/module-services/service-db/agents/settings/Settings.cpp b/module-services/service-db/agents/settings/Settings.cpp
index 393115df6..0ce1f172e 100644
--- a/module-services/service-db/agents/settings/Settings.cpp
+++ b/module-services/service-db/agents/settings/Settings.cpp
@@ -10,7 +10,7 @@
 #include <vector>
 
 #if defined(DEBUG_SETTINGS_DB) and DEBUG_SETTINGS_DB == 1
-#include <log.hpp>
+#include <log/log.hpp>
 #define log_debug(...) LOG_DEBUG(__VA_ARGS__);
 #else
 #define log_debug(...)
diff --git a/module-services/service-desktop/ServiceDesktop.cpp b/module-services/service-desktop/ServiceDesktop.cpp
index afe64d5fd..a61d4d009 100644
--- a/module-services/service-desktop/ServiceDesktop.cpp
+++ b/module-services/service-desktop/ServiceDesktop.cpp
@@ -13,7 +13,7 @@
 #include <MessageType.hpp>
 #include <Service/Worker.hpp>
 #include <json11.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 #include <application-desktop/Constants.hpp>
 #include <locks/data/PhoneLockMessages.hpp>
 #include <service-appmgr/Constants.hpp>
diff --git a/module-services/service-desktop/WorkerDesktop.cpp b/module-services/service-desktop/WorkerDesktop.cpp
index 1e0b6fbee..6f040dc52 100644
--- a/module-services/service-desktop/WorkerDesktop.cpp
+++ b/module-services/service-desktop/WorkerDesktop.cpp
@@ -10,7 +10,7 @@
 #include "Timers/TimerFactory.hpp"
 
 #include <bsp/usb/usb.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 #include <crc32.h>
 
 #include <map>
diff --git a/module-services/service-desktop/endpoints/CMakeLists.txt b/module-services/service-desktop/endpoints/CMakeLists.txt
index 4222e0308..5fc59c645 100644
--- a/module-services/service-desktop/endpoints/CMakeLists.txt
+++ b/module-services/service-desktop/endpoints/CMakeLists.txt
@@ -96,7 +96,9 @@ target_link_libraries(
         desktop-endpoints
     PUBLIC
         endpoint-message-sender
+        sys-service
     PRIVATE
         microtar
         base64::base64
+        version-header
 )
diff --git a/module-services/service-desktop/endpoints/HttpEnums.cpp b/module-services/service-desktop/endpoints/HttpEnums.cpp
index 2a2ed1cc7..a280530e1 100644
--- a/module-services/service-desktop/endpoints/HttpEnums.cpp
+++ b/module-services/service-desktop/endpoints/HttpEnums.cpp
@@ -3,7 +3,7 @@
 
 #include <endpoints/HttpEnums.hpp>
 
-#include <log.hpp>
+#include <log/log.hpp>
 
 namespace sdesktop::endpoints::http
 {
diff --git a/module-services/service-desktop/endpoints/backup/BackupRestore.cpp b/module-services/service-desktop/endpoints/backup/BackupRestore.cpp
index d7a19dae7..e5bac998d 100644
--- a/module-services/service-desktop/endpoints/backup/BackupRestore.cpp
+++ b/module-services/service-desktop/endpoints/backup/BackupRestore.cpp
@@ -4,12 +4,12 @@
 #include <endpoints/backup/BackupRestore.hpp>
 
 #include <SystemManager/SystemManagerCommon.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 #include <microtar.hpp>
 #include <purefs/filesystem_paths.hpp>
 #include <service-db/DBServiceAPI.hpp>
 #include <service-db/DBServiceName.hpp>
-#include <module-utils/Utils.hpp>
+#include <Utils.hpp>
 
 #include <cassert>
 #include <filesystem>
diff --git a/module-services/service-desktop/endpoints/contacts/ContactHelper.cpp b/module-services/service-desktop/endpoints/contacts/ContactHelper.cpp
index a22b744a6..92dfdb2f1 100644
--- a/module-services/service-desktop/endpoints/contacts/ContactHelper.cpp
+++ b/module-services/service-desktop/endpoints/contacts/ContactHelper.cpp
@@ -14,7 +14,7 @@
 #include <ContactRecord.hpp>
 #include <PhoneNumber.hpp>
 #include <Service/Common.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 #include <queries/RecordQuery.hpp>
 #include <queries/phonebook/QueryContactGetByID.hpp>
 #include <queries/phonebook/QueryContactUpdate.hpp>
diff --git a/module-services/service-desktop/endpoints/developerMode/DeveloperModeEndpoint.cpp b/module-services/service-desktop/endpoints/developerMode/DeveloperModeEndpoint.cpp
index 837c0ca4c..95e125252 100644
--- a/module-services/service-desktop/endpoints/developerMode/DeveloperModeEndpoint.cpp
+++ b/module-services/service-desktop/endpoints/developerMode/DeveloperModeEndpoint.cpp
@@ -2,7 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include <endpoints/developerMode/DeveloperModeEndpoint.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 
 #include <endpoints/message/Sender.hpp>
 
diff --git a/module-services/service-desktop/endpoints/developerMode/Mode/UI_Helper.cpp b/module-services/service-desktop/endpoints/developerMode/Mode/UI_Helper.cpp
index ad96510a1..2484d96e9 100644
--- a/module-services/service-desktop/endpoints/developerMode/Mode/UI_Helper.cpp
+++ b/module-services/service-desktop/endpoints/developerMode/Mode/UI_Helper.cpp
@@ -2,7 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include <endpoints/developerMode/Mode/UI_Helper.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 #include "service-desktop/Constants.hpp"
 #include "service-desktop/DeveloperModeMessage.hpp"
 #include <service-appmgr/Constants.hpp>
diff --git a/module-services/service-desktop/endpoints/developerMode/fs/FS_Helper.cpp b/module-services/service-desktop/endpoints/developerMode/fs/FS_Helper.cpp
index b92ab6e2d..7e801fa6d 100644
--- a/module-services/service-desktop/endpoints/developerMode/fs/FS_Helper.cpp
+++ b/module-services/service-desktop/endpoints/developerMode/fs/FS_Helper.cpp
@@ -3,7 +3,7 @@
 
 #include <endpoints/developerMode/fs/FS_Helper.hpp>
 
-#include <log.hpp>
+#include <log/log.hpp>
 #include <service-desktop/Constants.hpp>
 #include <service-desktop/DeveloperModeMessage.hpp>
 #include <endpoints/message/Sender.hpp>
diff --git a/module-services/service-desktop/endpoints/deviceInfo/DeviceInfoEndpoint.cpp b/module-services/service-desktop/endpoints/deviceInfo/DeviceInfoEndpoint.cpp
index 64bdac573..b94425952 100644
--- a/module-services/service-desktop/endpoints/deviceInfo/DeviceInfoEndpoint.cpp
+++ b/module-services/service-desktop/endpoints/deviceInfo/DeviceInfoEndpoint.cpp
@@ -6,7 +6,7 @@
 #include <endpoints/JsonKeyNames.hpp>
 
 #include <EventStore.hpp>
-#include <source/version.hpp>
+#include <product/version.hpp>
 #include <service-desktop/ServiceDesktop.hpp>
 #include <version.hpp>
 
diff --git a/module-services/service-desktop/endpoints/filesystem/FileContext.cpp b/module-services/service-desktop/endpoints/filesystem/FileContext.cpp
index b125e8850..631750424 100644
--- a/module-services/service-desktop/endpoints/filesystem/FileContext.cpp
+++ b/module-services/service-desktop/endpoints/filesystem/FileContext.cpp
@@ -2,7 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include <endpoints/filesystem/FileContext.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 
 FileContext::FileContext(
     std::filesystem::path path, std::size_t size, std::size_t chunkSize, std::string openMode, std::size_t offset)
diff --git a/module-services/service-desktop/endpoints/filesystem/FileOperations.cpp b/module-services/service-desktop/endpoints/filesystem/FileOperations.cpp
index eebe8179c..4b035858f 100644
--- a/module-services/service-desktop/endpoints/filesystem/FileOperations.cpp
+++ b/module-services/service-desktop/endpoints/filesystem/FileOperations.cpp
@@ -3,7 +3,7 @@
 
 #include <endpoints/filesystem/FileOperations.hpp>
 #include <base64.h>
-#include <log.hpp>
+#include <log/log.hpp>
 
 FileOperations &FileOperations::instance()
 {
diff --git a/module-services/service-desktop/endpoints/update/UpdateHelper.cpp b/module-services/service-desktop/endpoints/update/UpdateHelper.cpp
index 86f08aafd..4bdb275dc 100644
--- a/module-services/service-desktop/endpoints/update/UpdateHelper.cpp
+++ b/module-services/service-desktop/endpoints/update/UpdateHelper.cpp
@@ -3,7 +3,7 @@
 
 #include <endpoints/update/UpdateHelper.hpp>
 #include <endpoints/Context.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 #include <SystemManager/SystemManagerCommon.hpp>
 #include <purefs/filesystem_paths.hpp>
 
diff --git a/module-services/service-desktop/message-common/include/endpoints/message/Common.hpp b/module-services/service-desktop/message-common/include/endpoints/message/Common.hpp
index bc18edc85..75ad7ec7a 100644
--- a/module-services/service-desktop/message-common/include/endpoints/message/Common.hpp
+++ b/module-services/service-desktop/message-common/include/endpoints/message/Common.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <log.hpp>
+#include <log/log.hpp>
 #include <string>
 #include <json11.hpp>
 
diff --git a/module-services/service-desktop/parser/MessageHandler.cpp b/module-services/service-desktop/parser/MessageHandler.cpp
index a5ee1dbc0..8afef5c29 100644
--- a/module-services/service-desktop/parser/MessageHandler.cpp
+++ b/module-services/service-desktop/parser/MessageHandler.cpp
@@ -5,7 +5,7 @@
 
 #include <endpoints/EndpointFactory.hpp>
 
-#include <log.hpp>
+#include <log/log.hpp>
 
 #include <memory>
 
diff --git a/module-services/service-desktop/parser/ParserFSM.cpp b/module-services/service-desktop/parser/ParserFSM.cpp
index a98950d21..4a845f900 100644
--- a/module-services/service-desktop/parser/ParserFSM.cpp
+++ b/module-services/service-desktop/parser/ParserFSM.cpp
@@ -3,7 +3,7 @@
 
 #include "ParserFSM.hpp"
 
-#include <log.hpp>
+#include <log/log.hpp>
 #include <memory>
 #include <string>
 
diff --git a/module-services/service-eink/ServiceEink.cpp b/module-services/service-eink/ServiceEink.cpp
index 2b2438d20..fc676b855 100644
--- a/module-services/service-eink/ServiceEink.cpp
+++ b/module-services/service-eink/ServiceEink.cpp
@@ -9,7 +9,7 @@
 #include <time/ScopedTime.hpp>
 #include <Timers/TimerFactory.hpp>
 
-#include <log.hpp>
+#include <log/log.hpp>
 #include <messages/EinkMessage.hpp>
 #include <messages/ImageMessage.hpp>
 #include <SystemManager/messages/DeviceRegistrationMessage.hpp>
diff --git a/module-services/service-evtmgr/CMakeLists.txt b/module-services/service-evtmgr/CMakeLists.txt
index 4fa056c78..21164a12b 100644
--- a/module-services/service-evtmgr/CMakeLists.txt
+++ b/module-services/service-evtmgr/CMakeLists.txt
@@ -28,6 +28,7 @@ target_include_directories(${PROJECT_NAME}
 
 target_link_libraries(${PROJECT_NAME}
     PRIVATE
+        log
         module-apps
         module-gui
         module-utils
diff --git a/module-services/service-evtmgr/EventManager.cpp b/module-services/service-evtmgr/EventManager.cpp
index 955708c0c..016c40f2a 100644
--- a/module-services/service-evtmgr/EventManager.cpp
+++ b/module-services/service-evtmgr/EventManager.cpp
@@ -19,7 +19,7 @@
 #include <bsp/common.hpp>
 #include <bsp/rtc/rtc.hpp>
 #include <hal/key_input/KeyEventDefinitions.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 #include <Logger.hpp>
 #include <service-appmgr/Controller.hpp>
 #include <service-audio/AudioMessage.hpp>
diff --git a/module-services/service-evtmgr/WorkerEventCommon.cpp b/module-services/service-evtmgr/WorkerEventCommon.cpp
index dbb5fed9a..8ee7660f0 100644
--- a/module-services/service-evtmgr/WorkerEventCommon.cpp
+++ b/module-services/service-evtmgr/WorkerEventCommon.cpp
@@ -21,9 +21,9 @@
 #include <bsp/eink_frontlight/eink_frontlight.hpp>
 #include <EventStore.hpp>
 
-#include <common_data/RawKey.hpp>
+#include <hal/key_input/RawKey.hpp>
 #include <headset.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 #include <service-audio/AudioMessage.hpp>
 #include <service-desktop/Constants.hpp>
 #include <service-desktop/DesktopMessages.hpp>
diff --git a/module-services/service-evtmgr/service-evtmgr/EventManagerCommon.hpp b/module-services/service-evtmgr/service-evtmgr/EventManagerCommon.hpp
index 19c96e5b7..60f8c2ccb 100644
--- a/module-services/service-evtmgr/service-evtmgr/EventManagerCommon.hpp
+++ b/module-services/service-evtmgr/service-evtmgr/EventManagerCommon.hpp
@@ -5,7 +5,7 @@
 
 #include "Constants.hpp"
 
-#include <common_data/RawKey.hpp>
+#include <hal/key_input/RawKey.hpp>
 #include <MessageType.hpp>
 #include <Service/Common.hpp>
 #include <Service/Message.hpp>
diff --git a/module-services/service-evtmgr/service-evtmgr/KbdMessage.hpp b/module-services/service-evtmgr/service-evtmgr/KbdMessage.hpp
index 1a13a6303..5408e2c45 100644
--- a/module-services/service-evtmgr/service-evtmgr/KbdMessage.hpp
+++ b/module-services/service-evtmgr/service-evtmgr/KbdMessage.hpp
@@ -5,7 +5,7 @@
 
 #include "Service/Message.hpp"
 
-#include <common_data/RawKey.hpp>
+#include <hal/key_input/RawKey.hpp>
 
 namespace sevm
 {
diff --git a/module-services/service-gui/ServiceGUI.cpp b/module-services/service-gui/ServiceGUI.cpp
index 8930084d5..902f339cb 100644
--- a/module-services/service-gui/ServiceGUI.cpp
+++ b/module-services/service-gui/ServiceGUI.cpp
@@ -12,7 +12,7 @@
 #include <DrawCommand.hpp>
 #include <FontManager.hpp>
 #include <gui/core/ImageManager.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 #include <service-eink/Common.hpp>
 #include <service-eink/messages/ImageMessage.hpp>
 #include <service-eink/messages/EinkMessage.hpp>
@@ -190,9 +190,9 @@ namespace service::gui
 
     sys::MessagePointer ServiceGUI::handleGUIRenderingFinished(sys::Message *message)
     {
-        auto finishedMsg       = static_cast<service::gui::RenderingFinished *>(message);
-        const auto contextId   = finishedMsg->getContextId();
-        auto refreshMode       = finishedMsg->getRefreshMode();
+        auto finishedMsg     = static_cast<service::gui::RenderingFinished *>(message);
+        const auto contextId = finishedMsg->getContextId();
+        auto refreshMode     = finishedMsg->getRefreshMode();
         if (isInState(State::Idle)) {
             if (cache.isRenderCached()) {
                 refreshMode = getMaxRefreshMode(cache.getCachedRender()->refreshMode, refreshMode);
diff --git a/module-services/service-gui/WorkerGUI.cpp b/module-services/service-gui/WorkerGUI.cpp
index cd6b26b42..c85955ba0 100644
--- a/module-services/service-gui/WorkerGUI.cpp
+++ b/module-services/service-gui/WorkerGUI.cpp
@@ -4,7 +4,7 @@
 #include "WorkerGUI.hpp"
 
 #include <DrawCommand.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 #include <Renderer.hpp>
 #include <Service/Worker.hpp>
 #include <service-gui/ServiceGUI.hpp>
diff --git a/module-services/service-time/CMakeLists.txt b/module-services/service-time/CMakeLists.txt
index d31d0eec3..fef7513b3 100644
--- a/module-services/service-time/CMakeLists.txt
+++ b/module-services/service-time/CMakeLists.txt
@@ -30,7 +30,7 @@ target_include_directories(${PROJECT_NAME}
 target_link_libraries(${PROJECT_NAME}
     PRIVATE
         module-db
-        time
+        utils-time
         service-db
         service-time-api
         module-sys
diff --git a/module-services/service-time/ServiceTime.cpp b/module-services/service-time/ServiceTime.cpp
index 70f52f78f..2f9243cae 100644
--- a/module-services/service-time/ServiceTime.cpp
+++ b/module-services/service-time/ServiceTime.cpp
@@ -12,7 +12,7 @@
 
 #include <BaseInterface.hpp>
 #include <Common/Query.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 #include <MessageType.hpp>
 #include <module-db/Interface/EventRecord.hpp>
 #include <service-db/DBNotificationMessage.hpp>
diff --git a/module-services/service-time/api/CMakeLists.txt b/module-services/service-time/api/CMakeLists.txt
index d1c6c4b7f..41a68919c 100644
--- a/module-services/service-time/api/CMakeLists.txt
+++ b/module-services/service-time/api/CMakeLists.txt
@@ -9,6 +9,6 @@ target_sources(service-time-api
 
 target_link_libraries(service-time-api
         PRIVATE
-        time
+        utils-time
         service-time
         )
diff --git a/module-services/service-time/internal/StaticData.hpp b/module-services/service-time/internal/StaticData.hpp
index ba3d920a2..538102017 100644
--- a/module-services/service-time/internal/StaticData.hpp
+++ b/module-services/service-time/internal/StaticData.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <module-utils/time/time/time_locale.hpp>
+#include <time/time_locale.hpp>
 
 namespace stm::internal
 {
diff --git a/module-sys/Service/CMakeLists.txt b/module-sys/Service/CMakeLists.txt
index e9cdbb9f5..19fbc9cc0 100644
--- a/module-sys/Service/CMakeLists.txt
+++ b/module-sys/Service/CMakeLists.txt
@@ -1,9 +1,16 @@
 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/Common.hpp
+        
         include/Service/CpuSentinel.hpp
         include/Service/Mailbox.hpp
         include/Service/MessageForward.hpp
@@ -36,8 +43,12 @@ target_include_directories(sys-service
 target_link_libraries(sys-service
     PUBLIC
         messagetype
-        magic_enum::magic_enum
+        module-bsp
         module-os
+        sys-service-common
+        sys-watchdog
+
+        magic_enum::magic_enum
 )
 
 if (${ENABLE_TESTS})
diff --git a/module-sys/Service/Service.cpp b/module-sys/Service/Service.cpp
index a8f1d0ccb..df7d30142 100644
--- a/module-sys/Service/Service.cpp
+++ b/module-sys/Service/Service.cpp
@@ -10,8 +10,8 @@
 #include "Timers/SystemTimer.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 <log/debug.hpp>           // for DEBUG_SERVICE_MESSAGES
+#include <log/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
diff --git a/module-sys/SystemManager/CMakeLists.txt b/module-sys/SystemManager/CMakeLists.txt
index 8a6eeceff..065933e69 100644
--- a/module-sys/SystemManager/CMakeLists.txt
+++ b/module-sys/SystemManager/CMakeLists.txt
@@ -35,6 +35,7 @@ target_include_directories(sys-manager
 
 target_link_libraries(sys-manager
     PUBLIC
+        eventstore
         sys-service
 )
 
diff --git a/module-sys/SystemManager/CpuGovernor.cpp b/module-sys/SystemManager/CpuGovernor.cpp
index 5eaecebfd..05a6983c0 100644
--- a/module-sys/SystemManager/CpuGovernor.cpp
+++ b/module-sys/SystemManager/CpuGovernor.cpp
@@ -3,7 +3,7 @@
 
 #include <SystemManager/CpuGovernor.hpp>
 #include <algorithm>
-#include <log.hpp>
+#include <log/log.hpp>
 
 namespace sys
 {
diff --git a/module-sys/SystemManager/CpuStatistics.cpp b/module-sys/SystemManager/CpuStatistics.cpp
index 978631b73..699ef64c5 100644
--- a/module-sys/SystemManager/CpuStatistics.cpp
+++ b/module-sys/SystemManager/CpuStatistics.cpp
@@ -2,7 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include <SystemManager/CpuStatistics.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 #include <FreeRTOS.h>
 #include <task.h>
 #include <limits>
diff --git a/module-sys/SystemManager/DeviceManager.cpp b/module-sys/SystemManager/DeviceManager.cpp
index 26bd8dff8..070074a46 100644
--- a/module-sys/SystemManager/DeviceManager.cpp
+++ b/module-sys/SystemManager/DeviceManager.cpp
@@ -3,7 +3,7 @@
 
 #include <SystemManager/DeviceManager.hpp>
 #include <algorithm>
-#include <log.hpp>
+#include <log/log.hpp>
 
 namespace sys
 {
diff --git a/module-sys/SystemManager/PowerManager.cpp b/module-sys/SystemManager/PowerManager.cpp
index a96745d39..15a7e2e75 100644
--- a/module-sys/SystemManager/PowerManager.cpp
+++ b/module-sys/SystemManager/PowerManager.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 <log.hpp>
+#include <log/log.hpp>
 
 #include <SystemManager/PowerManager.hpp>
 
diff --git a/module-sys/SystemManager/include/SystemManager/SystemManagerCommon.hpp b/module-sys/SystemManager/include/SystemManager/SystemManagerCommon.hpp
index c562abd25..3d2f5efdc 100644
--- a/module-sys/SystemManager/include/SystemManager/SystemManagerCommon.hpp
+++ b/module-sys/SystemManager/include/SystemManager/SystemManagerCommon.hpp
@@ -13,7 +13,7 @@
 #include "Service/ServiceCreator.hpp"
 #include "Timers/TimerHandle.hpp"
 #include "PowerManager.hpp"
-#include <common_data/RawKey.hpp>
+#include <hal/key_input/RawKey.hpp>
 #include "Constants.hpp"
 #include "CpuStatistics.hpp"
 #include "DeviceManager.hpp"
diff --git a/module-sys/SystemWatchdog/CMakeLists.txt b/module-sys/SystemWatchdog/CMakeLists.txt
index 28d269254..6c52c544d 100644
--- a/module-sys/SystemWatchdog/CMakeLists.txt
+++ b/module-sys/SystemWatchdog/CMakeLists.txt
@@ -15,7 +15,7 @@ target_include_directories(sys-watchdog
 
 target_link_libraries(sys-watchdog
     PUBLIC
-        sys-service
+        sys-service-common
 
     PRIVATE
         module-bsp
diff --git a/module-sys/SystemWatchdog/SystemWatchdog.cpp b/module-sys/SystemWatchdog/SystemWatchdog.cpp
index 5e37f462f..18bce80ca 100644
--- a/module-sys/SystemWatchdog/SystemWatchdog.cpp
+++ b/module-sys/SystemWatchdog/SystemWatchdog.cpp
@@ -6,7 +6,7 @@
 #include "critical.hpp"
 #include "ticks.hpp"
 #include "bsp/watchdog/watchdog.hpp"
-#include <log.hpp>
+#include <log/log.hpp>
 
 namespace sys
 {
diff --git a/module-sys/Timers/CMakeLists.txt b/module-sys/Timers/CMakeLists.txt
index 85c7d6388..05833d4b6 100644
--- a/module-sys/Timers/CMakeLists.txt
+++ b/module-sys/Timers/CMakeLists.txt
@@ -21,5 +21,6 @@ target_include_directories(sys-timers
 
 target_link_libraries(sys-timers
     PUBLIC
+        sys-service
         module-os
 )
diff --git a/module-sys/Timers/SystemTimer.cpp b/module-sys/Timers/SystemTimer.cpp
index fcaa39f31..06644915b 100644
--- a/module-sys/Timers/SystemTimer.cpp
+++ b/module-sys/Timers/SystemTimer.cpp
@@ -4,7 +4,7 @@
 #include <Timers/SystemTimer.hpp>
 #include <Service/Service.hpp>
 #include <Timers/TimerMessage.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 #include <projdefs.h>
 #include <memory>
 
diff --git a/module-sys/Timers/TimerHandle.cpp b/module-sys/Timers/TimerHandle.cpp
index 655418300..061dd83f6 100644
--- a/module-sys/Timers/TimerHandle.cpp
+++ b/module-sys/Timers/TimerHandle.cpp
@@ -2,7 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include <Timers/TimerHandle.hpp>
-#include <module-utils/log/log.hpp>
+#include <log/log.hpp>
 
 namespace sys
 {
diff --git a/module-utils/CMakeLists.txt b/module-utils/CMakeLists.txt
index f7af0bcdc..687ff506a 100644
--- a/module-utils/CMakeLists.txt
+++ b/module-utils/CMakeLists.txt
@@ -1,61 +1,33 @@
-project(module-utils VERSION 1.0)
+module_is_test_entity()
 
-if(${CMAKE_VERSION} VERSION_LESS 3.12)
-    cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
-endif()
+add_library(module-utils INTERFACE)
 
-module_is_test_entity()
-
-set (SOURCES
-        ${CMAKE_CURRENT_SOURCE_DIR}/PhoneNumber.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/PhoneNumber.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/NumberHolderMatcher.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/country.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/ical/ParserICS.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/Utils.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/circular_buffer/StringCircularBuffer.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/generators/RandomStringGenerator.cpp
-)
-
-add_library(${PROJECT_NAME} STATIC ${SOURCES})
-
-target_link_libraries(${PROJECT_NAME}
-PUBLIC
-    application-calendar
-    board
-    libphonenumber::libphonenumber
-    log
-    magic_enum
-    module-os
-    module-vfs
-PRIVATE
-    hash-library::hash-library
-    json::json
-    time
-)
-
-# 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
-
-        ${CMAKE_CURRENT_SOURCE_DIR}
-)
-
-if (${ENABLE_TESTS})
-    add_subdirectory( test )
-endif()
-
-add_subdirectory(board)
 add_subdirectory(bootconfig)
 add_subdirectory(Clipboard)
 add_subdirectory(EventStore)
 add_subdirectory(i18n)
+add_subdirectory(ical)
+add_subdirectory(locale)
 add_subdirectory(log)
 add_subdirectory(math)
+add_subdirectory(phonenumber)
 add_subdirectory(rrule)
 add_subdirectory(time)
-add_subdirectory(ucs2)
-add_subdirectory(utf8)
+add_subdirectory(unicode)
+add_subdirectory(utility)
+
+target_link_libraries(module-utils
+    INTERFACE
+        clipboard
+        i18n
+        log-api
+        rrule
+        utility
+        utils-bootconfig
+        utils-calendar
+        utils-locale
+        utils-math
+        utils-phonenumber
+        utils-time
+        utils-unicode
+)
diff --git a/module-utils/EventStore/CMakeLists.txt b/module-utils/EventStore/CMakeLists.txt
index 2194e1338..f44d1373b 100644
--- a/module-utils/EventStore/CMakeLists.txt
+++ b/module-utils/EventStore/CMakeLists.txt
@@ -11,6 +11,9 @@ target_include_directories(eventstore
 )
 
 target_link_libraries(eventstore
+   PUBLIC
+      hal
+
    PRIVATE
       module-os
 )
diff --git a/module-utils/EventStore/EventStore.cpp b/module-utils/EventStore/EventStore.cpp
index 83a817249..cffe052fb 100644
--- a/module-utils/EventStore/EventStore.cpp
+++ b/module-utils/EventStore/EventStore.cpp
@@ -2,7 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "EventStore.hpp"
-#include <log.hpp>
+#include <log/log.hpp>
 #include <memory>
 #include <mutex.hpp>
 
diff --git a/module-utils/EventStore/EventStore.hpp b/module-utils/EventStore/EventStore.hpp
index a3b61e102..cf301b395 100644
--- a/module-utils/EventStore/EventStore.hpp
+++ b/module-utils/EventStore/EventStore.hpp
@@ -9,8 +9,9 @@
 // - gsm SIM tray
 // it's not meant to serve as polling interface - rather to serve data
 
+#include <hal/cellular/SIM.hpp>
+
 #include <cstddef>
-#include <service-cellular/api/common.hpp>
 #include <string>
 
 namespace cpp_freertos
@@ -119,8 +120,8 @@ namespace Store
         /// selected - tray selection settings settable sim tray
         enum class SIM
         {
-            SIM1 = static_cast<int>(cellular::api::SimSlot::SIM1),
-            SIM2 = static_cast<int>(cellular::api::SimSlot::SIM2),
+            SIM1 = static_cast<int>(hal::cellular::SimSlot::SIM1),
+            SIM2 = static_cast<int>(hal::cellular::SimSlot::SIM2),
             SIM_FAIL,
             SIM_UNKNOWN,
             NONE,
diff --git a/module-utils/board/CMakeLists.txt b/module-utils/board/CMakeLists.txt
deleted file mode 100644
index d4c4d1352..000000000
--- a/module-utils/board/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-add_board_subdirectory()
-target_link_libraries(board PUBLIC module-bsp PRIVATE segger::rtt)
diff --git a/module-utils/bootconfig/CMakeLists.txt b/module-utils/bootconfig/CMakeLists.txt
index e89fcdf6e..59ccf603c 100644
--- a/module-utils/bootconfig/CMakeLists.txt
+++ b/module-utils/bootconfig/CMakeLists.txt
@@ -1,24 +1,24 @@
-project( utils-bootconfig VERSION 1.0
-        DESCRIPTION "Library for processing boot config"
+add_library(utils-bootconfig STATIC)
+
+target_sources(utils-bootconfig
+    PRIVATE
+        src/bootconfig.cpp
 )
 
-set ( SOURCES
-    src/bootconfig.cpp
+target_include_directories(utils-bootconfig
+    PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>    
 )
 
-set( INCLUDES
-    include
-)
-
-add_library( ${PROJECT_NAME} STATIC ${SOURCES} )
-
-target_include_directories( ${PROJECT_NAME} PUBLIC ${INCLUDES} )
-
-target_link_libraries( ${PROJECT_NAME}
+target_link_libraries(utils-bootconfig
    PRIVATE
-      module-utils
-      module-vfs
-      hash-library::hash-library
-      Microsoft.GSL::GSL
-      json::json
+        module-os
+        purefs-paths
+        utils-time
+        utility
+        version-header
+
+        Microsoft.GSL::GSL
+        json::json
+        hash-library::hash-library
 )
diff --git a/module-utils/bootconfig/src/bootconfig.cpp b/module-utils/bootconfig/src/bootconfig.cpp
index c9021f1da..a1ffe37dd 100644
--- a/module-utils/bootconfig/src/bootconfig.cpp
+++ b/module-utils/bootconfig/src/bootconfig.cpp
@@ -6,19 +6,17 @@
 #include <gsl/util>
 #include <limits.h>
 #include <purefs/filesystem_paths.hpp>
-#include <source/version.hpp>
+#include <product/version.hpp>
 #include <time/time_conversion.hpp>
 #include <ticks.hpp>
 #include <cstdio>
-#include <log.hpp>
+#include <log/log.hpp>
 #include <array>
 #include <Utils.hpp>
 
 #include <fstream>
 
 #include <purefs/filesystem_paths.hpp>
-#include <sys/mount.h>
-#include <sys/statvfs.h>
 
 namespace boot
 {
@@ -132,7 +130,6 @@ namespace boot
         return 0;
     }
 
-
     bool BootConfig::loadBootConfig(const std::filesystem::path &bootJsonPath)
     {
         std::string parseErrors  = "";
diff --git a/module-utils/i18n/CMakeLists.txt b/module-utils/i18n/CMakeLists.txt
index 20975df7a..65e426a11 100644
--- a/module-utils/i18n/CMakeLists.txt
+++ b/module-utils/i18n/CMakeLists.txt
@@ -1,7 +1,5 @@
 add_library(i18n STATIC)
 
-module_is_test_entity(i18n)
-
 target_sources(i18n
     PRIVATE
         i18n.cpp
@@ -20,9 +18,9 @@ target_include_directories(i18n
 target_link_libraries(i18n
     PRIVATE 
         json::json
-        log
+        log-api
         module-os
-        module-vfs
+        purefs-paths
 )
 
 if (${ENABLE_TESTS})
diff --git a/module-utils/i18n/i18n.cpp b/module-utils/i18n/i18n.cpp
index 809c2cdb6..225d1b7e8 100644
--- a/module-utils/i18n/i18n.cpp
+++ b/module-utils/i18n/i18n.cpp
@@ -2,7 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "i18nImpl.hpp"
-#include <log.hpp>
+#include <log/log.hpp>
 #include <cstdio>
 #include <purefs/filesystem_paths.hpp>
 
diff --git a/module-utils/i18n/tests/CMakeLists.txt b/module-utils/i18n/tests/CMakeLists.txt
index 4faf6de58..a064d1dd2 100644
--- a/module-utils/i18n/tests/CMakeLists.txt
+++ b/module-utils/i18n/tests/CMakeLists.txt
@@ -5,5 +5,6 @@ add_catch2_executable(
         test_i18n.cpp
     LIBS
         i18n
+        module-vfs
     USE_FS
 )
diff --git a/module-utils/ical/CMakeLists.txt b/module-utils/ical/CMakeLists.txt
new file mode 100644
index 000000000..ae4e9e231
--- /dev/null
+++ b/module-utils/ical/CMakeLists.txt
@@ -0,0 +1,25 @@
+add_library(utils-calendar STATIC)
+
+target_sources(utils-calendar
+    PUBLIC
+        ParserICS.hpp       
+
+    PRIVATE
+        ParserICS.cpp
+)
+
+target_include_directories(utils-calendar
+    PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>
+)
+
+target_link_libraries(utils-calendar
+    PUBLIC
+        utils-time
+        json::json
+)
+
+if (${ENABLE_TESTS})
+    # calendar tests are out of date
+    # add_subdirectory(tests)
+endif()
diff --git a/module-utils/ical/tests/CMakeLists.txt b/module-utils/ical/tests/CMakeLists.txt
new file mode 100644
index 000000000..485836472
--- /dev/null
+++ b/module-utils/ical/tests/CMakeLists.txt
@@ -0,0 +1,9 @@
+# Phone number tests
+add_catch2_executable(
+    NAME
+        utils-calendar
+    SRCS
+        test_ParserICS.cpp
+    LIBS
+        utils-calendar
+)
diff --git a/module-utils/test/test_ParserICS.cpp b/module-utils/ical/tests/test_ParserICS.cpp
similarity index 99%
rename from module-utils/test/test_ParserICS.cpp
rename to module-utils/ical/tests/test_ParserICS.cpp
index 112ef2e4b..14473e3dc 100644
--- a/module-utils/test/test_ParserICS.cpp
+++ b/module-utils/ical/tests/test_ParserICS.cpp
@@ -4,7 +4,7 @@
 #define CATCH_CONFIG_MAIN
 
 #include <catch2/catch.hpp>
-#include "ical/ParserICS.hpp"
+#include "ParserICS.hpp"
 
 TEST_CASE("Testing Duration class object", "getDurationString method")
 {
diff --git a/module-utils/locale/CMakeLists.txt b/module-utils/locale/CMakeLists.txt
new file mode 100644
index 000000000..53cababe6
--- /dev/null
+++ b/module-utils/locale/CMakeLists.txt
@@ -0,0 +1,7 @@
+add_library(utils-locale INTERFACE)
+
+target_sources(utils-locale INTERFACE country.hpp)
+target_include_directories(utils-locale
+    INTERFACE
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>
+)
diff --git a/module-utils/country.hpp b/module-utils/locale/country.hpp
similarity index 100%
rename from module-utils/country.hpp
rename to module-utils/locale/country.hpp
diff --git a/module-utils/log/CMakeLists.txt b/module-utils/log/CMakeLists.txt
index 0bfc56427..0da5ab293 100644
--- a/module-utils/log/CMakeLists.txt
+++ b/module-utils/log/CMakeLists.txt
@@ -1,9 +1,27 @@
 add_library(log STATIC)
+
+add_subdirectory(api)
+add_subdirectory(board)
+
 target_sources(log
-   PRIVATE
-        ${CMAKE_CURRENT_SOURCE_DIR}/Logger.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/log.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/LoggerBuffer.cpp
+    PRIVATE
+        Logger.cpp
+        log.cpp
+        LoggerBuffer.cpp
+        StringCircularBuffer.cpp
 )
+
 target_include_directories(log PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-target_link_libraries(log PRIVATE module-bsp)
+
+target_link_libraries(log
+    PRIVATE
+        utility
+
+    PUBLIC
+        module-os
+        log-api
+)
+
+if (${ENABLE_TESTS})
+    add_subdirectory(tests)
+endif()
diff --git a/module-utils/log/Logger.cpp b/module-utils/log/Logger.cpp
index cdfd9a5fa..4dbc9868d 100644
--- a/module-utils/log/Logger.cpp
+++ b/module-utils/log/Logger.cpp
@@ -3,10 +3,9 @@
 
 #include "critical.hpp"
 #include <fstream>
-#include <gsl/util>
 #include "LockGuard.hpp"
 #include <Logger.hpp>
-#include <module-utils/Utils.hpp>
+#include <Utils.hpp>
 #include <portmacro.h>
 #include <ticks.hpp>
 #include "macros.h"
diff --git a/module-utils/log/Logger.hpp b/module-utils/log/Logger.hpp
index c858782be..7310fa4b1 100644
--- a/module-utils/log/Logger.hpp
+++ b/module-utils/log/Logger.hpp
@@ -4,8 +4,7 @@
 #pragma once
 
 #include <assert.h>
-#include <board.h>
-#include <log.hpp>
+#include <log/log.hpp>
 #include "LoggerBuffer.hpp"
 #include "log_colors.hpp"
 #include <map>
diff --git a/module-utils/log/LoggerBuffer.hpp b/module-utils/log/LoggerBuffer.hpp
index 6511018e8..307e6c125 100644
--- a/module-utils/log/LoggerBuffer.hpp
+++ b/module-utils/log/LoggerBuffer.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "circular_buffer/StringCircularBuffer.hpp"
+#include "StringCircularBuffer.hpp"
 
 class LoggerBuffer : public StringCircularBuffer
 {
diff --git a/module-utils/circular_buffer/StringCircularBuffer.cpp b/module-utils/log/StringCircularBuffer.cpp
similarity index 100%
rename from module-utils/circular_buffer/StringCircularBuffer.cpp
rename to module-utils/log/StringCircularBuffer.cpp
diff --git a/module-utils/circular_buffer/StringCircularBuffer.hpp b/module-utils/log/StringCircularBuffer.hpp
similarity index 100%
rename from module-utils/circular_buffer/StringCircularBuffer.hpp
rename to module-utils/log/StringCircularBuffer.hpp
diff --git a/module-utils/log/api/CMakeLists.txt b/module-utils/log/api/CMakeLists.txt
new file mode 100644
index 000000000..5cdf38eb0
--- /dev/null
+++ b/module-utils/log/api/CMakeLists.txt
@@ -0,0 +1,12 @@
+add_library(log-api INTERFACE)
+
+target_sources(log-api
+    INTERFACE
+        log/log.hpp
+        log/debug.hpp
+)
+
+target_include_directories(log-api
+    INTERFACE
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>
+)
diff --git a/module-utils/log/debug.hpp b/module-utils/log/api/log/debug.hpp
similarity index 100%
rename from module-utils/log/debug.hpp
rename to module-utils/log/api/log/debug.hpp
diff --git a/module-utils/log/log.hpp b/module-utils/log/api/log/log.hpp
similarity index 93%
rename from module-utils/log/log.hpp
rename to module-utils/log/api/log/log.hpp
index c29a1ad86..6dbf09c05 100644
--- a/module-utils/log/log.hpp
+++ b/module-utils/log/api/log/log.hpp
@@ -88,10 +88,10 @@ extern "C"
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-variable"
-static const size_t LOGGER_BUFFER_SIZE  = 8192;
-static const char *LOG_FILE_NAME        = "MuditaOS.log";
-static const int MAX_LOG_FILES_COUNT    = 3;
-static const size_t MAX_LOG_FILE_SIZE   = 1024 * 1024 * 15; // 15 MB
+static const size_t LOGGER_BUFFER_SIZE = 8192;
+static const char *LOG_FILE_NAME       = "MuditaOS.log";
+static const int MAX_LOG_FILES_COUNT   = 3;
+static const size_t MAX_LOG_FILE_SIZE  = 1024 * 1024 * 15; // 15 MB
 #pragma GCC diagnostic pop
 
 #endif /* LOG_LOG_H_ */
diff --git a/module-utils/log/board/CMakeLists.txt b/module-utils/log/board/CMakeLists.txt
new file mode 100644
index 000000000..318743315
--- /dev/null
+++ b/module-utils/log/board/CMakeLists.txt
@@ -0,0 +1 @@
+add_board_subdirectory()
diff --git a/module-utils/board/linux/CMakeLists.txt b/module-utils/log/board/linux/CMakeLists.txt
similarity index 81%
rename from module-utils/board/linux/CMakeLists.txt
rename to module-utils/log/board/linux/CMakeLists.txt
index 4f0ac64e0..a7222113f 100644
--- a/module-utils/board/linux/CMakeLists.txt
+++ b/module-utils/log/board/linux/CMakeLists.txt
@@ -1,5 +1,5 @@
 target_sources(
-    board
+    log
 PRIVATE
     log_linux.cpp
 )
diff --git a/module-utils/board/linux/log_linux.cpp b/module-utils/log/board/linux/log_linux.cpp
similarity index 95%
rename from module-utils/board/linux/log_linux.cpp
rename to module-utils/log/board/linux/log_linux.cpp
index c9edf6b92..5d91024b5 100644
--- a/module-utils/board/linux/log_linux.cpp
+++ b/module-utils/log/board/linux/log_linux.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 <log.hpp>
+#include <log/log.hpp>
 #include <Logger.hpp>
 #include <iostream>
 #include <string_view>
diff --git a/module-utils/board/rt1051/CMakeLists.txt b/module-utils/log/board/rt1051/CMakeLists.txt
similarity index 77%
rename from module-utils/board/rt1051/CMakeLists.txt
rename to module-utils/log/board/rt1051/CMakeLists.txt
index aa5f7bbbf..1b6d6a296 100644
--- a/module-utils/board/rt1051/CMakeLists.txt
+++ b/module-utils/log/board/rt1051/CMakeLists.txt
@@ -1,24 +1,30 @@
-target_sources(board
+target_sources(log
     PRIVATE
         log_rt1051.cpp
         time_syscalls.cpp
 )
 
+target_link_libraries(log
+    PRIVATE
+        module-bsp
+        segger::rtt
+)
+
 if (${LOG_REDIRECT} STREQUAL "RTT_JLINK")
     target_sources(
-        board
+        log
     PRIVATE
         log_writeRTT.cpp
     )
 elseif (${LOG_REDIRECT} STREQUAL "RTT_LUART")
     target_sources(
-        board
+        log
     PRIVATE    
         log_writeLUART.cpp
     )
 elseif ((${LOG_REDIRECT} STREQUAL "RTT_SYSTEMVIEW") AND (${SYSTEM_VIEW_ENABLED} EQUAL 1))
     target_sources(
-        board
+        log
     PRIVATE
         log_writeSYSTEMVIEW.cpp
     )
diff --git a/module-utils/board/rt1051/log_rt1051.cpp b/module-utils/log/board/rt1051/log_rt1051.cpp
similarity index 99%
rename from module-utils/board/rt1051/log_rt1051.cpp
rename to module-utils/log/board/rt1051/log_rt1051.cpp
index 050fd2cfc..7bd969e36 100644
--- a/module-utils/board/rt1051/log_rt1051.cpp
+++ b/module-utils/log/board/rt1051/log_rt1051.cpp
@@ -4,7 +4,7 @@
 #include <board.h>
 #include <critical.hpp>
 #include <macros.h>
-#include <log.hpp>
+#include <log/log.hpp>
 #include <Logger.hpp>
 #include <SEGGER_RTT.h>
 #include <ticks.hpp>
diff --git a/module-utils/board/rt1051/log_writeLUART.cpp b/module-utils/log/board/rt1051/log_writeLUART.cpp
similarity index 93%
rename from module-utils/board/rt1051/log_writeLUART.cpp
rename to module-utils/log/board/rt1051/log_writeLUART.cpp
index b54a628c1..214f4876f 100644
--- a/module-utils/board/rt1051/log_writeLUART.cpp
+++ b/module-utils/log/board/rt1051/log_writeLUART.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 <log.hpp>
+#include <log/log.hpp>
 #include "fsl_lpuart.h"
 
 #define LOG_UART_DEV LPUART3
diff --git a/module-utils/board/rt1051/log_writeRTT.cpp b/module-utils/log/board/rt1051/log_writeRTT.cpp
similarity index 93%
rename from module-utils/board/rt1051/log_writeRTT.cpp
rename to module-utils/log/board/rt1051/log_writeRTT.cpp
index fe73634e7..276070d1e 100644
--- a/module-utils/board/rt1051/log_writeRTT.cpp
+++ b/module-utils/log/board/rt1051/log_writeRTT.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 <log.hpp>
+#include <log/log.hpp>
 #include "../../segger/rtt/SEGGER_RTT.h"
 
 #define LOG_RTT_BUFF_INDEX 0
diff --git a/module-utils/board/rt1051/log_writeSYSTEMVIEW.cpp b/module-utils/log/board/rt1051/log_writeSYSTEMVIEW.cpp
similarity index 93%
rename from module-utils/board/rt1051/log_writeSYSTEMVIEW.cpp
rename to module-utils/log/board/rt1051/log_writeSYSTEMVIEW.cpp
index 1a4ab432c..de9877b38 100644
--- a/module-utils/board/rt1051/log_writeSYSTEMVIEW.cpp
+++ b/module-utils/log/board/rt1051/log_writeSYSTEMVIEW.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 <log.hpp>
+#include <log/log.hpp>
 #include "../../segger/systemview/SEGGER/SEGGER_SYSVIEW.h"
 
 void log_WriteToDevice(const uint8_t *pBuffer, unsigned NumBytes)
diff --git a/module-utils/board/rt1051/time_syscalls.cpp b/module-utils/log/board/rt1051/time_syscalls.cpp
similarity index 100%
rename from module-utils/board/rt1051/time_syscalls.cpp
rename to module-utils/log/board/rt1051/time_syscalls.cpp
diff --git a/module-utils/log/log.cpp b/module-utils/log/log.cpp
index 8d1463532..32961def9 100644
--- a/module-utils/log/log.cpp
+++ b/module-utils/log/log.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 <log.hpp>
+#include <log/log.hpp>
 #include <Logger.hpp>
 #include <ticks.hpp>
 #include <macros.h>
diff --git a/module-utils/log/tests/CMakeLists.txt b/module-utils/log/tests/CMakeLists.txt
new file mode 100644
index 000000000..9d80451c9
--- /dev/null
+++ b/module-utils/log/tests/CMakeLists.txt
@@ -0,0 +1,37 @@
+
+# Log tests
+add_catch2_executable(
+    NAME
+        utils-log
+    SRCS
+        test_log.cpp
+    LIBS
+        module-utils
+        module-vfs
+    USE_FS
+)
+
+# Log dumps tests
+add_catch2_executable(
+    NAME
+        utils-logdumps
+    SRCS
+        test_logDumps.cpp
+    LIBS
+        module-utils
+        module-vfs
+    USE_FS
+)
+
+# Logger buffer tests
+add_catch2_executable(
+    NAME
+        utils-loggerbuffer
+    SRCS
+        test_LoggerBuffer.cpp
+        RandomStringGenerator.cpp
+        RandomStringGenerator.hpp
+    LIBS
+        module-utils
+        log
+)
diff --git a/module-utils/generators/RandomStringGenerator.cpp b/module-utils/log/tests/RandomStringGenerator.cpp
similarity index 100%
rename from module-utils/generators/RandomStringGenerator.cpp
rename to module-utils/log/tests/RandomStringGenerator.cpp
diff --git a/module-utils/generators/RandomStringGenerator.hpp b/module-utils/log/tests/RandomStringGenerator.hpp
similarity index 100%
rename from module-utils/generators/RandomStringGenerator.hpp
rename to module-utils/log/tests/RandomStringGenerator.hpp
diff --git a/module-utils/test/test_LoggerBuffer.cpp b/module-utils/log/tests/test_LoggerBuffer.cpp
similarity index 99%
rename from module-utils/test/test_LoggerBuffer.cpp
rename to module-utils/log/tests/test_LoggerBuffer.cpp
index ab3fb517b..c43753e62 100644
--- a/module-utils/test/test_LoggerBuffer.cpp
+++ b/module-utils/log/tests/test_LoggerBuffer.cpp
@@ -4,7 +4,7 @@
 #define CATCH_CONFIG_MAIN // This tells Catch to provide a main() - only do this in one cpp file
 #include <catch2/catch.hpp>
 
-#include "generators/RandomStringGenerator.hpp"
+#include "RandomStringGenerator.hpp"
 #include "LoggerBuffer.hpp"
 #include <string>
 #include <vector>
diff --git a/module-utils/test/test_log.cpp b/module-utils/log/tests/test_log.cpp
similarity index 98%
rename from module-utils/test/test_log.cpp
rename to module-utils/log/tests/test_log.cpp
index 4fa11286d..122db9b92 100644
--- a/module-utils/test/test_log.cpp
+++ b/module-utils/log/tests/test_log.cpp
@@ -4,7 +4,7 @@
 #define CATCH_CONFIG_MAIN // This tells Catch to provide a main() - only do this in one cpp file
 #include <catch2/catch.hpp>
 
-#include <log.hpp>
+#include <log/log.hpp>
 #include <string>
 
 using namespace std;
diff --git a/module-utils/test/test_logDumps.cpp b/module-utils/log/tests/test_logDumps.cpp
similarity index 99%
rename from module-utils/test/test_logDumps.cpp
rename to module-utils/log/tests/test_logDumps.cpp
index 83bb6c6d3..3efaf67a4 100644
--- a/module-utils/test/test_logDumps.cpp
+++ b/module-utils/log/tests/test_logDumps.cpp
@@ -6,7 +6,7 @@
 
 #include <string>
 
-#include <module-utils/log/Logger.hpp>
+#include <log/Logger.hpp>
 
 namespace
 {
diff --git a/module-utils/math/CMakeLists.txt b/module-utils/math/CMakeLists.txt
index 3c2143edd..a8bc72e2c 100644
--- a/module-utils/math/CMakeLists.txt
+++ b/module-utils/math/CMakeLists.txt
@@ -1,6 +1,6 @@
-add_library(math INTERFACE)
+add_library(utils-math INTERFACE)
 
-target_include_directories(math
+target_include_directories(utils-math
     INTERFACE
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )
diff --git a/module-utils/math/tests/CMakeLists.txt b/module-utils/math/tests/CMakeLists.txt
index 31eba13e9..f608f641b 100644
--- a/module-utils/math/tests/CMakeLists.txt
+++ b/module-utils/math/tests/CMakeLists.txt
@@ -4,6 +4,6 @@ add_catch2_executable(
     SRCS
         test_math.cpp
     LIBS
-        math
+        utils-math
         module-utils
 )
diff --git a/module-utils/phonenumber/CMakeLists.txt b/module-utils/phonenumber/CMakeLists.txt
new file mode 100644
index 000000000..9db5fbbf0
--- /dev/null
+++ b/module-utils/phonenumber/CMakeLists.txt
@@ -0,0 +1,26 @@
+add_library(utils-phonenumber STATIC)
+
+target_sources(utils-phonenumber
+    PUBLIC
+        NumberHolderMatcher.hpp
+        PhoneNumber.hpp
+
+    PRIVATE
+        PhoneNumber.cpp
+)
+
+target_include_directories(utils-phonenumber
+    PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>
+)
+
+target_link_libraries(utils-phonenumber
+    PUBLIC
+        utf8
+        utils-locale
+        libphonenumber::libphonenumber
+)
+
+if (${ENABLE_TESTS})
+    add_subdirectory(tests)
+endif()
diff --git a/module-utils/NumberHolderMatcher.hpp b/module-utils/phonenumber/NumberHolderMatcher.hpp
similarity index 100%
rename from module-utils/NumberHolderMatcher.hpp
rename to module-utils/phonenumber/NumberHolderMatcher.hpp
diff --git a/module-utils/PhoneNumber.cpp b/module-utils/phonenumber/PhoneNumber.cpp
similarity index 99%
rename from module-utils/PhoneNumber.cpp
rename to module-utils/phonenumber/PhoneNumber.cpp
index 0f602a722..aba5d4309 100644
--- a/module-utils/PhoneNumber.cpp
+++ b/module-utils/phonenumber/PhoneNumber.cpp
@@ -4,7 +4,7 @@
 #include "PhoneNumber.hpp"
 
 #include "country.hpp"
-#include <log.hpp>
+#include <log/log.hpp>
 
 #include <phonenumbers/phonenumberutil.h>
 #include <phonenumbers/asyoutypeformatter.h>
diff --git a/module-utils/PhoneNumber.hpp b/module-utils/phonenumber/PhoneNumber.hpp
similarity index 100%
rename from module-utils/PhoneNumber.hpp
rename to module-utils/phonenumber/PhoneNumber.hpp
diff --git a/module-utils/phonenumber/tests/CMakeLists.txt b/module-utils/phonenumber/tests/CMakeLists.txt
new file mode 100644
index 000000000..2d6cd58a3
--- /dev/null
+++ b/module-utils/phonenumber/tests/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Phone number tests
+add_catch2_executable(
+    NAME
+        utils-phonenumber
+    SRCS
+        unittest_phonenumber.cpp
+        unittest_numbermatcher.cpp
+    LIBS
+        module-utils
+)
diff --git a/module-utils/test/unittest_numbermatcher.cpp b/module-utils/phonenumber/tests/unittest_numbermatcher.cpp
similarity index 100%
rename from module-utils/test/unittest_numbermatcher.cpp
rename to module-utils/phonenumber/tests/unittest_numbermatcher.cpp
diff --git a/module-utils/test/unittest_phonenumber.cpp b/module-utils/phonenumber/tests/unittest_phonenumber.cpp
similarity index 100%
rename from module-utils/test/unittest_phonenumber.cpp
rename to module-utils/phonenumber/tests/unittest_phonenumber.cpp
diff --git a/module-utils/rrule/CMakeLists.txt b/module-utils/rrule/CMakeLists.txt
index 2e5550b5f..7b26d8a57 100644
--- a/module-utils/rrule/CMakeLists.txt
+++ b/module-utils/rrule/CMakeLists.txt
@@ -13,13 +13,13 @@ target_include_directories(rrule PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE
 target_link_libraries(rrule
     PUBLIC
         date
-        time
+        utils-time
+        utility
+
     PRIVATE
         ical_cxx
 )
 
-module_is_test_entity(rrule)
-
 if (${ENABLE_TESTS})
     add_subdirectory(test)
 endif()
diff --git a/module-utils/test/CMakeLists.txt b/module-utils/test/CMakeLists.txt
deleted file mode 100644
index 0623de38a..000000000
--- a/module-utils/test/CMakeLists.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-add_catch2_executable(
-    NAME
-        utils-conditional-invoke-tests
-    SRCS
-        test-Utility-ConditionalInvoke.cpp
-    LIBS
-        module-utils
-)
-
-# Phone number tests
-add_catch2_executable(
-    NAME
-        utils-phonenumber
-    SRCS
-        unittest_phonenumber.cpp
-        unittest_numbermatcher.cpp
-    LIBS
-        module-utils
-)
-
-# utils tests
-add_catch2_executable(
-    NAME
-        utils
-    SRCS
-        unittest_utils.cpp
-    LIBS
-        module-utils
-)
-
-# Log tests
-add_catch2_executable(
-    NAME
-        utils-log
-    SRCS
-        test_log.cpp
-    LIBS
-        module-utils
-)
-
-# Log dumps tests
-add_catch2_executable(
-    NAME
-        utils-logdumps
-    SRCS
-        test_logDumps.cpp
-    LIBS
-        module-utils
-    USE_FS
-)
-
-# Logger buffer tests
-add_catch2_executable(
-    NAME
-        utils-loggerbuffer
-    SRCS
-        test_LoggerBuffer.cpp
-    LIBS
-        module-utils
-)
diff --git a/module-utils/time/CMakeLists.txt b/module-utils/time/CMakeLists.txt
index 8555efe6a..584a065f0 100644
--- a/module-utils/time/CMakeLists.txt
+++ b/module-utils/time/CMakeLists.txt
@@ -2,36 +2,38 @@ add_library(time-constants INTERFACE)
 
 target_include_directories(time-constants INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
 
-target_sources(time-constants 
+target_sources(time-constants
     PUBLIC
         time/time_constants.hpp
 )
 
-add_library(time)
+add_library(utils-time)
 
-module_is_test_entity(time)
-
-target_sources(time
+target_sources(utils-time
     PRIVATE
         time/time_conversion.cpp
         time/time_date_validation.cpp
+        time/time_conversion_factory.cpp
+        time/dateCommon.hpp
         time/TimeRangeParser.cpp
         time/TimeZone.cpp
-        time/time_conversion_factory.cpp
-
-        time/dateCommon.hpp
 )
 
-target_include_directories(time PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
-
-target_link_libraries(time 
-    PRIVATE 
-        time-constants
-        utz::utz
+target_include_directories(utils-time
     PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+)
+
+target_link_libraries(utils-time
+    PRIVATE
+        utz::utz
+
+    PUBLIC
+        time-constants
+        date
         i18n
-        log
-        module-utils
+        log-api
+        utility
         utf8
 )
 
diff --git a/module-utils/time/test/CMakeLists.txt b/module-utils/time/test/CMakeLists.txt
index e3285d9d6..239038627 100644
--- a/module-utils/time/test/CMakeLists.txt
+++ b/module-utils/time/test/CMakeLists.txt
@@ -4,8 +4,7 @@ add_catch2_executable(
     SRCS
         unittest_TimeRangeParser.cpp
     LIBS
-        module-utils
-        time
+        utils-time
 )
 
 add_catch2_executable(
@@ -14,7 +13,7 @@ add_catch2_executable(
     SRCS
         unittest_TimeZone.cpp
     LIBS
-        time
+        utils-time
 )
 # time tests
 add_catch2_executable(
@@ -23,7 +22,8 @@ add_catch2_executable(
     SRCS
         unittest_time.cpp
     LIBS
-        time
+        utils-time
         utf8
+        module-vfs
     USE_FS
 )
diff --git a/module-utils/time/time/ScopedTime.hpp b/module-utils/time/time/ScopedTime.hpp
index 81b25f229..7991a043f 100644
--- a/module-utils/time/time/ScopedTime.hpp
+++ b/module-utils/time/time/ScopedTime.hpp
@@ -4,7 +4,7 @@
 #pragma once
 
 #include <FreeRTOS.h>
-#include <log.hpp>
+#include <log/log.hpp>
 #include <string>
 #include <ticks.hpp>
 
diff --git a/module-utils/time/time/dateCommon.hpp b/module-utils/time/time/dateCommon.hpp
index d7e832400..5aed3e6ac 100644
--- a/module-utils/time/time/dateCommon.hpp
+++ b/module-utils/time/time/dateCommon.hpp
@@ -4,9 +4,9 @@
 #ifndef DATECOMMON_H
 #define DATECOMMON_H
 
-#include <time/time_conversion_factory.hpp>
-#include <module-utils/Utils.hpp>
-#include <service-time/api/TimeSettingsApi.hpp>
+#include "time_conversion_factory.hpp"
+
+#include <Utils.hpp>
 
 #include <date/date.h>
 
@@ -276,12 +276,6 @@ inline std::string TimePointToLocalizedTimeString(const TimePoint &tp, const std
     return timestamp->str(format);
 }
 
-inline std::string TimePointToLocalizedHourMinString(const TimePoint &tp)
-{
-    return stm::api::isTimeFormat12h() ? TimePointToLocalizedTimeString(tp, "%I:%M")
-                                       : TimePointToLocalizedTimeString(tp, "%H:%M");
-}
-
 inline TimePoint TimePointFromString(const char *s1)
 {
     TimePoint tp;
@@ -326,12 +320,6 @@ inline std::string TimePointToHourString12H(const TimePoint &tp)
     return utils::to_string(hour12h);
 }
 
-inline std::string TimePointToLocalizedHourString(const TimePoint &tp)
-{
-    return stm::api::isTimeFormat12h() ? TimePointToLocalizedTimeString(tp, "%I")
-                                       : TimePointToLocalizedTimeString(tp, "%H");
-}
-
 inline std::string TimePointToHourString24H(const TimePoint &tp)
 {
     auto hour =
diff --git a/module-utils/time/time/time_conversion.hpp b/module-utils/time/time/time_conversion.hpp
index 0a4a97147..0d18b0bfa 100644
--- a/module-utils/time/time/time_conversion.hpp
+++ b/module-utils/time/time/time_conversion.hpp
@@ -7,7 +7,7 @@
 /// as stdlib builtin locale doesn't provide way to substitute C-LOCALE
 
 #include "time/time_locale.hpp"
-#include <log.hpp>
+#include <log/log.hpp>
 
 #include <vector>
 #include <string>
diff --git a/module-utils/time/time/time_date_validation.cpp b/module-utils/time/time/time_date_validation.cpp
index 72be2b3aa..f7f341c44 100644
--- a/module-utils/time/time/time_date_validation.cpp
+++ b/module-utils/time/time/time_date_validation.cpp
@@ -8,7 +8,7 @@
  *      Author: kuba
  */
 #include "time_date_validation.hpp"
-#include <log.hpp>
+#include <log/log.hpp>
 namespace utils
 {
     namespace time
diff --git a/module-utils/time/time/time_locale.hpp b/module-utils/time/time/time_locale.hpp
index 25b70162a..5ff707f45 100644
--- a/module-utils/time/time/time_locale.hpp
+++ b/module-utils/time/time/time_locale.hpp
@@ -6,7 +6,7 @@
 #include <array>
 #include <utf8/UTF8.hpp>
 #include "i18n/i18n.hpp"
-#include <log.hpp>
+#include <log/log.hpp>
 
 namespace utils
 {
diff --git a/module-utils/unicode/CMakeLists.txt b/module-utils/unicode/CMakeLists.txt
new file mode 100644
index 000000000..d34d01146
--- /dev/null
+++ b/module-utils/unicode/CMakeLists.txt
@@ -0,0 +1,10 @@
+add_library(utils-unicode INTERFACE)
+
+add_subdirectory(ucs2)
+add_subdirectory(utf8)
+
+target_link_libraries(utils-unicode
+    INTERFACE
+        ucs2
+        utf8
+)
diff --git a/module-utils/ucs2/CMakeLists.txt b/module-utils/unicode/ucs2/CMakeLists.txt
similarity index 88%
rename from module-utils/ucs2/CMakeLists.txt
rename to module-utils/unicode/ucs2/CMakeLists.txt
index 24f7b412c..d214a6995 100644
--- a/module-utils/ucs2/CMakeLists.txt
+++ b/module-utils/unicode/ucs2/CMakeLists.txt
@@ -1,7 +1,5 @@
 add_library(ucs2 STATIC)
 
-module_is_test_entity(ucs2)
-
 target_sources(ucs2
     PRIVATE
        ucs2/UCS2.cpp
@@ -17,7 +15,7 @@ target_link_libraries(ucs2
         utf8
 
     PRIVATE
-        log
+        log-api
 )
 
 if (${ENABLE_TESTS})
diff --git a/module-utils/ucs2/test/CMakeLists.txt b/module-utils/unicode/ucs2/test/CMakeLists.txt
similarity index 100%
rename from module-utils/ucs2/test/CMakeLists.txt
rename to module-utils/unicode/ucs2/test/CMakeLists.txt
diff --git a/module-utils/ucs2/test/unittest_ucs2.cpp b/module-utils/unicode/ucs2/test/unittest_ucs2.cpp
similarity index 100%
rename from module-utils/ucs2/test/unittest_ucs2.cpp
rename to module-utils/unicode/ucs2/test/unittest_ucs2.cpp
diff --git a/module-utils/ucs2/ucs2/UCS2.cpp b/module-utils/unicode/ucs2/ucs2/UCS2.cpp
similarity index 99%
rename from module-utils/ucs2/ucs2/UCS2.cpp
rename to module-utils/unicode/ucs2/ucs2/UCS2.cpp
index 75ad06289..ae897739d 100644
--- a/module-utils/ucs2/ucs2/UCS2.cpp
+++ b/module-utils/unicode/ucs2/ucs2/UCS2.cpp
@@ -7,7 +7,7 @@
 #include <sstream>
 
 #include <iomanip>
-#include <log.hpp>
+#include <log/log.hpp>
 #include <iterator>
 #include <locale>
 #include <codecvt>
diff --git a/module-utils/ucs2/ucs2/UCS2.hpp b/module-utils/unicode/ucs2/ucs2/UCS2.hpp
similarity index 100%
rename from module-utils/ucs2/ucs2/UCS2.hpp
rename to module-utils/unicode/ucs2/ucs2/UCS2.hpp
diff --git a/module-utils/utf8/CMakeLists.txt b/module-utils/unicode/utf8/CMakeLists.txt
similarity index 77%
rename from module-utils/utf8/CMakeLists.txt
rename to module-utils/unicode/utf8/CMakeLists.txt
index b852cdb25..f6d4ef1d2 100644
--- a/module-utils/utf8/CMakeLists.txt
+++ b/module-utils/unicode/utf8/CMakeLists.txt
@@ -1,7 +1,5 @@
 add_library(utf8 STATIC)
 
-module_is_test_entity(utf8)
-
 target_sources(utf8
     PRIVATE
         utf8/UTF8.cpp
@@ -12,7 +10,7 @@ target_include_directories(utf8
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )
 
-target_link_libraries(utf8 PRIVATE log)
+target_link_libraries(utf8 PRIVATE log-api)
 
 if (${ENABLE_TESTS})
     add_subdirectory(test)
diff --git a/module-utils/utf8/test/CMakeLists.txt b/module-utils/unicode/utf8/test/CMakeLists.txt
similarity index 86%
rename from module-utils/utf8/test/CMakeLists.txt
rename to module-utils/unicode/utf8/test/CMakeLists.txt
index 1230ceb71..f8686bdf1 100644
--- a/module-utils/utf8/test/CMakeLists.txt
+++ b/module-utils/unicode/utf8/test/CMakeLists.txt
@@ -4,6 +4,6 @@ add_catch2_executable(
     SRCS
         unittest_utf8.cpp
     LIBS
-        log
+        log-api
         utf8
 )
diff --git a/module-utils/utf8/test/unittest_utf8.cpp b/module-utils/unicode/utf8/test/unittest_utf8.cpp
similarity index 100%
rename from module-utils/utf8/test/unittest_utf8.cpp
rename to module-utils/unicode/utf8/test/unittest_utf8.cpp
diff --git a/module-utils/utf8/utf8/UTF8.cpp b/module-utils/unicode/utf8/utf8/UTF8.cpp
similarity index 99%
rename from module-utils/utf8/utf8/UTF8.cpp
rename to module-utils/unicode/utf8/utf8/UTF8.cpp
index 39859c2bd..1b33bba28 100644
--- a/module-utils/utf8/utf8/UTF8.cpp
+++ b/module-utils/unicode/utf8/utf8/UTF8.cpp
@@ -6,7 +6,7 @@
 #include <cstdint>
 #include <ostream>
 
-#include <log.hpp>
+#include <log/log.hpp>
 #include "utf8/UTF8.hpp"
 
 #define debug_utf(...)
diff --git a/module-utils/utf8/utf8/UTF8.hpp b/module-utils/unicode/utf8/utf8/UTF8.hpp
similarity index 100%
rename from module-utils/utf8/utf8/UTF8.hpp
rename to module-utils/unicode/utf8/utf8/UTF8.hpp
diff --git a/module-utils/utility/CMakeLists.txt b/module-utils/utility/CMakeLists.txt
new file mode 100644
index 000000000..87adefbbc
--- /dev/null
+++ b/module-utils/utility/CMakeLists.txt
@@ -0,0 +1,33 @@
+add_library(utility STATIC)
+
+target_sources(utility
+    PRIVATE
+        Utils.cpp
+
+    PUBLIC
+        integer.hpp
+        Split.hpp
+        split_sv.hpp
+        Temperature.hpp
+        Utility.hpp
+        Utils.hpp
+)
+
+target_include_directories(utility
+    PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>
+)
+
+target_link_libraries(utility
+    PUBLIC
+        log-api
+        magic_enum::magic_enum
+
+    PRIVATE
+        hash-library::hash-library
+)
+
+if (${ENABLE_TESTS})
+    add_subdirectory(tests)
+endif()
+
diff --git a/module-utils/Split.hpp b/module-utils/utility/Split.hpp
similarity index 100%
rename from module-utils/Split.hpp
rename to module-utils/utility/Split.hpp
diff --git a/module-utils/Temperature.hpp b/module-utils/utility/Temperature.hpp
similarity index 100%
rename from module-utils/Temperature.hpp
rename to module-utils/utility/Temperature.hpp
diff --git a/module-utils/Utils.cpp b/module-utils/utility/Utils.cpp
similarity index 100%
rename from module-utils/Utils.cpp
rename to module-utils/utility/Utils.cpp
diff --git a/module-utils/Utils.hpp b/module-utils/utility/Utils.hpp
similarity index 92%
rename from module-utils/Utils.hpp
rename to module-utils/utility/Utils.hpp
index ae39e2f28..da1e25178 100644
--- a/module-utils/Utils.hpp
+++ b/module-utils/utility/Utils.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 #include "Split.hpp"
-#include <log.hpp>
+#include <log/log.hpp>
 #include <magic_enum.hpp>
 
 #include <algorithm> // std::find_if_not
@@ -72,12 +72,12 @@ namespace utils
         return base;
     }
 
-    template <typename T>[[nodiscard]] std::string to_string(T t)
+    template <typename T> [[nodiscard]] std::string to_string(T t)
     {
         return std::to_string(t);
     }
 
-    template <>[[nodiscard]] inline std::string to_string<long double>(long double t)
+    template <> [[nodiscard]] inline std::string to_string<long double>(long double t)
     {
         uint32_t precision = 6;
         int base           = static_cast<int>(t);
@@ -113,31 +113,31 @@ namespace utils
         return baseAsStr + "." + fractionalAsStr;
     }
 
-    template <>[[nodiscard]] inline std::string to_string<float>(float t)
+    template <> [[nodiscard]] inline std::string to_string<float>(float t)
     {
         return to_string(static_cast<long double>(t));
     }
 
-    template <>[[nodiscard]] inline std::string to_string<double>(double t)
+    template <> [[nodiscard]] inline std::string to_string<double>(double t)
     {
         return to_string(static_cast<long double>(t));
     }
 
-    template <>[[nodiscard]] inline std::string to_string<std::int64_t>(std::int64_t value)
+    template <> [[nodiscard]] inline std::string to_string<std::int64_t>(std::int64_t value)
     {
         std::ostringstream ss;
         ss << value;
         return ss.str();
     }
 
-    template <>[[nodiscard]] inline std::string to_string<std::uint64_t>(std::uint64_t value)
+    template <> [[nodiscard]] inline std::string to_string<std::uint64_t>(std::uint64_t value)
     {
         std::ostringstream ss;
         ss << value;
         return ss.str();
     }
 
-    template <typename T>[[nodiscard]] const std::string enumToString(const T &t)
+    template <typename T> [[nodiscard]] const std::string enumToString(const T &t)
     {
         static_assert(std::is_enum_v<T>);
         return std::string(magic_enum::enum_name(t));
@@ -147,7 +147,7 @@ namespace utils
     ///
     /// @param value to be converted
     /// @return Value casted to type T
-    template <typename T>[[nodiscard]] T getNumericValue(const std::string &value)
+    template <typename T> [[nodiscard]] T getNumericValue(const std::string &value)
     {
         static_assert(std::is_arithmetic_v<T>);
         if (value.empty()) {
diff --git a/module-utils/integer.hpp b/module-utils/utility/integer.hpp
similarity index 100%
rename from module-utils/integer.hpp
rename to module-utils/utility/integer.hpp
diff --git a/module-utils/split_sv.hpp b/module-utils/utility/split_sv.hpp
similarity index 100%
rename from module-utils/split_sv.hpp
rename to module-utils/utility/split_sv.hpp
diff --git a/module-utils/utility/tests/CMakeLists.txt b/module-utils/utility/tests/CMakeLists.txt
new file mode 100644
index 000000000..4d223f7c1
--- /dev/null
+++ b/module-utils/utility/tests/CMakeLists.txt
@@ -0,0 +1,18 @@
+add_catch2_executable(
+    NAME
+        utils-conditional-invoke-tests
+    SRCS
+        test-Utility-ConditionalInvoke.cpp
+    LIBS
+        module-utils
+)
+
+add_catch2_executable(
+    NAME
+        utils
+    SRCS
+        unittest_utils.cpp
+    LIBS
+        module-utils
+)
+
diff --git a/module-utils/test/test-Utility-ConditionalInvoke.cpp b/module-utils/utility/tests/test-Utility-ConditionalInvoke.cpp
similarity index 99%
rename from module-utils/test/test-Utility-ConditionalInvoke.cpp
rename to module-utils/utility/tests/test-Utility-ConditionalInvoke.cpp
index ec4d629a5..5f270b511 100644
--- a/module-utils/test/test-Utility-ConditionalInvoke.cpp
+++ b/module-utils/utility/tests/test-Utility-ConditionalInvoke.cpp
@@ -4,7 +4,7 @@
 #define CATCH_CONFIG_MAIN
 #include <catch2/catch.hpp>
 
-#include <module-utils/utility/Utility.hpp>
+#include <Utility.hpp>
 
 struct SomeStruct
 {
diff --git a/module-utils/test/unittest_utils.cpp b/module-utils/utility/tests/unittest_utils.cpp
similarity index 100%
rename from module-utils/test/unittest_utils.cpp
rename to module-utils/utility/tests/unittest_utils.cpp
diff --git a/module-vfs/drivers/src/purefs/fs/filesystem_littlefs.cpp b/module-vfs/drivers/src/purefs/fs/filesystem_littlefs.cpp
index a5e55c3de..1d1ea4356 100644
--- a/module-vfs/drivers/src/purefs/fs/filesystem_littlefs.cpp
+++ b/module-vfs/drivers/src/purefs/fs/filesystem_littlefs.cpp
@@ -10,7 +10,7 @@
 #include <purefs/blkdev/disk_handle.hpp>
 #include <purefs/fs/mount_flags.hpp>
 #include <lfs.h>
-#include <log.hpp>
+#include <log/log.hpp>
 
 #include <climits>
 #include <syslimits.h>
@@ -133,11 +133,11 @@ namespace
             LOG_ERROR("Block size doesn't match partition size");
             return -ERANGE;
         }
-        cfg->block_count = total_siz / cfg->block_size - 1;
+        cfg->block_count    = total_siz / cfg->block_size - 1;
         cfg->lookahead_size = std::min<lfs_size_t>(131072U, ((cfg->block_count >> 3U) + 1U) << 3U);
-        cfg->read_size  = cfg->block_size;
-        cfg->prog_size  = cfg->block_size;
-        cfg->cache_size = cfg->block_size;
+        cfg->read_size      = cfg->block_size;
+        cfg->prog_size      = cfg->block_size;
+        cfg->cache_size     = cfg->block_size;
         LOG_INFO("LFS: block count %u block size %u", unsigned(cfg->block_count), unsigned(cfg->block_size));
         return 0;
     }
@@ -149,7 +149,7 @@ namespace purefs::fs::drivers
     namespace
     {
         template <typename T, typename... Args>
-        auto invoke_lfs(filesystem_littlefs::fsfile zfil, T lfs_fun, Args &&... args)
+        auto invoke_lfs(filesystem_littlefs::fsfile zfil, T lfs_fun, Args &&...args)
             -> decltype(lfs_fun(nullptr, nullptr, std::forward<Args>(args)...))
         {
             auto vfile = std::dynamic_pointer_cast<file_handle_littlefs>(zfil);
@@ -166,7 +166,7 @@ namespace purefs::fs::drivers
             return lfs_to_errno(lerr);
         }
         template <typename T, typename... Args>
-        auto invoke_lfs(filesystem_littlefs::fsdir zdir, T lfs_fun, Args &&... args)
+        auto invoke_lfs(filesystem_littlefs::fsdir zdir, T lfs_fun, Args &&...args)
             -> decltype(lfs_fun(nullptr, nullptr, std::forward<Args>(args)...))
         {
             auto vdir = std::dynamic_pointer_cast<directory_handle_littlefs>(zdir);
@@ -184,7 +184,7 @@ namespace purefs::fs::drivers
         }
 
         template <typename T, typename... Args>
-        auto invoke_lfs(filesystem_littlefs::fsmount fmnt, T lfs_fun, Args &&... args)
+        auto invoke_lfs(filesystem_littlefs::fsmount fmnt, T lfs_fun, Args &&...args)
             -> decltype(lfs_fun(nullptr, std::forward<Args>(args)...))
         {
             auto mntp = std::static_pointer_cast<mount_point_littlefs>(fmnt);
@@ -197,7 +197,7 @@ namespace purefs::fs::drivers
         }
 
         template <typename T, typename... Args>
-        auto invoke_lfs(filesystem_littlefs::fsmount fmnt, std::string_view path, T lfs_fun, Args &&... args)
+        auto invoke_lfs(filesystem_littlefs::fsmount fmnt, std::string_view path, T lfs_fun, Args &&...args)
             -> decltype(lfs_fun(nullptr, "", std::forward<Args>(args)...))
         {
             auto mntp = std::static_pointer_cast<mount_point_littlefs>(fmnt);
@@ -234,7 +234,7 @@ namespace purefs::fs::drivers
             return lfs_to_errno(err);
         }
         {
-            auto diskmm = disk_mngr();
+            auto diskmm      = disk_mngr();
             const auto ssize = diskmm->get_info(disk, blkdev::info_type::sector_size);
             if (ssize < 0) {
                 LOG_ERROR("Unable to read sector size %i", int(ssize));
diff --git a/module-vfs/drivers/src/purefs/fs/filesystem_vfat.cpp b/module-vfs/drivers/src/purefs/fs/filesystem_vfat.cpp
index 76af69f35..e76885fb3 100644
--- a/module-vfs/drivers/src/purefs/fs/filesystem_vfat.cpp
+++ b/module-vfs/drivers/src/purefs/fs/filesystem_vfat.cpp
@@ -8,7 +8,7 @@
 #include <purefs/fs/drivers/file_handle_vfat.hpp>
 #include <purefs/fs/drivers/directory_handle_vfat.hpp>
 #include <purefs/fs/mount_flags.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 #include <fatfs/volume_mapper.hpp>
 #include <ff.h>
 #include <sys/statvfs.h>
diff --git a/module-vfs/drivers/src/thirdparty/littlefs/lfs_glue.cpp b/module-vfs/drivers/src/thirdparty/littlefs/lfs_glue.cpp
index e34192c5b..75e4ffa8d 100644
--- a/module-vfs/drivers/src/thirdparty/littlefs/lfs_glue.cpp
+++ b/module-vfs/drivers/src/thirdparty/littlefs/lfs_glue.cpp
@@ -4,7 +4,7 @@
 #include <lfs.h>
 #include <purefs/blkdev/disk_handle.hpp>
 #include <purefs/blkdev/disk_manager.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 #include <mutex.hpp>
 #include <errno.h>
 
diff --git a/module-vfs/src/purefs/blkdev/disk_handle.cpp b/module-vfs/src/purefs/blkdev/disk_handle.cpp
index f58a024a2..8800f3a55 100644
--- a/module-vfs/src/purefs/blkdev/disk_handle.cpp
+++ b/module-vfs/src/purefs/blkdev/disk_handle.cpp
@@ -2,7 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 #include <purefs/blkdev/disk_handle.hpp>
 #include <purefs/blkdev/disk.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 
 namespace purefs::blkdev::internal
 {
diff --git a/module-vfs/src/purefs/blkdev/disk_manager.cpp b/module-vfs/src/purefs/blkdev/disk_manager.cpp
index 1e407b702..3caf6d5cd 100644
--- a/module-vfs/src/purefs/blkdev/disk_manager.cpp
+++ b/module-vfs/src/purefs/blkdev/disk_manager.cpp
@@ -3,7 +3,7 @@
 
 #include <purefs/blkdev/disk_manager.hpp>
 #include <purefs/blkdev/disk.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 #include <mutex.hpp>
 #include <errno.h>
 #include <charconv>
@@ -18,7 +18,7 @@ namespace purefs::blkdev
     namespace
     {
         using namespace std::literals;
-        static constexpr auto part_suffix = "part"sv;
+        static constexpr auto part_suffix    = "part"sv;
         static constexpr auto syspart_suffix = "sys"sv;
     } // namespace
 
diff --git a/module-vfs/src/purefs/blkdev/partition_parser.cpp b/module-vfs/src/purefs/blkdev/partition_parser.cpp
index 1c99ecad1..2973ed58c 100644
--- a/module-vfs/src/purefs/blkdev/partition_parser.cpp
+++ b/module-vfs/src/purefs/blkdev/partition_parser.cpp
@@ -3,7 +3,7 @@
 
 #include <purefs/blkdev/partition_parser.hpp>
 #include <purefs/blkdev/disk.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 #include <errno.h>
 #include <limits>
 
diff --git a/module-vfs/src/purefs/fs/filesystem_syscalls.cpp b/module-vfs/src/purefs/fs/filesystem_syscalls.cpp
index 1d901d5dc..d294df8da 100644
--- a/module-vfs/src/purefs/fs/filesystem_syscalls.cpp
+++ b/module-vfs/src/purefs/fs/filesystem_syscalls.cpp
@@ -2,7 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 #include <purefs/fs/filesystem.hpp>
 #include <errno.h>
-#include <log.hpp>
+#include <log/log.hpp>
 #include <purefs/fs/filesystem_operations.hpp>
 #include <purefs/fs/file_handle.hpp>
 #include <purefs/fs/directory_handle.hpp>
diff --git a/module-vfs/src/purefs/vfs_subsystem.cpp b/module-vfs/src/purefs/vfs_subsystem.cpp
index 07babf0cb..6742f1bdb 100644
--- a/module-vfs/src/purefs/vfs_subsystem.cpp
+++ b/module-vfs/src/purefs/vfs_subsystem.cpp
@@ -8,7 +8,7 @@
 #include <purefs/vfs_subsystem.hpp>
 #include <purefs/vfs_subsystem_internal.hpp>
 #include <purefs/fs/thread_local_cwd.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 #include <purefs/filesystem_paths.hpp>
 #include <json11.hpp>
 #include <sys/stat.h>
diff --git a/products/BellHybrid/BellHybridMain.cpp b/products/BellHybrid/BellHybridMain.cpp
index d726a9a07..5cb194ed8 100644
--- a/products/BellHybrid/BellHybridMain.cpp
+++ b/products/BellHybrid/BellHybridMain.cpp
@@ -29,9 +29,9 @@
 
 #include <Application.hpp>
 #include <ApplicationLauncher.hpp>
-#include <log/Logger.hpp>
+#include <Logger.hpp>
 #include <log/log.hpp>
-#include <source/version.hpp>
+#include <product/version.hpp>
 #include <sys/SystemManager.hpp>
 #include <time/AlarmOperations.hpp>
 #include <SystemWatchdog/SystemWatchdog.hpp>
diff --git a/products/BellHybrid/CMakeLists.txt b/products/BellHybrid/CMakeLists.txt
index a5ea1188a..29593ed53 100644
--- a/products/BellHybrid/CMakeLists.txt
+++ b/products/BellHybrid/CMakeLists.txt
@@ -47,6 +47,7 @@ target_link_libraries(BellHybrid
         bell::app-settings
         bell::db
         evtmgr
+        log
         messagetype
         module-bsp
         module-vfs
@@ -56,6 +57,7 @@ target_link_libraries(BellHybrid
         sys
         bell::time
         platform
+        version-header
         "$<$<STREQUAL:${PROJECT_TARGET},TARGET_Linux>:iosyscalls>"
         "$<$<STREQUAL:${PROJECT_TARGET},TARGET_RT1051>:CrashCatcher::CrashCatcher>"
     )
@@ -68,8 +70,6 @@ set_source_files_properties(BellHybridMain.cpp PROPERTIES COMPILE_DEFINITIONS "$
 
 strip_executable(BellHybrid)
 
-add_dependencies(BellHybrid version)
-
 include(AddBootBin)
 add_boot_bin(BellHybrid)
 add_image(
diff --git a/products/BellHybrid/apps/application-bell-main/CMakeLists.txt b/products/BellHybrid/apps/application-bell-main/CMakeLists.txt
index f767d3296..b4eb59ddf 100644
--- a/products/BellHybrid/apps/application-bell-main/CMakeLists.txt
+++ b/products/BellHybrid/apps/application-bell-main/CMakeLists.txt
@@ -40,7 +40,7 @@ target_link_libraries(application-bell-main
         i18n
         module-gui
         service-gui
-        time
+        utils-time
         bell::db
         bell::evtmgr
         bell::app-alarm
diff --git a/products/BellHybrid/apps/application-bell-main/models/TemperatureModel.hpp b/products/BellHybrid/apps/application-bell-main/models/TemperatureModel.hpp
index 7ebd56fd9..1a36c0623 100644
--- a/products/BellHybrid/apps/application-bell-main/models/TemperatureModel.hpp
+++ b/products/BellHybrid/apps/application-bell-main/models/TemperatureModel.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <module-utils/Temperature.hpp>
+#include <Temperature.hpp>
 #include <service-db/Settings.hpp>
 
 #include <cstdint>
diff --git a/products/BellHybrid/apps/application-bell-main/presenters/HomeScreenPresenter.hpp b/products/BellHybrid/apps/application-bell-main/presenters/HomeScreenPresenter.hpp
index 9486ac370..67f776b68 100644
--- a/products/BellHybrid/apps/application-bell-main/presenters/HomeScreenPresenter.hpp
+++ b/products/BellHybrid/apps/application-bell-main/presenters/HomeScreenPresenter.hpp
@@ -9,7 +9,7 @@
 #include <common/models/AbstractAlarmModel.hpp>
 #include <gui/input/InputEvent.hpp>
 #include <Timers/TimerHandle.hpp>
-#include <module-utils/Temperature.hpp>
+#include <Temperature.hpp>
 #include <time/time_locale.hpp>
 #include <utf8/UTF8.hpp>
 
diff --git a/products/BellHybrid/apps/application-bell-settings/include/application-bell-settings/models/TemperatureUnitModel.hpp b/products/BellHybrid/apps/application-bell-settings/include/application-bell-settings/models/TemperatureUnitModel.hpp
index 7a90e0bb1..592f4ae1f 100644
--- a/products/BellHybrid/apps/application-bell-settings/include/application-bell-settings/models/TemperatureUnitModel.hpp
+++ b/products/BellHybrid/apps/application-bell-settings/include/application-bell-settings/models/TemperatureUnitModel.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <module-utils/Temperature.hpp>
+#include <Temperature.hpp>
 #include <service-db/Settings.hpp>
 
 #include <memory>
diff --git a/products/BellHybrid/apps/application-bell-settings/include/application-bell-settings/models/TimeUnitsModel.hpp b/products/BellHybrid/apps/application-bell-settings/include/application-bell-settings/models/TimeUnitsModel.hpp
index 0b17dc0ff..4882ce684 100644
--- a/products/BellHybrid/apps/application-bell-settings/include/application-bell-settings/models/TimeUnitsModel.hpp
+++ b/products/BellHybrid/apps/application-bell-settings/include/application-bell-settings/models/TimeUnitsModel.hpp
@@ -5,7 +5,7 @@
 
 #include <apps-common/ApplicationCommon.hpp>
 #include <apps-common/InternalModel.hpp>
-#include <module-utils/Temperature.hpp>
+#include <Temperature.hpp>
 #include <time/time_locale.hpp>
 
 namespace gui
diff --git a/products/BellHybrid/apps/application-bell-settings/widgets/TemperatureUnitListItem.hpp b/products/BellHybrid/apps/application-bell-settings/widgets/TemperatureUnitListItem.hpp
index 5d969e1ad..a6353d649 100644
--- a/products/BellHybrid/apps/application-bell-settings/widgets/TemperatureUnitListItem.hpp
+++ b/products/BellHybrid/apps/application-bell-settings/widgets/TemperatureUnitListItem.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <module-utils/Temperature.hpp>
+#include <Temperature.hpp>
 #include <widgets/BellSideListItem.hpp>
 #include <widgets/spinners/Spinners.hpp>
 #include <utf8/UTF8.hpp>
diff --git a/products/BellHybrid/apps/common/include/common/TimeUtils.hpp b/products/BellHybrid/apps/common/include/common/TimeUtils.hpp
index 1541743b3..b6560a0cb 100644
--- a/products/BellHybrid/apps/common/include/common/TimeUtils.hpp
+++ b/products/BellHybrid/apps/common/include/common/TimeUtils.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <module-utils/utf8/utf8/UTF8.hpp>
+#include <utf8/UTF8.hpp>
 
 #include <ctime>
 
diff --git a/products/BellHybrid/services/evtmgr/EventManager.cpp b/products/BellHybrid/services/evtmgr/EventManager.cpp
index 5f871e194..6b9f3d0b0 100644
--- a/products/BellHybrid/services/evtmgr/EventManager.cpp
+++ b/products/BellHybrid/services/evtmgr/EventManager.cpp
@@ -6,7 +6,7 @@
 #include "WorkerEvent.hpp"
 #include <evtmgr/EventManager.hpp>
 #include <keymap/KeyMap.hpp>
-#include <module-bsp/hal/temperature_source/TemperatureSource.hpp>
+#include <hal/temperature_source/TemperatureSource.hpp>
 #include <SystemManager/Constants.hpp>
 #include <screen-light-control/ScreenLightControl.hpp>
 #include <service-evtmgr/KbdMessage.hpp>
diff --git a/products/BellHybrid/services/evtmgr/include/evtmgr/api/TemperatureApi.hpp b/products/BellHybrid/services/evtmgr/include/evtmgr/api/TemperatureApi.hpp
index 3b8c2cf67..3e20c9fb3 100644
--- a/products/BellHybrid/services/evtmgr/include/evtmgr/api/TemperatureApi.hpp
+++ b/products/BellHybrid/services/evtmgr/include/evtmgr/api/TemperatureApi.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <module-bsp/hal/temperature_source/TemperatureSource.hpp>
+#include <hal/temperature_source/TemperatureSource.hpp>
 
 namespace evtmgr::api
 {
diff --git a/products/BellHybrid/services/evtmgr/internal/StaticData.hpp b/products/BellHybrid/services/evtmgr/internal/StaticData.hpp
index d66d22b35..7042c4fcd 100644
--- a/products/BellHybrid/services/evtmgr/internal/StaticData.hpp
+++ b/products/BellHybrid/services/evtmgr/internal/StaticData.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <module-bsp/hal/temperature_source/TemperatureSource.hpp>
+#include <hal/temperature_source/TemperatureSource.hpp>
 
 namespace evtmgr::internal
 {
diff --git a/products/PurePhone/CMakeLists.txt b/products/PurePhone/CMakeLists.txt
index c4804a8be..fd1976113 100644
--- a/products/PurePhone/CMakeLists.txt
+++ b/products/PurePhone/CMakeLists.txt
@@ -60,6 +60,7 @@ target_link_libraries(PurePhone
         appmgr
         db
         evtmgr
+        log
         messagetype
         module-apps
         module-bsp
@@ -71,6 +72,7 @@ target_link_libraries(PurePhone
         service-fileindexer
         service-time
         sys
+        version-header
         "$<$<STREQUAL:${PROJECT_TARGET},TARGET_Linux>:iosyscalls>"
         "$<$<STREQUAL:${PROJECT_TARGET},TARGET_RT1051>:CrashCatcher::CrashCatcher>"
     )
@@ -85,8 +87,6 @@ strip_executable(PurePhone)
 
 message_serial_status()
 
-add_dependencies(PurePhone version)
-
 include(AddBootBin)
 add_boot_bin(PurePhone)
 add_image(
diff --git a/products/PurePhone/PurePhoneMain.cpp b/products/PurePhone/PurePhoneMain.cpp
index 34332b92f..2a2a45415 100644
--- a/products/PurePhone/PurePhoneMain.cpp
+++ b/products/PurePhone/PurePhoneMain.cpp
@@ -59,9 +59,9 @@
 
 #include <Application.hpp>
 #include <ApplicationLauncher.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 #include <Logger.hpp>
-#include <source/version.hpp>
+#include <product/version.hpp>
 #include <sys/SystemManager.hpp>
 #include <SystemWatchdog/SystemWatchdog.hpp>
 #include <thread.hpp>
diff --git a/products/PurePhone/sys/SystemManager.cpp b/products/PurePhone/sys/SystemManager.cpp
index d23ac4233..591774be9 100644
--- a/products/PurePhone/sys/SystemManager.cpp
+++ b/products/PurePhone/sys/SystemManager.cpp
@@ -9,7 +9,7 @@
 #include <SystemManager/messages/SystemManagerMessage.hpp>
 #include <SystemManager/messages/TetheringQuestionRequest.hpp>
 #include <SystemManager/messages/TetheringStateRequest.hpp>
-#include <module-utils/EventStore/EventStore.hpp>
+#include <EventStore.hpp>
 #include <service-appmgr/Constants.hpp>
 #include <service-cellular/CellularMessage.hpp>
 #include <service-cellular/CellularServiceAPI.hpp>
diff --git a/products/PurePhone/test/test-settings/Database.cpp b/products/PurePhone/test/test-settings/Database.cpp
index 4e725211c..48fe3e0d1 100644
--- a/products/PurePhone/test/test-settings/Database.cpp
+++ b/products/PurePhone/test/test-settings/Database.cpp
@@ -3,7 +3,7 @@
 
 #include "module-db/Database/Database.hpp"
 
-#include <log.hpp>
+#include <log/log.hpp>
 
 #include <purefs/filesystem_paths.hpp>
 #include <gsl/util>
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 940b306ff..409d82ad3 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -82,7 +82,7 @@ function(add_gtest_executable)
         enable_test_filesystem()
     endif()
 
-    target_link_libraries(${_TESTNAME} PRIVATE gtest_main gmock log)
+    target_link_libraries(${_TESTNAME} PRIVATE gtest_main gmock log-api)
     foreach(lib ${_TEST_ARGS_LIBS})
         target_link_libraries(${_TESTNAME} PRIVATE ${lib})
     endforeach(lib)
@@ -157,7 +157,7 @@ function(add_catch2_executable)
         enable_test_filesystem()
     endif()
 
-    target_link_libraries(${_TESTNAME} PRIVATE Catch2::Catch2 log)
+    target_link_libraries(${_TESTNAME} PRIVATE Catch2::Catch2 log-api)
     foreach(lib ${_TEST_ARGS_LIBS})
         target_link_libraries(${_TESTNAME} PRIVATE ${lib})
     endforeach(lib)
diff --git a/test/mock-logs.cpp b/test/mock-logs.cpp
index b6150b844..dcb3395ab 100644
--- a/test/mock-logs.cpp
+++ b/test/mock-logs.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 <log.hpp>
+#include <log/log.hpp>
 #include <cstdarg>
 __attribute__((weak)) int log_Log(
     logger_level level, const char *file, int line, const char *function, const char *fmt, ...)
diff --git a/third-party/libphonenumber/CMakeLists.txt b/third-party/libphonenumber/CMakeLists.txt
index e59a5d221..d35fb3ce7 100644
--- a/third-party/libphonenumber/CMakeLists.txt
+++ b/third-party/libphonenumber/CMakeLists.txt
@@ -45,6 +45,7 @@ set_source_files_properties (${CMAKE_CURRENT_SOURCE_DIR}/src/cpp/src/phonenumber
 target_link_libraries (libphonenumber 
     PRIVATE 
         re2::re2
-    PUBLIC 
+    PUBLIC
+        module-os
         protobuf::libprotobuf-lite
 )