diff --git a/module-apps/Application.cpp b/module-apps/Application.cpp
index 10e63da22..50106ca5f 100644
--- a/module-apps/Application.cpp
+++ b/module-apps/Application.cpp
@@ -17,7 +17,7 @@
 #include "log/log.hpp"                                   // for LOG_INFO
 #include "messages/AppMessage.hpp"                       // for AppSwitchMe...
 #include "service-appmgr/Controller.hpp"                 // for Controller
-#include "service-cellular/messages/CellularMessage.hpp" // for CellularNot...
+#include <service-cellular/CellularMessage.hpp>
 #include "service-db/api/DBServiceAPI.hpp"               // for DBServiceAPI
 #include "service-evtmgr/messages/BatteryMessages.hpp"   // for BatteryLeve...
 #include "service-evtmgr/messages/EVMessages.hpp"        // for RtcMinuteAl...
diff --git a/module-apps/CMakeLists.txt b/module-apps/CMakeLists.txt
index f00019d06..ff2b1e594 100644
--- a/module-apps/CMakeLists.txt
+++ b/module-apps/CMakeLists.txt
@@ -92,6 +92,7 @@ target_link_libraries(${PROJECT_NAME}
         service-appmgr
         service-antenna
         service-audio
+        service-cellular
     PUBLIC
         module-bsp
         module-os
diff --git a/module-apps/application-antenna/ApplicationAntenna.cpp b/module-apps/application-antenna/ApplicationAntenna.cpp
index 9cecc85ab..0f2dbdf71 100644
--- a/module-apps/application-antenna/ApplicationAntenna.cpp
+++ b/module-apps/application-antenna/ApplicationAntenna.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 /*
@@ -11,7 +11,7 @@
 #include "ApplicationAntenna.hpp"
 #include "Service/Timer.hpp"
 #include "module-cellular/at/response.hpp"
-#include "service-cellular/api/CellularServiceAPI.hpp"
+#include <service-cellular/CellularServiceAPI.hpp>
 
 #include "windows/AntennaMainWindow.hpp"
 #include "windows/ScanModesWindow.hpp"
diff --git a/module-apps/application-antenna/ApplicationAntenna.hpp b/module-apps/application-antenna/ApplicationAntenna.hpp
index 3af5d5e2d..f7b037206 100644
--- a/module-apps/application-antenna/ApplicationAntenna.hpp
+++ b/module-apps/application-antenna/ApplicationAntenna.hpp
@@ -1,19 +1,11 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-/*
- * ApplicationAntenna.hpp
- *
- *  Created on: 18 lut 2020
- *      Author: kuba
- */
+#pragma once
 
-#ifndef MODULE_APPS_APPLICATION_ANTENNA_APPLICATIONANTENNA_HPP_
-#define MODULE_APPS_APPLICATION_ANTENNA_APPLICATIONANTENNA_HPP_
-
-#include "Application.hpp"
-#include "service-cellular/api/CellularServiceAPI.hpp"
-#include "windows/AppWindow.hpp"
+#include <Application.hpp>
+#include <service-cellular/CellularServiceAPI.hpp>
+#include <windows/AppWindow.hpp>
 
 namespace app
 {
@@ -84,5 +76,3 @@ namespace app
         }
     };
 } /* namespace app */
-
-#endif /* MODULE_APPS_APPLICATION_ANTENNA_APPLICATIONANTENNA_HPP_ */
diff --git a/module-apps/application-antenna/CMakeLists.txt b/module-apps/application-antenna/CMakeLists.txt
index e00472816..6441fcc54 100644
--- a/module-apps/application-antenna/CMakeLists.txt
+++ b/module-apps/application-antenna/CMakeLists.txt
@@ -1,4 +1,4 @@
-
+
 include_directories( ${CMAKE_PROJECT_NAME}
 
 	PUBLIC
@@ -22,3 +22,8 @@ target_sources( ${PROJECT_NAME}
 		"${CMAKE_CURRENT_LIST_DIR}/ApplicationAntenna.hpp"
 )
 
+target_link_libraries(${PROJECT_NAME}
+    PRIVATE
+        service-cellular
+)
+
diff --git a/module-apps/application-antenna/windows/AlgoParamsWindow.cpp b/module-apps/application-antenna/windows/AlgoParamsWindow.cpp
index 5bfccf534..9721e971d 100644
--- a/module-apps/application-antenna/windows/AlgoParamsWindow.cpp
+++ b/module-apps/application-antenna/windows/AlgoParamsWindow.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "AlgoParamsWindow.hpp"
@@ -12,7 +12,7 @@
 #include "gui/widgets/BoxLayout.hpp"
 #include "../AntennaAppStyle.hpp"
 #include "../ApplicationAntenna.hpp"
-#include "service-cellular/api/CellularServiceAPI.hpp"
+#include <service-cellular/CellularServiceAPI.hpp>
 
 using StringList = std::list<std::string>;
 
diff --git a/module-apps/application-antenna/windows/AntennaMainWindow.cpp b/module-apps/application-antenna/windows/AntennaMainWindow.cpp
index 98604d8ca..4fce5f6a0 100644
--- a/module-apps/application-antenna/windows/AntennaMainWindow.cpp
+++ b/module-apps/application-antenna/windows/AntennaMainWindow.cpp
@@ -20,7 +20,7 @@
 #include "ScanModesWindow.hpp"
 #include "AlgoParamsWindow.hpp"
 #include "../ApplicationAntenna.hpp"
-#include "service-cellular/api/CellularServiceAPI.hpp"
+#include <service-cellular/CellularServiceAPI.hpp>
 #include <service-antenna/AntennaServiceAPI.hpp>
 #include <at/response.hpp>
 namespace gui
diff --git a/module-apps/application-antenna/windows/ScanModesWindow.cpp b/module-apps/application-antenna/windows/ScanModesWindow.cpp
index f15678737..98392607a 100644
--- a/module-apps/application-antenna/windows/ScanModesWindow.cpp
+++ b/module-apps/application-antenna/windows/ScanModesWindow.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "ScanModesWindow.hpp"
@@ -12,7 +12,7 @@
 
 #include "../AntennaAppStyle.hpp"
 #include "../ApplicationAntenna.hpp"
-#include "service-cellular/api/CellularServiceAPI.hpp"
+#include <service-cellular/CellularServiceAPI.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-call/ApplicationCall.cpp b/module-apps/application-call/ApplicationCall.cpp
index 9edbf6739..c4bda84a8 100644
--- a/module-apps/application-call/ApplicationCall.cpp
+++ b/module-apps/application-call/ApplicationCall.cpp
@@ -20,7 +20,7 @@
 #include <log/log.hpp>
 #include <memory>
 #include <service-cellular/ServiceCellular.hpp>
-#include <service-cellular/api/CellularServiceAPI.hpp>
+#include <service-cellular/CellularServiceAPI.hpp>
 #include <service-audio/AudioServiceAPI.hpp>
 #include <service-appmgr/Controller.hpp>
 #include <time/time_conversion.hpp>
diff --git a/module-apps/application-call/ApplicationCall.hpp b/module-apps/application-call/ApplicationCall.hpp
index 99755aed1..82bf623e5 100644
--- a/module-apps/application-call/ApplicationCall.hpp
+++ b/module-apps/application-call/ApplicationCall.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
@@ -7,7 +7,7 @@
 #include "Service/Message.hpp"
 #include "Service/Timer.hpp"
 #include "SystemManager/SystemManager.hpp"
-#include <service-cellular/api/CellularServiceAPI.hpp>
+#include <service-cellular/CellularMessage.hpp>
 #include <time/time_conversion.hpp>
 
 namespace app
diff --git a/module-apps/application-call/CMakeLists.txt b/module-apps/application-call/CMakeLists.txt
index bfb26d081..b67699b7a 100644
--- a/module-apps/application-call/CMakeLists.txt
+++ b/module-apps/application-call/CMakeLists.txt
@@ -32,5 +32,6 @@ target_sources( ${PROJECT_NAME}
 target_link_libraries(${PROJECT_NAME}
     PRIVATE
         service-audio
+        service-cellular
 )
 
diff --git a/module-apps/application-call/windows/CallWindow.cpp b/module-apps/application-call/windows/CallWindow.cpp
index 7c7e53427..2e728df3b 100644
--- a/module-apps/application-call/windows/CallWindow.cpp
+++ b/module-apps/application-call/windows/CallWindow.cpp
@@ -16,7 +16,7 @@
 #include "i18/i18.hpp"
 
 #include <service-audio/AudioServiceAPI.hpp>
-#include "service-cellular/api/CellularServiceAPI.hpp"
+#include <service-cellular/CellularServiceAPI.hpp>
 #include "service-db/api/DBServiceAPI.hpp"
 
 #include "Label.hpp"
diff --git a/module-apps/application-call/windows/EnterNumberWindow.cpp b/module-apps/application-call/windows/EnterNumberWindow.cpp
index 12c0dc8a2..cc02a38e9 100644
--- a/module-apps/application-call/windows/EnterNumberWindow.cpp
+++ b/module-apps/application-call/windows/EnterNumberWindow.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "EnterNumberWindow.hpp"
@@ -12,7 +12,7 @@
 #include <i18/i18.hpp>
 #include <InputMode.hpp>
 #include <service-appmgr/Controller.hpp>
-#include <service-cellular/api/CellularServiceAPI.hpp>
+#include <service-cellular/CellularServiceAPI.hpp>
 #include <UiCommonActions.hpp>
 
 #include <phonenumbers/phonenumberutil.h>
diff --git a/module-apps/application-desktop/ApplicationDesktop.cpp b/module-apps/application-desktop/ApplicationDesktop.cpp
index baca1aa3c..563238126 100644
--- a/module-apps/application-desktop/ApplicationDesktop.cpp
+++ b/module-apps/application-desktop/ApplicationDesktop.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "ApplicationDesktop.hpp"
diff --git a/module-apps/application-desktop/ApplicationDesktop.hpp b/module-apps/application-desktop/ApplicationDesktop.hpp
index dda70e163..7f3eb5323 100644
--- a/module-apps/application-desktop/ApplicationDesktop.hpp
+++ b/module-apps/application-desktop/ApplicationDesktop.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
@@ -8,7 +8,7 @@
 
 #include <Application.hpp>
 #include <Service/Message.hpp>
-#include <service-cellular/messages/CellularMessage.hpp>
+#include <service-cellular/CellularMessage.hpp>
 #include <service-db/messages/DBNotificationMessage.hpp>
 #include <module-db/queries/notifications/QueryNotificationsGetAll.hpp>
 #include <service-desktop/endpoints/update/UpdateMuditaOS.hpp>
diff --git a/module-apps/application-desktop/CMakeLists.txt b/module-apps/application-desktop/CMakeLists.txt
index 108eef257..5e4548796 100644
--- a/module-apps/application-desktop/CMakeLists.txt
+++ b/module-apps/application-desktop/CMakeLists.txt
@@ -1,4 +1,4 @@
-
+
 include_directories( ${CMAKE_PROJECT_NAME}
 
 	PUBLIC
@@ -52,3 +52,7 @@ target_sources( ${PROJECT_NAME}
         "${CMAKE_CURRENT_LIST_DIR}/windows/Names.hpp"
 )
 
+target_link_libraries(${PROJECT_NAME}
+    PRIVATE
+        service-cellular
+    )
diff --git a/module-apps/application-desktop/widgets/PinLockHandler.hpp b/module-apps/application-desktop/widgets/PinLockHandler.hpp
index 8793bd10b..f2c66507c 100644
--- a/module-apps/application-desktop/widgets/PinLockHandler.hpp
+++ b/module-apps/application-desktop/widgets/PinLockHandler.hpp
@@ -1,10 +1,10 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
 
 #include "PinLock.hpp"
-#include <service-cellular/messages/CellularMessage.hpp>
+#include <service-cellular/CellularMessage.hpp>
 
 #include "Interface/SettingsRecord.hpp"
 namespace app
diff --git a/module-apps/application-settings/windows/Fota.cpp b/module-apps/application-settings/windows/Fota.cpp
index f27c93d45..553bde7e4 100644
--- a/module-apps/application-settings/windows/Fota.cpp
+++ b/module-apps/application-settings/windows/Fota.cpp
@@ -1,10 +1,10 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "Fota.hpp"
 #include "FotaWindow.hpp"
 
-#include <service-cellular/api/CellularServiceAPI.hpp>
+#include <service-cellular/CellularServiceAPI.hpp>
 #include <service-fota/api/FotaServiceAPI.hpp>
 #include <service-fota/messages/FotaMessages.hpp>
 
diff --git a/module-apps/application-settings/windows/Info.cpp b/module-apps/application-settings/windows/Info.cpp
index 72d288ab7..d51300e32 100644
--- a/module-apps/application-settings/windows/Info.cpp
+++ b/module-apps/application-settings/windows/Info.cpp
@@ -1,10 +1,10 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "Info.hpp"
 
 #include <application-settings/ApplicationSettings.hpp>
-#include <module-services/service-cellular/api/CellularServiceAPI.hpp>
+#include <service-cellular/CellularServiceAPI.hpp>
 
 #include <source/version.hpp>
 #include <log/log.hpp>
diff --git a/module-apps/application-settings/windows/USSDWindow.cpp b/module-apps/application-settings/windows/USSDWindow.cpp
index 28dae8c83..bda6c26fa 100644
--- a/module-apps/application-settings/windows/USSDWindow.cpp
+++ b/module-apps/application-settings/windows/USSDWindow.cpp
@@ -13,7 +13,7 @@
 #include <functional>
 #include <memory>
 #include <Font.hpp>
-#include "service-cellular/api/CellularServiceAPI.hpp"
+#include <service-cellular/CellularServiceAPI.hpp>
 
 namespace gui
 {
diff --git a/module-cellular/CMakeLists.txt b/module-cellular/CMakeLists.txt
index a03f57597..d572bb978 100644
--- a/module-cellular/CMakeLists.txt
+++ b/module-cellular/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.12)
+cmake_minimum_required(VERSION 3.12)
 
 project(module-cellular VERSION 1.0
         DESCRIPTION "Cellular module library")
@@ -75,7 +75,15 @@ target_include_directories(${PROJECT_NAME}
 
 )
 
-target_link_libraries(${PROJECT_NAME} module-bsp module-utils module-vfs module-services module-sys module-db )
+target_link_libraries(${PROJECT_NAME}
+    service-cellular
+    module-bsp
+    module-utils
+    module-vfs
+    module-services
+    module-sys
+    module-db
+)
 
 if (${ENABLE_TESTS})
     add_subdirectory( test )
diff --git a/module-cellular/Modem/ATParser.cpp b/module-cellular/Modem/ATParser.cpp
index 8cb57411c..31288780f 100644
--- a/module-cellular/Modem/ATParser.cpp
+++ b/module-cellular/Modem/ATParser.cpp
@@ -1,11 +1,11 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "ATParser.hpp"
 #include "Service/Bus.hpp"
 #include "service-fota/api/FotaServiceAPI.hpp"
 #include "bsp/cellular/bsp_cellular.hpp"
-#include "service-cellular/messages/CellularMessage.hpp"
+#include <service-cellular/CellularMessage.hpp>
 #include "ticks.hpp"
 #include <Utils.hpp>
 #include <utility>
diff --git a/module-cellular/Modem/TS0710/TS0710.cpp b/module-cellular/Modem/TS0710/TS0710.cpp
index 1a9fd73a1..25e1fa82d 100644
--- a/module-cellular/Modem/TS0710/TS0710.cpp
+++ b/module-cellular/Modem/TS0710/TS0710.cpp
@@ -1,12 +1,12 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "TS0710.h"
 #include "bsp/cellular/bsp_cellular.hpp"
 #include "projdefs.h"
-#include "service-cellular/ServiceCellular.hpp"
-#include "service-cellular/SignalStrength.hpp"
-#include "service-cellular/messages/CellularMessage.hpp"
+#include <service-cellular/ServiceCellular.hpp>
+#include <service-cellular/SignalStrength.hpp>
+#include <service-cellular/CellularMessage.hpp>
 #include <Service/Bus.hpp>
 #include <cassert>
 #include <memory>
diff --git a/module-services/service-antenna/CMakeLists.txt b/module-services/service-antenna/CMakeLists.txt
index 4ea75b46e..7b3c7a29f 100644
--- a/module-services/service-antenna/CMakeLists.txt
+++ b/module-services/service-antenna/CMakeLists.txt
@@ -13,6 +13,7 @@ target_link_libraries(${PROJECT_NAME}
         module-apps
         module-cellular
         module-utils
+        service-cellular
 )
 
 target_include_directories(${PROJECT_NAME}
diff --git a/module-services/service-antenna/ServiceAntenna.cpp b/module-services/service-antenna/ServiceAntenna.cpp
index 1dddcc1b6..23158458e 100644
--- a/module-services/service-antenna/ServiceAntenna.cpp
+++ b/module-services/service-antenna/ServiceAntenna.cpp
@@ -15,8 +15,8 @@
 #include <projdefs.h>
 #include <Service/Timer.hpp>
 #include <service-cellular/State.hpp>
-#include <service-cellular/api/CellularServiceAPI.hpp>
-#include <service-cellular/messages/CellularMessage.hpp>
+#include <service-cellular/CellularServiceAPI.hpp>
+#include <service-cellular/CellularMessage.hpp>
 
 #include <ticks.hpp>
 
diff --git a/module-services/service-appmgr/CMakeLists.txt b/module-services/service-appmgr/CMakeLists.txt
index 1650255c3..e3a9bc2e1 100644
--- a/module-services/service-appmgr/CMakeLists.txt
+++ b/module-services/service-appmgr/CMakeLists.txt
@@ -13,6 +13,7 @@ add_library(${PROJECT_NAME} STATIC ${SOURCES})
 
 target_link_libraries(${PROJECT_NAME}
     PRIVATE
+        service-cellular
         module-apps
         module-audio
 )
diff --git a/module-services/service-cellular/CMakeLists.txt b/module-services/service-cellular/CMakeLists.txt
index a85af1375..0c93a49e4 100644
--- a/module-services/service-cellular/CMakeLists.txt
+++ b/module-services/service-cellular/CMakeLists.txt
@@ -1,29 +1,26 @@
-include_directories( ${CMAKE_PROJECT_NAME}
-
-	PUBLIC
-		"${CMAKE_CURRENT_LIST_DIR}"
-)
-
-include_directories( ${PROJECT_NAME}
-
-	PUBLIC
-		"${CMAKE_CURRENT_LIST_DIR}"
-)
-
+project(service-cellular)
 message( "${PROJECT_NAME}  ${CMAKE_CURRENT_LIST_DIR}" )
 
-target_sources( ${PROJECT_NAME}
-
-	PRIVATE
-		"${CMAKE_CURRENT_LIST_DIR}/ServiceCellular.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/CellularUrcHandler.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/api/CellularServiceAPI.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/CellularCall.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/SignalStrength.cpp"
+set(SOURCES
+    CellularCall.cpp
+    CellularServiceAPI.cpp
+    CellularUrcHandler.cpp
+    ServiceCellular.cpp
+    SignalStrength.cpp
 )
+
+add_library(${PROJECT_NAME} STATIC ${SOURCES})
+
+target_include_directories(${PROJECT_NAME}
+    PUBLIC
+        ${CMAKE_CURRENT_LIST_DIR}
+)
+
 target_link_libraries(${PROJECT_NAME}
     PRIVATE
         service-antenna
         service-audio
+        module-bsp
+        module-cellular
     )
 
diff --git a/module-services/service-cellular/CellularCall.cpp b/module-services/service-cellular/CellularCall.cpp
index d128528d9..178d31f19 100644
--- a/module-services/service-cellular/CellularCall.cpp
+++ b/module-services/service-cellular/CellularCall.cpp
@@ -1,20 +1,20 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "CellularCall.hpp"
+#include "service-cellular/CellularCall.hpp"
 
-#include <Utils.hpp>                // for enum_cast, split
-#include <log/log.hpp>              // for LOG_ERROR
-#include <time/time_conversion.hpp> // for Timestamp, operator-, Duration
-#include <inttypes.h>               // for PRIu32
-#include <vector>                   // for vector
-#include <string>    // for allocator, stoul, operator+, string, char_traits, operator<<, basic_string, to_string
-#include <sstream>   // for operator<<, basic_ostream, basic_ostream<>::__ostream_type, ostream
-#include <optional>  // for optional
-#include <stdexcept> // for runtime_error
+#include <CalllogRecord.hpp>
+#include <PhoneNumber.hpp>
+#include <Utils.hpp>
+#include <log/log.hpp>
+#include <time/time_conversion.hpp>
 
-#include "CalllogRecord.hpp" // for CalllogRecord
-#include "PhoneNumber.hpp"   // for PhoneNumber::View, PhoneNumber
+#include <cinttypes>
+#include <optional>
+#include <sstream>
+#include <stdexcept>
+#include <string>
+#include <vector>
 
 namespace ModemCall
 {
diff --git a/module-services/service-cellular/api/CellularServiceAPI.cpp b/module-services/service-cellular/CellularServiceAPI.cpp
similarity index 83%
rename from module-services/service-cellular/api/CellularServiceAPI.cpp
rename to module-services/service-cellular/CellularServiceAPI.cpp
index 67d0eba6a..ab9d175dd 100644
--- a/module-services/service-cellular/api/CellularServiceAPI.cpp
+++ b/module-services/service-cellular/CellularServiceAPI.cpp
@@ -1,20 +1,21 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include <PhoneNumber.hpp> // for PhoneNumber
-#include <Service/Bus.hpp> // for Bus
-#include <memory> // for make_shared, shared_ptr, allocator, dynamic_pointer_cast, operator!=, __shared_ptr_access, __shared_ptr<>::element_type
-#include <string> // for string
-#include <utility> // for pair, move
+#include "service-cellular/CellularMessage.hpp"
+#include "service-cellular/CellularServiceAPI.hpp"
+#include "service-cellular/ServiceCellular.hpp"
 
-#include "../ServiceCellular.hpp" // for ServiceCellular, ServiceCellular::serviceName
-#include "CellularServiceAPI.hpp"
-#include "MessageType.hpp" // for MessageType, MessageType::CellularAnswerIncomingCall, MessageType::CellularGetAntenna, MessageType::CellularGetCREG, MessageType::CellularGetCSQ, MessageType::CellularGetFirmwareVersion, MessageType::CellularGetIMSI, MessageType::CellularGetNWINFO, MessageType::CellularGetNetworkInfo, MessageType::CellularGetOwnNumber, MessageType::CellularGetScanMode, MessageType::CellularHangupCall, MessageType::CellularSelectAntenna, MessageType::CellularSetScanMode, MessageType::CellularStartOperatorsScan
-#include "Modem/TS0710/TS0710.h"                         // for TS0710, TS0710::Channel, TS0710::Channel::Data
-#include "Service/Common.hpp"                            // for ReturnCodes, ReturnCodes::Success
-#include "bsp/cellular/bsp_cellular.hpp"                 // for antenna
-#include "log/log.hpp"                                   // for LOG_ERROR, LOG_DEBUG
-#include "service-cellular/messages/CellularMessage.hpp" // for CellularRequestMessage, CellularResponseMessage, CellularAntennaRequestMessage, CellularUSSDMessage, CellularCallRequestMessage, CellularDtmfRequestMessage, CellularGetChannelMessage, CellularAntennaResponseMessage, CellularUSSDMessage::RequestType
+#include <MessageType.hpp>
+#include <Modem/TS0710/TS0710.h>
+#include <PhoneNumber.hpp>
+#include <Service/Bus.hpp>
+#include <Service/Common.hpp>
+#include <bsp/cellular/bsp_cellular.hpp>
+#include <log/log.hpp>
+
+#include <memory>
+#include <string>
+#include <utility>
 
 namespace sys
 {
@@ -122,7 +123,7 @@ bool CellularServiceAPI::SelectAntenna(sys::Service *serv, bsp::cellular::antenn
 {
     auto msg     = std::make_shared<CellularAntennaRequestMessage>(MessageType::CellularSelectAntenna);
     msg->antenna = antenna;
-    auto ret  = sys::Bus::SendUnicast(msg, ServiceCellular::serviceName, serv, 5000);
+    auto ret     = sys::Bus::SendUnicast(msg, ServiceCellular::serviceName, serv, 5000);
 
     CellularResponseMessage *response = dynamic_cast<CellularResponseMessage *>(ret.second.get());
 
diff --git a/module-services/service-cellular/CellularUrcHandler.cpp b/module-services/service-cellular/CellularUrcHandler.cpp
index a1e2c3383..e988f789f 100644
--- a/module-services/service-cellular/CellularUrcHandler.cpp
+++ b/module-services/service-cellular/CellularUrcHandler.cpp
@@ -3,12 +3,12 @@
 
 #include "CellularUrcHandler.hpp"
 
-#include "messages/CellularMessage.hpp"
-#include "api/CellularServiceAPI.hpp"
+#include "service-cellular/CellularMessage.hpp"
+#include "service-cellular/CellularServiceAPI.hpp"
 
-#include <service-evtmgr/Constants.hpp>                              // for evt_manager service name
-#include <module-sys/Service/Bus.hpp>                                // for sys::Bus
-#include <service-antenna/AntennaServiceAPI.hpp>                     // for AntennaServiceAPI
+#include <module-sys/Service/Bus.hpp>
+#include <service-antenna/AntennaServiceAPI.hpp>
+#include <service-evtmgr/Constants.hpp>
 
 // this static function will be replaced by Settings API
 static bool isSettingsAutomaticTimeSyncEnabled()
diff --git a/module-services/service-cellular/CellularUrcHandler.hpp b/module-services/service-cellular/CellularUrcHandler.hpp
index 98f5063e9..586942a85 100644
--- a/module-services/service-cellular/CellularUrcHandler.hpp
+++ b/module-services/service-cellular/CellularUrcHandler.hpp
@@ -1,25 +1,24 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
 
-#include <module-cellular/at/UrcHandler.hpp>
+#include "service-cellular/CellularMessage.hpp"
+#include "service-cellular/CellularServiceAPI.hpp"
+#include "service-cellular/ServiceCellular.hpp"
 
 #include <module-cellular/at/UrcClip.hpp>
-#include <module-cellular/at/UrcCreg.hpp>
 #include <module-cellular/at/UrcCmti.hpp>
-#include <module-cellular/at/UrcCusd.hpp>
+#include <module-cellular/at/UrcCreg.hpp>
 #include <module-cellular/at/UrcCtze.hpp>
-#include <module-cellular/at/UrcQind.hpp>
+#include <module-cellular/at/UrcCusd.hpp>
+#include <module-cellular/at/UrcHandler.hpp>
 #include <module-cellular/at/UrcPoweredDown.hpp>
+#include <module-cellular/at/UrcQind.hpp>
 #include <module-cellular/at/UrcResponse.hpp>
 
 using namespace at::urc;
 
-#include "messages/CellularMessage.hpp"
-#include "api/CellularServiceAPI.hpp"
-#include "ServiceCellular.hpp"
-
 /**
  * ServiceCellular helper for handling Urc messages
  */
diff --git a/module-services/service-cellular/ServiceCellular.cpp b/module-services/service-cellular/ServiceCellular.cpp
index e7cf7a08d..dd7afa1e1 100644
--- a/module-services/service-cellular/ServiceCellular.cpp
+++ b/module-services/service-cellular/ServiceCellular.cpp
@@ -1,77 +1,77 @@
 // Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include <Utils.hpp>       // for removeNewLines, enumToString, split, to_string
-#include <at/UrcQind.hpp>  // for Qind
-#include <at/UrcCusd.hpp>  // for Cusd
-#include <at/UrcCtze.hpp>  // for Ctze
-#include <at/UrcCreg.hpp>  // for Creg
-#include <at/UrcCmti.hpp>  // for Cmti
-#include <at/UrcClip.hpp>  // for CLIP
-#include <at/response.hpp> // for parseQNWINFO
-#include <common_data/EventStore.hpp> // for GSM, GSM::SIM, GSM::SIM::SIM1, GSM::SIM::SIM_FAIL, GSM::SIM::SIM2, GSM::Tray, GSM::Tray::IN, Network
-#include <service-evtmgr/Constants.hpp>                                    // for evt_manager
-#include <country.hpp>                                                     // for Id, Id::UNKNOWN
-#include <PhoneNumber.hpp>                                                 // for PhoneNumber::View, PhoneNumber
-#include <module-db/queries/notifications/QueryNotificationsIncrement.hpp> // for Increment
-#include <module-db/queries/messages/sms/QuerySMSSearchByType.hpp>         // for SMSSearchByType, SMSSearchByTypeResult
-#include <module-cellular/at/UrcFactory.hpp>                               // for UrcFactory
-#include <log/log.hpp>      // for LOG_DEBUG, LOG_ERROR, LOG_INFO, LOG_FATAL, LOG_WARN, LOG_TRACE
-#include <bits/exception.h> // for exception
-#include <algorithm>        // for remove, max
-#include <cassert>          // for assert
-#include <iostream>         // for basic_istream, istringstream
-#include <string>   // for string, allocator, basic_string, operator+, char_traits, to_string, stoi, getline, operator!=
-#include <vector>   // for vector
-#include <utility>  // for move
-#include <optional> // for optional, nullopt, operator==
-#include <map>      // for map
+#include "CellularUrcHandler.hpp"
+#include "service-cellular/CellularCall.hpp"
+#include "service-cellular/CellularMessage.hpp"
+#include "service-cellular/CellularServiceAPI.hpp"
+#include "service-cellular/ServiceCellular.hpp"
+#include "service-cellular/SignalStrength.hpp"
+#include "service-cellular/State.hpp"
+#include "service-cellular/USSD.hpp"
 
-#include "Service/Message.hpp" // for DataMessage, ResponseMessage, MessagePointer
-#include "Service/Service.hpp" // for Service
-#include "Service/Timer.hpp"   // for Timer
-#include "ServiceCellular.hpp"
-#include "CellularUrcHandler.hpp" // for CellularUrcHandler
-#include "MessageType.hpp" // for MessageType, MessageType::CellularGetAntenna, MessageType::CellularListCurrentCalls, MessageType::CellularAnswerIncomingCall, MessageType::CellularCall, MessageType::CellularCallRequest, MessageType::CellularGetCREG, MessageType::CellularGetCSQ, MessageType::CellularGetFirmwareVersion, MessageType::CellularGetIMSI, MessageType::CellularGetNWINFO, MessageType::CellularGetNetworkInfo, MessageType::CellularGetOwnNumber, MessageType::CellularGetScanMode, MessageType::CellularGetScanModeResult, MessageType::CellularHangupCall, MessageType::CellularNetworkInfoResult, MessageType::CellularNotification, MessageType::CellularOperatorsScanResult, MessageType::CellularSelectAntenna, MessageType::CellularSetScanMode, MessageType::CellularSimProcedure, MessageType::CellularStartOperatorsScan, MessageType::CellularStateRequest, MessageType::CellularTransmitDtmfTones, MessageType::CellularUSSDRequest, MessageType::DBServiceNotification, MessageType::EVMModemStatus, MessageType::EVMTimeUpdated
-#include "messages/CellularMessage.hpp" // for CellularResponseMessage, CellularNotificationMessage, CellularNotificationMessage::Type, CellularCallMessage, CellularUSSDMessage, RawCommandRespAsync, RawCommandResp, CellularUSSDMessage::RequestType, CellularRequestMessage, StateChange, CellularGetChannelMessage, CellularGetChannelResponseMessage, CellularAntennaResponseMessage, CellularCallMessage::Type, CellularTimeNotificationMessage, CellularUSSDMessage::RequestType::abortSesion, CellularAntennaRequestMessage, CellularCallRequestMessage, CellularNotificationMessage::Type::CallActive, RawCommand, CellularCallMessage::Type::IncomingCall, CellularCallMessage::Type::Ringing, CellularDtmfRequestMessage, CellularNotificationMessage::Type::CallAborted, CellularNotificationMessage::Type::NetworkStatusUpdate, CellularNotificationMessage::Type::NewIncomingSMS, CellularNotificationMessage::Type::NewIncomingUSSD, CellularNotificationMessage::Type::PowerDownDeregistered, CellularNotificationMessage::Type::PowerDownDeregistering, CellularNotificationMessage::Type::SIM, CellularNotificationMessage::Type::SignalStrengthUpdate, CellularUSSDMessage::RequestType::pushSesionRequest, CellularNotificationMessage::Type::PowerUpProcedureComplete, CellularNotificationMessage::Type::RawCommand, CellularUSSDMessage::RequestType::pullSesionRequest
-#include "SignalStrength.hpp"           // for SignalStrength
-#include "service-evtmgr/messages/EVMessages.hpp"        // for SIMMessage, StatusStateMessage
-#include "ucs2/UCS2.hpp"                                 // for UCS2
-#include "api/CellularServiceAPI.hpp"                    // for USSDRequest
-#include "service-db/api/DBServiceAPI.hpp"               // for DBServiceAPI
-#include "service-db/messages/DBNotificationMessage.hpp" // for NotificationMessage
-#include "service-db/messages/QueryMessage.hpp"          // for QueryResponse
-#include "service-evtmgr/api/EventManagerServiceAPI.hpp" // for GetBoard
-#include <service-antenna/AntennaServiceAPI.hpp>         // for CSQChange, LockRequest
-#include <service-antenna/AntennaMessage.hpp>            // for AntennaChangedMessage
-#include "time/time_conversion.hpp"                      // for Timestamp
-#include "Audio/AudioCommon.hpp"                         // for PlaybackType, PlaybackType::TextMessageRingtone
-#include <service-audio/AudioServiceAPI.hpp>             // for PlaybackStart
-#include "BaseInterface.hpp" // for Interface, Interface::Name, Interface::Name::Notifications, Interface::Name::SMS
-#include "CalllogRecord.hpp" // for CalllogRecord
-#include "Commands.hpp" // for AT, factory, Cmd, AT::SMS_GSM, getCommadsSet, AT::CREG, AT::CSQ, AT::QNWINFO, AT::QSIMSTAT, AT::SMS_UCSC2, AT::ATA, AT::ATD, AT::ATH, AT::CEER, AT::CIMI, AT::CLCC, AT::CMGD, AT::CMGS, AT::CNUM, AT::CUSD_CLOSE_SESSION, AT::CUSD_OPEN_SESSION, AT::CUSD_SEND, AT::DISABLE_TIME_ZONE_REPORTING, AT::DISABLE_TIME_ZONE_UPDATE, AT::ENABLE_NETWORK_REGISTRATION_URC, AT::ENABLE_TIME_ZONE_UPDATE, AT::GET_SCANMODE, AT::IPR, AT::QCMGR, AT::QCMGS, AT::QGMR, AT::QLDTMF, AT::SET_SCANMODE, AT::SET_SMS_TEXT_MODE_UCS2, AT::SET_TIME_ZONE_REPORTING, AT::SIMSTAT_ON, AT::SIM_DET, AT::SIM_DET_ON, AT::STORE_SETTINGS_ATW, AT::VTS, commadsSet, commadsSet::simInit
-#include "Common/Common.hpp"          // for SMSType, SMSType::QUEUED, SMSType::FAILED, SMSType::INBOX, SMSType::OUTBOX
-#include "Common/Query.hpp"           // for Query, Query::Type, Query::Type::Create, Query::Type::Update, QueryResult
-#include "Modem/ATCommon.hpp"         // for Chanel, Chanel::BUSY, Chanel::NO_ANSWER, Chanel::NO_CARRIER
-#include "Modem/ATParser.hpp"         // for ATParser
-#include "Modem/TS0710/DLC_channel.h" // for DLC_channel, DLC_channel::Callback_t
-#include "Modem/TS0710/TS0710.h" // for TS0710, TS0710::Channel, TS0710::Channel::Commands, TS0710::ConfState, TS0710::ConfState::Success, TS0710::Channel::Notifications, TS0710::ConfState::Failure, TS0710::Mode, TS0710::Mode::AT
-#include "Modem/TS0710/TS0710_START.h" // for TS0710_START::START_SystemParameters_t
-#include "NotificationsRecord.hpp" // for NotificationsRecord, NotificationsRecord::Key, NotificationsRecord::Key::Calls, NotificationsRecord::Key::Sms
-#include "Result.hpp"              // for Result, Result::Code, Result::Code::OK
-#include "Service/Bus.hpp"         // for Bus
-#include "Tables/CalllogTable.hpp" // for CallType, CallType::CT_INCOMING, CallType::CT_MISSED, CallType::CT_OUTGOING
-#include "Tables/Record.hpp"       // for DB_ID_NONE
-#include "bsp/cellular/bsp_cellular.hpp" // for hotswap_trigger, sim_sel, value, Cellular, antenna, antenna::lowBand, status, value::ACTIVE, value::INACTIVE
-#include "projdefs.h"                         // for pdMS_TO_TICKS
-#include "service-antenna/ServiceAntenna.hpp" // for lockState, lockState::unlocked
-#include "service-cellular/CellularCall.hpp" // for CellularCall, ModemCall, operator<<, CallState, CallState::Active, Forced, Forced::True
-#include "service-cellular/State.hpp" // for State, State::ST, State::ST::CellularConfProcedure, State::ST::Failed, State::ST::PowerUpInProgress, State::ST::PowerUpProcedure, State::ST::ModemFatalFailure, State::ST::PowerDownWaiting, State::ST::AudioConfigurationProcedure, State::ST::Idle, State::ST::PowerDown, State::ST::SimInit, State::ST::ModemOn, State::ST::PowerDownStarted, State::ST::Ready, State::ST::SanityCheck, State::ST::SimSelect, State::ST::StatusCheck, State::ST::URCReady, cellular
-#include "service-cellular/USSD.hpp" // for State, State::pullRequestSent, State::sesionAborted, State::pullResponseReceived, State::pushSesion, noTimeout, State::none, pullResponseTimeout, pullSesionTimeout
+#include <Audio/AudioCommon.hpp>
+#include <BaseInterface.hpp>
+#include <CalllogRecord.hpp>
+#include <Commands.hpp>
+#include <Common/Common.hpp>
+#include <Common/Query.hpp>
+#include <MessageType.hpp>
+#include <Modem/ATCommon.hpp>
+#include <Modem/ATParser.hpp>
+#include <Modem/TS0710/DLC_channel.h>
+#include <Modem/TS0710/TS0710.h>
+#include <Modem/TS0710/TS0710_START.h>
+#include <NotificationsRecord.hpp>
+#include <PhoneNumber.hpp>
+#include <Result.hpp>
+#include <Service/Bus.hpp>
+#include <Service/Message.hpp>
+#include <Service/Service.hpp>
+#include <Service/Timer.hpp>
+#include <Tables/CalllogTable.hpp>
+#include <Tables/Record.hpp>
+#include <Utils.hpp>
+#include <at/UrcClip.hpp>
+#include <at/UrcCmti.hpp>
+#include <at/UrcCreg.hpp>
+#include <at/UrcCtze.hpp>
+#include <at/UrcCusd.hpp>
+#include <at/UrcQind.hpp>
+#include <at/response.hpp>
+#include <bsp/cellular/bsp_cellular.hpp>
+#include <common_data/EventStore.hpp>
+#include <country.hpp>
+#include <log/log.hpp>
+#include <module-cellular/at/UrcFactory.hpp>
+#include <module-db/queries/messages/sms/QuerySMSSearchByType.hpp>
+#include <module-db/queries/notifications/QueryNotificationsIncrement.hpp>
+#include <projdefs.h>
+#include <service-antenna/AntennaMessage.hpp>
+#include <service-antenna/AntennaServiceAPI.hpp>
+#include <service-antenna/ServiceAntenna.hpp>
 #include <service-appmgr/Controller.hpp>
+#include <service-audio/AudioServiceAPI.hpp>
+#include <service-db/api/DBServiceAPI.hpp>
+#include <service-db/messages/DBNotificationMessage.hpp>
+#include <service-db/messages/QueryMessage.hpp>
+#include <service-evtmgr/Constants.hpp>
+#include <service-evtmgr/api/EventManagerServiceAPI.hpp>
+#include <service-evtmgr/messages/EVMessages.hpp>
+#include <task.h>
+#include <time/time_conversion.hpp>
+#include <ucs2/UCS2.hpp>
+#include <utf8/UTF8.hpp>
 
-#include "task.h"        // for vTaskDelay
-#include "utf8/UTF8.hpp" // for UTF8
+#include <algorithm>
+#include <bits/exception.h>
+#include <cassert>
+#include <iostream>
+#include <map>
+#include <optional>
+#include <string>
+#include <utility>
+#include <vector>
 
 const char *ServiceCellular::serviceName = "ServiceCellular";
 
diff --git a/module-services/service-cellular/SignalStrength.cpp b/module-services/service-cellular/SignalStrength.cpp
index 018d052ef..ba72b0802 100644
--- a/module-services/service-cellular/SignalStrength.cpp
+++ b/module-services/service-cellular/SignalStrength.cpp
@@ -1,7 +1,7 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "SignalStrength.hpp"
+#include "service-cellular/SignalStrength.hpp"
 #include <log/log.hpp>
 
 SignalStrength::SignalStrength(int rssi)
diff --git a/module-services/service-cellular/CellularCall.hpp b/module-services/service-cellular/service-cellular/CellularCall.hpp
similarity index 82%
rename from module-services/service-cellular/CellularCall.hpp
rename to module-services/service-cellular/service-cellular/CellularCall.hpp
index 9dd5c86f1..6ddb03a7c 100644
--- a/module-services/service-cellular/CellularCall.hpp
+++ b/module-services/service-cellular/service-cellular/CellularCall.hpp
@@ -1,19 +1,19 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
 
-#include <PhoneNumber.hpp>             // for PhoneNumber::View, PhoneNumber
-#include <Interface/CalllogRecord.hpp> // for CalllogRecord
-#include <time/time_conversion.hpp>    // for Timestamp
-#include <stdint.h>                    // for uint8_t, int8_t
-#include <sys/types.h>                 // for time_t
-#include <functional>                  // for function
-#include <string>                      // for string
-#include <iosfwd>                      // for ostream
+#include <Interface/CalllogRecord.hpp>
+#include <PhoneNumber.hpp>
+#include <Tables/CalllogTable.hpp>
+#include <time/time_conversion.hpp>
+#include <utf8/UTF8.hpp>
 
-#include "Tables/CalllogTable.hpp" // for CallType, CallType::CT_NONE
-#include "utf8/UTF8.hpp"           // for UTF8
+#include <cstdint>
+#include <functional>
+#include <iosfwd>
+#include <string>
+#include <sys/types.h>
 
 namespace ModemCall
 {
@@ -97,9 +97,9 @@ namespace CellularCall
 
         void clear()
         {
-            call              = CalllogRecord();
-            isActiveCall      = false;
-            startActiveTime   = 0;
+            call            = CalllogRecord();
+            isActiveCall    = false;
+            startActiveTime = 0;
         }
 
       public:
diff --git a/module-services/service-cellular/messages/CellularMessage.hpp b/module-services/service-cellular/service-cellular/CellularMessage.hpp
similarity index 97%
rename from module-services/service-cellular/messages/CellularMessage.hpp
rename to module-services/service-cellular/service-cellular/CellularMessage.hpp
index fb1272c64..bee791c29 100644
--- a/module-services/service-cellular/messages/CellularMessage.hpp
+++ b/module-services/service-cellular/service-cellular/CellularMessage.hpp
@@ -1,23 +1,21 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#ifndef PUREPHONE_CELLULARMESSAGE_HPP
-#define PUREPHONE_CELLULARMESSAGE_HPP
+#pragma once
+
+#include "SignalStrength.hpp"
+#include "State.hpp"
 
-#include "../SignalStrength.hpp"
 #include <MessageType.hpp>
-#include <Service/Message.hpp>
-#include <utf8/UTF8.hpp>
-#include <memory>
-#include "../State.hpp"
 #include <Modem/TS0710/TS0710.h>
-
 #include <PhoneNumber.hpp>
+#include <Service/Message.hpp>
+#include <module-bsp/bsp/cellular/bsp_cellular.hpp>
+#include <utf8/UTF8.hpp>
 
+#include <memory>
 #include <string>
 
-#include "module-bsp/bsp/cellular/bsp_cellular.hpp"
-
 class CellularMessage : public sys::DataMessage
 {
   public:
@@ -341,5 +339,3 @@ namespace cellular
     };
 
 } // namespace cellular
-
-#endif // PUREPHONE_CELLULARMESSAGE_HPP
diff --git a/module-services/service-cellular/api/CellularServiceAPI.hpp b/module-services/service-cellular/service-cellular/CellularServiceAPI.hpp
similarity index 83%
rename from module-services/service-cellular/api/CellularServiceAPI.hpp
rename to module-services/service-cellular/service-cellular/CellularServiceAPI.hpp
index 298cbd0b4..66ca931b1 100644
--- a/module-services/service-cellular/api/CellularServiceAPI.hpp
+++ b/module-services/service-cellular/service-cellular/CellularServiceAPI.hpp
@@ -1,15 +1,17 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
-#include <Modem/TS0710/TS0710.h> // for TS0710, TS0710::Channel
-#include <PhoneNumber.hpp>       // for PhoneNumber
-#include <stdint.h>              // for uint32_t
-#include <string>                // for string, allocator
 
-#include "../messages/CellularMessage.hpp" // for CellularUSSDMessage, CellularUSSDMessage::RequestType
-#include "utf8/UTF8.hpp"
-#include "module-bsp/bsp/cellular/bsp_cellular.hpp" // for antenna
+#include "CellularMessage.hpp"
+
+#include <Modem/TS0710/TS0710.h>
+#include <PhoneNumber.hpp>
+#include <module-bsp/bsp/cellular/bsp_cellular.hpp>
+#include <utf8/UTF8.hpp>
+
+#include <cstdint>
+#include <string>
 
 class Service;
 namespace sys
diff --git a/module-services/service-cellular/ServiceCellular.hpp b/module-services/service-cellular/service-cellular/ServiceCellular.hpp
similarity index 80%
rename from module-services/service-cellular/ServiceCellular.hpp
rename to module-services/service-cellular/service-cellular/ServiceCellular.hpp
index af0e2f5e7..e5cbbc506 100644
--- a/module-services/service-cellular/ServiceCellular.hpp
+++ b/module-services/service-cellular/service-cellular/ServiceCellular.hpp
@@ -1,28 +1,28 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#ifndef PUREPHONE_SERVICECELLULAR_HPP
-#define PUREPHONE_SERVICECELLULAR_HPP
+#pragma once
 
-#include <Modem/TS0710/DLC_channel.h> // for DLC_channel::Callback_t, DLC_channel
-#include <Modem/TS0710/TS0710.h>      // for TS0710
-#include <Service/Service.hpp>        // for Service
+#include "CellularCall.hpp"
+#include "CellularMessage.hpp"
+#include "State.hpp"
+#include "USSD.hpp"
+
+#include <Modem/TS0710/DLC_channel.h>
+#include <Modem/TS0710/TS0710.h>
+#include <Modem/TS0710/TS0710_types.h>
+#include <SMSRecord.hpp>
+#include <Service/Common.hpp>
+#include <Service/Message.hpp>
+#include <Service/Service.hpp>
+#include <bsp/common.hpp>
 #include <utf8/UTF8.hpp>
-#include <stdint.h> // for uint32_t
-#include <optional> // for optional
-#include <memory>   // for unique_ptr, allocator, make_unique, shared_ptr
-#include <string>   // for string
-#include <vector>   // for vector
 
-#include "CellularCall.hpp" // for CellularCall
-#include "USSD.hpp"                     // for State, State::none
-#include "SMSRecord.hpp"                // for SMSRecord
-#include "messages/CellularMessage.hpp" // for CellularUSSDMessage, CellularUSSDMessage::RequestType
-#include "State.hpp"                    // for State
-#include "bsp/common.hpp"               // for Board, Board::none
-#include "Modem/TS0710/TS0710_types.h"  // for PS460800, PortSpeed_e
-#include "Service/Common.hpp"           // for ReturnCodes, ServicePowerMode
-#include "Service/Message.hpp"          // for MessagePointer, DataMessage (ptr only), ResponseMessage (ptr only)
+#include <cstdint>
+#include <memory>
+#include <optional>
+#include <string>
+#include <vector>
 
 class MuxDaemon;
 namespace db
@@ -174,5 +174,3 @@ class ServiceCellular : public sys::Service
 
     friend class CellularUrcHandler;
 };
-
-#endif // PUREPHONE_SERVICECELLULAR_HPP
diff --git a/module-services/service-cellular/SignalStrength.hpp b/module-services/service-cellular/service-cellular/SignalStrength.hpp
similarity index 93%
rename from module-services/service-cellular/SignalStrength.hpp
rename to module-services/service-cellular/service-cellular/SignalStrength.hpp
index ce0e3f847..c5e0bb4eb 100644
--- a/module-services/service-cellular/SignalStrength.hpp
+++ b/module-services/service-cellular/service-cellular/SignalStrength.hpp
@@ -1,12 +1,11 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
 
+#include <common_data/EventStore.hpp>
+
 #include <limits>
-
-#include "common_data/EventStore.hpp" // for SignalStrength, RssiBar
-
 class SignalStrength
 {
     // <rssi>   0           -113dBm or less
diff --git a/module-services/service-cellular/State.hpp b/module-services/service-cellular/service-cellular/State.hpp
similarity index 100%
rename from module-services/service-cellular/State.hpp
rename to module-services/service-cellular/service-cellular/State.hpp
diff --git a/module-services/service-cellular/USSD.hpp b/module-services/service-cellular/service-cellular/USSD.hpp
similarity index 100%
rename from module-services/service-cellular/USSD.hpp
rename to module-services/service-cellular/service-cellular/USSD.hpp
diff --git a/module-services/service-desktop/CMakeLists.txt b/module-services/service-desktop/CMakeLists.txt
index 1808b0c30..250a6777b 100644
--- a/module-services/service-desktop/CMakeLists.txt
+++ b/module-services/service-desktop/CMakeLists.txt
@@ -1,4 +1,4 @@
-message( "${PROJECT_NAME}  ${CMAKE_CURRENT_LIST_DIR}" )
+message( "${PROJECT_NAME}  ${CMAKE_CURRENT_LIST_DIR}" )
 
 add_subdirectory( parser )
 add_subdirectory( endpoints )
@@ -16,3 +16,7 @@ add_dependencies(${PROJECT_NAME} version)
 if (${ENABLE_TESTS})
 	add_subdirectory(tests)
 endif ()
+target_link_libraries(${PROJECT_NAME}
+    PRIVATE
+        service-cellular
+)
diff --git a/module-services/service-desktop/endpoints/developerMode/DeveloperModeHelper.cpp b/module-services/service-desktop/endpoints/developerMode/DeveloperModeHelper.cpp
index 7e12af76f..3027fb10b 100644
--- a/module-services/service-desktop/endpoints/developerMode/DeveloperModeHelper.cpp
+++ b/module-services/service-desktop/endpoints/developerMode/DeveloperModeHelper.cpp
@@ -1,11 +1,11 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include <module-sys/Service/Bus.hpp>
 #include <module-services/service-evtmgr/Constants.hpp>
 #include <module-services/service-desktop/parser/MessageHandler.hpp>
-#include <module-services/service-cellular/messages/CellularMessage.hpp>
-#include <module-services/service-cellular/ServiceCellular.hpp>
+#include <service-cellular/CellularMessage.hpp>
+#include <service-cellular/ServiceCellular.hpp>
 #include <module-services/service-desktop/messages/DesktopMessages.hpp>
 #include "DeveloperModeHelper.hpp"
 #include "ParserUtils.hpp" // for parserFSM
diff --git a/module-services/service-evtmgr/CMakeLists.txt b/module-services/service-evtmgr/CMakeLists.txt
index cc02694bd..cad9dccbc 100644
--- a/module-services/service-evtmgr/CMakeLists.txt
+++ b/module-services/service-evtmgr/CMakeLists.txt
@@ -33,5 +33,6 @@ target_sources( ${PROJECT_NAME}
 target_link_libraries(${PROJECT_NAME}
     PRIVATE
         service-audio
+        service-cellular
 )
 
diff --git a/module-services/service-evtmgr/EventManager.cpp b/module-services/service-evtmgr/EventManager.cpp
index f7d324059..ac7e616cb 100644
--- a/module-services/service-evtmgr/EventManager.cpp
+++ b/module-services/service-evtmgr/EventManager.cpp
@@ -10,7 +10,7 @@
 
 #include "EventManager.hpp"
 
-#include <service-cellular/messages/CellularMessage.hpp> // for CellularTimeNotificationMessage, RawCommandResp
+#include <service-cellular/CellularMessage.hpp>          // for CellularTimeNotificationMessage, RawCommandResp
 #include <service-evtmgr/Constants.hpp>                  // for evt_manager
 #include <service-desktop/Constants.hpp>                 // for ServiceDesktop
 #include <cassert>                                       // for assert
diff --git a/module-services/service-fota/CMakeLists.txt b/module-services/service-fota/CMakeLists.txt
index de770ace8..62fe79ff8 100644
--- a/module-services/service-fota/CMakeLists.txt
+++ b/module-services/service-fota/CMakeLists.txt
@@ -1,4 +1,4 @@
-include_directories( ${CMAKE_PROJECT_NAME}
+include_directories( ${CMAKE_PROJECT_NAME}
     PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}
 )
@@ -18,4 +18,8 @@ target_sources( ${PROJECT_NAME}
     PUBLIC
         messages/FotaMessages.hpp
 )
+target_link_libraries(${PROJECT_NAME}
+    PRIVATE
+        service-cellular
+)
 
diff --git a/module-services/service-fota/ServiceFota.cpp b/module-services/service-fota/ServiceFota.cpp
index ae5042923..623de25b8 100644
--- a/module-services/service-fota/ServiceFota.cpp
+++ b/module-services/service-fota/ServiceFota.cpp
@@ -1,9 +1,8 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include <Service/Bus.hpp>                             // for Bus
 #include <module-cellular/at/Result.hpp>               // for Result, Result::Code, Result::Code::OK
-#include <service-cellular/api/CellularServiceAPI.hpp> // for GetDataChannel
 #include <module-cellular/at/UrcFactory.hpp>           // for UrcFactory
 #include <bits/exception.h>                            // for exception
 #include <algorithm>                                   // for find_if, remove, transform
@@ -28,8 +27,10 @@
 #include "Modem/TS0710/DLC_channel.h"                    // for DLC_channel
 #include "log/log.hpp"                                   // for LOG_DEBUG, LOG_INFO, LOG_WARN, LOG_ERROR
 #include "portmacro.h"                                   // for TickType_t
-#include "service-cellular/State.hpp"                    // for State, State::ST, State::ST::Ready
-#include "service-cellular/messages/CellularMessage.hpp" // for CellularGetChannelResponseMessage, StateChange
+
+#include <service-cellular/CellularMessage.hpp>
+#include <service-cellular/CellularServiceAPI.hpp>
+#include <service-cellular/State.hpp>
 
 namespace FotaService
 {