diff --git a/silkworm/node/remote/kv/api/client.hpp b/silkworm/db/remote/kv/api/client.hpp
similarity index 100%
rename from silkworm/node/remote/kv/api/client.hpp
rename to silkworm/db/remote/kv/api/client.hpp
diff --git a/silkworm/node/remote/kv/api/direct_client.cpp b/silkworm/db/remote/kv/api/direct_client.cpp
similarity index 100%
rename from silkworm/node/remote/kv/api/direct_client.cpp
rename to silkworm/db/remote/kv/api/direct_client.cpp
diff --git a/silkworm/node/remote/kv/api/direct_client.hpp b/silkworm/db/remote/kv/api/direct_client.hpp
similarity index 100%
rename from silkworm/node/remote/kv/api/direct_client.hpp
rename to silkworm/db/remote/kv/api/direct_client.hpp
diff --git a/silkworm/node/remote/kv/api/direct_service.cpp b/silkworm/db/remote/kv/api/direct_service.cpp
similarity index 100%
rename from silkworm/node/remote/kv/api/direct_service.cpp
rename to silkworm/db/remote/kv/api/direct_service.cpp
diff --git a/silkworm/node/remote/kv/api/direct_service.hpp b/silkworm/db/remote/kv/api/direct_service.hpp
similarity index 100%
rename from silkworm/node/remote/kv/api/direct_service.hpp
rename to silkworm/db/remote/kv/api/direct_service.hpp
diff --git a/silkworm/node/remote/kv/api/endpoint/common.hpp b/silkworm/db/remote/kv/api/endpoint/common.hpp
similarity index 100%
rename from silkworm/node/remote/kv/api/endpoint/common.hpp
rename to silkworm/db/remote/kv/api/endpoint/common.hpp
diff --git a/silkworm/node/remote/kv/api/endpoint/temporal_point.hpp b/silkworm/db/remote/kv/api/endpoint/temporal_point.hpp
similarity index 100%
rename from silkworm/node/remote/kv/api/endpoint/temporal_point.hpp
rename to silkworm/db/remote/kv/api/endpoint/temporal_point.hpp
diff --git a/silkworm/node/remote/kv/api/endpoint/temporal_range.hpp b/silkworm/db/remote/kv/api/endpoint/temporal_range.hpp
similarity index 100%
rename from silkworm/node/remote/kv/api/endpoint/temporal_range.hpp
rename to silkworm/db/remote/kv/api/endpoint/temporal_range.hpp
diff --git a/silkworm/node/remote/kv/api/service.hpp b/silkworm/db/remote/kv/api/service.hpp
similarity index 100%
rename from silkworm/node/remote/kv/api/service.hpp
rename to silkworm/db/remote/kv/api/service.hpp
diff --git a/silkworm/node/remote/kv/grpc/client/endpoint/temporal_point.cpp b/silkworm/db/remote/kv/grpc/client/endpoint/temporal_point.cpp
similarity index 100%
rename from silkworm/node/remote/kv/grpc/client/endpoint/temporal_point.cpp
rename to silkworm/db/remote/kv/grpc/client/endpoint/temporal_point.cpp
diff --git a/silkworm/node/remote/kv/grpc/client/endpoint/temporal_point.hpp b/silkworm/db/remote/kv/grpc/client/endpoint/temporal_point.hpp
similarity index 100%
rename from silkworm/node/remote/kv/grpc/client/endpoint/temporal_point.hpp
rename to silkworm/db/remote/kv/grpc/client/endpoint/temporal_point.hpp
diff --git a/silkworm/node/remote/kv/grpc/client/endpoint/temporal_point_test.cpp b/silkworm/db/remote/kv/grpc/client/endpoint/temporal_point_test.cpp
similarity index 98%
rename from silkworm/node/remote/kv/grpc/client/endpoint/temporal_point_test.cpp
rename to silkworm/db/remote/kv/grpc/client/endpoint/temporal_point_test.cpp
index fbdc12de41..6af41775c7 100644
--- a/silkworm/node/remote/kv/grpc/client/endpoint/temporal_point_test.cpp
+++ b/silkworm/db/remote/kv/grpc/client/endpoint/temporal_point_test.cpp
@@ -18,7 +18,7 @@
 
 #include <catch2/catch.hpp>
 
-#include <silkworm/node/test_util/fixture.hpp>
+#include <silkworm/infra/test_util/fixture.hpp>
 
 #include "../../test_util/sample_protos.hpp"
 
diff --git a/silkworm/node/remote/kv/grpc/client/endpoint/temporal_range.cpp b/silkworm/db/remote/kv/grpc/client/endpoint/temporal_range.cpp
similarity index 100%
rename from silkworm/node/remote/kv/grpc/client/endpoint/temporal_range.cpp
rename to silkworm/db/remote/kv/grpc/client/endpoint/temporal_range.cpp
diff --git a/silkworm/node/remote/kv/grpc/client/endpoint/temporal_range.hpp b/silkworm/db/remote/kv/grpc/client/endpoint/temporal_range.hpp
similarity index 100%
rename from silkworm/node/remote/kv/grpc/client/endpoint/temporal_range.hpp
rename to silkworm/db/remote/kv/grpc/client/endpoint/temporal_range.hpp
diff --git a/silkworm/node/remote/kv/grpc/client/endpoint/temporal_range_test.cpp b/silkworm/db/remote/kv/grpc/client/endpoint/temporal_range_test.cpp
similarity index 99%
rename from silkworm/node/remote/kv/grpc/client/endpoint/temporal_range_test.cpp
rename to silkworm/db/remote/kv/grpc/client/endpoint/temporal_range_test.cpp
index 87e272c6cc..e27a1b6bab 100644
--- a/silkworm/node/remote/kv/grpc/client/endpoint/temporal_range_test.cpp
+++ b/silkworm/db/remote/kv/grpc/client/endpoint/temporal_range_test.cpp
@@ -18,7 +18,7 @@
 
 #include <catch2/catch.hpp>
 
-#include <silkworm/node/test_util/fixture.hpp>
+#include <silkworm/infra/test_util/fixture.hpp>
 
 #include "../../test_util/sample_protos.hpp"
 
diff --git a/silkworm/node/remote/kv/grpc/client/remote_client.cpp b/silkworm/db/remote/kv/grpc/client/remote_client.cpp
similarity index 100%
rename from silkworm/node/remote/kv/grpc/client/remote_client.cpp
rename to silkworm/db/remote/kv/grpc/client/remote_client.cpp
diff --git a/silkworm/node/remote/kv/grpc/client/remote_client.hpp b/silkworm/db/remote/kv/grpc/client/remote_client.hpp
similarity index 100%
rename from silkworm/node/remote/kv/grpc/client/remote_client.hpp
rename to silkworm/db/remote/kv/grpc/client/remote_client.hpp
diff --git a/silkworm/node/remote/kv/grpc/client/remote_client_test.cpp b/silkworm/db/remote/kv/grpc/client/remote_client_test.cpp
similarity index 100%
rename from silkworm/node/remote/kv/grpc/client/remote_client_test.cpp
rename to silkworm/db/remote/kv/grpc/client/remote_client_test.cpp
diff --git a/silkworm/node/remote/kv/grpc/server/kv_calls.cpp b/silkworm/db/remote/kv/grpc/server/kv_calls.cpp
similarity index 100%
rename from silkworm/node/remote/kv/grpc/server/kv_calls.cpp
rename to silkworm/db/remote/kv/grpc/server/kv_calls.cpp
diff --git a/silkworm/node/remote/kv/grpc/server/kv_calls.hpp b/silkworm/db/remote/kv/grpc/server/kv_calls.hpp
similarity index 100%
rename from silkworm/node/remote/kv/grpc/server/kv_calls.hpp
rename to silkworm/db/remote/kv/grpc/server/kv_calls.hpp
diff --git a/silkworm/node/remote/kv/grpc/server/kv_calls_test.cpp b/silkworm/db/remote/kv/grpc/server/kv_calls_test.cpp
similarity index 100%
rename from silkworm/node/remote/kv/grpc/server/kv_calls_test.cpp
rename to silkworm/db/remote/kv/grpc/server/kv_calls_test.cpp
diff --git a/silkworm/node/remote/kv/grpc/server/kv_server.cpp b/silkworm/db/remote/kv/grpc/server/kv_server.cpp
similarity index 100%
rename from silkworm/node/remote/kv/grpc/server/kv_server.cpp
rename to silkworm/db/remote/kv/grpc/server/kv_server.cpp
diff --git a/silkworm/node/remote/kv/grpc/server/kv_server.hpp b/silkworm/db/remote/kv/grpc/server/kv_server.hpp
similarity index 100%
rename from silkworm/node/remote/kv/grpc/server/kv_server.hpp
rename to silkworm/db/remote/kv/grpc/server/kv_server.hpp
diff --git a/silkworm/node/remote/kv/grpc/server/kv_server_test.cpp b/silkworm/db/remote/kv/grpc/server/kv_server_test.cpp
similarity index 99%
rename from silkworm/node/remote/kv/grpc/server/kv_server_test.cpp
rename to silkworm/db/remote/kv/grpc/server/kv_server_test.cpp
index 4bcfd43ae4..15e4271469 100644
--- a/silkworm/node/remote/kv/grpc/server/kv_server_test.cpp
+++ b/silkworm/db/remote/kv/grpc/server/kv_server_test.cpp
@@ -38,8 +38,9 @@
 #include <silkworm/infra/test_util/log.hpp>
 #include <silkworm/interfaces/remote/kv.pb.h>
 #include <silkworm/interfaces/types/types.pb.h>
-#include <silkworm/node/remote/kv/grpc/server/kv_calls.hpp>
-#include <silkworm/node/remote/kv/grpc/server/state_change_collection.hpp>
+
+#include "kv_calls.hpp"
+#include "state_change_collection.hpp"
 
 using namespace std::chrono_literals;
 
diff --git a/silkworm/node/remote/kv/grpc/server/state_change_collection.cpp b/silkworm/db/remote/kv/grpc/server/state_change_collection.cpp
similarity index 100%
rename from silkworm/node/remote/kv/grpc/server/state_change_collection.cpp
rename to silkworm/db/remote/kv/grpc/server/state_change_collection.cpp
diff --git a/silkworm/node/remote/kv/grpc/server/state_change_collection.hpp b/silkworm/db/remote/kv/grpc/server/state_change_collection.hpp
similarity index 100%
rename from silkworm/node/remote/kv/grpc/server/state_change_collection.hpp
rename to silkworm/db/remote/kv/grpc/server/state_change_collection.hpp
diff --git a/silkworm/node/remote/kv/grpc/server/state_change_collection_test.cpp b/silkworm/db/remote/kv/grpc/server/state_change_collection_test.cpp
similarity index 100%
rename from silkworm/node/remote/kv/grpc/server/state_change_collection_test.cpp
rename to silkworm/db/remote/kv/grpc/server/state_change_collection_test.cpp
diff --git a/silkworm/node/remote/kv/grpc/test_util/sample_protos.hpp b/silkworm/db/remote/kv/grpc/test_util/sample_protos.hpp
similarity index 100%
rename from silkworm/node/remote/kv/grpc/test_util/sample_protos.hpp
rename to silkworm/db/remote/kv/grpc/test_util/sample_protos.hpp
diff --git a/silkworm/node/test_util/fixture.hpp b/silkworm/infra/test_util/fixture.hpp
similarity index 100%
rename from silkworm/node/test_util/fixture.hpp
rename to silkworm/infra/test_util/fixture.hpp
diff --git a/silkworm/node/backend/ethereum_backend.hpp b/silkworm/node/backend/ethereum_backend.hpp
index cf6bdb52ff..1837b82b82 100644
--- a/silkworm/node/backend/ethereum_backend.hpp
+++ b/silkworm/node/backend/ethereum_backend.hpp
@@ -23,8 +23,8 @@
 
 #include <silkworm/core/chain/config.hpp>
 #include <silkworm/core/common/base.hpp>
+#include <silkworm/db/remote/kv/grpc/server/state_change_collection.hpp>
 #include <silkworm/node/common/node_settings.hpp>
-#include <silkworm/node/remote/kv/grpc/server/state_change_collection.hpp>
 #include <silkworm/sentry/api/common/sentry_client.hpp>
 
 namespace silkworm {
diff --git a/silkworm/node/execution/grpc/client/endpoint/checkers_test.cpp b/silkworm/node/execution/grpc/client/endpoint/checkers_test.cpp
index b2ad674868..e66662a75a 100644
--- a/silkworm/node/execution/grpc/client/endpoint/checkers_test.cpp
+++ b/silkworm/node/execution/grpc/client/endpoint/checkers_test.cpp
@@ -23,8 +23,8 @@
 #include <intx/intx.hpp>
 
 #include <silkworm/infra/grpc/common/conversion.hpp>
+#include <silkworm/infra/test_util/fixture.hpp>
 #include <silkworm/interfaces/execution/execution.pb.h>
-#include <silkworm/node/test_util/fixture.hpp>
 
 #include "../../test_util/sample_protos.hpp"
 
diff --git a/silkworm/node/execution/grpc/client/endpoint/getters_test.cpp b/silkworm/node/execution/grpc/client/endpoint/getters_test.cpp
index 1a1cdde765..e2ef0bda7b 100644
--- a/silkworm/node/execution/grpc/client/endpoint/getters_test.cpp
+++ b/silkworm/node/execution/grpc/client/endpoint/getters_test.cpp
@@ -22,8 +22,8 @@
 #include <intx/intx.hpp>
 
 #include <silkworm/infra/grpc/common/conversion.hpp>
+#include <silkworm/infra/test_util/fixture.hpp>
 #include <silkworm/interfaces/execution/execution.pb.h>
-#include <silkworm/node/test_util/fixture.hpp>
 #include <silkworm/node/test_util/sample_blocks.hpp>
 
 #include "../../test_util/sample_protos.hpp"
diff --git a/silkworm/node/execution/grpc/client/endpoint/insertion_test.cpp b/silkworm/node/execution/grpc/client/endpoint/insertion_test.cpp
index 69a897ccbc..fb9f0fb5ae 100644
--- a/silkworm/node/execution/grpc/client/endpoint/insertion_test.cpp
+++ b/silkworm/node/execution/grpc/client/endpoint/insertion_test.cpp
@@ -21,8 +21,8 @@
 #include <catch2/catch.hpp>
 #include <intx/intx.hpp>
 
+#include <silkworm/infra/test_util/fixture.hpp>
 #include <silkworm/interfaces/execution/execution.pb.h>
-#include <silkworm/node/test_util/fixture.hpp>
 #include <silkworm/node/test_util/sample_blocks.hpp>
 
 #include "../../test_util/sample_protos.hpp"
diff --git a/silkworm/node/execution/grpc/common/block_test.cpp b/silkworm/node/execution/grpc/common/block_test.cpp
index a758cf37d1..e2db271adf 100644
--- a/silkworm/node/execution/grpc/common/block_test.cpp
+++ b/silkworm/node/execution/grpc/common/block_test.cpp
@@ -20,8 +20,7 @@
 
 #include <catch2/catch.hpp>
 
-#include <silkworm/core/common/bytes_to_string.hpp>
-#include <silkworm/node/test_util/fixture.hpp>
+#include <silkworm/infra/test_util/fixture.hpp>
 #include <silkworm/node/test_util/sample_blocks.hpp>
 
 #include "../test_util/sample_protos.hpp"
diff --git a/silkworm/node/execution/grpc/server/endpoint/checkers_test.cpp b/silkworm/node/execution/grpc/server/endpoint/checkers_test.cpp
index 77b6406808..f8f8c79360 100644
--- a/silkworm/node/execution/grpc/server/endpoint/checkers_test.cpp
+++ b/silkworm/node/execution/grpc/server/endpoint/checkers_test.cpp
@@ -23,8 +23,8 @@
 #include <intx/intx.hpp>
 
 #include <silkworm/infra/grpc/common/conversion.hpp>
+#include <silkworm/infra/test_util/fixture.hpp>
 #include <silkworm/interfaces/execution/execution.pb.h>
-#include <silkworm/node/test_util/fixture.hpp>
 
 #include "../../test_util/sample_protos.hpp"
 
diff --git a/silkworm/node/execution/grpc/server/endpoint/getters_test.cpp b/silkworm/node/execution/grpc/server/endpoint/getters_test.cpp
index 303f8fbaa6..8732c2b86a 100644
--- a/silkworm/node/execution/grpc/server/endpoint/getters_test.cpp
+++ b/silkworm/node/execution/grpc/server/endpoint/getters_test.cpp
@@ -22,8 +22,8 @@
 #include <intx/intx.hpp>
 
 #include <silkworm/infra/grpc/common/conversion.hpp>
+#include <silkworm/infra/test_util/fixture.hpp>
 #include <silkworm/interfaces/execution/execution.pb.h>
-#include <silkworm/node/test_util/fixture.hpp>
 #include <silkworm/node/test_util/sample_blocks.hpp>
 
 #include "../../test_util/sample_protos.hpp"
diff --git a/silkworm/node/execution/grpc/server/endpoint/insertion_test.cpp b/silkworm/node/execution/grpc/server/endpoint/insertion_test.cpp
index 4dd0f428c3..32870351bd 100644
--- a/silkworm/node/execution/grpc/server/endpoint/insertion_test.cpp
+++ b/silkworm/node/execution/grpc/server/endpoint/insertion_test.cpp
@@ -21,8 +21,8 @@
 #include <catch2/catch.hpp>
 #include <intx/intx.hpp>
 
+#include <silkworm/infra/test_util/fixture.hpp>
 #include <silkworm/interfaces/execution/execution.pb.h>
-#include <silkworm/node/test_util/fixture.hpp>
 #include <silkworm/node/test_util/sample_blocks.hpp>
 
 #include "../../test_util/sample_protos.hpp"
diff --git a/silkworm/node/remote/ethbackend/grpc/server/backend_kv_server.cpp b/silkworm/node/remote/ethbackend/grpc/server/backend_kv_server.cpp
index a90176accc..67e7c9f1ff 100644
--- a/silkworm/node/remote/ethbackend/grpc/server/backend_kv_server.cpp
+++ b/silkworm/node/remote/ethbackend/grpc/server/backend_kv_server.cpp
@@ -16,11 +16,8 @@
 
 #include "backend_kv_server.hpp"
 
-#include <silkworm/infra/concurrency/task.hpp>
-
-#include <silkworm/infra/common/log.hpp>
+#include <silkworm/db/remote/kv/grpc/server/kv_calls.hpp>
 #include <silkworm/node/remote/ethbackend/grpc/server/backend_calls.hpp>
-#include <silkworm/node/remote/kv/grpc/server/kv_calls.hpp>
 
 namespace silkworm::rpc {
 
diff --git a/silkworm/node/remote/ethbackend/grpc/server/backend_kv_server.hpp b/silkworm/node/remote/ethbackend/grpc/server/backend_kv_server.hpp
index fac9873f2a..562765bb83 100644
--- a/silkworm/node/remote/ethbackend/grpc/server/backend_kv_server.hpp
+++ b/silkworm/node/remote/ethbackend/grpc/server/backend_kv_server.hpp
@@ -17,9 +17,9 @@
 #pragma once
 
 #include <silkworm/core/chain/config.hpp>
+#include <silkworm/db/remote/kv/grpc/server/kv_server.hpp>
 #include <silkworm/node/backend/ethereum_backend.hpp>
 #include <silkworm/node/remote/ethbackend/grpc/server/backend_server.hpp>
-#include <silkworm/node/remote/kv/grpc/server/kv_server.hpp>
 
 namespace silkworm::rpc {