diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1086b00ddde..5dce3f0390e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,7 +62,7 @@ if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git" AND NOT EXISTS "${ClickHouse_SOURC
     message (FATAL_ERROR "Submodules are not initialized. Run\n\tgit submodule update --init --recursive")
 endif ()
 
-include (cmake/find_ccache.cmake)
+include (cmake/find/ccache.cmake)
 
 if (NOT CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE STREQUAL "None")
     message (STATUS "CMAKE_BUILD_TYPE is not set, set to default = RELWITHDEBINFO")
@@ -303,49 +303,49 @@ endif ()
 message (STATUS "Building for: ${CMAKE_SYSTEM} ${CMAKE_SYSTEM_PROCESSOR} ${CMAKE_LIBRARY_ARCHITECTURE} ; USE_STATIC_LIBRARIES=${USE_STATIC_LIBRARIES} MAKE_STATIC_LIBRARIES=${MAKE_STATIC_LIBRARIES} SPLIT_SHARED=${SPLIT_SHARED_LIBRARIES} UNBUNDLED=${UNBUNDLED} CCACHE=${CCACHE_FOUND} ${CCACHE_VERSION}")
 
 include(GNUInstallDirs)
-include (cmake/find_contrib_lib.cmake)
+include (cmake/contrib_finder.cmake)
 include (cmake/lib_name.cmake)
 
 find_contrib_lib(double-conversion) # Must be before parquet
-include (cmake/find_ssl.cmake)
-include (cmake/find_icu.cmake)
-include (cmake/find_boost.cmake)
-include (cmake/find_zlib.cmake)
-include (cmake/find_zstd.cmake)
-include (cmake/find_ltdl.cmake) # for odbc
-include (cmake/find_termcap.cmake)
-include (cmake/find_odbc.cmake)
+include (cmake/find/ssl.cmake)
+include (cmake/find/icu.cmake)
+include (cmake/find/boost.cmake)
+include (cmake/find/zlib.cmake)
+include (cmake/find/zstd.cmake)
+include (cmake/find/ltdl.cmake) # for odbc
+include (cmake/find/termcap.cmake)
+include (cmake/find/odbc.cmake)
 # openssl, zlib, odbc before poco
-include (cmake/find_poco.cmake)
-include (cmake/find_lz4.cmake)
-include (cmake/find_xxhash.cmake)
-include (cmake/find_sparsehash.cmake)
-include (cmake/find_rt.cmake)
-include (cmake/find_execinfo.cmake)
-include (cmake/find_readline_edit.cmake)
-include (cmake/find_re2.cmake)
-include (cmake/find_libgsasl.cmake)
-include (cmake/find_rdkafka.cmake)
-include (cmake/find_capnp.cmake)
-include (cmake/find_llvm.cmake)
-include (cmake/find_h3.cmake)
-include (cmake/find_cpuid.cmake) # Freebsd, bundled
+include (cmake/find/poco.cmake)
+include (cmake/find/lz4.cmake)
+include (cmake/find/xxhash.cmake)
+include (cmake/find/sparsehash.cmake)
+include (cmake/find/rt.cmake)
+include (cmake/find/execinfo.cmake)
+include (cmake/find/readline_edit.cmake)
+include (cmake/find/re2.cmake)
+include (cmake/find/libgsasl.cmake)
+include (cmake/find/rdkafka.cmake)
+include (cmake/find/capnp.cmake)
+include (cmake/find/llvm.cmake)
+include (cmake/find/h3.cmake)
+include (cmake/find/cpuid.cmake) # Freebsd, bundled
 if (NOT USE_CPUID)
-    include (cmake/find_cpuinfo.cmake) # Debian
+    include (cmake/find/cpuinfo.cmake) # Debian
 endif()
-include (cmake/find_libxml2.cmake)
-include (cmake/find_brotli.cmake)
-include (cmake/find_protobuf.cmake)
-include (cmake/find_pdqsort.cmake)
-include (cmake/find_hdfs3.cmake) # uses protobuf
-include (cmake/find_consistent-hashing.cmake)
-include (cmake/find_base64.cmake)
-include (cmake/find_parquet.cmake)
-include (cmake/find_hyperscan.cmake)
-include (cmake/find_simdjson.cmake)
-include (cmake/find_rapidjson.cmake)
-include (cmake/find_fastops.cmake)
-#include (cmake/find_orc.cmake)
+include (cmake/find/libxml2.cmake)
+include (cmake/find/brotli.cmake)
+include (cmake/find/protobuf.cmake)
+include (cmake/find/pdqsort.cmake)
+include (cmake/find/hdfs3.cmake) # uses protobuf
+include (cmake/find/consistent-hashing.cmake)
+include (cmake/find/base64.cmake)
+include (cmake/find/parquet.cmake)
+include (cmake/find/hyperscan.cmake)
+include (cmake/find/simdjson.cmake)
+include (cmake/find/rapidjson.cmake)
+include (cmake/find/fastops.cmake)
+include (cmake/find/orc.cmake)
 
 find_contrib_lib(cityhash)
 find_contrib_lib(farmhash)
@@ -353,7 +353,7 @@ find_contrib_lib(metrohash)
 find_contrib_lib(btrie)
 
 if (ENABLE_TESTS)
-    include (cmake/find_gtest.cmake)
+    include (cmake/find/gtest.cmake)
 endif ()
 
 # Need to process before "contrib" dir:
diff --git a/cmake/find_contrib_lib.cmake b/cmake/contrib_finder.cmake
similarity index 100%
rename from cmake/find_contrib_lib.cmake
rename to cmake/contrib_finder.cmake
diff --git a/cmake/default_libs.cmake b/cmake/default_libs.cmake
index 54a01042558..0c2bedafda8 100644
--- a/cmake/default_libs.cmake
+++ b/cmake/default_libs.cmake
@@ -30,8 +30,8 @@ set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads REQUIRED)
 
 add_subdirectory(libs/libglibc-compatibility)
-include (cmake/find_unwind.cmake)
-include (cmake/find_cxx.cmake)
+include (cmake/find/unwind.cmake)
+include (cmake/find/cxx.cmake)
 
 add_library(global-group INTERFACE)
 target_link_libraries(global-group INTERFACE
diff --git a/cmake/find_base64.cmake b/cmake/find/base64.cmake
similarity index 100%
rename from cmake/find_base64.cmake
rename to cmake/find/base64.cmake
diff --git a/cmake/find_boost.cmake b/cmake/find/boost.cmake
similarity index 100%
rename from cmake/find_boost.cmake
rename to cmake/find/boost.cmake
diff --git a/cmake/find_brotli.cmake b/cmake/find/brotli.cmake
similarity index 100%
rename from cmake/find_brotli.cmake
rename to cmake/find/brotli.cmake
diff --git a/cmake/find_capnp.cmake b/cmake/find/capnp.cmake
similarity index 100%
rename from cmake/find_capnp.cmake
rename to cmake/find/capnp.cmake
diff --git a/cmake/find_ccache.cmake b/cmake/find/ccache.cmake
similarity index 100%
rename from cmake/find_ccache.cmake
rename to cmake/find/ccache.cmake
diff --git a/cmake/find_consistent-hashing.cmake b/cmake/find/consistent-hashing.cmake
similarity index 100%
rename from cmake/find_consistent-hashing.cmake
rename to cmake/find/consistent-hashing.cmake
diff --git a/cmake/find_cpuid.cmake b/cmake/find/cpuid.cmake
similarity index 100%
rename from cmake/find_cpuid.cmake
rename to cmake/find/cpuid.cmake
diff --git a/cmake/find_cpuinfo.cmake b/cmake/find/cpuinfo.cmake
similarity index 100%
rename from cmake/find_cpuinfo.cmake
rename to cmake/find/cpuinfo.cmake
diff --git a/cmake/find_cxx.cmake b/cmake/find/cxx.cmake
similarity index 100%
rename from cmake/find_cxx.cmake
rename to cmake/find/cxx.cmake
diff --git a/cmake/find_execinfo.cmake b/cmake/find/execinfo.cmake
similarity index 100%
rename from cmake/find_execinfo.cmake
rename to cmake/find/execinfo.cmake
diff --git a/cmake/find_fastops.cmake b/cmake/find/fastops.cmake
similarity index 100%
rename from cmake/find_fastops.cmake
rename to cmake/find/fastops.cmake
diff --git a/cmake/find_gperf.cmake b/cmake/find/gperf.cmake
similarity index 100%
rename from cmake/find_gperf.cmake
rename to cmake/find/gperf.cmake
diff --git a/cmake/find_gtest.cmake b/cmake/find/gtest.cmake
similarity index 100%
rename from cmake/find_gtest.cmake
rename to cmake/find/gtest.cmake
diff --git a/cmake/find_h3.cmake b/cmake/find/h3.cmake
similarity index 100%
rename from cmake/find_h3.cmake
rename to cmake/find/h3.cmake
diff --git a/cmake/find_hdfs3.cmake b/cmake/find/hdfs3.cmake
similarity index 100%
rename from cmake/find_hdfs3.cmake
rename to cmake/find/hdfs3.cmake
diff --git a/cmake/find_hyperscan.cmake b/cmake/find/hyperscan.cmake
similarity index 100%
rename from cmake/find_hyperscan.cmake
rename to cmake/find/hyperscan.cmake
diff --git a/cmake/find_icu.cmake b/cmake/find/icu.cmake
similarity index 100%
rename from cmake/find_icu.cmake
rename to cmake/find/icu.cmake
diff --git a/cmake/find_libgsasl.cmake b/cmake/find/libgsasl.cmake
similarity index 100%
rename from cmake/find_libgsasl.cmake
rename to cmake/find/libgsasl.cmake
diff --git a/cmake/find_libxml2.cmake b/cmake/find/libxml2.cmake
similarity index 100%
rename from cmake/find_libxml2.cmake
rename to cmake/find/libxml2.cmake
diff --git a/cmake/find_llvm.cmake b/cmake/find/llvm.cmake
similarity index 100%
rename from cmake/find_llvm.cmake
rename to cmake/find/llvm.cmake
diff --git a/cmake/find_ltdl.cmake b/cmake/find/ltdl.cmake
similarity index 100%
rename from cmake/find_ltdl.cmake
rename to cmake/find/ltdl.cmake
diff --git a/cmake/find_lz4.cmake b/cmake/find/lz4.cmake
similarity index 100%
rename from cmake/find_lz4.cmake
rename to cmake/find/lz4.cmake
diff --git a/cmake/find_odbc.cmake b/cmake/find/odbc.cmake
similarity index 100%
rename from cmake/find_odbc.cmake
rename to cmake/find/odbc.cmake
diff --git a/cmake/find_orc.cmake b/cmake/find/orc.cmake
similarity index 100%
rename from cmake/find_orc.cmake
rename to cmake/find/orc.cmake
diff --git a/cmake/find_parquet.cmake b/cmake/find/parquet.cmake
similarity index 98%
rename from cmake/find_parquet.cmake
rename to cmake/find/parquet.cmake
index 5c5bc664113..77ce38b255e 100644
--- a/cmake/find_parquet.cmake
+++ b/cmake/find/parquet.cmake
@@ -21,7 +21,7 @@ endif()
 
 if(ARROW_INCLUDE_DIR AND PARQUET_INCLUDE_DIR)
 elseif(NOT MISSING_INTERNAL_PARQUET_LIBRARY AND NOT OS_FREEBSD)
-    include(cmake/find_snappy.cmake)
+    include(cmake/find/snappy.cmake)
     set(CAN_USE_INTERNAL_PARQUET_LIBRARY 1)
     include(CheckCXXSourceCompiles)
     if(NOT USE_INTERNAL_DOUBLE_CONVERSION_LIBRARY)
diff --git a/cmake/find_pdqsort.cmake b/cmake/find/pdqsort.cmake
similarity index 100%
rename from cmake/find_pdqsort.cmake
rename to cmake/find/pdqsort.cmake
diff --git a/cmake/find_poco.cmake b/cmake/find/poco.cmake
similarity index 100%
rename from cmake/find_poco.cmake
rename to cmake/find/poco.cmake
diff --git a/cmake/find_protobuf.cmake b/cmake/find/protobuf.cmake
similarity index 100%
rename from cmake/find_protobuf.cmake
rename to cmake/find/protobuf.cmake
diff --git a/cmake/find_rapidjson.cmake b/cmake/find/rapidjson.cmake
similarity index 100%
rename from cmake/find_rapidjson.cmake
rename to cmake/find/rapidjson.cmake
diff --git a/cmake/find_rdkafka.cmake b/cmake/find/rdkafka.cmake
similarity index 100%
rename from cmake/find_rdkafka.cmake
rename to cmake/find/rdkafka.cmake
diff --git a/cmake/find_re2.cmake b/cmake/find/re2.cmake
similarity index 100%
rename from cmake/find_re2.cmake
rename to cmake/find/re2.cmake
diff --git a/cmake/find_readline_edit.cmake b/cmake/find/readline_edit.cmake
similarity index 100%
rename from cmake/find_readline_edit.cmake
rename to cmake/find/readline_edit.cmake
diff --git a/cmake/find_rt.cmake b/cmake/find/rt.cmake
similarity index 100%
rename from cmake/find_rt.cmake
rename to cmake/find/rt.cmake
diff --git a/cmake/find_simdjson.cmake b/cmake/find/simdjson.cmake
similarity index 100%
rename from cmake/find_simdjson.cmake
rename to cmake/find/simdjson.cmake
diff --git a/cmake/find_snappy.cmake b/cmake/find/snappy.cmake
similarity index 100%
rename from cmake/find_snappy.cmake
rename to cmake/find/snappy.cmake
diff --git a/cmake/find_sparsehash.cmake b/cmake/find/sparsehash.cmake
similarity index 100%
rename from cmake/find_sparsehash.cmake
rename to cmake/find/sparsehash.cmake
diff --git a/cmake/find_ssl.cmake b/cmake/find/ssl.cmake
similarity index 100%
rename from cmake/find_ssl.cmake
rename to cmake/find/ssl.cmake
diff --git a/cmake/find_termcap.cmake b/cmake/find/termcap.cmake
similarity index 100%
rename from cmake/find_termcap.cmake
rename to cmake/find/termcap.cmake
diff --git a/cmake/find_unwind.cmake b/cmake/find/unwind.cmake
similarity index 100%
rename from cmake/find_unwind.cmake
rename to cmake/find/unwind.cmake
diff --git a/cmake/find_xxhash.cmake b/cmake/find/xxhash.cmake
similarity index 100%
rename from cmake/find_xxhash.cmake
rename to cmake/find/xxhash.cmake
diff --git a/cmake/find_zlib.cmake b/cmake/find/zlib.cmake
similarity index 100%
rename from cmake/find_zlib.cmake
rename to cmake/find/zlib.cmake
diff --git a/cmake/find_zstd.cmake b/cmake/find/zstd.cmake
similarity index 100%
rename from cmake/find_zstd.cmake
rename to cmake/find/zstd.cmake