Move IDqIntegration to common dq library

87 files changed, 256 insertions, 85 deletions

diff --git a/ydb/core/yq/libs/actors/CMakeLists.darwin.txt b/ydb/core/yq/libs/actors/CMakeLists.darwin.txt
index 1400276e96..9ff690e759 100644
--- a/ydb/core/yq/libs/actors/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/actors/CMakeLists.darwin.txt
@@ -57,6 +57,7 @@ target_link_libraries(yq-libs-actors PUBLIC
   api-protos
   public-lib-fq
   cpp-client-ydb_table
+  dq-integration-transform
   providers-clickhouse-provider
   providers-common-codec
   providers-common-comp_nodes
@@ -68,7 +69,6 @@ target_link_libraries(yq-libs-actors PUBLIC
   providers-dq-actors
   providers-dq-common
   providers-dq-counters
-  providers-dq-interface
   providers-dq-provider
   dq-provider-exec
   dq-worker_manager-interface
diff --git a/ydb/core/yq/libs/actors/CMakeLists.linux-aarch64.txt b/ydb/core/yq/libs/actors/CMakeLists.linux-aarch64.txt
index 0b587a07f8..a363ba10cb 100644
--- a/ydb/core/yq/libs/actors/CMakeLists.linux-aarch64.txt
+++ b/ydb/core/yq/libs/actors/CMakeLists.linux-aarch64.txt
@@ -58,6 +58,7 @@ target_link_libraries(yq-libs-actors PUBLIC
   api-protos
   public-lib-fq
   cpp-client-ydb_table
+  dq-integration-transform
   providers-clickhouse-provider
   providers-common-codec
   providers-common-comp_nodes
@@ -69,7 +70,6 @@ target_link_libraries(yq-libs-actors PUBLIC
   providers-dq-actors
   providers-dq-common
   providers-dq-counters
-  providers-dq-interface
   providers-dq-provider
   dq-provider-exec
   dq-worker_manager-interface
diff --git a/ydb/core/yq/libs/actors/CMakeLists.linux.txt b/ydb/core/yq/libs/actors/CMakeLists.linux.txt
index 0b587a07f8..a363ba10cb 100644
--- a/ydb/core/yq/libs/actors/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/actors/CMakeLists.linux.txt
@@ -58,6 +58,7 @@ target_link_libraries(yq-libs-actors PUBLIC
   api-protos
   public-lib-fq
   cpp-client-ydb_table
+  dq-integration-transform
   providers-clickhouse-provider
   providers-common-codec
   providers-common-comp_nodes
@@ -69,7 +70,6 @@ target_link_libraries(yq-libs-actors PUBLIC
   providers-dq-actors
   providers-dq-common
   providers-dq-counters
-  providers-dq-interface
   providers-dq-provider
   dq-provider-exec
   dq-worker_manager-interface
diff --git a/ydb/core/yq/libs/actors/pending_fetcher.cpp b/ydb/core/yq/libs/actors/pending_fetcher.cpp
index a3d411ffec..2a1c1fa1fc 100644
--- a/ydb/core/yq/libs/actors/pending_fetcher.cpp
+++ b/ydb/core/yq/libs/actors/pending_fetcher.cpp
@@ -22,7 +22,7 @@
 #include <ydb/library/yql/providers/common/schema/mkql/yql_mkql_schema.h>
 #include <ydb/library/yql/providers/dq/provider/yql_dq_gateway.h>
 #include <ydb/library/yql/providers/dq/provider/yql_dq_provider.h>
-#include <ydb/library/yql/providers/dq/interface/yql_dq_task_transform.h>
+#include <ydb/library/yql/dq/integration/transform/yql_dq_task_transform.h>
 #include <ydb/library/yql/providers/ydb/provider/yql_ydb_provider.h>
 #include <ydb/library/yql/providers/clickhouse/provider/yql_clickhouse_provider.h>
 #include <ydb/library/yql/sql/settings/translation_settings.h>
diff --git a/ydb/core/yq/libs/actors/run_actor.cpp b/ydb/core/yq/libs/actors/run_actor.cpp
index 83c50e24fe..36d2e88f22 100644
--- a/ydb/core/yq/libs/actors/run_actor.cpp
+++ b/ydb/core/yq/libs/actors/run_actor.cpp
@@ -23,7 +23,7 @@
 #include <ydb/library/yql/providers/dq/provider/yql_dq_gateway.h>
 #include <ydb/library/yql/providers/dq/provider/yql_dq_provider.h>
 #include <ydb/library/yql/providers/dq/provider/exec/yql_dq_exectransformer.h>
-#include <ydb/library/yql/providers/dq/interface/yql_dq_task_transform.h>
+#include <ydb/library/yql/dq/integration/transform/yql_dq_task_transform.h>
 #include <ydb/library/yql/providers/pq/gateway/native/yql_pq_gateway.h>
 #include <ydb/library/yql/providers/pq/provider/yql_pq_provider.h>
 #include <ydb/library/yql/providers/pq/task_meta/task_meta.h>
diff --git a/ydb/core/yq/libs/mock/CMakeLists.darwin.txt b/ydb/core/yq/libs/mock/CMakeLists.darwin.txt
index fb68041154..a5f8f139ce 100644
--- a/ydb/core/yq/libs/mock/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/mock/CMakeLists.darwin.txt
@@ -38,13 +38,13 @@ target_link_libraries(yq-libs-mock PUBLIC
   yql-sql-settings
   api-protos
   cpp-client-ydb_table
+  dq-integration-transform
   providers-clickhouse-provider
   providers-common-codec
   providers-common-comp_nodes
   providers-common-provider
   common-schema-mkql
   providers-common-udf_resolve
-  providers-dq-interface
   providers-dq-provider
   dq-worker_manager-interface
   providers-ydb-provider
diff --git a/ydb/core/yq/libs/mock/CMakeLists.linux-aarch64.txt b/ydb/core/yq/libs/mock/CMakeLists.linux-aarch64.txt
index a15a4dd1a2..4a21994fc4 100644
--- a/ydb/core/yq/libs/mock/CMakeLists.linux-aarch64.txt
+++ b/ydb/core/yq/libs/mock/CMakeLists.linux-aarch64.txt
@@ -39,13 +39,13 @@ target_link_libraries(yq-libs-mock PUBLIC
   yql-sql-settings
   api-protos
   cpp-client-ydb_table
+  dq-integration-transform
   providers-clickhouse-provider
   providers-common-codec
   providers-common-comp_nodes
   providers-common-provider
   common-schema-mkql
   providers-common-udf_resolve
-  providers-dq-interface
   providers-dq-provider
   dq-worker_manager-interface
   providers-ydb-provider
diff --git a/ydb/core/yq/libs/mock/CMakeLists.linux.txt b/ydb/core/yq/libs/mock/CMakeLists.linux.txt
index a15a4dd1a2..4a21994fc4 100644
--- a/ydb/core/yq/libs/mock/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/mock/CMakeLists.linux.txt
@@ -39,13 +39,13 @@ target_link_libraries(yq-libs-mock PUBLIC
   yql-sql-settings
   api-protos
   cpp-client-ydb_table
+  dq-integration-transform
   providers-clickhouse-provider
   providers-common-codec
   providers-common-comp_nodes
   providers-common-provider
   common-schema-mkql
   providers-common-udf_resolve
-  providers-dq-interface
   providers-dq-provider
   dq-worker_manager-interface
   providers-ydb-provider
diff --git a/ydb/library/yql/dq/CMakeLists.txt b/ydb/library/yql/dq/CMakeLists.txt
index df7076a6f5..a585d7e0bf 100644
--- a/ydb/library/yql/dq/CMakeLists.txt
+++ b/ydb/library/yql/dq/CMakeLists.txt
@@ -10,6 +10,7 @@ add_subdirectory(actors)
 add_subdirectory(common)
 add_subdirectory(comp_nodes)
 add_subdirectory(expr_nodes)
+add_subdirectory(integration)
 add_subdirectory(opt)
 add_subdirectory(proto)
 add_subdirectory(runtime)
diff --git a/ydb/library/yql/dq/integration/CMakeLists.darwin.txt b/ydb/library/yql/dq/integration/CMakeLists.darwin.txt
new file mode 100644
index 0000000000..2213c8b415
--- /dev/null
+++ b/ydb/library/yql/dq/integration/CMakeLists.darwin.txt
@@ -0,0 +1,26 @@
+
+# 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.
+
+
+add_subdirectory(transform)
+
+add_library(yql-dq-integration)
+target_compile_options(yql-dq-integration PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_link_libraries(yql-dq-integration PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  contrib-libs-protobuf
+  library-cpp-yson
+  library-yql-ast
+  library-yql-core
+  yql-dq-tasks
+)
+target_sources(yql-dq-integration PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/dq/integration/yql_dq_integration.cpp
+)
diff --git a/ydb/library/yql/dq/integration/CMakeLists.linux-aarch64.txt b/ydb/library/yql/dq/integration/CMakeLists.linux-aarch64.txt
new file mode 100644
index 0000000000..f01517462e
--- /dev/null
+++ b/ydb/library/yql/dq/integration/CMakeLists.linux-aarch64.txt
@@ -0,0 +1,27 @@
+
+# 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.
+
+
+add_subdirectory(transform)
+
+add_library(yql-dq-integration)
+target_compile_options(yql-dq-integration PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_link_libraries(yql-dq-integration PUBLIC
+  contrib-libs-linux-headers
+  contrib-libs-cxxsupp
+  yutil
+  contrib-libs-protobuf
+  library-cpp-yson
+  library-yql-ast
+  library-yql-core
+  yql-dq-tasks
+)
+target_sources(yql-dq-integration PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/dq/integration/yql_dq_integration.cpp
+)
diff --git a/ydb/library/yql/dq/integration/CMakeLists.linux.txt b/ydb/library/yql/dq/integration/CMakeLists.linux.txt
new file mode 100644
index 0000000000..f01517462e
--- /dev/null
+++ b/ydb/library/yql/dq/integration/CMakeLists.linux.txt
@@ -0,0 +1,27 @@
+
+# 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.
+
+
+add_subdirectory(transform)
+
+add_library(yql-dq-integration)
+target_compile_options(yql-dq-integration PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_link_libraries(yql-dq-integration PUBLIC
+  contrib-libs-linux-headers
+  contrib-libs-cxxsupp
+  yutil
+  contrib-libs-protobuf
+  library-cpp-yson
+  library-yql-ast
+  library-yql-core
+  yql-dq-tasks
+)
+target_sources(yql-dq-integration PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/dq/integration/yql_dq_integration.cpp
+)
diff --git a/ydb/library/yql/dq/integration/CMakeLists.txt b/ydb/library/yql/dq/integration/CMakeLists.txt
new file mode 100644
index 0000000000..5bb4faffb4
--- /dev/null
+++ b/ydb/library/yql/dq/integration/CMakeLists.txt
@@ -0,0 +1,15 @@
+
+# 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_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
+  include(CMakeLists.linux-aarch64.txt)
+elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+  include(CMakeLists.darwin.txt)
+elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID)
+  include(CMakeLists.linux.txt)
+endif()
diff --git a/ydb/library/yql/dq/integration/transform/CMakeLists.darwin.txt b/ydb/library/yql/dq/integration/transform/CMakeLists.darwin.txt
new file mode 100644
index 0000000000..cafad8055c
--- /dev/null
+++ b/ydb/library/yql/dq/integration/transform/CMakeLists.darwin.txt
@@ -0,0 +1,21 @@
+
+# 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.
+
+
+
+add_library(dq-integration-transform)
+target_compile_options(dq-integration-transform PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_link_libraries(dq-integration-transform PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  library-yql-minikql
+)
+target_sources(dq-integration-transform PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/dq/integration/transform/yql_dq_task_transform.cpp
+)
diff --git a/ydb/library/yql/dq/integration/transform/CMakeLists.linux-aarch64.txt b/ydb/library/yql/dq/integration/transform/CMakeLists.linux-aarch64.txt
new file mode 100644
index 0000000000..24f0a05452
--- /dev/null
+++ b/ydb/library/yql/dq/integration/transform/CMakeLists.linux-aarch64.txt
@@ -0,0 +1,22 @@
+
+# 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.
+
+
+
+add_library(dq-integration-transform)
+target_compile_options(dq-integration-transform PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_link_libraries(dq-integration-transform PUBLIC
+  contrib-libs-linux-headers
+  contrib-libs-cxxsupp
+  yutil
+  library-yql-minikql
+)
+target_sources(dq-integration-transform PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/dq/integration/transform/yql_dq_task_transform.cpp
+)
diff --git a/ydb/library/yql/dq/integration/transform/CMakeLists.linux.txt b/ydb/library/yql/dq/integration/transform/CMakeLists.linux.txt
new file mode 100644
index 0000000000..24f0a05452
--- /dev/null
+++ b/ydb/library/yql/dq/integration/transform/CMakeLists.linux.txt
@@ -0,0 +1,22 @@
+
+# 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.
+
+
+
+add_library(dq-integration-transform)
+target_compile_options(dq-integration-transform PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_link_libraries(dq-integration-transform PUBLIC
+  contrib-libs-linux-headers
+  contrib-libs-cxxsupp
+  yutil
+  library-yql-minikql
+)
+target_sources(dq-integration-transform PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/dq/integration/transform/yql_dq_task_transform.cpp
+)
diff --git a/ydb/library/yql/dq/integration/transform/CMakeLists.txt b/ydb/library/yql/dq/integration/transform/CMakeLists.txt
new file mode 100644
index 0000000000..5bb4faffb4
--- /dev/null
+++ b/ydb/library/yql/dq/integration/transform/CMakeLists.txt
@@ -0,0 +1,15 @@
+
+# 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_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
+  include(CMakeLists.linux-aarch64.txt)
+elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+  include(CMakeLists.darwin.txt)
+elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID)
+  include(CMakeLists.linux.txt)
+endif()
diff --git a/ydb/library/yql/providers/dq/interface/yql_dq_task_transform.cpp b/ydb/library/yql/dq/integration/transform/yql_dq_task_transform.cpp
index b45ac30a73..c239b2353e 100644
--- a/ydb/library/yql/providers/dq/interface/yql_dq_task_transform.cpp
+++ b/ydb/library/yql/dq/integration/transform/yql_dq_task_transform.cpp
@@ -1,4 +1,4 @@
-#include <ydb/library/yql/providers/dq/interface/yql_dq_task_transform.h>
+#include <ydb/library/yql/dq/integration/transform/yql_dq_task_transform.h>
 
 namespace NYql {
 
diff --git a/ydb/library/yql/providers/dq/interface/yql_dq_task_transform.h b/ydb/library/yql/dq/integration/transform/yql_dq_task_transform.h
index 3077910b74..3077910b74 100644
--- a/ydb/library/yql/providers/dq/interface/yql_dq_task_transform.h
+++ b/ydb/library/yql/dq/integration/transform/yql_dq_task_transform.h
diff --git a/ydb/library/yql/providers/dq/interface/yql_dq_integration.cpp b/ydb/library/yql/dq/integration/yql_dq_integration.cpp
index acd0ae0ecb..acd0ae0ecb 100644
--- a/ydb/library/yql/providers/dq/interface/yql_dq_integration.cpp
+++ b/ydb/library/yql/dq/integration/yql_dq_integration.cpp
diff --git a/ydb/library/yql/providers/dq/interface/yql_dq_integration.h b/ydb/library/yql/dq/integration/yql_dq_integration.h
index d9980511cc..68e87eaac7 100644
--- a/ydb/library/yql/providers/dq/interface/yql_dq_integration.h
+++ b/ydb/library/yql/dq/integration/yql_dq_integration.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <ydb/library/yql/core/yql_data_provider.h>
 #include <ydb/library/yql/ast/yql_expr.h>
+#include <ydb/library/yql/core/yql_data_provider.h>
 #include <ydb/library/yql/dq/tasks/dq_tasks_graph.h>
 
 #include <library/cpp/yson/writer.h>
diff --git a/ydb/library/yql/dq/transform/CMakeLists.darwin.txt b/ydb/library/yql/dq/transform/CMakeLists.darwin.txt
index d784f1376b..315e018225 100644
--- a/ydb/library/yql/dq/transform/CMakeLists.darwin.txt
+++ b/ydb/library/yql/dq/transform/CMakeLists.darwin.txt
@@ -15,6 +15,7 @@ target_link_libraries(yql-dq-transform PUBLIC
   contrib-libs-cxxsupp
   yutil
   cpp-actors-core
+  dq-integration-transform
   yql-minikql-computation
   library-yql-minikql
   library-yql-utils
diff --git a/ydb/library/yql/dq/transform/CMakeLists.linux-aarch64.txt b/ydb/library/yql/dq/transform/CMakeLists.linux-aarch64.txt
index a92c412e3b..ff643b33cf 100644
--- a/ydb/library/yql/dq/transform/CMakeLists.linux-aarch64.txt
+++ b/ydb/library/yql/dq/transform/CMakeLists.linux-aarch64.txt
@@ -16,6 +16,7 @@ target_link_libraries(yql-dq-transform PUBLIC
   contrib-libs-cxxsupp
   yutil
   cpp-actors-core
+  dq-integration-transform
   yql-minikql-computation
   library-yql-minikql
   library-yql-utils
diff --git a/ydb/library/yql/dq/transform/CMakeLists.linux.txt b/ydb/library/yql/dq/transform/CMakeLists.linux.txt
index a92c412e3b..ff643b33cf 100644
--- a/ydb/library/yql/dq/transform/CMakeLists.linux.txt
+++ b/ydb/library/yql/dq/transform/CMakeLists.linux.txt
@@ -16,6 +16,7 @@ target_link_libraries(yql-dq-transform PUBLIC
   contrib-libs-cxxsupp
   yutil
   cpp-actors-core
+  dq-integration-transform
   yql-minikql-computation
   library-yql-minikql
   library-yql-utils
diff --git a/ydb/library/yql/dq/transform/yql_common_dq_transform.h b/ydb/library/yql/dq/transform/yql_common_dq_transform.h
index f8befd2acb..42d5813c51 100644
--- a/ydb/library/yql/dq/transform/yql_common_dq_transform.h
+++ b/ydb/library/yql/dq/transform/yql_common_dq_transform.h
@@ -1,10 +1,9 @@
 #pragma once
 
-#include <ydb/library/yql/providers/dq/interface/yql_dq_task_transform.h>
+#include <ydb/library/yql/dq/integration/transform/yql_dq_task_transform.h>
 
 namespace NYql {
 
 TTaskTransformFactory CreateCommonDqTaskTransformFactory();
 
 }
-
diff --git a/ydb/library/yql/providers/clickhouse/provider/CMakeLists.darwin.txt b/ydb/library/yql/providers/clickhouse/provider/CMakeLists.darwin.txt
index abc836122e..ca76b1925b 100644
--- a/ydb/library/yql/providers/clickhouse/provider/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/clickhouse/provider/CMakeLists.darwin.txt
@@ -24,6 +24,7 @@ target_link_libraries(providers-clickhouse-provider PUBLIC
   library-yql-core
   yql-core-type_ann
   yql-dq-expr_nodes
+  yql-dq-integration
   providers-common-db_id_async_resolver
   providers-clickhouse-expr_nodes
   providers-clickhouse-proto
@@ -36,7 +37,6 @@ target_link_libraries(providers-clickhouse-provider PUBLIC
   providers-common-transform
   providers-dq-common
   providers-dq-expr_nodes
-  providers-dq-interface
 )
 target_sources(providers-clickhouse-provider PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/clickhouse/provider/yql_clickhouse_datasink.cpp
diff --git a/ydb/library/yql/providers/clickhouse/provider/CMakeLists.linux-aarch64.txt b/ydb/library/yql/providers/clickhouse/provider/CMakeLists.linux-aarch64.txt
index aa0572b59c..6ac76dbc89 100644
--- a/ydb/library/yql/providers/clickhouse/provider/CMakeLists.linux-aarch64.txt
+++ b/ydb/library/yql/providers/clickhouse/provider/CMakeLists.linux-aarch64.txt
@@ -25,6 +25,7 @@ target_link_libraries(providers-clickhouse-provider PUBLIC
   library-yql-core
   yql-core-type_ann
   yql-dq-expr_nodes
+  yql-dq-integration
   providers-common-db_id_async_resolver
   providers-clickhouse-expr_nodes
   providers-clickhouse-proto
@@ -37,7 +38,6 @@ target_link_libraries(providers-clickhouse-provider PUBLIC
   providers-common-transform
   providers-dq-common
   providers-dq-expr_nodes
-  providers-dq-interface
 )
 target_sources(providers-clickhouse-provider PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/clickhouse/provider/yql_clickhouse_datasink.cpp
diff --git a/ydb/library/yql/providers/clickhouse/provider/CMakeLists.linux.txt b/ydb/library/yql/providers/clickhouse/provider/CMakeLists.linux.txt
index aa0572b59c..6ac76dbc89 100644
--- a/ydb/library/yql/providers/clickhouse/provider/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/clickhouse/provider/CMakeLists.linux.txt
@@ -25,6 +25,7 @@ target_link_libraries(providers-clickhouse-provider PUBLIC
   library-yql-core
   yql-core-type_ann
   yql-dq-expr_nodes
+  yql-dq-integration
   providers-common-db_id_async_resolver
   providers-clickhouse-expr_nodes
   providers-clickhouse-proto
@@ -37,7 +38,6 @@ target_link_libraries(providers-clickhouse-provider PUBLIC
   providers-common-transform
   providers-dq-common
   providers-dq-expr_nodes
-  providers-dq-interface
 )
 target_sources(providers-clickhouse-provider PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/clickhouse/provider/yql_clickhouse_datasink.cpp
diff --git a/ydb/library/yql/providers/clickhouse/provider/yql_clickhouse_dq_integration.h b/ydb/library/yql/providers/clickhouse/provider/yql_clickhouse_dq_integration.h
index e23e896c75..6fa8183f90 100644
--- a/ydb/library/yql/providers/clickhouse/provider/yql_clickhouse_dq_integration.h
+++ b/ydb/library/yql/providers/clickhouse/provider/yql_clickhouse_dq_integration.h
@@ -2,7 +2,7 @@
 
 #include "yql_clickhouse_provider.h"
 
-#include <ydb/library/yql/providers/dq/interface/yql_dq_integration.h>
+#include <ydb/library/yql/dq/integration/yql_dq_integration.h>
 
 #include <util/generic/ptr.h>
 
diff --git a/ydb/library/yql/providers/common/dq/CMakeLists.darwin.txt b/ydb/library/yql/providers/common/dq/CMakeLists.darwin.txt
index 53b7a533a0..1070128188 100644
--- a/ydb/library/yql/providers/common/dq/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/common/dq/CMakeLists.darwin.txt
@@ -11,7 +11,7 @@ add_library(providers-common-dq)
 target_link_libraries(providers-common-dq PUBLIC
   contrib-libs-cxxsupp
   yutil
-  providers-dq-interface
+  yql-dq-integration
 )
 target_sources(providers-common-dq PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/common/dq/yql_dq_integration_impl.cpp
diff --git a/ydb/library/yql/providers/common/dq/CMakeLists.linux-aarch64.txt b/ydb/library/yql/providers/common/dq/CMakeLists.linux-aarch64.txt
index 4acf128479..3fa3069dbc 100644
--- a/ydb/library/yql/providers/common/dq/CMakeLists.linux-aarch64.txt
+++ b/ydb/library/yql/providers/common/dq/CMakeLists.linux-aarch64.txt
@@ -12,7 +12,7 @@ target_link_libraries(providers-common-dq PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  providers-dq-interface
+  yql-dq-integration
 )
 target_sources(providers-common-dq PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/common/dq/yql_dq_integration_impl.cpp
diff --git a/ydb/library/yql/providers/common/dq/CMakeLists.linux.txt b/ydb/library/yql/providers/common/dq/CMakeLists.linux.txt
index 4acf128479..3fa3069dbc 100644
--- a/ydb/library/yql/providers/common/dq/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/common/dq/CMakeLists.linux.txt
@@ -12,7 +12,7 @@ target_link_libraries(providers-common-dq PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  providers-dq-interface
+  yql-dq-integration
 )
 target_sources(providers-common-dq PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/common/dq/yql_dq_integration_impl.cpp
diff --git a/ydb/library/yql/providers/common/dq/yql_dq_integration_impl.h b/ydb/library/yql/providers/common/dq/yql_dq_integration_impl.h
index 60638f811a..e063b337d7 100644
--- a/ydb/library/yql/providers/common/dq/yql_dq_integration_impl.h
+++ b/ydb/library/yql/providers/common/dq/yql_dq_integration_impl.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <ydb/library/yql/providers/dq/interface/yql_dq_integration.h>
+#include <ydb/library/yql/dq/integration/yql_dq_integration.h>
 
 namespace NYql {
 
diff --git a/ydb/library/yql/providers/dq/interface/CMakeLists.darwin.txt b/ydb/library/yql/providers/dq/interface/CMakeLists.darwin.txt
index c556248be3..2caf1879a6 100644
--- a/ydb/library/yql/providers/dq/interface/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/dq/interface/CMakeLists.darwin.txt
@@ -14,15 +14,9 @@ target_compile_options(providers-dq-interface PRIVATE
 target_link_libraries(providers-dq-interface PUBLIC
   contrib-libs-cxxsupp
   yutil
-  contrib-libs-protobuf
-  library-cpp-yson
-  library-yql-ast
-  library-yql-core
-  yql-dq-tasks
+  yql-public-udf
 )
 target_sources(providers-dq-interface PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/dq/interface/yql_dq_full_result_writer.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/dq/interface/yql_dq_integration.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/dq/interface/yql_dq_task_preprocessor.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/dq/interface/yql_dq_task_transform.cpp
 )
diff --git a/ydb/library/yql/providers/dq/interface/CMakeLists.linux-aarch64.txt b/ydb/library/yql/providers/dq/interface/CMakeLists.linux-aarch64.txt
index dfbe16ccb2..a8b43ce805 100644
--- a/ydb/library/yql/providers/dq/interface/CMakeLists.linux-aarch64.txt
+++ b/ydb/library/yql/providers/dq/interface/CMakeLists.linux-aarch64.txt
@@ -15,15 +15,9 @@ target_link_libraries(providers-dq-interface PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  contrib-libs-protobuf
-  library-cpp-yson
-  library-yql-ast
-  library-yql-core
-  yql-dq-tasks
+  yql-public-udf
 )
 target_sources(providers-dq-interface PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/dq/interface/yql_dq_full_result_writer.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/dq/interface/yql_dq_integration.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/dq/interface/yql_dq_task_preprocessor.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/dq/interface/yql_dq_task_transform.cpp
 )
diff --git a/ydb/library/yql/providers/dq/interface/CMakeLists.linux.txt b/ydb/library/yql/providers/dq/interface/CMakeLists.linux.txt
index dfbe16ccb2..a8b43ce805 100644
--- a/ydb/library/yql/providers/dq/interface/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/dq/interface/CMakeLists.linux.txt
@@ -15,15 +15,9 @@ target_link_libraries(providers-dq-interface PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  contrib-libs-protobuf
-  library-cpp-yson
-  library-yql-ast
-  library-yql-core
-  yql-dq-tasks
+  yql-public-udf
 )
 target_sources(providers-dq-interface PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/dq/interface/yql_dq_full_result_writer.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/dq/interface/yql_dq_integration.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/dq/interface/yql_dq_task_preprocessor.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/dq/interface/yql_dq_task_transform.cpp
 )
diff --git a/ydb/library/yql/providers/dq/mkql/CMakeLists.darwin.txt b/ydb/library/yql/providers/dq/mkql/CMakeLists.darwin.txt
index e5b274c787..f7fdd5de4d 100644
--- a/ydb/library/yql/providers/dq/mkql/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/dq/mkql/CMakeLists.darwin.txt
@@ -15,9 +15,9 @@ target_link_libraries(providers-dq-mkql PUBLIC
   contrib-libs-cxxsupp
   yutil
   library-yql-core
+  yql-dq-integration
   providers-common-mkql
   providers-dq-expr_nodes
-  providers-dq-interface
 )
 target_sources(providers-dq-mkql PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/dq/mkql/dqs_mkql_compiler.cpp
diff --git a/ydb/library/yql/providers/dq/mkql/CMakeLists.linux-aarch64.txt b/ydb/library/yql/providers/dq/mkql/CMakeLists.linux-aarch64.txt
index a2c24fdb67..8fb2cb0308 100644
--- a/ydb/library/yql/providers/dq/mkql/CMakeLists.linux-aarch64.txt
+++ b/ydb/library/yql/providers/dq/mkql/CMakeLists.linux-aarch64.txt
@@ -16,9 +16,9 @@ target_link_libraries(providers-dq-mkql PUBLIC
   contrib-libs-cxxsupp
   yutil
   library-yql-core
+  yql-dq-integration
   providers-common-mkql
   providers-dq-expr_nodes
-  providers-dq-interface
 )
 target_sources(providers-dq-mkql PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/dq/mkql/dqs_mkql_compiler.cpp
diff --git a/ydb/library/yql/providers/dq/mkql/CMakeLists.linux.txt b/ydb/library/yql/providers/dq/mkql/CMakeLists.linux.txt
index a2c24fdb67..8fb2cb0308 100644
--- a/ydb/library/yql/providers/dq/mkql/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/dq/mkql/CMakeLists.linux.txt
@@ -16,9 +16,9 @@ target_link_libraries(providers-dq-mkql PUBLIC
   contrib-libs-cxxsupp
   yutil
   library-yql-core
+  yql-dq-integration
   providers-common-mkql
   providers-dq-expr_nodes
-  providers-dq-interface
 )
 target_sources(providers-dq-mkql PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/dq/mkql/dqs_mkql_compiler.cpp
diff --git a/ydb/library/yql/providers/dq/mkql/dqs_mkql_compiler.cpp b/ydb/library/yql/providers/dq/mkql/dqs_mkql_compiler.cpp
index 2bb15a52fd..c4f2cd6cbd 100644
--- a/ydb/library/yql/providers/dq/mkql/dqs_mkql_compiler.cpp
+++ b/ydb/library/yql/providers/dq/mkql/dqs_mkql_compiler.cpp
@@ -1,6 +1,6 @@
 #include "dqs_mkql_compiler.h"
 
-#include <ydb/library/yql/providers/dq/interface/yql_dq_integration.h>
+#include <ydb/library/yql/dq/integration/yql_dq_integration.h>
 #include <ydb/library/yql/providers/dq/expr_nodes/dqs_expr_nodes.h>
 #include <ydb/library/yql/providers/common/mkql/yql_provider_mkql.h>
 
diff --git a/ydb/library/yql/providers/dq/planner/CMakeLists.darwin.txt b/ydb/library/yql/providers/dq/planner/CMakeLists.darwin.txt
index 78f3feb897..43bf8a5a1c 100644
--- a/ydb/library/yql/providers/dq/planner/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/dq/planner/CMakeLists.darwin.txt
@@ -17,13 +17,13 @@ target_link_libraries(providers-dq-planner PUBLIC
   yql-core-services
   yql-minikql-comp_nodes
   yql-minikql-computation
+  yql-dq-integration
   yql-dq-opt
   yql-dq-tasks
   providers-common-mkql
   dq-api-protos
   providers-dq-common
   providers-dq-expr_nodes
-  providers-dq-interface
   providers-dq-mkql
   providers-dq-opt
 )
diff --git a/ydb/library/yql/providers/dq/planner/CMakeLists.linux-aarch64.txt b/ydb/library/yql/providers/dq/planner/CMakeLists.linux-aarch64.txt
index e68cc9d15f..e22eae8530 100644
--- a/ydb/library/yql/providers/dq/planner/CMakeLists.linux-aarch64.txt
+++ b/ydb/library/yql/providers/dq/planner/CMakeLists.linux-aarch64.txt
@@ -18,13 +18,13 @@ target_link_libraries(providers-dq-planner PUBLIC
   yql-core-services
   yql-minikql-comp_nodes
   yql-minikql-computation
+  yql-dq-integration
   yql-dq-opt
   yql-dq-tasks
   providers-common-mkql
   dq-api-protos
   providers-dq-common
   providers-dq-expr_nodes
-  providers-dq-interface
   providers-dq-mkql
   providers-dq-opt
 )
diff --git a/ydb/library/yql/providers/dq/planner/CMakeLists.linux.txt b/ydb/library/yql/providers/dq/planner/CMakeLists.linux.txt
index e68cc9d15f..e22eae8530 100644
--- a/ydb/library/yql/providers/dq/planner/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/dq/planner/CMakeLists.linux.txt
@@ -18,13 +18,13 @@ target_link_libraries(providers-dq-planner PUBLIC
   yql-core-services
   yql-minikql-comp_nodes
   yql-minikql-computation
+  yql-dq-integration
   yql-dq-opt
   yql-dq-tasks
   providers-common-mkql
   dq-api-protos
   providers-dq-common
   providers-dq-expr_nodes
-  providers-dq-interface
   providers-dq-mkql
   providers-dq-opt
 )
diff --git a/ydb/library/yql/providers/dq/planner/execution_planner.cpp b/ydb/library/yql/providers/dq/planner/execution_planner.cpp
index 0b120f2ea3..f7c1ff06d1 100644
--- a/ydb/library/yql/providers/dq/planner/execution_planner.cpp
+++ b/ydb/library/yql/providers/dq/planner/execution_planner.cpp
@@ -1,6 +1,6 @@
 #include "execution_planner.h"
 
-#include <ydb/library/yql/providers/dq/interface/yql_dq_integration.h>
+#include <ydb/library/yql/dq/integration/yql_dq_integration.h>
 #include <ydb/library/yql/providers/dq/expr_nodes/dqs_expr_nodes.h>
 #include <ydb/library/yql/providers/dq/opt/dqs_opt.h>
 #include <ydb/library/yql/providers/dq/opt/logical_optimize.h>
diff --git a/ydb/library/yql/providers/dq/provider/CMakeLists.darwin.txt b/ydb/library/yql/providers/dq/provider/CMakeLists.darwin.txt
index 46c0f58d2b..768e169134 100644
--- a/ydb/library/yql/providers/dq/provider/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/dq/provider/CMakeLists.darwin.txt
@@ -23,6 +23,8 @@ target_link_libraries(providers-dq-provider PUBLIC
   library-yql-core
   yql-core-issue
   yql-utils-backtrace
+  yql-dq-integration
+  dq-integration-transform
   yql-dq-transform
   yql-dq-tasks
   yql-dq-type_ann
@@ -35,7 +37,6 @@ target_link_libraries(providers-dq-provider PUBLIC
   providers-dq-common
   providers-dq-config
   providers-dq-expr_nodes
-  providers-dq-interface
   providers-dq-opt
   providers-dq-planner
   providers-result-expr_nodes
diff --git a/ydb/library/yql/providers/dq/provider/CMakeLists.linux-aarch64.txt b/ydb/library/yql/providers/dq/provider/CMakeLists.linux-aarch64.txt
index 610a417dbc..29597b8d61 100644
--- a/ydb/library/yql/providers/dq/provider/CMakeLists.linux-aarch64.txt
+++ b/ydb/library/yql/providers/dq/provider/CMakeLists.linux-aarch64.txt
@@ -24,6 +24,8 @@ target_link_libraries(providers-dq-provider PUBLIC
   library-yql-core
   yql-core-issue
   yql-utils-backtrace
+  yql-dq-integration
+  dq-integration-transform
   yql-dq-transform
   yql-dq-tasks
   yql-dq-type_ann
@@ -36,7 +38,6 @@ target_link_libraries(providers-dq-provider PUBLIC
   providers-dq-common
   providers-dq-config
   providers-dq-expr_nodes
-  providers-dq-interface
   providers-dq-opt
   providers-dq-planner
   providers-result-expr_nodes
diff --git a/ydb/library/yql/providers/dq/provider/CMakeLists.linux.txt b/ydb/library/yql/providers/dq/provider/CMakeLists.linux.txt
index 610a417dbc..29597b8d61 100644
--- a/ydb/library/yql/providers/dq/provider/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/dq/provider/CMakeLists.linux.txt
@@ -24,6 +24,8 @@ target_link_libraries(providers-dq-provider PUBLIC
   library-yql-core
   yql-core-issue
   yql-utils-backtrace
+  yql-dq-integration
+  dq-integration-transform
   yql-dq-transform
   yql-dq-tasks
   yql-dq-type_ann
@@ -36,7 +38,6 @@ target_link_libraries(providers-dq-provider PUBLIC
   providers-dq-common
   providers-dq-config
   providers-dq-expr_nodes
-  providers-dq-interface
   providers-dq-opt
   providers-dq-planner
   providers-result-expr_nodes
diff --git a/ydb/library/yql/providers/dq/provider/exec/CMakeLists.darwin.txt b/ydb/library/yql/providers/dq/provider/exec/CMakeLists.darwin.txt
index 102fa46a9e..3360a34a23 100644
--- a/ydb/library/yql/providers/dq/provider/exec/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/dq/provider/exec/CMakeLists.darwin.txt
@@ -19,6 +19,7 @@ target_link_libraries(dq-provider-exec PUBLIC
   public-lib-yson_value
   cpp-client-ydb_driver
   library-yql-core
+  yql-dq-integration
   yql-dq-runtime
   yql-dq-tasks
   yql-dq-type_ann
@@ -32,7 +33,6 @@ target_link_libraries(dq-provider-exec PUBLIC
   providers-dq-common
   providers-dq-counters
   providers-dq-expr_nodes
-  providers-dq-interface
   providers-dq-opt
   providers-dq-planner
   providers-dq-runtime
diff --git a/ydb/library/yql/providers/dq/provider/exec/CMakeLists.linux-aarch64.txt b/ydb/library/yql/providers/dq/provider/exec/CMakeLists.linux-aarch64.txt
index 823f838755..e56ec01d4c 100644
--- a/ydb/library/yql/providers/dq/provider/exec/CMakeLists.linux-aarch64.txt
+++ b/ydb/library/yql/providers/dq/provider/exec/CMakeLists.linux-aarch64.txt
@@ -20,6 +20,7 @@ target_link_libraries(dq-provider-exec PUBLIC
   public-lib-yson_value
   cpp-client-ydb_driver
   library-yql-core
+  yql-dq-integration
   yql-dq-runtime
   yql-dq-tasks
   yql-dq-type_ann
@@ -33,7 +34,6 @@ target_link_libraries(dq-provider-exec PUBLIC
   providers-dq-common
   providers-dq-counters
   providers-dq-expr_nodes
-  providers-dq-interface
   providers-dq-opt
   providers-dq-planner
   providers-dq-runtime
diff --git a/ydb/library/yql/providers/dq/provider/exec/CMakeLists.linux.txt b/ydb/library/yql/providers/dq/provider/exec/CMakeLists.linux.txt
index 823f838755..e56ec01d4c 100644
--- a/ydb/library/yql/providers/dq/provider/exec/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/dq/provider/exec/CMakeLists.linux.txt
@@ -20,6 +20,7 @@ target_link_libraries(dq-provider-exec PUBLIC
   public-lib-yson_value
   cpp-client-ydb_driver
   library-yql-core
+  yql-dq-integration
   yql-dq-runtime
   yql-dq-tasks
   yql-dq-type_ann
@@ -33,7 +34,6 @@ target_link_libraries(dq-provider-exec PUBLIC
   providers-dq-common
   providers-dq-counters
   providers-dq-expr_nodes
-  providers-dq-interface
   providers-dq-opt
   providers-dq-planner
   providers-dq-runtime
diff --git a/ydb/library/yql/providers/dq/provider/exec/yql_dq_exectransformer.cpp b/ydb/library/yql/providers/dq/provider/exec/yql_dq_exectransformer.cpp
index 62258c4b47..1b1ae7e9b1 100644
--- a/ydb/library/yql/providers/dq/provider/exec/yql_dq_exectransformer.cpp
+++ b/ydb/library/yql/providers/dq/provider/exec/yql_dq_exectransformer.cpp
@@ -14,7 +14,7 @@
 #include <ydb/library/yql/providers/dq/actors/proto_builder.h>
 #include <ydb/library/yql/providers/dq/counters/counters.h>
 #include <ydb/library/yql/providers/dq/common/yql_dq_common.h>
-#include <ydb/library/yql/providers/dq/interface/yql_dq_integration.h>
+#include <ydb/library/yql/dq/integration/yql_dq_integration.h>
 #include <ydb/library/yql/providers/dq/planner/execution_planner.h>
 #include <ydb/library/yql/providers/dq/provider/yql_dq_gateway.h>
 #include <ydb/library/yql/providers/dq/provider/yql_dq_control.h>
diff --git a/ydb/library/yql/providers/dq/provider/yql_dq_gateway.h b/ydb/library/yql/providers/dq/provider/yql_dq_gateway.h
index efa1eb1706..c6ea5db4df 100644
--- a/ydb/library/yql/providers/dq/provider/yql_dq_gateway.h
+++ b/ydb/library/yql/providers/dq/provider/yql_dq_gateway.h
@@ -6,7 +6,7 @@
 #include <ydb/library/yql/providers/dq/api/protos/service.pb.h>
 #include <ydb/library/yql/providers/dq/planner/execution_planner.h>
 #include <ydb/library/yql/providers/dq/common/yql_dq_settings.h>
-#include <ydb/library/yql/providers/dq/interface/yql_dq_task_transform.h>
+#include <ydb/library/yql/dq/integration/transform/yql_dq_task_transform.h>
 #include <ydb/library/yql/providers/common/http_gateway/yql_http_gateway.h>
 
 #include <ydb/library/yql/core/yql_udf_resolver.h>
diff --git a/ydb/library/yql/providers/dq/provider/yql_dq_provider.cpp b/ydb/library/yql/providers/dq/provider/yql_dq_provider.cpp
index 100347422b..ca3df412f4 100644
--- a/ydb/library/yql/providers/dq/provider/yql_dq_provider.cpp
+++ b/ydb/library/yql/providers/dq/provider/yql_dq_provider.cpp
@@ -8,7 +8,7 @@
 #include <ydb/library/yql/providers/common/provider/yql_provider.h>
 #include <ydb/library/yql/providers/common/provider/yql_provider_names.h>
 
-#include <ydb/library/yql/providers/dq/interface/yql_dq_task_transform.h>
+#include <ydb/library/yql/dq/integration/transform/yql_dq_task_transform.h>
 #include <ydb/library/yql/dq/transform/yql_common_dq_transform.h>
 
 #include <ydb/library/yql/utils/log/log.h>
diff --git a/ydb/library/yql/providers/dq/provider/yql_dq_recapture.cpp b/ydb/library/yql/providers/dq/provider/yql_dq_recapture.cpp
index 2e60546388..d0838ad40c 100644
--- a/ydb/library/yql/providers/dq/provider/yql_dq_recapture.cpp
+++ b/ydb/library/yql/providers/dq/provider/yql_dq_recapture.cpp
@@ -3,7 +3,7 @@
 
 #include <ydb/library/yql/providers/common/provider/yql_provider_names.h>
 #include <ydb/library/yql/providers/dq/expr_nodes/dqs_expr_nodes.h>
-#include <ydb/library/yql/providers/dq/interface/yql_dq_integration.h>
+#include <ydb/library/yql/dq/integration/yql_dq_integration.h>
 #include <ydb/library/yql/core/expr_nodes/yql_expr_nodes.h>
 #include <ydb/library/yql/core/yql_expr_optimize.h>
 #include <ydb/library/yql/core/yql_graph_transformer.h>
diff --git a/ydb/library/yql/providers/dq/runtime/CMakeLists.darwin.txt b/ydb/library/yql/providers/dq/runtime/CMakeLists.darwin.txt
index d2b9beeb6a..5e00399735 100644
--- a/ydb/library/yql/providers/dq/runtime/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/dq/runtime/CMakeLists.darwin.txt
@@ -22,12 +22,12 @@ target_link_libraries(providers-dq-runtime PUBLIC
   yql-utils-backtrace
   yql-core-expr_nodes
   yql-dq-common
+  dq-integration-transform
   yql-dq-runtime
   providers-common-proto
   dq-api-protos
   providers-dq-common
   providers-dq-counters
-  providers-dq-interface
   providers-dq-task_runner
 )
 target_sources(providers-dq-runtime PRIVATE
diff --git a/ydb/library/yql/providers/dq/runtime/CMakeLists.linux-aarch64.txt b/ydb/library/yql/providers/dq/runtime/CMakeLists.linux-aarch64.txt
index b274953d25..3b44c0c270 100644
--- a/ydb/library/yql/providers/dq/runtime/CMakeLists.linux-aarch64.txt
+++ b/ydb/library/yql/providers/dq/runtime/CMakeLists.linux-aarch64.txt
@@ -23,12 +23,12 @@ target_link_libraries(providers-dq-runtime PUBLIC
   yql-utils-backtrace
   yql-core-expr_nodes
   yql-dq-common
+  dq-integration-transform
   yql-dq-runtime
   providers-common-proto
   dq-api-protos
   providers-dq-common
   providers-dq-counters
-  providers-dq-interface
   providers-dq-task_runner
 )
 target_sources(providers-dq-runtime PRIVATE
diff --git a/ydb/library/yql/providers/dq/runtime/CMakeLists.linux.txt b/ydb/library/yql/providers/dq/runtime/CMakeLists.linux.txt
index b274953d25..3b44c0c270 100644
--- a/ydb/library/yql/providers/dq/runtime/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/dq/runtime/CMakeLists.linux.txt
@@ -23,12 +23,12 @@ target_link_libraries(providers-dq-runtime PUBLIC
   yql-utils-backtrace
   yql-core-expr_nodes
   yql-dq-common
+  dq-integration-transform
   yql-dq-runtime
   providers-common-proto
   dq-api-protos
   providers-dq-common
   providers-dq-counters
-  providers-dq-interface
   providers-dq-task_runner
 )
 target_sources(providers-dq-runtime PRIVATE
diff --git a/ydb/library/yql/providers/dq/runtime/task_command_executor.h b/ydb/library/yql/providers/dq/runtime/task_command_executor.h
index 75f7c60177..fef0114c54 100644
--- a/ydb/library/yql/providers/dq/runtime/task_command_executor.h
+++ b/ydb/library/yql/providers/dq/runtime/task_command_executor.h
@@ -2,7 +2,7 @@
 
 #include <ydb/library/yql/minikql/computation/mkql_computation_node.h>
 #include <ydb/library/yql/minikql/mkql_stats_registry.h>
-#include <ydb/library/yql/providers/dq/interface/yql_dq_task_transform.h>
+#include <ydb/library/yql/dq/integration/transform/yql_dq_task_transform.h>
 
 namespace NYql {
 namespace NTaskRunnerProxy {
diff --git a/ydb/library/yql/providers/dq/task_runner/CMakeLists.darwin.txt b/ydb/library/yql/providers/dq/task_runner/CMakeLists.darwin.txt
index 229763f5f8..1ca5d50b77 100644
--- a/ydb/library/yql/providers/dq/task_runner/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/dq/task_runner/CMakeLists.darwin.txt
@@ -17,6 +17,7 @@ target_link_libraries(providers-dq-task_runner PUBLIC
   library-cpp-svnversion
   cpp-threading-task_scheduler
   cpp-yson-node
+  dq-integration-transform
   library-yql-minikql
   yql-minikql-computation
   yql-minikql-invoke_builtins
@@ -29,7 +30,6 @@ target_link_libraries(providers-dq-task_runner PUBLIC
   providers-common-proto
   dq-api-protos
   providers-dq-counters
-  providers-dq-interface
 )
 target_sources(providers-dq-task_runner PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/dq/task_runner/file_cache.cpp
diff --git a/ydb/library/yql/providers/dq/task_runner/CMakeLists.linux-aarch64.txt b/ydb/library/yql/providers/dq/task_runner/CMakeLists.linux-aarch64.txt
index b93cbe7750..a81fb238aa 100644
--- a/ydb/library/yql/providers/dq/task_runner/CMakeLists.linux-aarch64.txt
+++ b/ydb/library/yql/providers/dq/task_runner/CMakeLists.linux-aarch64.txt
@@ -18,6 +18,7 @@ target_link_libraries(providers-dq-task_runner PUBLIC
   library-cpp-svnversion
   cpp-threading-task_scheduler
   cpp-yson-node
+  dq-integration-transform
   library-yql-minikql
   yql-minikql-computation
   yql-minikql-invoke_builtins
@@ -30,7 +31,6 @@ target_link_libraries(providers-dq-task_runner PUBLIC
   providers-common-proto
   dq-api-protos
   providers-dq-counters
-  providers-dq-interface
 )
 target_sources(providers-dq-task_runner PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/dq/task_runner/file_cache.cpp
diff --git a/ydb/library/yql/providers/dq/task_runner/CMakeLists.linux.txt b/ydb/library/yql/providers/dq/task_runner/CMakeLists.linux.txt
index b93cbe7750..a81fb238aa 100644
--- a/ydb/library/yql/providers/dq/task_runner/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/dq/task_runner/CMakeLists.linux.txt
@@ -18,6 +18,7 @@ target_link_libraries(providers-dq-task_runner PUBLIC
   library-cpp-svnversion
   cpp-threading-task_scheduler
   cpp-yson-node
+  dq-integration-transform
   library-yql-minikql
   yql-minikql-computation
   yql-minikql-invoke_builtins
@@ -30,7 +31,6 @@ target_link_libraries(providers-dq-task_runner PUBLIC
   providers-common-proto
   dq-api-protos
   providers-dq-counters
-  providers-dq-interface
 )
 target_sources(providers-dq-task_runner PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/dq/task_runner/file_cache.cpp
diff --git a/ydb/library/yql/providers/dq/task_runner/tasks_runner_local.h b/ydb/library/yql/providers/dq/task_runner/tasks_runner_local.h
index 1702041a74..23fbb54b32 100644
--- a/ydb/library/yql/providers/dq/task_runner/tasks_runner_local.h
+++ b/ydb/library/yql/providers/dq/task_runner/tasks_runner_local.h
@@ -2,7 +2,7 @@
 
 #include "tasks_runner_proxy.h"
 
-#include <ydb/library/yql/providers/dq/interface/yql_dq_task_transform.h>
+#include <ydb/library/yql/dq/integration/transform/yql_dq_task_transform.h>
 
 namespace NYql::NTaskRunnerProxy {
 
diff --git a/ydb/library/yql/providers/dq/task_runner_actor/CMakeLists.darwin.txt b/ydb/library/yql/providers/dq/task_runner_actor/CMakeLists.darwin.txt
index b2333c31ff..f93dd43600 100644
--- a/ydb/library/yql/providers/dq/task_runner_actor/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/dq/task_runner_actor/CMakeLists.darwin.txt
@@ -16,6 +16,7 @@ target_link_libraries(providers-dq-task_runner_actor PUBLIC
   yutil
   cpp-actors-core
   dq-actors-task_runner
+  yql-dq-proto
   dq-api-protos
   providers-dq-runtime
   yql-utils-actors
diff --git a/ydb/library/yql/providers/dq/task_runner_actor/CMakeLists.linux-aarch64.txt b/ydb/library/yql/providers/dq/task_runner_actor/CMakeLists.linux-aarch64.txt
index 393d8ad6e4..765d66b19e 100644
--- a/ydb/library/yql/providers/dq/task_runner_actor/CMakeLists.linux-aarch64.txt
+++ b/ydb/library/yql/providers/dq/task_runner_actor/CMakeLists.linux-aarch64.txt
@@ -17,6 +17,7 @@ target_link_libraries(providers-dq-task_runner_actor PUBLIC
   yutil
   cpp-actors-core
   dq-actors-task_runner
+  yql-dq-proto
   dq-api-protos
   providers-dq-runtime
   yql-utils-actors
diff --git a/ydb/library/yql/providers/dq/task_runner_actor/CMakeLists.linux.txt b/ydb/library/yql/providers/dq/task_runner_actor/CMakeLists.linux.txt
index 393d8ad6e4..765d66b19e 100644
--- a/ydb/library/yql/providers/dq/task_runner_actor/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/dq/task_runner_actor/CMakeLists.linux.txt
@@ -17,6 +17,7 @@ target_link_libraries(providers-dq-task_runner_actor PUBLIC
   yutil
   cpp-actors-core
   dq-actors-task_runner
+  yql-dq-proto
   dq-api-protos
   providers-dq-runtime
   yql-utils-actors
diff --git a/ydb/library/yql/providers/function/provider/CMakeLists.darwin.txt b/ydb/library/yql/providers/function/provider/CMakeLists.darwin.txt
index 4ebb665f40..0ef405d0d9 100644
--- a/ydb/library/yql/providers/function/provider/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/function/provider/CMakeLists.darwin.txt
@@ -14,6 +14,7 @@ target_compile_options(providers-function-provider PRIVATE
 target_link_libraries(providers-function-provider PUBLIC
   contrib-libs-cxxsupp
   yutil
+  yql-dq-integration
   common-token_accessor-client
   providers-common-dq
   providers-common-provider
diff --git a/ydb/library/yql/providers/function/provider/CMakeLists.linux-aarch64.txt b/ydb/library/yql/providers/function/provider/CMakeLists.linux-aarch64.txt
index 4b48f3c607..bcc8d80873 100644
--- a/ydb/library/yql/providers/function/provider/CMakeLists.linux-aarch64.txt
+++ b/ydb/library/yql/providers/function/provider/CMakeLists.linux-aarch64.txt
@@ -15,6 +15,7 @@ target_link_libraries(providers-function-provider PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
+  yql-dq-integration
   common-token_accessor-client
   providers-common-dq
   providers-common-provider
diff --git a/ydb/library/yql/providers/function/provider/CMakeLists.linux.txt b/ydb/library/yql/providers/function/provider/CMakeLists.linux.txt
index 4b48f3c607..bcc8d80873 100644
--- a/ydb/library/yql/providers/function/provider/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/function/provider/CMakeLists.linux.txt
@@ -15,6 +15,7 @@ target_link_libraries(providers-function-provider PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
+  yql-dq-integration
   common-token_accessor-client
   providers-common-dq
   providers-common-provider
diff --git a/ydb/library/yql/providers/function/provider/dq_function_provider_impl.h b/ydb/library/yql/providers/function/provider/dq_function_provider_impl.h
index 0995a84bad..53509665d0 100644
--- a/ydb/library/yql/providers/function/provider/dq_function_provider_impl.h
+++ b/ydb/library/yql/providers/function/provider/dq_function_provider_impl.h
@@ -4,7 +4,7 @@
 
 #include <ydb/library/yql/providers/common/transform/yql_visit.h>
 #include <ydb/library/yql/core/yql_graph_transformer.h>
-#include <ydb/library/yql/providers/dq/interface/yql_dq_integration.h>
+#include <ydb/library/yql/dq/integration/yql_dq_integration.h>
 
 namespace NYql::NDqFunction {
 
@@ -14,4 +14,4 @@ THolder<IGraphTransformer> CreateDqFunctionPhysicalOptTransformer(TDqFunctionSta
 THolder<IDqIntegration> CreateDqFunctionDqIntegration(TDqFunctionState::TPtr state);
 THolder<TVisitorTransformerBase> CreateDqFunctionTypeAnnotation(TDqFunctionState::TPtr state);
 
-}
\ No newline at end of file
+}
diff --git a/ydb/library/yql/providers/pq/provider/CMakeLists.darwin.txt b/ydb/library/yql/providers/pq/provider/CMakeLists.darwin.txt
index e0f0f83c38..3a6bc45d3b 100644
--- a/ydb/library/yql/providers/pq/provider/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/pq/provider/CMakeLists.darwin.txt
@@ -27,6 +27,7 @@ target_link_libraries(providers-pq-provider PUBLIC
   library-yql-core
   yql-core-type_ann
   yql-dq-expr_nodes
+  yql-dq-integration
   yql-dq-opt
   providers-common-config
   providers-common-dq
@@ -35,7 +36,6 @@ target_link_libraries(providers-pq-provider PUBLIC
   providers-common-transform
   providers-dq-common
   providers-dq-expr_nodes
-  providers-dq-interface
   dq-provider-exec
   providers-pq-cm_client
   providers-pq-common
diff --git a/ydb/library/yql/providers/pq/provider/CMakeLists.linux-aarch64.txt b/ydb/library/yql/providers/pq/provider/CMakeLists.linux-aarch64.txt
index b0a7dac9f4..d0ad269949 100644
--- a/ydb/library/yql/providers/pq/provider/CMakeLists.linux-aarch64.txt
+++ b/ydb/library/yql/providers/pq/provider/CMakeLists.linux-aarch64.txt
@@ -28,6 +28,7 @@ target_link_libraries(providers-pq-provider PUBLIC
   library-yql-core
   yql-core-type_ann
   yql-dq-expr_nodes
+  yql-dq-integration
   yql-dq-opt
   providers-common-config
   providers-common-dq
@@ -36,7 +37,6 @@ target_link_libraries(providers-pq-provider PUBLIC
   providers-common-transform
   providers-dq-common
   providers-dq-expr_nodes
-  providers-dq-interface
   dq-provider-exec
   providers-pq-cm_client
   providers-pq-common
diff --git a/ydb/library/yql/providers/pq/provider/CMakeLists.linux.txt b/ydb/library/yql/providers/pq/provider/CMakeLists.linux.txt
index b0a7dac9f4..d0ad269949 100644
--- a/ydb/library/yql/providers/pq/provider/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/pq/provider/CMakeLists.linux.txt
@@ -28,6 +28,7 @@ target_link_libraries(providers-pq-provider PUBLIC
   library-yql-core
   yql-core-type_ann
   yql-dq-expr_nodes
+  yql-dq-integration
   yql-dq-opt
   providers-common-config
   providers-common-dq
@@ -36,7 +37,6 @@ target_link_libraries(providers-pq-provider PUBLIC
   providers-common-transform
   providers-dq-common
   providers-dq-expr_nodes
-  providers-dq-interface
   dq-provider-exec
   providers-pq-cm_client
   providers-pq-common
diff --git a/ydb/library/yql/providers/pq/provider/yql_pq_dq_integration.h b/ydb/library/yql/providers/pq/provider/yql_pq_dq_integration.h
index 81236079cb..2fb3eda99d 100644
--- a/ydb/library/yql/providers/pq/provider/yql_pq_dq_integration.h
+++ b/ydb/library/yql/providers/pq/provider/yql_pq_dq_integration.h
@@ -2,7 +2,7 @@
 
 #include "yql_pq_provider.h"
 
-#include <ydb/library/yql/providers/dq/interface/yql_dq_integration.h>
+#include <ydb/library/yql/dq/integration/yql_dq_integration.h>
 
 #include <util/generic/ptr.h>
 
diff --git a/ydb/library/yql/providers/pq/provider/yql_pq_provider.h b/ydb/library/yql/providers/pq/provider/yql_pq_provider.h
index bc9b4872c2..fa6d6077ec 100644
--- a/ydb/library/yql/providers/pq/provider/yql_pq_provider.h
+++ b/ydb/library/yql/providers/pq/provider/yql_pq_provider.h
@@ -3,7 +3,7 @@
 #include "yql_pq_gateway.h"
 
 #include <ydb/library/yql/core/yql_data_provider.h>
-#include <ydb/library/yql/providers/dq/interface/yql_dq_integration.h>
+#include <ydb/library/yql/dq/integration/yql_dq_integration.h>
 #include <ydb/library/yql/providers/pq/expr_nodes/yql_pq_expr_nodes.h>
 #include <ydb/library/yql/providers/common/db_id_async_resolver/db_async_resolver.h>
 
diff --git a/ydb/library/yql/providers/s3/provider/CMakeLists.darwin.txt b/ydb/library/yql/providers/s3/provider/CMakeLists.darwin.txt
index 99e87b35a4..83a19eed84 100644
--- a/ydb/library/yql/providers/s3/provider/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/s3/provider/CMakeLists.darwin.txt
@@ -26,6 +26,7 @@ target_link_libraries(providers-s3-provider PUBLIC
   library-yql-core
   yql-core-type_ann
   yql-dq-expr_nodes
+  yql-dq-integration
   library-yql-minikql
   yql-minikql-comp_nodes
   yql-minikql-computation
@@ -41,7 +42,6 @@ target_link_libraries(providers-s3-provider PUBLIC
   providers-common-transform
   providers-dq-common
   providers-dq-expr_nodes
-  providers-dq-interface
   providers-result-expr_nodes
   providers-s3-common
   providers-s3-expr_nodes
diff --git a/ydb/library/yql/providers/s3/provider/CMakeLists.linux-aarch64.txt b/ydb/library/yql/providers/s3/provider/CMakeLists.linux-aarch64.txt
index 0ecfc86637..f75614e737 100644
--- a/ydb/library/yql/providers/s3/provider/CMakeLists.linux-aarch64.txt
+++ b/ydb/library/yql/providers/s3/provider/CMakeLists.linux-aarch64.txt
@@ -27,6 +27,7 @@ target_link_libraries(providers-s3-provider PUBLIC
   library-yql-core
   yql-core-type_ann
   yql-dq-expr_nodes
+  yql-dq-integration
   library-yql-minikql
   yql-minikql-comp_nodes
   yql-minikql-computation
@@ -42,7 +43,6 @@ target_link_libraries(providers-s3-provider PUBLIC
   providers-common-transform
   providers-dq-common
   providers-dq-expr_nodes
-  providers-dq-interface
   providers-result-expr_nodes
   providers-s3-common
   providers-s3-expr_nodes
diff --git a/ydb/library/yql/providers/s3/provider/CMakeLists.linux.txt b/ydb/library/yql/providers/s3/provider/CMakeLists.linux.txt
index 0ecfc86637..f75614e737 100644
--- a/ydb/library/yql/providers/s3/provider/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/s3/provider/CMakeLists.linux.txt
@@ -27,6 +27,7 @@ target_link_libraries(providers-s3-provider PUBLIC
   library-yql-core
   yql-core-type_ann
   yql-dq-expr_nodes
+  yql-dq-integration
   library-yql-minikql
   yql-minikql-comp_nodes
   yql-minikql-computation
@@ -42,7 +43,6 @@ target_link_libraries(providers-s3-provider PUBLIC
   providers-common-transform
   providers-dq-common
   providers-dq-expr_nodes
-  providers-dq-interface
   providers-result-expr_nodes
   providers-s3-common
   providers-s3-expr_nodes
diff --git a/ydb/library/yql/providers/s3/provider/yql_s3_dq_integration.h b/ydb/library/yql/providers/s3/provider/yql_s3_dq_integration.h
index 09ecd4fbfb..fd3382ce78 100644
--- a/ydb/library/yql/providers/s3/provider/yql_s3_dq_integration.h
+++ b/ydb/library/yql/providers/s3/provider/yql_s3_dq_integration.h
@@ -2,7 +2,7 @@
 
 #include "yql_s3_provider.h"
 
-#include <ydb/library/yql/providers/dq/interface/yql_dq_integration.h>
+#include <ydb/library/yql/dq/integration/yql_dq_integration.h>
 
 #include <util/generic/ptr.h>
 
diff --git a/ydb/library/yql/providers/solomon/provider/CMakeLists.darwin.txt b/ydb/library/yql/providers/solomon/provider/CMakeLists.darwin.txt
index 6097509834..03f51c5c1e 100644
--- a/ydb/library/yql/providers/solomon/provider/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/solomon/provider/CMakeLists.darwin.txt
@@ -16,6 +16,7 @@ target_link_libraries(providers-solomon-provider PUBLIC
   yutil
   cpp-actors-protos
   yql-dq-expr_nodes
+  yql-dq-integration
   providers-common-config
   providers-common-proto
   providers-common-provider
diff --git a/ydb/library/yql/providers/solomon/provider/CMakeLists.linux-aarch64.txt b/ydb/library/yql/providers/solomon/provider/CMakeLists.linux-aarch64.txt
index be7b49d095..ed8c26d47e 100644
--- a/ydb/library/yql/providers/solomon/provider/CMakeLists.linux-aarch64.txt
+++ b/ydb/library/yql/providers/solomon/provider/CMakeLists.linux-aarch64.txt
@@ -17,6 +17,7 @@ target_link_libraries(providers-solomon-provider PUBLIC
   yutil
   cpp-actors-protos
   yql-dq-expr_nodes
+  yql-dq-integration
   providers-common-config
   providers-common-proto
   providers-common-provider
diff --git a/ydb/library/yql/providers/solomon/provider/CMakeLists.linux.txt b/ydb/library/yql/providers/solomon/provider/CMakeLists.linux.txt
index be7b49d095..ed8c26d47e 100644
--- a/ydb/library/yql/providers/solomon/provider/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/solomon/provider/CMakeLists.linux.txt
@@ -17,6 +17,7 @@ target_link_libraries(providers-solomon-provider PUBLIC
   yutil
   cpp-actors-protos
   yql-dq-expr_nodes
+  yql-dq-integration
   providers-common-config
   providers-common-proto
   providers-common-provider
diff --git a/ydb/library/yql/providers/solomon/provider/yql_solomon_dq_integration.h b/ydb/library/yql/providers/solomon/provider/yql_solomon_dq_integration.h
index 7a621caff1..90ed9c88f7 100644
--- a/ydb/library/yql/providers/solomon/provider/yql_solomon_dq_integration.h
+++ b/ydb/library/yql/providers/solomon/provider/yql_solomon_dq_integration.h
@@ -2,7 +2,7 @@
 
 #include "yql_solomon_provider.h"
 
-#include <ydb/library/yql/providers/dq/interface/yql_dq_integration.h>
+#include <ydb/library/yql/dq/integration/yql_dq_integration.h>
 
 #include <util/generic/ptr.h>
 
diff --git a/ydb/library/yql/providers/ydb/comp_nodes/yql_ydb_dq_transform.h b/ydb/library/yql/providers/ydb/comp_nodes/yql_ydb_dq_transform.h
index 0055de7aa2..7e2bcddfde 100644
--- a/ydb/library/yql/providers/ydb/comp_nodes/yql_ydb_dq_transform.h
+++ b/ydb/library/yql/providers/ydb/comp_nodes/yql_ydb_dq_transform.h
@@ -1,10 +1,9 @@
 #pragma once
 
-#include <ydb/library/yql/providers/dq/interface/yql_dq_task_transform.h>
+#include <ydb/library/yql/dq/integration/transform/yql_dq_task_transform.h>
 
 namespace NYql {
 
 TTaskTransformFactory CreateYdbDqTaskTransformFactory();
 
 }
-
diff --git a/ydb/library/yql/providers/ydb/provider/CMakeLists.darwin.txt b/ydb/library/yql/providers/ydb/provider/CMakeLists.darwin.txt
index 08ef8f84dc..bfd7474921 100644
--- a/ydb/library/yql/providers/ydb/provider/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/ydb/provider/CMakeLists.darwin.txt
@@ -30,6 +30,7 @@ target_link_libraries(providers-ydb-provider PUBLIC
   library-yql-core
   yql-core-type_ann
   yql-dq-expr_nodes
+  yql-dq-integration
   providers-common-config
   providers-common-db_id_async_resolver
   providers-common-dq
@@ -40,7 +41,6 @@ target_link_libraries(providers-ydb-provider PUBLIC
   providers-common-transform
   providers-dq-common
   providers-dq-expr_nodes
-  providers-dq-interface
   providers-result-expr_nodes
   providers-ydb-expr_nodes
   providers-ydb-proto
diff --git a/ydb/library/yql/providers/ydb/provider/CMakeLists.linux-aarch64.txt b/ydb/library/yql/providers/ydb/provider/CMakeLists.linux-aarch64.txt
index c0079f995e..f849a5b064 100644
--- a/ydb/library/yql/providers/ydb/provider/CMakeLists.linux-aarch64.txt
+++ b/ydb/library/yql/providers/ydb/provider/CMakeLists.linux-aarch64.txt
@@ -31,6 +31,7 @@ target_link_libraries(providers-ydb-provider PUBLIC
   library-yql-core
   yql-core-type_ann
   yql-dq-expr_nodes
+  yql-dq-integration
   providers-common-config
   providers-common-db_id_async_resolver
   providers-common-dq
@@ -41,7 +42,6 @@ target_link_libraries(providers-ydb-provider PUBLIC
   providers-common-transform
   providers-dq-common
   providers-dq-expr_nodes
-  providers-dq-interface
   providers-result-expr_nodes
   providers-ydb-expr_nodes
   providers-ydb-proto
diff --git a/ydb/library/yql/providers/ydb/provider/CMakeLists.linux.txt b/ydb/library/yql/providers/ydb/provider/CMakeLists.linux.txt
index c0079f995e..f849a5b064 100644
--- a/ydb/library/yql/providers/ydb/provider/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/ydb/provider/CMakeLists.linux.txt
@@ -31,6 +31,7 @@ target_link_libraries(providers-ydb-provider PUBLIC
   library-yql-core
   yql-core-type_ann
   yql-dq-expr_nodes
+  yql-dq-integration
   providers-common-config
   providers-common-db_id_async_resolver
   providers-common-dq
@@ -41,7 +42,6 @@ target_link_libraries(providers-ydb-provider PUBLIC
   providers-common-transform
   providers-dq-common
   providers-dq-expr_nodes
-  providers-dq-interface
   providers-result-expr_nodes
   providers-ydb-expr_nodes
   providers-ydb-proto
diff --git a/ydb/library/yql/providers/ydb/provider/yql_ydb_dq_integration.h b/ydb/library/yql/providers/ydb/provider/yql_ydb_dq_integration.h
index 417e977923..1b8f3a6c8c 100644
--- a/ydb/library/yql/providers/ydb/provider/yql_ydb_dq_integration.h
+++ b/ydb/library/yql/providers/ydb/provider/yql_ydb_dq_integration.h
@@ -2,7 +2,7 @@
 
 #include "yql_ydb_provider.h"
 
-#include <ydb/library/yql/providers/dq/interface/yql_dq_integration.h>
+#include <ydb/library/yql/dq/integration/yql_dq_integration.h>
 
 #include <util/generic/ptr.h>