intermediate changes

ref:fae4893f33010b24c860d4fa7f170add00599e22

16 files changed, 19 insertions, 32 deletions

diff --git a/library/cpp/containers/flat_hash/CMakeLists.txt b/library/cpp/containers/flat_hash/CMakeLists.txt
index 5fdc5b87a0..11e1864b0a 100644
--- a/library/cpp/containers/flat_hash/CMakeLists.txt
+++ b/library/cpp/containers/flat_hash/CMakeLists.txt
@@ -11,8 +11,20 @@ add_library(cpp-containers-flat_hash)
 target_link_libraries(cpp-containers-flat_hash PUBLIC
   contrib-libs-cxxsupp
   yutil
-  containers-flat_hash-lib
 )
 target_sources(cpp-containers-flat_hash PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/containers/flat_hash/flat_hash.cpp
+  ${CMAKE_SOURCE_DIR}/library/cpp/containers/flat_hash/lib/concepts/container.cpp
+  ${CMAKE_SOURCE_DIR}/library/cpp/containers/flat_hash/lib/concepts/iterator.cpp
+  ${CMAKE_SOURCE_DIR}/library/cpp/containers/flat_hash/lib/concepts/size_fitter.cpp
+  ${CMAKE_SOURCE_DIR}/library/cpp/containers/flat_hash/lib/concepts/value_marker.cpp
+  ${CMAKE_SOURCE_DIR}/library/cpp/containers/flat_hash/lib/containers.cpp
+  ${CMAKE_SOURCE_DIR}/library/cpp/containers/flat_hash/lib/expanders.cpp
+  ${CMAKE_SOURCE_DIR}/library/cpp/containers/flat_hash/lib/iterator.cpp
+  ${CMAKE_SOURCE_DIR}/library/cpp/containers/flat_hash/lib/map.cpp
+  ${CMAKE_SOURCE_DIR}/library/cpp/containers/flat_hash/lib/probings.cpp
+  ${CMAKE_SOURCE_DIR}/library/cpp/containers/flat_hash/lib/set.cpp
+  ${CMAKE_SOURCE_DIR}/library/cpp/containers/flat_hash/lib/size_fitters.cpp
+  ${CMAKE_SOURCE_DIR}/library/cpp/containers/flat_hash/lib/table.cpp
+  ${CMAKE_SOURCE_DIR}/library/cpp/containers/flat_hash/lib/value_markers.cpp
 )
diff --git a/library/cpp/containers/flat_hash/lib/fuzz/dense_map_fuzz/fuzz.cpp b/library/cpp/containers/flat_hash/fuzz/dense_map_fuzz/fuzz.cpp
index 9b4cb4c983..3d13482a3d 100644
--- a/library/cpp/containers/flat_hash/lib/fuzz/dense_map_fuzz/fuzz.cpp
+++ b/library/cpp/containers/flat_hash/fuzz/dense_map_fuzz/fuzz.cpp
@@ -4,7 +4,7 @@
 #include <library/cpp/containers/flat_hash/lib/size_fitters.h>
 #include <library/cpp/containers/flat_hash/lib/expanders.h>
 
-#include <library/cpp/containers/flat_hash/lib/fuzz/fuzz_common/fuzz_common.h>
+#include <library/cpp/containers/flat_hash/fuzz/fuzz_common/fuzz_common.h>
 
 #include <util/generic/hash.h>
 #include <util/generic/xrange.h>
diff --git a/library/cpp/containers/flat_hash/lib/fuzz/flat_map_fuzz/fuzz.cpp b/library/cpp/containers/flat_hash/fuzz/flat_map_fuzz/fuzz.cpp
index 7fb73af0e9..5ae81db9ab 100644
--- a/library/cpp/containers/flat_hash/lib/fuzz/flat_map_fuzz/fuzz.cpp
+++ b/library/cpp/containers/flat_hash/fuzz/flat_map_fuzz/fuzz.cpp
@@ -4,7 +4,7 @@
 #include <library/cpp/containers/flat_hash/lib/size_fitters.h>
 #include <library/cpp/containers/flat_hash/lib/expanders.h>
 
-#include <library/cpp/containers/flat_hash/lib/fuzz/fuzz_common/fuzz_common.h>
+#include <library/cpp/containers/flat_hash/fuzz/fuzz_common/fuzz_common.h>
 
 #include <util/generic/hash.h>
 #include <util/generic/xrange.h>
diff --git a/library/cpp/containers/flat_hash/lib/fuzz/fuzz_common/fuzz_common.cpp b/library/cpp/containers/flat_hash/fuzz/fuzz_common/fuzz_common.cpp
index efc2973d18..efc2973d18 100644
--- a/library/cpp/containers/flat_hash/lib/fuzz/fuzz_common/fuzz_common.cpp
+++ b/library/cpp/containers/flat_hash/fuzz/fuzz_common/fuzz_common.cpp
diff --git a/library/cpp/containers/flat_hash/lib/fuzz/fuzz_common/fuzz_common.h b/library/cpp/containers/flat_hash/fuzz/fuzz_common/fuzz_common.h
index 71a123d9cf..71a123d9cf 100644
--- a/library/cpp/containers/flat_hash/lib/fuzz/fuzz_common/fuzz_common.h
+++ b/library/cpp/containers/flat_hash/fuzz/fuzz_common/fuzz_common.h
diff --git a/library/cpp/containers/flat_hash/lib/CMakeLists.txt b/library/cpp/containers/flat_hash/lib/CMakeLists.txt
deleted file mode 100644
index a3f647f9ef..0000000000
--- a/library/cpp/containers/flat_hash/lib/CMakeLists.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-
-# This file was gererated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-
-add_library(containers-flat_hash-lib)
-target_link_libraries(containers-flat_hash-lib PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-)
-target_sources(containers-flat_hash-lib PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/containers/flat_hash/lib/containers.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/containers/flat_hash/lib/expanders.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/containers/flat_hash/lib/iterator.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/containers/flat_hash/lib/map.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/containers/flat_hash/lib/probings.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/containers/flat_hash/lib/set.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/containers/flat_hash/lib/size_fitters.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/containers/flat_hash/lib/table.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/containers/flat_hash/lib/value_markers.cpp
-)
diff --git a/library/cpp/containers/flat_hash/lib/concepts/concepts.cpp b/library/cpp/containers/flat_hash/lib/concepts/concepts.cpp
deleted file mode 100644
index 63eed9acdd..0000000000
--- a/library/cpp/containers/flat_hash/lib/concepts/concepts.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "container.h"
-#include "iterator.h"
-#include "size_fitter.h"
-#include "value_marker.h"
diff --git a/library/cpp/containers/flat_hash/lib/concepts/container.cpp b/library/cpp/containers/flat_hash/lib/concepts/container.cpp
new file mode 100644
index 0000000000..733484a7d7
--- /dev/null
+++ b/library/cpp/containers/flat_hash/lib/concepts/container.cpp
@@ -0,0 +1 @@
+#include "container.h"
diff --git a/library/cpp/containers/flat_hash/lib/concepts/iterator.cpp b/library/cpp/containers/flat_hash/lib/concepts/iterator.cpp
new file mode 100644
index 0000000000..7c5c206cc3
--- /dev/null
+++ b/library/cpp/containers/flat_hash/lib/concepts/iterator.cpp
@@ -0,0 +1 @@
+#include "iterator.h"
diff --git a/library/cpp/containers/flat_hash/lib/concepts/size_fitter.cpp b/library/cpp/containers/flat_hash/lib/concepts/size_fitter.cpp
new file mode 100644
index 0000000000..2afd5b3c63
--- /dev/null
+++ b/library/cpp/containers/flat_hash/lib/concepts/size_fitter.cpp
@@ -0,0 +1 @@
+#include "size_fitter.h"
diff --git a/library/cpp/containers/flat_hash/lib/concepts/value_marker.cpp b/library/cpp/containers/flat_hash/lib/concepts/value_marker.cpp
new file mode 100644
index 0000000000..336ca04737
--- /dev/null
+++ b/library/cpp/containers/flat_hash/lib/concepts/value_marker.cpp
@@ -0,0 +1 @@
+#include "value_marker.h"
diff --git a/library/cpp/containers/flat_hash/lib/ut/containers_ut.cpp b/library/cpp/containers/flat_hash/ut/containers_ut.cpp
index b17b30fa80..b17b30fa80 100644
--- a/library/cpp/containers/flat_hash/lib/ut/containers_ut.cpp
+++ b/library/cpp/containers/flat_hash/ut/containers_ut.cpp
diff --git a/library/cpp/containers/flat_hash/lib/ut/iterator_ut.cpp b/library/cpp/containers/flat_hash/ut/iterator_ut.cpp
index 0b77bf043f..0b77bf043f 100644
--- a/library/cpp/containers/flat_hash/lib/ut/iterator_ut.cpp
+++ b/library/cpp/containers/flat_hash/ut/iterator_ut.cpp
diff --git a/library/cpp/containers/flat_hash/lib/ut/probings_ut.cpp b/library/cpp/containers/flat_hash/ut/probings_ut.cpp
index 593f8cbb1b..593f8cbb1b 100644
--- a/library/cpp/containers/flat_hash/lib/ut/probings_ut.cpp
+++ b/library/cpp/containers/flat_hash/ut/probings_ut.cpp
diff --git a/library/cpp/containers/flat_hash/lib/ut/size_fitters_ut.cpp b/library/cpp/containers/flat_hash/ut/size_fitters_ut.cpp
index 4167947ece..4167947ece 100644
--- a/library/cpp/containers/flat_hash/lib/ut/size_fitters_ut.cpp
+++ b/library/cpp/containers/flat_hash/ut/size_fitters_ut.cpp
diff --git a/library/cpp/containers/flat_hash/lib/ut/table_ut.cpp b/library/cpp/containers/flat_hash/ut/table_ut.cpp
index ea511e2c6a..ea511e2c6a 100644
--- a/library/cpp/containers/flat_hash/lib/ut/table_ut.cpp
+++ b/library/cpp/containers/flat_hash/ut/table_ut.cpp