diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7be172ca31..089af59385 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -436,7 +436,6 @@ set(scylla_sources
     cql3/ut_name.cc
     cql3/values.cc
     data_dictionary/data_dictionary.cc
-    database.cc
     db/batchlog_manager.cc
     db/commitlog/commitlog.cc
     db/commitlog/commitlog_entry.cc
@@ -555,6 +554,8 @@ set(scylla_sources
     release.cc
     repair/repair.cc
     repair/row_level.cc
+    replica/database.cc
+    replica/table.cc
     row_cache.cc
     schema.cc
     schema_mutations.cc
@@ -611,7 +612,6 @@ set(scylla_sources
     streaming/stream_summary.cc
     streaming/stream_task.cc
     streaming/stream_transfer_task.cc
-    table.cc
     table_helper.cc
     thrift/controller.cc
     thrift/handler.cc
diff --git a/alternator/auth.cc b/alternator/auth.cc
index 2942616d61..96489e403b 100644
--- a/alternator/auth.cc
+++ b/alternator/auth.cc
@@ -34,7 +34,7 @@
 #include "service/storage_proxy.hh"
 #include "alternator/executor.hh"
 #include "cql3/selection/selection.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include "query-result-set.hh"
 #include "cql3/result_set.hh"
 #include <seastar/core/coroutine.hh>
diff --git a/alternator/executor.cc b/alternator/executor.cc
index c144419656..47bc1edc99 100644
--- a/alternator/executor.cc
+++ b/alternator/executor.cc
@@ -29,7 +29,7 @@
 #include "schema_builder.hh"
 #include "exceptions/exceptions.hh"
 #include "timestamp.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include "types/map.hh"
 #include "schema.hh"
 #include "query-request.hh"
diff --git a/alternator/streams.cc b/alternator/streams.cc
index 0ccad62543..c81120a732 100644
--- a/alternator/streams.cc
+++ b/alternator/streams.cc
@@ -28,7 +28,7 @@
 
 #include "utils/base64.hh"
 #include "log.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include "db/config.hh"
 
 #include "cdc/log.hh"
diff --git a/alternator/ttl.cc b/alternator/ttl.cc
index cdde2487e2..0f05f4b391 100644
--- a/alternator/ttl.cc
+++ b/alternator/ttl.cc
@@ -35,7 +35,7 @@
 #include "locator/abstract_replication_strategy.hh"
 #include "log.hh"
 #include "gc_clock.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include "service_permit.hh"
 #include "timestamp.hh"
 #include "service/storage_proxy.hh"
diff --git a/api/api_init.hh b/api/api_init.hh
index 3ae0a33a7f..d27cd25c78 100644
--- a/api/api_init.hh
+++ b/api/api_init.hh
@@ -23,7 +23,7 @@
 #include <seastar/http/httpd.hh>
 #include <seastar/core/future.hh>
 
-#include "database_fwd.hh"
+#include "replica/database_fwd.hh"
 #include "seastarx.hh"
 
 namespace service {
diff --git a/api/column_family.hh b/api/column_family.hh
index cb8c3b6008..24678b30d8 100644
--- a/api/column_family.hh
+++ b/api/column_family.hh
@@ -23,7 +23,7 @@
 
 #include "api.hh"
 #include "api/api-doc/column_family.json.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include <seastar/core/future-util.hh>
 #include <any>
 
diff --git a/api/commitlog.cc b/api/commitlog.cc
index 86f3d8cba5..406a54d69c 100644
--- a/api/commitlog.cc
+++ b/api/commitlog.cc
@@ -22,7 +22,7 @@
 #include "commitlog.hh"
 #include "db/commitlog/commitlog.hh"
 #include "api/api-doc/commitlog.json.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include <vector>
 
 namespace api {
diff --git a/api/lsa.cc b/api/lsa.cc
index 8044f9d1ee..2e3d3c6ba9 100644
--- a/api/lsa.cc
+++ b/api/lsa.cc
@@ -26,7 +26,7 @@
 #include <seastar/http/exception.hh>
 #include "utils/logalloc.hh"
 #include "log.hh"
-#include "database.hh"
+#include "replica/database.hh"
 
 namespace api {
 
diff --git a/api/storage_proxy.cc b/api/storage_proxy.cc
index 28345ad40d..21b38abb3f 100644
--- a/api/storage_proxy.cc
+++ b/api/storage_proxy.cc
@@ -26,7 +26,7 @@
 #include "service/storage_service.hh"
 #include "db/config.hh"
 #include "utils/histogram.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include "seastar/core/scheduling_specific.hh"
 
 namespace api {
diff --git a/api/storage_service.cc b/api/storage_service.cc
index 3d2c7255e4..7a22486ae4 100644
--- a/api/storage_service.cc
+++ b/api/storage_service.cc
@@ -46,7 +46,7 @@
 #include "release.hh"
 #include "compaction/compaction_manager.hh"
 #include "sstables/sstables.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include "db/extensions.hh"
 #include "db/snapshot-ctl.hh"
 #include "transport/controller.hh"
diff --git a/api/system.cc b/api/system.cc
index abd1db8afa..016a177f29 100644
--- a/api/system.cc
+++ b/api/system.cc
@@ -25,7 +25,7 @@
 #include <seastar/core/reactor.hh>
 #include <seastar/http/exception.hh>
 #include "log.hh"
-#include "database.hh"
+#include "replica/database.hh"
 
 extern logging::logger apilog;
 
diff --git a/auth/common.cc b/auth/common.cc
index 3e986ca6a0..45f3a0a391 100644
--- a/auth/common.cc
+++ b/auth/common.cc
@@ -25,7 +25,7 @@
 
 #include "cql3/query_processor.hh"
 #include "cql3/statements/create_table_statement.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include "schema_builder.hh"
 #include "service/migration_manager.hh"
 #include "timeout_config.hh"
diff --git a/auth/default_authorizer.cc b/auth/default_authorizer.cc
index 9fa74b2910..6253fefc93 100644
--- a/auth/default_authorizer.cc
+++ b/auth/default_authorizer.cc
@@ -61,7 +61,7 @@ extern "C" {
 #include "cql3/untyped_result_set.hh"
 #include "exceptions/exceptions.hh"
 #include "log.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include "utils/class_registrator.hh"
 
 namespace auth {
diff --git a/auth/password_authenticator.cc b/auth/password_authenticator.cc
index 7a99e6a516..933602725d 100644
--- a/auth/password_authenticator.cc
+++ b/auth/password_authenticator.cc
@@ -58,7 +58,7 @@
 #include "log.hh"
 #include "service/migration_manager.hh"
 #include "utils/class_registrator.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include "cql3/query_processor.hh"
 
 namespace auth {
diff --git a/auth/standard_role_manager.cc b/auth/standard_role_manager.cc
index 911121d351..634c0ec2c8 100644
--- a/auth/standard_role_manager.cc
+++ b/auth/standard_role_manager.cc
@@ -40,7 +40,7 @@
 #include "exceptions/exceptions.hh"
 #include "log.hh"
 #include "utils/class_registrator.hh"
-#include "database.hh"
+#include "replica/database.hh"
 
 namespace auth {
 
diff --git a/canonical_mutation.hh b/canonical_mutation.hh
index c98a284101..311f04e81e 100644
--- a/canonical_mutation.hh
+++ b/canonical_mutation.hh
@@ -23,7 +23,7 @@
 
 #include "bytes.hh"
 #include "schema_fwd.hh"
-#include "database_fwd.hh"
+#include "replica/database_fwd.hh"
 #include "bytes_ostream.hh"
 #include <iosfwd>
 
diff --git a/cdc/generation.cc b/cdc/generation.cc
index dbf82129ba..c6fb8964f0 100644
--- a/cdc/generation.cc
+++ b/cdc/generation.cc
@@ -28,7 +28,7 @@
 
 #include "keys.hh"
 #include "schema_builder.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include "db/system_keyspace.hh"
 #include "db/system_distributed_keyspace.hh"
 #include "dht/token-sharding.hh"
diff --git a/cdc/generation.hh b/cdc/generation.hh
index 7b72a57a62..d79f208a87 100644
--- a/cdc/generation.hh
+++ b/cdc/generation.hh
@@ -36,7 +36,7 @@
 #include <unordered_set>
 #include <seastar/util/noncopyable_function.hh>
 
-#include "database_fwd.hh"
+#include "replica/database_fwd.hh"
 #include "db_clock.hh"
 #include "dht/token.hh"
 #include "locator/token_metadata.hh"
diff --git a/cdc/log.cc b/cdc/log.cc
index 19516abbbb..0e39698c5c 100644
--- a/cdc/log.cc
+++ b/cdc/log.cc
@@ -34,7 +34,7 @@
 #include "cdc/change_visitor.hh"
 #include "cdc/metadata.hh"
 #include "bytes.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include "db/schema_tables.hh"
 #include "partition_slice_builder.hh"
 #include "schema.hh"
diff --git a/cdc/split.hh b/cdc/split.hh
index db4844f3cd..cec0de9a0d 100644
--- a/cdc/split.hh
+++ b/cdc/split.hh
@@ -24,7 +24,7 @@
 #include <vector>
 #include <boost/dynamic_bitset.hpp>
 #include "schema_fwd.hh"
-#include "database_fwd.hh"
+#include "replica/database_fwd.hh"
 #include "timestamp.hh"
 #include "bytes.hh"
 #include <seastar/util/noncopyable_function.hh>
diff --git a/compaction/compaction_manager.cc b/compaction/compaction_manager.cc
index 6a5ed45ea9..71bc1937f0 100644
--- a/compaction/compaction_manager.cc
+++ b/compaction/compaction_manager.cc
@@ -24,7 +24,7 @@
 #include "compaction_backlog_manager.hh"
 #include "sstables/sstables.hh"
 #include "sstables/sstables_manager.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include <seastar/core/metrics.hh>
 #include <seastar/core/coroutine.hh>
 #include "sstables/exceptions.hh"
diff --git a/configure.py b/configure.py
index 7cd48e693b..9ae9a53324 100755
--- a/configure.py
+++ b/configure.py
@@ -666,9 +666,9 @@ scylla_raft_core = [
     'raft/log.cc',
 ]
 
-scylla_core = (['database.cc',
+scylla_core = (['replica/database.cc',
+                'replica/table.cc',
                 'absl-flat_hash_map.cc',
-                'table.cc',
                 'atomic_cell.cc',
                 'caching_options.cc',
                 'collection_mutation.cc',
diff --git a/connection_notifier.cc b/connection_notifier.cc
index 02daa4632d..5140818ca6 100644
--- a/connection_notifier.cc
+++ b/connection_notifier.cc
@@ -21,7 +21,7 @@
 
 #include "connection_notifier.hh"
 #include "cql3/constants.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include "service/storage_proxy.hh"
 
 #include <stdexcept>
diff --git a/cql3/expr/expression.hh b/cql3/expr/expression.hh
index 2f5eee1f4d..702dec468f 100644
--- a/cql3/expr/expression.hh
+++ b/cql3/expr/expression.hh
@@ -41,7 +41,7 @@
 #include "utils/overloaded_functor.hh"
 #include "utils/variant_element.hh"
 #include "cql3/values.hh"
-#include "database_fwd.hh"
+#include "replica/database_fwd.hh"
 
 class row;
 
diff --git a/cql3/statements/create_function_statement.cc b/cql3/statements/create_function_statement.cc
index 783ec4e97b..d8ead79edd 100644
--- a/cql3/statements/create_function_statement.cc
+++ b/cql3/statements/create_function_statement.cc
@@ -28,7 +28,7 @@
 #include "service/storage_proxy.hh"
 #include "lang/lua.hh"
 #include "data_dictionary/data_dictionary.hh"
-#include "database.hh" // for wasm
+#include "replica/database.hh" // for wasm
 #include "cql3/query_processor.hh"
 
 namespace cql3 {
diff --git a/db/commitlog/commitlog_replayer.cc b/db/commitlog/commitlog_replayer.cc
index 145c144114..7db82e1b82 100644
--- a/db/commitlog/commitlog_replayer.cc
+++ b/db/commitlog/commitlog_replayer.cc
@@ -50,7 +50,7 @@
 
 #include "commitlog.hh"
 #include "commitlog_replayer.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include "sstables/sstables.hh"
 #include "db/system_keyspace.hh"
 #include "log.hh"
diff --git a/db/consistency_level.cc b/db/consistency_level.cc
index 5e0fd36037..eeac9d8206 100644
--- a/db/consistency_level.cc
+++ b/db/consistency_level.cc
@@ -48,7 +48,7 @@
 #include "exceptions/exceptions.hh"
 #include <seastar/core/sstring.hh>
 #include "schema.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include "unimplemented.hh"
 #include "db/read_repair_decision.hh"
 #include "locator/abstract_replication_strategy.hh"
diff --git a/db/consistency_level.hh b/db/consistency_level.hh
index 7737378929..541fc8348e 100644
--- a/db/consistency_level.hh
+++ b/db/consistency_level.hh
@@ -47,7 +47,7 @@
 #include "gms/inet_address.hh"
 #include "inet_address_vectors.hh"
 #include "log.hh"
-#include "database_fwd.hh"
+#include "replica/database_fwd.hh"
 
 #include <iosfwd>
 #include <vector>
diff --git a/db/cql_type_parser.cc b/db/cql_type_parser.cc
index 19fff35e86..f7c4f19139 100644
--- a/db/cql_type_parser.cc
+++ b/db/cql_type_parser.cc
@@ -41,7 +41,7 @@
 #include <boost/range/adaptor/map.hpp>
 #include <boost/range/adaptor/sliced.hpp>
 
-#include "database.hh"
+#include "replica/database.hh"
 #include "service/storage_proxy.hh"
 #include "cql3/CqlParser.hpp"
 #include "cql3/util.hh"
diff --git a/db/data_listeners.cc b/db/data_listeners.cc
index 9caac1feb9..9cae768731 100755
--- a/db/data_listeners.cc
+++ b/db/data_listeners.cc
@@ -20,7 +20,7 @@
  */
 
 #include "db/data_listeners.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include "db_clock.hh"
 
 #include <tuple>
diff --git a/db/hints/manager.cc b/db/hints/manager.cc
index 937c5a5864..4b4c42b708 100644
--- a/db/hints/manager.cc
+++ b/db/hints/manager.cc
@@ -39,7 +39,7 @@
 #include "lister.hh"
 #include "db/timeout_clock.hh"
 #include "service/priority_manager.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include "service_permit.hh"
 #include "utils/directories.hh"
 #include "locator/abstract_replication_strategy.hh"
diff --git a/db/legacy_schema_migrator.cc b/db/legacy_schema_migrator.cc
index d38b601db1..3ad67918fd 100644
--- a/db/legacy_schema_migrator.cc
+++ b/db/legacy_schema_migrator.cc
@@ -56,7 +56,7 @@
 #include <unordered_set>
 #include <chrono>
 
-#include "database.hh"
+#include "replica/database.hh"
 #include "legacy_schema_migrator.hh"
 #include "system_keyspace.hh"
 #include "schema_tables.hh"
diff --git a/db/schema_tables.cc b/db/schema_tables.cc
index 2a7f74712c..7657e6a299 100644
--- a/db/schema_tables.cc
+++ b/db/schema_tables.cc
@@ -86,7 +86,7 @@
 #include "view_info.hh"
 #include "cql_type_parser.hh"
 #include "db/timeout_clock.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include "data_dictionary/user_types_metadata.hh"
 
 #include "index/target_parser.hh"
diff --git a/db/size_estimates_virtual_reader.cc b/db/size_estimates_virtual_reader.cc
index a20fbde6b8..a7f140dde6 100644
--- a/db/size_estimates_virtual_reader.cc
+++ b/db/size_estimates_virtual_reader.cc
@@ -28,14 +28,14 @@
 #include <boost/range/algorithm/sort.hpp>
 
 #include "clustering_bounds_comparator.hh"
-#include "database_fwd.hh"
+#include "replica/database_fwd.hh"
 #include "db/system_keyspace.hh"
 #include "dht/i_partitioner.hh"
 #include "partition_range_compat.hh"
 #include "range.hh"
 #include "mutation_fragment.hh"
 #include "sstables/sstables.hh"
-#include "database.hh"
+#include "replica/database.hh"
 
 #include "db/size_estimates_virtual_reader.hh"
 
diff --git a/db/snapshot-ctl.cc b/db/snapshot-ctl.cc
index 7be44b2fb6..57e44740f9 100644
--- a/db/snapshot-ctl.cc
+++ b/db/snapshot-ctl.cc
@@ -40,7 +40,7 @@
 
 #include <boost/range/adaptors.hpp>
 #include "db/snapshot-ctl.hh"
-#include "database.hh"
+#include "replica/database.hh"
 
 namespace db {
 
diff --git a/db/snapshot-ctl.hh b/db/snapshot-ctl.hh
index 8715f485cd..06b7a4e435 100644
--- a/db/snapshot-ctl.hh
+++ b/db/snapshot-ctl.hh
@@ -44,7 +44,7 @@
 
 #include <seastar/core/sharded.hh>
 #include <seastar/core/future.hh>
-#include "database_fwd.hh"
+#include "replica/database_fwd.hh"
 #include <seastar/core/gate.hh>
 #include <seastar/core/rwlock.hh>
 
diff --git a/db/sstables-format-selector.cc b/db/sstables-format-selector.cc
index b5bb3604f7..23b60ea0ae 100644
--- a/db/sstables-format-selector.cc
+++ b/db/sstables-format-selector.cc
@@ -22,7 +22,7 @@
 
 #include "sstables-format-selector.hh"
 #include "log.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include "gms/gossiper.hh"
 #include "gms/feature_service.hh"
 #include "gms/versioned_value.hh"
diff --git a/db/system_distributed_keyspace.cc b/db/system_distributed_keyspace.cc
index b66e48160b..1324749db9 100644
--- a/db/system_distributed_keyspace.cc
+++ b/db/system_distributed_keyspace.cc
@@ -22,7 +22,7 @@
 #include "db/system_distributed_keyspace.hh"
 
 #include "cql3/untyped_result_set.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include "db/consistency_level_type.hh"
 #include "db/system_keyspace.hh"
 #include "schema_builder.hh"
diff --git a/db/view/build_progress_virtual_reader.hh b/db/view/build_progress_virtual_reader.hh
index 303cfe921d..a69038e29a 100644
--- a/db/view/build_progress_virtual_reader.hh
+++ b/db/view/build_progress_virtual_reader.hh
@@ -19,7 +19,7 @@
  * along with Scylla.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database.hh"
+#include "replica/database.hh"
 #include "db/system_keyspace.hh"
 #include "db/timeout_clock.hh"
 #include "dht/i_partitioner.hh"
diff --git a/db/view/view.cc b/db/view/view.cc
index 403cbc2730..89adb36f2e 100644
--- a/db/view/view.cc
+++ b/db/view/view.cc
@@ -57,7 +57,7 @@
 #include <seastar/core/coroutine.hh>
 #include <seastar/coroutine/maybe_yield.hh>
 
-#include "database.hh"
+#include "replica/database.hh"
 #include "clustering_bounds_comparator.hh"
 #include "cql3/statements/select_statement.hh"
 #include "cql3/util.hh"
diff --git a/db/view/view_builder.hh b/db/view/view_builder.hh
index b942ba2c9c..0b7358e793 100644
--- a/db/view/view_builder.hh
+++ b/db/view/view_builder.hh
@@ -26,7 +26,7 @@
 #include "service/migration_listener.hh"
 #include "utils/serialized_action.hh"
 #include "utils/UUID.hh"
-#include "database.hh"
+#include "replica/database.hh"
 
 #include <seastar/core/abort_source.hh>
 #include <seastar/core/future.hh>
diff --git a/db/view/view_update_generator.hh b/db/view/view_update_generator.hh
index 11b9798cda..eb3e230ec5 100644
--- a/db/view/view_update_generator.hh
+++ b/db/view/view_update_generator.hh
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "database.hh"
+#include "replica/database.hh"
 #include "sstables/shared_sstable.hh"
 
 #include <seastar/core/abort_source.hh>
diff --git a/db/virtual_table.hh b/db/virtual_table.hh
index 6e1c95804f..6199d26b12 100644
--- a/db/virtual_table.hh
+++ b/db/virtual_table.hh
@@ -24,7 +24,7 @@
 #include "mutation_reader.hh"
 #include "memtable.hh"
 #include "schema.hh"
-#include "database_fwd.hh"
+#include "replica/database_fwd.hh"
 
 namespace db {
 
diff --git a/dht/boot_strapper.cc b/dht/boot_strapper.cc
index dc9eedcf43..d9ea04b015 100644
--- a/dht/boot_strapper.cc
+++ b/dht/boot_strapper.cc
@@ -44,7 +44,7 @@
 #include "gms/gossiper.hh"
 #include "log.hh"
 #include "db/config.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include "streaming/stream_reason.hh"
 #include "locator/abstract_replication_strategy.hh"
 
diff --git a/dht/boot_strapper.hh b/dht/boot_strapper.hh
index f40602a49f..dfec784a95 100644
--- a/dht/boot_strapper.hh
+++ b/dht/boot_strapper.hh
@@ -40,7 +40,7 @@
 #include "locator/token_metadata.hh"
 #include "dht/i_partitioner.hh"
 #include <unordered_set>
-#include "database_fwd.hh"
+#include "replica/database_fwd.hh"
 #include "streaming/stream_reason.hh"
 #include <seastar/core/distributed.hh>
 #include <seastar/core/abort_source.hh>
diff --git a/dht/range_streamer.cc b/dht/range_streamer.cc
index afc9556f74..5082379040 100644
--- a/dht/range_streamer.cc
+++ b/dht/range_streamer.cc
@@ -40,7 +40,7 @@
 #include "dht/range_streamer.hh"
 #include "utils/fb_utilities.hh"
 #include "locator/snitch_base.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include "gms/gossiper.hh"
 #include "gms/failure_detector.hh"
 #include "log.hh"
diff --git a/dirty_memory_manager.hh b/dirty_memory_manager.hh
index bf4d5aab3f..fbb508b271 100644
--- a/dirty_memory_manager.hh
+++ b/dirty_memory_manager.hh
@@ -26,7 +26,7 @@
 #include <seastar/core/future.hh>
 #include <seastar/core/metrics_registration.hh>
 #include <seastar/core/semaphore.hh>
-#include "database_fwd.hh"
+#include "replica/database_fwd.hh"
 #include "utils/logalloc.hh"
 
 class dirty_memory_manager;
diff --git a/distributed_loader.cc b/distributed_loader.cc
index 143d2c89d8..e4ec7f43c2 100644
--- a/distributed_loader.cc
+++ b/distributed_loader.cc
@@ -21,7 +21,7 @@
 
 #include <seastar/util/closeable.hh>
 #include "distributed_loader.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include "db/config.hh"
 #include "db/system_keyspace.hh"
 #include "db/system_distributed_keyspace.hh"
diff --git a/frozen_mutation.hh b/frozen_mutation.hh
index e112dd4ae1..d598fc5909 100644
--- a/frozen_mutation.hh
+++ b/frozen_mutation.hh
@@ -22,7 +22,7 @@
 #pragma once
 
 #include "dht/i_partitioner.hh"
-#include "database_fwd.hh"
+#include "replica/database_fwd.hh"
 #include "mutation_fragment.hh"
 
 class mutation;
diff --git a/gms/failure_detector.cc b/gms/failure_detector.cc
index 2927860b7a..eb84ed0e2e 100644
--- a/gms/failure_detector.cc
+++ b/gms/failure_detector.cc
@@ -47,7 +47,7 @@
 #include "db/config.hh"
 #include <iostream>
 #include <chrono>
-#include "database.hh"
+#include "replica/database.hh"
 
 namespace gms {
 
diff --git a/index/built_indexes_virtual_reader.hh b/index/built_indexes_virtual_reader.hh
index 6db063a393..c81fa2ec10 100644
--- a/index/built_indexes_virtual_reader.hh
+++ b/index/built_indexes_virtual_reader.hh
@@ -19,7 +19,7 @@
  * along with Scylla.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database.hh"
+#include "replica/database.hh"
 #include "db/system_keyspace.hh"
 #include "flat_mutation_reader.hh"
 #include "mutation_fragment.hh"
diff --git a/index/secondary_index_manager.cc b/index/secondary_index_manager.cc
index aa50d949c4..facf8283dc 100644
--- a/index/secondary_index_manager.cc
+++ b/index/secondary_index_manager.cc
@@ -47,7 +47,7 @@
 #include "index/target_parser.hh"
 #include "db/query_context.hh"
 #include "schema_builder.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include "db/view/view.hh"
 
 #include <boost/range/adaptor/map.hpp>
diff --git a/index/secondary_index_manager.hh b/index/secondary_index_manager.hh
index 2449f4494c..3a2b073eb9 100644
--- a/index/secondary_index_manager.hh
+++ b/index/secondary_index_manager.hh
@@ -43,7 +43,7 @@
 
 #include "schema.hh"
 
-#include "database_fwd.hh"
+#include "replica/database_fwd.hh"
 
 #include <vector>
 #include <set>
diff --git a/keys.hh b/keys.hh
index 99a1650713..85207dadde 100644
--- a/keys.hh
+++ b/keys.hh
@@ -26,7 +26,7 @@
 #include "compound_compat.hh"
 #include "utils/managed_bytes.hh"
 #include "hashing.hh"
-#include "database_fwd.hh"
+#include "replica/database_fwd.hh"
 #include "schema_fwd.hh"
 #include <compare>
 
diff --git a/locator/abstract_replication_strategy.hh b/locator/abstract_replication_strategy.hh
index 16985036df..17c2618aa0 100644
--- a/locator/abstract_replication_strategy.hh
+++ b/locator/abstract_replication_strategy.hh
@@ -32,7 +32,7 @@
 #include <seastar/util/bool_class.hh>
 #include "utils/maybe_yield.hh"
 
-// forward declaration since database.hh includes this file
+// forward declaration since replica/database.hh includes this file
 class keyspace;
 
 namespace locator {
diff --git a/locator/local_strategy.hh b/locator/local_strategy.hh
index 6486acad96..3565a3b470 100644
--- a/locator/local_strategy.hh
+++ b/locator/local_strategy.hh
@@ -26,7 +26,7 @@
 #include <optional>
 #include <set>
 
-// forward declaration since database.hh includes this file
+// forward declaration since replica/database.hh includes this file
 class keyspace;
 
 namespace locator {
diff --git a/locator/token_metadata.hh b/locator/token_metadata.hh
index 1d5d291c24..9aca810228 100644
--- a/locator/token_metadata.hh
+++ b/locator/token_metadata.hh
@@ -53,7 +53,7 @@
 #include <seastar/core/shared_ptr.hh>
 #include <seastar/core/semaphore.hh>
 
-// forward declaration since database.hh includes this file
+// forward declaration since replica/database.hh includes this file
 class keyspace;
 
 namespace locator {
diff --git a/main.cc b/main.cc
index 765526339d..04a7634887 100644
--- a/main.cc
+++ b/main.cc
@@ -24,7 +24,7 @@
 #include <seastar/util/closeable.hh>
 #include "utils/build_id.hh"
 #include "supervisor.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include <seastar/core/reactor.hh>
 #include <seastar/core/app-template.hh>
 #include <seastar/core/distributed.hh>
diff --git a/memtable.cc b/memtable.cc
index 96a4bdbdae..50f52e2af1 100644
--- a/memtable.cc
+++ b/memtable.cc
@@ -20,7 +20,7 @@
  */
 
 #include "memtable.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include "frozen_mutation.hh"
 #include "partition_snapshot_reader.hh"
 #include "partition_builder.hh"
diff --git a/memtable.hh b/memtable.hh
index 9df693f01b..431756f848 100644
--- a/memtable.hh
+++ b/memtable.hh
@@ -24,7 +24,7 @@
 #include <map>
 #include <memory>
 #include <iosfwd>
-#include "database_fwd.hh"
+#include "replica/database_fwd.hh"
 #include "dht/i_partitioner.hh"
 #include "schema_fwd.hh"
 #include "encoding_stats.hh"
diff --git a/multishard_mutation_query.cc b/multishard_mutation_query.cc
index 89e47f57e8..7d80d5413d 100644
--- a/multishard_mutation_query.cc
+++ b/multishard_mutation_query.cc
@@ -22,7 +22,7 @@
 #include "schema_registry.hh"
 #include "service/priority_manager.hh"
 #include "multishard_mutation_query.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include "db/config.hh"
 #include "query-result-writer.hh"
 
diff --git a/multishard_mutation_query.hh b/multishard_mutation_query.hh
index 47256a35a7..e7ce723f51 100644
--- a/multishard_mutation_query.hh
+++ b/multishard_mutation_query.hh
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "database_fwd.hh"
+#include "replica/database_fwd.hh"
 #include "schema_fwd.hh"
 #include "cache_temperature.hh"
 #include "db/timeout_clock.hh"
diff --git a/mutation_partition_serializer.hh b/mutation_partition_serializer.hh
index bc13482543..2b0cfadbb4 100644
--- a/mutation_partition_serializer.hh
+++ b/mutation_partition_serializer.hh
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "database_fwd.hh"
+#include "replica/database_fwd.hh"
 #include "bytes_ostream.hh"
 #include "mutation_fragment.hh"
 
diff --git a/mutation_partition_view.hh b/mutation_partition_view.hh
index 82da1559e9..b790942ca3 100644
--- a/mutation_partition_view.hh
+++ b/mutation_partition_view.hh
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "database_fwd.hh"
+#include "replica/database_fwd.hh"
 #include "mutation_partition_visitor.hh"
 #include "utils/input_stream.hh"
 #include "atomic_cell.hh"
diff --git a/redis/controller.cc b/redis/controller.cc
index b7db6088a5..2427b67b08 100644
--- a/redis/controller.cc
+++ b/redis/controller.cc
@@ -27,7 +27,7 @@
 #include "db/config.hh"
 #include "log.hh"
 #include "auth/common.hh"
-#include "database.hh"
+#include "replica/database.hh"
 
 static logging::logger slogger("controller");
 
diff --git a/redis/keyspace_utils.cc b/redis/keyspace_utils.cc
index 53f60a52cd..0cebea22ac 100644
--- a/redis/keyspace_utils.cc
+++ b/redis/keyspace_utils.cc
@@ -35,7 +35,7 @@
 #include "transport/server.hh"
 #include "db/system_keyspace.hh"
 #include "schema.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include "gms/gossiper.hh"
 #include <seastar/core/print.hh>
 #include "db/config.hh"
diff --git a/redis/options.cc b/redis/options.cc
index 4d9c693680..6c4177415e 100644
--- a/redis/options.cc
+++ b/redis/options.cc
@@ -23,7 +23,7 @@
 #include "types.hh"
 #include "service/storage_proxy.hh"
 #include "schema.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include <seastar/core/print.hh>
 #include "redis/keyspace_utils.hh"
 
diff --git a/repair/repair.cc b/repair/repair.cc
index 887dd734c4..fe305fc29d 100644
--- a/repair/repair.cc
+++ b/repair/repair.cc
@@ -31,7 +31,7 @@
 #include "service/priority_manager.hh"
 #include "message/messaging_service.hh"
 #include "sstables/sstables.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include "db/config.hh"
 #include "hashers.hh"
 #include "locator/network_topology_strategy.hh"
diff --git a/repair/repair.hh b/repair/repair.hh
index 7aaf1066d4..92ba4fc8a5 100644
--- a/repair/repair.hh
+++ b/repair/repair.hh
@@ -33,7 +33,7 @@
 #include <seastar/core/condition-variable.hh>
 #include <seastar/core/gate.hh>
 
-#include "database_fwd.hh"
+#include "replica/database_fwd.hh"
 #include "frozen_mutation.hh"
 #include "utils/UUID.hh"
 #include "utils/hash.hh"
diff --git a/repair/row_level.cc b/repair/row_level.cc
index 8faa5c8a28..ed1468eaa9 100644
--- a/repair/row_level.cc
+++ b/repair/row_level.cc
@@ -33,7 +33,7 @@
 #include "utils/UUID.hh"
 #include "utils/hash.hh"
 #include "service/priority_manager.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include <seastar/util/bool_class.hh>
 #include <seastar/core/metrics_registration.hh>
 #include <seastar/core/coroutine.hh>
diff --git a/database.cc b/replica/database.cc
similarity index 99%
rename from database.cc
rename to replica/database.cc
index 8823a8a00d..354e149835 100644
--- a/database.cc
+++ b/replica/database.cc
@@ -21,7 +21,7 @@
 
 #include "log.hh"
 #include "lister.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include <seastar/core/future-util.hh>
 #include "db/system_keyspace.hh"
 #include "db/system_distributed_keyspace.hh"
diff --git a/database.hh b/replica/database.hh
similarity index 100%
rename from database.hh
rename to replica/database.hh
diff --git a/database_fwd.hh b/replica/database_fwd.hh
similarity index 98%
rename from database_fwd.hh
rename to replica/database_fwd.hh
index 059cb77de3..9feb1f2568 100644
--- a/database_fwd.hh
+++ b/replica/database_fwd.hh
@@ -21,7 +21,7 @@
 
 #pragma once
 
-// database.hh
+// replica/database.hh
 class database;
 class keyspace;
 class table;
diff --git a/table.cc b/replica/table.cc
similarity index 99%
rename from table.cc
rename to replica/table.cc
index 5bb9bb0aaf..7b57f670d4 100644
--- a/table.cc
+++ b/replica/table.cc
@@ -24,7 +24,7 @@
 #include <seastar/coroutine/maybe_yield.hh>
 #include <seastar/util/closeable.hh>
 
-#include "database.hh"
+#include "replica/database.hh"
 #include "sstables/sstables.hh"
 #include "sstables/sstables_manager.hh"
 #include "service/priority_manager.hh"
diff --git a/schema.cc b/schema.cc
index dfffd6554b..62f60a036c 100644
--- a/schema.cc
+++ b/schema.cc
@@ -36,7 +36,7 @@
 #include <boost/algorithm/cxx11/any_of.hpp>
 #include "view_info.hh"
 #include "partition_slice_builder.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include "dht/i_partitioner.hh"
 #include "dht/token-sharding.hh"
 #include "cdc/cdc_extension.hh"
diff --git a/schema_builder.hh b/schema_builder.hh
index 79bbe36e68..d9af6ef234 100644
--- a/schema_builder.hh
+++ b/schema_builder.hh
@@ -22,7 +22,7 @@
 #pragma once
 
 #include "schema.hh"
-#include "database_fwd.hh"
+#include "replica/database_fwd.hh"
 #include "cdc/log.hh"
 #include "dht/i_partitioner.hh"
 #include "tombstone_gc_options.hh"
diff --git a/service/cache_hitrate_calculator.hh b/service/cache_hitrate_calculator.hh
index 9dcb2187fe..24f7b8baac 100644
--- a/service/cache_hitrate_calculator.hh
+++ b/service/cache_hitrate_calculator.hh
@@ -21,7 +21,7 @@
 
 #pragma  once
 
-#include "database_fwd.hh"
+#include "replica/database_fwd.hh"
 #include "utils/UUID.hh"
 #include <seastar/core/timer.hh>
 #include <seastar/core/sharded.hh>
diff --git a/service/client_state.cc b/service/client_state.cc
index d0f136e618..4198931260 100644
--- a/service/client_state.cc
+++ b/service/client_state.cc
@@ -50,7 +50,7 @@
 #include "db/schema_tables.hh"
 #include "tracing/trace_keyspace_helper.hh"
 #include "db/system_distributed_keyspace.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include "cdc/log.hh"
 #include "utils/overloaded_functor.hh"
 #include <seastar/core/coroutine.hh>
diff --git a/service/client_state.hh b/service/client_state.hh
index 0359b7d465..0841adf013 100644
--- a/service/client_state.hh
+++ b/service/client_state.hh
@@ -47,7 +47,7 @@
 #include "timeout_config.hh"
 #include "timestamp.hh"
 #include "db_clock.hh"
-#include "database_fwd.hh"
+#include "replica/database_fwd.hh"
 #include "auth/authenticated_user.hh"
 #include "auth/authenticator.hh"
 #include "auth/permission.hh"
diff --git a/service/load_broadcaster.hh b/service/load_broadcaster.hh
index b39fae0deb..dca4c02ccd 100644
--- a/service/load_broadcaster.hh
+++ b/service/load_broadcaster.hh
@@ -40,7 +40,7 @@
 
 #pragma once
 
-#include "database_fwd.hh"
+#include "replica/database_fwd.hh"
 #include "gms/i_endpoint_state_change_subscriber.hh"
 #include "gms/gossiper.hh"
 
diff --git a/service/migration_manager.cc b/service/migration_manager.cc
index b1fb2e2b5c..da3e262c78 100644
--- a/service/migration_manager.cc
+++ b/service/migration_manager.cc
@@ -53,7 +53,7 @@
 #include "gms/gossiper.hh"
 #include "view_info.hh"
 #include "schema_builder.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include "db/schema_tables.hh"
 #include "types/user.hh"
 #include "db/schema_tables.hh"
diff --git a/service/misc_services.cc b/service/misc_services.cc
index dcd807ba27..71f9396787 100644
--- a/service/misc_services.cc
+++ b/service/misc_services.cc
@@ -46,7 +46,7 @@
 #include "gms/application_state.hh"
 #include "service/storage_proxy.hh"
 #include "service/view_update_backlog_broker.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include "locator/abstract_replication_strategy.hh"
 
 #include <cstdlib>
diff --git a/service/paxos/paxos_state.cc b/service/paxos/paxos_state.cc
index 4e3766f906..6c157cd399 100644
--- a/service/paxos/paxos_state.cc
+++ b/service/paxos/paxos_state.cc
@@ -26,7 +26,7 @@
 #include "service/paxos/paxos_state.hh"
 #include "db/system_keyspace.hh"
 #include "schema_registry.hh"
-#include "database.hh"
+#include "replica/database.hh"
 
 #include "utils/error_injection.hh"
 
diff --git a/service/storage_proxy.cc b/service/storage_proxy.cc
index 0efe34c51d..76743ce9c0 100644
--- a/service/storage_proxy.cc
+++ b/service/storage_proxy.cc
@@ -90,7 +90,7 @@
 #include <seastar/core/execution_stage.hh>
 #include "db/timeout_clock.hh"
 #include "multishard_mutation_query.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include "db/consistency_level_validations.hh"
 #include "cdc/log.hh"
 #include "cdc/stats.hh"
diff --git a/service/storage_proxy.hh b/service/storage_proxy.hh
index 1a95cc9022..6a0fd16321 100644
--- a/service/storage_proxy.hh
+++ b/service/storage_proxy.hh
@@ -41,7 +41,7 @@
 
 #pragma once
 
-#include "database_fwd.hh"
+#include "replica/database_fwd.hh"
 #include "data_dictionary/data_dictionary.hh"
 #include "message/messaging_service_fwd.hh"
 #include "query-request.hh"
diff --git a/service/storage_service.cc b/service/storage_service.cc
index c896c51495..f6a3017398 100644
--- a/service/storage_service.cc
+++ b/service/storage_service.cc
@@ -80,7 +80,7 @@
 #include "sstables/sstables.hh"
 #include "db/config.hh"
 #include "db/schema_tables.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include <seastar/core/metrics.hh>
 #include "cdc/generation.hh"
 #include "cdc/generation_service.hh"
diff --git a/service/storage_service.hh b/service/storage_service.hh
index d84c3c9500..7513269b91 100644
--- a/service/storage_service.hh
+++ b/service/storage_service.hh
@@ -53,7 +53,7 @@
 #include <seastar/core/gate.hh>
 #include "utils/fb_utilities.hh"
 #include "utils/serialized_action.hh"
-#include "database_fwd.hh"
+#include "replica/database_fwd.hh"
 #include "db/schema_features.hh"
 #include "streaming/stream_state.hh"
 #include "streaming/stream_reason.hh"
diff --git a/sstables/key.hh b/sstables/key.hh
index cd4921d08a..2943ff1f20 100644
--- a/sstables/key.hh
+++ b/sstables/key.hh
@@ -23,7 +23,7 @@
 #include "bytes.hh"
 #include "schema_fwd.hh"
 #include <seastar/core/future.hh>
-#include "database_fwd.hh"
+#include "replica/database_fwd.hh"
 #include "keys.hh"
 #include "compound_compat.hh"
 #include "dht/i_partitioner.hh"
diff --git a/sstables/sstable_directory.cc b/sstables/sstable_directory.cc
index 83f5e1be53..aa7bdf87f7 100644
--- a/sstables/sstable_directory.cc
+++ b/sstables/sstable_directory.cc
@@ -26,7 +26,7 @@
 #include "log.hh"
 #include "sstable_directory.hh"
 #include "lister.hh"
-#include "database.hh"
+#include "replica/database.hh"
 
 static logging::logger dirlog("sstable_directory");
 
diff --git a/sstables/sstable_set.cc b/sstables/sstable_set.cc
index dd94cdf23e..61c042f4e0 100644
--- a/sstables/sstable_set.cc
+++ b/sstables/sstable_set.cc
@@ -33,7 +33,7 @@
 
 #include "sstable_set_impl.hh"
 
-#include "database.hh"
+#include "replica/database.hh"
 
 namespace sstables {
 
diff --git a/sstables_loader.cc b/sstables_loader.cc
index b99dbe926e..45fca7826f 100644
--- a/sstables_loader.cc
+++ b/sstables_loader.cc
@@ -23,7 +23,7 @@
 #include <seastar/rpc/rpc.hh>
 #include "sstables_loader.hh"
 #include "distributed_loader.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include "sstables/sstables.hh"
 #include "gms/inet_address.hh"
 #include "streaming/stream_mutation_fragments_cmd.hh"
diff --git a/streaming/stream_transfer_task.cc b/streaming/stream_transfer_task.cc
index b1c2cc5825..7c02c186b0 100644
--- a/streaming/stream_transfer_task.cc
+++ b/streaming/stream_transfer_task.cc
@@ -57,7 +57,7 @@
 #include <boost/icl/interval.hpp>
 #include <boost/icl/interval_set.hpp>
 #include "sstables/sstables.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include "gms/feature_service.hh"
 
 namespace streaming {
diff --git a/table_helper.cc b/table_helper.cc
index 22252dae9d..b3594bd107 100644
--- a/table_helper.cc
+++ b/table_helper.cc
@@ -24,7 +24,7 @@
 #include "cql3/query_processor.hh"
 #include "cql3/statements/create_table_statement.hh"
 #include "cql3/statements/modification_statement.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include "service/migration_manager.hh"
 
 future<> table_helper::setup_table(cql3::query_processor& qp) const {
diff --git a/test/boost/database_test.cc b/test/boost/database_test.cc
index 7185d7b233..7722ebda32 100644
--- a/test/boost/database_test.cc
+++ b/test/boost/database_test.cc
@@ -32,7 +32,7 @@
 #include "test/lib/log.hh"
 #include "test/lib/random_utils.hh"
 
-#include "database.hh"
+#include "replica/database.hh"
 #include "lister.hh"
 #include "partition_slice_builder.hh"
 #include "frozen_mutation.hh"
diff --git a/test/boost/memtable_test.cc b/test/boost/memtable_test.cc
index 3caa3fb922..a0964e2350 100644
--- a/test/boost/memtable_test.cc
+++ b/test/boost/memtable_test.cc
@@ -21,7 +21,7 @@
 
 #include <boost/test/unit_test.hpp>
 #include "service/priority_manager.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include "db/config.hh"
 #include "utils/UUID_gen.hh"
 #include <seastar/testing/test_case.hh>
diff --git a/test/boost/mutation_reader_test.cc b/test/boost/mutation_reader_test.cc
index e2c7f72773..65c63fd160 100644
--- a/test/boost/mutation_reader_test.cc
+++ b/test/boost/mutation_reader_test.cc
@@ -52,7 +52,7 @@
 #include "cell_locking.hh"
 #include "sstables/sstables.hh"
 #include "sstables/sstable_set_impl.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include "partition_slice_builder.hh"
 #include "schema_registry.hh"
 #include "service/priority_manager.hh"
diff --git a/test/boost/mutation_test.cc b/test/boost/mutation_test.cc
index 20ae830de5..1e4127af6c 100644
--- a/test/boost/mutation_test.cc
+++ b/test/boost/mutation_test.cc
@@ -35,7 +35,7 @@
 #include <seastar/util/alloc_failure_injector.hh>
 #include <seastar/util/closeable.hh>
 
-#include "database.hh"
+#include "replica/database.hh"
 #include "utils/UUID_gen.hh"
 #include "mutation_reader.hh"
 #include "clustering_interval_set.hh"
diff --git a/test/boost/sstable_compaction_test.cc b/test/boost/sstable_compaction_test.cc
index 8254ae2967..afe210ed31 100644
--- a/test/boost/sstable_compaction_test.cc
+++ b/test/boost/sstable_compaction_test.cc
@@ -34,7 +34,7 @@
 #include <seastar/testing/thread_test_case.hh>
 #include "schema.hh"
 #include "schema_builder.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include "compaction/leveled_manifest.hh"
 #include "sstables/metadata_collector.hh"
 #include "sstables/sstable_writer.hh"
diff --git a/test/boost/sstable_datafile_test.cc b/test/boost/sstable_datafile_test.cc
index 103be80fbb..09b2ee0004 100644
--- a/test/boost/sstable_datafile_test.cc
+++ b/test/boost/sstable_datafile_test.cc
@@ -32,7 +32,7 @@
 #include <seastar/testing/thread_test_case.hh>
 #include "schema.hh"
 #include "schema_builder.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include "sstables/metadata_collector.hh"
 #include "sstables/sstable_writer.hh"
 #include <memory>
diff --git a/test/boost/sstable_mutation_test.cc b/test/boost/sstable_mutation_test.cc
index caa235f011..a81e785417 100644
--- a/test/boost/sstable_mutation_test.cc
+++ b/test/boost/sstable_mutation_test.cc
@@ -31,7 +31,7 @@
 #include <seastar/core/do_with.hh>
 #include <seastar/core/thread.hh>
 #include "sstables/sstables.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include "timestamp.hh"
 #include "schema_builder.hh"
 #include "mutation_reader.hh"
diff --git a/test/boost/sstable_resharding_test.cc b/test/boost/sstable_resharding_test.cc
index ba28d044f2..7780033021 100644
--- a/test/boost/sstable_resharding_test.cc
+++ b/test/boost/sstable_resharding_test.cc
@@ -11,7 +11,7 @@
 #include "sstables/sstables.hh"
 #include <seastar/testing/test_case.hh>
 #include "schema.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include "dht/murmur3_partitioner.hh"
 #include "compaction/compaction_manager.hh"
 #include "mutation_reader.hh"
diff --git a/test/boost/sstable_test.cc b/test/boost/sstable_test.cc
index 74ad292d18..90951676e4 100644
--- a/test/boost/sstable_test.cc
+++ b/test/boost/sstable_test.cc
@@ -34,7 +34,7 @@
 #include <seastar/testing/test_case.hh>
 #include "schema.hh"
 #include "compress.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include <memory>
 #include "test/boost/sstable_test.hh"
 #include "test/lib/tmpdir.hh"
diff --git a/test/boost/sstable_test.hh b/test/boost/sstable_test.hh
index 6cb4cfdf3b..314d26cd5b 100644
--- a/test/boost/sstable_test.hh
+++ b/test/boost/sstable_test.hh
@@ -24,7 +24,7 @@
 
 #include "types/map.hh"
 #include "sstables/sstables.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include "schema.hh"
 #include "schema_builder.hh"
 #include "types/set.hh"
diff --git a/test/boost/view_build_test.cc b/test/boost/view_build_test.cc
index 9903e8c9a0..d9ed364582 100644
--- a/test/boost/view_build_test.cc
+++ b/test/boost/view_build_test.cc
@@ -21,7 +21,7 @@
 
 #include <boost/test/unit_test.hpp>
 
-#include "database.hh"
+#include "replica/database.hh"
 #include "db/view/view_builder.hh"
 #include "db/view/view_updating_consumer.hh"
 #include "db/system_keyspace.hh"
diff --git a/test/boost/view_complex_test.cc b/test/boost/view_complex_test.cc
index b4e4cee43f..bd96f8f866 100644
--- a/test/boost/view_complex_test.cc
+++ b/test/boost/view_complex_test.cc
@@ -22,7 +22,7 @@
 #include <boost/test/unit_test.hpp>
 #include <boost/range/adaptor/map.hpp>
 
-#include "database.hh"
+#include "replica/database.hh"
 #include "db/view/view_builder.hh"
 #include "compaction/compaction_manager.hh"
 
diff --git a/test/boost/view_schema_ckey_test.cc b/test/boost/view_schema_ckey_test.cc
index 320b7eb082..24e0d6e407 100644
--- a/test/boost/view_schema_ckey_test.cc
+++ b/test/boost/view_schema_ckey_test.cc
@@ -23,7 +23,7 @@
 #include <boost/test/unit_test.hpp>
 #include <boost/range/adaptor/map.hpp>
 
-#include "database.hh"
+#include "replica/database.hh"
 #include "types/user.hh"
 #include "db/view/view_builder.hh"
 
diff --git a/test/boost/view_schema_pkey_test.cc b/test/boost/view_schema_pkey_test.cc
index 47a5e8bdc3..4ca5ad625e 100644
--- a/test/boost/view_schema_pkey_test.cc
+++ b/test/boost/view_schema_pkey_test.cc
@@ -23,7 +23,7 @@
 #include <boost/test/unit_test.hpp>
 #include <boost/range/adaptor/map.hpp>
 
-#include "database.hh"
+#include "replica/database.hh"
 #include "types/user.hh"
 #include "db/view/view_builder.hh"
 
diff --git a/test/boost/view_schema_test.cc b/test/boost/view_schema_test.cc
index b16d23cfcb..c59cdd599c 100644
--- a/test/boost/view_schema_test.cc
+++ b/test/boost/view_schema_test.cc
@@ -23,7 +23,7 @@
 #include <boost/test/unit_test.hpp>
 #include <boost/range/adaptor/map.hpp>
 
-#include "database.hh"
+#include "replica/database.hh"
 #include "types/user.hh"
 #include "db/view/node_view_update_backlog.hh"
 #include "db/view/view_builder.hh"
diff --git a/test/lib/alternator_test_env.cc b/test/lib/alternator_test_env.cc
index b03b923217..c3dcfea6d6 100644
--- a/test/lib/alternator_test_env.cc
+++ b/test/lib/alternator_test_env.cc
@@ -21,7 +21,7 @@
 
 #include "test/lib/alternator_test_env.hh"
 #include "alternator/rmw_operation.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include <seastar/core/coroutine.hh>
 
 #include "service/storage_proxy.hh"
diff --git a/test/lib/cql_test_env.cc b/test/lib/cql_test_env.cc
index bc9ff06665..4757ad80ab 100644
--- a/test/lib/cql_test_env.cc
+++ b/test/lib/cql_test_env.cc
@@ -23,7 +23,7 @@
 #include <iterator>
 #include <seastar/core/thread.hh>
 #include <seastar/util/defer.hh>
-#include "database_fwd.hh"
+#include "replica/database_fwd.hh"
 #include "sstables/sstables.hh"
 #include <seastar/core/do_with.hh>
 #include "test/lib/cql_test_env.hh"
diff --git a/test/lib/sstable_run_based_compaction_strategy_for_tests.hh b/test/lib/sstable_run_based_compaction_strategy_for_tests.hh
index 9bdd10f48f..34c22f53e6 100644
--- a/test/lib/sstable_run_based_compaction_strategy_for_tests.hh
+++ b/test/lib/sstable_run_based_compaction_strategy_for_tests.hh
@@ -24,7 +24,7 @@
 #include "compaction/compaction_strategy_impl.hh"
 #include "sstables/sstable_set.hh"
 #include "compaction/compaction.hh"
-#include "database.hh"
+#include "replica/database.hh"
 
 namespace sstables {
 
diff --git a/test/lib/sstable_utils.cc b/test/lib/sstable_utils.cc
index 84c8fabb9b..90f05cfc3c 100644
--- a/test/lib/sstable_utils.cc
+++ b/test/lib/sstable_utils.cc
@@ -21,7 +21,7 @@
 
 #include "test/lib/sstable_utils.hh"
 
-#include "database.hh"
+#include "replica/database.hh"
 #include "memtable-sstable.hh"
 #include "dht/i_partitioner.hh"
 #include "dht/murmur3_partitioner.hh"
diff --git a/test/lib/test_services.hh b/test/lib/test_services.hh
index 407f5a87b2..aca6ec0495 100644
--- a/test/lib/test_services.hh
+++ b/test/lib/test_services.hh
@@ -28,7 +28,7 @@
 #include "schema.hh"
 #include "schema_builder.hh"
 #include "row_cache.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include "cell_locking.hh"
 #include "compaction/compaction_manager.hh"
 #include "db/large_data_handler.hh"
diff --git a/test/manual/sstable_scan_footprint_test.cc b/test/manual/sstable_scan_footprint_test.cc
index cc9e1a2bc6..ccfa320dd2 100644
--- a/test/manual/sstable_scan_footprint_test.cc
+++ b/test/manual/sstable_scan_footprint_test.cc
@@ -26,7 +26,7 @@
 
 #include "schema_builder.hh"
 #include "row_cache.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include "db/config.hh"
 #include "db/commitlog/commitlog.hh"
 
diff --git a/test/perf/perf_cache_eviction.cc b/test/perf/perf_cache_eviction.cc
index 9ad16c635a..7251d12506 100644
--- a/test/perf/perf_cache_eviction.cc
+++ b/test/perf/perf_cache_eviction.cc
@@ -25,7 +25,7 @@
 #include "test/lib/cql_test_env.hh"
 #include "test/lib/log.hh"
 #include <seastar/core/app-template.hh>
-#include "database.hh"
+#include "replica/database.hh"
 #include "db/config.hh"
 #include "db/commitlog/commitlog.hh"
 #include "partition_slice_builder.hh"
diff --git a/test/perf/perf_fast_forward.cc b/test/perf/perf_fast_forward.cc
index 4087be1905..732554aad7 100644
--- a/test/perf/perf_fast_forward.cc
+++ b/test/perf/perf_fast_forward.cc
@@ -33,7 +33,7 @@
 #include "test/perf/perf.hh"
 #include <seastar/core/app-template.hh>
 #include "schema_builder.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include "release.hh"
 #include "db/config.hh"
 #include "partition_slice_builder.hh"
diff --git a/test/perf/perf_mutation.cc b/test/perf/perf_mutation.cc
index bdb0218be0..e1cfc7279d 100644
--- a/test/perf/perf_mutation.cc
+++ b/test/perf/perf_mutation.cc
@@ -20,7 +20,7 @@
  * along with Scylla.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database.hh"
+#include "replica/database.hh"
 #include "schema_builder.hh"
 #include "test/perf/perf.hh"
 #include <seastar/core/app-template.hh>
diff --git a/thrift/controller.cc b/thrift/controller.cc
index 36029173a3..1e14e6417a 100644
--- a/thrift/controller.cc
+++ b/thrift/controller.cc
@@ -21,7 +21,7 @@
 
 #include "thrift/controller.hh"
 #include "thrift/server.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include "db/config.hh"
 #include "log.hh"
 
diff --git a/thrift/handler.cc b/thrift/handler.cc
index 6dc7072dc3..2fbf297931 100644
--- a/thrift/handler.cc
+++ b/thrift/handler.cc
@@ -27,7 +27,7 @@
 #include "Cassandra.h"
 #include <seastar/core/distributed.hh>
 #include <seastar/core/coroutine.hh>
-#include "database.hh"
+#include "replica/database.hh"
 #include <seastar/core/sstring.hh>
 #include <seastar/core/print.hh>
 #include "frozen_mutation.hh"
diff --git a/thrift/handler.hh b/thrift/handler.hh
index 57d38d4889..83ce0788a3 100644
--- a/thrift/handler.hh
+++ b/thrift/handler.hh
@@ -24,7 +24,7 @@
 
 #include "Cassandra.h"
 #include "auth/service.hh"
-#include "database_fwd.hh"
+#include "replica/database_fwd.hh"
 #include <seastar/core/distributed.hh>
 #include "cql3/query_processor.hh"
 #include <memory>
diff --git a/thrift/server.cc b/thrift/server.cc
index 0aed3c56ac..780432b0c3 100644
--- a/thrift/server.cc
+++ b/thrift/server.cc
@@ -22,7 +22,7 @@
 #include "server.hh"
 #include "handler.hh"
 #include "db/config.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include <seastar/core/future-util.hh>
 #include <seastar/core/circular_buffer.hh>
 #include <seastar/core/metrics.hh>
diff --git a/thrift/server.hh b/thrift/server.hh
index a036984f27..9a57a26941 100644
--- a/thrift/server.hh
+++ b/thrift/server.hh
@@ -31,7 +31,7 @@
 #include <memory>
 #include <cstdint>
 #include <boost/intrusive/list.hpp>
-#include "database_fwd.hh"
+#include "replica/database_fwd.hh"
 #include "utils/updateable_value.hh"
 #include "service_permit.hh"
 
diff --git a/tombstone_gc.cc b/tombstone_gc.cc
index 2e72483e2b..bd733c0d1f 100644
--- a/tombstone_gc.cc
+++ b/tombstone_gc.cc
@@ -29,7 +29,7 @@
 #include "locator/token_metadata.hh"
 #include "exceptions/exceptions.hh"
 #include "locator/abstract_replication_strategy.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include "gms/feature_service.hh"
 
 extern logging::logger dblog;
diff --git a/tools/schema_loader.cc b/tools/schema_loader.cc
index 68bc873f94..579d865e55 100644
--- a/tools/schema_loader.cc
+++ b/tools/schema_loader.cc
@@ -34,7 +34,7 @@
 #include "db/cql_type_parser.hh"
 #include "db/config.hh"
 #include "db/schema_tables.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include "gms/feature_service.hh"
 #include "locator/abstract_replication_strategy.hh"
 #include "locator/snitch_base.hh"
diff --git a/validation.cc b/validation.cc
index ef57502bdd..c848becb97 100644
--- a/validation.cc
+++ b/validation.cc
@@ -40,7 +40,7 @@
  */
 
 #include "validation.hh"
-#include "database.hh"
+#include "replica/database.hh"
 #include "exceptions/exceptions.hh"
 
 namespace validation {
diff --git a/validation.hh b/validation.hh
index 4b7a2d2a5b..0ffccd0b3e 100644
--- a/validation.hh
+++ b/validation.hh
@@ -42,7 +42,7 @@
 #pragma once
 
 #include <seastar/core/sstring.hh>
-#include "database_fwd.hh"
+#include "replica/database_fwd.hh"
 #include "schema_fwd.hh"
 
 using namespace seastar;