diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5a8a4bac00..ff5471dfae 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -36,7 +36,7 @@ jobs:
     - name: build
       env:
         DEVELOPER_DIR: /Applications/Xcode_11.7.app/Contents/Developer
-      run: ./housekeeping/make_build.sh -DCOVERAGE=OFF -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain/cxx17.cmake
+      run: ./housekeeping/make_build.sh -DCLEAR_OBJS=ON -DCOVERAGE=OFF -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain/cxx17.cmake
 
   Linux:
     strategy:
@@ -44,17 +44,17 @@ jobs:
       matrix:
         options:
           - name: "Linux: gcc-10 ASAN No Toolchain"
-            run: ./housekeeping/make_build.sh -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain/gcc-10_cxx17.cmake -DASAN=ON
+            run: ./housekeeping/make_build.sh -DCLEAR_OBJS=ON -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain/gcc-10_cxx17.cmake -DASAN=ON
           - name: "Linux: gcc-12 ASAN No Toolchain"
-            run: ./housekeeping/make_build.sh -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain/gcc-12_cxx17.cmake -DASAN=ON
+            run: ./housekeeping/make_build.sh -DCLEAR_OBJS=ON -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain/gcc-12_cxx17.cmake -DASAN=ON
           - name: "Linux: clang-11 TSAN"
-            run: ./housekeeping/make_build.sh -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain/clang-11_cxx17.cmake -DTSAN=ON
+            run: ./housekeeping/make_build.sh -DCLEAR_OBJS=ON -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain/clang-11_cxx17.cmake -DTSAN=ON
           - name: "Linux: clang-11 UBSAN"
-            run: ./housekeeping/make_build.sh -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain/clang-11_cxx17.cmake -DUBSAN=ON
+            run: ./housekeeping/make_build.sh -DCLEAR_OBJS=ON -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain/clang-11_cxx17.cmake -DUBSAN=ON
           - name: "Linux: clang-11 External Project"
-            run: ./housekeeping/make_external_build.sh -DCMAKE_TOOLCHAIN_FILE=../../cmake/toolchain/clang-11_cxx17.cmake
+            run: ./housekeeping/make_external_build.sh -DCLEAR_OBJS=ON -DCMAKE_TOOLCHAIN_FILE=../../cmake/toolchain/clang-11_cxx17.cmake
           - name: "Linux: clang-15 UBSAN"
-            run: ./housekeeping/make_build.sh -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain/clang-15_cxx17.cmake -DUBSAN=ON
+            run: ./housekeeping/make_build.sh -DCLEAR_OBJS=ON -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain/clang-15_cxx17.cmake -DUBSAN=ON
           
     name: "${{ matrix.options.name }}"
     runs-on: ubuntu-latest
@@ -65,8 +65,19 @@ jobs:
         with:
           path: ${{ env.CACHE_PATHS }}
           key: ${{ github.job }}-${{ matrix.options.name }}-${{ env.CACHE_VERSION }}
+      - name: df du
+        run: |
+          df -m || true
+          du -hd1 /__w /github || true
+      - name: Install mold
+        run: ./housekeeping/ci_install_mold.sh --make-default
       - name: "${{ matrix.options.name }}"
         run: "${{ matrix.options.run }}"
+      - name: df du
+        if: ${{ always() }}
+        run: |
+          df -m || true
+          du -hd1 /__w /github || true
 
   clang-tidy:
     name: "Linux: clang-tidy"
@@ -98,10 +109,21 @@ jobs:
         with:
           path: ${{ env.CACHE_PATHS }}
           key: ${{ github.job }}-${{ env.CACHE_VERSION }}
+      - name: df du
+        run: |
+          df -m || true
+          du -hd1 /__w /github || true
+      - name: Install mold
+        run: ./housekeeping/ci_install_mold.sh --make-default
       - name: makeBuild
         env:
           BUILD_FINAL_TARGET: ctest_coverage
         run: ./housekeeping/make_build.sh -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain/gcc-10_cxx17.cmake -DCOVERAGE=ON
+      - name: df du
+        if: ${{ always() }}
+        run: |
+          df -m || true
+          du -hd1 /__w /github || true
       - if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository }}
         name: Submit Coverage
         env:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8f464fbf86..610bdc7d80 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,6 +40,7 @@ option(COVERAGE     "Enable generation of coverage info"          OFF)
 option(EMBEDDINGS   "Embed developers assets"                     ON )
 option(PROFILING    "Enable internal profiling instruments"       OFF)
 option(BACKWARD     "Enable stacktrace logging instruments"       ON )
+option(CLEAR_OBJS   "Clear object files"                          OFF)
 
 # sanitizers will be enabled only for Kagome, and will be disabled for dependencies
 option(ASAN         "Enable address sanitizer"                    OFF)
diff --git a/Makefile b/Makefile
index 1d1ff91a8e..a3e49b1a83 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,7 @@
 build:
 	mkdir build && cd build && \
 		cmake -DCMAKE_BUILD_TYPE=Release .. && \
-		make kagome -j $(shell expr $(shell nproc 2>/dev/null || sysctl -n hw.ncpu) / 2 + 1 ) && \
-		make kagome-db-editor -j $(shell expr $(shell nproc 2>/dev/null || sysctl -n hw.ncpu) / 2 + 1 )
+		make kagome -j $(shell expr $(shell nproc 2>/dev/null || sysctl -n hw.ncpu) / 2 + 1 )
 
 docker: 
 	INDOCKER_IMAGE=soramitsu/kagome-dev:4-minideb BUILD_DIR=build BUILD_THREADS=$(shell expr $(shell nproc 2>/dev/null || sysctl -n hw.ncpu) + 1 ) ./housekeeping/indocker.sh ./housekeeping/make_build.sh
diff --git a/cmake/install.cmake b/cmake/install.cmake
index 66cb64016d..24df6449c9 100644
--- a/cmake/install.cmake
+++ b/cmake/install.cmake
@@ -10,6 +10,18 @@ function(kagome_install target)
         )
 endfunction()
 
+### kagome_clear_objects should be called right after target_link_libraries(target) or kagome_install(target)
+function(kagome_clear_objects target)
+    if(CLEAR_OBJS)
+        add_custom_command(TARGET ${target}
+            POST_BUILD
+            COMMAND find ${CMAKE_CURRENT_BINARY_DIR} -name "*.o" -type f -delete
+            WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+            COMMENT "Removing object files from '${CMAKE_CURRENT_BINARY_DIR}'"
+        )
+    endif()
+endfunction()
+
 ### workaround for imported libraries
 function(kagome_install_mini target)
     install(TARGETS ${target} EXPORT kagomeTargets
diff --git a/cmake/kagomeConfig.cmake.in b/cmake/kagomeConfig.cmake.in
index dfb4047cbe..54535d5152 100644
--- a/cmake/kagomeConfig.cmake.in
+++ b/cmake/kagomeConfig.cmake.in
@@ -3,7 +3,9 @@
 include(CMakeFindDependencyMacro)
 
 find_dependency(Threads REQUIRED)
-find_dependency(Boost REQUIRED random filesystem)
+find_dependency(RapidJSON REQUIRED)
+find_dependency(prometheus-cpp REQUIRED)
+find_dependency(Boost REQUIRED random filesystem date_time)
 find_dependency(soralog REQUIRED)
 find_dependency(libp2p REQUIRED)
 find_dependency(xxhash REQUIRED)
diff --git a/core/api/CMakeLists.txt b/core/api/CMakeLists.txt
index 48aab54b23..b7d0e032cc 100644
--- a/core/api/CMakeLists.txt
+++ b/core/api/CMakeLists.txt
@@ -3,6 +3,73 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_subdirectory(jrpc)
-add_subdirectory(service)
-add_subdirectory(transport)
+add_library(api
+    service/impl/api_service_impl.cpp
+    service/chain/impl/chain_api_impl.cpp
+    service/chain/requests/get_block_hash.cpp
+    service/chain/chain_jrpc_processor.cpp
+    service/child_state/child_state_jrpc_processor.cpp
+    service/child_state/impl/child_state_api_impl.cpp
+    service/child_state/requests/get_storage_hash.cpp
+    service/child_state/requests/get_storage_size.cpp
+    service/child_state/requests/get_keys.cpp
+    service/child_state/requests/get_keys_paged.cpp
+    service/child_state/requests/get_storage.cpp
+    service/rpc/impl/rpc_api_impl.cpp
+    service/rpc/requests/methods.cpp
+    service/rpc/rpc_jrpc_processor.cpp
+    service/state/impl/state_api_impl.cpp
+    service/state/requests/call.cpp
+    service/state/requests/get_runtime_version.cpp
+    service/state/requests/unsubscribe_storage.cpp
+    service/state/requests/get_keys_paged.cpp
+    service/state/requests/get_storage.cpp
+    service/state/requests/subscribe_storage.cpp
+    service/state/state_jrpc_processor.cpp
+    service/internal/impl/internal_api_impl.cpp
+    service/internal/internal_jrpc_processor.cpp
+    service/author/impl/author_api_impl.cpp
+    service/author/author_jrpc_processor.cpp
+    service/system/impl/system_api_impl.cpp
+    service/system/requests/health.cpp
+    service/system/requests/version.cpp
+    service/system/requests/properties.cpp
+    service/system/requests/chain.cpp
+    service/system/requests/chain_type.cpp
+    service/system/requests/name.cpp
+    service/system/system_jrpc_processor.cpp
+    service/payment/impl/payment_api_impl.cpp
+    service/payment/payment_jrpc_processor.cpp
+    transport/impl/http/http_listener_impl.cpp
+    transport/impl/http/http_session.cpp
+    transport/impl/ws/ws_session.cpp
+    transport/impl/ws/ws_listener_impl.cpp
+    transport/tuner.cpp
+    transport/rpc_thread_pool.cpp
+    transport/error.cpp
+    jrpc/jrpc_handle_batch.cpp
+    jrpc/jrpc_server_impl.cpp
+    )
+
+target_link_libraries(api
+    PUBLIC
+    Boost::boost
+    logger
+    app_state_manager
+    p2p::p2p_peer_id
+    crypto_store
+    hexutil
+    scale::scale
+    storage
+    blob
+    metadata_api
+    consensus
+    ss58_codec
+    outcome
+    build_version
+    PRIVATE 
+    RapidJSON::rapidjson
+    metrics
+    )
+kagome_install(api)
+kagome_clear_objects(api)
diff --git a/core/api/jrpc/CMakeLists.txt b/core/api/jrpc/CMakeLists.txt
deleted file mode 100644
index ea5a0b8d4a..0000000000
--- a/core/api/jrpc/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# Copyright Soramitsu Co., Ltd. All Rights Reserved.
-# SPDX-License-Identifier: Apache-2.0
-#
-
-add_library(api_jrpc_server
-    jrpc_handle_batch.cpp
-    jrpc_server_impl.cpp
-    value_converter.hpp
-    )
-target_link_libraries(api_jrpc_server
-    RapidJSON::rapidjson
-    metrics
-    )
diff --git a/core/api/service/CMakeLists.txt b/core/api/service/CMakeLists.txt
index 5bd17b333e..383dfa7e1d 100644
--- a/core/api/service/CMakeLists.txt
+++ b/core/api/service/CMakeLists.txt
@@ -10,7 +10,7 @@ target_link_libraries(api_service
     Boost::boost
     logger
     app_state_manager
-    rpc_thread_pool
+    api
     p2p::p2p_peer_id
     )
 
diff --git a/core/api/service/author/CMakeLists.txt b/core/api/service/author/CMakeLists.txt
deleted file mode 100644
index 5a059db885..0000000000
--- a/core/api/service/author/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright Soramitsu Co., Ltd. All Rights Reserved.
-# SPDX-License-Identifier: Apache-2.0
-#
-
-add_library(author_api_service
-    author_api.hpp
-    author_jrpc_processor.hpp
-    author_jrpc_processor.cpp
-    impl/author_api_impl.hpp
-    impl/author_api_impl.cpp
-)
-
-target_link_libraries(author_api_service
-    crypto_store
-    scale::scale
-    logger
-    api_service
-    )
diff --git a/core/api/service/chain/CMakeLists.txt b/core/api/service/chain/CMakeLists.txt
deleted file mode 100644
index 9a1d875772..0000000000
--- a/core/api/service/chain/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Copyright Soramitsu Co., Ltd. All Rights Reserved.
-# SPDX-License-Identifier: Apache-2.0
-#
-
-add_subdirectory(requests)
-
-add_library(chain_api_service
-    chain_jrpc_processor.cpp
-    impl/chain_api_impl.cpp
-    )
-target_link_libraries(chain_api_service
-    api_service
-    api_chain_requests
-    hexutil
-    )
diff --git a/core/api/service/chain/requests/CMakeLists.txt b/core/api/service/chain/requests/CMakeLists.txt
deleted file mode 100644
index 61545e918e..0000000000
--- a/core/api/service/chain/requests/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Copyright Soramitsu Co., Ltd. All Rights Reserved.
-# SPDX-License-Identifier: Apache-2.0
-#
-
-add_library(api_chain_requests
-    get_block_hash.cpp
-    )
-target_link_libraries(api_chain_requests
-    Boost::boost
-    hexutil
-    )
diff --git a/core/api/service/child_state/CMakeLists.txt b/core/api/service/child_state/CMakeLists.txt
deleted file mode 100644
index b98cefd926..0000000000
--- a/core/api/service/child_state/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Copyright Soramitsu Co., Ltd. All Rights Reserved.
-# SPDX-License-Identifier: Apache-2.0
-#
-
-add_library(child_state_api_service
-    child_state_jrpc_processor.cpp
-    impl/child_state_api_impl.cpp
-    )
-target_link_libraries(child_state_api_service
-    api_child_state_requests
-    api_service
-    trie_storage
-    blob
-    metadata_api
-    )
-
-add_subdirectory(requests)
diff --git a/core/api/service/child_state/requests/CMakeLists.txt b/core/api/service/child_state/requests/CMakeLists.txt
deleted file mode 100644
index d733fa1018..0000000000
--- a/core/api/service/child_state/requests/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Copyright Soramitsu Co., Ltd. All Rights Reserved.
-# SPDX-License-Identifier: Apache-2.0
-#
-
-add_library(api_child_state_requests
-    get_keys.cpp
-    get_keys_paged.cpp
-    get_storage.cpp
-    get_storage_hash.cpp
-    get_storage_size.cpp
-    )
-
-target_link_libraries(api_child_state_requests
-    Boost::boost
-    blob
-    outcome
-    )
diff --git a/core/api/service/internal/CMakeLists.txt b/core/api/service/internal/CMakeLists.txt
deleted file mode 100644
index 2d83d82d59..0000000000
--- a/core/api/service/internal/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Copyright Soramitsu Co., Ltd. All Rights Reserved.
-# SPDX-License-Identifier: Apache-2.0
-#
-
-add_library(internal_api_service
-    internal_jrpc_processor.cpp
-    impl/internal_api_impl.cpp
-    )
-target_link_libraries(internal_api_service
-    api_service
-    )
diff --git a/core/api/service/payment/CMakeLists.txt b/core/api/service/payment/CMakeLists.txt
deleted file mode 100644
index 17bbc3359a..0000000000
--- a/core/api/service/payment/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-
-add_library(payment_api_service
-    payment_jrpc_processor.cpp
-    impl/payment_api_impl.cpp
-    )
-target_link_libraries(payment_api_service
-    api_service
-    )
diff --git a/core/api/service/rpc/CMakeLists.txt b/core/api/service/rpc/CMakeLists.txt
deleted file mode 100644
index 1b3fa2912f..0000000000
--- a/core/api/service/rpc/CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# Copyright Soramitsu Co., Ltd. All Rights Reserved.
-# SPDX-License-Identifier: Apache-2.0
-#
-
-add_library(rpc_api_service
-    rpc_jrpc_processor.cpp
-    impl/rpc_api_impl.cpp
-    )
-target_link_libraries(rpc_api_service
-    api_rpc_requests
-    api_service
-    )
-
-add_subdirectory(requests)
diff --git a/core/api/service/rpc/requests/CMakeLists.txt b/core/api/service/rpc/requests/CMakeLists.txt
deleted file mode 100644
index ef6d11cff7..0000000000
--- a/core/api/service/rpc/requests/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Copyright Soramitsu Co., Ltd. All Rights Reserved.
-# SPDX-License-Identifier: Apache-2.0
-#
-
-add_library(api_rpc_requests
-    methods.cpp
-    )
-
-target_link_libraries(api_rpc_requests
-    Boost::boost
-    outcome
-    )
diff --git a/core/api/service/state/CMakeLists.txt b/core/api/service/state/CMakeLists.txt
deleted file mode 100644
index bd73fe5d5b..0000000000
--- a/core/api/service/state/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Copyright Soramitsu Co., Ltd. All Rights Reserved.
-# SPDX-License-Identifier: Apache-2.0
-#
-
-add_library(state_api_service
-    state_jrpc_processor.cpp
-    impl/state_api_impl.cpp
-    )
-target_link_libraries(state_api_service
-    api_state_requests
-    api_service
-    trie_storage
-    blob
-    metadata_api
-    )
-
-add_subdirectory(requests)
diff --git a/core/api/service/state/requests/CMakeLists.txt b/core/api/service/state/requests/CMakeLists.txt
deleted file mode 100644
index 57f4805aa6..0000000000
--- a/core/api/service/state/requests/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright Soramitsu Co., Ltd. All Rights Reserved.
-# SPDX-License-Identifier: Apache-2.0
-#
-
-add_library(api_state_requests
-    call.cpp
-    get_keys_paged.cpp
-    get_storage.cpp
-    get_runtime_version.cpp
-    subscribe_storage.cpp
-    unsubscribe_storage.cpp
-    )
-
-target_link_libraries(api_state_requests
-    Boost::boost
-    blob
-    outcome
-    )
diff --git a/core/api/service/system/CMakeLists.txt b/core/api/service/system/CMakeLists.txt
deleted file mode 100644
index d1b198f470..0000000000
--- a/core/api/service/system/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Copyright Soramitsu Co., Ltd. All Rights Reserved.
-# SPDX-License-Identifier: Apache-2.0
-#
-
-add_library(system_api_service
-    system_jrpc_processor.cpp
-    impl/system_api_impl.cpp
-    )
-target_link_libraries(system_api_service
-    api_system_requests
-    babe
-    ss58_codec
-    )
-
-add_subdirectory(requests)
diff --git a/core/api/service/system/requests/CMakeLists.txt b/core/api/service/system/requests/CMakeLists.txt
deleted file mode 100644
index 041f4fa6f7..0000000000
--- a/core/api/service/system/requests/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Copyright Soramitsu Co., Ltd. All Rights Reserved.
-# SPDX-License-Identifier: Apache-2.0
-#
-
-add_library(api_system_requests
-    name.cpp
-    version.cpp
-    chain.cpp
-    chain_type.cpp
-    properties.cpp
-    health.cpp
-    )
-
-target_link_libraries(api_system_requests
-    Boost::boost
-    scale::scale
-    outcome
-    build_version
-    )
diff --git a/core/api/transport/CMakeLists.txt b/core/api/transport/CMakeLists.txt
deleted file mode 100644
index c3614c43f9..0000000000
--- a/core/api/transport/CMakeLists.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Copyright Soramitsu Co., Ltd. All Rights Reserved.
-# SPDX-License-Identifier: Apache-2.0
-#
-
-add_library(api_transport
-    impl/http/http_session.hpp
-    impl/http/http_session.cpp
-    impl/ws/ws_session.hpp
-    impl/ws/ws_session.cpp
-    error.hpp
-    error.cpp
-    listener.hpp
-    session.hpp
-    impl/http/http_listener_impl.hpp
-    impl/http/http_listener_impl.cpp
-    impl/ws/ws_listener_impl.hpp
-    impl/ws/ws_listener_impl.cpp
-    tuner.hpp
-    tuner.cpp
-    )
-target_link_libraries(api_transport
-    Boost::boost
-    logger
-    metrics
-    )
-
-add_library(rpc_thread_pool
-    rpc_io_context.hpp
-    rpc_thread_pool.hpp
-    rpc_thread_pool.cpp
-    )
-target_link_libraries(rpc_thread_pool
-    Boost::boost
-    logger
-    )
diff --git a/core/application/CMakeLists.txt b/core/application/CMakeLists.txt
index b0804e5fac..42fb19a2e0 100644
--- a/core/application/CMakeLists.txt
+++ b/core/application/CMakeLists.txt
@@ -23,6 +23,7 @@ add_custom_command(
 add_library(build_version
     ${CMAKE_CURRENT_BINARY_DIR}/build_version.cpp
     )
+kagome_install(build_version)
 
 add_library(app_config
     impl/app_configuration_impl.cpp
@@ -30,7 +31,7 @@ add_library(app_config
 target_link_libraries(app_config
     Boost::program_options
     p2p::p2p_multiaddress
-    api_transport
+    api
     blob
     assets
     chain_spec
@@ -54,6 +55,7 @@ add_library(app_state_manager
 target_link_libraries(app_state_manager
     logger
     )
+kagome_install(app_state_manager)
 
 add_library(print_chain_info_mode
     modes/print_chain_info_mode.cpp
diff --git a/core/authorship/CMakeLists.txt b/core/authorship/CMakeLists.txt
index d2c0e394a4..8bcb29bdb3 100644
--- a/core/authorship/CMakeLists.txt
+++ b/core/authorship/CMakeLists.txt
@@ -4,35 +4,16 @@
 #
 
 add_library(block_builder
-    block_builder.hpp
     impl/block_builder_impl.cpp
-    impl/block_builder_impl.hpp
     impl/block_builder_error.cpp
-    impl/block_builder_error.hpp
+    impl/proposer_impl.cpp
+    impl/block_builder_factory_impl.cpp
     )
 target_link_libraries(block_builder
     outcome
     logger
-    scale::scale
-    )
-
-add_library(block_builder_factory
-    block_builder_factory.hpp
-    impl/block_builder_factory_impl.cpp
-    impl/block_builder_factory_impl.hpp
-    )
-target_link_libraries(block_builder_factory
-    block_builder
-    block_header_repository
-    )
-
-add_library(proposer
-    proposer.hpp
-    impl/proposer_impl.cpp
-    impl/proposer_impl.hpp
-    )
-target_link_libraries(proposer
-    block_builder_factory
+    blockchain
     scale::scale
     metrics
     )
+kagome_clear_objects(block_builder)
diff --git a/core/blockchain/CMakeLists.txt b/core/blockchain/CMakeLists.txt
index a52bfd2ec0..fa9eb8748e 100644
--- a/core/blockchain/CMakeLists.txt
+++ b/core/blockchain/CMakeLists.txt
@@ -3,50 +3,29 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_subdirectory(impl)
-
-add_library(block_header_repository
-    impl/block_header_repository_impl.cpp
-    )
-target_link_libraries(block_header_repository
-    blockchain_common
-    block_tree_error
-    )
-kagome_install(block_header_repository)
-
-add_library(block_storage_error
+add_library(blockchain
+    impl/storage_util.cpp
+    impl/block_tree_error.cpp
+    impl/cached_tree.cpp
+    impl/block_tree_impl.cpp
+    impl/digest_tracker_impl.cpp
     impl/block_storage_error.cpp
-    )
-target_link_libraries(block_storage_error
-    outcome
-    )
-kagome_install(block_storage_error)
-
-add_library(block_storage
+    impl/justification_storage_policy.cpp
     impl/block_storage_impl.cpp
-    )
-target_link_libraries(block_storage
-    blockchain_common
-    block_storage_error
+    impl/block_header_repository_impl.cpp
+    impl/common.cpp
+    )
+target_link_libraries(blockchain
+    Boost::boost
+    storage
+    primitives
+    logger
+    blob
+    metrics
+    telemetry
+    outcome
     hasher
     scale::scale
     )
-kagome_install(block_storage)
-
-add_library(block_tree_error
-    block_tree_error.hpp
-    impl/block_tree_error.cpp
-    )
-target_link_libraries(block_tree_error
-    outcome
-    )
-kagome_install(block_tree_error)
-
-add_library(digest_tracker
-    impl/digest_tracker_impl.cpp
-    )
-target_link_libraries(digest_tracker
-    blockchain_common
-    )
-kagome_install(digest_tracker)
-
+kagome_install(blockchain)
+kagome_clear_objects(blockchain)
diff --git a/core/blockchain/impl/CMakeLists.txt b/core/blockchain/impl/CMakeLists.txt
deleted file mode 100644
index e137885e5a..0000000000
--- a/core/blockchain/impl/CMakeLists.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Copyright Soramitsu Co., Ltd. All Rights Reserved.
-# SPDX-License-Identifier: Apache-2.0
-#
-
-add_library(blockchain_common
-    common.cpp
-    storage_util.cpp
-    )
-target_link_libraries(blockchain_common
-    blob
-    Boost::boost
-    database_error
-    in_memory_storage
-    trie_storage
-    trie_storage_backend
-    polkadot_trie
-    polkadot_codec
-    primitives
-    )
-kagome_install(blockchain_common)
-
-add_library(justification_storage_policy
-    justification_storage_policy.cpp
-    )
-target_link_libraries(justification_storage_policy
-    logger
-    blob
-)
-kagome_install(justification_storage_policy)
-
-add_library(block_tree
-    block_tree_impl.cpp
-    cached_tree.cpp
-    )
-target_link_libraries(block_tree
-    block_tree_error
-    block_storage_error
-    blockchain_common
-    hasher
-    metrics
-    justification_storage_policy
-    telemetry
-    )
diff --git a/core/consensus/CMakeLists.txt b/core/consensus/CMakeLists.txt
index c7817d2fae..efe5af6e76 100644
--- a/core/consensus/CMakeLists.txt
+++ b/core/consensus/CMakeLists.txt
@@ -3,7 +3,50 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_subdirectory(validation)
-add_subdirectory(babe)
-add_subdirectory(grandpa)
-add_subdirectory(authority)
+add_library(consensus
+    authority/impl/schedule_node.cpp
+    authority/impl/authority_manager_impl.cpp
+    authority/authority_update_observer_error.cpp
+    authority/authority_manager_error.cpp
+    babe/impl/babe_digests_util.cpp
+    babe/impl/babe_config_node.cpp
+    babe/impl/block_executor_impl.cpp
+    babe/impl/babe_impl.cpp
+    babe/impl/threshold_util.cpp
+    babe/impl/babe_lottery_impl.cpp
+    babe/impl/babe_config_repository_impl.cpp
+    babe/impl/block_appender_impl.cpp
+    babe/impl/consistency_keeper_impl.cpp
+    babe/babe_error.cpp
+    validation/babe_block_validator.cpp
+    grandpa/impl/vote_tracker_impl.cpp
+    grandpa/impl/vote_crypto_provider_impl.cpp
+    grandpa/impl/grandpa_impl.cpp
+    grandpa/impl/voting_round_impl.cpp
+    grandpa/impl/environment_impl.cpp
+    grandpa/vote_graph/vote_graph_error.cpp
+    grandpa/vote_graph/vote_graph_impl.cpp
+    grandpa/voter_set.cpp
+    grandpa/voting_round_error.cpp
+    )
+target_link_libraries(consensus
+    mp_utils
+    ed25519_types
+    Boost::boost
+    schnorrkel_crust::schnorrkel_crust
+    transaction_pool_error
+    hasher
+    vrf_provider
+    logger
+    scale::scale
+    primitives
+    blob
+    outcome
+    p2p::p2p_peer_id
+    storage
+    metrics
+    blockchain
+    telemetry
+    )
+kagome_install(consensus)
+kagome_clear_objects(consensus)
diff --git a/core/consensus/authority/CMakeLists.txt b/core/consensus/authority/CMakeLists.txt
deleted file mode 100644
index e7e32208b9..0000000000
--- a/core/consensus/authority/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Copyright Soramitsu Co., Ltd. All Rights Reserved.
-# SPDX-License-Identifier: Apache-2.0
-#
-
-add_subdirectory(impl)
-
-add_library(authority_manager_error
-    authority_manager_error.cpp
-    )
-target_link_libraries(authority_manager_error
-    outcome
-    )
-
-add_library(authority_update_observer_error
-    authority_update_observer_error.cpp
-    )
-target_link_libraries(authority_update_observer_error
-    outcome
-    )
diff --git a/core/consensus/authority/impl/CMakeLists.txt b/core/consensus/authority/impl/CMakeLists.txt
deleted file mode 100644
index 270858b4b6..0000000000
--- a/core/consensus/authority/impl/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Copyright Soramitsu Co., Ltd. All Rights Reserved.
-# SPDX-License-Identifier: Apache-2.0
-#
-
-add_library(authority_manager
-    authority_manager_impl.cpp
-    schedule_node.cpp
-    )
-target_link_libraries(authority_manager
-    logger
-    authority_manager_error
-    authority_update_observer_error
-    block_tree_error
-    primitives
-    )
diff --git a/core/consensus/babe/CMakeLists.txt b/core/consensus/babe/CMakeLists.txt
deleted file mode 100644
index dd4b452460..0000000000
--- a/core/consensus/babe/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# Copyright Soramitsu Co., Ltd. All Rights Reserved.
-# SPDX-License-Identifier: Apache-2.0
-#
-
-add_subdirectory(impl)
-
-add_library(babe_error
-    babe_error.cpp
-    babe_error.hpp
-    )
-target_link_libraries(babe_error
-    outcome
-    )
diff --git a/core/consensus/babe/impl/CMakeLists.txt b/core/consensus/babe/impl/CMakeLists.txt
deleted file mode 100644
index 1ab1837c39..0000000000
--- a/core/consensus/babe/impl/CMakeLists.txt
+++ /dev/null
@@ -1,100 +0,0 @@
-#
-# Copyright Soramitsu Co., Ltd. All Rights Reserved.
-# SPDX-License-Identifier: Apache-2.0
-#
-
-add_library(babe_lottery
-    babe_lottery_impl.cpp
-    babe_lottery_impl.hpp
-    )
-target_link_libraries(babe_lottery
-    hasher
-    vrf_provider
-    logger
-    scale::scale
-    )
-
-add_library(threshold_util
-    threshold_util.cpp
-    )
-target_link_libraries(threshold_util
-    primitives
-    )
-
-add_library(babe_digests_util
-    babe_digests_util.cpp
-    )
-target_link_libraries(babe_digests_util
-    primitives
-    scale::scale
-    block_storage_error
-    )
-
-add_library(block_appender
-    block_appender_impl.cpp
-    )
-target_link_libraries(block_appender
-    logger
-    primitives
-    scale::scale
-    block_tree_error
-    threshold_util
-    babe_digests_util
-    blockchain_common
-    )
-
-add_library(block_executor
-    block_executor_impl.cpp
-    )
-target_link_libraries(block_executor
-    logger
-    primitives
-    scale::scale
-    block_tree_error
-    threshold_util
-    transaction_pool_error
-    babe_digests_util
-    metrics
-    telemetry
-    blockchain_common
-    consistency_keeper
-    )
-
-add_library(consistency_keeper
-    consistency_keeper_impl.cpp
-    )
-target_link_libraries(consistency_keeper
-    Boost::boost
-    block_storage_error
-    )
-
-add_library(babe_config_repository
-    babe_config_repository_impl.cpp
-    babe_config_node.cpp
-    )
-target_link_libraries(babe_config_repository
-    primitives
-    scale::scale
-    )
-
-add_library(babe
-    babe_impl.cpp
-    babe_impl.hpp
-    )
-target_link_libraries(babe
-    babe_error
-    Boost::boost
-    schnorrkel_crust::schnorrkel_crust
-    logger
-    scale::scale
-    blob
-    outcome
-    p2p::p2p_peer_id
-    babe_digests_util
-    threshold_util
-    block_executor
-    polkadot_trie
-    metrics
-    block_storage_error
-    telemetry
-    )
diff --git a/core/consensus/grandpa/CMakeLists.txt b/core/consensus/grandpa/CMakeLists.txt
deleted file mode 100644
index 3160e92ccf..0000000000
--- a/core/consensus/grandpa/CMakeLists.txt
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# Copyright Soramitsu Co., Ltd. All Rights Reserved.
-# SPDX-License-Identifier: Apache-2.0
-#
-
-add_subdirectory(vote_graph)
-
-add_library(environment
-    impl/environment_impl.cpp
-    )
-
-target_link_libraries(environment
-    scale::scale
-    logger
-    blob
-    )
-
-add_library(vote_tracker
-    impl/vote_tracker_impl.cpp
-    )
-target_link_libraries(vote_tracker
-    blob
-    )
-
-add_library(vote_crypto_provider
-    impl/vote_crypto_provider_impl.cpp
-    )
-target_link_libraries(vote_crypto_provider
-    scale::scale
-    outcome
-    )
-
-add_library(voter_set
-    voter_set.cpp
-    )
-target_link_libraries(voter_set
-    ed25519_types
-    )
-
-add_library(voting_round_error
-    voting_round_error.cpp
-    )
-target_link_libraries(voting_round_error
-    outcome
-    )
-
-add_library(voting_round
-    impl/voting_round_impl.cpp
-    )
-
-target_link_libraries(voting_round
-    logger
-    voter_set
-    voting_round_error
-    blockchain_common
-    block_tree_error
-    )
-
-add_library(grandpa
-    impl/grandpa_impl.cpp
-    )
-target_link_libraries(grandpa
-    voting_round
-    vote_crypto_provider
-    vote_graph
-    vote_tracker
-    metrics
-    )
diff --git a/core/consensus/grandpa/vote_graph/CMakeLists.txt b/core/consensus/grandpa/vote_graph/CMakeLists.txt
deleted file mode 100644
index da958d8cee..0000000000
--- a/core/consensus/grandpa/vote_graph/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# Copyright Soramitsu Co., Ltd. All Rights Reserved.
-# SPDX-License-Identifier: Apache-2.0
-#
-
-add_library(vote_graph
-    vote_graph_impl.cpp
-    vote_graph_error.cpp
-    )
-target_link_libraries(vote_graph
-    Boost::boost
-    outcome
-    voting_round_error
-    )
diff --git a/core/consensus/validation/CMakeLists.txt b/core/consensus/validation/CMakeLists.txt
deleted file mode 100644
index 40be19e3f8..0000000000
--- a/core/consensus/validation/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# Copyright Soramitsu Co., Ltd. All Rights Reserved.
-# SPDX-License-Identifier: Apache-2.0
-#
-
-add_library(block_validator
-    babe_block_validator.cpp
-    )
-target_link_libraries(block_validator
-    outcome
-    babe_digests_util
-    mp_utils
-    logger
-    )
diff --git a/core/crypto/CMakeLists.txt b/core/crypto/CMakeLists.txt
index 3878f73fd4..059a9d98d0 100644
--- a/core/crypto/CMakeLists.txt
+++ b/core/crypto/CMakeLists.txt
@@ -43,6 +43,7 @@ target_link_libraries(vrf_provider
     blob
     p2p::p2p_random_generator # generator from libp2p
     )
+kagome_install(vrf_provider)
 
 add_library(sr25519_provider
     sr25519/sr25519_provider_impl.cpp
diff --git a/core/host_api/impl/CMakeLists.txt b/core/host_api/impl/CMakeLists.txt
index 9eed4427bf..99807f1c49 100644
--- a/core/host_api/impl/CMakeLists.txt
+++ b/core/host_api/impl/CMakeLists.txt
@@ -63,10 +63,9 @@ add_library(storage_extension
 target_link_libraries(storage_extension
     blob
     logger
-    ordered_trie_hash
+    storage
     scale::scale_encode_append
     runtime_transaction_error
-    polkadot_codec
     )
 kagome_install(storage_extension)
 
@@ -76,7 +75,7 @@ add_library(child_storage_extension
 target_link_libraries(child_storage_extension
     blob
     logger
-    ordered_trie_hash
+    storage
     scale::scale_encode_append
     runtime_transaction_error
     )
diff --git a/core/injector/CMakeLists.txt b/core/injector/CMakeLists.txt
index 0e2929aa91..ea60a80e20 100644
--- a/core/injector/CMakeLists.txt
+++ b/core/injector/CMakeLists.txt
@@ -11,20 +11,14 @@ target_link_libraries(application_injector
     runtime_wavm
     account_nonce_api
     address_publisher
-    api_jrpc_server
-    api_transport
+    api
     app_config
     app_state_manager
     authority_discovery_api
     print_chain_info_mode
     assets
-    author_api_service
-    authority_manager
-    babe
+    storage
     babe_api
-    babe_lottery
-    babe_config_repository
-    synchronizer
     binaryen_executor_factory
     binaryen_runtime_external_interface
     binaryen_wasm_memory
@@ -33,32 +27,18 @@ target_link_libraries(application_injector
     module_repository
     binaryen_module_factory
     bip39_provider
-    block_announce_protocol
-    block_appender
     block_builder_api
-    block_executor
-    block_header_repository
-    block_storage
-    block_tree
-    block_validator
-    chain_api_service
-    changes_tracker
-    child_state_api_service
+    consensus
+    blockchain
     clock
     chain_spec
     core_api
     crypto_store
-    digest_tracker
     ecdsa_provider
     ed25519_provider
-    environment
-    extrinsic_observer
     transaction_pool
     host_api_factory
-    kagome_router
-    kagome_router
     key_file_storage
-    rocksdb_wrapper
     log_configurator
     metadata_api
     metrics
@@ -69,17 +49,8 @@ target_link_libraries(application_injector
     p2p::p2p_kademlia
     p2p::p2p_ping
     parachain_host_api
-    payment_api_service
     pbkdf2_provider
-    peer_manager
-    polkadot_codec
-    polkadot_trie
-    polkadot_trie_factory
-    propagate_transactions_protocol
-    proposer
-    protocol_factory
-    rpc_api_service
-    rpc_thread_pool
+    block_builder
     runtime_upgrade_tracker
     runtime_environment_factory
     runtime_properties_cache
@@ -88,45 +59,25 @@ target_link_libraries(application_injector
     soralog::fallback_configurator
     soralog::soralog
     sr25519_provider
-    state_api_service
-    state_protocol_observer
+    network
     storage_code_provider
-    sync_protocol_observer
     telemetry
     tagged_transaction_queue_api
     transaction_payment_api
     transaction_pool
-    trie_serializer
-    trie_storage
     trie_storage_provider
     vrf_provider
     waitable_timer
-    authority_manager
-    system_api_service
-    payment_api_service
-    rpc_api_service
-    internal_api_service
-    peer_manager
     assets
-    block_announce_protocol
-    propagate_transactions_protocol
-    grandpa_protocol
     grandpa_api
-    grandpa
-    protocol_factory
     p2p::p2p_loopback_stream
-    grandpa_transmitter
-    block_announce_transmitter
-    transactions_transmitter
     offchain_worker_factory
     offchain_worker_pool
     offchain_worker_api
     offchain_persistent_storage
     offchain_local_storage
-    reputation_repository
     session_keys_api
-    collation_protocol
-    req_collation_protocol
     validator_parachain
     fd_limit
     )
+kagome_clear_objects(application_injector)
diff --git a/core/metrics/CMakeLists.txt b/core/metrics/CMakeLists.txt
index 00cd065d1b..f94394de51 100644
--- a/core/metrics/CMakeLists.txt
+++ b/core/metrics/CMakeLists.txt
@@ -23,10 +23,11 @@ add_library(metrics
 
 target_link_libraries(metrics
     app_state_manager
-    api_transport
+    api
     Boost::boost
     prometheus-cpp::core
     )
+kagome_install(metrics)
 
 add_library(metrics_watcher
     impl/metrics_watcher.cpp
diff --git a/core/network/CMakeLists.txt b/core/network/CMakeLists.txt
index 29ae63f903..6ccdd8e31e 100644
--- a/core/network/CMakeLists.txt
+++ b/core/network/CMakeLists.txt
@@ -4,6 +4,46 @@
 #
 
 add_subdirectory(protobuf)
-add_subdirectory(helpers)
-add_subdirectory(impl)
-add_subdirectory(adapters)
+
+
+add_library(network
+    impl/state_protocol_observer_impl.cpp
+    impl/synchronizer_impl.cpp
+    impl/router_libp2p.cpp
+    impl/grandpa_transmitter_impl.cpp
+    impl/block_announce_transmitter_impl.cpp
+    impl/extrinsic_observer_impl.cpp
+    impl/transactions_transmitter_impl.cpp
+    impl/sync_protocol_observer_impl.cpp
+    impl/protocols/protocol_error.cpp
+    impl/protocols/state_protocol_impl.cpp
+    impl/protocols/protocol_factory.cpp
+    impl/protocols/sync_protocol_impl.cpp
+    impl/protocols/propagate_transactions_protocol.cpp
+    impl/protocols/grandpa_protocol.cpp
+    impl/protocols/protocol_req_collation.cpp
+    impl/protocols/collation_protocol.cpp
+    impl/protocols/block_announce_protocol.cpp
+    impl/peer_view.cpp
+    impl/peer_manager_impl.cpp
+    impl/reputation_repository_impl.cpp
+    helpers/scale_message_read_writer.cpp
+    adapters/adapter_errors.cpp
+    )
+target_link_libraries(network
+    p2p::p2p_basic_scheduler
+    scale_libp2p_types
+    blockchain
+    logger
+    p2p::p2p_peer_id
+    primitives
+    metrics
+    telemetry
+    p2p::p2p_message_read_writer
+    scale::scale
+    outcome
+    blob
+    node_api_proto
+    p2p::p2p_loopback_stream
+    )
+kagome_clear_objects(network)
diff --git a/core/network/adapters/CMakeLists.txt b/core/network/adapters/CMakeLists.txt
deleted file mode 100644
index bb5ef35677..0000000000
--- a/core/network/adapters/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Copyright Soramitsu Co., Ltd. All Rights Reserved.
-# SPDX-License-Identifier: Apache-2.0
-#
-
-add_library(adapter_errors
-    adapter_errors.hpp
-    adapter_errors.cpp
-    )
-target_link_libraries(adapter_errors
-    outcome
-    )
diff --git a/core/network/helpers/CMakeLists.txt b/core/network/helpers/CMakeLists.txt
deleted file mode 100644
index 741c1c6f74..0000000000
--- a/core/network/helpers/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Copyright Soramitsu Co., Ltd. All Rights Reserved.
-# SPDX-License-Identifier: Apache-2.0
-#
-
-add_library(scale_message_read_writer
-    scale_message_read_writer.hpp
-    scale_message_read_writer.cpp
-    )
-target_link_libraries(scale_message_read_writer
-    p2p::p2p_message_read_writer
-    scale::scale
-    )
diff --git a/core/network/impl/CMakeLists.txt b/core/network/impl/CMakeLists.txt
deleted file mode 100644
index a399d7ff5a..0000000000
--- a/core/network/impl/CMakeLists.txt
+++ /dev/null
@@ -1,98 +0,0 @@
-#
-# Copyright Soramitsu Co., Ltd. All Rights Reserved.
-# SPDX-License-Identifier: Apache-2.0
-#
-
-add_subdirectory(protocols)
-
-add_library(synchronizer
-    synchronizer_impl.cpp
-    )
-target_link_libraries(synchronizer
-    logger
-    primitives
-    metrics
-    telemetry
-    )
-
-add_library(grandpa_transmitter
-    grandpa_transmitter_impl.cpp
-    )
-target_link_libraries(grandpa_transmitter
-    logger
-    )
-
-add_library(block_announce_transmitter
-    block_announce_transmitter_impl.cpp
-    )
-target_link_libraries(block_announce_transmitter
-    logger
-    )
-
-add_library(transactions_transmitter
-    transactions_transmitter_impl.cpp
-    )
-target_link_libraries(transactions_transmitter
-    logger
-    )
-
-add_library(kagome_router
-    router_libp2p.cpp
-    router_libp2p.hpp
-    )
-target_link_libraries(kagome_router
-    logger
-    outcome
-    block_announce_protocol
-    )
-
-add_library(extrinsic_observer
-    extrinsic_observer_impl.hpp
-    extrinsic_observer_impl.cpp
-    )
-target_link_libraries(extrinsic_observer
-    logger
-    )
-
-
-add_library(state_protocol_observer
-    state_protocol_observer_impl.hpp
-    state_protocol_observer_impl.cpp
-    )
-target_link_libraries(state_protocol_observer
-    logger
-    )
-
-add_library(sync_protocol_observer
-    sync_protocol_observer_impl.hpp
-    sync_protocol_observer_impl.cpp
-    )
-target_link_libraries(sync_protocol_observer
-    block_header_repository
-    logger
-    p2p::p2p_peer_id
-    )
-
-add_library(peer_manager
-    peer_manager_impl.cpp
-    )
-target_link_libraries(peer_manager
-    logger
-    scale_libp2p_types
-    peer_view
-    )
-
-add_library(reputation_repository
-    reputation_repository_impl.cpp
-    )
-target_link_libraries(reputation_repository
-    p2p::p2p_peer_id
-    p2p::p2p_basic_scheduler
-    )
-
-add_library(peer_view
-    peer_view.cpp
-    )
-target_link_libraries(peer_view
-    p2p::p2p_peer_id
-    )
diff --git a/core/network/impl/protocols/CMakeLists.txt b/core/network/impl/protocols/CMakeLists.txt
deleted file mode 100644
index 222a778705..0000000000
--- a/core/network/impl/protocols/CMakeLists.txt
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-# Copyright Soramitsu Co., Ltd. All Rights Reserved.
-# SPDX-License-Identifier: Apache-2.0
-#
-
-add_library(protocol_error
-    protocol_error.cpp
-    )
-target_link_libraries(protocol_error
-    outcome
-    )
-
-add_library(block_announce_protocol
-    block_announce_protocol.cpp
-    )
-target_link_libraries(block_announce_protocol
-    logger
-    scale_message_read_writer
-    protocol_error
-    )
-
-add_library(collation_protocol
-    collation_protocol.cpp
-    )
-target_link_libraries(collation_protocol
-    blob
-    logger
-    scale_message_read_writer
-    protocol_error
-    p2p::p2p_peer_id
-    )
-
-add_library(grandpa_protocol
-    grandpa_protocol.cpp
-    )
-target_link_libraries(grandpa_protocol
-    logger
-    protocol_error
-    )
-
-add_library(propagate_transactions_protocol
-    propagate_transactions_protocol.cpp
-    )
-target_link_libraries(propagate_transactions_protocol
-    logger
-    protocol_error
-    metrics
-    )
-
-
-add_library(state_protocol
-    state_protocol_impl.cpp
-    )
-target_link_libraries(state_protocol
-    logger
-    node_api_proto
-    protocol_error
-    )
-
-add_library(sync_protocol
-    sync_protocol_impl.cpp
-    )
-target_link_libraries(sync_protocol
-    blob
-    logger
-    node_api_proto
-    adapter_errors
-    protocol_error
-    scale_message_read_writer
-    )
-
-add_library(req_collation_protocol
-    protocol_req_collation.cpp
-    )
-target_link_libraries(req_collation_protocol
-    blob
-    logger
-    adapter_errors
-    protocol_error
-    scale_message_read_writer
-    p2p::p2p_peer_id
-    )
-
-add_library(protocol_factory
-    protocol_factory.cpp
-    )
-target_link_libraries(protocol_factory
-    state_protocol
-    sync_protocol
-    logger
-    )
diff --git a/core/parachain/CMakeLists.txt b/core/parachain/CMakeLists.txt
index f92a13761f..8abe5fcea9 100644
--- a/core/parachain/CMakeLists.txt
+++ b/core/parachain/CMakeLists.txt
@@ -15,8 +15,5 @@ add_library(validator_parachain
 
 target_link_libraries(validator_parachain
     crypto_store
-    req_collation_protocol
-    collation_protocol
-    protocol_error
-    peer_view
+    network
     )
diff --git a/core/runtime/common/CMakeLists.txt b/core/runtime/common/CMakeLists.txt
index 4220f3b735..d94c32a178 100644
--- a/core/runtime/common/CMakeLists.txt
+++ b/core/runtime/common/CMakeLists.txt
@@ -42,15 +42,14 @@ add_library(trie_storage_provider
     )
 target_link_libraries(trie_storage_provider
     runtime_transaction_error
-    trie_storage
-    trie_serializer
+    storage
     blob
     )
 kagome_install(trie_storage_provider)
 
 add_library(runtime_upgrade_tracker runtime_upgrade_tracker_impl.cpp)
 target_link_libraries(runtime_upgrade_tracker
-    block_storage
+    blockchain
     logger
     )
 kagome_install(runtime_upgrade_tracker)
@@ -64,7 +63,7 @@ kagome_install(module_repository)
 add_library(runtime_environment_factory runtime_environment_factory.cpp)
 target_link_libraries(runtime_environment_factory
     logger
-    trie_error
+    storage
     mp_utils
     )
 kagome_install(runtime_environment_factory)
diff --git a/core/runtime/runtime_api/impl/CMakeLists.txt b/core/runtime/runtime_api/impl/CMakeLists.txt
index 50764b2169..2ec0003b58 100644
--- a/core/runtime/runtime_api/impl/CMakeLists.txt
+++ b/core/runtime/runtime_api/impl/CMakeLists.txt
@@ -38,7 +38,7 @@ add_library(grandpa_api
     grandpa_api.cpp
     )
 target_link_libraries(grandpa_api
-    block_header_repository
+    blockchain
     executor
     )
 
@@ -48,6 +48,7 @@ add_library(metadata_api
 target_link_libraries(metadata_api
     executor
     )
+kagome_install(metadata_api)
 
 add_library(parachain_host_api
     parachain_host.cpp
diff --git a/core/storage/CMakeLists.txt b/core/storage/CMakeLists.txt
index 1c1a582a3f..6de5d36e46 100644
--- a/core/storage/CMakeLists.txt
+++ b/core/storage/CMakeLists.txt
@@ -1,16 +1,37 @@
 # Copyright Soramitsu Co., Ltd. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_subdirectory(rocksdb)
-add_subdirectory(trie)
-add_subdirectory(in_memory)
-add_subdirectory(changes_trie)
-
-add_library(database_error
+add_library(storage
+    rocksdb/rocksdb_cursor.cpp
+    rocksdb/rocksdb.cpp
+    rocksdb/rocksdb_batch.cpp
     database_error.cpp
+    changes_trie/impl/storage_changes_tracker_impl.cpp
+    in_memory/in_memory_storage.cpp
+    trie/impl/ephemeral_trie_batch_impl.cpp
+    trie/impl/trie_storage_impl.cpp
+    trie/impl/trie_storage_backend_batch.cpp
+    trie/impl/trie_storage_backend_impl.cpp
+    trie/impl/persistent_trie_batch_impl.cpp
+    trie/impl/topper_trie_batch_impl.cpp
+    trie/polkadot_trie/trie_node.cpp
+    trie/polkadot_trie/polkadot_trie_impl.cpp
+    trie/polkadot_trie/polkadot_trie_factory_impl.cpp
+    trie/polkadot_trie/polkadot_trie_cursor_impl.cpp
+    trie/polkadot_trie/trie_error.cpp
+    trie/serialization/trie_serializer_impl.cpp
+    trie/serialization/polkadot_codec.cpp
     )
-target_link_libraries(database_error
+target_link_libraries(storage
+    blob
+    scale::scale
     Boost::boost
     outcome
+    RocksDB::rocksdb
+    Boost::filesystem
+    fmt::fmt
+    logger
+    blake2
     )
-kagome_install(database_error)
+kagome_install(storage)
+kagome_clear_objects(storage)
diff --git a/core/storage/changes_trie/CMakeLists.txt b/core/storage/changes_trie/CMakeLists.txt
deleted file mode 100644
index d472066f86..0000000000
--- a/core/storage/changes_trie/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright Soramitsu Co., Ltd. All Rights Reserved.
-# SPDX-License-Identifier: Apache-2.0
-
-add_library(changes_tracker
-    impl/storage_changes_tracker_impl.cpp
-    )
-target_link_libraries(changes_tracker
-    blob
-    logger
-    scale::scale
-    )
-kagome_install(changes_tracker)
diff --git a/core/storage/in_memory/CMakeLists.txt b/core/storage/in_memory/CMakeLists.txt
deleted file mode 100644
index 12c3fedf5e..0000000000
--- a/core/storage/in_memory/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright Soramitsu Co., Ltd. All Rights Reserved.
-# SPDX-License-Identifier: Apache-2.0
-
-add_library(in_memory_storage
-    in_memory_storage.cpp
-    )
-target_link_libraries(in_memory_storage
-    database_error
-    )
-kagome_install(in_memory_storage)
diff --git a/core/storage/rocksdb/CMakeLists.txt b/core/storage/rocksdb/CMakeLists.txt
deleted file mode 100644
index 3fdde327ad..0000000000
--- a/core/storage/rocksdb/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Copyright Soramitsu Co., Ltd. All Rights Reserved.
-# SPDX-License-Identifier: Apache-2.0
-#
-
-add_library(rocksdb_wrapper
-    rocksdb.cpp
-    rocksdb_batch.cpp
-    rocksdb_cursor.cpp
-    )
-target_link_libraries(rocksdb_wrapper
-    RocksDB::rocksdb
-    Boost::filesystem
-    database_error
-    logger
-    )
-
-kagome_install(rocksdb_wrapper)
diff --git a/core/storage/trie/CMakeLists.txt b/core/storage/trie/CMakeLists.txt
deleted file mode 100644
index ce4a77e258..0000000000
--- a/core/storage/trie/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright Soramitsu Co., Ltd. All Rights Reserved.
-# SPDX-License-Identifier: Apache-2.0
-
-add_subdirectory(polkadot_trie)
-add_subdirectory(serialization)
-add_subdirectory(impl)
diff --git a/core/storage/trie/impl/CMakeLists.txt b/core/storage/trie/impl/CMakeLists.txt
deleted file mode 100644
index eeda36ca7c..0000000000
--- a/core/storage/trie/impl/CMakeLists.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright Soramitsu Co., Ltd. All Rights Reserved.
-# SPDX-License-Identifier: Apache-2.0
-
-add_library(trie_storage_backend
-    trie_storage_backend_impl.cpp
-    trie_storage_backend_batch.cpp
-    )
-target_link_libraries(trie_storage_backend
-    fmt::fmt
-    )
-kagome_install(trie_storage_backend)
-
-add_library(topper_trie_batch
-    topper_trie_batch_impl.cpp
-    )
-target_link_libraries(topper_trie_batch
-    fmt::fmt
-    )
-kagome_install(topper_trie_batch)
-
-add_library(persistent_trie_batch
-    persistent_trie_batch_impl.cpp
-    )
-target_link_libraries(persistent_trie_batch
-    trie_error
-    polkadot_trie_cursor
-    topper_trie_batch
-    )
-kagome_install(persistent_trie_batch)
-
-add_library(ephemeral_trie_batch
-    ephemeral_trie_batch_impl.cpp
-    )
-target_link_libraries(ephemeral_trie_batch
-    polkadot_trie_cursor
-    topper_trie_batch
-    )
-kagome_install(ephemeral_trie_batch)
-
-add_library(trie_storage
-    trie_storage_impl.cpp
-    )
-target_link_libraries(trie_storage
-    ephemeral_trie_batch
-    persistent_trie_batch
-    logger
-    )
-kagome_install(trie_storage)
diff --git a/core/storage/trie/polkadot_trie/CMakeLists.txt b/core/storage/trie/polkadot_trie/CMakeLists.txt
deleted file mode 100644
index cc2437fe55..0000000000
--- a/core/storage/trie/polkadot_trie/CMakeLists.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright Soramitsu Co., Ltd. All Rights Reserved.
-# SPDX-License-Identifier: Apache-2.0
-
-add_library(polkadot_node
-    trie_node.cpp
-    )
-target_link_libraries(polkadot_node
-    fmt::fmt
-    )
-kagome_install(polkadot_node)
-
-add_library(trie_error
-    trie_error.cpp
-    )
-target_link_libraries(trie_error
-    outcome
-    )
-kagome_install(trie_error)
-
-add_library(polkadot_trie_cursor
-    polkadot_trie_cursor_impl.cpp
-    )
-target_link_libraries(polkadot_trie_cursor
-    polkadot_codec
-    logger
-    )
-kagome_install(polkadot_trie_cursor)
-
-add_library(polkadot_trie
-    polkadot_trie_impl.cpp
-    )
-target_link_libraries(polkadot_trie
-    polkadot_node
-    trie_error
-    polkadot_codec
-    polkadot_trie_cursor
-    )
-kagome_install(polkadot_trie)
-
-add_library(polkadot_trie_factory
-    polkadot_trie_factory_impl.cpp
-    )
-target_link_libraries(polkadot_trie_factory
-    polkadot_trie
-    )
-kagome_install(polkadot_trie_factory)
diff --git a/core/storage/trie/serialization/CMakeLists.txt b/core/storage/trie/serialization/CMakeLists.txt
deleted file mode 100644
index f7c6597492..0000000000
--- a/core/storage/trie/serialization/CMakeLists.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright Soramitsu Co., Ltd. All Rights Reserved.
-# SPDX-License-Identifier: Apache-2.0
-
-add_library(trie_serializer
-    trie_serializer_impl.cpp
-    )
-target_link_libraries(trie_serializer
-    polkadot_node
-    )
-kagome_install(trie_serializer)
-
-add_library(polkadot_codec
-    polkadot_codec.cpp
-    )
-target_link_libraries(polkadot_codec
-    scale::scale
-    blake2
-    blob
-    polkadot_node
-    )
-kagome_install(polkadot_codec)
-
-add_library(ordered_trie_hash INTERFACE)
-target_link_libraries(ordered_trie_hash INTERFACE
-    polkadot_trie
-    polkadot_codec
-    scale::scale
-    )
-kagome_install(ordered_trie_hash)
diff --git a/core/transaction_pool/CMakeLists.txt b/core/transaction_pool/CMakeLists.txt
index b21201c7eb..5306652caf 100644
--- a/core/transaction_pool/CMakeLists.txt
+++ b/core/transaction_pool/CMakeLists.txt
@@ -17,6 +17,7 @@ add_library(transaction_pool_error
 target_link_libraries(transaction_pool_error
     outcome
     )
+kagome_install(transaction_pool_error)
 
 add_library(transaction_pool
     impl/transaction_pool_impl.cpp)
@@ -26,6 +27,6 @@ target_link_libraries(transaction_pool
     logger
     blob
     transaction_pool_error
-    block_header_repository
+    blockchain
     metrics
     )
diff --git a/core/utils/CMakeLists.txt b/core/utils/CMakeLists.txt
index e89ecee89e..31050e6870 100644
--- a/core/utils/CMakeLists.txt
+++ b/core/utils/CMakeLists.txt
@@ -3,36 +3,29 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_executable(storage_explorer
+add_library(storage_explorer
     storage_explorer.cpp
     ${BACKWARD_ENABLE}
     )
 target_link_libraries(storage_explorer
     application_injector
-    authority_manager
+    consensus
     )
 if (BACKWARD)
     add_backward(storage_explorer)
 endif()
 
-add_executable(kagome-db-editor
+add_library(kagome-db-editor
     kagome_db_editor.cpp
     )
 target_link_libraries(kagome-db-editor
     Boost::Boost.DI
-    block_storage
-    changes_tracker
+    blockchain
     hasher
-    rocksdb_wrapper
-    polkadot_codec
-    polkadot_trie_factory
+    storage
     runtime_upgrade_tracker
-    trie_serializer
-    trie_storage
-    trie_storage_backend
+    storage
     )
 if (BACKWARD)
   add_backward(kagome-db-editor)
 endif()
-kagome_install(kagome-db-editor)
-
diff --git a/core/utils/kagome_db_editor.cpp b/core/utils/kagome_db_editor.cpp
index 9f6c56dea6..249c3eb1fd 100644
--- a/core/utils/kagome_db_editor.cpp
+++ b/core/utils/kagome_db_editor.cpp
@@ -163,7 +163,7 @@ auto is_hash(const char *s) {
          && std::equal(s, s + 2, "0x");
 };
 
-int main(int argc, char *argv[]) {
+int db_editor_main(int argc, const char **argv) {
 #if defined(BACKWARD_HAS_BACKTRACE)
   backward::SignalHandling sh;
 #endif
@@ -441,4 +441,6 @@ int main(int argc, char *argv[]) {
     dynamic_cast<storage::RocksDB *>(storage.get())
         ->compact(common::Buffer(), common::Buffer());
   }
+
+  return 0;
 }
diff --git a/core/utils/storage_explorer.cpp b/core/utils/storage_explorer.cpp
index b34c592d69..250f80a5a6 100644
--- a/core/utils/storage_explorer.cpp
+++ b/core/utils/storage_explorer.cpp
@@ -461,7 +461,7 @@ class SearchChainCommand : public Command {
   std::shared_ptr<Hasher> hasher;
 };
 
-int main(int argc, const char **argv) {
+int storage_explorer_main(int argc, const char **argv) {
   ArgumentList args{argv, argc};
 
   CommandParser parser;
diff --git a/housekeeping/ci_install_mold.sh b/housekeeping/ci_install_mold.sh
new file mode 100755
index 0000000000..c7f7d0c567
--- /dev/null
+++ b/housekeeping/ci_install_mold.sh
@@ -0,0 +1,11 @@
+#!/bin/bash -xe
+
+if [ "$CI" != "true" ] || [ "$GITHUB_ACTIONS" != "true" ]; then
+  echo "CI=true GITHUB_ACTIONS=true are required"
+  exit -1
+fi
+
+wget -q -O- https://github.com/rui314/mold/releases/download/v1.3.1/mold-1.3.1-x86_64-linux.tar.gz | tar -C /usr/local --strip-components=1 -xzf -
+if [ "$1" == "--make-default" ]; then
+  ln -sf /usr/local/bin/mold $(realpath /usr/bin/ld)
+fi
diff --git a/housekeeping/docker/kagome-dev/make.sh b/housekeeping/docker/kagome-dev/make.sh
index fd2c210be1..6237befe4c 100755
--- a/housekeeping/docker/kagome-dev/make.sh
+++ b/housekeeping/docker/kagome-dev/make.sh
@@ -14,4 +14,4 @@ git submodule update --init
 cd "$(dirname $0)/../../.."
 
 cmake . -B"${BUILD_DIR}" -G 'Unix Makefiles' -DCMAKE_BUILD_TYPE="${BUILD_TYPE}"
-cmake --build "${BUILD_DIR}" --target kagome kagome-db-editor -- -j${BUILD_THREADS}
+cmake --build "${BUILD_DIR}" --target kagome -- -j${BUILD_THREADS}
diff --git a/housekeeping/docker/kagome/build_and_push.sh b/housekeeping/docker/kagome/build_and_push.sh
index bc407701cf..1f7979a383 100755
--- a/housekeeping/docker/kagome/build_and_push.sh
+++ b/housekeeping/docker/kagome/build_and_push.sh
@@ -38,7 +38,6 @@ mkdir -p ${CTX_DIR}
 
 # Copy binaries
 cp -a ${BUILD_DIR}/node/kagome ${CTX_DIR}/
-cp -a ${BUILD_DIR}/core/utils/kagome-db-editor ${CTX_DIR}/
 
 if [ "$BUILD_TYPE" = "Release" ]; then
   strip ${CTX_DIR}/kagome
diff --git a/housekeeping/docker/kagome/minideb-debug.Dockerfile b/housekeeping/docker/kagome/minideb-debug.Dockerfile
index b20ca9a43f..9490194986 100644
--- a/housekeeping/docker/kagome/minideb-debug.Dockerfile
+++ b/housekeeping/docker/kagome/minideb-debug.Dockerfile
@@ -15,4 +15,3 @@ RUN apt-get update && \
     rm -rf /var/lib/apt/lists/*
 
 COPY kagome /usr/local/bin/
-COPY kagome-db-editor /usr/local/bin/
diff --git a/housekeeping/docker/kagome/minideb-release.Dockerfile b/housekeeping/docker/kagome/minideb-release.Dockerfile
index 7f37d59b4f..19349424b5 100644
--- a/housekeeping/docker/kagome/minideb-release.Dockerfile
+++ b/housekeeping/docker/kagome/minideb-release.Dockerfile
@@ -16,4 +16,3 @@ RUN apt-get update && \
 
 
 COPY kagome /usr/local/bin/
-COPY kagome-db-editor /usr/local/bin/
diff --git a/node/CMakeLists.txt b/node/CMakeLists.txt
index 30eb882921..9beeb67c67 100644
--- a/node/CMakeLists.txt
+++ b/node/CMakeLists.txt
@@ -14,6 +14,9 @@ target_link_libraries(kagome
     fd_limit
     p2p::p2p_identify
     p2p::p2p_ping
+
+    kagome-db-editor
+    storage_explorer
     )
 if (BACKWARD)
   add_backward(kagome)
diff --git a/node/main.cpp b/node/main.cpp
index 38a656414c..2e0997c928 100644
--- a/node/main.cpp
+++ b/node/main.cpp
@@ -23,7 +23,20 @@
 using kagome::application::AppConfiguration;
 using kagome::application::AppConfigurationImpl;
 
+int storage_explorer_main(int argc, const char **argv);
+int db_editor_main(int argc, const char **argv);
+
 int main(int argc, const char **argv) {
+  if (argc > 1) {
+    std::string_view name{argv[1]};
+    if (name == "storage-explorer") {
+      return storage_explorer_main(argc, argv + 1);
+    }
+    if (name == "db-editor") {
+      return db_editor_main(argc, argv + 1);
+    }
+  }
+
 #if defined(BACKWARD_HAS_BACKTRACE)
   backward::SignalHandling sh;
 #endif
diff --git a/test/core/api/service/author/CMakeLists.txt b/test/core/api/service/author/CMakeLists.txt
index 2e71bef567..04947245ee 100644
--- a/test/core/api/service/author/CMakeLists.txt
+++ b/test/core/api/service/author/CMakeLists.txt
@@ -7,7 +7,7 @@ addtest(author_api_test
     author_api_test.cpp
     )
 target_link_libraries(author_api_test
-    author_api_service
+    api
     blob
     hasher
     testutil_primitives_generator
diff --git a/test/core/api/service/chain/CMakeLists.txt b/test/core/api/service/chain/CMakeLists.txt
index d5b1e78f5c..259ac22fbf 100644
--- a/test/core/api/service/chain/CMakeLists.txt
+++ b/test/core/api/service/chain/CMakeLists.txt
@@ -7,13 +7,8 @@ addtest(chain_api_test
     chain_api_test.cpp
     )
 target_link_libraries(chain_api_test
-    api_service
-    chain_api_service
-    api_chain_requests
-    api_jrpc_server
-    api_transport
+    api
     blob
-    state_api_service
     )
 
 addtest(base_request_test
diff --git a/test/core/api/service/child_state/CMakeLists.txt b/test/core/api/service/child_state/CMakeLists.txt
index c2e754a220..23c71ed22c 100644
--- a/test/core/api/service/child_state/CMakeLists.txt
+++ b/test/core/api/service/child_state/CMakeLists.txt
@@ -7,6 +7,6 @@ addtest(child_state_api_test
     child_state_api_test.cpp
     )
 target_link_libraries(child_state_api_test
-    child_state_api_service
+    api
     blob
     )
diff --git a/test/core/api/service/payment/CMakeLists.txt b/test/core/api/service/payment/CMakeLists.txt
index 279d8c8c1f..721424d896 100644
--- a/test/core/api/service/payment/CMakeLists.txt
+++ b/test/core/api/service/payment/CMakeLists.txt
@@ -7,6 +7,6 @@ addtest(payment_api_test
         payment_api_test.cpp
         )
 target_link_libraries(payment_api_test
-        payment_api_service
+        api
         blob
         )
diff --git a/test/core/api/service/state/CMakeLists.txt b/test/core/api/service/state/CMakeLists.txt
index eda1e7f0cb..04cf6648bc 100644
--- a/test/core/api/service/state/CMakeLists.txt
+++ b/test/core/api/service/state/CMakeLists.txt
@@ -7,7 +7,7 @@ addtest(state_api_test
     state_api_test.cpp
     )
 target_link_libraries(state_api_test
-    state_api_service
+    api
     blob
     )
 
@@ -15,7 +15,6 @@ addtest(state_jrpc_processor_test
     state_jrpc_processor_test.cpp
     )
 target_link_libraries(state_jrpc_processor_test
-    state_api_service
-    api_jrpc_server
+    api
     blob
     )
diff --git a/test/core/api/service/system/CMakeLists.txt b/test/core/api/service/system/CMakeLists.txt
index 7ee71ca85a..e8eece0086 100644
--- a/test/core/api/service/system/CMakeLists.txt
+++ b/test/core/api/service/system/CMakeLists.txt
@@ -7,5 +7,5 @@ addtest(system_api_test
     system_api_test.cpp
     )
 target_link_libraries(system_api_test
-    system_api_service
+    api
     )
\ No newline at end of file
diff --git a/test/core/api/transport/CMakeLists.txt b/test/core/api/transport/CMakeLists.txt
index 94beab5a3e..50fba209ac 100644
--- a/test/core/api/transport/CMakeLists.txt
+++ b/test/core/api/transport/CMakeLists.txt
@@ -8,11 +8,8 @@ addtest(http_listener_test
     )
 target_link_libraries(http_listener_test
     test_http_client
-    api_jrpc_server
-    api_transport
-    api_service
+    api
     blob
-    state_api_service
     logger_for_tests
     )
 
@@ -21,11 +18,8 @@ addtest(ws_listener_test
     )
 target_link_libraries(ws_listener_test
     test_ws_client
-    api_jrpc_server
-    api_transport
-    api_service
+    api
     blob
-    state_api_service
     logger_for_tests
     )
 
@@ -33,5 +27,5 @@ addtest(jrpc_handle_batch_test
     jrpc_handle_batch_test.cpp
     )
 target_link_libraries(jrpc_handle_batch_test
-    api_jrpc_server
+    api
     )
diff --git a/test/core/authorship/CMakeLists.txt b/test/core/authorship/CMakeLists.txt
index 4373016acb..86e42c414e 100644
--- a/test/core/authorship/CMakeLists.txt
+++ b/test/core/authorship/CMakeLists.txt
@@ -18,7 +18,7 @@ addtest(block_builder_factory_test
     )
 
 target_link_libraries(block_builder_factory_test
-    block_builder_factory
+    block_builder
     logger_for_tests
     )
 
@@ -27,7 +27,7 @@ addtest(proposer_test
     )
 
 target_link_libraries(proposer_test
-    proposer
+    block_builder
     transaction_pool
     logger_for_tests
     )
diff --git a/test/core/blockchain/CMakeLists.txt b/test/core/blockchain/CMakeLists.txt
index 35c48831f0..9c755c5eb2 100644
--- a/test/core/blockchain/CMakeLists.txt
+++ b/test/core/blockchain/CMakeLists.txt
@@ -7,20 +7,18 @@ addtest(block_header_repository_test
     block_header_repository_test.cpp
     )
 target_link_libraries(block_header_repository_test
-    block_header_repository
+    blockchain
     base_rocksdb_test
     hasher
-    blockchain_common
     )
 
 addtest(block_tree_test
     block_tree_test.cpp
     )
 target_link_libraries(block_tree_test
-    block_tree
-    block_header_repository
-    extrinsic_observer
-    babe_digests_util
+    blockchain
+    network
+    consensus
     logger_for_tests
     dummy_error
     )
@@ -29,14 +27,14 @@ addtest(block_storage_test
     block_storage_test.cpp
     )
 target_link_libraries(block_storage_test
-    block_storage
+    blockchain
     logger_for_tests
     )
 
 addtest(justification_storage_policy_test
-        justification_storage_policy_test.cpp
-        )
+    justification_storage_policy_test.cpp
+    )
 target_link_libraries(justification_storage_policy_test
-        justification_storage_policy
-        scale::scale
-        )
+    blockchain
+    scale::scale
+    )
diff --git a/test/core/consensus/CMakeLists.txt b/test/core/consensus/CMakeLists.txt
index c794378e6f..9ffdadfe43 100644
--- a/test/core/consensus/CMakeLists.txt
+++ b/test/core/consensus/CMakeLists.txt
@@ -12,6 +12,6 @@ addtest(babe_lottery_test
     babe_lottery_test.cpp
     )
 target_link_libraries(babe_lottery_test
-    babe_lottery
+    consensus
     logger_for_tests
     )
diff --git a/test/core/consensus/authority/CMakeLists.txt b/test/core/consensus/authority/CMakeLists.txt
index f24c777fbf..7523a560c6 100644
--- a/test/core/consensus/authority/CMakeLists.txt
+++ b/test/core/consensus/authority/CMakeLists.txt
@@ -7,10 +7,10 @@ addtest(authority_manager_test
     authority_manager_test.cpp
     )
 target_link_libraries(authority_manager_test
-    authority_manager
+    consensus
     scale::scale
     blob
     dummy_error
     logger_for_tests
-    in_memory_storage
+    storage
     )
diff --git a/test/core/consensus/babe/CMakeLists.txt b/test/core/consensus/babe/CMakeLists.txt
index 8152760dca..84a58e448e 100644
--- a/test/core/consensus/babe/CMakeLists.txt
+++ b/test/core/consensus/babe/CMakeLists.txt
@@ -7,7 +7,7 @@ addtest(babe_test
     babe_test.cpp
     )
 target_link_libraries(babe_test
-    babe
+    consensus
     clock
     waitable_timer
     sr25519_types
@@ -19,26 +19,23 @@ addtest(babe_config_repository_test
     babe_config_repository_test.cpp
     )
 target_link_libraries(babe_config_repository_test
-    babe_config_repository
+    consensus
     clock
-    in_memory_storage
+    storage
     logger_for_tests
-    babe_error
-    babe_digests_util
     )
 
 addtest(threshold_util_test
     threshold_util_test.cpp
     )
 target_link_libraries(threshold_util_test
-    threshold_util
+    consensus
     )
 
 addtest(block_executor_test
     block_executor_test.cpp
     )
 target_link_libraries(block_executor_test
-    block_executor
+    consensus
     log_configurator
-    voting_round_error
     )
diff --git a/test/core/consensus/grandpa/CMakeLists.txt b/test/core/consensus/grandpa/CMakeLists.txt
index fc630e88f3..e9f3f3a9a2 100644
--- a/test/core/consensus/grandpa/CMakeLists.txt
+++ b/test/core/consensus/grandpa/CMakeLists.txt
@@ -9,7 +9,7 @@ addtest(chain_test
     chain_test.cpp
     )
 target_link_libraries(chain_test
-    environment
+    consensus
     logger_for_tests
     )
 
@@ -17,19 +17,19 @@ addtest(vote_tracker_test
     vote_tracker_test.cpp
     )
 target_link_libraries(vote_tracker_test
-    vote_tracker
+    consensus
     )
 
 addtest(voter_set_test
     voter_set_test.cpp
     )
 target_link_libraries(voter_set_test
-    voter_set
+    consensus
     )
 
 addtest(vote_weight_test
     vote_weight_test.cpp
     )
 target_link_libraries(vote_weight_test
-    voter_set
+    consensus
     )
diff --git a/test/core/consensus/grandpa/vote_graph/CMakeLists.txt b/test/core/consensus/grandpa/vote_graph/CMakeLists.txt
index fabb2000fa..7eb384ab39 100644
--- a/test/core/consensus/grandpa/vote_graph/CMakeLists.txt
+++ b/test/core/consensus/grandpa/vote_graph/CMakeLists.txt
@@ -16,9 +16,7 @@ addtest(vote_graph_test
     small_block_number_test.cpp
     )
 target_link_libraries(vote_graph_test
-    vote_graph
-    vote_tracker
-    voter_set
+    consensus
     blob
-    block_tree
+    blockchain
     )
diff --git a/test/core/consensus/grandpa/voting_round/CMakeLists.txt b/test/core/consensus/grandpa/voting_round/CMakeLists.txt
index f67e53bcf1..84450f55aa 100644
--- a/test/core/consensus/grandpa/voting_round/CMakeLists.txt
+++ b/test/core/consensus/grandpa/voting_round/CMakeLists.txt
@@ -8,9 +8,7 @@ addtest(voting_round_test
     )
 
 target_link_libraries(voting_round_test
-    voting_round
-    vote_graph
-    vote_tracker
+    consensus
     blob
     clock
     logger_for_tests
diff --git a/test/core/consensus/validation/CMakeLists.txt b/test/core/consensus/validation/CMakeLists.txt
index c03132c57d..b97b4949fe 100644
--- a/test/core/consensus/validation/CMakeLists.txt
+++ b/test/core/consensus/validation/CMakeLists.txt
@@ -7,7 +7,7 @@ addtest(block_validator_test
     block_validator_test.cpp
     )
 target_link_libraries(block_validator_test
-    block_validator
+    consensus
     p2p::p2p_peer_id
     testutil_primitives_generator
     sr25519_provider
diff --git a/test/core/network/CMakeLists.txt b/test/core/network/CMakeLists.txt
index b7a65b5920..2d130c3844 100644
--- a/test/core/network/CMakeLists.txt
+++ b/test/core/network/CMakeLists.txt
@@ -10,14 +10,14 @@ addtest(block_response_cache_test
     )
 target_link_libraries(block_response_cache_test
     p2p::p2p_peer_id
-    sync_protocol
+    network
     )
 
 addtest(stream_engine_test
     stream_engine_test.cpp
     )
 target_link_libraries(stream_engine_test
-    scale_message_read_writer
+    network
     p2p::p2p_peer_id
     scale::scale
     blob
@@ -29,7 +29,7 @@ addtest(rpc_libp2p_test
     rpc_libp2p_test.cpp
     )
 target_link_libraries(rpc_libp2p_test
-    scale_message_read_writer
+    network
     scale::scale
     outcome
     blob
@@ -43,22 +43,17 @@ addtest(state_protocol_observer_test
     state_protocol_observer_test.cpp
     )
 target_link_libraries(state_protocol_observer_test
-    in_memory_storage
     logger_for_tests
-    polkadot_trie
-    polkadot_trie_factory
-    state_protocol_observer
-    trie_serializer
-    trie_storage
-    trie_storage_backend
+    storage
+    network
     )
 
 addtest(sync_protocol_observer_test
     sync_protocol_observer_test.cpp
     )
 target_link_libraries(sync_protocol_observer_test
-    sync_protocol_observer
-    polkadot_trie
+    network
+    storage
     logger_for_tests
     )
 
@@ -66,11 +61,10 @@ addtest(synchronizer_test
     synchronizer_test.cpp
     )
 target_link_libraries(synchronizer_test
-    synchronizer
     logger_for_tests
-    sync_protocol
-    block_tree_error
-    polkadot_codec
+    network
+    blockchain
+    storage
     p2p::p2p_basic_scheduler
     p2p::p2p_message_read_writer
     p2p::p2p_peer_id
diff --git a/test/core/network/types/CMakeLists.txt b/test/core/network/types/CMakeLists.txt
index eea24f72aa..a3fee71826 100644
--- a/test/core/network/types/CMakeLists.txt
+++ b/test/core/network/types/CMakeLists.txt
@@ -7,7 +7,7 @@ addtest(uvar_adapter_test
     uvar_adapter_test.cpp
     )
 target_link_libraries(uvar_adapter_test
-    adapter_errors
+    network
     )
 
 addtest(message_read_writer_test
@@ -21,7 +21,7 @@ target_link_libraries(proto_block_response_test
     node_api_proto
     blob
     scale::scale
-    adapter_errors
+    network
     )
 
 addtest(proto_block_request_test
@@ -30,7 +30,7 @@ addtest(proto_block_request_test
 target_link_libraries(proto_block_request_test
     node_api_proto
     blob
-    adapter_errors
+    network
     p2p::p2p_uvarint
     )
 
@@ -38,7 +38,7 @@ addtest(proto_state_response_test
     protobuf_state_response_test.cpp
     )
 target_link_libraries(proto_state_response_test
-    adapter_errors
+    network
     blob
     node_api_proto
     )
@@ -49,7 +49,7 @@ addtest(proto_state_request_test
 target_link_libraries(proto_state_request_test
     node_api_proto
     blob
-    adapter_errors
+    network
     p2p::p2p_uvarint
     )
 
diff --git a/test/core/runtime/CMakeLists.txt b/test/core/runtime/CMakeLists.txt
index 15ff726a03..3a645354cd 100644
--- a/test/core/runtime/CMakeLists.txt
+++ b/test/core/runtime/CMakeLists.txt
@@ -23,10 +23,7 @@ addtest(trie_storage_provider_test
     )
 target_link_libraries(trie_storage_provider_test
     trie_storage_provider
-    in_memory_storage
-    trie_storage_backend
-    polkadot_trie_factory
-    trie_serializer
+    storage
     logger_for_tests
     )
 
@@ -55,7 +52,7 @@ addtest(runtime_upgrade_tracker_test
 target_link_libraries(runtime_upgrade_tracker_test
     runtime_upgrade_tracker
     blob
-    in_memory_storage
+    storage
     logger
     log_configurator
     scale::scale
diff --git a/test/core/runtime/binaryen/CMakeLists.txt b/test/core/runtime/binaryen/CMakeLists.txt
index 274eebb965..83dbf0e383 100644
--- a/test/core/runtime/binaryen/CMakeLists.txt
+++ b/test/core/runtime/binaryen/CMakeLists.txt
@@ -17,7 +17,7 @@ target_link_libraries(binaryen_runtime_test INTERFACE
     binaryen_wasm_memory_factory
     module_repository
     runtime_upgrade_tracker
-    in_memory_storage
+    storage
     )
 
 addtest(tagged_transaction_queue_test
@@ -61,7 +61,7 @@ addtest(grandpa_api_test
 target_link_libraries(grandpa_api_test
     binaryen_runtime_test
     grandpa_api
-    trie_storage_backend
+    storage
     basic_code_provider
     key_file_storage
     core_api
@@ -75,7 +75,7 @@ target_link_libraries(metadata_test
     binaryen_runtime_test
     metadata_api
     basic_code_provider
-    trie_storage
+    storage
     core_api
     logger_for_tests
     )
diff --git a/test/core/runtime/wavm/CMakeLists.txt b/test/core/runtime/wavm/CMakeLists.txt
index 3b7368395a..fc6b99d715 100644
--- a/test/core/runtime/wavm/CMakeLists.txt
+++ b/test/core/runtime/wavm/CMakeLists.txt
@@ -34,7 +34,7 @@ target_link_libraries(core_integration_test
     wavm_runtime_test
     core_api
     basic_code_provider
-    in_memory_storage
+    storage
     logger_for_tests
     )
 
@@ -45,10 +45,7 @@ target_link_libraries(wasm_executor_test
     runtime_wavm
     basic_code_provider
     core_api
-    trie_storage
-    trie_storage_backend
     trie_storage_provider
-    in_memory_storage
     host_api_factory
     crypto_store
     key_file_storage
@@ -58,8 +55,7 @@ target_link_libraries(wasm_executor_test
     pbkdf2_provider
     hasher
     primitives
-    polkadot_trie_factory
-    trie_serializer
+    storage
     logger_for_tests
     module_repository
     )
diff --git a/test/core/storage/changes_trie/CMakeLists.txt b/test/core/storage/changes_trie/CMakeLists.txt
index 930e46a186..3da9d8003e 100644
--- a/test/core/storage/changes_trie/CMakeLists.txt
+++ b/test/core/storage/changes_trie/CMakeLists.txt
@@ -5,13 +5,7 @@ addtest(changes_tracker_test
     changes_tracker_test.cpp
     )
 target_link_libraries(changes_tracker_test
-    changes_tracker
-    trie_storage
-    trie_serializer
-    polkadot_trie_factory
-    trie_storage_backend
-    in_memory_storage
-    polkadot_codec
+    storage
     logger_for_tests
     )
 
diff --git a/test/core/storage/rocksdb/CMakeLists.txt b/test/core/storage/rocksdb/CMakeLists.txt
index 46bdab7c65..1b035b78f4 100644
--- a/test/core/storage/rocksdb/CMakeLists.txt
+++ b/test/core/storage/rocksdb/CMakeLists.txt
@@ -3,7 +3,7 @@
 
 addtest(rocksdb_fs_test rocksdb_fs_test.cpp)
 target_link_libraries(rocksdb_fs_test
-    rocksdb_wrapper
+    storage
     base_fs_test
     )
 
@@ -11,7 +11,7 @@ addtest(rocksdb_integration_test
     rocksdb_integration_test.cpp
     )
 target_link_libraries(rocksdb_integration_test
-    rocksdb_wrapper
+    storage
     base_rocksdb_test
     Boost::filesystem
     hexutil
diff --git a/test/core/storage/trie/polkadot_trie/CMakeLists.txt b/test/core/storage/trie/polkadot_trie/CMakeLists.txt
index bbe93c2008..8b96589c49 100644
--- a/test/core/storage/trie/polkadot_trie/CMakeLists.txt
+++ b/test/core/storage/trie/polkadot_trie/CMakeLists.txt
@@ -6,10 +6,8 @@ addtest(polkadot_trie_test
     polkadot_trie_test.cpp
     )
 target_link_libraries(polkadot_trie_test
-    polkadot_trie_factory
+    storage
     Boost::boost
-    trie_serializer
-    trie_error
     log_configurator
     )
 
@@ -17,7 +15,6 @@ addtest(polkadot_trie_cursor_test
     polkadot_trie_cursor_test.cpp
     )
 target_link_libraries(polkadot_trie_cursor_test
-    polkadot_trie_cursor
-    polkadot_trie
+    storage
     log_configurator
     )
diff --git a/test/core/storage/trie/trie_storage/CMakeLists.txt b/test/core/storage/trie/trie_storage/CMakeLists.txt
index f31fcd7b6f..a218163625 100644
--- a/test/core/storage/trie/trie_storage/CMakeLists.txt
+++ b/test/core/storage/trie/trie_storage/CMakeLists.txt
@@ -11,16 +11,9 @@ addtest(polkadot_trie_storage_test
     ordered_trie_hash_test.cpp
     )
 target_link_libraries(polkadot_trie_storage_test
-    trie_storage
-    rocksdb_wrapper
-    ordered_trie_hash
-    polkadot_trie_factory
+    storage
     Boost::boost
     base_rocksdb_test
-    trie_storage_backend
-    trie_serializer
-    in_memory_storage
-    trie_error
     logger_for_tests
     )
 
@@ -28,7 +21,6 @@ addtest(trie_storage_backend_test
     trie_storage_backend_test.cpp
     )
 target_link_libraries(trie_storage_backend_test
-    trie_storage_backend
+    storage
     blob
-    in_memory_storage
     )
diff --git a/test/external-project-test/CMakeLists.txt b/test/external-project-test/CMakeLists.txt
index e9872bbc87..fbe2e39c4f 100644
--- a/test/external-project-test/CMakeLists.txt
+++ b/test/external-project-test/CMakeLists.txt
@@ -36,11 +36,9 @@ target_link_libraries(main
     kagome::executor
     kagome::runtime_wavm
     kagome::core_api
-    kagome::trie_storage
-    kagome::trie_storage_backend
+    kagome::storage
     kagome::trie_storage_provider
     kagome::log_configurator
-    kagome::rocksdb_wrapper
     kagome::host_api_factory
     kagome::chain_spec
     kagome::crypto_store
@@ -49,14 +47,12 @@ target_link_libraries(main
     kagome::ed25519_provider
     kagome::pbkdf2_provider
     kagome::hasher
-    kagome::polkadot_trie_factory
-    kagome::trie_serializer
+    kagome::storage
     kagome::module_repository
-    kagome::changes_tracker
     kagome::storage_code_provider
     kagome::offchain_persistent_storage
     kagome::offchain_worker_pool
-    kagome::block_header_repository
+    kagome::blockchain
     kagome::runtime_upgrade_tracker
     kagome::runtime_properties_cache
     )
diff --git a/test/testutil/storage/CMakeLists.txt b/test/testutil/storage/CMakeLists.txt
index 1620a90339..eca5046969 100644
--- a/test/testutil/storage/CMakeLists.txt
+++ b/test/testutil/storage/CMakeLists.txt
@@ -19,7 +19,7 @@ target_link_libraries(base_rocksdb_test
     base_fs_test
     Boost::filesystem
     Boost::boost
-    rocksdb_wrapper
+    storage
     logger_for_tests
     )