diff --git a/cmake/copyright.cmake b/cmake/copyright.cmake
index ad20885db2..2f9c8f9c82 100644
--- a/cmake/copyright.cmake
+++ b/cmake/copyright.cmake
@@ -62,7 +62,7 @@ list(FILTER SRC EXCLUDE REGEX [[silkworm/core/crypto/kzg\.cpp$]])
 list(FILTER SRC EXCLUDE REGEX [[silkworm/infra/concurrency/thread_pool\.hpp$]])
 list(FILTER SRC EXCLUDE REGEX [[silkworm/interfaces/]])
 list(FILTER SRC EXCLUDE REGEX [[silkworm/node/common/preverified_hashes_[a-z]+\.cpp$]])
-list(FILTER SRC EXCLUDE REGEX [[silkworm/snapshots/config/[a-z_]+\.hpp$]])
+list(FILTER SRC EXCLUDE REGEX [[silkworm/db/snapshots/config/[a-z_]+\.hpp$]])
 
 foreach(F IN LISTS SRC)
   check("${F}")
diff --git a/cmd/capi/execute.cpp b/cmd/capi/execute.cpp
index 30502e1147..927256ae91 100644
--- a/cmd/capi/execute.cpp
+++ b/cmd/capi/execute.cpp
@@ -31,12 +31,12 @@
 #pragma GCC diagnostic pop
 
 #include <silkworm/capi/silkworm.h>
+#include <silkworm/db/access_layer.hpp>
+#include <silkworm/db/mdbx.hpp>
+#include <silkworm/db/snapshots/repository.hpp>
 #include <silkworm/infra/common/directories.hpp>
 #include <silkworm/infra/common/log.hpp>
-#include <silkworm/node/db/access_layer.hpp>
-#include <silkworm/node/db/mdbx.hpp>
 #include <silkworm/rpc/daemon.hpp>
-#include <silkworm/snapshots/repository.hpp>
 
 #include "../common/common.hpp"
 
diff --git a/cmd/common/db_checklist.cpp b/cmd/common/db_checklist.cpp
index 623fd712ff..8e523a0e5e 100644
--- a/cmd/common/db_checklist.cpp
+++ b/cmd/common/db_checklist.cpp
@@ -19,10 +19,10 @@
 #include <regex>
 
 #include <silkworm/core/chain/genesis.hpp>
+#include <silkworm/db/access_layer.hpp>
+#include <silkworm/db/genesis.hpp>
+#include <silkworm/db/stages.hpp>
 #include <silkworm/infra/common/log.hpp>
-#include <silkworm/node/db/access_layer.hpp>
-#include <silkworm/node/db/genesis.hpp>
-#include <silkworm/node/db/stages.hpp>
 
 namespace silkworm::cmd::common {
 
diff --git a/cmd/common/db_max_readers_option.cpp b/cmd/common/db_max_readers_option.cpp
index c4885e4839..cee0b50273 100644
--- a/cmd/common/db_max_readers_option.cpp
+++ b/cmd/common/db_max_readers_option.cpp
@@ -16,7 +16,7 @@
 
 #include "db_max_readers_option.hpp"
 
-#include <silkworm/node/db/mdbx.hpp>
+#include <silkworm/db/mdbx.hpp>
 
 namespace silkworm::cmd::common {
 
diff --git a/cmd/common/settings.hpp b/cmd/common/settings.hpp
index 7dadd99288..9798c4e9c2 100644
--- a/cmd/common/settings.hpp
+++ b/cmd/common/settings.hpp
@@ -16,11 +16,11 @@
 
 #pragma once
 
+#include <silkworm/db/snapshots/settings.hpp>
 #include <silkworm/infra/common/log.hpp>
 #include <silkworm/node/settings.hpp>
 #include <silkworm/rpc/settings.hpp>
 #include <silkworm/sentry/settings.hpp>
-#include <silkworm/snapshots/settings.hpp>
 
 namespace silkworm::cmd::common {
 
diff --git a/cmd/common/snapshot_options.hpp b/cmd/common/snapshot_options.hpp
index 9671b53deb..5498047c02 100644
--- a/cmd/common/snapshot_options.hpp
+++ b/cmd/common/snapshot_options.hpp
@@ -18,7 +18,7 @@
 
 #include <CLI/CLI.hpp>
 
-#include <silkworm/snapshots/settings.hpp>
+#include <silkworm/db/snapshots/settings.hpp>
 
 namespace silkworm::cmd::common {
 
diff --git a/cmd/dev/backend_kv_server.cpp b/cmd/dev/backend_kv_server.cpp
index f882efad02..c0de50b833 100644
--- a/cmd/dev/backend_kv_server.cpp
+++ b/cmd/dev/backend_kv_server.cpp
@@ -31,15 +31,15 @@
 #include <silkworm/buildinfo.h>
 #include <silkworm/core/types/address.hpp>
 #include <silkworm/core/types/evmc_bytes32.hpp>
+#include <silkworm/db/access_layer.hpp>
+#include <silkworm/db/head_info.hpp>
+#include <silkworm/db/mdbx.hpp>
 #include <silkworm/infra/common/directories.hpp>
 #include <silkworm/infra/common/log.hpp>
 #include <silkworm/infra/concurrency/awaitable_wait_for_one.hpp>
 #include <silkworm/infra/grpc/client/client_context_pool.hpp>
 #include <silkworm/node/backend/ethereum_backend.hpp>
 #include <silkworm/node/backend/remote/backend_kv_server.hpp>
-#include <silkworm/node/db/access_layer.hpp>
-#include <silkworm/node/db/head_info.hpp>
-#include <silkworm/node/db/mdbx.hpp>
 #include <silkworm/sentry/eth/status_data_provider.hpp>
 #include <silkworm/sentry/grpc/client/sentry_client.hpp>
 #include <silkworm/sentry/multi_sentry_client.hpp>
diff --git a/cmd/dev/check_blockhashes.cpp b/cmd/dev/check_blockhashes.cpp
index 8c3f82c014..8a58c36934 100644
--- a/cmd/dev/check_blockhashes.cpp
+++ b/cmd/dev/check_blockhashes.cpp
@@ -19,10 +19,10 @@
 #include <CLI/CLI.hpp>
 
 #include <silkworm/core/common/endian.hpp>
+#include <silkworm/db/tables.hpp>
 #include <silkworm/infra/common/directories.hpp>
 #include <silkworm/infra/common/log.hpp>
 #include <silkworm/infra/common/stopwatch.hpp>
-#include <silkworm/node/db/tables.hpp>
 
 using namespace silkworm;
 
diff --git a/cmd/dev/check_changes.cpp b/cmd/dev/check_changes.cpp
index d35fef51ab..ca247ac8ff 100644
--- a/cmd/dev/check_changes.cpp
+++ b/cmd/dev/check_changes.cpp
@@ -23,12 +23,12 @@
 #include <silkworm/core/execution/processor.hpp>
 #include <silkworm/core/types/address.hpp>
 #include <silkworm/core/types/evmc_bytes32.hpp>
+#include <silkworm/db/access_layer.hpp>
+#include <silkworm/db/buffer.hpp>
+#include <silkworm/db/snapshots/repository.hpp>
 #include <silkworm/infra/common/directories.hpp>
 #include <silkworm/infra/common/log.hpp>
 #include <silkworm/infra/concurrency/signal_handler.hpp>
-#include <silkworm/node/db/access_layer.hpp>
-#include <silkworm/node/db/buffer.hpp>
-#include <silkworm/snapshots/repository.hpp>
 
 using namespace evmc::literals;
 using namespace silkworm;
diff --git a/cmd/dev/check_hashstate.cpp b/cmd/dev/check_hashstate.cpp
index 47d7bdd1bc..8a4343b406 100644
--- a/cmd/dev/check_hashstate.cpp
+++ b/cmd/dev/check_hashstate.cpp
@@ -18,10 +18,10 @@
 
 #include <CLI/CLI.hpp>
 
+#include <silkworm/db/tables.hpp>
+#include <silkworm/db/util.hpp>
 #include <silkworm/infra/common/directories.hpp>
 #include <silkworm/infra/common/log.hpp>
-#include <silkworm/node/db/tables.hpp>
-#include <silkworm/node/db/util.hpp>
 
 using namespace silkworm;
 
diff --git a/cmd/dev/check_log_indices.cpp b/cmd/dev/check_log_indices.cpp
index 5a9712fbde..abdeb15fd7 100644
--- a/cmd/dev/check_log_indices.cpp
+++ b/cmd/dev/check_log_indices.cpp
@@ -29,15 +29,15 @@
 #include <silkworm/core/common/bytes_to_string.hpp>
 #include <silkworm/core/types/address.hpp>
 #include <silkworm/core/types/evmc_bytes32.hpp>
+#include <silkworm/db/bitmap.hpp>
+#include <silkworm/db/log_cbor.hpp>
+#include <silkworm/db/mdbx.hpp>
+#include <silkworm/db/tables.hpp>
+#include <silkworm/db/util.hpp>
 #include <silkworm/infra/common/directories.hpp>
 #include <silkworm/infra/common/ensure.hpp>
 #include <silkworm/infra/common/log.hpp>
 #include <silkworm/infra/concurrency/signal_handler.hpp>
-#include <silkworm/node/db/bitmap.hpp>
-#include <silkworm/node/db/log_cbor.hpp>
-#include <silkworm/node/db/mdbx.hpp>
-#include <silkworm/node/db/tables.hpp>
-#include <silkworm/node/db/util.hpp>
 
 #include "../common/common.hpp"
 
diff --git a/cmd/dev/check_pow.cpp b/cmd/dev/check_pow.cpp
index f12aaf94f0..0c098bf1d5 100644
--- a/cmd/dev/check_pow.cpp
+++ b/cmd/dev/check_pow.cpp
@@ -24,12 +24,12 @@
 #include <silkworm/core/chain/config.hpp>
 #include <silkworm/core/common/endian.hpp>
 #include <silkworm/core/types/evmc_bytes32.hpp>
+#include <silkworm/db/access_layer.hpp>
+#include <silkworm/db/stages.hpp>
 #include <silkworm/infra/common/directories.hpp>
 #include <silkworm/infra/common/log.hpp>
 #include <silkworm/infra/common/stopwatch.hpp>
 #include <silkworm/infra/concurrency/signal_handler.hpp>
-#include <silkworm/node/db/access_layer.hpp>
-#include <silkworm/node/db/stages.hpp>
 
 namespace fs = std::filesystem;
 using namespace silkworm;
diff --git a/cmd/dev/check_senders.cpp b/cmd/dev/check_senders.cpp
index 4019ec56a9..d09c792e52 100644
--- a/cmd/dev/check_senders.cpp
+++ b/cmd/dev/check_senders.cpp
@@ -25,11 +25,11 @@
 #include <silkworm/core/types/address.hpp>
 #include <silkworm/core/types/block_body_for_storage.hpp>
 #include <silkworm/core/types/evmc_bytes32.hpp>
+#include <silkworm/db/stages.hpp>
 #include <silkworm/infra/common/decoding_exception.hpp>
 #include <silkworm/infra/common/directories.hpp>
 #include <silkworm/infra/common/log.hpp>
 #include <silkworm/infra/concurrency/signal_handler.hpp>
-#include <silkworm/node/db/stages.hpp>
 
 #include "../common/common.hpp"
 
diff --git a/cmd/dev/check_tx_lookup.cpp b/cmd/dev/check_tx_lookup.cpp
index cbae58ae3b..f653968133 100644
--- a/cmd/dev/check_tx_lookup.cpp
+++ b/cmd/dev/check_tx_lookup.cpp
@@ -19,12 +19,12 @@
 #include <silkworm/core/common/endian.hpp>
 #include <silkworm/core/common/util.hpp>
 #include <silkworm/core/types/block_body_for_storage.hpp>
+#include <silkworm/db/etl/collector.hpp>
+#include <silkworm/db/stages.hpp>
 #include <silkworm/infra/common/decoding_exception.hpp>
 #include <silkworm/infra/common/directories.hpp>
 #include <silkworm/infra/common/log.hpp>
 #include <silkworm/infra/concurrency/signal_handler.hpp>
-#include <silkworm/node/db/etl/collector.hpp>
-#include <silkworm/node/db/stages.hpp>
 
 using namespace silkworm;
 
diff --git a/cmd/dev/db_toolbox.cpp b/cmd/dev/db_toolbox.cpp
index c6a22a2d0f..01ea7e8ad6 100644
--- a/cmd/dev/db_toolbox.cpp
+++ b/cmd/dev/db_toolbox.cpp
@@ -41,16 +41,16 @@
 #include <silkworm/core/types/address.hpp>
 #include <silkworm/core/types/block_body_for_storage.hpp>
 #include <silkworm/core/types/evmc_bytes32.hpp>
+#include <silkworm/db/genesis.hpp>
+#include <silkworm/db/mdbx.hpp>
+#include <silkworm/db/prune_mode.hpp>
+#include <silkworm/db/stages.hpp>
 #include <silkworm/infra/common/decoding_exception.hpp>
 #include <silkworm/infra/common/directories.hpp>
 #include <silkworm/infra/common/ensure.hpp>
 #include <silkworm/infra/common/log.hpp>
 #include <silkworm/infra/common/stopwatch.hpp>
 #include <silkworm/infra/concurrency/signal_handler.hpp>
-#include <silkworm/node/db/genesis.hpp>
-#include <silkworm/node/db/mdbx.hpp>
-#include <silkworm/node/db/prune_mode.hpp>
-#include <silkworm/node/db/stages.hpp>
 #include <silkworm/node/stagedsync/execution_pipeline.hpp>
 #include <silkworm/node/stagedsync/stages/stage_interhashes/trie_cursor.hpp>
 
diff --git a/cmd/dev/embed_toml.cpp b/cmd/dev/embed_toml.cpp
index 59c318aa5a..58a61339e4 100644
--- a/cmd/dev/embed_toml.cpp
+++ b/cmd/dev/embed_toml.cpp
@@ -85,7 +85,7 @@ int main(int argc, char* argv[]) {
             output << "#pragma once\n\n";
             output << "#include <array>\n";
             output << "#include <string_view>\n\n";
-            output << "#include <silkworm/snapshots/entry.hpp>\n\n";
+            output << "#include <silkworm/db/snapshots/entry.hpp>\n\n";
             output << "namespace silkworm::snapshots {\n\n";
             output << "inline constexpr std::array k" << snapshot_name << "Snapshots{\n";
             for (auto&& [key, value] : table) {
diff --git a/cmd/dev/scan_txs.cpp b/cmd/dev/scan_txs.cpp
index 43c854f1c4..55833b7f3e 100644
--- a/cmd/dev/scan_txs.cpp
+++ b/cmd/dev/scan_txs.cpp
@@ -21,9 +21,9 @@
 
 #include <silkworm/core/execution/execution.hpp>
 #include <silkworm/core/protocol/rule_set.hpp>
+#include <silkworm/db/access_layer.hpp>
+#include <silkworm/db/buffer.hpp>
 #include <silkworm/infra/common/directories.hpp>
-#include <silkworm/node/db/access_layer.hpp>
-#include <silkworm/node/db/buffer.hpp>
 
 int main(int argc, char* argv[]) {
     CLI::App app{"Executes Ethereum blocks and scans txs for errored txs"};
diff --git a/cmd/dev/snapshots.cpp b/cmd/dev/snapshots.cpp
index 7c4669e5f6..d631a6e1b7 100644
--- a/cmd/dev/snapshots.cpp
+++ b/cmd/dev/snapshots.cpp
@@ -31,14 +31,14 @@
 #include <silkworm/core/types/address.hpp>
 #include <silkworm/core/types/block_body_for_storage.hpp>
 #include <silkworm/core/types/evmc_bytes32.hpp>
+#include <silkworm/db/snapshot_sync.hpp>
+#include <silkworm/db/snapshots/bittorrent/client.hpp>
+#include <silkworm/db/snapshots/index.hpp>
+#include <silkworm/db/snapshots/repository.hpp>
+#include <silkworm/db/snapshots/seg/seg_zip.hpp>
+#include <silkworm/db/snapshots/snapshot.hpp>
 #include <silkworm/infra/common/ensure.hpp>
 #include <silkworm/infra/common/log.hpp>
-#include <silkworm/node/snapshot_sync.hpp>
-#include <silkworm/snapshots/bittorrent/client.hpp>
-#include <silkworm/snapshots/index.hpp>
-#include <silkworm/snapshots/repository.hpp>
-#include <silkworm/snapshots/seg/seg_zip.hpp>
-#include <silkworm/snapshots/snapshot.hpp>
 
 #include "../common/common.hpp"
 #include "../common/shutdown_signal.hpp"
diff --git a/cmd/silkworm.cpp b/cmd/silkworm.cpp
index 4b9cd924cc..36a10b3299 100644
--- a/cmd/silkworm.cpp
+++ b/cmd/silkworm.cpp
@@ -29,11 +29,11 @@
 #include <boost/asio/use_future.hpp>
 
 #include <silkworm/buildinfo.h>
+#include <silkworm/db/head_info.hpp>
 #include <silkworm/infra/common/log.hpp>
 #include <silkworm/infra/concurrency/awaitable_wait_for_all.hpp>
 #include <silkworm/infra/concurrency/awaitable_wait_for_one.hpp>
 #include <silkworm/infra/grpc/client/client_context_pool.hpp>
-#include <silkworm/node/db/head_info.hpp>
 #include <silkworm/node/node.hpp>
 #include <silkworm/sentry/eth/status_data_provider.hpp>
 #include <silkworm/sentry/sentry_client_factory.hpp>
diff --git a/cmd/test/backend_kv_test.cpp b/cmd/test/backend_kv_test.cpp
index f096982d79..4dfc4d99a6 100644
--- a/cmd/test/backend_kv_test.cpp
+++ b/cmd/test/backend_kv_test.cpp
@@ -33,12 +33,12 @@
 #include <silkworm/core/common/assert.hpp>
 #include <silkworm/core/common/util.hpp>
 #include <silkworm/core/types/address.hpp>
+#include <silkworm/db/tables.hpp>
 #include <silkworm/infra/common/log.hpp>
 #include <silkworm/infra/grpc/common/conversion.hpp>
 #include <silkworm/infra/grpc/common/util.hpp>
 #include <silkworm/interfaces/remote/ethbackend.grpc.pb.h>
 #include <silkworm/interfaces/remote/kv.grpc.pb.h>
-#include <silkworm/node/db/tables.hpp>
 
 #include "../common/shutdown_signal.hpp"
 
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
index 61807c0f0b..bf00647328 100644
--- a/docs/CONTRIBUTING.md
+++ b/docs/CONTRIBUTING.md
@@ -77,7 +77,7 @@ If you need to update the list of builtin snapshots in Silkworm, the following p
 * update `erigon-snapshot` submodule to the new commit
 * generate the embedded C++ code bindings for predefined snapshots by executing from project home folder:
 ```
-<build_folder>/cmd/dev/embed_toml -i third_party/erigon-snapshot -o silkworm/snapshots/config
+<build_folder>/cmd/dev/embed_toml -i third_party/erigon-snapshot -o silkworm/db/snapshots/config
 ```
 
 
diff --git a/silkworm/CMakeLists.txt b/silkworm/CMakeLists.txt
index 7eb517c421..a107e23f65 100644
--- a/silkworm/CMakeLists.txt
+++ b/silkworm/CMakeLists.txt
@@ -20,11 +20,11 @@ add_subdirectory(core)
 if(NOT SILKWORM_CORE_ONLY)
   add_subdirectory(interfaces)
   add_subdirectory(infra)
+  add_subdirectory(db)
+  add_subdirectory(rpc)
   add_subdirectory(sentry)
-  add_subdirectory(snapshots)
   add_subdirectory(sync)
   add_subdirectory(node)
-  add_subdirectory(rpc)
   add_subdirectory(capi)
 endif()
 
diff --git a/silkworm/capi/instance.hpp b/silkworm/capi/instance.hpp
index b028842123..cee1920d73 100644
--- a/silkworm/capi/instance.hpp
+++ b/silkworm/capi/instance.hpp
@@ -22,9 +22,9 @@
 
 #include <boost/asio/cancellation_signal.hpp>
 
+#include <silkworm/db/snapshots/repository.hpp>
 #include <silkworm/infra/concurrency/context_pool_settings.hpp>
 #include <silkworm/rpc/daemon.hpp>
-#include <silkworm/snapshots/repository.hpp>
 
 struct SilkwormInstance {
     silkworm::concurrency::ContextPoolSettings context_pool_settings;
diff --git a/silkworm/capi/silkworm.cpp b/silkworm/capi/silkworm.cpp
index 45d405b915..8f9f0bc255 100644
--- a/silkworm/capi/silkworm.cpp
+++ b/silkworm/capi/silkworm.cpp
@@ -31,16 +31,16 @@
 #include <silkworm/core/chain/config.hpp>
 #include <silkworm/core/execution/call_tracer.hpp>
 #include <silkworm/core/execution/execution.hpp>
+#include <silkworm/db/access_layer.hpp>
+#include <silkworm/db/buffer.hpp>
+#include <silkworm/db/snapshots/index.hpp>
+#include <silkworm/db/stages.hpp>
 #include <silkworm/infra/common/bounded_buffer.hpp>
 #include <silkworm/infra/common/directories.hpp>
 #include <silkworm/infra/common/log.hpp>
 #include <silkworm/infra/common/stopwatch.hpp>
 #include <silkworm/infra/concurrency/signal_handler.hpp>
 #include <silkworm/infra/concurrency/thread_pool.hpp>
-#include <silkworm/node/db/access_layer.hpp>
-#include <silkworm/node/db/buffer.hpp>
-#include <silkworm/node/db/stages.hpp>
-#include <silkworm/snapshots/index.hpp>
 
 #include "instance.hpp"
 
diff --git a/silkworm/capi/silkworm_test.cpp b/silkworm/capi/silkworm_test.cpp
index a92b79a742..e1cb45c1c9 100644
--- a/silkworm/capi/silkworm_test.cpp
+++ b/silkworm/capi/silkworm_test.cpp
@@ -22,12 +22,12 @@
 #include <catch2/catch.hpp>
 
 #include <silkworm/core/trie/vector_root.hpp>
+#include <silkworm/db/mdbx.hpp>
+#include <silkworm/db/snapshots/index.hpp>
+#include <silkworm/db/snapshots/snapshot.hpp>
+#include <silkworm/db/snapshots/test_util/common.hpp>
 #include <silkworm/infra/test_util/log.hpp>
-#include <silkworm/node/db/mdbx.hpp>
 #include <silkworm/rpc/test/api_test_database.hpp>
-#include <silkworm/snapshots/index.hpp>
-#include <silkworm/snapshots/snapshot.hpp>
-#include <silkworm/snapshots/test_util/common.hpp>
 
 namespace silkworm {
 
diff --git a/silkworm/node/db/CMakeLists.txt b/silkworm/db/CMakeLists.txt
similarity index 89%
rename from silkworm/node/db/CMakeLists.txt
rename to silkworm/db/CMakeLists.txt
index ecb5479537..a56119fcd9 100644
--- a/silkworm/node/db/CMakeLists.txt
+++ b/silkworm/db/CMakeLists.txt
@@ -17,8 +17,10 @@
 include("${SILKWORM_MAIN_DIR}/cmake/common/targets.cmake")
 
 add_subdirectory(etl)
+add_subdirectory(snapshots)
 
 find_package(absl REQUIRED)
+find_package(magic_enum REQUIRED)
 find_package(Microsoft.GSL REQUIRED)
 find_package(nlohmann_json REQUIRED)
 find_package(roaring REQUIRED)
@@ -36,8 +38,10 @@ set(LIBS_PUBLIC
 # cmake-format: off
 set(LIBS_PRIVATE
     cborcpp
+    magic_enum::magic_enum
     Microsoft.GSL::GSL
     nlohmann_json::nlohmann_json
+    silkworm_db_etl
     silkworm_infra
     silkworm_snapshots
 )
@@ -47,5 +51,5 @@ silkworm_library(
   silkworm_db
   PUBLIC ${LIBS_PUBLIC}
   PRIVATE ${LIBS_PRIVATE}
-  EXCLUDE_REGEX "node/db/etl"
+  EXCLUDE_REGEX "db/etl" "db/snapshots"
 )
diff --git a/silkworm/node/db/access_layer.cpp b/silkworm/db/access_layer.cpp
similarity index 99%
rename from silkworm/node/db/access_layer.cpp
rename to silkworm/db/access_layer.cpp
index 0873079937..b9954a0209 100644
--- a/silkworm/node/db/access_layer.cpp
+++ b/silkworm/db/access_layer.cpp
@@ -24,12 +24,12 @@
 #include <silkworm/core/common/endian.hpp>
 #include <silkworm/core/types/block_body_for_storage.hpp>
 #include <silkworm/core/types/evmc_bytes32.hpp>
+#include <silkworm/db/bitmap.hpp>
+#include <silkworm/db/receipt_cbor.hpp>
+#include <silkworm/db/snapshots/repository.hpp>
+#include <silkworm/db/tables.hpp>
 #include <silkworm/infra/common/decoding_exception.hpp>
 #include <silkworm/infra/common/ensure.hpp>
-#include <silkworm/node/db/bitmap.hpp>
-#include <silkworm/node/db/receipt_cbor.hpp>
-#include <silkworm/node/db/tables.hpp>
-#include <silkworm/snapshots/repository.hpp>
 
 namespace silkworm::db {
 
diff --git a/silkworm/node/db/access_layer.hpp b/silkworm/db/access_layer.hpp
similarity index 99%
rename from silkworm/node/db/access_layer.hpp
rename to silkworm/db/access_layer.hpp
index 80aa48b059..8be4c6261f 100644
--- a/silkworm/node/db/access_layer.hpp
+++ b/silkworm/db/access_layer.hpp
@@ -32,8 +32,8 @@
 #include <silkworm/core/types/block.hpp>
 #include <silkworm/core/types/hash.hpp>
 #include <silkworm/core/types/receipt.hpp>
-#include <silkworm/node/db/mdbx.hpp>
-#include <silkworm/node/db/util.hpp>
+#include <silkworm/db/mdbx.hpp>
+#include <silkworm/db/util.hpp>
 
 namespace silkworm::snapshots {
 class SnapshotRepository;
diff --git a/silkworm/node/db/access_layer_test.cpp b/silkworm/db/access_layer_test.cpp
similarity index 99%
rename from silkworm/node/db/access_layer_test.cpp
rename to silkworm/db/access_layer_test.cpp
index 9680aed380..735e631f7a 100644
--- a/silkworm/node/db/access_layer_test.cpp
+++ b/silkworm/db/access_layer_test.cpp
@@ -25,13 +25,13 @@
 #include <silkworm/core/common/test_util.hpp>
 #include <silkworm/core/execution/execution.hpp>
 #include <silkworm/core/protocol/param.hpp>
+#include <silkworm/db/bitmap.hpp>
+#include <silkworm/db/buffer.hpp>
+#include <silkworm/db/prune_mode.hpp>
+#include <silkworm/db/stages.hpp>
+#include <silkworm/db/tables.hpp>
+#include <silkworm/db/test_util/temp_chain_data.hpp>
 #include <silkworm/infra/test_util/log.hpp>
-#include <silkworm/node/db/bitmap.hpp>
-#include <silkworm/node/db/buffer.hpp>
-#include <silkworm/node/db/prune_mode.hpp>
-#include <silkworm/node/db/stages.hpp>
-#include <silkworm/node/db/tables.hpp>
-#include <silkworm/node/db/test_util/temp_chain_data.hpp>
 
 namespace silkworm {
 
diff --git a/silkworm/node/db/bitmap.cpp b/silkworm/db/bitmap.cpp
similarity index 99%
rename from silkworm/node/db/bitmap.cpp
rename to silkworm/db/bitmap.cpp
index cb4296dd44..cd13bb66f7 100644
--- a/silkworm/node/db/bitmap.cpp
+++ b/silkworm/db/bitmap.cpp
@@ -19,11 +19,11 @@
 #include <stdexcept>
 
 #include <silkworm/core/common/bytes_to_string.hpp>
+#include <silkworm/db/etl_mdbx_collector.hpp>
+#include <silkworm/db/util.hpp>
 #include <silkworm/infra/common/binary_search.hpp>
 #include <silkworm/infra/common/ensure.hpp>
 #include <silkworm/infra/concurrency/signal_handler.hpp>
-#include <silkworm/node/db/etl_mdbx_collector.hpp>
-#include <silkworm/node/db/util.hpp>
 
 namespace silkworm::db::bitmap {
 
diff --git a/silkworm/node/db/bitmap.hpp b/silkworm/db/bitmap.hpp
similarity index 99%
rename from silkworm/node/db/bitmap.hpp
rename to silkworm/db/bitmap.hpp
index f69a50feb5..908e85b3bb 100644
--- a/silkworm/node/db/bitmap.hpp
+++ b/silkworm/db/bitmap.hpp
@@ -37,7 +37,7 @@
 
 #include <silkworm/core/common/base.hpp>
 #include <silkworm/core/common/bytes.hpp>
-#include <silkworm/node/db/mdbx.hpp>
+#include <silkworm/db/mdbx.hpp>
 
 namespace silkworm::db::etl {
 class Collector;
diff --git a/silkworm/node/db/bitmap_test.cpp b/silkworm/db/bitmap_test.cpp
similarity index 98%
rename from silkworm/node/db/bitmap_test.cpp
rename to silkworm/db/bitmap_test.cpp
index a266ec66e1..7b56d158f9 100644
--- a/silkworm/node/db/bitmap_test.cpp
+++ b/silkworm/db/bitmap_test.cpp
@@ -22,8 +22,8 @@
 #include <absl/container/btree_map.h>
 #include <catch2/catch.hpp>
 
-#include <silkworm/node/db/etl_mdbx_collector.hpp>
-#include <silkworm/node/db/test_util/temp_chain_data.hpp>
+#include <silkworm/db/etl_mdbx_collector.hpp>
+#include <silkworm/db/test_util/temp_chain_data.hpp>
 
 namespace silkworm::db::bitmap {
 
diff --git a/silkworm/node/db/buffer.cpp b/silkworm/db/buffer.cpp
similarity index 99%
rename from silkworm/node/db/buffer.cpp
rename to silkworm/db/buffer.cpp
index 60757ee133..709f4ec927 100644
--- a/silkworm/node/db/buffer.cpp
+++ b/silkworm/db/buffer.cpp
@@ -22,12 +22,12 @@
 #include <absl/container/btree_set.h>
 
 #include <silkworm/core/common/endian.hpp>
+#include <silkworm/db/access_layer.hpp>
+#include <silkworm/db/log_cbor.hpp>
+#include <silkworm/db/receipt_cbor.hpp>
+#include <silkworm/db/tables.hpp>
 #include <silkworm/infra/common/log.hpp>
 #include <silkworm/infra/common/stopwatch.hpp>
-#include <silkworm/node/db/access_layer.hpp>
-#include <silkworm/node/db/log_cbor.hpp>
-#include <silkworm/node/db/receipt_cbor.hpp>
-#include <silkworm/node/db/tables.hpp>
 
 namespace silkworm::db {
 
diff --git a/silkworm/node/db/buffer.hpp b/silkworm/db/buffer.hpp
similarity index 98%
rename from silkworm/node/db/buffer.hpp
rename to silkworm/db/buffer.hpp
index e51d914f81..bf3ed96a7f 100644
--- a/silkworm/node/db/buffer.hpp
+++ b/silkworm/db/buffer.hpp
@@ -29,9 +29,9 @@
 #include <silkworm/core/types/account.hpp>
 #include <silkworm/core/types/block.hpp>
 #include <silkworm/core/types/receipt.hpp>
-#include <silkworm/node/db/access_layer.hpp>
-#include <silkworm/node/db/mdbx.hpp>
-#include <silkworm/node/db/util.hpp>
+#include <silkworm/db/access_layer.hpp>
+#include <silkworm/db/mdbx.hpp>
+#include <silkworm/db/util.hpp>
 
 namespace silkworm::db {
 
diff --git a/silkworm/node/db/buffer_test.cpp b/silkworm/db/buffer_test.cpp
similarity index 98%
rename from silkworm/node/db/buffer_test.cpp
rename to silkworm/db/buffer_test.cpp
index 57ef65c66b..b455520cb6 100644
--- a/silkworm/node/db/buffer_test.cpp
+++ b/silkworm/db/buffer_test.cpp
@@ -21,10 +21,10 @@
 #include <silkworm/core/common/endian.hpp>
 #include <silkworm/core/types/address.hpp>
 #include <silkworm/core/types/evmc_bytes32.hpp>
+#include <silkworm/db/buffer.hpp>
+#include <silkworm/db/tables.hpp>
+#include <silkworm/db/test_util/temp_chain_data.hpp>
 #include <silkworm/infra/test_util/log.hpp>
-#include <silkworm/node/db/buffer.hpp>
-#include <silkworm/node/db/tables.hpp>
-#include <silkworm/node/db/test_util/temp_chain_data.hpp>
 
 namespace silkworm::db {
 
diff --git a/silkworm/node/db/db_utils.cpp b/silkworm/db/db_utils.cpp
similarity index 96%
rename from silkworm/node/db/db_utils.cpp
rename to silkworm/db/db_utils.cpp
index 29d9168e09..95286e6db8 100644
--- a/silkworm/node/db/db_utils.cpp
+++ b/silkworm/db/db_utils.cpp
@@ -16,9 +16,9 @@
 
 #include "db_utils.hpp"
 
+#include <silkworm/db/tables.hpp>
+#include <silkworm/db/util.hpp>
 #include <silkworm/infra/common/decoding_exception.hpp>
-#include <silkworm/node/db/tables.hpp>
-#include <silkworm/node/db/util.hpp>
 
 namespace silkworm {
 
diff --git a/silkworm/node/db/db_utils.hpp b/silkworm/db/db_utils.hpp
similarity index 93%
rename from silkworm/node/db/db_utils.hpp
rename to silkworm/db/db_utils.hpp
index 9f226abad0..5af1ab4a85 100644
--- a/silkworm/node/db/db_utils.hpp
+++ b/silkworm/db/db_utils.hpp
@@ -22,8 +22,8 @@
 #include <silkworm/core/common/base.hpp>
 #include <silkworm/core/types/block.hpp>
 #include <silkworm/core/types/hash.hpp>
-#include <silkworm/node/db/access_layer.hpp>
-#include <silkworm/node/db/mdbx.hpp>
+#include <silkworm/db/access_layer.hpp>
+#include <silkworm/db/mdbx.hpp>
 
 namespace silkworm {
 
diff --git a/silkworm/node/db/db_utils_test.cpp b/silkworm/db/db_utils_test.cpp
similarity index 97%
rename from silkworm/node/db/db_utils_test.cpp
rename to silkworm/db/db_utils_test.cpp
index 729c7e351b..51e511175f 100644
--- a/silkworm/node/db/db_utils_test.cpp
+++ b/silkworm/db/db_utils_test.cpp
@@ -18,10 +18,10 @@
 
 #include <catch2/catch.hpp>
 
+#include <silkworm/db/access_layer.hpp>
+#include <silkworm/db/stages.hpp>
+#include <silkworm/db/tables.hpp>
 #include <silkworm/infra/common/directories.hpp>
-#include <silkworm/node/db/access_layer.hpp>
-#include <silkworm/node/db/stages.hpp>
-#include <silkworm/node/db/tables.hpp>
 
 namespace silkworm::db {
 
diff --git a/silkworm/node/db/etl/CMakeLists.txt b/silkworm/db/etl/CMakeLists.txt
similarity index 100%
rename from silkworm/node/db/etl/CMakeLists.txt
rename to silkworm/db/etl/CMakeLists.txt
diff --git a/silkworm/node/db/etl/buffer.hpp b/silkworm/db/etl/buffer.hpp
similarity index 100%
rename from silkworm/node/db/etl/buffer.hpp
rename to silkworm/db/etl/buffer.hpp
diff --git a/silkworm/node/db/etl/collector.cpp b/silkworm/db/etl/collector.cpp
similarity index 100%
rename from silkworm/node/db/etl/collector.cpp
rename to silkworm/db/etl/collector.cpp
diff --git a/silkworm/node/db/etl/collector.hpp b/silkworm/db/etl/collector.hpp
similarity index 100%
rename from silkworm/node/db/etl/collector.hpp
rename to silkworm/db/etl/collector.hpp
diff --git a/silkworm/node/db/etl/collector_settings.hpp b/silkworm/db/etl/collector_settings.hpp
similarity index 100%
rename from silkworm/node/db/etl/collector_settings.hpp
rename to silkworm/db/etl/collector_settings.hpp
diff --git a/silkworm/node/db/etl/file_provider.cpp b/silkworm/db/etl/file_provider.cpp
similarity index 100%
rename from silkworm/node/db/etl/file_provider.cpp
rename to silkworm/db/etl/file_provider.cpp
diff --git a/silkworm/node/db/etl/file_provider.hpp b/silkworm/db/etl/file_provider.hpp
similarity index 100%
rename from silkworm/node/db/etl/file_provider.hpp
rename to silkworm/db/etl/file_provider.hpp
diff --git a/silkworm/node/db/etl/in_memory_collector.hpp b/silkworm/db/etl/in_memory_collector.hpp
similarity index 100%
rename from silkworm/node/db/etl/in_memory_collector.hpp
rename to silkworm/db/etl/in_memory_collector.hpp
diff --git a/silkworm/node/db/etl/util.hpp b/silkworm/db/etl/util.hpp
similarity index 100%
rename from silkworm/node/db/etl/util.hpp
rename to silkworm/db/etl/util.hpp
diff --git a/silkworm/node/db/etl/util_test.cpp b/silkworm/db/etl/util_test.cpp
similarity index 100%
rename from silkworm/node/db/etl/util_test.cpp
rename to silkworm/db/etl/util_test.cpp
diff --git a/silkworm/node/db/etl_collector_test.cpp b/silkworm/db/etl_collector_test.cpp
similarity index 97%
rename from silkworm/node/db/etl_collector_test.cpp
rename to silkworm/db/etl_collector_test.cpp
index 2e838d6d9e..45e9480c4f 100644
--- a/silkworm/node/db/etl_collector_test.cpp
+++ b/silkworm/db/etl_collector_test.cpp
@@ -22,10 +22,10 @@
 
 #include <silkworm/core/common/endian.hpp>
 #include <silkworm/core/common/random_number.hpp>
+#include <silkworm/db/tables.hpp>
+#include <silkworm/db/test_util/temp_chain_data.hpp>
 #include <silkworm/infra/common/log.hpp>
 #include <silkworm/infra/test_util/log.hpp>
-#include <silkworm/node/db/tables.hpp>
-#include <silkworm/node/db/test_util/temp_chain_data.hpp>
 
 #include "etl_mdbx_collector.hpp"
 
diff --git a/silkworm/node/db/etl_in_memory_collector_test.cpp b/silkworm/db/etl_in_memory_collector_test.cpp
similarity index 99%
rename from silkworm/node/db/etl_in_memory_collector_test.cpp
rename to silkworm/db/etl_in_memory_collector_test.cpp
index a00d15c057..0984b00e94 100644
--- a/silkworm/node/db/etl_in_memory_collector_test.cpp
+++ b/silkworm/db/etl_in_memory_collector_test.cpp
@@ -20,9 +20,9 @@
 #include <catch2/catch.hpp>
 
 #include <silkworm/core/common/random_number.hpp>
+#include <silkworm/db/test_util/temp_chain_data.hpp>
 #include <silkworm/infra/common/log.hpp>
 #include <silkworm/infra/test_util/log.hpp>
-#include <silkworm/node/db/test_util/temp_chain_data.hpp>
 
 #include "etl/in_memory_collector.hpp"
 #include "mdbx.hpp"
diff --git a/silkworm/node/db/etl_mdbx_collector.hpp b/silkworm/db/etl_mdbx_collector.hpp
similarity index 100%
rename from silkworm/node/db/etl_mdbx_collector.hpp
rename to silkworm/db/etl_mdbx_collector.hpp
diff --git a/silkworm/node/db/genesis.cpp b/silkworm/db/genesis.cpp
similarity index 100%
rename from silkworm/node/db/genesis.cpp
rename to silkworm/db/genesis.cpp
diff --git a/silkworm/node/db/genesis.hpp b/silkworm/db/genesis.hpp
similarity index 95%
rename from silkworm/node/db/genesis.hpp
rename to silkworm/db/genesis.hpp
index 65f6106ebb..7b8082c50c 100644
--- a/silkworm/node/db/genesis.hpp
+++ b/silkworm/db/genesis.hpp
@@ -17,8 +17,8 @@
 #pragma once
 
 #include <silkworm/core/state/in_memory_state.hpp>
-#include <silkworm/node/db/access_layer.hpp>
-#include <silkworm/node/db/mdbx.hpp>
+#include <silkworm/db/access_layer.hpp>
+#include <silkworm/db/mdbx.hpp>
 
 namespace silkworm::db {
 //! \brief Validates provided genesis json payload
diff --git a/silkworm/node/db/genesis_test.cpp b/silkworm/db/genesis_test.cpp
similarity index 98%
rename from silkworm/node/db/genesis_test.cpp
rename to silkworm/db/genesis_test.cpp
index 2b93f711d3..3f43703874 100644
--- a/silkworm/node/db/genesis_test.cpp
+++ b/silkworm/db/genesis_test.cpp
@@ -19,8 +19,8 @@
 #include <catch2/catch.hpp>
 
 #include <silkworm/core/chain/genesis.hpp>
-#include <silkworm/node/db/tables.hpp>
-#include <silkworm/node/db/test_util/temp_chain_data.hpp>
+#include <silkworm/db/tables.hpp>
+#include <silkworm/db/test_util/temp_chain_data.hpp>
 
 namespace silkworm::db {
 
diff --git a/silkworm/node/db/head_info.cpp b/silkworm/db/head_info.cpp
similarity index 95%
rename from silkworm/node/db/head_info.cpp
rename to silkworm/db/head_info.cpp
index bcd731e752..b372e15f73 100644
--- a/silkworm/node/db/head_info.cpp
+++ b/silkworm/db/head_info.cpp
@@ -18,9 +18,9 @@
 
 #include <gsl/util>
 
+#include <silkworm/db/access_layer.hpp>
+#include <silkworm/db/stages.hpp>
 #include <silkworm/infra/common/log.hpp>
-#include <silkworm/node/db/access_layer.hpp>
-#include <silkworm/node/db/stages.hpp>
 
 namespace silkworm::db {
 
diff --git a/silkworm/node/db/head_info.hpp b/silkworm/db/head_info.hpp
similarity index 95%
rename from silkworm/node/db/head_info.hpp
rename to silkworm/db/head_info.hpp
index 9d332c4bc0..cff115ef03 100644
--- a/silkworm/node/db/head_info.hpp
+++ b/silkworm/db/head_info.hpp
@@ -17,7 +17,7 @@
 #pragma once
 
 #include <silkworm/core/types/head_info.hpp>
-#include <silkworm/node/db/mdbx.hpp>
+#include <silkworm/db/mdbx.hpp>
 
 namespace silkworm::db {
 
diff --git a/silkworm/node/db/log_cbor.cpp b/silkworm/db/log_cbor.cpp
similarity index 100%
rename from silkworm/node/db/log_cbor.cpp
rename to silkworm/db/log_cbor.cpp
diff --git a/silkworm/node/db/log_cbor.hpp b/silkworm/db/log_cbor.hpp
similarity index 100%
rename from silkworm/node/db/log_cbor.hpp
rename to silkworm/db/log_cbor.hpp
diff --git a/silkworm/node/db/log_cbor_test.cpp b/silkworm/db/log_cbor_test.cpp
similarity index 100%
rename from silkworm/node/db/log_cbor_test.cpp
rename to silkworm/db/log_cbor_test.cpp
diff --git a/silkworm/node/db/mdbx.cpp b/silkworm/db/mdbx.cpp
similarity index 99%
rename from silkworm/node/db/mdbx.cpp
rename to silkworm/db/mdbx.cpp
index c6e640bc3a..3ffc2369e0 100644
--- a/silkworm/node/db/mdbx.cpp
+++ b/silkworm/db/mdbx.cpp
@@ -18,8 +18,8 @@
 
 #include <stdexcept>
 
+#include <silkworm/db/util.hpp>
 #include <silkworm/infra/common/log.hpp>
-#include <silkworm/node/db/util.hpp>
 
 namespace silkworm::db {
 
diff --git a/silkworm/node/db/mdbx.hpp b/silkworm/db/mdbx.hpp
similarity index 100%
rename from silkworm/node/db/mdbx.hpp
rename to silkworm/db/mdbx.hpp
diff --git a/silkworm/node/db/mdbx_test.cpp b/silkworm/db/mdbx_test.cpp
similarity index 99%
rename from silkworm/node/db/mdbx_test.cpp
rename to silkworm/db/mdbx_test.cpp
index 7ddfcff5ce..c7eba45ccd 100644
--- a/silkworm/node/db/mdbx_test.cpp
+++ b/silkworm/db/mdbx_test.cpp
@@ -22,7 +22,7 @@
 #include <catch2/catch.hpp>
 
 #include <silkworm/core/common/bytes_to_string.hpp>
-#include <silkworm/node/db/test_util/temp_chain_data.hpp>
+#include <silkworm/db/test_util/temp_chain_data.hpp>
 
 static const std::map<std::string, std::string> kGeneticCode{
     {"AAA", "Lysine"},
diff --git a/silkworm/node/db/memory_mutation.cpp b/silkworm/db/memory_mutation.cpp
similarity index 98%
rename from silkworm/node/db/memory_mutation.cpp
rename to silkworm/db/memory_mutation.cpp
index 82344633e9..c9a719a857 100644
--- a/silkworm/node/db/memory_mutation.cpp
+++ b/silkworm/db/memory_mutation.cpp
@@ -18,10 +18,10 @@
 
 #include <gsl/util>
 
+#include <silkworm/db/memory_mutation_cursor.hpp>
+#include <silkworm/db/tables.hpp>
 #include <silkworm/infra/common/directories.hpp>
 #include <silkworm/infra/common/log.hpp>
-#include <silkworm/node/db/memory_mutation_cursor.hpp>
-#include <silkworm/node/db/tables.hpp>
 
 namespace silkworm::db {
 
diff --git a/silkworm/node/db/memory_mutation.hpp b/silkworm/db/memory_mutation.hpp
similarity index 98%
rename from silkworm/node/db/memory_mutation.hpp
rename to silkworm/db/memory_mutation.hpp
index fc9b3ed93c..2cdae0fc14 100644
--- a/silkworm/node/db/memory_mutation.hpp
+++ b/silkworm/db/memory_mutation.hpp
@@ -22,7 +22,7 @@
 
 #include <silkworm/core/chain/config.hpp>
 #include <silkworm/core/common/base.hpp>
-#include <silkworm/node/db/access_layer.hpp>
+#include <silkworm/db/access_layer.hpp>
 
 namespace silkworm::db {
 
diff --git a/silkworm/node/db/memory_mutation_cursor.cpp b/silkworm/db/memory_mutation_cursor.cpp
similarity index 100%
rename from silkworm/node/db/memory_mutation_cursor.cpp
rename to silkworm/db/memory_mutation_cursor.cpp
diff --git a/silkworm/node/db/memory_mutation_cursor.hpp b/silkworm/db/memory_mutation_cursor.hpp
similarity index 99%
rename from silkworm/node/db/memory_mutation_cursor.hpp
rename to silkworm/db/memory_mutation_cursor.hpp
index a1974861da..07277c0a20 100644
--- a/silkworm/node/db/memory_mutation_cursor.hpp
+++ b/silkworm/db/memory_mutation_cursor.hpp
@@ -18,7 +18,7 @@
 
 #include <memory>
 
-#include <silkworm/node/db/mdbx.hpp>
+#include <silkworm/db/mdbx.hpp>
 
 #include "memory_mutation.hpp"
 
diff --git a/silkworm/node/db/memory_mutation_cursor_test.cpp b/silkworm/db/memory_mutation_cursor_test.cpp
similarity index 99%
rename from silkworm/node/db/memory_mutation_cursor_test.cpp
rename to silkworm/db/memory_mutation_cursor_test.cpp
index 8442c7ea07..a2db11887f 100644
--- a/silkworm/node/db/memory_mutation_cursor_test.cpp
+++ b/silkworm/db/memory_mutation_cursor_test.cpp
@@ -18,8 +18,8 @@
 
 #include <catch2/catch.hpp>
 
+#include <silkworm/db/test_util/temp_chain_data.hpp>
 #include <silkworm/infra/test_util/log.hpp>
-#include <silkworm/node/db/test_util/temp_chain_data.hpp>
 
 namespace silkworm::db {
 
diff --git a/silkworm/node/db/memory_mutation_test.cpp b/silkworm/db/memory_mutation_test.cpp
similarity index 100%
rename from silkworm/node/db/memory_mutation_test.cpp
rename to silkworm/db/memory_mutation_test.cpp
diff --git a/silkworm/node/db/prune_mode.cpp b/silkworm/db/prune_mode.cpp
similarity index 100%
rename from silkworm/node/db/prune_mode.cpp
rename to silkworm/db/prune_mode.cpp
diff --git a/silkworm/node/db/prune_mode.hpp b/silkworm/db/prune_mode.hpp
similarity index 98%
rename from silkworm/node/db/prune_mode.hpp
rename to silkworm/db/prune_mode.hpp
index 56e9feb054..c9523937dd 100644
--- a/silkworm/node/db/prune_mode.hpp
+++ b/silkworm/db/prune_mode.hpp
@@ -19,8 +19,8 @@
 #include <optional>
 #include <string>
 
-#include <silkworm/node/db/mdbx.hpp>
-#include <silkworm/node/db/tables.hpp>
+#include <silkworm/db/mdbx.hpp>
+#include <silkworm/db/tables.hpp>
 
 namespace silkworm::db {
 
diff --git a/silkworm/node/db/receipt_cbor.cpp b/silkworm/db/receipt_cbor.cpp
similarity index 100%
rename from silkworm/node/db/receipt_cbor.cpp
rename to silkworm/db/receipt_cbor.cpp
diff --git a/silkworm/node/db/receipt_cbor.hpp b/silkworm/db/receipt_cbor.hpp
similarity index 100%
rename from silkworm/node/db/receipt_cbor.hpp
rename to silkworm/db/receipt_cbor.hpp
diff --git a/silkworm/node/db/receipt_cbor_test.cpp b/silkworm/db/receipt_cbor_test.cpp
similarity index 100%
rename from silkworm/node/db/receipt_cbor_test.cpp
rename to silkworm/db/receipt_cbor_test.cpp
diff --git a/silkworm/node/snapshot_sync.cpp b/silkworm/db/snapshot_sync.cpp
similarity index 98%
rename from silkworm/node/snapshot_sync.cpp
rename to silkworm/db/snapshot_sync.cpp
index c81943ffa1..6f841e8d47 100644
--- a/silkworm/node/snapshot_sync.cpp
+++ b/silkworm/db/snapshot_sync.cpp
@@ -22,15 +22,15 @@
 #include <magic_enum.hpp>
 
 #include <silkworm/core/types/hash.hpp>
+#include <silkworm/db/etl_mdbx_collector.hpp>
+#include <silkworm/db/snapshots/config.hpp>
+#include <silkworm/db/snapshots/index.hpp>
+#include <silkworm/db/snapshots/path.hpp>
+#include <silkworm/db/stages.hpp>
 #include <silkworm/infra/common/ensure.hpp>
 #include <silkworm/infra/common/environment.hpp>
 #include <silkworm/infra/common/log.hpp>
 #include <silkworm/infra/concurrency/thread_pool.hpp>
-#include <silkworm/node/db/etl_mdbx_collector.hpp>
-#include <silkworm/node/db/stages.hpp>
-#include <silkworm/snapshots/config.hpp>
-#include <silkworm/snapshots/index.hpp>
-#include <silkworm/snapshots/path.hpp>
 
 namespace silkworm::node {
 
diff --git a/silkworm/node/snapshot_sync.hpp b/silkworm/db/snapshot_sync.hpp
similarity index 90%
rename from silkworm/node/snapshot_sync.hpp
rename to silkworm/db/snapshot_sync.hpp
index e5be2f8dbe..edc4324a6b 100644
--- a/silkworm/node/snapshot_sync.hpp
+++ b/silkworm/db/snapshot_sync.hpp
@@ -21,11 +21,11 @@
 #include <vector>
 
 #include <silkworm/core/chain/config.hpp>
+#include <silkworm/db/access_layer.hpp>
+#include <silkworm/db/snapshots/bittorrent/client.hpp>
+#include <silkworm/db/snapshots/repository.hpp>
+#include <silkworm/db/snapshots/settings.hpp>
 #include <silkworm/infra/concurrency/stoppable.hpp>
-#include <silkworm/node/db/access_layer.hpp>
-#include <silkworm/snapshots/bittorrent/client.hpp>
-#include <silkworm/snapshots/repository.hpp>
-#include <silkworm/snapshots/settings.hpp>
 
 namespace silkworm::node {
 
diff --git a/silkworm/node/snapshot_sync_test.cpp b/silkworm/db/snapshot_sync_test.cpp
similarity index 98%
rename from silkworm/node/snapshot_sync_test.cpp
rename to silkworm/db/snapshot_sync_test.cpp
index a4da3ac68d..b7dc6fd1f6 100644
--- a/silkworm/node/snapshot_sync_test.cpp
+++ b/silkworm/db/snapshot_sync_test.cpp
@@ -19,10 +19,10 @@
 #include <catch2/catch.hpp>
 
 #include <silkworm/core/chain/config.hpp>
+#include <silkworm/db/test_util/temp_chain_data.hpp>
 #include <silkworm/infra/common/log.hpp>
 #include <silkworm/infra/test_util/log.hpp>
 #include <silkworm/infra/test_util/temporary_file.hpp>
-#include <silkworm/node/db/test_util/temp_chain_data.hpp>
 
 namespace silkworm::node {
 
diff --git a/silkworm/snapshots/CMakeLists.txt b/silkworm/db/snapshots/CMakeLists.txt
similarity index 100%
rename from silkworm/snapshots/CMakeLists.txt
rename to silkworm/db/snapshots/CMakeLists.txt
diff --git a/silkworm/snapshots/bittorrent/client.cpp b/silkworm/db/snapshots/bittorrent/client.cpp
similarity index 100%
rename from silkworm/snapshots/bittorrent/client.cpp
rename to silkworm/db/snapshots/bittorrent/client.cpp
diff --git a/silkworm/snapshots/bittorrent/client.hpp b/silkworm/db/snapshots/bittorrent/client.hpp
similarity index 98%
rename from silkworm/snapshots/bittorrent/client.hpp
rename to silkworm/db/snapshots/bittorrent/client.hpp
index 2081c20b4b..619b412d9a 100644
--- a/silkworm/snapshots/bittorrent/client.hpp
+++ b/silkworm/db/snapshots/bittorrent/client.hpp
@@ -40,7 +40,7 @@
 #include <libtorrent/session_stats.hpp>
 #pragma GCC diagnostic pop
 
-#include <silkworm/snapshots/bittorrent/settings.hpp>
+#include <silkworm/db/snapshots/bittorrent/settings.hpp>
 
 namespace silkworm::snapshots::bittorrent {
 
diff --git a/silkworm/snapshots/bittorrent/client_test.cpp b/silkworm/db/snapshots/bittorrent/client_test.cpp
similarity index 100%
rename from silkworm/snapshots/bittorrent/client_test.cpp
rename to silkworm/db/snapshots/bittorrent/client_test.cpp
diff --git a/silkworm/snapshots/bittorrent/settings.hpp b/silkworm/db/snapshots/bittorrent/settings.hpp
similarity index 100%
rename from silkworm/snapshots/bittorrent/settings.hpp
rename to silkworm/db/snapshots/bittorrent/settings.hpp
diff --git a/silkworm/snapshots/config.cpp b/silkworm/db/snapshots/config.cpp
similarity index 98%
rename from silkworm/snapshots/config.cpp
rename to silkworm/db/snapshots/config.cpp
index eb01cce007..d6339d4c81 100644
--- a/silkworm/snapshots/config.cpp
+++ b/silkworm/db/snapshots/config.cpp
@@ -19,8 +19,8 @@
 #include <map>
 #include <utility>
 
+#include <silkworm/db/snapshots/path.hpp>
 #include <silkworm/infra/common/log.hpp>
-#include <silkworm/snapshots/path.hpp>
 
 namespace silkworm::snapshots {
 
diff --git a/silkworm/snapshots/config.hpp b/silkworm/db/snapshots/config.hpp
similarity index 86%
rename from silkworm/snapshots/config.hpp
rename to silkworm/db/snapshots/config.hpp
index bf9f8abcd5..17a1e66ece 100644
--- a/silkworm/snapshots/config.hpp
+++ b/silkworm/db/snapshots/config.hpp
@@ -22,12 +22,12 @@
 
 #include <silkworm/core/chain/config.hpp>
 #include <silkworm/core/common/small_map.hpp>
-#include <silkworm/snapshots/config/bor_mainnet.hpp>
-#include <silkworm/snapshots/config/goerli.hpp>
-#include <silkworm/snapshots/config/mainnet.hpp>
-#include <silkworm/snapshots/config/mumbai.hpp>
-#include <silkworm/snapshots/config/sepolia.hpp>
-#include <silkworm/snapshots/entry.hpp>
+#include <silkworm/db/snapshots/config/bor_mainnet.hpp>
+#include <silkworm/db/snapshots/config/goerli.hpp>
+#include <silkworm/db/snapshots/config/mainnet.hpp>
+#include <silkworm/db/snapshots/config/mumbai.hpp>
+#include <silkworm/db/snapshots/config/sepolia.hpp>
+#include <silkworm/db/snapshots/entry.hpp>
 
 namespace silkworm::snapshots {
 
diff --git a/silkworm/snapshots/config/bor_mainnet.hpp b/silkworm/db/snapshots/config/bor_mainnet.hpp
similarity index 99%
rename from silkworm/snapshots/config/bor_mainnet.hpp
rename to silkworm/db/snapshots/config/bor_mainnet.hpp
index 69f0b128ab..b735846d6a 100644
--- a/silkworm/snapshots/config/bor_mainnet.hpp
+++ b/silkworm/db/snapshots/config/bor_mainnet.hpp
@@ -5,7 +5,7 @@
 #include <array>
 #include <string_view>
 
-#include <silkworm/snapshots/entry.hpp>
+#include <silkworm/db/snapshots/entry.hpp>
 
 namespace silkworm::snapshots {
 
diff --git a/silkworm/snapshots/config/goerli.hpp b/silkworm/db/snapshots/config/goerli.hpp
similarity index 99%
rename from silkworm/snapshots/config/goerli.hpp
rename to silkworm/db/snapshots/config/goerli.hpp
index c00511761a..a09c4f10c8 100644
--- a/silkworm/snapshots/config/goerli.hpp
+++ b/silkworm/db/snapshots/config/goerli.hpp
@@ -5,7 +5,7 @@
 #include <array>
 #include <string_view>
 
-#include <silkworm/snapshots/entry.hpp>
+#include <silkworm/db/snapshots/entry.hpp>
 
 namespace silkworm::snapshots {
 
diff --git a/silkworm/snapshots/config/mainnet.hpp b/silkworm/db/snapshots/config/mainnet.hpp
similarity index 99%
rename from silkworm/snapshots/config/mainnet.hpp
rename to silkworm/db/snapshots/config/mainnet.hpp
index 11a2ff2cc3..a3d3585223 100644
--- a/silkworm/snapshots/config/mainnet.hpp
+++ b/silkworm/db/snapshots/config/mainnet.hpp
@@ -5,7 +5,7 @@
 #include <array>
 #include <string_view>
 
-#include <silkworm/snapshots/entry.hpp>
+#include <silkworm/db/snapshots/entry.hpp>
 
 namespace silkworm::snapshots {
 
diff --git a/silkworm/snapshots/config/mumbai.hpp b/silkworm/db/snapshots/config/mumbai.hpp
similarity index 99%
rename from silkworm/snapshots/config/mumbai.hpp
rename to silkworm/db/snapshots/config/mumbai.hpp
index 12f19205dc..2c88626b07 100644
--- a/silkworm/snapshots/config/mumbai.hpp
+++ b/silkworm/db/snapshots/config/mumbai.hpp
@@ -5,7 +5,7 @@
 #include <array>
 #include <string_view>
 
-#include <silkworm/snapshots/entry.hpp>
+#include <silkworm/db/snapshots/entry.hpp>
 
 namespace silkworm::snapshots {
 
diff --git a/silkworm/snapshots/config/sepolia.hpp b/silkworm/db/snapshots/config/sepolia.hpp
similarity index 99%
rename from silkworm/snapshots/config/sepolia.hpp
rename to silkworm/db/snapshots/config/sepolia.hpp
index a6cde5d870..209aceec94 100644
--- a/silkworm/snapshots/config/sepolia.hpp
+++ b/silkworm/db/snapshots/config/sepolia.hpp
@@ -5,7 +5,7 @@
 #include <array>
 #include <string_view>
 
-#include <silkworm/snapshots/entry.hpp>
+#include <silkworm/db/snapshots/entry.hpp>
 
 namespace silkworm::snapshots {
 
diff --git a/silkworm/snapshots/config_test.cpp b/silkworm/db/snapshots/config_test.cpp
similarity index 98%
rename from silkworm/snapshots/config_test.cpp
rename to silkworm/db/snapshots/config_test.cpp
index 23b0852caf..1c7f276473 100644
--- a/silkworm/snapshots/config_test.cpp
+++ b/silkworm/db/snapshots/config_test.cpp
@@ -21,7 +21,7 @@
 #include <catch2/catch.hpp>
 #include <magic_enum.hpp>
 
-#include <silkworm/snapshots/path.hpp>
+#include <silkworm/db/snapshots/path.hpp>
 
 namespace silkworm::snapshots {
 
diff --git a/silkworm/snapshots/entry.hpp b/silkworm/db/snapshots/entry.hpp
similarity index 100%
rename from silkworm/snapshots/entry.hpp
rename to silkworm/db/snapshots/entry.hpp
diff --git a/silkworm/snapshots/index.cpp b/silkworm/db/snapshots/index.cpp
similarity index 98%
rename from silkworm/snapshots/index.cpp
rename to silkworm/db/snapshots/index.cpp
index 939f0f8b8a..6e09e6de0e 100644
--- a/silkworm/snapshots/index.cpp
+++ b/silkworm/db/snapshots/index.cpp
@@ -24,12 +24,12 @@
 #include <silkworm/core/common/util.hpp>
 #include <silkworm/core/types/block_body_for_storage.hpp>
 #include <silkworm/core/types/hash.hpp>
+#include <silkworm/db/snapshots/rec_split/rec_split.hpp>
+#include <silkworm/db/snapshots/rec_split/rec_split_seq.hpp>
+#include <silkworm/db/snapshots/seg/common/varint.hpp>
+#include <silkworm/db/snapshots/snapshot.hpp>
 #include <silkworm/infra/common/ensure.hpp>
 #include <silkworm/infra/common/log.hpp>
-#include <silkworm/snapshots/rec_split/rec_split.hpp>
-#include <silkworm/snapshots/rec_split/rec_split_seq.hpp>
-#include <silkworm/snapshots/seg/common/varint.hpp>
-#include <silkworm/snapshots/snapshot.hpp>
 
 namespace silkworm::snapshots {
 
diff --git a/silkworm/snapshots/index.hpp b/silkworm/db/snapshots/index.hpp
similarity index 94%
rename from silkworm/snapshots/index.hpp
rename to silkworm/db/snapshots/index.hpp
index 11baf5b631..1752edf2c1 100644
--- a/silkworm/snapshots/index.hpp
+++ b/silkworm/db/snapshots/index.hpp
@@ -19,9 +19,9 @@
 #include <memory>
 #include <utility>
 
-#include <silkworm/snapshots/path.hpp>
-#include <silkworm/snapshots/rec_split/rec_split.hpp>
-#include <silkworm/snapshots/seg/decompressor.hpp>
+#include <silkworm/db/snapshots/path.hpp>
+#include <silkworm/db/snapshots/rec_split/rec_split.hpp>
+#include <silkworm/db/snapshots/seg/decompressor.hpp>
 
 namespace silkworm::snapshots {
 
diff --git a/silkworm/snapshots/index_test.cpp b/silkworm/db/snapshots/index_test.cpp
similarity index 99%
rename from silkworm/snapshots/index_test.cpp
rename to silkworm/db/snapshots/index_test.cpp
index 3a6469a524..9fb894e604 100644
--- a/silkworm/snapshots/index_test.cpp
+++ b/silkworm/db/snapshots/index_test.cpp
@@ -18,9 +18,9 @@
 
 #include <catch2/catch.hpp>
 
+#include <silkworm/db/snapshots/test_util/common.hpp>
 #include <silkworm/infra/common/decoding_exception.hpp>
 #include <silkworm/infra/test_util/log.hpp>
-#include <silkworm/snapshots/test_util/common.hpp>
 
 namespace silkworm::snapshots {
 
diff --git a/silkworm/snapshots/path.cpp b/silkworm/db/snapshots/path.cpp
similarity index 100%
rename from silkworm/snapshots/path.cpp
rename to silkworm/db/snapshots/path.cpp
diff --git a/silkworm/snapshots/path.hpp b/silkworm/db/snapshots/path.hpp
similarity index 100%
rename from silkworm/snapshots/path.hpp
rename to silkworm/db/snapshots/path.hpp
diff --git a/silkworm/snapshots/path_test.cpp b/silkworm/db/snapshots/path_test.cpp
similarity index 100%
rename from silkworm/snapshots/path_test.cpp
rename to silkworm/db/snapshots/path_test.cpp
diff --git a/silkworm/snapshots/rec_split/common/common.hpp b/silkworm/db/snapshots/rec_split/common/common.hpp
similarity index 100%
rename from silkworm/snapshots/rec_split/common/common.hpp
rename to silkworm/db/snapshots/rec_split/common/common.hpp
diff --git a/silkworm/snapshots/rec_split/common/murmur_hash3.cpp b/silkworm/db/snapshots/rec_split/common/murmur_hash3.cpp
similarity index 100%
rename from silkworm/snapshots/rec_split/common/murmur_hash3.cpp
rename to silkworm/db/snapshots/rec_split/common/murmur_hash3.cpp
diff --git a/silkworm/snapshots/rec_split/common/murmur_hash3.hpp b/silkworm/db/snapshots/rec_split/common/murmur_hash3.hpp
similarity index 100%
rename from silkworm/snapshots/rec_split/common/murmur_hash3.hpp
rename to silkworm/db/snapshots/rec_split/common/murmur_hash3.hpp
diff --git a/silkworm/snapshots/rec_split/common/murmur_hash3_test.cpp b/silkworm/db/snapshots/rec_split/common/murmur_hash3_test.cpp
similarity index 100%
rename from silkworm/snapshots/rec_split/common/murmur_hash3_test.cpp
rename to silkworm/db/snapshots/rec_split/common/murmur_hash3_test.cpp
diff --git a/silkworm/snapshots/rec_split/encoding/elias_fano.hpp b/silkworm/db/snapshots/rec_split/encoding/elias_fano.hpp
similarity index 99%
rename from silkworm/snapshots/rec_split/encoding/elias_fano.hpp
rename to silkworm/db/snapshots/rec_split/encoding/elias_fano.hpp
index 77d8d971d5..5990ca8519 100644
--- a/silkworm/snapshots/rec_split/encoding/elias_fano.hpp
+++ b/silkworm/db/snapshots/rec_split/encoding/elias_fano.hpp
@@ -57,10 +57,10 @@
 #include <silkworm/core/common/base.hpp>
 #include <silkworm/core/common/bytes.hpp>
 #include <silkworm/core/common/endian.hpp>
+#include <silkworm/db/snapshots/rec_split/common/common.hpp>
+#include <silkworm/db/snapshots/rec_split/encoding/sequence.hpp>
 #include <silkworm/infra/common/ensure.hpp>
 #include <silkworm/infra/common/log.hpp>
-#include <silkworm/snapshots/rec_split/common/common.hpp>
-#include <silkworm/snapshots/rec_split/encoding/sequence.hpp>
 
 // EliasFano algo overview https://www.antoniomallia.it/sorted-integers-compression-with-elias-fano-encoding.html
 // P. Elias. Efficient storage and retrieval by content and address of static files. J. ACM, 21(2):246–260, 1974.
diff --git a/silkworm/snapshots/rec_split/encoding/elias_fano_test.cpp b/silkworm/db/snapshots/rec_split/encoding/elias_fano_test.cpp
similarity index 100%
rename from silkworm/snapshots/rec_split/encoding/elias_fano_test.cpp
rename to silkworm/db/snapshots/rec_split/encoding/elias_fano_test.cpp
diff --git a/silkworm/snapshots/rec_split/encoding/golomb_rice.hpp b/silkworm/db/snapshots/rec_split/encoding/golomb_rice.hpp
similarity index 98%
rename from silkworm/snapshots/rec_split/encoding/golomb_rice.hpp
rename to silkworm/db/snapshots/rec_split/encoding/golomb_rice.hpp
index 0353c81dd3..7f6ed5c227 100644
--- a/silkworm/snapshots/rec_split/encoding/golomb_rice.hpp
+++ b/silkworm/db/snapshots/rec_split/encoding/golomb_rice.hpp
@@ -50,9 +50,9 @@
 #include <iostream>
 
 #include <silkworm/core/common/assert.hpp>
+#include <silkworm/db/snapshots/rec_split/common/common.hpp>
+#include <silkworm/db/snapshots/rec_split/encoding/sequence.hpp>
 #include <silkworm/infra/common/log.hpp>
-#include <silkworm/snapshots/rec_split/common/common.hpp>
-#include <silkworm/snapshots/rec_split/encoding/sequence.hpp>
 
 namespace silkworm::snapshots::rec_split::encoding {
 
diff --git a/silkworm/snapshots/rec_split/encoding/golomb_rice_test.cpp b/silkworm/db/snapshots/rec_split/encoding/golomb_rice_test.cpp
similarity index 97%
rename from silkworm/snapshots/rec_split/encoding/golomb_rice_test.cpp
rename to silkworm/db/snapshots/rec_split/encoding/golomb_rice_test.cpp
index 62774384fd..0b871167cb 100644
--- a/silkworm/snapshots/rec_split/encoding/golomb_rice_test.cpp
+++ b/silkworm/db/snapshots/rec_split/encoding/golomb_rice_test.cpp
@@ -21,8 +21,8 @@
 #include <catch2/catch.hpp>
 
 #include <silkworm/core/common/random_number.hpp>
+#include <silkworm/db/snapshots/rec_split/encoding/sequence.hpp>
 #include <silkworm/infra/test_util/log.hpp>
-#include <silkworm/snapshots/rec_split/encoding/sequence.hpp>
 
 namespace silkworm::snapshots::rec_split::encoding {
 
diff --git a/silkworm/snapshots/rec_split/encoding/sequence.hpp b/silkworm/db/snapshots/rec_split/encoding/sequence.hpp
similarity index 100%
rename from silkworm/snapshots/rec_split/encoding/sequence.hpp
rename to silkworm/db/snapshots/rec_split/encoding/sequence.hpp
diff --git a/silkworm/snapshots/rec_split/encoding/sequence_test.cpp b/silkworm/db/snapshots/rec_split/encoding/sequence_test.cpp
similarity index 100%
rename from silkworm/snapshots/rec_split/encoding/sequence_test.cpp
rename to silkworm/db/snapshots/rec_split/encoding/sequence_test.cpp
diff --git a/silkworm/snapshots/rec_split/rec_split.cpp b/silkworm/db/snapshots/rec_split/rec_split.cpp
similarity index 100%
rename from silkworm/snapshots/rec_split/rec_split.cpp
rename to silkworm/db/snapshots/rec_split/rec_split.cpp
diff --git a/silkworm/snapshots/rec_split/rec_split.hpp b/silkworm/db/snapshots/rec_split/rec_split.hpp
similarity index 99%
rename from silkworm/snapshots/rec_split/rec_split.hpp
rename to silkworm/db/snapshots/rec_split/rec_split.hpp
index d67c32e625..ce6a68dffc 100644
--- a/silkworm/snapshots/rec_split/rec_split.hpp
+++ b/silkworm/db/snapshots/rec_split/rec_split.hpp
@@ -67,12 +67,12 @@
 #include <silkworm/core/common/endian.hpp>
 #include <silkworm/core/common/math.hpp>
 #include <silkworm/core/common/util.hpp>
+#include <silkworm/db/snapshots/rec_split/common/murmur_hash3.hpp>
+#include <silkworm/db/snapshots/rec_split/encoding/elias_fano.hpp>
+#include <silkworm/db/snapshots/rec_split/encoding/golomb_rice.hpp>
 #include <silkworm/infra/common/ensure.hpp>
 #include <silkworm/infra/common/log.hpp>
 #include <silkworm/infra/common/memory_mapped_file.hpp>
-#include <silkworm/snapshots/rec_split/common/murmur_hash3.hpp>
-#include <silkworm/snapshots/rec_split/encoding/elias_fano.hpp>
-#include <silkworm/snapshots/rec_split/encoding/golomb_rice.hpp>
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wsign-conversion"
diff --git a/silkworm/snapshots/rec_split/rec_split_par.hpp b/silkworm/db/snapshots/rec_split/rec_split_par.hpp
similarity index 99%
rename from silkworm/snapshots/rec_split/rec_split_par.hpp
rename to silkworm/db/snapshots/rec_split/rec_split_par.hpp
index 06686b7a40..cb57a1866e 100644
--- a/silkworm/snapshots/rec_split/rec_split_par.hpp
+++ b/silkworm/db/snapshots/rec_split/rec_split_par.hpp
@@ -53,8 +53,8 @@
 #endif /* defined(__clang__) */
 #pragma GCC diagnostic ignored "-Wsign-compare"
 
+#include <silkworm/db/snapshots/rec_split/rec_split.hpp>
 #include <silkworm/infra/concurrency/thread_pool.hpp>
-#include <silkworm/snapshots/rec_split/rec_split.hpp>
 
 // Check if the vector contains duplicates without altering the original vector order
 // Used here to check the keys vector (whose elements are related to the elements of values vector at the same index)
diff --git a/silkworm/snapshots/rec_split/rec_split_par_test.cpp b/silkworm/db/snapshots/rec_split/rec_split_par_test.cpp
similarity index 100%
rename from silkworm/snapshots/rec_split/rec_split_par_test.cpp
rename to silkworm/db/snapshots/rec_split/rec_split_par_test.cpp
diff --git a/silkworm/snapshots/rec_split/rec_split_seq.hpp b/silkworm/db/snapshots/rec_split/rec_split_seq.hpp
similarity index 99%
rename from silkworm/snapshots/rec_split/rec_split_seq.hpp
rename to silkworm/db/snapshots/rec_split/rec_split_seq.hpp
index 03ce663974..b54e26257f 100644
--- a/silkworm/snapshots/rec_split/rec_split_seq.hpp
+++ b/silkworm/db/snapshots/rec_split/rec_split_seq.hpp
@@ -53,8 +53,8 @@
 #endif /* defined(__clang__) */
 #pragma GCC diagnostic ignored "-Wsign-compare"
 
-#include <silkworm/node/db/etl/collector.hpp>
-#include <silkworm/snapshots/rec_split/rec_split.hpp>
+#include <silkworm/db/etl/collector.hpp>
+#include <silkworm/db/snapshots/rec_split/rec_split.hpp>
 
 namespace silkworm::snapshots::rec_split {
 
diff --git a/silkworm/snapshots/rec_split/rec_split_seq_test.cpp b/silkworm/db/snapshots/rec_split/rec_split_seq_test.cpp
similarity index 100%
rename from silkworm/snapshots/rec_split/rec_split_seq_test.cpp
rename to silkworm/db/snapshots/rec_split/rec_split_seq_test.cpp
diff --git a/silkworm/snapshots/rec_split/test_util/xoroshiro128pp.hpp b/silkworm/db/snapshots/rec_split/test_util/xoroshiro128pp.hpp
similarity index 100%
rename from silkworm/snapshots/rec_split/test_util/xoroshiro128pp.hpp
rename to silkworm/db/snapshots/rec_split/test_util/xoroshiro128pp.hpp
diff --git a/silkworm/snapshots/repository.cpp b/silkworm/db/snapshots/repository.cpp
similarity index 99%
rename from silkworm/snapshots/repository.cpp
rename to silkworm/db/snapshots/repository.cpp
index 6a1428e600..6817be0f31 100644
--- a/silkworm/snapshots/repository.cpp
+++ b/silkworm/db/snapshots/repository.cpp
@@ -21,9 +21,9 @@
 #include <utility>
 
 #include <silkworm/core/common/assert.hpp>
+#include <silkworm/db/snapshots/index.hpp>
 #include <silkworm/infra/common/ensure.hpp>
 #include <silkworm/infra/common/log.hpp>
-#include <silkworm/snapshots/index.hpp>
 
 namespace silkworm::snapshots {
 
diff --git a/silkworm/snapshots/repository.hpp b/silkworm/db/snapshots/repository.hpp
similarity index 97%
rename from silkworm/snapshots/repository.hpp
rename to silkworm/db/snapshots/repository.hpp
index 902d8f64d5..49b9db5d43 100644
--- a/silkworm/snapshots/repository.hpp
+++ b/silkworm/db/snapshots/repository.hpp
@@ -25,9 +25,9 @@
 
 #include <silkworm/core/common/base.hpp>
 #include <silkworm/core/types/block.hpp>
-#include <silkworm/snapshots/path.hpp>
-#include <silkworm/snapshots/settings.hpp>
-#include <silkworm/snapshots/snapshot.hpp>
+#include <silkworm/db/snapshots/path.hpp>
+#include <silkworm/db/snapshots/settings.hpp>
+#include <silkworm/db/snapshots/snapshot.hpp>
 
 namespace silkworm::snapshots {
 
diff --git a/silkworm/snapshots/repository_test.cpp b/silkworm/db/snapshots/repository_test.cpp
similarity index 99%
rename from silkworm/snapshots/repository_test.cpp
rename to silkworm/db/snapshots/repository_test.cpp
index b05d921a0b..8dd8752662 100644
--- a/silkworm/snapshots/repository_test.cpp
+++ b/silkworm/db/snapshots/repository_test.cpp
@@ -18,11 +18,11 @@
 
 #include <catch2/catch.hpp>
 
+#include <silkworm/db/snapshots/index.hpp>
+#include <silkworm/db/snapshots/test_util/common.hpp>
 #include <silkworm/infra/common/directories.hpp>
 #include <silkworm/infra/common/log.hpp>
 #include <silkworm/infra/test_util/log.hpp>
-#include <silkworm/snapshots/index.hpp>
-#include <silkworm/snapshots/test_util/common.hpp>
 
 namespace silkworm::snapshots {
 
diff --git a/silkworm/snapshots/seg/CMakeLists.txt b/silkworm/db/snapshots/seg/CMakeLists.txt
similarity index 100%
rename from silkworm/snapshots/seg/CMakeLists.txt
rename to silkworm/db/snapshots/seg/CMakeLists.txt
diff --git a/silkworm/snapshots/seg/common/varint.cpp b/silkworm/db/snapshots/seg/common/varint.cpp
similarity index 100%
rename from silkworm/snapshots/seg/common/varint.cpp
rename to silkworm/db/snapshots/seg/common/varint.cpp
diff --git a/silkworm/snapshots/seg/common/varint.hpp b/silkworm/db/snapshots/seg/common/varint.hpp
similarity index 100%
rename from silkworm/snapshots/seg/common/varint.hpp
rename to silkworm/db/snapshots/seg/common/varint.hpp
diff --git a/silkworm/snapshots/seg/common/varint_test.cpp b/silkworm/db/snapshots/seg/common/varint_test.cpp
similarity index 100%
rename from silkworm/snapshots/seg/common/varint_test.cpp
rename to silkworm/db/snapshots/seg/common/varint_test.cpp
diff --git a/silkworm/snapshots/seg/compressor.cpp b/silkworm/db/snapshots/seg/compressor.cpp
similarity index 100%
rename from silkworm/snapshots/seg/compressor.cpp
rename to silkworm/db/snapshots/seg/compressor.cpp
diff --git a/silkworm/snapshots/seg/compressor.hpp b/silkworm/db/snapshots/seg/compressor.hpp
similarity index 100%
rename from silkworm/snapshots/seg/compressor.hpp
rename to silkworm/db/snapshots/seg/compressor.hpp
diff --git a/silkworm/snapshots/seg/compressor/bit_stream.cpp b/silkworm/db/snapshots/seg/compressor/bit_stream.cpp
similarity index 100%
rename from silkworm/snapshots/seg/compressor/bit_stream.cpp
rename to silkworm/db/snapshots/seg/compressor/bit_stream.cpp
diff --git a/silkworm/snapshots/seg/compressor/bit_stream.hpp b/silkworm/db/snapshots/seg/compressor/bit_stream.hpp
similarity index 100%
rename from silkworm/snapshots/seg/compressor/bit_stream.hpp
rename to silkworm/db/snapshots/seg/compressor/bit_stream.hpp
diff --git a/silkworm/snapshots/seg/compressor/bit_stream_test.cpp b/silkworm/db/snapshots/seg/compressor/bit_stream_test.cpp
similarity index 100%
rename from silkworm/snapshots/seg/compressor/bit_stream_test.cpp
rename to silkworm/db/snapshots/seg/compressor/bit_stream_test.cpp
diff --git a/silkworm/snapshots/seg/compressor/huffman_code.cpp b/silkworm/db/snapshots/seg/compressor/huffman_code.cpp
similarity index 100%
rename from silkworm/snapshots/seg/compressor/huffman_code.cpp
rename to silkworm/db/snapshots/seg/compressor/huffman_code.cpp
diff --git a/silkworm/snapshots/seg/compressor/huffman_code.hpp b/silkworm/db/snapshots/seg/compressor/huffman_code.hpp
similarity index 100%
rename from silkworm/snapshots/seg/compressor/huffman_code.hpp
rename to silkworm/db/snapshots/seg/compressor/huffman_code.hpp
diff --git a/silkworm/snapshots/seg/compressor/huffman_code_test.cpp b/silkworm/db/snapshots/seg/compressor/huffman_code_test.cpp
similarity index 100%
rename from silkworm/snapshots/seg/compressor/huffman_code_test.cpp
rename to silkworm/db/snapshots/seg/compressor/huffman_code_test.cpp
diff --git a/silkworm/snapshots/seg/compressor/intermediate_compressed_stream.cpp b/silkworm/db/snapshots/seg/compressor/intermediate_compressed_stream.cpp
similarity index 98%
rename from silkworm/snapshots/seg/compressor/intermediate_compressed_stream.cpp
rename to silkworm/db/snapshots/seg/compressor/intermediate_compressed_stream.cpp
index 0aa54dff64..c8e02a8bec 100644
--- a/silkworm/snapshots/seg/compressor/intermediate_compressed_stream.cpp
+++ b/silkworm/db/snapshots/seg/compressor/intermediate_compressed_stream.cpp
@@ -17,7 +17,7 @@
 #include "intermediate_compressed_stream.hpp"
 
 #include <silkworm/core/common/bytes_to_string.hpp>
-#include <silkworm/snapshots/seg/common/varint.hpp>
+#include <silkworm/db/snapshots/seg/common/varint.hpp>
 
 namespace silkworm::snapshots::seg {
 
diff --git a/silkworm/snapshots/seg/compressor/intermediate_compressed_stream.hpp b/silkworm/db/snapshots/seg/compressor/intermediate_compressed_stream.hpp
similarity index 100%
rename from silkworm/snapshots/seg/compressor/intermediate_compressed_stream.hpp
rename to silkworm/db/snapshots/seg/compressor/intermediate_compressed_stream.hpp
diff --git a/silkworm/snapshots/seg/compressor/intermediate_compressed_stream_test.cpp b/silkworm/db/snapshots/seg/compressor/intermediate_compressed_stream_test.cpp
similarity index 100%
rename from silkworm/snapshots/seg/compressor/intermediate_compressed_stream_test.cpp
rename to silkworm/db/snapshots/seg/compressor/intermediate_compressed_stream_test.cpp
diff --git a/silkworm/snapshots/seg/compressor/lcp_kasai.cpp b/silkworm/db/snapshots/seg/compressor/lcp_kasai.cpp
similarity index 100%
rename from silkworm/snapshots/seg/compressor/lcp_kasai.cpp
rename to silkworm/db/snapshots/seg/compressor/lcp_kasai.cpp
diff --git a/silkworm/snapshots/seg/compressor/lcp_kasai.hpp b/silkworm/db/snapshots/seg/compressor/lcp_kasai.hpp
similarity index 100%
rename from silkworm/snapshots/seg/compressor/lcp_kasai.hpp
rename to silkworm/db/snapshots/seg/compressor/lcp_kasai.hpp
diff --git a/silkworm/snapshots/seg/compressor/output_file_transaction.cpp b/silkworm/db/snapshots/seg/compressor/output_file_transaction.cpp
similarity index 100%
rename from silkworm/snapshots/seg/compressor/output_file_transaction.cpp
rename to silkworm/db/snapshots/seg/compressor/output_file_transaction.cpp
diff --git a/silkworm/snapshots/seg/compressor/output_file_transaction.hpp b/silkworm/db/snapshots/seg/compressor/output_file_transaction.hpp
similarity index 100%
rename from silkworm/snapshots/seg/compressor/output_file_transaction.hpp
rename to silkworm/db/snapshots/seg/compressor/output_file_transaction.hpp
diff --git a/silkworm/snapshots/seg/compressor/patricia_tree.cpp b/silkworm/db/snapshots/seg/compressor/patricia_tree.cpp
similarity index 100%
rename from silkworm/snapshots/seg/compressor/patricia_tree.cpp
rename to silkworm/db/snapshots/seg/compressor/patricia_tree.cpp
diff --git a/silkworm/snapshots/seg/compressor/patricia_tree.hpp b/silkworm/db/snapshots/seg/compressor/patricia_tree.hpp
similarity index 100%
rename from silkworm/snapshots/seg/compressor/patricia_tree.hpp
rename to silkworm/db/snapshots/seg/compressor/patricia_tree.hpp
diff --git a/silkworm/snapshots/seg/compressor/patricia_tree_test.cpp b/silkworm/db/snapshots/seg/compressor/patricia_tree_test.cpp
similarity index 100%
rename from silkworm/snapshots/seg/compressor/patricia_tree_test.cpp
rename to silkworm/db/snapshots/seg/compressor/patricia_tree_test.cpp
diff --git a/silkworm/snapshots/seg/compressor/pattern_aggregator.cpp b/silkworm/db/snapshots/seg/compressor/pattern_aggregator.cpp
similarity index 99%
rename from silkworm/snapshots/seg/compressor/pattern_aggregator.cpp
rename to silkworm/db/snapshots/seg/compressor/pattern_aggregator.cpp
index 4069b2da63..aa336f1dec 100644
--- a/silkworm/snapshots/seg/compressor/pattern_aggregator.cpp
+++ b/silkworm/db/snapshots/seg/compressor/pattern_aggregator.cpp
@@ -21,7 +21,7 @@
 #include <optional>
 
 #include <silkworm/core/common/endian.hpp>
-#include <silkworm/node/db/etl/collector.hpp>
+#include <silkworm/db/etl/collector.hpp>
 
 namespace silkworm::snapshots::seg {
 
diff --git a/silkworm/snapshots/seg/compressor/pattern_aggregator.hpp b/silkworm/db/snapshots/seg/compressor/pattern_aggregator.hpp
similarity index 100%
rename from silkworm/snapshots/seg/compressor/pattern_aggregator.hpp
rename to silkworm/db/snapshots/seg/compressor/pattern_aggregator.hpp
diff --git a/silkworm/snapshots/seg/compressor/pattern_aggregator_test.cpp b/silkworm/db/snapshots/seg/compressor/pattern_aggregator_test.cpp
similarity index 100%
rename from silkworm/snapshots/seg/compressor/pattern_aggregator_test.cpp
rename to silkworm/db/snapshots/seg/compressor/pattern_aggregator_test.cpp
diff --git a/silkworm/snapshots/seg/compressor/pattern_covering.cpp b/silkworm/db/snapshots/seg/compressor/pattern_covering.cpp
similarity index 100%
rename from silkworm/snapshots/seg/compressor/pattern_covering.cpp
rename to silkworm/db/snapshots/seg/compressor/pattern_covering.cpp
diff --git a/silkworm/snapshots/seg/compressor/pattern_covering.hpp b/silkworm/db/snapshots/seg/compressor/pattern_covering.hpp
similarity index 100%
rename from silkworm/snapshots/seg/compressor/pattern_covering.hpp
rename to silkworm/db/snapshots/seg/compressor/pattern_covering.hpp
diff --git a/silkworm/snapshots/seg/compressor/pattern_covering_test.cpp b/silkworm/db/snapshots/seg/compressor/pattern_covering_test.cpp
similarity index 100%
rename from silkworm/snapshots/seg/compressor/pattern_covering_test.cpp
rename to silkworm/db/snapshots/seg/compressor/pattern_covering_test.cpp
diff --git a/silkworm/snapshots/seg/compressor/pattern_extractor.cpp b/silkworm/db/snapshots/seg/compressor/pattern_extractor.cpp
similarity index 100%
rename from silkworm/snapshots/seg/compressor/pattern_extractor.cpp
rename to silkworm/db/snapshots/seg/compressor/pattern_extractor.cpp
diff --git a/silkworm/snapshots/seg/compressor/pattern_extractor.hpp b/silkworm/db/snapshots/seg/compressor/pattern_extractor.hpp
similarity index 100%
rename from silkworm/snapshots/seg/compressor/pattern_extractor.hpp
rename to silkworm/db/snapshots/seg/compressor/pattern_extractor.hpp
diff --git a/silkworm/snapshots/seg/compressor/pattern_extractor_test.cpp b/silkworm/db/snapshots/seg/compressor/pattern_extractor_test.cpp
similarity index 100%
rename from silkworm/snapshots/seg/compressor/pattern_extractor_test.cpp
rename to silkworm/db/snapshots/seg/compressor/pattern_extractor_test.cpp
diff --git a/silkworm/snapshots/seg/compressor/positions_map.cpp b/silkworm/db/snapshots/seg/compressor/positions_map.cpp
similarity index 100%
rename from silkworm/snapshots/seg/compressor/positions_map.cpp
rename to silkworm/db/snapshots/seg/compressor/positions_map.cpp
diff --git a/silkworm/snapshots/seg/compressor/positions_map.hpp b/silkworm/db/snapshots/seg/compressor/positions_map.hpp
similarity index 100%
rename from silkworm/snapshots/seg/compressor/positions_map.hpp
rename to silkworm/db/snapshots/seg/compressor/positions_map.hpp
diff --git a/silkworm/snapshots/seg/compressor/raw_words_stream.cpp b/silkworm/db/snapshots/seg/compressor/raw_words_stream.cpp
similarity index 97%
rename from silkworm/snapshots/seg/compressor/raw_words_stream.cpp
rename to silkworm/db/snapshots/seg/compressor/raw_words_stream.cpp
index 88ebca7427..4a808ff3dd 100644
--- a/silkworm/snapshots/seg/compressor/raw_words_stream.cpp
+++ b/silkworm/db/snapshots/seg/compressor/raw_words_stream.cpp
@@ -19,7 +19,7 @@
 #include <stdexcept>
 
 #include <silkworm/core/common/bytes_to_string.hpp>
-#include <silkworm/snapshots/seg/common/varint.hpp>
+#include <silkworm/db/snapshots/seg/common/varint.hpp>
 
 namespace silkworm::snapshots::seg {
 
diff --git a/silkworm/snapshots/seg/compressor/raw_words_stream.hpp b/silkworm/db/snapshots/seg/compressor/raw_words_stream.hpp
similarity index 100%
rename from silkworm/snapshots/seg/compressor/raw_words_stream.hpp
rename to silkworm/db/snapshots/seg/compressor/raw_words_stream.hpp
diff --git a/silkworm/snapshots/seg/compressor/raw_words_stream_test.cpp b/silkworm/db/snapshots/seg/compressor/raw_words_stream_test.cpp
similarity index 100%
rename from silkworm/snapshots/seg/compressor/raw_words_stream_test.cpp
rename to silkworm/db/snapshots/seg/compressor/raw_words_stream_test.cpp
diff --git a/silkworm/snapshots/seg/compressor/seg_stream.cpp b/silkworm/db/snapshots/seg/compressor/seg_stream.cpp
similarity index 98%
rename from silkworm/snapshots/seg/compressor/seg_stream.cpp
rename to silkworm/db/snapshots/seg/compressor/seg_stream.cpp
index f27a6deb1e..1e8329719f 100644
--- a/silkworm/snapshots/seg/compressor/seg_stream.cpp
+++ b/silkworm/db/snapshots/seg/compressor/seg_stream.cpp
@@ -20,7 +20,7 @@
 
 #include <silkworm/core/common/bytes_to_string.hpp>
 #include <silkworm/core/common/endian.hpp>
-#include <silkworm/snapshots/seg/common/varint.hpp>
+#include <silkworm/db/snapshots/seg/common/varint.hpp>
 
 namespace silkworm::snapshots::seg {
 
diff --git a/silkworm/snapshots/seg/compressor/seg_stream.hpp b/silkworm/db/snapshots/seg/compressor/seg_stream.hpp
similarity index 100%
rename from silkworm/snapshots/seg/compressor/seg_stream.hpp
rename to silkworm/db/snapshots/seg/compressor/seg_stream.hpp
diff --git a/silkworm/snapshots/seg/decompressor.cpp b/silkworm/db/snapshots/seg/decompressor.cpp
similarity index 100%
rename from silkworm/snapshots/seg/decompressor.cpp
rename to silkworm/db/snapshots/seg/decompressor.cpp
diff --git a/silkworm/snapshots/seg/decompressor.hpp b/silkworm/db/snapshots/seg/decompressor.hpp
similarity index 100%
rename from silkworm/snapshots/seg/decompressor.hpp
rename to silkworm/db/snapshots/seg/decompressor.hpp
diff --git a/silkworm/snapshots/seg/seg_zip.cpp b/silkworm/db/snapshots/seg/seg_zip.cpp
similarity index 100%
rename from silkworm/snapshots/seg/seg_zip.cpp
rename to silkworm/db/snapshots/seg/seg_zip.cpp
diff --git a/silkworm/snapshots/seg/seg_zip.hpp b/silkworm/db/snapshots/seg/seg_zip.hpp
similarity index 100%
rename from silkworm/snapshots/seg/seg_zip.hpp
rename to silkworm/db/snapshots/seg/seg_zip.hpp
diff --git a/silkworm/snapshots/settings.hpp b/silkworm/db/snapshots/settings.hpp
similarity index 95%
rename from silkworm/snapshots/settings.hpp
rename to silkworm/db/snapshots/settings.hpp
index 96d7a9a16d..e7a352ae2d 100644
--- a/silkworm/snapshots/settings.hpp
+++ b/silkworm/db/snapshots/settings.hpp
@@ -18,8 +18,8 @@
 
 #include <filesystem>
 
+#include <silkworm/db/snapshots/bittorrent/settings.hpp>
 #include <silkworm/infra/common/directories.hpp>
-#include <silkworm/snapshots/bittorrent/settings.hpp>
 
 namespace silkworm::snapshots {
 
diff --git a/silkworm/snapshots/snapshot.cpp b/silkworm/db/snapshots/snapshot.cpp
similarity index 99%
rename from silkworm/snapshots/snapshot.cpp
rename to silkworm/db/snapshots/snapshot.cpp
index b138c4f65c..6c20eaff0c 100644
--- a/silkworm/snapshots/snapshot.cpp
+++ b/silkworm/db/snapshots/snapshot.cpp
@@ -21,10 +21,10 @@
 #include <silkworm/core/common/util.hpp>
 #include <silkworm/core/types/address.hpp>
 #include <silkworm/core/types/transaction.hpp>
+#include <silkworm/db/snapshots/path.hpp>
 #include <silkworm/infra/common/decoding_exception.hpp>
 #include <silkworm/infra/common/ensure.hpp>
 #include <silkworm/infra/common/log.hpp>
-#include <silkworm/snapshots/path.hpp>
 
 namespace silkworm::snapshots {
 
diff --git a/silkworm/snapshots/snapshot.hpp b/silkworm/db/snapshots/snapshot.hpp
similarity index 98%
rename from silkworm/snapshots/snapshot.hpp
rename to silkworm/db/snapshots/snapshot.hpp
index 2fdab8f9fa..40cbfee2eb 100644
--- a/silkworm/snapshots/snapshot.hpp
+++ b/silkworm/db/snapshots/snapshot.hpp
@@ -28,10 +28,10 @@
 #include <silkworm/core/common/bytes.hpp>
 #include <silkworm/core/types/block.hpp>
 #include <silkworm/core/types/block_body_for_storage.hpp>
+#include <silkworm/db/snapshots/path.hpp>
+#include <silkworm/db/snapshots/rec_split/rec_split_par.hpp>
+#include <silkworm/db/snapshots/seg/decompressor.hpp>
 #include <silkworm/infra/common/os.hpp>
-#include <silkworm/snapshots/path.hpp>
-#include <silkworm/snapshots/rec_split/rec_split_par.hpp>
-#include <silkworm/snapshots/seg/decompressor.hpp>
 
 namespace silkworm::snapshots {
 
diff --git a/silkworm/snapshots/snapshot_benchmark.cpp b/silkworm/db/snapshots/snapshot_benchmark.cpp
similarity index 97%
rename from silkworm/snapshots/snapshot_benchmark.cpp
rename to silkworm/db/snapshots/snapshot_benchmark.cpp
index 13033e02ae..fe12131daf 100644
--- a/silkworm/snapshots/snapshot_benchmark.cpp
+++ b/silkworm/db/snapshots/snapshot_benchmark.cpp
@@ -17,12 +17,12 @@
 #include <benchmark/benchmark.h>
 
 #include <silkworm/core/common/util.hpp>
+#include <silkworm/db/snapshots/index.hpp>
+#include <silkworm/db/snapshots/seg/decompressor.hpp>
+#include <silkworm/db/snapshots/test_util/common.hpp>
 #include <silkworm/infra/common/directories.hpp>
 #include <silkworm/infra/test_util/log.hpp>
 #include <silkworm/infra/test_util/temporary_file.hpp>
-#include <silkworm/snapshots/index.hpp>
-#include <silkworm/snapshots/seg/decompressor.hpp>
-#include <silkworm/snapshots/test_util/common.hpp>
 
 namespace silkworm::snapshots {
 
diff --git a/silkworm/snapshots/snapshot_decompressor_test.cpp b/silkworm/db/snapshots/snapshot_decompressor_test.cpp
similarity index 99%
rename from silkworm/snapshots/snapshot_decompressor_test.cpp
rename to silkworm/db/snapshots/snapshot_decompressor_test.cpp
index 1d0a615432..bf64cb3c48 100644
--- a/silkworm/snapshots/snapshot_decompressor_test.cpp
+++ b/silkworm/db/snapshots/snapshot_decompressor_test.cpp
@@ -28,9 +28,9 @@
 
 #include <silkworm/core/common/endian.hpp>
 #include <silkworm/core/common/util.hpp>
+#include <silkworm/db/snapshots/test_util/common.hpp>
 #include <silkworm/infra/common/directories.hpp>
 #include <silkworm/infra/test_util/log.hpp>
-#include <silkworm/snapshots/test_util/common.hpp>
 
 #include "seg/decompressor.hpp"
 
diff --git a/silkworm/snapshots/snapshot_test.cpp b/silkworm/db/snapshots/snapshot_test.cpp
similarity index 99%
rename from silkworm/snapshots/snapshot_test.cpp
rename to silkworm/db/snapshots/snapshot_test.cpp
index d9f71621cb..ca0511e274 100644
--- a/silkworm/snapshots/snapshot_test.cpp
+++ b/silkworm/db/snapshots/snapshot_test.cpp
@@ -21,11 +21,11 @@
 
 #include <catch2/catch.hpp>
 
+#include <silkworm/db/snapshots/index.hpp>
+#include <silkworm/db/snapshots/test_util/common.hpp>
 #include <silkworm/infra/common/directories.hpp>
 #include <silkworm/infra/common/log.hpp>
 #include <silkworm/infra/test_util/log.hpp>
-#include <silkworm/snapshots/index.hpp>
-#include <silkworm/snapshots/test_util/common.hpp>
 
 namespace silkworm::snapshots {
 
diff --git a/silkworm/snapshots/test_util/common.hpp b/silkworm/db/snapshots/test_util/common.hpp
similarity index 99%
rename from silkworm/snapshots/test_util/common.hpp
rename to silkworm/db/snapshots/test_util/common.hpp
index 062cab92fc..8923d86935 100644
--- a/silkworm/snapshots/test_util/common.hpp
+++ b/silkworm/db/snapshots/test_util/common.hpp
@@ -21,9 +21,9 @@
 
 #include <silkworm/core/common/endian.hpp>
 #include <silkworm/core/common/util.hpp>
+#include <silkworm/db/snapshots/repository.hpp>
+#include <silkworm/db/snapshots/seg/common/varint.hpp>
 #include <silkworm/infra/test_util/temporary_file.hpp>
-#include <silkworm/snapshots/repository.hpp>
-#include <silkworm/snapshots/seg/common/varint.hpp>
 
 namespace silkworm::snapshots::test_util {
 
diff --git a/silkworm/node/db/stage.cpp b/silkworm/db/stage.cpp
similarity index 98%
rename from silkworm/node/db/stage.cpp
rename to silkworm/db/stage.cpp
index be7618fc9f..6648b81365 100644
--- a/silkworm/node/db/stage.cpp
+++ b/silkworm/db/stage.cpp
@@ -18,7 +18,7 @@
 
 #include <magic_enum.hpp>
 
-#include <silkworm/node/db/stages.hpp>
+#include <silkworm/db/stages.hpp>
 
 namespace silkworm::stagedsync {
 
diff --git a/silkworm/node/db/stage.hpp b/silkworm/db/stage.hpp
similarity index 97%
rename from silkworm/node/db/stage.hpp
rename to silkworm/db/stage.hpp
index b868e9bc3c..78ef161fdf 100644
--- a/silkworm/node/db/stage.hpp
+++ b/silkworm/db/stage.hpp
@@ -20,12 +20,12 @@
 #include <exception>
 #include <mutex>
 
+#include <silkworm/db/etl_mdbx_collector.hpp>
+#include <silkworm/db/stages.hpp>
+#include <silkworm/db/tables.hpp>
 #include <silkworm/infra/common/ensure.hpp>
 #include <silkworm/infra/common/log.hpp>
 #include <silkworm/infra/concurrency/stoppable.hpp>
-#include <silkworm/node/db/etl_mdbx_collector.hpp>
-#include <silkworm/node/db/stages.hpp>
-#include <silkworm/node/db/tables.hpp>
 
 namespace silkworm::stagedsync {
 
diff --git a/silkworm/node/db/stages.cpp b/silkworm/db/stages.cpp
similarity index 100%
rename from silkworm/node/db/stages.cpp
rename to silkworm/db/stages.cpp
diff --git a/silkworm/node/db/stages.hpp b/silkworm/db/stages.hpp
similarity index 98%
rename from silkworm/node/db/stages.hpp
rename to silkworm/db/stages.hpp
index 9f9bfd059b..d165bbd398 100644
--- a/silkworm/node/db/stages.hpp
+++ b/silkworm/db/stages.hpp
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include <silkworm/node/db/mdbx.hpp>
-#include <silkworm/node/db/tables.hpp>
+#include <silkworm/db/mdbx.hpp>
+#include <silkworm/db/tables.hpp>
 
 /*
     List of stages keys stored into SyncStage table
diff --git a/silkworm/node/db/tables.cpp b/silkworm/db/tables.cpp
similarity index 98%
rename from silkworm/node/db/tables.cpp
rename to silkworm/db/tables.cpp
index b28546fd81..64a80249da 100644
--- a/silkworm/node/db/tables.cpp
+++ b/silkworm/db/tables.cpp
@@ -18,7 +18,7 @@
 
 #include <stdexcept>
 
-#include <silkworm/node/db/access_layer.hpp>
+#include <silkworm/db/access_layer.hpp>
 
 namespace silkworm::db::table {
 
diff --git a/silkworm/node/db/tables.hpp b/silkworm/db/tables.hpp
similarity index 99%
rename from silkworm/node/db/tables.hpp
rename to silkworm/db/tables.hpp
index 1c690d892a..f2c41c06d1 100644
--- a/silkworm/node/db/tables.hpp
+++ b/silkworm/db/tables.hpp
@@ -18,8 +18,8 @@
 
 #include <optional>
 
-#include <silkworm/node/db/mdbx.hpp>
-#include <silkworm/node/db/util.hpp>
+#include <silkworm/db/mdbx.hpp>
+#include <silkworm/db/util.hpp>
 
 /// Part of the compatibility layer with the Erigon DB format.
 
diff --git a/silkworm/node/db/test_util/temp_chain_data.cpp b/silkworm/db/test_util/temp_chain_data.cpp
similarity index 95%
rename from silkworm/node/db/test_util/temp_chain_data.cpp
rename to silkworm/db/test_util/temp_chain_data.cpp
index d12a1a3807..24af352daa 100644
--- a/silkworm/node/db/test_util/temp_chain_data.cpp
+++ b/silkworm/db/test_util/temp_chain_data.cpp
@@ -19,8 +19,8 @@
 #include <nlohmann/json.hpp>
 
 #include <silkworm/core/chain/genesis.hpp>
-#include <silkworm/node/db/genesis.hpp>
-#include <silkworm/node/db/tables.hpp>
+#include <silkworm/db/genesis.hpp>
+#include <silkworm/db/tables.hpp>
 
 namespace silkworm::db::test_util {
 
diff --git a/silkworm/node/db/test_util/temp_chain_data.hpp b/silkworm/db/test_util/temp_chain_data.hpp
similarity index 96%
rename from silkworm/node/db/test_util/temp_chain_data.hpp
rename to silkworm/db/test_util/temp_chain_data.hpp
index c79246b5ca..9f03de1da0 100644
--- a/silkworm/node/db/test_util/temp_chain_data.hpp
+++ b/silkworm/db/test_util/temp_chain_data.hpp
@@ -19,9 +19,9 @@
 #include <memory>
 
 #include <silkworm/core/chain/config.hpp>
+#include <silkworm/db/mdbx.hpp>
+#include <silkworm/db/prune_mode.hpp>
 #include <silkworm/infra/common/directories.hpp>
-#include <silkworm/node/db/mdbx.hpp>
-#include <silkworm/node/db/prune_mode.hpp>
 
 namespace silkworm::db::test_util {
 
diff --git a/silkworm/node/db/util.cpp b/silkworm/db/util.cpp
similarity index 100%
rename from silkworm/node/db/util.cpp
rename to silkworm/db/util.cpp
diff --git a/silkworm/node/db/util.hpp b/silkworm/db/util.hpp
similarity index 99%
rename from silkworm/node/db/util.hpp
rename to silkworm/db/util.hpp
index faaff23f18..c549264c82 100644
--- a/silkworm/node/db/util.hpp
+++ b/silkworm/db/util.hpp
@@ -31,7 +31,7 @@ see its package dbutils.
 #include <silkworm/core/common/base.hpp>
 #include <silkworm/core/common/bytes.hpp>
 #include <silkworm/core/types/block.hpp>
-#include <silkworm/node/db/mdbx.hpp>
+#include <silkworm/db/mdbx.hpp>
 
 namespace silkworm::db {
 
diff --git a/silkworm/node/CMakeLists.txt b/silkworm/node/CMakeLists.txt
index 2cf4afcd65..e615913d09 100644
--- a/silkworm/node/CMakeLists.txt
+++ b/silkworm/node/CMakeLists.txt
@@ -16,7 +16,6 @@
 
 include("${SILKWORM_MAIN_DIR}/cmake/common/targets.cmake")
 
-add_subdirectory(db)
 add_subdirectory(stagedsync/stages)
 
 find_package(absl REQUIRED strings)
@@ -55,5 +54,5 @@ silkworm_library(
   silkworm_node
   PUBLIC ${SILKWORM_NODE_PUBLIC_LIBS}
   PRIVATE ${SILKWORM_NODE_PRIVATE_LIBS}
-  EXCLUDE_REGEX "node/db" "node/stagedsync/stages"
+  EXCLUDE_REGEX "node/stagedsync/stages"
 )
diff --git a/silkworm/node/backend/ethereum_backend_test.cpp b/silkworm/node/backend/ethereum_backend_test.cpp
index 749bef5e33..d3abfa12fb 100644
--- a/silkworm/node/backend/ethereum_backend_test.cpp
+++ b/silkworm/node/backend/ethereum_backend_test.cpp
@@ -19,8 +19,8 @@
 #include <catch2/catch.hpp>
 
 #include <silkworm/core/common/base.hpp>
+#include <silkworm/db/mdbx.hpp>
 #include <silkworm/infra/common/directories.hpp>
-#include <silkworm/node/db/mdbx.hpp>
 
 namespace silkworm {
 
diff --git a/silkworm/node/backend/remote/backend_kv_server_test.cpp b/silkworm/node/backend/remote/backend_kv_server_test.cpp
index 89789017e2..599f1a42e2 100644
--- a/silkworm/node/backend/remote/backend_kv_server_test.cpp
+++ b/silkworm/node/backend/remote/backend_kv_server_test.cpp
@@ -33,6 +33,7 @@
 #include <silkworm/core/common/base.hpp>
 #include <silkworm/core/common/bytes.hpp>
 #include <silkworm/core/common/empty_hashes.hpp>
+#include <silkworm/db/mdbx.hpp>
 #include <silkworm/infra/common/directories.hpp>
 #include <silkworm/infra/common/log.hpp>
 #include <silkworm/infra/common/os.hpp>
@@ -44,7 +45,6 @@
 #include <silkworm/node/backend/remote/grpc/backend_calls.hpp>
 #include <silkworm/node/backend/remote/grpc/kv_calls.hpp>
 #include <silkworm/node/backend/state_change_collection.hpp>
-#include <silkworm/node/db/mdbx.hpp>
 #include <silkworm/sentry/api/common/sentry_client.hpp>
 
 using namespace std::chrono_literals;
diff --git a/silkworm/node/backend/remote/grpc/kv_calls.hpp b/silkworm/node/backend/remote/grpc/kv_calls.hpp
index c27958b71d..0bfa36610e 100644
--- a/silkworm/node/backend/remote/grpc/kv_calls.hpp
+++ b/silkworm/node/backend/remote/grpc/kv_calls.hpp
@@ -29,12 +29,12 @@
 #include <grpcpp/grpcpp.h>
 
 #include <silkworm/core/chain/config.hpp>
+#include <silkworm/db/mdbx.hpp>
 #include <silkworm/infra/grpc/server/call.hpp>
 #include <silkworm/infra/grpc/server/server.hpp>
 #include <silkworm/interfaces/remote/kv.grpc.pb.h>
 #include <silkworm/node/backend/ethereum_backend.hpp>
 #include <silkworm/node/backend/state_change_collection.hpp>
-#include <silkworm/node/db/mdbx.hpp>
 
 // KV API protocol versions
 // 5.1.0 - first issue
diff --git a/silkworm/node/common/node_settings.hpp b/silkworm/node/common/node_settings.hpp
index e8c96a6a9e..af83fd8f68 100644
--- a/silkworm/node/common/node_settings.hpp
+++ b/silkworm/node/common/node_settings.hpp
@@ -29,10 +29,10 @@
 
 #include <silkworm/core/chain/config.hpp>
 #include <silkworm/core/common/base.hpp>
+#include <silkworm/db/etl/collector_settings.hpp>
+#include <silkworm/db/mdbx.hpp>
+#include <silkworm/db/prune_mode.hpp>
 #include <silkworm/infra/common/directories.hpp>
-#include <silkworm/node/db/etl/collector_settings.hpp>
-#include <silkworm/node/db/mdbx.hpp>
-#include <silkworm/node/db/prune_mode.hpp>
 
 namespace silkworm {
 
diff --git a/silkworm/node/node.cpp b/silkworm/node/node.cpp
index f9649308af..f6bbdab383 100644
--- a/silkworm/node/node.cpp
+++ b/silkworm/node/node.cpp
@@ -18,6 +18,8 @@
 
 #include <utility>
 
+#include <silkworm/db/snapshot_sync.hpp>
+#include <silkworm/db/snapshots/bittorrent/client.hpp>
 #include <silkworm/infra/common/log.hpp>
 #include <silkworm/infra/common/os.hpp>
 #include <silkworm/infra/concurrency/awaitable_wait_for_all.hpp>
@@ -25,9 +27,7 @@
 #include <silkworm/node/backend/remote/backend_kv_server.hpp>
 #include <silkworm/node/common/preverified_hashes.hpp>
 #include <silkworm/node/resource_usage.hpp>
-#include <silkworm/node/snapshot_sync.hpp>
 #include <silkworm/node/stagedsync/server.hpp>
-#include <silkworm/snapshots/bittorrent/client.hpp>
 
 namespace silkworm::node {
 
diff --git a/silkworm/node/node.hpp b/silkworm/node/node.hpp
index 63c5912d96..a81fa9b0c9 100644
--- a/silkworm/node/node.hpp
+++ b/silkworm/node/node.hpp
@@ -20,13 +20,13 @@
 
 #include <silkworm/infra/concurrency/task.hpp>
 
+#include <silkworm/db/mdbx.hpp>
+#include <silkworm/db/snapshots/settings.hpp>
 #include <silkworm/node/common/node_settings.hpp>
-#include <silkworm/node/db/mdbx.hpp>
 #include <silkworm/node/settings.hpp>
 #include <silkworm/node/stagedsync/local_client.hpp>
 #include <silkworm/sentry/api/common/sentry_client.hpp>
 #include <silkworm/sentry/settings.hpp>
-#include <silkworm/snapshots/settings.hpp>
 
 namespace silkworm::node {
 
diff --git a/silkworm/node/settings.hpp b/silkworm/node/settings.hpp
index 433e0ba654..78f10ab83f 100644
--- a/silkworm/node/settings.hpp
+++ b/silkworm/node/settings.hpp
@@ -18,11 +18,11 @@
 
 #include <memory>
 
+#include <silkworm/db/snapshots/settings.hpp>
 #include <silkworm/infra/common/log.hpp>
 #include <silkworm/infra/grpc/server/server_settings.hpp>
 #include <silkworm/node/common/node_settings.hpp>
 #include <silkworm/sentry/settings.hpp>
-#include <silkworm/snapshots/settings.hpp>
 
 namespace silkworm::node {
 
diff --git a/silkworm/node/stagedsync/execution_engine.cpp b/silkworm/node/stagedsync/execution_engine.cpp
index f68a03406a..f7b28e1346 100644
--- a/silkworm/node/stagedsync/execution_engine.cpp
+++ b/silkworm/node/stagedsync/execution_engine.cpp
@@ -18,8 +18,8 @@
 
 #include <set>
 
+#include <silkworm/db/access_layer.hpp>
 #include <silkworm/infra/common/ensure.hpp>
-#include <silkworm/node/db/access_layer.hpp>
 
 namespace silkworm::stagedsync {
 
diff --git a/silkworm/node/stagedsync/execution_engine.hpp b/silkworm/node/stagedsync/execution_engine.hpp
index dceb49fc8d..36f6564324 100644
--- a/silkworm/node/stagedsync/execution_engine.hpp
+++ b/silkworm/node/stagedsync/execution_engine.hpp
@@ -28,7 +28,7 @@
 
 #include <silkworm/core/common/lru_cache.hpp>
 #include <silkworm/core/types/block.hpp>
-#include <silkworm/node/db/stage.hpp>
+#include <silkworm/db/stage.hpp>
 #include <silkworm/node/stagedsync/execution_pipeline.hpp>
 
 #include "forks/extending_fork.hpp"
diff --git a/silkworm/node/stagedsync/execution_engine_test.cpp b/silkworm/node/stagedsync/execution_engine_test.cpp
index 7e3fc695a2..9392b13fd4 100644
--- a/silkworm/node/stagedsync/execution_engine_test.cpp
+++ b/silkworm/node/stagedsync/execution_engine_test.cpp
@@ -24,12 +24,12 @@
 #include <silkworm/core/common/bytes_to_string.hpp>
 #include <silkworm/core/common/empty_hashes.hpp>
 #include <silkworm/core/types/block.hpp>
+#include <silkworm/db/genesis.hpp>
+#include <silkworm/db/stages.hpp>
+#include <silkworm/db/test_util/temp_chain_data.hpp>
 #include <silkworm/infra/common/environment.hpp>
 #include <silkworm/infra/test_util/log.hpp>
 #include <silkworm/node/common/preverified_hashes.hpp>
-#include <silkworm/node/db/genesis.hpp>
-#include <silkworm/node/db/stages.hpp>
-#include <silkworm/node/db/test_util/temp_chain_data.hpp>
 #include <silkworm/node/test_util/temp_chain_data_node_settings.hpp>
 
 namespace silkworm {
diff --git a/silkworm/node/stagedsync/execution_pipeline.hpp b/silkworm/node/stagedsync/execution_pipeline.hpp
index 2096a124de..7fbadac939 100644
--- a/silkworm/node/stagedsync/execution_pipeline.hpp
+++ b/silkworm/node/stagedsync/execution_pipeline.hpp
@@ -21,8 +21,8 @@
 #include <vector>
 
 #include <silkworm/core/types/hash.hpp>
+#include <silkworm/db/stage.hpp>
 #include <silkworm/node/common/node_settings.hpp>
-#include <silkworm/node/db/stage.hpp>
 
 namespace silkworm::stagedsync {
 
diff --git a/silkworm/node/stagedsync/forks/canonical_chain.cpp b/silkworm/node/stagedsync/forks/canonical_chain.cpp
index acee1a6639..f361dfe94e 100644
--- a/silkworm/node/stagedsync/forks/canonical_chain.cpp
+++ b/silkworm/node/stagedsync/forks/canonical_chain.cpp
@@ -18,9 +18,9 @@
 
 #include <set>
 
+#include <silkworm/db/access_layer.hpp>
+#include <silkworm/db/db_utils.hpp>
 #include <silkworm/infra/common/ensure.hpp>
-#include <silkworm/node/db/access_layer.hpp>
-#include <silkworm/node/db/db_utils.hpp>
 
 namespace silkworm::stagedsync {
 
diff --git a/silkworm/node/stagedsync/forks/canonical_chain.hpp b/silkworm/node/stagedsync/forks/canonical_chain.hpp
index 15882c3181..f81fd73f45 100644
--- a/silkworm/node/stagedsync/forks/canonical_chain.hpp
+++ b/silkworm/node/stagedsync/forks/canonical_chain.hpp
@@ -24,8 +24,8 @@
 
 #include <silkworm/core/common/lru_cache.hpp>
 #include <silkworm/core/types/block.hpp>
-#include <silkworm/node/db/access_layer.hpp>
-#include <silkworm/node/db/stage.hpp>
+#include <silkworm/db/access_layer.hpp>
+#include <silkworm/db/stage.hpp>
 #include <silkworm/node/stagedsync/execution_pipeline.hpp>
 
 namespace silkworm::stagedsync {
diff --git a/silkworm/node/stagedsync/forks/extending_fork.hpp b/silkworm/node/stagedsync/forks/extending_fork.hpp
index 10a2e32843..be2dc97a2f 100644
--- a/silkworm/node/stagedsync/forks/extending_fork.hpp
+++ b/silkworm/node/stagedsync/forks/extending_fork.hpp
@@ -20,10 +20,10 @@
 
 #include <boost/asio/io_context.hpp>
 
+#include <silkworm/db/memory_mutation.hpp>
 #include <silkworm/infra/concurrency/awaitable_future.hpp>
 
 #include "fork.hpp"
-#include "silkworm/node/db/memory_mutation.hpp"
 
 namespace silkworm::stagedsync {
 
diff --git a/silkworm/node/stagedsync/forks/fork.cpp b/silkworm/node/stagedsync/forks/fork.cpp
index 48a916901d..d5a532cbbb 100644
--- a/silkworm/node/stagedsync/forks/fork.cpp
+++ b/silkworm/node/stagedsync/forks/fork.cpp
@@ -18,10 +18,10 @@
 
 #include <set>
 
+#include <silkworm/db/access_layer.hpp>
+#include <silkworm/db/db_utils.hpp>
+#include <silkworm/db/stage.hpp>
 #include <silkworm/infra/common/ensure.hpp>
-#include <silkworm/node/db/access_layer.hpp>
-#include <silkworm/node/db/db_utils.hpp>
-#include <silkworm/node/db/stage.hpp>
 
 #include "main_chain.hpp"
 
diff --git a/silkworm/node/stagedsync/forks/fork.hpp b/silkworm/node/stagedsync/forks/fork.hpp
index 9c6fdc4e7c..1dae2c2c2c 100644
--- a/silkworm/node/stagedsync/forks/fork.hpp
+++ b/silkworm/node/stagedsync/forks/fork.hpp
@@ -23,10 +23,10 @@
 #include <vector>
 
 #include <silkworm/core/types/block.hpp>
+#include <silkworm/db/memory_mutation.hpp>
 #include <silkworm/node/stagedsync/execution_pipeline.hpp>
 
 #include "canonical_chain.hpp"
-#include "silkworm/node/db/memory_mutation.hpp"
 #include "verification_result.hpp"
 
 namespace silkworm::stagedsync {
diff --git a/silkworm/node/stagedsync/forks/fork_test.cpp b/silkworm/node/stagedsync/forks/fork_test.cpp
index b51ff605f8..ed2f8718b8 100644
--- a/silkworm/node/stagedsync/forks/fork_test.cpp
+++ b/silkworm/node/stagedsync/forks/fork_test.cpp
@@ -22,12 +22,12 @@
 #include <catch2/catch.hpp>
 
 #include <silkworm/core/common/empty_hashes.hpp>
+#include <silkworm/db/genesis.hpp>
+#include <silkworm/db/stages.hpp>
+#include <silkworm/db/test_util/temp_chain_data.hpp>
 #include <silkworm/infra/common/environment.hpp>
 #include <silkworm/infra/test_util/log.hpp>
 #include <silkworm/node/common/preverified_hashes.hpp>
-#include <silkworm/node/db/genesis.hpp>
-#include <silkworm/node/db/stages.hpp>
-#include <silkworm/node/db/test_util/temp_chain_data.hpp>
 #include <silkworm/node/test_util/temp_chain_data_node_settings.hpp>
 
 #include "main_chain.hpp"
diff --git a/silkworm/node/stagedsync/forks/main_chain.cpp b/silkworm/node/stagedsync/forks/main_chain.cpp
index 1aaeda1ebd..a9466b7dd8 100644
--- a/silkworm/node/stagedsync/forks/main_chain.cpp
+++ b/silkworm/node/stagedsync/forks/main_chain.cpp
@@ -21,9 +21,9 @@
 #include <gsl/util>
 #include <magic_enum.hpp>
 
+#include <silkworm/db/access_layer.hpp>
 #include <silkworm/infra/common/ensure.hpp>
 #include <silkworm/infra/common/stopwatch.hpp>
-#include <silkworm/node/db/access_layer.hpp>
 
 #include "extending_fork.hpp"
 
diff --git a/silkworm/node/stagedsync/forks/main_chain.hpp b/silkworm/node/stagedsync/forks/main_chain.hpp
index 24ba1e51a9..a226511bb6 100644
--- a/silkworm/node/stagedsync/forks/main_chain.hpp
+++ b/silkworm/node/stagedsync/forks/main_chain.hpp
@@ -26,8 +26,8 @@
 
 #include <silkworm/core/common/lru_cache.hpp>
 #include <silkworm/core/types/block.hpp>
-#include <silkworm/node/db/memory_mutation.hpp>
-#include <silkworm/node/db/stage.hpp>
+#include <silkworm/db/memory_mutation.hpp>
+#include <silkworm/db/stage.hpp>
 #include <silkworm/node/stagedsync/execution_pipeline.hpp>
 
 #include "canonical_chain.hpp"
diff --git a/silkworm/node/stagedsync/forks/main_chain_test.cpp b/silkworm/node/stagedsync/forks/main_chain_test.cpp
index 00f9600465..ccd9b13393 100644
--- a/silkworm/node/stagedsync/forks/main_chain_test.cpp
+++ b/silkworm/node/stagedsync/forks/main_chain_test.cpp
@@ -24,12 +24,12 @@
 #include <silkworm/core/common/bytes_to_string.hpp>
 #include <silkworm/core/common/empty_hashes.hpp>
 #include <silkworm/core/types/block.hpp>
+#include <silkworm/db/genesis.hpp>
+#include <silkworm/db/stages.hpp>
+#include <silkworm/db/test_util/temp_chain_data.hpp>
 #include <silkworm/infra/common/environment.hpp>
 #include <silkworm/infra/test_util/log.hpp>
 #include <silkworm/node/common/preverified_hashes.hpp>
-#include <silkworm/node/db/genesis.hpp>
-#include <silkworm/node/db/stages.hpp>
-#include <silkworm/node/db/test_util/temp_chain_data.hpp>
 #include <silkworm/node/test_util/temp_chain_data_node_settings.hpp>
 
 namespace silkworm {
diff --git a/silkworm/node/stagedsync/local_client_test.cpp b/silkworm/node/stagedsync/local_client_test.cpp
index 2d28265c73..faae4f86f6 100644
--- a/silkworm/node/stagedsync/local_client_test.cpp
+++ b/silkworm/node/stagedsync/local_client_test.cpp
@@ -18,8 +18,8 @@
 
 #include <catch2/catch.hpp>
 
+#include <silkworm/db/test_util/temp_chain_data.hpp>
 #include <silkworm/infra/test_util/log.hpp>
-#include <silkworm/node/db/test_util/temp_chain_data.hpp>
 #include <silkworm/node/stagedsync/server.hpp>
 #include <silkworm/node/test_util/temp_chain_data_node_settings.hpp>
 
diff --git a/silkworm/node/stagedsync/remote_client_test.cpp b/silkworm/node/stagedsync/remote_client_test.cpp
index c8fde29ce2..45612c57a7 100644
--- a/silkworm/node/stagedsync/remote_client_test.cpp
+++ b/silkworm/node/stagedsync/remote_client_test.cpp
@@ -18,9 +18,9 @@
 
 #include <catch2/catch.hpp>
 
+#include <silkworm/db/test_util/temp_chain_data.hpp>
 #include <silkworm/infra/grpc/client/client_context_pool.hpp>
 #include <silkworm/infra/test_util/log.hpp>
-#include <silkworm/node/db/test_util/temp_chain_data.hpp>
 
 namespace silkworm::execution {
 
diff --git a/silkworm/node/stagedsync/stages/stage_blockhashes.hpp b/silkworm/node/stagedsync/stages/stage_blockhashes.hpp
index cc6545295a..75255a04db 100644
--- a/silkworm/node/stagedsync/stages/stage_blockhashes.hpp
+++ b/silkworm/node/stagedsync/stages/stage_blockhashes.hpp
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include <silkworm/node/db/etl/collector_settings.hpp>
-#include <silkworm/node/db/stage.hpp>
+#include <silkworm/db/etl/collector_settings.hpp>
+#include <silkworm/db/stage.hpp>
 
 namespace silkworm::stagedsync {
 
diff --git a/silkworm/node/stagedsync/stages/stage_bodies.cpp b/silkworm/node/stagedsync/stages/stage_bodies.cpp
index f384a35477..ea799e35ac 100644
--- a/silkworm/node/stagedsync/stages/stage_bodies.cpp
+++ b/silkworm/node/stagedsync/stages/stage_bodies.cpp
@@ -20,10 +20,10 @@
 
 #include <magic_enum.hpp>
 
+#include <silkworm/db/access_layer.hpp>
+#include <silkworm/db/stages.hpp>
 #include <silkworm/infra/common/log.hpp>
 #include <silkworm/infra/common/measure.hpp>
-#include <silkworm/node/db/access_layer.hpp>
-#include <silkworm/node/db/stages.hpp>
 
 namespace silkworm::stagedsync {
 
diff --git a/silkworm/node/stagedsync/stages/stage_bodies.hpp b/silkworm/node/stagedsync/stages/stage_bodies.hpp
index 2cecd277d1..0d93bdce67 100644
--- a/silkworm/node/stagedsync/stages/stage_bodies.hpp
+++ b/silkworm/node/stagedsync/stages/stage_bodies.hpp
@@ -21,10 +21,10 @@
 #include <silkworm/core/chain/config.hpp>
 #include <silkworm/core/protocol/rule_set.hpp>
 #include <silkworm/core/types/block.hpp>
+#include <silkworm/db/access_layer.hpp>
+#include <silkworm/db/buffer.hpp>
+#include <silkworm/db/stage.hpp>
 #include <silkworm/infra/concurrency/containers.hpp>
-#include <silkworm/node/db/access_layer.hpp>
-#include <silkworm/node/db/buffer.hpp>
-#include <silkworm/node/db/stage.hpp>
 
 namespace silkworm::stagedsync {
 
diff --git a/silkworm/node/stagedsync/stages/stage_bodies_test.cpp b/silkworm/node/stagedsync/stages/stage_bodies_test.cpp
index 25bc1a040f..2024980fa9 100644
--- a/silkworm/node/stagedsync/stages/stage_bodies_test.cpp
+++ b/silkworm/node/stagedsync/stages/stage_bodies_test.cpp
@@ -22,9 +22,9 @@
 
 #include <silkworm/core/common/bytes_to_string.hpp>
 #include <silkworm/core/types/block.hpp>
-#include <silkworm/node/db/genesis.hpp>
-#include <silkworm/node/db/stages.hpp>
-#include <silkworm/node/db/test_util/temp_chain_data.hpp>
+#include <silkworm/db/genesis.hpp>
+#include <silkworm/db/stages.hpp>
+#include <silkworm/db/test_util/temp_chain_data.hpp>
 
 namespace silkworm {
 
diff --git a/silkworm/node/stagedsync/stages/stage_call_trace_index.hpp b/silkworm/node/stagedsync/stages/stage_call_trace_index.hpp
index 436505eda4..43f8f4f7e0 100644
--- a/silkworm/node/stagedsync/stages/stage_call_trace_index.hpp
+++ b/silkworm/node/stagedsync/stages/stage_call_trace_index.hpp
@@ -18,10 +18,10 @@
 
 #include <stdexcept>
 
-#include <silkworm/node/db/bitmap.hpp>
-#include <silkworm/node/db/etl/collector_settings.hpp>
-#include <silkworm/node/db/prune_mode.hpp>
-#include <silkworm/node/db/stage.hpp>
+#include <silkworm/db/bitmap.hpp>
+#include <silkworm/db/etl/collector_settings.hpp>
+#include <silkworm/db/prune_mode.hpp>
+#include <silkworm/db/stage.hpp>
 
 namespace silkworm::stagedsync {
 
diff --git a/silkworm/node/stagedsync/stages/stage_execution.cpp b/silkworm/node/stagedsync/stages/stage_execution.cpp
index 3deb5390b9..51bcb07a0a 100644
--- a/silkworm/node/stagedsync/stages/stage_execution.cpp
+++ b/silkworm/node/stagedsync/stages/stage_execution.cpp
@@ -25,10 +25,10 @@
 #include <silkworm/core/common/endian.hpp>
 #include <silkworm/core/execution/call_tracer.hpp>
 #include <silkworm/core/execution/processor.hpp>
+#include <silkworm/db/access_layer.hpp>
+#include <silkworm/db/buffer.hpp>
 #include <silkworm/infra/common/decoding_exception.hpp>
 #include <silkworm/infra/common/stopwatch.hpp>
-#include <silkworm/node/db/access_layer.hpp>
-#include <silkworm/node/db/buffer.hpp>
 
 namespace silkworm::stagedsync {
 
diff --git a/silkworm/node/stagedsync/stages/stage_execution.hpp b/silkworm/node/stagedsync/stages/stage_execution.hpp
index 748e0e7aad..0bc93548c4 100644
--- a/silkworm/node/stagedsync/stages/stage_execution.hpp
+++ b/silkworm/node/stagedsync/stages/stage_execution.hpp
@@ -21,8 +21,8 @@
 #include <silkworm/core/chain/config.hpp>
 #include <silkworm/core/execution/evm.hpp>
 #include <silkworm/core/protocol/rule_set.hpp>
-#include <silkworm/node/db/prune_mode.hpp>
-#include <silkworm/node/db/stage.hpp>
+#include <silkworm/db/prune_mode.hpp>
+#include <silkworm/db/stage.hpp>
 
 namespace silkworm::stagedsync {
 
diff --git a/silkworm/node/stagedsync/stages/stage_finish.cpp b/silkworm/node/stagedsync/stages/stage_finish.cpp
index cbc2f68245..eb13da6ba8 100644
--- a/silkworm/node/stagedsync/stages/stage_finish.cpp
+++ b/silkworm/node/stagedsync/stages/stage_finish.cpp
@@ -19,7 +19,7 @@
 #include <magic_enum.hpp>
 
 #include <silkworm/core/common/bytes_to_string.hpp>
-#include <silkworm/node/db/access_layer.hpp>
+#include <silkworm/db/access_layer.hpp>
 
 namespace silkworm::stagedsync {
 
diff --git a/silkworm/node/stagedsync/stages/stage_finish.hpp b/silkworm/node/stagedsync/stages/stage_finish.hpp
index 4460eb5533..3fde44f3c5 100644
--- a/silkworm/node/stagedsync/stages/stage_finish.hpp
+++ b/silkworm/node/stagedsync/stages/stage_finish.hpp
@@ -18,7 +18,7 @@
 
 #include <string>
 
-#include <silkworm/node/db/stage.hpp>
+#include <silkworm/db/stage.hpp>
 
 namespace silkworm::stagedsync {
 
diff --git a/silkworm/node/stagedsync/stages/stage_hashstate.cpp b/silkworm/node/stagedsync/stages/stage_hashstate.cpp
index e5a50126c4..76ff196c43 100644
--- a/silkworm/node/stagedsync/stages/stage_hashstate.cpp
+++ b/silkworm/node/stagedsync/stages/stage_hashstate.cpp
@@ -24,8 +24,8 @@
 #include <silkworm/core/common/endian.hpp>
 #include <silkworm/core/types/address.hpp>
 #include <silkworm/core/types/evmc_bytes32.hpp>
+#include <silkworm/db/access_layer.hpp>
 #include <silkworm/infra/common/decoding_exception.hpp>
-#include <silkworm/node/db/access_layer.hpp>
 
 namespace silkworm::stagedsync {
 
diff --git a/silkworm/node/stagedsync/stages/stage_hashstate.hpp b/silkworm/node/stagedsync/stages/stage_hashstate.hpp
index 42bf6fd554..29af17649c 100644
--- a/silkworm/node/stagedsync/stages/stage_hashstate.hpp
+++ b/silkworm/node/stagedsync/stages/stage_hashstate.hpp
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include <silkworm/node/db/etl/collector_settings.hpp>
-#include <silkworm/node/db/stage.hpp>
+#include <silkworm/db/etl/collector_settings.hpp>
+#include <silkworm/db/stage.hpp>
 
 namespace silkworm::stagedsync {
 
diff --git a/silkworm/node/stagedsync/stages/stage_headers.cpp b/silkworm/node/stagedsync/stages/stage_headers.cpp
index 1e06b047a7..87a1773cb4 100644
--- a/silkworm/node/stagedsync/stages/stage_headers.cpp
+++ b/silkworm/node/stagedsync/stages/stage_headers.cpp
@@ -21,12 +21,12 @@
 
 #include <magic_enum.hpp>
 
+#include <silkworm/db/db_utils.hpp>
+#include <silkworm/db/stages.hpp>
 #include <silkworm/infra/common/ensure.hpp>
 #include <silkworm/infra/common/environment.hpp>
 #include <silkworm/infra/common/log.hpp>
 #include <silkworm/infra/common/measure.hpp>
-#include <silkworm/node/db/db_utils.hpp>
-#include <silkworm/node/db/stages.hpp>
 
 namespace silkworm::stagedsync {
 
diff --git a/silkworm/node/stagedsync/stages/stage_headers.hpp b/silkworm/node/stagedsync/stages/stage_headers.hpp
index 87b7bb6058..25d0ce410b 100644
--- a/silkworm/node/stagedsync/stages/stage_headers.hpp
+++ b/silkworm/node/stagedsync/stages/stage_headers.hpp
@@ -18,9 +18,9 @@
 #include <atomic>
 
 #include <silkworm/core/types/hash.hpp>
+#include <silkworm/db/access_layer.hpp>
+#include <silkworm/db/stage.hpp>
 #include <silkworm/infra/common/measure.hpp>
-#include <silkworm/node/db/access_layer.hpp>
-#include <silkworm/node/db/stage.hpp>
 
 namespace silkworm::stagedsync {
 
diff --git a/silkworm/node/stagedsync/stages/stage_headers_test.cpp b/silkworm/node/stagedsync/stages/stage_headers_test.cpp
index bd728b7cfe..80176b4c79 100644
--- a/silkworm/node/stagedsync/stages/stage_headers_test.cpp
+++ b/silkworm/node/stagedsync/stages/stage_headers_test.cpp
@@ -20,8 +20,8 @@
 
 #include <silkworm/core/chain/genesis.hpp>
 #include <silkworm/core/common/bytes_to_string.hpp>
-#include <silkworm/node/db/genesis.hpp>
-#include <silkworm/node/db/test_util/temp_chain_data.hpp>
+#include <silkworm/db/genesis.hpp>
+#include <silkworm/db/test_util/temp_chain_data.hpp>
 
 namespace silkworm {
 
diff --git a/silkworm/node/stagedsync/stages/stage_history_index.hpp b/silkworm/node/stagedsync/stages/stage_history_index.hpp
index a318f28a8b..a8d3c71811 100644
--- a/silkworm/node/stagedsync/stages/stage_history_index.hpp
+++ b/silkworm/node/stagedsync/stages/stage_history_index.hpp
@@ -16,10 +16,10 @@
 
 #pragma once
 
-#include <silkworm/node/db/bitmap.hpp>
-#include <silkworm/node/db/etl/collector_settings.hpp>
-#include <silkworm/node/db/prune_mode.hpp>
-#include <silkworm/node/db/stage.hpp>
+#include <silkworm/db/bitmap.hpp>
+#include <silkworm/db/etl/collector_settings.hpp>
+#include <silkworm/db/prune_mode.hpp>
+#include <silkworm/db/stage.hpp>
 
 namespace silkworm::stagedsync {
 
diff --git a/silkworm/node/stagedsync/stages/stage_history_index_test.cpp b/silkworm/node/stagedsync/stages/stage_history_index_test.cpp
index 8b4c2ff2f8..620c5849ab 100644
--- a/silkworm/node/stagedsync/stages/stage_history_index_test.cpp
+++ b/silkworm/node/stagedsync/stages/stage_history_index_test.cpp
@@ -22,12 +22,12 @@
 #include <silkworm/core/execution/execution.hpp>
 #include <silkworm/core/protocol/param.hpp>
 #include <silkworm/core/types/address.hpp>
+#include <silkworm/db/access_layer.hpp>
+#include <silkworm/db/bitmap.hpp>
+#include <silkworm/db/buffer.hpp>
+#include <silkworm/db/stages.hpp>
+#include <silkworm/db/test_util/temp_chain_data.hpp>
 #include <silkworm/infra/test_util/log.hpp>
-#include <silkworm/node/db/access_layer.hpp>
-#include <silkworm/node/db/bitmap.hpp>
-#include <silkworm/node/db/buffer.hpp>
-#include <silkworm/node/db/stages.hpp>
-#include <silkworm/node/db/test_util/temp_chain_data.hpp>
 #include <silkworm/node/stagedsync/stages/stage_history_index.hpp>
 
 using namespace evmc::literals;
diff --git a/silkworm/node/stagedsync/stages/stage_interhashes.cpp b/silkworm/node/stagedsync/stages/stage_interhashes.cpp
index 0ab3c88e6e..4bab22bdc8 100644
--- a/silkworm/node/stagedsync/stages/stage_interhashes.cpp
+++ b/silkworm/node/stagedsync/stages/stage_interhashes.cpp
@@ -27,9 +27,9 @@
 #include <silkworm/core/trie/nibbles.hpp>
 #include <silkworm/core/types/address.hpp>
 #include <silkworm/core/types/evmc_bytes32.hpp>
+#include <silkworm/db/access_layer.hpp>
 #include <silkworm/infra/common/decoding_exception.hpp>
 #include <silkworm/infra/common/stopwatch.hpp>
-#include <silkworm/node/db/access_layer.hpp>
 
 namespace silkworm::stagedsync {
 
diff --git a/silkworm/node/stagedsync/stages/stage_interhashes.hpp b/silkworm/node/stagedsync/stages/stage_interhashes.hpp
index 4a6c14564f..475c86063f 100644
--- a/silkworm/node/stagedsync/stages/stage_interhashes.hpp
+++ b/silkworm/node/stagedsync/stages/stage_interhashes.hpp
@@ -18,9 +18,9 @@
 
 #include <silkworm/core/trie/hash_builder.hpp>
 #include <silkworm/core/trie/prefix_set.hpp>
-#include <silkworm/node/db/etl/collector.hpp>
-#include <silkworm/node/db/etl/collector_settings.hpp>
-#include <silkworm/node/db/stage.hpp>
+#include <silkworm/db/etl/collector.hpp>
+#include <silkworm/db/etl/collector_settings.hpp>
+#include <silkworm/db/stage.hpp>
 #include <silkworm/node/stagedsync/stages/stage_interhashes/trie_loader.hpp>
 
 namespace silkworm::stagedsync {
diff --git a/silkworm/node/stagedsync/stages/stage_interhashes/_test.cpp b/silkworm/node/stagedsync/stages/stage_interhashes/_test.cpp
index 928bf2e945..e368c7ef69 100644
--- a/silkworm/node/stagedsync/stages/stage_interhashes/_test.cpp
+++ b/silkworm/node/stagedsync/stages/stage_interhashes/_test.cpp
@@ -22,9 +22,9 @@
 #include <silkworm/core/types/account.hpp>
 #include <silkworm/core/types/address.hpp>
 #include <silkworm/core/types/evmc_bytes32.hpp>
-#include <silkworm/node/db/etl_mdbx_collector.hpp>
-#include <silkworm/node/db/tables.hpp>
-#include <silkworm/node/db/test_util/temp_chain_data.hpp>
+#include <silkworm/db/etl_mdbx_collector.hpp>
+#include <silkworm/db/tables.hpp>
+#include <silkworm/db/test_util/temp_chain_data.hpp>
 #include <silkworm/node/stagedsync/stages/stage_interhashes/trie_cursor.hpp>
 #include <silkworm/node/stagedsync/stages/stage_interhashes/trie_loader.hpp>
 
diff --git a/silkworm/node/stagedsync/stages/stage_interhashes/trie_cursor.cpp b/silkworm/node/stagedsync/stages/stage_interhashes/trie_cursor.cpp
index 6881ce1799..90ec33cd65 100644
--- a/silkworm/node/stagedsync/stages/stage_interhashes/trie_cursor.cpp
+++ b/silkworm/node/stagedsync/stages/stage_interhashes/trie_cursor.cpp
@@ -21,8 +21,8 @@
 #include <gsl/narrow>
 
 #include <silkworm/core/trie/nibbles.hpp>
+#include <silkworm/db/util.hpp>
 #include <silkworm/infra/common/decoding_exception.hpp>
-#include <silkworm/node/db/util.hpp>
 
 namespace silkworm::trie {
 
diff --git a/silkworm/node/stagedsync/stages/stage_interhashes/trie_cursor.hpp b/silkworm/node/stagedsync/stages/stage_interhashes/trie_cursor.hpp
index cbbc510072..c5b7652931 100644
--- a/silkworm/node/stagedsync/stages/stage_interhashes/trie_cursor.hpp
+++ b/silkworm/node/stagedsync/stages/stage_interhashes/trie_cursor.hpp
@@ -20,8 +20,8 @@
 
 #include <silkworm/core/trie/node.hpp>
 #include <silkworm/core/trie/prefix_set.hpp>
-#include <silkworm/node/db/etl/collector.hpp>
-#include <silkworm/node/db/mdbx.hpp>
+#include <silkworm/db/etl/collector.hpp>
+#include <silkworm/db/mdbx.hpp>
 
 namespace silkworm::trie {
 
diff --git a/silkworm/node/stagedsync/stages/stage_interhashes/trie_loader.cpp b/silkworm/node/stagedsync/stages/stage_interhashes/trie_loader.cpp
index 997d81aad2..44de8a391d 100644
--- a/silkworm/node/stagedsync/stages/stage_interhashes/trie_loader.cpp
+++ b/silkworm/node/stagedsync/stages/stage_interhashes/trie_loader.cpp
@@ -21,9 +21,9 @@
 #include <silkworm/core/common/empty_hashes.hpp>
 #include <silkworm/core/trie/nibbles.hpp>
 #include <silkworm/core/types/account.hpp>
+#include <silkworm/db/tables.hpp>
 #include <silkworm/infra/common/decoding_exception.hpp>
 #include <silkworm/infra/concurrency/signal_handler.hpp>
-#include <silkworm/node/db/tables.hpp>
 
 namespace silkworm::trie {
 
diff --git a/silkworm/node/stagedsync/stages/stage_interhashes/trie_loader.hpp b/silkworm/node/stagedsync/stages/stage_interhashes/trie_loader.hpp
index 5e0c16bbaf..d2bed3e93d 100644
--- a/silkworm/node/stagedsync/stages/stage_interhashes/trie_loader.hpp
+++ b/silkworm/node/stagedsync/stages/stage_interhashes/trie_loader.hpp
@@ -18,8 +18,8 @@
 
 #include <silkworm/core/trie/hash_builder.hpp>
 #include <silkworm/core/trie/prefix_set.hpp>
-#include <silkworm/node/db/etl/collector.hpp>
-#include <silkworm/node/db/mdbx.hpp>
+#include <silkworm/db/etl/collector.hpp>
+#include <silkworm/db/mdbx.hpp>
 #include <silkworm/node/stagedsync/stages/stage_interhashes/trie_cursor.hpp>
 
 namespace silkworm::trie {
diff --git a/silkworm/node/stagedsync/stages/stage_log_index.cpp b/silkworm/node/stagedsync/stages/stage_log_index.cpp
index 498eee1950..20684528d5 100644
--- a/silkworm/node/stagedsync/stages/stage_log_index.cpp
+++ b/silkworm/node/stagedsync/stages/stage_log_index.cpp
@@ -21,7 +21,7 @@
 #include <gsl/narrow>
 #include <magic_enum.hpp>
 
-#include <silkworm/node/db/log_cbor.hpp>
+#include <silkworm/db/log_cbor.hpp>
 
 namespace silkworm::stagedsync {
 
diff --git a/silkworm/node/stagedsync/stages/stage_log_index.hpp b/silkworm/node/stagedsync/stages/stage_log_index.hpp
index 9683e1ac6c..a5b760e04a 100644
--- a/silkworm/node/stagedsync/stages/stage_log_index.hpp
+++ b/silkworm/node/stagedsync/stages/stage_log_index.hpp
@@ -18,10 +18,10 @@
 
 #include <stdexcept>
 
-#include <silkworm/node/db/bitmap.hpp>
-#include <silkworm/node/db/etl/collector_settings.hpp>
-#include <silkworm/node/db/prune_mode.hpp>
-#include <silkworm/node/db/stage.hpp>
+#include <silkworm/db/bitmap.hpp>
+#include <silkworm/db/etl/collector_settings.hpp>
+#include <silkworm/db/prune_mode.hpp>
+#include <silkworm/db/stage.hpp>
 
 namespace silkworm::stagedsync {
 
diff --git a/silkworm/node/stagedsync/stages/stage_senders.cpp b/silkworm/node/stagedsync/stages/stage_senders.cpp
index 3ccfee2909..91cce2c855 100644
--- a/silkworm/node/stagedsync/stages/stage_senders.cpp
+++ b/silkworm/node/stagedsync/stages/stage_senders.cpp
@@ -26,8 +26,8 @@
 #include <silkworm/core/crypto/ecdsa.h>
 #include <silkworm/core/crypto/secp256k1n.hpp>
 #include <silkworm/core/protocol/validation.hpp>
+#include <silkworm/db/access_layer.hpp>
 #include <silkworm/infra/common/stopwatch.hpp>
-#include <silkworm/node/db/access_layer.hpp>
 
 namespace silkworm::stagedsync {
 
diff --git a/silkworm/node/stagedsync/stages/stage_senders.hpp b/silkworm/node/stagedsync/stages/stage_senders.hpp
index 67b2939edf..a3917ef880 100644
--- a/silkworm/node/stagedsync/stages/stage_senders.hpp
+++ b/silkworm/node/stagedsync/stages/stage_senders.hpp
@@ -28,11 +28,11 @@
 #include <silkworm/core/chain/config.hpp>
 #include <silkworm/core/common/base.hpp>
 #include <silkworm/core/common/bytes.hpp>
+#include <silkworm/db/etl/collector.hpp>
+#include <silkworm/db/etl/collector_settings.hpp>
+#include <silkworm/db/prune_mode.hpp>
+#include <silkworm/db/stage.hpp>
 #include <silkworm/infra/concurrency/thread_pool.hpp>
-#include <silkworm/node/db/etl/collector.hpp>
-#include <silkworm/node/db/etl/collector_settings.hpp>
-#include <silkworm/node/db/prune_mode.hpp>
-#include <silkworm/node/db/stage.hpp>
 
 namespace silkworm::stagedsync {
 
diff --git a/silkworm/node/stagedsync/stages/stage_tx_lookup.cpp b/silkworm/node/stagedsync/stages/stage_tx_lookup.cpp
index 803cda7c17..c039e30a36 100644
--- a/silkworm/node/stagedsync/stages/stage_tx_lookup.cpp
+++ b/silkworm/node/stagedsync/stages/stage_tx_lookup.cpp
@@ -21,7 +21,7 @@
 #include <magic_enum.hpp>
 
 #include <silkworm/core/common/endian.hpp>
-#include <silkworm/node/db/access_layer.hpp>
+#include <silkworm/db/access_layer.hpp>
 
 namespace silkworm::stagedsync {
 
diff --git a/silkworm/node/stagedsync/stages/stage_tx_lookup.hpp b/silkworm/node/stagedsync/stages/stage_tx_lookup.hpp
index a641dc2d64..8743b966d0 100644
--- a/silkworm/node/stagedsync/stages/stage_tx_lookup.hpp
+++ b/silkworm/node/stagedsync/stages/stage_tx_lookup.hpp
@@ -16,10 +16,10 @@
 
 #pragma once
 
-#include <silkworm/node/db/bitmap.hpp>
-#include <silkworm/node/db/etl/collector_settings.hpp>
-#include <silkworm/node/db/prune_mode.hpp>
-#include <silkworm/node/db/stage.hpp>
+#include <silkworm/db/bitmap.hpp>
+#include <silkworm/db/etl/collector_settings.hpp>
+#include <silkworm/db/prune_mode.hpp>
+#include <silkworm/db/stage.hpp>
 
 namespace silkworm::stagedsync {
 
diff --git a/silkworm/node/stagedsync/stages/stage_tx_lookup_test.cpp b/silkworm/node/stagedsync/stages/stage_tx_lookup_test.cpp
index bc7b09c6f8..049d1907ba 100644
--- a/silkworm/node/stagedsync/stages/stage_tx_lookup_test.cpp
+++ b/silkworm/node/stagedsync/stages/stage_tx_lookup_test.cpp
@@ -18,9 +18,9 @@
 
 #include <silkworm/core/common/test_util.hpp>
 #include <silkworm/core/types/block_body_for_storage.hpp>
+#include <silkworm/db/access_layer.hpp>
+#include <silkworm/db/test_util/temp_chain_data.hpp>
 #include <silkworm/infra/test_util/log.hpp>
-#include <silkworm/node/db/access_layer.hpp>
-#include <silkworm/node/db/test_util/temp_chain_data.hpp>
 #include <silkworm/node/stagedsync/stages/stage_tx_lookup.hpp>
 
 using namespace evmc::literals;
diff --git a/silkworm/node/stagedsync/stages_test.cpp b/silkworm/node/stagedsync/stages_test.cpp
index f3e78069f3..a5847b41dc 100644
--- a/silkworm/node/stagedsync/stages_test.cpp
+++ b/silkworm/node/stagedsync/stages_test.cpp
@@ -25,11 +25,11 @@
 #include <silkworm/core/trie/vector_root.hpp>
 #include <silkworm/core/types/address.hpp>
 #include <silkworm/core/types/evmc_bytes32.hpp>
+#include <silkworm/db/access_layer.hpp>
+#include <silkworm/db/buffer.hpp>
+#include <silkworm/db/genesis.hpp>
 #include <silkworm/infra/test_util/log.hpp>
 #include <silkworm/node/common/node_settings.hpp>
-#include <silkworm/node/db/access_layer.hpp>
-#include <silkworm/node/db/buffer.hpp>
-#include <silkworm/node/db/genesis.hpp>
 #include <silkworm/node/stagedsync/stages/stage_blockhashes.hpp>
 #include <silkworm/node/stagedsync/stages/stage_call_trace_index.hpp>
 #include <silkworm/node/stagedsync/stages/stage_execution.hpp>
diff --git a/silkworm/node/test_util/temp_chain_data_node_settings.hpp b/silkworm/node/test_util/temp_chain_data_node_settings.hpp
index c7c52b5792..bbd830c996 100644
--- a/silkworm/node/test_util/temp_chain_data_node_settings.hpp
+++ b/silkworm/node/test_util/temp_chain_data_node_settings.hpp
@@ -16,9 +16,9 @@
 
 #pragma once
 
+#include <silkworm/db/test_util/temp_chain_data.hpp>
 #include <silkworm/infra/common/directories.hpp>
 #include <silkworm/node/common/node_settings.hpp>
-#include <silkworm/node/db/test_util/temp_chain_data.hpp>
 
 namespace silkworm::node::test_util {
 
diff --git a/silkworm/rpc/commands/debug_api.cpp b/silkworm/rpc/commands/debug_api.cpp
index 19c5133324..8fe983c825 100644
--- a/silkworm/rpc/commands/debug_api.cpp
+++ b/silkworm/rpc/commands/debug_api.cpp
@@ -32,10 +32,10 @@
 #include <silkworm/core/common/util.hpp>
 #include <silkworm/core/types/address.hpp>
 #include <silkworm/core/types/evmc_bytes32.hpp>
+#include <silkworm/db/tables.hpp>
+#include <silkworm/db/util.hpp>
 #include <silkworm/infra/common/ensure.hpp>
 #include <silkworm/infra/common/log.hpp>
-#include <silkworm/node/db/tables.hpp>
-#include <silkworm/node/db/util.hpp>
 #include <silkworm/rpc/common/util.hpp>
 #include <silkworm/rpc/core/account_dumper.hpp>
 #include <silkworm/rpc/core/blocks.hpp>
diff --git a/silkworm/rpc/commands/eth_api.cpp b/silkworm/rpc/commands/eth_api.cpp
index b1e8f62618..e702edacf8 100644
--- a/silkworm/rpc/commands/eth_api.cpp
+++ b/silkworm/rpc/commands/eth_api.cpp
@@ -31,9 +31,9 @@
 #include <silkworm/core/types/address.hpp>
 #include <silkworm/core/types/evmc_bytes32.hpp>
 #include <silkworm/core/types/transaction.hpp>
+#include <silkworm/db/util.hpp>
 #include <silkworm/infra/common/ensure.hpp>
 #include <silkworm/infra/common/log.hpp>
-#include <silkworm/node/db/util.hpp>
 #include <silkworm/rpc/common/util.hpp>
 #include <silkworm/rpc/core/blocks.hpp>
 #include <silkworm/rpc/core/cached_chain.hpp>
diff --git a/silkworm/rpc/commands/ots_api.cpp b/silkworm/rpc/commands/ots_api.cpp
index aafbee9ba4..f67852a1e2 100644
--- a/silkworm/rpc/commands/ots_api.cpp
+++ b/silkworm/rpc/commands/ots_api.cpp
@@ -24,11 +24,11 @@
 #include <silkworm/core/protocol/ethash_rule_set.hpp>
 #include <silkworm/core/types/address.hpp>
 #include <silkworm/core/types/evmc_bytes32.hpp>
+#include <silkworm/db/access_layer.hpp>
+#include <silkworm/db/bitmap.hpp>
+#include <silkworm/db/tables.hpp>
 #include <silkworm/infra/common/ensure.hpp>
 #include <silkworm/infra/common/log.hpp>
-#include <silkworm/node/db/access_layer.hpp>
-#include <silkworm/node/db/bitmap.hpp>
-#include <silkworm/node/db/tables.hpp>
 #include <silkworm/rpc/core/blocks.hpp>
 #include <silkworm/rpc/core/cached_chain.hpp>
 #include <silkworm/rpc/core/evm_trace.hpp>
diff --git a/silkworm/rpc/commands/ots_api.hpp b/silkworm/rpc/commands/ots_api.hpp
index 172f1ab8e7..b1786cf9fe 100644
--- a/silkworm/rpc/commands/ots_api.hpp
+++ b/silkworm/rpc/commands/ots_api.hpp
@@ -24,9 +24,9 @@
 #include <silkworm/core/common/base.hpp>
 #include <silkworm/core/common/block_cache.hpp>
 #include <silkworm/core/common/bytes.hpp>
+#include <silkworm/db/bitmap.hpp>
 #include <silkworm/infra/concurrency/private_service.hpp>
 #include <silkworm/infra/concurrency/shared_service.hpp>
-#include <silkworm/node/db/bitmap.hpp>
 #include <silkworm/rpc/ethbackend/backend.hpp>
 #include <silkworm/rpc/ethdb/database.hpp>
 #include <silkworm/rpc/ethdb/kv/state_cache.hpp>
diff --git a/silkworm/rpc/commands/parity_api.cpp b/silkworm/rpc/commands/parity_api.cpp
index e7800031b7..5ac0da4a7f 100644
--- a/silkworm/rpc/commands/parity_api.cpp
+++ b/silkworm/rpc/commands/parity_api.cpp
@@ -22,8 +22,8 @@
 
 #include <silkworm/core/common/util.hpp>
 #include <silkworm/core/types/address.hpp>
+#include <silkworm/db/tables.hpp>
 #include <silkworm/infra/common/log.hpp>
-#include <silkworm/node/db/tables.hpp>
 #include <silkworm/rpc/common/util.hpp>
 #include <silkworm/rpc/core/blocks.hpp>
 #include <silkworm/rpc/core/cached_chain.hpp>
diff --git a/silkworm/rpc/core/account_dumper.cpp b/silkworm/rpc/core/account_dumper.cpp
index 44acedab5a..dce41e066e 100644
--- a/silkworm/rpc/core/account_dumper.cpp
+++ b/silkworm/rpc/core/account_dumper.cpp
@@ -23,10 +23,10 @@
 #include <silkworm/core/trie/hash_builder.hpp>
 #include <silkworm/core/trie/nibbles.hpp>
 #include <silkworm/core/types/address.hpp>
+#include <silkworm/db/tables.hpp>
+#include <silkworm/db/util.hpp>
 #include <silkworm/infra/common/decoding_exception.hpp>
 #include <silkworm/infra/common/log.hpp>
-#include <silkworm/node/db/tables.hpp>
-#include <silkworm/node/db/util.hpp>
 #include <silkworm/rpc/common/util.hpp>
 #include <silkworm/rpc/core/account_walker.hpp>
 #include <silkworm/rpc/core/cached_chain.hpp>
diff --git a/silkworm/rpc/core/account_walker.cpp b/silkworm/rpc/core/account_walker.cpp
index a1033363b5..b5b4b06bbd 100644
--- a/silkworm/rpc/core/account_walker.cpp
+++ b/silkworm/rpc/core/account_walker.cpp
@@ -17,9 +17,9 @@
 #include "account_walker.hpp"
 
 #include <silkworm/core/common/endian.hpp>
-#include <silkworm/node/db/bitmap.hpp>
-#include <silkworm/node/db/tables.hpp>
-#include <silkworm/node/db/util.hpp>
+#include <silkworm/db/bitmap.hpp>
+#include <silkworm/db/tables.hpp>
+#include <silkworm/db/util.hpp>
 #include <silkworm/rpc/common/util.hpp>
 #include <silkworm/rpc/ethdb/cursor.hpp>
 
diff --git a/silkworm/rpc/core/block_reader.cpp b/silkworm/rpc/core/block_reader.cpp
index c81e855e6c..5aba03b98b 100644
--- a/silkworm/rpc/core/block_reader.cpp
+++ b/silkworm/rpc/core/block_reader.cpp
@@ -22,11 +22,11 @@
 #include <silkworm/core/common/util.hpp>
 #include <silkworm/core/types/account.hpp>
 #include <silkworm/core/types/address.hpp>
+#include <silkworm/db/bitmap.hpp>
+#include <silkworm/db/tables.hpp>
+#include <silkworm/db/util.hpp>
 #include <silkworm/infra/common/decoding_exception.hpp>
 #include <silkworm/infra/common/log.hpp>
-#include <silkworm/node/db/bitmap.hpp>
-#include <silkworm/node/db/tables.hpp>
-#include <silkworm/node/db/util.hpp>
 #include <silkworm/rpc/common/util.hpp>
 #include <silkworm/rpc/core/cached_chain.hpp>
 #include <silkworm/rpc/core/rawdb/util.hpp>
diff --git a/silkworm/rpc/core/blocks.cpp b/silkworm/rpc/core/blocks.cpp
index 3592f882da..0d9388fc3a 100644
--- a/silkworm/rpc/core/blocks.cpp
+++ b/silkworm/rpc/core/blocks.cpp
@@ -18,8 +18,8 @@
 
 #include <silkworm/core/common/assert.hpp>
 #include <silkworm/core/common/util.hpp>
+#include <silkworm/db/tables.hpp>
 #include <silkworm/infra/common/log.hpp>
-#include <silkworm/node/db/tables.hpp>
 #include <silkworm/rpc/core/rawdb/chain.hpp>
 #include <silkworm/rpc/stagedsync/stages.hpp>
 
diff --git a/silkworm/rpc/core/blocks_test.cpp b/silkworm/rpc/core/blocks_test.cpp
index 6013b0c4f6..d458d61a5b 100644
--- a/silkworm/rpc/core/blocks_test.cpp
+++ b/silkworm/rpc/core/blocks_test.cpp
@@ -26,8 +26,8 @@
 
 #include <silkworm/core/common/base.hpp>
 #include <silkworm/core/common/bytes.hpp>
+#include <silkworm/db/tables.hpp>
 #include <silkworm/infra/common/log.hpp>
-#include <silkworm/node/db/tables.hpp>
 #include <silkworm/rpc/stagedsync/stages.hpp>
 #include <silkworm/rpc/test/mock_database_reader.hpp>
 
diff --git a/silkworm/rpc/core/cached_chain_test.cpp b/silkworm/rpc/core/cached_chain_test.cpp
index 82cf9be7bd..0421a66579 100644
--- a/silkworm/rpc/core/cached_chain_test.cpp
+++ b/silkworm/rpc/core/cached_chain_test.cpp
@@ -30,8 +30,8 @@
 #include <silkworm/core/common/base.hpp>
 #include <silkworm/core/common/bytes.hpp>
 #include <silkworm/core/common/util.hpp>
+#include <silkworm/db/tables.hpp>
 #include <silkworm/infra/test_util/log.hpp>
-#include <silkworm/node/db/tables.hpp>
 #include <silkworm/rpc/core/blocks.hpp>
 #include <silkworm/rpc/core/rawdb/accessors.hpp>
 #include <silkworm/rpc/test/mock_database_reader.hpp>
diff --git a/silkworm/rpc/core/evm_debug_test.cpp b/silkworm/rpc/core/evm_debug_test.cpp
index 3c6529a9c3..51f513c750 100644
--- a/silkworm/rpc/core/evm_debug_test.cpp
+++ b/silkworm/rpc/core/evm_debug_test.cpp
@@ -23,7 +23,7 @@
 #include <catch2/catch.hpp>
 #include <gmock/gmock.h>
 
-#include <silkworm/node/db/tables.hpp>
+#include <silkworm/db/tables.hpp>
 #include <silkworm/rpc/common/util.hpp>
 #include <silkworm/rpc/storage/remote_chain_storage.hpp>
 #include <silkworm/rpc/test/context_test_base.hpp>
diff --git a/silkworm/rpc/core/evm_trace_test.cpp b/silkworm/rpc/core/evm_trace_test.cpp
index fb236c8e80..c812a6e932 100644
--- a/silkworm/rpc/core/evm_trace_test.cpp
+++ b/silkworm/rpc/core/evm_trace_test.cpp
@@ -26,9 +26,9 @@
 #include <gmock/gmock.h>
 
 #include <silkworm/core/common/util.hpp>
+#include <silkworm/db/tables.hpp>
 #include <silkworm/infra/common/log.hpp>
 #include <silkworm/infra/test_util/log.hpp>
-#include <silkworm/node/db/tables.hpp>
 #include <silkworm/rpc/common/util.hpp>
 #include <silkworm/rpc/storage/remote_chain_storage.hpp>
 #include <silkworm/rpc/test/context_test_base.hpp>
diff --git a/silkworm/rpc/core/local_state.hpp b/silkworm/rpc/core/local_state.hpp
index be77b49b26..70410ba109 100644
--- a/silkworm/rpc/core/local_state.hpp
+++ b/silkworm/rpc/core/local_state.hpp
@@ -26,8 +26,8 @@
 
 #include <silkworm/core/common/util.hpp>
 #include <silkworm/core/state/state.hpp>
-#include <silkworm/node/db/access_layer.hpp>
-#include <silkworm/node/db/mdbx.hpp>
+#include <silkworm/db/access_layer.hpp>
+#include <silkworm/db/mdbx.hpp>
 #include <silkworm/rpc/core/rawdb/accessors.hpp>
 #include <silkworm/rpc/core/state_reader.hpp>
 
diff --git a/silkworm/rpc/core/logs_walker.cpp b/silkworm/rpc/core/logs_walker.cpp
index 8f9d66f0e8..cf967a1048 100644
--- a/silkworm/rpc/core/logs_walker.cpp
+++ b/silkworm/rpc/core/logs_walker.cpp
@@ -22,8 +22,8 @@
 
 #include <silkworm/core/types/address.hpp>
 #include <silkworm/core/types/evmc_bytes32.hpp>
+#include <silkworm/db/tables.hpp>
 #include <silkworm/infra/common/log.hpp>
-#include <silkworm/node/db/tables.hpp>
 #include <silkworm/rpc/core/blocks.hpp>
 #include <silkworm/rpc/core/cached_chain.hpp>
 #include <silkworm/rpc/core/rawdb/chain.hpp>
diff --git a/silkworm/rpc/core/rawdb/chain.cpp b/silkworm/rpc/core/rawdb/chain.cpp
index ee50bee523..64d296c156 100644
--- a/silkworm/rpc/core/rawdb/chain.cpp
+++ b/silkworm/rpc/core/rawdb/chain.cpp
@@ -25,10 +25,10 @@
 #include <silkworm/core/types/address.hpp>
 #include <silkworm/core/types/block_body_for_storage.hpp>
 #include <silkworm/core/types/evmc_bytes32.hpp>
+#include <silkworm/db/tables.hpp>
+#include <silkworm/db/util.hpp>
 #include <silkworm/infra/common/decoding_exception.hpp>
 #include <silkworm/infra/common/log.hpp>
-#include <silkworm/node/db/tables.hpp>
-#include <silkworm/node/db/util.hpp>
 #include <silkworm/rpc/common/util.hpp>
 #include <silkworm/rpc/core/blocks.hpp>
 #include <silkworm/rpc/ethdb/cbor.hpp>
diff --git a/silkworm/rpc/core/rawdb/chain_test.cpp b/silkworm/rpc/core/rawdb/chain_test.cpp
index 48f32d4c68..d4627d9a37 100644
--- a/silkworm/rpc/core/rawdb/chain_test.cpp
+++ b/silkworm/rpc/core/rawdb/chain_test.cpp
@@ -28,8 +28,8 @@
 
 #include <silkworm/core/common/empty_hashes.hpp>
 #include <silkworm/core/common/util.hpp>
+#include <silkworm/db/tables.hpp>
 #include <silkworm/infra/test_util/log.hpp>
-#include <silkworm/node/db/tables.hpp>
 #include <silkworm/rpc/core/blocks.hpp>
 #include <silkworm/rpc/test/mock_database_reader.hpp>
 
diff --git a/silkworm/rpc/core/rawdb/util.cpp b/silkworm/rpc/core/rawdb/util.cpp
index 52c70ed975..b2e15e0eb4 100644
--- a/silkworm/rpc/core/rawdb/util.cpp
+++ b/silkworm/rpc/core/rawdb/util.cpp
@@ -22,7 +22,7 @@
 #include <silkworm/core/common/base.hpp>
 #include <silkworm/core/common/bytes.hpp>
 #include <silkworm/core/common/endian.hpp>
-#include <silkworm/node/db/util.hpp>
+#include <silkworm/db/util.hpp>
 
 namespace silkworm {
 
diff --git a/silkworm/rpc/core/state_reader.cpp b/silkworm/rpc/core/state_reader.cpp
index 7559db7bf8..7829a9ec83 100644
--- a/silkworm/rpc/core/state_reader.cpp
+++ b/silkworm/rpc/core/state_reader.cpp
@@ -19,11 +19,11 @@
 #include <silkworm/core/common/empty_hashes.hpp>
 #include <silkworm/core/common/util.hpp>
 #include <silkworm/core/types/account.hpp>
+#include <silkworm/db/bitmap.hpp>
+#include <silkworm/db/tables.hpp>
+#include <silkworm/db/util.hpp>
 #include <silkworm/infra/common/decoding_exception.hpp>
 #include <silkworm/infra/common/log.hpp>
-#include <silkworm/node/db/bitmap.hpp>
-#include <silkworm/node/db/tables.hpp>
-#include <silkworm/node/db/util.hpp>
 #include <silkworm/rpc/common/util.hpp>
 #include <silkworm/rpc/core/rawdb/util.hpp>
 
diff --git a/silkworm/rpc/core/state_reader_test.cpp b/silkworm/rpc/core/state_reader_test.cpp
index a757940d16..0433723dc2 100644
--- a/silkworm/rpc/core/state_reader_test.cpp
+++ b/silkworm/rpc/core/state_reader_test.cpp
@@ -21,7 +21,7 @@
 #include <catch2/catch.hpp>
 #include <evmc/evmc.hpp>
 
-#include <silkworm/node/db/tables.hpp>
+#include <silkworm/db/tables.hpp>
 #include <silkworm/rpc/common/util.hpp>
 #include <silkworm/rpc/core/blocks.hpp>
 #include <silkworm/rpc/test/context_test_base.hpp>
diff --git a/silkworm/rpc/core/storage_walker.cpp b/silkworm/rpc/core/storage_walker.cpp
index 7cac89d641..5308a983f6 100644
--- a/silkworm/rpc/core/storage_walker.cpp
+++ b/silkworm/rpc/core/storage_walker.cpp
@@ -21,11 +21,11 @@
 
 #include <silkworm/core/common/endian.hpp>
 #include <silkworm/core/types/address.hpp>
+#include <silkworm/db/bitmap.hpp>
+#include <silkworm/db/tables.hpp>
+#include <silkworm/db/util.hpp>
 #include <silkworm/infra/common/decoding_exception.hpp>
 #include <silkworm/infra/common/log.hpp>
-#include <silkworm/node/db/bitmap.hpp>
-#include <silkworm/node/db/tables.hpp>
-#include <silkworm/node/db/util.hpp>
 #include <silkworm/rpc/common/util.hpp>
 #include <silkworm/rpc/ethdb/cursor.hpp>
 #include <silkworm/rpc/ethdb/transaction_database.hpp>
diff --git a/silkworm/rpc/daemon.cpp b/silkworm/rpc/daemon.cpp
index e3b0a6560e..49fc390942 100644
--- a/silkworm/rpc/daemon.cpp
+++ b/silkworm/rpc/daemon.cpp
@@ -27,11 +27,11 @@
 #include <boost/process/environment.hpp>
 #include <grpcpp/grpcpp.h>
 
+#include <silkworm/db/access_layer.hpp>
 #include <silkworm/infra/common/ensure.hpp>
 #include <silkworm/infra/common/log.hpp>
 #include <silkworm/infra/concurrency/private_service.hpp>
 #include <silkworm/infra/concurrency/shared_service.hpp>
-#include <silkworm/node/db/access_layer.hpp>
 #include <silkworm/rpc/common/compatibility.hpp>
 #include <silkworm/rpc/ethbackend/remote_backend.hpp>
 #include <silkworm/rpc/ethdb/file/local_database.hpp>
diff --git a/silkworm/rpc/daemon.hpp b/silkworm/rpc/daemon.hpp
index 5f5743265c..3fc5a1f227 100644
--- a/silkworm/rpc/daemon.hpp
+++ b/silkworm/rpc/daemon.hpp
@@ -23,14 +23,14 @@
 
 #include <boost/asio/thread_pool.hpp>
 
+#include <silkworm/db/mdbx.hpp>
+#include <silkworm/db/snapshots/repository.hpp>
 #include <silkworm/infra/common/log.hpp>
 #include <silkworm/infra/grpc/client/client_context_pool.hpp>
 #include <silkworm/infra/grpc/common/version.hpp>
-#include <silkworm/node/db/mdbx.hpp>
 #include <silkworm/rpc/common/constants.hpp>
 #include <silkworm/rpc/ethdb/kv/state_changes_stream.hpp>
 #include <silkworm/rpc/http/server.hpp>
-#include <silkworm/snapshots/repository.hpp>
 
 #include "settings.hpp"
 
diff --git a/silkworm/rpc/ethdb/file/local_cursor.hpp b/silkworm/rpc/ethdb/file/local_cursor.hpp
index 216257bf14..7f7299aead 100644
--- a/silkworm/rpc/ethdb/file/local_cursor.hpp
+++ b/silkworm/rpc/ethdb/file/local_cursor.hpp
@@ -26,7 +26,7 @@
 #include <boost/asio/use_awaitable.hpp>
 
 #include <silkworm/core/common/util.hpp>
-#include <silkworm/node/db/mdbx.hpp>
+#include <silkworm/db/mdbx.hpp>
 #include <silkworm/rpc/common/util.hpp>
 #include <silkworm/rpc/ethdb/cursor.hpp>
 
diff --git a/silkworm/rpc/ethdb/file/local_database.hpp b/silkworm/rpc/ethdb/file/local_database.hpp
index 391e94bcf4..88b62c7984 100644
--- a/silkworm/rpc/ethdb/file/local_database.hpp
+++ b/silkworm/rpc/ethdb/file/local_database.hpp
@@ -20,7 +20,7 @@
 #include <string>
 #include <utility>
 
-#include <silkworm/node/db/mdbx.hpp>
+#include <silkworm/db/mdbx.hpp>
 #include <silkworm/rpc/ethdb/database.hpp>
 #include <silkworm/rpc/ethdb/transaction.hpp>
 
diff --git a/silkworm/rpc/ethdb/file/local_transaction.hpp b/silkworm/rpc/ethdb/file/local_transaction.hpp
index 130cb144b6..2db237f15e 100644
--- a/silkworm/rpc/ethdb/file/local_transaction.hpp
+++ b/silkworm/rpc/ethdb/file/local_transaction.hpp
@@ -24,7 +24,7 @@
 
 #include <silkworm/infra/concurrency/task.hpp>
 
-#include <silkworm/node/db/mdbx.hpp>
+#include <silkworm/db/mdbx.hpp>
 #include <silkworm/rpc/ethdb/cursor.hpp>
 #include <silkworm/rpc/ethdb/file/local_cursor.hpp>
 #include <silkworm/rpc/ethdb/kv/cached_database.hpp>
diff --git a/silkworm/rpc/ethdb/kv/cached_database.cpp b/silkworm/rpc/ethdb/kv/cached_database.cpp
index a90bce2d69..13cfd524e8 100644
--- a/silkworm/rpc/ethdb/kv/cached_database.cpp
+++ b/silkworm/rpc/ethdb/kv/cached_database.cpp
@@ -19,7 +19,7 @@
 #include <memory>
 #include <utility>
 
-#include <silkworm/node/db/tables.hpp>
+#include <silkworm/db/tables.hpp>
 #include <silkworm/rpc/core/blocks.hpp>
 
 namespace silkworm::rpc::ethdb::kv {
diff --git a/silkworm/rpc/ethdb/kv/cached_database_test.cpp b/silkworm/rpc/ethdb/kv/cached_database_test.cpp
index a0eee36b9e..ee5f5be7d8 100644
--- a/silkworm/rpc/ethdb/kv/cached_database_test.cpp
+++ b/silkworm/rpc/ethdb/kv/cached_database_test.cpp
@@ -27,7 +27,7 @@
 #include <gmock/gmock.h>
 
 #include <silkworm/core/common/util.hpp>
-#include <silkworm/node/db/tables.hpp>
+#include <silkworm/db/tables.hpp>
 #include <silkworm/rpc/core/rawdb/accessors.hpp>
 #include <silkworm/rpc/ethdb/kv/state_cache.hpp>
 #include <silkworm/rpc/test/dummy_transaction.hpp>
diff --git a/silkworm/rpc/ethdb/kv/state_cache.cpp b/silkworm/rpc/ethdb/kv/state_cache.cpp
index cd76481085..cb6306bebc 100644
--- a/silkworm/rpc/ethdb/kv/state_cache.cpp
+++ b/silkworm/rpc/ethdb/kv/state_cache.cpp
@@ -23,9 +23,9 @@
 #include <silkworm/core/common/assert.hpp>
 #include <silkworm/core/common/util.hpp>
 #include <silkworm/core/types/address.hpp>
+#include <silkworm/db/tables.hpp>
 #include <silkworm/infra/common/log.hpp>
 #include <silkworm/infra/grpc/common/conversion.hpp>
-#include <silkworm/node/db/tables.hpp>
 #include <silkworm/rpc/common/util.hpp>
 #include <silkworm/rpc/core/rawdb/util.hpp>
 #include <silkworm/rpc/ethdb/transaction_database.hpp>
diff --git a/silkworm/rpc/json/log_test.cpp b/silkworm/rpc/json/log_test.cpp
index 39f32f54a4..333c6ef5b8 100644
--- a/silkworm/rpc/json/log_test.cpp
+++ b/silkworm/rpc/json/log_test.cpp
@@ -25,7 +25,7 @@
 #include <nlohmann/json.hpp>
 
 #include <silkworm/core/common/util.hpp>
-#include <silkworm/node/db/access_layer.hpp>
+#include <silkworm/db/access_layer.hpp>
 
 namespace {
 #ifdef _WIN32
diff --git a/silkworm/rpc/json/types_test.cpp b/silkworm/rpc/json/types_test.cpp
index 4839521045..87aadcf42c 100644
--- a/silkworm/rpc/json/types_test.cpp
+++ b/silkworm/rpc/json/types_test.cpp
@@ -27,9 +27,9 @@
 
 #include <silkworm/core/common/util.hpp>
 #include <silkworm/core/types/block_body_for_storage.hpp>
+#include <silkworm/db/access_layer.hpp>
 #include <silkworm/infra/common/decoding_exception.hpp>
 #include <silkworm/infra/test_util/log.hpp>
-#include <silkworm/node/db/access_layer.hpp>
 
 namespace silkworm::rpc {
 
diff --git a/silkworm/rpc/stagedsync/stages.cpp b/silkworm/rpc/stagedsync/stages.cpp
index 8f2ebb38cb..6a75d1cfa3 100644
--- a/silkworm/rpc/stagedsync/stages.cpp
+++ b/silkworm/rpc/stagedsync/stages.cpp
@@ -19,7 +19,7 @@
 #include <stdexcept>
 
 #include <silkworm/core/common/endian.hpp>
-#include <silkworm/node/db/tables.hpp>
+#include <silkworm/db/tables.hpp>
 
 namespace silkworm::rpc::stages {
 
diff --git a/silkworm/rpc/stagedsync/stages.hpp b/silkworm/rpc/stagedsync/stages.hpp
index 2af3b945f5..f05ff79052 100644
--- a/silkworm/rpc/stagedsync/stages.hpp
+++ b/silkworm/rpc/stagedsync/stages.hpp
@@ -20,7 +20,7 @@
 
 #include <silkworm/core/common/base.hpp>
 #include <silkworm/core/common/bytes.hpp>
-#include <silkworm/node/db/stages.hpp>
+#include <silkworm/db/stages.hpp>
 #include <silkworm/rpc/core/rawdb/accessors.hpp>
 
 namespace silkworm::rpc::stages {
diff --git a/silkworm/rpc/stagedsync/stages_test.cpp b/silkworm/rpc/stagedsync/stages_test.cpp
index 15ad37db82..b4a940b1df 100644
--- a/silkworm/rpc/stagedsync/stages_test.cpp
+++ b/silkworm/rpc/stagedsync/stages_test.cpp
@@ -24,7 +24,7 @@
 #include <catch2/catch.hpp>
 #include <gmock/gmock.h>
 
-#include <silkworm/node/db/tables.hpp>
+#include <silkworm/db/tables.hpp>
 #include <silkworm/rpc/test/mock_database_reader.hpp>
 
 namespace silkworm::rpc::stages {
diff --git a/silkworm/rpc/storage/local_chain_storage.cpp b/silkworm/rpc/storage/local_chain_storage.cpp
index 5e797652da..f504157504 100644
--- a/silkworm/rpc/storage/local_chain_storage.cpp
+++ b/silkworm/rpc/storage/local_chain_storage.cpp
@@ -19,7 +19,7 @@
 #include <bit>
 
 #include <silkworm/core/types/transaction.hpp>
-#include <silkworm/node/db/access_layer.hpp>
+#include <silkworm/db/access_layer.hpp>
 
 namespace silkworm::rpc {
 
diff --git a/silkworm/rpc/storage/local_chain_storage.hpp b/silkworm/rpc/storage/local_chain_storage.hpp
index ef9f3d1c78..30212de7e2 100644
--- a/silkworm/rpc/storage/local_chain_storage.hpp
+++ b/silkworm/rpc/storage/local_chain_storage.hpp
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include <silkworm/node/db/access_layer.hpp>
-#include <silkworm/node/db/mdbx.hpp>
+#include <silkworm/db/access_layer.hpp>
+#include <silkworm/db/mdbx.hpp>
 
 #include "chain_storage.hpp"
 
diff --git a/silkworm/rpc/storage/remote_chain_storage.cpp b/silkworm/rpc/storage/remote_chain_storage.cpp
index 9afd1ded77..04a61e9239 100644
--- a/silkworm/rpc/storage/remote_chain_storage.cpp
+++ b/silkworm/rpc/storage/remote_chain_storage.cpp
@@ -16,8 +16,8 @@
 
 #include "remote_chain_storage.hpp"
 
+#include <silkworm/db/access_layer.hpp>
 #include <silkworm/infra/grpc/common/conversion.hpp>
-#include <silkworm/node/db/access_layer.hpp>
 #include <silkworm/rpc/core/rawdb/chain.hpp>
 
 namespace silkworm::rpc {
diff --git a/silkworm/rpc/test/api_test_database.cpp b/silkworm/rpc/test/api_test_database.cpp
index dd2937d374..a129fcfdd0 100644
--- a/silkworm/rpc/test/api_test_database.cpp
+++ b/silkworm/rpc/test/api_test_database.cpp
@@ -16,8 +16,8 @@
 
 #include "api_test_database.hpp"
 
+#include <silkworm/db/tables.hpp>
 #include <silkworm/infra/common/directories.hpp>
-#include <silkworm/node/db/tables.hpp>
 
 namespace silkworm::rpc::test {
 
diff --git a/silkworm/rpc/test/api_test_database.hpp b/silkworm/rpc/test/api_test_database.hpp
index 393e9bf4cd..e9d537b9a6 100644
--- a/silkworm/rpc/test/api_test_database.hpp
+++ b/silkworm/rpc/test/api_test_database.hpp
@@ -34,10 +34,10 @@
 #include <silkworm/core/types/address.hpp>
 #include <silkworm/core/types/block.hpp>
 #include <silkworm/core/types/receipt.hpp>
+#include <silkworm/db/access_layer.hpp>
+#include <silkworm/db/buffer.hpp>
+#include <silkworm/db/genesis.hpp>
 #include <silkworm/infra/test_util/log.hpp>
-#include <silkworm/node/db/access_layer.hpp>
-#include <silkworm/node/db/buffer.hpp>
-#include <silkworm/node/db/genesis.hpp>
 #include <silkworm/rpc/common/constants.hpp>
 #include <silkworm/rpc/common/writer.hpp>
 #include <silkworm/rpc/ethdb/file/local_database.hpp>
diff --git a/silkworm/sync/block_exchange.hpp b/silkworm/sync/block_exchange.hpp
index 83d156cb5d..0cc1cec096 100644
--- a/silkworm/sync/block_exchange.hpp
+++ b/silkworm/sync/block_exchange.hpp
@@ -20,9 +20,9 @@
 #include <variant>
 
 #include <silkworm/core/types/block.hpp>
+#include <silkworm/db/access_layer.hpp>
 #include <silkworm/infra/concurrency/active_component.hpp>
 #include <silkworm/infra/concurrency/containers.hpp>
-#include <silkworm/node/db/access_layer.hpp>
 #include <silkworm/sentry/api/common/message_from_peer.hpp>
 #include <silkworm/sync/internals/body_sequence.hpp>
 #include <silkworm/sync/internals/header_chain.hpp>
diff --git a/silkworm/sync/internals/body_retrieval.hpp b/silkworm/sync/internals/body_retrieval.hpp
index 2fe18e3442..2534162ee6 100644
--- a/silkworm/sync/internals/body_retrieval.hpp
+++ b/silkworm/sync/internals/body_retrieval.hpp
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <silkworm/node/db/access_layer.hpp>
+#include <silkworm/db/access_layer.hpp>
 
 #include "types.hpp"
 
diff --git a/silkworm/sync/internals/body_sequence.hpp b/silkworm/sync/internals/body_sequence.hpp
index 7faa823b96..d97a690265 100644
--- a/silkworm/sync/internals/body_sequence.hpp
+++ b/silkworm/sync/internals/body_sequence.hpp
@@ -18,7 +18,7 @@
 
 #include <list>
 
-#include <silkworm/node/db/access_layer.hpp>
+#include <silkworm/db/access_layer.hpp>
 #include <silkworm/sync/messages/outbound_get_block_bodies.hpp>
 #include <silkworm/sync/packets/block_bodies_packet.hpp>
 #include <silkworm/sync/packets/new_block_packet.hpp>
diff --git a/silkworm/sync/internals/body_sequence_test.cpp b/silkworm/sync/internals/body_sequence_test.cpp
index 61440a28f8..da8246acee 100644
--- a/silkworm/sync/internals/body_sequence_test.cpp
+++ b/silkworm/sync/internals/body_sequence_test.cpp
@@ -22,9 +22,9 @@
 
 #include <silkworm/core/chain/genesis.hpp>
 #include <silkworm/core/common/bytes_to_string.hpp>
+#include <silkworm/db/genesis.hpp>
+#include <silkworm/db/test_util/temp_chain_data.hpp>
 #include <silkworm/infra/test_util/log.hpp>
-#include <silkworm/node/db/genesis.hpp>
-#include <silkworm/node/db/test_util/temp_chain_data.hpp>
 #include <silkworm/sync/sentry_client.hpp>
 
 namespace silkworm {
diff --git a/silkworm/sync/internals/chain_elements.hpp b/silkworm/sync/internals/chain_elements.hpp
index 9be6ebc75d..f134d396d6 100644
--- a/silkworm/sync/internals/chain_elements.hpp
+++ b/silkworm/sync/internals/chain_elements.hpp
@@ -24,7 +24,7 @@
 #include <utility>
 #include <vector>
 
-#include <silkworm/node/db/access_layer.hpp>
+#include <silkworm/db/access_layer.hpp>
 
 #include "priority_queue.hpp"
 #include "types.hpp"
diff --git a/silkworm/sync/internals/header_chain.cpp b/silkworm/sync/internals/header_chain.cpp
index 4af10d3210..421ca7093b 100644
--- a/silkworm/sync/internals/header_chain.cpp
+++ b/silkworm/sync/internals/header_chain.cpp
@@ -25,9 +25,9 @@
 #include <silkworm/core/common/singleton.hpp>
 #include <silkworm/core/types/evmc_bytes32.hpp>
 #include <silkworm/core/types/hash.hpp>
+#include <silkworm/db/db_utils.hpp>
 #include <silkworm/infra/common/environment.hpp>
 #include <silkworm/infra/common/log.hpp>
-#include <silkworm/node/db/db_utils.hpp>
 #include <silkworm/sync/sentry_client.hpp>
 
 #include "algorithm.hpp"
diff --git a/silkworm/sync/internals/header_chain_plus_exec_test.cpp b/silkworm/sync/internals/header_chain_plus_exec_test.cpp
index f132e33d68..da857347e0 100644
--- a/silkworm/sync/internals/header_chain_plus_exec_test.cpp
+++ b/silkworm/sync/internals/header_chain_plus_exec_test.cpp
@@ -22,10 +22,10 @@
 #include <silkworm/core/common/bytes_to_string.hpp>
 #include <silkworm/core/protocol/rule_set.hpp>
 #include <silkworm/core/types/block.hpp>
+#include <silkworm/db/genesis.hpp>
+#include <silkworm/db/test_util/temp_chain_data.hpp>
 #include <silkworm/infra/common/environment.hpp>
 #include <silkworm/infra/test_util/log.hpp>
-#include <silkworm/node/db/genesis.hpp>
-#include <silkworm/node/db/test_util/temp_chain_data.hpp>
 #include <silkworm/node/stagedsync/execution_engine.hpp>
 #include <silkworm/node/test_util/temp_chain_data_node_settings.hpp>
 
diff --git a/silkworm/sync/internals/header_retrieval.hpp b/silkworm/sync/internals/header_retrieval.hpp
index 3742311e69..9f12ff48b3 100644
--- a/silkworm/sync/internals/header_retrieval.hpp
+++ b/silkworm/sync/internals/header_retrieval.hpp
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <silkworm/node/db/access_layer.hpp>
+#include <silkworm/db/access_layer.hpp>
 
 #include "types.hpp"
 
diff --git a/silkworm/sync/messages/internal_message_test.cpp b/silkworm/sync/messages/internal_message_test.cpp
index 0c8e6e1396..23560a5979 100644
--- a/silkworm/sync/messages/internal_message_test.cpp
+++ b/silkworm/sync/messages/internal_message_test.cpp
@@ -18,7 +18,7 @@
 
 #include <catch2/catch.hpp>
 
-#include <silkworm/node/db/test_util/temp_chain_data.hpp>
+#include <silkworm/db/test_util/temp_chain_data.hpp>
 #include <silkworm/sync/internals/body_sequence.hpp>
 
 namespace silkworm {
diff --git a/silkworm/sync/messages/message.hpp b/silkworm/sync/messages/message.hpp
index 9d745d21d1..009dbaf263 100644
--- a/silkworm/sync/messages/message.hpp
+++ b/silkworm/sync/messages/message.hpp
@@ -18,7 +18,7 @@
 
 #include <string>
 
-#include <silkworm/node/db/access_layer.hpp>
+#include <silkworm/db/access_layer.hpp>
 
 namespace silkworm {
 
diff --git a/silkworm/sync/sync.hpp b/silkworm/sync/sync.hpp
index bf9a70d0f0..8e8f86b898 100644
--- a/silkworm/sync/sync.hpp
+++ b/silkworm/sync/sync.hpp
@@ -24,9 +24,9 @@
 #include <boost/asio/any_io_executor.hpp>
 
 #include <silkworm/core/chain/config.hpp>
+#include <silkworm/db/mdbx.hpp>
 #include <silkworm/infra/common/log.hpp>
 #include <silkworm/infra/grpc/client/client_context_pool.hpp>
-#include <silkworm/node/db/mdbx.hpp>
 #include <silkworm/node/stagedsync/client.hpp>
 #include <silkworm/rpc/common/interface_log.hpp>
 #include <silkworm/rpc/daemon.hpp>
diff --git a/silkworm/sync/test_util/mock_block_exchange.hpp b/silkworm/sync/test_util/mock_block_exchange.hpp
index e950f6deb2..a4df3944b4 100644
--- a/silkworm/sync/test_util/mock_block_exchange.hpp
+++ b/silkworm/sync/test_util/mock_block_exchange.hpp
@@ -25,7 +25,7 @@
 #include <silkworm/core/common/base.hpp>
 #include <silkworm/core/types/block.hpp>
 #include <silkworm/core/types/hash.hpp>
-#include <silkworm/node/db/mdbx.hpp>
+#include <silkworm/db/mdbx.hpp>
 #include <silkworm/sync/block_exchange.hpp>
 #include <silkworm/sync/messages/message.hpp>
 #include <silkworm/sync/sentry_client.hpp>