formats/arrow

Перемещение arrow-специфики ydb/core/formats -> ydb/core/formats/arrow

97 files changed, 321 insertions, 217 deletions

diff --git a/ydb/core/formats/CMakeLists.darwin-x86_64.txt b/ydb/core/formats/CMakeLists.darwin-x86_64.txt
index 5a61f8cae0c..f1230dd58c1 100644
--- a/ydb/core/formats/CMakeLists.darwin-x86_64.txt
+++ b/ydb/core/formats/CMakeLists.darwin-x86_64.txt
@@ -6,34 +6,17 @@
 # original buildsystem will not be accepted.
 
 
-add_subdirectory(ut)
+add_subdirectory(arrow)
 
 add_library(ydb-core-formats)
 target_compile_options(ydb-core-formats PRIVATE
   -DUSE_CURRENT_UDF_ABI_VERSION
 )
-target_include_directories(ydb-core-formats PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/library/arrow_clickhouse
-)
 target_link_libraries(ydb-core-formats PUBLIC
   contrib-libs-cxxsupp
   yutil
-  libs-apache-arrow
   ydb-core-scheme
-  ydb-library-arrow_kernels
-  ydb-library-binary_json
-  ydb-library-dynumber
-  ydb-library-arrow_clickhouse
 )
 target_sources(ydb-core-formats PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow_batch_builder.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow_helpers.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow_filter.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/formats/converter.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/formats/clickhouse_block.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/formats/custom_registry.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/formats/merging_sorted_input_stream.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/formats/program.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/formats/ssa_program_optimizer.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/formats/size_calcer.cpp
 )
diff --git a/ydb/core/formats/CMakeLists.linux-aarch64.txt b/ydb/core/formats/CMakeLists.linux-aarch64.txt
index babe3b6bd78..0c1fd44e5f2 100644
--- a/ydb/core/formats/CMakeLists.linux-aarch64.txt
+++ b/ydb/core/formats/CMakeLists.linux-aarch64.txt
@@ -6,35 +6,18 @@
 # original buildsystem will not be accepted.
 
 
-add_subdirectory(ut)
+add_subdirectory(arrow)
 
 add_library(ydb-core-formats)
 target_compile_options(ydb-core-formats PRIVATE
   -DUSE_CURRENT_UDF_ABI_VERSION
 )
-target_include_directories(ydb-core-formats PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/library/arrow_clickhouse
-)
 target_link_libraries(ydb-core-formats PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  libs-apache-arrow
   ydb-core-scheme
-  ydb-library-arrow_kernels
-  ydb-library-binary_json
-  ydb-library-dynumber
-  ydb-library-arrow_clickhouse
 )
 target_sources(ydb-core-formats PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow_batch_builder.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow_helpers.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow_filter.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/formats/converter.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/formats/clickhouse_block.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/formats/custom_registry.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/formats/merging_sorted_input_stream.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/formats/program.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/formats/ssa_program_optimizer.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/formats/size_calcer.cpp
 )
diff --git a/ydb/core/formats/CMakeLists.linux-x86_64.txt b/ydb/core/formats/CMakeLists.linux-x86_64.txt
index babe3b6bd78..0c1fd44e5f2 100644
--- a/ydb/core/formats/CMakeLists.linux-x86_64.txt
+++ b/ydb/core/formats/CMakeLists.linux-x86_64.txt
@@ -6,35 +6,18 @@
 # original buildsystem will not be accepted.
 
 
-add_subdirectory(ut)
+add_subdirectory(arrow)
 
 add_library(ydb-core-formats)
 target_compile_options(ydb-core-formats PRIVATE
   -DUSE_CURRENT_UDF_ABI_VERSION
 )
-target_include_directories(ydb-core-formats PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/library/arrow_clickhouse
-)
 target_link_libraries(ydb-core-formats PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  libs-apache-arrow
   ydb-core-scheme
-  ydb-library-arrow_kernels
-  ydb-library-binary_json
-  ydb-library-dynumber
-  ydb-library-arrow_clickhouse
 )
 target_sources(ydb-core-formats PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow_batch_builder.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow_helpers.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow_filter.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/formats/converter.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/formats/clickhouse_block.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/formats/custom_registry.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/formats/merging_sorted_input_stream.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/formats/program.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/formats/ssa_program_optimizer.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/formats/size_calcer.cpp
 )
diff --git a/ydb/core/formats/CMakeLists.windows-x86_64.txt b/ydb/core/formats/CMakeLists.windows-x86_64.txt
index 37d76b38f33..f1230dd58c1 100644
--- a/ydb/core/formats/CMakeLists.windows-x86_64.txt
+++ b/ydb/core/formats/CMakeLists.windows-x86_64.txt
@@ -6,34 +6,17 @@
 # original buildsystem will not be accepted.
 
 
-add_subdirectory(ut)
+add_subdirectory(arrow)
 
 add_library(ydb-core-formats)
 target_compile_options(ydb-core-formats PRIVATE
   -DUSE_CURRENT_UDF_ABI_VERSION
 )
-target_include_directories(ydb-core-formats PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/udfs/common/clickhouse/client/base
-  ${CMAKE_SOURCE_DIR}/ydb/library/arrow_clickhouse
-)
 target_link_libraries(ydb-core-formats PUBLIC
   contrib-libs-cxxsupp
   yutil
-  libs-apache-arrow
   ydb-core-scheme
-  ydb-library-arrow_kernels
-  ydb-library-binary_json
-  ydb-library-dynumber
 )
 target_sources(ydb-core-formats PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow_batch_builder.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow_helpers.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow_filter.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/formats/converter.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/formats/clickhouse_block.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/formats/custom_registry.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/formats/merging_sorted_input_stream.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/formats/program.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/formats/ssa_program_optimizer.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/formats/size_calcer.cpp
 )
diff --git a/ydb/core/formats/arrow/CMakeLists.darwin-x86_64.txt b/ydb/core/formats/arrow/CMakeLists.darwin-x86_64.txt
new file mode 100644
index 00000000000..225e2097297
--- /dev/null
+++ b/ydb/core/formats/arrow/CMakeLists.darwin-x86_64.txt
@@ -0,0 +1,38 @@
+
+# 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(ut)
+
+add_library(core-formats-arrow)
+target_compile_options(core-formats-arrow PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_include_directories(core-formats-arrow PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/library/arrow_clickhouse
+)
+target_link_libraries(core-formats-arrow PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  libs-apache-arrow
+  ydb-core-scheme
+  ydb-library-arrow_kernels
+  ydb-library-binary_json
+  ydb-library-dynumber
+  ydb-library-arrow_clickhouse
+)
+target_sources(core-formats-arrow PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow/arrow_batch_builder.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow/arrow_helpers.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow/arrow_filter.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow/converter.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow/custom_registry.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow/merging_sorted_input_stream.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow/program.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow/ssa_program_optimizer.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow/size_calcer.cpp
+)
diff --git a/ydb/core/formats/arrow/CMakeLists.linux-aarch64.txt b/ydb/core/formats/arrow/CMakeLists.linux-aarch64.txt
new file mode 100644
index 00000000000..103005acef6
--- /dev/null
+++ b/ydb/core/formats/arrow/CMakeLists.linux-aarch64.txt
@@ -0,0 +1,39 @@
+
+# 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(ut)
+
+add_library(core-formats-arrow)
+target_compile_options(core-formats-arrow PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_include_directories(core-formats-arrow PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/library/arrow_clickhouse
+)
+target_link_libraries(core-formats-arrow PUBLIC
+  contrib-libs-linux-headers
+  contrib-libs-cxxsupp
+  yutil
+  libs-apache-arrow
+  ydb-core-scheme
+  ydb-library-arrow_kernels
+  ydb-library-binary_json
+  ydb-library-dynumber
+  ydb-library-arrow_clickhouse
+)
+target_sources(core-formats-arrow PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow/arrow_batch_builder.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow/arrow_helpers.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow/arrow_filter.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow/converter.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow/custom_registry.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow/merging_sorted_input_stream.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow/program.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow/ssa_program_optimizer.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow/size_calcer.cpp
+)
diff --git a/ydb/core/formats/arrow/CMakeLists.linux-x86_64.txt b/ydb/core/formats/arrow/CMakeLists.linux-x86_64.txt
new file mode 100644
index 00000000000..103005acef6
--- /dev/null
+++ b/ydb/core/formats/arrow/CMakeLists.linux-x86_64.txt
@@ -0,0 +1,39 @@
+
+# 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(ut)
+
+add_library(core-formats-arrow)
+target_compile_options(core-formats-arrow PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_include_directories(core-formats-arrow PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/library/arrow_clickhouse
+)
+target_link_libraries(core-formats-arrow PUBLIC
+  contrib-libs-linux-headers
+  contrib-libs-cxxsupp
+  yutil
+  libs-apache-arrow
+  ydb-core-scheme
+  ydb-library-arrow_kernels
+  ydb-library-binary_json
+  ydb-library-dynumber
+  ydb-library-arrow_clickhouse
+)
+target_sources(core-formats-arrow PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow/arrow_batch_builder.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow/arrow_helpers.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow/arrow_filter.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow/converter.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow/custom_registry.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow/merging_sorted_input_stream.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow/program.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow/ssa_program_optimizer.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow/size_calcer.cpp
+)
diff --git a/ydb/core/formats/ut/CMakeLists.txt b/ydb/core/formats/arrow/CMakeLists.txt
index f8b31df0c11..f8b31df0c11 100644
--- a/ydb/core/formats/ut/CMakeLists.txt
+++ b/ydb/core/formats/arrow/CMakeLists.txt
diff --git a/ydb/core/formats/arrow/CMakeLists.windows-x86_64.txt b/ydb/core/formats/arrow/CMakeLists.windows-x86_64.txt
new file mode 100644
index 00000000000..26821f7aa13
--- /dev/null
+++ b/ydb/core/formats/arrow/CMakeLists.windows-x86_64.txt
@@ -0,0 +1,38 @@
+
+# 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(ut)
+
+add_library(core-formats-arrow)
+target_compile_options(core-formats-arrow PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_include_directories(core-formats-arrow PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/udfs/common/clickhouse/client/base
+  ${CMAKE_SOURCE_DIR}/ydb/library/arrow_clickhouse
+)
+target_link_libraries(core-formats-arrow PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  libs-apache-arrow
+  ydb-core-scheme
+  ydb-library-arrow_kernels
+  ydb-library-binary_json
+  ydb-library-dynumber
+)
+target_sources(core-formats-arrow PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow/arrow_batch_builder.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow/arrow_helpers.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow/arrow_filter.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow/converter.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow/custom_registry.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow/merging_sorted_input_stream.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow/program.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow/ssa_program_optimizer.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow/size_calcer.cpp
+)
diff --git a/ydb/core/formats/arrow_batch_builder.cpp b/ydb/core/formats/arrow/arrow_batch_builder.cpp
index b7107e7ce11..b7107e7ce11 100644
--- a/ydb/core/formats/arrow_batch_builder.cpp
+++ b/ydb/core/formats/arrow/arrow_batch_builder.cpp
diff --git a/ydb/core/formats/arrow_batch_builder.h b/ydb/core/formats/arrow/arrow_batch_builder.h
index 303e57d23c9..303e57d23c9 100644
--- a/ydb/core/formats/arrow_batch_builder.h
+++ b/ydb/core/formats/arrow/arrow_batch_builder.h
diff --git a/ydb/core/formats/arrow_filter.cpp b/ydb/core/formats/arrow/arrow_filter.cpp
index 014c032ec74..014c032ec74 100644
--- a/ydb/core/formats/arrow_filter.cpp
+++ b/ydb/core/formats/arrow/arrow_filter.cpp
diff --git a/ydb/core/formats/arrow_filter.h b/ydb/core/formats/arrow/arrow_filter.h
index 86c33949083..86c33949083 100644
--- a/ydb/core/formats/arrow_filter.h
+++ b/ydb/core/formats/arrow/arrow_filter.h
diff --git a/ydb/core/formats/arrow_helpers.cpp b/ydb/core/formats/arrow/arrow_helpers.cpp
index 456426c4df0..456426c4df0 100644
--- a/ydb/core/formats/arrow_helpers.cpp
+++ b/ydb/core/formats/arrow/arrow_helpers.cpp
diff --git a/ydb/core/formats/arrow_helpers.h b/ydb/core/formats/arrow/arrow_helpers.h
index 54ae4b58348..54ae4b58348 100644
--- a/ydb/core/formats/arrow_helpers.h
+++ b/ydb/core/formats/arrow/arrow_helpers.h
diff --git a/ydb/core/formats/converter.cpp b/ydb/core/formats/arrow/converter.cpp
index f34ad2eaac8..f34ad2eaac8 100644
--- a/ydb/core/formats/converter.cpp
+++ b/ydb/core/formats/arrow/converter.cpp
diff --git a/ydb/core/formats/converter.h b/ydb/core/formats/arrow/converter.h
index f4dff7c919b..f4dff7c919b 100644
--- a/ydb/core/formats/converter.h
+++ b/ydb/core/formats/arrow/converter.h
diff --git a/ydb/core/formats/custom_registry.cpp b/ydb/core/formats/arrow/custom_registry.cpp
index 10fa2d97486..10fa2d97486 100644
--- a/ydb/core/formats/custom_registry.cpp
+++ b/ydb/core/formats/arrow/custom_registry.cpp
diff --git a/ydb/core/formats/custom_registry.h b/ydb/core/formats/arrow/custom_registry.h
index 77f419d33d6..77f419d33d6 100644
--- a/ydb/core/formats/custom_registry.h
+++ b/ydb/core/formats/arrow/custom_registry.h
diff --git a/ydb/core/formats/input_stream.h b/ydb/core/formats/arrow/input_stream.h
index 94ae17199a1..94ae17199a1 100644
--- a/ydb/core/formats/input_stream.h
+++ b/ydb/core/formats/arrow/input_stream.h
diff --git a/ydb/core/formats/merging_sorted_input_stream.cpp b/ydb/core/formats/arrow/merging_sorted_input_stream.cpp
index 6002d269a58..6002d269a58 100644
--- a/ydb/core/formats/merging_sorted_input_stream.cpp
+++ b/ydb/core/formats/arrow/merging_sorted_input_stream.cpp
diff --git a/ydb/core/formats/merging_sorted_input_stream.h b/ydb/core/formats/arrow/merging_sorted_input_stream.h
index 2a3a2f72277..2a3a2f72277 100644
--- a/ydb/core/formats/merging_sorted_input_stream.h
+++ b/ydb/core/formats/arrow/merging_sorted_input_stream.h
diff --git a/ydb/core/formats/one_batch_input_stream.h b/ydb/core/formats/arrow/one_batch_input_stream.h
index 647e70a3f6a..647e70a3f6a 100644
--- a/ydb/core/formats/one_batch_input_stream.h
+++ b/ydb/core/formats/arrow/one_batch_input_stream.h
diff --git a/ydb/core/formats/program.cpp b/ydb/core/formats/arrow/program.cpp
index e82fdbf8899..e82fdbf8899 100644
--- a/ydb/core/formats/program.cpp
+++ b/ydb/core/formats/arrow/program.cpp
diff --git a/ydb/core/formats/program.h b/ydb/core/formats/arrow/program.h
index f01e35930dc..f01e35930dc 100644
--- a/ydb/core/formats/program.h
+++ b/ydb/core/formats/arrow/program.h
diff --git a/ydb/core/formats/replace_key.h b/ydb/core/formats/arrow/replace_key.h
index 5c5a6804e73..5c5a6804e73 100644
--- a/ydb/core/formats/replace_key.h
+++ b/ydb/core/formats/arrow/replace_key.h
diff --git a/ydb/core/formats/size_calcer.cpp b/ydb/core/formats/arrow/size_calcer.cpp
index 90760a51d07..90760a51d07 100644
--- a/ydb/core/formats/size_calcer.cpp
+++ b/ydb/core/formats/arrow/size_calcer.cpp
diff --git a/ydb/core/formats/size_calcer.h b/ydb/core/formats/arrow/size_calcer.h
index dc239243a24..dc239243a24 100644
--- a/ydb/core/formats/size_calcer.h
+++ b/ydb/core/formats/arrow/size_calcer.h
diff --git a/ydb/core/formats/sort_cursor.h b/ydb/core/formats/arrow/sort_cursor.h
index a12e0b554ce..a12e0b554ce 100644
--- a/ydb/core/formats/sort_cursor.h
+++ b/ydb/core/formats/arrow/sort_cursor.h
diff --git a/ydb/core/formats/ssa_program_optimizer.cpp b/ydb/core/formats/arrow/ssa_program_optimizer.cpp
index 7ab9fbd9eb9..7ab9fbd9eb9 100644
--- a/ydb/core/formats/ssa_program_optimizer.cpp
+++ b/ydb/core/formats/arrow/ssa_program_optimizer.cpp
diff --git a/ydb/core/formats/ssa_program_optimizer.h b/ydb/core/formats/arrow/ssa_program_optimizer.h
index bdd2f78363c..bdd2f78363c 100644
--- a/ydb/core/formats/ssa_program_optimizer.h
+++ b/ydb/core/formats/arrow/ssa_program_optimizer.h
diff --git a/ydb/core/formats/ssa_runtime_version.h b/ydb/core/formats/arrow/ssa_runtime_version.h
index 3235dbd0e45..3235dbd0e45 100644
--- a/ydb/core/formats/ssa_runtime_version.h
+++ b/ydb/core/formats/arrow/ssa_runtime_version.h
diff --git a/ydb/core/formats/switch_type.h b/ydb/core/formats/arrow/switch_type.h
index 558589b71ad..558589b71ad 100644
--- a/ydb/core/formats/switch_type.h
+++ b/ydb/core/formats/arrow/switch_type.h
diff --git a/ydb/core/formats/ut/CMakeLists.darwin-x86_64.txt b/ydb/core/formats/arrow/ut/CMakeLists.darwin-x86_64.txt
index d46c4ba17b8..e63852f457f 100644
--- a/ydb/core/formats/ut/CMakeLists.darwin-x86_64.txt
+++ b/ydb/core/formats/arrow/ut/CMakeLists.darwin-x86_64.txt
@@ -7,50 +7,50 @@
 
 
 
-add_executable(ydb-core-formats-ut)
-target_compile_options(ydb-core-formats-ut PRIVATE
+add_executable(ydb-core-formats-arrow-ut)
+target_compile_options(ydb-core-formats-arrow-ut PRIVATE
   -Wno-unused-parameter
   -DUSE_CURRENT_UDF_ABI_VERSION
 )
-target_include_directories(ydb-core-formats-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/core/formats
+target_include_directories(ydb-core-formats-arrow-ut PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow
   ${CMAKE_SOURCE_DIR}/ydb/library/arrow_clickhouse
 )
-target_link_libraries(ydb-core-formats-ut PUBLIC
+target_link_libraries(ydb-core-formats-arrow-ut PUBLIC
   contrib-libs-cxxsupp
   yutil
   library-cpp-cpuid_check
   cpp-testing-unittest_main
-  ydb-core-formats
+  core-formats-arrow
   libs-apache-arrow
   ydb-library-arrow_kernels
   ydb-core-base
   udf-service-exception_policy
   yql-sql-pg_dummy
 )
-target_link_options(ydb-core-formats-ut PRIVATE
+target_link_options(ydb-core-formats-arrow-ut PRIVATE
   -Wl,-platform_version,macos,11.0,11.0
   -fPIC
   -fPIC
   -framework
   CoreFoundation
 )
-target_sources(ydb-core-formats-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/core/formats/ut_arrow.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/formats/ut_program_step.cpp
+target_sources(ydb-core-formats-arrow-ut PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow/ut_arrow.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow/ut_program_step.cpp
 )
 set_property(
   TARGET
-  ydb-core-formats-ut
+  ydb-core-formats-arrow-ut
   PROPERTY
   SPLIT_FACTOR
   1
 )
 add_yunittest(
   NAME
-  ydb-core-formats-ut
+  ydb-core-formats-arrow-ut
   TEST_TARGET
-  ydb-core-formats-ut
+  ydb-core-formats-arrow-ut
   TEST_ARG
   --print-before-suite
   --print-before-test
@@ -60,19 +60,19 @@ add_yunittest(
 )
 set_yunittest_property(
   TEST
-  ydb-core-formats-ut
+  ydb-core-formats-arrow-ut
   PROPERTY
   LABELS
   SMALL
 )
 set_yunittest_property(
   TEST
-  ydb-core-formats-ut
+  ydb-core-formats-arrow-ut
   PROPERTY
   PROCESSORS
   1
 )
-target_allocator(ydb-core-formats-ut
+target_allocator(ydb-core-formats-arrow-ut
   system_allocator
 )
-vcs_info(ydb-core-formats-ut)
+vcs_info(ydb-core-formats-arrow-ut)
diff --git a/ydb/core/formats/ut/CMakeLists.linux-aarch64.txt b/ydb/core/formats/arrow/ut/CMakeLists.linux-aarch64.txt
index c8cb28b90d6..b396886cf0c 100644
--- a/ydb/core/formats/ut/CMakeLists.linux-aarch64.txt
+++ b/ydb/core/formats/arrow/ut/CMakeLists.linux-aarch64.txt
@@ -7,28 +7,28 @@
 
 
 
-add_executable(ydb-core-formats-ut)
-target_compile_options(ydb-core-formats-ut PRIVATE
+add_executable(ydb-core-formats-arrow-ut)
+target_compile_options(ydb-core-formats-arrow-ut PRIVATE
   -Wno-unused-parameter
   -DUSE_CURRENT_UDF_ABI_VERSION
 )
-target_include_directories(ydb-core-formats-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/core/formats
+target_include_directories(ydb-core-formats-arrow-ut PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow
   ${CMAKE_SOURCE_DIR}/ydb/library/arrow_clickhouse
 )
-target_link_libraries(ydb-core-formats-ut PUBLIC
+target_link_libraries(ydb-core-formats-arrow-ut PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
   cpp-testing-unittest_main
-  ydb-core-formats
+  core-formats-arrow
   libs-apache-arrow
   ydb-library-arrow_kernels
   ydb-core-base
   udf-service-exception_policy
   yql-sql-pg_dummy
 )
-target_link_options(ydb-core-formats-ut PRIVATE
+target_link_options(ydb-core-formats-arrow-ut PRIVATE
   -ldl
   -lrt
   -Wl,--no-as-needed
@@ -38,22 +38,22 @@ target_link_options(ydb-core-formats-ut PRIVATE
   -lrt
   -ldl
 )
-target_sources(ydb-core-formats-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/core/formats/ut_arrow.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/formats/ut_program_step.cpp
+target_sources(ydb-core-formats-arrow-ut PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow/ut_arrow.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow/ut_program_step.cpp
 )
 set_property(
   TARGET
-  ydb-core-formats-ut
+  ydb-core-formats-arrow-ut
   PROPERTY
   SPLIT_FACTOR
   1
 )
 add_yunittest(
   NAME
-  ydb-core-formats-ut
+  ydb-core-formats-arrow-ut
   TEST_TARGET
-  ydb-core-formats-ut
+  ydb-core-formats-arrow-ut
   TEST_ARG
   --print-before-suite
   --print-before-test
@@ -63,19 +63,19 @@ add_yunittest(
 )
 set_yunittest_property(
   TEST
-  ydb-core-formats-ut
+  ydb-core-formats-arrow-ut
   PROPERTY
   LABELS
   SMALL
 )
 set_yunittest_property(
   TEST
-  ydb-core-formats-ut
+  ydb-core-formats-arrow-ut
   PROPERTY
   PROCESSORS
   1
 )
-target_allocator(ydb-core-formats-ut
+target_allocator(ydb-core-formats-arrow-ut
   cpp-malloc-jemalloc
 )
-vcs_info(ydb-core-formats-ut)
+vcs_info(ydb-core-formats-arrow-ut)
diff --git a/ydb/core/formats/ut/CMakeLists.linux-x86_64.txt b/ydb/core/formats/arrow/ut/CMakeLists.linux-x86_64.txt
index 01c6008939c..722652c673a 100644
--- a/ydb/core/formats/ut/CMakeLists.linux-x86_64.txt
+++ b/ydb/core/formats/arrow/ut/CMakeLists.linux-x86_64.txt
@@ -7,29 +7,29 @@
 
 
 
-add_executable(ydb-core-formats-ut)
-target_compile_options(ydb-core-formats-ut PRIVATE
+add_executable(ydb-core-formats-arrow-ut)
+target_compile_options(ydb-core-formats-arrow-ut PRIVATE
   -Wno-unused-parameter
   -DUSE_CURRENT_UDF_ABI_VERSION
 )
-target_include_directories(ydb-core-formats-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/core/formats
+target_include_directories(ydb-core-formats-arrow-ut PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow
   ${CMAKE_SOURCE_DIR}/ydb/library/arrow_clickhouse
 )
-target_link_libraries(ydb-core-formats-ut PUBLIC
+target_link_libraries(ydb-core-formats-arrow-ut PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
   library-cpp-cpuid_check
   cpp-testing-unittest_main
-  ydb-core-formats
+  core-formats-arrow
   libs-apache-arrow
   ydb-library-arrow_kernels
   ydb-core-base
   udf-service-exception_policy
   yql-sql-pg_dummy
 )
-target_link_options(ydb-core-formats-ut PRIVATE
+target_link_options(ydb-core-formats-arrow-ut PRIVATE
   -ldl
   -lrt
   -Wl,--no-as-needed
@@ -39,22 +39,22 @@ target_link_options(ydb-core-formats-ut PRIVATE
   -lrt
   -ldl
 )
-target_sources(ydb-core-formats-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/core/formats/ut_arrow.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/formats/ut_program_step.cpp
+target_sources(ydb-core-formats-arrow-ut PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow/ut_arrow.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow/ut_program_step.cpp
 )
 set_property(
   TARGET
-  ydb-core-formats-ut
+  ydb-core-formats-arrow-ut
   PROPERTY
   SPLIT_FACTOR
   1
 )
 add_yunittest(
   NAME
-  ydb-core-formats-ut
+  ydb-core-formats-arrow-ut
   TEST_TARGET
-  ydb-core-formats-ut
+  ydb-core-formats-arrow-ut
   TEST_ARG
   --print-before-suite
   --print-before-test
@@ -64,20 +64,20 @@ add_yunittest(
 )
 set_yunittest_property(
   TEST
-  ydb-core-formats-ut
+  ydb-core-formats-arrow-ut
   PROPERTY
   LABELS
   SMALL
 )
 set_yunittest_property(
   TEST
-  ydb-core-formats-ut
+  ydb-core-formats-arrow-ut
   PROPERTY
   PROCESSORS
   1
 )
-target_allocator(ydb-core-formats-ut
+target_allocator(ydb-core-formats-arrow-ut
   cpp-malloc-tcmalloc
   libs-tcmalloc-no_percpu_cache
 )
-vcs_info(ydb-core-formats-ut)
+vcs_info(ydb-core-formats-arrow-ut)
diff --git a/ydb/core/formats/arrow/ut/CMakeLists.txt b/ydb/core/formats/arrow/ut/CMakeLists.txt
new file mode 100644
index 00000000000..f8b31df0c11
--- /dev/null
+++ b/ydb/core/formats/arrow/ut/CMakeLists.txt
@@ -0,0 +1,17 @@
+
+# This file was generated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND NOT HAVE_CUDA)
+  include(CMakeLists.linux-aarch64.txt)
+elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+  include(CMakeLists.darwin-x86_64.txt)
+elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA)
+  include(CMakeLists.windows-x86_64.txt)
+elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA)
+  include(CMakeLists.linux-x86_64.txt)
+endif()
diff --git a/ydb/core/formats/ut/CMakeLists.windows-x86_64.txt b/ydb/core/formats/arrow/ut/CMakeLists.windows-x86_64.txt
index 959f87e023e..937feb4f7bd 100644
--- a/ydb/core/formats/ut/CMakeLists.windows-x86_64.txt
+++ b/ydb/core/formats/arrow/ut/CMakeLists.windows-x86_64.txt
@@ -7,43 +7,43 @@
 
 
 
-add_executable(ydb-core-formats-ut)
-target_compile_options(ydb-core-formats-ut PRIVATE
+add_executable(ydb-core-formats-arrow-ut)
+target_compile_options(ydb-core-formats-arrow-ut PRIVATE
   -Wno-unused-parameter
   -DUSE_CURRENT_UDF_ABI_VERSION
 )
-target_include_directories(ydb-core-formats-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/core/formats
+target_include_directories(ydb-core-formats-arrow-ut PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow
   ${CMAKE_SOURCE_DIR}/ydb/library/arrow_clickhouse
 )
-target_link_libraries(ydb-core-formats-ut PUBLIC
+target_link_libraries(ydb-core-formats-arrow-ut PUBLIC
   contrib-libs-cxxsupp
   yutil
   library-cpp-cpuid_check
   cpp-testing-unittest_main
-  ydb-core-formats
+  core-formats-arrow
   libs-apache-arrow
   ydb-library-arrow_kernels
   ydb-core-base
   udf-service-exception_policy
   yql-sql-pg_dummy
 )
-target_sources(ydb-core-formats-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/core/formats/ut_arrow.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/formats/ut_program_step.cpp
+target_sources(ydb-core-formats-arrow-ut PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow/ut_arrow.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/formats/arrow/ut_program_step.cpp
 )
 set_property(
   TARGET
-  ydb-core-formats-ut
+  ydb-core-formats-arrow-ut
   PROPERTY
   SPLIT_FACTOR
   1
 )
 add_yunittest(
   NAME
-  ydb-core-formats-ut
+  ydb-core-formats-arrow-ut
   TEST_TARGET
-  ydb-core-formats-ut
+  ydb-core-formats-arrow-ut
   TEST_ARG
   --print-before-suite
   --print-before-test
@@ -53,19 +53,19 @@ add_yunittest(
 )
 set_yunittest_property(
   TEST
-  ydb-core-formats-ut
+  ydb-core-formats-arrow-ut
   PROPERTY
   LABELS
   SMALL
 )
 set_yunittest_property(
   TEST
-  ydb-core-formats-ut
+  ydb-core-formats-arrow-ut
   PROPERTY
   PROCESSORS
   1
 )
-target_allocator(ydb-core-formats-ut
+target_allocator(ydb-core-formats-arrow-ut
   system_allocator
 )
-vcs_info(ydb-core-formats-ut)
+vcs_info(ydb-core-formats-arrow-ut)
diff --git a/ydb/core/formats/ut_arrow.cpp b/ydb/core/formats/arrow/ut_arrow.cpp
index 5efa2fd9e11..f0d7eb19dd3 100644
--- a/ydb/core/formats/ut_arrow.cpp
+++ b/ydb/core/formats/arrow/ut_arrow.cpp
@@ -1,15 +1,16 @@
-#include <ydb/core/formats/arrow_batch_builder.h>
-#include <ydb/core/formats/arrow_helpers.h>
-#include <ydb/core/formats/converter.h>
-#include <ydb/core/formats/one_batch_input_stream.h>
-#include <ydb/core/formats/merging_sorted_input_stream.h>
+#include "arrow_batch_builder.h"
+#include "arrow_helpers.h"
+#include "converter.h"
+#include "one_batch_input_stream.h"
+#include "merging_sorted_input_stream.h"
+#include "arrow_filter.h"
+
 #include <ydb/library/binary_json/write.h>
 #include <library/cpp/testing/unittest/registar.h>
 #include <util/string/printf.h>
 #include <contrib/libs/apache/arrow/cpp/src/arrow/api.h>
 #include <contrib/libs/apache/arrow/cpp/src/arrow/compute/api.h>
 #include <util/random/shuffle.h>
-#include "arrow_filter.h"
 
 namespace NKikimr {
 namespace {
diff --git a/ydb/core/formats/ut_program_step.cpp b/ydb/core/formats/arrow/ut_program_step.cpp
index 1da278b1e5e..1da278b1e5e 100644
--- a/ydb/core/formats/ut_program_step.cpp
+++ b/ydb/core/formats/arrow/ut_program_step.cpp
diff --git a/ydb/core/grpc_services/rpc_long_tx.cpp b/ydb/core/grpc_services/rpc_long_tx.cpp
index 04f16cf92af..575a1504fae 100644
--- a/ydb/core/grpc_services/rpc_long_tx.cpp
+++ b/ydb/core/grpc_services/rpc_long_tx.cpp
@@ -8,7 +8,7 @@
 #include <ydb/core/base/tablet_pipe.h>
 #include <ydb/core/base/tablet_pipecache.h>
 #include <ydb/core/tablet/tablet_pipe_client_cache.h>
-#include <ydb/core/formats/arrow_helpers.h>
+#include <ydb/core/formats/arrow/arrow_helpers.h>
 #include <ydb/core/tx/sharding/sharding.h>
 #include <ydb/core/scheme/scheme_types_proto.h>
 #include <ydb/core/tx/schemeshard/schemeshard.h>
diff --git a/ydb/core/grpc_services/rpc_long_tx.h b/ydb/core/grpc_services/rpc_long_tx.h
index 2adad8bebbf..511ec6d219c 100644
--- a/ydb/core/grpc_services/rpc_long_tx.h
+++ b/ydb/core/grpc_services/rpc_long_tx.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <ydb/core/tx/scheme_cache/scheme_cache.h>
-#include <ydb/core/formats/arrow_helpers.h>
+#include <ydb/core/formats/arrow/arrow_helpers.h>
 
 namespace NKikimr::NGRpcService {
 
diff --git a/ydb/core/io_formats/CMakeLists.darwin-x86_64.txt b/ydb/core/io_formats/CMakeLists.darwin-x86_64.txt
index c443e626fd1..617ed8f31fd 100644
--- a/ydb/core/io_formats/CMakeLists.darwin-x86_64.txt
+++ b/ydb/core/io_formats/CMakeLists.darwin-x86_64.txt
@@ -18,7 +18,7 @@ target_link_libraries(ydb-core-io_formats PUBLIC
   yutil
   contrib-libs-double-conversion
   cpp-string_utils-quote
-  ydb-core-formats
+  core-formats-arrow
   ydb-core-scheme
   ydb-library-binary_json
   ydb-library-dynumber
diff --git a/ydb/core/io_formats/CMakeLists.linux-aarch64.txt b/ydb/core/io_formats/CMakeLists.linux-aarch64.txt
index 4a2ffea3948..6128891a22a 100644
--- a/ydb/core/io_formats/CMakeLists.linux-aarch64.txt
+++ b/ydb/core/io_formats/CMakeLists.linux-aarch64.txt
@@ -19,7 +19,7 @@ target_link_libraries(ydb-core-io_formats PUBLIC
   yutil
   contrib-libs-double-conversion
   cpp-string_utils-quote
-  ydb-core-formats
+  core-formats-arrow
   ydb-core-scheme
   ydb-library-binary_json
   ydb-library-dynumber
diff --git a/ydb/core/io_formats/CMakeLists.linux-x86_64.txt b/ydb/core/io_formats/CMakeLists.linux-x86_64.txt
index 4a2ffea3948..6128891a22a 100644
--- a/ydb/core/io_formats/CMakeLists.linux-x86_64.txt
+++ b/ydb/core/io_formats/CMakeLists.linux-x86_64.txt
@@ -19,7 +19,7 @@ target_link_libraries(ydb-core-io_formats PUBLIC
   yutil
   contrib-libs-double-conversion
   cpp-string_utils-quote
-  ydb-core-formats
+  core-formats-arrow
   ydb-core-scheme
   ydb-library-binary_json
   ydb-library-dynumber
diff --git a/ydb/core/io_formats/CMakeLists.windows-x86_64.txt b/ydb/core/io_formats/CMakeLists.windows-x86_64.txt
index c443e626fd1..617ed8f31fd 100644
--- a/ydb/core/io_formats/CMakeLists.windows-x86_64.txt
+++ b/ydb/core/io_formats/CMakeLists.windows-x86_64.txt
@@ -18,7 +18,7 @@ target_link_libraries(ydb-core-io_formats PUBLIC
   yutil
   contrib-libs-double-conversion
   cpp-string_utils-quote
-  ydb-core-formats
+  core-formats-arrow
   ydb-core-scheme
   ydb-library-binary_json
   ydb-library-dynumber
diff --git a/ydb/core/io_formats/csv_arrow.cpp b/ydb/core/io_formats/csv_arrow.cpp
index 480456a6f10..a7baa934b71 100644
--- a/ydb/core/io_formats/csv_arrow.cpp
+++ b/ydb/core/io_formats/csv_arrow.cpp
@@ -1,5 +1,5 @@
 #include "csv.h"
-#include <ydb/core/formats/arrow_helpers.h>
+#include <ydb/core/formats/arrow/arrow_helpers.h>
 #include <contrib/libs/apache/arrow/cpp/src/arrow/record_batch.h>
 #include <contrib/libs/apache/arrow/cpp/src/arrow/util/value_parsing.h>
 
@@ -90,7 +90,7 @@ std::shared_ptr<arrow::RecordBatch> TArrowCSV::ConvertColumnTypes(std::shared_pt
         arrow::SchemaBuilder sBuilder;
         for (auto&& f : parsedBatch->schema()->fields()) {
             Y_VERIFY(sBuilder.AddField(std::make_shared<arrow::Field>(f->name(), f->type())).ok());
-            
+
         }
         auto resultSchema = sBuilder.Finish();
         Y_VERIFY(resultSchema.ok());
diff --git a/ydb/core/io_formats/ut_csv.cpp b/ydb/core/io_formats/ut_csv.cpp
index dd610cb9d8f..ea8965254c1 100644
--- a/ydb/core/io_formats/ut_csv.cpp
+++ b/ydb/core/io_formats/ut_csv.cpp
@@ -1,6 +1,6 @@
 #include "csv.h"
 
-#include <ydb/core/formats/arrow_helpers.h>
+#include <ydb/core/formats/arrow/arrow_helpers.h>
 #include <library/cpp/testing/unittest/registar.h>
 
 namespace NKikimr::NFormats {
diff --git a/ydb/core/kqp/compute_actor/kqp_compute_events.h b/ydb/core/kqp/compute_actor/kqp_compute_events.h
index 4f3c4fd313a..e0cd067901c 100644
--- a/ydb/core/kqp/compute_actor/kqp_compute_events.h
+++ b/ydb/core/kqp/compute_actor/kqp_compute_events.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <ydb/core/formats/arrow_helpers.h>
+#include <ydb/core/formats/arrow/arrow_helpers.h>
 #include <ydb/core/kqp/common/kqp.h>
 #include <ydb/core/protos/tx_datashard.pb.h>
 #include <ydb/core/scheme/scheme_tabledefs.h>
diff --git a/ydb/core/kqp/executer_actor/kqp_executer_impl.cpp b/ydb/core/kqp/executer_actor/kqp_executer_impl.cpp
index e1020485646..3e8b9de1574 100644
--- a/ydb/core/kqp/executer_actor/kqp_executer_impl.cpp
+++ b/ydb/core/kqp/executer_actor/kqp_executer_impl.cpp
@@ -1,6 +1,6 @@
 #include "kqp_executer_impl.h"
 
-#include <ydb/core/formats/arrow_helpers.h>
+#include <ydb/core/formats/arrow/arrow_helpers.h>
 #include <ydb/core/kqp/runtime/kqp_transport.h>
 
 #include <ydb/public/api/protos/ydb_rate_limiter.pb.h>
diff --git a/ydb/core/kqp/opt/physical/kqp_opt_phy_olap_agg.cpp b/ydb/core/kqp/opt/physical/kqp_opt_phy_olap_agg.cpp
index 11480e2cb99..cd6eb508e87 100644
--- a/ydb/core/kqp/opt/physical/kqp_opt_phy_olap_agg.cpp
+++ b/ydb/core/kqp/opt/physical/kqp_opt_phy_olap_agg.cpp
@@ -2,7 +2,7 @@
 
 #include <ydb/core/kqp/common/kqp_yql.h>
 
-#include <ydb/core/formats/ssa_runtime_version.h>
+#include <ydb/core/formats/arrow/ssa_runtime_version.h>
 
 #include <ydb/library/yql/core/yql_opt_utils.h>
 
diff --git a/ydb/core/kqp/opt/physical/kqp_opt_phy_olap_filter.cpp b/ydb/core/kqp/opt/physical/kqp_opt_phy_olap_filter.cpp
index 30d5a0f88c3..e96bb83a9ab 100644
--- a/ydb/core/kqp/opt/physical/kqp_opt_phy_olap_filter.cpp
+++ b/ydb/core/kqp/opt/physical/kqp_opt_phy_olap_filter.cpp
@@ -1,7 +1,7 @@
 #include "kqp_opt_phy_rules.h"
 #include "kqp_opt_phy_olap_filter_collection.h"
 
-#include <ydb/core/formats/ssa_runtime_version.h>
+#include <ydb/core/formats/arrow/ssa_runtime_version.h>
 #include <ydb/core/kqp/common/kqp_yql.h>
 #include <ydb/library/yql/core/extract_predicate/extract_predicate.h>
 #include <ydb/library/yql/core/yql_opt_utils.h>
diff --git a/ydb/core/kqp/opt/physical/kqp_opt_phy_olap_filter_collection.cpp b/ydb/core/kqp/opt/physical/kqp_opt_phy_olap_filter_collection.cpp
index 56117107ac5..f08299dab20 100644
--- a/ydb/core/kqp/opt/physical/kqp_opt_phy_olap_filter_collection.cpp
+++ b/ydb/core/kqp/opt/physical/kqp_opt_phy_olap_filter_collection.cpp
@@ -1,6 +1,6 @@
 #include "kqp_opt_phy_olap_filter_collection.h"
 
-#include <ydb/core/formats/ssa_runtime_version.h>
+#include <ydb/core/formats/arrow/ssa_runtime_version.h>
 #include <ydb/library/yql/core/yql_expr_type_annotation.h>
 #include <ydb/library/yql/utils/log/log.h>
 
diff --git a/ydb/core/kqp/query_compiler/kqp_olap_compiler.cpp b/ydb/core/kqp/query_compiler/kqp_olap_compiler.cpp
index 8fb80d889c1..ab066a23dd6 100644
--- a/ydb/core/kqp/query_compiler/kqp_olap_compiler.cpp
+++ b/ydb/core/kqp/query_compiler/kqp_olap_compiler.cpp
@@ -1,7 +1,7 @@
 #include "kqp_olap_compiler.h"
 
-#include <ydb/core/formats/arrow_helpers.h>
-#include <ydb/core/formats/ssa_runtime_version.h>
+#include <ydb/core/formats/arrow/arrow_helpers.h>
+#include <ydb/core/formats/arrow/ssa_runtime_version.h>
 
 #include <ydb/library/yql/core/yql_opt_utils.h>
 
diff --git a/ydb/core/kqp/runtime/kqp_scan_data.h b/ydb/core/kqp/runtime/kqp_scan_data.h
index 54607b91dfc..e530b3d51ca 100644
--- a/ydb/core/kqp/runtime/kqp_scan_data.h
+++ b/ydb/core/kqp/runtime/kqp_scan_data.h
@@ -6,7 +6,7 @@
 #include <ydb/core/protos/services.pb.h>
 
 #include <ydb/core/engine/minikql/minikql_engine_host.h>
-#include <ydb/core/formats/arrow_helpers.h>
+#include <ydb/core/formats/arrow/arrow_helpers.h>
 #include <ydb/core/scheme/scheme_tabledefs.h>
 #include <ydb/core/tablet_flat/flat_database.h>
 
diff --git a/ydb/core/kqp/ut/olap/kqp_olap_ut.cpp b/ydb/core/kqp/ut/olap/kqp_olap_ut.cpp
index b9f32a7ca73..7ac9cee7c1e 100644
--- a/ydb/core/kqp/ut/olap/kqp_olap_ut.cpp
+++ b/ydb/core/kqp/ut/olap/kqp_olap_ut.cpp
@@ -8,7 +8,7 @@
 #include <contrib/libs/apache/arrow/cpp/src/arrow/ipc/writer.h>
 
 #include <ydb/library/yql/dq/actors/compute/dq_compute_actor.h>
-#include <ydb/core/formats/ssa_runtime_version.h>
+#include <ydb/core/formats/arrow/ssa_runtime_version.h>
 #include <ydb/core/kqp/executer_actor/kqp_executer.h>
 #include <ydb/core/tx/datashard/datashard.h>
 #include <ydb/core/tx/datashard/datashard_ut_common_kqp.h>
diff --git a/ydb/core/kqp/ut/scheme/kqp_scheme_ut.cpp b/ydb/core/kqp/ut/scheme/kqp_scheme_ut.cpp
index 60a3fa53c16..284740bd03c 100644
--- a/ydb/core/kqp/ut/scheme/kqp_scheme_ut.cpp
+++ b/ydb/core/kqp/ut/scheme/kqp_scheme_ut.cpp
@@ -1,5 +1,5 @@
 #include <ydb/core/kqp/ut/common/kqp_ut_common.h>
-#include <ydb/core/formats/arrow_helpers.h>
+#include <ydb/core/formats/arrow/arrow_helpers.h>
 #include <ydb/public/sdk/cpp/client/ydb_proto/accessor.h>
 #include <ydb/public/sdk/cpp/client/ydb_scheme/scheme.h>
 #include <ydb/public/sdk/cpp/client/ydb_topic/topic.h>
diff --git a/ydb/core/testlib/cs_helper.cpp b/ydb/core/testlib/cs_helper.cpp
index 990f6b7aede..d3edd61a252 100644
--- a/ydb/core/testlib/cs_helper.cpp
+++ b/ydb/core/testlib/cs_helper.cpp
@@ -1,6 +1,6 @@
 #include "cs_helper.h"
 #include <ydb/core/tx/tx_proxy/proxy.h>
-#include <ydb/core/formats/arrow_helpers.h>
+#include <ydb/core/formats/arrow/arrow_helpers.h>
 #include <ydb/core/grpc_services/local_rpc/local_rpc.h>
 
 #include <library/cpp/actors/core/event.h>
diff --git a/ydb/core/tx/columnshard/columnshard__read_base.cpp b/ydb/core/tx/columnshard/columnshard__read_base.cpp
index 63c8239a6e7..cd84b512bea 100644
--- a/ydb/core/tx/columnshard/columnshard__read_base.cpp
+++ b/ydb/core/tx/columnshard/columnshard__read_base.cpp
@@ -1,7 +1,7 @@
 #include <ydb/core/tx/columnshard/columnshard_impl.h>
 #include <ydb/core/tx/columnshard/columnshard__read_base.h>
 #include <ydb/core/tx/columnshard/columnshard__index_scan.h>
-#include <ydb/core/formats/ssa_program_optimizer.h>
+#include <ydb/core/formats/arrow/ssa_program_optimizer.h>
 
 namespace NKikimr::NColumnShard {
 
diff --git a/ydb/core/tx/columnshard/columnshard__scan.cpp b/ydb/core/tx/columnshard/columnshard__scan.cpp
index ec1ddd2cd89..fcb7bb657d1 100644
--- a/ydb/core/tx/columnshard/columnshard__scan.cpp
+++ b/ydb/core/tx/columnshard/columnshard__scan.cpp
@@ -5,7 +5,7 @@
 #include <ydb/core/tx/columnshard/blob_cache.h>
 #include <ydb/core/tx/columnshard/columnshard_impl.h>
 #include <ydb/core/tx/columnshard/columnshard_private_events.h>
-#include <ydb/core/formats/converter.h>
+#include <ydb/core/formats/arrow/converter.h>
 #include <ydb/core/tablet_flat/flat_row_celled.h>
 #include <ydb/library/yql/dq/actors/compute/dq_compute_actor.h>
 #include <ydb/core/kqp/compute_actor/kqp_compute_events.h>
diff --git a/ydb/core/tx/columnshard/columnshard__stats_scan.h b/ydb/core/tx/columnshard/columnshard__stats_scan.h
index 81504523507..10e79603799 100644
--- a/ydb/core/tx/columnshard/columnshard__stats_scan.h
+++ b/ydb/core/tx/columnshard/columnshard__stats_scan.h
@@ -6,7 +6,7 @@
 
 #include <ydb/core/tablet_flat/flat_cxx_database.h>
 #include <ydb/core/sys_view/common/schema.h>
-#include <ydb/core/formats/custom_registry.h>
+#include <ydb/core/formats/arrow/custom_registry.h>
 
 namespace NKikimr::NColumnShard {
 
diff --git a/ydb/core/tx/columnshard/columnshard_common.cpp b/ydb/core/tx/columnshard/columnshard_common.cpp
index 7b163d6170b..a33cfdd3eba 100644
--- a/ydb/core/tx/columnshard/columnshard_common.cpp
+++ b/ydb/core/tx/columnshard/columnshard_common.cpp
@@ -1,5 +1,5 @@
 #include "columnshard_common.h"
-#include <ydb/core/formats/arrow_batch_builder.h>
+#include <ydb/core/formats/arrow/arrow_batch_builder.h>
 #include <ydb/core/tx/columnshard/engines/index_info.h>
 
 namespace NKikimr::NColumnShard {
diff --git a/ydb/core/tx/columnshard/columnshard_common.h b/ydb/core/tx/columnshard/columnshard_common.h
index 53f6668d6f5..fae465b1527 100644
--- a/ydb/core/tx/columnshard/columnshard_common.h
+++ b/ydb/core/tx/columnshard/columnshard_common.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "defs.h"
-#include <ydb/core/formats/arrow_helpers.h>
+#include <ydb/core/formats/arrow/arrow_helpers.h>
 #include <ydb/core/scheme/scheme_tabledefs.h>
 #include <ydb/core/protos/ssa.pb.h>
 #include <ydb/core/tx/columnshard/engines/predicate.h>
diff --git a/ydb/core/tx/columnshard/columnshard_costs.cpp b/ydb/core/tx/columnshard/columnshard_costs.cpp
index 7e45a37043e..f9447ff9058 100644
--- a/ydb/core/tx/columnshard/columnshard_costs.cpp
+++ b/ydb/core/tx/columnshard/columnshard_costs.cpp
@@ -1,7 +1,7 @@
 #include <ydb/core/tx/columnshard/columnshard_costs.h>
 #include <ydb/core/tx/columnshard/engines/index_info.h>
 #include <ydb/core/tx/columnshard/engines/granules_table.h>
-#include <ydb/core/formats/arrow_helpers.h>
+#include <ydb/core/formats/arrow/arrow_helpers.h>
 #include <ydb/core/scheme/scheme_tabledefs.h>
 #include <ydb/core/protos/ssa.pb.h>
 #include <ydb/core/tx/columnshard/engines/predicate.h>
diff --git a/ydb/core/tx/columnshard/columnshard_costs.h b/ydb/core/tx/columnshard/columnshard_costs.h
index b7cb20ebe5d..bd35ab29d19 100644
--- a/ydb/core/tx/columnshard/columnshard_costs.h
+++ b/ydb/core/tx/columnshard/columnshard_costs.h
@@ -1,6 +1,6 @@
 #pragma once
-#include <ydb/core/formats/arrow_batch_builder.h>
-#include <ydb/core/formats/arrow_helpers.h>
+#include <ydb/core/formats/arrow/arrow_batch_builder.h>
+#include <ydb/core/formats/arrow/arrow_helpers.h>
 #include <ydb/core/protos/kqp.pb.h>
 
 namespace NKikimr::NOlap {
diff --git a/ydb/core/tx/columnshard/columnshard_ut_common.h b/ydb/core/tx/columnshard/columnshard_ut_common.h
index 5748ca84064..09027dc4cc4 100644
--- a/ydb/core/tx/columnshard/columnshard_ut_common.h
+++ b/ydb/core/tx/columnshard/columnshard_ut_common.h
@@ -4,7 +4,7 @@
 #include "columnshard_impl.h"
 #include "blob_cache.h"
 
-#include <ydb/core/formats/arrow_batch_builder.h>
+#include <ydb/core/formats/arrow/arrow_batch_builder.h>
 #include <ydb/core/scheme/scheme_tabledefs.h>
 #include <ydb/core/scheme/scheme_types_proto.h>
 #include <ydb/core/testlib/tablet_helpers.h>
diff --git a/ydb/core/tx/columnshard/engines/column_engine.h b/ydb/core/tx/columnshard/engines/column_engine.h
index b4c9c16c322..aaa4a26e838 100644
--- a/ydb/core/tx/columnshard/engines/column_engine.h
+++ b/ydb/core/tx/columnshard/engines/column_engine.h
@@ -8,7 +8,7 @@
 #include "columns_table.h"
 #include "granules_table.h"
 
-#include <ydb/core/formats/replace_key.h>
+#include <ydb/core/formats/arrow/replace_key.h>
 #include <ydb/core/tx/columnshard/blob.h>
 
 namespace NKikimr::NOlap {
diff --git a/ydb/core/tx/columnshard/engines/column_engine_logs.cpp b/ydb/core/tx/columnshard/engines/column_engine_logs.cpp
index 7c699723c21..348e9557950 100644
--- a/ydb/core/tx/columnshard/engines/column_engine_logs.cpp
+++ b/ydb/core/tx/columnshard/engines/column_engine_logs.cpp
@@ -2,8 +2,8 @@
 #include "indexed_read_data.h"
 #include "filter.h"
 
-#include <ydb/core/formats/one_batch_input_stream.h>
-#include <ydb/core/formats/merging_sorted_input_stream.h>
+#include <ydb/core/formats/arrow/one_batch_input_stream.h>
+#include <ydb/core/formats/arrow/merging_sorted_input_stream.h>
 
 #include <concepts>
 #include <span>
diff --git a/ydb/core/tx/columnshard/engines/filter.cpp b/ydb/core/tx/columnshard/engines/filter.cpp
index 6ccee4f24cb..0d7ddc101cb 100644
--- a/ydb/core/tx/columnshard/engines/filter.cpp
+++ b/ydb/core/tx/columnshard/engines/filter.cpp
@@ -2,8 +2,8 @@
 #include "defs.h"
 #include "indexed_read_data.h"
 
-#include <ydb/core/formats/arrow_helpers.h>
-#include <ydb/core/formats/custom_registry.h>
+#include <ydb/core/formats/arrow/arrow_helpers.h>
+#include <ydb/core/formats/arrow/custom_registry.h>
 
 namespace NKikimr::NOlap {
 
diff --git a/ydb/core/tx/columnshard/engines/filter.h b/ydb/core/tx/columnshard/engines/filter.h
index 6112849af0c..45dc4ab596c 100644
--- a/ydb/core/tx/columnshard/engines/filter.h
+++ b/ydb/core/tx/columnshard/engines/filter.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <ydb/core/formats/program.h>
-#include <ydb/core/formats/replace_key.h>
+#include <ydb/core/formats/arrow/program.h>
+#include <ydb/core/formats/arrow/replace_key.h>
 
 namespace NKikimr::NOlap {
 
diff --git a/ydb/core/tx/columnshard/engines/granules_table.h b/ydb/core/tx/columnshard/engines/granules_table.h
index 176de66fa33..e69cd1e57bc 100644
--- a/ydb/core/tx/columnshard/engines/granules_table.h
+++ b/ydb/core/tx/columnshard/engines/granules_table.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "db_wrapper.h"
-#include <ydb/core/formats/replace_key.h>
+#include <ydb/core/formats/arrow/replace_key.h>
 
 namespace NKikimr::NOlap {
 
diff --git a/ydb/core/tx/columnshard/engines/index_info.cpp b/ydb/core/tx/columnshard/engines/index_info.cpp
index ccdae968df9..340e0c3a882 100644
--- a/ydb/core/tx/columnshard/engines/index_info.cpp
+++ b/ydb/core/tx/columnshard/engines/index_info.cpp
@@ -2,8 +2,8 @@
 #include "insert_table.h"
 #include "column_engine.h"
 
-#include <ydb/core/formats/arrow_batch_builder.h>
-#include <ydb/core/formats/sort_cursor.h>
+#include <ydb/core/formats/arrow/arrow_batch_builder.h>
+#include <ydb/core/formats/arrow/sort_cursor.h>
 #include <ydb/core/sys_view/common/schema.h>
 
 namespace NKikimr::NOlap {
diff --git a/ydb/core/tx/columnshard/engines/indexed_read_data.cpp b/ydb/core/tx/columnshard/engines/indexed_read_data.cpp
index d992f9dd638..ba4dd5fcaee 100644
--- a/ydb/core/tx/columnshard/engines/indexed_read_data.cpp
+++ b/ydb/core/tx/columnshard/engines/indexed_read_data.cpp
@@ -4,9 +4,9 @@
 #include "column_engine_logs.h"
 #include <ydb/core/tx/columnshard/columnshard__index_scan.h>
 #include <ydb/core/tx/columnshard/columnshard__stats_scan.h>
-#include <ydb/core/formats/one_batch_input_stream.h>
-#include <ydb/core/formats/merging_sorted_input_stream.h>
-#include <ydb/core/formats/custom_registry.h>
+#include <ydb/core/formats/arrow/one_batch_input_stream.h>
+#include <ydb/core/formats/arrow/merging_sorted_input_stream.h>
+#include <ydb/core/formats/arrow/custom_registry.h>
 
 namespace NKikimr::NOlap {
 
diff --git a/ydb/core/tx/columnshard/engines/portion_info.h b/ydb/core/tx/columnshard/engines/portion_info.h
index 40c220122c1..b75bd6d2175 100644
--- a/ydb/core/tx/columnshard/engines/portion_info.h
+++ b/ydb/core/tx/columnshard/engines/portion_info.h
@@ -4,7 +4,7 @@
 #include "columns_table.h"
 #include "index_info.h"
 
-#include <ydb/core/formats/replace_key.h>
+#include <ydb/core/formats/arrow/replace_key.h>
 
 
 namespace NKikimr::NOlap {
diff --git a/ydb/core/tx/columnshard/engines/predicate.cpp b/ydb/core/tx/columnshard/engines/predicate.cpp
index 493bc06ae2a..8bdb884922b 100644
--- a/ydb/core/tx/columnshard/engines/predicate.cpp
+++ b/ydb/core/tx/columnshard/engines/predicate.cpp
@@ -1,7 +1,7 @@
 #include "predicate.h"
 
-#include <ydb/core/formats/arrow_helpers.h>
-#include <ydb/core/formats/switch_type.h>
+#include <ydb/core/formats/arrow/arrow_helpers.h>
+#include <ydb/core/formats/arrow/switch_type.h>
 
 namespace NKikimr::NOlap {
 
diff --git a/ydb/core/tx/columnshard/engines/predicate.h b/ydb/core/tx/columnshard/engines/predicate.h
index 525009dfbee..6eaca68c7b5 100644
--- a/ydb/core/tx/columnshard/engines/predicate.h
+++ b/ydb/core/tx/columnshard/engines/predicate.h
@@ -2,7 +2,7 @@
 
 #include "defs.h"
 
-#include <ydb/core/formats/program.h>
+#include <ydb/core/formats/arrow/program.h>
 
 #include <contrib/libs/apache/arrow/cpp/src/arrow/record_batch.h>
 
diff --git a/ydb/core/tx/columnshard/engines/reader/CMakeLists.darwin-x86_64.txt b/ydb/core/tx/columnshard/engines/reader/CMakeLists.darwin-x86_64.txt
index d03e55eb670..02acfdbc020 100644
--- a/ydb/core/tx/columnshard/engines/reader/CMakeLists.darwin-x86_64.txt
+++ b/ydb/core/tx/columnshard/engines/reader/CMakeLists.darwin-x86_64.txt
@@ -16,7 +16,7 @@ target_link_libraries(columnshard-engines-reader PUBLIC
   yutil
   libs-apache-arrow
   ydb-core-protos
-  ydb-core-formats
+  core-formats-arrow
 )
 target_sources(columnshard-engines-reader PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/tx/columnshard/engines/reader/filter_assembler.cpp
diff --git a/ydb/core/tx/columnshard/engines/reader/CMakeLists.linux-aarch64.txt b/ydb/core/tx/columnshard/engines/reader/CMakeLists.linux-aarch64.txt
index 503e7703de0..69c7c541391 100644
--- a/ydb/core/tx/columnshard/engines/reader/CMakeLists.linux-aarch64.txt
+++ b/ydb/core/tx/columnshard/engines/reader/CMakeLists.linux-aarch64.txt
@@ -17,7 +17,7 @@ target_link_libraries(columnshard-engines-reader PUBLIC
   yutil
   libs-apache-arrow
   ydb-core-protos
-  ydb-core-formats
+  core-formats-arrow
 )
 target_sources(columnshard-engines-reader PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/tx/columnshard/engines/reader/filter_assembler.cpp
diff --git a/ydb/core/tx/columnshard/engines/reader/CMakeLists.linux-x86_64.txt b/ydb/core/tx/columnshard/engines/reader/CMakeLists.linux-x86_64.txt
index 503e7703de0..69c7c541391 100644
--- a/ydb/core/tx/columnshard/engines/reader/CMakeLists.linux-x86_64.txt
+++ b/ydb/core/tx/columnshard/engines/reader/CMakeLists.linux-x86_64.txt
@@ -17,7 +17,7 @@ target_link_libraries(columnshard-engines-reader PUBLIC
   yutil
   libs-apache-arrow
   ydb-core-protos
-  ydb-core-formats
+  core-formats-arrow
 )
 target_sources(columnshard-engines-reader PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/tx/columnshard/engines/reader/filter_assembler.cpp
diff --git a/ydb/core/tx/columnshard/engines/reader/CMakeLists.windows-x86_64.txt b/ydb/core/tx/columnshard/engines/reader/CMakeLists.windows-x86_64.txt
index d03e55eb670..02acfdbc020 100644
--- a/ydb/core/tx/columnshard/engines/reader/CMakeLists.windows-x86_64.txt
+++ b/ydb/core/tx/columnshard/engines/reader/CMakeLists.windows-x86_64.txt
@@ -16,7 +16,7 @@ target_link_libraries(columnshard-engines-reader PUBLIC
   yutil
   libs-apache-arrow
   ydb-core-protos
-  ydb-core-formats
+  core-formats-arrow
 )
 target_sources(columnshard-engines-reader PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/tx/columnshard/engines/reader/filter_assembler.cpp
diff --git a/ydb/core/tx/columnshard/engines/reader/batch.h b/ydb/core/tx/columnshard/engines/reader/batch.h
index 16a2fb33bb7..ed4d3676fb1 100644
--- a/ydb/core/tx/columnshard/engines/reader/batch.h
+++ b/ydb/core/tx/columnshard/engines/reader/batch.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "conveyor_task.h"
 
-#include <ydb/core/formats/arrow_filter.h>
+#include <ydb/core/formats/arrow/arrow_filter.h>
 #include <ydb/core/tx/columnshard/blob.h>
 #include <ydb/core/tx/columnshard/engines/portion_info.h>
 
diff --git a/ydb/core/tx/columnshard/engines/reader/filter_assembler.h b/ydb/core/tx/columnshard/engines/reader/filter_assembler.h
index 80ee2430c7b..5b32be9363e 100644
--- a/ydb/core/tx/columnshard/engines/reader/filter_assembler.h
+++ b/ydb/core/tx/columnshard/engines/reader/filter_assembler.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "conveyor_task.h"
 
-#include <ydb/core/formats/arrow_filter.h>
+#include <ydb/core/formats/arrow/arrow_filter.h>
 #include <ydb/core/tx/columnshard/engines/portion_info.h>
 #include <ydb/core/tx/columnshard/engines/indexed_read_data.h>
 
diff --git a/ydb/core/tx/columnshard/engines/reader/postfilter_assembler.h b/ydb/core/tx/columnshard/engines/reader/postfilter_assembler.h
index 494b55e10f5..0dad312c346 100644
--- a/ydb/core/tx/columnshard/engines/reader/postfilter_assembler.h
+++ b/ydb/core/tx/columnshard/engines/reader/postfilter_assembler.h
@@ -2,7 +2,7 @@
 #include "conveyor_task.h"
 
 #include <ydb/core/tx/columnshard/engines/portion_info.h>
-#include <ydb/core/formats/arrow_filter.h>
+#include <ydb/core/formats/arrow/arrow_filter.h>
 
 #include <contrib/libs/apache/arrow/cpp/src/arrow/record_batch.h>
 
diff --git a/ydb/core/tx/columnshard/engines/reader/read_filter_merger.h b/ydb/core/tx/columnshard/engines/reader/read_filter_merger.h
index 534707f8858..b25b7a4338f 100644
--- a/ydb/core/tx/columnshard/engines/reader/read_filter_merger.h
+++ b/ydb/core/tx/columnshard/engines/reader/read_filter_merger.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <ydb/library/accessor/accessor.h>
-#include <ydb/core/formats/arrow_filter.h>
-#include <ydb/core/formats/arrow_helpers.h>
+#include <ydb/core/formats/arrow/arrow_filter.h>
+#include <ydb/core/formats/arrow/arrow_helpers.h>
 #include <ydb/core/tx/columnshard/engines/index_info.h>
 #include <contrib/libs/apache/arrow/cpp/src/arrow/record_batch.h>
 #include <util/generic/hash.h>
diff --git a/ydb/core/tx/columnshard/engines/scalars.cpp b/ydb/core/tx/columnshard/engines/scalars.cpp
index f7788b8fd1a..d886b930d3f 100644
--- a/ydb/core/tx/columnshard/engines/scalars.cpp
+++ b/ydb/core/tx/columnshard/engines/scalars.cpp
@@ -1,6 +1,6 @@
 #include "scalars.h"
 
-#include <ydb/core/formats/switch_type.h>
+#include <ydb/core/formats/arrow/switch_type.h>
 #include <ydb/core/util/yverify_stream.h>
 
 namespace NKikimr::NOlap {
diff --git a/ydb/core/tx/columnshard/engines/tier_info.h b/ydb/core/tx/columnshard/engines/tier_info.h
index c6565a60a7e..f6208341e88 100644
--- a/ydb/core/tx/columnshard/engines/tier_info.h
+++ b/ydb/core/tx/columnshard/engines/tier_info.h
@@ -3,7 +3,7 @@
 #include "defs.h"
 #include "scalars.h"
 
-#include <ydb/core/formats/arrow_helpers.h>
+#include <ydb/core/formats/arrow/arrow_helpers.h>
 #include <contrib/libs/apache/arrow/cpp/src/arrow/util/compression.h>
 
 namespace NKikimr::NOlap {
@@ -60,7 +60,7 @@ public:
         Compression = value;
         return *this;
     }
-        
+
     const std::optional<TCompression> GetCompression() const {
         if (NeedExport) {
             return {};
diff --git a/ydb/core/tx/datashard/datashard.cpp b/ydb/core/tx/datashard/datashard.cpp
index 51a3f940524..ab36bdc66d8 100644
--- a/ydb/core/tx/datashard/datashard.cpp
+++ b/ydb/core/tx/datashard/datashard.cpp
@@ -3,7 +3,7 @@
 
 #include <ydb/core/base/interconnect_channels.h>
 #include <ydb/core/engine/minikql/flat_local_tx_factory.h>
-#include <ydb/core/formats/arrow_batch_builder.h>
+#include <ydb/core/formats/arrow/arrow_batch_builder.h>
 #include <ydb/core/scheme/scheme_tablecell.h>
 #include <ydb/core/tablet/tablet_counters_protobuf.h>
 #include <ydb/core/tx/long_tx_service/public/events.h>
diff --git a/ydb/core/tx/datashard/datashard__kqp_scan.cpp b/ydb/core/tx/datashard/datashard__kqp_scan.cpp
index faca260a7bf..681c75ccf02 100644
--- a/ydb/core/tx/datashard/datashard__kqp_scan.cpp
+++ b/ydb/core/tx/datashard/datashard__kqp_scan.cpp
@@ -3,7 +3,7 @@
 #include <util/string/vector.h>
 
 #include <ydb/core/actorlib_impl/long_timer.h>
-#include <ydb/core/formats/arrow_batch_builder.h>
+#include <ydb/core/formats/arrow/arrow_batch_builder.h>
 #include <ydb/core/kqp/compute_actor/kqp_compute_events.h>
 #include <ydb/core/tablet_flat/flat_row_celled.h>
 
diff --git a/ydb/core/tx/datashard/datashard__read_iterator.cpp b/ydb/core/tx/datashard/datashard__read_iterator.cpp
index beae056e505..7b214a03ca1 100644
--- a/ydb/core/tx/datashard/datashard__read_iterator.cpp
+++ b/ydb/core/tx/datashard/datashard__read_iterator.cpp
@@ -4,7 +4,7 @@
 #include "setup_sys_locks.h"
 #include "datashard_locks_db.h"
 
-#include <ydb/core/formats/arrow_batch_builder.h>
+#include <ydb/core/formats/arrow/arrow_batch_builder.h>
 
 #include <util/system/hp_timer.h>
 
diff --git a/ydb/core/tx/datashard/datashard_ut_read_iterator.cpp b/ydb/core/tx/datashard/datashard_ut_read_iterator.cpp
index 2a58b557843..7f9a176a203 100644
--- a/ydb/core/tx/datashard/datashard_ut_read_iterator.cpp
+++ b/ydb/core/tx/datashard/datashard_ut_read_iterator.cpp
@@ -3,8 +3,8 @@
 #include "datashard_active_transaction.h"
 #include "read_iterator.h"
 
-#include <ydb/core/formats/arrow_helpers.h>
-#include <ydb/core/formats/converter.h>
+#include <ydb/core/formats/arrow/arrow_helpers.h>
+#include <ydb/core/formats/arrow/converter.h>
 #include <ydb/core/kqp/ut/common/kqp_ut_common.h>
 #include <ydb/core/tx/tx_proxy/proxy.h>
 #include <ydb/core/tx/tx_proxy/read_table.h>
diff --git a/ydb/core/tx/schemeshard/ut_olap.cpp b/ydb/core/tx/schemeshard/ut_olap.cpp
index 9f22d440f6c..49535aab373 100644
--- a/ydb/core/tx/schemeshard/ut_olap.cpp
+++ b/ydb/core/tx/schemeshard/ut_olap.cpp
@@ -1,7 +1,7 @@
 #include <ydb/core/tx/schemeshard/ut_helpers/helpers.h>
 #include <ydb/core/tx/columnshard/columnshard.h>
-#include <ydb/core/formats/arrow_helpers.h>
-#include <ydb/core/formats/arrow_batch_builder.h>
+#include <ydb/core/formats/arrow/arrow_helpers.h>
+#include <ydb/core/formats/arrow/arrow_batch_builder.h>
 
 using namespace NKikimr::NSchemeShard;
 using namespace NKikimr;
diff --git a/ydb/core/tx/sharding/sharding.h b/ydb/core/tx/sharding/sharding.h
index 73243cf2cc6..6c093ce301b 100644
--- a/ydb/core/tx/sharding/sharding.h
+++ b/ydb/core/tx/sharding/sharding.h
@@ -2,7 +2,7 @@
 
 #include "hash.h"
 
-#include <ydb/core/formats/arrow_helpers.h>
+#include <ydb/core/formats/arrow/arrow_helpers.h>
 #include <ydb/core/protos/flat_scheme_op.pb.h>
 
 #include <ydb/library/yql/public/udf/udf_value.h>
diff --git a/ydb/core/tx/tx_proxy/upload_rows_common_impl.h b/ydb/core/tx/tx_proxy/upload_rows_common_impl.h
index de2de4f0b83..c7030b76277 100644
--- a/ydb/core/tx/tx_proxy/upload_rows_common_impl.h
+++ b/ydb/core/tx/tx_proxy/upload_rows_common_impl.h
@@ -5,12 +5,12 @@
 #include <ydb/core/tx/long_tx_service/public/events.h>
 #include <ydb/core/grpc_services/local_rpc/local_rpc.h>
 #include <ydb/core/grpc_services/rpc_long_tx.h>
-#include <ydb/core/formats/arrow_batch_builder.h>
+#include <ydb/core/formats/arrow/arrow_batch_builder.h>
+#include <ydb/core/formats/arrow/converter.h>
 #include <ydb/core/io_formats/csv.h>
 #include <ydb/core/base/tablet_pipecache.h>
 #include <ydb/core/base/kikimr_issue.h>
 #include <ydb/core/base/path.h>
-#include <ydb/core/formats/converter.h>
 #include <ydb/core/scheme/scheme_tablecell.h>
 #include <ydb/core/scheme/scheme_type_info.h>
 #include <ydb/core/tx/datashard/datashard.h>
diff --git a/ydb/services/ext_index/service/add_index.cpp b/ydb/services/ext_index/service/add_index.cpp
index efc988a0fca..83b7950b1cc 100644
--- a/ydb/services/ext_index/service/add_index.cpp
+++ b/ydb/services/ext_index/service/add_index.cpp
@@ -1,6 +1,6 @@
 #include "add_index.h"
 #include <ydb/core/tx/tx_proxy/upload_rows.h>
-#include <ydb/core/formats/converter.h>
+#include <ydb/core/formats/arrow/converter.h>
 #include <ydb/core/scheme/scheme_tablecell.h>
 
 #include <ydb/public/api/protos/ydb_status_codes.pb.h>
diff --git a/ydb/services/ydb/ydb_bulk_upsert_olap_ut.cpp b/ydb/services/ydb/ydb_bulk_upsert_olap_ut.cpp
index 842756e4d36..df84b3fcea7 100644
--- a/ydb/services/ydb/ydb_bulk_upsert_olap_ut.cpp
+++ b/ydb/services/ydb/ydb_bulk_upsert_olap_ut.cpp
@@ -6,7 +6,7 @@
 
 #include <ydb/library/yql/public/issue/yql_issue.h>
 #include <ydb/library/yql/public/issue/yql_issue_message.h>
-#include <ydb/core/formats/arrow_helpers.h>
+#include <ydb/core/formats/arrow/arrow_helpers.h>
 
 using namespace NYdb;
 
diff --git a/ydb/services/ydb/ydb_common_ut.h b/ydb/services/ydb/ydb_common_ut.h
index 0ef3d871e52..d969b5ed51e 100644
--- a/ydb/services/ydb/ydb_common_ut.h
+++ b/ydb/services/ydb/ydb_common_ut.h
@@ -3,7 +3,7 @@
 #include <library/cpp/testing/unittest/tests_data.h>
 #include <library/cpp/testing/unittest/registar.h>
 #include <ydb/core/testlib/test_client.h>
-#include <ydb/core/formats/arrow_helpers.h>
+#include <ydb/core/formats/arrow/arrow_helpers.h>
 #include <ydb/services/ydb/ydb_dummy.h>
 #include <ydb/public/sdk/cpp/client/ydb_value/value.h>
 
diff --git a/ydb/services/ydb/ydb_long_tx_ut.cpp b/ydb/services/ydb/ydb_long_tx_ut.cpp
index 1a42e1059d1..e5941368687 100644
--- a/ydb/services/ydb/ydb_long_tx_ut.cpp
+++ b/ydb/services/ydb/ydb_long_tx_ut.cpp
@@ -4,7 +4,7 @@
 #include <ydb/core/tx/columnshard/columnshard.h>
 #include <ydb/core/tx/long_tx_service/public/types.h>
 #include <ydb/core/tx/sharding/sharding.h>
-#include <ydb/core/formats/arrow_helpers.h>
+#include <ydb/core/formats/arrow/arrow_helpers.h>
 #include <ydb/library/aclib/aclib.h>
 
 using namespace NYdb;