Extract schemeshard protos p.1 (#11803)

70 files changed, 335 insertions, 241 deletions

diff --git a/ydb/core/client/flat_ut_client.h b/ydb/core/client/flat_ut_client.h
index 71d55bd1fe..179cee22bd 100644
--- a/ydb/core/client/flat_ut_client.h
+++ b/ydb/core/client/flat_ut_client.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <ydb/core/base/tablet_resolver.h>
+#include <ydb/core/protos/schemeshard/operations.pb.h>
 #include <ydb/core/testlib/test_client.h>
 #include <ydb/core/tx/tx_proxy/proxy.h>
 #include <ydb/public/lib/deprecated/kicli/kicli.h>
diff --git a/ydb/core/client/server/msgbus_server_scheme_request.cpp b/ydb/core/client/server/msgbus_server_scheme_request.cpp
index 0ac14d3ee2..57a8b89e9f 100644
--- a/ydb/core/client/server/msgbus_server_scheme_request.cpp
+++ b/ydb/core/client/server/msgbus_server_scheme_request.cpp
@@ -1,10 +1,12 @@
-#include <ydb/core/base/ticket_parser.h>
 #include "msgbus_server.h"
 #include "msgbus_server_request.h"
 #include "msgbus_server_proxy.h"
 #include "msgbus_server_persqueue.h"
 #include "msgbus_securereq.h"
 
+#include <ydb/core/base/ticket_parser.h>
+#include <ydb/core/protos/schemeshard/operations.pb.h>
+
 namespace NKikimr {
 namespace NMsgBusProxy {
 
diff --git a/ydb/core/cms/console/console_tenants_manager.cpp b/ydb/core/cms/console/console_tenants_manager.cpp
index 88b5a6190e..91548676b2 100644
--- a/ydb/core/cms/console/console_tenants_manager.cpp
+++ b/ydb/core/cms/console/console_tenants_manager.cpp
@@ -6,6 +6,7 @@
 #include <ydb/core/base/path.h>
 #include <ydb/core/blobstorage/base/blobstorage_events.h>
 #include <ydb/core/protos/msgbus.pb.h>
+#include <ydb/core/protos/schemeshard/operations.pb.h>
 #include <ydb/core/util/pb.h>
 #include <ydb/public/lib/operation_id/operation_id.h>
 
diff --git a/ydb/core/driver_lib/cli_base/cli_cmds_db.cpp b/ydb/core/driver_lib/cli_base/cli_cmds_db.cpp
index 6690ac62c1..7215b5fbfb 100644
--- a/ydb/core/driver_lib/cli_base/cli_cmds_db.cpp
+++ b/ydb/core/driver_lib/cli_base/cli_cmds_db.cpp
@@ -3,6 +3,7 @@
 
 #include <ydb/core/tx/schemeshard/schemeshard_user_attr_limits.h>
 #include <ydb/core/protos/bind_channel_storage_pool.pb.h>
+#include <ydb/core/protos/schemeshard/operations.pb.h>
 
 #include <ydb/library/aclib/aclib.h>
 
diff --git a/ydb/core/grpc_services/rpc_alter_coordination_node.cpp b/ydb/core/grpc_services/rpc_alter_coordination_node.cpp
index 36f948f38c..1754997de6 100644
--- a/ydb/core/grpc_services/rpc_alter_coordination_node.cpp
+++ b/ydb/core/grpc_services/rpc_alter_coordination_node.cpp
@@ -1,5 +1,6 @@
 #include "service_coordination.h"
 #include <ydb/core/grpc_services/base/base.h>
+#include <ydb/core/protos/schemeshard/operations.pb.h>
 
 #include <ydb/public/api/protos/ydb_coordination.pb.h>
 
diff --git a/ydb/core/grpc_services/rpc_copy_table.cpp b/ydb/core/grpc_services/rpc_copy_table.cpp
index 729be8e20d..a7e6cfe4b9 100644
--- a/ydb/core/grpc_services/rpc_copy_table.cpp
+++ b/ydb/core/grpc_services/rpc_copy_table.cpp
@@ -1,5 +1,6 @@
 #include "service_table.h"
 #include <ydb/core/grpc_services/base/base.h>
+#include <ydb/core/protos/schemeshard/operations.pb.h>
 
 #include "rpc_calls.h"
 #include "rpc_scheme_base.h"
diff --git a/ydb/core/grpc_services/rpc_copy_tables.cpp b/ydb/core/grpc_services/rpc_copy_tables.cpp
index a31c017558..ff83488d82 100644
--- a/ydb/core/grpc_services/rpc_copy_tables.cpp
+++ b/ydb/core/grpc_services/rpc_copy_tables.cpp
@@ -1,5 +1,6 @@
 #include "service_table.h"
 #include <ydb/core/grpc_services/base/base.h>
+#include <ydb/core/protos/schemeshard/operations.pb.h>
 
 #include "rpc_calls.h"
 #include "rpc_scheme_base.h"
diff --git a/ydb/core/grpc_services/rpc_create_coordination_node.cpp b/ydb/core/grpc_services/rpc_create_coordination_node.cpp
index 10cb1a2b48..ba993e9126 100644
--- a/ydb/core/grpc_services/rpc_create_coordination_node.cpp
+++ b/ydb/core/grpc_services/rpc_create_coordination_node.cpp
@@ -1,5 +1,6 @@
 #include "service_coordination.h"
 #include <ydb/core/grpc_services/base/base.h>
+#include <ydb/core/protos/schemeshard/operations.pb.h>
 
 #include "rpc_scheme_base.h"
 #include "rpc_common/rpc_common.h"
diff --git a/ydb/core/grpc_services/rpc_create_table.cpp b/ydb/core/grpc_services/rpc_create_table.cpp
index 8fa4f6ed26..971cca82ce 100644
--- a/ydb/core/grpc_services/rpc_create_table.cpp
+++ b/ydb/core/grpc_services/rpc_create_table.cpp
@@ -8,6 +8,7 @@
 #include <ydb/core/cms/console/configs_dispatcher.h>
 #include <ydb/core/engine/mkql_proto.h>
 #include <ydb/core/protos/console_config.pb.h>
+#include <ydb/core/protos/schemeshard/operations.pb.h>
 #include <ydb/core/ydb_convert/column_families.h>
 #include <ydb/core/ydb_convert/table_description.h>
 #include <ydb/core/ydb_convert/table_profiles.h>
diff --git a/ydb/core/grpc_services/rpc_drop_coordination_node.cpp b/ydb/core/grpc_services/rpc_drop_coordination_node.cpp
index 79fd74d1d2..fd29f7d59d 100644
--- a/ydb/core/grpc_services/rpc_drop_coordination_node.cpp
+++ b/ydb/core/grpc_services/rpc_drop_coordination_node.cpp
@@ -1,5 +1,6 @@
 #include "service_coordination.h"
 #include <ydb/core/grpc_services/base/base.h>
+#include <ydb/core/protos/schemeshard/operations.pb.h>
 
 #include <ydb/public/api/protos/ydb_coordination.pb.h>
 
diff --git a/ydb/core/grpc_services/rpc_drop_table.cpp b/ydb/core/grpc_services/rpc_drop_table.cpp
index a09fcdcfd3..759667694a 100644
--- a/ydb/core/grpc_services/rpc_drop_table.cpp
+++ b/ydb/core/grpc_services/rpc_drop_table.cpp
@@ -1,5 +1,6 @@
 #include "service_table.h"
 #include <ydb/core/grpc_services/base/base.h>
+#include <ydb/core/protos/schemeshard/operations.pb.h>
 
 #include "service_table.h"
 #include "rpc_calls.h"
diff --git a/ydb/core/grpc_services/rpc_keyvalue.cpp b/ydb/core/grpc_services/rpc_keyvalue.cpp
index 366a977465..bb2f3f3dc0 100644
--- a/ydb/core/grpc_services/rpc_keyvalue.cpp
+++ b/ydb/core/grpc_services/rpc_keyvalue.cpp
@@ -6,6 +6,7 @@
 #include <ydb/core/grpc_services/rpc_scheme_base.h>
 #include <ydb/core/grpc_services/rpc_common/rpc_common.h>
 #include <ydb/core/keyvalue/keyvalue_events.h>
+#include <ydb/core/protos/schemeshard/operations.pb.h>
 #include <ydb/core/tx/scheme_cache/scheme_cache.h>
 #include <ydb/core/mind/local.h>
 #include <ydb/core/protos/local.pb.h>
diff --git a/ydb/core/grpc_services/rpc_log_store.cpp b/ydb/core/grpc_services/rpc_log_store.cpp
index bb84bc25d4..9ed9869541 100644
--- a/ydb/core/grpc_services/rpc_log_store.cpp
+++ b/ydb/core/grpc_services/rpc_log_store.cpp
@@ -2,10 +2,11 @@
 #include "rpc_common/rpc_common.h"
 #include "rpc_scheme_base.h"
 
+#include <ydb/core/protos/schemeshard/operations.pb.h>
+#include <ydb/core/scheme/scheme_type_id.h>
 #include <ydb/core/ydb_convert/table_description.h>
-#include <ydb/core/ydb_convert/ydb_convert.h>
 #include <ydb/core/ydb_convert/table_settings.h>
-#include <ydb/core/scheme/scheme_type_id.h>
+#include <ydb/core/ydb_convert/ydb_convert.h>
 #include <ydb/library/mkql_proto/mkql_proto.h>
 
 #include <ydb/core/grpc_services/base/base.h>
diff --git a/ydb/core/grpc_services/rpc_make_directory.cpp b/ydb/core/grpc_services/rpc_make_directory.cpp
index 19e6ff7356..34fdf432f1 100644
--- a/ydb/core/grpc_services/rpc_make_directory.cpp
+++ b/ydb/core/grpc_services/rpc_make_directory.cpp
@@ -2,8 +2,10 @@
 
 #include "rpc_scheme_base.h"
 #include "rpc_common/rpc_common.h"
+
 #include <ydb/core/grpc_services/base/base.h>
 #include <ydb/core/protos/flat_tx_scheme.pb.h>
+#include <ydb/core/protos/schemeshard/operations.pb.h>
 #include <ydb/public/api/protos/ydb_scheme.pb.h>
 
 namespace NKikimr {
diff --git a/ydb/core/grpc_services/rpc_modify_permissions.cpp b/ydb/core/grpc_services/rpc_modify_permissions.cpp
index 5c6091f725..d7270688a3 100644
--- a/ydb/core/grpc_services/rpc_modify_permissions.cpp
+++ b/ydb/core/grpc_services/rpc_modify_permissions.cpp
@@ -3,6 +3,7 @@
 #include "rpc_scheme_base.h"
 #include "rpc_common/rpc_common.h"
 #include <ydb/core/protos/flat_tx_scheme.pb.h>
+#include <ydb/core/protos/schemeshard/operations.pb.h>
 #include <ydb/core/tx/schemeshard/schemeshard.h>
 #include <ydb/core/ydb_convert/ydb_convert.h>
 #include <ydb/core/grpc_services/base/base.h>
diff --git a/ydb/core/grpc_services/rpc_remove_directory.cpp b/ydb/core/grpc_services/rpc_remove_directory.cpp
index 076887fc09..918f4db2d7 100644
--- a/ydb/core/grpc_services/rpc_remove_directory.cpp
+++ b/ydb/core/grpc_services/rpc_remove_directory.cpp
@@ -3,6 +3,7 @@
 #include "rpc_scheme_base.h"
 #include "rpc_common/rpc_common.h"
 #include <ydb/core/grpc_services/base/base.h>
+#include <ydb/core/protos/schemeshard/operations.pb.h>
 #include <ydb/public/api/protos/ydb_scheme.pb.h>
 
 namespace NKikimr {
diff --git a/ydb/core/grpc_services/rpc_rename_tables.cpp b/ydb/core/grpc_services/rpc_rename_tables.cpp
index e5fd056d48..e162ea0407 100644
--- a/ydb/core/grpc_services/rpc_rename_tables.cpp
+++ b/ydb/core/grpc_services/rpc_rename_tables.cpp
@@ -1,5 +1,6 @@
 #include "service_table.h"
 #include <ydb/core/grpc_services/base/base.h>
+#include <ydb/core/protos/schemeshard/operations.pb.h>
 
 #include "service_table.h"
 #include "rpc_calls.h"
diff --git a/ydb/core/kqp/executer_actor/kqp_scheme_executer.cpp b/ydb/core/kqp/executer_actor/kqp_scheme_executer.cpp
index a8781780f2..40f293a7ad 100644
--- a/ydb/core/kqp/executer_actor/kqp_scheme_executer.cpp
+++ b/ydb/core/kqp/executer_actor/kqp_scheme_executer.cpp
@@ -1,12 +1,13 @@
 #include "kqp_executer.h"
 #include "kqp_executer_impl.h"
 
-#include <ydb/core/kqp/gateway/actors/scheme.h>
 #include <ydb/core/kqp/gateway/actors/analyze_actor.h>
+#include <ydb/core/kqp/gateway/actors/scheme.h>
 #include <ydb/core/kqp/gateway/local_rpc/helper.h>
-#include <ydb/core/tx/tx_proxy/proxy.h>
 #include <ydb/core/kqp/session_actor/kqp_worker_common.h>
+#include <ydb/core/protos/schemeshard/operations.pb.h>
 #include <ydb/core/tx/schemeshard/schemeshard_build_index.h>
+#include <ydb/core/tx/tx_proxy/proxy.h>
 #include <ydb/services/metadata/abstract/kqp_common.h>
 
 namespace NKikimr::NKqp {
diff --git a/ydb/core/kqp/gateway/behaviour/external_data_source/manager.cpp b/ydb/core/kqp/gateway/behaviour/external_data_source/manager.cpp
index b9d76ce063..594c607f5b 100644
--- a/ydb/core/kqp/gateway/behaviour/external_data_source/manager.cpp
+++ b/ydb/core/kqp/gateway/behaviour/external_data_source/manager.cpp
@@ -6,6 +6,7 @@
 #include <ydb/core/kqp/gateway/actors/scheme.h>
 #include <ydb/core/kqp/gateway/utils/scheme_helpers.h>
 #include <ydb/core/kqp/provider/yql_kikimr_gateway.h>
+#include <ydb/core/protos/schemeshard/operations.pb.h>
 #include <ydb/core/base/path.h>
 #include <ydb/core/base/feature_flags.h>
 
diff --git a/ydb/core/kqp/gateway/behaviour/resource_pool/manager.cpp b/ydb/core/kqp/gateway/behaviour/resource_pool/manager.cpp
index e01ecc4010..0aabea6e6a 100644
--- a/ydb/core/kqp/gateway/behaviour/resource_pool/manager.cpp
+++ b/ydb/core/kqp/gateway/behaviour/resource_pool/manager.cpp
@@ -7,6 +7,7 @@
 #include <ydb/core/kqp/gateway/actors/scheme.h>
 #include <ydb/core/protos/console_config.pb.h>
 #include <ydb/core/protos/feature_flags.pb.h>
+#include <ydb/core/protos/schemeshard/operations.pb.h>
 #include <ydb/core/resource_pools/resource_pool_settings.h>
 
 
diff --git a/ydb/core/kqp/gateway/behaviour/tablestore/operations/abstract.cpp b/ydb/core/kqp/gateway/behaviour/tablestore/operations/abstract.cpp
index 6e01379176..11124c025d 100644
--- a/ydb/core/kqp/gateway/behaviour/tablestore/operations/abstract.cpp
+++ b/ydb/core/kqp/gateway/behaviour/tablestore/operations/abstract.cpp
@@ -1,6 +1,8 @@
 #include "abstract.h"
+
 #include <ydb/core/kqp/gateway/utils/scheme_helpers.h>
 #include <ydb/core/kqp/provider/yql_kikimr_gateway.h>
+#include <ydb/core/protos/schemeshard/operations.pb.h>
 
 namespace NKikimr::NKqp {
 
diff --git a/ydb/core/kqp/gateway/behaviour/tablestore/operations/alter_sharding.cpp b/ydb/core/kqp/gateway/behaviour/tablestore/operations/alter_sharding.cpp
index fc0e3b0d26..56fa17ad00 100644
--- a/ydb/core/kqp/gateway/behaviour/tablestore/operations/alter_sharding.cpp
+++ b/ydb/core/kqp/gateway/behaviour/tablestore/operations/alter_sharding.cpp
@@ -1,4 +1,5 @@
 #include "alter_sharding.h"
+#include <ydb/core/protos/schemeshard/operations.pb.h>
 #include <ydb/library/actors/core/log.h>
 #include <util/string/type.h>
 
diff --git a/ydb/core/kqp/gateway/behaviour/view/manager.cpp b/ydb/core/kqp/gateway/behaviour/view/manager.cpp
index f7d421a790..63a685207a 100644
--- a/ydb/core/kqp/gateway/behaviour/view/manager.cpp
+++ b/ydb/core/kqp/gateway/behaviour/view/manager.cpp
@@ -4,6 +4,7 @@
 #include <ydb/core/kqp/gateway/actors/scheme.h>
 #include <ydb/core/kqp/gateway/utils/scheme_helpers.h>
 #include <ydb/core/kqp/provider/yql_kikimr_provider.h>
+#include <ydb/core/protos/schemeshard/operations.pb.h>
 #include <ydb/core/tx/tx_proxy/proxy.h>
 
 namespace NKikimr::NKqp {
diff --git a/ydb/core/kqp/query_data/kqp_prepared_query.cpp b/ydb/core/kqp/query_data/kqp_prepared_query.cpp
index 29c6b24c73..f591e514e2 100644
--- a/ydb/core/kqp/query_data/kqp_prepared_query.cpp
+++ b/ydb/core/kqp/query_data/kqp_prepared_query.cpp
@@ -2,15 +2,16 @@
 
 #include <ydb/core/base/path.h>
 #include <ydb/core/kqp/common/kqp_resolve.h>
-#include <ydb/library/mkql_proto/mkql_proto.h>
+#include <ydb/core/kqp/common/simple/helpers.h>
 #include <ydb/core/kqp/provider/yql_kikimr_settings.h>
+#include <ydb/core/protos/kqp_physical.pb.h>
+#include <ydb/core/protos/schemeshard/operations.pb.h>
+#include <ydb/library/mkql_proto/mkql_proto.h>
+#include <ydb/library/mkql_proto/mkql_proto.h>
+#include <ydb/library/services/services.pb.h>
 #include <yql/essentials/core/yql_data_provider.h>
 #include <yql/essentials/minikql/mkql_function_registry.h>
 #include <yql/essentials/minikql/mkql_node.h>
-#include <ydb/library/mkql_proto/mkql_proto.h>
-#include <ydb/core/kqp/common/simple/helpers.h>
-#include <ydb/core/protos/kqp_physical.pb.h>
-#include <ydb/library/services/services.pb.h>
 
 #include <ydb/library/actors/core/log.h>
 
diff --git a/ydb/core/kqp/session_actor/kqp_temp_tables_manager.cpp b/ydb/core/kqp/session_actor/kqp_temp_tables_manager.cpp
index a96b2989c0..9cd8b86434 100644
--- a/ydb/core/kqp/session_actor/kqp_temp_tables_manager.cpp
+++ b/ydb/core/kqp/session_actor/kqp_temp_tables_manager.cpp
@@ -2,8 +2,9 @@
 
 #include <ydb/core/base/path.h>
 #include <ydb/core/kqp/gateway/actors/scheme.h>
-#include <ydb/core/tx/tx_proxy/proxy.h>
 #include <ydb/core/kqp/session_actor/kqp_worker_common.h>
+#include <ydb/core/protos/schemeshard/operations.pb.h>
+#include <ydb/core/tx/tx_proxy/proxy.h>
 
 #include <ydb/library/actors/core/actor_bootstrapped.h>
 #include <ydb/library/actors/core/event_pb.h>
diff --git a/ydb/core/kqp/ut/scan/kqp_split_ut.cpp b/ydb/core/kqp/ut/scan/kqp_split_ut.cpp
index 995f214d7d..3d593ee7ff 100644
--- a/ydb/core/kqp/ut/scan/kqp_split_ut.cpp
+++ b/ydb/core/kqp/ut/scan/kqp_split_ut.cpp
@@ -14,6 +14,7 @@
 #include <ydb/core/kqp/common/kqp.h>
 #include <ydb/core/kqp/executer_actor/kqp_executer.h>
 
+#include <ydb/core/protos/schemeshard/operations.pb.h>
 #include <ydb/core/tx/tx_proxy/proxy.h>
 #include <ydb/core/tx/schemeshard/schemeshard.h>
 
diff --git a/ydb/core/kqp/workload_service/actors/scheme_actors.cpp b/ydb/core/kqp/workload_service/actors/scheme_actors.cpp
index d78da26d28..fcec4fa743 100644
--- a/ydb/core/kqp/workload_service/actors/scheme_actors.cpp
+++ b/ydb/core/kqp/workload_service/actors/scheme_actors.cpp
@@ -3,6 +3,8 @@
 #include <ydb/core/base/path.h>
 #include <ydb/core/base/tablet_pipe.h>
 
+#include <ydb/core/protos/schemeshard/operations.pb.h>
+
 #include <ydb/core/kqp/common/simple/services.h>
 #include <ydb/core/kqp/workload_service/common/events.h>
 #include <ydb/core/kqp/workload_service/common/helpers.h>
diff --git a/ydb/core/load_test/ut_ycsb.cpp b/ydb/core/load_test/ut_ycsb.cpp
index df0cf04df2..0022b4af28 100644
--- a/ydb/core/load_test/ut_ycsb.cpp
+++ b/ydb/core/load_test/ut_ycsb.cpp
@@ -1,4 +1,5 @@
 #include <ydb/core/kqp/ut/common/kqp_ut_common.h> // Y_UNIT_TEST_(TWIN|QUAD), Q_
+#include <ydb/core/protos/schemeshard/operations.pb.h>
 #include <ydb/core/load_test/events.h>
 #include <ydb/core/load_test/ycsb/common.h>
 #include <ydb/core/load_test/ycsb/test_load_actor.h>
diff --git a/ydb/core/mind/hive/hive_ut.cpp b/ydb/core/mind/hive/hive_ut.cpp
index 27f024c573..dd19b3025a 100644
--- a/ydb/core/mind/hive/hive_ut.cpp
+++ b/ydb/core/mind/hive/hive_ut.cpp
@@ -11,6 +11,7 @@
 #include <ydb/core/blobstorage/pdisk/blobstorage_pdisk_tools.h>
 #include <ydb/core/protos/counters_hive.pb.h>
 #include <ydb/core/protos/follower_group.pb.h>
+#include <ydb/core/protos/schemeshard/operations.pb.h>
 #include <ydb/core/mind/bscontroller/bsc.h>
 #include <ydb/core/mind/tenant_pool.h>
 #include <ydb/core/tablet_flat/tablet_flat_executed.h>
diff --git a/ydb/core/mind/node_broker_ut.cpp b/ydb/core/mind/node_broker_ut.cpp
index f3e0d37250..374bcaf4ed 100644
--- a/ydb/core/mind/node_broker_ut.cpp
+++ b/ydb/core/mind/node_broker_ut.cpp
@@ -14,6 +14,7 @@
 #include <ydb/core/base/statestorage_impl.h>
 #include <ydb/core/blobstorage/crypto/default.h>
 #include <ydb/core/blobstorage/pdisk/blobstorage_pdisk_tools.h>
+#include <ydb/core/protos/schemeshard/operations.pb.h>
 #include <ydb/core/tablet_flat/shared_cache_events.h>
 #include <ydb/core/tablet_flat/shared_sausagecache.h>
 #include <ydb/core/tx/schemeshard/schemeshard.h>
diff --git a/ydb/core/persqueue/partition_scale_request.cpp b/ydb/core/persqueue/partition_scale_request.cpp
index 61b01669f4..459b564098 100644
--- a/ydb/core/persqueue/partition_scale_request.cpp
+++ b/ydb/core/persqueue/partition_scale_request.cpp
@@ -1,6 +1,8 @@
 #include "partition_scale_request.h"
 #include "read_balancer_log.h"
 
+#include <ydb/core/protos/schemeshard/operations.pb.h>
+
 namespace NKikimr {
 namespace NPQ {
 
diff --git a/ydb/core/protos/flat_scheme_op.proto b/ydb/core/protos/flat_scheme_op.proto
index 88f08508c0..11e7e9315f 100644
--- a/ydb/core/protos/flat_scheme_op.proto
+++ b/ydb/core/protos/flat_scheme_op.proto
@@ -1,28 +1,29 @@
-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/blob_depot_config.proto";
+import "ydb/core/protos/blockstore_config.proto";
+import "ydb/core/protos/channel_purpose.proto";
+import "ydb/core/protos/compaction.proto";
+import "ydb/core/protos/filestore_config.proto";
+import "ydb/core/protos/follower_group.proto";
+import "ydb/core/protos/index_builder.proto";
 import "ydb/core/protos/pqconfig.proto";
 import "ydb/core/protos/replication.proto";
-import "ydb/core/protos/compaction.proto";
+import "ydb/core/protos/schemeshard/operations.proto";
+import "ydb/core/protos/subdomains.proto";
 import "ydb/core/protos/table_stats.proto";
 import "ydb/core/protos/tablet.proto";
-import "ydb/core/protos/subdomains.proto";
-import "ydb/core/protos/blockstore_config.proto";
-import "ydb/core/protos/filestore_config.proto";
-import "ydb/core/protos/channel_purpose.proto";
-import "ydb/core/protos/follower_group.proto";
-import "ydb/core/protos/blob_depot_config.proto";
 import "ydb/core/protos/yql_translation_settings.proto";
+import "ydb/core/scheme/protos/pathid.proto";
+import "ydb/core/scheme/protos/type_info.proto";
+import "ydb/core/tx/columnshard/common/protos/snapshot.proto";
+import "ydb/core/tx/columnshard/engines/scheme/defaults/protos/data.proto";
+import "ydb/library/actors/protos/actors.proto";
+import "ydb/library/formats/arrow/protos/accessor.proto";
+import "ydb/library/mkql_proto/protos/minikql.proto";
 import "ydb/public/api/protos/ydb_coordination.proto";
 import "ydb/public/api/protos/ydb_export.proto";
 import "ydb/public/api/protos/ydb_table.proto";
 import "ydb/public/api/protos/ydb_value.proto";
-import "ydb/library/actors/protos/actors.proto";
-import "ydb/library/mkql_proto/protos/minikql.proto";
-import "ydb/core/protos/index_builder.proto";
-import "ydb/core/tx/columnshard/engines/scheme/defaults/protos/data.proto";
-import "ydb/core/tx/columnshard/common/protos/snapshot.proto";
-import "ydb/library/formats/arrow/protos/accessor.proto";
 
 import "google/protobuf/empty.proto";
 import "google/protobuf/struct.proto";
@@ -1468,172 +1469,6 @@ message TBlobDepotDescription {
     optional fixed64 TabletId = 5; // for unsharded mode
 }
 
-enum EOperationType {
-    ESchemeOpMkDir = 1;
-    ESchemeOpCreateTable = 2;
-    ESchemeOpCreatePersQueueGroup = 3;
-    ESchemeOpDropTable = 4;
-    ESchemeOpDropPersQueueGroup = 5;
-    ESchemeOpAlterTable = 6;
-    ESchemeOpAlterPersQueueGroup = 7;
-    ESchemeOpModifyACL = 8;
-    ESchemeOpRmDir = 9;
-    ESchemeOpSplitMergeTablePartitions = 10;
-    ESchemeOpBackup = 11;
-    ESchemeOpCreateSubDomain = 12;
-    ESchemeOpDropSubDomain = 13;
-    ESchemeOpCreateRtmrVolume = 14;
-    ESchemeOpCreateBlockStoreVolume = 15;
-    ESchemeOpAlterBlockStoreVolume = 16;
-    ESchemeOpAssignBlockStoreVolume = 17;
-    ESchemeOpDropBlockStoreVolume = 18;
-    ESchemeOpCreateKesus = 19;
-    ESchemeOpDropKesus = 20;
-    ESchemeOpForceDropSubDomain = 21;
-    ESchemeOpCreateSolomonVolume = 22;
-    ESchemeOpDropSolomonVolume = 23;
-    ESchemeOpAlterKesus = 24;
-    ESchemeOpAlterSubDomain = 25;
-    ESchemeOpAlterUserAttributes = 26;
-
-    // *************
-    // Unsafe operation. Nornally it is used for deleting database. It called by CMS, and CMS takes care of remaining resourses.
-    // If you apply it manually to an ordinary path in cases of emergenses, be aware of:
-    // 1 -- data transactions are ignored. Distributed transactions colud be broken so progress on other shards would be blocked forever
-    // 2 -- boorowed/loans blobs could be lost forever.
-    //
-    ESchemeOpForceDropUnsafe = 27;
-    //
-    // *************
-
-    ESchemeOpCreateIndexedTable = 28;
-    ESchemeOpCreateTableIndex = 29;
-    ESchemeOpCreateConsistentCopyTables = 30;
-    ESchemeOpDropTableIndex = 31;
-    ESchemeOpCreateExtSubDomain = 32;
-    ESchemeOpAlterExtSubDomain = 33;
-    ESchemeOpForceDropExtSubDomain = 34;
-    ESchemeOp_DEPRECATED_35 = 35;
-    ESchemeOpUpgradeSubDomain = 36;
-    ESchemeOpUpgradeSubDomainDecision = 37;
-    ESchemeOpCreateIndexBuild = 38;
-    ESchemeOpInitiateBuildIndexMainTable = 39;
-    ESchemeOpCreateLock = 40;
-    ESchemeOpApplyIndexBuild = 41;
-    ESchemeOpFinalizeBuildIndexMainTable = 42;
-    ESchemeOpAlterTableIndex = 43;
-    ESchemeOpAlterSolomonVolume = 44;
-    ESchemeOpDropLock = 45;
-
-    ESchemeOpFinalizeBuildIndexImplTable = 46;
-    ESchemeOpInitiateBuildIndexImplTable = 47;
-
-    ESchemeOpDropIndex = 48;
-    ESchemeOpDropTableIndexAtMainTable = 49;
-
-    ESchemeOpCancelIndexBuild = 50;
-
-    ESchemeOpCreateFileStore = 51;
-    ESchemeOpAlterFileStore = 52;
-    ESchemeOpDropFileStore = 53;
-
-    ESchemeOpRestore = 54;
-
-    ESchemeOpCreateColumnStore = 55;
-    ESchemeOpAlterColumnStore = 56;
-    ESchemeOpDropColumnStore = 57;
-    ESchemeOpCreateColumnTable = 58;
-    ESchemeOpAlterColumnTable = 59;
-    ESchemeOpDropColumnTable = 60;
-
-    ESchemeOpAlterLogin = 61;
-
-    /// CDC
-    // Create
-    ESchemeOpCreateCdcStream = 62;
-    ESchemeOpCreateCdcStreamImpl = 63;
-    ESchemeOpCreateCdcStreamAtTable = 64;
-    // Alter
-    ESchemeOpAlterCdcStream = 65;
-    ESchemeOpAlterCdcStreamImpl = 66;
-    ESchemeOpAlterCdcStreamAtTable = 67;
-    // Drop
-    ESchemeOpDropCdcStream = 68;
-    ESchemeOpDropCdcStreamImpl = 69;
-    ESchemeOpDropCdcStreamAtTable = 70;
-
-    ESchemeOpMoveTable = 71;
-    ESchemeOpMoveTableIndex = 72;
-
-    // Sequences
-    ESchemeOpCreateSequence = 73;
-    ESchemeOpAlterSequence = 74;
-    ESchemeOpDropSequence = 75;
-
-    // Replication
-    ESchemeOpCreateReplication = 76;
-    ESchemeOpAlterReplication = 77;
-    ESchemeOpDropReplicationCascade = 78;
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // BlobDepot
-    ESchemeOpCreateBlobDepot = 79;
-    ESchemeOpAlterBlobDepot = 80;
-    ESchemeOpDropBlobDepot = 81;
-
-    // Move index
-    ESchemeOpMoveIndex = 82;
-
-    reserved 83, 84; // ESchemeOpAllocatePersQueueGroup and ESchemeOpDeallocatePersQueueGroup
-
-    // AlterExtSubDomain suboperations
-    ESchemeOpAlterExtSubDomainCreateHive = 85;
-
-    // External Table
-    ESchemeOpCreateExternalTable = 86;
-    ESchemeOpDropExternalTable = 87;
-    ESchemeOpAlterExternalTable = 88;
-
-    // External Data Source
-    ESchemeOpCreateExternalDataSource = 89;
-    ESchemeOpDropExternalDataSource = 90;
-    ESchemeOpAlterExternalDataSource = 91;
-
-    ESchemeOpCreateColumnBuild = 92;
-
-    // View
-    ESchemeOpCreateView = 93;
-    ESchemeOpAlterView = 94;
-    ESchemeOpDropView = 95;
-
-    ESchemeOpDropReplication = 96;
-
-    /// ContinuousBackup
-    // Create
-    ESchemeOpCreateContinuousBackup = 97;
-    // Alter
-    ESchemeOpAlterContinuousBackup = 98;
-    // Drop
-    ESchemeOpDropContinuousBackup = 99;
-
-    // Resource Pool
-    ESchemeOpCreateResourcePool = 100;
-    ESchemeOpDropResourcePool = 101;
-    ESchemeOpAlterResourcePool = 102;
-
-    ESchemeOpRestoreIncrementalBackup = 103;
-    ESchemeOpRestoreIncrementalBackupAtTable = 104;
-
-    // BackupCollection
-    ESchemeOpCreateBackupCollection = 105;
-    ESchemeOpAlterBackupCollection = 106;
-    ESchemeOpDropBackupCollection = 107;
-    ESchemeOpBackupBackupCollection = 109;
-
-    // Move sequence
-    ESchemeOpMoveSequence = 108;
-}
-
 message TApplyIf {
     optional uint64 PathId = 1;
     optional uint64 PathVersion = 2;
diff --git a/ydb/core/protos/schemeshard/operations.proto b/ydb/core/protos/schemeshard/operations.proto
new file mode 100644
index 0000000000..786c4b2b54
--- /dev/null
+++ b/ydb/core/protos/schemeshard/operations.proto
@@ -0,0 +1,168 @@
+package NKikimrSchemeOp;
+option java_package = "ru.yandex.kikimr.proto";
+
+enum EOperationType {
+    ESchemeOpMkDir = 1;
+    ESchemeOpCreateTable = 2;
+    ESchemeOpCreatePersQueueGroup = 3;
+    ESchemeOpDropTable = 4;
+    ESchemeOpDropPersQueueGroup = 5;
+    ESchemeOpAlterTable = 6;
+    ESchemeOpAlterPersQueueGroup = 7;
+    ESchemeOpModifyACL = 8;
+    ESchemeOpRmDir = 9;
+    ESchemeOpSplitMergeTablePartitions = 10;
+    ESchemeOpBackup = 11;
+    ESchemeOpCreateSubDomain = 12;
+    ESchemeOpDropSubDomain = 13;
+    ESchemeOpCreateRtmrVolume = 14;
+    ESchemeOpCreateBlockStoreVolume = 15;
+    ESchemeOpAlterBlockStoreVolume = 16;
+    ESchemeOpAssignBlockStoreVolume = 17;
+    ESchemeOpDropBlockStoreVolume = 18;
+    ESchemeOpCreateKesus = 19;
+    ESchemeOpDropKesus = 20;
+    ESchemeOpForceDropSubDomain = 21;
+    ESchemeOpCreateSolomonVolume = 22;
+    ESchemeOpDropSolomonVolume = 23;
+    ESchemeOpAlterKesus = 24;
+    ESchemeOpAlterSubDomain = 25;
+    ESchemeOpAlterUserAttributes = 26;
+
+    // *************
+    // Unsafe operation. Nornally it is used for deleting database. It called by CMS, and CMS takes care of remaining resourses.
+    // If you apply it manually to an ordinary path in cases of emergenses, be aware of:
+    // 1 -- data transactions are ignored. Distributed transactions colud be broken so progress on other shards would be blocked forever
+    // 2 -- boorowed/loans blobs could be lost forever.
+    //
+    ESchemeOpForceDropUnsafe = 27;
+    //
+    // *************
+
+    ESchemeOpCreateIndexedTable = 28;
+    ESchemeOpCreateTableIndex = 29;
+    ESchemeOpCreateConsistentCopyTables = 30;
+    ESchemeOpDropTableIndex = 31;
+    ESchemeOpCreateExtSubDomain = 32;
+    ESchemeOpAlterExtSubDomain = 33;
+    ESchemeOpForceDropExtSubDomain = 34;
+    ESchemeOp_DEPRECATED_35 = 35;
+    ESchemeOpUpgradeSubDomain = 36;
+    ESchemeOpUpgradeSubDomainDecision = 37;
+    ESchemeOpCreateIndexBuild = 38;
+    ESchemeOpInitiateBuildIndexMainTable = 39;
+    ESchemeOpCreateLock = 40;
+    ESchemeOpApplyIndexBuild = 41;
+    ESchemeOpFinalizeBuildIndexMainTable = 42;
+    ESchemeOpAlterTableIndex = 43;
+    ESchemeOpAlterSolomonVolume = 44;
+    ESchemeOpDropLock = 45;
+
+    ESchemeOpFinalizeBuildIndexImplTable = 46;
+    ESchemeOpInitiateBuildIndexImplTable = 47;
+
+    ESchemeOpDropIndex = 48;
+    ESchemeOpDropTableIndexAtMainTable = 49;
+
+    ESchemeOpCancelIndexBuild = 50;
+
+    ESchemeOpCreateFileStore = 51;
+    ESchemeOpAlterFileStore = 52;
+    ESchemeOpDropFileStore = 53;
+
+    ESchemeOpRestore = 54;
+
+    ESchemeOpCreateColumnStore = 55;
+    ESchemeOpAlterColumnStore = 56;
+    ESchemeOpDropColumnStore = 57;
+    ESchemeOpCreateColumnTable = 58;
+    ESchemeOpAlterColumnTable = 59;
+    ESchemeOpDropColumnTable = 60;
+
+    ESchemeOpAlterLogin = 61;
+
+    /// CDC
+    // Create
+    ESchemeOpCreateCdcStream = 62;
+    ESchemeOpCreateCdcStreamImpl = 63;
+    ESchemeOpCreateCdcStreamAtTable = 64;
+    // Alter
+    ESchemeOpAlterCdcStream = 65;
+    ESchemeOpAlterCdcStreamImpl = 66;
+    ESchemeOpAlterCdcStreamAtTable = 67;
+    // Drop
+    ESchemeOpDropCdcStream = 68;
+    ESchemeOpDropCdcStreamImpl = 69;
+    ESchemeOpDropCdcStreamAtTable = 70;
+
+    ESchemeOpMoveTable = 71;
+    ESchemeOpMoveTableIndex = 72;
+
+    // Sequences
+    ESchemeOpCreateSequence = 73;
+    ESchemeOpAlterSequence = 74;
+    ESchemeOpDropSequence = 75;
+
+    // Replication
+    ESchemeOpCreateReplication = 76;
+    ESchemeOpAlterReplication = 77;
+    ESchemeOpDropReplicationCascade = 78;
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // BlobDepot
+    ESchemeOpCreateBlobDepot = 79;
+    ESchemeOpAlterBlobDepot = 80;
+    ESchemeOpDropBlobDepot = 81;
+
+    // Move index
+    ESchemeOpMoveIndex = 82;
+
+    reserved 83, 84; // ESchemeOpAllocatePersQueueGroup and ESchemeOpDeallocatePersQueueGroup
+
+    // AlterExtSubDomain suboperations
+    ESchemeOpAlterExtSubDomainCreateHive = 85;
+
+    // External Table
+    ESchemeOpCreateExternalTable = 86;
+    ESchemeOpDropExternalTable = 87;
+    ESchemeOpAlterExternalTable = 88;
+
+    // External Data Source
+    ESchemeOpCreateExternalDataSource = 89;
+    ESchemeOpDropExternalDataSource = 90;
+    ESchemeOpAlterExternalDataSource = 91;
+
+    ESchemeOpCreateColumnBuild = 92;
+
+    // View
+    ESchemeOpCreateView = 93;
+    ESchemeOpAlterView = 94;
+    ESchemeOpDropView = 95;
+
+    ESchemeOpDropReplication = 96;
+
+    /// ContinuousBackup
+    // Create
+    ESchemeOpCreateContinuousBackup = 97;
+    // Alter
+    ESchemeOpAlterContinuousBackup = 98;
+    // Drop
+    ESchemeOpDropContinuousBackup = 99;
+
+    // Resource Pool
+    ESchemeOpCreateResourcePool = 100;
+    ESchemeOpDropResourcePool = 101;
+    ESchemeOpAlterResourcePool = 102;
+
+    ESchemeOpRestoreIncrementalBackup = 103;
+    ESchemeOpRestoreIncrementalBackupAtTable = 104;
+
+    // BackupCollection
+    ESchemeOpCreateBackupCollection = 105;
+    ESchemeOpAlterBackupCollection = 106;
+    ESchemeOpDropBackupCollection = 107;
+    ESchemeOpBackupBackupCollection = 109;
+
+    // Move sequence
+    ESchemeOpMoveSequence = 108;
+}
diff --git a/ydb/core/protos/schemeshard/ya.make b/ydb/core/protos/schemeshard/ya.make
new file mode 100644
index 0000000000..c3b0027f2d
--- /dev/null
+++ b/ydb/core/protos/schemeshard/ya.make
@@ -0,0 +1,17 @@
+PROTO_LIBRARY()
+
+SET(PROTOC_TRANSITIVE_HEADERS "no")
+
+GRPC()
+
+IF (OS_WINDOWS)
+    NO_OPTIMIZE_PY_PROTOS()
+ENDIF()
+
+SRCS(
+    operations.proto
+)
+
+EXCLUDE_TAGS(GO_PROTO)
+
+END()
diff --git a/ydb/core/protos/ya.make b/ydb/core/protos/ya.make
index 017bbffa9c..17daa84b88 100644
--- a/ydb/core/protos/ya.make
+++ b/ydb/core/protos/ya.make
@@ -157,26 +157,27 @@ GENERATE_ENUM_SERIALIZATION(datashard_load.pb.h)
 GENERATE_ENUM_SERIALIZATION(shared_cache.pb.h)
 
 PEERDIR(
-    ydb/library/actors/protos
     ydb/core/config/protos
     ydb/core/fq/libs/config/protos
+    ydb/core/protos/schemeshard
     ydb/core/scheme/protos
+    ydb/core/tx/columnshard/common/protos
+    ydb/core/tx/columnshard/engines/protos
+    ydb/core/tx/columnshard/engines/scheme/defaults/protos
+    ydb/library/actors/protos
+    ydb/library/formats/arrow/protos
     ydb/library/login/protos
     ydb/library/mkql_proto/protos
+    ydb/library/services
+    ydb/library/ydb_issue/proto
+    ydb/library/yql/dq/actors/protos
+    ydb/library/yql/dq/proto
     ydb/public/api/protos
     yql/essentials/core/file_storage/proto
     yql/essentials/core/issue/protos
-    ydb/library/yql/dq/actors/protos
-    ydb/library/yql/dq/proto
     yql/essentials/providers/common/proto
     yql/essentials/public/issue/protos
     yql/essentials/public/types
-    ydb/library/services
-    ydb/library/ydb_issue/proto
-    ydb/core/tx/columnshard/engines/scheme/defaults/protos
-    ydb/core/tx/columnshard/engines/protos
-    ydb/library/formats/arrow/protos
-    ydb/core/tx/columnshard/common/protos
 )
 
 CPP_PROTO_PLUGIN0(config_proto_plugin ydb/core/config/tools/protobuf_plugin)
diff --git a/ydb/core/testlib/cs_helper.cpp b/ydb/core/testlib/cs_helper.cpp
index f342b2c1c7..37a08dd30a 100644
--- a/ydb/core/testlib/cs_helper.cpp
+++ b/ydb/core/testlib/cs_helper.cpp
@@ -1,11 +1,13 @@
 #include "cs_helper.h"
-#include <ydb/core/tx/tx_proxy/proxy.h>
 #include <ydb/core/formats/arrow/arrow_helpers.h>
 #include <ydb/core/grpc_services/local_rpc/local_rpc.h>
-#include <yql/essentials/types/binary_json/write.h>
+#include <ydb/core/protos/schemeshard/operations.pb.h>
+#include <ydb/core/tx/tx_proxy/proxy.h>
 
 #include <ydb/library/actors/core/event.h>
 #include <ydb/public/api/protos/ydb_table.pb.h>
+
+#include <yql/essentials/types/binary_json/write.h>
 #include <library/cpp/testing/unittest/registar.h>
 
 #include <contrib/libs/apache/arrow/cpp/src/arrow/buffer.h>
diff --git a/ydb/core/testlib/tenant_runtime.cpp b/ydb/core/testlib/tenant_runtime.cpp
index bad948aaad..5780d43def 100644
--- a/ydb/core/testlib/tenant_runtime.cpp
+++ b/ydb/core/testlib/tenant_runtime.cpp
@@ -1,22 +1,26 @@
 #include "tenant_runtime.h"
 
-#include <ydb/core/node_whiteboard/node_whiteboard.h>
+#include <ydb/core/base/feature_flags_service.h>
 #include <ydb/core/blobstorage/base/blobstorage_events.h>
-#include <ydb/core/cms/console/console.h>
 #include <ydb/core/cms/console/configs_dispatcher.h>
-#include <ydb/core/base/feature_flags_service.h>
+#include <ydb/core/cms/console/console.h>
 #include <ydb/core/cms/console/feature_flags_configurator.h>
 #include <ydb/core/mind/bscontroller/bsc.h>
 #include <ydb/core/mind/labels_maintainer.h>
 #include <ydb/core/mind/tenant_pool.h>
 #include <ydb/core/mind/tenant_slot_broker.h>
+#include <ydb/core/node_whiteboard/node_whiteboard.h>
+#include <ydb/core/persqueue/pq.h>
+#include <ydb/core/protos/schemeshard/operations.pb.h>
+#include <ydb/core/statistics/aggregator/aggregator.h>
+#include <ydb/core/sys_view/processor/processor.h>
 #include <ydb/core/tablet/bootstrapper.h>
 #include <ydb/core/tablet/tablet_monitoring_proxy.h>
 #include <ydb/core/tablet_flat/tablet_flat_executed.h>
 #include <ydb/core/testlib/tablet_helpers.h>
 #include <ydb/core/tx/coordinator/coordinator.h>
-#include <ydb/core/tx/long_tx_service/public/events.h>
 #include <ydb/core/tx/long_tx_service/long_tx_service.h>
+#include <ydb/core/tx/long_tx_service/public/events.h>
 #include <ydb/core/tx/mediator/mediator.h>
 #include <ydb/core/tx/replication/controller/controller.h>
 #include <ydb/core/tx/schemeshard/schemeshard.h>
@@ -24,9 +28,6 @@
 #include <ydb/core/tx/sequenceshard/sequenceshard.h>
 #include <ydb/core/tx/tx_allocator/txallocator.h>
 #include <ydb/core/tx/tx_proxy/proxy.h>
-#include <ydb/core/sys_view/processor/processor.h>
-#include <ydb/core/persqueue/pq.h>
-#include <ydb/core/statistics/aggregator/aggregator.h>
 
 #include <ydb/library/actors/core/interconnect.h>
 #include <ydb/library/actors/interconnect/interconnect.h>
diff --git a/ydb/core/testlib/test_client.cpp b/ydb/core/testlib/test_client.cpp
index f8552fecb1..1f4f1e8ea0 100644
--- a/ydb/core/testlib/test_client.cpp
+++ b/ydb/core/testlib/test_client.cpp
@@ -69,6 +69,7 @@
 #include <ydb/core/kqp/finalize_script_service/kqp_finalize_script_service.h>
 #include <ydb/core/metering/metering.h>
 #include <ydb/core/protos/stream.pb.h>
+#include <ydb/core/protos/schemeshard/operations.pb.h>
 #include <ydb/library/services/services.pb.h>
 #include <ydb/core/tablet_flat/tablet_flat_executed.h>
 #include <ydb/core/tx/columnshard/columnshard.h>
diff --git a/ydb/core/tx/datashard/datashard_ut_ext_blobs_multiple_channels.cpp b/ydb/core/tx/datashard/datashard_ut_ext_blobs_multiple_channels.cpp
index f14bea6a73..4e37650262 100644
--- a/ydb/core/tx/datashard/datashard_ut_ext_blobs_multiple_channels.cpp
+++ b/ydb/core/tx/datashard/datashard_ut_ext_blobs_multiple_channels.cpp
@@ -5,6 +5,7 @@
 #include <ydb/core/formats/arrow/arrow_helpers.h>
 #include <ydb/core/formats/arrow/converter.h>
 #include <ydb/core/kqp/ut/common/kqp_ut_common.h>
+#include <ydb/core/protos/schemeshard/operations.pb.h>
 #include <ydb/core/tablet_flat/shared_cache_events.h>
 #include <ydb/core/tx/tx_proxy/proxy.h>
 #include <ydb/core/tx/tx_proxy/read_table.h>
diff --git a/ydb/core/tx/datashard/datashard_ut_locks.cpp b/ydb/core/tx/datashard/datashard_ut_locks.cpp
index 76f1cab67c..60f3ed8b03 100644
--- a/ydb/core/tx/datashard/datashard_ut_locks.cpp
+++ b/ydb/core/tx/datashard/datashard_ut_locks.cpp
@@ -2,6 +2,7 @@
 #include <ydb/core/tx/locks/locks.h>
 #include <ydb/core/tx/datashard/ut_common/datashard_ut_common.h>
 
+#include <ydb/core/protos/schemeshard/operations.pb.h>
 #include <ydb/core/tablet_flat/flat_dbase_apply.h>
 #include <ydb/core/tablet_flat/flat_exec_commit.h>
 #include <ydb/core/testlib/test_client.h>
diff --git a/ydb/core/tx/datashard/ut_common/datashard_ut_common.cpp b/ydb/core/tx/datashard/ut_common/datashard_ut_common.cpp
index 2235552515..f5de8af40e 100644
--- a/ydb/core/tx/datashard/ut_common/datashard_ut_common.cpp
+++ b/ydb/core/tx/datashard/ut_common/datashard_ut_common.cpp
@@ -16,6 +16,7 @@
 #include <ydb/core/tx/tx_proxy/upload_rows.h>
 #include <ydb/core/tx/schemeshard/schemeshard_build_index.h>
 #include <ydb/core/protos/follower_group.pb.h>
+#include <ydb/core/protos/schemeshard/operations.pb.h>
 #include <ydb/public/sdk/cpp/client/ydb_result/result.h>
 
 #include <yql/essentials/minikql/mkql_node_serialization.h>
diff --git a/ydb/core/tx/replication/controller/dst_alterer.cpp b/ydb/core/tx/replication/controller/dst_alterer.cpp
index c03314f1d5..91febca0ef 100644
--- a/ydb/core/tx/replication/controller/dst_alterer.cpp
+++ b/ydb/core/tx/replication/controller/dst_alterer.cpp
@@ -3,6 +3,7 @@
 #include "private_events.h"
 
 #include <ydb/core/base/tablet_pipecache.h>
+#include <ydb/core/protos/schemeshard/operations.pb.h>
 #include <ydb/core/tx/schemeshard/schemeshard.h>
 #include <ydb/core/tx/tx_proxy/proxy.h>
 #include <ydb/library/actors/core/actor_bootstrapped.h>
diff --git a/ydb/core/tx/replication/controller/dst_creator.cpp b/ydb/core/tx/replication/controller/dst_creator.cpp
index c4a8bbda5a..4f241702e0 100644
--- a/ydb/core/tx/replication/controller/dst_creator.cpp
+++ b/ydb/core/tx/replication/controller/dst_creator.cpp
@@ -7,6 +7,7 @@
 #include <ydb/core/base/tablet_pipecache.h>
 #include <ydb/core/cms/console/configs_dispatcher.h>
 #include <ydb/core/protos/console_config.pb.h>
+#include <ydb/core/protos/schemeshard/operations.pb.h>
 #include <ydb/core/tx/replication/ydb_proxy/ydb_proxy.h>
 #include <ydb/core/tx/scheme_board/events.h>
 #include <ydb/core/tx/scheme_board/subscriber.h>
diff --git a/ydb/core/tx/replication/controller/dst_remover.cpp b/ydb/core/tx/replication/controller/dst_remover.cpp
index 538eddd812..62f7ca8f35 100644
--- a/ydb/core/tx/replication/controller/dst_remover.cpp
+++ b/ydb/core/tx/replication/controller/dst_remover.cpp
@@ -3,6 +3,7 @@
 #include "private_events.h"
 
 #include <ydb/core/base/tablet_pipecache.h>
+#include <ydb/core/protos/schemeshard/operations.pb.h>
 #include <ydb/core/tx/schemeshard/schemeshard.h>
 #include <ydb/core/tx/tx_proxy/proxy.h>
 #include <ydb/library/actors/core/actor_bootstrapped.h>
diff --git a/ydb/core/tx/schemeshard/generated/codegen/main.cpp b/ydb/core/tx/schemeshard/generated/codegen/main.cpp
index 68124cf691..55ff5a9682 100644
--- a/ydb/core/tx/schemeshard/generated/codegen/main.cpp
+++ b/ydb/core/tx/schemeshard/generated/codegen/main.cpp
@@ -1,4 +1,4 @@
-#include <ydb/core/protos/flat_scheme_op.pb.h>
+#include <ydb/core/protos/schemeshard/operations.pb.h>
 
 #include <google/protobuf/descriptor.pb.h>
 #include <jinja2cpp/reflected_value.h>
diff --git a/ydb/core/tx/schemeshard/olap/operations/alter/abstract/converter.h b/ydb/core/tx/schemeshard/olap/operations/alter/abstract/converter.h
index e1974eb03c..3c6aed6d14 100644
--- a/ydb/core/tx/schemeshard/olap/operations/alter/abstract/converter.h
+++ b/ydb/core/tx/schemeshard/olap/operations/alter/abstract/converter.h
@@ -1,5 +1,6 @@
 #pragma once
 #include <ydb/core/protos/flat_scheme_op.pb.h>
+#include <ydb/core/protos/schemeshard/operations.pb.h>
 #include <ydb/core/scheme/protos/type_info.pb.h>
 #include <ydb/core/tx/schemeshard/olap/common/common.h>
 
@@ -129,4 +130,4 @@ public:
     }
 };
 
-}
\ No newline at end of file
+}
diff --git a/ydb/core/tx/schemeshard/schemeshard_audit_log_fragment.cpp b/ydb/core/tx/schemeshard/schemeshard_audit_log_fragment.cpp
index eb091e78d9..91ccb3430c 100644
--- a/ydb/core/tx/schemeshard/schemeshard_audit_log_fragment.cpp
+++ b/ydb/core/tx/schemeshard/schemeshard_audit_log_fragment.cpp
@@ -2,8 +2,9 @@
 
 #include <ydb/core/base/path.h>
 #include <ydb/core/protos/flat_scheme_op.pb.h>
-#include <ydb/core/protos/subdomains.pb.h>
 #include <ydb/core/protos/index_builder.pb.h>
+#include <ydb/core/protos/schemeshard/operations.pb.h>
+#include <ydb/core/protos/subdomains.pb.h>
 #include <ydb/library/aclib/aclib.h>
 
 #include <util/string/builder.h>
diff --git a/ydb/core/tx/schemeshard/schemeshard_tx_infly.h b/ydb/core/tx/schemeshard/schemeshard_tx_infly.h
index 1164abf00c..32908473a9 100644
--- a/ydb/core/tx/schemeshard/schemeshard_tx_infly.h
+++ b/ydb/core/tx/schemeshard/schemeshard_tx_infly.h
@@ -3,11 +3,12 @@
 #include "schemeshard_types.h"
 
 #include <ydb/core/protos/counters_schemeshard.pb.h>
+#include <ydb/core/protos/schemeshard/operations.pb.h>
 #include <ydb/core/protos/tx_datashard.pb.h>
-
 #include <ydb/core/tx/datashard/datashard.h>
 
 #include <ydb/library/actors/core/actorid.h>
+
 #include <util/generic/hash.h>
 #include <util/generic/hash_set.h>
 
diff --git a/ydb/core/tx/schemeshard/ut_export/ut_export.cpp b/ydb/core/tx/schemeshard/ut_export/ut_export.cpp
index cb8e586fb0..47cfca6c2e 100644
--- a/ydb/core/tx/schemeshard/ut_export/ut_export.cpp
+++ b/ydb/core/tx/schemeshard/ut_export/ut_export.cpp
@@ -1,3 +1,4 @@
+#include <ydb/core/protos/schemeshard/operations.pb.h>
 #include <ydb/core/tablet_flat/shared_cache_events.h>
 #include <ydb/core/tx/schemeshard/ut_helpers/helpers.h>
 #include <ydb/core/tx/schemeshard/ut_helpers/auditlog_helpers.h>
diff --git a/ydb/core/tx/schemeshard/ut_helpers/helpers.cpp b/ydb/core/tx/schemeshard/ut_helpers/helpers.cpp
index 1000d3f109..0c7a78ab81 100644
--- a/ydb/core/tx/schemeshard/ut_helpers/helpers.cpp
+++ b/ydb/core/tx/schemeshard/ut_helpers/helpers.cpp
@@ -16,6 +16,7 @@
 
 #include <ydb/core/util/pb.h>
 #include <ydb/public/api/protos/ydb_export.pb.h>
+#include <ydb/core/protos/schemeshard/operations.pb.h>
 #include <ydb/public/sdk/cpp/client/ydb_table/table.h>
 
 #include <library/cpp/testing/unittest/registar.h>
diff --git a/ydb/core/tx/schemeshard/ut_helpers/test_env.cpp b/ydb/core/tx/schemeshard/ut_helpers/test_env.cpp
index c50856e832..16077cc065 100644
--- a/ydb/core/tx/schemeshard/ut_helpers/test_env.cpp
+++ b/ydb/core/tx/schemeshard/ut_helpers/test_env.cpp
@@ -5,6 +5,7 @@
 #include <ydb/core/base/tablet_resolver.h>
 #include <ydb/core/cms/console/configs_dispatcher.h>
 #include <ydb/core/metering/metering.h>
+#include <ydb/core/protos/schemeshard/operations.pb.h>
 #include <ydb/core/tablet_flat/tablet_flat_executed.h>
 #include <ydb/core/tx/datashard/datashard.h>
 #include <ydb/core/tx/schemeshard/schemeshard_private.h>
diff --git a/ydb/core/tx/schemeshard/ut_index_build/ut_index_build.cpp b/ydb/core/tx/schemeshard/ut_index_build/ut_index_build.cpp
index 39d2f3c98e..2889516666 100644
--- a/ydb/core/tx/schemeshard/ut_index_build/ut_index_build.cpp
+++ b/ydb/core/tx/schemeshard/ut_index_build/ut_index_build.cpp
@@ -1,4 +1,5 @@
 #include <ydb/core/base/table_index.h>
+#include <ydb/core/protos/schemeshard/operations.pb.h>
 #include <ydb/core/tx/scheme_board/events.h>
 #include <ydb/core/tx/schemeshard/ut_helpers/helpers.h>
 #include <ydb/core/tx/schemeshard/schemeshard_billing_helpers.h>
diff --git a/ydb/core/tx/schemeshard/ut_index_build/ut_vector_index_build.cpp b/ydb/core/tx/schemeshard/ut_index_build/ut_vector_index_build.cpp
index b7c8b91585..47ce8e0b22 100644
--- a/ydb/core/tx/schemeshard/ut_index_build/ut_vector_index_build.cpp
+++ b/ydb/core/tx/schemeshard/ut_index_build/ut_vector_index_build.cpp
@@ -1,4 +1,5 @@
 #include <ydb/core/base/table_index.h>
+#include <ydb/core/protos/schemeshard/operations.pb.h>
 #include <ydb/core/tx/schemeshard/ut_helpers/helpers.h>
 #include <ydb/core/tx/schemeshard/schemeshard_billing_helpers.h>
 #include <ydb/core/testlib/actors/block_events.h>
diff --git a/ydb/core/tx/schemeshard/ut_restore/ut_restore.cpp b/ydb/core/tx/schemeshard/ut_restore/ut_restore.cpp
index 84cb50be9b..ba46f1ab20 100644
--- a/ydb/core/tx/schemeshard/ut_restore/ut_restore.cpp
+++ b/ydb/core/tx/schemeshard/ut_restore/ut_restore.cpp
@@ -4,6 +4,7 @@
 
 #include <ydb/core/base/localdb.h>
 #include <ydb/core/kqp/ut/common/kqp_ut_common.h>
+#include <ydb/core/protos/schemeshard/operations.pb.h>
 #include <ydb/core/tablet/resource_broker.h>
 #include <ydb/core/tx/schemeshard/ut_helpers/helpers.h>
 #include <ydb/core/tx/schemeshard/ut_helpers/auditlog_helpers.h>
diff --git a/ydb/core/tx/sequenceproxy/sequenceproxy_ut.cpp b/ydb/core/tx/sequenceproxy/sequenceproxy_ut.cpp
index d127b14408..50931d8935 100644
--- a/ydb/core/tx/sequenceproxy/sequenceproxy_ut.cpp
+++ b/ydb/core/tx/sequenceproxy/sequenceproxy_ut.cpp
@@ -1,5 +1,6 @@
 #include "sequenceproxy.h"
 
+#include <ydb/core/protos/schemeshard/operations.pb.h>
 #include <ydb/core/tx/scheme_board/cache.h>
 #include <ydb/core/tx/schemeshard/schemeshard.h>
 #include <ydb/core/tx/sequenceshard/public/events.h>
diff --git a/ydb/core/tx/tx_proxy/schemereq.cpp b/ydb/core/tx/tx_proxy/schemereq.cpp
index 12fe027d2d..e8fdd3f992 100644
--- a/ydb/core/tx/tx_proxy/schemereq.cpp
+++ b/ydb/core/tx/tx_proxy/schemereq.cpp
@@ -6,7 +6,9 @@
 #include <ydb/core/base/tx_processing.h>
 #include <ydb/core/docapi/traits.h>
 #include <ydb/core/protos/flat_scheme_op.pb.h>
+#include <ydb/core/protos/schemeshard/operations.pb.h>
 #include <ydb/core/tx/schemeshard/schemeshard.h>
+
 #include <ydb/library/aclib/aclib.h>
 #include <ydb/library/actors/core/hfunc.h>
 #include <ydb/library/protobuf_printer/security_printer.h>
diff --git a/ydb/core/ydb_convert/table_description.cpp b/ydb/core/ydb_convert/table_description.cpp
index 4738846fbd..8e5f2625fa 100644
--- a/ydb/core/ydb_convert/table_description.cpp
+++ b/ydb/core/ydb_convert/table_description.cpp
@@ -3,18 +3,19 @@
 #include "table_settings.h"
 #include "ydb_convert.h"
 
-#include <ydb/core/base/path.h>
 #include <ydb/core/base/appdata.h>
+#include <ydb/core/base/path.h>
 #include <ydb/core/engine/mkql_proto.h>
 #include <ydb/core/formats/arrow/switch/switch_type.h>
+#include <ydb/core/protos/follower_group.pb.h>
+#include <ydb/core/protos/kqp_physical.pb.h>
+#include <ydb/core/protos/schemeshard/operations.pb.h>
+#include <ydb/core/protos/table_stats.pb.h>
+#include <ydb/core/scheme/protos/type_info.pb.h>
+#include <ydb/core/scheme/scheme_pathid.h>
 #include <ydb/core/scheme/scheme_types_proto.h>
 #include <ydb/library/ydb_issue/proto/issue_id.pb.h>
 #include <yql/essentials/public/issue/yql_issue.h>
-#include <ydb/core/scheme/scheme_pathid.h>
-#include <ydb/core/scheme/protos/type_info.pb.h>
-#include <ydb/core/protos/kqp_physical.pb.h>
-#include <ydb/core/protos/table_stats.pb.h>
-#include <ydb/core/protos/follower_group.pb.h>
 
 #include <util/generic/hash.h>
 
diff --git a/ydb/core/ymq/actor/executor.cpp b/ydb/core/ymq/actor/executor.cpp
index aded6aa60e..acf52ee789 100644
--- a/ydb/core/ymq/actor/executor.cpp
+++ b/ydb/core/ymq/actor/executor.cpp
@@ -4,6 +4,7 @@
 
 #include <ydb/core/protos/tx_proxy.pb.h>
 #include <ydb/core/protos/flat_tx_scheme.pb.h>
+#include <ydb/core/protos/schemeshard/operations.pb.h>
 
 #include <ydb/core/engine/mkql_proto.h>
 #include <ydb/public/lib/value/value.h>
diff --git a/ydb/core/ymq/actor/garbage_collector.cpp b/ydb/core/ymq/actor/garbage_collector.cpp
index d6f296c4ea..6d80125bb5 100644
--- a/ydb/core/ymq/actor/garbage_collector.cpp
+++ b/ydb/core/ymq/actor/garbage_collector.cpp
@@ -8,6 +8,7 @@
 
 #include <ydb/core/base/path.h>
 #include <ydb/core/mon/mon.h>
+#include <ydb/core/protos/schemeshard/operations.pb.h>
 
 #include <ydb/library/services/services.pb.h>
 
diff --git a/ydb/core/ymq/actor/modify_permissions.cpp b/ydb/core/ymq/actor/modify_permissions.cpp
index a6146e588a..ef0e49ca05 100644
--- a/ydb/core/ymq/actor/modify_permissions.cpp
+++ b/ydb/core/ymq/actor/modify_permissions.cpp
@@ -1,5 +1,7 @@
 #include "action.h"
 
+#include <ydb/core/protos/schemeshard/operations.pb.h>
+
 #include <google/protobuf/text_format.h>
 
 #include <util/string/ascii.h>
diff --git a/ydb/core/ymq/actor/queue_schema.cpp b/ydb/core/ymq/actor/queue_schema.cpp
index f821f090e4..aed3b09b83 100644
--- a/ydb/core/ymq/actor/queue_schema.cpp
+++ b/ydb/core/ymq/actor/queue_schema.cpp
@@ -5,6 +5,7 @@
 #include "queue_schema.h"
 #include "serviceid.h"
 
+#include <ydb/core/protos/schemeshard/operations.pb.h>
 #include <ydb/core/ymq/base/limits.h>
 #include <ydb/core/ymq/queues/common/db_queries_maker.h>
 #include <ydb/core/ymq/queues/common/key_hashes.h>
diff --git a/ydb/core/ymq/actor/schema.cpp b/ydb/core/ymq/actor/schema.cpp
index fc0f0a373d..71b340802a 100644
--- a/ydb/core/ymq/actor/schema.cpp
+++ b/ydb/core/ymq/actor/schema.cpp
@@ -3,13 +3,15 @@
 #include "log.h"
 #include "params.h"
 #include "schema.h"
+
+#include <ydb/core/base/tablet_pipe.h>
+#include <ydb/core/client/minikql_compile/mkql_compile_service.h>
+#include <ydb/core/protos/schemeshard/operations.pb.h>
 #include <ydb/core/ymq/base/constants.h>
 #include <ydb/core/ymq/base/limits.h>
 #include <ydb/core/ymq/queues/fifo/schema.h>
 #include <ydb/core/ymq/queues/std/schema.h>
 
-#include <ydb/core/base/tablet_pipe.h>
-#include <ydb/core/client/minikql_compile/mkql_compile_service.h>
 #include <ydb/public/lib/value/value.h>
 
 #include <util/generic/guid.h>
diff --git a/ydb/public/lib/deprecated/kicli/kikimr.cpp b/ydb/public/lib/deprecated/kicli/kikimr.cpp
index b5f6ab5771..f57df130e5 100644
--- a/ydb/public/lib/deprecated/kicli/kikimr.cpp
+++ b/ydb/public/lib/deprecated/kicli/kikimr.cpp
@@ -2,6 +2,7 @@
 
 #include <ydb/public/lib/deprecated/client/msgbus_client.h>
 #include <ydb/core/protos/console_config.pb.h>
+#include <ydb/core/protos/schemeshard/operations.pb.h>
 #include <util/string/builder.h>
 
 namespace NKikimr {
diff --git a/ydb/public/lib/deprecated/kicli/schema.cpp b/ydb/public/lib/deprecated/kicli/schema.cpp
index 0923796761..f76171933b 100644
--- a/ydb/public/lib/deprecated/kicli/schema.cpp
+++ b/ydb/public/lib/deprecated/kicli/schema.cpp
@@ -1,4 +1,7 @@
 #include "kicli.h"
+
+#include <ydb/core/protos/schemeshard/operations.pb.h>
+
 #include <ydb/public/lib/deprecated/client/msgbus_client.h>
 
 namespace NKikimr {
diff --git a/ydb/services/lib/actors/pq_schema_actor.h b/ydb/services/lib/actors/pq_schema_actor.h
index 01f7106a11..1a4ad69d65 100644
--- a/ydb/services/lib/actors/pq_schema_actor.h
+++ b/ydb/services/lib/actors/pq_schema_actor.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <ydb/core/grpc_services/rpc_scheme_base.h>
+#include <ydb/core/protos/schemeshard/operations.pb.h>
 
 #include <ydb/public/api/grpc/draft/ydb_persqueue_v1.grpc.pb.h>
 #include <ydb/public/api/protos/persqueue_error_codes_v1.pb.h>
diff --git a/ydb/services/ydb/ydb_index_table_ut.cpp b/ydb/services/ydb/ydb_index_table_ut.cpp
index 05dd0cf831..cf353f0e46 100644
--- a/ydb/services/ydb/ydb_index_table_ut.cpp
+++ b/ydb/services/ydb/ydb_index_table_ut.cpp
@@ -2,6 +2,7 @@
 #include <ydb/public/sdk/cpp/client/ydb_table/table.h>
 #include <ydb/public/sdk/cpp/client/ydb_types/status_codes.h>
 
+#include <ydb/core/protos/schemeshard/operations.pb.h>
 #include <ydb/core/tx/datashard/datashard.h>
 #include <ydb/core/client/flat_ut_client.h>
 
diff --git a/ydb/services/ydb/ydb_ut.cpp b/ydb/services/ydb/ydb_ut.cpp
index 88dd4cb505..b0123b1aff 100644
--- a/ydb/services/ydb/ydb_ut.cpp
+++ b/ydb/services/ydb/ydb_ut.cpp
@@ -7,6 +7,7 @@
 #include <ydb/core/base/storage_pools.h>
 #include <ydb/core/kqp/ut/common/kqp_ut_common.h>
 #include <ydb/core/protos/flat_scheme_op.pb.h>
+#include <ydb/core/protos/schemeshard/operations.pb.h>
 #include <ydb/core/scheme/scheme_tablecell.h>
 #include <ydb/core/testlib/test_client.h>
 #include <ydb/core/tx/datashard/ut_common/datashard_ut_common.h>
diff --git a/ydb/tests/library/clients/kikimr_client.py b/ydb/tests/library/clients/kikimr_client.py
index fc65236f68..013ed5385d 100644
--- a/ydb/tests/library/clients/kikimr_client.py
+++ b/ydb/tests/library/clients/kikimr_client.py
@@ -13,9 +13,8 @@ import functools
 from google.protobuf.text_format import Parse
 from ydb.core.protos import blobstorage_config_pb2
 import ydb.core.protos.msgbus_pb2 as msgbus
-import ydb.core.protos.flat_scheme_op_pb2 as flat_scheme_op_pb2
 import ydb.core.protos.grpc_pb2_grpc as grpc_server
-from ydb.core.protos import flat_scheme_op_pb2 as flat_scheme_op
+from ydb.core.protos.schemeshard import operations_pb2 as schemeshard_pb2
 from ydb.public.api.protos.ydb_status_codes_pb2 import StatusIds
 from ydb.public.api.grpc.draft import ydb_tablet_v1_pb2_grpc as grpc_tablet_service
 from ydb.public.api.protos.draft.ydb_tablet_pb2 import RestartTabletRequest
@@ -179,7 +178,7 @@ class KiKiMRMessageBusClient(object):
         scheme_transaction = request.Transaction
         scheme_operation = scheme_transaction.ModifyScheme
         scheme_operation.WorkingDir = '/'
-        scheme_operation.OperationType = flat_scheme_op.ESchemeOpAlterSubDomain
+        scheme_operation.OperationType = schemeshard_pb2.ESchemeOpAlterSubDomain
         domain_description = scheme_operation.SubDomain
         domain_description.Name = domain_name
         for name, kind in spools.items():
@@ -207,7 +206,7 @@ class KiKiMRMessageBusClient(object):
 
     def add_attr(self, working_dir, name, attributes, token=None):
         request = msgbus.TSchemeOperation()
-        request.Transaction.ModifyScheme.OperationType = flat_scheme_op_pb2.ESchemeOpAlterUserAttributes
+        request.Transaction.ModifyScheme.OperationType = schemeshard_pb2.ESchemeOpAlterUserAttributes
         request.Transaction.ModifyScheme.WorkingDir = working_dir
         request.Transaction.ModifyScheme.AlterUserAttributes.PathName = name
 
diff --git a/ydb/tests/library/common/protobuf_ss.py b/ydb/tests/library/common/protobuf_ss.py
index af7e787963..18ed3d889a 100644
--- a/ydb/tests/library/common/protobuf_ss.py
+++ b/ydb/tests/library/common/protobuf_ss.py
@@ -8,6 +8,7 @@ from os.path import basename, dirname, join
 from ydb.core.protos import msgbus_pb2
 from ydb.core.protos import compaction_pb2
 from ydb.core.protos import flat_scheme_op_pb2
+from ydb.core.protos.schemeshard import operations_pb2 as schemeshard_pb2
 from ydb.tests.library.common.protobuf import AbstractProtobufBuilder, build_protobuf_if_necessary
 
 
@@ -94,7 +95,7 @@ class CreatePath(AbstractProtobufBuilder):
             name = basename(work_dir)
             work_dir = dirname(work_dir)
         self.protobuf.Transaction.ModifyScheme.WorkingDir = work_dir
-        self.protobuf.Transaction.ModifyScheme.OperationType = flat_scheme_op_pb2.ESchemeOpMkDir
+        self.protobuf.Transaction.ModifyScheme.OperationType = schemeshard_pb2.ESchemeOpMkDir
         self.protobuf.Transaction.ModifyScheme.MkDir.Name = name
 
 
@@ -149,7 +150,7 @@ class RegisterTenant(AbstractProtobufBuilder):
             name = basename(work_dir)
             work_dir = dirname(work_dir)
 
-        self.__modify_scheme.OperationType = flat_scheme_op_pb2.ESchemeOpCreateSubDomain
+        self.__modify_scheme.OperationType = schemeshard_pb2.ESchemeOpCreateSubDomain
         self.__modify_scheme.WorkingDir = work_dir
 
         self.__tenant_settings.Name = name
@@ -233,7 +234,7 @@ class DropTenantRequest(AbstractTSchemeOperationRequest):
 
     def __init__(self, path, name=None, drop_policy=flat_scheme_op_pb2.EDropFailOnChanges, options=None):
         super(DropTenantRequest, self).__init__()
-        self.protobuf.Transaction.ModifyScheme.OperationType = flat_scheme_op_pb2.ESchemeOpDropSubDomain
+        self.protobuf.Transaction.ModifyScheme.OperationType = schemeshard_pb2.ESchemeOpDropSubDomain
 
         if name is None:
             name = basename(path)
@@ -258,7 +259,7 @@ class DropTenantRequest(AbstractTSchemeOperationRequest):
 class ForceDropTenantRequest(DropTenantRequest):
     def __init__(self, path, name=None, drop_policy=flat_scheme_op_pb2.EDropFailOnChanges, options=None):
         super(ForceDropTenantRequest, self).__init__(path, name, drop_policy, options)
-        self.protobuf.Transaction.ModifyScheme.OperationType = flat_scheme_op_pb2.ESchemeOpForceDropSubDomain
+        self.protobuf.Transaction.ModifyScheme.OperationType = schemeshard_pb2.ESchemeOpForceDropSubDomain
 
 
 class DropPathRequest(AbstractTSchemeOperationRequest):
@@ -267,7 +268,7 @@ class DropPathRequest(AbstractTSchemeOperationRequest):
 
     def __init__(self, path, name=None, drop_policy=flat_scheme_op_pb2.EDropFailOnChanges, options=None):
         super(DropPathRequest, self).__init__()
-        self.protobuf.Transaction.ModifyScheme.OperationType = flat_scheme_op_pb2.ESchemeOpRmDir
+        self.protobuf.Transaction.ModifyScheme.OperationType = schemeshard_pb2.ESchemeOpRmDir
 
         if name is None:
             name = basename(path)
@@ -300,7 +301,7 @@ class DropTopicRequest(AbstractTSchemeOperationRequest):
             topic_name = basename(path)
             path = dirname(path)
 
-        self.__modify_scheme_transaction.OperationType = flat_scheme_op_pb2.ESchemeOpDropPersQueueGroup
+        self.__modify_scheme_transaction.OperationType = schemeshard_pb2.ESchemeOpDropPersQueueGroup
         self.__modify_scheme_transaction.WorkingDir = path
         self.__drop.Name = topic_name
         self.with_options(options or self.Options())
@@ -402,7 +403,7 @@ class CreateTopicRequest(AbstractTSchemeOperationRequest):
 
     @property
     def _operation(self):
-        return flat_scheme_op_pb2.ESchemeOpCreatePersQueueGroup
+        return schemeshard_pb2.ESchemeOpCreatePersQueueGroup
 
     @property
     def _modify_scheme_transaction(self):
@@ -444,7 +445,7 @@ class AlterTopicRequest(CreateTopicRequest):
 
     @property
     def _operation(self):
-        return flat_scheme_op_pb2.ESchemeOpAlterPersQueueGroup
+        return schemeshard_pb2.ESchemeOpAlterPersQueueGroup
 
     @property
     def _pers_queue(self):
@@ -458,7 +459,7 @@ class DropPath(AbstractProtobufBuilder):
             name = basename(work_dir)
             work_dir = dirname(work_dir)
         self.protobuf.Transaction.ModifyScheme.WorkingDir = work_dir
-        self.protobuf.Transaction.ModifyScheme.OperationType = flat_scheme_op_pb2.ESchemeOpRmDir
+        self.protobuf.Transaction.ModifyScheme.OperationType = schemeshard_pb2.ESchemeOpRmDir
         self.protobuf.Transaction.ModifyScheme.Drop.Name = name
         self.protobuf.Transaction.ModifyScheme.Drop.WaitPolicy = drop_policy
 
@@ -591,7 +592,7 @@ class CreateTableRequest(AbstractTSchemeOperationRequest):
             table_name = basename(path)
             path = dirname(path)
 
-        self.protobuf.Transaction.ModifyScheme.OperationType = flat_scheme_op_pb2.ESchemeOpCreateTable
+        self.protobuf.Transaction.ModifyScheme.OperationType = schemeshard_pb2.ESchemeOpCreateTable
 
         self.protobuf.Transaction.ModifyScheme.WorkingDir = path
         self.__create_table_protobuf.Name = table_name
@@ -656,7 +657,7 @@ class AlterTableRequest(AbstractTSchemeOperationRequest):
         super(AlterTableRequest, self).__init__()
         self.__column_ids = itertools.count(start=1)
 
-        self.protobuf.Transaction.ModifyScheme.OperationType = flat_scheme_op_pb2.ESchemeOpAlterTable
+        self.protobuf.Transaction.ModifyScheme.OperationType = schemeshard_pb2.ESchemeOpAlterTable
 
         self.protobuf.Transaction.ModifyScheme.WorkingDir = path
         self.__alter_table_protobuf.Name = table_name
@@ -698,7 +699,7 @@ class DropTableRequest(AbstractTSchemeOperationRequest):
 
     def __init__(self, path, table_name=None, drop_policy=flat_scheme_op_pb2.EDropFailOnChanges, options=None):
         super(DropTableRequest, self).__init__()
-        self.protobuf.Transaction.ModifyScheme.OperationType = flat_scheme_op_pb2.ESchemeOpDropTable
+        self.protobuf.Transaction.ModifyScheme.OperationType = schemeshard_pb2.ESchemeOpDropTable
 
         if table_name is None:
             table_name = basename(path)
@@ -735,7 +736,7 @@ TSchemeOperationStatus = SchemeOperationStatus
 class CopyTableRequest(AbstractTSchemeOperationRequest):
     def __init__(self, source_table_full_name, destination_path, destination_name):
         super(CopyTableRequest, self).__init__()
-        self.protobuf.Transaction.ModifyScheme.OperationType = flat_scheme_op_pb2.ESchemeOpCreateTable
+        self.protobuf.Transaction.ModifyScheme.OperationType = schemeshard_pb2.ESchemeOpCreateTable
         self.__create_table_protobuf.CopyFromTable = source_table_full_name
         self.protobuf.Transaction.ModifyScheme.WorkingDir = destination_path
         self.__create_table_protobuf.Name = destination_name
diff --git a/ydb/tools/cfg/dynamic.py b/ydb/tools/cfg/dynamic.py
index 837b0d2e4a..2dbee2c422 100644
--- a/ydb/tools/cfg/dynamic.py
+++ b/ydb/tools/cfg/dynamic.py
@@ -5,7 +5,7 @@ import os
 
 from ydb.core.protos import blobstorage_config_pb2 as bs_config
 from ydb.core.protos import blobstorage_pdisk_config_pb2 as pdisk_config
-from ydb.core.protos import flat_scheme_op_pb2 as flat_scheme_op
+from ydb.core.protos.schemeshard import operations_pb2 as schemeshard_pb2
 from ydb.core.protos import msgbus_pb2 as msgbus
 from ydb.core.protos import tx_proxy_pb2 as tx_proxy
 from ydb.tools.cfg import base, static, utils
@@ -251,7 +251,7 @@ class DynamicConfigGenerator(object):
         scheme_transaction = tx_proxy.TTransaction()
         scheme_operation = scheme_transaction.ModifyScheme
         scheme_operation.WorkingDir = '/'
-        scheme_operation.OperationType = flat_scheme_op.ESchemeOpAlterSubDomain
+        scheme_operation.OperationType = schemeshard_pb2.ESchemeOpAlterSubDomain
 
         domain_description = scheme_operation.SubDomain
         domain_description.Name = domain.domain_name