YQL-15941 Refactoring: move some code in correct place and fix deps.

86 files changed, 141 insertions, 95 deletions

diff --git a/ydb/core/kqp/run_script_actor/ut/CMakeLists.darwin-x86_64.txt b/ydb/core/kqp/run_script_actor/ut/CMakeLists.darwin-x86_64.txt
index fb0cde92da..abd531632f 100644
--- a/ydb/core/kqp/run_script_actor/ut/CMakeLists.darwin-x86_64.txt
+++ b/ydb/core/kqp/run_script_actor/ut/CMakeLists.darwin-x86_64.txt
@@ -24,6 +24,7 @@ target_link_libraries(ydb-core-kqp-run_script_actor-ut PUBLIC
   ydb-core-kqp
   kqp-ut-common
   yql-sql-pg
+  yql-parser-pg_wrapper
   cpp-client-ydb_operation
   client-ydb_types-operation
 )
diff --git a/ydb/core/kqp/run_script_actor/ut/CMakeLists.linux-aarch64.txt b/ydb/core/kqp/run_script_actor/ut/CMakeLists.linux-aarch64.txt
index c1ba15b91d..da508d9d69 100644
--- a/ydb/core/kqp/run_script_actor/ut/CMakeLists.linux-aarch64.txt
+++ b/ydb/core/kqp/run_script_actor/ut/CMakeLists.linux-aarch64.txt
@@ -24,6 +24,7 @@ target_link_libraries(ydb-core-kqp-run_script_actor-ut PUBLIC
   ydb-core-kqp
   kqp-ut-common
   yql-sql-pg
+  yql-parser-pg_wrapper
   cpp-client-ydb_operation
   client-ydb_types-operation
 )
diff --git a/ydb/core/kqp/run_script_actor/ut/CMakeLists.linux-x86_64.txt b/ydb/core/kqp/run_script_actor/ut/CMakeLists.linux-x86_64.txt
index 90991ca609..d20b2bde7e 100644
--- a/ydb/core/kqp/run_script_actor/ut/CMakeLists.linux-x86_64.txt
+++ b/ydb/core/kqp/run_script_actor/ut/CMakeLists.linux-x86_64.txt
@@ -25,6 +25,7 @@ target_link_libraries(ydb-core-kqp-run_script_actor-ut PUBLIC
   ydb-core-kqp
   kqp-ut-common
   yql-sql-pg
+  yql-parser-pg_wrapper
   cpp-client-ydb_operation
   client-ydb_types-operation
 )
diff --git a/ydb/core/kqp/run_script_actor/ut/CMakeLists.windows-x86_64.txt b/ydb/core/kqp/run_script_actor/ut/CMakeLists.windows-x86_64.txt
index 13f5dbd403..ade7244716 100644
--- a/ydb/core/kqp/run_script_actor/ut/CMakeLists.windows-x86_64.txt
+++ b/ydb/core/kqp/run_script_actor/ut/CMakeLists.windows-x86_64.txt
@@ -24,6 +24,7 @@ target_link_libraries(ydb-core-kqp-run_script_actor-ut PUBLIC
   ydb-core-kqp
   kqp-ut-common
   yql-sql-pg
+  yql-parser-pg_wrapper
   cpp-client-ydb_operation
   client-ydb_types-operation
 )
diff --git a/ydb/core/kqp/run_script_actor/ut/ya.make b/ydb/core/kqp/run_script_actor/ut/ya.make
index affac6f148..35dc226aeb 100644
--- a/ydb/core/kqp/run_script_actor/ut/ya.make
+++ b/ydb/core/kqp/run_script_actor/ut/ya.make
@@ -14,10 +14,11 @@ PEERDIR(
     ydb/core/kqp
     ydb/core/kqp/ut/common
     ydb/library/yql/sql/pg
+    ydb/library/yql/parser/pg_wrapper
     ydb/public/sdk/cpp/client/ydb_operation
     ydb/public/sdk/cpp/client/ydb_types/operation
 )
 
 YQL_LAST_ABI_VERSION()
 
-END()
\ No newline at end of file
+END()
diff --git a/ydb/core/kqp/ut/opt/CMakeLists.darwin-x86_64.txt b/ydb/core/kqp/ut/opt/CMakeLists.darwin-x86_64.txt
index b4756b8e8f..6698f154e3 100644
--- a/ydb/core/kqp/ut/opt/CMakeLists.darwin-x86_64.txt
+++ b/ydb/core/kqp/ut/opt/CMakeLists.darwin-x86_64.txt
@@ -24,6 +24,7 @@ target_link_libraries(ydb-core-kqp-ut-opt PUBLIC
   ydb-core-kqp
   kqp-ut-common
   yql-sql-pg
+  yql-parser-pg_wrapper
   re2_udf
 )
 target_link_options(ydb-core-kqp-ut-opt PRIVATE
diff --git a/ydb/core/kqp/ut/opt/CMakeLists.linux-aarch64.txt b/ydb/core/kqp/ut/opt/CMakeLists.linux-aarch64.txt
index 7e41ceeb34..7573c704e6 100644
--- a/ydb/core/kqp/ut/opt/CMakeLists.linux-aarch64.txt
+++ b/ydb/core/kqp/ut/opt/CMakeLists.linux-aarch64.txt
@@ -24,6 +24,7 @@ target_link_libraries(ydb-core-kqp-ut-opt PUBLIC
   ydb-core-kqp
   kqp-ut-common
   yql-sql-pg
+  yql-parser-pg_wrapper
   re2_udf
 )
 target_link_options(ydb-core-kqp-ut-opt PRIVATE
diff --git a/ydb/core/kqp/ut/opt/CMakeLists.linux-x86_64.txt b/ydb/core/kqp/ut/opt/CMakeLists.linux-x86_64.txt
index 0ad33099d5..a50261610f 100644
--- a/ydb/core/kqp/ut/opt/CMakeLists.linux-x86_64.txt
+++ b/ydb/core/kqp/ut/opt/CMakeLists.linux-x86_64.txt
@@ -25,6 +25,7 @@ target_link_libraries(ydb-core-kqp-ut-opt PUBLIC
   ydb-core-kqp
   kqp-ut-common
   yql-sql-pg
+  yql-parser-pg_wrapper
   re2_udf
 )
 target_link_options(ydb-core-kqp-ut-opt PRIVATE
diff --git a/ydb/core/kqp/ut/opt/CMakeLists.windows-x86_64.txt b/ydb/core/kqp/ut/opt/CMakeLists.windows-x86_64.txt
index dd2804c278..fbe3b550fe 100644
--- a/ydb/core/kqp/ut/opt/CMakeLists.windows-x86_64.txt
+++ b/ydb/core/kqp/ut/opt/CMakeLists.windows-x86_64.txt
@@ -24,6 +24,7 @@ target_link_libraries(ydb-core-kqp-ut-opt PUBLIC
   ydb-core-kqp
   kqp-ut-common
   yql-sql-pg
+  yql-parser-pg_wrapper
   re2_udf
 )
 target_sources(ydb-core-kqp-ut-opt PRIVATE
diff --git a/ydb/core/kqp/ut/opt/ya.make b/ydb/core/kqp/ut/opt/ya.make
index f6b800a0b4..84332bad6d 100644
--- a/ydb/core/kqp/ut/opt/ya.make
+++ b/ydb/core/kqp/ut/opt/ya.make
@@ -27,6 +27,7 @@ PEERDIR(
     ydb/core/kqp
     ydb/core/kqp/ut/common
     ydb/library/yql/sql/pg
+    ydb/library/yql/parser/pg_wrapper
     ydb/library/yql/udfs/common/re2
 )
 
diff --git a/ydb/core/kqp/ut/pg/CMakeLists.darwin-x86_64.txt b/ydb/core/kqp/ut/pg/CMakeLists.darwin-x86_64.txt
index 4eb8ac3dee..29dec7a4f8 100644
--- a/ydb/core/kqp/ut/pg/CMakeLists.darwin-x86_64.txt
+++ b/ydb/core/kqp/ut/pg/CMakeLists.darwin-x86_64.txt
@@ -25,6 +25,7 @@ target_link_libraries(ydb-core-kqp-ut-pg PUBLIC
   kqp-ut-common
   udf-service-exception_policy
   yql-sql-pg
+  yql-parser-pg_wrapper
 )
 target_link_options(ydb-core-kqp-ut-pg PRIVATE
   -Wl,-platform_version,macos,11.0,11.0
diff --git a/ydb/core/kqp/ut/pg/CMakeLists.linux-aarch64.txt b/ydb/core/kqp/ut/pg/CMakeLists.linux-aarch64.txt
index 74f5b31863..f1e343b4e6 100644
--- a/ydb/core/kqp/ut/pg/CMakeLists.linux-aarch64.txt
+++ b/ydb/core/kqp/ut/pg/CMakeLists.linux-aarch64.txt
@@ -25,6 +25,7 @@ target_link_libraries(ydb-core-kqp-ut-pg PUBLIC
   kqp-ut-common
   udf-service-exception_policy
   yql-sql-pg
+  yql-parser-pg_wrapper
 )
 target_link_options(ydb-core-kqp-ut-pg PRIVATE
   -ldl
diff --git a/ydb/core/kqp/ut/pg/CMakeLists.linux-x86_64.txt b/ydb/core/kqp/ut/pg/CMakeLists.linux-x86_64.txt
index b0d4df74c2..68faa3cc67 100644
--- a/ydb/core/kqp/ut/pg/CMakeLists.linux-x86_64.txt
+++ b/ydb/core/kqp/ut/pg/CMakeLists.linux-x86_64.txt
@@ -26,6 +26,7 @@ target_link_libraries(ydb-core-kqp-ut-pg PUBLIC
   kqp-ut-common
   udf-service-exception_policy
   yql-sql-pg
+  yql-parser-pg_wrapper
 )
 target_link_options(ydb-core-kqp-ut-pg PRIVATE
   -ldl
diff --git a/ydb/core/kqp/ut/pg/CMakeLists.windows-x86_64.txt b/ydb/core/kqp/ut/pg/CMakeLists.windows-x86_64.txt
index f92072e535..6e99fa7cf8 100644
--- a/ydb/core/kqp/ut/pg/CMakeLists.windows-x86_64.txt
+++ b/ydb/core/kqp/ut/pg/CMakeLists.windows-x86_64.txt
@@ -28,6 +28,7 @@ target_link_libraries(ydb-core-kqp-ut-pg PUBLIC
   kqp-ut-common
   udf-service-exception_policy
   yql-sql-pg
+  yql-parser-pg_wrapper
 )
 target_sources(ydb-core-kqp-ut-pg PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/pg/kqp_pg_ut.cpp
diff --git a/ydb/core/kqp/ut/pg/ya.make b/ydb/core/kqp/ut/pg/ya.make
index b05c4cfa3c..df0b5e115a 100644
--- a/ydb/core/kqp/ut/pg/ya.make
+++ b/ydb/core/kqp/ut/pg/ya.make
@@ -12,6 +12,7 @@ PEERDIR(
     ydb/core/kqp/ut/common
     ydb/library/yql/public/udf/service/exception_policy
     ydb/library/yql/sql/pg
+    ydb/library/yql/parser/pg_wrapper
 )
 
 ADDINCL(
diff --git a/ydb/core/kqp/ut/service/CMakeLists.darwin-x86_64.txt b/ydb/core/kqp/ut/service/CMakeLists.darwin-x86_64.txt
index 4ccaedc03a..ac0ed13bd7 100644
--- a/ydb/core/kqp/ut/service/CMakeLists.darwin-x86_64.txt
+++ b/ydb/core/kqp/ut/service/CMakeLists.darwin-x86_64.txt
@@ -23,6 +23,7 @@ target_link_libraries(ydb-core-kqp-ut-service PUBLIC
   cpp-threading-local_executor
   kqp-ut-common
   yql-sql-pg
+  yql-parser-pg_wrapper
   cpp-client-ydb_operation
   client-ydb_types-operation
 )
diff --git a/ydb/core/kqp/ut/service/CMakeLists.linux-aarch64.txt b/ydb/core/kqp/ut/service/CMakeLists.linux-aarch64.txt
index 2dbc0e745e..1198c83320 100644
--- a/ydb/core/kqp/ut/service/CMakeLists.linux-aarch64.txt
+++ b/ydb/core/kqp/ut/service/CMakeLists.linux-aarch64.txt
@@ -23,6 +23,7 @@ target_link_libraries(ydb-core-kqp-ut-service PUBLIC
   cpp-threading-local_executor
   kqp-ut-common
   yql-sql-pg
+  yql-parser-pg_wrapper
   cpp-client-ydb_operation
   client-ydb_types-operation
 )
diff --git a/ydb/core/kqp/ut/service/CMakeLists.linux-x86_64.txt b/ydb/core/kqp/ut/service/CMakeLists.linux-x86_64.txt
index 2fc3af90dc..457477a5d6 100644
--- a/ydb/core/kqp/ut/service/CMakeLists.linux-x86_64.txt
+++ b/ydb/core/kqp/ut/service/CMakeLists.linux-x86_64.txt
@@ -24,6 +24,7 @@ target_link_libraries(ydb-core-kqp-ut-service PUBLIC
   cpp-threading-local_executor
   kqp-ut-common
   yql-sql-pg
+  yql-parser-pg_wrapper
   cpp-client-ydb_operation
   client-ydb_types-operation
 )
diff --git a/ydb/core/kqp/ut/service/CMakeLists.windows-x86_64.txt b/ydb/core/kqp/ut/service/CMakeLists.windows-x86_64.txt
index 4cb934efc3..10ef8e0ce5 100644
--- a/ydb/core/kqp/ut/service/CMakeLists.windows-x86_64.txt
+++ b/ydb/core/kqp/ut/service/CMakeLists.windows-x86_64.txt
@@ -23,6 +23,7 @@ target_link_libraries(ydb-core-kqp-ut-service PUBLIC
   cpp-threading-local_executor
   kqp-ut-common
   yql-sql-pg
+  yql-parser-pg_wrapper
   cpp-client-ydb_operation
   client-ydb_types-operation
 )
diff --git a/ydb/core/kqp/ut/service/ya.make b/ydb/core/kqp/ut/service/ya.make
index a5df857c98..64135e8217 100644
--- a/ydb/core/kqp/ut/service/ya.make
+++ b/ydb/core/kqp/ut/service/ya.make
@@ -23,6 +23,7 @@ PEERDIR(
     ydb/core/kqp
     ydb/core/kqp/ut/common
     ydb/library/yql/sql/pg
+    ydb/library/yql/parser/pg_wrapper
     ydb/public/sdk/cpp/client/ydb_operation
     ydb/public/sdk/cpp/client/ydb_types/operation
 )
diff --git a/ydb/core/tablet_flat/ut_pg/CMakeLists.darwin-x86_64.txt b/ydb/core/tablet_flat/ut_pg/CMakeLists.darwin-x86_64.txt
index d18b8a5c8d..5c80d5a5fb 100644
--- a/ydb/core/tablet_flat/ut_pg/CMakeLists.darwin-x86_64.txt
+++ b/ydb/core/tablet_flat/ut_pg/CMakeLists.darwin-x86_64.txt
@@ -26,6 +26,7 @@ target_link_libraries(ydb-core-tablet_flat-ut_pg PUBLIC
   test-libs-table
   udf-service-exception_policy
   yql-sql-pg
+  yql-parser-pg_wrapper
 )
 target_link_options(ydb-core-tablet_flat-ut_pg PRIVATE
   -Wl,-platform_version,macos,11.0,11.0
diff --git a/ydb/core/tablet_flat/ut_pg/CMakeLists.linux-aarch64.txt b/ydb/core/tablet_flat/ut_pg/CMakeLists.linux-aarch64.txt
index 7bc4caad8e..5f5ea010ab 100644
--- a/ydb/core/tablet_flat/ut_pg/CMakeLists.linux-aarch64.txt
+++ b/ydb/core/tablet_flat/ut_pg/CMakeLists.linux-aarch64.txt
@@ -26,6 +26,7 @@ target_link_libraries(ydb-core-tablet_flat-ut_pg PUBLIC
   test-libs-table
   udf-service-exception_policy
   yql-sql-pg
+  yql-parser-pg_wrapper
 )
 target_link_options(ydb-core-tablet_flat-ut_pg PRIVATE
   -ldl
diff --git a/ydb/core/tablet_flat/ut_pg/CMakeLists.linux-x86_64.txt b/ydb/core/tablet_flat/ut_pg/CMakeLists.linux-x86_64.txt
index a0261bfb89..1a1d324e73 100644
--- a/ydb/core/tablet_flat/ut_pg/CMakeLists.linux-x86_64.txt
+++ b/ydb/core/tablet_flat/ut_pg/CMakeLists.linux-x86_64.txt
@@ -27,6 +27,7 @@ target_link_libraries(ydb-core-tablet_flat-ut_pg PUBLIC
   test-libs-table
   udf-service-exception_policy
   yql-sql-pg
+  yql-parser-pg_wrapper
 )
 target_link_options(ydb-core-tablet_flat-ut_pg PRIVATE
   -ldl
diff --git a/ydb/core/tablet_flat/ut_pg/CMakeLists.windows-x86_64.txt b/ydb/core/tablet_flat/ut_pg/CMakeLists.windows-x86_64.txt
index 12c870733e..9f55862ee2 100644
--- a/ydb/core/tablet_flat/ut_pg/CMakeLists.windows-x86_64.txt
+++ b/ydb/core/tablet_flat/ut_pg/CMakeLists.windows-x86_64.txt
@@ -29,6 +29,7 @@ target_link_libraries(ydb-core-tablet_flat-ut_pg PUBLIC
   test-libs-table
   udf-service-exception_policy
   yql-sql-pg
+  yql-parser-pg_wrapper
 )
 target_sources(ydb-core-tablet_flat-ut_pg PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/tablet_flat/ut_pg/flat_database_pg_ut.cpp
diff --git a/ydb/core/tablet_flat/ut_pg/ya.make b/ydb/core/tablet_flat/ut_pg/ya.make
index ba4473520e..9b6e02a1a4 100644
--- a/ydb/core/tablet_flat/ut_pg/ya.make
+++ b/ydb/core/tablet_flat/ut_pg/ya.make
@@ -11,6 +11,7 @@ PEERDIR(
     ydb/core/tablet_flat/test/libs/table
     ydb/library/yql/public/udf/service/exception_policy
     ydb/library/yql/sql/pg
+    ydb/library/yql/parser/pg_wrapper
 )
 
 ADDINCL(
diff --git a/ydb/core/testlib/pg/CMakeLists.darwin-x86_64.txt b/ydb/core/testlib/pg/CMakeLists.darwin-x86_64.txt
index 7d263fa4af..8a60ddd183 100644
--- a/ydb/core/testlib/pg/CMakeLists.darwin-x86_64.txt
+++ b/ydb/core/testlib/pg/CMakeLists.darwin-x86_64.txt
@@ -13,4 +13,5 @@ target_link_libraries(core-testlib-pg INTERFACE
   yutil
   ydb-core-testlib
   yql-sql-pg
+  yql-parser-pg_wrapper
 )
diff --git a/ydb/core/testlib/pg/CMakeLists.linux-aarch64.txt b/ydb/core/testlib/pg/CMakeLists.linux-aarch64.txt
index 89512dce03..6ae9d60fea 100644
--- a/ydb/core/testlib/pg/CMakeLists.linux-aarch64.txt
+++ b/ydb/core/testlib/pg/CMakeLists.linux-aarch64.txt
@@ -14,4 +14,5 @@ target_link_libraries(core-testlib-pg INTERFACE
   yutil
   ydb-core-testlib
   yql-sql-pg
+  yql-parser-pg_wrapper
 )
diff --git a/ydb/core/testlib/pg/CMakeLists.linux-x86_64.txt b/ydb/core/testlib/pg/CMakeLists.linux-x86_64.txt
index 89512dce03..6ae9d60fea 100644
--- a/ydb/core/testlib/pg/CMakeLists.linux-x86_64.txt
+++ b/ydb/core/testlib/pg/CMakeLists.linux-x86_64.txt
@@ -14,4 +14,5 @@ target_link_libraries(core-testlib-pg INTERFACE
   yutil
   ydb-core-testlib
   yql-sql-pg
+  yql-parser-pg_wrapper
 )
diff --git a/ydb/core/testlib/pg/CMakeLists.windows-x86_64.txt b/ydb/core/testlib/pg/CMakeLists.windows-x86_64.txt
index 7d263fa4af..8a60ddd183 100644
--- a/ydb/core/testlib/pg/CMakeLists.windows-x86_64.txt
+++ b/ydb/core/testlib/pg/CMakeLists.windows-x86_64.txt
@@ -13,4 +13,5 @@ target_link_libraries(core-testlib-pg INTERFACE
   yutil
   ydb-core-testlib
   yql-sql-pg
+  yql-parser-pg_wrapper
 )
diff --git a/ydb/core/testlib/pg/ya.make b/ydb/core/testlib/pg/ya.make
index 0b062ba739..95b49bc37f 100644
--- a/ydb/core/testlib/pg/ya.make
+++ b/ydb/core/testlib/pg/ya.make
@@ -3,6 +3,7 @@ LIBRARY()
 PEERDIR(
     ydb/core/testlib
     ydb/library/yql/sql/pg
+    ydb/library/yql/parser/pg_wrapper
 )
 
 END()
diff --git a/ydb/library/yql/minikql/comp_nodes/llvm/CMakeLists.darwin-x86_64.txt b/ydb/library/yql/minikql/comp_nodes/llvm/CMakeLists.darwin-x86_64.txt
index dc7af54976..e754a222a9 100644
--- a/ydb/library/yql/minikql/comp_nodes/llvm/CMakeLists.darwin-x86_64.txt
+++ b/ydb/library/yql/minikql/comp_nodes/llvm/CMakeLists.darwin-x86_64.txt
@@ -43,15 +43,12 @@ target_sources(minikql-comp_nodes-llvm PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_agg_minmax.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_agg_some.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_agg_sum.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_builder.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_coalesce.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_if.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_impl.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_just.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_logical.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_compress.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_func.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_reader.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_skiptake.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_top.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_tuple.cpp
diff --git a/ydb/library/yql/minikql/comp_nodes/llvm/CMakeLists.linux-aarch64.txt b/ydb/library/yql/minikql/comp_nodes/llvm/CMakeLists.linux-aarch64.txt
index 818764f2b7..091e1b1af1 100644
--- a/ydb/library/yql/minikql/comp_nodes/llvm/CMakeLists.linux-aarch64.txt
+++ b/ydb/library/yql/minikql/comp_nodes/llvm/CMakeLists.linux-aarch64.txt
@@ -44,15 +44,12 @@ target_sources(minikql-comp_nodes-llvm PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_agg_minmax.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_agg_some.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_agg_sum.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_builder.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_coalesce.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_if.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_impl.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_just.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_logical.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_compress.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_func.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_reader.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_skiptake.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_top.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_tuple.cpp
diff --git a/ydb/library/yql/minikql/comp_nodes/llvm/CMakeLists.linux-x86_64.txt b/ydb/library/yql/minikql/comp_nodes/llvm/CMakeLists.linux-x86_64.txt
index 818764f2b7..091e1b1af1 100644
--- a/ydb/library/yql/minikql/comp_nodes/llvm/CMakeLists.linux-x86_64.txt
+++ b/ydb/library/yql/minikql/comp_nodes/llvm/CMakeLists.linux-x86_64.txt
@@ -44,15 +44,12 @@ target_sources(minikql-comp_nodes-llvm PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_agg_minmax.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_agg_some.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_agg_sum.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_builder.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_coalesce.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_if.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_impl.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_just.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_logical.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_compress.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_func.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_reader.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_skiptake.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_top.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_tuple.cpp
diff --git a/ydb/library/yql/minikql/comp_nodes/llvm/CMakeLists.windows-x86_64.txt b/ydb/library/yql/minikql/comp_nodes/llvm/CMakeLists.windows-x86_64.txt
index dc7af54976..e754a222a9 100644
--- a/ydb/library/yql/minikql/comp_nodes/llvm/CMakeLists.windows-x86_64.txt
+++ b/ydb/library/yql/minikql/comp_nodes/llvm/CMakeLists.windows-x86_64.txt
@@ -43,15 +43,12 @@ target_sources(minikql-comp_nodes-llvm PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_agg_minmax.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_agg_some.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_agg_sum.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_builder.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_coalesce.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_if.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_impl.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_just.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_logical.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_compress.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_func.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_reader.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_skiptake.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_top.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/comp_nodes/mkql_block_tuple.cpp
diff --git a/ydb/library/yql/minikql/comp_nodes/mkql_apply.cpp b/ydb/library/yql/minikql/comp_nodes/mkql_apply.cpp
index 9f538ec7a0..e2635f7a05 100644
--- a/ydb/library/yql/minikql/comp_nodes/mkql_apply.cpp
+++ b/ydb/library/yql/minikql/comp_nodes/mkql_apply.cpp
@@ -1,6 +1,6 @@
 #include "mkql_apply.h"
-#include "mkql_block_impl.h"
 
+#include <ydb/library/yql/minikql/computation/mkql_block_impl.h>
 #include <ydb/library/yql/minikql/computation/mkql_computation_node_codegen.h>
 #include <ydb/library/yql/minikql/computation/mkql_computation_node_holders.h>
 #include <ydb/library/yql/minikql/mkql_node_cast.h>
diff --git a/ydb/library/yql/minikql/comp_nodes/mkql_block_agg.cpp b/ydb/library/yql/minikql/comp_nodes/mkql_block_agg.cpp
index b6ee6e8ad1..ffb7242941 100644
--- a/ydb/library/yql/minikql/comp_nodes/mkql_block_agg.cpp
+++ b/ydb/library/yql/minikql/comp_nodes/mkql_block_agg.cpp
@@ -1,10 +1,10 @@
 #include "mkql_block_agg.h"
 #include "mkql_block_agg_factory.h"
-#include "mkql_block_reader.h"
-#include "mkql_block_builder.h"
-#include "mkql_block_impl.h"
 #include "mkql_rh_hash.h"
 
+#include <ydb/library/yql/minikql/computation/mkql_block_reader.h>
+#include <ydb/library/yql/minikql/computation/mkql_block_builder.h>
+#include <ydb/library/yql/minikql/computation/mkql_block_impl.h>
 #include <ydb/library/yql/minikql/computation/mkql_computation_node_impl.h>
 #include <ydb/library/yql/minikql/computation/mkql_computation_node_holders.h>
 
diff --git a/ydb/library/yql/minikql/comp_nodes/mkql_block_agg_minmax.cpp b/ydb/library/yql/minikql/comp_nodes/mkql_block_agg_minmax.cpp
index 9fe7c1a9be..3d3e04a01a 100644
--- a/ydb/library/yql/minikql/comp_nodes/mkql_block_agg_minmax.cpp
+++ b/ydb/library/yql/minikql/comp_nodes/mkql_block_agg_minmax.cpp
@@ -1,17 +1,17 @@
 #include "mkql_block_agg_minmax.h"
-#include "mkql_block_builder.h"
 
-#include <ydb/library/yql/minikql/mkql_node_builder.h>
 #include <ydb/library/yql/minikql/mkql_node_cast.h>
+#include <ydb/library/yql/minikql/mkql_node_builder.h>
 #include <ydb/library/yql/minikql/mkql_string_util.h>
 
+#include <ydb/library/yql/minikql/computation/mkql_block_builder.h>
+#include <ydb/library/yql/minikql/computation/mkql_block_reader.h>
 #include <ydb/library/yql/minikql/computation/mkql_computation_node_holders.h>
+
 #include <ydb/library/yql/minikql/arrow/arrow_defs.h>
 #include <ydb/library/yql/minikql/arrow/arrow_util.h>
 #include <ydb/library/yql/minikql/arrow/mkql_bit_utils.h>
 
-#include <ydb/library/yql/minikql/comp_nodes/mkql_block_reader.h>
-
 #include <ydb/library/yql/public/udf/arrow/block_item_comparator.h>
 
 #include <arrow/scalar.h>
diff --git a/ydb/library/yql/minikql/comp_nodes/mkql_block_agg_some.cpp b/ydb/library/yql/minikql/comp_nodes/mkql_block_agg_some.cpp
index b82e311b88..39a4c0d5e5 100644
--- a/ydb/library/yql/minikql/comp_nodes/mkql_block_agg_some.cpp
+++ b/ydb/library/yql/minikql/comp_nodes/mkql_block_agg_some.cpp
@@ -3,8 +3,8 @@
 #include <ydb/library/yql/minikql/mkql_node_builder.h>
 #include <ydb/library/yql/minikql/mkql_node_cast.h>
 
-#include <ydb/library/yql/minikql/comp_nodes/mkql_block_builder.h>
-#include <ydb/library/yql/minikql/comp_nodes/mkql_block_reader.h>
+#include <ydb/library/yql/minikql/computation/mkql_block_reader.h>
+#include <ydb/library/yql/minikql/computation/mkql_block_builder.h>
 
 namespace NKikimr {
 namespace NMiniKQL {
diff --git a/ydb/library/yql/minikql/comp_nodes/mkql_block_agg_sum.cpp b/ydb/library/yql/minikql/comp_nodes/mkql_block_agg_sum.cpp
index cf499b45dc..d6e449cc92 100644
--- a/ydb/library/yql/minikql/comp_nodes/mkql_block_agg_sum.cpp
+++ b/ydb/library/yql/minikql/comp_nodes/mkql_block_agg_sum.cpp
@@ -1,9 +1,9 @@
 #include "mkql_block_agg_sum.h"
-#include "mkql_block_builder.h"
 
 #include <ydb/library/yql/minikql/mkql_node_builder.h>
 #include <ydb/library/yql/minikql/mkql_node_cast.h>
 
+#include <ydb/library/yql/minikql/computation/mkql_block_builder.h>
 #include <ydb/library/yql/minikql/computation/mkql_computation_node_holders.h>
 #include <ydb/library/yql/minikql/arrow/arrow_defs.h>
 #include <ydb/library/yql/minikql/arrow/arrow_util.h>
@@ -613,7 +613,7 @@ std::unique_ptr<typename TTag::TPreparedAggregator> PrepareSum(TTupleType* tuple
     auto dataType = UnpackOptionalData(argType, isOptional);
     bool isScalar = blockType->GetShape() == TBlockType::EShape::Scalar;
 
-    
+
     TType* sumRetType = nullptr;
     const auto& typeInfo = NYql::NUdf::GetDataTypeInfo(*dataType->GetDataSlot());
     if (typeInfo.Features & NYql::NUdf::EDataTypeFeatures::SignedIntegralType) {
@@ -694,7 +694,7 @@ public:
         , ArgColumn_(argColumn)
         , OutputType_(outputType)
     {}
-    
+
     std::unique_ptr<typename TTag::TAggregator> Make(TComputationContext& ctx) const final {
         return std::make_unique<TAvgBlockAggregator<TTag, TIn>>(FilterColumn_, ArgColumn_, OutputType_, ctx);
     }
diff --git a/ydb/library/yql/minikql/comp_nodes/mkql_block_compress.cpp b/ydb/library/yql/minikql/comp_nodes/mkql_block_compress.cpp
index 901d3cf50b..ab4c76e832 100644
--- a/ydb/library/yql/minikql/comp_nodes/mkql_block_compress.cpp
+++ b/ydb/library/yql/minikql/comp_nodes/mkql_block_compress.cpp
@@ -1,7 +1,7 @@
 #include "mkql_block_compress.h"
-#include "mkql_block_builder.h"
-#include "mkql_block_impl.h"
 
+#include <ydb/library/yql/minikql/computation/mkql_block_builder.h>
+#include <ydb/library/yql/minikql/computation/mkql_block_impl.h>
 #include <ydb/library/yql/minikql/arrow/arrow_util.h>
 #include <ydb/library/yql/minikql/arrow/mkql_bit_utils.h>
 #include <ydb/library/yql/minikql/mkql_type_builder.h>
diff --git a/ydb/library/yql/minikql/comp_nodes/mkql_block_func.cpp b/ydb/library/yql/minikql/comp_nodes/mkql_block_func.cpp
index 6803a70e83..c933b114d9 100644
--- a/ydb/library/yql/minikql/comp_nodes/mkql_block_func.cpp
+++ b/ydb/library/yql/minikql/comp_nodes/mkql_block_func.cpp
@@ -1,5 +1,6 @@
 #include "mkql_block_func.h"
-#include "mkql_block_impl.h"
+
+#include <ydb/library/yql/minikql/computation/mkql_block_impl.h>
 
 #include <ydb/library/yql/minikql/arrow/arrow_defs.h>
 #include <ydb/library/yql/minikql/mkql_node_builder.h>
diff --git a/ydb/library/yql/minikql/comp_nodes/mkql_block_if.cpp b/ydb/library/yql/minikql/comp_nodes/mkql_block_if.cpp
index d12077bb59..f4da98355c 100644
--- a/ydb/library/yql/minikql/comp_nodes/mkql_block_if.cpp
+++ b/ydb/library/yql/minikql/comp_nodes/mkql_block_if.cpp
@@ -1,7 +1,8 @@
 #include "mkql_block_if.h"
-#include "mkql_block_impl.h"
-#include "mkql_block_reader.h"
-#include "mkql_block_builder.h"
+
+#include <ydb/library/yql/minikql/computation/mkql_block_reader.h>
+#include <ydb/library/yql/minikql/computation/mkql_block_builder.h>
+#include <ydb/library/yql/minikql/computation/mkql_block_impl.h>
 
 #include <ydb/library/yql/minikql/arrow/arrow_defs.h>
 #include <ydb/library/yql/minikql/arrow/arrow_util.h>
diff --git a/ydb/library/yql/minikql/comp_nodes/mkql_block_just.cpp b/ydb/library/yql/minikql/comp_nodes/mkql_block_just.cpp
index 2c9473c5f4..131047fe1a 100644
--- a/ydb/library/yql/minikql/comp_nodes/mkql_block_just.cpp
+++ b/ydb/library/yql/minikql/comp_nodes/mkql_block_just.cpp
@@ -1,6 +1,6 @@
 #include "mkql_block_just.h"
-#include "mkql_block_impl.h"
 
+#include <ydb/library/yql/minikql/computation/mkql_block_impl.h>
 #include <ydb/library/yql/minikql/arrow/arrow_defs.h>
 #include <ydb/library/yql/minikql/arrow/arrow_util.h>
 #include <ydb/library/yql/minikql/computation/mkql_computation_node_holders.h>
diff --git a/ydb/library/yql/minikql/comp_nodes/mkql_block_skiptake.cpp b/ydb/library/yql/minikql/comp_nodes/mkql_block_skiptake.cpp
index 3434148e26..8147864aa1 100644
--- a/ydb/library/yql/minikql/comp_nodes/mkql_block_skiptake.cpp
+++ b/ydb/library/yql/minikql/comp_nodes/mkql_block_skiptake.cpp
@@ -1,6 +1,6 @@
 #include "mkql_block_skiptake.h"
-#include "mkql_block_impl.h"
 
+#include <ydb/library/yql/minikql/computation/mkql_block_impl.h>
 #include <ydb/library/yql/minikql/arrow/arrow_defs.h>
 #include <ydb/library/yql/minikql/arrow/arrow_util.h>
 #include <ydb/library/yql/minikql/mkql_type_builder.h>
@@ -171,4 +171,4 @@ IComputationNode* WrapWideTakeBlocks(TCallable& callable, const TComputationNode
 }
 
 }
-}
\ No newline at end of file
+}
diff --git a/ydb/library/yql/minikql/comp_nodes/mkql_block_top.cpp b/ydb/library/yql/minikql/comp_nodes/mkql_block_top.cpp
index 10d1873294..09068f1ce0 100644
--- a/ydb/library/yql/minikql/comp_nodes/mkql_block_top.cpp
+++ b/ydb/library/yql/minikql/comp_nodes/mkql_block_top.cpp
@@ -1,7 +1,8 @@
 #include "mkql_block_top.h"
-#include "mkql_block_impl.h"
-#include "mkql_block_reader.h"
-#include "mkql_block_builder.h"
+
+#include <ydb/library/yql/minikql/computation/mkql_block_reader.h>
+#include <ydb/library/yql/minikql/computation/mkql_block_builder.h>
+#include <ydb/library/yql/minikql/computation/mkql_block_impl.h>
 
 #include <ydb/library/yql/public/udf/arrow/block_item_comparator.h>
 
diff --git a/ydb/library/yql/minikql/comp_nodes/mkql_block_tuple.cpp b/ydb/library/yql/minikql/comp_nodes/mkql_block_tuple.cpp
index 1a61b9c7f4..9c59e96abe 100644
--- a/ydb/library/yql/minikql/comp_nodes/mkql_block_tuple.cpp
+++ b/ydb/library/yql/minikql/comp_nodes/mkql_block_tuple.cpp
@@ -1,5 +1,6 @@
 #include "mkql_block_tuple.h"
-#include "mkql_block_impl.h"
+
+#include <ydb/library/yql/minikql/computation/mkql_block_impl.h>
 
 #include <ydb/library/yql/minikql/arrow/arrow_defs.h>
 #include <ydb/library/yql/minikql/arrow/arrow_util.h>
diff --git a/ydb/library/yql/minikql/comp_nodes/mkql_blocks.cpp b/ydb/library/yql/minikql/comp_nodes/mkql_blocks.cpp
index 1b6cde3f89..da7745f7ab 100644
--- a/ydb/library/yql/minikql/comp_nodes/mkql_blocks.cpp
+++ b/ydb/library/yql/minikql/comp_nodes/mkql_blocks.cpp
@@ -1,7 +1,8 @@
 #include "mkql_blocks.h"
-#include "mkql_block_builder.h"
-#include "mkql_block_reader.h"
-#include "mkql_block_impl.h"
+
+#include <ydb/library/yql/minikql/computation/mkql_block_reader.h>
+#include <ydb/library/yql/minikql/computation/mkql_block_builder.h>
+#include <ydb/library/yql/minikql/computation/mkql_block_impl.h>
 
 #include <ydb/library/yql/minikql/arrow/arrow_defs.h>
 #include <ydb/library/yql/minikql/arrow/arrow_util.h>
diff --git a/ydb/library/yql/minikql/comp_nodes/mkql_scalar_apply.cpp b/ydb/library/yql/minikql/comp_nodes/mkql_scalar_apply.cpp
index 56f5e973fc..ad2907bc24 100644
--- a/ydb/library/yql/minikql/comp_nodes/mkql_scalar_apply.cpp
+++ b/ydb/library/yql/minikql/comp_nodes/mkql_scalar_apply.cpp
@@ -1,7 +1,8 @@
 #include "mkql_scalar_apply.h"
-#include "mkql_block_impl.h"
-#include "mkql_block_builder.h"
-#include "mkql_block_reader.h"
+
+#include <ydb/library/yql/minikql/computation/mkql_block_reader.h>
+#include <ydb/library/yql/minikql/computation/mkql_block_builder.h>
+#include <ydb/library/yql/minikql/computation/mkql_block_impl.h>
 
 #include <ydb/library/yql/minikql/arrow/arrow_defs.h>
 #include <ydb/library/yql/minikql/arrow/arrow_util.h>
diff --git a/ydb/library/yql/minikql/comp_nodes/ya.make.inc b/ydb/library/yql/minikql/comp_nodes/ya.make.inc
index 8df9c42c48..52039b166d 100644
--- a/ydb/library/yql/minikql/comp_nodes/ya.make.inc
+++ b/ydb/library/yql/minikql/comp_nodes/ya.make.inc
@@ -11,15 +11,12 @@ SRCS(
     mkql_block_agg_minmax.cpp
     mkql_block_agg_some.cpp
     mkql_block_agg_sum.cpp
-    mkql_block_builder.cpp
     mkql_block_coalesce.cpp
     mkql_block_if.cpp
-    mkql_block_impl.cpp
     mkql_block_just.cpp
     mkql_block_logical.cpp
     mkql_block_compress.cpp
     mkql_block_func.cpp
-    mkql_block_reader.cpp
     mkql_block_skiptake.cpp
     mkql_block_top.cpp
     mkql_block_tuple.cpp
diff --git a/ydb/library/yql/minikql/computation/llvm/CMakeLists.darwin-x86_64.txt b/ydb/library/yql/minikql/computation/llvm/CMakeLists.darwin-x86_64.txt
index 160c27a623..bbea34f1bd 100644
--- a/ydb/library/yql/minikql/computation/llvm/CMakeLists.darwin-x86_64.txt
+++ b/ydb/library/yql/minikql/computation/llvm/CMakeLists.darwin-x86_64.txt
@@ -35,6 +35,9 @@ target_link_libraries(minikql-computation-llvm PUBLIC
   cpp-threading-future
 )
 target_sources(minikql-computation-llvm PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/computation/mkql_block_builder.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/computation/mkql_block_impl.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/computation/mkql_block_reader.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/computation/mkql_computation_node.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/computation/mkql_computation_node_codegen.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/computation/mkql_computation_node_graph.cpp
diff --git a/ydb/library/yql/minikql/computation/llvm/CMakeLists.linux-aarch64.txt b/ydb/library/yql/minikql/computation/llvm/CMakeLists.linux-aarch64.txt
index a3503c8d43..2b98eb3a36 100644
--- a/ydb/library/yql/minikql/computation/llvm/CMakeLists.linux-aarch64.txt
+++ b/ydb/library/yql/minikql/computation/llvm/CMakeLists.linux-aarch64.txt
@@ -36,6 +36,9 @@ target_link_libraries(minikql-computation-llvm PUBLIC
   cpp-threading-future
 )
 target_sources(minikql-computation-llvm PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/computation/mkql_block_builder.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/computation/mkql_block_impl.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/computation/mkql_block_reader.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/computation/mkql_computation_node.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/computation/mkql_computation_node_codegen.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/computation/mkql_computation_node_graph.cpp
diff --git a/ydb/library/yql/minikql/computation/llvm/CMakeLists.linux-x86_64.txt b/ydb/library/yql/minikql/computation/llvm/CMakeLists.linux-x86_64.txt
index a3503c8d43..2b98eb3a36 100644
--- a/ydb/library/yql/minikql/computation/llvm/CMakeLists.linux-x86_64.txt
+++ b/ydb/library/yql/minikql/computation/llvm/CMakeLists.linux-x86_64.txt
@@ -36,6 +36,9 @@ target_link_libraries(minikql-computation-llvm PUBLIC
   cpp-threading-future
 )
 target_sources(minikql-computation-llvm PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/computation/mkql_block_builder.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/computation/mkql_block_impl.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/computation/mkql_block_reader.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/computation/mkql_computation_node.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/computation/mkql_computation_node_codegen.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/computation/mkql_computation_node_graph.cpp
diff --git a/ydb/library/yql/minikql/computation/llvm/CMakeLists.windows-x86_64.txt b/ydb/library/yql/minikql/computation/llvm/CMakeLists.windows-x86_64.txt
index 160c27a623..bbea34f1bd 100644
--- a/ydb/library/yql/minikql/computation/llvm/CMakeLists.windows-x86_64.txt
+++ b/ydb/library/yql/minikql/computation/llvm/CMakeLists.windows-x86_64.txt
@@ -35,6 +35,9 @@ target_link_libraries(minikql-computation-llvm PUBLIC
   cpp-threading-future
 )
 target_sources(minikql-computation-llvm PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/computation/mkql_block_builder.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/computation/mkql_block_impl.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/computation/mkql_block_reader.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/computation/mkql_computation_node.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/computation/mkql_computation_node_codegen.cpp
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/computation/mkql_computation_node_graph.cpp
diff --git a/ydb/library/yql/minikql/comp_nodes/mkql_block_builder.cpp b/ydb/library/yql/minikql/computation/mkql_block_builder.cpp
index 090df34937..a2d19e2dfe 100644
--- a/ydb/library/yql/minikql/comp_nodes/mkql_block_builder.cpp
+++ b/ydb/library/yql/minikql/computation/mkql_block_builder.cpp
@@ -1,9 +1,9 @@
 #include "mkql_block_builder.h"
+#include "mkql_computation_node_holders.h"
 
 #include <ydb/library/yql/minikql/arrow/arrow_defs.h>
 #include <ydb/library/yql/minikql/arrow/arrow_util.h>
 #include <ydb/library/yql/minikql/arrow/mkql_bit_utils.h>
-#include <ydb/library/yql/minikql/computation/mkql_computation_node_holders.h>
 #include <ydb/library/yql/minikql/mkql_node_cast.h>
 #include <ydb/library/yql/minikql/mkql_type_builder.h>
 
diff --git a/ydb/library/yql/minikql/comp_nodes/mkql_block_builder.h b/ydb/library/yql/minikql/computation/mkql_block_builder.h
index 9eab9e987c..fa82b1ef50 100644
--- a/ydb/library/yql/minikql/comp_nodes/mkql_block_builder.h
+++ b/ydb/library/yql/minikql/computation/mkql_block_builder.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include "mkql_block_item.h"
+#include "mkql_computation_node.h"
 
 #include <ydb/library/yql/minikql/mkql_node.h>
-#include <ydb/library/yql/minikql/computation/mkql_computation_node.h>
 
 #include <ydb/library/yql/public/udf/arrow/block_builder.h>
 
diff --git a/ydb/library/yql/minikql/comp_nodes/mkql_block_impl.cpp b/ydb/library/yql/minikql/computation/mkql_block_impl.cpp
index ed7637addf..ed7637addf 100644
--- a/ydb/library/yql/minikql/comp_nodes/mkql_block_impl.cpp
+++ b/ydb/library/yql/minikql/computation/mkql_block_impl.cpp
diff --git a/ydb/library/yql/minikql/comp_nodes/mkql_block_impl.h b/ydb/library/yql/minikql/computation/mkql_block_impl.h
index a48b3c2a62..0d6b43580e 100644
--- a/ydb/library/yql/minikql/comp_nodes/mkql_block_impl.h
+++ b/ydb/library/yql/minikql/computation/mkql_block_impl.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <ydb/library/yql/minikql/computation/mkql_computation_node_impl.h>
-#include <ydb/library/yql/minikql/computation/mkql_computation_node_holders.h>
+#include "mkql_computation_node_impl.h"
+#include "mkql_computation_node_holders.h"
 
 #include <ydb/library/yql/minikql/arrow/arrow_util.h>
 
diff --git a/ydb/library/yql/minikql/comp_nodes/mkql_block_item.h b/ydb/library/yql/minikql/computation/mkql_block_item.h
index a01d2dc780..a01d2dc780 100644
--- a/ydb/library/yql/minikql/comp_nodes/mkql_block_item.h
+++ b/ydb/library/yql/minikql/computation/mkql_block_item.h
diff --git a/ydb/library/yql/minikql/comp_nodes/mkql_block_reader.cpp b/ydb/library/yql/minikql/computation/mkql_block_reader.cpp
index 5438227d8c..bb75bd64f9 100644
--- a/ydb/library/yql/minikql/comp_nodes/mkql_block_reader.cpp
+++ b/ydb/library/yql/minikql/computation/mkql_block_reader.cpp
@@ -193,7 +193,7 @@ struct TConverterTraits {
                 ret->SetPgBuilder(pgBuilder);
                 return ret;
             }
-        }        
+        }
     }
 };
 
diff --git a/ydb/library/yql/minikql/comp_nodes/mkql_block_reader.h b/ydb/library/yql/minikql/computation/mkql_block_reader.h
index 8cc896521b..84bf62a801 100644
--- a/ydb/library/yql/minikql/comp_nodes/mkql_block_reader.h
+++ b/ydb/library/yql/minikql/computation/mkql_block_reader.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "mkql_block_item.h"
+#include "mkql_computation_node_holders.h"
 
-#include <ydb/library/yql/minikql/computation/mkql_computation_node_holders.h>
 #include <ydb/library/yql/minikql/mkql_node.h>
 
 #include <ydb/library/yql/public/udf/udf_types.h>
diff --git a/ydb/library/yql/minikql/computation/ya.make.inc b/ydb/library/yql/minikql/computation/ya.make.inc
index aa442c63ca..7785d0762e 100644
--- a/ydb/library/yql/minikql/computation/ya.make.inc
+++ b/ydb/library/yql/minikql/computation/ya.make.inc
@@ -1,6 +1,9 @@
 SRCDIR(ydb/library/yql/minikql/computation)
 
 SRCS(
+    mkql_block_builder.cpp
+    mkql_block_impl.cpp
+    mkql_block_reader.cpp
     mkql_computation_node.cpp
     mkql_computation_node_codegen.cpp
     mkql_computation_node_graph.cpp
diff --git a/ydb/library/yql/parser/pg_wrapper/CMakeLists.darwin-x86_64.txt b/ydb/library/yql/parser/pg_wrapper/CMakeLists.darwin-x86_64.txt
index 791e1ba67f..00ae1e863d 100644
--- a/ydb/library/yql/parser/pg_wrapper/CMakeLists.darwin-x86_64.txt
+++ b/ydb/library/yql/parser/pg_wrapper/CMakeLists.darwin-x86_64.txt
@@ -84,6 +84,7 @@ target_compile_options(yql-parser-pg_wrapper PRIVATE
   -Dpg_mode_mask=yql_pg_mode_mask
   -Dpg_strong_random=yql_pg_strong_random
   -Dpg_strong_random_init=yql_pg_strong_random_init
+  -DScanKeywordBareLabel=yql_ScanKeywordBareLabel
   -DScanKeywordCategories=yql_ScanKeywordCategories
   -DScanKeywords=yql_ScanKeywords
   -Dscram_ClientKey=yql_scram_ClientKey
@@ -116,7 +117,7 @@ target_link_libraries(yql-parser-pg_wrapper PUBLIC
   library-cpp-yson
   library-yql-core
   yql-minikql-arrow
-  minikql-comp_nodes-llvm
+  minikql-computation-llvm
   yql-parser-pg_catalog
   providers-common-codec
   yql-public-issue
diff --git a/ydb/library/yql/parser/pg_wrapper/CMakeLists.linux-aarch64.txt b/ydb/library/yql/parser/pg_wrapper/CMakeLists.linux-aarch64.txt
index ecc1f941e8..831bc4df15 100644
--- a/ydb/library/yql/parser/pg_wrapper/CMakeLists.linux-aarch64.txt
+++ b/ydb/library/yql/parser/pg_wrapper/CMakeLists.linux-aarch64.txt
@@ -82,6 +82,7 @@ target_compile_options(yql-parser-pg_wrapper PRIVATE
   -Dpg_mode_mask=yql_pg_mode_mask
   -Dpg_strong_random=yql_pg_strong_random
   -Dpg_strong_random_init=yql_pg_strong_random_init
+  -DScanKeywordBareLabel=yql_ScanKeywordBareLabel
   -DScanKeywordCategories=yql_ScanKeywordCategories
   -DScanKeywords=yql_ScanKeywords
   -Dscram_ClientKey=yql_scram_ClientKey
@@ -115,7 +116,7 @@ target_link_libraries(yql-parser-pg_wrapper PUBLIC
   library-cpp-yson
   library-yql-core
   yql-minikql-arrow
-  minikql-comp_nodes-llvm
+  minikql-computation-llvm
   yql-parser-pg_catalog
   providers-common-codec
   yql-public-issue
diff --git a/ydb/library/yql/parser/pg_wrapper/CMakeLists.linux-x86_64.txt b/ydb/library/yql/parser/pg_wrapper/CMakeLists.linux-x86_64.txt
index 522eef8bbd..94ba6ce373 100644
--- a/ydb/library/yql/parser/pg_wrapper/CMakeLists.linux-x86_64.txt
+++ b/ydb/library/yql/parser/pg_wrapper/CMakeLists.linux-x86_64.txt
@@ -84,6 +84,7 @@ target_compile_options(yql-parser-pg_wrapper PRIVATE
   -Dpg_mode_mask=yql_pg_mode_mask
   -Dpg_strong_random=yql_pg_strong_random
   -Dpg_strong_random_init=yql_pg_strong_random_init
+  -DScanKeywordBareLabel=yql_ScanKeywordBareLabel
   -DScanKeywordCategories=yql_ScanKeywordCategories
   -DScanKeywords=yql_ScanKeywords
   -Dscram_ClientKey=yql_scram_ClientKey
@@ -117,7 +118,7 @@ target_link_libraries(yql-parser-pg_wrapper PUBLIC
   library-cpp-yson
   library-yql-core
   yql-minikql-arrow
-  minikql-comp_nodes-llvm
+  minikql-computation-llvm
   yql-parser-pg_catalog
   providers-common-codec
   yql-public-issue
diff --git a/ydb/library/yql/parser/pg_wrapper/CMakeLists.windows-x86_64.txt b/ydb/library/yql/parser/pg_wrapper/CMakeLists.windows-x86_64.txt
index 041aac3f40..1a6b2fde3d 100644
--- a/ydb/library/yql/parser/pg_wrapper/CMakeLists.windows-x86_64.txt
+++ b/ydb/library/yql/parser/pg_wrapper/CMakeLists.windows-x86_64.txt
@@ -97,6 +97,7 @@ target_compile_options(yql-parser-pg_wrapper PRIVATE
   -Dpg_mode_mask=yql_pg_mode_mask
   -Dpg_strong_random=yql_pg_strong_random
   -Dpg_strong_random_init=yql_pg_strong_random_init
+  -DScanKeywordBareLabel=yql_ScanKeywordBareLabel
   -DScanKeywordCategories=yql_ScanKeywordCategories
   -DScanKeywords=yql_ScanKeywords
   -Dscram_ClientKey=yql_scram_ClientKey
@@ -132,7 +133,7 @@ target_link_libraries(yql-parser-pg_wrapper PUBLIC
   library-cpp-yson
   library-yql-core
   yql-minikql-arrow
-  minikql-comp_nodes-llvm
+  minikql-computation-llvm
   yql-parser-pg_catalog
   providers-common-codec
   yql-public-issue
diff --git a/ydb/library/yql/parser/pg_wrapper/cflags.inc b/ydb/library/yql/parser/pg_wrapper/cflags.inc
index d2d08c20cb..c796c601dd 100644
--- a/ydb/library/yql/parser/pg_wrapper/cflags.inc
+++ b/ydb/library/yql/parser/pg_wrapper/cflags.inc
@@ -88,6 +88,7 @@ CFLAGS(
     -Dpg_mode_mask=yql_pg_mode_mask
     -Dpg_strong_random=yql_pg_strong_random
     -Dpg_strong_random_init=yql_pg_strong_random_init
+    -DScanKeywordBareLabel=yql_ScanKeywordBareLabel
     -DScanKeywordCategories=yql_ScanKeywordCategories
     -DScanKeywords=yql_ScanKeywords
     -Dscram_ClientKey=yql_scram_ClientKey
@@ -96,4 +97,4 @@ CFLAGS(
     -Dscram_ServerKey=yql_scram_ServerKey
     -Dscram_build_secret=yql_scram_build_secret
     -Dpg_is_ascii=yql_pg_is_ascii
-)
\ No newline at end of file
+)
diff --git a/ydb/library/yql/parser/pg_wrapper/comp_factory.cpp b/ydb/library/yql/parser/pg_wrapper/comp_factory.cpp
index fa151908fa..53298ba799 100644
--- a/ydb/library/yql/parser/pg_wrapper/comp_factory.cpp
+++ b/ydb/library/yql/parser/pg_wrapper/comp_factory.cpp
@@ -1,5 +1,5 @@
 #include <ydb/library/yql/parser/pg_wrapper/interface/interface.h>
-#include <ydb/library/yql/minikql/comp_nodes/mkql_block_impl.h>
+#include <ydb/library/yql/minikql/computation/mkql_block_impl.h>
 #include <ydb/library/yql/minikql/computation/mkql_computation_node_impl.h>
 #include <ydb/library/yql/minikql/computation/mkql_computation_node_holders.h>
 #include <ydb/library/yql/minikql/computation/mkql_computation_node_pack_impl.h>
@@ -2450,7 +2450,7 @@ arrow::Datum MakePgScalar(NKikimr::NMiniKQL::TPgType* type, const NKikimr::NUdf:
     if (desc.PassByValue) {
         return arrow::MakeScalar((uint64_t)ScalarDatumFromPod(value));
     } else {
-        auto ptr = (const char*)PointerDatumFromPod(value);        
+        auto ptr = (const char*)PointerDatumFromPod(value);
         ui32 size;
         if (desc.TypeLen == -1) {
             auto ptr = (const text*)PointerDatumFromPod(value);
@@ -2904,9 +2904,9 @@ public:
     TPgCompare(const NYql::NPg::TTypeDesc& typeDesc)
         : TypeDesc(typeDesc)
     {
-        Zero(FInfoLess);        
-        Zero(FInfoCompare);        
-        Zero(FInfoEquals);        
+        Zero(FInfoLess);
+        Zero(FInfoCompare);
+        Zero(FInfoEquals);
 
         auto lessProcId = TypeDesc.LessProcId;
         auto compareProcId = TypeDesc.CompareProcId;
@@ -2928,7 +2928,7 @@ public:
             fmgr_info(equalProcId, &FInfoEquals);
             Y_ENSURE(!FInfoEquals.fn_retset);
             Y_ENSURE(FInfoEquals.fn_addr);
-            Y_ENSURE(FInfoEquals.fn_nargs == 2);        
+            Y_ENSURE(FInfoEquals.fn_nargs == 2);
         }
 
         Y_ENSURE(compareProcId);
@@ -3275,7 +3275,7 @@ public:
         memcpy(ret, value, len);
         return PointerDatumToPod((Datum)ret);
     }
-    
+
     NUdf::TUnboxedValue MakeText(const char* value) const override {
         auto len = GetFullVarSize((const text*)value);
         char* ret = (char*)palloc(len);
diff --git a/ydb/library/yql/parser/pg_wrapper/parser.h b/ydb/library/yql/parser/pg_wrapper/interface/raw_parser.h
index dbff240242..dbff240242 100644
--- a/ydb/library/yql/parser/pg_wrapper/parser.h
+++ b/ydb/library/yql/parser/pg_wrapper/interface/raw_parser.h
diff --git a/ydb/library/yql/parser/pg_wrapper/parser.cpp b/ydb/library/yql/parser/pg_wrapper/parser.cpp
index 57124b87e7..bffe099a41 100644
--- a/ydb/library/yql/parser/pg_wrapper/parser.cpp
+++ b/ydb/library/yql/parser/pg_wrapper/parser.cpp
@@ -1,4 +1,5 @@
-#include "parser.h"
+#include <ydb/library/yql/parser/pg_wrapper/interface/raw_parser.h>
+
 #include "arena_ctx.h"
 
 #include <util/generic/scope.h>
diff --git a/ydb/library/yql/parser/pg_wrapper/ut/CMakeLists.darwin-x86_64.txt b/ydb/library/yql/parser/pg_wrapper/ut/CMakeLists.darwin-x86_64.txt
index f2733b50ff..fcc636c10d 100644
--- a/ydb/library/yql/parser/pg_wrapper/ut/CMakeLists.darwin-x86_64.txt
+++ b/ydb/library/yql/parser/pg_wrapper/ut/CMakeLists.darwin-x86_64.txt
@@ -78,6 +78,7 @@ target_compile_options(ydb-library-yql-parser-pg_wrapper-ut PRIVATE
   -Dpg_mode_mask=yql_pg_mode_mask
   -Dpg_strong_random=yql_pg_strong_random
   -Dpg_strong_random_init=yql_pg_strong_random_init
+  -DScanKeywordBareLabel=yql_ScanKeywordBareLabel
   -DScanKeywordCategories=yql_ScanKeywordCategories
   -DScanKeywords=yql_ScanKeywords
   -Dscram_ClientKey=yql_scram_ClientKey
diff --git a/ydb/library/yql/parser/pg_wrapper/ut/CMakeLists.linux-aarch64.txt b/ydb/library/yql/parser/pg_wrapper/ut/CMakeLists.linux-aarch64.txt
index 93a0bc1452..3043dbcedc 100644
--- a/ydb/library/yql/parser/pg_wrapper/ut/CMakeLists.linux-aarch64.txt
+++ b/ydb/library/yql/parser/pg_wrapper/ut/CMakeLists.linux-aarch64.txt
@@ -78,6 +78,7 @@ target_compile_options(ydb-library-yql-parser-pg_wrapper-ut PRIVATE
   -Dpg_mode_mask=yql_pg_mode_mask
   -Dpg_strong_random=yql_pg_strong_random
   -Dpg_strong_random_init=yql_pg_strong_random_init
+  -DScanKeywordBareLabel=yql_ScanKeywordBareLabel
   -DScanKeywordCategories=yql_ScanKeywordCategories
   -DScanKeywords=yql_ScanKeywords
   -Dscram_ClientKey=yql_scram_ClientKey
diff --git a/ydb/library/yql/parser/pg_wrapper/ut/CMakeLists.linux-x86_64.txt b/ydb/library/yql/parser/pg_wrapper/ut/CMakeLists.linux-x86_64.txt
index 9d6f39c9ca..b6d87ed594 100644
--- a/ydb/library/yql/parser/pg_wrapper/ut/CMakeLists.linux-x86_64.txt
+++ b/ydb/library/yql/parser/pg_wrapper/ut/CMakeLists.linux-x86_64.txt
@@ -78,6 +78,7 @@ target_compile_options(ydb-library-yql-parser-pg_wrapper-ut PRIVATE
   -Dpg_mode_mask=yql_pg_mode_mask
   -Dpg_strong_random=yql_pg_strong_random
   -Dpg_strong_random_init=yql_pg_strong_random_init
+  -DScanKeywordBareLabel=yql_ScanKeywordBareLabel
   -DScanKeywordCategories=yql_ScanKeywordCategories
   -DScanKeywords=yql_ScanKeywords
   -Dscram_ClientKey=yql_scram_ClientKey
diff --git a/ydb/library/yql/parser/pg_wrapper/ut/CMakeLists.windows-x86_64.txt b/ydb/library/yql/parser/pg_wrapper/ut/CMakeLists.windows-x86_64.txt
index 54905a61cb..c66f106eec 100644
--- a/ydb/library/yql/parser/pg_wrapper/ut/CMakeLists.windows-x86_64.txt
+++ b/ydb/library/yql/parser/pg_wrapper/ut/CMakeLists.windows-x86_64.txt
@@ -90,6 +90,7 @@ target_compile_options(ydb-library-yql-parser-pg_wrapper-ut PRIVATE
   -Dpg_mode_mask=yql_pg_mode_mask
   -Dpg_strong_random=yql_pg_strong_random
   -Dpg_strong_random_init=yql_pg_strong_random_init
+  -DScanKeywordBareLabel=yql_ScanKeywordBareLabel
   -DScanKeywordCategories=yql_ScanKeywordCategories
   -DScanKeywords=yql_ScanKeywords
   -Dscram_ClientKey=yql_scram_ClientKey
diff --git a/ydb/library/yql/parser/pg_wrapper/ut/parser_ut.cpp b/ydb/library/yql/parser/pg_wrapper/ut/parser_ut.cpp
index 0c9368d009..9ed316f767 100644
--- a/ydb/library/yql/parser/pg_wrapper/ut/parser_ut.cpp
+++ b/ydb/library/yql/parser/pg_wrapper/ut/parser_ut.cpp
@@ -1,4 +1,4 @@
-#include <ydb/library/yql/parser/pg_wrapper/parser.h>
+#include <ydb/library/yql/parser/pg_wrapper/interface/raw_parser.h>
 
 #include <util/stream/str.h>
 #include <util/system/thread.h>
diff --git a/ydb/library/yql/parser/pg_wrapper/ya.make b/ydb/library/yql/parser/pg_wrapper/ya.make
index a9699205c2..ca2f9618da 100644
--- a/ydb/library/yql/parser/pg_wrapper/ya.make
+++ b/ydb/library/yql/parser/pg_wrapper/ya.make
@@ -68,7 +68,7 @@ PEERDIR(
     library/cpp/yson
     ydb/library/yql/core
     ydb/library/yql/minikql/arrow
-    ydb/library/yql/minikql/comp_nodes/llvm
+    ydb/library/yql/minikql/computation/llvm
     ydb/library/yql/parser/pg_catalog
     ydb/library/yql/providers/common/codec
     ydb/library/yql/public/issue
diff --git a/ydb/library/yql/sql/pg/CMakeLists.darwin-x86_64.txt b/ydb/library/yql/sql/pg/CMakeLists.darwin-x86_64.txt
index 81be7f0f17..84681e1679 100644
--- a/ydb/library/yql/sql/pg/CMakeLists.darwin-x86_64.txt
+++ b/ydb/library/yql/sql/pg/CMakeLists.darwin-x86_64.txt
@@ -24,7 +24,6 @@ target_link_libraries(yql-sql-pg PUBLIC
   library-yql-ast
   library-yql-core
   yql-parser-pg_catalog
-  yql-parser-pg_wrapper
   yql-sql-settings
 )
 target_sources(yql-sql-pg PRIVATE
diff --git a/ydb/library/yql/sql/pg/CMakeLists.linux-aarch64.txt b/ydb/library/yql/sql/pg/CMakeLists.linux-aarch64.txt
index b902823cf8..73f54b66fa 100644
--- a/ydb/library/yql/sql/pg/CMakeLists.linux-aarch64.txt
+++ b/ydb/library/yql/sql/pg/CMakeLists.linux-aarch64.txt
@@ -25,7 +25,6 @@ target_link_libraries(yql-sql-pg PUBLIC
   library-yql-ast
   library-yql-core
   yql-parser-pg_catalog
-  yql-parser-pg_wrapper
   yql-sql-settings
 )
 target_sources(yql-sql-pg PRIVATE
diff --git a/ydb/library/yql/sql/pg/CMakeLists.linux-x86_64.txt b/ydb/library/yql/sql/pg/CMakeLists.linux-x86_64.txt
index b902823cf8..73f54b66fa 100644
--- a/ydb/library/yql/sql/pg/CMakeLists.linux-x86_64.txt
+++ b/ydb/library/yql/sql/pg/CMakeLists.linux-x86_64.txt
@@ -25,7 +25,6 @@ target_link_libraries(yql-sql-pg PUBLIC
   library-yql-ast
   library-yql-core
   yql-parser-pg_catalog
-  yql-parser-pg_wrapper
   yql-sql-settings
 )
 target_sources(yql-sql-pg PRIVATE
diff --git a/ydb/library/yql/sql/pg/CMakeLists.windows-x86_64.txt b/ydb/library/yql/sql/pg/CMakeLists.windows-x86_64.txt
index 169f9dfca7..15dfee3761 100644
--- a/ydb/library/yql/sql/pg/CMakeLists.windows-x86_64.txt
+++ b/ydb/library/yql/sql/pg/CMakeLists.windows-x86_64.txt
@@ -27,7 +27,6 @@ target_link_libraries(yql-sql-pg PUBLIC
   library-yql-ast
   library-yql-core
   yql-parser-pg_catalog
-  yql-parser-pg_wrapper
   yql-sql-settings
 )
 target_sources(yql-sql-pg PRIVATE
diff --git a/ydb/library/yql/sql/pg/pg_sql.cpp b/ydb/library/yql/sql/pg/pg_sql.cpp
index 9fce9d2e23..4dcc46b2e6 100644
--- a/ydb/library/yql/sql/pg/pg_sql.cpp
+++ b/ydb/library/yql/sql/pg/pg_sql.cpp
@@ -4,7 +4,7 @@
 #include <ydb/library/yql/parser/pg_wrapper/interface/config.h>
 #include <ydb/library/yql/parser/pg_wrapper/interface/parser.h>
 #include <ydb/library/yql/parser/pg_wrapper/interface/utils.h>
-#include <ydb/library/yql/parser/pg_wrapper/parser.h>
+#include <ydb/library/yql/parser/pg_wrapper/interface/raw_parser.h>
 #include <ydb/library/yql/parser/pg_wrapper/postgresql/src/backend/catalog/pg_type_d.h>
 #include <ydb/library/yql/parser/pg_catalog/catalog.h>
 #include <ydb/library/yql/providers/common/provider/yql_provider_names.h>
@@ -218,7 +218,7 @@ public:
             Provider = provider;
             break;
         }
-        
+
         for (size_t i = 0; i < Settings.PgParameterTypeOids.size(); ++i) {
             auto paramName = PREPARED_PARAM_PREFIX + ToString(i + 1);
             ParamNameToTypeOid[paramName] = Settings.PgParameterTypeOids[i];
@@ -947,7 +947,7 @@ public:
             }
         }
 
-        const auto select = (value->selectStmt) 
+        const auto select = (value->selectStmt)
             ? ParseSelectStmt(CAST_NODE(SelectStmt, value->selectStmt), true, targetColumns)
             : L(A("Void"));
         if (!select) {
@@ -1362,7 +1362,7 @@ public:
             }
         }
     }
-    
+
     TAstNode* ParseDropViewStmt(const DropStmt* value, const TVector<const List*>& names) {
         // behavior and concurrent don't matter here
 
@@ -1376,7 +1376,7 @@ public:
                 NodeNotImplemented(value, nameNode);
                 return nullptr;
             }
-            
+
             const auto name = StrVal(nameNode);
             auto it = Views.find(name);
             if (!value->missing_ok && it == Views.end()) {
@@ -1390,8 +1390,8 @@ public:
         }
 
         return Statements.back();
-    } 
-    
+    }
+
     TAstNode* ParseDropTableStmt(const DropStmt* value, const TVector<const List*>& names) {
         if (value->behavior == DROP_CASCADE) {
             AddError("CASCADE is not implemented");
@@ -1418,10 +1418,10 @@ public:
 
             const auto [clusterName, tableName] = getSchemaAndTableName(nameList);
             const auto [sink, key] = ParseQualifiedRelationName(
-                /* catalogName */ "", 
-                clusterName, 
-                tableName, 
-                /* isSink */ true, 
+                /* catalogName */ "",
+                clusterName,
+                tableName,
+                /* isSink */ true,
                 /* isScheme */ true
             );
 
@@ -1440,7 +1440,7 @@ public:
                         )
                     )
                 ));
-                
+
             }
         }
 
@@ -1630,7 +1630,7 @@ public:
         ));
         return Statements.back();
     }
-    
+
     TMaybe<TString> GetConfigVariable(const TString& varName) {
         if (varName == "server_version") {
             return GetPostgresServerVersionStr();
@@ -1652,7 +1652,7 @@ public:
         }
 
         const auto columnName = QAX(varName);
-        const auto varValueNode = 
+        const auto varValueNode =
             L(A("PgConst"), QAX(*varValue), L(A("PgType"), QA("text")));
 
         const auto lambda = L(A("lambda"), QL(), varValueNode);
@@ -1822,17 +1822,17 @@ public:
             return {};
         }
         const auto readExpr = L(
-            A("Read!"), 
-            A("world"), 
-            source,  
+            A("Read!"),
+            A("world"),
+            source,
             key,
             L(A("Void")),
             QL()
-        ); 
-        return { 
+        );
+        return {
             readExpr,
-            alias, 
-            colnames, 
+            alias,
+            colnames,
             /* injectRead */ true,
         };
     }
diff --git a/ydb/library/yql/sql/pg/ut/CMakeLists.darwin-x86_64.txt b/ydb/library/yql/sql/pg/ut/CMakeLists.darwin-x86_64.txt
index 738414dcb0..1b2f7362e8 100644
--- a/ydb/library/yql/sql/pg/ut/CMakeLists.darwin-x86_64.txt
+++ b/ydb/library/yql/sql/pg/ut/CMakeLists.darwin-x86_64.txt
@@ -24,6 +24,7 @@ target_link_libraries(ydb-library-yql-sql-pg-ut PUBLIC
   contrib-libs-fmt
   udf-service-exception_policy
   library-yql-sql
+  yql-parser-pg_wrapper
 )
 target_link_options(ydb-library-yql-sql-pg-ut PRIVATE
   -Wl,-platform_version,macos,11.0,11.0
diff --git a/ydb/library/yql/sql/pg/ut/CMakeLists.linux-aarch64.txt b/ydb/library/yql/sql/pg/ut/CMakeLists.linux-aarch64.txt
index 221548471d..c7bd854615 100644
--- a/ydb/library/yql/sql/pg/ut/CMakeLists.linux-aarch64.txt
+++ b/ydb/library/yql/sql/pg/ut/CMakeLists.linux-aarch64.txt
@@ -24,6 +24,7 @@ target_link_libraries(ydb-library-yql-sql-pg-ut PUBLIC
   contrib-libs-fmt
   udf-service-exception_policy
   library-yql-sql
+  yql-parser-pg_wrapper
 )
 target_link_options(ydb-library-yql-sql-pg-ut PRIVATE
   -ldl
diff --git a/ydb/library/yql/sql/pg/ut/CMakeLists.linux-x86_64.txt b/ydb/library/yql/sql/pg/ut/CMakeLists.linux-x86_64.txt
index f448b135ca..da833e07fb 100644
--- a/ydb/library/yql/sql/pg/ut/CMakeLists.linux-x86_64.txt
+++ b/ydb/library/yql/sql/pg/ut/CMakeLists.linux-x86_64.txt
@@ -25,6 +25,7 @@ target_link_libraries(ydb-library-yql-sql-pg-ut PUBLIC
   contrib-libs-fmt
   udf-service-exception_policy
   library-yql-sql
+  yql-parser-pg_wrapper
 )
 target_link_options(ydb-library-yql-sql-pg-ut PRIVATE
   -ldl
diff --git a/ydb/library/yql/sql/pg/ut/CMakeLists.windows-x86_64.txt b/ydb/library/yql/sql/pg/ut/CMakeLists.windows-x86_64.txt
index c86c2af5ca..257706149c 100644
--- a/ydb/library/yql/sql/pg/ut/CMakeLists.windows-x86_64.txt
+++ b/ydb/library/yql/sql/pg/ut/CMakeLists.windows-x86_64.txt
@@ -24,6 +24,7 @@ target_link_libraries(ydb-library-yql-sql-pg-ut PUBLIC
   contrib-libs-fmt
   udf-service-exception_policy
   library-yql-sql
+  yql-parser-pg_wrapper
 )
 target_sources(ydb-library-yql-sql-pg-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/sql/pg/pg_sql_ut.cpp
diff --git a/ydb/library/yql/sql/pg/ut/ya.make b/ydb/library/yql/sql/pg/ut/ya.make
index d00c6f1c41..57e021007a 100644
--- a/ydb/library/yql/sql/pg/ut/ya.make
+++ b/ydb/library/yql/sql/pg/ut/ya.make
@@ -16,6 +16,7 @@ PEERDIR(
     ydb/library/yql/public/udf/service/exception_policy
     ydb/library/yql/sql
     ydb/library/yql/sql/pg
+    ydb/library/yql/parser/pg_wrapper
 )
 
 SIZE(MEDIUM)
diff --git a/ydb/library/yql/sql/pg/ya.make b/ydb/library/yql/sql/pg/ya.make
index 0e95b2da09..65171dca6e 100644
--- a/ydb/library/yql/sql/pg/ya.make
+++ b/ydb/library/yql/sql/pg/ya.make
@@ -8,7 +8,6 @@ PEERDIR(
     ydb/library/yql/ast
     ydb/library/yql/core
     ydb/library/yql/parser/pg_catalog
-    ydb/library/yql/parser/pg_wrapper
     ydb/library/yql/sql/settings
 )