refactor ydb/core/scheme dependencies

110 files changed, 579 insertions, 180 deletions

diff --git a/ydb/core/base/CMakeLists.darwin-x86_64.txt b/ydb/core/base/CMakeLists.darwin-x86_64.txt
index b26c3a19a1..2a6628b32e 100644
--- a/ydb/core/base/CMakeLists.darwin-x86_64.txt
+++ b/ydb/core/base/CMakeLists.darwin-x86_64.txt
@@ -36,6 +36,7 @@ target_link_libraries(ydb-core-base PUBLIC
   ydb-core-erasure
   ydb-core-protos
   core-protos-out
+  ydb-core-scheme
   ydb-library-aclib
   ydb-library-login
   ydb-library-pdisk_io
@@ -60,7 +61,6 @@ target_sources(ydb-core-base PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/base/localdb.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/logoblob.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/path.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/base/pathid.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/pool_stats_collector.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/quoter.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/row_version.cpp
diff --git a/ydb/core/base/CMakeLists.linux-aarch64.txt b/ydb/core/base/CMakeLists.linux-aarch64.txt
index 247b95949a..bd7865b0b0 100644
--- a/ydb/core/base/CMakeLists.linux-aarch64.txt
+++ b/ydb/core/base/CMakeLists.linux-aarch64.txt
@@ -37,6 +37,7 @@ target_link_libraries(ydb-core-base PUBLIC
   ydb-core-erasure
   ydb-core-protos
   core-protos-out
+  ydb-core-scheme
   ydb-library-aclib
   ydb-library-login
   ydb-library-pdisk_io
@@ -61,7 +62,6 @@ target_sources(ydb-core-base PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/base/localdb.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/logoblob.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/path.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/base/pathid.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/pool_stats_collector.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/quoter.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/row_version.cpp
diff --git a/ydb/core/base/CMakeLists.linux-x86_64.txt b/ydb/core/base/CMakeLists.linux-x86_64.txt
index 247b95949a..bd7865b0b0 100644
--- a/ydb/core/base/CMakeLists.linux-x86_64.txt
+++ b/ydb/core/base/CMakeLists.linux-x86_64.txt
@@ -37,6 +37,7 @@ target_link_libraries(ydb-core-base PUBLIC
   ydb-core-erasure
   ydb-core-protos
   core-protos-out
+  ydb-core-scheme
   ydb-library-aclib
   ydb-library-login
   ydb-library-pdisk_io
@@ -61,7 +62,6 @@ target_sources(ydb-core-base PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/base/localdb.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/logoblob.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/path.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/base/pathid.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/pool_stats_collector.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/quoter.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/row_version.cpp
diff --git a/ydb/core/base/CMakeLists.windows-x86_64.txt b/ydb/core/base/CMakeLists.windows-x86_64.txt
index b26c3a19a1..2a6628b32e 100644
--- a/ydb/core/base/CMakeLists.windows-x86_64.txt
+++ b/ydb/core/base/CMakeLists.windows-x86_64.txt
@@ -36,6 +36,7 @@ target_link_libraries(ydb-core-base PUBLIC
   ydb-core-erasure
   ydb-core-protos
   core-protos-out
+  ydb-core-scheme
   ydb-library-aclib
   ydb-library-login
   ydb-library-pdisk_io
@@ -60,7 +61,6 @@ target_sources(ydb-core-base PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/base/localdb.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/logoblob.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/path.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/base/pathid.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/pool_stats_collector.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/quoter.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/base/row_version.cpp
diff --git a/ydb/core/base/blobstorage.h b/ydb/core/base/blobstorage.h
index b8ff78474b..d087de7720 100644
--- a/ydb/core/base/blobstorage.h
+++ b/ydb/core/base/blobstorage.h
@@ -5,8 +5,8 @@
 #include "events.h"
 #include "tablet_types.h"
 #include "logoblob.h"
-#include "pathid.h"
 
+#include <ydb/core/scheme/scheme_pathid.h>
 #include <ydb/core/base/services/blobstorage_service_id.h>
 #include <ydb/core/base/blobstorage_grouptype.h>
 #include <ydb/core/protos/base.pb.h>
diff --git a/ydb/core/base/board_subscriber_ut.cpp b/ydb/core/base/board_subscriber_ut.cpp
index 404432b979..b86aef4672 100644
--- a/ydb/core/base/board_subscriber_ut.cpp
+++ b/ydb/core/base/board_subscriber_ut.cpp
@@ -1,7 +1,7 @@
 #include <ydb/core/base/statestorage.h>
 #include <ydb/core/base/statestorage_impl.h>
 
-#include <ydb/core/base/pathid.h>
+#include <ydb/core/scheme/scheme_pathid.h>
 #include <ydb/core/testlib/basics/appdata.h>
 #include <ydb/core/testlib/basics/helpers.h>
 
diff --git a/ydb/core/base/statestorage_impl.h b/ydb/core/base/statestorage_impl.h
index 2fd78b0757..ed154b9d2d 100644
--- a/ydb/core/base/statestorage_impl.h
+++ b/ydb/core/base/statestorage_impl.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "pathid.h"
+#include "ydb/core/scheme/scheme_pathid.h"
 #include "statestorage.h"
 
 namespace NKikimr {
diff --git a/ydb/core/base/ya.make b/ydb/core/base/ya.make
index 016b772782..3af57c78ff 100644
--- a/ydb/core/base/ya.make
+++ b/ydb/core/base/ya.make
@@ -37,7 +37,6 @@ SRCS(
     memobserver.h
     nameservice.h
     path.cpp
-    pathid.cpp
     pool_stats_collector.cpp
     pool_stats_collector.h
     quoter.cpp
@@ -99,6 +98,7 @@ PEERDIR(
     ydb/core/erasure
     ydb/core/protos
     ydb/core/protos/out
+    ydb/core/scheme
     ydb/library/aclib
     ydb/library/login
     ydb/library/pdisk_io
diff --git a/ydb/core/cms/console/console_tenants_manager.h b/ydb/core/cms/console/console_tenants_manager.h
index 0932dd273e..bf5ad34cdf 100644
--- a/ydb/core/cms/console/console_tenants_manager.h
+++ b/ydb/core/cms/console/console_tenants_manager.h
@@ -8,7 +8,7 @@
 
 #include <ydb/core/base/blobstorage.h>
 #include <ydb/core/base/location.h>
-#include <ydb/core/base/pathid.h>
+#include <ydb/core/scheme/scheme_pathid.h>
 #include <ydb/core/base/tablet_pipe.h>
 #include <ydb/core/engine/minikql/flat_local_tx_factory.h>
 #include <ydb/core/mind/tenant_slot_broker.h>
diff --git a/ydb/core/formats/arrow/converter.cpp b/ydb/core/formats/arrow/converter.cpp
index df99fbc05a..7c3caa905a 100644
--- a/ydb/core/formats/arrow/converter.cpp
+++ b/ydb/core/formats/arrow/converter.cpp
@@ -5,6 +5,7 @@
 #include <ydb/library/dynumber/dynumber.h>
 
 #include <util/memory/pool.h>
+#include <library/cpp/containers/stack_vector/stack_vec.h>
 
 #include <contrib/libs/apache/arrow/cpp/src/arrow/builder.h>
 #include <contrib/libs/apache/arrow/cpp/src/arrow/record_batch.h>
diff --git a/ydb/core/protos/CMakeLists.darwin-x86_64.txt b/ydb/core/protos/CMakeLists.darwin-x86_64.txt
index 21afc82480..df64832294 100644
--- a/ydb/core/protos/CMakeLists.darwin-x86_64.txt
+++ b/ydb/core/protos/CMakeLists.darwin-x86_64.txt
@@ -1490,18 +1490,6 @@ get_built_tool_path(
   cpp_styleguide
 )
 get_built_tool_path(
-  TOOL_protoc_bin
-  TOOL_protoc_dependency
-  contrib/tools/protoc/bin
-  protoc
-)
-get_built_tool_path(
-  TOOL_cpp_styleguide_bin
-  TOOL_cpp_styleguide_dependency
-  contrib/tools/protoc/plugins/cpp_styleguide
-  cpp_styleguide
-)
-get_built_tool_path(
   TOOL_enum_parser_bin
   TOOL_enum_parser_dependency
   tools/enum_parser/enum_parser
@@ -1525,6 +1513,7 @@ target_link_libraries(ydb-core-protos PUBLIC
   tools-enum_parser-enum_serialization_runtime
   cpp-actors-protos
   libs-config-protos
+  core-scheme-protos
   library-login-protos
   library-mkql_proto-protos
   api-protos
@@ -1649,7 +1638,6 @@ target_proto_messages(ydb-core-protos PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/protos/tx_proxy.proto
   ${CMAKE_SOURCE_DIR}/ydb/core/protos/tx_scheme.proto
   ${CMAKE_SOURCE_DIR}/ydb/core/protos/tx_sequenceshard.proto
-  ${CMAKE_SOURCE_DIR}/ydb/core/protos/type_info.proto
   ${CMAKE_SOURCE_DIR}/ydb/core/protos/pdiskfit.proto
   ${CMAKE_SOURCE_DIR}/ydb/core/protos/pqconfig.proto
   ${CMAKE_SOURCE_DIR}/ydb/core/protos/auth.proto
diff --git a/ydb/core/protos/CMakeLists.linux-aarch64.txt b/ydb/core/protos/CMakeLists.linux-aarch64.txt
index dd7c1ba870..c7f97d4885 100644
--- a/ydb/core/protos/CMakeLists.linux-aarch64.txt
+++ b/ydb/core/protos/CMakeLists.linux-aarch64.txt
@@ -1490,18 +1490,6 @@ get_built_tool_path(
   cpp_styleguide
 )
 get_built_tool_path(
-  TOOL_protoc_bin
-  TOOL_protoc_dependency
-  contrib/tools/protoc/bin
-  protoc
-)
-get_built_tool_path(
-  TOOL_cpp_styleguide_bin
-  TOOL_cpp_styleguide_dependency
-  contrib/tools/protoc/plugins/cpp_styleguide
-  cpp_styleguide
-)
-get_built_tool_path(
   TOOL_enum_parser_bin
   TOOL_enum_parser_dependency
   tools/enum_parser/enum_parser
@@ -1526,6 +1514,7 @@ target_link_libraries(ydb-core-protos PUBLIC
   tools-enum_parser-enum_serialization_runtime
   cpp-actors-protos
   libs-config-protos
+  core-scheme-protos
   library-login-protos
   library-mkql_proto-protos
   api-protos
@@ -1650,7 +1639,6 @@ target_proto_messages(ydb-core-protos PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/protos/tx_proxy.proto
   ${CMAKE_SOURCE_DIR}/ydb/core/protos/tx_scheme.proto
   ${CMAKE_SOURCE_DIR}/ydb/core/protos/tx_sequenceshard.proto
-  ${CMAKE_SOURCE_DIR}/ydb/core/protos/type_info.proto
   ${CMAKE_SOURCE_DIR}/ydb/core/protos/pdiskfit.proto
   ${CMAKE_SOURCE_DIR}/ydb/core/protos/pqconfig.proto
   ${CMAKE_SOURCE_DIR}/ydb/core/protos/auth.proto
diff --git a/ydb/core/protos/CMakeLists.linux-x86_64.txt b/ydb/core/protos/CMakeLists.linux-x86_64.txt
index dd7c1ba870..c7f97d4885 100644
--- a/ydb/core/protos/CMakeLists.linux-x86_64.txt
+++ b/ydb/core/protos/CMakeLists.linux-x86_64.txt
@@ -1490,18 +1490,6 @@ get_built_tool_path(
   cpp_styleguide
 )
 get_built_tool_path(
-  TOOL_protoc_bin
-  TOOL_protoc_dependency
-  contrib/tools/protoc/bin
-  protoc
-)
-get_built_tool_path(
-  TOOL_cpp_styleguide_bin
-  TOOL_cpp_styleguide_dependency
-  contrib/tools/protoc/plugins/cpp_styleguide
-  cpp_styleguide
-)
-get_built_tool_path(
   TOOL_enum_parser_bin
   TOOL_enum_parser_dependency
   tools/enum_parser/enum_parser
@@ -1526,6 +1514,7 @@ target_link_libraries(ydb-core-protos PUBLIC
   tools-enum_parser-enum_serialization_runtime
   cpp-actors-protos
   libs-config-protos
+  core-scheme-protos
   library-login-protos
   library-mkql_proto-protos
   api-protos
@@ -1650,7 +1639,6 @@ target_proto_messages(ydb-core-protos PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/protos/tx_proxy.proto
   ${CMAKE_SOURCE_DIR}/ydb/core/protos/tx_scheme.proto
   ${CMAKE_SOURCE_DIR}/ydb/core/protos/tx_sequenceshard.proto
-  ${CMAKE_SOURCE_DIR}/ydb/core/protos/type_info.proto
   ${CMAKE_SOURCE_DIR}/ydb/core/protos/pdiskfit.proto
   ${CMAKE_SOURCE_DIR}/ydb/core/protos/pqconfig.proto
   ${CMAKE_SOURCE_DIR}/ydb/core/protos/auth.proto
diff --git a/ydb/core/protos/CMakeLists.windows-x86_64.txt b/ydb/core/protos/CMakeLists.windows-x86_64.txt
index 21afc82480..df64832294 100644
--- a/ydb/core/protos/CMakeLists.windows-x86_64.txt
+++ b/ydb/core/protos/CMakeLists.windows-x86_64.txt
@@ -1490,18 +1490,6 @@ get_built_tool_path(
   cpp_styleguide
 )
 get_built_tool_path(
-  TOOL_protoc_bin
-  TOOL_protoc_dependency
-  contrib/tools/protoc/bin
-  protoc
-)
-get_built_tool_path(
-  TOOL_cpp_styleguide_bin
-  TOOL_cpp_styleguide_dependency
-  contrib/tools/protoc/plugins/cpp_styleguide
-  cpp_styleguide
-)
-get_built_tool_path(
   TOOL_enum_parser_bin
   TOOL_enum_parser_dependency
   tools/enum_parser/enum_parser
@@ -1525,6 +1513,7 @@ target_link_libraries(ydb-core-protos PUBLIC
   tools-enum_parser-enum_serialization_runtime
   cpp-actors-protos
   libs-config-protos
+  core-scheme-protos
   library-login-protos
   library-mkql_proto-protos
   api-protos
@@ -1649,7 +1638,6 @@ target_proto_messages(ydb-core-protos PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/protos/tx_proxy.proto
   ${CMAKE_SOURCE_DIR}/ydb/core/protos/tx_scheme.proto
   ${CMAKE_SOURCE_DIR}/ydb/core/protos/tx_sequenceshard.proto
-  ${CMAKE_SOURCE_DIR}/ydb/core/protos/type_info.proto
   ${CMAKE_SOURCE_DIR}/ydb/core/protos/pdiskfit.proto
   ${CMAKE_SOURCE_DIR}/ydb/core/protos/pqconfig.proto
   ${CMAKE_SOURCE_DIR}/ydb/core/protos/auth.proto
diff --git a/ydb/core/protos/base.proto b/ydb/core/protos/base.proto
index 1f7e855e09..574cc48275 100644
--- a/ydb/core/protos/base.proto
+++ b/ydb/core/protos/base.proto
@@ -37,8 +37,3 @@ message TRowVersion {
     optional uint64 Step = 1;
     optional uint64 TxId = 2;
 }
-
-message TPathID {
-    optional fixed64 OwnerId = 1;
-    optional uint64 LocalId = 2;
-}
diff --git a/ydb/core/protos/flat_scheme_op.proto b/ydb/core/protos/flat_scheme_op.proto
index eec4c42fbb..629e577868 100644
--- a/ydb/core/protos/flat_scheme_op.proto
+++ b/ydb/core/protos/flat_scheme_op.proto
@@ -1,5 +1,5 @@
-import "ydb/core/protos/base.proto";
-import "ydb/core/protos/type_info.proto";
+import "ydb/core/scheme/protos/type_info.proto";
+import "ydb/core/scheme/protos/pathid.proto";
 import "ydb/core/protos/bind_channel_storage_pool.proto";
 import "ydb/core/protos/pqconfig.proto";
 import "ydb/core/protos/replication.proto";
diff --git a/ydb/core/protos/flat_tx_scheme.proto b/ydb/core/protos/flat_tx_scheme.proto
index ed2d300245..bb4bcde645 100644
--- a/ydb/core/protos/flat_tx_scheme.proto
+++ b/ydb/core/protos/flat_tx_scheme.proto
@@ -1,6 +1,7 @@
 import "library/cpp/actors/protos/actors.proto";
 import "ydb/core/protos/base.proto";
-import "ydb/core/protos/type_info.proto";
+import "ydb/core/scheme/protos/pathid.proto";
+import "ydb/core/scheme/protos/type_info.proto";
 import "ydb/core/protos/subdomains.proto";
 import "ydb/core/protos/bind_channel_storage_pool.proto";
 import "ydb/core/protos/flat_scheme_op.proto";
diff --git a/ydb/core/protos/kqp.proto b/ydb/core/protos/kqp.proto
index 5742f70258..14cca0f988 100644
--- a/ydb/core/protos/kqp.proto
+++ b/ydb/core/protos/kqp.proto
@@ -4,7 +4,7 @@ option cc_enable_arenas = true;
 
 import "google/protobuf/duration.proto";
 import "library/cpp/actors/protos/actors.proto";
-import "ydb/core/protos/type_info.proto";
+import "ydb/core/scheme/protos/type_info.proto";
 import "ydb/core/protos/kqp_physical.proto";
 import "ydb/core/protos/kqp_stats.proto";
 import "ydb/core/protos/query_stats.proto";
diff --git a/ydb/core/protos/pqconfig.proto b/ydb/core/protos/pqconfig.proto
index e709a35314..1e3b26f44e 100644
--- a/ydb/core/protos/pqconfig.proto
+++ b/ydb/core/protos/pqconfig.proto
@@ -6,7 +6,7 @@ import "ydb/core/protos/msgbus_kv.proto";
 import "ydb/core/protos/node_limits.proto";
 import "ydb/core/protos/netclassifier.proto";
 import "ydb/library/services/services.proto";
-import "ydb/core/protos/type_info.proto";
+import "ydb/core/scheme/protos/type_info.proto";
 
 import "library/cpp/actors/protos/actors.proto";
 
diff --git a/ydb/core/protos/replication.proto b/ydb/core/protos/replication.proto
index 51fc908752..4a7f21c008 100644
--- a/ydb/core/protos/replication.proto
+++ b/ydb/core/protos/replication.proto
@@ -1,4 +1,4 @@
-import "ydb/core/protos/base.proto";
+import "ydb/core/scheme/protos/pathid.proto";
 
 package NKikimrReplication;
 option java_package = "ru.yandex.kikimr.proto";
diff --git a/ydb/core/protos/scheme_log.proto b/ydb/core/protos/scheme_log.proto
index 1507ed3cd0..70d313e2f7 100644
--- a/ydb/core/protos/scheme_log.proto
+++ b/ydb/core/protos/scheme_log.proto
@@ -1,5 +1,5 @@
 import "ydb/core/protos/flat_scheme_op.proto";
-import "ydb/core/protos/type_info.proto";
+import "ydb/core/scheme/protos/type_info.proto";
 
 package NTabletFlatScheme;
 option java_package = "ru.yandex.kikimr.proto";
diff --git a/ydb/core/protos/tx.proto b/ydb/core/protos/tx.proto
index eaafd0ef31..de069bda69 100644
--- a/ydb/core/protos/tx.proto
+++ b/ydb/core/protos/tx.proto
@@ -1,4 +1,5 @@
 import "library/cpp/actors/protos/actors.proto";
+import "ydb/core/scheme/protos/key_range.proto";
 import "ydb/core/protos/base.proto";
 import "google/protobuf/any.proto";
 
@@ -356,13 +357,6 @@ message TEvReadSetAck {
     optional uint64 Seqno = 7; // Should be equal to TEvReadSet.Seqno which we are ACKing
 }
 
-message TKeyRange {
-    optional bytes From = 1;
-    optional bytes To = 2;
-    optional bool FromInclusive = 3;
-    optional bool ToInclusive = 4;
-};
-
 message TEvStreamClearanceRequest {
     optional uint64 TxId = 1;
     optional uint64 ShardId = 2;
diff --git a/ydb/core/protos/tx_datashard.proto b/ydb/core/protos/tx_datashard.proto
index 82b31b4de4..6b1a4fffb1 100644
--- a/ydb/core/protos/tx_datashard.proto
+++ b/ydb/core/protos/tx_datashard.proto
@@ -2,7 +2,9 @@ option cc_enable_arenas = true;
 
 import "library/cpp/actors/protos/actors.proto";
 import "ydb/core/protos/base.proto";
-import "ydb/core/protos/type_info.proto";
+import "ydb/core/scheme/protos/type_info.proto";
+import "ydb/core/scheme/protos/key_range.proto";
+import "ydb/core/scheme/protos/pathid.proto";
 import "ydb/core/protos/kqp.proto";
 import "ydb/core/protos/ssa.proto";
 import "ydb/core/protos/tablet.proto";
diff --git a/ydb/core/protos/tx_sequenceshard.proto b/ydb/core/protos/tx_sequenceshard.proto
index dd3d203250..4b2a5967a3 100644
--- a/ydb/core/protos/tx_sequenceshard.proto
+++ b/ydb/core/protos/tx_sequenceshard.proto
@@ -1,5 +1,6 @@
 syntax = "proto3";
 import "ydb/core/protos/base.proto";
+import "ydb/core/scheme/protos/pathid.proto";
 
 package NKikimrTxSequenceShard;
 option java_package = "ru.yandex.kikimr.proto";
diff --git a/ydb/core/protos/ya.make b/ydb/core/protos/ya.make
index b2eddfbb88..b5982bcc5e 100644
--- a/ydb/core/protos/ya.make
+++ b/ydb/core/protos/ya.make
@@ -118,7 +118,6 @@ SRCS(
     tx_proxy.proto
     tx_scheme.proto
     tx_sequenceshard.proto
-    type_info.proto
     pdiskfit.proto
     pqconfig.proto
     auth.proto
@@ -139,6 +138,7 @@ GENERATE_ENUM_SERIALIZATION(datashard_load.pb.h)
 PEERDIR(
     library/cpp/actors/protos
     ydb/core/fq/libs/config/protos
+    ydb/core/scheme/protos
     ydb/library/login/protos
     ydb/library/mkql_proto/protos
     ydb/public/api/protos
diff --git a/ydb/core/scheme/CMakeLists.darwin-x86_64.txt b/ydb/core/scheme/CMakeLists.darwin-x86_64.txt
index 82ba1fccb1..beb2abe3f8 100644
--- a/ydb/core/scheme/CMakeLists.darwin-x86_64.txt
+++ b/ydb/core/scheme/CMakeLists.darwin-x86_64.txt
@@ -6,6 +6,7 @@
 # original buildsystem will not be accepted.
 
 
+add_subdirectory(protos)
 add_subdirectory(ut)
 
 add_library(ydb-core-scheme)
@@ -17,12 +18,13 @@ target_link_libraries(ydb-core-scheme PUBLIC
   cpp-containers-bitseq
   cpp-deprecated-enum_codegen
   library-cpp-yson
-  ydb-core-base
+  core-scheme-protos
   ydb-core-scheme_types
-  ydb-core-util
   ydb-library-aclib
   parser-pg_wrapper-interface
   public-lib-scheme_types
+  library-pretty_types_print-protobuf
+  cpp-lwtrace-mon
 )
 target_sources(ydb-core-scheme PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/scheme/scheme_borders.cpp
@@ -31,4 +33,5 @@ target_sources(ydb-core-scheme PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/scheme/scheme_types_defs.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/scheme/scheme_type_info.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/scheme/scheme_types_proto.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/scheme/scheme_pathid.cpp
 )
diff --git a/ydb/core/scheme/CMakeLists.linux-aarch64.txt b/ydb/core/scheme/CMakeLists.linux-aarch64.txt
index 98cdbeea4a..20a86e6a3a 100644
--- a/ydb/core/scheme/CMakeLists.linux-aarch64.txt
+++ b/ydb/core/scheme/CMakeLists.linux-aarch64.txt
@@ -6,6 +6,7 @@
 # original buildsystem will not be accepted.
 
 
+add_subdirectory(protos)
 add_subdirectory(ut)
 
 add_library(ydb-core-scheme)
@@ -18,12 +19,13 @@ target_link_libraries(ydb-core-scheme PUBLIC
   cpp-containers-bitseq
   cpp-deprecated-enum_codegen
   library-cpp-yson
-  ydb-core-base
+  core-scheme-protos
   ydb-core-scheme_types
-  ydb-core-util
   ydb-library-aclib
   parser-pg_wrapper-interface
   public-lib-scheme_types
+  library-pretty_types_print-protobuf
+  cpp-lwtrace-mon
 )
 target_sources(ydb-core-scheme PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/scheme/scheme_borders.cpp
@@ -32,4 +34,5 @@ target_sources(ydb-core-scheme PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/scheme/scheme_types_defs.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/scheme/scheme_type_info.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/scheme/scheme_types_proto.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/scheme/scheme_pathid.cpp
 )
diff --git a/ydb/core/scheme/CMakeLists.linux-x86_64.txt b/ydb/core/scheme/CMakeLists.linux-x86_64.txt
index 98cdbeea4a..20a86e6a3a 100644
--- a/ydb/core/scheme/CMakeLists.linux-x86_64.txt
+++ b/ydb/core/scheme/CMakeLists.linux-x86_64.txt
@@ -6,6 +6,7 @@
 # original buildsystem will not be accepted.
 
 
+add_subdirectory(protos)
 add_subdirectory(ut)
 
 add_library(ydb-core-scheme)
@@ -18,12 +19,13 @@ target_link_libraries(ydb-core-scheme PUBLIC
   cpp-containers-bitseq
   cpp-deprecated-enum_codegen
   library-cpp-yson
-  ydb-core-base
+  core-scheme-protos
   ydb-core-scheme_types
-  ydb-core-util
   ydb-library-aclib
   parser-pg_wrapper-interface
   public-lib-scheme_types
+  library-pretty_types_print-protobuf
+  cpp-lwtrace-mon
 )
 target_sources(ydb-core-scheme PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/scheme/scheme_borders.cpp
@@ -32,4 +34,5 @@ target_sources(ydb-core-scheme PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/scheme/scheme_types_defs.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/scheme/scheme_type_info.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/scheme/scheme_types_proto.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/scheme/scheme_pathid.cpp
 )
diff --git a/ydb/core/scheme/CMakeLists.windows-x86_64.txt b/ydb/core/scheme/CMakeLists.windows-x86_64.txt
index 82ba1fccb1..beb2abe3f8 100644
--- a/ydb/core/scheme/CMakeLists.windows-x86_64.txt
+++ b/ydb/core/scheme/CMakeLists.windows-x86_64.txt
@@ -6,6 +6,7 @@
 # original buildsystem will not be accepted.
 
 
+add_subdirectory(protos)
 add_subdirectory(ut)
 
 add_library(ydb-core-scheme)
@@ -17,12 +18,13 @@ target_link_libraries(ydb-core-scheme PUBLIC
   cpp-containers-bitseq
   cpp-deprecated-enum_codegen
   library-cpp-yson
-  ydb-core-base
+  core-scheme-protos
   ydb-core-scheme_types
-  ydb-core-util
   ydb-library-aclib
   parser-pg_wrapper-interface
   public-lib-scheme_types
+  library-pretty_types_print-protobuf
+  cpp-lwtrace-mon
 )
 target_sources(ydb-core-scheme PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/scheme/scheme_borders.cpp
@@ -31,4 +33,5 @@ target_sources(ydb-core-scheme PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/scheme/scheme_types_defs.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/scheme/scheme_type_info.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/scheme/scheme_types_proto.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/scheme/scheme_pathid.cpp
 )
diff --git a/ydb/core/scheme/defs.h b/ydb/core/scheme/defs.h
index c42f4b9f60..efe35fddda 100644
--- a/ydb/core/scheme/defs.h
+++ b/ydb/core/scheme/defs.h
@@ -1,8 +1,5 @@
 #pragma once
 
-#include <ydb/core/base/defs.h>
-
-
 namespace NKikimr {
 namespace NScheme {
 
diff --git a/ydb/core/scheme/protos/CMakeLists.darwin-x86_64.txt b/ydb/core/scheme/protos/CMakeLists.darwin-x86_64.txt
new file mode 100644
index 0000000000..0191fcd833
--- /dev/null
+++ b/ydb/core/scheme/protos/CMakeLists.darwin-x86_64.txt
@@ -0,0 +1,83 @@
+
+# This file was generated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+get_built_tool_path(
+  TOOL_grpc_cpp_bin
+  TOOL_grpc_cpp_dependency
+  contrib/tools/protoc/plugins/grpc_cpp
+  grpc_cpp
+)
+get_built_tool_path(
+  TOOL_protoc_bin
+  TOOL_protoc_dependency
+  contrib/tools/protoc/bin
+  protoc
+)
+get_built_tool_path(
+  TOOL_cpp_styleguide_bin
+  TOOL_cpp_styleguide_dependency
+  contrib/tools/protoc/plugins/cpp_styleguide
+  cpp_styleguide
+)
+get_built_tool_path(
+  TOOL_protoc_bin
+  TOOL_protoc_dependency
+  contrib/tools/protoc/bin
+  protoc
+)
+get_built_tool_path(
+  TOOL_cpp_styleguide_bin
+  TOOL_cpp_styleguide_dependency
+  contrib/tools/protoc/plugins/cpp_styleguide
+  cpp_styleguide
+)
+get_built_tool_path(
+  TOOL_protoc_bin
+  TOOL_protoc_dependency
+  contrib/tools/protoc/bin
+  protoc
+)
+get_built_tool_path(
+  TOOL_cpp_styleguide_bin
+  TOOL_cpp_styleguide_dependency
+  contrib/tools/protoc/plugins/cpp_styleguide
+  cpp_styleguide
+)
+
+add_library(core-scheme-protos)
+set_property(TARGET core-scheme-protos PROPERTY
+  PROTOC_EXTRA_OUTS .grpc.pb.cc .grpc.pb.h
+)
+target_link_libraries(core-scheme-protos PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  contrib-libs-grpc
+  contrib-libs-protobuf
+)
+target_proto_messages(core-scheme-protos PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/scheme/protos/type_info.proto
+  ${CMAKE_SOURCE_DIR}/ydb/core/scheme/protos/key_range.proto
+  ${CMAKE_SOURCE_DIR}/ydb/core/scheme/protos/pathid.proto
+)
+target_proto_addincls(core-scheme-protos
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(core-scheme-protos
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
+target_proto_plugin(core-scheme-protos
+  grpc_cpp
+  grpc_cpp
+)
diff --git a/ydb/core/scheme/protos/CMakeLists.linux-aarch64.txt b/ydb/core/scheme/protos/CMakeLists.linux-aarch64.txt
new file mode 100644
index 0000000000..c8f537f77c
--- /dev/null
+++ b/ydb/core/scheme/protos/CMakeLists.linux-aarch64.txt
@@ -0,0 +1,84 @@
+
+# This file was generated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+get_built_tool_path(
+  TOOL_grpc_cpp_bin
+  TOOL_grpc_cpp_dependency
+  contrib/tools/protoc/plugins/grpc_cpp
+  grpc_cpp
+)
+get_built_tool_path(
+  TOOL_protoc_bin
+  TOOL_protoc_dependency
+  contrib/tools/protoc/bin
+  protoc
+)
+get_built_tool_path(
+  TOOL_cpp_styleguide_bin
+  TOOL_cpp_styleguide_dependency
+  contrib/tools/protoc/plugins/cpp_styleguide
+  cpp_styleguide
+)
+get_built_tool_path(
+  TOOL_protoc_bin
+  TOOL_protoc_dependency
+  contrib/tools/protoc/bin
+  protoc
+)
+get_built_tool_path(
+  TOOL_cpp_styleguide_bin
+  TOOL_cpp_styleguide_dependency
+  contrib/tools/protoc/plugins/cpp_styleguide
+  cpp_styleguide
+)
+get_built_tool_path(
+  TOOL_protoc_bin
+  TOOL_protoc_dependency
+  contrib/tools/protoc/bin
+  protoc
+)
+get_built_tool_path(
+  TOOL_cpp_styleguide_bin
+  TOOL_cpp_styleguide_dependency
+  contrib/tools/protoc/plugins/cpp_styleguide
+  cpp_styleguide
+)
+
+add_library(core-scheme-protos)
+set_property(TARGET core-scheme-protos PROPERTY
+  PROTOC_EXTRA_OUTS .grpc.pb.cc .grpc.pb.h
+)
+target_link_libraries(core-scheme-protos PUBLIC
+  contrib-libs-linux-headers
+  contrib-libs-cxxsupp
+  yutil
+  contrib-libs-grpc
+  contrib-libs-protobuf
+)
+target_proto_messages(core-scheme-protos PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/scheme/protos/type_info.proto
+  ${CMAKE_SOURCE_DIR}/ydb/core/scheme/protos/key_range.proto
+  ${CMAKE_SOURCE_DIR}/ydb/core/scheme/protos/pathid.proto
+)
+target_proto_addincls(core-scheme-protos
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(core-scheme-protos
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
+target_proto_plugin(core-scheme-protos
+  grpc_cpp
+  grpc_cpp
+)
diff --git a/ydb/core/scheme/protos/CMakeLists.linux-x86_64.txt b/ydb/core/scheme/protos/CMakeLists.linux-x86_64.txt
new file mode 100644
index 0000000000..c8f537f77c
--- /dev/null
+++ b/ydb/core/scheme/protos/CMakeLists.linux-x86_64.txt
@@ -0,0 +1,84 @@
+
+# This file was generated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+get_built_tool_path(
+  TOOL_grpc_cpp_bin
+  TOOL_grpc_cpp_dependency
+  contrib/tools/protoc/plugins/grpc_cpp
+  grpc_cpp
+)
+get_built_tool_path(
+  TOOL_protoc_bin
+  TOOL_protoc_dependency
+  contrib/tools/protoc/bin
+  protoc
+)
+get_built_tool_path(
+  TOOL_cpp_styleguide_bin
+  TOOL_cpp_styleguide_dependency
+  contrib/tools/protoc/plugins/cpp_styleguide
+  cpp_styleguide
+)
+get_built_tool_path(
+  TOOL_protoc_bin
+  TOOL_protoc_dependency
+  contrib/tools/protoc/bin
+  protoc
+)
+get_built_tool_path(
+  TOOL_cpp_styleguide_bin
+  TOOL_cpp_styleguide_dependency
+  contrib/tools/protoc/plugins/cpp_styleguide
+  cpp_styleguide
+)
+get_built_tool_path(
+  TOOL_protoc_bin
+  TOOL_protoc_dependency
+  contrib/tools/protoc/bin
+  protoc
+)
+get_built_tool_path(
+  TOOL_cpp_styleguide_bin
+  TOOL_cpp_styleguide_dependency
+  contrib/tools/protoc/plugins/cpp_styleguide
+  cpp_styleguide
+)
+
+add_library(core-scheme-protos)
+set_property(TARGET core-scheme-protos PROPERTY
+  PROTOC_EXTRA_OUTS .grpc.pb.cc .grpc.pb.h
+)
+target_link_libraries(core-scheme-protos PUBLIC
+  contrib-libs-linux-headers
+  contrib-libs-cxxsupp
+  yutil
+  contrib-libs-grpc
+  contrib-libs-protobuf
+)
+target_proto_messages(core-scheme-protos PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/scheme/protos/type_info.proto
+  ${CMAKE_SOURCE_DIR}/ydb/core/scheme/protos/key_range.proto
+  ${CMAKE_SOURCE_DIR}/ydb/core/scheme/protos/pathid.proto
+)
+target_proto_addincls(core-scheme-protos
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(core-scheme-protos
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
+target_proto_plugin(core-scheme-protos
+  grpc_cpp
+  grpc_cpp
+)
diff --git a/ydb/core/scheme/protos/CMakeLists.txt b/ydb/core/scheme/protos/CMakeLists.txt
new file mode 100644
index 0000000000..f8b31df0c1
--- /dev/null
+++ b/ydb/core/scheme/protos/CMakeLists.txt
@@ -0,0 +1,17 @@
+
+# This file was generated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND NOT HAVE_CUDA)
+  include(CMakeLists.linux-aarch64.txt)
+elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+  include(CMakeLists.darwin-x86_64.txt)
+elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA)
+  include(CMakeLists.windows-x86_64.txt)
+elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA)
+  include(CMakeLists.linux-x86_64.txt)
+endif()
diff --git a/ydb/core/scheme/protos/CMakeLists.windows-x86_64.txt b/ydb/core/scheme/protos/CMakeLists.windows-x86_64.txt
new file mode 100644
index 0000000000..0191fcd833
--- /dev/null
+++ b/ydb/core/scheme/protos/CMakeLists.windows-x86_64.txt
@@ -0,0 +1,83 @@
+
+# This file was generated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+get_built_tool_path(
+  TOOL_grpc_cpp_bin
+  TOOL_grpc_cpp_dependency
+  contrib/tools/protoc/plugins/grpc_cpp
+  grpc_cpp
+)
+get_built_tool_path(
+  TOOL_protoc_bin
+  TOOL_protoc_dependency
+  contrib/tools/protoc/bin
+  protoc
+)
+get_built_tool_path(
+  TOOL_cpp_styleguide_bin
+  TOOL_cpp_styleguide_dependency
+  contrib/tools/protoc/plugins/cpp_styleguide
+  cpp_styleguide
+)
+get_built_tool_path(
+  TOOL_protoc_bin
+  TOOL_protoc_dependency
+  contrib/tools/protoc/bin
+  protoc
+)
+get_built_tool_path(
+  TOOL_cpp_styleguide_bin
+  TOOL_cpp_styleguide_dependency
+  contrib/tools/protoc/plugins/cpp_styleguide
+  cpp_styleguide
+)
+get_built_tool_path(
+  TOOL_protoc_bin
+  TOOL_protoc_dependency
+  contrib/tools/protoc/bin
+  protoc
+)
+get_built_tool_path(
+  TOOL_cpp_styleguide_bin
+  TOOL_cpp_styleguide_dependency
+  contrib/tools/protoc/plugins/cpp_styleguide
+  cpp_styleguide
+)
+
+add_library(core-scheme-protos)
+set_property(TARGET core-scheme-protos PROPERTY
+  PROTOC_EXTRA_OUTS .grpc.pb.cc .grpc.pb.h
+)
+target_link_libraries(core-scheme-protos PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  contrib-libs-grpc
+  contrib-libs-protobuf
+)
+target_proto_messages(core-scheme-protos PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/scheme/protos/type_info.proto
+  ${CMAKE_SOURCE_DIR}/ydb/core/scheme/protos/key_range.proto
+  ${CMAKE_SOURCE_DIR}/ydb/core/scheme/protos/pathid.proto
+)
+target_proto_addincls(core-scheme-protos
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(core-scheme-protos
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
+target_proto_plugin(core-scheme-protos
+  grpc_cpp
+  grpc_cpp
+)
diff --git a/ydb/core/scheme/protos/key_range.proto b/ydb/core/scheme/protos/key_range.proto
new file mode 100644
index 0000000000..f48dbc11d2
--- /dev/null
+++ b/ydb/core/scheme/protos/key_range.proto
@@ -0,0 +1,9 @@
+package NKikimrTx;
+option java_package = "ru.yandex.kikimr.proto";
+
+message TKeyRange {
+    optional bytes From = 1;
+    optional bytes To = 2;
+    optional bool FromInclusive = 3;
+    optional bool ToInclusive = 4;
+};
diff --git a/ydb/core/scheme/protos/pathid.proto b/ydb/core/scheme/protos/pathid.proto
new file mode 100644
index 0000000000..7f51f121cf
--- /dev/null
+++ b/ydb/core/scheme/protos/pathid.proto
@@ -0,0 +1,7 @@
+package NKikimrProto;
+option java_package = "ru.yandex.kikimr.proto";
+
+message TPathID {
+    optional fixed64 OwnerId = 1;
+    optional uint64 LocalId = 2;
+}
diff --git a/ydb/core/protos/type_info.proto b/ydb/core/scheme/protos/type_info.proto
index 3ce4b6ed83..3ce4b6ed83 100644
--- a/ydb/core/protos/type_info.proto
+++ b/ydb/core/scheme/protos/type_info.proto
diff --git a/ydb/core/scheme/protos/ya.make b/ydb/core/scheme/protos/ya.make
new file mode 100644
index 0000000000..526fc2bf5b
--- /dev/null
+++ b/ydb/core/scheme/protos/ya.make
@@ -0,0 +1,17 @@
+PROTO_LIBRARY()
+
+GRPC()
+
+IF (OS_WINDOWS)
+    NO_OPTIMIZE_PY_PROTOS()
+ENDIF()
+
+SRCS(
+    type_info.proto
+    key_range.proto
+    pathid.proto
+)
+
+EXCLUDE_TAGS(GO_PROTO)
+
+END()
diff --git a/ydb/core/base/pathid.cpp b/ydb/core/scheme/scheme_pathid.cpp
index 0ad8a2d93c..6093a41842 100644
--- a/ydb/core/base/pathid.cpp
+++ b/ydb/core/scheme/scheme_pathid.cpp
@@ -1,11 +1,25 @@
-#include "pathid.h"
+#include "scheme_pathid.h"
 
 #include <util/stream/str.h>
 
 namespace NKikimr {
 
+namespace {
+inline ui64 PathIdHash(ui64 a, ui64 b) noexcept {
+    const ui64 x1 = 0x001DFF3D8DC48F5Dull * (a & 0xFFFFFFFFull);
+    const ui64 x2 = 0x179CA10C9242235Dull * (a >> 32);
+    const ui64 x3 = 0x0F530CAD458B0FB1ull * (b & 0xFFFFFFFFull);
+    const ui64 x4 = 0xB5026F5AA96619E9ull * (b >> 32);
+
+    const ui64 sum = 0x06C9C021156EAA1Full + x1 + x2 + x3 + x4;
+
+    return (sum >> 32);
+}
+
+}
+
 ui64 TPathId::Hash() const {
-    return Hash128to32(OwnerId, LocalPathId);
+    return PathIdHash(OwnerId, LocalPathId);
 }
 
 TString TPathId::ToString() const {
diff --git a/ydb/core/base/pathid.h b/ydb/core/scheme/scheme_pathid.h
index 711c01593f..c62e80cca8 100644
--- a/ydb/core/base/pathid.h
+++ b/ydb/core/scheme/scheme_pathid.h
@@ -1,8 +1,6 @@
 #pragma once
 
-#include "defs.h"
-
-#include <ydb/core/protos/base.pb.h>
+#include <ydb/core/scheme/protos/pathid.pb.h>
 
 namespace NKikimr {
 
diff --git a/ydb/core/scheme/scheme_tablecell.cpp b/ydb/core/scheme/scheme_tablecell.cpp
index 80ef260d73..04f168be3a 100644
--- a/ydb/core/scheme/scheme_tablecell.cpp
+++ b/ydb/core/scheme/scheme_tablecell.cpp
@@ -1,6 +1,7 @@
 #include <ydb/core/scheme/scheme_tablecell.h>
 #include <ydb/core/scheme/scheme_type_registry.h>
 
+#include <library/cpp/actors/core/actorid.h>
 #include <util/string/escape.h>
 
 namespace NKikimr {
@@ -296,7 +297,7 @@ void DbgPrintValue(TString &res, const TCell &r, NScheme::TTypeInfo typeInfo) {
             res += ToString(r.AsValue<double>());
             break;
         case NScheme::NTypeIds::ActorId:
-            res += ToString(r.AsValue<TActorId>());
+            res += ToString(r.AsValue<NActors::TActorId>());
             break;
         case NScheme::NTypeIds::Pg:
             // TODO: support pg types
diff --git a/ydb/core/scheme/scheme_tabledefs.h b/ydb/core/scheme/scheme_tabledefs.h
index 4615e5388d..b380d0f288 100644
--- a/ydb/core/scheme/scheme_tabledefs.h
+++ b/ydb/core/scheme/scheme_tabledefs.h
@@ -3,8 +3,8 @@
 #include "defs.h"
 #include "scheme_tablecell.h"
 
-#include <ydb/core/base/pathid.h>
-#include <ydb/core/protos/tx.pb.h>
+#include <ydb/core/scheme/scheme_pathid.h>
+#include <ydb/core/scheme/protos/key_range.pb.h>
 #include <ydb/core/scheme_types/scheme_types.h>
 #include <ydb/library/aclib/aclib.h>
 
diff --git a/ydb/core/scheme/scheme_types_proto.h b/ydb/core/scheme/scheme_types_proto.h
index ce46ccad11..6eabef1d63 100644
--- a/ydb/core/scheme/scheme_types_proto.h
+++ b/ydb/core/scheme/scheme_types_proto.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <ydb/core/scheme_types/scheme_type_info.h>
-#include <ydb/core/protos/type_info.pb.h>
+#include <ydb/core/scheme/protos/type_info.pb.h>
 
 namespace NKikimr::NScheme {
 
diff --git a/ydb/core/scheme/ya.make b/ydb/core/scheme/ya.make
index d20674f123..7c3479aba7 100644
--- a/ydb/core/scheme/ya.make
+++ b/ydb/core/scheme/ya.make
@@ -7,6 +7,7 @@ SRCS(
     scheme_types_defs.cpp
     scheme_type_info.cpp
     scheme_types_proto.cpp
+    scheme_pathid.cpp
 )
 
 PEERDIR(
@@ -15,12 +16,14 @@ PEERDIR(
     library/cpp/containers/bitseq
     library/cpp/deprecated/enum_codegen
     library/cpp/yson
-    ydb/core/base
+    ydb/core/scheme/protos
     ydb/core/scheme_types
-    ydb/core/util
     ydb/library/aclib
     ydb/library/yql/parser/pg_wrapper/interface
     ydb/public/lib/scheme_types
+    # temporary.
+    ydb/library/pretty_types_print/protobuf
+    library/cpp/lwtrace/mon
 )
 
 END()
diff --git a/ydb/core/sys_view/common/events.h b/ydb/core/sys_view/common/events.h
index b170395a54..c489c1f400 100644
--- a/ydb/core/sys_view/common/events.h
+++ b/ydb/core/sys_view/common/events.h
@@ -4,7 +4,7 @@
 #include "db_counters.h"
 
 #include <ydb/core/base/events.h>
-#include <ydb/core/base/pathid.h>
+#include <ydb/core/scheme/scheme_pathid.h>
 #include <library/cpp/actors/core/events.h>
 #include <ydb/core/protos/sys_view.pb.h>
 
diff --git a/ydb/core/sys_view/common/processor_scan.h b/ydb/core/sys_view/common/processor_scan.h
index 56aeb70a0a..0ac998e278 100644
--- a/ydb/core/sys_view/common/processor_scan.h
+++ b/ydb/core/sys_view/common/processor_scan.h
@@ -26,7 +26,7 @@ public:
     }
 
     TProcessorScan(
-        const TActorId& ownerId,
+        const NActors::TActorId& ownerId,
         ui32 scanId,
         const TTableId& tableId,
         const TTableRange& tableRange,
diff --git a/ydb/core/sys_view/common/scan_actor_base_impl.h b/ydb/core/sys_view/common/scan_actor_base_impl.h
index 06a149457a..842362d9a2 100644
--- a/ydb/core/sys_view/common/scan_actor_base_impl.h
+++ b/ydb/core/sys_view/common/scan_actor_base_impl.h
@@ -27,7 +27,7 @@ class TScanActorBase : public TActorBootstrapped<TDerived> {
 public:
     using TBase = TActorBootstrapped<TDerived>;
 
-    TScanActorBase(const TActorId& ownerId, ui32 scanId, const TTableId& tableId,
+    TScanActorBase(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId,
         const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
         : OwnerActorId(ownerId)
         , ScanId(scanId)
@@ -319,7 +319,7 @@ private:
 protected:
     static constexpr TDuration Timeout = TDuration::Seconds(60);
 
-    const TActorId OwnerActorId;
+    const NActors::TActorId OwnerActorId;
     const ui32 ScanId;
     const TTableId TableId;
     TSerializedTableRange TableRange;
diff --git a/ydb/core/sys_view/nodes/nodes.cpp b/ydb/core/sys_view/nodes/nodes.cpp
index 6404789425..9c23429ed6 100644
--- a/ydb/core/sys_view/nodes/nodes.cpp
+++ b/ydb/core/sys_view/nodes/nodes.cpp
@@ -25,7 +25,7 @@ public:
         return NKikimrServices::TActivity::KQP_SYSTEM_VIEW_SCAN;
     }
 
-    TNodesScan(const TActorId& ownerId, ui32 scanId, const TTableId& tableId,
+    TNodesScan(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId,
         const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
         : TBase(ownerId, scanId, tableId, tableRange, columns)
     {
@@ -85,7 +85,7 @@ private:
             return;
         }
 
-        const TActorId nameserviceId = GetNameserviceActorId();
+        const NActors::TActorId nameserviceId = GetNameserviceActorId();
         Send(nameserviceId, new TEvInterconnect::TEvListNodes());
     }
 
@@ -233,7 +233,7 @@ private:
     THashMap<TNodeId, THolder<TEvWhiteboard::TEvSystemStateResponse>> WBSystemInfo;
 };
 
-THolder<IActor> CreateNodesScan(const TActorId& ownerId, ui32 scanId, const TTableId& tableId,
+THolder<NActors::IActor> CreateNodesScan(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId,
     const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
 {
     return MakeHolder<TNodesScan>(ownerId, scanId, tableId, tableRange, columns);
diff --git a/ydb/core/sys_view/nodes/nodes.h b/ydb/core/sys_view/nodes/nodes.h
index 8f1192250b..d22c913929 100644
--- a/ydb/core/sys_view/nodes/nodes.h
+++ b/ydb/core/sys_view/nodes/nodes.h
@@ -2,10 +2,13 @@
 
 #include <ydb/core/kqp/runtime/kqp_compute.h>
 
+#include <library/cpp/actors/core/actor.h>
+#include <library/cpp/actors/core/actorid.h>
+
 namespace NKikimr {
 namespace NSysView {
 
-THolder<IActor> CreateNodesScan(const TActorId& ownerId, ui32 scanId, const TTableId& tableId,
+THolder<NActors::IActor> CreateNodesScan(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId,
     const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
 
 } // NSysView
diff --git a/ydb/core/sys_view/partition_stats/partition_stats.cpp b/ydb/core/sys_view/partition_stats/partition_stats.cpp
index 625e4d75b8..34c04abc4e 100644
--- a/ydb/core/sys_view/partition_stats/partition_stats.cpp
+++ b/ydb/core/sys_view/partition_stats/partition_stats.cpp
@@ -447,7 +447,7 @@ private:
     bool ProcessInFly = false;
 };
 
-THolder<IActor> CreatePartitionStatsCollector(size_t batchSize, size_t pendingRequestsLimit)
+THolder<NActors::IActor> CreatePartitionStatsCollector(size_t batchSize, size_t pendingRequestsLimit)
 {
     return MakeHolder<TPartitionStatsCollector>(batchSize, pendingRequestsLimit);
 }
@@ -461,7 +461,7 @@ public:
         return NKikimrServices::TActivity::KQP_SYSTEM_VIEW_SCAN;
     }
 
-    TPartitionStatsScan(const TActorId& ownerId, ui32 scanId, const TTableId& tableId,
+    TPartitionStatsScan(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId,
         const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
         : TBase(ownerId, scanId, tableId, tableRange, columns)
     {
@@ -689,7 +689,7 @@ private:
     bool IncludePathColumn = false;
 };
 
-THolder<IActor> CreatePartitionStatsScan(const TActorId& ownerId, ui32 scanId, const TTableId& tableId,
+THolder<NActors::IActor> CreatePartitionStatsScan(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId,
     const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
 {
     return MakeHolder<TPartitionStatsScan>(ownerId, scanId, tableId, tableRange, columns);
diff --git a/ydb/core/sys_view/partition_stats/partition_stats.h b/ydb/core/sys_view/partition_stats/partition_stats.h
index dedf62906f..cfe6f90ccb 100644
--- a/ydb/core/sys_view/partition_stats/partition_stats.h
+++ b/ydb/core/sys_view/partition_stats/partition_stats.h
@@ -2,17 +2,20 @@
 
 #include <ydb/core/kqp/runtime/kqp_compute.h>
 
+#include <library/cpp/actors/core/actor.h>
+#include <library/cpp/actors/core/actorid.h>
+
 namespace NKikimr {
 namespace NSysView {
 
 constexpr size_t STATS_COLLECTOR_BATCH_SIZE = 5000;
 constexpr size_t STATS_COLLECTOR_QUEUE_SIZE_LIMIT = 10;
 
-THolder<IActor> CreatePartitionStatsCollector(
+THolder<NActors::IActor> CreatePartitionStatsCollector(
     size_t batchSize = STATS_COLLECTOR_BATCH_SIZE,
     size_t pendingRequestsCount = STATS_COLLECTOR_QUEUE_SIZE_LIMIT);
 
-THolder<IActor> CreatePartitionStatsScan(const TActorId& ownerId, ui32 scanId, const TTableId& tableId,
+THolder<NActors::IActor> CreatePartitionStatsScan(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId,
     const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
 
 } // NSysView
diff --git a/ydb/core/sys_view/partition_stats/top_partitions.cpp b/ydb/core/sys_view/partition_stats/top_partitions.cpp
index 57a719da46..ca80d79231 100644
--- a/ydb/core/sys_view/partition_stats/top_partitions.cpp
+++ b/ydb/core/sys_view/partition_stats/top_partitions.cpp
@@ -61,7 +61,7 @@ struct TTopPartitionsExtractorMap :
     }
 };
 
-THolder<IActor> CreateTopPartitionsScan(const TActorId& ownerId, ui32 scanId, const TTableId& tableId,
+THolder<NActors::IActor> CreateTopPartitionsScan(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId,
     const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
 {
     using TTopPartitionsScan = TProcessorScan<
diff --git a/ydb/core/sys_view/partition_stats/top_partitions.h b/ydb/core/sys_view/partition_stats/top_partitions.h
index dcf49a89a5..b3cf1b343f 100644
--- a/ydb/core/sys_view/partition_stats/top_partitions.h
+++ b/ydb/core/sys_view/partition_stats/top_partitions.h
@@ -2,9 +2,12 @@
 
 #include <ydb/core/kqp/runtime/kqp_compute.h>
 
+#include <library/cpp/actors/core/actor.h>
+#include <library/cpp/actors/core/actorid.h>
+
 namespace NKikimr::NSysView {
 
-THolder<IActor> CreateTopPartitionsScan(const TActorId& ownerId, ui32 scanId,
+THolder<NActors::IActor> CreateTopPartitionsScan(const NActors::TActorId& ownerId, ui32 scanId,
     const TTableId& tableId, const TTableRange& tableRange,
     const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
 
diff --git a/ydb/core/sys_view/processor/processor.cpp b/ydb/core/sys_view/processor/processor.cpp
index d0c09f8e7b..da6ec4a373 100644
--- a/ydb/core/sys_view/processor/processor.cpp
+++ b/ydb/core/sys_view/processor/processor.cpp
@@ -5,11 +5,11 @@
 namespace NKikimr {
 namespace NSysView {
 
-IActor* CreateSysViewProcessor(const TActorId& tablet, TTabletStorageInfo* info) {
+IActor* CreateSysViewProcessor(const NActors::TActorId& tablet, TTabletStorageInfo* info) {
     return new TSysViewProcessor(tablet, info, EProcessorMode::MINUTE);
 }
 
-IActor* CreateSysViewProcessorForTests(const TActorId& tablet, TTabletStorageInfo* info) {
+IActor* CreateSysViewProcessorForTests(const NActors::TActorId& tablet, TTabletStorageInfo* info) {
     return new TSysViewProcessor(tablet, info, EProcessorMode::FAST);
 }
 
diff --git a/ydb/core/sys_view/processor/processor.h b/ydb/core/sys_view/processor/processor.h
index ad08696597..1d01c2a88e 100644
--- a/ydb/core/sys_view/processor/processor.h
+++ b/ydb/core/sys_view/processor/processor.h
@@ -6,8 +6,8 @@
 namespace NKikimr {
 namespace NSysView {
 
-IActor* CreateSysViewProcessor(const TActorId& tablet, TTabletStorageInfo* info);
-IActor* CreateSysViewProcessorForTests(const TActorId& tablet, TTabletStorageInfo* info);
+IActor* CreateSysViewProcessor(const NActors::TActorId& tablet, TTabletStorageInfo* info);
+IActor* CreateSysViewProcessorForTests(const NActors::TActorId& tablet, TTabletStorageInfo* info);
 
 } // NSysView
 } // NKikimr
diff --git a/ydb/core/sys_view/processor/processor_impl.cpp b/ydb/core/sys_view/processor/processor_impl.cpp
index 1bd8bb5b05..4c624cdea7 100644
--- a/ydb/core/sys_view/processor/processor_impl.cpp
+++ b/ydb/core/sys_view/processor/processor_impl.cpp
@@ -8,7 +8,7 @@
 namespace NKikimr {
 namespace NSysView {
 
-TSysViewProcessor::TSysViewProcessor(const TActorId& tablet, TTabletStorageInfo* info, EProcessorMode processorMode)
+TSysViewProcessor::TSysViewProcessor(const NActors::TActorId& tablet, TTabletStorageInfo* info, EProcessorMode processorMode)
     : TActor(&TThis::StateInit)
     , TTabletExecutedFlat(info, tablet, new NMiniKQL::TMiniKQLFactory)
     , TotalInterval(TDuration::Seconds(processorMode == EProcessorMode::FAST ? 1 : 60))
@@ -490,7 +490,7 @@ void TSysViewProcessor::EntryToProto(NKikimrSysView::TTopPartitionsEntry& dst, c
 }
 
 template <typename TResponse>
-void TSysViewProcessor::ReplyOverloaded(const TActorId& sender) {
+void TSysViewProcessor::ReplyOverloaded(const NActors::TActorId& sender) {
     auto response = MakeHolder<TResponse>();
     response->Record.SetOverloaded(true);
     Send(sender, std::move(response));
diff --git a/ydb/core/sys_view/processor/processor_impl.h b/ydb/core/sys_view/processor/processor_impl.h
index 1b9a2a7a13..feb42c70e9 100644
--- a/ydb/core/sys_view/processor/processor_impl.h
+++ b/ydb/core/sys_view/processor/processor_impl.h
@@ -28,7 +28,7 @@ public:
         return NKikimrServices::TActivity::SYSTEM_VIEW_PROCESSOR;
     }
 
-    TSysViewProcessor(const TActorId& tablet, TTabletStorageInfo* info, EProcessorMode processorMode);
+    TSysViewProcessor(const NActors::TActorId& tablet, TTabletStorageInfo* info, EProcessorMode processorMode);
 
 private:
     using Schema = TProcessorSchema;
@@ -173,7 +173,7 @@ private:
     static void EntryToProto(NKikimrSysView::TTopPartitionsEntry& dst, const NKikimrSysView::TTopPartitionsInfo& src);
 
     template <typename TResponse>
-    void ReplyOverloaded(const TActorId& sender);
+    void ReplyOverloaded(const NActors::TActorId& sender);
 
     template <typename TMap, typename TRequest, typename TResponse>
     void Reply(typename TRequest::TPtr& ev);
diff --git a/ydb/core/sys_view/processor/tx_configure.cpp b/ydb/core/sys_view/processor/tx_configure.cpp
index 68a2a133e5..0cb063da7d 100644
--- a/ydb/core/sys_view/processor/tx_configure.cpp
+++ b/ydb/core/sys_view/processor/tx_configure.cpp
@@ -7,7 +7,7 @@ struct TSysViewProcessor::TTxConfigure : public TTxBase {
     NKikimrSysView::TEvConfigureProcessor Record;
     TActorId Sender;
 
-    TTxConfigure(TSelf* self, NKikimrSysView::TEvConfigureProcessor&& record, const TActorId& sender)
+    TTxConfigure(TSelf* self, NKikimrSysView::TEvConfigureProcessor&& record, const NActors::TActorId& sender)
         : TTxBase(self)
         , Record(std::move(record))
         , Sender(sender)
diff --git a/ydb/core/sys_view/query_stats/query_metrics.cpp b/ydb/core/sys_view/query_stats/query_metrics.cpp
index d303ea3978..de7f29ebc2 100644
--- a/ydb/core/sys_view/query_stats/query_metrics.cpp
+++ b/ydb/core/sys_view/query_stats/query_metrics.cpp
@@ -61,7 +61,7 @@ struct TQueryMetricsExtractorsMap :
     }
 };
 
-THolder<IActor> CreateQueryMetricsScan(const TActorId& ownerId, ui32 scanId, const TTableId& tableId,
+THolder<NActors::IActor> CreateQueryMetricsScan(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId,
     const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
 {
     using TQueryMetricsScan = TProcessorScan<
diff --git a/ydb/core/sys_view/query_stats/query_metrics.h b/ydb/core/sys_view/query_stats/query_metrics.h
index e374081126..09aa817b61 100644
--- a/ydb/core/sys_view/query_stats/query_metrics.h
+++ b/ydb/core/sys_view/query_stats/query_metrics.h
@@ -2,10 +2,13 @@
 
 #include <ydb/core/kqp/runtime/kqp_compute.h>
 
+#include <library/cpp/actors/core/actor.h>
+#include <library/cpp/actors/core/actorid.h>
+
 namespace NKikimr {
 namespace NSysView {
 
-THolder<IActor> CreateQueryMetricsScan(const TActorId& ownerId, ui32 scanId,
+THolder<NActors::IActor> CreateQueryMetricsScan(const NActors::TActorId& ownerId, ui32 scanId,
     const TTableId& tableId, const TTableRange& tableRange,
     const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
 
diff --git a/ydb/core/sys_view/query_stats/query_stats.cpp b/ydb/core/sys_view/query_stats/query_stats.cpp
index 4f9e89a3b9..64bf42eae5 100644
--- a/ydb/core/sys_view/query_stats/query_stats.cpp
+++ b/ydb/core/sys_view/query_stats/query_stats.cpp
@@ -95,7 +95,7 @@ public:
         return NKikimrServices::TActivity::KQP_SYSTEM_VIEW_SCAN;
     }
 
-    TQueryStatsScan(const TActorId& ownerId, ui32 scanId, const TTableId& tableId,
+    TQueryStatsScan(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId,
         const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
         NKikimrSysView::EStatsType statsType,
         ui64 bucketCount, const TDuration& bucketSize)
@@ -506,7 +506,7 @@ private:
     NKikimrSysView::TEvGetQueryMetricsRequest Request;
 };
 
-THolder<IActor> CreateQueryStatsScan(const TActorId& ownerId, ui32 scanId, const TTableId& tableId,
+THolder<NActors::IActor> CreateQueryStatsScan(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId,
     const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
 {
     auto viewName = tableId.SysViewInfo;
diff --git a/ydb/core/sys_view/query_stats/query_stats.h b/ydb/core/sys_view/query_stats/query_stats.h
index a7a76b9b57..6473f95665 100644
--- a/ydb/core/sys_view/query_stats/query_stats.h
+++ b/ydb/core/sys_view/query_stats/query_stats.h
@@ -2,6 +2,9 @@
 
 #include <ydb/core/kqp/runtime/kqp_compute.h>
 
+#include <library/cpp/actors/core/actor.h>
+#include <library/cpp/actors/core/actorid.h>
+
 namespace NKikimr {
 namespace NSysView {
 
@@ -17,7 +20,7 @@ struct TQueryStatsBucketRange {
     explicit TQueryStatsBucketRange(const TSerializedTableRange& range, const TDuration& bucketSize);
 };
 
-THolder<IActor> CreateQueryStatsScan(const TActorId& ownerId, ui32 scanId, const TTableId& tableId,
+THolder<NActors::IActor> CreateQueryStatsScan(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId,
     const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
 
 } // NSysView
diff --git a/ydb/core/sys_view/scan.cpp b/ydb/core/sys_view/scan.cpp
index 577393cfbb..8d06e227e2 100644
--- a/ydb/core/sys_view/scan.cpp
+++ b/ydb/core/sys_view/scan.cpp
@@ -28,7 +28,7 @@ public:
     using TBase = TActor<TSysViewRangesReader>;
 
     TSysViewRangesReader(
-        const TActorId& ownerId,
+        const NActors::TActorId& ownerId,
         ui32 scanId,
         const TTableId& tableId,
         TVector<TSerializedTableRange> ranges,
@@ -140,7 +140,7 @@ private:
     TMaybe<TActorId> ScanActorId;
 };
 
-THolder<IActor> CreateSystemViewScan(const TActorId& ownerId, ui32 scanId, const TTableId& tableId,
+THolder<NActors::IActor> CreateSystemViewScan(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId,
     TVector<TSerializedTableRange> ranges, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
 {
     if (ranges.size() == 1) {
@@ -150,7 +150,7 @@ THolder<IActor> CreateSystemViewScan(const TActorId& ownerId, ui32 scanId, const
     }
 }
 
-THolder<IActor> CreateSystemViewScan(const TActorId& ownerId, ui32 scanId, const TTableId& tableId,
+THolder<NActors::IActor> CreateSystemViewScan(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId,
     const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
 {
     if (tableId.SysViewInfo == PartitionStatsName) {
diff --git a/ydb/core/sys_view/scan.h b/ydb/core/sys_view/scan.h
index d85e7640ef..83f1ddd5b3 100644
--- a/ydb/core/sys_view/scan.h
+++ b/ydb/core/sys_view/scan.h
@@ -2,13 +2,15 @@
 
 #include <ydb/core/kqp/runtime/kqp_compute.h>
 
+#include <library/cpp/actors/core/actor.h>
+
 namespace NKikimr {
 namespace NSysView {
 
-THolder<IActor> CreateSystemViewScan(const TActorId& ownerId, ui32 scanId, const TTableId& tableId,
+THolder<NActors::IActor> CreateSystemViewScan(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId,
     TVector<TSerializedTableRange> ranges, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
 
-THolder<IActor> CreateSystemViewScan(const TActorId& ownerId, ui32 scanId, const TTableId& tableId,
+THolder<NActors::IActor> CreateSystemViewScan(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId,
     const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
 
 } // NSysView
diff --git a/ydb/core/sys_view/service/db_counters.cpp b/ydb/core/sys_view/service/db_counters.cpp
index cc3a16d16a..dad00cebd4 100644
--- a/ydb/core/sys_view/service/db_counters.cpp
+++ b/ydb/core/sys_view/service/db_counters.cpp
@@ -108,7 +108,7 @@ private:
     })
 };
 
-IActor* CreateDbWatcherActor(TIntrusivePtr<TDbWatcherCallback> callback) {
+NActors::IActor* CreateDbWatcherActor(TIntrusivePtr<TDbWatcherCallback> callback) {
     return new TDbWatcherActor(callback);
 }
 
diff --git a/ydb/core/sys_view/service/db_counters.h b/ydb/core/sys_view/service/db_counters.h
index 92e15e51e2..99e4b2e81e 100644
--- a/ydb/core/sys_view/service/db_counters.h
+++ b/ydb/core/sys_view/service/db_counters.h
@@ -2,6 +2,8 @@
 
 #include <ydb/core/scheme/scheme_tabledefs.h>
 
+#include <library/cpp/actors/core/actor.h>
+
 namespace NKikimr {
 namespace NSysView {
 
@@ -9,7 +11,7 @@ struct TDbWatcherCallback : public TThrRefBase {
     virtual void OnDatabaseRemoved(const TString& database, TPathId pathId) = 0;
 };
 
-IActor* CreateDbWatcherActor(TIntrusivePtr<TDbWatcherCallback> callback);
+NActors::IActor* CreateDbWatcherActor(TIntrusivePtr<TDbWatcherCallback> callback);
 
 }
 }
diff --git a/ydb/core/sys_view/service/sysview_service.cpp b/ydb/core/sys_view/service/sysview_service.cpp
index dfa98efdd2..873a335b10 100644
--- a/ydb/core/sys_view/service/sysview_service.cpp
+++ b/ydb/core/sys_view/service/sysview_service.cpp
@@ -1211,14 +1211,14 @@ private:
     static constexpr TDuration ProcessCountersInterval = TDuration::Seconds(5);
 };
 
-THolder<IActor> CreateSysViewService(
+THolder<NActors::IActor> CreateSysViewService(
     TExtCountersConfig&& config, bool hasExternalCounters)
 {
     return MakeHolder<TSysViewService>(
         std::move(config), hasExternalCounters, EProcessorMode::MINUTE);
 }
 
-THolder<IActor> CreateSysViewServiceForTests() {
+THolder<NActors::IActor> CreateSysViewServiceForTests() {
     return MakeHolder<TSysViewService>(
         TExtCountersConfig(), true, EProcessorMode::FAST);
 }
diff --git a/ydb/core/sys_view/service/sysview_service.h b/ydb/core/sys_view/service/sysview_service.h
index 430dfb0261..557d78b8c9 100644
--- a/ydb/core/sys_view/service/sysview_service.h
+++ b/ydb/core/sys_view/service/sysview_service.h
@@ -19,10 +19,10 @@ void CollectQueryStats(const TActorContext& ctx, const NKqpProto::TKqpStatsQuery
     const TString& userSID, ui64 parametersSize, const TString& database,
     const NKikimrKqp::EQueryType type, ui64 requestUnits);
 
-THolder<IActor> CreateSysViewService(
+THolder<NActors::IActor> CreateSysViewService(
     TExtCountersConfig&& config, bool hasExternalCounters);
 
-THolder<IActor> CreateSysViewServiceForTests();
+THolder<NActors::IActor> CreateSysViewServiceForTests();
 
 } // NSysView
 } // NKikimr
diff --git a/ydb/core/sys_view/storage/groups.cpp b/ydb/core/sys_view/storage/groups.cpp
index dabd46f9dc..cca51da225 100644
--- a/ydb/core/sys_view/storage/groups.cpp
+++ b/ydb/core/sys_view/storage/groups.cpp
@@ -41,7 +41,7 @@ public:
     }
 
 };
-THolder<IActor> CreateGroupsScan(const TActorId& ownerId, ui32 scanId, const TTableId& tableId,
+THolder<NActors::IActor> CreateGroupsScan(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId,
     const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
 {
     return MakeHolder<TGroupsScan>(ownerId, scanId, tableId, tableRange, columns);
diff --git a/ydb/core/sys_view/storage/groups.h b/ydb/core/sys_view/storage/groups.h
index ab861d94a8..42755bf879 100644
--- a/ydb/core/sys_view/storage/groups.h
+++ b/ydb/core/sys_view/storage/groups.h
@@ -2,10 +2,13 @@
 
 #include <ydb/core/kqp/runtime/kqp_compute.h>
 
+#include <library/cpp/actors/core/actor.h>
+#include <library/cpp/actors/core/actorid.h>
+
 namespace NKikimr {
 namespace NSysView {
 
-THolder<IActor> CreateGroupsScan(const TActorId& ownerId, ui32 scanId, const TTableId& tableId,
+THolder<NActors::IActor> CreateGroupsScan(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId,
     const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
 
 } // NSysView
diff --git a/ydb/core/sys_view/storage/pdisks.cpp b/ydb/core/sys_view/storage/pdisks.cpp
index 7b99991c52..f870dc1ffa 100644
--- a/ydb/core/sys_view/storage/pdisks.cpp
+++ b/ydb/core/sys_view/storage/pdisks.cpp
@@ -45,7 +45,7 @@ public:
     }
 };
 
-THolder<IActor> CreatePDisksScan(const TActorId& ownerId, ui32 scanId, const TTableId& tableId,
+THolder<NActors::IActor> CreatePDisksScan(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId,
     const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
 {
     return MakeHolder<TPDisksScan>(ownerId, scanId, tableId, tableRange, columns);
diff --git a/ydb/core/sys_view/storage/pdisks.h b/ydb/core/sys_view/storage/pdisks.h
index 4172cb333f..2ddc5d6b00 100644
--- a/ydb/core/sys_view/storage/pdisks.h
+++ b/ydb/core/sys_view/storage/pdisks.h
@@ -2,10 +2,13 @@
 
 #include <ydb/core/kqp/runtime/kqp_compute.h>
 
+#include <library/cpp/actors/core/actor.h>
+#include <library/cpp/actors/core/actorid.h>
+
 namespace NKikimr {
 namespace NSysView {
 
-THolder<IActor> CreatePDisksScan(const TActorId& ownerId, ui32 scanId, const TTableId& tableId,
+THolder<NActors::IActor> CreatePDisksScan(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId,
     const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
 
 } // NSysView
diff --git a/ydb/core/sys_view/storage/storage_pools.cpp b/ydb/core/sys_view/storage/storage_pools.cpp
index 66896a6999..20c331f7da 100644
--- a/ydb/core/sys_view/storage/storage_pools.cpp
+++ b/ydb/core/sys_view/storage/storage_pools.cpp
@@ -40,7 +40,7 @@ public:
     }
 };
 
-THolder<IActor> CreateStoragePoolsScan(const TActorId& ownerId, ui32 scanId, const TTableId& tableId,
+THolder<NActors::IActor> CreateStoragePoolsScan(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId,
     const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
 {
     return MakeHolder<TStoragePoolsScan>(ownerId, scanId, tableId, tableRange, columns);
diff --git a/ydb/core/sys_view/storage/storage_pools.h b/ydb/core/sys_view/storage/storage_pools.h
index 7ced359d00..9ac4fd6ab2 100644
--- a/ydb/core/sys_view/storage/storage_pools.h
+++ b/ydb/core/sys_view/storage/storage_pools.h
@@ -2,10 +2,13 @@
 
 #include <ydb/core/kqp/runtime/kqp_compute.h>
 
+#include <library/cpp/actors/core/actor.h>
+#include <library/cpp/actors/core/actorid.h>
+
 namespace NKikimr {
 namespace NSysView {
 
-THolder<IActor> CreateStoragePoolsScan(const TActorId& ownerId, ui32 scanId, const TTableId& tableId,
+THolder<NActors::IActor> CreateStoragePoolsScan(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId,
     const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
 
 } // NSysView
diff --git a/ydb/core/sys_view/storage/storage_stats.cpp b/ydb/core/sys_view/storage/storage_stats.cpp
index 3668e79798..23876218c2 100644
--- a/ydb/core/sys_view/storage/storage_stats.cpp
+++ b/ydb/core/sys_view/storage/storage_stats.cpp
@@ -29,7 +29,7 @@ public:
     }
 };
 
-THolder<IActor> CreateStorageStatsScan(const TActorId& ownerId, ui32 scanId, const TTableId& tableId,
+THolder<NActors::IActor> CreateStorageStatsScan(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId,
     const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
 {
     return MakeHolder<TStorageStatsScan>(ownerId, scanId, tableId, tableRange, columns);
diff --git a/ydb/core/sys_view/storage/storage_stats.h b/ydb/core/sys_view/storage/storage_stats.h
index 5ffe026e29..cacfadbb7d 100644
--- a/ydb/core/sys_view/storage/storage_stats.h
+++ b/ydb/core/sys_view/storage/storage_stats.h
@@ -2,9 +2,12 @@
 
 #include <ydb/core/kqp/runtime/kqp_compute.h>
 
+#include <library/cpp/actors/core/actor.h>
+#include <library/cpp/actors/core/actorid.h>
+
 namespace NKikimr::NSysView {
 
-THolder<IActor> CreateStorageStatsScan(const TActorId& ownerId, ui32 scanId, const TTableId& tableId,
+THolder<NActors::IActor> CreateStorageStatsScan(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId,
     const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
 
 } // NKikimr::NSysView
diff --git a/ydb/core/sys_view/storage/vslots.cpp b/ydb/core/sys_view/storage/vslots.cpp
index 987eb2750d..6a2bbabfec 100644
--- a/ydb/core/sys_view/storage/vslots.cpp
+++ b/ydb/core/sys_view/storage/vslots.cpp
@@ -42,7 +42,7 @@ public:
     }
 };
 
-THolder<IActor> CreateVSlotsScan(const TActorId& ownerId, ui32 scanId, const TTableId& tableId,
+THolder<NActors::IActor> CreateVSlotsScan(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId,
     const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
 {
     return MakeHolder<TVSlotsScan>(ownerId, scanId, tableId, tableRange, columns);
diff --git a/ydb/core/sys_view/storage/vslots.h b/ydb/core/sys_view/storage/vslots.h
index 34f38f9e0f..d9076e30a6 100644
--- a/ydb/core/sys_view/storage/vslots.h
+++ b/ydb/core/sys_view/storage/vslots.h
@@ -2,10 +2,13 @@
 
 #include <ydb/core/kqp/runtime/kqp_compute.h>
 
+#include <library/cpp/actors/core/actor.h>
+#include <library/cpp/actors/core/actorid.h>
+
 namespace NKikimr {
 namespace NSysView {
 
-THolder<IActor> CreateVSlotsScan(const TActorId& ownerId, ui32 scanId, const TTableId& tableId,
+THolder<NActors::IActor> CreateVSlotsScan(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId,
     const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
 
 } // NSysView
diff --git a/ydb/core/sys_view/tablets/tablets.cpp b/ydb/core/sys_view/tablets/tablets.cpp
index b79cbb1c13..cebb38ebd9 100644
--- a/ydb/core/sys_view/tablets/tablets.cpp
+++ b/ydb/core/sys_view/tablets/tablets.cpp
@@ -23,7 +23,7 @@ public:
         return NKikimrServices::TActivity::KQP_SYSTEM_VIEW_SCAN;
     }
 
-    TTabletsScan(const TActorId& ownerId, ui32 scanId, const TTableId& tableId,
+    TTabletsScan(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId,
         const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
         : TBase(ownerId, scanId, tableId, tableRange, columns)
     {
@@ -357,7 +357,7 @@ private:
     bool BatchRequested = false;
 };
 
-THolder<IActor> CreateTabletsScan(const TActorId& ownerId, ui32 scanId, const TTableId& tableId,
+THolder<NActors::IActor> CreateTabletsScan(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId,
     const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
 {
     return MakeHolder<TTabletsScan>(ownerId, scanId, tableId, tableRange, columns);
diff --git a/ydb/core/sys_view/tablets/tablets.h b/ydb/core/sys_view/tablets/tablets.h
index ca54b08d3e..9936737df9 100644
--- a/ydb/core/sys_view/tablets/tablets.h
+++ b/ydb/core/sys_view/tablets/tablets.h
@@ -2,10 +2,12 @@
 
 #include <ydb/core/kqp/runtime/kqp_compute.h>
 
+#include <library/cpp/actors/core/actor.h>
+
 namespace NKikimr {
 namespace NSysView {
 
-THolder<IActor> CreateTabletsScan(const TActorId& ownerId, ui32 scanId, const TTableId& tableId,
+THolder<NActors::IActor> CreateTabletsScan(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId,
     const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
 
 } // NSysView
diff --git a/ydb/core/tablet_flat/protos/CMakeLists.darwin-x86_64.txt b/ydb/core/tablet_flat/protos/CMakeLists.darwin-x86_64.txt
index f018a876e4..a04498fa62 100644
--- a/ydb/core/tablet_flat/protos/CMakeLists.darwin-x86_64.txt
+++ b/ydb/core/tablet_flat/protos/CMakeLists.darwin-x86_64.txt
@@ -37,6 +37,7 @@ target_link_libraries(core-tablet_flat-protos PUBLIC
   yutil
   contrib-libs-protobuf
   ydb-core-protos
+  core-scheme-protos
 )
 target_proto_messages(core-tablet_flat-protos PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/tablet_flat/protos/flat_table_part.proto
diff --git a/ydb/core/tablet_flat/protos/CMakeLists.linux-aarch64.txt b/ydb/core/tablet_flat/protos/CMakeLists.linux-aarch64.txt
index ad30547f6b..d9797a00bb 100644
--- a/ydb/core/tablet_flat/protos/CMakeLists.linux-aarch64.txt
+++ b/ydb/core/tablet_flat/protos/CMakeLists.linux-aarch64.txt
@@ -38,6 +38,7 @@ target_link_libraries(core-tablet_flat-protos PUBLIC
   yutil
   contrib-libs-protobuf
   ydb-core-protos
+  core-scheme-protos
 )
 target_proto_messages(core-tablet_flat-protos PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/tablet_flat/protos/flat_table_part.proto
diff --git a/ydb/core/tablet_flat/protos/CMakeLists.linux-x86_64.txt b/ydb/core/tablet_flat/protos/CMakeLists.linux-x86_64.txt
index ad30547f6b..d9797a00bb 100644
--- a/ydb/core/tablet_flat/protos/CMakeLists.linux-x86_64.txt
+++ b/ydb/core/tablet_flat/protos/CMakeLists.linux-x86_64.txt
@@ -38,6 +38,7 @@ target_link_libraries(core-tablet_flat-protos PUBLIC
   yutil
   contrib-libs-protobuf
   ydb-core-protos
+  core-scheme-protos
 )
 target_proto_messages(core-tablet_flat-protos PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/tablet_flat/protos/flat_table_part.proto
diff --git a/ydb/core/tablet_flat/protos/CMakeLists.windows-x86_64.txt b/ydb/core/tablet_flat/protos/CMakeLists.windows-x86_64.txt
index f018a876e4..a04498fa62 100644
--- a/ydb/core/tablet_flat/protos/CMakeLists.windows-x86_64.txt
+++ b/ydb/core/tablet_flat/protos/CMakeLists.windows-x86_64.txt
@@ -37,6 +37,7 @@ target_link_libraries(core-tablet_flat-protos PUBLIC
   yutil
   contrib-libs-protobuf
   ydb-core-protos
+  core-scheme-protos
 )
 target_proto_messages(core-tablet_flat-protos PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/tablet_flat/protos/flat_table_part.proto
diff --git a/ydb/core/tablet_flat/protos/flat_table_part.proto b/ydb/core/tablet_flat/protos/flat_table_part.proto
index 53892fabfe..77acb9a6d1 100644
--- a/ydb/core/tablet_flat/protos/flat_table_part.proto
+++ b/ydb/core/tablet_flat/protos/flat_table_part.proto
@@ -1,5 +1,5 @@
 import "ydb/core/protos/base.proto";
-import "ydb/core/protos/type_info.proto";
+import "ydb/core/scheme/protos/type_info.proto";
 
 package NKikimr.NTable.NProto;
 option java_package = "ru.yandex.kikimr.proto";
diff --git a/ydb/core/tablet_flat/protos/ya.make b/ydb/core/tablet_flat/protos/ya.make
index 940c1e1fc9..72fdd74eae 100644
--- a/ydb/core/tablet_flat/protos/ya.make
+++ b/ydb/core/tablet_flat/protos/ya.make
@@ -8,6 +8,7 @@ SRCS(
 PEERDIR(
     contrib/libs/protobuf
     ydb/core/protos
+    ydb/core/scheme/protos
 )
 
 END()
diff --git a/ydb/core/tx/datashard/cdc_stream_scan.h b/ydb/core/tx/datashard/cdc_stream_scan.h
index c8be61ded2..3abee90ccb 100644
--- a/ydb/core/tx/datashard/cdc_stream_scan.h
+++ b/ydb/core/tx/datashard/cdc_stream_scan.h
@@ -2,7 +2,7 @@
 
 #include <library/cpp/actors/core/actor.h>
 
-#include <ydb/core/base/pathid.h>
+#include <ydb/core/scheme/scheme_pathid.h>
 #include <ydb/core/scheme/scheme_tablecell.h>
 #include <ydb/core/tablet_flat/flat_cxx_database.h>
 
diff --git a/ydb/core/tx/datashard/change_record.h b/ydb/core/tx/datashard/change_record.h
index ae3ea88663..c1e7920df3 100644
--- a/ydb/core/tx/datashard/change_record.h
+++ b/ydb/core/tx/datashard/change_record.h
@@ -4,7 +4,7 @@
 
 #include <library/cpp/json/json_value.h>
 
-#include <ydb/core/base/pathid.h>
+#include <ydb/core/scheme/scheme_pathid.h>
 #include <ydb/core/scheme/scheme_tablecell.h>
 
 #include <util/generic/maybe.h>
diff --git a/ydb/core/tx/datashard/change_sender_monitoring.cpp b/ydb/core/tx/datashard/change_sender_monitoring.cpp
index 3ee4bcd5c1..9cc4ba1b6b 100644
--- a/ydb/core/tx/datashard/change_sender_monitoring.cpp
+++ b/ydb/core/tx/datashard/change_sender_monitoring.cpp
@@ -1,5 +1,6 @@
 #include "change_sender_monitoring.h"
 
+#include <util/string/builder.h>
 #include <util/string/cast.h>
 #include <util/string/printf.h>
 #include <util/string/split.h>
diff --git a/ydb/core/tx/datashard/change_sender_monitoring.h b/ydb/core/tx/datashard/change_sender_monitoring.h
index c650848b8d..fe9bf40b9a 100644
--- a/ydb/core/tx/datashard/change_sender_monitoring.h
+++ b/ydb/core/tx/datashard/change_sender_monitoring.h
@@ -1,9 +1,11 @@
 #pragma once
 
-#include <ydb/core/base/pathid.h>
+#include <ydb/core/scheme/scheme_pathid.h>
 
 #include <library/cpp/monlib/service/pages/templates.h>
 
+#include <util/generic/maybe.h>
+
 namespace NKikimr::NDataShard {
 
 template <typename T>
diff --git a/ydb/core/tx/datashard/snapshot_key.h b/ydb/core/tx/datashard/snapshot_key.h
index 3efaf46fd5..f16e4438e6 100644
--- a/ydb/core/tx/datashard/snapshot_key.h
+++ b/ydb/core/tx/datashard/snapshot_key.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <ydb/core/base/pathid.h>
+#include <ydb/core/scheme/scheme_pathid.h>
 
 #include <util/generic/fwd.h>
 
diff --git a/ydb/core/tx/replication/controller/private_events.h b/ydb/core/tx/replication/controller/private_events.h
index 7048467930..8438e9f27c 100644
--- a/ydb/core/tx/replication/controller/private_events.h
+++ b/ydb/core/tx/replication/controller/private_events.h
@@ -4,7 +4,7 @@
 
 #include <ydb/core/base/defs.h>
 #include <ydb/core/base/events.h>
-#include <ydb/core/base/pathid.h>
+#include <ydb/core/scheme/scheme_pathid.h>
 #include <ydb/core/protos/flat_tx_scheme.pb.h>
 
 namespace NKikimr::NReplication::NController {
diff --git a/ydb/core/tx/replication/controller/replication.h b/ydb/core/tx/replication/controller/replication.h
index 5ab51fd34d..df69d5227e 100644
--- a/ydb/core/tx/replication/controller/replication.h
+++ b/ydb/core/tx/replication/controller/replication.h
@@ -3,7 +3,7 @@
 #include "sys_params.h"
 
 #include <ydb/core/base/defs.h>
-#include <ydb/core/base/pathid.h>
+#include <ydb/core/scheme/scheme_pathid.h>
 
 #include <util/generic/ptr.h>
 
diff --git a/ydb/core/tx/scheme_board/events.h b/ydb/core/tx/scheme_board/events.h
index 506fb5beca..8e686e8b92 100644
--- a/ydb/core/tx/scheme_board/events.h
+++ b/ydb/core/tx/scheme_board/events.h
@@ -4,7 +4,7 @@
 #include "helpers.h"
 #include "two_part_description.h"
 
-#include <ydb/core/base/pathid.h>
+#include <ydb/core/scheme/scheme_pathid.h>
 #include <ydb/core/base/statestorage.h>
 #include <ydb/core/protos/flat_tx_scheme.pb.h>
 #include <ydb/core/protos/scheme_board.pb.h>
diff --git a/ydb/core/tx/scheme_board/helpers.h b/ydb/core/tx/scheme_board/helpers.h
index 3b07df3e06..c613ee48a6 100644
--- a/ydb/core/tx/scheme_board/helpers.h
+++ b/ydb/core/tx/scheme_board/helpers.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "defs.h"
-#include <ydb/core/base/pathid.h>
+#include <ydb/core/scheme/scheme_pathid.h>
 
 #include <ydb/core/protos/flat_tx_scheme.pb.h>
 
diff --git a/ydb/core/tx/scheme_board/mon_events.h b/ydb/core/tx/scheme_board/mon_events.h
index 7e02c2d58f..9a12be47f6 100644
--- a/ydb/core/tx/scheme_board/mon_events.h
+++ b/ydb/core/tx/scheme_board/mon_events.h
@@ -2,7 +2,7 @@
 
 #include "defs.h"
 
-#include <ydb/core/base/pathid.h>
+#include <ydb/core/scheme/scheme_pathid.h>
 #include <ydb/core/protos/scheme_board_mon.pb.h>
 #include <ydb/library/services/services.pb.h>
 
diff --git a/ydb/core/tx/scheme_board/monitoring.cpp b/ydb/core/tx/scheme_board/monitoring.cpp
index 923cf75f90..8b0d2281ec 100644
--- a/ydb/core/tx/scheme_board/monitoring.cpp
+++ b/ydb/core/tx/scheme_board/monitoring.cpp
@@ -2,7 +2,7 @@
 #include "monitoring.h"
 
 #include <ydb/core/base/appdata.h>
-#include <ydb/core/base/pathid.h>
+#include <ydb/core/scheme/scheme_pathid.h>
 #include <ydb/core/base/statestorage_impl.h>
 #include <ydb/core/mon/mon.h>
 #include <ydb/library/services/services.pb.h>
diff --git a/ydb/core/tx/scheme_board/populator.h b/ydb/core/tx/scheme_board/populator.h
index 8105c56ba4..ff0b4cead4 100644
--- a/ydb/core/tx/scheme_board/populator.h
+++ b/ydb/core/tx/scheme_board/populator.h
@@ -3,7 +3,7 @@
 #include "defs.h"
 #include "two_part_description.h"
 
-#include <ydb/core/base/pathid.h>
+#include <ydb/core/scheme/scheme_pathid.h>
 
 #include <util/generic/map.h>
 
diff --git a/ydb/core/tx/scheme_board/populator_ut.cpp b/ydb/core/tx/scheme_board/populator_ut.cpp
index 50394d74c7..e2af80d747 100644
--- a/ydb/core/tx/scheme_board/populator_ut.cpp
+++ b/ydb/core/tx/scheme_board/populator_ut.cpp
@@ -1,7 +1,7 @@
 #include "events.h"
 #include "ut_helpers.h"
 
-#include <ydb/core/base/pathid.h>
+#include <ydb/core/scheme/scheme_pathid.h>
 #include <ydb/core/base/tablet_types.h>
 #include <ydb/library/services/services.pb.h>
 #include <ydb/core/tx/schemeshard/ut_helpers/helpers.h>
diff --git a/ydb/core/tx/scheme_board/replica_ut.cpp b/ydb/core/tx/scheme_board/replica_ut.cpp
index 90799649a5..2f79b5bfc1 100644
--- a/ydb/core/tx/scheme_board/replica_ut.cpp
+++ b/ydb/core/tx/scheme_board/replica_ut.cpp
@@ -2,7 +2,7 @@
 #include "replica.h"
 #include "ut_helpers.h"
 
-#include <ydb/core/base/pathid.h>
+#include <ydb/core/scheme/scheme_pathid.h>
 #include <ydb/library/services/services.pb.h>
 #include <ydb/core/testlib/basics/appdata.h>
 
diff --git a/ydb/core/tx/scheme_board/subscriber.h b/ydb/core/tx/scheme_board/subscriber.h
index f415e4e9d5..8e6cd2ffa4 100644
--- a/ydb/core/tx/scheme_board/subscriber.h
+++ b/ydb/core/tx/scheme_board/subscriber.h
@@ -2,7 +2,7 @@
 
 #include "defs.h"
 
-#include <ydb/core/base/pathid.h>
+#include <ydb/core/scheme/scheme_pathid.h>
 
 #include <util/generic/string.h>
 
diff --git a/ydb/core/tx/scheme_board/subscriber_ut.cpp b/ydb/core/tx/scheme_board/subscriber_ut.cpp
index 9db9833d22..3eec1e58c1 100644
--- a/ydb/core/tx/scheme_board/subscriber_ut.cpp
+++ b/ydb/core/tx/scheme_board/subscriber_ut.cpp
@@ -2,7 +2,7 @@
 #include "subscriber.h"
 #include "ut_helpers.h"
 
-#include <ydb/core/base/pathid.h>
+#include <ydb/core/scheme/scheme_pathid.h>
 #include <ydb/core/base/statestorage_impl.h>
 #include <ydb/library/services/services.pb.h>
 #include <ydb/core/testlib/basics/appdata.h>
diff --git a/ydb/core/tx/scheme_cache/scheme_cache.h b/ydb/core/tx/scheme_cache/scheme_cache.h
index e799a91e29..c3e8a9df21 100644
--- a/ydb/core/tx/scheme_cache/scheme_cache.h
+++ b/ydb/core/tx/scheme_cache/scheme_cache.h
@@ -2,7 +2,7 @@
 
 #include <ydb/core/base/appdata.h>
 #include <ydb/core/base/events.h>
-#include <ydb/core/base/pathid.h>
+#include <ydb/core/scheme/scheme_pathid.h>
 #include <ydb/core/base/tx_processing.h>
 #include <ydb/core/protos/flat_scheme_op.pb.h>
 #include <ydb/core/protos/flat_tx_scheme.pb.h>
diff --git a/ydb/core/tx/schemeshard/schemeshard_identificators.h b/ydb/core/tx/schemeshard/schemeshard_identificators.h
index a6f0ff5aa0..e774da9d35 100644
--- a/ydb/core/tx/schemeshard/schemeshard_identificators.h
+++ b/ydb/core/tx/schemeshard/schemeshard_identificators.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <ydb/core/base/pathid.h>
+#include <ydb/core/scheme/scheme_pathid.h>
 #include <ydb/core/util/ui64id.h>
 
 #include <util/generic/utility.h>
diff --git a/ydb/core/tx/schemeshard/schemeshard_schema.h b/ydb/core/tx/schemeshard/schemeshard_schema.h
index c9d88ec9dc..0fd9a999f1 100644
--- a/ydb/core/tx/schemeshard/schemeshard_schema.h
+++ b/ydb/core/tx/schemeshard/schemeshard_schema.h
@@ -2,7 +2,7 @@
 
 #include "schemeshard_types.h"
 
-#include <ydb/core/base/pathid.h>
+#include <ydb/core/scheme/scheme_pathid.h>
 #include <ydb/core/protos/tx_datashard.pb.h>
 #include <ydb/core/protos/tx.pb.h>
 #include <ydb/core/tablet_flat/flat_cxx_database.h>
diff --git a/ydb/core/tx/schemeshard/schemeshard_tables_storage.h b/ydb/core/tx/schemeshard/schemeshard_tables_storage.h
index 0f57d81ab4..c006967336 100644
--- a/ydb/core/tx/schemeshard/schemeshard_tables_storage.h
+++ b/ydb/core/tx/schemeshard/schemeshard_tables_storage.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "schemeshard_info_types.h"
 
-#include <ydb/core/base/pathid.h>
+#include <ydb/core/scheme/scheme_pathid.h>
 
 #include <ydb/library/accessor/accessor.h>
 #include <util/digest/numeric.h>
diff --git a/ydb/core/tx/schemeshard/ut_helpers/ls_checks.h b/ydb/core/tx/schemeshard/ut_helpers/ls_checks.h
index 0168972abf..edd085969c 100644
--- a/ydb/core/tx/schemeshard/ut_helpers/ls_checks.h
+++ b/ydb/core/tx/schemeshard/ut_helpers/ls_checks.h
@@ -3,7 +3,7 @@
 #include <ydb/core/protos/flat_tx_scheme.pb.h>
 
 #include <ydb/core/testlib/actors/test_runtime.h>
-#include <ydb/core/base/pathid.h>
+#include <ydb/core/scheme/scheme_pathid.h>
 
 #include <functional>
 
diff --git a/ydb/core/tx/sequenceproxy/public/events.h b/ydb/core/tx/sequenceproxy/public/events.h
index db786242e3..2fdaae7c8c 100644
--- a/ydb/core/tx/sequenceproxy/public/events.h
+++ b/ydb/core/tx/sequenceproxy/public/events.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <ydb/core/base/events.h>
-#include <ydb/core/base/pathid.h>
+#include <ydb/core/scheme/scheme_pathid.h>
 #include <ydb/library/aclib/aclib.h>
 #include <ydb/public/api/protos/ydb_status_codes.pb.h>
 #include <ydb/library/yql/public/issue/yql_issue.h>
diff --git a/ydb/core/tx/sequenceshard/public/events.h b/ydb/core/tx/sequenceshard/public/events.h
index 3175b90641..599bd718c1 100644
--- a/ydb/core/tx/sequenceshard/public/events.h
+++ b/ydb/core/tx/sequenceshard/public/events.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <ydb/core/base/events.h>
-#include <ydb/core/base/pathid.h>
+#include <ydb/core/scheme/scheme_pathid.h>
 #include <ydb/core/protos/tx_sequenceshard.pb.h>
 
 namespace NKikimr {