diff --git a/.gitignore b/.gitignore
index 9d724a1..26f1e02 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,4 +9,6 @@ crates/target
 # qdrant
 .qdrant-initialized
 storage
-snapshots
\ No newline at end of file
+snapshots
+
+.DS_Store
\ No newline at end of file
diff --git a/Cargo.lock b/Cargo.lock
index 76eeaf9..8c9dad0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3,5669 +3,303 @@
 version = 3
 
 [[package]]
-name = "actix-codec"
-version = "0.5.1"
+name = "aho-corasick"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "617a8268e3537fe1d8c9ead925fca49ef6400927ee7bc26750e90ecee14ce4b8"
+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
 dependencies = [
- "bitflags 1.3.2",
- "bytes",
- "futures-core",
- "futures-sink",
  "memchr",
- "pin-project-lite",
- "tokio",
- "tokio-util",
- "tracing",
-]
-
-[[package]]
-name = "actix-cors"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b340e9cfa5b08690aae90fb61beb44e9b06f44fe3d0f93781aaa58cfba86245e"
-dependencies = [
- "actix-utils",
- "actix-web",
- "derive_more",
- "futures-util",
- "log",
- "once_cell",
- "smallvec",
-]
-
-[[package]]
-name = "actix-files"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d832782fac6ca7369a70c9ee9a20554623c5e51c76e190ad151780ebea1cf689"
-dependencies = [
- "actix-http",
- "actix-service",
- "actix-utils",
- "actix-web",
- "askama_escape",
- "bitflags 1.3.2",
- "bytes",
- "derive_more",
- "futures-core",
- "http-range",
- "log",
- "mime",
- "mime_guess",
- "percent-encoding",
- "pin-project-lite",
-]
-
-[[package]]
-name = "actix-http"
-version = "3.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a92ef85799cba03f76e4f7c10f533e66d87c9a7e7055f3391f09000ad8351bc9"
-dependencies = [
- "actix-codec",
- "actix-rt",
- "actix-service",
- "actix-tls",
- "actix-utils",
- "ahash 0.8.3",
- "base64 0.21.3",
- "bitflags 2.4.0",
- "brotli",
- "bytes",
- "bytestring",
- "derive_more",
- "encoding_rs",
- "flate2",
- "futures-core",
- "h2",
- "http",
- "httparse",
- "httpdate",
- "itoa",
- "language-tags",
- "local-channel",
- "mime",
- "percent-encoding",
- "pin-project-lite",
- "rand 0.8.5",
- "sha1",
- "smallvec",
- "tokio",
- "tokio-util",
- "tracing",
- "zstd 0.12.4",
-]
-
-[[package]]
-name = "actix-macros"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb"
-dependencies = [
- "quote",
- "syn 2.0.29",
 ]
 
 [[package]]
-name = "actix-multipart"
-version = "0.6.1"
+name = "bstr"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b960e2aea75f49c8f069108063d12a48d329fc8b60b786dfc7552a9d5918d2d"
+checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019"
 dependencies = [
- "actix-multipart-derive",
- "actix-utils",
- "actix-web",
- "bytes",
- "derive_more",
- "futures-core",
- "futures-util",
- "httparse",
- "local-waker",
- "log",
  "memchr",
- "mime",
- "serde",
- "serde_json",
- "serde_plain",
- "tempfile",
- "tokio",
-]
-
-[[package]]
-name = "actix-multipart-derive"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a0a77f836d869f700e5b47ac7c3c8b9c8bc82e4aec861954c6198abee3ebd4d"
-dependencies = [
- "darling",
- "parse-size",
- "proc-macro2",
- "quote",
- "syn 2.0.29",
-]
-
-[[package]]
-name = "actix-router"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d66ff4d247d2b160861fa2866457e85706833527840e4133f8f49aa423a38799"
-dependencies = [
- "bytestring",
- "http",
- "regex",
  "serde",
- "tracing",
-]
-
-[[package]]
-name = "actix-rt"
-version = "2.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28f32d40287d3f402ae0028a9d54bef51af15c8769492826a69d28f81893151d"
-dependencies = [
- "futures-core",
- "tokio",
 ]
 
 [[package]]
-name = "actix-server"
-version = "2.3.0"
+name = "cc"
+version = "1.0.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3eb13e7eef0423ea6eab0e59f6c72e7cb46d33691ad56a726b3cd07ddec2c2d4"
+checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
 dependencies = [
- "actix-rt",
- "actix-service",
- "actix-utils",
- "futures-core",
- "futures-util",
- "mio",
- "socket2 0.5.3",
- "tokio",
- "tracing",
+ "libc",
 ]
 
 [[package]]
-name = "actix-service"
-version = "2.0.2"
+name = "cfg-if"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b894941f818cfdc7ccc4b9e60fa7e53b5042a2e8567270f9147d5591893373a"
-dependencies = [
- "futures-core",
- "paste",
- "pin-project-lite",
-]
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
-name = "actix-tls"
-version = "3.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72616e7fbec0aa99c6f3164677fa48ff5a60036d0799c98cab894a44f3e0efc3"
+name = "codeindex"
+version = "0.1.0"
 dependencies = [
- "actix-rt",
- "actix-service",
- "actix-utils",
- "futures-core",
- "impl-more",
- "pin-project-lite",
- "rustls 0.21.7",
- "rustls-webpki 0.101.4",
- "tokio",
- "tokio-rustls 0.23.4",
- "tokio-util",
- "tracing",
- "webpki-roots 0.22.6",
+ "ignore",
+ "tree-sitter",
+ "tree-sitter-javascript",
+ "tree-sitter-python",
+ "tree-sitter-rust",
+ "tree-sitter-typescript",
 ]
 
 [[package]]
-name = "actix-utils"
-version = "3.0.1"
+name = "fnv"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88a1dcdff1466e3c2488e1cb5c36a71822750ad43839937f85d2f4d9f8b705d8"
-dependencies = [
- "local-waker",
- "pin-project-lite",
-]
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
 [[package]]
-name = "actix-web"
-version = "4.4.0"
+name = "globset"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e4a5b5e29603ca8c94a77c65cf874718ceb60292c5a5c3e5f4ace041af462b9"
+checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d"
 dependencies = [
- "actix-codec",
- "actix-http",
- "actix-macros",
- "actix-router",
- "actix-rt",
- "actix-server",
- "actix-service",
- "actix-tls",
- "actix-utils",
- "actix-web-codegen",
- "ahash 0.8.3",
- "bytes",
- "bytestring",
- "cfg-if",
- "cookie",
- "derive_more",
- "encoding_rs",
- "futures-core",
- "futures-util",
- "itoa",
- "language-tags",
+ "aho-corasick",
+ "bstr",
+ "fnv",
  "log",
- "mime",
- "once_cell",
- "pin-project-lite",
  "regex",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "smallvec",
- "socket2 0.5.3",
- "time 0.3.28",
- "url",
-]
-
-[[package]]
-name = "actix-web-codegen"
-version = "4.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb1f50ebbb30eca122b188319a4398b3f7bb4a8cdf50ecfb73bfc6a3c3ce54f5"
-dependencies = [
- "actix-router",
- "proc-macro2",
- "quote",
- "syn 2.0.29",
 ]
 
 [[package]]
-name = "actix-web-validator"
-version = "5.0.1"
+name = "ignore"
+version = "0.4.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f40ee5ed4e266dad8d980f964c5ddd746f1f4f85b7f3b54f7099ab861ec6d746"
+checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492"
 dependencies = [
- "actix-http",
- "actix-router",
- "actix-web",
- "bytes",
- "futures",
- "futures-util",
+ "globset",
+ "lazy_static",
  "log",
- "mime",
- "serde",
- "serde_json",
- "serde_qs",
- "serde_urlencoded",
- "thiserror",
- "validator",
-]
-
-[[package]]
-name = "addr2line"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
-dependencies = [
- "gimli",
-]
-
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
-[[package]]
-name = "aes"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2"
-dependencies = [
- "cfg-if",
- "cipher",
- "cpufeatures",
-]
-
-[[package]]
-name = "ahash"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
-dependencies = [
- "getrandom 0.2.10",
- "once_cell",
- "version_check",
-]
-
-[[package]]
-name = "ahash"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
-dependencies = [
- "cfg-if",
- "getrandom 0.2.10",
- "once_cell",
- "version_check",
-]
-
-[[package]]
-name = "aho-corasick"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783"
-dependencies = [
  "memchr",
+ "regex",
+ "same-file",
+ "thread_local",
+ "walkdir",
+ "winapi-util",
 ]
 
 [[package]]
-name = "alloc-no-stdlib"
-version = "2.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3"
-
-[[package]]
-name = "alloc-stdlib"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece"
-dependencies = [
- "alloc-no-stdlib",
-]
-
-[[package]]
-name = "android-tzdata"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
-
-[[package]]
-name = "android_system_properties"
-version = "0.1.5"
+name = "lazy_static"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
-dependencies = [
- "libc",
-]
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
-name = "anes"
-version = "0.1.6"
+name = "libc"
+version = "0.2.149"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
+checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
 
 [[package]]
-name = "anstream"
-version = "0.5.0"
+name = "log"
+version = "0.4.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c"
-dependencies = [
- "anstyle",
- "anstyle-parse",
- "anstyle-query",
- "anstyle-wincon",
- "colorchoice",
- "utf8parse",
-]
+checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
 
 [[package]]
-name = "anstyle"
-version = "1.0.2"
+name = "memchr"
+version = "2.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea"
+checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
 
 [[package]]
-name = "anstyle-parse"
-version = "0.2.1"
+name = "once_cell"
+version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333"
-dependencies = [
- "utf8parse",
-]
+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
 
 [[package]]
-name = "anstyle-query"
-version = "1.0.0"
+name = "proc-macro2"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
+checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
 dependencies = [
- "windows-sys 0.48.0",
+ "unicode-ident",
 ]
 
 [[package]]
-name = "anstyle-wincon"
-version = "2.1.0"
+name = "quote"
+version = "1.0.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd"
+checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
 dependencies = [
- "anstyle",
- "windows-sys 0.48.0",
+ "proc-macro2",
 ]
 
 [[package]]
-name = "anyhow"
-version = "1.0.75"
+name = "regex"
+version = "1.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
-
-[[package]]
-name = "api"
-version = "1.4.1"
+checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
 dependencies = [
- "chrono",
- "env_logger",
- "log",
- "parking_lot",
- "prost",
- "prost-build",
- "prost-types",
- "rand 0.8.5",
- "schemars",
- "segment",
- "serde",
- "serde_json",
- "thiserror",
- "tokio",
- "tonic",
- "tonic-build",
- "tower",
- "uuid",
- "validator",
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
 ]
 
 [[package]]
-name = "approx"
-version = "0.5.1"
+name = "regex-automata"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6"
+checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
 dependencies = [
- "num-traits",
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
 ]
 
 [[package]]
-name = "arc-swap"
-version = "1.6.0"
+name = "regex-syntax"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6"
+checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
 
 [[package]]
-name = "arrayvec"
-version = "0.4.12"
+name = "same-file"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
 dependencies = [
- "nodrop",
+ "winapi-util",
 ]
 
 [[package]]
-name = "arrayvec"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
-
-[[package]]
-name = "askama_escape"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "619743e34b5ba4e9703bba34deac3427c72507c7159f5fd030aea8cac0cfe341"
-
-[[package]]
-name = "async-stream"
-version = "0.3.5"
+name = "serde"
+version = "1.0.189"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51"
+checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537"
 dependencies = [
- "async-stream-impl",
- "futures-core",
- "pin-project-lite",
+ "serde_derive",
 ]
 
 [[package]]
-name = "async-stream-impl"
-version = "0.3.5"
+name = "serde_derive"
+version = "1.0.189"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
+checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn",
 ]
 
 [[package]]
-name = "async-trait"
-version = "0.1.73"
+name = "syn"
+version = "2.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0"
+checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "unicode-ident",
 ]
 
 [[package]]
-name = "atomic-polyfill"
-version = "0.1.11"
+name = "thread_local"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3ff7eb3f316534d83a8a2c3d1674ace8a5a71198eba31e2e2b597833f699b28"
+checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
 dependencies = [
- "critical-section",
+ "cfg-if",
+ "once_cell",
 ]
 
 [[package]]
-name = "atomic_refcell"
-version = "0.1.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "112ef6b3f6cb3cb6fc5b6b494ef7a848492cff1ab0ef4de10b0f7d572861c905"
-
-[[package]]
-name = "atomicwrites"
-version = "0.4.1"
+name = "tree-sitter"
+version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1163d9d7c51de51a2b79d6df5e8888d11e9df17c752ce4a285fb6ca1580734e"
+checksum = "e747b1f9b7b931ed39a548c1fae149101497de3c1fc8d9e18c62c1a66c683d3d"
 dependencies = [
- "rustix 0.37.23",
- "tempfile",
- "windows-sys 0.48.0",
+ "cc",
+ "regex",
 ]
 
 [[package]]
-name = "atty"
-version = "0.2.14"
+name = "tree-sitter-javascript"
+version = "0.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+checksum = "edbc663376bdd294bd1f0a6daf859aedb9aa5bdb72217d7ad8ba2d5314102cf7"
 dependencies = [
- "hermit-abi 0.1.19",
- "libc",
- "winapi",
+ "cc",
+ "tree-sitter",
 ]
 
 [[package]]
-name = "autocfg"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
-
-[[package]]
-name = "axum"
-version = "0.6.20"
+name = "tree-sitter-python"
+version = "0.20.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf"
+checksum = "e6c93b1b1fbd0d399db3445f51fd3058e43d0b4dcff62ddbdb46e66550978aa5"
 dependencies = [
- "async-trait",
- "axum-core",
- "bitflags 1.3.2",
- "bytes",
- "futures-util",
- "http",
- "http-body",
- "hyper",
- "itoa",
- "matchit",
- "memchr",
- "mime",
- "percent-encoding",
- "pin-project-lite",
- "rustversion",
- "serde",
- "serde_json",
- "serde_path_to_error",
- "serde_urlencoded",
- "sync_wrapper",
- "tokio",
- "tower",
- "tower-layer",
- "tower-service",
+ "cc",
+ "tree-sitter",
 ]
 
 [[package]]
-name = "axum-core"
-version = "0.3.4"
+name = "tree-sitter-rust"
+version = "0.20.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c"
+checksum = "b0832309b0b2b6d33760ce5c0e818cb47e1d72b468516bfe4134408926fa7594"
 dependencies = [
- "async-trait",
- "bytes",
- "futures-util",
- "http",
- "http-body",
- "mime",
- "rustversion",
- "tower-layer",
- "tower-service",
+ "cc",
+ "tree-sitter",
 ]
 
 [[package]]
-name = "backtrace"
-version = "0.3.69"
+name = "tree-sitter-typescript"
+version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
+checksum = "a75049f0aafabb2aac205d7bb24da162b53dcd0cfb326785f25a2f32efa8071a"
 dependencies = [
- "addr2line",
  "cc",
- "cfg-if",
- "libc",
- "miniz_oxide",
- "object",
- "rustc-demangle",
+ "tree-sitter",
 ]
 
 [[package]]
-name = "base64"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
-
-[[package]]
-name = "base64"
-version = "0.21.3"
+name = "unicode-ident"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
-name = "base64ct"
-version = "1.6.0"
+name = "walkdir"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
+checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
 
 [[package]]
-name = "bincode"
-version = "1.3.3"
+name = "winapi"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
 dependencies = [
- "serde",
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
 ]
 
 [[package]]
-name = "bindgen"
-version = "0.65.1"
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5"
-dependencies = [
- "bitflags 1.3.2",
- "cexpr",
- "clang-sys",
- "lazy_static",
- "lazycell",
- "peeking_take_while",
- "prettyplease 0.2.12",
- "proc-macro2",
- "quote",
- "regex",
- "rustc-hash",
- "shlex",
- "syn 2.0.29",
-]
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
-name = "bit-set"
-version = "0.5.3"
+name = "winapi-util"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
+checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
 dependencies = [
- "bit-vec",
-]
-
-[[package]]
-name = "bit-vec"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "bitflags"
-version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
-
-[[package]]
-name = "bitvec"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
-dependencies = [
- "funty",
- "radium",
- "tap",
- "wyz",
-]
-
-[[package]]
-name = "blake2-rfc"
-version = "0.2.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400"
-dependencies = [
- "arrayvec 0.4.12",
- "constant_time_eq 0.1.5",
-]
-
-[[package]]
-name = "block-buffer"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "brotli"
-version = "3.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68"
-dependencies = [
- "alloc-no-stdlib",
- "alloc-stdlib",
- "brotli-decompressor",
-]
-
-[[package]]
-name = "brotli-decompressor"
-version = "2.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744"
-dependencies = [
- "alloc-no-stdlib",
- "alloc-stdlib",
-]
-
-[[package]]
-name = "bumpalo"
-version = "3.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
-
-[[package]]
-name = "bytemuck"
-version = "1.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea"
-
-[[package]]
-name = "byteorder"
-version = "1.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
-
-[[package]]
-name = "bytes"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
-
-[[package]]
-name = "bytestring"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "238e4886760d98c4f899360c834fa93e62cf7f721ac3c2da375cbdf4b8679aae"
-dependencies = [
- "bytes",
-]
-
-[[package]]
-name = "bzip2"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8"
-dependencies = [
- "bzip2-sys",
- "libc",
-]
-
-[[package]]
-name = "bzip2-sys"
-version = "0.1.11+1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
-]
-
-[[package]]
-name = "cast"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
-
-[[package]]
-name = "cc"
-version = "1.0.83"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
-dependencies = [
- "jobserver",
- "libc",
-]
-
-[[package]]
-name = "cedarwood"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d910bedd62c24733263d0bed247460853c9d22e8956bd4cd964302095e04e90"
-dependencies = [
- "smallvec",
-]
-
-[[package]]
-name = "cexpr"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
-dependencies = [
- "nom",
-]
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "cgroups-rs"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fb3af90c8d48ad5f432d8afb521b5b40c2a2fce46dd60e05912de51c47fba64"
-dependencies = [
- "libc",
- "log",
- "nix 0.25.1",
- "regex",
- "thiserror",
-]
-
-[[package]]
-name = "charabia"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "098219a776307414866165a03a9cc68c1578764fe3616fe979e1c280790ddd73"
-dependencies = [
- "aho-corasick",
- "cow-utils",
- "csv",
- "deunicode",
- "either",
- "fst",
- "irg-kvariants",
- "jieba-rs",
- "lindera-core",
- "lindera-dictionary",
- "lindera-tokenizer",
- "once_cell",
- "pinyin",
- "serde",
- "slice-group-by",
- "unicode-normalization",
- "whatlang",
-]
-
-[[package]]
-name = "chrono"
-version = "0.4.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f56b4c72906975ca04becb8a30e102dfecddd0c06181e3e95ddc444be28881f8"
-dependencies = [
- "android-tzdata",
- "iana-time-zone",
- "js-sys",
- "num-traits",
- "serde",
- "time 0.1.45",
- "wasm-bindgen",
- "windows-targets 0.48.5",
-]
-
-[[package]]
-name = "ciborium"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926"
-dependencies = [
- "ciborium-io",
- "ciborium-ll",
- "serde",
-]
-
-[[package]]
-name = "ciborium-io"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656"
-
-[[package]]
-name = "ciborium-ll"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b"
-dependencies = [
- "ciborium-io",
- "half",
-]
-
-[[package]]
-name = "cipher"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
-dependencies = [
- "crypto-common",
- "inout",
-]
-
-[[package]]
-name = "clang-sys"
-version = "1.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f"
-dependencies = [
- "glob",
- "libc",
- "libloading",
-]
-
-[[package]]
-name = "clap"
-version = "4.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c8d502cbaec4595d2e7d5f61e318f05417bd2b66fdc3809498f0d3fdf0bea27"
-dependencies = [
- "clap_builder",
- "clap_derive",
- "once_cell",
-]
-
-[[package]]
-name = "clap_builder"
-version = "4.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5891c7bc0edb3e1c2204fc5e94009affabeb1821c9e5fdc3959536c5c0bb984d"
-dependencies = [
- "anstream",
- "anstyle",
- "clap_lex",
- "strsim",
-]
-
-[[package]]
-name = "clap_derive"
-version = "4.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9fd1a5729c4548118d7d70ff234a44868d00489a4b6597b0b020918a0e91a1a"
-dependencies = [
- "heck",
- "proc-macro2",
- "quote",
- "syn 2.0.29",
-]
-
-[[package]]
-name = "clap_lex"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961"
-
-[[package]]
-name = "codeindex"
-version = "0.1.0"
-dependencies = [
- "axum",
- "cc",
- "codeindex_common",
- "colored",
- "log",
- "qdrant",
- "redis",
- "serde",
- "serde_json",
- "tokio",
- "tree-sitter",
- "tree-sitter-javascript",
- "tree-sitter-python",
- "tree-sitter-rust",
- "tree-sitter-typescript",
-]
-
-[[package]]
-name = "codeindex_common"
-version = "0.1.0"
-dependencies = [
- "atty",
- "git2",
-]
-
-[[package]]
-name = "collection"
-version = "0.4.2"
-dependencies = [
- "actix-web-validator",
- "api",
- "arc-swap",
- "async-trait",
- "atomicwrites",
- "chrono",
- "common",
- "criterion",
- "env_logger",
- "fs_extra",
- "futures",
- "hashring",
- "indicatif",
- "itertools 0.11.0",
- "log",
- "merge",
- "num_cpus",
- "ordered-float 3.9.1",
- "parking_lot",
- "pprof",
- "rand 0.8.5",
- "rmp-serde",
- "rstest",
- "schemars",
- "segment",
- "semver",
- "serde",
- "serde_cbor",
- "serde_json",
- "tar",
- "tempfile",
- "thiserror",
- "tinyvec",
- "tokio",
- "tonic",
- "tower",
- "url",
- "uuid",
- "validator",
- "wal",
-]
-
-[[package]]
-name = "colorchoice"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
-
-[[package]]
-name = "colored"
-version = "2.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6"
-dependencies = [
- "is-terminal",
- "lazy_static",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "combine"
-version = "4.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4"
-dependencies = [
- "bytes",
- "futures-core",
- "memchr",
- "pin-project-lite",
- "tokio",
- "tokio-util",
-]
-
-[[package]]
-name = "common"
-version = "0.1.0"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "config"
-version = "0.13.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d379af7f68bfc21714c6c7dea883544201741d2ce8274bb12fa54f89507f52a7"
-dependencies = [
- "async-trait",
- "json5",
- "lazy_static",
- "nom",
- "pathdiff",
- "ron",
- "rust-ini",
- "serde",
- "serde_json",
- "toml",
- "yaml-rust",
-]
-
-[[package]]
-name = "console"
-version = "0.15.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8"
-dependencies = [
- "encode_unicode",
- "lazy_static",
- "libc",
- "unicode-width",
- "windows-sys 0.45.0",
-]
-
-[[package]]
-name = "console-api"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2895653b4d9f1538a83970077cb01dfc77a4810524e51a110944688e916b18e"
-dependencies = [
- "prost",
- "prost-types",
- "tonic",
- "tracing-core",
-]
-
-[[package]]
-name = "console-subscriber"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4cf42660ac07fcebed809cfe561dd8730bcd35b075215e6479c516bcd0d11cb"
-dependencies = [
- "console-api",
- "crossbeam-channel",
- "crossbeam-utils",
- "futures",
- "hdrhistogram",
- "humantime",
- "parking_lot",
- "prost-types",
- "serde",
- "serde_json",
- "thread_local",
- "tokio",
- "tokio-stream",
- "tonic",
- "tracing",
- "tracing-core",
- "tracing-subscriber",
-]
-
-[[package]]
-name = "constant_time_eq"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
-
-[[package]]
-name = "constant_time_eq"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
-
-[[package]]
-name = "convert_case"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
-
-[[package]]
-name = "cookie"
-version = "0.16.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb"
-dependencies = [
- "percent-encoding",
- "time 0.3.28",
- "version_check",
-]
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
-
-[[package]]
-name = "cow-utils"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79bb3adfaf5f75d24b01aee375f7555907840fa2800e5ec8fa3b9e2031830173"
-
-[[package]]
-name = "cpp_demangle"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e8227005286ec39567949b33df9896bcadfa6051bccca2488129f108ca23119"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "cpufeatures"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "crc"
-version = "3.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe"
-dependencies = [
- "crc-catalog",
-]
-
-[[package]]
-name = "crc-catalog"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484"
-
-[[package]]
-name = "crc16"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "338089f42c427b86394a5ee60ff321da23a5c89c9d89514c829687b26359fcff"
-
-[[package]]
-name = "crc32fast"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "criterion"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f"
-dependencies = [
- "anes",
- "cast",
- "ciborium",
- "clap",
- "criterion-plot",
- "is-terminal",
- "itertools 0.10.5",
- "num-traits",
- "once_cell",
- "oorandom",
- "plotters",
- "rayon",
- "regex",
- "serde",
- "serde_derive",
- "serde_json",
- "tinytemplate",
- "walkdir",
-]
-
-[[package]]
-name = "criterion-plot"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1"
-dependencies = [
- "cast",
- "itertools 0.10.5",
-]
-
-[[package]]
-name = "critical-section"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216"
-
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
-dependencies = [
- "cfg-if",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-deque"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef"
-dependencies = [
- "cfg-if",
- "crossbeam-epoch",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-epoch"
-version = "0.9.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7"
-dependencies = [
- "autocfg",
- "cfg-if",
- "crossbeam-utils",
- "memoffset",
- "scopeguard",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.8.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "crypto-common"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
-dependencies = [
- "generic-array",
- "typenum",
-]
-
-[[package]]
-name = "csv"
-version = "1.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086"
-dependencies = [
- "csv-core",
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "csv-core"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "darling"
-version = "0.20.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e"
-dependencies = [
- "darling_core",
- "darling_macro",
-]
-
-[[package]]
-name = "darling_core"
-version = "0.20.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim",
- "syn 2.0.29",
-]
-
-[[package]]
-name = "darling_macro"
-version = "0.20.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
-dependencies = [
- "darling_core",
- "quote",
- "syn 2.0.29",
-]
-
-[[package]]
-name = "debugid"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d"
-dependencies = [
- "uuid",
-]
-
-[[package]]
-name = "deranged"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946"
-
-[[package]]
-name = "derive_more"
-version = "0.99.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
-dependencies = [
- "convert_case",
- "proc-macro2",
- "quote",
- "rustc_version",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "deunicode"
-version = "1.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c1bba4f227a4a53d12b653f50ca7bf10c9119ae2aba56aff9e0338b5c98f36a"
-
-[[package]]
-name = "digest"
-version = "0.10.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
-dependencies = [
- "block-buffer",
- "crypto-common",
- "subtle",
-]
-
-[[package]]
-name = "dlv-list"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257"
-
-[[package]]
-name = "docopt"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f3f119846c823f9eafcf953a8f6ffb6ed69bf6240883261a7f13b634579a51f"
-dependencies = [
- "lazy_static",
- "regex",
- "serde",
- "strsim",
-]
-
-[[package]]
-name = "dyn-clone"
-version = "1.0.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbfc4744c1b8f2a09adc0e55242f60b1af195d88596bd8700be74418c056c555"
-
-[[package]]
-name = "earcutr"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0812b44697951d35fde8fcb0da81c9de7e809e825a66bbf1ecb79d9829d4ca3d"
-dependencies = [
- "itertools 0.10.5",
- "num-traits",
-]
-
-[[package]]
-name = "either"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
-
-[[package]]
-name = "encode_unicode"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
-
-[[package]]
-name = "encoding"
-version = "0.2.33"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec"
-dependencies = [
- "encoding-index-japanese",
- "encoding-index-korean",
- "encoding-index-simpchinese",
- "encoding-index-singlebyte",
- "encoding-index-tradchinese",
-]
-
-[[package]]
-name = "encoding-index-japanese"
-version = "1.20141219.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91"
-dependencies = [
- "encoding_index_tests",
-]
-
-[[package]]
-name = "encoding-index-korean"
-version = "1.20141219.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81"
-dependencies = [
- "encoding_index_tests",
-]
-
-[[package]]
-name = "encoding-index-simpchinese"
-version = "1.20141219.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7"
-dependencies = [
- "encoding_index_tests",
-]
-
-[[package]]
-name = "encoding-index-singlebyte"
-version = "1.20141219.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a"
-dependencies = [
- "encoding_index_tests",
-]
-
-[[package]]
-name = "encoding-index-tradchinese"
-version = "1.20141219.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18"
-dependencies = [
- "encoding_index_tests",
-]
-
-[[package]]
-name = "encoding_index_tests"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569"
-
-[[package]]
-name = "encoding_rs"
-version = "0.8.33"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "encoding_rs_io"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cc3c5651fb62ab8aa3103998dade57efdd028544bd300516baa31840c252a83"
-dependencies = [
- "encoding_rs",
-]
-
-[[package]]
-name = "env_logger"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0"
-dependencies = [
- "humantime",
- "is-terminal",
- "log",
- "regex",
- "termcolor",
-]
-
-[[package]]
-name = "equivalent"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
-
-[[package]]
-name = "errno"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd"
-dependencies = [
- "errno-dragonfly",
- "libc",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
-dependencies = [
- "cc",
- "libc",
-]
-
-[[package]]
-name = "fastrand"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764"
-
-[[package]]
-name = "filetime"
-version = "0.2.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall 0.3.5",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "findshlibs"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40b9e59cd0f7e0806cca4be089683ecb6434e602038df21fe6bf6711b2f07f64"
-dependencies = [
- "cc",
- "lazy_static",
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "fixedbitset"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
-
-[[package]]
-name = "flate2"
-version = "1.0.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010"
-dependencies = [
- "crc32fast",
- "miniz_oxide",
-]
-
-[[package]]
-name = "float_next_after"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8"
-
-[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
-[[package]]
-name = "form_urlencoded"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652"
-dependencies = [
- "percent-encoding",
-]
-
-[[package]]
-name = "fs4"
-version = "0.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eeb4ed9e12f43b7fa0baae3f9cdda28352770132ef2e09a23760c29cae8bd47"
-dependencies = [
- "rustix 0.38.10",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "fs_extra"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
-
-[[package]]
-name = "fst"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ab85b9b05e3978cc9a9cf8fea7f01b494e1a09ed3037e16ba39edc7a29eb61a"
-
-[[package]]
-name = "funty"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
-
-[[package]]
-name = "futures"
-version = "0.3.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-channel"
-version = "0.3.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
-dependencies = [
- "futures-core",
- "futures-sink",
-]
-
-[[package]]
-name = "futures-core"
-version = "0.3.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
-
-[[package]]
-name = "futures-executor"
-version = "0.3.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-io"
-version = "0.3.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
-
-[[package]]
-name = "futures-macro"
-version = "0.3.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.29",
-]
-
-[[package]]
-name = "futures-sink"
-version = "0.3.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
-
-[[package]]
-name = "futures-task"
-version = "0.3.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
-
-[[package]]
-name = "futures-timer"
-version = "3.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
-
-[[package]]
-name = "futures-util"
-version = "0.3.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-macro",
- "futures-sink",
- "futures-task",
- "memchr",
- "pin-project-lite",
- "pin-utils",
- "slab",
-]
-
-[[package]]
-name = "fxhash"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
-dependencies = [
- "byteorder",
-]
-
-[[package]]
-name = "generator"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e"
-dependencies = [
- "cc",
- "libc",
- "log",
- "rustversion",
- "windows",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.14.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
-dependencies = [
- "typenum",
- "version_check",
-]
-
-[[package]]
-name = "geo"
-version = "0.26.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1645cf1d7fea7dac1a66f7357f3df2677ada708b8d9db8e9b043878930095a96"
-dependencies = [
- "earcutr",
- "float_next_after",
- "geo-types",
- "geographiclib-rs",
- "log",
- "num-traits",
- "robust",
- "rstar",
-]
-
-[[package]]
-name = "geo-types"
-version = "0.7.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9705398c5c7b26132e74513f4ee7c1d7dafd786004991b375c172be2be0eecaa"
-dependencies = [
- "approx",
- "num-traits",
- "rstar",
- "serde",
-]
-
-[[package]]
-name = "geographiclib-rs"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ea804e7bd3c6a4ca6a01edfa35231557a8a81d4d3f3e1e2b650d028c42592be"
-dependencies = [
- "lazy_static",
-]
-
-[[package]]
-name = "geohash"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a18b809b13fa4f1c9ccfd94179cc429021a3517856b5160422c3d810c1e8546"
-dependencies = [
- "geo-types",
- "libm",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi 0.9.0+wasi-snapshot-preview1",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.2.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
-]
-
-[[package]]
-name = "getset"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e45727250e75cc04ff2846a66397da8ef2b3db8e40e0cef4df67950a07621eb9"
-dependencies = [
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "gimli"
-version = "0.28.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
-
-[[package]]
-name = "git2"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12ef350ba88a33b4d524b1d1c79096c9ade5ef8c59395df0e60d1e1889414c0e"
-dependencies = [
- "bitflags 2.4.0",
- "libc",
- "libgit2-sys",
- "log",
- "openssl-probe",
- "openssl-sys",
- "url",
-]
-
-[[package]]
-name = "glob"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
-
-[[package]]
-name = "h2"
-version = "0.3.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833"
-dependencies = [
- "bytes",
- "fnv",
- "futures-core",
- "futures-sink",
- "futures-util",
- "http",
- "indexmap 1.9.3",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
-]
-
-[[package]]
-name = "half"
-version = "1.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
-
-[[package]]
-name = "hash32"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67"
-dependencies = [
- "byteorder",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-dependencies = [
- "ahash 0.7.6",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
-
-[[package]]
-name = "hashring"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c499ff70b6f65833dd5961abe0464eb295ec69993ba3ab0066f42be4fbb98b85"
-dependencies = [
- "siphasher",
-]
-
-[[package]]
-name = "hdrhistogram"
-version = "7.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f19b9f54f7c7f55e31401bb647626ce0cf0f67b0004982ce815b3ee72a02aa8"
-dependencies = [
- "base64 0.13.1",
- "byteorder",
- "flate2",
- "nom",
- "num-traits",
-]
-
-[[package]]
-name = "heapless"
-version = "0.7.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db04bc24a18b9ea980628ecf00e6c0264f3c1426dac36c00cb49b6fbad8b0743"
-dependencies = [
- "atomic-polyfill",
- "hash32",
- "rustc_version",
- "spin 0.9.8",
- "stable_deref_trait",
-]
-
-[[package]]
-name = "heck"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
-
-[[package]]
-name = "hermit-abi"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "hermit-abi"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
-
-[[package]]
-name = "hex"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
-
-[[package]]
-name = "hmac"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
-dependencies = [
- "digest",
-]
-
-[[package]]
-name = "http"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"
-dependencies = [
- "bytes",
- "fnv",
- "itoa",
-]
-
-[[package]]
-name = "http-body"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
-dependencies = [
- "bytes",
- "http",
- "pin-project-lite",
-]
-
-[[package]]
-name = "http-range"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573"
-
-[[package]]
-name = "httparse"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
-
-[[package]]
-name = "httpdate"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
-
-[[package]]
-name = "humantime"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
-
-[[package]]
-name = "hyper"
-version = "0.14.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-core",
- "futures-util",
- "h2",
- "http",
- "http-body",
- "httparse",
- "httpdate",
- "itoa",
- "pin-project-lite",
- "socket2 0.4.9",
- "tokio",
- "tower-service",
- "tracing",
- "want",
-]
-
-[[package]]
-name = "hyper-rustls"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97"
-dependencies = [
- "futures-util",
- "http",
- "hyper",
- "rustls 0.21.7",
- "tokio",
- "tokio-rustls 0.24.1",
-]
-
-[[package]]
-name = "hyper-timeout"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1"
-dependencies = [
- "hyper",
- "pin-project-lite",
- "tokio",
- "tokio-io-timeout",
-]
-
-[[package]]
-name = "iana-time-zone"
-version = "0.1.57"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613"
-dependencies = [
- "android_system_properties",
- "core-foundation-sys",
- "iana-time-zone-haiku",
- "js-sys",
- "wasm-bindgen",
- "windows",
-]
-
-[[package]]
-name = "iana-time-zone-haiku"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "ident_case"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
-
-[[package]]
-name = "idna"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
-dependencies = [
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "if_chain"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed"
-
-[[package]]
-name = "impl-more"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "206ca75c9c03ba3d4ace2460e57b189f39f43de612c2f85836e65c929701bb2d"
-
-[[package]]
-name = "indexmap"
-version = "1.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
-dependencies = [
- "autocfg",
- "hashbrown 0.12.3",
- "serde",
-]
-
-[[package]]
-name = "indexmap"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
-dependencies = [
- "equivalent",
- "hashbrown 0.14.0",
-]
-
-[[package]]
-name = "indicatif"
-version = "0.17.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b297dc40733f23a0e52728a58fa9489a5b7638a324932de16b41adc3ef80730"
-dependencies = [
- "console",
- "instant",
- "number_prefix",
- "portable-atomic",
- "unicode-width",
-]
-
-[[package]]
-name = "inferno"
-version = "0.11.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73c0fefcb6d409a6587c07515951495d482006f89a21daa0f2f783aa4fd5e027"
-dependencies = [
- "ahash 0.8.3",
- "indexmap 2.0.0",
- "is-terminal",
- "itoa",
- "log",
- "num-format",
- "once_cell",
- "quick-xml",
- "rgb",
- "str_stack",
-]
-
-[[package]]
-name = "inout"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "instant"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "io-lifetimes"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
-dependencies = [
- "hermit-abi 0.3.2",
- "libc",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "io-uring"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "141a0f4546a50b2ed637c7a6df0d7dff45c9f41523254996764461c8ae0d9424"
-dependencies = [
- "bitflags 1.3.2",
- "libc",
-]
-
-[[package]]
-name = "ipnet"
-version = "2.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6"
-
-[[package]]
-name = "irg-kvariants"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c73214298363629cf9dbfc93b426808865ee3c121029778cb31b1284104fdf78"
-dependencies = [
- "csv",
- "once_cell",
- "serde",
-]
-
-[[package]]
-name = "is-terminal"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
-dependencies = [
- "hermit-abi 0.3.2",
- "rustix 0.38.10",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "itertools"
-version = "0.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itertools"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itoa"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
-
-[[package]]
-name = "jieba-rs"
-version = "0.6.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93f0c1347cd3ac8d7c6e3a2dc33ac496d365cf09fc0831aa61111e1a6738983e"
-dependencies = [
- "cedarwood",
- "fxhash",
- "hashbrown 0.14.0",
- "lazy_static",
- "phf",
- "phf_codegen",
- "regex",
-]
-
-[[package]]
-name = "jobserver"
-version = "0.1.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "js-sys"
-version = "0.3.64"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
-dependencies = [
- "wasm-bindgen",
-]
-
-[[package]]
-name = "json5"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96b0db21af676c1ce64250b5f40f3ce2cf27e4e47cb91ed91eb6fe9350b430c1"
-dependencies = [
- "pest",
- "pest_derive",
- "serde",
-]
-
-[[package]]
-name = "language-tags"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388"
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
-[[package]]
-name = "lazycell"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
-
-[[package]]
-name = "libc"
-version = "0.2.147"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
-
-[[package]]
-name = "libgit2-sys"
-version = "0.16.1+1.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2a2bb3680b094add03bb3732ec520ece34da31a8cd2d633d1389d0f0fb60d0c"
-dependencies = [
- "cc",
- "libc",
- "libssh2-sys",
- "libz-sys",
- "openssl-sys",
- "pkg-config",
-]
-
-[[package]]
-name = "libloading"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
-dependencies = [
- "cfg-if",
- "winapi",
-]
-
-[[package]]
-name = "libm"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4"
-
-[[package]]
-name = "librocksdb-sys"
-version = "0.11.0+8.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3386f101bcb4bd252d8e9d2fb41ec3b0862a15a62b478c355b2982efa469e3e"
-dependencies = [
- "bindgen",
- "bzip2-sys",
- "cc",
- "glob",
- "libc",
- "libz-sys",
-]
-
-[[package]]
-name = "libssh2-sys"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee"
-dependencies = [
- "cc",
- "libc",
- "libz-sys",
- "openssl-sys",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "libz-sys"
-version = "1.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "lindera-cc-cedict-builder"
-version = "0.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d2e8f2ca97ddf952fe340642511b9c14b373cb2eef711d526bb8ef2ca0969b8"
-dependencies = [
- "anyhow",
- "bincode",
- "byteorder",
- "csv",
- "encoding",
- "env_logger",
- "glob",
- "lindera-core",
- "lindera-decompress",
- "log",
- "yada",
-]
-
-[[package]]
-name = "lindera-compress"
-version = "0.27.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f3e553d55ebe9881fa5e5de588b0a153456e93564d17dfbef498912caf63a2"
-dependencies = [
- "anyhow",
- "flate2",
- "lindera-decompress",
-]
-
-[[package]]
-name = "lindera-core"
-version = "0.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f586eb8a9393c32d5525e0e9336a3727bd1329674740097126f3b0bff8a1a1ea"
-dependencies = [
- "anyhow",
- "bincode",
- "byteorder",
- "encoding_rs",
- "log",
- "once_cell",
- "serde",
- "thiserror",
- "yada",
-]
-
-[[package]]
-name = "lindera-decompress"
-version = "0.27.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e077a410e61c962cb526f71b7effd62ffc607488a8f61869c937582d2ccb529b"
-dependencies = [
- "anyhow",
- "flate2",
- "serde",
-]
-
-[[package]]
-name = "lindera-dictionary"
-version = "0.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec7be7410b1da7017a8948986b87af67082f605e9a716f0989790d795d677f0c"
-dependencies = [
- "anyhow",
- "bincode",
- "byteorder",
- "lindera-cc-cedict-builder",
- "lindera-core",
- "lindera-ipadic-builder",
- "lindera-ipadic-neologd-builder",
- "lindera-ko-dic",
- "lindera-ko-dic-builder",
- "lindera-unidic",
- "lindera-unidic-builder",
- "serde",
-]
-
-[[package]]
-name = "lindera-ipadic-builder"
-version = "0.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "705d07f8a45d04fd95149f7ad41a26d1f9e56c9c00402be6f9dd05e3d88b99c6"
-dependencies = [
- "anyhow",
- "bincode",
- "byteorder",
- "csv",
- "encoding_rs",
- "encoding_rs_io",
- "env_logger",
- "glob",
- "lindera-core",
- "lindera-decompress",
- "log",
- "serde",
- "yada",
-]
-
-[[package]]
-name = "lindera-ipadic-neologd-builder"
-version = "0.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "633a93983ba13fba42328311a501091bd4a7aff0c94ae9eaa9d4733dd2b0468a"
-dependencies = [
- "anyhow",
- "bincode",
- "byteorder",
- "csv",
- "encoding_rs",
- "encoding_rs_io",
- "env_logger",
- "glob",
- "lindera-core",
- "lindera-decompress",
- "log",
- "serde",
- "yada",
-]
-
-[[package]]
-name = "lindera-ko-dic"
-version = "0.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a428e0d316b6c86f51bd919479692bc41ad840dba266ebc044663970f431ea18"
-dependencies = [
- "bincode",
- "byteorder",
- "encoding",
- "flate2",
- "lindera-core",
- "lindera-decompress",
- "lindera-ko-dic-builder",
- "once_cell",
- "tar",
-]
-
-[[package]]
-name = "lindera-ko-dic-builder"
-version = "0.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a5288704c6b8a069c0a1705c38758e836497698b50453373ab3d56c6f9a7ef8"
-dependencies = [
- "anyhow",
- "bincode",
- "byteorder",
- "csv",
- "encoding",
- "env_logger",
- "glob",
- "lindera-compress",
- "lindera-core",
- "lindera-decompress",
- "log",
- "yada",
-]
-
-[[package]]
-name = "lindera-tokenizer"
-version = "0.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "106ba439b2e87529d9bbedbb88d69f635baba1195c26502b308f55a85885fc81"
-dependencies = [
- "bincode",
- "byteorder",
- "lindera-core",
- "lindera-dictionary",
- "once_cell",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "lindera-unidic"
-version = "0.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3399b6dcfe1701333451d184ff3c677f433b320153427b146360c9e4bd8cb816"
-dependencies = [
- "bincode",
- "byteorder",
- "encoding",
- "lindera-core",
- "lindera-decompress",
- "lindera-unidic-builder",
- "once_cell",
- "ureq",
- "zip",
-]
-
-[[package]]
-name = "lindera-unidic-builder"
-version = "0.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b698227fdaeac32289173ab389b990d4eb00a40cbc9912020f69a0c491dabf55"
-dependencies = [
- "anyhow",
- "bincode",
- "byteorder",
- "csv",
- "encoding",
- "env_logger",
- "glob",
- "lindera-compress",
- "lindera-core",
- "lindera-decompress",
- "log",
- "yada",
-]
-
-[[package]]
-name = "linked-hash-map"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503"
-
-[[package]]
-name = "local-channel"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f303ec0e94c6c54447f84f3b0ef7af769858a9c4ef56ef2a986d3dcd4c3fc9c"
-dependencies = [
- "futures-core",
- "futures-sink",
- "futures-util",
- "local-waker",
-]
-
-[[package]]
-name = "local-waker"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e34f76eb3611940e0e7d53a9aaa4e6a3151f69541a282fd0dad5571420c53ff1"
-
-[[package]]
-name = "lock_api"
-version = "0.4.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
-dependencies = [
- "autocfg",
- "scopeguard",
- "serde",
-]
-
-[[package]]
-name = "log"
-version = "0.4.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
-
-[[package]]
-name = "loom"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5"
-dependencies = [
- "cfg-if",
- "generator",
- "scoped-tls",
- "tracing",
- "tracing-subscriber",
-]
-
-[[package]]
-name = "matchers"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
-dependencies = [
- "regex-automata 0.1.10",
-]
-
-[[package]]
-name = "matchit"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed1202b2a6f884ae56f04cff409ab315c5ce26b5e58d7412e484f01fd52f52ef"
-
-[[package]]
-name = "memchr"
-version = "2.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f478948fd84d9f8e86967bf432640e46adfb5a4bd4f14ef7e864ab38220534ae"
-
-[[package]]
-name = "memmap2"
-version = "0.5.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "memmap2"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "memoffset"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "merge"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10bbef93abb1da61525bbc45eeaff6473a41907d19f8f9aa5168d214e10693e9"
-dependencies = [
- "merge_derive",
- "num-traits",
-]
-
-[[package]]
-name = "merge_derive"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "209d075476da2e63b4b29e72a2ef627b840589588e71400a25e3565c4f849d07"
-dependencies = [
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "mime"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
-
-[[package]]
-name = "mime_guess"
-version = "2.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef"
-dependencies = [
- "mime",
- "unicase",
-]
-
-[[package]]
-name = "minimal-lexical"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-
-[[package]]
-name = "miniz_oxide"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
-dependencies = [
- "adler",
-]
-
-[[package]]
-name = "mio"
-version = "0.8.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
-dependencies = [
- "libc",
- "log",
- "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "multimap"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
-
-[[package]]
-name = "nix"
-version = "0.25.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4"
-dependencies = [
- "autocfg",
- "bitflags 1.3.2",
- "cfg-if",
- "libc",
-]
-
-[[package]]
-name = "nix"
-version = "0.26.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
-dependencies = [
- "bitflags 1.3.2",
- "cfg-if",
- "libc",
-]
-
-[[package]]
-name = "nodrop"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
-
-[[package]]
-name = "nom"
-version = "7.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
-dependencies = [
- "memchr",
- "minimal-lexical",
-]
-
-[[package]]
-name = "ntapi"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "nu-ansi-term"
-version = "0.46.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
-dependencies = [
- "overload",
- "winapi",
-]
-
-[[package]]
-name = "num-derive"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e6a0fd4f737c707bd9086cc16c925f294943eb62eb71499e9fd4cf71f8b9f4e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.29",
-]
-
-[[package]]
-name = "num-format"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3"
-dependencies = [
- "arrayvec 0.7.4",
- "itoa",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
-dependencies = [
- "autocfg",
- "libm",
-]
-
-[[package]]
-name = "num_cpus"
-version = "1.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
-dependencies = [
- "hermit-abi 0.3.2",
- "libc",
-]
-
-[[package]]
-name = "number_prefix"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
-
-[[package]]
-name = "object"
-version = "0.32.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
-
-[[package]]
-name = "oorandom"
-version = "11.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
-
-[[package]]
-name = "openssl-probe"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
-
-[[package]]
-name = "openssl-sys"
-version = "0.9.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db7e971c2c2bba161b2d2fdf37080177eff520b3bc044787c7f1f5f9e78d869b"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "ordered-float"
-version = "2.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7940cf2ca942593318d07fcf2596cdca60a85c9e7fab408a5e21a4f9dcd40d87"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "ordered-float"
-version = "3.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a54938017eacd63036332b4ae5c8a49fc8c0c1d6d629893057e4f13609edd06"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "ordered-multimap"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a"
-dependencies = [
- "dlv-list",
- "hashbrown 0.12.3",
-]
-
-[[package]]
-name = "overload"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
-
-[[package]]
-name = "parking_lot"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
-dependencies = [
- "lock_api",
- "parking_lot_core",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447"
-dependencies = [
- "backtrace",
- "cfg-if",
- "libc",
- "petgraph",
- "redox_syscall 0.3.5",
- "smallvec",
- "thread-id",
- "windows-targets 0.48.5",
-]
-
-[[package]]
-name = "parse-size"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "944553dd59c802559559161f9816429058b869003836120e262e8caec061b7ae"
-
-[[package]]
-name = "password-hash"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700"
-dependencies = [
- "base64ct",
- "rand_core 0.6.4",
- "subtle",
-]
-
-[[package]]
-name = "paste"
-version = "1.0.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
-
-[[package]]
-name = "pathdiff"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
-
-[[package]]
-name = "pbkdf2"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917"
-dependencies = [
- "digest",
- "hmac",
- "password-hash",
- "sha2",
-]
-
-[[package]]
-name = "peeking_take_while"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
-
-[[package]]
-name = "percent-encoding"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
-
-[[package]]
-name = "permutation_iterator"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b55405179fe06e4e3820ddaf9f9b51cdff9e7496af9554acdb2b1921a86ca9cb"
-dependencies = [
- "blake2-rfc",
- "rand 0.7.3",
-]
-
-[[package]]
-name = "pest"
-version = "2.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1acb4a4365a13f749a93f1a094a7805e5cfa0955373a9de860d962eaa3a5fe5a"
-dependencies = [
- "thiserror",
- "ucd-trie",
-]
-
-[[package]]
-name = "pest_derive"
-version = "2.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "666d00490d4ac815001da55838c500eafb0320019bbaa44444137c48b443a853"
-dependencies = [
- "pest",
- "pest_generator",
-]
-
-[[package]]
-name = "pest_generator"
-version = "2.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68ca01446f50dbda87c1786af8770d535423fa8a53aec03b8f4e3d7eb10e0929"
-dependencies = [
- "pest",
- "pest_meta",
- "proc-macro2",
- "quote",
- "syn 2.0.29",
-]
-
-[[package]]
-name = "pest_meta"
-version = "2.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56af0a30af74d0445c0bf6d9d051c979b516a1a5af790d251daee76005420a48"
-dependencies = [
- "once_cell",
- "pest",
- "sha2",
-]
-
-[[package]]
-name = "petgraph"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
-dependencies = [
- "fixedbitset",
- "indexmap 2.0.0",
-]
-
-[[package]]
-name = "phf"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc"
-dependencies = [
- "phf_shared",
-]
-
-[[package]]
-name = "phf_codegen"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a"
-dependencies = [
- "phf_generator",
- "phf_shared",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0"
-dependencies = [
- "phf_shared",
- "rand 0.8.5",
-]
-
-[[package]]
-name = "phf_shared"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b"
-dependencies = [
- "siphasher",
-]
-
-[[package]]
-name = "pin-project"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.29",
-]
-
-[[package]]
-name = "pin-project-lite"
-version = "0.2.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
-
-[[package]]
-name = "pin-utils"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
-
-[[package]]
-name = "pinyin"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bd12336e3afa34152e002f57df37a7056778daa59ea542b3473b87f5fb260c4"
-
-[[package]]
-name = "pkg-config"
-version = "0.3.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
-
-[[package]]
-name = "plotters"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45"
-dependencies = [
- "num-traits",
- "plotters-backend",
- "plotters-svg",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "plotters-backend"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609"
-
-[[package]]
-name = "plotters-svg"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab"
-dependencies = [
- "plotters-backend",
-]
-
-[[package]]
-name = "portable-atomic"
-version = "1.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31114a898e107c51bb1609ffaf55a0e011cf6a4d7f1170d0015a165082c0338b"
-
-[[package]]
-name = "pprof"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978385d59daf9269189d052ca8a84c1acfd0715c0599a5d5188d4acc078ca46a"
-dependencies = [
- "backtrace",
- "cfg-if",
- "findshlibs",
- "inferno",
- "libc",
- "log",
- "nix 0.26.4",
- "once_cell",
- "parking_lot",
- "prost",
- "prost-build",
- "prost-derive",
- "sha2",
- "smallvec",
- "symbolic-demangle",
- "tempfile",
- "thiserror",
-]
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
-
-[[package]]
-name = "prettyplease"
-version = "0.1.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86"
-dependencies = [
- "proc-macro2",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "prettyplease"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c64d9ba0963cdcea2e1b2230fbae2bab30eb25a174be395c41e764bfb65dd62"
-dependencies = [
- "proc-macro2",
- "syn 2.0.29",
-]
-
-[[package]]
-name = "proc-macro-error"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
-dependencies = [
- "proc-macro-error-attr",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-error-attr"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
-dependencies = [
- "proc-macro2",
- "quote",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.66"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "procfs"
-version = "0.15.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "943ca7f9f29bab5844ecd8fdb3992c5969b6622bb9609b9502fef9b4310e3f1f"
-dependencies = [
- "bitflags 1.3.2",
- "byteorder",
- "hex",
- "lazy_static",
- "rustix 0.36.15",
-]
-
-[[package]]
-name = "prometheus"
-version = "0.13.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "449811d15fbdf5ceb5c1144416066429cf82316e2ec8ce0c1f6f8a02e7bbcf8c"
-dependencies = [
- "cfg-if",
- "fnv",
- "lazy_static",
- "memchr",
- "parking_lot",
- "thiserror",
-]
-
-[[package]]
-name = "proptest"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e35c06b98bf36aba164cc17cb25f7e232f5c4aeea73baa14b8a9f0d92dbfa65"
-dependencies = [
- "bit-set",
- "bitflags 1.3.2",
- "byteorder",
- "lazy_static",
- "num-traits",
- "rand 0.8.5",
- "rand_chacha 0.3.1",
- "rand_xorshift",
- "regex-syntax 0.6.29",
- "rusty-fork",
- "tempfile",
- "unarray",
-]
-
-[[package]]
-name = "prost"
-version = "0.11.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd"
-dependencies = [
- "bytes",
- "prost-derive",
-]
-
-[[package]]
-name = "prost-build"
-version = "0.11.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270"
-dependencies = [
- "bytes",
- "heck",
- "itertools 0.10.5",
- "lazy_static",
- "log",
- "multimap",
- "petgraph",
- "prettyplease 0.1.25",
- "prost",
- "prost-types",
- "pulldown-cmark",
- "pulldown-cmark-to-cmark",
- "regex",
- "syn 1.0.109",
- "tempfile",
- "which",
-]
-
-[[package]]
-name = "prost-derive"
-version = "0.11.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4"
-dependencies = [
- "anyhow",
- "itertools 0.10.5",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "prost-types"
-version = "0.11.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13"
-dependencies = [
- "prost",
-]
-
-[[package]]
-name = "protobuf"
-version = "2.28.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94"
-
-[[package]]
-name = "protobuf-build"
-version = "0.14.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2df9942df2981178a930a72d442de47e2f0df18ad68e50a30f816f1848215ad0"
-dependencies = [
- "bitflags 1.3.2",
- "proc-macro2",
- "prost-build",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "pulldown-cmark"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a1a2f1f0a7ecff9c31abbe177637be0e97a0aef46cf8738ece09327985d998"
-dependencies = [
- "bitflags 1.3.2",
- "memchr",
- "unicase",
-]
-
-[[package]]
-name = "pulldown-cmark-to-cmark"
-version = "10.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0194e6e1966c23cc5fd988714f85b18d548d773e81965413555d96569931833d"
-dependencies = [
- "pulldown-cmark",
-]
-
-[[package]]
-name = "qdrant"
-version = "1.4.1"
-dependencies = [
- "actix-cors",
- "actix-files",
- "actix-multipart",
- "actix-web",
- "actix-web-validator",
- "anyhow",
- "api",
- "chrono",
- "clap",
- "collection",
- "colored",
- "config",
- "console-subscriber",
- "constant_time_eq 0.3.0",
- "env_logger",
- "futures",
- "futures-util",
- "itertools 0.11.0",
- "log",
- "num-traits",
- "num_cpus",
- "parking_lot",
- "prometheus",
- "prost",
- "raft",
- "raft-proto",
- "reqwest",
- "rustls 0.20.9",
- "rustls-pemfile",
- "schemars",
- "sealed_test",
- "segment",
- "serde",
- "serde_cbor",
- "serde_json",
- "serde_urlencoded",
- "slog",
- "slog-stdlog",
- "storage",
- "sys-info",
- "tar",
- "tempfile",
- "thiserror",
- "tikv-jemallocator",
- "tokio",
- "tonic",
- "tower",
- "tower-layer",
- "tracing",
- "tracing-subscriber",
- "tracing-tracy",
- "uuid",
- "validator",
- "wal",
-]
-
-[[package]]
-name = "quantization"
-version = "0.1.0"
-source = "git+https://github.com/qdrant/quantization.git#f0ea16536e5cc799a51156856c3a90b344bfe92b"
-dependencies = [
- "cc",
- "permutation_iterator",
- "rand 0.8.5",
- "rayon",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "quick-error"
-version = "1.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
-
-[[package]]
-name = "quick-xml"
-version = "0.26.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f50b1c63b38611e7d4d7f68b82d3ad0cc71a2ad2e7f61fc10f1328d917c93cd"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.33"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "radium"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
-
-[[package]]
-name = "raft"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f12688b23a649902762d4c11d854d73c49c9b93138f2de16403ef9f571ad5bae"
-dependencies = [
- "fxhash",
- "getset",
- "protobuf",
- "raft-proto",
- "rand 0.8.5",
- "slog",
- "thiserror",
-]
-
-[[package]]
-name = "raft-proto"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb6884896294f553e8d5cfbdb55080b9f5f2f43394afff59c9f077e0f4b46d6b"
-dependencies = [
- "lazy_static",
- "prost",
- "protobuf",
- "protobuf-build",
-]
-
-[[package]]
-name = "rand"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
-dependencies = [
- "getrandom 0.1.16",
- "libc",
- "rand_chacha 0.2.2",
- "rand_core 0.5.1",
- "rand_hc",
-]
-
-[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "libc",
- "rand_chacha 0.3.1",
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.5.1",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-dependencies = [
- "getrandom 0.1.16",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-dependencies = [
- "getrandom 0.2.10",
-]
-
-[[package]]
-name = "rand_distr"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31"
-dependencies = [
- "num-traits",
- "rand 0.8.5",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-dependencies = [
- "rand_core 0.5.1",
-]
-
-[[package]]
-name = "rand_xorshift"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f"
-dependencies = [
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "rayon"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b"
-dependencies = [
- "either",
- "rayon-core",
-]
-
-[[package]]
-name = "rayon-core"
-version = "1.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d"
-dependencies = [
- "crossbeam-channel",
- "crossbeam-deque",
- "crossbeam-utils",
- "num_cpus",
-]
-
-[[package]]
-name = "redis"
-version = "0.23.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffd6543a7bc6428396845f6854ccf3d1ae8823816592e2cbe74f20f50f209d02"
-dependencies = [
- "async-trait",
- "bytes",
- "combine",
- "crc16",
- "futures",
- "futures-util",
- "itoa",
- "log",
- "percent-encoding",
- "pin-project-lite",
- "rand 0.8.5",
- "ryu",
- "sha1_smol",
- "socket2 0.4.9",
- "tokio",
- "tokio-util",
- "url",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
-dependencies = [
- "bitflags 1.3.2",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
-dependencies = [
- "bitflags 1.3.2",
-]
-
-[[package]]
-name = "regex"
-version = "1.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-automata 0.3.7",
- "regex-syntax 0.7.5",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
-dependencies = [
- "regex-syntax 0.6.29",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax 0.7.5",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.6.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
-
-[[package]]
-name = "regex-syntax"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
-
-[[package]]
-name = "relative-path"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c707298afce11da2efef2f600116fa93ffa7a032b5d7b628aa17711ec81383ca"
-
-[[package]]
-name = "reqwest"
-version = "0.11.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1"
-dependencies = [
- "base64 0.21.3",
- "bytes",
- "encoding_rs",
- "futures-core",
- "futures-util",
- "h2",
- "http",
- "http-body",
- "hyper",
- "hyper-rustls",
- "ipnet",
- "js-sys",
- "log",
- "mime",
- "once_cell",
- "percent-encoding",
- "pin-project-lite",
- "rustls 0.21.7",
- "rustls-pemfile",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "tokio",
- "tokio-rustls 0.24.1",
- "tokio-util",
- "tower-service",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "wasm-streams",
- "web-sys",
- "webpki-roots 0.25.2",
- "winreg",
-]
-
-[[package]]
-name = "rgb"
-version = "0.8.36"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20ec2d3e3fc7a92ced357df9cebd5a10b6fb2aa1ee797bf7e9ce2f17dffc8f59"
-dependencies = [
- "bytemuck",
-]
-
-[[package]]
-name = "ring"
-version = "0.16.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
-dependencies = [
- "cc",
- "libc",
- "once_cell",
- "spin 0.5.2",
- "untrusted",
- "web-sys",
- "winapi",
-]
-
-[[package]]
-name = "rmp"
-version = "0.8.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f9860a6cc38ed1da53456442089b4dfa35e7cedaa326df63017af88385e6b20"
-dependencies = [
- "byteorder",
- "num-traits",
- "paste",
-]
-
-[[package]]
-name = "rmp-serde"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a"
-dependencies = [
- "byteorder",
- "rmp",
- "serde",
-]
-
-[[package]]
-name = "robust"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbf4a6aa5f6d6888f39e980649f3ad6b666acdce1d78e95b8a2cb076e687ae30"
-
-[[package]]
-name = "rocksdb"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb6f170a4041d50a0ce04b0d2e14916d6ca863ea2e422689a5b694395d299ffe"
-dependencies = [
- "libc",
- "librocksdb-sys",
-]
-
-[[package]]
-name = "ron"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88073939a61e5b7680558e6be56b419e208420c2adb92be54921fa6b72283f1a"
-dependencies = [
- "base64 0.13.1",
- "bitflags 1.3.2",
- "serde",
-]
-
-[[package]]
-name = "rstar"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73111312eb7a2287d229f06c00ff35b51ddee180f017ab6dec1f69d62ac098d6"
-dependencies = [
- "heapless",
- "num-traits",
- "smallvec",
-]
-
-[[package]]
-name = "rstest"
-version = "0.18.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97eeab2f3c0a199bc4be135c36c924b6590b88c377d416494288c14f2db30199"
-dependencies = [
- "futures",
- "futures-timer",
- "rstest_macros",
- "rustc_version",
-]
-
-[[package]]
-name = "rstest_macros"
-version = "0.18.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d428f8247852f894ee1be110b375111b586d4fa431f6c46e64ba5a0dcccbe605"
-dependencies = [
- "cfg-if",
- "glob",
- "proc-macro2",
- "quote",
- "regex",
- "relative-path",
- "rustc_version",
- "syn 2.0.29",
- "unicode-ident",
-]
-
-[[package]]
-name = "rust-ini"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df"
-dependencies = [
- "cfg-if",
- "ordered-multimap",
-]
-
-[[package]]
-name = "rustc-demangle"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
-
-[[package]]
-name = "rustc-hash"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
-
-[[package]]
-name = "rustc_version"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
-dependencies = [
- "semver",
-]
-
-[[package]]
-name = "rustix"
-version = "0.36.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c37f1bd5ef1b5422177b7646cba67430579cfe2ace80f284fee876bca52ad941"
-dependencies = [
- "bitflags 1.3.2",
- "errno",
- "io-lifetimes",
- "libc",
- "linux-raw-sys 0.1.4",
- "windows-sys 0.45.0",
-]
-
-[[package]]
-name = "rustix"
-version = "0.37.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06"
-dependencies = [
- "bitflags 1.3.2",
- "errno",
- "io-lifetimes",
- "libc",
- "linux-raw-sys 0.3.8",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "rustix"
-version = "0.38.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed6248e1caa625eb708e266e06159f135e8c26f2bb7ceb72dc4b2766d0340964"
-dependencies = [
- "bitflags 2.4.0",
- "errno",
- "libc",
- "linux-raw-sys 0.4.5",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "rustls"
-version = "0.20.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99"
-dependencies = [
- "log",
- "ring",
- "sct",
- "webpki",
-]
-
-[[package]]
-name = "rustls"
-version = "0.21.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8"
-dependencies = [
- "log",
- "ring",
- "rustls-webpki 0.101.4",
- "sct",
-]
-
-[[package]]
-name = "rustls-pemfile"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2"
-dependencies = [
- "base64 0.21.3",
-]
-
-[[package]]
-name = "rustls-webpki"
-version = "0.100.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e98ff011474fa39949b7e5c0428f9b4937eda7da7848bbb947786b7be0b27dab"
-dependencies = [
- "ring",
- "untrusted",
-]
-
-[[package]]
-name = "rustls-webpki"
-version = "0.101.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d"
-dependencies = [
- "ring",
- "untrusted",
-]
-
-[[package]]
-name = "rustversion"
-version = "1.0.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
-
-[[package]]
-name = "rusty-fork"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f"
-dependencies = [
- "fnv",
- "quick-error",
- "tempfile",
- "wait-timeout",
-]
-
-[[package]]
-name = "rusty-forkfork"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ce85af4dfa2fb0c0143121ab5e424c71ea693867357c9159b8777b59984c218"
-dependencies = [
- "fnv",
- "quick-error",
- "tempfile",
- "wait-timeout",
-]
-
-[[package]]
-name = "ryu"
-version = "1.0.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
-
-[[package]]
-name = "same-file"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "schemars"
-version = "0.8.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "763f8cd0d4c71ed8389c90cb8100cba87e763bd01a8e614d4f0af97bcd50a161"
-dependencies = [
- "chrono",
- "dyn-clone",
- "indexmap 1.9.3",
- "schemars_derive",
- "serde",
- "serde_json",
- "url",
- "uuid",
-]
-
-[[package]]
-name = "schemars_derive"
-version = "0.8.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0f696e21e10fa546b7ffb1c9672c6de8fbc7a81acf59524386d8639bf12737"
-dependencies = [
- "proc-macro2",
- "quote",
- "serde_derive_internals",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "scoped-tls"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
-
-[[package]]
-name = "scopeguard"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
-
-[[package]]
-name = "sct"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
-dependencies = [
- "ring",
- "untrusted",
-]
-
-[[package]]
-name = "seahash"
-version = "4.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
-
-[[package]]
-name = "sealed_test"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a608d94641cc17fe203b102db2ae86d47a236630192f0244ddbbbb0044c0272"
-dependencies = [
- "fs_extra",
- "rusty-forkfork",
- "sealed_test_derive",
- "tempfile",
-]
-
-[[package]]
-name = "sealed_test_derive"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b672e005ae58fef5da619d90b9f1c5b44b061890f4a371b3c96257a8a15e697"
-dependencies = [
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "segment"
-version = "0.6.0"
-dependencies = [
- "atomic_refcell",
- "atomicwrites",
- "bincode",
- "bitvec",
- "cgroups-rs",
- "charabia",
- "chrono",
- "common",
- "criterion",
- "fs_extra",
- "futures",
- "geo",
- "geohash",
- "io-uring",
- "itertools 0.11.0",
- "log",
- "memmap2 0.7.1",
- "num-derive",
- "num-traits",
- "num_cpus",
- "ordered-float 3.9.1",
- "parking_lot",
- "pprof",
- "procfs",
- "quantization",
- "rand 0.8.5",
- "rand_distr",
- "rayon",
- "rmp-serde",
- "rocksdb",
- "rstest",
- "schemars",
- "seahash",
- "semver",
- "serde",
- "serde-value",
- "serde_cbor",
- "serde_json",
- "smol_str",
- "sysinfo",
- "tar",
- "tempfile",
- "thiserror",
- "tinyvec",
- "uuid",
- "validator",
- "walkdir",
-]
-
-[[package]]
-name = "semver"
-version = "1.0.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918"
-
-[[package]]
-name = "serde"
-version = "1.0.188"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde-value"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c"
-dependencies = [
- "ordered-float 2.10.0",
- "serde",
-]
-
-[[package]]
-name = "serde_cbor"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5"
-dependencies = [
- "half",
- "serde",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.188"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.29",
-]
-
-[[package]]
-name = "serde_derive_internals"
-version = "0.26.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.105"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360"
-dependencies = [
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serde_path_to_error"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335"
-dependencies = [
- "itoa",
- "serde",
-]
-
-[[package]]
-name = "serde_plain"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce1fc6db65a611022b23a0dec6975d63fb80a302cb3388835ff02c097258d50"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "serde_qs"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cac3f1e2ca2fe333923a1ae72caca910b98ed0630bb35ef6f8c8517d6e81afa"
-dependencies = [
- "actix-web",
- "futures",
- "percent-encoding",
- "serde",
- "thiserror",
-]
-
-[[package]]
-name = "serde_urlencoded"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
-dependencies = [
- "form_urlencoded",
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "sha1"
-version = "0.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest",
-]
-
-[[package]]
-name = "sha1_smol"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012"
-
-[[package]]
-name = "sha2"
-version = "0.10.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest",
-]
-
-[[package]]
-name = "sharded-slab"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
-dependencies = [
- "lazy_static",
-]
-
-[[package]]
-name = "shlex"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
-
-[[package]]
-name = "signal-hook-registry"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "siphasher"
-version = "0.3.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
-
-[[package]]
-name = "slab"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "slice-group-by"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7"
-
-[[package]]
-name = "slog"
-version = "2.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8347046d4ebd943127157b94d63abb990fcf729dc4e9978927fdf4ac3c998d06"
-
-[[package]]
-name = "slog-scope"
-version = "4.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f95a4b4c3274cd2869549da82b57ccc930859bdbf5bcea0424bc5f140b3c786"
-dependencies = [
- "arc-swap",
- "lazy_static",
- "slog",
-]
-
-[[package]]
-name = "slog-stdlog"
-version = "4.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6706b2ace5bbae7291d3f8d2473e2bfab073ccd7d03670946197aec98471fa3e"
-dependencies = [
- "log",
- "slog",
- "slog-scope",
-]
-
-[[package]]
-name = "smallvec"
-version = "1.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
-
-[[package]]
-name = "smol_str"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74212e6bbe9a4352329b2f68ba3130c15a3f26fe88ff22dbdc6cdd58fa85e99c"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "socket2"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
-dependencies = [
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "socket2"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877"
-dependencies = [
- "libc",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "spin"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
-
-[[package]]
-name = "spin"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
-dependencies = [
- "lock_api",
-]
-
-[[package]]
-name = "stable_deref_trait"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
-
-[[package]]
-name = "storage"
-version = "0.2.0"
-dependencies = [
- "anyhow",
- "api",
- "async-trait",
- "atomicwrites",
- "chrono",
- "collection",
- "env_logger",
- "futures",
- "http",
- "itertools 0.11.0",
- "log",
- "num_cpus",
- "parking_lot",
- "proptest",
- "prost",
- "protobuf",
- "raft",
- "rand 0.8.5",
- "reqwest",
- "schemars",
- "segment",
- "serde",
- "serde_cbor",
- "serde_json",
- "tar",
- "tempfile",
- "thiserror",
- "tokio",
- "tonic",
- "url",
- "uuid",
- "validator",
- "wal",
-]
-
-[[package]]
-name = "str_stack"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9091b6114800a5f2141aee1d1b9d6ca3592ac062dc5decb3764ec5895a47b4eb"
-
-[[package]]
-name = "strsim"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-
-[[package]]
-name = "subtle"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
-
-[[package]]
-name = "symbolic-common"
-version = "12.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "167a4ffd7c35c143fd1030aa3c2caf76ba42220bd5a6b5f4781896434723b8c3"
-dependencies = [
- "debugid",
- "memmap2 0.5.10",
- "stable_deref_trait",
- "uuid",
-]
-
-[[package]]
-name = "symbolic-demangle"
-version = "12.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e378c50e80686c1c5c205674e1f86a2858bec3d2a7dfdd690331a8a19330f293"
-dependencies = [
- "cpp_demangle",
- "rustc-demangle",
- "symbolic-common",
-]
-
-[[package]]
-name = "syn"
-version = "1.0.109"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "sync_wrapper"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
-
-[[package]]
-name = "sys-info"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b3a0d0aba8bf96a0e1ddfdc352fc53b3df7f39318c71854910c3c4b024ae52c"
-dependencies = [
- "cc",
- "libc",
-]
-
-[[package]]
-name = "sysinfo"
-version = "0.29.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8d0e9cc2273cc8d31377bdd638d72e3ac3e5607b18621062b169d02787f1bab"
-dependencies = [
- "cfg-if",
- "core-foundation-sys",
- "libc",
- "ntapi",
- "once_cell",
- "rayon",
- "winapi",
-]
-
-[[package]]
-name = "tap"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
-
-[[package]]
-name = "tar"
-version = "0.4.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb"
-dependencies = [
- "filetime",
- "libc",
- "xattr",
-]
-
-[[package]]
-name = "tempfile"
-version = "3.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef"
-dependencies = [
- "cfg-if",
- "fastrand",
- "redox_syscall 0.3.5",
- "rustix 0.38.10",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "termcolor"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "thiserror"
-version = "1.0.47"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.47"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.29",
-]
-
-[[package]]
-name = "thread-id"
-version = "4.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79474f573561cdc4871a0de34a51c92f7f5a56039113fbb5b9c9f96bdb756669"
-dependencies = [
- "libc",
- "redox_syscall 0.2.16",
- "winapi",
-]
-
-[[package]]
-name = "thread_local"
-version = "1.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
-dependencies = [
- "cfg-if",
- "once_cell",
-]
-
-[[package]]
-name = "tikv-jemalloc-sys"
-version = "0.5.4+5.3.0-patched"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9402443cb8fd499b6f327e40565234ff34dbda27460c5b47db0db77443dd85d1"
-dependencies = [
- "cc",
- "libc",
-]
-
-[[package]]
-name = "tikv-jemallocator"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "965fe0c26be5c56c94e38ba547249074803efd52adfb66de62107d95aab3eaca"
-dependencies = [
- "libc",
- "tikv-jemalloc-sys",
-]
-
-[[package]]
-name = "time"
-version = "0.1.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a"
-dependencies = [
- "libc",
- "wasi 0.10.0+wasi-snapshot-preview1",
- "winapi",
-]
-
-[[package]]
-name = "time"
-version = "0.3.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48"
-dependencies = [
- "deranged",
- "itoa",
- "serde",
- "time-core",
- "time-macros",
-]
-
-[[package]]
-name = "time-core"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
-
-[[package]]
-name = "time-macros"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572"
-dependencies = [
- "time-core",
-]
-
-[[package]]
-name = "tinytemplate"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc"
-dependencies = [
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "tinyvec"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
-dependencies = [
- "tinyvec_macros",
-]
-
-[[package]]
-name = "tinyvec_macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
-
-[[package]]
-name = "tokio"
-version = "1.29.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da"
-dependencies = [
- "autocfg",
- "backtrace",
- "bytes",
- "libc",
- "mio",
- "num_cpus",
- "parking_lot",
- "pin-project-lite",
- "signal-hook-registry",
- "socket2 0.4.9",
- "tokio-macros",
- "tracing",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "tokio-io-timeout"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf"
-dependencies = [
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "tokio-macros"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.29",
-]
-
-[[package]]
-name = "tokio-rustls"
-version = "0.23.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59"
-dependencies = [
- "rustls 0.20.9",
- "tokio",
- "webpki",
-]
-
-[[package]]
-name = "tokio-rustls"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
-dependencies = [
- "rustls 0.21.7",
- "tokio",
-]
-
-[[package]]
-name = "tokio-stream"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
-dependencies = [
- "futures-core",
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "tokio-util"
-version = "0.7.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d"
-dependencies = [
- "bytes",
- "futures-core",
- "futures-sink",
- "pin-project-lite",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "toml"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "tonic"
-version = "0.9.2"
-source = "git+https://github.com/qdrant/tonic?branch=v0.9.2-patched#060ab88c87955adc59d46a44b4e3b72cb4cc1522"
-dependencies = [
- "async-stream",
- "async-trait",
- "axum",
- "base64 0.21.3",
- "bytes",
- "flate2",
- "futures-core",
- "futures-util",
- "h2",
- "http",
- "http-body",
- "hyper",
- "hyper-timeout",
- "percent-encoding",
- "pin-project",
- "prost",
- "rustls-pemfile",
- "tokio",
- "tokio-rustls 0.24.1",
- "tokio-stream",
- "tower",
- "tower-layer",
- "tower-service",
- "tracing",
-]
-
-[[package]]
-name = "tonic-build"
-version = "0.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6fdaae4c2c638bb70fe42803a26fbd6fc6ac8c72f5c59f67ecc2a2dcabf4b07"
-dependencies = [
- "prettyplease 0.1.25",
- "proc-macro2",
- "prost-build",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "tower"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
-dependencies = [
- "futures-core",
- "futures-util",
- "indexmap 1.9.3",
- "pin-project",
- "pin-project-lite",
- "rand 0.8.5",
- "slab",
- "tokio",
- "tokio-util",
- "tower-layer",
- "tower-service",
- "tracing",
-]
-
-[[package]]
-name = "tower-layer"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
-
-[[package]]
-name = "tower-service"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
-
-[[package]]
-name = "tracing"
-version = "0.1.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
-dependencies = [
- "cfg-if",
- "log",
- "pin-project-lite",
- "tracing-attributes",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-attributes"
-version = "0.1.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.29",
-]
-
-[[package]]
-name = "tracing-core"
-version = "0.1.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
-dependencies = [
- "once_cell",
- "valuable",
-]
-
-[[package]]
-name = "tracing-log"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
-dependencies = [
- "lazy_static",
- "log",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-subscriber"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"
-dependencies = [
- "matchers",
- "nu-ansi-term",
- "once_cell",
- "parking_lot",
- "regex",
- "sharded-slab",
- "smallvec",
- "thread_local",
- "tracing",
- "tracing-core",
- "tracing-log",
-]
-
-[[package]]
-name = "tracing-tracy"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f3edd27f53bc0e55aefa9223f68eb44354060103d3e34635f6e27627fe0227f"
-dependencies = [
- "tracing-core",
- "tracing-subscriber",
- "tracy-client",
-]
-
-[[package]]
-name = "tracy-client"
-version = "0.16.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c78458aa3759647e0399e959a06f9f6dc61450a1caaa4f1632a3df8e8c55af7"
-dependencies = [
- "loom",
- "once_cell",
- "tracy-client-sys",
-]
-
-[[package]]
-name = "tracy-client-sys"
-version = "0.21.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90e764693ea5a090fb9b0a33fe9d32aa52656ae7ccd9f820719d2d998677c2eb"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "tree-sitter"
-version = "0.20.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e747b1f9b7b931ed39a548c1fae149101497de3c1fc8d9e18c62c1a66c683d3d"
-dependencies = [
- "cc",
- "regex",
-]
-
-[[package]]
-name = "tree-sitter-javascript"
-version = "0.20.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edbc663376bdd294bd1f0a6daf859aedb9aa5bdb72217d7ad8ba2d5314102cf7"
-dependencies = [
- "cc",
- "tree-sitter",
-]
-
-[[package]]
-name = "tree-sitter-python"
-version = "0.20.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c93b1b1fbd0d399db3445f51fd3058e43d0b4dcff62ddbdb46e66550978aa5"
-dependencies = [
- "cc",
- "tree-sitter",
-]
-
-[[package]]
-name = "tree-sitter-rust"
-version = "0.20.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0832309b0b2b6d33760ce5c0e818cb47e1d72b468516bfe4134408926fa7594"
-dependencies = [
- "cc",
- "tree-sitter",
-]
-
-[[package]]
-name = "tree-sitter-typescript"
-version = "0.20.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "079c695c32d39ad089101c66393aeaca30e967fba3486a91f573d2f0e12d290a"
-dependencies = [
- "cc",
- "tree-sitter",
-]
-
-[[package]]
-name = "try-lock"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
-
-[[package]]
-name = "typenum"
-version = "1.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
-
-[[package]]
-name = "ucd-trie"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"
-
-[[package]]
-name = "unarray"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94"
-
-[[package]]
-name = "unicase"
-version = "2.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"
-dependencies = [
- "version_check",
-]
-
-[[package]]
-name = "unicode-bidi"
-version = "0.3.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
-dependencies = [
- "tinyvec",
-]
-
-[[package]]
-name = "unicode-width"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
-
-[[package]]
-name = "untrusted"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
-
-[[package]]
-name = "ureq"
-version = "2.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b11c96ac7ee530603dcdf68ed1557050f374ce55a5a07193ebf8cbc9f8927e9"
-dependencies = [
- "base64 0.21.3",
- "log",
- "once_cell",
- "rustls 0.21.7",
- "rustls-webpki 0.100.2",
- "url",
- "webpki-roots 0.23.1",
-]
-
-[[package]]
-name = "url"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5"
-dependencies = [
- "form_urlencoded",
- "idna",
- "percent-encoding",
- "serde",
-]
-
-[[package]]
-name = "utf8parse"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
-
-[[package]]
-name = "uuid"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d"
-dependencies = [
- "getrandom 0.2.10",
- "serde",
-]
-
-[[package]]
-name = "validator"
-version = "0.16.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b92f40481c04ff1f4f61f304d61793c7b56ff76ac1469f1beb199b1445b253bd"
-dependencies = [
- "idna",
- "lazy_static",
- "regex",
- "serde",
- "serde_derive",
- "serde_json",
- "url",
- "validator_derive",
-]
-
-[[package]]
-name = "validator_derive"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc44ca3088bb3ba384d9aecf40c6a23a676ce23e09bdaca2073d99c207f864af"
-dependencies = [
- "if_chain",
- "lazy_static",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "regex",
- "syn 1.0.109",
- "validator_types",
-]
-
-[[package]]
-name = "validator_types"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "111abfe30072511849c5910134e8baf8dc05de4c0e5903d681cbd5c9c4d611e3"
-dependencies = [
- "proc-macro2",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "valuable"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
-
-[[package]]
-name = "vcpkg"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
-
-[[package]]
-name = "version_check"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-
-[[package]]
-name = "wait-timeout"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "wal"
-version = "0.1.2"
-source = "git+https://github.com/qdrant/wal.git?rev=a32f6a38acf7ffd761df83b0790eaefeb107cd60#a32f6a38acf7ffd761df83b0790eaefeb107cd60"
-dependencies = [
- "byteorder",
- "crc",
- "crossbeam-channel",
- "docopt",
- "env_logger",
- "fs4",
- "log",
- "memmap2 0.7.1",
- "rand 0.8.5",
- "rand_distr",
- "rustix 0.38.10",
- "serde",
-]
-
-[[package]]
-name = "walkdir"
-version = "2.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"
-dependencies = [
- "same-file",
- "winapi-util",
-]
-
-[[package]]
-name = "want"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
-dependencies = [
- "try-lock",
-]
-
-[[package]]
-name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-
-[[package]]
-name = "wasi"
-version = "0.10.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
-
-[[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
-
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.87"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
-dependencies = [
- "cfg-if",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.87"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
-dependencies = [
- "bumpalo",
- "log",
- "once_cell",
- "proc-macro2",
- "quote",
- "syn 2.0.29",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-futures"
-version = "0.4.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03"
-dependencies = [
- "cfg-if",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.87"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.87"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.29",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.87"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
-
-[[package]]
-name = "wasm-streams"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7"
-dependencies = [
- "futures-util",
- "js-sys",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
-]
-
-[[package]]
-name = "web-sys"
-version = "0.3.64"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "webpki"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd"
-dependencies = [
- "ring",
- "untrusted",
-]
-
-[[package]]
-name = "webpki-roots"
-version = "0.22.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87"
-dependencies = [
- "webpki",
-]
-
-[[package]]
-name = "webpki-roots"
-version = "0.23.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338"
-dependencies = [
- "rustls-webpki 0.100.2",
-]
-
-[[package]]
-name = "webpki-roots"
-version = "0.25.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc"
-
-[[package]]
-name = "whatlang"
-version = "0.16.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcdcd0195a5b871e50926da8e881277f36a4621b3220d85092e7b91cc85f6bd9"
-dependencies = [
- "hashbrown 0.12.3",
- "once_cell",
-]
-
-[[package]]
-name = "which"
-version = "4.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269"
-dependencies = [
- "either",
- "libc",
- "once_cell",
-]
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-util"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
-dependencies = [
- "winapi",
+ "winapi",
 ]
 
 [[package]]
@@ -5673,256 +307,3 @@ name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "windows"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
-dependencies = [
- "windows-targets 0.48.5",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.45.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
-dependencies = [
- "windows-targets 0.42.2",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
-dependencies = [
- "windows-targets 0.48.5",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
-dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
-dependencies = [
- "windows_aarch64_gnullvm 0.48.5",
- "windows_aarch64_msvc 0.48.5",
- "windows_i686_gnu 0.48.5",
- "windows_i686_msvc 0.48.5",
- "windows_x86_64_gnu 0.48.5",
- "windows_x86_64_gnullvm 0.48.5",
- "windows_x86_64_msvc 0.48.5",
-]
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
-
-[[package]]
-name = "winreg"
-version = "0.50.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
-dependencies = [
- "cfg-if",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "wyz"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
-dependencies = [
- "tap",
-]
-
-[[package]]
-name = "xattr"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "yada"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6d12cb7a57bbf2ab670ed9545bae3648048547f9039279a89ce000208e585c1"
-
-[[package]]
-name = "yaml-rust"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
-dependencies = [
- "linked-hash-map",
-]
-
-[[package]]
-name = "zip"
-version = "0.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261"
-dependencies = [
- "aes",
- "byteorder",
- "bzip2",
- "constant_time_eq 0.1.5",
- "crc32fast",
- "crossbeam-utils",
- "flate2",
- "hmac",
- "pbkdf2",
- "sha1",
- "time 0.3.28",
- "zstd 0.11.2+zstd.1.5.2",
-]
-
-[[package]]
-name = "zstd"
-version = "0.11.2+zstd.1.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4"
-dependencies = [
- "zstd-safe 5.0.2+zstd.1.5.2",
-]
-
-[[package]]
-name = "zstd"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c"
-dependencies = [
- "zstd-safe 6.0.6",
-]
-
-[[package]]
-name = "zstd-safe"
-version = "5.0.2+zstd.1.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db"
-dependencies = [
- "libc",
- "zstd-sys",
-]
-
-[[package]]
-name = "zstd-safe"
-version = "6.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581"
-dependencies = [
- "libc",
- "zstd-sys",
-]
-
-[[package]]
-name = "zstd-sys"
-version = "2.0.8+zstd.1.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
-]
diff --git a/Cargo.toml b/Cargo.toml
index 1e25b15..e710d27 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,13 +1,12 @@
 [workspace]
 resolver = "2"
-members = ["crates/codeindex", "crates/codeindex_common", "crates/qdrant"]
-
-[patch.crates-io]
-# Temporary patch until <https://github.com/hyperium/tonic/pull/1401> is merged
-tonic = { git = 'https://github.com/qdrant/tonic', branch = "v0.9.2-patched" }
+members = ["crates/codeindex"]
 
 [profile.release]
-lto = "fat"
+strip = true
+opt-level = "z" # Optimize for size.
+lto = true # Enable Link Time Optimization (LTO)
+codegen-units = 1
 
 # Inherit from release, because we are not rebuilding often,
 # and we don't want the huge binary sizes from debug builds.
diff --git a/TODO b/TODO
deleted file mode 100644
index b8e583f..0000000
--- a/TODO
+++ /dev/null
@@ -1,3 +0,0 @@
-1. extract web server into seperate modules and be joined `codeindex_restful_apis`
-2. codeindex_grpc_apis
-3. codeindex_webui: monaco-editor & Askcodebase AI
\ No newline at end of file
diff --git a/crates/codeindex/Cargo.toml b/crates/codeindex/Cargo.toml
index e16a3aa..47aa631 100644
--- a/crates/codeindex/Cargo.toml
+++ b/crates/codeindex/Cargo.toml
@@ -4,21 +4,10 @@ version = "0.1.0"
 edition = "2021"
 default-run = "codeindex"
 
-[build-dependencies]
-cc = "*"
-
 [dependencies]
-qdrant = { path = "../qdrant" }
-codeindex_common = { path = "../codeindex_common" }
-colored = "2.0.4"
-tokio = { version = "~1.29", features = ["full"] }
-axum = "0.6.20"
-serde = { version = "1.0.188", features = ["derive"] }
-serde_json = "1.0.105"
-redis = { version = "0.23.2", features = ["cluster-async", "tokio-comp"] }
+ignore = "0.4.20"
 tree-sitter = "0.20.10"
 tree-sitter-rust = "0.20.4"
 tree-sitter-python = "0.20.4"
 tree-sitter-typescript = "0.20.2"
 tree-sitter-javascript = "0.20.1"
-log = "0.4"
\ No newline at end of file
diff --git a/crates/codeindex/src/handlers/javascript.rs b/crates/codeindex/src/handlers/javascript.rs
new file mode 100644
index 0000000..5b5a343
--- /dev/null
+++ b/crates/codeindex/src/handlers/javascript.rs
@@ -0,0 +1,42 @@
+use std::collections::HashMap;
+
+use tree_sitter::TreeCursor;
+
+// Handler for JavaScript function_declaration
+fn handle_js_function(cursor: &mut TreeCursor, source_code: &str) -> String {
+    let mut function_signature = String::new();
+    if cursor.goto_first_child() {
+        loop {
+            let node = cursor.node();
+            match node.kind() {
+                "identifier" => {
+                    let start_byte = node.start_byte();
+                    let end_byte = node.end_byte();
+                    let child_name = &source_code[start_byte..end_byte];
+                    function_signature.push_str(&format!("function {}", child_name));
+                }
+                "formal_parameters" => {
+                    let start_byte = node.start_byte();
+                    let end_byte = node.end_byte();
+                    let parameters = &source_code[start_byte..end_byte];
+                    function_signature.push_str(&format!("{}", parameters));
+                }
+                // JavaScript doesn't have explicit return types, so we don't handle that here
+                _ => {}
+            }
+
+            if !cursor.goto_next_sibling() {
+                break;
+            }
+        }
+        cursor.goto_parent();
+    }
+    function_signature
+}
+
+pub fn get_handlers() -> HashMap<&'static str, fn(&mut TreeCursor, &str) -> String> {
+    let mut handlers: HashMap<&str, fn(&mut TreeCursor, &str) -> String> = HashMap::new();
+    handlers.insert("function_declaration", handle_js_function);
+    // Insert more handlers as needed
+    handlers
+}
diff --git a/crates/codeindex/src/handlers/mod.rs b/crates/codeindex/src/handlers/mod.rs
new file mode 100644
index 0000000..8b1bdad
--- /dev/null
+++ b/crates/codeindex/src/handlers/mod.rs
@@ -0,0 +1,18 @@
+mod javascript;
+mod python;
+mod rust;
+mod typescript;
+
+use std::collections::HashMap;
+
+use tree_sitter::TreeCursor;
+
+pub fn get_handlers(extension: &str) -> HashMap<&'static str, fn(&mut TreeCursor, &str) -> String> {
+    match extension {
+        "js" | "jsx" => javascript::get_handlers(),
+        "ts" | "tsx" => typescript::get_handlers(),
+        "rs" => rust::get_handlers(),
+        "py" => python::get_handlers(),
+        _ => HashMap::new(),
+    }
+}
diff --git a/crates/codeindex/src/handlers/python.rs b/crates/codeindex/src/handlers/python.rs
new file mode 100644
index 0000000..4d80ee8
--- /dev/null
+++ b/crates/codeindex/src/handlers/python.rs
@@ -0,0 +1,66 @@
+use std::collections::HashMap;
+
+use tree_sitter::TreeCursor;
+
+// Handler for Python function_definition
+fn handle_py_function(cursor: &mut TreeCursor, source_code: &str) -> String {
+    let mut function_signature = String::new();
+    if cursor.goto_first_child() {
+        loop {
+            let node = cursor.node();
+            match node.kind() {
+                "identifier" => {
+                    let start_byte = node.start_byte();
+                    let end_byte = node.end_byte();
+                    let child_name = &source_code[start_byte..end_byte];
+                    function_signature.push_str(&format!("def {}", child_name));
+                }
+                "parameters" => {
+                    let start_byte = node.start_byte();
+                    let end_byte = node.end_byte();
+                    let parameters = &source_code[start_byte..end_byte];
+                    function_signature.push_str(&format!("{}", parameters));
+                }
+                // Python doesn't have explicit return types, so we don't handle that here
+                _ => {}
+            }
+
+            if !cursor.goto_next_sibling() {
+                break;
+            }
+        }
+        cursor.goto_parent();
+    }
+    function_signature
+}
+
+// Handler for Python class_definition
+fn handle_py_class(cursor: &mut TreeCursor, source_code: &str) -> String {
+    let mut class_signature = String::new();
+    if cursor.goto_first_child() {
+        loop {
+            let node = cursor.node();
+            if node.kind() == "identifier" {
+                let start_byte = node.start_byte();
+                let end_byte = node.end_byte();
+                let child_name = &source_code[start_byte..end_byte];
+                class_signature.push_str(&format!("class {}:", child_name));
+            }
+            // You may want to handle fields, methods, etc. here...
+
+            if !cursor.goto_next_sibling() {
+                break;
+            }
+        }
+        cursor.goto_parent();
+    }
+    class_signature
+}
+
+pub fn get_handlers() -> HashMap<&'static str, fn(&mut TreeCursor, &str) -> String> {
+    let mut handlers: HashMap<&str, fn(&mut TreeCursor, &str) -> String> = HashMap::new();
+    handlers.insert("function_definition", handle_py_function);
+    handlers.insert("class_definition", handle_py_class);
+    // Insert more handlers as needed
+    handlers
+}
diff --git a/crates/codeindex/src/handlers/rust.rs b/crates/codeindex/src/handlers/rust.rs
new file mode 100644
index 0000000..82b4f6f
--- /dev/null
+++ b/crates/codeindex/src/handlers/rust.rs
@@ -0,0 +1,72 @@
+use std::collections::HashMap;
+
+use tree_sitter::TreeCursor;
+
+// Handler for Rust function_item
+fn handle_rs_function(cursor: &mut TreeCursor, source_code: &str) -> String {
+    let mut function_signature = String::new();
+    if cursor.goto_first_child() {
+        loop {
+            let node = cursor.node();
+            match node.kind() {
+                "identifier" => {
+                    let start_byte = node.start_byte();
+                    let end_byte = node.end_byte();
+                    let child_name = &source_code[start_byte..end_byte];
+                    function_signature.push_str(&format!("fn {}", child_name));
+                }
+                "parameters" => {
+                    let start_byte = node.start_byte();
+                    let end_byte = node.end_byte();
+                    let parameters = &source_code[start_byte..end_byte];
+                    function_signature.push_str(&format!("{}", parameters));
+                }
+                "type_identifier" => {
+                    let start_byte = node.start_byte();
+                    let end_byte = node.end_byte();
+                    let return_type = &source_code[start_byte..end_byte];
+                    function_signature.push_str(&format!(" -> {}", return_type));
+                }
+                _ => {}
+            }
+
+            if !cursor.goto_next_sibling() {
+                break;
+            }
+        }
+        cursor.goto_parent();
+    }
+    function_signature
+}
+
+// Handler for Rust struct_item
+fn handle_rs_struct(cursor: &mut TreeCursor, source_code: &str) -> String {
+    let mut struct_signature = String::new();
+    if cursor.goto_first_child() {
+        loop {
+            let node = cursor.node();
+            if node.kind() == "identifier" {
+                let start_byte = node.start_byte();
+                let end_byte = node.end_byte();
+                let child_name = &source_code[start_byte..end_byte];
+                struct_signature.push_str(&format!("struct {} {{", child_name));
+            }
+            // You may want to handle fields here...
+
+            if !cursor.goto_next_sibling() {
+                break;
+            }
+        }
+        cursor.goto_parent();
+    }
+    struct_signature.push_str("}");
+    struct_signature
+}
+
+pub fn get_handlers() -> HashMap<&'static str, fn(&mut TreeCursor, &str) -> String> {
+    let mut handlers: HashMap<&str, fn(&mut TreeCursor, &str) -> String> = HashMap::new();
+    handlers.insert("function_item", handle_rs_function);
+    handlers.insert("struct_item", handle_rs_struct);
+    // Insert more handlers as needed
+    handlers
+}
diff --git a/crates/codeindex/src/handlers/typescript.rs b/crates/codeindex/src/handlers/typescript.rs
new file mode 100644
index 0000000..aefc05d
--- /dev/null
+++ b/crates/codeindex/src/handlers/typescript.rs
@@ -0,0 +1,80 @@
+use std::collections::HashMap;
+
+use tree_sitter::TreeCursor;
+
+// Handler for TypeScript function_declaration
+fn handle_ts_function(cursor: &mut tree_sitter::TreeCursor, source_code: &str) -> String {
+    let mut function_signature = String::new();
+    if cursor.goto_first_child() {
+        loop {
+            let node = cursor.node();
+            match node.kind() {
+                "identifier" => {
+                    let start_byte = node.start_byte();
+                    let end_byte = node.end_byte();
+                    let child_name = &source_code[start_byte..end_byte];
+                    function_signature.push_str(&format!("function {}", child_name));
+                }
+                "formal_parameters" => {
+                    let start_byte = node.start_byte();
+                    let end_byte = node.end_byte();
+                    let parameters = &source_code[start_byte..end_byte];
+                    function_signature.push_str(&format!("{}", parameters));
+                }
+                "type_annotation" => {
+                    let start_byte = node.start_byte();
+                    let end_byte = node.end_byte();
+                    let return_type = &source_code[start_byte..end_byte];
+                    function_signature.push_str(&format!(": {}", return_type));
+                }
+                _ => {}
+            }
+
+            if !cursor.goto_next_sibling() {
+                break;
+            }
+        }
+        cursor.goto_parent();
+    }
+    function_signature
+}
+
+// Handler for TypeScript class_declaration
+fn handle_ts_class(cursor: &mut TreeCursor, source_code: &str) -> String {
+    let mut class_signature = String::new();
+    if cursor.goto_first_child() {
+        loop {
+            let node = cursor.node();
+            match node.kind() {
+                "class" => {
+                    let start_byte = node.start_byte();
+                    let end_byte = node.end_byte();
+                    let keyword = &source_code[start_byte..end_byte];
+                    class_signature.push_str(keyword);
+                    class_signature.push(' ');
+                }
+                "type_identifier" => {
+                    let start_byte = node.start_byte();
+                    let end_byte = node.end_byte();
+                    let child_name = &source_code[start_byte..end_byte];
+                    class_signature.push_str(child_name);
+                }
+                _ => {}
+            }
+
+            if !cursor.goto_next_sibling() {
+                break;
+            }
+        }
+        cursor.goto_parent();
+    }
+    class_signature
+}
+
+pub fn get_handlers() -> HashMap<&'static str, fn(&mut TreeCursor, &str) -> String> {
+    let mut handlers: HashMap<&str, fn(&mut TreeCursor, &str) -> String> = HashMap::new();
+    handlers.insert("function_declaration", handle_ts_function);
+    handlers.insert("class_declaration", handle_ts_class);
+    // Insert more handlers as needed
+    handlers
+}
diff --git a/crates/codeindex/src/languages.rs b/crates/codeindex/src/languages.rs
new file mode 100644
index 0000000..c60bc3a
--- /dev/null
+++ b/crates/codeindex/src/languages.rs
@@ -0,0 +1,16 @@
+use tree_sitter::Language;
+use {
+    tree_sitter_javascript as ts_js, tree_sitter_python as ts_python, tree_sitter_rust as ts_rust,
+    tree_sitter_typescript as ts_ts,
+};
+
+pub fn get_language(extension: Option<&str>) -> Option<Language> {
+    match extension {
+        Some("rs") => Some(ts_rust::language()),
+        Some("js") | Some("jsx") => Some(ts_js::language()),
+        Some("ts") => Some(ts_ts::language_typescript()),
+        Some("tsx") => Some(ts_ts::language_tsx()),
+        Some("py") => Some(ts_python::language()),
+        _ => None,
+    }
+}
diff --git a/crates/codeindex/src/main.rs b/crates/codeindex/src/main.rs
index 55b7b94..c35954a 100644
--- a/crates/codeindex/src/main.rs
+++ b/crates/codeindex/src/main.rs
@@ -1,16 +1,11 @@
-mod welcome;
-
-use qdrant::start_qdrant;
-use welcome::welcome;
-
-/// CodeIndex is a local-first high performance codebase index engine designed for AI.
-/// It helps your LLM understand the structure and semantics of a codebase and grab code
-/// context when needed.
-///
-/// This CLI starts a CodeIndex peer/server.
-fn main() {
-    welcome();
-
-    let _ = start_qdrant();
-    log::info!("CodeIndex server stopped");
-}
+mod walker;  
+mod handlers;  
+mod languages;  
+mod outline;  
+  
+use std::error::Error;  
+use walker::process_entries;  
+  
+fn main() -> Result<(), Box<dyn Error>> {  
+    process_entries()  
+}  
diff --git a/crates/codeindex/src/outline.rs b/crates/codeindex/src/outline.rs
new file mode 100644
index 0000000..7734533
--- /dev/null
+++ b/crates/codeindex/src/outline.rs
@@ -0,0 +1,35 @@
+use tree_sitter::Node;
+
+use crate::handlers;
+
+pub fn get_outline(node: Node, source_code: &str, extension: Option<&str>) -> Vec<String> {
+    let mut cursor = node.walk();
+    let mut signatures = Vec::new();
+
+    // Get the handlers for this language
+    let handlers = handlers::get_handlers(extension.unwrap_or(""));
+
+    if cursor.goto_first_child() {
+        loop {
+            let child_node = cursor.node();
+            let child_kind = child_node.kind();
+
+            // Lookup the handler for this kind of node
+            if let Some(handler) = handlers.get(child_kind) {
+                let signature = handler(&mut cursor, source_code);
+                signatures.push(signature);
+            }
+
+            // If the node has no children or we're done processing the children,
+            // we move on to the next sibling.
+            if !cursor.goto_first_child() {
+                while !cursor.goto_next_sibling() {
+                    if !cursor.goto_parent() {
+                        return signatures;
+                    }
+                }
+            }
+        }
+    }
+    signatures
+}
diff --git a/crates/codeindex/src/repo.rs b/crates/codeindex/src/repo.rs
deleted file mode 100644
index ea6f9ce..0000000
--- a/crates/codeindex/src/repo.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-use std::path::Path;
-
-use codeindex_common::git2::{Cred, Repository};
-
-fn clone_repo(url: &str) -> Result<(), git2::Error> {
-    let creds = Cred::default();
-    let repos_path = Path::new("repos");
-
-    let repo_name = url
-        .split('/')
-        .last()
-        .expect("Failed to parse repo name from URL");
-
-    let repo_path = repos_path.join(repo_name);
-
-    if repo_path.exists() {
-        return Ok(()); // Repo already cloned
-    }
-
-    println!("Cloning {} to {}", url, repo_path.display());
-
-    let repo = Repository::clone(url, &repo_path, Some(&creds))?;
-
-    println!("Cloned {} successfully", repo.path().display());
-
-    Ok(())
-}
diff --git a/crates/codeindex/src/walker.rs b/crates/codeindex/src/walker.rs
new file mode 100644
index 0000000..1a74ad9
--- /dev/null
+++ b/crates/codeindex/src/walker.rs
@@ -0,0 +1,67 @@
+use std::error::Error;
+use std::fs;
+use std::io::ErrorKind::InvalidData;
+
+use ignore::overrides::OverrideBuilder;
+use ignore::WalkBuilder;
+use tree_sitter::Parser;
+
+use crate::languages::get_language;
+use crate::outline::get_outline;
+
+pub fn process_entries() -> Result<(), Box<dyn Error>> {
+    let mut overrides = OverrideBuilder::new(".");
+    overrides.add("!.git")?; // ignore .git directory
+
+    for result in WalkBuilder::new("./")
+        .overrides(overrides.build()?)
+        .hidden(false)
+        .build()
+    {
+        match result {
+            Ok(entry) => process_entry(entry)?,
+            Err(err) => eprintln!("Error: {}", err),
+        }
+    }
+    Ok(())
+}
+
+fn process_entry(entry: ignore::DirEntry) -> Result<(), Box<dyn Error>> {
+    // Skip the root directory
+    if entry.depth() == 0 {
+        return Ok(());
+    }
+
+    // Strip the './' prefix and print the path
+    let path = entry.path().strip_prefix("./").unwrap_or(entry.path());
+    println!("{}", path.display());
+
+    // Check if path is a file
+    if path.is_file() {
+        match fs::read_to_string(path) {
+            Ok(code) => {
+                let mut parser = Parser::new();
+                let language = get_language(path.extension().and_then(std::ffi::OsStr::to_str));
+
+                if let Some(language) = language {
+                    parser.set_language(language).unwrap();
+                } else {
+                    return Ok(()); // Ignore other file types
+                }
+
+                let extension = path.extension().and_then(std::ffi::OsStr::to_str);
+                let tree = parser.parse(&code, None).unwrap();
+                let root_node = tree.root_node();
+                let outline = get_outline(root_node, &code, extension);
+                for signature in outline {
+                    println!("  {}", signature);
+                }
+            }
+            Err(e) if e.kind() == InvalidData => {
+                // Skip binary files
+            }
+            Err(e) => return Err(e.into()),
+        }
+    }
+    Ok(())
+}
diff --git a/crates/codeindex/src/welcome.rs b/crates/codeindex/src/welcome.rs
deleted file mode 100644
index 7ab54da..0000000
--- a/crates/codeindex/src/welcome.rs
+++ /dev/null
@@ -1,47 +0,0 @@
-use std::env;
-
-use codeindex_common::atty::{self, Stream};
-use colored::{Color, ColoredString, Colorize};
-
-fn paint(text: &str, true_color: bool) -> ColoredString {
-    if true_color {
-        text.bold().truecolor(70, 144, 239)
-    } else {
-        text.bold().color(Color::Blue)
-    }
-}
-
-/// Prints welcome message
-#[rustfmt::skip]
-pub fn welcome() {
-    if !atty::is(Stream::Stdout) {
-        colored::control::set_override(false);
-    }
-
-    let mut true_color = true;
-    let package_version = env!("CARGO_PKG_VERSION");
-
-    match env::var("COLORTERM") {
-        Ok(val) => if val != "24bit" && val != "truecolor" {
-            true_color = false;
-        },
-        Err(_) => true_color = false,
-    }
-
-    println!("{}", paint(r#"_________     _________    ________      _________            "#, true_color));
-    println!("{}", paint(r#"__  ____/___________  /________  _/____________  /________  __"#, true_color));
-    println!("{}", paint(r#"_  /    _  __ \  __  /_  _ \__  / __  __ \  __  /_  _ \_  |/_/"#, true_color));
-    println!("{}", paint(r#"/ /___  / /_/ / /_/ / /  __/_/ /  _  / / / /_/ / /  __/_>  <  "#, true_color));
-    println!("{}", paint(&format!(r#"\____/  \____/\__,_/  \___//___/  /_/ /_/\__,_/  \___//_/|_|  v{}"#, package_version), true_color));
-    println!();
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_welcome() {
-        welcome();
-    }
-}
diff --git a/crates/codeindex_common/Cargo.toml b/crates/codeindex_common/Cargo.toml
deleted file mode 100644
index 0c1082b..0000000
--- a/crates/codeindex_common/Cargo.toml
+++ /dev/null
@@ -1,11 +0,0 @@
-[package]
-name = "codeindex_common"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-
-atty = "0.2"
-git2 = "0.18.0"
\ No newline at end of file
diff --git a/crates/codeindex_common/src/lib.rs b/crates/codeindex_common/src/lib.rs
deleted file mode 100644
index 52b60de..0000000
--- a/crates/codeindex_common/src/lib.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-/// codeindex_common is a library that contains common code
-/// for crates of codeindex project.
-pub extern crate atty;
-pub extern crate git2;
\ No newline at end of file
diff --git a/crates/qdrant/Cargo.toml b/crates/qdrant/Cargo.toml
deleted file mode 100644
index 060a12f..0000000
--- a/crates/qdrant/Cargo.toml
+++ /dev/null
@@ -1,109 +0,0 @@
-[package]
-name = "qdrant"
-version = "1.4.1"
-authors = [
-    "Andrey Vasnetsov <andrey@vasnetsov.com>",
-    "Qdrant Team <info@qdrant.tech>",
-]
-readme = "README.md"
-homepage = "https://qdrant.tech/"
-repository = "https://github.com/qdrant/qdrant"
-license = "Apache-2.0"
-edition = "2021"
-
-[features]
-default = ["web", "parking_lot"]
-web = ["actix-web"]
-multiling-chinese = ["segment/multiling-chinese"]
-multiling-japanese = ["segment/multiling-japanese"]
-multiling-korean = ["segment/multiling-korean"]
-service_debug = ["parking_lot", "parking_lot/deadlock_detection"]
-tracing-log = ["tracing", "tracing/log"]
-console = ["console-subscriber"]
-console-subscriber = ["tracing", "tracing-subscriber", "dep:console-subscriber"]
-tracy = ["tracing-tracy"]
-tracing-tracy = ["tracing", "tracing-subscriber", "dep:tracing-tracy"]
-tokio-tracing = ["tokio/tracing"]
-
-[dev-dependencies]
-serde_urlencoded = "0.7"
-sealed_test = "1.0.0"
-
-tempfile = "3.7.1"
-
-[dependencies]
-
-parking_lot = { version = "0.12.1", features=["deadlock_detection"], optional = true }
-
-num_cpus = "1.16"
-thiserror = "1.0"
-log = "0.4"
-env_logger = "0.10.0"
-colored = "2"
-serde = { version = "~1.0", features = ["derive"] }
-serde_json = "~1.0"
-chrono = { version = "~0.4", features = ["serde"] }
-schemars = { version = "0.8.12", features = ["uuid1", "preserve_order", "chrono"] }
-itertools = "0.11"
-anyhow = "1.0.72"
-futures = "0.3.28"
-futures-util = "0.3.27"
-clap = { version = "4.3.21", features = ["derive"] }
-serde_cbor = { version = "0.11.2"}
-uuid = { version = "1.4", features = ["v4", "serde"] }
-sys-info = "0.9.1"
-wal = { git = "https://github.com/qdrant/wal.git", rev = "a32f6a38acf7ffd761df83b0790eaefeb107cd60" }
-
-config = "~0.13.3"
-
-tokio = { version = "~1.29", features = ["full"] }
-
-actix-web = { version = "4.3.1", optional = true, features = ["rustls", "actix-tls"] }
-actix-cors = "0.6.4"
-actix-files = "0.6.2"
-tonic = { version = "0.9.2", features = ["gzip", "tls"] }
-tower = "0.4.13"
-tower-layer = "0.3.2"
-num-traits = "0.2.16"
-tar = "0.4.40"
-reqwest = { version = "0.11", default-features = false, features = ["stream", "rustls-tls", "blocking"] }
-rustls = "0.20.7"
-rustls-pemfile = "1.0.3"
-prometheus = { version = "0.13.3", default-features = false }
-validator = { version = "0.16", features = ["derive"] }
-actix-web-validator = "5.0.1"
-
-# Consensus related crates
-raft = { version = "0.7.0", features = ["prost-codec"], default-features = false }
-slog = "2.7.0"
-slog-stdlog = "4.1.1"
-prost = "0.11.9"
-raft-proto = { version = "0.7.0", features = ["prost-codec"], default-features = false}
-
-segment = { path = "lib/segment" }
-collection = { path = "lib/collection" }
-storage = { path = "lib/storage" }
-api = { path = "lib/api" }
-actix-multipart = "0.6.0"
-constant_time_eq = "0.3.0"
-
-# Profiling
-tracing = { version = "0.1", features = ["async-await"], optional = true }
-tracing-subscriber = { version = "0.3", default-features = false, features = ["registry", "std"], optional = true }
-console-subscriber = { version = "0.1", default-features = false, features = ["parking_lot"], optional = true }
-tracing-tracy = { version = "0.10.2", features = ["ondemand"], optional = true }
-
-[target.'cfg(not(target_env = "msvc"))'.dependencies]
-tikv-jemallocator = "0.5"
-
-[[bin]]
-name = "schema_generator"
-path = "src/schema_generator.rs"
-test = false
-bench = false
-
-[[bin]]
-name = "wal_inspector"
-path = "src/wal_inspector.rs"
-test = false
-bench = false
\ No newline at end of file
diff --git a/crates/qdrant/LICENSE b/crates/qdrant/LICENSE
deleted file mode 100644
index 261eeb9..0000000
--- a/crates/qdrant/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/crates/qdrant/README.md b/crates/qdrant/README.md
deleted file mode 100644
index 1026fcd..0000000
--- a/crates/qdrant/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Qdrant Integration into CodeIndex
-
-**Qdrant** (read: quadrant) is a vector similarity search engine and vector database. It provides a production-ready service with a convenient API to store, search, and manage points—vectors with an additional payload Qdrant is tailored to extended filtering support. It makes it useful for all sorts of neural-network or semantic-based matching, faceted search, and other applications.
-
-
-> [!IMPORTANT]  
-> We respect qdrant's [Apache License 2.0](./LICENSE) and strictly follow its rules. If you're looking for a Vector Database solution, please check [Qdrant Website](https://qdrant.tech/).
-
-We've directly integrated Qdrant into CodeIndex project to achieve:
-
-1. **Performance Improvement:** Direct library function calls within the same process are faster than network requests, even on the same machine. This reduces latency and optimizes application speed.
-
-2. **Direct API Calls:** This allows greater flexibility with direct access to all Qdrant functionalities without network interface restrictions. It simplifies our codebase, promotes safer code with Rust's static typing, and eliminates the need for network communication code for Qdrant interaction.
\ No newline at end of file
diff --git a/crates/qdrant/config/config.yaml b/crates/qdrant/config/config.yaml
deleted file mode 100644
index 28c6b77..0000000
--- a/crates/qdrant/config/config.yaml
+++ /dev/null
@@ -1,206 +0,0 @@
-debug: false
-log_level: INFO
-
-storage:
-  # Where to store all the data
-  storage_path: ./storage
-
-  # Where to store snapshots
-  snapshots_path: ./snapshots
-
-  # Where to store temporary files
-  # If null, temporary snapshot are stored in: storage/snapshots_temp/
-  temp_path: null
-
-  # If true - point's payload will not be stored in memory.
-  # It will be read from the disk every time it is requested.
-  # This setting saves RAM by (slightly) increasing the response time.
-  # Note: those payload values that are involved in filtering and are indexed - remain in RAM.
-  on_disk_payload: true
-
-  # Write-ahead-log related configuration
-  wal:
-    # Size of a single WAL segment
-    wal_capacity_mb: 32
-
-    # Number of WAL segments to create ahead of actual data requirement
-    wal_segments_ahead: 0
-
-  # Normal node - receives all updates and answers all queries
-  node_type: "Normal"
-
-  # Listener node - receives all updates, but does not answer search/read queries
-  # Useful for setting up a dedicated backup node
-  # node_type: "Listener"
-
-  performance:
-    # Number of parallel threads used for search operations. If 0 - auto selection.
-    max_search_threads: 0
-    # Max total number of threads, which can be used for running optimization processes across all collections.
-    # Note: Each optimization thread will also use `max_indexing_threads` for index building.
-    # So total number of threads used for optimization will be `max_optimization_threads * max_indexing_threads`
-    max_optimization_threads: 1
-
-  optimizers:
-    # The minimal fraction of deleted vectors in a segment, required to perform segment optimization
-    deleted_threshold: 0.2
-
-    # The minimal number of vectors in a segment, required to perform segment optimization
-    vacuum_min_vector_number: 1000
-
-    # Target amount of segments optimizer will try to keep.
-    # Real amount of segments may vary depending on multiple parameters:
-    #  - Amount of stored points
-    #  - Current write RPS
-    #
-    # It is recommended to select default number of segments as a factor of the number of search threads,
-    # so that each segment would be handled evenly by one of the threads.
-    # If `default_segment_number = 0`, will be automatically selected by the number of available CPUs
-    default_segment_number: 0
-
-    # Do not create segments larger this size (in KiloBytes).
-    # Large segments might require disproportionately long indexation times,
-    # therefore it makes sense to limit the size of segments.
-    #
-    # If indexation speed have more priority for your - make this parameter lower.
-    # If search speed is more important - make this parameter higher.
-    # Note: 1Kb = 1 vector of size 256
-    # If not set, will be automatically selected considering the number of available CPUs.
-    max_segment_size_kb: null
-
-    # Maximum size (in KiloBytes) of vectors to store in-memory per segment.
-    # Segments larger than this threshold will be stored as read-only memmaped file.
-    # To enable memmap storage, lower the threshold
-    # Note: 1Kb = 1 vector of size 256
-    # To explicitly disable mmap optimization, set to `0`.
-    # If not set, will be disabled by default.
-    memmap_threshold_kb: null
-
-    # Maximum size (in KiloBytes) of vectors allowed for plain index.
-    # Default value based on https://github.com/google-research/google-research/blob/master/scann/docs/algorithms.md
-    # Note: 1Kb = 1 vector of size 256
-    # To explicitly disable vector indexing, set to `0`.
-    # If not set, the default value will be used.
-    indexing_threshold_kb: 20000
-
-    # Interval between forced flushes.
-    flush_interval_sec: 5
-
-    # Max number of threads, which can be used for optimization per collection.
-    # Note: Each optimization thread will also use `max_indexing_threads` for index building.
-    # So total number of threads used for optimization will be `max_optimization_threads * max_indexing_threads`
-    # If `max_optimization_threads = 0`, optimization will be disabled.
-    max_optimization_threads: 1
-
-  # Default parameters of HNSW Index. Could be overridden for each collection or named vector individually
-  hnsw_index:
-    # Number of edges per node in the index graph. Larger the value - more accurate the search, more space required.
-    m: 16
-    # Number of neighbours to consider during the index building. Larger the value - more accurate the search, more time required to build index.
-    ef_construct: 100
-    # Minimal size (in KiloBytes) of vectors for additional payload-based indexing.
-    # If payload chunk is smaller than `full_scan_threshold_kb` additional indexing won't be used -
-    # in this case full-scan search should be preferred by query planner and additional indexing is not required.
-    # Note: 1Kb = 1 vector of size 256
-    full_scan_threshold_kb: 10000
-    # Number of parallel threads used for background index building. If 0 - auto selection.
-    max_indexing_threads: 0
-    # Store HNSW index on disk. If set to false, index will be stored in RAM. Default: false
-    on_disk: false
-    # Custom M param for hnsw graph built for payload index. If not set, default M will be used.
-    payload_m: null
-
-service:
-
-  # Maximum size of POST data in a single request in megabytes
-  max_request_size_mb: 32
-
-  # Number of parallel workers used for serving the api. If 0 - equal to the number of available cores.
-  # If missing - Same as storage.max_search_threads
-  max_workers: 0
-
-  # Host to bind the service on
-  host: 0.0.0.0
-
-  # HTTP(S) port to bind the service on
-  http_port: 6333
-
-  # gRPC port to bind the service on.
-  # If `null` - gRPC is disabled. Default: null
-  # Comment to disable gRPC:
-  grpc_port: 6334
-
-  # Enable CORS headers in REST API.
-  # If enabled, browsers would be allowed to query REST endpoints regardless of query origin.
-  # More info: https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS
-  # Default: true
-  enable_cors: true
-
-  # Enable HTTPS for the REST and gRPC API
-  enable_tls: false
-
-  # Check user HTTPS client certificate against CA file specified in tls config
-  verify_https_client_certificate: false
-
-  # Set an api-key.
-  # If set, all requests must include a header with the api-key.
-  # example header: `api-key: <API-KEY>`
-  #
-  # If you enable this you should also enable TLS.
-  # (Either above or via an external service like nginx.)
-  # Sending an api-key over an unencrypted channel is insecure.
-  #
-  # Uncomment to enable.
-  # api_key: your_secret_api_key_here
-
-cluster:
-  # Use `enabled: true` to run Qdrant in distributed deployment mode
-  enabled: false
-
-  # Configuration of the inter-cluster communication
-  p2p:
-    # Port for internal communication between peers
-    port: 6335
-
-    # Use TLS for communication between peers
-    enable_tls: false
-
-  # Configuration related to distributed consensus algorithm
-  consensus:
-    # How frequently peers should ping each other.
-    # Setting this parameter to lower value will allow consensus
-    # to detect disconnected nodes earlier, but too frequent
-    # tick period may create significant network and CPU overhead.
-    # We encourage you NOT to change this parameter unless you know what you are doing.
-    tick_period_ms: 100
-
-
-# Set to true to prevent service from sending usage statistics to the developers.
-# Read more: https://qdrant.tech/documentation/guides/telemetry
-telemetry_disabled: false
-
-
-# TLS configuration.
-# Required if either service.enable_tls or cluster.p2p.enable_tls is true.
-tls:
-  # Server certificate chain file
-  cert: ./tls/cert.pem
-
-  # Server private key file
-  key: ./tls/key.pem
-
-  # Certificate authority certificate file.
-  # This certificate will be used to validate the certificates
-  # presented by other nodes during inter-cluster communication.
-  #
-  # If verify_https_client_certificate is true, it will verify
-  # HTTPS client certificate
-  #
-  # Required if cluster.p2p.enable_tls is true.
-  ca_cert: ./tls/cacert.pem
-
-  # TTL in seconds to reload certificate from disk, useful for certificate rotations.
-  # Only works for HTTPS endpoints. Does not support gRPC (and intra-cluster communication).
-  # If `null` - TTL is disabled.
-  cert_ttl: 3600
-
diff --git a/crates/qdrant/config/development.yaml b/crates/qdrant/config/development.yaml
deleted file mode 100644
index 7795e40..0000000
--- a/crates/qdrant/config/development.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-debug: true
-log_level: DEBUG
-
-service:
-  host: 127.0.0.1
-  http_port: 6333
-  # Uncomment to enable gRPC:
-  #grpc_port: 6334
-  #api_key: your_secret_api_key_here
-
-
-storage:
-  performance:
-    # Number of parallel threads used for search operations. If 0 - auto selection.
-    max_search_threads: 4
-
-  optimizers:
-    # Minimum interval between forced flushes.
-    flush_interval_sec: 5
-
-    # Do not create too much segments in dev
-    default_segment_number: 2
-
-  handle_collection_load_errors: true
-
diff --git a/crates/qdrant/config/production.yaml b/crates/qdrant/config/production.yaml
deleted file mode 100644
index e62b4ef..0000000
--- a/crates/qdrant/config/production.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-debug: false
-log_level: INFO
-
-service:
-  host: 0.0.0.0
-  http_port: 6333
-  # Uncomment to enable gRPC:
-  #grpc_port: 6334
diff --git a/crates/qdrant/lib/api/Cargo.toml b/crates/qdrant/lib/api/Cargo.toml
deleted file mode 100644
index c99571f..0000000
--- a/crates/qdrant/lib/api/Cargo.toml
+++ /dev/null
@@ -1,36 +0,0 @@
-[package]
-name = "api"
-version = "1.4.1"
-authors = [
-    "Andrey Vasnetsov <andrey@vasnetsov.com>",
-    "Qdrant Team <info@qdrant.tech>",
-]
-license = "Apache-2.0"
-edition = "2021"
-
-[dependencies]
-log = "0.4"
-env_logger = "0.10.0"
-tonic = { version = "0.9.2", features = ["gzip", "tls"] }
-prost = "0.11.9"
-prost-types = "0.11.9"
-serde = { version = "~1.0", features = ["derive"] }
-serde_json = "~1.0"
-schemars = { version = "0.8.12", features = ["uuid1", "preserve_order", "chrono"] }
-uuid = { version = "1.4", features = ["v4", "serde"] }
-tower = "0.4.13"
-tokio = "1.29.1"
-rand = "0.8.5"
-chrono = { version = "~0.4", features = ["serde"] }
-thiserror = "1.0"
-parking_lot = "0.12"
-validator = { version = "0.16", features = ["derive"] }
-
-segment = {path = "../segment"}
-
-[build-dependencies]
-tonic-build = { version = "0.9.2", features = ["prost"] }
-prost-build = { version = "0.11.8", features = ["cleanup-markdown"] }
-
-[dev-dependencies]
-tokio = { version = "~1.29", features = ["full"] }
diff --git a/crates/qdrant/lib/api/build.rs b/crates/qdrant/lib/api/build.rs
deleted file mode 100644
index cce29f6..0000000
--- a/crates/qdrant/lib/api/build.rs
+++ /dev/null
@@ -1,237 +0,0 @@
-use tonic_build::Builder;
-
-fn main() -> std::io::Result<()> {
-    // Build gRPC bits from proto file
-    tonic_build::configure()
-        // Because we want to attach all validation rules to the generated gRPC types, we must do
-        // so by extending the builder. This is ugly, but better than manually implementing
-        // `Validation` for all these types and seems to be the best approach. The line below
-        // configures all attributes.
-        .extern_path(".google.protobuf.Empty", "()")
-        .compile_well_known_types(true)
-        .configure_validation()
-        .out_dir("src/grpc/") // saves generated structures at this location
-        .compile(
-            &["src/grpc/proto/qdrant.proto"], // proto entry point
-            &["src/grpc/proto"], // specify the root location to search proto dependencies
-        )?;
-
-    // Append trait extension imports to generated gRPC output
-    append_to_file("src/grpc/qdrant.rs", "use super::validate::ValidateExt;");
-
-    Ok(())
-}
-
-/// Extension to [`Builder`] to configure validation attributes.
-trait BuilderExt {
-    fn configure_validation(self) -> Self;
-    fn validates(self, fields: &[(&str, &str)], extra_derives: &[&str]) -> Self;
-    fn derive_validate(self, path: &str) -> Self;
-    fn derive_validates(self, paths: &[&str]) -> Self;
-    fn field_validate(self, path: &str, constraint: &str) -> Self;
-    fn field_validates(self, paths: &[(&str, &str)]) -> Self;
-}
-
-impl BuilderExt for Builder {
-    fn configure_validation(self) -> Self {
-        configure_validation(self)
-    }
-
-    fn validates(self, fields: &[(&str, &str)], extra_derives: &[&str]) -> Self {
-        // Build list of structs to derive validation on, guess these from list of fields
-        let mut derives = fields
-            .iter()
-            .map(|(field, _)| field.split_once('.').unwrap().0)
-            .collect::<Vec<&str>>();
-        derives.extend(extra_derives);
-        derives.sort_unstable();
-        derives.dedup();
-
-        self.derive_validates(&derives).field_validates(fields)
-    }
-
-    fn derive_validate(self, path: &str) -> Self {
-        self.type_attribute(path, "#[derive(validator::Validate)]")
-    }
-
-    fn derive_validates(self, paths: &[&str]) -> Self {
-        paths.iter().fold(self, |c, path| c.derive_validate(path))
-    }
-
-    fn field_validate(self, path: &str, constraint: &str) -> Self {
-        if constraint.is_empty() {
-            self.field_attribute(path, "#[validate]")
-        } else {
-            self.field_attribute(path, format!("#[validate({constraint})]"))
-        }
-    }
-
-    fn field_validates(self, fields: &[(&str, &str)]) -> Self {
-        fields.iter().fold(self, |c, (path, constraint)| {
-            c.field_validate(path, constraint)
-        })
-    }
-}
-
-/// Configure additional attributes required for validation on generated gRPC types.
-///
-/// These are grouped by service file.
-#[rustfmt::skip]
-fn configure_validation(builder: Builder) -> Builder {
-    builder
-        // Service: collections.proto
-        .validates(&[
-            ("GetCollectionInfoRequest.collection_name", "length(min = 1, max = 255)"),
-            ("CreateCollection.collection_name", "length(min = 1, max = 255), custom = \"crate::grpc::validate::validate_collection_name\""),
-            ("CreateCollection.hnsw_config", ""),
-            ("CreateCollection.wal_config", ""),
-            ("CreateCollection.optimizers_config", ""),
-            ("CreateCollection.vectors_config", ""),
-            ("CreateCollection.quantization_config", ""),
-            ("UpdateCollection.collection_name", "length(min = 1, max = 255)"),
-            ("UpdateCollection.optimizers_config", ""),
-            ("UpdateCollection.params", ""),
-            ("UpdateCollection.timeout", "custom = \"crate::grpc::validate::validate_u64_range_min_1\""),
-            ("UpdateCollection.hnsw_config", ""),
-            ("UpdateCollection.vectors_config", ""),
-            ("UpdateCollection.quantization_config", ""),
-            ("DeleteCollection.collection_name", "length(min = 1, max = 255)"),
-            ("DeleteCollection.timeout", "custom = \"crate::grpc::validate::validate_u64_range_min_1\""),
-            ("CollectionConfig.params", ""),
-            ("CollectionConfig.hnsw_config", ""),
-            ("CollectionConfig.optimizers_config", ""),
-            ("CollectionConfig.quantization_config", ""),
-            ("CollectionParams.vectors_config", ""),
-            ("ChangeAliases.timeout", "custom = \"crate::grpc::validate::validate_u64_range_min_1\""),
-            ("ListCollectionAliasesRequest.collection_name", "length(min = 1, max = 255)"),
-            ("HnswConfigDiff.ef_construct", "custom = \"crate::grpc::validate::validate_u64_range_min_4\""),
-            ("WalConfigDiff.wal_capacity_mb", "custom = \"crate::grpc::validate::validate_u64_range_min_1\""),
-            ("OptimizersConfigDiff.deleted_threshold", "custom = \"crate::grpc::validate::validate_f64_range_1\""),
-            ("OptimizersConfigDiff.vacuum_min_vector_number", "custom = \"crate::grpc::validate::validate_u64_range_min_100\""),
-            ("VectorsConfig.config", ""),
-            ("VectorsConfigDiff.config", ""),
-            ("VectorParams.size", "range(min = 1)"),
-            ("VectorParams.hnsw_config", ""),
-            ("VectorParams.quantization_config", ""),
-            ("VectorParamsMap.map", ""),
-            ("VectorParamsDiff.hnsw_config", ""),
-            ("VectorParamsDiff.quantization_config", ""),
-            ("VectorParamsDiffMap.map", ""),
-            ("QuantizationConfig.quantization", ""),
-            ("QuantizationConfigDiff.quantization", ""),
-            ("ScalarQuantization.quantile", "custom = \"crate::grpc::validate::validate_f32_range_min_0_5_max_1\""),
-        ], &[
-            "ListCollectionsRequest",
-            "CollectionParamsDiff",
-            "ListAliasesRequest",
-            "CollectionClusterInfoRequest",
-            "UpdateCollectionClusterSetupRequest",
-            "ProductQuantization",
-            "Disabled",
-            "QuantizationConfigDiff",
-            "quantization_config_diff::Quantization"
-        ])
-        // Service: collections_internal.proto
-        .validates(&[
-            ("GetCollectionInfoRequestInternal.get_collection_info_request", ""),
-            ("InitiateShardTransferRequest.collection_name", "length(min = 1, max = 255)"),
-        ], &[])
-        // Service: points.proto
-        .validates(&[
-            ("UpsertPoints.collection_name", "length(min = 1, max = 255)"),
-            ("DeletePoints.collection_name", "length(min = 1, max = 255)"),
-            ("UpdatePointVectors.collection_name", "length(min = 1, max = 255)"),
-            ("UpdatePointVectors.vectors", "custom(function = \"crate::grpc::validate::validate_named_vectors_not_empty\", message = \"must specify vectors to update\")"),
-            ("DeletePointVectors.collection_name", "length(min = 1, max = 255)"),
-            ("DeletePointVectors.vector_names", "length(min = 1, message = \"must specify vector names to delete\")"),
-            ("GetPoints.collection_name", "length(min = 1, max = 255)"),
-            ("SetPayloadPoints.collection_name", "length(min = 1, max = 255)"),
-            ("DeletePayloadPoints.collection_name", "length(min = 1, max = 255)"),
-            ("ClearPayloadPoints.collection_name", "length(min = 1, max = 255)"),
-            ("UpdateBatchPoints.collection_name", "length(min = 1, max = 255)"),
-            ("UpdateBatchPoints.operations", "length(min = 1)"),
-            ("CreateFieldIndexCollection.collection_name", "length(min = 1, max = 255)"),
-            ("CreateFieldIndexCollection.field_name", "length(min = 1)"),
-            ("DeleteFieldIndexCollection.collection_name", "length(min = 1, max = 255)"),
-            ("DeleteFieldIndexCollection.field_name", "length(min = 1)"),
-            ("SearchPoints.collection_name", "length(min = 1, max = 255)"),
-            ("SearchPoints.limit", "range(min = 1)"),
-            ("SearchPoints.params", ""),
-            ("SearchPoints.vector_name", "custom = \"crate::grpc::validate::validate_not_empty\""),
-            ("SearchBatchPoints.collection_name", "length(min = 1, max = 255)"),
-            ("SearchBatchPoints.search_points", ""),
-            ("SearchPointGroups.collection_name", "length(min = 1, max = 255)"),
-            ("SearchPointGroups.group_by", "length(min = 1)"),
-            ("SearchPointGroups.params", ""),
-            ("SearchPointGroups.vector_name", "custom = \"crate::grpc::validate::validate_not_empty\""),
-            ("SearchPointGroups.group_size", "range(min = 1)"),
-            ("SearchPointGroups.limit", "range(min = 1)"),
-            ("SearchParams.quantization", ""),
-            ("QuantizationSearchParams.oversampling", "custom = \"crate::grpc::validate::validate_f64_range_min_1\""),
-            ("ScrollPoints.collection_name", "length(min = 1, max = 255)"),
-            ("ScrollPoints.limit", "custom = \"crate::grpc::validate::validate_u32_range_min_1\""),
-            ("RecommendPoints.collection_name", "length(min = 1, max = 255)"),
-            ("RecommendPoints.params", ""),
-            ("RecommendBatchPoints.collection_name", "length(min = 1, max = 255)"),
-            ("RecommendBatchPoints.recommend_points", ""),
-            ("RecommendPointGroups.collection_name", "length(min = 1, max = 255)"),
-            ("RecommendPointGroups.group_by", "length(min = 1)"),
-            ("RecommendPointGroups.group_size", "range(min = 1)"),
-            ("RecommendPointGroups.limit", "range(min = 1)"),
-            ("RecommendPointGroups.params", ""),
-            ("CountPoints.collection_name", "length(min = 1, max = 255)"),
-            ("GeoPolygon.points", "custom = \"crate::grpc::validate::validate_geo_polygon\""),
-        ], &[])
-        .type_attribute(".", "#[derive(serde::Serialize)]")
-        // Service: points_internal_service.proto
-        .validates(&[
-            ("UpsertPointsInternal.upsert_points", ""),
-            ("DeletePointsInternal.delete_points", ""),
-            ("UpdateVectorsInternal.update_vectors", ""),
-            ("DeleteVectorsInternal.delete_vectors", ""),
-            ("SetPayloadPointsInternal.set_payload_points", ""),
-            ("DeletePayloadPointsInternal.delete_payload_points", ""),
-            ("ClearPayloadPointsInternal.clear_payload_points", ""),
-            ("CreateFieldIndexCollectionInternal.create_field_index_collection", ""),
-            ("DeleteFieldIndexCollectionInternal.delete_field_index_collection", ""),
-            ("SearchPointsInternal.search_points", ""),
-            ("SearchBatchPointsInternal.collection_name", "length(min = 1, max = 255)"),
-            ("SearchBatchPointsInternal.search_points", ""),
-            ("RecommendPointsInternal.recommend_points", ""),
-            ("ScrollPointsInternal.scroll_points", ""),
-            ("GetPointsInternal.get_points", ""),
-            ("CountPointsInternal.count_points", ""),
-            ("SyncPointsInternal.sync_points", ""),
-            ("SyncPoints.collection_name", "length(min = 1, max = 255)"),
-        ], &[])
-        // Service: raft_service.proto
-        .validates(&[
-            ("AddPeerToKnownMessage.uri", "custom = \"crate::grpc::validate::validate_not_empty\""),
-            ("AddPeerToKnownMessage.port", "custom = \"crate::grpc::validate::validate_u32_range_min_1\""),
-        ], &[])
-        // Service: snapshot_service.proto
-        .validates(&[
-            ("CreateSnapshotRequest.collection_name", "length(min = 1, max = 255)"),
-            ("ListSnapshotsRequest.collection_name", "length(min = 1, max = 255)"),
-            ("DeleteSnapshotRequest.collection_name", "length(min = 1, max = 255)"),
-            ("DeleteSnapshotRequest.snapshot_name", "length(min = 1)"),
-            ("DeleteFullSnapshotRequest.snapshot_name", "length(min = 1)"),
-        ], &[
-            "CreateFullSnapshotRequest",
-            "ListFullSnapshotsRequest",
-        ])
-}
-
-fn append_to_file(path: &str, line: &str) {
-    use std::fs::OpenOptions;
-    use std::io::prelude::*;
-    writeln!(
-        OpenOptions::new()
-            .write(true)
-            .append(true)
-            .open(path)
-            .unwrap(),
-        "{line}",
-    )
-    .unwrap()
-}
diff --git a/crates/qdrant/lib/api/src/grpc/conversions.rs b/crates/qdrant/lib/api/src/grpc/conversions.rs
deleted file mode 100644
index 535fe6d..0000000
--- a/crates/qdrant/lib/api/src/grpc/conversions.rs
+++ /dev/null
@@ -1,1100 +0,0 @@
-use std::collections::{HashMap, HashSet};
-use std::time::Instant;
-
-use chrono::{NaiveDateTime, Timelike};
-use segment::data_types::text_index::TextIndexType;
-use segment::data_types::vectors::VectorElementType;
-use segment::types::{default_quantization_ignore_value, default_quantization_rescore_value};
-use tonic::Status;
-use uuid::Uuid;
-
-use super::protobuf;
-use super::qdrant::{CompressionRatio, GroupId};
-use crate::grpc::models::{CollectionsResponse, VersionInfo};
-use crate::grpc::qdrant::condition::ConditionOneOf;
-use crate::grpc::qdrant::payload_index_params::IndexParams;
-use crate::grpc::qdrant::point_id::PointIdOptions;
-use crate::grpc::qdrant::r#match::MatchValue;
-use crate::grpc::qdrant::value::Kind;
-use crate::grpc::qdrant::vectors::VectorsOptions;
-use crate::grpc::qdrant::with_payload_selector::SelectorOptions;
-use crate::grpc::qdrant::{
-    with_vectors_selector, CollectionDescription, CollectionOperationResponse, Condition, Distance,
-    FieldCondition, Filter, GeoBoundingBox, GeoPoint, GeoPolygon, GeoRadius, HasIdCondition,
-    HealthCheckReply, HnswConfigDiff, IsEmptyCondition, IsNullCondition, ListCollectionsResponse,
-    ListValue, Match, NamedVectors, NestedCondition, PayloadExcludeSelector,
-    PayloadIncludeSelector, PayloadIndexParams, PayloadSchemaInfo, PayloadSchemaType, PointId,
-    ProductQuantization, QuantizationConfig, QuantizationSearchParams, QuantizationType, Range,
-    RepeatedIntegers, RepeatedStrings, ScalarQuantization, ScoredPoint, SearchParams, Struct,
-    TextIndexParams, TokenizerType, Value, ValuesCount, Vector, Vectors, VectorsSelector,
-    WithPayloadSelector, WithVectorsSelector,
-};
-
-pub fn payload_to_proto(payload: segment::types::Payload) -> HashMap<String, Value> {
-    payload
-        .into_iter()
-        .map(|(k, v)| (k, json_to_proto(v)))
-        .collect()
-}
-
-fn json_to_proto(json_value: serde_json::Value) -> Value {
-    match json_value {
-        serde_json::Value::Null => Value {
-            kind: Some(Kind::NullValue(0)),
-        },
-        serde_json::Value::Bool(v) => Value {
-            kind: Some(Kind::BoolValue(v)),
-        },
-        serde_json::Value::Number(n) => Value {
-            kind: if let Some(int) = n.as_i64() {
-                Some(Kind::IntegerValue(int))
-            } else {
-                Some(Kind::DoubleValue(n.as_f64().unwrap()))
-            },
-        },
-        serde_json::Value::String(s) => Value {
-            kind: Some(Kind::StringValue(s)),
-        },
-        serde_json::Value::Array(v) => {
-            let list = v.into_iter().map(json_to_proto).collect();
-            Value {
-                kind: Some(Kind::ListValue(ListValue { values: list })),
-            }
-        }
-        serde_json::Value::Object(m) => {
-            let map = m.into_iter().map(|(k, v)| (k, json_to_proto(v))).collect();
-            Value {
-                kind: Some(Kind::StructValue(Struct { fields: map })),
-            }
-        }
-    }
-}
-
-pub fn proto_to_payloads(proto: HashMap<String, Value>) -> Result<segment::types::Payload, Status> {
-    let mut map: serde_json::Map<String, serde_json::Value> = serde_json::Map::new();
-    for (k, v) in proto.into_iter() {
-        map.insert(k, proto_to_json(v)?);
-    }
-    Ok(map.into())
-}
-
-fn proto_to_json(proto: Value) -> Result<serde_json::Value, Status> {
-    match proto.kind {
-        None => Ok(serde_json::Value::default()),
-        Some(kind) => match kind {
-            Kind::NullValue(_) => Ok(serde_json::Value::Null),
-            Kind::DoubleValue(n) => {
-                let v = match serde_json::Number::from_f64(n) {
-                    Some(f) => f,
-                    None => return Err(Status::invalid_argument("cannot convert to json number")),
-                };
-                Ok(serde_json::Value::Number(v))
-            }
-            Kind::IntegerValue(i) => Ok(serde_json::Value::Number(i.into())),
-            Kind::StringValue(s) => Ok(serde_json::Value::String(s)),
-            Kind::BoolValue(b) => Ok(serde_json::Value::Bool(b)),
-            Kind::StructValue(s) => {
-                let mut map = serde_json::Map::new();
-                for (k, v) in s.fields.into_iter() {
-                    map.insert(k, proto_to_json(v)?);
-                }
-                Ok(serde_json::Value::Object(map))
-            }
-            Kind::ListValue(l) => {
-                let mut list = Vec::new();
-                for v in l.values.into_iter() {
-                    list.push(proto_to_json(v)?);
-                }
-                Ok(serde_json::Value::Array(list))
-            }
-        },
-    }
-}
-
-impl From<VersionInfo> for HealthCheckReply {
-    fn from(info: VersionInfo) -> Self {
-        HealthCheckReply {
-            title: info.title,
-            version: info.version,
-        }
-    }
-}
-
-impl From<(Instant, CollectionsResponse)> for ListCollectionsResponse {
-    fn from(value: (Instant, CollectionsResponse)) -> Self {
-        let (timing, response) = value;
-        let collections = response
-            .collections
-            .into_iter()
-            .map(|desc| CollectionDescription { name: desc.name })
-            .collect::<Vec<_>>();
-        Self {
-            collections,
-            time: timing.elapsed().as_secs_f64(),
-        }
-    }
-}
-
-impl From<segment::data_types::text_index::TokenizerType> for TokenizerType {
-    fn from(tokenizer_type: segment::data_types::text_index::TokenizerType) -> Self {
-        match tokenizer_type {
-            segment::data_types::text_index::TokenizerType::Prefix => TokenizerType::Prefix,
-            segment::data_types::text_index::TokenizerType::Whitespace => TokenizerType::Whitespace,
-            segment::data_types::text_index::TokenizerType::Multilingual => {
-                TokenizerType::Multilingual
-            }
-            segment::data_types::text_index::TokenizerType::Word => TokenizerType::Word,
-        }
-    }
-}
-
-impl From<segment::data_types::text_index::TextIndexParams> for PayloadIndexParams {
-    fn from(params: segment::data_types::text_index::TextIndexParams) -> Self {
-        let tokenizer = TokenizerType::from(params.tokenizer);
-        PayloadIndexParams {
-            index_params: Some(IndexParams::TextIndexParams(TextIndexParams {
-                tokenizer: tokenizer as i32,
-                lowercase: params.lowercase,
-                min_token_len: params.min_token_len.map(|x| x as u64),
-                max_token_len: params.max_token_len.map(|x| x as u64),
-            })),
-        }
-    }
-}
-
-impl From<segment::types::PayloadIndexInfo> for PayloadSchemaInfo {
-    fn from(schema: segment::types::PayloadIndexInfo) -> Self {
-        PayloadSchemaInfo {
-            data_type: match schema.data_type {
-                segment::types::PayloadSchemaType::Keyword => PayloadSchemaType::Keyword,
-                segment::types::PayloadSchemaType::Integer => PayloadSchemaType::Integer,
-                segment::types::PayloadSchemaType::Float => PayloadSchemaType::Float,
-                segment::types::PayloadSchemaType::Geo => PayloadSchemaType::Geo,
-                segment::types::PayloadSchemaType::Text => PayloadSchemaType::Text,
-                segment::types::PayloadSchemaType::Bool => PayloadSchemaType::Bool,
-            }
-            .into(),
-            params: schema.params.map(|params| match params {
-                segment::types::PayloadSchemaParams::Text(text_index_params) => {
-                    text_index_params.into()
-                }
-            }),
-            points: Some(schema.points as u64),
-        }
-    }
-}
-
-impl TryFrom<TokenizerType> for segment::data_types::text_index::TokenizerType {
-    type Error = Status;
-    fn try_from(tokenizer_type: TokenizerType) -> Result<Self, Self::Error> {
-        match tokenizer_type {
-            TokenizerType::Unknown => Err(Status::invalid_argument("unknown tokenizer type")),
-            TokenizerType::Prefix => Ok(segment::data_types::text_index::TokenizerType::Prefix),
-            TokenizerType::Multilingual => {
-                Ok(segment::data_types::text_index::TokenizerType::Multilingual)
-            }
-            TokenizerType::Whitespace => {
-                Ok(segment::data_types::text_index::TokenizerType::Whitespace)
-            }
-            TokenizerType::Word => Ok(segment::data_types::text_index::TokenizerType::Word),
-        }
-    }
-}
-
-impl TryFrom<TextIndexParams> for segment::data_types::text_index::TextIndexParams {
-    type Error = Status;
-    fn try_from(params: TextIndexParams) -> Result<Self, Self::Error> {
-        Ok(segment::data_types::text_index::TextIndexParams {
-            r#type: TextIndexType::Text,
-            tokenizer: TokenizerType::from_i32(params.tokenizer)
-                .map(|x| x.try_into())
-                .unwrap_or_else(|| Err(Status::invalid_argument("unknown tokenizer type")))?,
-            lowercase: params.lowercase,
-            min_token_len: params.min_token_len.map(|x| x as usize),
-            max_token_len: params.max_token_len.map(|x| x as usize),
-        })
-    }
-}
-
-impl TryFrom<PayloadIndexParams> for segment::data_types::text_index::TextIndexParams {
-    type Error = Status;
-    fn try_from(params: PayloadIndexParams) -> Result<Self, Self::Error> {
-        match params.index_params {
-            None => Ok(Default::default()),
-            Some(IndexParams::TextIndexParams(text_index_params)) => {
-                Ok(text_index_params.try_into()?)
-            }
-        }
-    }
-}
-
-impl TryFrom<IndexParams> for segment::types::PayloadSchemaParams {
-    type Error = Status;
-
-    fn try_from(value: IndexParams) -> Result<Self, Self::Error> {
-        match value {
-            IndexParams::TextIndexParams(text_index_params) => Ok(
-                segment::types::PayloadSchemaParams::Text(text_index_params.try_into()?),
-            ),
-        }
-    }
-}
-
-impl TryFrom<PayloadSchemaInfo> for segment::types::PayloadIndexInfo {
-    type Error = Status;
-
-    fn try_from(schema: PayloadSchemaInfo) -> Result<Self, Self::Error> {
-        let data_type = match PayloadSchemaType::from_i32(schema.data_type) {
-            None => {
-                return Err(Status::invalid_argument(
-                    "Malformed payload schema".to_string(),
-                ))
-            }
-            Some(data_type) => match data_type {
-                PayloadSchemaType::Keyword => segment::types::PayloadSchemaType::Keyword,
-                PayloadSchemaType::Integer => segment::types::PayloadSchemaType::Integer,
-                PayloadSchemaType::Float => segment::types::PayloadSchemaType::Float,
-                PayloadSchemaType::Geo => segment::types::PayloadSchemaType::Geo,
-                PayloadSchemaType::Text => segment::types::PayloadSchemaType::Text,
-                PayloadSchemaType::Bool => segment::types::PayloadSchemaType::Bool,
-                PayloadSchemaType::UnknownType => {
-                    return Err(Status::invalid_argument(
-                        "Malformed payload schema".to_string(),
-                    ))
-                }
-            },
-        };
-        let params = match schema.params {
-            None => None,
-            Some(PayloadIndexParams { index_params: None }) => None,
-            Some(PayloadIndexParams {
-                index_params: Some(index_params),
-            }) => Some(index_params.try_into()?),
-        };
-
-        Ok(segment::types::PayloadIndexInfo {
-            data_type,
-            params,
-            points: schema.points.unwrap_or(0) as usize,
-        })
-    }
-}
-
-impl From<(Instant, bool)> for CollectionOperationResponse {
-    fn from(value: (Instant, bool)) -> Self {
-        let (timing, result) = value;
-        CollectionOperationResponse {
-            result,
-            time: timing.elapsed().as_secs_f64(),
-        }
-    }
-}
-
-impl From<segment::types::GeoPoint> for GeoPoint {
-    fn from(geo: segment::types::GeoPoint) -> Self {
-        Self {
-            lon: geo.lon,
-            lat: geo.lat,
-        }
-    }
-}
-
-impl TryFrom<WithPayloadSelector> for segment::types::WithPayloadInterface {
-    type Error = Status;
-
-    fn try_from(value: WithPayloadSelector) -> Result<Self, Self::Error> {
-        match value.selector_options {
-            Some(options) => Ok(match options {
-                SelectorOptions::Enable(flag) => segment::types::WithPayloadInterface::Bool(flag),
-                SelectorOptions::Exclude(s) => {
-                    segment::types::PayloadSelectorExclude::new(s.fields).into()
-                }
-                SelectorOptions::Include(s) => {
-                    segment::types::PayloadSelectorInclude::new(s.fields).into()
-                }
-            }),
-            _ => Err(Status::invalid_argument("No PayloadSelector".to_string())),
-        }
-    }
-}
-
-impl From<segment::types::WithPayloadInterface> for WithPayloadSelector {
-    fn from(value: segment::types::WithPayloadInterface) -> Self {
-        let selector_options = match value {
-            segment::types::WithPayloadInterface::Bool(flag) => SelectorOptions::Enable(flag),
-            segment::types::WithPayloadInterface::Fields(fields) => {
-                SelectorOptions::Include(PayloadIncludeSelector { fields })
-            }
-            segment::types::WithPayloadInterface::Selector(selector) => match selector {
-                segment::types::PayloadSelector::Include(s) => {
-                    SelectorOptions::Include(PayloadIncludeSelector { fields: s.include })
-                }
-                segment::types::PayloadSelector::Exclude(s) => {
-                    SelectorOptions::Exclude(PayloadExcludeSelector { fields: s.exclude })
-                }
-            },
-        };
-        WithPayloadSelector {
-            selector_options: Some(selector_options),
-        }
-    }
-}
-
-impl From<QuantizationSearchParams> for segment::types::QuantizationSearchParams {
-    fn from(params: QuantizationSearchParams) -> Self {
-        Self {
-            ignore: params.ignore.unwrap_or(default_quantization_ignore_value()),
-            rescore: params
-                .rescore
-                .unwrap_or(default_quantization_rescore_value()),
-            oversampling: params.oversampling,
-        }
-    }
-}
-
-impl From<segment::types::QuantizationSearchParams> for QuantizationSearchParams {
-    fn from(params: segment::types::QuantizationSearchParams) -> Self {
-        Self {
-            ignore: Some(params.ignore),
-            rescore: Some(params.rescore),
-            oversampling: params.oversampling,
-        }
-    }
-}
-
-impl From<SearchParams> for segment::types::SearchParams {
-    fn from(params: SearchParams) -> Self {
-        Self {
-            hnsw_ef: params.hnsw_ef.map(|x| x as usize),
-            exact: params.exact.unwrap_or(false),
-            quantization: params.quantization.map(|q| q.into()),
-        }
-    }
-}
-
-impl From<segment::types::SearchParams> for SearchParams {
-    fn from(params: segment::types::SearchParams) -> Self {
-        Self {
-            hnsw_ef: params.hnsw_ef.map(|x| x as u64),
-            exact: Some(params.exact),
-            quantization: params.quantization.map(|q| q.into()),
-        }
-    }
-}
-
-impl From<segment::types::PointIdType> for PointId {
-    fn from(point_id: segment::types::PointIdType) -> Self {
-        PointId {
-            point_id_options: Some(match point_id {
-                segment::types::PointIdType::NumId(num) => PointIdOptions::Num(num),
-                segment::types::PointIdType::Uuid(uuid) => PointIdOptions::Uuid(uuid.to_string()),
-            }),
-        }
-    }
-}
-
-impl From<segment::data_types::vectors::VectorType> for Vector {
-    fn from(vector: segment::data_types::vectors::VectorType) -> Self {
-        Self { data: vector }
-    }
-}
-
-impl From<HashMap<String, Vec<VectorElementType>>> for NamedVectors {
-    fn from(vectors: HashMap<String, Vec<VectorElementType>>) -> Self {
-        Self {
-            vectors: vectors
-                .into_iter()
-                .map(|(name, vector)| (name, vector.into()))
-                .collect(),
-        }
-    }
-}
-
-impl From<segment::data_types::vectors::VectorStruct> for Vectors {
-    fn from(vector_struct: segment::data_types::vectors::VectorStruct) -> Self {
-        match vector_struct {
-            segment::data_types::vectors::VectorStruct::Single(vector) => Self {
-                vectors_options: Some(VectorsOptions::Vector(vector.into())),
-            },
-            segment::data_types::vectors::VectorStruct::Multi(vectors) => Self {
-                vectors_options: Some(VectorsOptions::Vectors(vectors.into())),
-            },
-        }
-    }
-}
-
-impl From<segment::types::ScoredPoint> for ScoredPoint {
-    fn from(point: segment::types::ScoredPoint) -> Self {
-        Self {
-            id: Some(point.id.into()),
-            payload: point.payload.map(payload_to_proto).unwrap_or_default(),
-            score: point.score,
-            version: point.version,
-            vectors: point.vector.map(|v| v.into()),
-        }
-    }
-}
-
-impl From<segment::data_types::groups::GroupId> for GroupId {
-    fn from(key: segment::data_types::groups::GroupId) -> Self {
-        match key {
-            segment::data_types::groups::GroupId::String(str) => Self {
-                kind: Some(crate::grpc::qdrant::group_id::Kind::StringValue(str)),
-            },
-            segment::data_types::groups::GroupId::NumberU64(n) => Self {
-                kind: Some(crate::grpc::qdrant::group_id::Kind::UnsignedValue(n)),
-            },
-            segment::data_types::groups::GroupId::NumberI64(n) => Self {
-                kind: Some(crate::grpc::qdrant::group_id::Kind::IntegerValue(n)),
-            },
-        }
-    }
-}
-
-impl From<NamedVectors> for HashMap<String, Vec<VectorElementType>> {
-    fn from(vectors: NamedVectors) -> Self {
-        vectors
-            .vectors
-            .into_iter()
-            .map(|(name, vector)| (name, vector.data))
-            .collect()
-    }
-}
-
-impl TryFrom<Vectors> for segment::data_types::vectors::VectorStruct {
-    type Error = Status;
-
-    fn try_from(vectors: Vectors) -> Result<Self, Self::Error> {
-        match vectors.vectors_options {
-            Some(vectors_options) => Ok(match vectors_options {
-                VectorsOptions::Vector(vector) => {
-                    segment::data_types::vectors::VectorStruct::Single(vector.data)
-                }
-                VectorsOptions::Vectors(vectors) => {
-                    segment::data_types::vectors::VectorStruct::Multi(vectors.into())
-                }
-            }),
-            None => Err(Status::invalid_argument("No Provided")),
-        }
-    }
-}
-
-impl From<segment::types::WithVector> for WithVectorsSelector {
-    fn from(with_vectors: segment::types::WithVector) -> Self {
-        let selector_options = match with_vectors {
-            segment::types::WithVector::Bool(enabled) => {
-                with_vectors_selector::SelectorOptions::Enable(enabled)
-            }
-            segment::types::WithVector::Selector(include) => {
-                with_vectors_selector::SelectorOptions::Include(VectorsSelector { names: include })
-            }
-        };
-        Self {
-            selector_options: Some(selector_options),
-        }
-    }
-}
-
-impl From<WithVectorsSelector> for segment::types::WithVector {
-    fn from(with_vectors_selector: WithVectorsSelector) -> Self {
-        match with_vectors_selector.selector_options {
-            None => Self::default(),
-            Some(with_vectors_selector::SelectorOptions::Enable(enabled)) => Self::Bool(enabled),
-            Some(with_vectors_selector::SelectorOptions::Include(include)) => {
-                Self::Selector(include.names)
-            }
-        }
-    }
-}
-
-impl TryFrom<PointId> for segment::types::PointIdType {
-    type Error = Status;
-
-    fn try_from(value: PointId) -> Result<Self, Self::Error> {
-        match value.point_id_options {
-            Some(PointIdOptions::Num(num_id)) => Ok(segment::types::PointIdType::NumId(num_id)),
-            Some(PointIdOptions::Uuid(uui_str)) => Uuid::parse_str(&uui_str)
-                .map(segment::types::PointIdType::Uuid)
-                .map_err(|_err| {
-                    Status::invalid_argument(format!("Unable to parse UUID: {uui_str}"))
-                }),
-            _ => Err(Status::invalid_argument(
-                "No ID options provided".to_string(),
-            )),
-        }
-    }
-}
-
-impl From<segment::types::ScalarQuantization> for ScalarQuantization {
-    fn from(value: segment::types::ScalarQuantization) -> Self {
-        let config = value.scalar;
-        ScalarQuantization {
-            r#type: match config.r#type {
-                segment::types::ScalarType::Int8 => {
-                    crate::grpc::qdrant::QuantizationType::Int8 as i32
-                }
-            },
-            quantile: config.quantile,
-            always_ram: config.always_ram,
-        }
-    }
-}
-
-impl TryFrom<ScalarQuantization> for segment::types::ScalarQuantization {
-    type Error = Status;
-
-    fn try_from(value: ScalarQuantization) -> Result<Self, Self::Error> {
-        Ok(segment::types::ScalarQuantization {
-            scalar: segment::types::ScalarQuantizationConfig {
-                r#type: match QuantizationType::from_i32(value.r#type) {
-                    Some(QuantizationType::Int8) => segment::types::ScalarType::Int8,
-                    Some(QuantizationType::UnknownQuantization) | None => {
-                        return Err(Status::invalid_argument("Unknown quantization type"))
-                    }
-                },
-                quantile: value.quantile,
-                always_ram: value.always_ram,
-            },
-        })
-    }
-}
-
-impl From<segment::types::ProductQuantization> for ProductQuantization {
-    fn from(value: segment::types::ProductQuantization) -> Self {
-        let config = value.product;
-        ProductQuantization {
-            compression: match config.compression {
-                segment::types::CompressionRatio::X4 => CompressionRatio::X4 as i32,
-                segment::types::CompressionRatio::X8 => CompressionRatio::X8 as i32,
-                segment::types::CompressionRatio::X16 => CompressionRatio::X16 as i32,
-                segment::types::CompressionRatio::X32 => CompressionRatio::X32 as i32,
-                segment::types::CompressionRatio::X64 => CompressionRatio::X64 as i32,
-            },
-            always_ram: config.always_ram,
-        }
-    }
-}
-
-impl TryFrom<ProductQuantization> for segment::types::ProductQuantization {
-    type Error = Status;
-
-    fn try_from(value: ProductQuantization) -> Result<Self, Self::Error> {
-        Ok(segment::types::ProductQuantization {
-            product: segment::types::ProductQuantizationConfig {
-                compression: match CompressionRatio::from_i32(value.compression) {
-                    None => {
-                        return Err(Status::invalid_argument(
-                            "Unknown compression ratio".to_string(),
-                        ))
-                    }
-                    Some(CompressionRatio::X4) => segment::types::CompressionRatio::X4,
-                    Some(CompressionRatio::X8) => segment::types::CompressionRatio::X8,
-                    Some(CompressionRatio::X16) => segment::types::CompressionRatio::X16,
-                    Some(CompressionRatio::X32) => segment::types::CompressionRatio::X32,
-                    Some(CompressionRatio::X64) => segment::types::CompressionRatio::X64,
-                },
-                always_ram: value.always_ram,
-            },
-        })
-    }
-}
-
-impl From<segment::types::QuantizationConfig> for QuantizationConfig {
-    fn from(value: segment::types::QuantizationConfig) -> Self {
-        match value {
-            segment::types::QuantizationConfig::Scalar(scalar) => Self {
-                quantization: Some(super::qdrant::quantization_config::Quantization::Scalar(
-                    scalar.into(),
-                )),
-            },
-            segment::types::QuantizationConfig::Product(product) => Self {
-                quantization: Some(super::qdrant::quantization_config::Quantization::Product(
-                    product.into(),
-                )),
-            },
-        }
-    }
-}
-
-impl TryFrom<QuantizationConfig> for segment::types::QuantizationConfig {
-    type Error = Status;
-
-    fn try_from(value: QuantizationConfig) -> Result<Self, Self::Error> {
-        let value = value
-            .quantization
-            .ok_or_else(|| Status::invalid_argument("Unable to convert quantization config"))?;
-        match value {
-            super::qdrant::quantization_config::Quantization::Scalar(config) => Ok(
-                segment::types::QuantizationConfig::Scalar(config.try_into()?),
-            ),
-            super::qdrant::quantization_config::Quantization::Product(config) => Ok(
-                segment::types::QuantizationConfig::Product(config.try_into()?),
-            ),
-        }
-    }
-}
-
-fn conditions_helper_from_grpc(
-    conditions: Vec<Condition>,
-) -> Result<Option<Vec<segment::types::Condition>>, tonic::Status> {
-    if conditions.is_empty() {
-        Ok(None)
-    } else {
-        let vec = conditions
-            .into_iter()
-            .map(|c| c.try_into())
-            .collect::<Result<_, _>>()?;
-        Ok(Some(vec))
-    }
-}
-
-fn conditions_helper_to_grpc(conditions: Option<Vec<segment::types::Condition>>) -> Vec<Condition> {
-    match conditions {
-        None => vec![],
-        Some(conditions) => {
-            if conditions.is_empty() {
-                vec![]
-            } else {
-                conditions.into_iter().map(|c| c.into()).collect()
-            }
-        }
-    }
-}
-
-impl TryFrom<Filter> for segment::types::Filter {
-    type Error = Status;
-
-    fn try_from(value: Filter) -> Result<Self, Self::Error> {
-        Ok(Self {
-            should: conditions_helper_from_grpc(value.should)?,
-            must: conditions_helper_from_grpc(value.must)?,
-            must_not: conditions_helper_from_grpc(value.must_not)?,
-        })
-    }
-}
-
-impl From<segment::types::Filter> for Filter {
-    fn from(value: segment::types::Filter) -> Self {
-        Self {
-            should: conditions_helper_to_grpc(value.should),
-            must: conditions_helper_to_grpc(value.must),
-            must_not: conditions_helper_to_grpc(value.must_not),
-        }
-    }
-}
-
-impl TryFrom<Condition> for segment::types::Condition {
-    type Error = Status;
-
-    fn try_from(value: Condition) -> Result<Self, Self::Error> {
-        if let Some(condition) = value.condition_one_of {
-            return match condition {
-                ConditionOneOf::Field(field) => {
-                    Ok(segment::types::Condition::Field(field.try_into()?))
-                }
-                ConditionOneOf::HasId(has_id) => {
-                    Ok(segment::types::Condition::HasId(has_id.try_into()?))
-                }
-                ConditionOneOf::Filter(filter) => {
-                    Ok(segment::types::Condition::Filter(filter.try_into()?))
-                }
-                ConditionOneOf::IsEmpty(is_empty) => {
-                    Ok(segment::types::Condition::IsEmpty(is_empty.into()))
-                }
-                ConditionOneOf::IsNull(is_null) => {
-                    Ok(segment::types::Condition::IsNull(is_null.into()))
-                }
-                ConditionOneOf::Nested(nested) => Ok(segment::types::Condition::Nested(
-                    segment::types::NestedCondition::new(nested.try_into()?),
-                )),
-            };
-        }
-        Err(Status::invalid_argument("Malformed Condition type"))
-    }
-}
-
-impl From<segment::types::Condition> for Condition {
-    fn from(value: segment::types::Condition) -> Self {
-        let condition_one_of = match value {
-            segment::types::Condition::Field(field) => ConditionOneOf::Field(field.into()),
-            segment::types::Condition::IsEmpty(is_empty) => {
-                ConditionOneOf::IsEmpty(is_empty.into())
-            }
-            segment::types::Condition::IsNull(is_null) => ConditionOneOf::IsNull(is_null.into()),
-            segment::types::Condition::HasId(has_id) => ConditionOneOf::HasId(has_id.into()),
-            segment::types::Condition::Filter(filter) => ConditionOneOf::Filter(filter.into()),
-            segment::types::Condition::Nested(nested) => {
-                ConditionOneOf::Nested(nested.nested.into())
-            }
-        };
-
-        Self {
-            condition_one_of: Some(condition_one_of),
-        }
-    }
-}
-
-impl TryFrom<NestedCondition> for segment::types::Nested {
-    type Error = Status;
-
-    fn try_from(value: NestedCondition) -> Result<Self, Self::Error> {
-        match value.filter {
-            None => Err(Status::invalid_argument(
-                "Nested condition must have a filter",
-            )),
-            Some(filter) => Ok(Self {
-                key: value.key,
-                filter: filter.try_into()?,
-            }),
-        }
-    }
-}
-
-impl From<segment::types::Nested> for NestedCondition {
-    fn from(value: segment::types::Nested) -> Self {
-        Self {
-            key: value.key,
-            filter: Some(value.filter.into()),
-        }
-    }
-}
-
-impl From<IsEmptyCondition> for segment::types::IsEmptyCondition {
-    fn from(value: IsEmptyCondition) -> Self {
-        segment::types::IsEmptyCondition {
-            is_empty: segment::types::PayloadField { key: value.key },
-        }
-    }
-}
-
-impl From<segment::types::IsEmptyCondition> for IsEmptyCondition {
-    fn from(value: segment::types::IsEmptyCondition) -> Self {
-        Self {
-            key: value.is_empty.key,
-        }
-    }
-}
-
-impl From<IsNullCondition> for segment::types::IsNullCondition {
-    fn from(value: IsNullCondition) -> Self {
-        segment::types::IsNullCondition {
-            is_null: segment::types::PayloadField { key: value.key },
-        }
-    }
-}
-
-impl From<segment::types::IsNullCondition> for IsNullCondition {
-    fn from(value: segment::types::IsNullCondition) -> Self {
-        Self {
-            key: value.is_null.key,
-        }
-    }
-}
-
-impl TryFrom<HasIdCondition> for segment::types::HasIdCondition {
-    type Error = Status;
-
-    fn try_from(value: HasIdCondition) -> Result<Self, Self::Error> {
-        let set: HashSet<segment::types::PointIdType> = value
-            .has_id
-            .into_iter()
-            .map(|p| p.try_into())
-            .collect::<Result<_, _>>()?;
-        Ok(Self { has_id: set })
-    }
-}
-
-impl From<segment::types::HasIdCondition> for HasIdCondition {
-    fn from(value: segment::types::HasIdCondition) -> Self {
-        let set: Vec<PointId> = value.has_id.into_iter().map(|p| p.into()).collect();
-        Self { has_id: set }
-    }
-}
-
-impl TryFrom<FieldCondition> for segment::types::FieldCondition {
-    type Error = Status;
-
-    fn try_from(value: FieldCondition) -> Result<Self, Self::Error> {
-        let FieldCondition {
-            key,
-            r#match,
-            range,
-            geo_bounding_box,
-            geo_radius,
-            values_count,
-            // geo_polygon,
-        } = value;
-
-        let geo_bounding_box =
-            geo_bounding_box.map_or_else(|| Ok(None), |g| g.try_into().map(Some))?;
-        let geo_radius = geo_radius.map_or_else(|| Ok(None), |g| g.try_into().map(Some))?;
-        let geo_polygon = None; // geo_polygon.map_or_else(|| Ok(None), |g| g.try_into().map(Some))?;
-        Ok(Self {
-            key,
-            r#match: r#match.map_or_else(|| Ok(None), |m| m.try_into().map(Some))?,
-            range: range.map(Into::into),
-            geo_bounding_box,
-            geo_radius,
-            geo_polygon,
-            values_count: values_count.map(Into::into),
-        })
-    }
-}
-
-impl From<segment::types::FieldCondition> for FieldCondition {
-    fn from(value: segment::types::FieldCondition) -> Self {
-        let segment::types::FieldCondition {
-            key,
-            r#match,
-            range,
-            geo_bounding_box,
-            geo_radius,
-            geo_polygon: _geo_polygon,
-            values_count,
-        } = value;
-
-        let geo_bounding_box = geo_bounding_box.map(Into::into);
-        let geo_radius = geo_radius.map(Into::into);
-        Self {
-            key,
-            r#match: r#match.map(Into::into),
-            range: range.map(Into::into),
-            geo_bounding_box,
-            geo_radius,
-            // geo_polygon: geo_polygon.map(Into::into),
-            values_count: values_count.map(Into::into),
-        }
-    }
-}
-
-impl TryFrom<GeoBoundingBox> for segment::types::GeoBoundingBox {
-    type Error = Status;
-
-    fn try_from(value: GeoBoundingBox) -> Result<Self, Self::Error> {
-        match value {
-            GeoBoundingBox {
-                top_left: Some(t),
-                bottom_right: Some(b),
-            } => Ok(Self {
-                top_left: t.into(),
-                bottom_right: b.into(),
-            }),
-            _ => Err(Status::invalid_argument("Malformed GeoBoundingBox type")),
-        }
-    }
-}
-
-impl From<segment::types::GeoBoundingBox> for GeoBoundingBox {
-    fn from(value: segment::types::GeoBoundingBox) -> Self {
-        Self {
-            top_left: Some(value.top_left.into()),
-            bottom_right: Some(value.bottom_right.into()),
-        }
-    }
-}
-
-impl TryFrom<GeoRadius> for segment::types::GeoRadius {
-    type Error = Status;
-
-    fn try_from(value: GeoRadius) -> Result<Self, Self::Error> {
-        match value {
-            GeoRadius {
-                center: Some(c),
-                radius,
-            } => Ok(Self {
-                center: c.into(),
-                radius: radius.into(),
-            }),
-            _ => Err(Status::invalid_argument("Malformed GeoRadius type")),
-        }
-    }
-}
-
-impl From<segment::types::GeoRadius> for GeoRadius {
-    fn from(value: segment::types::GeoRadius) -> Self {
-        Self {
-            center: Some(value.center.into()),
-            radius: value.radius as f32, // TODO lossy ok?
-        }
-    }
-}
-
-impl TryFrom<GeoPolygon> for segment::types::GeoPolygon {
-    type Error = Status;
-
-    fn try_from(value: GeoPolygon) -> Result<Self, Self::Error> {
-        if value.points.is_empty() {
-            return Err(Status::invalid_argument("Empty GeoPolygon"));
-        }
-
-        let points: Vec<segment::types::GeoPoint> =
-            value.points.into_iter().map(Into::into).collect();
-
-        Ok(Self { points })
-    }
-}
-
-impl From<segment::types::GeoPolygon> for GeoPolygon {
-    fn from(value: segment::types::GeoPolygon) -> Self {
-        Self {
-            points: value.points.into_iter().map(Into::into).collect(),
-        }
-    }
-}
-
-impl From<GeoPoint> for segment::types::GeoPoint {
-    fn from(value: GeoPoint) -> Self {
-        Self {
-            lon: value.lon,
-            lat: value.lat,
-        }
-    }
-}
-
-impl From<Range> for segment::types::Range {
-    fn from(value: Range) -> Self {
-        Self {
-            lt: value.lt,
-            gt: value.gt,
-            gte: value.gte,
-            lte: value.lte,
-        }
-    }
-}
-
-impl From<segment::types::Range> for Range {
-    fn from(value: segment::types::Range) -> Self {
-        Self {
-            lt: value.lt,
-            gt: value.gt,
-            gte: value.gte,
-            lte: value.lte,
-        }
-    }
-}
-
-impl From<ValuesCount> for segment::types::ValuesCount {
-    fn from(value: ValuesCount) -> Self {
-        Self {
-            lt: value.lt.map(|x| x as usize),
-            gt: value.gt.map(|x| x as usize),
-            gte: value.gte.map(|x| x as usize),
-            lte: value.lte.map(|x| x as usize),
-        }
-    }
-}
-
-impl From<segment::types::ValuesCount> for ValuesCount {
-    fn from(value: segment::types::ValuesCount) -> Self {
-        Self {
-            lt: value.lt.map(|x| x as u64),
-            gt: value.gt.map(|x| x as u64),
-            gte: value.gte.map(|x| x as u64),
-            lte: value.lte.map(|x| x as u64),
-        }
-    }
-}
-
-impl TryFrom<Match> for segment::types::Match {
-    type Error = Status;
-
-    fn try_from(value: Match) -> Result<Self, Self::Error> {
-        match value.match_value {
-            Some(mv) => Ok(match mv {
-                MatchValue::Keyword(kw) => kw.into(),
-                MatchValue::Integer(int) => int.into(),
-                MatchValue::Boolean(flag) => flag.into(),
-                MatchValue::Text(text) => segment::types::Match::Text(text.into()),
-                MatchValue::Keywords(kwds) => kwds.strings.into(),
-                MatchValue::Integers(ints) => ints.integers.into(),
-                MatchValue::ExceptIntegers(kwds) => {
-                    segment::types::Match::Except(kwds.integers.into())
-                }
-                MatchValue::ExceptKeywords(ints) => {
-                    segment::types::Match::Except(ints.strings.into())
-                }
-            }),
-            _ => Err(Status::invalid_argument("Malformed Match condition")),
-        }
-    }
-}
-
-impl From<segment::types::Match> for Match {
-    fn from(value: segment::types::Match) -> Self {
-        let match_value = match value {
-            segment::types::Match::Value(value) => match value.value {
-                segment::types::ValueVariants::Keyword(kw) => MatchValue::Keyword(kw),
-                segment::types::ValueVariants::Integer(int) => MatchValue::Integer(int),
-                segment::types::ValueVariants::Bool(flag) => MatchValue::Boolean(flag),
-            },
-            segment::types::Match::Text(segment::types::MatchText { text }) => {
-                MatchValue::Text(text)
-            }
-            segment::types::Match::Any(any) => match any.any {
-                segment::types::AnyVariants::Keywords(strings) => {
-                    MatchValue::Keywords(RepeatedStrings { strings })
-                }
-                segment::types::AnyVariants::Integers(integers) => {
-                    MatchValue::Integers(RepeatedIntegers { integers })
-                }
-            },
-            segment::types::Match::Except(except) => match except.except {
-                segment::types::AnyVariants::Keywords(strings) => {
-                    MatchValue::ExceptKeywords(RepeatedStrings { strings })
-                }
-                segment::types::AnyVariants::Integers(integers) => {
-                    MatchValue::ExceptIntegers(RepeatedIntegers { integers })
-                }
-            },
-        };
-        Self {
-            match_value: Some(match_value),
-        }
-    }
-}
-
-impl From<HnswConfigDiff> for segment::types::HnswConfig {
-    fn from(hnsw_config: HnswConfigDiff) -> Self {
-        Self {
-            m: hnsw_config.m.unwrap_or_default() as usize,
-            ef_construct: hnsw_config.ef_construct.unwrap_or_default() as usize,
-            full_scan_threshold: hnsw_config.full_scan_threshold.unwrap_or_default() as usize,
-            max_indexing_threads: hnsw_config.max_indexing_threads.unwrap_or_default() as usize,
-            on_disk: hnsw_config.on_disk,
-            payload_m: hnsw_config.payload_m.map(|x| x as usize),
-        }
-    }
-}
-
-pub fn date_time_to_proto(date_time: NaiveDateTime) -> protobuf::Timestamp {
-    protobuf::Timestamp {
-        seconds: date_time.timestamp(), // number of non-leap seconds since the midnight on January 1, 1970.
-        nanos: date_time.nanosecond() as i32,
-    }
-}
-
-impl TryFrom<Distance> for segment::types::Distance {
-    type Error = Status;
-
-    fn try_from(value: Distance) -> Result<Self, Self::Error> {
-        Ok(match value {
-            Distance::UnknownDistance => {
-                return Err(Status::invalid_argument(
-                    "Malformed distance parameter: UnknownDistance",
-                ))
-            }
-            Distance::Cosine => segment::types::Distance::Cosine,
-            Distance::Euclid => segment::types::Distance::Euclid,
-            Distance::Dot => segment::types::Distance::Dot,
-        })
-    }
-}
-
-pub fn from_grpc_dist(dist: i32) -> Result<segment::types::Distance, Status> {
-    match Distance::from_i32(dist) {
-        None => Err(Status::invalid_argument(format!(
-            "Malformed distance parameter, unexpected value: {dist}"
-        ))),
-        Some(grpc_distance) => Ok(grpc_distance.try_into()?),
-    }
-}
diff --git a/crates/qdrant/lib/api/src/grpc/dynamic_channel_pool.rs b/crates/qdrant/lib/api/src/grpc/dynamic_channel_pool.rs
deleted file mode 100644
index 8f903f7..0000000
--- a/crates/qdrant/lib/api/src/grpc/dynamic_channel_pool.rs
+++ /dev/null
@@ -1,88 +0,0 @@
-use std::time::{Duration, Instant};
-
-use parking_lot::Mutex;
-use tonic::transport::{Channel, ClientTlsConfig, Error as TonicError, Uri};
-
-use crate::grpc::dynamic_pool::{CountedItem, DynamicPool};
-
-pub async fn make_grpc_channel(
-    timeout: Duration,
-    connection_timeout: Duration,
-    uri: Uri,
-    tls_config: Option<ClientTlsConfig>,
-) -> Result<Channel, TonicError> {
-    let mut endpoint = Channel::builder(uri)
-        .timeout(timeout)
-        .connect_timeout(connection_timeout);
-    if let Some(config) = tls_config {
-        endpoint = endpoint.tls_config(config)?;
-    }
-    // `connect` is using the `Reconnect` network service internally to handle dropped connections
-    endpoint.connect().await
-}
-
-pub struct DynamicChannelPool {
-    pool: Mutex<DynamicPool<Channel>>,
-    init_at: Instant,
-    uri: Uri,
-    timeout: Duration,
-    connection_timeout: Duration,
-    tls_config: Option<ClientTlsConfig>,
-}
-
-impl DynamicChannelPool {
-    pub async fn new(
-        uri: Uri,
-        timeout: Duration,
-        connection_timeout: Duration,
-        tls_config: Option<ClientTlsConfig>,
-        usage_per_channel: usize,
-        min_channels: usize,
-    ) -> Result<Self, TonicError> {
-        let mut channels = Vec::with_capacity(min_channels);
-        for _ in 0..min_channels {
-            let channel =
-                make_grpc_channel(timeout, connection_timeout, uri.clone(), tls_config.clone())
-                    .await?;
-            channels.push(channel);
-        }
-
-        let init_at = Instant::now();
-
-        let pool = DynamicPool::new(channels, usage_per_channel, min_channels);
-        Ok(Self {
-            pool: Mutex::new(pool),
-            init_at,
-            uri,
-            timeout,
-            connection_timeout,
-            tls_config,
-        })
-    }
-
-    pub fn init_at(&self) -> Instant {
-        self.init_at
-    }
-
-    pub async fn choose(&self) -> Result<CountedItem<Channel>, TonicError> {
-        let channel = self.pool.lock().choose();
-        let channel = match channel {
-            None => {
-                let channel = make_grpc_channel(
-                    self.timeout,
-                    self.connection_timeout,
-                    self.uri.clone(),
-                    self.tls_config.clone(),
-                )
-                .await?;
-                self.pool.lock().add(channel)
-            }
-            Some(channel) => channel,
-        };
-        Ok(channel)
-    }
-
-    pub fn drop_channel(&self, channel: CountedItem<Channel>) {
-        self.pool.lock().drop_item(channel);
-    }
-}
diff --git a/crates/qdrant/lib/api/src/grpc/dynamic_pool.rs b/crates/qdrant/lib/api/src/grpc/dynamic_pool.rs
deleted file mode 100644
index 5c72827..0000000
--- a/crates/qdrant/lib/api/src/grpc/dynamic_pool.rs
+++ /dev/null
@@ -1,246 +0,0 @@
-use std::collections::HashMap;
-use std::sync::atomic::{AtomicUsize, Ordering};
-use std::sync::Arc;
-use std::time::{Duration, Instant};
-
-use rand::Rng;
-
-#[derive(Debug)]
-struct ItemWithStats<T: Clone> {
-    pub item: T,
-    pub usage: AtomicUsize,
-    pub last_success: AtomicUsize,
-}
-
-impl<T: Clone> ItemWithStats<T> {
-    fn new(item: T, last_used_since: usize) -> Self {
-        Self {
-            item,
-            usage: AtomicUsize::new(0),
-            last_success: AtomicUsize::new(last_used_since),
-        }
-    }
-}
-
-pub struct DynamicPool<T: Clone> {
-    items: HashMap<u64, Arc<ItemWithStats<T>>>,
-    /// How many times one item can be used
-    max_usage_per_item: usize,
-    /// Minimal number of items in the pool
-    min_items: usize,
-    /// Instant when the pool was created
-    init_at: Instant,
-}
-
-pub struct CountedItem<T: Clone> {
-    item: Arc<ItemWithStats<T>>,
-    item_id: u64,
-    init_at: Instant,
-}
-
-impl<T: Clone> CountedItem<T> {
-    fn new(item_id: u64, item: Arc<ItemWithStats<T>>, init_at: Instant) -> Self {
-        item.usage.fetch_add(1, Ordering::Relaxed);
-        Self {
-            item,
-            item_id,
-            init_at,
-        }
-    }
-
-    pub fn item(&self) -> &T {
-        &self.item.item
-    }
-
-    pub fn report_success(&self) {
-        let time_since_init = Instant::now().duration_since(self.init_at).as_millis() as usize;
-        self.item
-            .last_success
-            .store(time_since_init, Ordering::Relaxed);
-    }
-
-    pub fn last_success_age(&self) -> Duration {
-        let time_since_init = Instant::now().duration_since(self.init_at).as_millis() as usize;
-        let time_since_last_success = self.item.last_success.load(Ordering::Relaxed);
-        Duration::from_millis((time_since_init - time_since_last_success) as u64)
-    }
-}
-
-impl<T: Clone> Drop for CountedItem<T> {
-    fn drop(&mut self) {
-        self.item.usage.fetch_sub(1, Ordering::Relaxed);
-    }
-}
-
-impl<T: Clone> DynamicPool<T> {
-    fn random_idx() -> u64 {
-        rand::thread_rng().gen()
-    }
-
-    pub fn new(items: Vec<T>, max_usage_per_item: usize, min_items: usize) -> Self {
-        debug_assert!(max_usage_per_item > 0);
-        debug_assert!(items.len() >= min_items);
-        let init_at = Instant::now();
-        let last_success_since = Instant::now().duration_since(init_at).as_millis() as usize;
-        let items = items
-            .into_iter()
-            .map(|item| {
-                let item = Arc::new(ItemWithStats::new(item, last_success_since));
-                (Self::random_idx(), item)
-            })
-            .collect();
-        Self {
-            items,
-            max_usage_per_item,
-            min_items,
-            init_at,
-        }
-    }
-
-    pub fn drop_item(&mut self, item: CountedItem<T>) {
-        let item_id = item.item_id;
-        self.items.remove(&item_id);
-    }
-
-    pub fn add(&mut self, item: T) -> CountedItem<T> {
-        let item_with_stats = Arc::new(ItemWithStats::new(
-            item,
-            Instant::now().duration_since(self.init_at).as_millis() as usize,
-        ));
-        let item_id = Self::random_idx();
-        self.items.insert(item_id, item_with_stats.clone());
-        CountedItem::new(item_id, item_with_stats, self.init_at)
-    }
-
-    // Returns None if current capacity is not enough
-    pub fn choose(&mut self) -> Option<CountedItem<T>> {
-        if self.items.len() < self.min_items {
-            return None;
-        }
-
-        // If all items are used too much, we cannot use any of them so we return None
-        let mut total_usage = 0;
-        let min_usage_idx = *self
-            .items
-            .iter()
-            .map(|(idx, item)| {
-                let usage = item.usage.load(Ordering::Relaxed);
-                total_usage += usage;
-                (idx, usage)
-            })
-            .filter(|(_, min_usage)| *min_usage < self.max_usage_per_item)
-            .min_by_key(|(_, usage)| *usage)?
-            .0;
-
-        let current_usage_capacity = self.items.len().saturating_mul(self.max_usage_per_item);
-
-        if current_usage_capacity.saturating_sub(total_usage)
-            > self.max_usage_per_item.saturating_mul(2)
-            && self.items.len() > self.min_items
-        {
-            // We have too many items, and we have enough capacity to remove some of them
-            let item = self
-                .items
-                .remove(&min_usage_idx)
-                .expect("Item must exist, as we just found it");
-            return Some(CountedItem::new(min_usage_idx, item, self.init_at));
-        }
-
-        Some(CountedItem::new(
-            min_usage_idx,
-            self.items
-                .get(&min_usage_idx)
-                .expect("Item must exist, as we just found it")
-                .clone(),
-            self.init_at,
-        ))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::sync::atomic::{AtomicUsize, Ordering};
-
-    use super::*;
-
-    async fn use_item(item: CountedItem<Arc<AtomicUsize>>) {
-        item.item().fetch_add(1, Ordering::SeqCst);
-        // Sleep for 1-100 ms
-        tokio::time::sleep(std::time::Duration::from_millis(
-            rand::random::<u64>() % 100 + 1,
-        ))
-        .await;
-        item.item().fetch_sub(1, Ordering::SeqCst);
-        item.report_success();
-        drop(item);
-    }
-
-    #[test]
-    fn test_dynamic_pool() {
-        let items = vec![Arc::new(AtomicUsize::new(0)), Arc::new(AtomicUsize::new(0))];
-
-        let mut pool = DynamicPool::new(items, 5, 2);
-
-        let mut items = vec![];
-
-        for _ in 0..17 {
-            let item = match pool.choose() {
-                None => pool.add(Arc::new(AtomicUsize::new(0))),
-                Some(it) => it,
-            };
-
-            item.item().fetch_add(1, Ordering::SeqCst);
-            items.push(item);
-        }
-
-        assert_eq!(pool.items.len(), 4);
-
-        for _ in 0..10 {
-            items.pop();
-        }
-
-        for (idx, item) in pool.items.iter() {
-            println!("{} -> {:?}", idx, item);
-        }
-
-        assert!(pool.choose().is_some());
-
-        assert_eq!(pool.items.len(), 3);
-    }
-
-    #[test]
-    fn test_dynamic_pool_with_runtime() {
-        let items = vec![Arc::new(AtomicUsize::new(0)), Arc::new(AtomicUsize::new(0))];
-
-        let runtime = tokio::runtime::Runtime::new().unwrap();
-
-        let mut pool = DynamicPool::new(items, 5, 2);
-
-        let mut handles = vec![];
-        for _ in 0..1000 {
-            let item = match pool.choose() {
-                None => pool.add(Arc::new(AtomicUsize::new(0))),
-                Some(it) => it,
-            };
-
-            let handle = runtime.spawn(async move { use_item(item).await });
-
-            handles.push(handle);
-
-            // Sleep for 3 ms with std
-            std::thread::sleep(std::time::Duration::from_millis(2));
-        }
-        runtime.block_on(async move {
-            for handle in handles {
-                handle.await.unwrap();
-            }
-        });
-
-        pool.items.iter().for_each(|(_, item)| {
-            assert_eq!(item.item.load(Ordering::SeqCst), 0);
-            assert_eq!(item.usage.load(Ordering::SeqCst), 0);
-        });
-
-        assert!(pool.items.len() < 50);
-    }
-}
diff --git a/crates/qdrant/lib/api/src/grpc/google.protobuf.rs b/crates/qdrant/lib/api/src/grpc/google.protobuf.rs
deleted file mode 100644
index 0e055ed..0000000
--- a/crates/qdrant/lib/api/src/grpc/google.protobuf.rs
+++ /dev/null
@@ -1,212 +0,0 @@
-/// `Struct` represents a structured data value, consisting of fields
-/// which map to dynamically typed values. In some languages, `Struct`
-/// might be supported by a native representation. For example, in
-/// scripting languages like JS a struct is represented as an
-/// object. The details of that representation are described together
-/// with the proto support for the language.
-///
-/// The JSON representation for `Struct` is JSON object.
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct Struct {
-    /// Unordered map of dynamically typed values.
-    #[prost(map = "string, message", tag = "1")]
-    pub fields: ::std::collections::HashMap<::prost::alloc::string::String, Value>,
-}
-/// `Value` represents a dynamically typed value which can be either
-/// null, a number, a string, a boolean, a recursive struct value, or a
-/// list of values. A producer of value is expected to set one of these
-/// variants. Absence of any variant indicates an error.
-///
-/// The JSON representation for `Value` is JSON value.
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct Value {
-    /// The kind of value.
-    #[prost(oneof = "value::Kind", tags = "1, 2, 3, 4, 5, 6")]
-    pub kind: ::core::option::Option<value::Kind>,
-}
-/// Nested message and enum types in `Value`.
-pub mod value {
-    /// The kind of value.
-    #[derive(serde::Serialize)]
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Oneof)]
-    pub enum Kind {
-        /// Represents a null value.
-        #[prost(enumeration = "super::NullValue", tag = "1")]
-        NullValue(i32),
-        /// Represents a double value.
-        #[prost(double, tag = "2")]
-        NumberValue(f64),
-        /// Represents a string value.
-        #[prost(string, tag = "3")]
-        StringValue(::prost::alloc::string::String),
-        /// Represents a boolean value.
-        #[prost(bool, tag = "4")]
-        BoolValue(bool),
-        /// Represents a structured value.
-        #[prost(message, tag = "5")]
-        StructValue(super::Struct),
-        /// Represents a repeated `Value`.
-        #[prost(message, tag = "6")]
-        ListValue(super::ListValue),
-    }
-}
-/// `ListValue` is a wrapper around a repeated field of values.
-///
-/// The JSON representation for `ListValue` is JSON array.
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct ListValue {
-    /// Repeated field of dynamically typed values.
-    #[prost(message, repeated, tag = "1")]
-    pub values: ::prost::alloc::vec::Vec<Value>,
-}
-/// `NullValue` is a singleton enumeration to represent the null value for the
-/// `Value` type union.
-///
-/// The JSON representation for `NullValue` is JSON `null`.
-#[derive(serde::Serialize)]
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
-#[repr(i32)]
-pub enum NullValue {
-    /// Null value.
-    NullValue = 0,
-}
-impl NullValue {
-    /// String value of the enum field names used in the ProtoBuf definition.
-    ///
-    /// The values are not transformed in any way and thus are considered stable
-    /// (if the ProtoBuf definition does not change) and safe for programmatic use.
-    pub fn as_str_name(&self) -> &'static str {
-        match self {
-            NullValue::NullValue => "NULL_VALUE",
-        }
-    }
-    /// Creates an enum from field names used in the ProtoBuf definition.
-    pub fn from_str_name(value: &str) -> ::core::option::Option<Self> {
-        match value {
-            "NULL_VALUE" => Some(Self::NullValue),
-            _ => None,
-        }
-    }
-}
-/// A Timestamp represents a point in time independent of any time zone or local
-/// calendar, encoded as a count of seconds and fractions of seconds at
-/// nanosecond resolution. The count is relative to an epoch at UTC midnight on
-/// January 1, 1970, in the proleptic Gregorian calendar which extends the
-/// Gregorian calendar backwards to year one.
-///
-/// All minutes are 60 seconds long. Leap seconds are "smeared" so that no leap
-/// second table is needed for interpretation, using a [24-hour linear
-/// smear](<https://developers.google.com/time/smear>).
-///
-/// The range is from 0001-01-01T00:00:00Z to 9999-12-31T23:59:59.999999999Z. By
-/// restricting to that range, we ensure that we can convert to and from [RFC
-/// 3339](<https://www.ietf.org/rfc/rfc3339.txt>) date strings.
-///
-/// # Examples
-///
-/// Example 1: Compute Timestamp from POSIX `time()`.
-///
-/// ```text
-/// Timestamp timestamp;
-/// timestamp.set_seconds(time(NULL));
-/// timestamp.set_nanos(0);
-/// ```
-///
-/// Example 2: Compute Timestamp from POSIX `gettimeofday()`.
-///
-/// ```text
-/// struct timeval tv;
-/// gettimeofday(&tv, NULL);
-///
-/// Timestamp timestamp;
-/// timestamp.set_seconds(tv.tv_sec);
-/// timestamp.set_nanos(tv.tv_usec * 1000);
-/// ```
-///
-/// Example 3: Compute Timestamp from Win32 `GetSystemTimeAsFileTime()`.
-///
-/// ```text
-/// FILETIME ft;
-/// GetSystemTimeAsFileTime(&ft);
-/// UINT64 ticks = (((UINT64)ft.dwHighDateTime) << 32) | ft.dwLowDateTime;
-///
-/// // A Windows tick is 100 nanoseconds. Windows epoch 1601-01-01T00:00:00Z
-/// // is 11644473600 seconds before Unix epoch 1970-01-01T00:00:00Z.
-/// Timestamp timestamp;
-/// timestamp.set_seconds((INT64) ((ticks / 10000000) - 11644473600LL));
-/// timestamp.set_nanos((INT32) ((ticks % 10000000) * 100));
-/// ```
-///
-/// Example 4: Compute Timestamp from Java `System.currentTimeMillis()`.
-///
-/// ```text
-/// long millis = System.currentTimeMillis();
-///
-/// Timestamp timestamp = Timestamp.newBuilder().setSeconds(millis / 1000)
-///      .setNanos((int) ((millis % 1000) * 1000000)).build();
-/// ```
-///
-/// Example 5: Compute Timestamp from Java `Instant.now()`.
-///
-/// ```text
-/// Instant now = Instant.now();
-///
-/// Timestamp timestamp =
-///      Timestamp.newBuilder().setSeconds(now.getEpochSecond())
-///          .setNanos(now.getNano()).build();
-/// ```
-///
-/// Example 6: Compute Timestamp from current time in Python.
-///
-/// ```text
-/// timestamp = Timestamp()
-/// timestamp.GetCurrentTime()
-/// ```
-///
-/// # JSON Mapping
-///
-/// In JSON format, the Timestamp type is encoded as a string in the
-/// [RFC 3339](<https://www.ietf.org/rfc/rfc3339.txt>) format. That is, the
-/// format is "{year}-{month}-{day}T{hour}:{min}:{sec}\\[.{frac_sec}\\]Z"
-/// where {year} is always expressed using four digits while {month}, {day},
-/// {hour}, {min}, and {sec} are zero-padded to two digits each. The fractional
-/// seconds, which can go up to 9 digits (i.e. up to 1 nanosecond resolution),
-/// are optional. The "Z" suffix indicates the timezone ("UTC"); the timezone
-/// is required. A proto3 JSON serializer should always use UTC (as indicated by
-/// "Z") when printing the Timestamp type and a proto3 JSON parser should be
-/// able to accept both UTC and other timezones (as indicated by an offset).
-///
-/// For example, "2017-01-15T01:30:15.01Z" encodes 15.01 seconds past
-/// 01:30 UTC on January 15, 2017.
-///
-/// In JavaScript, one can convert a Date object to this format using the
-/// standard
-/// \[toISOString()\](<https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toISOString>)
-/// method. In Python, a standard `datetime.datetime` object can be converted
-/// to this format using
-/// \[`strftime`\](<https://docs.python.org/2/library/time.html#time.strftime>) with
-/// the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one can use
-/// the Joda Time's \[`ISODateTimeFormat.dateTime()`\](<http://joda-time.sourceforge.net/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime(>)) to obtain a formatter capable of generating timestamps in this format.
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct Timestamp {
-    /// Represents seconds of UTC time since Unix epoch
-    /// 1970-01-01T00:00:00Z. Must be from 0001-01-01T00:00:00Z to
-    /// 9999-12-31T23:59:59Z inclusive.
-    #[prost(int64, tag = "1")]
-    pub seconds: i64,
-    /// Non-negative fractions of a second at nanosecond resolution. Negative
-    /// second values with fractions must still have non-negative nanos values
-    /// that count forward in time. Must be from 0 to 999,999,999
-    /// inclusive.
-    #[prost(int32, tag = "2")]
-    pub nanos: i32,
-}
diff --git a/crates/qdrant/lib/api/src/grpc/mod.rs b/crates/qdrant/lib/api/src/grpc/mod.rs
deleted file mode 100644
index ac549c1..0000000
--- a/crates/qdrant/lib/api/src/grpc/mod.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-pub mod conversions;
-pub mod models;
-#[allow(clippy::all)]
-#[rustfmt::skip] // tonic uses `prettyplease` to format its output
-pub mod qdrant;
-pub mod dynamic_channel_pool;
-pub mod dynamic_pool;
-pub mod transport_channel_pool;
-pub mod validate;
-
-// Include generated protobuf "well-known types".
-#[path = "google.protobuf.rs"]
-#[rustfmt::skip]
-pub mod protobuf;
-
-// `prost`'s generated code expects these types
-// under `google::protobuf`, so we do a little module path hack here
-pub mod google {
-    pub use super::protobuf;
-}
-
-pub const fn api_crate_version() -> &'static str {
-    env!("CARGO_PKG_VERSION")
-}
diff --git a/crates/qdrant/lib/api/src/grpc/models.rs b/crates/qdrant/lib/api/src/grpc/models.rs
deleted file mode 100644
index 4e17dcf..0000000
--- a/crates/qdrant/lib/api/src/grpc/models.rs
+++ /dev/null
@@ -1,61 +0,0 @@
-use std::fmt::Debug;
-
-use schemars::JsonSchema;
-use serde;
-use serde::{Deserialize, Serialize};
-
-#[derive(Serialize, Deserialize)]
-pub struct VersionInfo {
-    pub title: String,
-    pub version: String,
-}
-
-impl Default for VersionInfo {
-    fn default() -> Self {
-        VersionInfo {
-            title: "qdrant - vector search engine".to_string(),
-            version: env!("CARGO_PKG_VERSION").to_string(),
-        }
-    }
-}
-
-impl VersionInfo {
-    pub fn minor_version(&self) -> String {
-        let minor = self
-            .version
-            .split('.')
-            .take(2)
-            .collect::<Vec<&str>>()
-            .join(".");
-        format!("{}.x", minor)
-    }
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum ApiStatus {
-    Ok,
-    Error(String),
-    Accepted,
-}
-
-#[derive(Debug, Serialize, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub struct ApiResponse<D: Serialize + Debug> {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub result: Option<D>,
-    pub status: ApiStatus,
-    pub time: f64,
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub struct CollectionDescription {
-    pub name: String,
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub struct CollectionsResponse {
-    pub collections: Vec<CollectionDescription>,
-}
diff --git a/crates/qdrant/lib/api/src/grpc/proto/collections.proto b/crates/qdrant/lib/api/src/grpc/proto/collections.proto
deleted file mode 100644
index 77becf3..0000000
--- a/crates/qdrant/lib/api/src/grpc/proto/collections.proto
+++ /dev/null
@@ -1,438 +0,0 @@
-syntax = "proto3";
-package qdrant;
-
-message VectorParams {
-  uint64 size = 1; // Size of the vectors
-  Distance distance = 2; // Distance function used for comparing vectors
-  optional HnswConfigDiff hnsw_config = 3; // Configuration of vector HNSW graph. If omitted - the collection configuration will be used
-  optional QuantizationConfig quantization_config = 4; // Configuration of vector quantization config. If omitted - the collection configuration will be used
-  optional bool on_disk = 5; // If true - serve vectors from disk. If set to false, the vectors will be loaded in RAM.
-}
-
-message VectorParamsDiff {
-  optional HnswConfigDiff hnsw_config = 1; // Update params for HNSW index. If empty object - it will be unset
-  optional QuantizationConfigDiff quantization_config = 2; // Update quantization params. If none - it is left unchanged.
-  optional bool on_disk = 3; // If true - serve vectors from disk. If set to false, the vectors will be loaded in RAM.
-}
-
-message VectorParamsMap {
-  map<string, VectorParams> map = 1;
-}
-
-message VectorParamsDiffMap {
-  map<string, VectorParamsDiff> map = 1;
-}
-
-message VectorsConfig {
-  oneof config {
-    VectorParams params = 1;
-    VectorParamsMap params_map = 2;
-  }
-}
-
-message VectorsConfigDiff {
-  oneof config {
-    VectorParamsDiff params = 1;
-    VectorParamsDiffMap params_map = 2;
-  }
-}
-
-message GetCollectionInfoRequest {
-  string collection_name = 1; // Name of the collection
-}
-
-message ListCollectionsRequest {
-}
-
-message CollectionDescription {
-  string name = 1; // Name of the collection
-}
-
-message GetCollectionInfoResponse {
-  CollectionInfo result = 1;
-  double time = 2; // Time spent to process
-}
-
-message ListCollectionsResponse {
-  repeated CollectionDescription collections = 1;
-  double time = 2; // Time spent to process
-}
-
-enum Distance {
-  UnknownDistance = 0;
-  Cosine = 1;
-  Euclid = 2;
-  Dot = 3;
-}
-
-enum CollectionStatus {
-  UnknownCollectionStatus = 0;
-  Green = 1; // All segments are ready
-  Yellow = 2; // Optimization in process
-  Red = 3; // Something went wrong
-}
-
-enum PayloadSchemaType {
-  UnknownType = 0;
-  Keyword = 1;
-  Integer = 2;
-  Float = 3;
-  Geo = 4;
-  Text = 5;
-  Bool = 6;
-}
-
-enum QuantizationType {
-  UnknownQuantization = 0;
-  Int8 = 1;
-}
-
-enum CompressionRatio {
-  x4 = 0;
-  x8 = 1;
-  x16 = 2;
-  x32 = 3;
-  x64 = 4;
-}
-
-message OptimizerStatus {
-  bool ok = 1;
-  string error = 2;
-}
-
-message HnswConfigDiff {
-  /*
-  Number of edges per node in the index graph. Larger the value - more accurate the search, more space required.
-   */
-  optional uint64 m = 1;
-  /*
-  Number of neighbours to consider during the index building. Larger the value - more accurate the search, more time required to build the index.
-  */
-  optional uint64 ef_construct = 2;
-  /*
-  Minimal size (in KiloBytes) of vectors for additional payload-based indexing.
-  If the payload chunk is smaller than `full_scan_threshold` additional indexing won't be used -
-  in this case full-scan search should be preferred by query planner and additional indexing is not required.
-  Note: 1 Kb = 1 vector of size 256
-  */
-  optional uint64 full_scan_threshold = 3;
-  /*
-  Number of parallel threads used for background index building. If 0 - auto selection.
-   */
-  optional uint64 max_indexing_threads = 4;
-  /*
-  Store HNSW index on disk. If set to false, the index will be stored in RAM.
-   */
-  optional bool on_disk = 5;
-  /*
-   Number of additional payload-aware links per node in the index graph. If not set - regular M parameter will be used.
-   */
-  optional uint64 payload_m = 6;
-}
-
-message WalConfigDiff {
-  optional uint64 wal_capacity_mb = 1; // Size of a single WAL block file
-  optional uint64 wal_segments_ahead = 2; // Number of segments to create in advance
-}
-
-message OptimizersConfigDiff {
-  /*
-  The minimal fraction of deleted vectors in a segment, required to perform segment optimization
-   */
-  optional double deleted_threshold = 1;
-  /*
-  The minimal number of vectors in a segment, required to perform segment optimization
-   */
-  optional uint64 vacuum_min_vector_number = 2;
-  /*
-  Target amount of segments the optimizer will try to keep.
-  Real amount of segments may vary depending on multiple parameters:
-
-   - Amount of stored points.
-   - Current write RPS.
-
-  It is recommended to select the default number of segments as a factor of the number of search threads,
-  so that each segment would be handled evenly by one of the threads.
-  */
-  optional uint64 default_segment_number = 3;
-  /*
-  Do not create segments larger this size (in kilobytes).
-  Large segments might require disproportionately long indexation times,
-  therefore it makes sense to limit the size of segments.
-    
-  If indexing speed is more important - make this parameter lower.
-  If search speed is more important - make this parameter higher.
-  Note: 1Kb = 1 vector of size 256
-  If not set, will be automatically selected considering the number of available CPUs.
-  */
-  optional uint64 max_segment_size = 4;
-  /*
-  Maximum size (in kilobytes) of vectors to store in-memory per segment.
-  Segments larger than this threshold will be stored as read-only memmaped file.
-
-  Memmap storage is disabled by default, to enable it, set this threshold to a reasonable value.
-
-  To disable memmap storage, set this to `0`.
-
-  Note: 1Kb = 1 vector of size 256
-  */
-  optional uint64 memmap_threshold = 5;
-  /*
-  Maximum size (in kilobytes) of vectors allowed for plain index, exceeding this threshold will enable vector indexing
-  
-  Default value is 20,000, based on <https://github.com/google-research/google-research/blob/master/scann/docs/algorithms.md>.
-  
-  To disable vector indexing, set to `0`.
-  
-  Note: 1kB = 1 vector of size 256.
-  */
-  optional uint64 indexing_threshold = 6;
-  /*
-  Interval between forced flushes.
-  */
-  optional uint64 flush_interval_sec = 7;
-  /*
-  Max number of threads, which can be used for optimization. If 0 - `NUM_CPU - 1` will be used
-  */
-  optional uint64 max_optimization_threads = 8;
-}
-
-message ScalarQuantization {
-  QuantizationType type = 1; // Type of quantization
-  optional float quantile = 2; // Number of bits to use for quantization
-  optional bool always_ram = 3; // If true - quantized vectors always will be stored in RAM, ignoring the config of main storage
-}
-
-message ProductQuantization {
-  CompressionRatio compression = 1; // Compression ratio
-  optional bool always_ram = 2; // If true - quantized vectors always will be stored in RAM, ignoring the config of main storage
-}
-
-message QuantizationConfig {
-  oneof quantization {
-    ScalarQuantization scalar = 1;
-    ProductQuantization product = 2;
-  }
-}
-
-message Disabled {
-
-}
-
-message QuantizationConfigDiff {
-  oneof quantization {
-    ScalarQuantization scalar = 1;
-    ProductQuantization product = 2;
-    Disabled disabled = 3;
-  }
-}
-
-message CreateCollection {
-  string collection_name = 1; // Name of the collection
-  reserved 2; // Deprecated
-  reserved 3; // Deprecated
-  optional HnswConfigDiff hnsw_config = 4; // Configuration of vector index
-  optional WalConfigDiff wal_config = 5; // Configuration of the Write-Ahead-Log
-  optional OptimizersConfigDiff optimizers_config = 6; // Configuration of the optimizers
-  optional uint32 shard_number = 7; // Number of shards in the collection, default is 1 for standalone, otherwise equal to the number of nodes. Minimum is 1
-  optional bool on_disk_payload = 8; // If true - point's payload will not be stored in memory
-  optional uint64 timeout = 9; // Wait timeout for operation commit in seconds, if not specified - default value will be supplied
-  optional VectorsConfig vectors_config = 10; // Configuration for vectors
-  optional uint32 replication_factor = 11; // Number of replicas of each shard that network tries to maintain, default = 1
-  optional uint32 write_consistency_factor = 12; // How many replicas should apply the operation for us to consider it successful, default = 1
-  optional string init_from_collection = 13; // Specify name of the other collection to copy data from
-  optional QuantizationConfig quantization_config = 14; // Quantization configuration of vector
-}
-
-message UpdateCollection {
-  string collection_name = 1; // Name of the collection
-  optional OptimizersConfigDiff optimizers_config = 2; // New configuration parameters for the collection. This operation is blocking, it will only proceed once all current optimizations are complete
-  optional uint64 timeout = 3; // Wait timeout for operation commit in seconds if blocking, if not specified - default value will be supplied
-  optional CollectionParamsDiff params = 4; // New configuration parameters for the collection
-  optional HnswConfigDiff hnsw_config = 5; // New HNSW parameters for the collection index
-  optional VectorsConfigDiff vectors_config = 6; // New vector parameters
-  optional QuantizationConfigDiff quantization_config = 7; // Quantization configuration of vector
-}
-
-message DeleteCollection {
-  string collection_name = 1; // Name of the collection
-  optional uint64 timeout = 2; // Wait timeout for operation commit in seconds, if not specified - default value will be supplied
-}
-
-message CollectionOperationResponse {
-  bool result = 1; // if operation made changes
-  double time = 2; // Time spent to process
-}
-
-message CollectionParams {
-  reserved 1; // Deprecated
-  reserved 2; // Deprecated
-  uint32 shard_number = 3; // Number of shards in collection
-  bool on_disk_payload = 4; // If true - point's payload will not be stored in memory
-  optional VectorsConfig vectors_config = 5; // Configuration for vectors
-  optional uint32 replication_factor = 6; // Number of replicas of each shard that network tries to maintain
-  optional uint32 write_consistency_factor = 7; // How many replicas should apply the operation for us to consider it successful
-}
-
-message CollectionParamsDiff {
-  optional uint32 replication_factor = 1; // Number of replicas of each shard that network tries to maintain
-  optional uint32 write_consistency_factor = 2; // How many replicas should apply the operation for us to consider it successful
-  optional bool on_disk_payload = 3; // If true - point's payload will not be stored in memory
-}
-
-message CollectionConfig {
-  CollectionParams params = 1; // Collection parameters
-  HnswConfigDiff hnsw_config = 2; // Configuration of vector index
-  OptimizersConfigDiff optimizer_config = 3; // Configuration of the optimizers
-  WalConfigDiff wal_config = 4; // Configuration of the Write-Ahead-Log
-  optional QuantizationConfig quantization_config = 5; // Configuration of the vector quantization
-}
-
-enum TokenizerType {
-  Unknown = 0;
-  Prefix = 1;
-  Whitespace = 2;
-  Word = 3;
-  Multilingual = 4;
-}
-
-message TextIndexParams {
-  TokenizerType tokenizer = 1; // Tokenizer type
-  optional bool lowercase = 2; // If true - all tokens will be lowercase
-  optional uint64 min_token_len = 3; // Minimal token length
-  optional uint64 max_token_len = 4; // Maximal token length
-}
-
-message PayloadIndexParams {
-  oneof index_params {
-    TextIndexParams text_index_params = 1; // Parameters for text index
-  }
-}
-
-message PayloadSchemaInfo {
-  PayloadSchemaType data_type = 1; // Field data type
-  optional PayloadIndexParams params = 2; // Field index parameters
-  optional uint64 points = 3; // Number of points indexed within this field indexed
-}
-
-message CollectionInfo {
-  CollectionStatus status = 1; // operating condition of the collection
-  OptimizerStatus optimizer_status = 2; // status of collection optimizers
-  uint64 vectors_count = 3; // number of vectors in the collection
-  uint64 segments_count = 4; // Number of independent segments
-  reserved 5; // Deprecated
-  reserved 6; // Deprecated
-  CollectionConfig config = 7; // Configuration
-  map<string, PayloadSchemaInfo> payload_schema = 8; // Collection data types
-  uint64 points_count = 9; // number of points in the collection
-  optional uint64 indexed_vectors_count = 10; // number of indexed vectors in the collection.
-}
-
-message ChangeAliases {
-  repeated AliasOperations actions = 1; // List of actions
-  optional uint64 timeout = 2; // Wait timeout for operation commit in seconds, if not specified - default value will be supplied
-}
-
-message AliasOperations {
-  oneof action {
-    CreateAlias create_alias = 1;
-    RenameAlias rename_alias = 2;
-    DeleteAlias delete_alias = 3;
-  }
-}
-
-message CreateAlias {
-  string collection_name = 1; // Name of the collection
-  string alias_name = 2; // New name of the alias
-}
-
-message RenameAlias {
-  string old_alias_name = 1; // Name of the alias to rename
-  string new_alias_name = 2; // Name of the alias
-}
-
-message DeleteAlias {
-  string alias_name = 1; // Name of the alias
-}
-
-message ListAliasesRequest {
-}
-
-message ListCollectionAliasesRequest {
-  string collection_name = 1; // Name of the collection
-}
-
-message AliasDescription {
-  string alias_name = 1; // Name of the alias
-  string collection_name = 2; // Name of the collection
-}
-
-message ListAliasesResponse {
-  repeated AliasDescription aliases = 1;
-  double time = 2; // Time spent to process
-}
-
-message CollectionClusterInfoRequest {
-  string collection_name = 1; // Name of the collection
-}
-
-enum ReplicaState {
-  Active = 0; // Active and sound
-  Dead = 1; // Failed for some reason
-  Partial = 2; // The shard is partially loaded and is currently receiving data from other shards
-  Initializing = 3; // Collection is being created
-  Listener = 4; // A shard which receives data, but is not used for search; Useful for backup shards
-}
-
-message LocalShardInfo {
-  uint32 shard_id = 1; // Local shard id
-  uint64 points_count = 2; // Number of points in the shard
-  ReplicaState state = 3;  // Is replica active
-}
-
-message RemoteShardInfo {
-  uint32 shard_id = 1; // Local shard id
-  uint64 peer_id = 2; // Remote peer id
-  ReplicaState state = 3; // Is replica active
-}
-
-message ShardTransferInfo {
-  uint32 shard_id = 1; // Local shard id
-  uint64 from = 2;
-  uint64 to = 3;
-  bool sync = 4; // If `true` transfer is a synchronization of a replicas; If `false` transfer is a moving of a shard from one peer to another
-}
-
-message CollectionClusterInfoResponse {
-  uint64 peer_id = 1;  // ID of this peer 
-  uint64 shard_count = 2; // Total number of shards
-  repeated LocalShardInfo local_shards = 3; // Local shards
-  repeated RemoteShardInfo remote_shards = 4; // Remote shards
-  repeated ShardTransferInfo shard_transfers = 5; // Shard transfers
-}
-
-message MoveShard {
-  uint32 shard_id = 1; // Local shard id
-  uint64 from_peer_id = 2;
-  uint64 to_peer_id = 3;
-}
-
-message Replica {
-  uint32 shard_id = 1;
-  uint64 peer_id = 2;
-}
-
-message UpdateCollectionClusterSetupRequest {
-  string collection_name = 1; // Name of the collection
-  oneof operation {
-    MoveShard move_shard = 2;
-    MoveShard replicate_shard = 3;
-    MoveShard abort_transfer = 4;
-    Replica drop_replica = 5;
-  }
-  optional uint64 timeout = 6; // Wait timeout for operation commit in seconds, if not specified - default value will be supplied
-}
-
-message UpdateCollectionClusterSetupResponse {
-  bool result = 1;
-}
diff --git a/crates/qdrant/lib/api/src/grpc/proto/collections_internal_service.proto b/crates/qdrant/lib/api/src/grpc/proto/collections_internal_service.proto
deleted file mode 100644
index 0f4bd26..0000000
--- a/crates/qdrant/lib/api/src/grpc/proto/collections_internal_service.proto
+++ /dev/null
@@ -1,26 +0,0 @@
-syntax = "proto3";
-
-import "collections.proto";
-
-package qdrant;
-
-service CollectionsInternal {
-  /*
- Get collection info
- */
-  rpc Get (GetCollectionInfoRequestInternal) returns (GetCollectionInfoResponse) {}
-  /*
-  Initiate shard transfer
-  */
-  rpc Initiate (InitiateShardTransferRequest) returns (CollectionOperationResponse) {}
-}
-
-message GetCollectionInfoRequestInternal {
-  GetCollectionInfoRequest get_collectionInfoRequest = 1;
-  uint32 shard_id = 2;
-}
-
-message InitiateShardTransferRequest {
-  string collection_name = 1; // Name of the collection
-  uint32 shard_id = 2; // Id of the temporary shard
-}
\ No newline at end of file
diff --git a/crates/qdrant/lib/api/src/grpc/proto/collections_service.proto b/crates/qdrant/lib/api/src/grpc/proto/collections_service.proto
deleted file mode 100644
index 2297027..0000000
--- a/crates/qdrant/lib/api/src/grpc/proto/collections_service.proto
+++ /dev/null
@@ -1,48 +0,0 @@
-syntax = "proto3";
-
-import "collections.proto";
-
-package qdrant;
-
-service Collections {
-  /*
-  Get detailed information about specified existing collection
-   */
-  rpc Get (GetCollectionInfoRequest) returns (GetCollectionInfoResponse) {}
-  /*
-  Get list name of all existing collections
-   */
-  rpc List (ListCollectionsRequest) returns (ListCollectionsResponse) {}
-  /*
-  Create new collection with given parameters
-   */
-  rpc Create (CreateCollection) returns (CollectionOperationResponse) {}
-  /*
-  Update parameters of the existing collection
-   */
-  rpc Update (UpdateCollection) returns (CollectionOperationResponse) {}
-  /*
-  Drop collection and all associated data
-   */
-  rpc Delete (DeleteCollection) returns (CollectionOperationResponse) {}
-  /*
-  Update Aliases of the existing collection
-  */
-  rpc UpdateAliases (ChangeAliases) returns (CollectionOperationResponse) {}
-  /*
-  Get list of all aliases for a collection
-  */
-  rpc ListCollectionAliases (ListCollectionAliasesRequest) returns (ListAliasesResponse) {}
-  /*
-  Get list of all aliases for all existing collections
-  */
-  rpc ListAliases (ListAliasesRequest) returns (ListAliasesResponse) {}
-  /*
-  Get cluster information for a collection
-  */
-  rpc CollectionClusterInfo (CollectionClusterInfoRequest) returns (CollectionClusterInfoResponse) {}
-  /*
-  Update cluster setup for a collection
-  */
-  rpc UpdateCollectionClusterSetup (UpdateCollectionClusterSetupRequest) returns (UpdateCollectionClusterSetupResponse) {}
-}
diff --git a/crates/qdrant/lib/api/src/grpc/proto/json_with_int.proto b/crates/qdrant/lib/api/src/grpc/proto/json_with_int.proto
deleted file mode 100644
index 3fc496e..0000000
--- a/crates/qdrant/lib/api/src/grpc/proto/json_with_int.proto
+++ /dev/null
@@ -1,61 +0,0 @@
-// Fork of the google.protobuf.Value with explicit support for integer values
-
-syntax = "proto3";
-
-package qdrant;
-
-// `Struct` represents a structured data value, consisting of fields
-// which map to dynamically typed values. In some languages, `Struct`
-// might be supported by a native representation. For example, in
-// scripting languages like JS a struct is represented as an
-// object. The details of that representation are described together
-// with the proto support for the language.
-//
-// The JSON representation for `Struct` is a JSON object.
-message Struct {
-  // Unordered map of dynamically typed values.
-  map<string, Value> fields = 1;
-}
-
-// `Value` represents a dynamically typed value which can be either
-// null, a number, a string, a boolean, a recursive struct value, or a
-// list of values. A producer of value is expected to set one of those
-// variants, absence of any variant indicates an error.
-//
-// The JSON representation for `Value` is a JSON value.
-message Value {
-  // The kind of value.
-  oneof kind {
-    // Represents a null value.
-    NullValue null_value = 1;
-    // Represents a double value.
-    double double_value = 2;
-    // Represents an integer value
-    int64 integer_value = 3;
-    // Represents a string value.
-    string string_value = 4;
-    // Represents a boolean value.
-    bool bool_value = 5;
-    // Represents a structured value.
-    Struct struct_value = 6;
-    // Represents a repeated `Value`.
-    ListValue list_value = 7;
-  }
-}
-
-// `NullValue` is a singleton enumeration to represent the null value for the
-// `Value` type union.
-//
-//  The JSON representation for `NullValue` is JSON `null`.
-enum NullValue {
-  // Null value.
-  NULL_VALUE = 0;
-}
-
-// `ListValue` is a wrapper around a repeated field of values.
-//
-// The JSON representation for `ListValue` is a JSON array.
-message ListValue {
-  // Repeated field of dynamically typed values.
-  repeated Value values = 1;
-}
diff --git a/crates/qdrant/lib/api/src/grpc/proto/points.proto b/crates/qdrant/lib/api/src/grpc/proto/points.proto
deleted file mode 100644
index 4390db0..0000000
--- a/crates/qdrant/lib/api/src/grpc/proto/points.proto
+++ /dev/null
@@ -1,616 +0,0 @@
-syntax = "proto3";
-
-package qdrant;
-
-import "json_with_int.proto";
-import "collections.proto";
-
-
-enum WriteOrderingType {
-  Weak = 0; // Write operations may be reordered, works faster, default
-  Medium = 1; // Write operations go through dynamically selected leader, may be inconsistent for a short period of time in case of leader change
-  Strong = 2; // Write operations go through the permanent leader, consistent, but may be unavailable if leader is down
-}
-
-message WriteOrdering {
-  WriteOrderingType type = 1; // Write ordering guarantees
-}
-
-enum ReadConsistencyType {
-  All = 0; // Send request to all nodes and return points which are present on all of them
-  Majority = 1; // Send requests to all nodes and return points which are present on majority of them
-  Quorum = 2; // Send requests to half + 1 nodes, return points which are present on all of them
-}
-
-message ReadConsistency {
-  oneof value {
-    ReadConsistencyType type = 1; // Common read consistency configurations
-    uint64 factor = 2; // Send request to a specified number of nodes, and return points which are present on all of them
-  }
-}
-
-// ---------------------------------------------
-// ------------- Point Id Requests -------------
-// ---------------------------------------------
-
-message PointId {
-  oneof point_id_options {
-    uint64 num = 1; // Numerical ID of the point
-    string uuid = 2; // UUID
-  }
-}
-
-message Vector {
-  repeated float data = 1;
-}
-
-// ---------------------------------------------
-// ---------------- RPC Requests ---------------
-// ---------------------------------------------
-
-message UpsertPoints {
-  string collection_name = 1; // name of the collection
-  optional bool wait = 2; // Wait until the changes have been applied?
-  repeated PointStruct points = 3;
-  optional WriteOrdering ordering = 4; // Write ordering guarantees
-}
-
-message DeletePoints {
-  string collection_name = 1; // name of the collection
-  optional bool wait = 2; // Wait until the changes have been applied?
-  PointsSelector points = 3; // Affected points
-  optional WriteOrdering ordering = 4; // Write ordering guarantees
-}
-
-message GetPoints {
-  string collection_name = 1; // name of the collection
-  repeated PointId ids = 2; // List of points to retrieve
-  reserved 3; // deprecated "with_vector" field
-  WithPayloadSelector with_payload = 4; // Options for specifying which payload to include or not
-  optional WithVectorsSelector with_vectors = 5; // Options for specifying which vectors to include into response
-  optional ReadConsistency read_consistency = 6; // Options for specifying read consistency guarantees
-}
-
-message UpdatePointVectors {
-  string collection_name = 1; // name of the collection
-  optional bool wait = 2; // Wait until the changes have been applied?
-  repeated PointVectors points = 3; // List of points and vectors to update
-  optional WriteOrdering ordering = 4; // Write ordering guarantees
-}
-
-message PointVectors {
-  PointId id = 1; // ID to update vectors for
-  Vectors vectors = 2; // Named vectors to update, leave others intact
-}
-
-message DeletePointVectors {
-  string collection_name = 1; // name of the collection
-  optional bool wait = 2; // Wait until the changes have been applied?
-  PointsSelector points_selector = 3; // Affected points
-  VectorsSelector vectors = 4; // List of vector names to delete
-  optional WriteOrdering ordering = 5; // Write ordering guarantees
-}
-
-message SetPayloadPoints {
-  string collection_name = 1; // name of the collection
-  optional bool wait = 2; // Wait until the changes have been applied?
-  map<string, Value> payload = 3; // New payload values
-  reserved 4; // List of point to modify, deprecated
-  optional PointsSelector points_selector = 5; // Affected points
-  optional WriteOrdering ordering = 6; // Write ordering guarantees
-}
-
-message DeletePayloadPoints {
-  string collection_name = 1; // name of the collection
-  optional bool wait = 2; // Wait until the changes have been applied?
-  repeated string keys = 3; // List of keys to delete
-  reserved 4; // Affected points, deprecated
-  optional PointsSelector points_selector = 5; // Affected points
-  optional WriteOrdering ordering = 6; // Write ordering guarantees
-}
-
-message ClearPayloadPoints {
-  string collection_name = 1; // name of the collection
-  optional bool wait = 2; // Wait until the changes have been applied?
-  PointsSelector points = 3; // Affected points
-  optional WriteOrdering ordering = 4; // Write ordering guarantees
-}
-
-enum FieldType {
-  FieldTypeKeyword = 0;
-  FieldTypeInteger = 1;
-  FieldTypeFloat = 2;
-  FieldTypeGeo = 3;
-  FieldTypeText = 4;
-  FieldTypeBool = 5;
-}
-
-message CreateFieldIndexCollection {
-  string collection_name = 1; // name of the collection
-  optional bool wait = 2; // Wait until the changes have been applied?
-  string field_name = 3; // Field name to index
-  optional FieldType field_type = 4; // Field type.
-  optional PayloadIndexParams field_index_params = 5; // Payload index params.
-  optional WriteOrdering ordering = 6; // Write ordering guarantees
-}
-
-message DeleteFieldIndexCollection {
-  string collection_name = 1; // name of the collection
-  optional bool wait = 2; // Wait until the changes have been applied?
-  string field_name = 3; // Field name to delete
-  optional WriteOrdering ordering = 4; // Write ordering guarantees
-}
-
-message PayloadIncludeSelector {
-  repeated string fields = 1; // List of payload keys to include into result
-}
-
-message PayloadExcludeSelector {
-  repeated string fields = 1; // List of payload keys to exclude from the result
-}
-
-message WithPayloadSelector {
-  oneof selector_options {
-    bool enable = 1; // If `true` - return all payload, if `false` - none
-    PayloadIncludeSelector include = 2;
-    PayloadExcludeSelector exclude = 3;
-  }
-}
-
-message NamedVectors {
-  map<string, Vector> vectors = 1;
-}
-
-message Vectors {
-  oneof vectors_options {
-    Vector vector = 1;
-    NamedVectors vectors = 2;
-  }
-}
-
-message VectorsSelector {
-  repeated string names = 1; // List of vectors to include into result
-}
-
-message WithVectorsSelector {
-  oneof selector_options {
-    bool enable = 1; // If `true` - return all vectors, if `false` - none
-    VectorsSelector include = 2; // List of payload keys to include into result
-  }
-}
-
-message QuantizationSearchParams {
-  /*
-  If set to true, search will ignore quantized vector data
-   */
-  optional bool ignore = 1;
-
-  /*
-  If true, use original vectors to re-score top-k results. Default is true.
-   */
-  optional bool rescore = 2;
-
-  /*
-  Oversampling factor for quantization.
-
-  Defines how many extra vectors should be pre-selected using quantized index,
-  and then re-scored using original vectors.
-
-  For example, if `oversampling` is 2.4 and `limit` is 100, then 240 vectors will be pre-selected using quantized index,
-  and then top-100 will be returned after re-scoring.
-   */
-  optional double oversampling = 3;
-}
-
-message SearchParams {
-  /*
-  Params relevant to HNSW index. Size of the beam in a beam-search.
-  Larger the value - more accurate the result, more time required for search.
-   */
-  optional uint64 hnsw_ef = 1;
-
-  /*
-  Search without approximation. If set to true, search may run long but with exact results.
-  */
-  optional bool exact = 2;
-
-  /*
-  If set to true, search will ignore quantized vector data 
-  */
-  optional QuantizationSearchParams quantization = 3;
-}
-
-message SearchPoints {
-  string collection_name = 1; // name of the collection
-  repeated float vector = 2; // vector
-  Filter filter = 3; // Filter conditions - return only those points that satisfy the specified conditions
-  uint64 limit = 4; // Max number of result
-  reserved 5; // deprecated "with_vector" field
-  WithPayloadSelector with_payload = 6; // Options for specifying which payload to include or not
-  SearchParams params = 7; // Search config
-  optional float score_threshold = 8; // If provided - cut off results with worse scores
-  optional uint64 offset = 9; // Offset of the result
-  optional string vector_name = 10; // Which vector to use for search, if not specified - use default vector
-  optional WithVectorsSelector with_vectors = 11; // Options for specifying which vectors to include into response
-  optional ReadConsistency read_consistency = 12; // Options for specifying read consistency guarantees
-}
-
-message SearchBatchPoints {
-  string collection_name = 1; // Name of the collection
-  repeated SearchPoints search_points = 2;
-  optional ReadConsistency read_consistency = 3; // Options for specifying read consistency guarantees
-}
-
-message WithLookup {
-  string collection = 1; // Name of the collection to use for points lookup
-  optional WithPayloadSelector with_payload = 2; // Options for specifying which payload to include (or not)
-  optional WithVectorsSelector with_vectors = 3; // Options for specifying which vectors to include (or not)
-}
-
-
-message SearchPointGroups {
-  string collection_name = 1; // Name of the collection
-  repeated float vector = 2; // Vector to compare against
-  Filter filter = 3; // Filter conditions - return only those points that satisfy the specified conditions
-  uint32 limit = 4; // Max number of result
-  WithPayloadSelector with_payload = 5; // Options for specifying which payload to include or not
-  SearchParams params = 6; // Search config
-  optional float score_threshold = 7; // If provided - cut off results with worse scores
-  optional string vector_name = 8; // Which vector to use for search, if not specified - use default vector
-  optional WithVectorsSelector with_vectors = 9; // Options for specifying which vectors to include into response
-  string group_by = 10; // Payload field to group by, must be a string or number field. If there are multiple values for the field, all of them will be used. One point can be in multiple groups.
-  uint32 group_size = 11; // Maximum amount of points to return per group
-  optional ReadConsistency read_consistency = 12; // Options for specifying read consistency guarantees
-  optional WithLookup with_lookup = 13; // Options for specifying how to use the group id to lookup points in another collection
-}
-
-message ScrollPoints {
-  string collection_name = 1;
-  Filter filter = 2; // Filter conditions - return only those points that satisfy the specified conditions
-  optional PointId offset = 3; // Start with this ID
-  optional uint32 limit = 4; // Max number of result
-  reserved 5; // deprecated "with_vector" field
-  WithPayloadSelector with_payload = 6; // Options for specifying which payload to include or not
-  optional WithVectorsSelector with_vectors = 7; // Options for specifying which vectors to include into response
-  optional ReadConsistency read_consistency = 8; // Options for specifying read consistency guarantees
-}
-
-message LookupLocation {
-  string collection_name = 1;
-  optional string vector_name = 2; // Which vector to use for search, if not specified - use default vector
-}
-
-message RecommendPoints {
-  string collection_name = 1; // name of the collection
-  repeated PointId positive = 2; // Look for vectors closest to those
-  repeated PointId negative = 3; // Try to avoid vectors like this
-  Filter filter = 4; // Filter conditions - return only those points that satisfy the specified conditions
-  uint64 limit = 5; // Max number of result
-  reserved 6; // deprecated "with_vector" field
-  WithPayloadSelector with_payload = 7; // Options for specifying which payload to include or not
-  SearchParams params = 8; // Search config
-  optional float score_threshold = 9; // If provided - cut off results with worse scores
-  optional uint64 offset = 10; // Offset of the result
-  optional string using = 11; // Define which vector to use for recommendation, if not specified - default vector
-  optional WithVectorsSelector with_vectors = 12; // Options for specifying which vectors to include into response
-  optional LookupLocation lookup_from = 13; // Name of the collection to use for points lookup, if not specified - use current collection
-  optional ReadConsistency read_consistency = 14; // Options for specifying read consistency guarantees
-}
-
-message RecommendBatchPoints {
-  string collection_name = 1; // Name of the collection
-  repeated RecommendPoints recommend_points = 2;
-  optional ReadConsistency read_consistency = 3; // Options for specifying read consistency guarantees
-}
-
-message RecommendPointGroups {
-  string collection_name = 1; // Name of the collection
-  repeated PointId positive = 2; // Look for vectors closest to those
-  repeated PointId negative = 3; // Try to avoid vectors like this
-  Filter filter = 4; // Filter conditions - return only those points that satisfy the specified conditions
-  uint32 limit = 5; // Max number of groups in result
-  WithPayloadSelector with_payload = 6; // Options for specifying which payload to include or not
-  SearchParams params = 7; // Search config
-  optional float score_threshold = 8; // If provided - cut off results with worse scores
-  optional string using = 9; // Define which vector to use for recommendation, if not specified - default vector
-  optional WithVectorsSelector with_vectors = 10; // Options for specifying which vectors to include into response
-  optional LookupLocation lookup_from = 11; // Name of the collection to use for points lookup, if not specified - use current collection
-  string group_by = 12; // Payload field to group by, must be a string or number field. If there are multiple values for the field, all of them will be used. One point can be in multiple groups.
-  uint32 group_size = 13; // Maximum amount of points to return per group
-  optional ReadConsistency read_consistency = 14; // Options for specifying read consistency guarantees
-  optional WithLookup with_lookup = 15; // Options for specifying how to use the group id to lookup points in another collection
-}
-
-message CountPoints {
-  string collection_name = 1; // name of the collection
-  Filter filter = 2; // Filter conditions - return only those points that satisfy the specified conditions
-  optional bool exact = 3; // If `true` - return exact count, if `false` - return approximate count
-}
-
-message PointsUpdateOperation {
-  message PointStructList {
-    repeated PointStruct points = 1;
-  }
-  message SetPayload {
-      map<string, Value> payload = 1;
-      optional PointsSelector points_selector = 2; // Affected points
-  }
-  message DeletePayload {
-      repeated string keys = 1;
-      optional PointsSelector points_selector = 2; // Affected points
-  }
-  message UpdateVectors {
-    repeated PointVectors points = 1; // List of points and vectors to update
-  }
-  message DeleteVectors {
-    PointsSelector points_selector = 1; // Affected points
-    VectorsSelector vectors = 2; // List of vector names to delete
-  }
-
-  oneof operation {
-    PointStructList upsert = 1;
-    PointsSelector delete = 2;
-    SetPayload set_payload = 3;
-    SetPayload overwrite_payload = 4;
-    DeletePayload delete_payload = 5;
-    PointsSelector clear_payload = 6;
-    UpdateVectors update_vectors = 7;
-    DeleteVectors delete_vectors = 8;
-  }
-}
-
-message UpdateBatchPoints {
-  string collection_name = 1; // name of the collection
-  optional bool wait = 2; // Wait until the changes have been applied?
-  repeated PointsUpdateOperation operations = 3;
-  optional WriteOrdering ordering = 4; // Write ordering guarantees
-}
-
-// ---------------------------------------------
-// ---------------- RPC Response ---------------
-// ---------------------------------------------
-
-message PointsOperationResponse {
-  UpdateResult result = 1;
-  double time = 2; // Time spent to process
-}
-
-message UpdateResult {
-  uint64 operation_id = 1; // Number of operation
-  UpdateStatus status = 2; // Operation status
-}
-
-enum UpdateStatus {
-  UnknownUpdateStatus = 0;
-  Acknowledged = 1; // Update is received, but not processed yet
-  Completed = 2; // Update is applied and ready for search
-}
-
-message ScoredPoint {
-  PointId id = 1; // Point id
-  map<string, Value> payload = 2; // Payload
-  float score = 3; // Similarity score
-  reserved 4; // deprecated "vector" field
-  uint64 version = 5; // Last update operation applied to this point
-  optional Vectors vectors = 6; // Vectors to search
-}
-
-message GroupId {
-  oneof kind {
-    // Represents a double value.
-    uint64 unsigned_value = 1;
-    // Represents an integer value
-    int64 integer_value = 2;
-    // Represents a string value.
-    string string_value = 3;
-  }
-}
-
-message PointGroup {
-  GroupId id = 1; // Group id
-  repeated ScoredPoint hits = 2; // Points in the group 
-  RetrievedPoint lookup = 3; // Point(s) from the lookup collection that matches the group id
-}
-
-message GroupsResult {
-  repeated PointGroup groups = 1; // Groups
-}
-
-message SearchResponse {
-  repeated ScoredPoint result = 1;
-  double time = 2; // Time spent to process
-}
-
-message BatchResult {
-  repeated ScoredPoint result = 1;
-}
-
-message SearchBatchResponse {
-  repeated BatchResult result = 1;
-  double time = 2; // Time spent to process
-}
-
-message SearchGroupsResponse {
-  GroupsResult result = 1;
-  double time = 2; // Time spent to process
-}
-
-message CountResponse {
-  CountResult result = 1;
-  double time = 2; // Time spent to process
-}
-
-message ScrollResponse {
-  optional PointId next_page_offset = 1; // Use this offset for the next query
-  repeated RetrievedPoint result = 2;
-  double time = 3; // Time spent to process
-}
-
-message CountResult {
-  uint64 count = 1;
-}
-
-message RetrievedPoint {
-  PointId id = 1;
-  map<string, Value> payload = 2;
-  reserved 3; // deprecated "vector" field
-  optional Vectors vectors = 4;
-}
-
-message GetResponse {
-  repeated RetrievedPoint result = 1;
-  double time = 2; // Time spent to process
-}
-
-message RecommendResponse {
-  repeated ScoredPoint result = 1;
-  double time = 2; // Time spent to process
-}
-
-message RecommendBatchResponse {
-  repeated BatchResult result = 1;
-  double time = 2; // Time spent to process
-}
-
-message RecommendGroupsResponse {
-  GroupsResult result = 1;
-  double time = 2; // Time spent to process
-}
-
-message UpdateBatchResponse {
-  repeated UpdateResult result = 1;
-  double time = 2; // Time spent to process
-}
-
-// ---------------------------------------------
-// ------------- Filter Conditions -------------
-// ---------------------------------------------
-
-message Filter {
-  repeated Condition should = 1; // At least one of those conditions should match
-  repeated Condition must = 2; // All conditions must match
-  repeated Condition must_not = 3; // All conditions must NOT match
-}
-
-message Condition {
-  oneof condition_one_of {
-    FieldCondition field = 1;
-    IsEmptyCondition is_empty = 2;
-    HasIdCondition has_id = 3;
-    Filter filter = 4;
-    IsNullCondition is_null = 5;
-    NestedCondition nested = 6;
-  }
-}
-
-message IsEmptyCondition {
-  string key = 1;
-}
-
-message IsNullCondition {
-    string key = 1;
-}
-
-message HasIdCondition {
-  repeated PointId has_id = 1;
-}
-
-message NestedCondition {
-  string key = 1; // Path to nested object
-  Filter filter = 2; // Filter condition
-}
-
-message FieldCondition {
-  string key = 1;
-  Match match = 2; // Check if point has field with a given value
-  Range range = 3; // Check if points value lies in a given range
-  GeoBoundingBox geo_bounding_box = 4; // Check if points geolocation lies in a given area
-  GeoRadius geo_radius = 5; // Check if geo point is within a given radius
-  ValuesCount values_count = 6; // Check number of values for a specific field
-  //  GeoPolygon geo_polygon = 7; // Check if geo point is within a given polygon
-}
-
-message Match {
-  oneof match_value {
-    string keyword = 1; // Match string keyword
-    int64 integer = 2; // Match integer
-    bool boolean = 3; // Match boolean
-    string text = 4; // Match text
-    RepeatedStrings keywords = 5; // Match multiple keywords
-    RepeatedIntegers integers = 6; // Match multiple integers
-    RepeatedIntegers except_integers = 7; // Match any other value except those integers
-    RepeatedStrings except_keywords = 8; // Match any other value except those keywords
-  }
-}
-
-message RepeatedStrings {
-  repeated string strings = 1;
-}
-
-message RepeatedIntegers {
-  repeated int64 integers = 1;
-}
-
-message Range {
-  optional double lt = 1;
-  optional double gt = 2;
-  optional double gte = 3;
-  optional double lte = 4;
-}
-
-message GeoBoundingBox {
-  GeoPoint top_left = 1; // north-west corner
-  GeoPoint bottom_right = 2; // south-east corner
-}
-
-message GeoRadius {
-  GeoPoint center = 1; // Center of the circle
-  float radius = 2; // In meters
-}
-
-message GeoPolygon {
-  // Ordered list of coordinates representing the vertices of a polygon.
-  // The minimum size is 4, and the first coordinate and the last coordinate
-  // should be the same to form a closed polygon.
-  repeated GeoPoint points = 1;
-}
-
-message ValuesCount {
-  optional uint64 lt = 1;
-  optional uint64 gt = 2;
-  optional uint64 gte = 3;
-  optional uint64 lte = 4;
-}
-
-// ---------------------------------------------
-// -------------- Points Selector --------------
-// ---------------------------------------------
-
-message PointsSelector {
-  oneof points_selector_one_of {
-    PointsIdsList points = 1;
-    Filter filter = 2;
-  }
-}
-
-message PointsIdsList {
-  repeated PointId ids = 1;
-}
-
-// ---------------------------------------------
-// ------------------- Point -------------------
-// ---------------------------------------------
-
-
-message PointStruct {
-  PointId id = 1;
-  reserved 2; // deprecated "vector" field
-  map<string, Value> payload = 3;
-  optional Vectors vectors = 4;
-}
-
-
-message GeoPoint {
-  double lon = 1;
-  double lat = 2;
-}
diff --git a/crates/qdrant/lib/api/src/grpc/proto/points_internal_service.proto b/crates/qdrant/lib/api/src/grpc/proto/points_internal_service.proto
deleted file mode 100644
index cbce163..0000000
--- a/crates/qdrant/lib/api/src/grpc/proto/points_internal_service.proto
+++ /dev/null
@@ -1,118 +0,0 @@
-syntax = "proto3";
-
-import "points.proto";
-
-package qdrant;
-
-import "google/protobuf/struct.proto";
-
-service PointsInternal {
-  rpc Upsert (UpsertPointsInternal) returns (PointsOperationResponse) {}
-  rpc Sync (SyncPointsInternal) returns (PointsOperationResponse) {}
-  rpc Delete (DeletePointsInternal) returns (PointsOperationResponse) {}
-  rpc UpdateVectors (UpdateVectorsInternal) returns (PointsOperationResponse) {}
-  rpc DeleteVectors (DeleteVectorsInternal) returns (PointsOperationResponse) {}
-  rpc SetPayload (SetPayloadPointsInternal) returns (PointsOperationResponse) {}
-  rpc OverwritePayload (SetPayloadPointsInternal) returns (PointsOperationResponse) {}
-  rpc DeletePayload (DeletePayloadPointsInternal) returns (PointsOperationResponse) {}
-  rpc ClearPayload (ClearPayloadPointsInternal) returns (PointsOperationResponse) {}
-  rpc CreateFieldIndex (CreateFieldIndexCollectionInternal) returns (PointsOperationResponse) {}
-  rpc DeleteFieldIndex (DeleteFieldIndexCollectionInternal) returns (PointsOperationResponse) {}
-  rpc Search (SearchPointsInternal) returns (SearchResponse) {}
-  rpc SearchBatch (SearchBatchPointsInternal) returns (SearchBatchResponse) {}
-  rpc Scroll (ScrollPointsInternal) returns (ScrollResponse) {}
-  rpc Count (CountPointsInternal) returns (CountResponse) {}
-  rpc Recommend (RecommendPointsInternal) returns (RecommendResponse) {}
-  rpc Get (GetPointsInternal) returns (GetResponse) {}
-}
-
-
-message SyncPoints {
-  string collection_name = 1; // name of the collection
-  optional bool wait = 2; // Wait until the changes have been applied?
-  repeated PointStruct points = 3;
-  optional PointId from_id = 4; // Start of the sync range
-  optional PointId to_id = 5; // End of the sync range
-  optional WriteOrdering ordering = 6;
-}
-
-message SyncPointsInternal {
-  SyncPoints sync_points = 1;
-  optional uint32 shard_id = 2;
-}
-
-message UpsertPointsInternal {
-  UpsertPoints upsert_points = 1;
-  optional uint32 shard_id = 2;
-}
-
-message DeletePointsInternal {
-  DeletePoints delete_points = 1;
-  optional uint32 shard_id = 2;
-}
-
-message UpdateVectorsInternal {
-  UpdatePointVectors update_vectors = 1;
-  optional uint32 shard_id = 2;
-}
-
-message DeleteVectorsInternal {
-  DeletePointVectors delete_vectors = 1;
-  optional uint32 shard_id = 2;
-}
-
-message SetPayloadPointsInternal {
-  SetPayloadPoints set_payload_points = 1;
-  optional uint32 shard_id = 2;
-}
-
-message DeletePayloadPointsInternal {
-  DeletePayloadPoints delete_payload_points = 1;
-  optional uint32 shard_id = 2;
-}
-
-message ClearPayloadPointsInternal {
-  ClearPayloadPoints clear_payload_points = 1;
-  optional uint32 shard_id = 2;
-}
-
-message CreateFieldIndexCollectionInternal {
-  CreateFieldIndexCollection create_field_index_collection = 1;
-  optional uint32 shard_id = 2;
-}
-
-message DeleteFieldIndexCollectionInternal {
-  DeleteFieldIndexCollection delete_field_index_collection = 1;
-  optional uint32 shard_id = 2;
-}
-
-message SearchPointsInternal {
-  SearchPoints search_points = 1;
-  optional uint32 shard_id = 2;
-}
-
-message SearchBatchPointsInternal {
-  string collection_name = 1;
-  repeated SearchPoints search_points = 2;
-  optional uint32 shard_id = 3;
-}
-
-message ScrollPointsInternal {
-  ScrollPoints scroll_points = 1;
-  optional uint32 shard_id = 2;
-}
-
-message RecommendPointsInternal {
-  RecommendPoints recommend_points = 1;
-  optional uint32 shard_id = 2;
-}
-
-message GetPointsInternal {
-  GetPoints get_points = 1;
-  optional uint32 shard_id = 2;
-}
-
-message CountPointsInternal {
-  CountPoints count_points = 1;
-  optional uint32 shard_id = 2;
-}
diff --git a/crates/qdrant/lib/api/src/grpc/proto/points_service.proto b/crates/qdrant/lib/api/src/grpc/proto/points_service.proto
deleted file mode 100644
index 607e116..0000000
--- a/crates/qdrant/lib/api/src/grpc/proto/points_service.proto
+++ /dev/null
@@ -1,91 +0,0 @@
-syntax = "proto3";
-
-import "points.proto";
-
-package qdrant;
-
-import "google/protobuf/struct.proto";
-
-service Points {
-  /*
-  Perform insert + updates on points. If a point with a given ID already exists - it will be overwritten.
-   */
-  rpc Upsert (UpsertPoints) returns (PointsOperationResponse) {}
-  /*
-  Delete points
-   */
-  rpc Delete (DeletePoints) returns (PointsOperationResponse) {}
-  /*
-  Retrieve points
-   */
-  rpc Get (GetPoints) returns (GetResponse) {}
-  /*
-  Update named vectors for point
-   */
-  rpc UpdateVectors (UpdatePointVectors) returns (PointsOperationResponse) {}
-  /*
-  Delete named vectors for points
-   */
-  rpc DeleteVectors (DeletePointVectors) returns (PointsOperationResponse) {}
-  /*
-  Set payload for points
-   */
-  rpc SetPayload (SetPayloadPoints) returns (PointsOperationResponse) {}
-  /*
-  Overwrite payload for points
-   */
-  rpc OverwritePayload (SetPayloadPoints) returns (PointsOperationResponse) {}
-  /*
-  Delete specified key payload for points
-   */
-  rpc DeletePayload (DeletePayloadPoints) returns (PointsOperationResponse) {}
-  /*
-  Remove all payload for specified points
-   */
-  rpc ClearPayload (ClearPayloadPoints) returns (PointsOperationResponse) {}
-  /*
-  Create index for field in collection
-   */
-  rpc CreateFieldIndex (CreateFieldIndexCollection) returns (PointsOperationResponse) {}
-  /*
-  Delete field index for collection
-   */
-  rpc DeleteFieldIndex (DeleteFieldIndexCollection) returns (PointsOperationResponse) {}
-  /*
-  Retrieve closest points based on vector similarity and given filtering conditions
-   */
-  rpc Search (SearchPoints) returns (SearchResponse) {}
-  /*
-   Retrieve closest points based on vector similarity and given filtering conditions
-    */
-  rpc SearchBatch (SearchBatchPoints) returns (SearchBatchResponse) {}
-  /*
-  Retrieve closest points based on vector similarity and given filtering conditions, grouped by a given field
-   */
-  rpc SearchGroups (SearchPointGroups) returns (SearchGroupsResponse) {}
-  /*
-  Iterate over all or filtered points points
-  */
-  rpc Scroll (ScrollPoints) returns (ScrollResponse) {}
-  /*
-  Look for the points which are closer to stored positive examples and at the same time further to negative examples.
-   */
-  rpc Recommend (RecommendPoints) returns (RecommendResponse) {}
-  /*
-  Look for the points which are closer to stored positive examples and at the same time further to negative examples.
-   */
-  rpc RecommendBatch (RecommendBatchPoints) returns (RecommendBatchResponse) {}
-    /*
-  Look for the points which are closer to stored positive examples and at the same time further to negative examples, grouped by a given field
-   */
-  rpc RecommendGroups (RecommendPointGroups) returns (RecommendGroupsResponse) {}
-  /*
-   Count points in collection with given filtering conditions
-   */
-  rpc Count (CountPoints) returns (CountResponse) {}
-
-  /*
-   Perform multiple update operations in one request
-  */
-  rpc UpdateBatch (UpdateBatchPoints) returns (UpdateBatchResponse) {}
-}
diff --git a/crates/qdrant/lib/api/src/grpc/proto/qdrant.proto b/crates/qdrant/lib/api/src/grpc/proto/qdrant.proto
deleted file mode 100644
index 534c93a..0000000
--- a/crates/qdrant/lib/api/src/grpc/proto/qdrant.proto
+++ /dev/null
@@ -1,22 +0,0 @@
-syntax = "proto3";
-
-import "collections_service.proto";
-import "collections_internal_service.proto";
-import "points_service.proto";
-import "points_internal_service.proto";
-import "raft_service.proto";
-import "snapshots_service.proto";
-
-package qdrant;
-
-service Qdrant {
-  rpc HealthCheck (HealthCheckRequest) returns (HealthCheckReply) {}
-}
-
-message HealthCheckRequest {
-}
-
-message HealthCheckReply {
-  string title = 1;
-  string version = 2;
-}
diff --git a/crates/qdrant/lib/api/src/grpc/proto/raft_service.proto b/crates/qdrant/lib/api/src/grpc/proto/raft_service.proto
deleted file mode 100644
index b1d6caf..0000000
--- a/crates/qdrant/lib/api/src/grpc/proto/raft_service.proto
+++ /dev/null
@@ -1,51 +0,0 @@
-syntax = "proto3";
-
-package qdrant;
-
-import "google/protobuf/empty.proto";
-
-service Raft {
-  // Send Raft message to another peer
-  rpc Send (RaftMessage) returns (google.protobuf.Empty);
-  // Send to bootstrap peer
-  // Returns uri by id if bootstrap knows this peer
-  rpc WhoIs (PeerId) returns (Uri);
-  // Send to bootstrap peer
-  // Adds peer to the network
-  // Returns all peers
-  rpc AddPeerToKnown (AddPeerToKnownMessage) returns (AllPeers);
-  // DEPRECATED
-  // Its functionality is now included in `AddPeerToKnown`
-  //
-  // Send to bootstrap peer
-  // Proposes to add this peer as participant of consensus
-  rpc AddPeerAsParticipant (PeerId) returns (google.protobuf.Empty);
-}
-
-message RaftMessage {
-    bytes message = 1;
-}
-
-message AllPeers {
-    repeated Peer all_peers = 1;
-    uint64 first_peer_id = 2;
-}
-
-message Peer {
-    string uri = 1;
-    uint64 id = 2;
-}
-
-message AddPeerToKnownMessage {
-  optional string uri = 1;
-  optional uint32 port = 2;
-  uint64 id = 3;
-}
-
-message PeerId {
-  uint64 id = 1;
-}
-
-message Uri {
-  string uri = 1;
-}
\ No newline at end of file
diff --git a/crates/qdrant/lib/api/src/grpc/proto/snapshots_service.proto b/crates/qdrant/lib/api/src/grpc/proto/snapshots_service.proto
deleted file mode 100644
index 5770268..0000000
--- a/crates/qdrant/lib/api/src/grpc/proto/snapshots_service.proto
+++ /dev/null
@@ -1,75 +0,0 @@
-syntax = "proto3";
-
-package qdrant;
-
-import "google/protobuf/struct.proto";
-import "google/protobuf/timestamp.proto";
-
-service Snapshots {
-  /*
- Create collection snapshot
-  */
-  rpc Create (CreateSnapshotRequest) returns (CreateSnapshotResponse) {}
-  /*
-  List collection snapshots
-   */
-  rpc List (ListSnapshotsRequest) returns (ListSnapshotsResponse) {}
-  /*
-  Delete collection snapshots
-   */
-  rpc Delete (DeleteSnapshotRequest) returns (DeleteSnapshotResponse) {}
-  /*
-  Create full storage snapshot
-  */
-  rpc CreateFull (CreateFullSnapshotRequest) returns (CreateSnapshotResponse) {}
-  /*
-  List full storage snapshots
-   */
-  rpc ListFull (ListFullSnapshotsRequest) returns (ListSnapshotsResponse) {}
-  /*
-  List full storage snapshots
-   */
-  rpc DeleteFull (DeleteFullSnapshotRequest) returns (DeleteSnapshotResponse) {}
-
-}
-
-message CreateFullSnapshotRequest {}
-
-message ListFullSnapshotsRequest {}
-
-message DeleteFullSnapshotRequest {
-  string snapshot_name = 1; // Name of the full snapshot
-}
-
-message CreateSnapshotRequest {
-  string collection_name = 1; // Name of the collection
-}
-
-message ListSnapshotsRequest {
-  string collection_name = 1; // Name of the collection
-}
-
-message DeleteSnapshotRequest {
-  string collection_name = 1; // Name of the collection
-  string snapshot_name = 2; // Name of the collection snapshot
-}
-
-message SnapshotDescription {
-  string name = 1; // Name of the snapshot
-  google.protobuf.Timestamp creation_time = 2; // Creation time of the snapshot
-  int64 size = 3; // Size of the snapshot in bytes
-}
-
-message CreateSnapshotResponse {
-  SnapshotDescription snapshot_description = 1;
-  double time = 2; // Time spent to process
-}
-
-message ListSnapshotsResponse {
-  repeated SnapshotDescription snapshot_descriptions = 1;
-  double time = 2; // Time spent to process
-}
-
-message DeleteSnapshotResponse {
-  double time = 1; // Time spent to process
-}
diff --git a/crates/qdrant/lib/api/src/grpc/qdrant.rs b/crates/qdrant/lib/api/src/grpc/qdrant.rs
deleted file mode 100644
index d4c3fae..0000000
--- a/crates/qdrant/lib/api/src/grpc/qdrant.rs
+++ /dev/null
@@ -1,9058 +0,0 @@
-#[derive(validator::Validate)]
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct VectorParams {
-    /// Size of the vectors
-    #[prost(uint64, tag = "1")]
-    #[validate(range(min = 1))]
-    pub size: u64,
-    /// Distance function used for comparing vectors
-    #[prost(enumeration = "Distance", tag = "2")]
-    pub distance: i32,
-    /// Configuration of vector HNSW graph. If omitted - the collection configuration will be used
-    #[prost(message, optional, tag = "3")]
-    #[validate]
-    pub hnsw_config: ::core::option::Option<HnswConfigDiff>,
-    /// Configuration of vector quantization config. If omitted - the collection configuration will be used
-    #[prost(message, optional, tag = "4")]
-    #[validate]
-    pub quantization_config: ::core::option::Option<QuantizationConfig>,
-    /// If true - serve vectors from disk. If set to false, the vectors will be loaded in RAM.
-    #[prost(bool, optional, tag = "5")]
-    pub on_disk: ::core::option::Option<bool>,
-}
-#[derive(validator::Validate)]
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct VectorParamsDiff {
-    /// Update params for HNSW index. If empty object - it will be unset
-    #[prost(message, optional, tag = "1")]
-    #[validate]
-    pub hnsw_config: ::core::option::Option<HnswConfigDiff>,
-    /// Update quantization params. If none - it is left unchanged.
-    #[prost(message, optional, tag = "2")]
-    #[validate]
-    pub quantization_config: ::core::option::Option<QuantizationConfigDiff>,
-    /// If true - serve vectors from disk. If set to false, the vectors will be loaded in RAM.
-    #[prost(bool, optional, tag = "3")]
-    pub on_disk: ::core::option::Option<bool>,
-}
-#[derive(validator::Validate)]
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct VectorParamsMap {
-    #[prost(map = "string, message", tag = "1")]
-    #[validate]
-    pub map: ::std::collections::HashMap<::prost::alloc::string::String, VectorParams>,
-}
-#[derive(validator::Validate)]
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct VectorParamsDiffMap {
-    #[prost(map = "string, message", tag = "1")]
-    #[validate]
-    pub map: ::std::collections::HashMap<
-        ::prost::alloc::string::String,
-        VectorParamsDiff,
-    >,
-}
-#[derive(validator::Validate)]
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct VectorsConfig {
-    #[prost(oneof = "vectors_config::Config", tags = "1, 2")]
-    #[validate]
-    pub config: ::core::option::Option<vectors_config::Config>,
-}
-/// Nested message and enum types in `VectorsConfig`.
-pub mod vectors_config {
-    #[derive(serde::Serialize)]
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Oneof)]
-    pub enum Config {
-        #[prost(message, tag = "1")]
-        Params(super::VectorParams),
-        #[prost(message, tag = "2")]
-        ParamsMap(super::VectorParamsMap),
-    }
-}
-#[derive(validator::Validate)]
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct VectorsConfigDiff {
-    #[prost(oneof = "vectors_config_diff::Config", tags = "1, 2")]
-    #[validate]
-    pub config: ::core::option::Option<vectors_config_diff::Config>,
-}
-/// Nested message and enum types in `VectorsConfigDiff`.
-pub mod vectors_config_diff {
-    #[derive(serde::Serialize)]
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Oneof)]
-    pub enum Config {
-        #[prost(message, tag = "1")]
-        Params(super::VectorParamsDiff),
-        #[prost(message, tag = "2")]
-        ParamsMap(super::VectorParamsDiffMap),
-    }
-}
-#[derive(validator::Validate)]
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct GetCollectionInfoRequest {
-    /// Name of the collection
-    #[prost(string, tag = "1")]
-    #[validate(length(min = 1, max = 255))]
-    pub collection_name: ::prost::alloc::string::String,
-}
-#[derive(validator::Validate)]
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct ListCollectionsRequest {}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct CollectionDescription {
-    /// Name of the collection
-    #[prost(string, tag = "1")]
-    pub name: ::prost::alloc::string::String,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct GetCollectionInfoResponse {
-    #[prost(message, optional, tag = "1")]
-    pub result: ::core::option::Option<CollectionInfo>,
-    /// Time spent to process
-    #[prost(double, tag = "2")]
-    pub time: f64,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct ListCollectionsResponse {
-    #[prost(message, repeated, tag = "1")]
-    pub collections: ::prost::alloc::vec::Vec<CollectionDescription>,
-    /// Time spent to process
-    #[prost(double, tag = "2")]
-    pub time: f64,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct OptimizerStatus {
-    #[prost(bool, tag = "1")]
-    pub ok: bool,
-    #[prost(string, tag = "2")]
-    pub error: ::prost::alloc::string::String,
-}
-#[derive(validator::Validate)]
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct HnswConfigDiff {
-    /// Number of edges per node in the index graph. Larger the value - more accurate the search, more space required.
-    #[prost(uint64, optional, tag = "1")]
-    pub m: ::core::option::Option<u64>,
-    /// Number of neighbours to consider during the index building. Larger the value - more accurate the search, more time required to build the index.
-    #[prost(uint64, optional, tag = "2")]
-    #[validate(custom = "crate::grpc::validate::validate_u64_range_min_4")]
-    pub ef_construct: ::core::option::Option<u64>,
-    /// Minimal size (in KiloBytes) of vectors for additional payload-based indexing.
-    /// If the payload chunk is smaller than `full_scan_threshold` additional indexing won't be used -
-    /// in this case full-scan search should be preferred by query planner and additional indexing is not required.
-    /// Note: 1 Kb = 1 vector of size 256
-    #[prost(uint64, optional, tag = "3")]
-    pub full_scan_threshold: ::core::option::Option<u64>,
-    /// Number of parallel threads used for background index building. If 0 - auto selection.
-    #[prost(uint64, optional, tag = "4")]
-    pub max_indexing_threads: ::core::option::Option<u64>,
-    /// Store HNSW index on disk. If set to false, the index will be stored in RAM.
-    #[prost(bool, optional, tag = "5")]
-    pub on_disk: ::core::option::Option<bool>,
-    /// Number of additional payload-aware links per node in the index graph. If not set - regular M parameter will be used.
-    #[prost(uint64, optional, tag = "6")]
-    pub payload_m: ::core::option::Option<u64>,
-}
-#[derive(validator::Validate)]
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct WalConfigDiff {
-    /// Size of a single WAL block file
-    #[prost(uint64, optional, tag = "1")]
-    #[validate(custom = "crate::grpc::validate::validate_u64_range_min_1")]
-    pub wal_capacity_mb: ::core::option::Option<u64>,
-    /// Number of segments to create in advance
-    #[prost(uint64, optional, tag = "2")]
-    pub wal_segments_ahead: ::core::option::Option<u64>,
-}
-#[derive(validator::Validate)]
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct OptimizersConfigDiff {
-    /// The minimal fraction of deleted vectors in a segment, required to perform segment optimization
-    #[prost(double, optional, tag = "1")]
-    #[validate(custom = "crate::grpc::validate::validate_f64_range_1")]
-    pub deleted_threshold: ::core::option::Option<f64>,
-    /// The minimal number of vectors in a segment, required to perform segment optimization
-    #[prost(uint64, optional, tag = "2")]
-    #[validate(custom = "crate::grpc::validate::validate_u64_range_min_100")]
-    pub vacuum_min_vector_number: ::core::option::Option<u64>,
-    /// Target amount of segments the optimizer will try to keep.
-    /// Real amount of segments may vary depending on multiple parameters:
-    ///
-    /// * Amount of stored points.
-    /// * Current write RPS.
-    ///
-    /// It is recommended to select the default number of segments as a factor of the number of search threads,
-    /// so that each segment would be handled evenly by one of the threads.
-    #[prost(uint64, optional, tag = "3")]
-    pub default_segment_number: ::core::option::Option<u64>,
-    /// Do not create segments larger this size (in kilobytes).
-    /// Large segments might require disproportionately long indexation times,
-    /// therefore it makes sense to limit the size of segments.
-    ///
-    /// If indexing speed is more important - make this parameter lower.
-    /// If search speed is more important - make this parameter higher.
-    /// Note: 1Kb = 1 vector of size 256
-    /// If not set, will be automatically selected considering the number of available CPUs.
-    #[prost(uint64, optional, tag = "4")]
-    pub max_segment_size: ::core::option::Option<u64>,
-    /// Maximum size (in kilobytes) of vectors to store in-memory per segment.
-    /// Segments larger than this threshold will be stored as read-only memmaped file.
-    ///
-    /// Memmap storage is disabled by default, to enable it, set this threshold to a reasonable value.
-    ///
-    /// To disable memmap storage, set this to `0`.
-    ///
-    /// Note: 1Kb = 1 vector of size 256
-    #[prost(uint64, optional, tag = "5")]
-    pub memmap_threshold: ::core::option::Option<u64>,
-    /// Maximum size (in kilobytes) of vectors allowed for plain index, exceeding this threshold will enable vector indexing
-    ///
-    /// Default value is 20,000, based on <<https://github.com/google-research/google-research/blob/master/scann/docs/algorithms.md>.>
-    ///
-    /// To disable vector indexing, set to `0`.
-    ///
-    /// Note: 1kB = 1 vector of size 256.
-    #[prost(uint64, optional, tag = "6")]
-    pub indexing_threshold: ::core::option::Option<u64>,
-    /// Interval between forced flushes.
-    #[prost(uint64, optional, tag = "7")]
-    pub flush_interval_sec: ::core::option::Option<u64>,
-    /// Max number of threads, which can be used for optimization. If 0 - `NUM_CPU - 1` will be used
-    #[prost(uint64, optional, tag = "8")]
-    pub max_optimization_threads: ::core::option::Option<u64>,
-}
-#[derive(validator::Validate)]
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct ScalarQuantization {
-    /// Type of quantization
-    #[prost(enumeration = "QuantizationType", tag = "1")]
-    pub r#type: i32,
-    /// Number of bits to use for quantization
-    #[prost(float, optional, tag = "2")]
-    #[validate(custom = "crate::grpc::validate::validate_f32_range_min_0_5_max_1")]
-    pub quantile: ::core::option::Option<f32>,
-    /// If true - quantized vectors always will be stored in RAM, ignoring the config of main storage
-    #[prost(bool, optional, tag = "3")]
-    pub always_ram: ::core::option::Option<bool>,
-}
-#[derive(validator::Validate)]
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct ProductQuantization {
-    /// Compression ratio
-    #[prost(enumeration = "CompressionRatio", tag = "1")]
-    pub compression: i32,
-    /// If true - quantized vectors always will be stored in RAM, ignoring the config of main storage
-    #[prost(bool, optional, tag = "2")]
-    pub always_ram: ::core::option::Option<bool>,
-}
-#[derive(validator::Validate)]
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct QuantizationConfig {
-    #[prost(oneof = "quantization_config::Quantization", tags = "1, 2")]
-    #[validate]
-    pub quantization: ::core::option::Option<quantization_config::Quantization>,
-}
-/// Nested message and enum types in `QuantizationConfig`.
-pub mod quantization_config {
-    #[derive(serde::Serialize)]
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Oneof)]
-    pub enum Quantization {
-        #[prost(message, tag = "1")]
-        Scalar(super::ScalarQuantization),
-        #[prost(message, tag = "2")]
-        Product(super::ProductQuantization),
-    }
-}
-#[derive(validator::Validate)]
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct Disabled {}
-#[derive(validator::Validate)]
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct QuantizationConfigDiff {
-    #[prost(oneof = "quantization_config_diff::Quantization", tags = "1, 2, 3")]
-    #[validate]
-    pub quantization: ::core::option::Option<quantization_config_diff::Quantization>,
-}
-/// Nested message and enum types in `QuantizationConfigDiff`.
-pub mod quantization_config_diff {
-    #[derive(serde::Serialize)]
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Oneof)]
-    pub enum Quantization {
-        #[prost(message, tag = "1")]
-        Scalar(super::ScalarQuantization),
-        #[prost(message, tag = "2")]
-        Product(super::ProductQuantization),
-        #[prost(message, tag = "3")]
-        Disabled(super::Disabled),
-    }
-}
-#[derive(validator::Validate)]
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct CreateCollection {
-    /// Name of the collection
-    #[prost(string, tag = "1")]
-    #[validate(
-        length(min = 1, max = 255),
-        custom = "crate::grpc::validate::validate_collection_name"
-    )]
-    pub collection_name: ::prost::alloc::string::String,
-    /// Configuration of vector index
-    #[prost(message, optional, tag = "4")]
-    #[validate]
-    pub hnsw_config: ::core::option::Option<HnswConfigDiff>,
-    /// Configuration of the Write-Ahead-Log
-    #[prost(message, optional, tag = "5")]
-    #[validate]
-    pub wal_config: ::core::option::Option<WalConfigDiff>,
-    /// Configuration of the optimizers
-    #[prost(message, optional, tag = "6")]
-    #[validate]
-    pub optimizers_config: ::core::option::Option<OptimizersConfigDiff>,
-    /// Number of shards in the collection, default is 1 for standalone, otherwise equal to the number of nodes. Minimum is 1
-    #[prost(uint32, optional, tag = "7")]
-    pub shard_number: ::core::option::Option<u32>,
-    /// If true - point's payload will not be stored in memory
-    #[prost(bool, optional, tag = "8")]
-    pub on_disk_payload: ::core::option::Option<bool>,
-    /// Wait timeout for operation commit in seconds, if not specified - default value will be supplied
-    #[prost(uint64, optional, tag = "9")]
-    pub timeout: ::core::option::Option<u64>,
-    /// Configuration for vectors
-    #[prost(message, optional, tag = "10")]
-    #[validate]
-    pub vectors_config: ::core::option::Option<VectorsConfig>,
-    /// Number of replicas of each shard that network tries to maintain, default = 1
-    #[prost(uint32, optional, tag = "11")]
-    pub replication_factor: ::core::option::Option<u32>,
-    /// How many replicas should apply the operation for us to consider it successful, default = 1
-    #[prost(uint32, optional, tag = "12")]
-    pub write_consistency_factor: ::core::option::Option<u32>,
-    /// Specify name of the other collection to copy data from
-    #[prost(string, optional, tag = "13")]
-    pub init_from_collection: ::core::option::Option<::prost::alloc::string::String>,
-    /// Quantization configuration of vector
-    #[prost(message, optional, tag = "14")]
-    #[validate]
-    pub quantization_config: ::core::option::Option<QuantizationConfig>,
-}
-#[derive(validator::Validate)]
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct UpdateCollection {
-    /// Name of the collection
-    #[prost(string, tag = "1")]
-    #[validate(length(min = 1, max = 255))]
-    pub collection_name: ::prost::alloc::string::String,
-    /// New configuration parameters for the collection. This operation is blocking, it will only proceed once all current optimizations are complete
-    #[prost(message, optional, tag = "2")]
-    #[validate]
-    pub optimizers_config: ::core::option::Option<OptimizersConfigDiff>,
-    /// Wait timeout for operation commit in seconds if blocking, if not specified - default value will be supplied
-    #[prost(uint64, optional, tag = "3")]
-    #[validate(custom = "crate::grpc::validate::validate_u64_range_min_1")]
-    pub timeout: ::core::option::Option<u64>,
-    /// New configuration parameters for the collection
-    #[prost(message, optional, tag = "4")]
-    #[validate]
-    pub params: ::core::option::Option<CollectionParamsDiff>,
-    /// New HNSW parameters for the collection index
-    #[prost(message, optional, tag = "5")]
-    #[validate]
-    pub hnsw_config: ::core::option::Option<HnswConfigDiff>,
-    /// New vector parameters
-    #[prost(message, optional, tag = "6")]
-    #[validate]
-    pub vectors_config: ::core::option::Option<VectorsConfigDiff>,
-    /// Quantization configuration of vector
-    #[prost(message, optional, tag = "7")]
-    #[validate]
-    pub quantization_config: ::core::option::Option<QuantizationConfigDiff>,
-}
-#[derive(validator::Validate)]
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct DeleteCollection {
-    /// Name of the collection
-    #[prost(string, tag = "1")]
-    #[validate(length(min = 1, max = 255))]
-    pub collection_name: ::prost::alloc::string::String,
-    /// Wait timeout for operation commit in seconds, if not specified - default value will be supplied
-    #[prost(uint64, optional, tag = "2")]
-    #[validate(custom = "crate::grpc::validate::validate_u64_range_min_1")]
-    pub timeout: ::core::option::Option<u64>,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct CollectionOperationResponse {
-    /// if operation made changes
-    #[prost(bool, tag = "1")]
-    pub result: bool,
-    /// Time spent to process
-    #[prost(double, tag = "2")]
-    pub time: f64,
-}
-#[derive(validator::Validate)]
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct CollectionParams {
-    /// Number of shards in collection
-    #[prost(uint32, tag = "3")]
-    pub shard_number: u32,
-    /// If true - point's payload will not be stored in memory
-    #[prost(bool, tag = "4")]
-    pub on_disk_payload: bool,
-    /// Configuration for vectors
-    #[prost(message, optional, tag = "5")]
-    #[validate]
-    pub vectors_config: ::core::option::Option<VectorsConfig>,
-    /// Number of replicas of each shard that network tries to maintain
-    #[prost(uint32, optional, tag = "6")]
-    pub replication_factor: ::core::option::Option<u32>,
-    /// How many replicas should apply the operation for us to consider it successful
-    #[prost(uint32, optional, tag = "7")]
-    pub write_consistency_factor: ::core::option::Option<u32>,
-}
-#[derive(validator::Validate)]
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct CollectionParamsDiff {
-    /// Number of replicas of each shard that network tries to maintain
-    #[prost(uint32, optional, tag = "1")]
-    pub replication_factor: ::core::option::Option<u32>,
-    /// How many replicas should apply the operation for us to consider it successful
-    #[prost(uint32, optional, tag = "2")]
-    pub write_consistency_factor: ::core::option::Option<u32>,
-    /// If true - point's payload will not be stored in memory
-    #[prost(bool, optional, tag = "3")]
-    pub on_disk_payload: ::core::option::Option<bool>,
-}
-#[derive(validator::Validate)]
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct CollectionConfig {
-    /// Collection parameters
-    #[prost(message, optional, tag = "1")]
-    #[validate]
-    pub params: ::core::option::Option<CollectionParams>,
-    /// Configuration of vector index
-    #[prost(message, optional, tag = "2")]
-    #[validate]
-    pub hnsw_config: ::core::option::Option<HnswConfigDiff>,
-    /// Configuration of the optimizers
-    #[prost(message, optional, tag = "3")]
-    pub optimizer_config: ::core::option::Option<OptimizersConfigDiff>,
-    /// Configuration of the Write-Ahead-Log
-    #[prost(message, optional, tag = "4")]
-    pub wal_config: ::core::option::Option<WalConfigDiff>,
-    /// Configuration of the vector quantization
-    #[prost(message, optional, tag = "5")]
-    #[validate]
-    pub quantization_config: ::core::option::Option<QuantizationConfig>,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct TextIndexParams {
-    /// Tokenizer type
-    #[prost(enumeration = "TokenizerType", tag = "1")]
-    pub tokenizer: i32,
-    /// If true - all tokens will be lowercase
-    #[prost(bool, optional, tag = "2")]
-    pub lowercase: ::core::option::Option<bool>,
-    /// Minimal token length
-    #[prost(uint64, optional, tag = "3")]
-    pub min_token_len: ::core::option::Option<u64>,
-    /// Maximal token length
-    #[prost(uint64, optional, tag = "4")]
-    pub max_token_len: ::core::option::Option<u64>,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct PayloadIndexParams {
-    #[prost(oneof = "payload_index_params::IndexParams", tags = "1")]
-    pub index_params: ::core::option::Option<payload_index_params::IndexParams>,
-}
-/// Nested message and enum types in `PayloadIndexParams`.
-pub mod payload_index_params {
-    #[derive(serde::Serialize)]
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Oneof)]
-    pub enum IndexParams {
-        /// Parameters for text index
-        #[prost(message, tag = "1")]
-        TextIndexParams(super::TextIndexParams),
-    }
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct PayloadSchemaInfo {
-    /// Field data type
-    #[prost(enumeration = "PayloadSchemaType", tag = "1")]
-    pub data_type: i32,
-    /// Field index parameters
-    #[prost(message, optional, tag = "2")]
-    pub params: ::core::option::Option<PayloadIndexParams>,
-    /// Number of points indexed within this field indexed
-    #[prost(uint64, optional, tag = "3")]
-    pub points: ::core::option::Option<u64>,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct CollectionInfo {
-    /// operating condition of the collection
-    #[prost(enumeration = "CollectionStatus", tag = "1")]
-    pub status: i32,
-    /// status of collection optimizers
-    #[prost(message, optional, tag = "2")]
-    pub optimizer_status: ::core::option::Option<OptimizerStatus>,
-    /// number of vectors in the collection
-    #[prost(uint64, tag = "3")]
-    pub vectors_count: u64,
-    /// Number of independent segments
-    #[prost(uint64, tag = "4")]
-    pub segments_count: u64,
-    /// Configuration
-    #[prost(message, optional, tag = "7")]
-    pub config: ::core::option::Option<CollectionConfig>,
-    /// Collection data types
-    #[prost(map = "string, message", tag = "8")]
-    pub payload_schema: ::std::collections::HashMap<
-        ::prost::alloc::string::String,
-        PayloadSchemaInfo,
-    >,
-    /// number of points in the collection
-    #[prost(uint64, tag = "9")]
-    pub points_count: u64,
-    /// number of indexed vectors in the collection.
-    #[prost(uint64, optional, tag = "10")]
-    pub indexed_vectors_count: ::core::option::Option<u64>,
-}
-#[derive(validator::Validate)]
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct ChangeAliases {
-    /// List of actions
-    #[prost(message, repeated, tag = "1")]
-    pub actions: ::prost::alloc::vec::Vec<AliasOperations>,
-    /// Wait timeout for operation commit in seconds, if not specified - default value will be supplied
-    #[prost(uint64, optional, tag = "2")]
-    #[validate(custom = "crate::grpc::validate::validate_u64_range_min_1")]
-    pub timeout: ::core::option::Option<u64>,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct AliasOperations {
-    #[prost(oneof = "alias_operations::Action", tags = "1, 2, 3")]
-    pub action: ::core::option::Option<alias_operations::Action>,
-}
-/// Nested message and enum types in `AliasOperations`.
-pub mod alias_operations {
-    #[derive(serde::Serialize)]
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Oneof)]
-    pub enum Action {
-        #[prost(message, tag = "1")]
-        CreateAlias(super::CreateAlias),
-        #[prost(message, tag = "2")]
-        RenameAlias(super::RenameAlias),
-        #[prost(message, tag = "3")]
-        DeleteAlias(super::DeleteAlias),
-    }
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct CreateAlias {
-    /// Name of the collection
-    #[prost(string, tag = "1")]
-    pub collection_name: ::prost::alloc::string::String,
-    /// New name of the alias
-    #[prost(string, tag = "2")]
-    pub alias_name: ::prost::alloc::string::String,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct RenameAlias {
-    /// Name of the alias to rename
-    #[prost(string, tag = "1")]
-    pub old_alias_name: ::prost::alloc::string::String,
-    /// Name of the alias
-    #[prost(string, tag = "2")]
-    pub new_alias_name: ::prost::alloc::string::String,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct DeleteAlias {
-    /// Name of the alias
-    #[prost(string, tag = "1")]
-    pub alias_name: ::prost::alloc::string::String,
-}
-#[derive(validator::Validate)]
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct ListAliasesRequest {}
-#[derive(validator::Validate)]
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct ListCollectionAliasesRequest {
-    /// Name of the collection
-    #[prost(string, tag = "1")]
-    #[validate(length(min = 1, max = 255))]
-    pub collection_name: ::prost::alloc::string::String,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct AliasDescription {
-    /// Name of the alias
-    #[prost(string, tag = "1")]
-    pub alias_name: ::prost::alloc::string::String,
-    /// Name of the collection
-    #[prost(string, tag = "2")]
-    pub collection_name: ::prost::alloc::string::String,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct ListAliasesResponse {
-    #[prost(message, repeated, tag = "1")]
-    pub aliases: ::prost::alloc::vec::Vec<AliasDescription>,
-    /// Time spent to process
-    #[prost(double, tag = "2")]
-    pub time: f64,
-}
-#[derive(validator::Validate)]
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct CollectionClusterInfoRequest {
-    /// Name of the collection
-    #[prost(string, tag = "1")]
-    pub collection_name: ::prost::alloc::string::String,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct LocalShardInfo {
-    /// Local shard id
-    #[prost(uint32, tag = "1")]
-    pub shard_id: u32,
-    /// Number of points in the shard
-    #[prost(uint64, tag = "2")]
-    pub points_count: u64,
-    /// Is replica active
-    #[prost(enumeration = "ReplicaState", tag = "3")]
-    pub state: i32,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct RemoteShardInfo {
-    /// Local shard id
-    #[prost(uint32, tag = "1")]
-    pub shard_id: u32,
-    /// Remote peer id
-    #[prost(uint64, tag = "2")]
-    pub peer_id: u64,
-    /// Is replica active
-    #[prost(enumeration = "ReplicaState", tag = "3")]
-    pub state: i32,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct ShardTransferInfo {
-    /// Local shard id
-    #[prost(uint32, tag = "1")]
-    pub shard_id: u32,
-    #[prost(uint64, tag = "2")]
-    pub from: u64,
-    #[prost(uint64, tag = "3")]
-    pub to: u64,
-    /// If `true` transfer is a synchronization of a replicas; If `false` transfer is a moving of a shard from one peer to another
-    #[prost(bool, tag = "4")]
-    pub sync: bool,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct CollectionClusterInfoResponse {
-    /// ID of this peer
-    #[prost(uint64, tag = "1")]
-    pub peer_id: u64,
-    /// Total number of shards
-    #[prost(uint64, tag = "2")]
-    pub shard_count: u64,
-    /// Local shards
-    #[prost(message, repeated, tag = "3")]
-    pub local_shards: ::prost::alloc::vec::Vec<LocalShardInfo>,
-    /// Remote shards
-    #[prost(message, repeated, tag = "4")]
-    pub remote_shards: ::prost::alloc::vec::Vec<RemoteShardInfo>,
-    /// Shard transfers
-    #[prost(message, repeated, tag = "5")]
-    pub shard_transfers: ::prost::alloc::vec::Vec<ShardTransferInfo>,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct MoveShard {
-    /// Local shard id
-    #[prost(uint32, tag = "1")]
-    pub shard_id: u32,
-    #[prost(uint64, tag = "2")]
-    pub from_peer_id: u64,
-    #[prost(uint64, tag = "3")]
-    pub to_peer_id: u64,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct Replica {
-    #[prost(uint32, tag = "1")]
-    pub shard_id: u32,
-    #[prost(uint64, tag = "2")]
-    pub peer_id: u64,
-}
-#[derive(validator::Validate)]
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct UpdateCollectionClusterSetupRequest {
-    /// Name of the collection
-    #[prost(string, tag = "1")]
-    pub collection_name: ::prost::alloc::string::String,
-    /// Wait timeout for operation commit in seconds, if not specified - default value will be supplied
-    #[prost(uint64, optional, tag = "6")]
-    pub timeout: ::core::option::Option<u64>,
-    #[prost(
-        oneof = "update_collection_cluster_setup_request::Operation",
-        tags = "2, 3, 4, 5"
-    )]
-    pub operation: ::core::option::Option<
-        update_collection_cluster_setup_request::Operation,
-    >,
-}
-/// Nested message and enum types in `UpdateCollectionClusterSetupRequest`.
-pub mod update_collection_cluster_setup_request {
-    #[derive(serde::Serialize)]
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Oneof)]
-    pub enum Operation {
-        #[prost(message, tag = "2")]
-        MoveShard(super::MoveShard),
-        #[prost(message, tag = "3")]
-        ReplicateShard(super::MoveShard),
-        #[prost(message, tag = "4")]
-        AbortTransfer(super::MoveShard),
-        #[prost(message, tag = "5")]
-        DropReplica(super::Replica),
-    }
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct UpdateCollectionClusterSetupResponse {
-    #[prost(bool, tag = "1")]
-    pub result: bool,
-}
-#[derive(serde::Serialize)]
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
-#[repr(i32)]
-pub enum Distance {
-    UnknownDistance = 0,
-    Cosine = 1,
-    Euclid = 2,
-    Dot = 3,
-}
-impl Distance {
-    /// String value of the enum field names used in the ProtoBuf definition.
-    ///
-    /// The values are not transformed in any way and thus are considered stable
-    /// (if the ProtoBuf definition does not change) and safe for programmatic use.
-    pub fn as_str_name(&self) -> &'static str {
-        match self {
-            Distance::UnknownDistance => "UnknownDistance",
-            Distance::Cosine => "Cosine",
-            Distance::Euclid => "Euclid",
-            Distance::Dot => "Dot",
-        }
-    }
-    /// Creates an enum from field names used in the ProtoBuf definition.
-    pub fn from_str_name(value: &str) -> ::core::option::Option<Self> {
-        match value {
-            "UnknownDistance" => Some(Self::UnknownDistance),
-            "Cosine" => Some(Self::Cosine),
-            "Euclid" => Some(Self::Euclid),
-            "Dot" => Some(Self::Dot),
-            _ => None,
-        }
-    }
-}
-#[derive(serde::Serialize)]
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
-#[repr(i32)]
-pub enum CollectionStatus {
-    UnknownCollectionStatus = 0,
-    /// All segments are ready
-    Green = 1,
-    /// Optimization in process
-    Yellow = 2,
-    /// Something went wrong
-    Red = 3,
-}
-impl CollectionStatus {
-    /// String value of the enum field names used in the ProtoBuf definition.
-    ///
-    /// The values are not transformed in any way and thus are considered stable
-    /// (if the ProtoBuf definition does not change) and safe for programmatic use.
-    pub fn as_str_name(&self) -> &'static str {
-        match self {
-            CollectionStatus::UnknownCollectionStatus => "UnknownCollectionStatus",
-            CollectionStatus::Green => "Green",
-            CollectionStatus::Yellow => "Yellow",
-            CollectionStatus::Red => "Red",
-        }
-    }
-    /// Creates an enum from field names used in the ProtoBuf definition.
-    pub fn from_str_name(value: &str) -> ::core::option::Option<Self> {
-        match value {
-            "UnknownCollectionStatus" => Some(Self::UnknownCollectionStatus),
-            "Green" => Some(Self::Green),
-            "Yellow" => Some(Self::Yellow),
-            "Red" => Some(Self::Red),
-            _ => None,
-        }
-    }
-}
-#[derive(serde::Serialize)]
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
-#[repr(i32)]
-pub enum PayloadSchemaType {
-    UnknownType = 0,
-    Keyword = 1,
-    Integer = 2,
-    Float = 3,
-    Geo = 4,
-    Text = 5,
-    Bool = 6,
-}
-impl PayloadSchemaType {
-    /// String value of the enum field names used in the ProtoBuf definition.
-    ///
-    /// The values are not transformed in any way and thus are considered stable
-    /// (if the ProtoBuf definition does not change) and safe for programmatic use.
-    pub fn as_str_name(&self) -> &'static str {
-        match self {
-            PayloadSchemaType::UnknownType => "UnknownType",
-            PayloadSchemaType::Keyword => "Keyword",
-            PayloadSchemaType::Integer => "Integer",
-            PayloadSchemaType::Float => "Float",
-            PayloadSchemaType::Geo => "Geo",
-            PayloadSchemaType::Text => "Text",
-            PayloadSchemaType::Bool => "Bool",
-        }
-    }
-    /// Creates an enum from field names used in the ProtoBuf definition.
-    pub fn from_str_name(value: &str) -> ::core::option::Option<Self> {
-        match value {
-            "UnknownType" => Some(Self::UnknownType),
-            "Keyword" => Some(Self::Keyword),
-            "Integer" => Some(Self::Integer),
-            "Float" => Some(Self::Float),
-            "Geo" => Some(Self::Geo),
-            "Text" => Some(Self::Text),
-            "Bool" => Some(Self::Bool),
-            _ => None,
-        }
-    }
-}
-#[derive(serde::Serialize)]
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
-#[repr(i32)]
-pub enum QuantizationType {
-    UnknownQuantization = 0,
-    Int8 = 1,
-}
-impl QuantizationType {
-    /// String value of the enum field names used in the ProtoBuf definition.
-    ///
-    /// The values are not transformed in any way and thus are considered stable
-    /// (if the ProtoBuf definition does not change) and safe for programmatic use.
-    pub fn as_str_name(&self) -> &'static str {
-        match self {
-            QuantizationType::UnknownQuantization => "UnknownQuantization",
-            QuantizationType::Int8 => "Int8",
-        }
-    }
-    /// Creates an enum from field names used in the ProtoBuf definition.
-    pub fn from_str_name(value: &str) -> ::core::option::Option<Self> {
-        match value {
-            "UnknownQuantization" => Some(Self::UnknownQuantization),
-            "Int8" => Some(Self::Int8),
-            _ => None,
-        }
-    }
-}
-#[derive(serde::Serialize)]
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
-#[repr(i32)]
-pub enum CompressionRatio {
-    X4 = 0,
-    X8 = 1,
-    X16 = 2,
-    X32 = 3,
-    X64 = 4,
-}
-impl CompressionRatio {
-    /// String value of the enum field names used in the ProtoBuf definition.
-    ///
-    /// The values are not transformed in any way and thus are considered stable
-    /// (if the ProtoBuf definition does not change) and safe for programmatic use.
-    pub fn as_str_name(&self) -> &'static str {
-        match self {
-            CompressionRatio::X4 => "x4",
-            CompressionRatio::X8 => "x8",
-            CompressionRatio::X16 => "x16",
-            CompressionRatio::X32 => "x32",
-            CompressionRatio::X64 => "x64",
-        }
-    }
-    /// Creates an enum from field names used in the ProtoBuf definition.
-    pub fn from_str_name(value: &str) -> ::core::option::Option<Self> {
-        match value {
-            "x4" => Some(Self::X4),
-            "x8" => Some(Self::X8),
-            "x16" => Some(Self::X16),
-            "x32" => Some(Self::X32),
-            "x64" => Some(Self::X64),
-            _ => None,
-        }
-    }
-}
-#[derive(serde::Serialize)]
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
-#[repr(i32)]
-pub enum TokenizerType {
-    Unknown = 0,
-    Prefix = 1,
-    Whitespace = 2,
-    Word = 3,
-    Multilingual = 4,
-}
-impl TokenizerType {
-    /// String value of the enum field names used in the ProtoBuf definition.
-    ///
-    /// The values are not transformed in any way and thus are considered stable
-    /// (if the ProtoBuf definition does not change) and safe for programmatic use.
-    pub fn as_str_name(&self) -> &'static str {
-        match self {
-            TokenizerType::Unknown => "Unknown",
-            TokenizerType::Prefix => "Prefix",
-            TokenizerType::Whitespace => "Whitespace",
-            TokenizerType::Word => "Word",
-            TokenizerType::Multilingual => "Multilingual",
-        }
-    }
-    /// Creates an enum from field names used in the ProtoBuf definition.
-    pub fn from_str_name(value: &str) -> ::core::option::Option<Self> {
-        match value {
-            "Unknown" => Some(Self::Unknown),
-            "Prefix" => Some(Self::Prefix),
-            "Whitespace" => Some(Self::Whitespace),
-            "Word" => Some(Self::Word),
-            "Multilingual" => Some(Self::Multilingual),
-            _ => None,
-        }
-    }
-}
-#[derive(serde::Serialize)]
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
-#[repr(i32)]
-pub enum ReplicaState {
-    /// Active and sound
-    Active = 0,
-    /// Failed for some reason
-    Dead = 1,
-    /// The shard is partially loaded and is currently receiving data from other shards
-    Partial = 2,
-    /// Collection is being created
-    Initializing = 3,
-    /// A shard which receives data, but is not used for search; Useful for backup shards
-    Listener = 4,
-}
-impl ReplicaState {
-    /// String value of the enum field names used in the ProtoBuf definition.
-    ///
-    /// The values are not transformed in any way and thus are considered stable
-    /// (if the ProtoBuf definition does not change) and safe for programmatic use.
-    pub fn as_str_name(&self) -> &'static str {
-        match self {
-            ReplicaState::Active => "Active",
-            ReplicaState::Dead => "Dead",
-            ReplicaState::Partial => "Partial",
-            ReplicaState::Initializing => "Initializing",
-            ReplicaState::Listener => "Listener",
-        }
-    }
-    /// Creates an enum from field names used in the ProtoBuf definition.
-    pub fn from_str_name(value: &str) -> ::core::option::Option<Self> {
-        match value {
-            "Active" => Some(Self::Active),
-            "Dead" => Some(Self::Dead),
-            "Partial" => Some(Self::Partial),
-            "Initializing" => Some(Self::Initializing),
-            "Listener" => Some(Self::Listener),
-            _ => None,
-        }
-    }
-}
-/// Generated client implementations.
-pub mod collections_client {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
-    use tonic::codegen::*;
-    use tonic::codegen::http::Uri;
-    #[derive(Debug, Clone)]
-    pub struct CollectionsClient<T> {
-        inner: tonic::client::Grpc<T>,
-    }
-    impl CollectionsClient<tonic::transport::Channel> {
-        /// Attempt to create a new client by connecting to a given endpoint.
-        pub async fn connect<D>(dst: D) -> Result<Self, tonic::transport::Error>
-        where
-            D: TryInto<tonic::transport::Endpoint>,
-            D::Error: Into<StdError>,
-        {
-            let conn = tonic::transport::Endpoint::new(dst)?.connect().await?;
-            Ok(Self::new(conn))
-        }
-    }
-    impl<T> CollectionsClient<T>
-    where
-        T: tonic::client::GrpcService<tonic::body::BoxBody>,
-        T::Error: Into<StdError>,
-        T::ResponseBody: Body<Data = Bytes> + Send + 'static,
-        <T::ResponseBody as Body>::Error: Into<StdError> + Send,
-    {
-        pub fn new(inner: T) -> Self {
-            let inner = tonic::client::Grpc::new(inner);
-            Self { inner }
-        }
-        pub fn with_origin(inner: T, origin: Uri) -> Self {
-            let inner = tonic::client::Grpc::with_origin(inner, origin);
-            Self { inner }
-        }
-        pub fn with_interceptor<F>(
-            inner: T,
-            interceptor: F,
-        ) -> CollectionsClient<InterceptedService<T, F>>
-        where
-            F: tonic::service::Interceptor,
-            T::ResponseBody: Default,
-            T: tonic::codegen::Service<
-                http::Request<tonic::body::BoxBody>,
-                Response = http::Response<
-                    <T as tonic::client::GrpcService<tonic::body::BoxBody>>::ResponseBody,
-                >,
-            >,
-            <T as tonic::codegen::Service<
-                http::Request<tonic::body::BoxBody>,
-            >>::Error: Into<StdError> + Send + Sync,
-        {
-            CollectionsClient::new(InterceptedService::new(inner, interceptor))
-        }
-        /// Compress requests with the given encoding.
-        ///
-        /// This requires the server to support it otherwise it might respond with an
-        /// error.
-        #[must_use]
-        pub fn send_compressed(mut self, encoding: CompressionEncoding) -> Self {
-            self.inner = self.inner.send_compressed(encoding);
-            self
-        }
-        /// Enable decompressing responses.
-        #[must_use]
-        pub fn accept_compressed(mut self, encoding: CompressionEncoding) -> Self {
-            self.inner = self.inner.accept_compressed(encoding);
-            self
-        }
-        /// Limits the maximum size of a decoded message.
-        ///
-        /// Default: `4MB`
-        #[must_use]
-        pub fn max_decoding_message_size(mut self, limit: usize) -> Self {
-            self.inner = self.inner.max_decoding_message_size(limit);
-            self
-        }
-        /// Limits the maximum size of an encoded message.
-        ///
-        /// Default: `usize::MAX`
-        #[must_use]
-        pub fn max_encoding_message_size(mut self, limit: usize) -> Self {
-            self.inner = self.inner.max_encoding_message_size(limit);
-            self
-        }
-        /// Get detailed information about specified existing collection
-        pub async fn get(
-            &mut self,
-            request: impl tonic::IntoRequest<super::GetCollectionInfoRequest>,
-        ) -> std::result::Result<
-            tonic::Response<super::GetCollectionInfoResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static("/qdrant.Collections/Get");
-            let mut req = request.into_request();
-            req.extensions_mut().insert(GrpcMethod::new("qdrant.Collections", "Get"));
-            self.inner.unary(req, path, codec).await
-        }
-        /// Get list name of all existing collections
-        pub async fn list(
-            &mut self,
-            request: impl tonic::IntoRequest<super::ListCollectionsRequest>,
-        ) -> std::result::Result<
-            tonic::Response<super::ListCollectionsResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static("/qdrant.Collections/List");
-            let mut req = request.into_request();
-            req.extensions_mut().insert(GrpcMethod::new("qdrant.Collections", "List"));
-            self.inner.unary(req, path, codec).await
-        }
-        /// Create new collection with given parameters
-        pub async fn create(
-            &mut self,
-            request: impl tonic::IntoRequest<super::CreateCollection>,
-        ) -> std::result::Result<
-            tonic::Response<super::CollectionOperationResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/qdrant.Collections/Create",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut().insert(GrpcMethod::new("qdrant.Collections", "Create"));
-            self.inner.unary(req, path, codec).await
-        }
-        /// Update parameters of the existing collection
-        pub async fn update(
-            &mut self,
-            request: impl tonic::IntoRequest<super::UpdateCollection>,
-        ) -> std::result::Result<
-            tonic::Response<super::CollectionOperationResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/qdrant.Collections/Update",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut().insert(GrpcMethod::new("qdrant.Collections", "Update"));
-            self.inner.unary(req, path, codec).await
-        }
-        /// Drop collection and all associated data
-        pub async fn delete(
-            &mut self,
-            request: impl tonic::IntoRequest<super::DeleteCollection>,
-        ) -> std::result::Result<
-            tonic::Response<super::CollectionOperationResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/qdrant.Collections/Delete",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut().insert(GrpcMethod::new("qdrant.Collections", "Delete"));
-            self.inner.unary(req, path, codec).await
-        }
-        /// Update Aliases of the existing collection
-        pub async fn update_aliases(
-            &mut self,
-            request: impl tonic::IntoRequest<super::ChangeAliases>,
-        ) -> std::result::Result<
-            tonic::Response<super::CollectionOperationResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/qdrant.Collections/UpdateAliases",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(GrpcMethod::new("qdrant.Collections", "UpdateAliases"));
-            self.inner.unary(req, path, codec).await
-        }
-        /// Get list of all aliases for a collection
-        pub async fn list_collection_aliases(
-            &mut self,
-            request: impl tonic::IntoRequest<super::ListCollectionAliasesRequest>,
-        ) -> std::result::Result<
-            tonic::Response<super::ListAliasesResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/qdrant.Collections/ListCollectionAliases",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(GrpcMethod::new("qdrant.Collections", "ListCollectionAliases"));
-            self.inner.unary(req, path, codec).await
-        }
-        /// Get list of all aliases for all existing collections
-        pub async fn list_aliases(
-            &mut self,
-            request: impl tonic::IntoRequest<super::ListAliasesRequest>,
-        ) -> std::result::Result<
-            tonic::Response<super::ListAliasesResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/qdrant.Collections/ListAliases",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(GrpcMethod::new("qdrant.Collections", "ListAliases"));
-            self.inner.unary(req, path, codec).await
-        }
-        /// Get cluster information for a collection
-        pub async fn collection_cluster_info(
-            &mut self,
-            request: impl tonic::IntoRequest<super::CollectionClusterInfoRequest>,
-        ) -> std::result::Result<
-            tonic::Response<super::CollectionClusterInfoResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/qdrant.Collections/CollectionClusterInfo",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(GrpcMethod::new("qdrant.Collections", "CollectionClusterInfo"));
-            self.inner.unary(req, path, codec).await
-        }
-        /// Update cluster setup for a collection
-        pub async fn update_collection_cluster_setup(
-            &mut self,
-            request: impl tonic::IntoRequest<super::UpdateCollectionClusterSetupRequest>,
-        ) -> std::result::Result<
-            tonic::Response<super::UpdateCollectionClusterSetupResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/qdrant.Collections/UpdateCollectionClusterSetup",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(
-                    GrpcMethod::new("qdrant.Collections", "UpdateCollectionClusterSetup"),
-                );
-            self.inner.unary(req, path, codec).await
-        }
-    }
-}
-/// Generated server implementations.
-pub mod collections_server {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
-    use tonic::codegen::*;
-    /// Generated trait containing gRPC methods that should be implemented for use with CollectionsServer.
-    #[async_trait]
-    pub trait Collections: Send + Sync + 'static {
-        /// Get detailed information about specified existing collection
-        async fn get(
-            &self,
-            request: tonic::Request<super::GetCollectionInfoRequest>,
-        ) -> std::result::Result<
-            tonic::Response<super::GetCollectionInfoResponse>,
-            tonic::Status,
-        >;
-        /// Get list name of all existing collections
-        async fn list(
-            &self,
-            request: tonic::Request<super::ListCollectionsRequest>,
-        ) -> std::result::Result<
-            tonic::Response<super::ListCollectionsResponse>,
-            tonic::Status,
-        >;
-        /// Create new collection with given parameters
-        async fn create(
-            &self,
-            request: tonic::Request<super::CreateCollection>,
-        ) -> std::result::Result<
-            tonic::Response<super::CollectionOperationResponse>,
-            tonic::Status,
-        >;
-        /// Update parameters of the existing collection
-        async fn update(
-            &self,
-            request: tonic::Request<super::UpdateCollection>,
-        ) -> std::result::Result<
-            tonic::Response<super::CollectionOperationResponse>,
-            tonic::Status,
-        >;
-        /// Drop collection and all associated data
-        async fn delete(
-            &self,
-            request: tonic::Request<super::DeleteCollection>,
-        ) -> std::result::Result<
-            tonic::Response<super::CollectionOperationResponse>,
-            tonic::Status,
-        >;
-        /// Update Aliases of the existing collection
-        async fn update_aliases(
-            &self,
-            request: tonic::Request<super::ChangeAliases>,
-        ) -> std::result::Result<
-            tonic::Response<super::CollectionOperationResponse>,
-            tonic::Status,
-        >;
-        /// Get list of all aliases for a collection
-        async fn list_collection_aliases(
-            &self,
-            request: tonic::Request<super::ListCollectionAliasesRequest>,
-        ) -> std::result::Result<
-            tonic::Response<super::ListAliasesResponse>,
-            tonic::Status,
-        >;
-        /// Get list of all aliases for all existing collections
-        async fn list_aliases(
-            &self,
-            request: tonic::Request<super::ListAliasesRequest>,
-        ) -> std::result::Result<
-            tonic::Response<super::ListAliasesResponse>,
-            tonic::Status,
-        >;
-        /// Get cluster information for a collection
-        async fn collection_cluster_info(
-            &self,
-            request: tonic::Request<super::CollectionClusterInfoRequest>,
-        ) -> std::result::Result<
-            tonic::Response<super::CollectionClusterInfoResponse>,
-            tonic::Status,
-        >;
-        /// Update cluster setup for a collection
-        async fn update_collection_cluster_setup(
-            &self,
-            request: tonic::Request<super::UpdateCollectionClusterSetupRequest>,
-        ) -> std::result::Result<
-            tonic::Response<super::UpdateCollectionClusterSetupResponse>,
-            tonic::Status,
-        >;
-    }
-    #[derive(Debug)]
-    pub struct CollectionsServer<T: Collections> {
-        inner: _Inner<T>,
-        accept_compression_encodings: EnabledCompressionEncodings,
-        send_compression_encodings: EnabledCompressionEncodings,
-        max_decoding_message_size: Option<usize>,
-        max_encoding_message_size: Option<usize>,
-    }
-    struct _Inner<T>(Arc<T>);
-    impl<T: Collections> CollectionsServer<T> {
-        pub fn new(inner: T) -> Self {
-            Self::from_arc(Arc::new(inner))
-        }
-        pub fn from_arc(inner: Arc<T>) -> Self {
-            let inner = _Inner(inner);
-            Self {
-                inner,
-                accept_compression_encodings: Default::default(),
-                send_compression_encodings: Default::default(),
-                max_decoding_message_size: None,
-                max_encoding_message_size: None,
-            }
-        }
-        pub fn with_interceptor<F>(
-            inner: T,
-            interceptor: F,
-        ) -> InterceptedService<Self, F>
-        where
-            F: tonic::service::Interceptor,
-        {
-            InterceptedService::new(Self::new(inner), interceptor)
-        }
-        /// Enable decompressing requests with the given encoding.
-        #[must_use]
-        pub fn accept_compressed(mut self, encoding: CompressionEncoding) -> Self {
-            self.accept_compression_encodings.enable(encoding);
-            self
-        }
-        /// Compress responses with the given encoding, if the client supports it.
-        #[must_use]
-        pub fn send_compressed(mut self, encoding: CompressionEncoding) -> Self {
-            self.send_compression_encodings.enable(encoding);
-            self
-        }
-        /// Limits the maximum size of a decoded message.
-        ///
-        /// Default: `4MB`
-        #[must_use]
-        pub fn max_decoding_message_size(mut self, limit: usize) -> Self {
-            self.max_decoding_message_size = Some(limit);
-            self
-        }
-        /// Limits the maximum size of an encoded message.
-        ///
-        /// Default: `usize::MAX`
-        #[must_use]
-        pub fn max_encoding_message_size(mut self, limit: usize) -> Self {
-            self.max_encoding_message_size = Some(limit);
-            self
-        }
-    }
-    impl<T, B> tonic::codegen::Service<http::Request<B>> for CollectionsServer<T>
-    where
-        T: Collections,
-        B: Body + Send + 'static,
-        B::Error: Into<StdError> + Send + 'static,
-    {
-        type Response = http::Response<tonic::body::BoxBody>;
-        type Error = std::convert::Infallible;
-        type Future = BoxFuture<Self::Response, Self::Error>;
-        fn poll_ready(
-            &mut self,
-            _cx: &mut Context<'_>,
-        ) -> Poll<std::result::Result<(), Self::Error>> {
-            Poll::Ready(Ok(()))
-        }
-        fn call(&mut self, req: http::Request<B>) -> Self::Future {
-            let inner = self.inner.clone();
-            match req.uri().path() {
-                "/qdrant.Collections/Get" => {
-                    #[allow(non_camel_case_types)]
-                    struct GetSvc<T: Collections>(pub Arc<T>);
-                    impl<
-                        T: Collections,
-                    > tonic::server::UnaryService<super::GetCollectionInfoRequest>
-                    for GetSvc<T> {
-                        type Response = super::GetCollectionInfoResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::GetCollectionInfoRequest>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move { (*inner).get(request).await };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = GetSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.Collections/List" => {
-                    #[allow(non_camel_case_types)]
-                    struct ListSvc<T: Collections>(pub Arc<T>);
-                    impl<
-                        T: Collections,
-                    > tonic::server::UnaryService<super::ListCollectionsRequest>
-                    for ListSvc<T> {
-                        type Response = super::ListCollectionsResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::ListCollectionsRequest>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move { (*inner).list(request).await };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = ListSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.Collections/Create" => {
-                    #[allow(non_camel_case_types)]
-                    struct CreateSvc<T: Collections>(pub Arc<T>);
-                    impl<
-                        T: Collections,
-                    > tonic::server::UnaryService<super::CreateCollection>
-                    for CreateSvc<T> {
-                        type Response = super::CollectionOperationResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::CreateCollection>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move { (*inner).create(request).await };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = CreateSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.Collections/Update" => {
-                    #[allow(non_camel_case_types)]
-                    struct UpdateSvc<T: Collections>(pub Arc<T>);
-                    impl<
-                        T: Collections,
-                    > tonic::server::UnaryService<super::UpdateCollection>
-                    for UpdateSvc<T> {
-                        type Response = super::CollectionOperationResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::UpdateCollection>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move { (*inner).update(request).await };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = UpdateSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.Collections/Delete" => {
-                    #[allow(non_camel_case_types)]
-                    struct DeleteSvc<T: Collections>(pub Arc<T>);
-                    impl<
-                        T: Collections,
-                    > tonic::server::UnaryService<super::DeleteCollection>
-                    for DeleteSvc<T> {
-                        type Response = super::CollectionOperationResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::DeleteCollection>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move { (*inner).delete(request).await };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = DeleteSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.Collections/UpdateAliases" => {
-                    #[allow(non_camel_case_types)]
-                    struct UpdateAliasesSvc<T: Collections>(pub Arc<T>);
-                    impl<
-                        T: Collections,
-                    > tonic::server::UnaryService<super::ChangeAliases>
-                    for UpdateAliasesSvc<T> {
-                        type Response = super::CollectionOperationResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::ChangeAliases>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move {
-                                (*inner).update_aliases(request).await
-                            };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = UpdateAliasesSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.Collections/ListCollectionAliases" => {
-                    #[allow(non_camel_case_types)]
-                    struct ListCollectionAliasesSvc<T: Collections>(pub Arc<T>);
-                    impl<
-                        T: Collections,
-                    > tonic::server::UnaryService<super::ListCollectionAliasesRequest>
-                    for ListCollectionAliasesSvc<T> {
-                        type Response = super::ListAliasesResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::ListCollectionAliasesRequest>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move {
-                                (*inner).list_collection_aliases(request).await
-                            };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = ListCollectionAliasesSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.Collections/ListAliases" => {
-                    #[allow(non_camel_case_types)]
-                    struct ListAliasesSvc<T: Collections>(pub Arc<T>);
-                    impl<
-                        T: Collections,
-                    > tonic::server::UnaryService<super::ListAliasesRequest>
-                    for ListAliasesSvc<T> {
-                        type Response = super::ListAliasesResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::ListAliasesRequest>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move {
-                                (*inner).list_aliases(request).await
-                            };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = ListAliasesSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.Collections/CollectionClusterInfo" => {
-                    #[allow(non_camel_case_types)]
-                    struct CollectionClusterInfoSvc<T: Collections>(pub Arc<T>);
-                    impl<
-                        T: Collections,
-                    > tonic::server::UnaryService<super::CollectionClusterInfoRequest>
-                    for CollectionClusterInfoSvc<T> {
-                        type Response = super::CollectionClusterInfoResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::CollectionClusterInfoRequest>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move {
-                                (*inner).collection_cluster_info(request).await
-                            };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = CollectionClusterInfoSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.Collections/UpdateCollectionClusterSetup" => {
-                    #[allow(non_camel_case_types)]
-                    struct UpdateCollectionClusterSetupSvc<T: Collections>(pub Arc<T>);
-                    impl<
-                        T: Collections,
-                    > tonic::server::UnaryService<
-                        super::UpdateCollectionClusterSetupRequest,
-                    > for UpdateCollectionClusterSetupSvc<T> {
-                        type Response = super::UpdateCollectionClusterSetupResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<
-                                super::UpdateCollectionClusterSetupRequest,
-                            >,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move {
-                                (*inner).update_collection_cluster_setup(request).await
-                            };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = UpdateCollectionClusterSetupSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                _ => {
-                    Box::pin(async move {
-                        Ok(
-                            http::Response::builder()
-                                .status(200)
-                                .header("grpc-status", "12")
-                                .header("content-type", "application/grpc")
-                                .body(empty_body())
-                                .unwrap(),
-                        )
-                    })
-                }
-            }
-        }
-    }
-    impl<T: Collections> Clone for CollectionsServer<T> {
-        fn clone(&self) -> Self {
-            let inner = self.inner.clone();
-            Self {
-                inner,
-                accept_compression_encodings: self.accept_compression_encodings,
-                send_compression_encodings: self.send_compression_encodings,
-                max_decoding_message_size: self.max_decoding_message_size,
-                max_encoding_message_size: self.max_encoding_message_size,
-            }
-        }
-    }
-    impl<T: Collections> Clone for _Inner<T> {
-        fn clone(&self) -> Self {
-            Self(Arc::clone(&self.0))
-        }
-    }
-    impl<T: std::fmt::Debug> std::fmt::Debug for _Inner<T> {
-        fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-            write!(f, "{:?}", self.0)
-        }
-    }
-    impl<T: Collections> tonic::server::NamedService for CollectionsServer<T> {
-        const NAME: &'static str = "qdrant.Collections";
-    }
-}
-#[derive(validator::Validate)]
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct GetCollectionInfoRequestInternal {
-    #[prost(message, optional, tag = "1")]
-    pub get_collection_info_request: ::core::option::Option<GetCollectionInfoRequest>,
-    #[prost(uint32, tag = "2")]
-    pub shard_id: u32,
-}
-#[derive(validator::Validate)]
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct InitiateShardTransferRequest {
-    /// Name of the collection
-    #[prost(string, tag = "1")]
-    #[validate(length(min = 1, max = 255))]
-    pub collection_name: ::prost::alloc::string::String,
-    /// Id of the temporary shard
-    #[prost(uint32, tag = "2")]
-    pub shard_id: u32,
-}
-/// Generated client implementations.
-pub mod collections_internal_client {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
-    use tonic::codegen::*;
-    use tonic::codegen::http::Uri;
-    #[derive(Debug, Clone)]
-    pub struct CollectionsInternalClient<T> {
-        inner: tonic::client::Grpc<T>,
-    }
-    impl CollectionsInternalClient<tonic::transport::Channel> {
-        /// Attempt to create a new client by connecting to a given endpoint.
-        pub async fn connect<D>(dst: D) -> Result<Self, tonic::transport::Error>
-        where
-            D: TryInto<tonic::transport::Endpoint>,
-            D::Error: Into<StdError>,
-        {
-            let conn = tonic::transport::Endpoint::new(dst)?.connect().await?;
-            Ok(Self::new(conn))
-        }
-    }
-    impl<T> CollectionsInternalClient<T>
-    where
-        T: tonic::client::GrpcService<tonic::body::BoxBody>,
-        T::Error: Into<StdError>,
-        T::ResponseBody: Body<Data = Bytes> + Send + 'static,
-        <T::ResponseBody as Body>::Error: Into<StdError> + Send,
-    {
-        pub fn new(inner: T) -> Self {
-            let inner = tonic::client::Grpc::new(inner);
-            Self { inner }
-        }
-        pub fn with_origin(inner: T, origin: Uri) -> Self {
-            let inner = tonic::client::Grpc::with_origin(inner, origin);
-            Self { inner }
-        }
-        pub fn with_interceptor<F>(
-            inner: T,
-            interceptor: F,
-        ) -> CollectionsInternalClient<InterceptedService<T, F>>
-        where
-            F: tonic::service::Interceptor,
-            T::ResponseBody: Default,
-            T: tonic::codegen::Service<
-                http::Request<tonic::body::BoxBody>,
-                Response = http::Response<
-                    <T as tonic::client::GrpcService<tonic::body::BoxBody>>::ResponseBody,
-                >,
-            >,
-            <T as tonic::codegen::Service<
-                http::Request<tonic::body::BoxBody>,
-            >>::Error: Into<StdError> + Send + Sync,
-        {
-            CollectionsInternalClient::new(InterceptedService::new(inner, interceptor))
-        }
-        /// Compress requests with the given encoding.
-        ///
-        /// This requires the server to support it otherwise it might respond with an
-        /// error.
-        #[must_use]
-        pub fn send_compressed(mut self, encoding: CompressionEncoding) -> Self {
-            self.inner = self.inner.send_compressed(encoding);
-            self
-        }
-        /// Enable decompressing responses.
-        #[must_use]
-        pub fn accept_compressed(mut self, encoding: CompressionEncoding) -> Self {
-            self.inner = self.inner.accept_compressed(encoding);
-            self
-        }
-        /// Limits the maximum size of a decoded message.
-        ///
-        /// Default: `4MB`
-        #[must_use]
-        pub fn max_decoding_message_size(mut self, limit: usize) -> Self {
-            self.inner = self.inner.max_decoding_message_size(limit);
-            self
-        }
-        /// Limits the maximum size of an encoded message.
-        ///
-        /// Default: `usize::MAX`
-        #[must_use]
-        pub fn max_encoding_message_size(mut self, limit: usize) -> Self {
-            self.inner = self.inner.max_encoding_message_size(limit);
-            self
-        }
-        /// Get collection info
-        pub async fn get(
-            &mut self,
-            request: impl tonic::IntoRequest<super::GetCollectionInfoRequestInternal>,
-        ) -> std::result::Result<
-            tonic::Response<super::GetCollectionInfoResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/qdrant.CollectionsInternal/Get",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(GrpcMethod::new("qdrant.CollectionsInternal", "Get"));
-            self.inner.unary(req, path, codec).await
-        }
-        /// Initiate shard transfer
-        pub async fn initiate(
-            &mut self,
-            request: impl tonic::IntoRequest<super::InitiateShardTransferRequest>,
-        ) -> std::result::Result<
-            tonic::Response<super::CollectionOperationResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/qdrant.CollectionsInternal/Initiate",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(GrpcMethod::new("qdrant.CollectionsInternal", "Initiate"));
-            self.inner.unary(req, path, codec).await
-        }
-    }
-}
-/// Generated server implementations.
-pub mod collections_internal_server {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
-    use tonic::codegen::*;
-    /// Generated trait containing gRPC methods that should be implemented for use with CollectionsInternalServer.
-    #[async_trait]
-    pub trait CollectionsInternal: Send + Sync + 'static {
-        /// Get collection info
-        async fn get(
-            &self,
-            request: tonic::Request<super::GetCollectionInfoRequestInternal>,
-        ) -> std::result::Result<
-            tonic::Response<super::GetCollectionInfoResponse>,
-            tonic::Status,
-        >;
-        /// Initiate shard transfer
-        async fn initiate(
-            &self,
-            request: tonic::Request<super::InitiateShardTransferRequest>,
-        ) -> std::result::Result<
-            tonic::Response<super::CollectionOperationResponse>,
-            tonic::Status,
-        >;
-    }
-    #[derive(Debug)]
-    pub struct CollectionsInternalServer<T: CollectionsInternal> {
-        inner: _Inner<T>,
-        accept_compression_encodings: EnabledCompressionEncodings,
-        send_compression_encodings: EnabledCompressionEncodings,
-        max_decoding_message_size: Option<usize>,
-        max_encoding_message_size: Option<usize>,
-    }
-    struct _Inner<T>(Arc<T>);
-    impl<T: CollectionsInternal> CollectionsInternalServer<T> {
-        pub fn new(inner: T) -> Self {
-            Self::from_arc(Arc::new(inner))
-        }
-        pub fn from_arc(inner: Arc<T>) -> Self {
-            let inner = _Inner(inner);
-            Self {
-                inner,
-                accept_compression_encodings: Default::default(),
-                send_compression_encodings: Default::default(),
-                max_decoding_message_size: None,
-                max_encoding_message_size: None,
-            }
-        }
-        pub fn with_interceptor<F>(
-            inner: T,
-            interceptor: F,
-        ) -> InterceptedService<Self, F>
-        where
-            F: tonic::service::Interceptor,
-        {
-            InterceptedService::new(Self::new(inner), interceptor)
-        }
-        /// Enable decompressing requests with the given encoding.
-        #[must_use]
-        pub fn accept_compressed(mut self, encoding: CompressionEncoding) -> Self {
-            self.accept_compression_encodings.enable(encoding);
-            self
-        }
-        /// Compress responses with the given encoding, if the client supports it.
-        #[must_use]
-        pub fn send_compressed(mut self, encoding: CompressionEncoding) -> Self {
-            self.send_compression_encodings.enable(encoding);
-            self
-        }
-        /// Limits the maximum size of a decoded message.
-        ///
-        /// Default: `4MB`
-        #[must_use]
-        pub fn max_decoding_message_size(mut self, limit: usize) -> Self {
-            self.max_decoding_message_size = Some(limit);
-            self
-        }
-        /// Limits the maximum size of an encoded message.
-        ///
-        /// Default: `usize::MAX`
-        #[must_use]
-        pub fn max_encoding_message_size(mut self, limit: usize) -> Self {
-            self.max_encoding_message_size = Some(limit);
-            self
-        }
-    }
-    impl<T, B> tonic::codegen::Service<http::Request<B>> for CollectionsInternalServer<T>
-    where
-        T: CollectionsInternal,
-        B: Body + Send + 'static,
-        B::Error: Into<StdError> + Send + 'static,
-    {
-        type Response = http::Response<tonic::body::BoxBody>;
-        type Error = std::convert::Infallible;
-        type Future = BoxFuture<Self::Response, Self::Error>;
-        fn poll_ready(
-            &mut self,
-            _cx: &mut Context<'_>,
-        ) -> Poll<std::result::Result<(), Self::Error>> {
-            Poll::Ready(Ok(()))
-        }
-        fn call(&mut self, req: http::Request<B>) -> Self::Future {
-            let inner = self.inner.clone();
-            match req.uri().path() {
-                "/qdrant.CollectionsInternal/Get" => {
-                    #[allow(non_camel_case_types)]
-                    struct GetSvc<T: CollectionsInternal>(pub Arc<T>);
-                    impl<
-                        T: CollectionsInternal,
-                    > tonic::server::UnaryService<
-                        super::GetCollectionInfoRequestInternal,
-                    > for GetSvc<T> {
-                        type Response = super::GetCollectionInfoResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<
-                                super::GetCollectionInfoRequestInternal,
-                            >,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move { (*inner).get(request).await };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = GetSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.CollectionsInternal/Initiate" => {
-                    #[allow(non_camel_case_types)]
-                    struct InitiateSvc<T: CollectionsInternal>(pub Arc<T>);
-                    impl<
-                        T: CollectionsInternal,
-                    > tonic::server::UnaryService<super::InitiateShardTransferRequest>
-                    for InitiateSvc<T> {
-                        type Response = super::CollectionOperationResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::InitiateShardTransferRequest>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move { (*inner).initiate(request).await };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = InitiateSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                _ => {
-                    Box::pin(async move {
-                        Ok(
-                            http::Response::builder()
-                                .status(200)
-                                .header("grpc-status", "12")
-                                .header("content-type", "application/grpc")
-                                .body(empty_body())
-                                .unwrap(),
-                        )
-                    })
-                }
-            }
-        }
-    }
-    impl<T: CollectionsInternal> Clone for CollectionsInternalServer<T> {
-        fn clone(&self) -> Self {
-            let inner = self.inner.clone();
-            Self {
-                inner,
-                accept_compression_encodings: self.accept_compression_encodings,
-                send_compression_encodings: self.send_compression_encodings,
-                max_decoding_message_size: self.max_decoding_message_size,
-                max_encoding_message_size: self.max_encoding_message_size,
-            }
-        }
-    }
-    impl<T: CollectionsInternal> Clone for _Inner<T> {
-        fn clone(&self) -> Self {
-            Self(Arc::clone(&self.0))
-        }
-    }
-    impl<T: std::fmt::Debug> std::fmt::Debug for _Inner<T> {
-        fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-            write!(f, "{:?}", self.0)
-        }
-    }
-    impl<T: CollectionsInternal> tonic::server::NamedService
-    for CollectionsInternalServer<T> {
-        const NAME: &'static str = "qdrant.CollectionsInternal";
-    }
-}
-/// `Struct` represents a structured data value, consisting of fields
-/// which map to dynamically typed values. In some languages, `Struct`
-/// might be supported by a native representation. For example, in
-/// scripting languages like JS a struct is represented as an
-/// object. The details of that representation are described together
-/// with the proto support for the language.
-///
-/// The JSON representation for `Struct` is a JSON object.
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct Struct {
-    /// Unordered map of dynamically typed values.
-    #[prost(map = "string, message", tag = "1")]
-    pub fields: ::std::collections::HashMap<::prost::alloc::string::String, Value>,
-}
-/// `Value` represents a dynamically typed value which can be either
-/// null, a number, a string, a boolean, a recursive struct value, or a
-/// list of values. A producer of value is expected to set one of those
-/// variants, absence of any variant indicates an error.
-///
-/// The JSON representation for `Value` is a JSON value.
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct Value {
-    /// The kind of value.
-    #[prost(oneof = "value::Kind", tags = "1, 2, 3, 4, 5, 6, 7")]
-    pub kind: ::core::option::Option<value::Kind>,
-}
-/// Nested message and enum types in `Value`.
-pub mod value {
-    /// The kind of value.
-    #[derive(serde::Serialize)]
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Oneof)]
-    pub enum Kind {
-        /// Represents a null value.
-        #[prost(enumeration = "super::NullValue", tag = "1")]
-        NullValue(i32),
-        /// Represents a double value.
-        #[prost(double, tag = "2")]
-        DoubleValue(f64),
-        /// Represents an integer value
-        #[prost(int64, tag = "3")]
-        IntegerValue(i64),
-        /// Represents a string value.
-        #[prost(string, tag = "4")]
-        StringValue(::prost::alloc::string::String),
-        /// Represents a boolean value.
-        #[prost(bool, tag = "5")]
-        BoolValue(bool),
-        /// Represents a structured value.
-        #[prost(message, tag = "6")]
-        StructValue(super::Struct),
-        /// Represents a repeated `Value`.
-        #[prost(message, tag = "7")]
-        ListValue(super::ListValue),
-    }
-}
-/// `ListValue` is a wrapper around a repeated field of values.
-///
-/// The JSON representation for `ListValue` is a JSON array.
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct ListValue {
-    /// Repeated field of dynamically typed values.
-    #[prost(message, repeated, tag = "1")]
-    pub values: ::prost::alloc::vec::Vec<Value>,
-}
-/// `NullValue` is a singleton enumeration to represent the null value for the
-/// `Value` type union.
-///
-/// The JSON representation for `NullValue` is JSON `null`.
-#[derive(serde::Serialize)]
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
-#[repr(i32)]
-pub enum NullValue {
-    /// Null value.
-    NullValue = 0,
-}
-impl NullValue {
-    /// String value of the enum field names used in the ProtoBuf definition.
-    ///
-    /// The values are not transformed in any way and thus are considered stable
-    /// (if the ProtoBuf definition does not change) and safe for programmatic use.
-    pub fn as_str_name(&self) -> &'static str {
-        match self {
-            NullValue::NullValue => "NULL_VALUE",
-        }
-    }
-    /// Creates an enum from field names used in the ProtoBuf definition.
-    pub fn from_str_name(value: &str) -> ::core::option::Option<Self> {
-        match value {
-            "NULL_VALUE" => Some(Self::NullValue),
-            _ => None,
-        }
-    }
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct WriteOrdering {
-    /// Write ordering guarantees
-    #[prost(enumeration = "WriteOrderingType", tag = "1")]
-    pub r#type: i32,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct ReadConsistency {
-    #[prost(oneof = "read_consistency::Value", tags = "1, 2")]
-    pub value: ::core::option::Option<read_consistency::Value>,
-}
-/// Nested message and enum types in `ReadConsistency`.
-pub mod read_consistency {
-    #[derive(serde::Serialize)]
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Oneof)]
-    pub enum Value {
-        /// Common read consistency configurations
-        #[prost(enumeration = "super::ReadConsistencyType", tag = "1")]
-        Type(i32),
-        /// Send request to a specified number of nodes, and return points which are present on all of them
-        #[prost(uint64, tag = "2")]
-        Factor(u64),
-    }
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct PointId {
-    #[prost(oneof = "point_id::PointIdOptions", tags = "1, 2")]
-    pub point_id_options: ::core::option::Option<point_id::PointIdOptions>,
-}
-/// Nested message and enum types in `PointId`.
-pub mod point_id {
-    #[derive(serde::Serialize)]
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Oneof)]
-    pub enum PointIdOptions {
-        /// Numerical ID of the point
-        #[prost(uint64, tag = "1")]
-        Num(u64),
-        /// UUID
-        #[prost(string, tag = "2")]
-        Uuid(::prost::alloc::string::String),
-    }
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct Vector {
-    #[prost(float, repeated, tag = "1")]
-    pub data: ::prost::alloc::vec::Vec<f32>,
-}
-#[derive(validator::Validate)]
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct UpsertPoints {
-    /// name of the collection
-    #[prost(string, tag = "1")]
-    #[validate(length(min = 1, max = 255))]
-    pub collection_name: ::prost::alloc::string::String,
-    /// Wait until the changes have been applied?
-    #[prost(bool, optional, tag = "2")]
-    pub wait: ::core::option::Option<bool>,
-    #[prost(message, repeated, tag = "3")]
-    pub points: ::prost::alloc::vec::Vec<PointStruct>,
-    /// Write ordering guarantees
-    #[prost(message, optional, tag = "4")]
-    pub ordering: ::core::option::Option<WriteOrdering>,
-}
-#[derive(validator::Validate)]
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct DeletePoints {
-    /// name of the collection
-    #[prost(string, tag = "1")]
-    #[validate(length(min = 1, max = 255))]
-    pub collection_name: ::prost::alloc::string::String,
-    /// Wait until the changes have been applied?
-    #[prost(bool, optional, tag = "2")]
-    pub wait: ::core::option::Option<bool>,
-    /// Affected points
-    #[prost(message, optional, tag = "3")]
-    pub points: ::core::option::Option<PointsSelector>,
-    /// Write ordering guarantees
-    #[prost(message, optional, tag = "4")]
-    pub ordering: ::core::option::Option<WriteOrdering>,
-}
-#[derive(validator::Validate)]
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct GetPoints {
-    /// name of the collection
-    #[prost(string, tag = "1")]
-    #[validate(length(min = 1, max = 255))]
-    pub collection_name: ::prost::alloc::string::String,
-    /// List of points to retrieve
-    #[prost(message, repeated, tag = "2")]
-    pub ids: ::prost::alloc::vec::Vec<PointId>,
-    /// Options for specifying which payload to include or not
-    #[prost(message, optional, tag = "4")]
-    pub with_payload: ::core::option::Option<WithPayloadSelector>,
-    /// Options for specifying which vectors to include into response
-    #[prost(message, optional, tag = "5")]
-    pub with_vectors: ::core::option::Option<WithVectorsSelector>,
-    /// Options for specifying read consistency guarantees
-    #[prost(message, optional, tag = "6")]
-    pub read_consistency: ::core::option::Option<ReadConsistency>,
-}
-#[derive(validator::Validate)]
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct UpdatePointVectors {
-    /// name of the collection
-    #[prost(string, tag = "1")]
-    #[validate(length(min = 1, max = 255))]
-    pub collection_name: ::prost::alloc::string::String,
-    /// Wait until the changes have been applied?
-    #[prost(bool, optional, tag = "2")]
-    pub wait: ::core::option::Option<bool>,
-    /// List of points and vectors to update
-    #[prost(message, repeated, tag = "3")]
-    pub points: ::prost::alloc::vec::Vec<PointVectors>,
-    /// Write ordering guarantees
-    #[prost(message, optional, tag = "4")]
-    pub ordering: ::core::option::Option<WriteOrdering>,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct PointVectors {
-    /// ID to update vectors for
-    #[prost(message, optional, tag = "1")]
-    pub id: ::core::option::Option<PointId>,
-    /// Named vectors to update, leave others intact
-    #[prost(message, optional, tag = "2")]
-    pub vectors: ::core::option::Option<Vectors>,
-}
-#[derive(validator::Validate)]
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct DeletePointVectors {
-    /// name of the collection
-    #[prost(string, tag = "1")]
-    #[validate(length(min = 1, max = 255))]
-    pub collection_name: ::prost::alloc::string::String,
-    /// Wait until the changes have been applied?
-    #[prost(bool, optional, tag = "2")]
-    pub wait: ::core::option::Option<bool>,
-    /// Affected points
-    #[prost(message, optional, tag = "3")]
-    pub points_selector: ::core::option::Option<PointsSelector>,
-    /// List of vector names to delete
-    #[prost(message, optional, tag = "4")]
-    pub vectors: ::core::option::Option<VectorsSelector>,
-    /// Write ordering guarantees
-    #[prost(message, optional, tag = "5")]
-    pub ordering: ::core::option::Option<WriteOrdering>,
-}
-#[derive(validator::Validate)]
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct SetPayloadPoints {
-    /// name of the collection
-    #[prost(string, tag = "1")]
-    #[validate(length(min = 1, max = 255))]
-    pub collection_name: ::prost::alloc::string::String,
-    /// Wait until the changes have been applied?
-    #[prost(bool, optional, tag = "2")]
-    pub wait: ::core::option::Option<bool>,
-    /// New payload values
-    #[prost(map = "string, message", tag = "3")]
-    pub payload: ::std::collections::HashMap<::prost::alloc::string::String, Value>,
-    /// Affected points
-    #[prost(message, optional, tag = "5")]
-    pub points_selector: ::core::option::Option<PointsSelector>,
-    /// Write ordering guarantees
-    #[prost(message, optional, tag = "6")]
-    pub ordering: ::core::option::Option<WriteOrdering>,
-}
-#[derive(validator::Validate)]
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct DeletePayloadPoints {
-    /// name of the collection
-    #[prost(string, tag = "1")]
-    #[validate(length(min = 1, max = 255))]
-    pub collection_name: ::prost::alloc::string::String,
-    /// Wait until the changes have been applied?
-    #[prost(bool, optional, tag = "2")]
-    pub wait: ::core::option::Option<bool>,
-    /// List of keys to delete
-    #[prost(string, repeated, tag = "3")]
-    pub keys: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
-    /// Affected points
-    #[prost(message, optional, tag = "5")]
-    pub points_selector: ::core::option::Option<PointsSelector>,
-    /// Write ordering guarantees
-    #[prost(message, optional, tag = "6")]
-    pub ordering: ::core::option::Option<WriteOrdering>,
-}
-#[derive(validator::Validate)]
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct ClearPayloadPoints {
-    /// name of the collection
-    #[prost(string, tag = "1")]
-    #[validate(length(min = 1, max = 255))]
-    pub collection_name: ::prost::alloc::string::String,
-    /// Wait until the changes have been applied?
-    #[prost(bool, optional, tag = "2")]
-    pub wait: ::core::option::Option<bool>,
-    /// Affected points
-    #[prost(message, optional, tag = "3")]
-    pub points: ::core::option::Option<PointsSelector>,
-    /// Write ordering guarantees
-    #[prost(message, optional, tag = "4")]
-    pub ordering: ::core::option::Option<WriteOrdering>,
-}
-#[derive(validator::Validate)]
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct CreateFieldIndexCollection {
-    /// name of the collection
-    #[prost(string, tag = "1")]
-    #[validate(length(min = 1, max = 255))]
-    pub collection_name: ::prost::alloc::string::String,
-    /// Wait until the changes have been applied?
-    #[prost(bool, optional, tag = "2")]
-    pub wait: ::core::option::Option<bool>,
-    /// Field name to index
-    #[prost(string, tag = "3")]
-    #[validate(length(min = 1))]
-    pub field_name: ::prost::alloc::string::String,
-    /// Field type.
-    #[prost(enumeration = "FieldType", optional, tag = "4")]
-    pub field_type: ::core::option::Option<i32>,
-    /// Payload index params.
-    #[prost(message, optional, tag = "5")]
-    pub field_index_params: ::core::option::Option<PayloadIndexParams>,
-    /// Write ordering guarantees
-    #[prost(message, optional, tag = "6")]
-    pub ordering: ::core::option::Option<WriteOrdering>,
-}
-#[derive(validator::Validate)]
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct DeleteFieldIndexCollection {
-    /// name of the collection
-    #[prost(string, tag = "1")]
-    #[validate(length(min = 1, max = 255))]
-    pub collection_name: ::prost::alloc::string::String,
-    /// Wait until the changes have been applied?
-    #[prost(bool, optional, tag = "2")]
-    pub wait: ::core::option::Option<bool>,
-    /// Field name to delete
-    #[prost(string, tag = "3")]
-    #[validate(length(min = 1))]
-    pub field_name: ::prost::alloc::string::String,
-    /// Write ordering guarantees
-    #[prost(message, optional, tag = "4")]
-    pub ordering: ::core::option::Option<WriteOrdering>,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct PayloadIncludeSelector {
-    /// List of payload keys to include into result
-    #[prost(string, repeated, tag = "1")]
-    pub fields: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct PayloadExcludeSelector {
-    /// List of payload keys to exclude from the result
-    #[prost(string, repeated, tag = "1")]
-    pub fields: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct WithPayloadSelector {
-    #[prost(oneof = "with_payload_selector::SelectorOptions", tags = "1, 2, 3")]
-    pub selector_options: ::core::option::Option<with_payload_selector::SelectorOptions>,
-}
-/// Nested message and enum types in `WithPayloadSelector`.
-pub mod with_payload_selector {
-    #[derive(serde::Serialize)]
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Oneof)]
-    pub enum SelectorOptions {
-        /// If `true` - return all payload, if `false` - none
-        #[prost(bool, tag = "1")]
-        Enable(bool),
-        #[prost(message, tag = "2")]
-        Include(super::PayloadIncludeSelector),
-        #[prost(message, tag = "3")]
-        Exclude(super::PayloadExcludeSelector),
-    }
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct NamedVectors {
-    #[prost(map = "string, message", tag = "1")]
-    pub vectors: ::std::collections::HashMap<::prost::alloc::string::String, Vector>,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct Vectors {
-    #[prost(oneof = "vectors::VectorsOptions", tags = "1, 2")]
-    pub vectors_options: ::core::option::Option<vectors::VectorsOptions>,
-}
-/// Nested message and enum types in `Vectors`.
-pub mod vectors {
-    #[derive(serde::Serialize)]
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Oneof)]
-    pub enum VectorsOptions {
-        #[prost(message, tag = "1")]
-        Vector(super::Vector),
-        #[prost(message, tag = "2")]
-        Vectors(super::NamedVectors),
-    }
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct VectorsSelector {
-    /// List of vectors to include into result
-    #[prost(string, repeated, tag = "1")]
-    pub names: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct WithVectorsSelector {
-    #[prost(oneof = "with_vectors_selector::SelectorOptions", tags = "1, 2")]
-    pub selector_options: ::core::option::Option<with_vectors_selector::SelectorOptions>,
-}
-/// Nested message and enum types in `WithVectorsSelector`.
-pub mod with_vectors_selector {
-    #[derive(serde::Serialize)]
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Oneof)]
-    pub enum SelectorOptions {
-        /// If `true` - return all vectors, if `false` - none
-        #[prost(bool, tag = "1")]
-        Enable(bool),
-        /// List of payload keys to include into result
-        #[prost(message, tag = "2")]
-        Include(super::VectorsSelector),
-    }
-}
-#[derive(validator::Validate)]
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct QuantizationSearchParams {
-    /// If set to true, search will ignore quantized vector data
-    #[prost(bool, optional, tag = "1")]
-    pub ignore: ::core::option::Option<bool>,
-    /// If true, use original vectors to re-score top-k results. Default is true.
-    #[prost(bool, optional, tag = "2")]
-    pub rescore: ::core::option::Option<bool>,
-    /// Oversampling factor for quantization.
-    ///
-    /// Defines how many extra vectors should be pre-selected using quantized index,
-    /// and then re-scored using original vectors.
-    ///
-    /// For example, if `oversampling` is 2.4 and `limit` is 100, then 240 vectors will be pre-selected using quantized index,
-    /// and then top-100 will be returned after re-scoring.
-    #[prost(double, optional, tag = "3")]
-    #[validate(custom = "crate::grpc::validate::validate_f64_range_min_1")]
-    pub oversampling: ::core::option::Option<f64>,
-}
-#[derive(validator::Validate)]
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct SearchParams {
-    /// Params relevant to HNSW index. Size of the beam in a beam-search.
-    /// Larger the value - more accurate the result, more time required for search.
-    #[prost(uint64, optional, tag = "1")]
-    pub hnsw_ef: ::core::option::Option<u64>,
-    /// Search without approximation. If set to true, search may run long but with exact results.
-    #[prost(bool, optional, tag = "2")]
-    pub exact: ::core::option::Option<bool>,
-    /// If set to true, search will ignore quantized vector data
-    #[prost(message, optional, tag = "3")]
-    #[validate]
-    pub quantization: ::core::option::Option<QuantizationSearchParams>,
-}
-#[derive(validator::Validate)]
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct SearchPoints {
-    /// name of the collection
-    #[prost(string, tag = "1")]
-    #[validate(length(min = 1, max = 255))]
-    pub collection_name: ::prost::alloc::string::String,
-    /// vector
-    #[prost(float, repeated, tag = "2")]
-    pub vector: ::prost::alloc::vec::Vec<f32>,
-    /// Filter conditions - return only those points that satisfy the specified conditions
-    #[prost(message, optional, tag = "3")]
-    pub filter: ::core::option::Option<Filter>,
-    /// Max number of result
-    #[prost(uint64, tag = "4")]
-    #[validate(range(min = 1))]
-    pub limit: u64,
-    /// Options for specifying which payload to include or not
-    #[prost(message, optional, tag = "6")]
-    pub with_payload: ::core::option::Option<WithPayloadSelector>,
-    /// Search config
-    #[prost(message, optional, tag = "7")]
-    #[validate]
-    pub params: ::core::option::Option<SearchParams>,
-    /// If provided - cut off results with worse scores
-    #[prost(float, optional, tag = "8")]
-    pub score_threshold: ::core::option::Option<f32>,
-    /// Offset of the result
-    #[prost(uint64, optional, tag = "9")]
-    pub offset: ::core::option::Option<u64>,
-    /// Which vector to use for search, if not specified - use default vector
-    #[prost(string, optional, tag = "10")]
-    #[validate(custom = "crate::grpc::validate::validate_not_empty")]
-    pub vector_name: ::core::option::Option<::prost::alloc::string::String>,
-    /// Options for specifying which vectors to include into response
-    #[prost(message, optional, tag = "11")]
-    pub with_vectors: ::core::option::Option<WithVectorsSelector>,
-    /// Options for specifying read consistency guarantees
-    #[prost(message, optional, tag = "12")]
-    pub read_consistency: ::core::option::Option<ReadConsistency>,
-}
-#[derive(validator::Validate)]
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct SearchBatchPoints {
-    /// Name of the collection
-    #[prost(string, tag = "1")]
-    #[validate(length(min = 1, max = 255))]
-    pub collection_name: ::prost::alloc::string::String,
-    #[prost(message, repeated, tag = "2")]
-    #[validate]
-    pub search_points: ::prost::alloc::vec::Vec<SearchPoints>,
-    /// Options for specifying read consistency guarantees
-    #[prost(message, optional, tag = "3")]
-    pub read_consistency: ::core::option::Option<ReadConsistency>,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct WithLookup {
-    /// Name of the collection to use for points lookup
-    #[prost(string, tag = "1")]
-    pub collection: ::prost::alloc::string::String,
-    /// Options for specifying which payload to include (or not)
-    #[prost(message, optional, tag = "2")]
-    pub with_payload: ::core::option::Option<WithPayloadSelector>,
-    /// Options for specifying which vectors to include (or not)
-    #[prost(message, optional, tag = "3")]
-    pub with_vectors: ::core::option::Option<WithVectorsSelector>,
-}
-#[derive(validator::Validate)]
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct SearchPointGroups {
-    /// Name of the collection
-    #[prost(string, tag = "1")]
-    #[validate(length(min = 1, max = 255))]
-    pub collection_name: ::prost::alloc::string::String,
-    /// Vector to compare against
-    #[prost(float, repeated, tag = "2")]
-    pub vector: ::prost::alloc::vec::Vec<f32>,
-    /// Filter conditions - return only those points that satisfy the specified conditions
-    #[prost(message, optional, tag = "3")]
-    pub filter: ::core::option::Option<Filter>,
-    /// Max number of result
-    #[prost(uint32, tag = "4")]
-    #[validate(range(min = 1))]
-    pub limit: u32,
-    /// Options for specifying which payload to include or not
-    #[prost(message, optional, tag = "5")]
-    pub with_payload: ::core::option::Option<WithPayloadSelector>,
-    /// Search config
-    #[prost(message, optional, tag = "6")]
-    #[validate]
-    pub params: ::core::option::Option<SearchParams>,
-    /// If provided - cut off results with worse scores
-    #[prost(float, optional, tag = "7")]
-    pub score_threshold: ::core::option::Option<f32>,
-    /// Which vector to use for search, if not specified - use default vector
-    #[prost(string, optional, tag = "8")]
-    #[validate(custom = "crate::grpc::validate::validate_not_empty")]
-    pub vector_name: ::core::option::Option<::prost::alloc::string::String>,
-    /// Options for specifying which vectors to include into response
-    #[prost(message, optional, tag = "9")]
-    pub with_vectors: ::core::option::Option<WithVectorsSelector>,
-    /// Payload field to group by, must be a string or number field. If there are multiple values for the field, all of them will be used. One point can be in multiple groups.
-    #[prost(string, tag = "10")]
-    #[validate(length(min = 1))]
-    pub group_by: ::prost::alloc::string::String,
-    /// Maximum amount of points to return per group
-    #[prost(uint32, tag = "11")]
-    #[validate(range(min = 1))]
-    pub group_size: u32,
-    /// Options for specifying read consistency guarantees
-    #[prost(message, optional, tag = "12")]
-    pub read_consistency: ::core::option::Option<ReadConsistency>,
-    /// Options for specifying how to use the group id to lookup points in another collection
-    #[prost(message, optional, tag = "13")]
-    pub with_lookup: ::core::option::Option<WithLookup>,
-}
-#[derive(validator::Validate)]
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct ScrollPoints {
-    #[prost(string, tag = "1")]
-    #[validate(length(min = 1, max = 255))]
-    pub collection_name: ::prost::alloc::string::String,
-    /// Filter conditions - return only those points that satisfy the specified conditions
-    #[prost(message, optional, tag = "2")]
-    pub filter: ::core::option::Option<Filter>,
-    /// Start with this ID
-    #[prost(message, optional, tag = "3")]
-    pub offset: ::core::option::Option<PointId>,
-    /// Max number of result
-    #[prost(uint32, optional, tag = "4")]
-    #[validate(custom = "crate::grpc::validate::validate_u32_range_min_1")]
-    pub limit: ::core::option::Option<u32>,
-    /// Options for specifying which payload to include or not
-    #[prost(message, optional, tag = "6")]
-    pub with_payload: ::core::option::Option<WithPayloadSelector>,
-    /// Options for specifying which vectors to include into response
-    #[prost(message, optional, tag = "7")]
-    pub with_vectors: ::core::option::Option<WithVectorsSelector>,
-    /// Options for specifying read consistency guarantees
-    #[prost(message, optional, tag = "8")]
-    pub read_consistency: ::core::option::Option<ReadConsistency>,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct LookupLocation {
-    #[prost(string, tag = "1")]
-    pub collection_name: ::prost::alloc::string::String,
-    /// Which vector to use for search, if not specified - use default vector
-    #[prost(string, optional, tag = "2")]
-    pub vector_name: ::core::option::Option<::prost::alloc::string::String>,
-}
-#[derive(validator::Validate)]
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct RecommendPoints {
-    /// name of the collection
-    #[prost(string, tag = "1")]
-    #[validate(length(min = 1, max = 255))]
-    pub collection_name: ::prost::alloc::string::String,
-    /// Look for vectors closest to those
-    #[prost(message, repeated, tag = "2")]
-    pub positive: ::prost::alloc::vec::Vec<PointId>,
-    /// Try to avoid vectors like this
-    #[prost(message, repeated, tag = "3")]
-    pub negative: ::prost::alloc::vec::Vec<PointId>,
-    /// Filter conditions - return only those points that satisfy the specified conditions
-    #[prost(message, optional, tag = "4")]
-    pub filter: ::core::option::Option<Filter>,
-    /// Max number of result
-    #[prost(uint64, tag = "5")]
-    pub limit: u64,
-    /// Options for specifying which payload to include or not
-    #[prost(message, optional, tag = "7")]
-    pub with_payload: ::core::option::Option<WithPayloadSelector>,
-    /// Search config
-    #[prost(message, optional, tag = "8")]
-    #[validate]
-    pub params: ::core::option::Option<SearchParams>,
-    /// If provided - cut off results with worse scores
-    #[prost(float, optional, tag = "9")]
-    pub score_threshold: ::core::option::Option<f32>,
-    /// Offset of the result
-    #[prost(uint64, optional, tag = "10")]
-    pub offset: ::core::option::Option<u64>,
-    /// Define which vector to use for recommendation, if not specified - default vector
-    #[prost(string, optional, tag = "11")]
-    pub using: ::core::option::Option<::prost::alloc::string::String>,
-    /// Options for specifying which vectors to include into response
-    #[prost(message, optional, tag = "12")]
-    pub with_vectors: ::core::option::Option<WithVectorsSelector>,
-    /// Name of the collection to use for points lookup, if not specified - use current collection
-    #[prost(message, optional, tag = "13")]
-    pub lookup_from: ::core::option::Option<LookupLocation>,
-    /// Options for specifying read consistency guarantees
-    #[prost(message, optional, tag = "14")]
-    pub read_consistency: ::core::option::Option<ReadConsistency>,
-}
-#[derive(validator::Validate)]
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct RecommendBatchPoints {
-    /// Name of the collection
-    #[prost(string, tag = "1")]
-    #[validate(length(min = 1, max = 255))]
-    pub collection_name: ::prost::alloc::string::String,
-    #[prost(message, repeated, tag = "2")]
-    #[validate]
-    pub recommend_points: ::prost::alloc::vec::Vec<RecommendPoints>,
-    /// Options for specifying read consistency guarantees
-    #[prost(message, optional, tag = "3")]
-    pub read_consistency: ::core::option::Option<ReadConsistency>,
-}
-#[derive(validator::Validate)]
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct RecommendPointGroups {
-    /// Name of the collection
-    #[prost(string, tag = "1")]
-    #[validate(length(min = 1, max = 255))]
-    pub collection_name: ::prost::alloc::string::String,
-    /// Look for vectors closest to those
-    #[prost(message, repeated, tag = "2")]
-    pub positive: ::prost::alloc::vec::Vec<PointId>,
-    /// Try to avoid vectors like this
-    #[prost(message, repeated, tag = "3")]
-    pub negative: ::prost::alloc::vec::Vec<PointId>,
-    /// Filter conditions - return only those points that satisfy the specified conditions
-    #[prost(message, optional, tag = "4")]
-    pub filter: ::core::option::Option<Filter>,
-    /// Max number of groups in result
-    #[prost(uint32, tag = "5")]
-    #[validate(range(min = 1))]
-    pub limit: u32,
-    /// Options for specifying which payload to include or not
-    #[prost(message, optional, tag = "6")]
-    pub with_payload: ::core::option::Option<WithPayloadSelector>,
-    /// Search config
-    #[prost(message, optional, tag = "7")]
-    #[validate]
-    pub params: ::core::option::Option<SearchParams>,
-    /// If provided - cut off results with worse scores
-    #[prost(float, optional, tag = "8")]
-    pub score_threshold: ::core::option::Option<f32>,
-    /// Define which vector to use for recommendation, if not specified - default vector
-    #[prost(string, optional, tag = "9")]
-    pub using: ::core::option::Option<::prost::alloc::string::String>,
-    /// Options for specifying which vectors to include into response
-    #[prost(message, optional, tag = "10")]
-    pub with_vectors: ::core::option::Option<WithVectorsSelector>,
-    /// Name of the collection to use for points lookup, if not specified - use current collection
-    #[prost(message, optional, tag = "11")]
-    pub lookup_from: ::core::option::Option<LookupLocation>,
-    /// Payload field to group by, must be a string or number field. If there are multiple values for the field, all of them will be used. One point can be in multiple groups.
-    #[prost(string, tag = "12")]
-    #[validate(length(min = 1))]
-    pub group_by: ::prost::alloc::string::String,
-    /// Maximum amount of points to return per group
-    #[prost(uint32, tag = "13")]
-    #[validate(range(min = 1))]
-    pub group_size: u32,
-    /// Options for specifying read consistency guarantees
-    #[prost(message, optional, tag = "14")]
-    pub read_consistency: ::core::option::Option<ReadConsistency>,
-    /// Options for specifying how to use the group id to lookup points in another collection
-    #[prost(message, optional, tag = "15")]
-    pub with_lookup: ::core::option::Option<WithLookup>,
-}
-#[derive(validator::Validate)]
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct CountPoints {
-    /// name of the collection
-    #[prost(string, tag = "1")]
-    #[validate(length(min = 1, max = 255))]
-    pub collection_name: ::prost::alloc::string::String,
-    /// Filter conditions - return only those points that satisfy the specified conditions
-    #[prost(message, optional, tag = "2")]
-    pub filter: ::core::option::Option<Filter>,
-    /// If `true` - return exact count, if `false` - return approximate count
-    #[prost(bool, optional, tag = "3")]
-    pub exact: ::core::option::Option<bool>,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct PointsUpdateOperation {
-    #[prost(
-        oneof = "points_update_operation::Operation",
-        tags = "1, 2, 3, 4, 5, 6, 7, 8"
-    )]
-    pub operation: ::core::option::Option<points_update_operation::Operation>,
-}
-/// Nested message and enum types in `PointsUpdateOperation`.
-pub mod points_update_operation {
-    #[derive(serde::Serialize)]
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Message)]
-    pub struct PointStructList {
-        #[prost(message, repeated, tag = "1")]
-        pub points: ::prost::alloc::vec::Vec<super::PointStruct>,
-    }
-    #[derive(serde::Serialize)]
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Message)]
-    pub struct SetPayload {
-        #[prost(map = "string, message", tag = "1")]
-        pub payload: ::std::collections::HashMap<
-            ::prost::alloc::string::String,
-            super::Value,
-        >,
-        /// Affected points
-        #[prost(message, optional, tag = "2")]
-        pub points_selector: ::core::option::Option<super::PointsSelector>,
-    }
-    #[derive(serde::Serialize)]
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Message)]
-    pub struct DeletePayload {
-        #[prost(string, repeated, tag = "1")]
-        pub keys: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
-        /// Affected points
-        #[prost(message, optional, tag = "2")]
-        pub points_selector: ::core::option::Option<super::PointsSelector>,
-    }
-    #[derive(serde::Serialize)]
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Message)]
-    pub struct UpdateVectors {
-        /// List of points and vectors to update
-        #[prost(message, repeated, tag = "1")]
-        pub points: ::prost::alloc::vec::Vec<super::PointVectors>,
-    }
-    #[derive(serde::Serialize)]
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Message)]
-    pub struct DeleteVectors {
-        /// Affected points
-        #[prost(message, optional, tag = "1")]
-        pub points_selector: ::core::option::Option<super::PointsSelector>,
-        /// List of vector names to delete
-        #[prost(message, optional, tag = "2")]
-        pub vectors: ::core::option::Option<super::VectorsSelector>,
-    }
-    #[derive(serde::Serialize)]
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Oneof)]
-    pub enum Operation {
-        #[prost(message, tag = "1")]
-        Upsert(PointStructList),
-        #[prost(message, tag = "2")]
-        Delete(super::PointsSelector),
-        #[prost(message, tag = "3")]
-        SetPayload(SetPayload),
-        #[prost(message, tag = "4")]
-        OverwritePayload(SetPayload),
-        #[prost(message, tag = "5")]
-        DeletePayload(DeletePayload),
-        #[prost(message, tag = "6")]
-        ClearPayload(super::PointsSelector),
-        #[prost(message, tag = "7")]
-        UpdateVectors(UpdateVectors),
-        #[prost(message, tag = "8")]
-        DeleteVectors(DeleteVectors),
-    }
-}
-#[derive(validator::Validate)]
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct UpdateBatchPoints {
-    /// name of the collection
-    #[prost(string, tag = "1")]
-    #[validate(length(min = 1, max = 255))]
-    pub collection_name: ::prost::alloc::string::String,
-    /// Wait until the changes have been applied?
-    #[prost(bool, optional, tag = "2")]
-    pub wait: ::core::option::Option<bool>,
-    #[prost(message, repeated, tag = "3")]
-    #[validate(length(min = 1))]
-    pub operations: ::prost::alloc::vec::Vec<PointsUpdateOperation>,
-    /// Write ordering guarantees
-    #[prost(message, optional, tag = "4")]
-    pub ordering: ::core::option::Option<WriteOrdering>,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct PointsOperationResponse {
-    #[prost(message, optional, tag = "1")]
-    pub result: ::core::option::Option<UpdateResult>,
-    /// Time spent to process
-    #[prost(double, tag = "2")]
-    pub time: f64,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct UpdateResult {
-    /// Number of operation
-    #[prost(uint64, tag = "1")]
-    pub operation_id: u64,
-    /// Operation status
-    #[prost(enumeration = "UpdateStatus", tag = "2")]
-    pub status: i32,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct ScoredPoint {
-    /// Point id
-    #[prost(message, optional, tag = "1")]
-    pub id: ::core::option::Option<PointId>,
-    /// Payload
-    #[prost(map = "string, message", tag = "2")]
-    pub payload: ::std::collections::HashMap<::prost::alloc::string::String, Value>,
-    /// Similarity score
-    #[prost(float, tag = "3")]
-    pub score: f32,
-    /// Last update operation applied to this point
-    #[prost(uint64, tag = "5")]
-    pub version: u64,
-    /// Vectors to search
-    #[prost(message, optional, tag = "6")]
-    pub vectors: ::core::option::Option<Vectors>,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct GroupId {
-    #[prost(oneof = "group_id::Kind", tags = "1, 2, 3")]
-    pub kind: ::core::option::Option<group_id::Kind>,
-}
-/// Nested message and enum types in `GroupId`.
-pub mod group_id {
-    #[derive(serde::Serialize)]
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Oneof)]
-    pub enum Kind {
-        /// Represents a double value.
-        #[prost(uint64, tag = "1")]
-        UnsignedValue(u64),
-        /// Represents an integer value
-        #[prost(int64, tag = "2")]
-        IntegerValue(i64),
-        /// Represents a string value.
-        #[prost(string, tag = "3")]
-        StringValue(::prost::alloc::string::String),
-    }
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct PointGroup {
-    /// Group id
-    #[prost(message, optional, tag = "1")]
-    pub id: ::core::option::Option<GroupId>,
-    /// Points in the group
-    #[prost(message, repeated, tag = "2")]
-    pub hits: ::prost::alloc::vec::Vec<ScoredPoint>,
-    /// Point(s) from the lookup collection that matches the group id
-    #[prost(message, optional, tag = "3")]
-    pub lookup: ::core::option::Option<RetrievedPoint>,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct GroupsResult {
-    /// Groups
-    #[prost(message, repeated, tag = "1")]
-    pub groups: ::prost::alloc::vec::Vec<PointGroup>,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct SearchResponse {
-    #[prost(message, repeated, tag = "1")]
-    pub result: ::prost::alloc::vec::Vec<ScoredPoint>,
-    /// Time spent to process
-    #[prost(double, tag = "2")]
-    pub time: f64,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct BatchResult {
-    #[prost(message, repeated, tag = "1")]
-    pub result: ::prost::alloc::vec::Vec<ScoredPoint>,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct SearchBatchResponse {
-    #[prost(message, repeated, tag = "1")]
-    pub result: ::prost::alloc::vec::Vec<BatchResult>,
-    /// Time spent to process
-    #[prost(double, tag = "2")]
-    pub time: f64,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct SearchGroupsResponse {
-    #[prost(message, optional, tag = "1")]
-    pub result: ::core::option::Option<GroupsResult>,
-    /// Time spent to process
-    #[prost(double, tag = "2")]
-    pub time: f64,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct CountResponse {
-    #[prost(message, optional, tag = "1")]
-    pub result: ::core::option::Option<CountResult>,
-    /// Time spent to process
-    #[prost(double, tag = "2")]
-    pub time: f64,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct ScrollResponse {
-    /// Use this offset for the next query
-    #[prost(message, optional, tag = "1")]
-    pub next_page_offset: ::core::option::Option<PointId>,
-    #[prost(message, repeated, tag = "2")]
-    pub result: ::prost::alloc::vec::Vec<RetrievedPoint>,
-    /// Time spent to process
-    #[prost(double, tag = "3")]
-    pub time: f64,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct CountResult {
-    #[prost(uint64, tag = "1")]
-    pub count: u64,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct RetrievedPoint {
-    #[prost(message, optional, tag = "1")]
-    pub id: ::core::option::Option<PointId>,
-    #[prost(map = "string, message", tag = "2")]
-    pub payload: ::std::collections::HashMap<::prost::alloc::string::String, Value>,
-    #[prost(message, optional, tag = "4")]
-    pub vectors: ::core::option::Option<Vectors>,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct GetResponse {
-    #[prost(message, repeated, tag = "1")]
-    pub result: ::prost::alloc::vec::Vec<RetrievedPoint>,
-    /// Time spent to process
-    #[prost(double, tag = "2")]
-    pub time: f64,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct RecommendResponse {
-    #[prost(message, repeated, tag = "1")]
-    pub result: ::prost::alloc::vec::Vec<ScoredPoint>,
-    /// Time spent to process
-    #[prost(double, tag = "2")]
-    pub time: f64,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct RecommendBatchResponse {
-    #[prost(message, repeated, tag = "1")]
-    pub result: ::prost::alloc::vec::Vec<BatchResult>,
-    /// Time spent to process
-    #[prost(double, tag = "2")]
-    pub time: f64,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct RecommendGroupsResponse {
-    #[prost(message, optional, tag = "1")]
-    pub result: ::core::option::Option<GroupsResult>,
-    /// Time spent to process
-    #[prost(double, tag = "2")]
-    pub time: f64,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct UpdateBatchResponse {
-    #[prost(message, repeated, tag = "1")]
-    pub result: ::prost::alloc::vec::Vec<UpdateResult>,
-    /// Time spent to process
-    #[prost(double, tag = "2")]
-    pub time: f64,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct Filter {
-    /// At least one of those conditions should match
-    #[prost(message, repeated, tag = "1")]
-    pub should: ::prost::alloc::vec::Vec<Condition>,
-    /// All conditions must match
-    #[prost(message, repeated, tag = "2")]
-    pub must: ::prost::alloc::vec::Vec<Condition>,
-    /// All conditions must NOT match
-    #[prost(message, repeated, tag = "3")]
-    pub must_not: ::prost::alloc::vec::Vec<Condition>,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct Condition {
-    #[prost(oneof = "condition::ConditionOneOf", tags = "1, 2, 3, 4, 5, 6")]
-    pub condition_one_of: ::core::option::Option<condition::ConditionOneOf>,
-}
-/// Nested message and enum types in `Condition`.
-pub mod condition {
-    #[derive(serde::Serialize)]
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Oneof)]
-    pub enum ConditionOneOf {
-        #[prost(message, tag = "1")]
-        Field(super::FieldCondition),
-        #[prost(message, tag = "2")]
-        IsEmpty(super::IsEmptyCondition),
-        #[prost(message, tag = "3")]
-        HasId(super::HasIdCondition),
-        #[prost(message, tag = "4")]
-        Filter(super::Filter),
-        #[prost(message, tag = "5")]
-        IsNull(super::IsNullCondition),
-        #[prost(message, tag = "6")]
-        Nested(super::NestedCondition),
-    }
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct IsEmptyCondition {
-    #[prost(string, tag = "1")]
-    pub key: ::prost::alloc::string::String,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct IsNullCondition {
-    #[prost(string, tag = "1")]
-    pub key: ::prost::alloc::string::String,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct HasIdCondition {
-    #[prost(message, repeated, tag = "1")]
-    pub has_id: ::prost::alloc::vec::Vec<PointId>,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct NestedCondition {
-    /// Path to nested object
-    #[prost(string, tag = "1")]
-    pub key: ::prost::alloc::string::String,
-    /// Filter condition
-    #[prost(message, optional, tag = "2")]
-    pub filter: ::core::option::Option<Filter>,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct FieldCondition {
-    #[prost(string, tag = "1")]
-    pub key: ::prost::alloc::string::String,
-    /// Check if point has field with a given value
-    #[prost(message, optional, tag = "2")]
-    pub r#match: ::core::option::Option<Match>,
-    /// Check if points value lies in a given range
-    #[prost(message, optional, tag = "3")]
-    pub range: ::core::option::Option<Range>,
-    /// Check if points geolocation lies in a given area
-    #[prost(message, optional, tag = "4")]
-    pub geo_bounding_box: ::core::option::Option<GeoBoundingBox>,
-    /// Check if geo point is within a given radius
-    #[prost(message, optional, tag = "5")]
-    pub geo_radius: ::core::option::Option<GeoRadius>,
-    /// Check number of values for a specific field
-    #[prost(message, optional, tag = "6")]
-    pub values_count: ::core::option::Option<ValuesCount>,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct Match {
-    #[prost(oneof = "r#match::MatchValue", tags = "1, 2, 3, 4, 5, 6, 7, 8")]
-    pub match_value: ::core::option::Option<r#match::MatchValue>,
-}
-/// Nested message and enum types in `Match`.
-pub mod r#match {
-    #[derive(serde::Serialize)]
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Oneof)]
-    pub enum MatchValue {
-        /// Match string keyword
-        #[prost(string, tag = "1")]
-        Keyword(::prost::alloc::string::String),
-        /// Match integer
-        #[prost(int64, tag = "2")]
-        Integer(i64),
-        /// Match boolean
-        #[prost(bool, tag = "3")]
-        Boolean(bool),
-        /// Match text
-        #[prost(string, tag = "4")]
-        Text(::prost::alloc::string::String),
-        /// Match multiple keywords
-        #[prost(message, tag = "5")]
-        Keywords(super::RepeatedStrings),
-        /// Match multiple integers
-        #[prost(message, tag = "6")]
-        Integers(super::RepeatedIntegers),
-        /// Match any other value except those integers
-        #[prost(message, tag = "7")]
-        ExceptIntegers(super::RepeatedIntegers),
-        /// Match any other value except those keywords
-        #[prost(message, tag = "8")]
-        ExceptKeywords(super::RepeatedStrings),
-    }
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct RepeatedStrings {
-    #[prost(string, repeated, tag = "1")]
-    pub strings: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct RepeatedIntegers {
-    #[prost(int64, repeated, tag = "1")]
-    pub integers: ::prost::alloc::vec::Vec<i64>,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct Range {
-    #[prost(double, optional, tag = "1")]
-    pub lt: ::core::option::Option<f64>,
-    #[prost(double, optional, tag = "2")]
-    pub gt: ::core::option::Option<f64>,
-    #[prost(double, optional, tag = "3")]
-    pub gte: ::core::option::Option<f64>,
-    #[prost(double, optional, tag = "4")]
-    pub lte: ::core::option::Option<f64>,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct GeoBoundingBox {
-    /// north-west corner
-    #[prost(message, optional, tag = "1")]
-    pub top_left: ::core::option::Option<GeoPoint>,
-    /// south-east corner
-    #[prost(message, optional, tag = "2")]
-    pub bottom_right: ::core::option::Option<GeoPoint>,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct GeoRadius {
-    /// Center of the circle
-    #[prost(message, optional, tag = "1")]
-    pub center: ::core::option::Option<GeoPoint>,
-    /// In meters
-    #[prost(float, tag = "2")]
-    pub radius: f32,
-}
-#[derive(validator::Validate)]
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct GeoPolygon {
-    /// Ordered list of coordinates representing the vertices of a polygon.
-    /// The minimum size is 4, and the first coordinate and the last coordinate
-    /// should be the same to form a closed polygon.
-    #[prost(message, repeated, tag = "1")]
-    #[validate(custom = "crate::grpc::validate::validate_geo_polygon")]
-    pub points: ::prost::alloc::vec::Vec<GeoPoint>,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct ValuesCount {
-    #[prost(uint64, optional, tag = "1")]
-    pub lt: ::core::option::Option<u64>,
-    #[prost(uint64, optional, tag = "2")]
-    pub gt: ::core::option::Option<u64>,
-    #[prost(uint64, optional, tag = "3")]
-    pub gte: ::core::option::Option<u64>,
-    #[prost(uint64, optional, tag = "4")]
-    pub lte: ::core::option::Option<u64>,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct PointsSelector {
-    #[prost(oneof = "points_selector::PointsSelectorOneOf", tags = "1, 2")]
-    pub points_selector_one_of: ::core::option::Option<
-        points_selector::PointsSelectorOneOf,
-    >,
-}
-/// Nested message and enum types in `PointsSelector`.
-pub mod points_selector {
-    #[derive(serde::Serialize)]
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Oneof)]
-    pub enum PointsSelectorOneOf {
-        #[prost(message, tag = "1")]
-        Points(super::PointsIdsList),
-        #[prost(message, tag = "2")]
-        Filter(super::Filter),
-    }
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct PointsIdsList {
-    #[prost(message, repeated, tag = "1")]
-    pub ids: ::prost::alloc::vec::Vec<PointId>,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct PointStruct {
-    #[prost(message, optional, tag = "1")]
-    pub id: ::core::option::Option<PointId>,
-    #[prost(map = "string, message", tag = "3")]
-    pub payload: ::std::collections::HashMap<::prost::alloc::string::String, Value>,
-    #[prost(message, optional, tag = "4")]
-    pub vectors: ::core::option::Option<Vectors>,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct GeoPoint {
-    #[prost(double, tag = "1")]
-    pub lon: f64,
-    #[prost(double, tag = "2")]
-    pub lat: f64,
-}
-#[derive(serde::Serialize)]
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
-#[repr(i32)]
-pub enum WriteOrderingType {
-    /// Write operations may be reordered, works faster, default
-    Weak = 0,
-    /// Write operations go through dynamically selected leader, may be inconsistent for a short period of time in case of leader change
-    Medium = 1,
-    /// Write operations go through the permanent leader, consistent, but may be unavailable if leader is down
-    Strong = 2,
-}
-impl WriteOrderingType {
-    /// String value of the enum field names used in the ProtoBuf definition.
-    ///
-    /// The values are not transformed in any way and thus are considered stable
-    /// (if the ProtoBuf definition does not change) and safe for programmatic use.
-    pub fn as_str_name(&self) -> &'static str {
-        match self {
-            WriteOrderingType::Weak => "Weak",
-            WriteOrderingType::Medium => "Medium",
-            WriteOrderingType::Strong => "Strong",
-        }
-    }
-    /// Creates an enum from field names used in the ProtoBuf definition.
-    pub fn from_str_name(value: &str) -> ::core::option::Option<Self> {
-        match value {
-            "Weak" => Some(Self::Weak),
-            "Medium" => Some(Self::Medium),
-            "Strong" => Some(Self::Strong),
-            _ => None,
-        }
-    }
-}
-#[derive(serde::Serialize)]
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
-#[repr(i32)]
-pub enum ReadConsistencyType {
-    /// Send request to all nodes and return points which are present on all of them
-    All = 0,
-    /// Send requests to all nodes and return points which are present on majority of them
-    Majority = 1,
-    /// Send requests to half + 1 nodes, return points which are present on all of them
-    Quorum = 2,
-}
-impl ReadConsistencyType {
-    /// String value of the enum field names used in the ProtoBuf definition.
-    ///
-    /// The values are not transformed in any way and thus are considered stable
-    /// (if the ProtoBuf definition does not change) and safe for programmatic use.
-    pub fn as_str_name(&self) -> &'static str {
-        match self {
-            ReadConsistencyType::All => "All",
-            ReadConsistencyType::Majority => "Majority",
-            ReadConsistencyType::Quorum => "Quorum",
-        }
-    }
-    /// Creates an enum from field names used in the ProtoBuf definition.
-    pub fn from_str_name(value: &str) -> ::core::option::Option<Self> {
-        match value {
-            "All" => Some(Self::All),
-            "Majority" => Some(Self::Majority),
-            "Quorum" => Some(Self::Quorum),
-            _ => None,
-        }
-    }
-}
-#[derive(serde::Serialize)]
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
-#[repr(i32)]
-pub enum FieldType {
-    Keyword = 0,
-    Integer = 1,
-    Float = 2,
-    Geo = 3,
-    Text = 4,
-    Bool = 5,
-}
-impl FieldType {
-    /// String value of the enum field names used in the ProtoBuf definition.
-    ///
-    /// The values are not transformed in any way and thus are considered stable
-    /// (if the ProtoBuf definition does not change) and safe for programmatic use.
-    pub fn as_str_name(&self) -> &'static str {
-        match self {
-            FieldType::Keyword => "FieldTypeKeyword",
-            FieldType::Integer => "FieldTypeInteger",
-            FieldType::Float => "FieldTypeFloat",
-            FieldType::Geo => "FieldTypeGeo",
-            FieldType::Text => "FieldTypeText",
-            FieldType::Bool => "FieldTypeBool",
-        }
-    }
-    /// Creates an enum from field names used in the ProtoBuf definition.
-    pub fn from_str_name(value: &str) -> ::core::option::Option<Self> {
-        match value {
-            "FieldTypeKeyword" => Some(Self::Keyword),
-            "FieldTypeInteger" => Some(Self::Integer),
-            "FieldTypeFloat" => Some(Self::Float),
-            "FieldTypeGeo" => Some(Self::Geo),
-            "FieldTypeText" => Some(Self::Text),
-            "FieldTypeBool" => Some(Self::Bool),
-            _ => None,
-        }
-    }
-}
-#[derive(serde::Serialize)]
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
-#[repr(i32)]
-pub enum UpdateStatus {
-    UnknownUpdateStatus = 0,
-    /// Update is received, but not processed yet
-    Acknowledged = 1,
-    /// Update is applied and ready for search
-    Completed = 2,
-}
-impl UpdateStatus {
-    /// String value of the enum field names used in the ProtoBuf definition.
-    ///
-    /// The values are not transformed in any way and thus are considered stable
-    /// (if the ProtoBuf definition does not change) and safe for programmatic use.
-    pub fn as_str_name(&self) -> &'static str {
-        match self {
-            UpdateStatus::UnknownUpdateStatus => "UnknownUpdateStatus",
-            UpdateStatus::Acknowledged => "Acknowledged",
-            UpdateStatus::Completed => "Completed",
-        }
-    }
-    /// Creates an enum from field names used in the ProtoBuf definition.
-    pub fn from_str_name(value: &str) -> ::core::option::Option<Self> {
-        match value {
-            "UnknownUpdateStatus" => Some(Self::UnknownUpdateStatus),
-            "Acknowledged" => Some(Self::Acknowledged),
-            "Completed" => Some(Self::Completed),
-            _ => None,
-        }
-    }
-}
-/// Generated client implementations.
-pub mod points_client {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
-    use tonic::codegen::*;
-    use tonic::codegen::http::Uri;
-    #[derive(Debug, Clone)]
-    pub struct PointsClient<T> {
-        inner: tonic::client::Grpc<T>,
-    }
-    impl PointsClient<tonic::transport::Channel> {
-        /// Attempt to create a new client by connecting to a given endpoint.
-        pub async fn connect<D>(dst: D) -> Result<Self, tonic::transport::Error>
-        where
-            D: TryInto<tonic::transport::Endpoint>,
-            D::Error: Into<StdError>,
-        {
-            let conn = tonic::transport::Endpoint::new(dst)?.connect().await?;
-            Ok(Self::new(conn))
-        }
-    }
-    impl<T> PointsClient<T>
-    where
-        T: tonic::client::GrpcService<tonic::body::BoxBody>,
-        T::Error: Into<StdError>,
-        T::ResponseBody: Body<Data = Bytes> + Send + 'static,
-        <T::ResponseBody as Body>::Error: Into<StdError> + Send,
-    {
-        pub fn new(inner: T) -> Self {
-            let inner = tonic::client::Grpc::new(inner);
-            Self { inner }
-        }
-        pub fn with_origin(inner: T, origin: Uri) -> Self {
-            let inner = tonic::client::Grpc::with_origin(inner, origin);
-            Self { inner }
-        }
-        pub fn with_interceptor<F>(
-            inner: T,
-            interceptor: F,
-        ) -> PointsClient<InterceptedService<T, F>>
-        where
-            F: tonic::service::Interceptor,
-            T::ResponseBody: Default,
-            T: tonic::codegen::Service<
-                http::Request<tonic::body::BoxBody>,
-                Response = http::Response<
-                    <T as tonic::client::GrpcService<tonic::body::BoxBody>>::ResponseBody,
-                >,
-            >,
-            <T as tonic::codegen::Service<
-                http::Request<tonic::body::BoxBody>,
-            >>::Error: Into<StdError> + Send + Sync,
-        {
-            PointsClient::new(InterceptedService::new(inner, interceptor))
-        }
-        /// Compress requests with the given encoding.
-        ///
-        /// This requires the server to support it otherwise it might respond with an
-        /// error.
-        #[must_use]
-        pub fn send_compressed(mut self, encoding: CompressionEncoding) -> Self {
-            self.inner = self.inner.send_compressed(encoding);
-            self
-        }
-        /// Enable decompressing responses.
-        #[must_use]
-        pub fn accept_compressed(mut self, encoding: CompressionEncoding) -> Self {
-            self.inner = self.inner.accept_compressed(encoding);
-            self
-        }
-        /// Limits the maximum size of a decoded message.
-        ///
-        /// Default: `4MB`
-        #[must_use]
-        pub fn max_decoding_message_size(mut self, limit: usize) -> Self {
-            self.inner = self.inner.max_decoding_message_size(limit);
-            self
-        }
-        /// Limits the maximum size of an encoded message.
-        ///
-        /// Default: `usize::MAX`
-        #[must_use]
-        pub fn max_encoding_message_size(mut self, limit: usize) -> Self {
-            self.inner = self.inner.max_encoding_message_size(limit);
-            self
-        }
-        /// Perform insert + updates on points. If a point with a given ID already exists - it will be overwritten.
-        pub async fn upsert(
-            &mut self,
-            request: impl tonic::IntoRequest<super::UpsertPoints>,
-        ) -> std::result::Result<
-            tonic::Response<super::PointsOperationResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static("/qdrant.Points/Upsert");
-            let mut req = request.into_request();
-            req.extensions_mut().insert(GrpcMethod::new("qdrant.Points", "Upsert"));
-            self.inner.unary(req, path, codec).await
-        }
-        /// Delete points
-        pub async fn delete(
-            &mut self,
-            request: impl tonic::IntoRequest<super::DeletePoints>,
-        ) -> std::result::Result<
-            tonic::Response<super::PointsOperationResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static("/qdrant.Points/Delete");
-            let mut req = request.into_request();
-            req.extensions_mut().insert(GrpcMethod::new("qdrant.Points", "Delete"));
-            self.inner.unary(req, path, codec).await
-        }
-        /// Retrieve points
-        pub async fn get(
-            &mut self,
-            request: impl tonic::IntoRequest<super::GetPoints>,
-        ) -> std::result::Result<tonic::Response<super::GetResponse>, tonic::Status> {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static("/qdrant.Points/Get");
-            let mut req = request.into_request();
-            req.extensions_mut().insert(GrpcMethod::new("qdrant.Points", "Get"));
-            self.inner.unary(req, path, codec).await
-        }
-        /// Update named vectors for point
-        pub async fn update_vectors(
-            &mut self,
-            request: impl tonic::IntoRequest<super::UpdatePointVectors>,
-        ) -> std::result::Result<
-            tonic::Response<super::PointsOperationResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/qdrant.Points/UpdateVectors",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(GrpcMethod::new("qdrant.Points", "UpdateVectors"));
-            self.inner.unary(req, path, codec).await
-        }
-        /// Delete named vectors for points
-        pub async fn delete_vectors(
-            &mut self,
-            request: impl tonic::IntoRequest<super::DeletePointVectors>,
-        ) -> std::result::Result<
-            tonic::Response<super::PointsOperationResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/qdrant.Points/DeleteVectors",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(GrpcMethod::new("qdrant.Points", "DeleteVectors"));
-            self.inner.unary(req, path, codec).await
-        }
-        /// Set payload for points
-        pub async fn set_payload(
-            &mut self,
-            request: impl tonic::IntoRequest<super::SetPayloadPoints>,
-        ) -> std::result::Result<
-            tonic::Response<super::PointsOperationResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static("/qdrant.Points/SetPayload");
-            let mut req = request.into_request();
-            req.extensions_mut().insert(GrpcMethod::new("qdrant.Points", "SetPayload"));
-            self.inner.unary(req, path, codec).await
-        }
-        /// Overwrite payload for points
-        pub async fn overwrite_payload(
-            &mut self,
-            request: impl tonic::IntoRequest<super::SetPayloadPoints>,
-        ) -> std::result::Result<
-            tonic::Response<super::PointsOperationResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/qdrant.Points/OverwritePayload",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(GrpcMethod::new("qdrant.Points", "OverwritePayload"));
-            self.inner.unary(req, path, codec).await
-        }
-        /// Delete specified key payload for points
-        pub async fn delete_payload(
-            &mut self,
-            request: impl tonic::IntoRequest<super::DeletePayloadPoints>,
-        ) -> std::result::Result<
-            tonic::Response<super::PointsOperationResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/qdrant.Points/DeletePayload",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(GrpcMethod::new("qdrant.Points", "DeletePayload"));
-            self.inner.unary(req, path, codec).await
-        }
-        /// Remove all payload for specified points
-        pub async fn clear_payload(
-            &mut self,
-            request: impl tonic::IntoRequest<super::ClearPayloadPoints>,
-        ) -> std::result::Result<
-            tonic::Response<super::PointsOperationResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/qdrant.Points/ClearPayload",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(GrpcMethod::new("qdrant.Points", "ClearPayload"));
-            self.inner.unary(req, path, codec).await
-        }
-        /// Create index for field in collection
-        pub async fn create_field_index(
-            &mut self,
-            request: impl tonic::IntoRequest<super::CreateFieldIndexCollection>,
-        ) -> std::result::Result<
-            tonic::Response<super::PointsOperationResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/qdrant.Points/CreateFieldIndex",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(GrpcMethod::new("qdrant.Points", "CreateFieldIndex"));
-            self.inner.unary(req, path, codec).await
-        }
-        /// Delete field index for collection
-        pub async fn delete_field_index(
-            &mut self,
-            request: impl tonic::IntoRequest<super::DeleteFieldIndexCollection>,
-        ) -> std::result::Result<
-            tonic::Response<super::PointsOperationResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/qdrant.Points/DeleteFieldIndex",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(GrpcMethod::new("qdrant.Points", "DeleteFieldIndex"));
-            self.inner.unary(req, path, codec).await
-        }
-        /// Retrieve closest points based on vector similarity and given filtering conditions
-        pub async fn search(
-            &mut self,
-            request: impl tonic::IntoRequest<super::SearchPoints>,
-        ) -> std::result::Result<tonic::Response<super::SearchResponse>, tonic::Status> {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static("/qdrant.Points/Search");
-            let mut req = request.into_request();
-            req.extensions_mut().insert(GrpcMethod::new("qdrant.Points", "Search"));
-            self.inner.unary(req, path, codec).await
-        }
-        /// Retrieve closest points based on vector similarity and given filtering conditions
-        pub async fn search_batch(
-            &mut self,
-            request: impl tonic::IntoRequest<super::SearchBatchPoints>,
-        ) -> std::result::Result<
-            tonic::Response<super::SearchBatchResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/qdrant.Points/SearchBatch",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut().insert(GrpcMethod::new("qdrant.Points", "SearchBatch"));
-            self.inner.unary(req, path, codec).await
-        }
-        /// Retrieve closest points based on vector similarity and given filtering conditions, grouped by a given field
-        pub async fn search_groups(
-            &mut self,
-            request: impl tonic::IntoRequest<super::SearchPointGroups>,
-        ) -> std::result::Result<
-            tonic::Response<super::SearchGroupsResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/qdrant.Points/SearchGroups",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(GrpcMethod::new("qdrant.Points", "SearchGroups"));
-            self.inner.unary(req, path, codec).await
-        }
-        /// Iterate over all or filtered points points
-        pub async fn scroll(
-            &mut self,
-            request: impl tonic::IntoRequest<super::ScrollPoints>,
-        ) -> std::result::Result<tonic::Response<super::ScrollResponse>, tonic::Status> {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static("/qdrant.Points/Scroll");
-            let mut req = request.into_request();
-            req.extensions_mut().insert(GrpcMethod::new("qdrant.Points", "Scroll"));
-            self.inner.unary(req, path, codec).await
-        }
-        /// Look for the points which are closer to stored positive examples and at the same time further to negative examples.
-        pub async fn recommend(
-            &mut self,
-            request: impl tonic::IntoRequest<super::RecommendPoints>,
-        ) -> std::result::Result<
-            tonic::Response<super::RecommendResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static("/qdrant.Points/Recommend");
-            let mut req = request.into_request();
-            req.extensions_mut().insert(GrpcMethod::new("qdrant.Points", "Recommend"));
-            self.inner.unary(req, path, codec).await
-        }
-        /// Look for the points which are closer to stored positive examples and at the same time further to negative examples.
-        pub async fn recommend_batch(
-            &mut self,
-            request: impl tonic::IntoRequest<super::RecommendBatchPoints>,
-        ) -> std::result::Result<
-            tonic::Response<super::RecommendBatchResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/qdrant.Points/RecommendBatch",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(GrpcMethod::new("qdrant.Points", "RecommendBatch"));
-            self.inner.unary(req, path, codec).await
-        }
-        /// Look for the points which are closer to stored positive examples and at the same time further to negative examples, grouped by a given field
-        pub async fn recommend_groups(
-            &mut self,
-            request: impl tonic::IntoRequest<super::RecommendPointGroups>,
-        ) -> std::result::Result<
-            tonic::Response<super::RecommendGroupsResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/qdrant.Points/RecommendGroups",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(GrpcMethod::new("qdrant.Points", "RecommendGroups"));
-            self.inner.unary(req, path, codec).await
-        }
-        /// Count points in collection with given filtering conditions
-        pub async fn count(
-            &mut self,
-            request: impl tonic::IntoRequest<super::CountPoints>,
-        ) -> std::result::Result<tonic::Response<super::CountResponse>, tonic::Status> {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static("/qdrant.Points/Count");
-            let mut req = request.into_request();
-            req.extensions_mut().insert(GrpcMethod::new("qdrant.Points", "Count"));
-            self.inner.unary(req, path, codec).await
-        }
-        /// Perform multiple update operations in one request
-        pub async fn update_batch(
-            &mut self,
-            request: impl tonic::IntoRequest<super::UpdateBatchPoints>,
-        ) -> std::result::Result<
-            tonic::Response<super::UpdateBatchResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/qdrant.Points/UpdateBatch",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut().insert(GrpcMethod::new("qdrant.Points", "UpdateBatch"));
-            self.inner.unary(req, path, codec).await
-        }
-    }
-}
-/// Generated server implementations.
-pub mod points_server {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
-    use tonic::codegen::*;
-    /// Generated trait containing gRPC methods that should be implemented for use with PointsServer.
-    #[async_trait]
-    pub trait Points: Send + Sync + 'static {
-        /// Perform insert + updates on points. If a point with a given ID already exists - it will be overwritten.
-        async fn upsert(
-            &self,
-            request: tonic::Request<super::UpsertPoints>,
-        ) -> std::result::Result<
-            tonic::Response<super::PointsOperationResponse>,
-            tonic::Status,
-        >;
-        /// Delete points
-        async fn delete(
-            &self,
-            request: tonic::Request<super::DeletePoints>,
-        ) -> std::result::Result<
-            tonic::Response<super::PointsOperationResponse>,
-            tonic::Status,
-        >;
-        /// Retrieve points
-        async fn get(
-            &self,
-            request: tonic::Request<super::GetPoints>,
-        ) -> std::result::Result<tonic::Response<super::GetResponse>, tonic::Status>;
-        /// Update named vectors for point
-        async fn update_vectors(
-            &self,
-            request: tonic::Request<super::UpdatePointVectors>,
-        ) -> std::result::Result<
-            tonic::Response<super::PointsOperationResponse>,
-            tonic::Status,
-        >;
-        /// Delete named vectors for points
-        async fn delete_vectors(
-            &self,
-            request: tonic::Request<super::DeletePointVectors>,
-        ) -> std::result::Result<
-            tonic::Response<super::PointsOperationResponse>,
-            tonic::Status,
-        >;
-        /// Set payload for points
-        async fn set_payload(
-            &self,
-            request: tonic::Request<super::SetPayloadPoints>,
-        ) -> std::result::Result<
-            tonic::Response<super::PointsOperationResponse>,
-            tonic::Status,
-        >;
-        /// Overwrite payload for points
-        async fn overwrite_payload(
-            &self,
-            request: tonic::Request<super::SetPayloadPoints>,
-        ) -> std::result::Result<
-            tonic::Response<super::PointsOperationResponse>,
-            tonic::Status,
-        >;
-        /// Delete specified key payload for points
-        async fn delete_payload(
-            &self,
-            request: tonic::Request<super::DeletePayloadPoints>,
-        ) -> std::result::Result<
-            tonic::Response<super::PointsOperationResponse>,
-            tonic::Status,
-        >;
-        /// Remove all payload for specified points
-        async fn clear_payload(
-            &self,
-            request: tonic::Request<super::ClearPayloadPoints>,
-        ) -> std::result::Result<
-            tonic::Response<super::PointsOperationResponse>,
-            tonic::Status,
-        >;
-        /// Create index for field in collection
-        async fn create_field_index(
-            &self,
-            request: tonic::Request<super::CreateFieldIndexCollection>,
-        ) -> std::result::Result<
-            tonic::Response<super::PointsOperationResponse>,
-            tonic::Status,
-        >;
-        /// Delete field index for collection
-        async fn delete_field_index(
-            &self,
-            request: tonic::Request<super::DeleteFieldIndexCollection>,
-        ) -> std::result::Result<
-            tonic::Response<super::PointsOperationResponse>,
-            tonic::Status,
-        >;
-        /// Retrieve closest points based on vector similarity and given filtering conditions
-        async fn search(
-            &self,
-            request: tonic::Request<super::SearchPoints>,
-        ) -> std::result::Result<tonic::Response<super::SearchResponse>, tonic::Status>;
-        /// Retrieve closest points based on vector similarity and given filtering conditions
-        async fn search_batch(
-            &self,
-            request: tonic::Request<super::SearchBatchPoints>,
-        ) -> std::result::Result<
-            tonic::Response<super::SearchBatchResponse>,
-            tonic::Status,
-        >;
-        /// Retrieve closest points based on vector similarity and given filtering conditions, grouped by a given field
-        async fn search_groups(
-            &self,
-            request: tonic::Request<super::SearchPointGroups>,
-        ) -> std::result::Result<
-            tonic::Response<super::SearchGroupsResponse>,
-            tonic::Status,
-        >;
-        /// Iterate over all or filtered points points
-        async fn scroll(
-            &self,
-            request: tonic::Request<super::ScrollPoints>,
-        ) -> std::result::Result<tonic::Response<super::ScrollResponse>, tonic::Status>;
-        /// Look for the points which are closer to stored positive examples and at the same time further to negative examples.
-        async fn recommend(
-            &self,
-            request: tonic::Request<super::RecommendPoints>,
-        ) -> std::result::Result<
-            tonic::Response<super::RecommendResponse>,
-            tonic::Status,
-        >;
-        /// Look for the points which are closer to stored positive examples and at the same time further to negative examples.
-        async fn recommend_batch(
-            &self,
-            request: tonic::Request<super::RecommendBatchPoints>,
-        ) -> std::result::Result<
-            tonic::Response<super::RecommendBatchResponse>,
-            tonic::Status,
-        >;
-        /// Look for the points which are closer to stored positive examples and at the same time further to negative examples, grouped by a given field
-        async fn recommend_groups(
-            &self,
-            request: tonic::Request<super::RecommendPointGroups>,
-        ) -> std::result::Result<
-            tonic::Response<super::RecommendGroupsResponse>,
-            tonic::Status,
-        >;
-        /// Count points in collection with given filtering conditions
-        async fn count(
-            &self,
-            request: tonic::Request<super::CountPoints>,
-        ) -> std::result::Result<tonic::Response<super::CountResponse>, tonic::Status>;
-        /// Perform multiple update operations in one request
-        async fn update_batch(
-            &self,
-            request: tonic::Request<super::UpdateBatchPoints>,
-        ) -> std::result::Result<
-            tonic::Response<super::UpdateBatchResponse>,
-            tonic::Status,
-        >;
-    }
-    #[derive(Debug)]
-    pub struct PointsServer<T: Points> {
-        inner: _Inner<T>,
-        accept_compression_encodings: EnabledCompressionEncodings,
-        send_compression_encodings: EnabledCompressionEncodings,
-        max_decoding_message_size: Option<usize>,
-        max_encoding_message_size: Option<usize>,
-    }
-    struct _Inner<T>(Arc<T>);
-    impl<T: Points> PointsServer<T> {
-        pub fn new(inner: T) -> Self {
-            Self::from_arc(Arc::new(inner))
-        }
-        pub fn from_arc(inner: Arc<T>) -> Self {
-            let inner = _Inner(inner);
-            Self {
-                inner,
-                accept_compression_encodings: Default::default(),
-                send_compression_encodings: Default::default(),
-                max_decoding_message_size: None,
-                max_encoding_message_size: None,
-            }
-        }
-        pub fn with_interceptor<F>(
-            inner: T,
-            interceptor: F,
-        ) -> InterceptedService<Self, F>
-        where
-            F: tonic::service::Interceptor,
-        {
-            InterceptedService::new(Self::new(inner), interceptor)
-        }
-        /// Enable decompressing requests with the given encoding.
-        #[must_use]
-        pub fn accept_compressed(mut self, encoding: CompressionEncoding) -> Self {
-            self.accept_compression_encodings.enable(encoding);
-            self
-        }
-        /// Compress responses with the given encoding, if the client supports it.
-        #[must_use]
-        pub fn send_compressed(mut self, encoding: CompressionEncoding) -> Self {
-            self.send_compression_encodings.enable(encoding);
-            self
-        }
-        /// Limits the maximum size of a decoded message.
-        ///
-        /// Default: `4MB`
-        #[must_use]
-        pub fn max_decoding_message_size(mut self, limit: usize) -> Self {
-            self.max_decoding_message_size = Some(limit);
-            self
-        }
-        /// Limits the maximum size of an encoded message.
-        ///
-        /// Default: `usize::MAX`
-        #[must_use]
-        pub fn max_encoding_message_size(mut self, limit: usize) -> Self {
-            self.max_encoding_message_size = Some(limit);
-            self
-        }
-    }
-    impl<T, B> tonic::codegen::Service<http::Request<B>> for PointsServer<T>
-    where
-        T: Points,
-        B: Body + Send + 'static,
-        B::Error: Into<StdError> + Send + 'static,
-    {
-        type Response = http::Response<tonic::body::BoxBody>;
-        type Error = std::convert::Infallible;
-        type Future = BoxFuture<Self::Response, Self::Error>;
-        fn poll_ready(
-            &mut self,
-            _cx: &mut Context<'_>,
-        ) -> Poll<std::result::Result<(), Self::Error>> {
-            Poll::Ready(Ok(()))
-        }
-        fn call(&mut self, req: http::Request<B>) -> Self::Future {
-            let inner = self.inner.clone();
-            match req.uri().path() {
-                "/qdrant.Points/Upsert" => {
-                    #[allow(non_camel_case_types)]
-                    struct UpsertSvc<T: Points>(pub Arc<T>);
-                    impl<T: Points> tonic::server::UnaryService<super::UpsertPoints>
-                    for UpsertSvc<T> {
-                        type Response = super::PointsOperationResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::UpsertPoints>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move { (*inner).upsert(request).await };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = UpsertSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.Points/Delete" => {
-                    #[allow(non_camel_case_types)]
-                    struct DeleteSvc<T: Points>(pub Arc<T>);
-                    impl<T: Points> tonic::server::UnaryService<super::DeletePoints>
-                    for DeleteSvc<T> {
-                        type Response = super::PointsOperationResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::DeletePoints>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move { (*inner).delete(request).await };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = DeleteSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.Points/Get" => {
-                    #[allow(non_camel_case_types)]
-                    struct GetSvc<T: Points>(pub Arc<T>);
-                    impl<T: Points> tonic::server::UnaryService<super::GetPoints>
-                    for GetSvc<T> {
-                        type Response = super::GetResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::GetPoints>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move { (*inner).get(request).await };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = GetSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.Points/UpdateVectors" => {
-                    #[allow(non_camel_case_types)]
-                    struct UpdateVectorsSvc<T: Points>(pub Arc<T>);
-                    impl<
-                        T: Points,
-                    > tonic::server::UnaryService<super::UpdatePointVectors>
-                    for UpdateVectorsSvc<T> {
-                        type Response = super::PointsOperationResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::UpdatePointVectors>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move {
-                                (*inner).update_vectors(request).await
-                            };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = UpdateVectorsSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.Points/DeleteVectors" => {
-                    #[allow(non_camel_case_types)]
-                    struct DeleteVectorsSvc<T: Points>(pub Arc<T>);
-                    impl<
-                        T: Points,
-                    > tonic::server::UnaryService<super::DeletePointVectors>
-                    for DeleteVectorsSvc<T> {
-                        type Response = super::PointsOperationResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::DeletePointVectors>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move {
-                                (*inner).delete_vectors(request).await
-                            };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = DeleteVectorsSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.Points/SetPayload" => {
-                    #[allow(non_camel_case_types)]
-                    struct SetPayloadSvc<T: Points>(pub Arc<T>);
-                    impl<T: Points> tonic::server::UnaryService<super::SetPayloadPoints>
-                    for SetPayloadSvc<T> {
-                        type Response = super::PointsOperationResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::SetPayloadPoints>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move { (*inner).set_payload(request).await };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = SetPayloadSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.Points/OverwritePayload" => {
-                    #[allow(non_camel_case_types)]
-                    struct OverwritePayloadSvc<T: Points>(pub Arc<T>);
-                    impl<T: Points> tonic::server::UnaryService<super::SetPayloadPoints>
-                    for OverwritePayloadSvc<T> {
-                        type Response = super::PointsOperationResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::SetPayloadPoints>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move {
-                                (*inner).overwrite_payload(request).await
-                            };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = OverwritePayloadSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.Points/DeletePayload" => {
-                    #[allow(non_camel_case_types)]
-                    struct DeletePayloadSvc<T: Points>(pub Arc<T>);
-                    impl<
-                        T: Points,
-                    > tonic::server::UnaryService<super::DeletePayloadPoints>
-                    for DeletePayloadSvc<T> {
-                        type Response = super::PointsOperationResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::DeletePayloadPoints>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move {
-                                (*inner).delete_payload(request).await
-                            };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = DeletePayloadSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.Points/ClearPayload" => {
-                    #[allow(non_camel_case_types)]
-                    struct ClearPayloadSvc<T: Points>(pub Arc<T>);
-                    impl<
-                        T: Points,
-                    > tonic::server::UnaryService<super::ClearPayloadPoints>
-                    for ClearPayloadSvc<T> {
-                        type Response = super::PointsOperationResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::ClearPayloadPoints>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move {
-                                (*inner).clear_payload(request).await
-                            };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = ClearPayloadSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.Points/CreateFieldIndex" => {
-                    #[allow(non_camel_case_types)]
-                    struct CreateFieldIndexSvc<T: Points>(pub Arc<T>);
-                    impl<
-                        T: Points,
-                    > tonic::server::UnaryService<super::CreateFieldIndexCollection>
-                    for CreateFieldIndexSvc<T> {
-                        type Response = super::PointsOperationResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::CreateFieldIndexCollection>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move {
-                                (*inner).create_field_index(request).await
-                            };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = CreateFieldIndexSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.Points/DeleteFieldIndex" => {
-                    #[allow(non_camel_case_types)]
-                    struct DeleteFieldIndexSvc<T: Points>(pub Arc<T>);
-                    impl<
-                        T: Points,
-                    > tonic::server::UnaryService<super::DeleteFieldIndexCollection>
-                    for DeleteFieldIndexSvc<T> {
-                        type Response = super::PointsOperationResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::DeleteFieldIndexCollection>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move {
-                                (*inner).delete_field_index(request).await
-                            };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = DeleteFieldIndexSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.Points/Search" => {
-                    #[allow(non_camel_case_types)]
-                    struct SearchSvc<T: Points>(pub Arc<T>);
-                    impl<T: Points> tonic::server::UnaryService<super::SearchPoints>
-                    for SearchSvc<T> {
-                        type Response = super::SearchResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::SearchPoints>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move { (*inner).search(request).await };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = SearchSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.Points/SearchBatch" => {
-                    #[allow(non_camel_case_types)]
-                    struct SearchBatchSvc<T: Points>(pub Arc<T>);
-                    impl<T: Points> tonic::server::UnaryService<super::SearchBatchPoints>
-                    for SearchBatchSvc<T> {
-                        type Response = super::SearchBatchResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::SearchBatchPoints>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move {
-                                (*inner).search_batch(request).await
-                            };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = SearchBatchSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.Points/SearchGroups" => {
-                    #[allow(non_camel_case_types)]
-                    struct SearchGroupsSvc<T: Points>(pub Arc<T>);
-                    impl<T: Points> tonic::server::UnaryService<super::SearchPointGroups>
-                    for SearchGroupsSvc<T> {
-                        type Response = super::SearchGroupsResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::SearchPointGroups>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move {
-                                (*inner).search_groups(request).await
-                            };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = SearchGroupsSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.Points/Scroll" => {
-                    #[allow(non_camel_case_types)]
-                    struct ScrollSvc<T: Points>(pub Arc<T>);
-                    impl<T: Points> tonic::server::UnaryService<super::ScrollPoints>
-                    for ScrollSvc<T> {
-                        type Response = super::ScrollResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::ScrollPoints>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move { (*inner).scroll(request).await };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = ScrollSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.Points/Recommend" => {
-                    #[allow(non_camel_case_types)]
-                    struct RecommendSvc<T: Points>(pub Arc<T>);
-                    impl<T: Points> tonic::server::UnaryService<super::RecommendPoints>
-                    for RecommendSvc<T> {
-                        type Response = super::RecommendResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::RecommendPoints>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move { (*inner).recommend(request).await };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = RecommendSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.Points/RecommendBatch" => {
-                    #[allow(non_camel_case_types)]
-                    struct RecommendBatchSvc<T: Points>(pub Arc<T>);
-                    impl<
-                        T: Points,
-                    > tonic::server::UnaryService<super::RecommendBatchPoints>
-                    for RecommendBatchSvc<T> {
-                        type Response = super::RecommendBatchResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::RecommendBatchPoints>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move {
-                                (*inner).recommend_batch(request).await
-                            };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = RecommendBatchSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.Points/RecommendGroups" => {
-                    #[allow(non_camel_case_types)]
-                    struct RecommendGroupsSvc<T: Points>(pub Arc<T>);
-                    impl<
-                        T: Points,
-                    > tonic::server::UnaryService<super::RecommendPointGroups>
-                    for RecommendGroupsSvc<T> {
-                        type Response = super::RecommendGroupsResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::RecommendPointGroups>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move {
-                                (*inner).recommend_groups(request).await
-                            };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = RecommendGroupsSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.Points/Count" => {
-                    #[allow(non_camel_case_types)]
-                    struct CountSvc<T: Points>(pub Arc<T>);
-                    impl<T: Points> tonic::server::UnaryService<super::CountPoints>
-                    for CountSvc<T> {
-                        type Response = super::CountResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::CountPoints>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move { (*inner).count(request).await };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = CountSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.Points/UpdateBatch" => {
-                    #[allow(non_camel_case_types)]
-                    struct UpdateBatchSvc<T: Points>(pub Arc<T>);
-                    impl<T: Points> tonic::server::UnaryService<super::UpdateBatchPoints>
-                    for UpdateBatchSvc<T> {
-                        type Response = super::UpdateBatchResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::UpdateBatchPoints>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move {
-                                (*inner).update_batch(request).await
-                            };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = UpdateBatchSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                _ => {
-                    Box::pin(async move {
-                        Ok(
-                            http::Response::builder()
-                                .status(200)
-                                .header("grpc-status", "12")
-                                .header("content-type", "application/grpc")
-                                .body(empty_body())
-                                .unwrap(),
-                        )
-                    })
-                }
-            }
-        }
-    }
-    impl<T: Points> Clone for PointsServer<T> {
-        fn clone(&self) -> Self {
-            let inner = self.inner.clone();
-            Self {
-                inner,
-                accept_compression_encodings: self.accept_compression_encodings,
-                send_compression_encodings: self.send_compression_encodings,
-                max_decoding_message_size: self.max_decoding_message_size,
-                max_encoding_message_size: self.max_encoding_message_size,
-            }
-        }
-    }
-    impl<T: Points> Clone for _Inner<T> {
-        fn clone(&self) -> Self {
-            Self(Arc::clone(&self.0))
-        }
-    }
-    impl<T: std::fmt::Debug> std::fmt::Debug for _Inner<T> {
-        fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-            write!(f, "{:?}", self.0)
-        }
-    }
-    impl<T: Points> tonic::server::NamedService for PointsServer<T> {
-        const NAME: &'static str = "qdrant.Points";
-    }
-}
-#[derive(serde::Serialize)]
-#[derive(validator::Validate)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct SyncPoints {
-    /// name of the collection
-    #[prost(string, tag = "1")]
-    #[validate(length(min = 1, max = 255))]
-    pub collection_name: ::prost::alloc::string::String,
-    /// Wait until the changes have been applied?
-    #[prost(bool, optional, tag = "2")]
-    pub wait: ::core::option::Option<bool>,
-    #[prost(message, repeated, tag = "3")]
-    pub points: ::prost::alloc::vec::Vec<PointStruct>,
-    /// Start of the sync range
-    #[prost(message, optional, tag = "4")]
-    pub from_id: ::core::option::Option<PointId>,
-    /// End of the sync range
-    #[prost(message, optional, tag = "5")]
-    pub to_id: ::core::option::Option<PointId>,
-    #[prost(message, optional, tag = "6")]
-    pub ordering: ::core::option::Option<WriteOrdering>,
-}
-#[derive(serde::Serialize)]
-#[derive(validator::Validate)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct SyncPointsInternal {
-    #[prost(message, optional, tag = "1")]
-    #[validate]
-    pub sync_points: ::core::option::Option<SyncPoints>,
-    #[prost(uint32, optional, tag = "2")]
-    pub shard_id: ::core::option::Option<u32>,
-}
-#[derive(serde::Serialize)]
-#[derive(validator::Validate)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct UpsertPointsInternal {
-    #[prost(message, optional, tag = "1")]
-    #[validate]
-    pub upsert_points: ::core::option::Option<UpsertPoints>,
-    #[prost(uint32, optional, tag = "2")]
-    pub shard_id: ::core::option::Option<u32>,
-}
-#[derive(serde::Serialize)]
-#[derive(validator::Validate)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct DeletePointsInternal {
-    #[prost(message, optional, tag = "1")]
-    #[validate]
-    pub delete_points: ::core::option::Option<DeletePoints>,
-    #[prost(uint32, optional, tag = "2")]
-    pub shard_id: ::core::option::Option<u32>,
-}
-#[derive(serde::Serialize)]
-#[derive(validator::Validate)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct UpdateVectorsInternal {
-    #[prost(message, optional, tag = "1")]
-    #[validate]
-    pub update_vectors: ::core::option::Option<UpdatePointVectors>,
-    #[prost(uint32, optional, tag = "2")]
-    pub shard_id: ::core::option::Option<u32>,
-}
-#[derive(serde::Serialize)]
-#[derive(validator::Validate)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct DeleteVectorsInternal {
-    #[prost(message, optional, tag = "1")]
-    #[validate]
-    pub delete_vectors: ::core::option::Option<DeletePointVectors>,
-    #[prost(uint32, optional, tag = "2")]
-    pub shard_id: ::core::option::Option<u32>,
-}
-#[derive(serde::Serialize)]
-#[derive(validator::Validate)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct SetPayloadPointsInternal {
-    #[prost(message, optional, tag = "1")]
-    #[validate]
-    pub set_payload_points: ::core::option::Option<SetPayloadPoints>,
-    #[prost(uint32, optional, tag = "2")]
-    pub shard_id: ::core::option::Option<u32>,
-}
-#[derive(serde::Serialize)]
-#[derive(validator::Validate)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct DeletePayloadPointsInternal {
-    #[prost(message, optional, tag = "1")]
-    #[validate]
-    pub delete_payload_points: ::core::option::Option<DeletePayloadPoints>,
-    #[prost(uint32, optional, tag = "2")]
-    pub shard_id: ::core::option::Option<u32>,
-}
-#[derive(serde::Serialize)]
-#[derive(validator::Validate)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct ClearPayloadPointsInternal {
-    #[prost(message, optional, tag = "1")]
-    #[validate]
-    pub clear_payload_points: ::core::option::Option<ClearPayloadPoints>,
-    #[prost(uint32, optional, tag = "2")]
-    pub shard_id: ::core::option::Option<u32>,
-}
-#[derive(serde::Serialize)]
-#[derive(validator::Validate)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct CreateFieldIndexCollectionInternal {
-    #[prost(message, optional, tag = "1")]
-    #[validate]
-    pub create_field_index_collection: ::core::option::Option<
-        CreateFieldIndexCollection,
-    >,
-    #[prost(uint32, optional, tag = "2")]
-    pub shard_id: ::core::option::Option<u32>,
-}
-#[derive(serde::Serialize)]
-#[derive(validator::Validate)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct DeleteFieldIndexCollectionInternal {
-    #[prost(message, optional, tag = "1")]
-    #[validate]
-    pub delete_field_index_collection: ::core::option::Option<
-        DeleteFieldIndexCollection,
-    >,
-    #[prost(uint32, optional, tag = "2")]
-    pub shard_id: ::core::option::Option<u32>,
-}
-#[derive(serde::Serialize)]
-#[derive(validator::Validate)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct SearchPointsInternal {
-    #[prost(message, optional, tag = "1")]
-    #[validate]
-    pub search_points: ::core::option::Option<SearchPoints>,
-    #[prost(uint32, optional, tag = "2")]
-    pub shard_id: ::core::option::Option<u32>,
-}
-#[derive(serde::Serialize)]
-#[derive(validator::Validate)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct SearchBatchPointsInternal {
-    #[prost(string, tag = "1")]
-    #[validate(length(min = 1, max = 255))]
-    pub collection_name: ::prost::alloc::string::String,
-    #[prost(message, repeated, tag = "2")]
-    #[validate]
-    pub search_points: ::prost::alloc::vec::Vec<SearchPoints>,
-    #[prost(uint32, optional, tag = "3")]
-    pub shard_id: ::core::option::Option<u32>,
-}
-#[derive(serde::Serialize)]
-#[derive(validator::Validate)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct ScrollPointsInternal {
-    #[prost(message, optional, tag = "1")]
-    #[validate]
-    pub scroll_points: ::core::option::Option<ScrollPoints>,
-    #[prost(uint32, optional, tag = "2")]
-    pub shard_id: ::core::option::Option<u32>,
-}
-#[derive(serde::Serialize)]
-#[derive(validator::Validate)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct RecommendPointsInternal {
-    #[prost(message, optional, tag = "1")]
-    #[validate]
-    pub recommend_points: ::core::option::Option<RecommendPoints>,
-    #[prost(uint32, optional, tag = "2")]
-    pub shard_id: ::core::option::Option<u32>,
-}
-#[derive(serde::Serialize)]
-#[derive(validator::Validate)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct GetPointsInternal {
-    #[prost(message, optional, tag = "1")]
-    #[validate]
-    pub get_points: ::core::option::Option<GetPoints>,
-    #[prost(uint32, optional, tag = "2")]
-    pub shard_id: ::core::option::Option<u32>,
-}
-#[derive(serde::Serialize)]
-#[derive(validator::Validate)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct CountPointsInternal {
-    #[prost(message, optional, tag = "1")]
-    #[validate]
-    pub count_points: ::core::option::Option<CountPoints>,
-    #[prost(uint32, optional, tag = "2")]
-    pub shard_id: ::core::option::Option<u32>,
-}
-/// Generated client implementations.
-pub mod points_internal_client {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
-    use tonic::codegen::*;
-    use tonic::codegen::http::Uri;
-    #[derive(Debug, Clone)]
-    pub struct PointsInternalClient<T> {
-        inner: tonic::client::Grpc<T>,
-    }
-    impl PointsInternalClient<tonic::transport::Channel> {
-        /// Attempt to create a new client by connecting to a given endpoint.
-        pub async fn connect<D>(dst: D) -> Result<Self, tonic::transport::Error>
-        where
-            D: TryInto<tonic::transport::Endpoint>,
-            D::Error: Into<StdError>,
-        {
-            let conn = tonic::transport::Endpoint::new(dst)?.connect().await?;
-            Ok(Self::new(conn))
-        }
-    }
-    impl<T> PointsInternalClient<T>
-    where
-        T: tonic::client::GrpcService<tonic::body::BoxBody>,
-        T::Error: Into<StdError>,
-        T::ResponseBody: Body<Data = Bytes> + Send + 'static,
-        <T::ResponseBody as Body>::Error: Into<StdError> + Send,
-    {
-        pub fn new(inner: T) -> Self {
-            let inner = tonic::client::Grpc::new(inner);
-            Self { inner }
-        }
-        pub fn with_origin(inner: T, origin: Uri) -> Self {
-            let inner = tonic::client::Grpc::with_origin(inner, origin);
-            Self { inner }
-        }
-        pub fn with_interceptor<F>(
-            inner: T,
-            interceptor: F,
-        ) -> PointsInternalClient<InterceptedService<T, F>>
-        where
-            F: tonic::service::Interceptor,
-            T::ResponseBody: Default,
-            T: tonic::codegen::Service<
-                http::Request<tonic::body::BoxBody>,
-                Response = http::Response<
-                    <T as tonic::client::GrpcService<tonic::body::BoxBody>>::ResponseBody,
-                >,
-            >,
-            <T as tonic::codegen::Service<
-                http::Request<tonic::body::BoxBody>,
-            >>::Error: Into<StdError> + Send + Sync,
-        {
-            PointsInternalClient::new(InterceptedService::new(inner, interceptor))
-        }
-        /// Compress requests with the given encoding.
-        ///
-        /// This requires the server to support it otherwise it might respond with an
-        /// error.
-        #[must_use]
-        pub fn send_compressed(mut self, encoding: CompressionEncoding) -> Self {
-            self.inner = self.inner.send_compressed(encoding);
-            self
-        }
-        /// Enable decompressing responses.
-        #[must_use]
-        pub fn accept_compressed(mut self, encoding: CompressionEncoding) -> Self {
-            self.inner = self.inner.accept_compressed(encoding);
-            self
-        }
-        /// Limits the maximum size of a decoded message.
-        ///
-        /// Default: `4MB`
-        #[must_use]
-        pub fn max_decoding_message_size(mut self, limit: usize) -> Self {
-            self.inner = self.inner.max_decoding_message_size(limit);
-            self
-        }
-        /// Limits the maximum size of an encoded message.
-        ///
-        /// Default: `usize::MAX`
-        #[must_use]
-        pub fn max_encoding_message_size(mut self, limit: usize) -> Self {
-            self.inner = self.inner.max_encoding_message_size(limit);
-            self
-        }
-        pub async fn upsert(
-            &mut self,
-            request: impl tonic::IntoRequest<super::UpsertPointsInternal>,
-        ) -> std::result::Result<
-            tonic::Response<super::PointsOperationResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/qdrant.PointsInternal/Upsert",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(GrpcMethod::new("qdrant.PointsInternal", "Upsert"));
-            self.inner.unary(req, path, codec).await
-        }
-        pub async fn sync(
-            &mut self,
-            request: impl tonic::IntoRequest<super::SyncPointsInternal>,
-        ) -> std::result::Result<
-            tonic::Response<super::PointsOperationResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/qdrant.PointsInternal/Sync",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(GrpcMethod::new("qdrant.PointsInternal", "Sync"));
-            self.inner.unary(req, path, codec).await
-        }
-        pub async fn delete(
-            &mut self,
-            request: impl tonic::IntoRequest<super::DeletePointsInternal>,
-        ) -> std::result::Result<
-            tonic::Response<super::PointsOperationResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/qdrant.PointsInternal/Delete",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(GrpcMethod::new("qdrant.PointsInternal", "Delete"));
-            self.inner.unary(req, path, codec).await
-        }
-        pub async fn update_vectors(
-            &mut self,
-            request: impl tonic::IntoRequest<super::UpdateVectorsInternal>,
-        ) -> std::result::Result<
-            tonic::Response<super::PointsOperationResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/qdrant.PointsInternal/UpdateVectors",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(GrpcMethod::new("qdrant.PointsInternal", "UpdateVectors"));
-            self.inner.unary(req, path, codec).await
-        }
-        pub async fn delete_vectors(
-            &mut self,
-            request: impl tonic::IntoRequest<super::DeleteVectorsInternal>,
-        ) -> std::result::Result<
-            tonic::Response<super::PointsOperationResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/qdrant.PointsInternal/DeleteVectors",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(GrpcMethod::new("qdrant.PointsInternal", "DeleteVectors"));
-            self.inner.unary(req, path, codec).await
-        }
-        pub async fn set_payload(
-            &mut self,
-            request: impl tonic::IntoRequest<super::SetPayloadPointsInternal>,
-        ) -> std::result::Result<
-            tonic::Response<super::PointsOperationResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/qdrant.PointsInternal/SetPayload",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(GrpcMethod::new("qdrant.PointsInternal", "SetPayload"));
-            self.inner.unary(req, path, codec).await
-        }
-        pub async fn overwrite_payload(
-            &mut self,
-            request: impl tonic::IntoRequest<super::SetPayloadPointsInternal>,
-        ) -> std::result::Result<
-            tonic::Response<super::PointsOperationResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/qdrant.PointsInternal/OverwritePayload",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(GrpcMethod::new("qdrant.PointsInternal", "OverwritePayload"));
-            self.inner.unary(req, path, codec).await
-        }
-        pub async fn delete_payload(
-            &mut self,
-            request: impl tonic::IntoRequest<super::DeletePayloadPointsInternal>,
-        ) -> std::result::Result<
-            tonic::Response<super::PointsOperationResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/qdrant.PointsInternal/DeletePayload",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(GrpcMethod::new("qdrant.PointsInternal", "DeletePayload"));
-            self.inner.unary(req, path, codec).await
-        }
-        pub async fn clear_payload(
-            &mut self,
-            request: impl tonic::IntoRequest<super::ClearPayloadPointsInternal>,
-        ) -> std::result::Result<
-            tonic::Response<super::PointsOperationResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/qdrant.PointsInternal/ClearPayload",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(GrpcMethod::new("qdrant.PointsInternal", "ClearPayload"));
-            self.inner.unary(req, path, codec).await
-        }
-        pub async fn create_field_index(
-            &mut self,
-            request: impl tonic::IntoRequest<super::CreateFieldIndexCollectionInternal>,
-        ) -> std::result::Result<
-            tonic::Response<super::PointsOperationResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/qdrant.PointsInternal/CreateFieldIndex",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(GrpcMethod::new("qdrant.PointsInternal", "CreateFieldIndex"));
-            self.inner.unary(req, path, codec).await
-        }
-        pub async fn delete_field_index(
-            &mut self,
-            request: impl tonic::IntoRequest<super::DeleteFieldIndexCollectionInternal>,
-        ) -> std::result::Result<
-            tonic::Response<super::PointsOperationResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/qdrant.PointsInternal/DeleteFieldIndex",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(GrpcMethod::new("qdrant.PointsInternal", "DeleteFieldIndex"));
-            self.inner.unary(req, path, codec).await
-        }
-        pub async fn search(
-            &mut self,
-            request: impl tonic::IntoRequest<super::SearchPointsInternal>,
-        ) -> std::result::Result<tonic::Response<super::SearchResponse>, tonic::Status> {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/qdrant.PointsInternal/Search",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(GrpcMethod::new("qdrant.PointsInternal", "Search"));
-            self.inner.unary(req, path, codec).await
-        }
-        pub async fn search_batch(
-            &mut self,
-            request: impl tonic::IntoRequest<super::SearchBatchPointsInternal>,
-        ) -> std::result::Result<
-            tonic::Response<super::SearchBatchResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/qdrant.PointsInternal/SearchBatch",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(GrpcMethod::new("qdrant.PointsInternal", "SearchBatch"));
-            self.inner.unary(req, path, codec).await
-        }
-        pub async fn scroll(
-            &mut self,
-            request: impl tonic::IntoRequest<super::ScrollPointsInternal>,
-        ) -> std::result::Result<tonic::Response<super::ScrollResponse>, tonic::Status> {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/qdrant.PointsInternal/Scroll",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(GrpcMethod::new("qdrant.PointsInternal", "Scroll"));
-            self.inner.unary(req, path, codec).await
-        }
-        pub async fn count(
-            &mut self,
-            request: impl tonic::IntoRequest<super::CountPointsInternal>,
-        ) -> std::result::Result<tonic::Response<super::CountResponse>, tonic::Status> {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/qdrant.PointsInternal/Count",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(GrpcMethod::new("qdrant.PointsInternal", "Count"));
-            self.inner.unary(req, path, codec).await
-        }
-        pub async fn recommend(
-            &mut self,
-            request: impl tonic::IntoRequest<super::RecommendPointsInternal>,
-        ) -> std::result::Result<
-            tonic::Response<super::RecommendResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/qdrant.PointsInternal/Recommend",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(GrpcMethod::new("qdrant.PointsInternal", "Recommend"));
-            self.inner.unary(req, path, codec).await
-        }
-        pub async fn get(
-            &mut self,
-            request: impl tonic::IntoRequest<super::GetPointsInternal>,
-        ) -> std::result::Result<tonic::Response<super::GetResponse>, tonic::Status> {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/qdrant.PointsInternal/Get",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut().insert(GrpcMethod::new("qdrant.PointsInternal", "Get"));
-            self.inner.unary(req, path, codec).await
-        }
-    }
-}
-/// Generated server implementations.
-pub mod points_internal_server {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
-    use tonic::codegen::*;
-    /// Generated trait containing gRPC methods that should be implemented for use with PointsInternalServer.
-    #[async_trait]
-    pub trait PointsInternal: Send + Sync + 'static {
-        async fn upsert(
-            &self,
-            request: tonic::Request<super::UpsertPointsInternal>,
-        ) -> std::result::Result<
-            tonic::Response<super::PointsOperationResponse>,
-            tonic::Status,
-        >;
-        async fn sync(
-            &self,
-            request: tonic::Request<super::SyncPointsInternal>,
-        ) -> std::result::Result<
-            tonic::Response<super::PointsOperationResponse>,
-            tonic::Status,
-        >;
-        async fn delete(
-            &self,
-            request: tonic::Request<super::DeletePointsInternal>,
-        ) -> std::result::Result<
-            tonic::Response<super::PointsOperationResponse>,
-            tonic::Status,
-        >;
-        async fn update_vectors(
-            &self,
-            request: tonic::Request<super::UpdateVectorsInternal>,
-        ) -> std::result::Result<
-            tonic::Response<super::PointsOperationResponse>,
-            tonic::Status,
-        >;
-        async fn delete_vectors(
-            &self,
-            request: tonic::Request<super::DeleteVectorsInternal>,
-        ) -> std::result::Result<
-            tonic::Response<super::PointsOperationResponse>,
-            tonic::Status,
-        >;
-        async fn set_payload(
-            &self,
-            request: tonic::Request<super::SetPayloadPointsInternal>,
-        ) -> std::result::Result<
-            tonic::Response<super::PointsOperationResponse>,
-            tonic::Status,
-        >;
-        async fn overwrite_payload(
-            &self,
-            request: tonic::Request<super::SetPayloadPointsInternal>,
-        ) -> std::result::Result<
-            tonic::Response<super::PointsOperationResponse>,
-            tonic::Status,
-        >;
-        async fn delete_payload(
-            &self,
-            request: tonic::Request<super::DeletePayloadPointsInternal>,
-        ) -> std::result::Result<
-            tonic::Response<super::PointsOperationResponse>,
-            tonic::Status,
-        >;
-        async fn clear_payload(
-            &self,
-            request: tonic::Request<super::ClearPayloadPointsInternal>,
-        ) -> std::result::Result<
-            tonic::Response<super::PointsOperationResponse>,
-            tonic::Status,
-        >;
-        async fn create_field_index(
-            &self,
-            request: tonic::Request<super::CreateFieldIndexCollectionInternal>,
-        ) -> std::result::Result<
-            tonic::Response<super::PointsOperationResponse>,
-            tonic::Status,
-        >;
-        async fn delete_field_index(
-            &self,
-            request: tonic::Request<super::DeleteFieldIndexCollectionInternal>,
-        ) -> std::result::Result<
-            tonic::Response<super::PointsOperationResponse>,
-            tonic::Status,
-        >;
-        async fn search(
-            &self,
-            request: tonic::Request<super::SearchPointsInternal>,
-        ) -> std::result::Result<tonic::Response<super::SearchResponse>, tonic::Status>;
-        async fn search_batch(
-            &self,
-            request: tonic::Request<super::SearchBatchPointsInternal>,
-        ) -> std::result::Result<
-            tonic::Response<super::SearchBatchResponse>,
-            tonic::Status,
-        >;
-        async fn scroll(
-            &self,
-            request: tonic::Request<super::ScrollPointsInternal>,
-        ) -> std::result::Result<tonic::Response<super::ScrollResponse>, tonic::Status>;
-        async fn count(
-            &self,
-            request: tonic::Request<super::CountPointsInternal>,
-        ) -> std::result::Result<tonic::Response<super::CountResponse>, tonic::Status>;
-        async fn recommend(
-            &self,
-            request: tonic::Request<super::RecommendPointsInternal>,
-        ) -> std::result::Result<
-            tonic::Response<super::RecommendResponse>,
-            tonic::Status,
-        >;
-        async fn get(
-            &self,
-            request: tonic::Request<super::GetPointsInternal>,
-        ) -> std::result::Result<tonic::Response<super::GetResponse>, tonic::Status>;
-    }
-    #[derive(Debug)]
-    pub struct PointsInternalServer<T: PointsInternal> {
-        inner: _Inner<T>,
-        accept_compression_encodings: EnabledCompressionEncodings,
-        send_compression_encodings: EnabledCompressionEncodings,
-        max_decoding_message_size: Option<usize>,
-        max_encoding_message_size: Option<usize>,
-    }
-    struct _Inner<T>(Arc<T>);
-    impl<T: PointsInternal> PointsInternalServer<T> {
-        pub fn new(inner: T) -> Self {
-            Self::from_arc(Arc::new(inner))
-        }
-        pub fn from_arc(inner: Arc<T>) -> Self {
-            let inner = _Inner(inner);
-            Self {
-                inner,
-                accept_compression_encodings: Default::default(),
-                send_compression_encodings: Default::default(),
-                max_decoding_message_size: None,
-                max_encoding_message_size: None,
-            }
-        }
-        pub fn with_interceptor<F>(
-            inner: T,
-            interceptor: F,
-        ) -> InterceptedService<Self, F>
-        where
-            F: tonic::service::Interceptor,
-        {
-            InterceptedService::new(Self::new(inner), interceptor)
-        }
-        /// Enable decompressing requests with the given encoding.
-        #[must_use]
-        pub fn accept_compressed(mut self, encoding: CompressionEncoding) -> Self {
-            self.accept_compression_encodings.enable(encoding);
-            self
-        }
-        /// Compress responses with the given encoding, if the client supports it.
-        #[must_use]
-        pub fn send_compressed(mut self, encoding: CompressionEncoding) -> Self {
-            self.send_compression_encodings.enable(encoding);
-            self
-        }
-        /// Limits the maximum size of a decoded message.
-        ///
-        /// Default: `4MB`
-        #[must_use]
-        pub fn max_decoding_message_size(mut self, limit: usize) -> Self {
-            self.max_decoding_message_size = Some(limit);
-            self
-        }
-        /// Limits the maximum size of an encoded message.
-        ///
-        /// Default: `usize::MAX`
-        #[must_use]
-        pub fn max_encoding_message_size(mut self, limit: usize) -> Self {
-            self.max_encoding_message_size = Some(limit);
-            self
-        }
-    }
-    impl<T, B> tonic::codegen::Service<http::Request<B>> for PointsInternalServer<T>
-    where
-        T: PointsInternal,
-        B: Body + Send + 'static,
-        B::Error: Into<StdError> + Send + 'static,
-    {
-        type Response = http::Response<tonic::body::BoxBody>;
-        type Error = std::convert::Infallible;
-        type Future = BoxFuture<Self::Response, Self::Error>;
-        fn poll_ready(
-            &mut self,
-            _cx: &mut Context<'_>,
-        ) -> Poll<std::result::Result<(), Self::Error>> {
-            Poll::Ready(Ok(()))
-        }
-        fn call(&mut self, req: http::Request<B>) -> Self::Future {
-            let inner = self.inner.clone();
-            match req.uri().path() {
-                "/qdrant.PointsInternal/Upsert" => {
-                    #[allow(non_camel_case_types)]
-                    struct UpsertSvc<T: PointsInternal>(pub Arc<T>);
-                    impl<
-                        T: PointsInternal,
-                    > tonic::server::UnaryService<super::UpsertPointsInternal>
-                    for UpsertSvc<T> {
-                        type Response = super::PointsOperationResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::UpsertPointsInternal>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move { (*inner).upsert(request).await };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = UpsertSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.PointsInternal/Sync" => {
-                    #[allow(non_camel_case_types)]
-                    struct SyncSvc<T: PointsInternal>(pub Arc<T>);
-                    impl<
-                        T: PointsInternal,
-                    > tonic::server::UnaryService<super::SyncPointsInternal>
-                    for SyncSvc<T> {
-                        type Response = super::PointsOperationResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::SyncPointsInternal>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move { (*inner).sync(request).await };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = SyncSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.PointsInternal/Delete" => {
-                    #[allow(non_camel_case_types)]
-                    struct DeleteSvc<T: PointsInternal>(pub Arc<T>);
-                    impl<
-                        T: PointsInternal,
-                    > tonic::server::UnaryService<super::DeletePointsInternal>
-                    for DeleteSvc<T> {
-                        type Response = super::PointsOperationResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::DeletePointsInternal>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move { (*inner).delete(request).await };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = DeleteSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.PointsInternal/UpdateVectors" => {
-                    #[allow(non_camel_case_types)]
-                    struct UpdateVectorsSvc<T: PointsInternal>(pub Arc<T>);
-                    impl<
-                        T: PointsInternal,
-                    > tonic::server::UnaryService<super::UpdateVectorsInternal>
-                    for UpdateVectorsSvc<T> {
-                        type Response = super::PointsOperationResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::UpdateVectorsInternal>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move {
-                                (*inner).update_vectors(request).await
-                            };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = UpdateVectorsSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.PointsInternal/DeleteVectors" => {
-                    #[allow(non_camel_case_types)]
-                    struct DeleteVectorsSvc<T: PointsInternal>(pub Arc<T>);
-                    impl<
-                        T: PointsInternal,
-                    > tonic::server::UnaryService<super::DeleteVectorsInternal>
-                    for DeleteVectorsSvc<T> {
-                        type Response = super::PointsOperationResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::DeleteVectorsInternal>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move {
-                                (*inner).delete_vectors(request).await
-                            };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = DeleteVectorsSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.PointsInternal/SetPayload" => {
-                    #[allow(non_camel_case_types)]
-                    struct SetPayloadSvc<T: PointsInternal>(pub Arc<T>);
-                    impl<
-                        T: PointsInternal,
-                    > tonic::server::UnaryService<super::SetPayloadPointsInternal>
-                    for SetPayloadSvc<T> {
-                        type Response = super::PointsOperationResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::SetPayloadPointsInternal>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move { (*inner).set_payload(request).await };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = SetPayloadSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.PointsInternal/OverwritePayload" => {
-                    #[allow(non_camel_case_types)]
-                    struct OverwritePayloadSvc<T: PointsInternal>(pub Arc<T>);
-                    impl<
-                        T: PointsInternal,
-                    > tonic::server::UnaryService<super::SetPayloadPointsInternal>
-                    for OverwritePayloadSvc<T> {
-                        type Response = super::PointsOperationResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::SetPayloadPointsInternal>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move {
-                                (*inner).overwrite_payload(request).await
-                            };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = OverwritePayloadSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.PointsInternal/DeletePayload" => {
-                    #[allow(non_camel_case_types)]
-                    struct DeletePayloadSvc<T: PointsInternal>(pub Arc<T>);
-                    impl<
-                        T: PointsInternal,
-                    > tonic::server::UnaryService<super::DeletePayloadPointsInternal>
-                    for DeletePayloadSvc<T> {
-                        type Response = super::PointsOperationResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::DeletePayloadPointsInternal>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move {
-                                (*inner).delete_payload(request).await
-                            };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = DeletePayloadSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.PointsInternal/ClearPayload" => {
-                    #[allow(non_camel_case_types)]
-                    struct ClearPayloadSvc<T: PointsInternal>(pub Arc<T>);
-                    impl<
-                        T: PointsInternal,
-                    > tonic::server::UnaryService<super::ClearPayloadPointsInternal>
-                    for ClearPayloadSvc<T> {
-                        type Response = super::PointsOperationResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::ClearPayloadPointsInternal>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move {
-                                (*inner).clear_payload(request).await
-                            };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = ClearPayloadSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.PointsInternal/CreateFieldIndex" => {
-                    #[allow(non_camel_case_types)]
-                    struct CreateFieldIndexSvc<T: PointsInternal>(pub Arc<T>);
-                    impl<
-                        T: PointsInternal,
-                    > tonic::server::UnaryService<
-                        super::CreateFieldIndexCollectionInternal,
-                    > for CreateFieldIndexSvc<T> {
-                        type Response = super::PointsOperationResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<
-                                super::CreateFieldIndexCollectionInternal,
-                            >,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move {
-                                (*inner).create_field_index(request).await
-                            };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = CreateFieldIndexSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.PointsInternal/DeleteFieldIndex" => {
-                    #[allow(non_camel_case_types)]
-                    struct DeleteFieldIndexSvc<T: PointsInternal>(pub Arc<T>);
-                    impl<
-                        T: PointsInternal,
-                    > tonic::server::UnaryService<
-                        super::DeleteFieldIndexCollectionInternal,
-                    > for DeleteFieldIndexSvc<T> {
-                        type Response = super::PointsOperationResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<
-                                super::DeleteFieldIndexCollectionInternal,
-                            >,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move {
-                                (*inner).delete_field_index(request).await
-                            };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = DeleteFieldIndexSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.PointsInternal/Search" => {
-                    #[allow(non_camel_case_types)]
-                    struct SearchSvc<T: PointsInternal>(pub Arc<T>);
-                    impl<
-                        T: PointsInternal,
-                    > tonic::server::UnaryService<super::SearchPointsInternal>
-                    for SearchSvc<T> {
-                        type Response = super::SearchResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::SearchPointsInternal>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move { (*inner).search(request).await };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = SearchSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.PointsInternal/SearchBatch" => {
-                    #[allow(non_camel_case_types)]
-                    struct SearchBatchSvc<T: PointsInternal>(pub Arc<T>);
-                    impl<
-                        T: PointsInternal,
-                    > tonic::server::UnaryService<super::SearchBatchPointsInternal>
-                    for SearchBatchSvc<T> {
-                        type Response = super::SearchBatchResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::SearchBatchPointsInternal>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move {
-                                (*inner).search_batch(request).await
-                            };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = SearchBatchSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.PointsInternal/Scroll" => {
-                    #[allow(non_camel_case_types)]
-                    struct ScrollSvc<T: PointsInternal>(pub Arc<T>);
-                    impl<
-                        T: PointsInternal,
-                    > tonic::server::UnaryService<super::ScrollPointsInternal>
-                    for ScrollSvc<T> {
-                        type Response = super::ScrollResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::ScrollPointsInternal>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move { (*inner).scroll(request).await };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = ScrollSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.PointsInternal/Count" => {
-                    #[allow(non_camel_case_types)]
-                    struct CountSvc<T: PointsInternal>(pub Arc<T>);
-                    impl<
-                        T: PointsInternal,
-                    > tonic::server::UnaryService<super::CountPointsInternal>
-                    for CountSvc<T> {
-                        type Response = super::CountResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::CountPointsInternal>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move { (*inner).count(request).await };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = CountSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.PointsInternal/Recommend" => {
-                    #[allow(non_camel_case_types)]
-                    struct RecommendSvc<T: PointsInternal>(pub Arc<T>);
-                    impl<
-                        T: PointsInternal,
-                    > tonic::server::UnaryService<super::RecommendPointsInternal>
-                    for RecommendSvc<T> {
-                        type Response = super::RecommendResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::RecommendPointsInternal>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move { (*inner).recommend(request).await };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = RecommendSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.PointsInternal/Get" => {
-                    #[allow(non_camel_case_types)]
-                    struct GetSvc<T: PointsInternal>(pub Arc<T>);
-                    impl<
-                        T: PointsInternal,
-                    > tonic::server::UnaryService<super::GetPointsInternal>
-                    for GetSvc<T> {
-                        type Response = super::GetResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::GetPointsInternal>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move { (*inner).get(request).await };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = GetSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                _ => {
-                    Box::pin(async move {
-                        Ok(
-                            http::Response::builder()
-                                .status(200)
-                                .header("grpc-status", "12")
-                                .header("content-type", "application/grpc")
-                                .body(empty_body())
-                                .unwrap(),
-                        )
-                    })
-                }
-            }
-        }
-    }
-    impl<T: PointsInternal> Clone for PointsInternalServer<T> {
-        fn clone(&self) -> Self {
-            let inner = self.inner.clone();
-            Self {
-                inner,
-                accept_compression_encodings: self.accept_compression_encodings,
-                send_compression_encodings: self.send_compression_encodings,
-                max_decoding_message_size: self.max_decoding_message_size,
-                max_encoding_message_size: self.max_encoding_message_size,
-            }
-        }
-    }
-    impl<T: PointsInternal> Clone for _Inner<T> {
-        fn clone(&self) -> Self {
-            Self(Arc::clone(&self.0))
-        }
-    }
-    impl<T: std::fmt::Debug> std::fmt::Debug for _Inner<T> {
-        fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-            write!(f, "{:?}", self.0)
-        }
-    }
-    impl<T: PointsInternal> tonic::server::NamedService for PointsInternalServer<T> {
-        const NAME: &'static str = "qdrant.PointsInternal";
-    }
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct RaftMessage {
-    #[prost(bytes = "vec", tag = "1")]
-    pub message: ::prost::alloc::vec::Vec<u8>,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct AllPeers {
-    #[prost(message, repeated, tag = "1")]
-    pub all_peers: ::prost::alloc::vec::Vec<Peer>,
-    #[prost(uint64, tag = "2")]
-    pub first_peer_id: u64,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct Peer {
-    #[prost(string, tag = "1")]
-    pub uri: ::prost::alloc::string::String,
-    #[prost(uint64, tag = "2")]
-    pub id: u64,
-}
-#[derive(serde::Serialize)]
-#[derive(validator::Validate)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct AddPeerToKnownMessage {
-    #[prost(string, optional, tag = "1")]
-    #[validate(custom = "crate::grpc::validate::validate_not_empty")]
-    pub uri: ::core::option::Option<::prost::alloc::string::String>,
-    #[prost(uint32, optional, tag = "2")]
-    #[validate(custom = "crate::grpc::validate::validate_u32_range_min_1")]
-    pub port: ::core::option::Option<u32>,
-    #[prost(uint64, tag = "3")]
-    pub id: u64,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct PeerId {
-    #[prost(uint64, tag = "1")]
-    pub id: u64,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct Uri {
-    #[prost(string, tag = "1")]
-    pub uri: ::prost::alloc::string::String,
-}
-/// Generated client implementations.
-pub mod raft_client {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
-    use tonic::codegen::*;
-    use tonic::codegen::http::Uri;
-    #[derive(Debug, Clone)]
-    pub struct RaftClient<T> {
-        inner: tonic::client::Grpc<T>,
-    }
-    impl RaftClient<tonic::transport::Channel> {
-        /// Attempt to create a new client by connecting to a given endpoint.
-        pub async fn connect<D>(dst: D) -> Result<Self, tonic::transport::Error>
-        where
-            D: TryInto<tonic::transport::Endpoint>,
-            D::Error: Into<StdError>,
-        {
-            let conn = tonic::transport::Endpoint::new(dst)?.connect().await?;
-            Ok(Self::new(conn))
-        }
-    }
-    impl<T> RaftClient<T>
-    where
-        T: tonic::client::GrpcService<tonic::body::BoxBody>,
-        T::Error: Into<StdError>,
-        T::ResponseBody: Body<Data = Bytes> + Send + 'static,
-        <T::ResponseBody as Body>::Error: Into<StdError> + Send,
-    {
-        pub fn new(inner: T) -> Self {
-            let inner = tonic::client::Grpc::new(inner);
-            Self { inner }
-        }
-        pub fn with_origin(inner: T, origin: Uri) -> Self {
-            let inner = tonic::client::Grpc::with_origin(inner, origin);
-            Self { inner }
-        }
-        pub fn with_interceptor<F>(
-            inner: T,
-            interceptor: F,
-        ) -> RaftClient<InterceptedService<T, F>>
-        where
-            F: tonic::service::Interceptor,
-            T::ResponseBody: Default,
-            T: tonic::codegen::Service<
-                http::Request<tonic::body::BoxBody>,
-                Response = http::Response<
-                    <T as tonic::client::GrpcService<tonic::body::BoxBody>>::ResponseBody,
-                >,
-            >,
-            <T as tonic::codegen::Service<
-                http::Request<tonic::body::BoxBody>,
-            >>::Error: Into<StdError> + Send + Sync,
-        {
-            RaftClient::new(InterceptedService::new(inner, interceptor))
-        }
-        /// Compress requests with the given encoding.
-        ///
-        /// This requires the server to support it otherwise it might respond with an
-        /// error.
-        #[must_use]
-        pub fn send_compressed(mut self, encoding: CompressionEncoding) -> Self {
-            self.inner = self.inner.send_compressed(encoding);
-            self
-        }
-        /// Enable decompressing responses.
-        #[must_use]
-        pub fn accept_compressed(mut self, encoding: CompressionEncoding) -> Self {
-            self.inner = self.inner.accept_compressed(encoding);
-            self
-        }
-        /// Limits the maximum size of a decoded message.
-        ///
-        /// Default: `4MB`
-        #[must_use]
-        pub fn max_decoding_message_size(mut self, limit: usize) -> Self {
-            self.inner = self.inner.max_decoding_message_size(limit);
-            self
-        }
-        /// Limits the maximum size of an encoded message.
-        ///
-        /// Default: `usize::MAX`
-        #[must_use]
-        pub fn max_encoding_message_size(mut self, limit: usize) -> Self {
-            self.inner = self.inner.max_encoding_message_size(limit);
-            self
-        }
-        /// Send Raft message to another peer
-        pub async fn send(
-            &mut self,
-            request: impl tonic::IntoRequest<super::RaftMessage>,
-        ) -> std::result::Result<tonic::Response<()>, tonic::Status> {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static("/qdrant.Raft/Send");
-            let mut req = request.into_request();
-            req.extensions_mut().insert(GrpcMethod::new("qdrant.Raft", "Send"));
-            self.inner.unary(req, path, codec).await
-        }
-        /// Send to bootstrap peer
-        /// Returns uri by id if bootstrap knows this peer
-        pub async fn who_is(
-            &mut self,
-            request: impl tonic::IntoRequest<super::PeerId>,
-        ) -> std::result::Result<tonic::Response<super::Uri>, tonic::Status> {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static("/qdrant.Raft/WhoIs");
-            let mut req = request.into_request();
-            req.extensions_mut().insert(GrpcMethod::new("qdrant.Raft", "WhoIs"));
-            self.inner.unary(req, path, codec).await
-        }
-        /// Send to bootstrap peer
-        /// Adds peer to the network
-        /// Returns all peers
-        pub async fn add_peer_to_known(
-            &mut self,
-            request: impl tonic::IntoRequest<super::AddPeerToKnownMessage>,
-        ) -> std::result::Result<tonic::Response<super::AllPeers>, tonic::Status> {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/qdrant.Raft/AddPeerToKnown",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(GrpcMethod::new("qdrant.Raft", "AddPeerToKnown"));
-            self.inner.unary(req, path, codec).await
-        }
-        /// DEPRECATED
-        /// Its functionality is now included in `AddPeerToKnown`
-        ///
-        /// Send to bootstrap peer
-        /// Proposes to add this peer as participant of consensus
-        pub async fn add_peer_as_participant(
-            &mut self,
-            request: impl tonic::IntoRequest<super::PeerId>,
-        ) -> std::result::Result<tonic::Response<()>, tonic::Status> {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/qdrant.Raft/AddPeerAsParticipant",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(GrpcMethod::new("qdrant.Raft", "AddPeerAsParticipant"));
-            self.inner.unary(req, path, codec).await
-        }
-    }
-}
-/// Generated server implementations.
-pub mod raft_server {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
-    use tonic::codegen::*;
-    /// Generated trait containing gRPC methods that should be implemented for use with RaftServer.
-    #[async_trait]
-    pub trait Raft: Send + Sync + 'static {
-        /// Send Raft message to another peer
-        async fn send(
-            &self,
-            request: tonic::Request<super::RaftMessage>,
-        ) -> std::result::Result<tonic::Response<()>, tonic::Status>;
-        /// Send to bootstrap peer
-        /// Returns uri by id if bootstrap knows this peer
-        async fn who_is(
-            &self,
-            request: tonic::Request<super::PeerId>,
-        ) -> std::result::Result<tonic::Response<super::Uri>, tonic::Status>;
-        /// Send to bootstrap peer
-        /// Adds peer to the network
-        /// Returns all peers
-        async fn add_peer_to_known(
-            &self,
-            request: tonic::Request<super::AddPeerToKnownMessage>,
-        ) -> std::result::Result<tonic::Response<super::AllPeers>, tonic::Status>;
-        /// DEPRECATED
-        /// Its functionality is now included in `AddPeerToKnown`
-        ///
-        /// Send to bootstrap peer
-        /// Proposes to add this peer as participant of consensus
-        async fn add_peer_as_participant(
-            &self,
-            request: tonic::Request<super::PeerId>,
-        ) -> std::result::Result<tonic::Response<()>, tonic::Status>;
-    }
-    #[derive(Debug)]
-    pub struct RaftServer<T: Raft> {
-        inner: _Inner<T>,
-        accept_compression_encodings: EnabledCompressionEncodings,
-        send_compression_encodings: EnabledCompressionEncodings,
-        max_decoding_message_size: Option<usize>,
-        max_encoding_message_size: Option<usize>,
-    }
-    struct _Inner<T>(Arc<T>);
-    impl<T: Raft> RaftServer<T> {
-        pub fn new(inner: T) -> Self {
-            Self::from_arc(Arc::new(inner))
-        }
-        pub fn from_arc(inner: Arc<T>) -> Self {
-            let inner = _Inner(inner);
-            Self {
-                inner,
-                accept_compression_encodings: Default::default(),
-                send_compression_encodings: Default::default(),
-                max_decoding_message_size: None,
-                max_encoding_message_size: None,
-            }
-        }
-        pub fn with_interceptor<F>(
-            inner: T,
-            interceptor: F,
-        ) -> InterceptedService<Self, F>
-        where
-            F: tonic::service::Interceptor,
-        {
-            InterceptedService::new(Self::new(inner), interceptor)
-        }
-        /// Enable decompressing requests with the given encoding.
-        #[must_use]
-        pub fn accept_compressed(mut self, encoding: CompressionEncoding) -> Self {
-            self.accept_compression_encodings.enable(encoding);
-            self
-        }
-        /// Compress responses with the given encoding, if the client supports it.
-        #[must_use]
-        pub fn send_compressed(mut self, encoding: CompressionEncoding) -> Self {
-            self.send_compression_encodings.enable(encoding);
-            self
-        }
-        /// Limits the maximum size of a decoded message.
-        ///
-        /// Default: `4MB`
-        #[must_use]
-        pub fn max_decoding_message_size(mut self, limit: usize) -> Self {
-            self.max_decoding_message_size = Some(limit);
-            self
-        }
-        /// Limits the maximum size of an encoded message.
-        ///
-        /// Default: `usize::MAX`
-        #[must_use]
-        pub fn max_encoding_message_size(mut self, limit: usize) -> Self {
-            self.max_encoding_message_size = Some(limit);
-            self
-        }
-    }
-    impl<T, B> tonic::codegen::Service<http::Request<B>> for RaftServer<T>
-    where
-        T: Raft,
-        B: Body + Send + 'static,
-        B::Error: Into<StdError> + Send + 'static,
-    {
-        type Response = http::Response<tonic::body::BoxBody>;
-        type Error = std::convert::Infallible;
-        type Future = BoxFuture<Self::Response, Self::Error>;
-        fn poll_ready(
-            &mut self,
-            _cx: &mut Context<'_>,
-        ) -> Poll<std::result::Result<(), Self::Error>> {
-            Poll::Ready(Ok(()))
-        }
-        fn call(&mut self, req: http::Request<B>) -> Self::Future {
-            let inner = self.inner.clone();
-            match req.uri().path() {
-                "/qdrant.Raft/Send" => {
-                    #[allow(non_camel_case_types)]
-                    struct SendSvc<T: Raft>(pub Arc<T>);
-                    impl<T: Raft> tonic::server::UnaryService<super::RaftMessage>
-                    for SendSvc<T> {
-                        type Response = ();
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::RaftMessage>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move { (*inner).send(request).await };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = SendSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.Raft/WhoIs" => {
-                    #[allow(non_camel_case_types)]
-                    struct WhoIsSvc<T: Raft>(pub Arc<T>);
-                    impl<T: Raft> tonic::server::UnaryService<super::PeerId>
-                    for WhoIsSvc<T> {
-                        type Response = super::Uri;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::PeerId>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move { (*inner).who_is(request).await };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = WhoIsSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.Raft/AddPeerToKnown" => {
-                    #[allow(non_camel_case_types)]
-                    struct AddPeerToKnownSvc<T: Raft>(pub Arc<T>);
-                    impl<
-                        T: Raft,
-                    > tonic::server::UnaryService<super::AddPeerToKnownMessage>
-                    for AddPeerToKnownSvc<T> {
-                        type Response = super::AllPeers;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::AddPeerToKnownMessage>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move {
-                                (*inner).add_peer_to_known(request).await
-                            };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = AddPeerToKnownSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.Raft/AddPeerAsParticipant" => {
-                    #[allow(non_camel_case_types)]
-                    struct AddPeerAsParticipantSvc<T: Raft>(pub Arc<T>);
-                    impl<T: Raft> tonic::server::UnaryService<super::PeerId>
-                    for AddPeerAsParticipantSvc<T> {
-                        type Response = ();
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::PeerId>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move {
-                                (*inner).add_peer_as_participant(request).await
-                            };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = AddPeerAsParticipantSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                _ => {
-                    Box::pin(async move {
-                        Ok(
-                            http::Response::builder()
-                                .status(200)
-                                .header("grpc-status", "12")
-                                .header("content-type", "application/grpc")
-                                .body(empty_body())
-                                .unwrap(),
-                        )
-                    })
-                }
-            }
-        }
-    }
-    impl<T: Raft> Clone for RaftServer<T> {
-        fn clone(&self) -> Self {
-            let inner = self.inner.clone();
-            Self {
-                inner,
-                accept_compression_encodings: self.accept_compression_encodings,
-                send_compression_encodings: self.send_compression_encodings,
-                max_decoding_message_size: self.max_decoding_message_size,
-                max_encoding_message_size: self.max_encoding_message_size,
-            }
-        }
-    }
-    impl<T: Raft> Clone for _Inner<T> {
-        fn clone(&self) -> Self {
-            Self(Arc::clone(&self.0))
-        }
-    }
-    impl<T: std::fmt::Debug> std::fmt::Debug for _Inner<T> {
-        fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-            write!(f, "{:?}", self.0)
-        }
-    }
-    impl<T: Raft> tonic::server::NamedService for RaftServer<T> {
-        const NAME: &'static str = "qdrant.Raft";
-    }
-}
-#[derive(serde::Serialize)]
-#[derive(validator::Validate)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct CreateFullSnapshotRequest {}
-#[derive(serde::Serialize)]
-#[derive(validator::Validate)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct ListFullSnapshotsRequest {}
-#[derive(serde::Serialize)]
-#[derive(validator::Validate)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct DeleteFullSnapshotRequest {
-    /// Name of the full snapshot
-    #[prost(string, tag = "1")]
-    #[validate(length(min = 1))]
-    pub snapshot_name: ::prost::alloc::string::String,
-}
-#[derive(serde::Serialize)]
-#[derive(validator::Validate)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct CreateSnapshotRequest {
-    /// Name of the collection
-    #[prost(string, tag = "1")]
-    #[validate(length(min = 1, max = 255))]
-    pub collection_name: ::prost::alloc::string::String,
-}
-#[derive(serde::Serialize)]
-#[derive(validator::Validate)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct ListSnapshotsRequest {
-    /// Name of the collection
-    #[prost(string, tag = "1")]
-    #[validate(length(min = 1, max = 255))]
-    pub collection_name: ::prost::alloc::string::String,
-}
-#[derive(serde::Serialize)]
-#[derive(validator::Validate)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct DeleteSnapshotRequest {
-    /// Name of the collection
-    #[prost(string, tag = "1")]
-    #[validate(length(min = 1, max = 255))]
-    pub collection_name: ::prost::alloc::string::String,
-    /// Name of the collection snapshot
-    #[prost(string, tag = "2")]
-    #[validate(length(min = 1))]
-    pub snapshot_name: ::prost::alloc::string::String,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct SnapshotDescription {
-    /// Name of the snapshot
-    #[prost(string, tag = "1")]
-    pub name: ::prost::alloc::string::String,
-    /// Creation time of the snapshot
-    #[prost(message, optional, tag = "2")]
-    pub creation_time: ::core::option::Option<super::google::protobuf::Timestamp>,
-    /// Size of the snapshot in bytes
-    #[prost(int64, tag = "3")]
-    pub size: i64,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct CreateSnapshotResponse {
-    #[prost(message, optional, tag = "1")]
-    pub snapshot_description: ::core::option::Option<SnapshotDescription>,
-    /// Time spent to process
-    #[prost(double, tag = "2")]
-    pub time: f64,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct ListSnapshotsResponse {
-    #[prost(message, repeated, tag = "1")]
-    pub snapshot_descriptions: ::prost::alloc::vec::Vec<SnapshotDescription>,
-    /// Time spent to process
-    #[prost(double, tag = "2")]
-    pub time: f64,
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct DeleteSnapshotResponse {
-    /// Time spent to process
-    #[prost(double, tag = "1")]
-    pub time: f64,
-}
-/// Generated client implementations.
-pub mod snapshots_client {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
-    use tonic::codegen::*;
-    use tonic::codegen::http::Uri;
-    #[derive(Debug, Clone)]
-    pub struct SnapshotsClient<T> {
-        inner: tonic::client::Grpc<T>,
-    }
-    impl SnapshotsClient<tonic::transport::Channel> {
-        /// Attempt to create a new client by connecting to a given endpoint.
-        pub async fn connect<D>(dst: D) -> Result<Self, tonic::transport::Error>
-        where
-            D: TryInto<tonic::transport::Endpoint>,
-            D::Error: Into<StdError>,
-        {
-            let conn = tonic::transport::Endpoint::new(dst)?.connect().await?;
-            Ok(Self::new(conn))
-        }
-    }
-    impl<T> SnapshotsClient<T>
-    where
-        T: tonic::client::GrpcService<tonic::body::BoxBody>,
-        T::Error: Into<StdError>,
-        T::ResponseBody: Body<Data = Bytes> + Send + 'static,
-        <T::ResponseBody as Body>::Error: Into<StdError> + Send,
-    {
-        pub fn new(inner: T) -> Self {
-            let inner = tonic::client::Grpc::new(inner);
-            Self { inner }
-        }
-        pub fn with_origin(inner: T, origin: Uri) -> Self {
-            let inner = tonic::client::Grpc::with_origin(inner, origin);
-            Self { inner }
-        }
-        pub fn with_interceptor<F>(
-            inner: T,
-            interceptor: F,
-        ) -> SnapshotsClient<InterceptedService<T, F>>
-        where
-            F: tonic::service::Interceptor,
-            T::ResponseBody: Default,
-            T: tonic::codegen::Service<
-                http::Request<tonic::body::BoxBody>,
-                Response = http::Response<
-                    <T as tonic::client::GrpcService<tonic::body::BoxBody>>::ResponseBody,
-                >,
-            >,
-            <T as tonic::codegen::Service<
-                http::Request<tonic::body::BoxBody>,
-            >>::Error: Into<StdError> + Send + Sync,
-        {
-            SnapshotsClient::new(InterceptedService::new(inner, interceptor))
-        }
-        /// Compress requests with the given encoding.
-        ///
-        /// This requires the server to support it otherwise it might respond with an
-        /// error.
-        #[must_use]
-        pub fn send_compressed(mut self, encoding: CompressionEncoding) -> Self {
-            self.inner = self.inner.send_compressed(encoding);
-            self
-        }
-        /// Enable decompressing responses.
-        #[must_use]
-        pub fn accept_compressed(mut self, encoding: CompressionEncoding) -> Self {
-            self.inner = self.inner.accept_compressed(encoding);
-            self
-        }
-        /// Limits the maximum size of a decoded message.
-        ///
-        /// Default: `4MB`
-        #[must_use]
-        pub fn max_decoding_message_size(mut self, limit: usize) -> Self {
-            self.inner = self.inner.max_decoding_message_size(limit);
-            self
-        }
-        /// Limits the maximum size of an encoded message.
-        ///
-        /// Default: `usize::MAX`
-        #[must_use]
-        pub fn max_encoding_message_size(mut self, limit: usize) -> Self {
-            self.inner = self.inner.max_encoding_message_size(limit);
-            self
-        }
-        /// Create collection snapshot
-        pub async fn create(
-            &mut self,
-            request: impl tonic::IntoRequest<super::CreateSnapshotRequest>,
-        ) -> std::result::Result<
-            tonic::Response<super::CreateSnapshotResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static("/qdrant.Snapshots/Create");
-            let mut req = request.into_request();
-            req.extensions_mut().insert(GrpcMethod::new("qdrant.Snapshots", "Create"));
-            self.inner.unary(req, path, codec).await
-        }
-        /// List collection snapshots
-        pub async fn list(
-            &mut self,
-            request: impl tonic::IntoRequest<super::ListSnapshotsRequest>,
-        ) -> std::result::Result<
-            tonic::Response<super::ListSnapshotsResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static("/qdrant.Snapshots/List");
-            let mut req = request.into_request();
-            req.extensions_mut().insert(GrpcMethod::new("qdrant.Snapshots", "List"));
-            self.inner.unary(req, path, codec).await
-        }
-        /// Delete collection snapshots
-        pub async fn delete(
-            &mut self,
-            request: impl tonic::IntoRequest<super::DeleteSnapshotRequest>,
-        ) -> std::result::Result<
-            tonic::Response<super::DeleteSnapshotResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static("/qdrant.Snapshots/Delete");
-            let mut req = request.into_request();
-            req.extensions_mut().insert(GrpcMethod::new("qdrant.Snapshots", "Delete"));
-            self.inner.unary(req, path, codec).await
-        }
-        /// Create full storage snapshot
-        pub async fn create_full(
-            &mut self,
-            request: impl tonic::IntoRequest<super::CreateFullSnapshotRequest>,
-        ) -> std::result::Result<
-            tonic::Response<super::CreateSnapshotResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/qdrant.Snapshots/CreateFull",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(GrpcMethod::new("qdrant.Snapshots", "CreateFull"));
-            self.inner.unary(req, path, codec).await
-        }
-        /// List full storage snapshots
-        pub async fn list_full(
-            &mut self,
-            request: impl tonic::IntoRequest<super::ListFullSnapshotsRequest>,
-        ) -> std::result::Result<
-            tonic::Response<super::ListSnapshotsResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/qdrant.Snapshots/ListFull",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut().insert(GrpcMethod::new("qdrant.Snapshots", "ListFull"));
-            self.inner.unary(req, path, codec).await
-        }
-        /// List full storage snapshots
-        pub async fn delete_full(
-            &mut self,
-            request: impl tonic::IntoRequest<super::DeleteFullSnapshotRequest>,
-        ) -> std::result::Result<
-            tonic::Response<super::DeleteSnapshotResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/qdrant.Snapshots/DeleteFull",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(GrpcMethod::new("qdrant.Snapshots", "DeleteFull"));
-            self.inner.unary(req, path, codec).await
-        }
-    }
-}
-/// Generated server implementations.
-pub mod snapshots_server {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
-    use tonic::codegen::*;
-    /// Generated trait containing gRPC methods that should be implemented for use with SnapshotsServer.
-    #[async_trait]
-    pub trait Snapshots: Send + Sync + 'static {
-        /// Create collection snapshot
-        async fn create(
-            &self,
-            request: tonic::Request<super::CreateSnapshotRequest>,
-        ) -> std::result::Result<
-            tonic::Response<super::CreateSnapshotResponse>,
-            tonic::Status,
-        >;
-        /// List collection snapshots
-        async fn list(
-            &self,
-            request: tonic::Request<super::ListSnapshotsRequest>,
-        ) -> std::result::Result<
-            tonic::Response<super::ListSnapshotsResponse>,
-            tonic::Status,
-        >;
-        /// Delete collection snapshots
-        async fn delete(
-            &self,
-            request: tonic::Request<super::DeleteSnapshotRequest>,
-        ) -> std::result::Result<
-            tonic::Response<super::DeleteSnapshotResponse>,
-            tonic::Status,
-        >;
-        /// Create full storage snapshot
-        async fn create_full(
-            &self,
-            request: tonic::Request<super::CreateFullSnapshotRequest>,
-        ) -> std::result::Result<
-            tonic::Response<super::CreateSnapshotResponse>,
-            tonic::Status,
-        >;
-        /// List full storage snapshots
-        async fn list_full(
-            &self,
-            request: tonic::Request<super::ListFullSnapshotsRequest>,
-        ) -> std::result::Result<
-            tonic::Response<super::ListSnapshotsResponse>,
-            tonic::Status,
-        >;
-        /// List full storage snapshots
-        async fn delete_full(
-            &self,
-            request: tonic::Request<super::DeleteFullSnapshotRequest>,
-        ) -> std::result::Result<
-            tonic::Response<super::DeleteSnapshotResponse>,
-            tonic::Status,
-        >;
-    }
-    #[derive(Debug)]
-    pub struct SnapshotsServer<T: Snapshots> {
-        inner: _Inner<T>,
-        accept_compression_encodings: EnabledCompressionEncodings,
-        send_compression_encodings: EnabledCompressionEncodings,
-        max_decoding_message_size: Option<usize>,
-        max_encoding_message_size: Option<usize>,
-    }
-    struct _Inner<T>(Arc<T>);
-    impl<T: Snapshots> SnapshotsServer<T> {
-        pub fn new(inner: T) -> Self {
-            Self::from_arc(Arc::new(inner))
-        }
-        pub fn from_arc(inner: Arc<T>) -> Self {
-            let inner = _Inner(inner);
-            Self {
-                inner,
-                accept_compression_encodings: Default::default(),
-                send_compression_encodings: Default::default(),
-                max_decoding_message_size: None,
-                max_encoding_message_size: None,
-            }
-        }
-        pub fn with_interceptor<F>(
-            inner: T,
-            interceptor: F,
-        ) -> InterceptedService<Self, F>
-        where
-            F: tonic::service::Interceptor,
-        {
-            InterceptedService::new(Self::new(inner), interceptor)
-        }
-        /// Enable decompressing requests with the given encoding.
-        #[must_use]
-        pub fn accept_compressed(mut self, encoding: CompressionEncoding) -> Self {
-            self.accept_compression_encodings.enable(encoding);
-            self
-        }
-        /// Compress responses with the given encoding, if the client supports it.
-        #[must_use]
-        pub fn send_compressed(mut self, encoding: CompressionEncoding) -> Self {
-            self.send_compression_encodings.enable(encoding);
-            self
-        }
-        /// Limits the maximum size of a decoded message.
-        ///
-        /// Default: `4MB`
-        #[must_use]
-        pub fn max_decoding_message_size(mut self, limit: usize) -> Self {
-            self.max_decoding_message_size = Some(limit);
-            self
-        }
-        /// Limits the maximum size of an encoded message.
-        ///
-        /// Default: `usize::MAX`
-        #[must_use]
-        pub fn max_encoding_message_size(mut self, limit: usize) -> Self {
-            self.max_encoding_message_size = Some(limit);
-            self
-        }
-    }
-    impl<T, B> tonic::codegen::Service<http::Request<B>> for SnapshotsServer<T>
-    where
-        T: Snapshots,
-        B: Body + Send + 'static,
-        B::Error: Into<StdError> + Send + 'static,
-    {
-        type Response = http::Response<tonic::body::BoxBody>;
-        type Error = std::convert::Infallible;
-        type Future = BoxFuture<Self::Response, Self::Error>;
-        fn poll_ready(
-            &mut self,
-            _cx: &mut Context<'_>,
-        ) -> Poll<std::result::Result<(), Self::Error>> {
-            Poll::Ready(Ok(()))
-        }
-        fn call(&mut self, req: http::Request<B>) -> Self::Future {
-            let inner = self.inner.clone();
-            match req.uri().path() {
-                "/qdrant.Snapshots/Create" => {
-                    #[allow(non_camel_case_types)]
-                    struct CreateSvc<T: Snapshots>(pub Arc<T>);
-                    impl<
-                        T: Snapshots,
-                    > tonic::server::UnaryService<super::CreateSnapshotRequest>
-                    for CreateSvc<T> {
-                        type Response = super::CreateSnapshotResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::CreateSnapshotRequest>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move { (*inner).create(request).await };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = CreateSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.Snapshots/List" => {
-                    #[allow(non_camel_case_types)]
-                    struct ListSvc<T: Snapshots>(pub Arc<T>);
-                    impl<
-                        T: Snapshots,
-                    > tonic::server::UnaryService<super::ListSnapshotsRequest>
-                    for ListSvc<T> {
-                        type Response = super::ListSnapshotsResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::ListSnapshotsRequest>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move { (*inner).list(request).await };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = ListSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.Snapshots/Delete" => {
-                    #[allow(non_camel_case_types)]
-                    struct DeleteSvc<T: Snapshots>(pub Arc<T>);
-                    impl<
-                        T: Snapshots,
-                    > tonic::server::UnaryService<super::DeleteSnapshotRequest>
-                    for DeleteSvc<T> {
-                        type Response = super::DeleteSnapshotResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::DeleteSnapshotRequest>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move { (*inner).delete(request).await };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = DeleteSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.Snapshots/CreateFull" => {
-                    #[allow(non_camel_case_types)]
-                    struct CreateFullSvc<T: Snapshots>(pub Arc<T>);
-                    impl<
-                        T: Snapshots,
-                    > tonic::server::UnaryService<super::CreateFullSnapshotRequest>
-                    for CreateFullSvc<T> {
-                        type Response = super::CreateSnapshotResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::CreateFullSnapshotRequest>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move { (*inner).create_full(request).await };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = CreateFullSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.Snapshots/ListFull" => {
-                    #[allow(non_camel_case_types)]
-                    struct ListFullSvc<T: Snapshots>(pub Arc<T>);
-                    impl<
-                        T: Snapshots,
-                    > tonic::server::UnaryService<super::ListFullSnapshotsRequest>
-                    for ListFullSvc<T> {
-                        type Response = super::ListSnapshotsResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::ListFullSnapshotsRequest>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move { (*inner).list_full(request).await };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = ListFullSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                "/qdrant.Snapshots/DeleteFull" => {
-                    #[allow(non_camel_case_types)]
-                    struct DeleteFullSvc<T: Snapshots>(pub Arc<T>);
-                    impl<
-                        T: Snapshots,
-                    > tonic::server::UnaryService<super::DeleteFullSnapshotRequest>
-                    for DeleteFullSvc<T> {
-                        type Response = super::DeleteSnapshotResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::DeleteFullSnapshotRequest>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move { (*inner).delete_full(request).await };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = DeleteFullSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                _ => {
-                    Box::pin(async move {
-                        Ok(
-                            http::Response::builder()
-                                .status(200)
-                                .header("grpc-status", "12")
-                                .header("content-type", "application/grpc")
-                                .body(empty_body())
-                                .unwrap(),
-                        )
-                    })
-                }
-            }
-        }
-    }
-    impl<T: Snapshots> Clone for SnapshotsServer<T> {
-        fn clone(&self) -> Self {
-            let inner = self.inner.clone();
-            Self {
-                inner,
-                accept_compression_encodings: self.accept_compression_encodings,
-                send_compression_encodings: self.send_compression_encodings,
-                max_decoding_message_size: self.max_decoding_message_size,
-                max_encoding_message_size: self.max_encoding_message_size,
-            }
-        }
-    }
-    impl<T: Snapshots> Clone for _Inner<T> {
-        fn clone(&self) -> Self {
-            Self(Arc::clone(&self.0))
-        }
-    }
-    impl<T: std::fmt::Debug> std::fmt::Debug for _Inner<T> {
-        fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-            write!(f, "{:?}", self.0)
-        }
-    }
-    impl<T: Snapshots> tonic::server::NamedService for SnapshotsServer<T> {
-        const NAME: &'static str = "qdrant.Snapshots";
-    }
-}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct HealthCheckRequest {}
-#[derive(serde::Serialize)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct HealthCheckReply {
-    #[prost(string, tag = "1")]
-    pub title: ::prost::alloc::string::String,
-    #[prost(string, tag = "2")]
-    pub version: ::prost::alloc::string::String,
-}
-/// Generated client implementations.
-pub mod qdrant_client {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
-    use tonic::codegen::*;
-    use tonic::codegen::http::Uri;
-    #[derive(Debug, Clone)]
-    pub struct QdrantClient<T> {
-        inner: tonic::client::Grpc<T>,
-    }
-    impl QdrantClient<tonic::transport::Channel> {
-        /// Attempt to create a new client by connecting to a given endpoint.
-        pub async fn connect<D>(dst: D) -> Result<Self, tonic::transport::Error>
-        where
-            D: TryInto<tonic::transport::Endpoint>,
-            D::Error: Into<StdError>,
-        {
-            let conn = tonic::transport::Endpoint::new(dst)?.connect().await?;
-            Ok(Self::new(conn))
-        }
-    }
-    impl<T> QdrantClient<T>
-    where
-        T: tonic::client::GrpcService<tonic::body::BoxBody>,
-        T::Error: Into<StdError>,
-        T::ResponseBody: Body<Data = Bytes> + Send + 'static,
-        <T::ResponseBody as Body>::Error: Into<StdError> + Send,
-    {
-        pub fn new(inner: T) -> Self {
-            let inner = tonic::client::Grpc::new(inner);
-            Self { inner }
-        }
-        pub fn with_origin(inner: T, origin: Uri) -> Self {
-            let inner = tonic::client::Grpc::with_origin(inner, origin);
-            Self { inner }
-        }
-        pub fn with_interceptor<F>(
-            inner: T,
-            interceptor: F,
-        ) -> QdrantClient<InterceptedService<T, F>>
-        where
-            F: tonic::service::Interceptor,
-            T::ResponseBody: Default,
-            T: tonic::codegen::Service<
-                http::Request<tonic::body::BoxBody>,
-                Response = http::Response<
-                    <T as tonic::client::GrpcService<tonic::body::BoxBody>>::ResponseBody,
-                >,
-            >,
-            <T as tonic::codegen::Service<
-                http::Request<tonic::body::BoxBody>,
-            >>::Error: Into<StdError> + Send + Sync,
-        {
-            QdrantClient::new(InterceptedService::new(inner, interceptor))
-        }
-        /// Compress requests with the given encoding.
-        ///
-        /// This requires the server to support it otherwise it might respond with an
-        /// error.
-        #[must_use]
-        pub fn send_compressed(mut self, encoding: CompressionEncoding) -> Self {
-            self.inner = self.inner.send_compressed(encoding);
-            self
-        }
-        /// Enable decompressing responses.
-        #[must_use]
-        pub fn accept_compressed(mut self, encoding: CompressionEncoding) -> Self {
-            self.inner = self.inner.accept_compressed(encoding);
-            self
-        }
-        /// Limits the maximum size of a decoded message.
-        ///
-        /// Default: `4MB`
-        #[must_use]
-        pub fn max_decoding_message_size(mut self, limit: usize) -> Self {
-            self.inner = self.inner.max_decoding_message_size(limit);
-            self
-        }
-        /// Limits the maximum size of an encoded message.
-        ///
-        /// Default: `usize::MAX`
-        #[must_use]
-        pub fn max_encoding_message_size(mut self, limit: usize) -> Self {
-            self.inner = self.inner.max_encoding_message_size(limit);
-            self
-        }
-        pub async fn health_check(
-            &mut self,
-            request: impl tonic::IntoRequest<super::HealthCheckRequest>,
-        ) -> std::result::Result<
-            tonic::Response<super::HealthCheckReply>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::new(
-                        tonic::Code::Unknown,
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/qdrant.Qdrant/HealthCheck",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut().insert(GrpcMethod::new("qdrant.Qdrant", "HealthCheck"));
-            self.inner.unary(req, path, codec).await
-        }
-    }
-}
-/// Generated server implementations.
-pub mod qdrant_server {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
-    use tonic::codegen::*;
-    /// Generated trait containing gRPC methods that should be implemented for use with QdrantServer.
-    #[async_trait]
-    pub trait Qdrant: Send + Sync + 'static {
-        async fn health_check(
-            &self,
-            request: tonic::Request<super::HealthCheckRequest>,
-        ) -> std::result::Result<
-            tonic::Response<super::HealthCheckReply>,
-            tonic::Status,
-        >;
-    }
-    #[derive(Debug)]
-    pub struct QdrantServer<T: Qdrant> {
-        inner: _Inner<T>,
-        accept_compression_encodings: EnabledCompressionEncodings,
-        send_compression_encodings: EnabledCompressionEncodings,
-        max_decoding_message_size: Option<usize>,
-        max_encoding_message_size: Option<usize>,
-    }
-    struct _Inner<T>(Arc<T>);
-    impl<T: Qdrant> QdrantServer<T> {
-        pub fn new(inner: T) -> Self {
-            Self::from_arc(Arc::new(inner))
-        }
-        pub fn from_arc(inner: Arc<T>) -> Self {
-            let inner = _Inner(inner);
-            Self {
-                inner,
-                accept_compression_encodings: Default::default(),
-                send_compression_encodings: Default::default(),
-                max_decoding_message_size: None,
-                max_encoding_message_size: None,
-            }
-        }
-        pub fn with_interceptor<F>(
-            inner: T,
-            interceptor: F,
-        ) -> InterceptedService<Self, F>
-        where
-            F: tonic::service::Interceptor,
-        {
-            InterceptedService::new(Self::new(inner), interceptor)
-        }
-        /// Enable decompressing requests with the given encoding.
-        #[must_use]
-        pub fn accept_compressed(mut self, encoding: CompressionEncoding) -> Self {
-            self.accept_compression_encodings.enable(encoding);
-            self
-        }
-        /// Compress responses with the given encoding, if the client supports it.
-        #[must_use]
-        pub fn send_compressed(mut self, encoding: CompressionEncoding) -> Self {
-            self.send_compression_encodings.enable(encoding);
-            self
-        }
-        /// Limits the maximum size of a decoded message.
-        ///
-        /// Default: `4MB`
-        #[must_use]
-        pub fn max_decoding_message_size(mut self, limit: usize) -> Self {
-            self.max_decoding_message_size = Some(limit);
-            self
-        }
-        /// Limits the maximum size of an encoded message.
-        ///
-        /// Default: `usize::MAX`
-        #[must_use]
-        pub fn max_encoding_message_size(mut self, limit: usize) -> Self {
-            self.max_encoding_message_size = Some(limit);
-            self
-        }
-    }
-    impl<T, B> tonic::codegen::Service<http::Request<B>> for QdrantServer<T>
-    where
-        T: Qdrant,
-        B: Body + Send + 'static,
-        B::Error: Into<StdError> + Send + 'static,
-    {
-        type Response = http::Response<tonic::body::BoxBody>;
-        type Error = std::convert::Infallible;
-        type Future = BoxFuture<Self::Response, Self::Error>;
-        fn poll_ready(
-            &mut self,
-            _cx: &mut Context<'_>,
-        ) -> Poll<std::result::Result<(), Self::Error>> {
-            Poll::Ready(Ok(()))
-        }
-        fn call(&mut self, req: http::Request<B>) -> Self::Future {
-            let inner = self.inner.clone();
-            match req.uri().path() {
-                "/qdrant.Qdrant/HealthCheck" => {
-                    #[allow(non_camel_case_types)]
-                    struct HealthCheckSvc<T: Qdrant>(pub Arc<T>);
-                    impl<
-                        T: Qdrant,
-                    > tonic::server::UnaryService<super::HealthCheckRequest>
-                    for HealthCheckSvc<T> {
-                        type Response = super::HealthCheckReply;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<super::HealthCheckRequest>,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move {
-                                (*inner).health_check(request).await
-                            };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let inner = inner.0;
-                        let method = HealthCheckSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
-                _ => {
-                    Box::pin(async move {
-                        Ok(
-                            http::Response::builder()
-                                .status(200)
-                                .header("grpc-status", "12")
-                                .header("content-type", "application/grpc")
-                                .body(empty_body())
-                                .unwrap(),
-                        )
-                    })
-                }
-            }
-        }
-    }
-    impl<T: Qdrant> Clone for QdrantServer<T> {
-        fn clone(&self) -> Self {
-            let inner = self.inner.clone();
-            Self {
-                inner,
-                accept_compression_encodings: self.accept_compression_encodings,
-                send_compression_encodings: self.send_compression_encodings,
-                max_decoding_message_size: self.max_decoding_message_size,
-                max_encoding_message_size: self.max_encoding_message_size,
-            }
-        }
-    }
-    impl<T: Qdrant> Clone for _Inner<T> {
-        fn clone(&self) -> Self {
-            Self(Arc::clone(&self.0))
-        }
-    }
-    impl<T: std::fmt::Debug> std::fmt::Debug for _Inner<T> {
-        fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-            write!(f, "{:?}", self.0)
-        }
-    }
-    impl<T: Qdrant> tonic::server::NamedService for QdrantServer<T> {
-        const NAME: &'static str = "qdrant.Qdrant";
-    }
-}
-use super::validate::ValidateExt;
diff --git a/crates/qdrant/lib/api/src/grpc/transport_channel_pool.rs b/crates/qdrant/lib/api/src/grpc/transport_channel_pool.rs
deleted file mode 100644
index bb9f15d..0000000
--- a/crates/qdrant/lib/api/src/grpc/transport_channel_pool.rs
+++ /dev/null
@@ -1,378 +0,0 @@
-use std::collections::HashMap;
-use std::future::Future;
-use std::num::NonZeroUsize;
-use std::time::Duration;
-
-use rand::{thread_rng, Rng};
-use tokio::select;
-use tonic::transport::{Channel, ClientTlsConfig, Error as TonicError, Uri};
-use tonic::{Code, Status};
-
-use crate::grpc::dynamic_channel_pool::DynamicChannelPool;
-use crate::grpc::dynamic_pool::CountedItem;
-use crate::grpc::qdrant::qdrant_client::QdrantClient;
-use crate::grpc::qdrant::HealthCheckRequest;
-
-pub const DEFAULT_GRPC_TIMEOUT: Duration = Duration::from_secs(60);
-pub const DEFAULT_CONNECT_TIMEOUT: Duration = Duration::from_secs(2);
-pub const DEFAULT_POOL_SIZE: usize = 2;
-
-/// Allow a large number of connections per channel, that is close to the limit of
-/// `http2_max_pending_accept_reset_streams` that we configure to minimize the chance of
-/// GOAWAY/ENHANCE_YOUR_CALM errors from occurring.
-/// More info: <https://github.com/qdrant/qdrant/issues/1907>
-const MAX_CONNECTIONS_PER_CHANNEL: usize = 1024;
-const DEFAULT_RETRIES: usize = 2;
-const DEFAULT_BACKOFF: Duration = Duration::from_millis(100);
-
-/// How long to wait for response from server, before checking health of the server
-const SMART_CONNECT_INTERVAL: Duration = Duration::from_secs(1);
-
-/// There is no indication, that health-check API is affected by high parallel load
-/// So we can use small timeout for health-check
-const HEALTH_CHECK_TIMEOUT: Duration = Duration::from_secs(2);
-
-/// Try to recreate channel, if there were no successful requests within this time
-const CHANNEL_TTL: Duration = Duration::from_secs(5);
-
-#[derive(thiserror::Error, Debug)]
-pub enum RequestError<E: std::error::Error> {
-    #[error("Error in closure supplied to transport channel pool: {0}")]
-    FromClosure(E),
-    #[error("Tonic error: {0}")]
-    Tonic(#[from] TonicError),
-}
-
-enum RetryAction {
-    Fail(Status),
-    RetryOnce(Status),
-    RetryWithBackoff(Status),
-    RetryImmediately(Status),
-}
-
-#[derive(Debug)]
-enum HealthCheckError {
-    NoChannel,
-    ConnectionError(TonicError),
-    RequestError(Status),
-}
-
-#[derive(Debug)]
-enum RequestFailure {
-    HealthCheck(HealthCheckError),
-    RequestError(Status),
-    RequestConnection(TonicError),
-}
-
-/// Holds a pool of channels established for a set of URIs.
-/// Channel are shared by cloning them.
-/// Make the `pool_size` larger to increase throughput.
-pub struct TransportChannelPool {
-    uri_to_pool: tokio::sync::RwLock<HashMap<Uri, DynamicChannelPool>>,
-    pool_size: NonZeroUsize,
-    grpc_timeout: Duration,
-    connection_timeout: Duration,
-    tls_config: Option<ClientTlsConfig>,
-}
-
-impl Default for TransportChannelPool {
-    fn default() -> Self {
-        Self {
-            uri_to_pool: tokio::sync::RwLock::new(HashMap::new()),
-            pool_size: NonZeroUsize::new(DEFAULT_POOL_SIZE).unwrap(),
-            grpc_timeout: DEFAULT_GRPC_TIMEOUT,
-            connection_timeout: DEFAULT_CONNECT_TIMEOUT,
-            tls_config: None,
-        }
-    }
-}
-
-impl TransportChannelPool {
-    pub fn new(
-        p2p_grpc_timeout: Duration,
-        connection_timeout: Duration,
-        pool_size: usize,
-        tls_config: Option<ClientTlsConfig>,
-    ) -> Self {
-        Self {
-            uri_to_pool: Default::default(),
-            grpc_timeout: p2p_grpc_timeout,
-            connection_timeout,
-            pool_size: NonZeroUsize::new(pool_size).unwrap(),
-            tls_config,
-        }
-    }
-
-    async fn _init_pool_for_uri(&self, uri: Uri) -> Result<DynamicChannelPool, TonicError> {
-        DynamicChannelPool::new(
-            uri,
-            self.grpc_timeout,
-            self.connection_timeout,
-            self.tls_config.clone(),
-            MAX_CONNECTIONS_PER_CHANNEL,
-            self.pool_size.get(),
-        )
-        .await
-    }
-
-    /// Initialize a pool for the URI and return a clone of the first channel.
-    /// Does not fail if the pool already exist.
-    async fn init_pool_for_uri(&self, uri: Uri) -> Result<CountedItem<Channel>, TonicError> {
-        let mut guard = self.uri_to_pool.write().await;
-        match guard.get_mut(&uri) {
-            None => {
-                let channels = self._init_pool_for_uri(uri.clone()).await?;
-                let channel = channels.choose().await?;
-                guard.insert(uri, channels);
-                Ok(channel)
-            }
-            Some(channels) => channels.choose().await,
-        }
-    }
-
-    pub async fn drop_pool(&self, uri: &Uri) {
-        let mut guard = self.uri_to_pool.write().await;
-        guard.remove(uri);
-    }
-
-    pub async fn drop_channel(&self, uri: &Uri, channel: CountedItem<Channel>) {
-        let guard = self.uri_to_pool.read().await;
-        if let Some(pool) = guard.get(uri) {
-            pool.drop_channel(channel);
-        }
-    }
-
-    async fn get_pooled_channel(
-        &self,
-        uri: &Uri,
-    ) -> Option<Result<CountedItem<Channel>, TonicError>> {
-        let guard = self.uri_to_pool.read().await;
-        match guard.get(uri) {
-            None => None,
-            Some(channels) => Some(channels.choose().await),
-        }
-    }
-
-    async fn get_or_create_pooled_channel(
-        &self,
-        uri: &Uri,
-    ) -> Result<CountedItem<Channel>, TonicError> {
-        match self.get_pooled_channel(uri).await {
-            None => self.init_pool_for_uri(uri.clone()).await,
-            Some(channel) => channel,
-        }
-    }
-
-    /// Checks if the channel is still alive.
-    ///
-    /// It uses duplicate "fast" channel, equivalent to the original, but with smaller timeout.
-    /// If it can't get healthcheck response in the timeout, it assumes the channel is dead.
-    /// And we need to drop the pool for the uri and try again.
-    /// For performance reasons, we start the check only after `SMART_CONNECT_TIMEOUT`.
-    async fn check_connectability(&self, uri: &Uri) -> HealthCheckError {
-        loop {
-            tokio::time::sleep(SMART_CONNECT_INTERVAL).await;
-            let channel = self.get_pooled_channel(uri).await;
-            match channel {
-                None => return HealthCheckError::NoChannel,
-                Some(Err(tonic_error)) => return HealthCheckError::ConnectionError(tonic_error),
-                Some(Ok(channel)) => {
-                    let mut client = QdrantClient::new(channel.item().clone());
-
-                    let resp: Result<_, Status> = select! {
-                        res = client.health_check(HealthCheckRequest {}) => {
-                            res
-                        }
-                        _ = tokio::time::sleep(HEALTH_CHECK_TIMEOUT) => {
-                            // Current healthcheck timed out, but maybe there were other requests
-                            // that succeeded in a given time window.
-                            // If so, we can continue watching.
-                            if channel.last_success_age() > HEALTH_CHECK_TIMEOUT {
-                                return HealthCheckError::RequestError(Status::deadline_exceeded(format!("Healthcheck timeout {}ms exceeded", HEALTH_CHECK_TIMEOUT.as_millis())))
-                            } else {
-                                continue;
-                            }
-                        }
-                    };
-                    match resp {
-                        Ok(_) => {
-                            channel.report_success();
-                            // continue watching
-                        }
-                        Err(status) => return HealthCheckError::RequestError(status),
-                    }
-                }
-            }
-        }
-    }
-
-    async fn _make_request<T, O: Future<Output = Result<T, Status>>>(
-        &self,
-        uri: &Uri,
-        f: &impl Fn(Channel) -> O,
-        timeout: Duration,
-    ) -> Result<T, RequestFailure> {
-        let channel = match self.get_or_create_pooled_channel(uri).await {
-            Ok(channel) => channel,
-            Err(tonic_error) => {
-                return Err(RequestFailure::RequestConnection(tonic_error));
-            }
-        };
-
-        let result: RequestFailure = select! {
-            res = f(channel.item().clone()) => {
-                match res {
-                    Ok(body) => {
-                        channel.report_success();
-                        return Ok(body);
-                    },
-                    Err(err) => RequestFailure::RequestError(err)
-                }
-            }
-            res = self.check_connectability(uri) => {
-               RequestFailure::HealthCheck(res)
-            }
-            _res = tokio::time::sleep(timeout) => {
-                RequestFailure::RequestError(Status::deadline_exceeded(format!("Timeout {}ms reached for uri: {}", timeout.as_millis(), uri)))
-            }
-        };
-
-        // After this point the request is not successful, but we can try to recover
-        let last_success_age = channel.last_success_age();
-        if last_success_age > CHANNEL_TTL {
-            // There were no successful requests for a long time, we can try to reconnect
-            // It might be possible that server died and changed its ip address
-            self.drop_channel(uri, channel).await;
-        } else {
-            // We don't need this channel anymore, drop before waiting for the backoff
-            drop(channel);
-        }
-
-        Err(result)
-    }
-
-    // Allows to use channel to `uri`. If there is no channels to specified uri - they will be created.
-    pub async fn with_channel_timeout<T, O: Future<Output = Result<T, Status>>>(
-        &self,
-        uri: &Uri,
-        f: impl Fn(Channel) -> O,
-        timeout: Option<Duration>,
-        retries: usize,
-    ) -> Result<T, RequestError<Status>> {
-        let mut retries_left = retries;
-        let mut attempt = 0;
-        let max_timeout = timeout.unwrap_or_else(|| self.grpc_timeout + self.connection_timeout);
-
-        loop {
-            let request_result: Result<T, _> = self._make_request(uri, &f, max_timeout).await;
-
-            let error_result = match request_result {
-                Ok(body) => return Ok(body),
-                Err(err) => err,
-            };
-
-            let action = match error_result {
-                RequestFailure::HealthCheck(healthcheck_error) => {
-                    match healthcheck_error {
-                        HealthCheckError::NoChannel => {
-                            // The channel pool was dropped during the request processing.
-                            // Meaning that the peer is not available anymore.
-                            // So we can just fail the request.
-                            RetryAction::Fail(Status::unavailable(format!(
-                                "Peer {} is not available",
-                                uri
-                            )))
-                        }
-                        HealthCheckError::ConnectionError(error) => {
-                            // Can't establish connection to the server during the healthcheck.
-                            // Possible situation:
-                            // - Server was killed during the request processing and request timed out.
-                            // Actions:
-                            // - retry no backoff
-                            RetryAction::RetryImmediately(Status::unavailable(format!(
-                                "Failed to connect to {}, error: {}",
-                                uri, error
-                            )))
-                        }
-                        HealthCheckError::RequestError(status) => {
-                            // Channel might be unavailable or overloaded.
-                            // Or server might be dead.
-                            RetryAction::RetryWithBackoff(status)
-                        }
-                    }
-                }
-                RequestFailure::RequestError(status) => {
-                    match status.code() {
-                        Code::Cancelled | Code::Unavailable => {
-                            // Possible situations:
-                            // - Server is frozen and will never respond.
-                            // - Server is overloaded and will respond in the future.
-                            RetryAction::RetryWithBackoff(status)
-                        }
-                        Code::Internal => {
-                            // Something is broken, but let's retry anyway, but only once.
-                            RetryAction::RetryOnce(status)
-                        }
-                        _ => {
-                            // No special handling, just fail already.
-                            RetryAction::Fail(status)
-                        }
-                    }
-                }
-                RequestFailure::RequestConnection(error) => {
-                    // Can't establish connection to the server during the request.
-                    // Possible situation:
-                    // - Server is killed
-                    // - Server is overloaded
-                    // Actions:
-                    // - retry with backoff
-                    RetryAction::RetryWithBackoff(Status::unavailable(format!(
-                        "Failed to connect to {}, error: {}",
-                        uri, error
-                    )))
-                }
-            };
-
-            let (backoff_time, fallback_status) = match action {
-                RetryAction::Fail(err) => return Err(RequestError::FromClosure(err)),
-                RetryAction::RetryImmediately(fallback_status) => (Duration::ZERO, fallback_status),
-                RetryAction::RetryWithBackoff(fallback_status) => {
-                    // Calculate backoff
-                    let backoff = DEFAULT_BACKOFF * 2u32.pow(attempt as u32)
-                        + Duration::from_millis(thread_rng().gen_range(0..100));
-
-                    if backoff > max_timeout {
-                        // We can't wait for the request any longer, return the error as is
-                        return Err(RequestError::FromClosure(fallback_status));
-                    }
-                    (backoff, fallback_status)
-                }
-                RetryAction::RetryOnce(fallback_status) => {
-                    if retries_left > 1 {
-                        retries_left = 1;
-                    }
-                    (Duration::ZERO, fallback_status)
-                }
-            };
-
-            attempt += 1;
-            if retries_left == 0 {
-                return Err(RequestError::FromClosure(fallback_status));
-            }
-            retries_left = retries_left.saturating_sub(1);
-
-            // Wait for the backoff
-            tokio::time::sleep(backoff_time).await;
-        }
-    }
-
-    // Allows to use channel to `uri`. If there is no channels to specified uri - they will be created.
-    pub async fn with_channel<T, O: Future<Output = Result<T, Status>>>(
-        &self,
-        uri: &Uri,
-        f: impl Fn(Channel) -> O,
-    ) -> Result<T, RequestError<Status>> {
-        self.with_channel_timeout(uri, f, None, DEFAULT_RETRIES)
-            .await
-    }
-}
diff --git a/crates/qdrant/lib/api/src/grpc/validate.rs b/crates/qdrant/lib/api/src/grpc/validate.rs
deleted file mode 100644
index d18967a..0000000
--- a/crates/qdrant/lib/api/src/grpc/validate.rs
+++ /dev/null
@@ -1,419 +0,0 @@
-use std::borrow::Cow;
-use std::collections::HashMap;
-
-use serde::Serialize;
-use validator::{Validate, ValidationError, ValidationErrors};
-
-use super::qdrant::{GeoPoint, NamedVectors};
-
-pub trait ValidateExt {
-    fn validate(&self) -> Result<(), ValidationErrors>;
-}
-
-impl Validate for dyn ValidateExt {
-    #[inline]
-    fn validate(&self) -> Result<(), ValidationErrors> {
-        ValidateExt::validate(self)
-    }
-}
-
-impl<V> ValidateExt for ::core::option::Option<V>
-where
-    V: Validate,
-{
-    #[inline]
-    fn validate(&self) -> Result<(), ValidationErrors> {
-        (&self).validate()
-    }
-}
-
-impl<V> ValidateExt for &::core::option::Option<V>
-where
-    V: Validate,
-{
-    #[inline]
-    fn validate(&self) -> Result<(), ValidationErrors> {
-        self.as_ref().map(Validate::validate).unwrap_or(Ok(()))
-    }
-}
-
-impl<V> ValidateExt for Vec<V>
-where
-    V: Validate,
-{
-    #[inline]
-    fn validate(&self) -> Result<(), ValidationErrors> {
-        let errors = self
-            .iter()
-            .filter_map(|v| v.validate().err())
-            .fold(Err(ValidationErrors::new()), |bag, err| {
-                ValidationErrors::merge(bag, "?", Err(err))
-            })
-            .unwrap_err();
-        errors.errors().is_empty().then_some(()).ok_or(errors)
-    }
-}
-
-impl<K, V> ValidateExt for HashMap<K, V>
-where
-    V: Validate,
-{
-    #[inline]
-    fn validate(&self) -> Result<(), ValidationErrors> {
-        let errors = self
-            .values()
-            .filter_map(|v| v.validate().err())
-            .fold(Err(ValidationErrors::new()), |bag, err| {
-                ValidationErrors::merge(bag, "?", Err(err))
-            })
-            .unwrap_err();
-        errors.errors().is_empty().then_some(()).ok_or(errors)
-    }
-}
-
-impl Validate for crate::grpc::qdrant::vectors_config::Config {
-    fn validate(&self) -> Result<(), ValidationErrors> {
-        use crate::grpc::qdrant::vectors_config::Config;
-        match self {
-            Config::Params(params) => params.validate(),
-            Config::ParamsMap(params_map) => params_map.validate(),
-        }
-    }
-}
-
-impl Validate for crate::grpc::qdrant::vectors_config_diff::Config {
-    fn validate(&self) -> Result<(), ValidationErrors> {
-        use crate::grpc::qdrant::vectors_config_diff::Config;
-        match self {
-            Config::Params(params) => params.validate(),
-            Config::ParamsMap(params_map) => params_map.validate(),
-        }
-    }
-}
-
-impl Validate for crate::grpc::qdrant::quantization_config::Quantization {
-    fn validate(&self) -> Result<(), ValidationErrors> {
-        use crate::grpc::qdrant::quantization_config::Quantization;
-        match self {
-            Quantization::Scalar(scalar) => scalar.validate(),
-            Quantization::Product(product) => product.validate(),
-        }
-    }
-}
-
-impl Validate for crate::grpc::qdrant::quantization_config_diff::Quantization {
-    fn validate(&self) -> Result<(), ValidationErrors> {
-        use crate::grpc::qdrant::quantization_config_diff::Quantization;
-        match self {
-            Quantization::Scalar(scalar) => scalar.validate(),
-            Quantization::Product(product) => product.validate(),
-            Quantization::Disabled(_) => Ok(()),
-        }
-    }
-}
-
-/// Validate that `value` is a non-empty string or `None`.
-pub fn validate_not_empty(value: &Option<String>) -> Result<(), ValidationError> {
-    match value {
-        Some(value) if value.is_empty() => Err(ValidationError::new("not_empty")),
-        _ => Ok(()),
-    }
-}
-
-/// Validate the value is in `[1, ]` or `None`.
-pub fn validate_u64_range_min_1(value: &Option<u64>) -> Result<(), ValidationError> {
-    validate_range_generic(value, Some(1), None)
-}
-
-/// Validate the value is in `[1, ]` or `None`.
-pub fn validate_u32_range_min_1(value: &Option<u32>) -> Result<(), ValidationError> {
-    validate_range_generic(value, Some(1), None)
-}
-
-/// Validate the value is in `[100, ]` or `None`.
-pub fn validate_u64_range_min_100(value: &Option<u64>) -> Result<(), ValidationError> {
-    validate_range_generic(value, Some(100), None)
-}
-
-/// Validate the value is in `[1000, ]` or `None`.
-pub fn validate_u64_range_min_1000(value: &Option<u64>) -> Result<(), ValidationError> {
-    validate_range_generic(value, Some(1000), None)
-}
-
-/// Validate the value is in `[4, ]` or `None`.
-pub fn validate_u64_range_min_4(value: &Option<u64>) -> Result<(), ValidationError> {
-    validate_range_generic(value, Some(4), None)
-}
-
-/// Validate the value is in `[4, 10000]` or `None`.
-pub fn validate_u64_range_min_4_max_10000(value: &Option<u64>) -> Result<(), ValidationError> {
-    validate_range_generic(value, Some(4), Some(10_000))
-}
-
-/// Validate the value is in `[0.5, 1.0]` or `None`.
-pub fn validate_f32_range_min_0_5_max_1(value: &Option<f32>) -> Result<(), ValidationError> {
-    validate_range_generic(value, Some(0.5), Some(1.0))
-}
-
-/// Validate the value is in `[0.0, 1.0]` or `None`.
-pub fn validate_f64_range_1(value: &Option<f64>) -> Result<(), ValidationError> {
-    validate_range_generic(value, Some(0.0), Some(1.0))
-}
-
-/// Validate the value is in `[1.0, ]` or `None`.
-pub fn validate_f64_range_min_1(value: &Option<f64>) -> Result<(), ValidationError> {
-    validate_range_generic(value, Some(1.0), None)
-}
-
-/// Validate the value is in `[min, max]` or `None`.
-#[inline]
-pub fn validate_range_generic<N>(
-    value: &Option<N>,
-    min: Option<N>,
-    max: Option<N>,
-) -> Result<(), ValidationError>
-where
-    N: PartialOrd + Serialize,
-{
-    // If value is None we're good
-    let value = match value {
-        Some(value) => value,
-        None => return Ok(()),
-    };
-
-    // If value is within bounds we're good
-    if min.as_ref().map(|min| value >= min).unwrap_or(true)
-        && max.as_ref().map(|max| value <= max).unwrap_or(true)
-    {
-        return Ok(());
-    }
-
-    let mut err = ValidationError::new("range");
-    if let Some(min) = min {
-        err.add_param(Cow::from("min"), &min);
-    }
-    if let Some(max) = max {
-        err.add_param(Cow::from("max"), &max);
-    }
-    Err(err)
-}
-
-/// Validate the list of named vectors is not empty.
-pub fn validate_named_vectors_not_empty(
-    value: &Option<NamedVectors>,
-) -> Result<(), ValidationError> {
-    // If length is non-zero, we're good
-    match value {
-        Some(vectors) if !vectors.vectors.is_empty() => return Ok(()),
-        Some(_) | None => {}
-    }
-
-    let mut err = ValidationError::new("length");
-    err.add_param(Cow::from("min"), &1);
-    Err(err)
-}
-
-/// Validate the collection name contains no illegal characters.
-pub fn validate_collection_name(value: &str) -> Result<(), ValidationError> {
-    const INVALID_CHARS: [char; 11] =
-        ['<', '>', ':', '"', '/', '\\', '|', '?', '*', '\0', '\u{1F}'];
-
-    match INVALID_CHARS.into_iter().find(|c| value.contains(*c)) {
-        Some(c) => {
-            let mut err = ValidationError::new("does_not_contain");
-            err.add_param(Cow::from("pattern"), &c);
-            err.message
-                .replace(format!("collection name cannot contain \"{c}\" char").into());
-            Err(err)
-        }
-        None => Ok(()),
-    }
-}
-
-/// Validate a polygon has at least 4 points and is closed.
-pub fn validate_geo_polygon(points: &Vec<GeoPoint>) -> Result<(), ValidationError> {
-    let min_length = 4;
-    if points.len() < min_length {
-        let mut err = ValidationError::new("min_polygon_length");
-        err.add_param(Cow::from("length"), &points.len());
-        err.add_param(Cow::from("min_length"), &min_length);
-        return Err(err);
-    }
-
-    let first_point = &points[0];
-    let last_point = &points[points.len() - 1];
-    if first_point != last_point {
-        return Err(ValidationError::new("closed_polygon"));
-    }
-
-    Ok(())
-}
-
-#[cfg(test)]
-mod tests {
-    use validator::Validate;
-
-    use crate::grpc::qdrant::{
-        CreateCollection, CreateFieldIndexCollection, GeoPoint, GeoPolygon, SearchPoints,
-        UpdateCollection,
-    };
-
-    #[test]
-    fn test_good_request() {
-        let bad_request = CreateCollection {
-            collection_name: "test_collection".into(),
-            timeout: Some(10),
-            ..Default::default()
-        };
-        assert!(
-            bad_request.validate().is_ok(),
-            "good collection request should not error on validation"
-        );
-
-        // Collection name validation must not be strict on non-creation
-        let bad_request = UpdateCollection {
-            collection_name: "no/path".into(),
-            ..Default::default()
-        };
-        assert!(
-            bad_request.validate().is_ok(),
-            "good collection request should not error on validation"
-        );
-
-        // Collection name validation must not be strict on non-creation
-        let bad_request = UpdateCollection {
-            collection_name: "no*path".into(),
-            ..Default::default()
-        };
-        assert!(
-            bad_request.validate().is_ok(),
-            "good collection request should not error on validation"
-        );
-    }
-
-    #[test]
-    fn test_bad_collection_request() {
-        let bad_request = CreateCollection {
-            collection_name: "".into(),
-            timeout: Some(0),
-            ..Default::default()
-        };
-        assert!(
-            bad_request.validate().is_err(),
-            "bad collection request should error on validation"
-        );
-
-        // Collection name validation must be strict on creation
-        let bad_request = CreateCollection {
-            collection_name: "no/path".into(),
-            ..Default::default()
-        };
-        assert!(
-            bad_request.validate().is_err(),
-            "bad collection request should error on validation"
-        );
-
-        // Collection name validation must be strict on creation
-        let bad_request = CreateCollection {
-            collection_name: "no*path".into(),
-            ..Default::default()
-        };
-        assert!(
-            bad_request.validate().is_err(),
-            "bad collection request should error on validation"
-        );
-    }
-
-    #[test]
-    fn test_bad_index_request() {
-        let bad_request = CreateFieldIndexCollection {
-            collection_name: "".into(),
-            field_name: "".into(),
-            ..Default::default()
-        };
-        assert!(
-            bad_request.validate().is_err(),
-            "bad index request should error on validation"
-        );
-    }
-
-    #[test]
-    fn test_bad_search_request() {
-        let bad_request = SearchPoints {
-            collection_name: "".into(),
-            limit: 0,
-            vector_name: Some("".into()),
-            ..Default::default()
-        };
-        assert!(
-            bad_request.validate().is_err(),
-            "bad search request should error on validation"
-        );
-
-        let bad_request = SearchPoints {
-            limit: 0,
-            ..Default::default()
-        };
-        assert!(
-            bad_request.validate().is_err(),
-            "bad search request should error on validation"
-        );
-
-        let bad_request = SearchPoints {
-            vector_name: Some("".into()),
-            ..Default::default()
-        };
-        assert!(
-            bad_request.validate().is_err(),
-            "bad search request should error on validation"
-        );
-    }
-
-    #[test]
-    fn test_geo_polygon() {
-        let bad_polygon = GeoPolygon { points: vec![] };
-        assert!(
-            bad_polygon.validate().is_err(),
-            "bad polygon should error on validation"
-        );
-
-        let bad_polygon = GeoPolygon {
-            points: vec![
-                GeoPoint { lat: 1., lon: 1. },
-                GeoPoint { lat: 2., lon: 2. },
-                GeoPoint { lat: 3., lon: 3. },
-            ],
-        };
-        assert!(
-            bad_polygon.validate().is_err(),
-            "bad polygon should error on validation"
-        );
-
-        let bad_polygon = GeoPolygon {
-            points: vec![
-                GeoPoint { lat: 1., lon: 1. },
-                GeoPoint { lat: 2., lon: 2. },
-                GeoPoint { lat: 3., lon: 3. },
-                GeoPoint { lat: 4., lon: 4. },
-            ],
-        };
-
-        assert!(
-            bad_polygon.validate().is_err(),
-            "bad polygon should error on validation"
-        );
-
-        let good_polygon = GeoPolygon {
-            points: vec![
-                GeoPoint { lat: 1., lon: 1. },
-                GeoPoint { lat: 2., lon: 2. },
-                GeoPoint { lat: 3., lon: 3. },
-                GeoPoint { lat: 1., lon: 1. },
-            ],
-        };
-        assert!(
-            good_polygon.validate().is_ok(),
-            "good polygon should not error on validation"
-        );
-    }
-}
diff --git a/crates/qdrant/lib/api/src/lib.rs b/crates/qdrant/lib/api/src/lib.rs
deleted file mode 100644
index 773d491..0000000
--- a/crates/qdrant/lib/api/src/lib.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub mod grpc;
diff --git a/crates/qdrant/lib/collection/Cargo.toml b/crates/qdrant/lib/collection/Cargo.toml
deleted file mode 100644
index 430a15d..0000000
--- a/crates/qdrant/lib/collection/Cargo.toml
+++ /dev/null
@@ -1,68 +0,0 @@
-[package]
-name = "collection"
-version = "0.4.2"
-authors = [
-    "Andrey Vasnetsov <vasnetsov93@gmail.com>",
-    "Qdrant Team <info@qdrant.tech>",
-]
-license = "Apache-2.0"
-edition = "2021"
-
-[dev-dependencies]
-tempfile = "3.7.1"
-criterion = "0.5"
-rstest = "0.18.1"
-
-[target.'cfg(not(target_os = "windows"))'.dev-dependencies]
-pprof = { version = "0.12", features = ["flamegraph", "prost-codec"] }
-
-[dependencies]
-
-parking_lot = "0.12"
-
-rand = "0.8.5"
-thiserror = "1.0"
-serde = { version = "~1.0", features = ["derive"] }
-serde_json = { version = "~1.0", features = ["std"] }
-serde_cbor = "0.11.2"
-rmp-serde = "~1.1"
-wal = { git = "https://github.com/qdrant/wal.git", rev = "a32f6a38acf7ffd761df83b0790eaefeb107cd60"}
-ordered-float = "3.7"
-hashring = "0.3.2"
-tinyvec = { version = "1.6.0", features = ["alloc"] }
-
-tokio = {version = "~1.29", features = ["full"]}
-futures = "0.3.28"
-atomicwrites = "0.4.1"
-log = "0.4"
-env_logger = "0.10.0"
-merge = "0.1.0"
-async-trait = "0.1.72"
-arc-swap = "1.6.0"
-tonic = { version = "0.9.2", features = ["gzip", "tls"] }
-tower = "0.4.13"
-uuid = { version = "1.4", features = ["v4", "serde"] }
-url = { version = "2", features = ["serde"] }
-validator = { version = "0.16", features = ["derive"] }
-actix-web-validator = "5.0.1"
-
-common = {path = "../common"}
-segment = {path = "../segment"}
-api = {path = "../api"}
-
-itertools = "0.11"
-indicatif = "0.17.6"
-chrono = { version = "~0.4", features = ["serde"] }
-schemars = { version = "0.8.12", features = ["uuid1", "preserve_order", "chrono", "url"] }
-num_cpus = "1.16.0"
-tar = "0.4.40"
-fs_extra = "1.3.0"
-semver = "1.0.18"
-
-[[bench]]
-name = "hash_ring_bench"
-harness = false
-
-[[bench]]
-name = "batch_search_bench"
-harness = false
diff --git a/crates/qdrant/lib/collection/README.md b/crates/qdrant/lib/collection/README.md
deleted file mode 100644
index 1d1be13..0000000
--- a/crates/qdrant/lib/collection/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Collection
-
-Crate, which implements all functions required for operations with a single collection of points.
-Points within a collection should share the same payload schema and have same vector size.
-So that search requests could be performed over all points of a single collection.
-
-## Structure
-
-![Collection structure](./docs/collection-struct.mmd.png)
-
-## Update process
-
-![Update process](./docs/update-sequence.mmd.png)
-
diff --git a/crates/qdrant/lib/collection/benches/batch_search_bench.rs b/crates/qdrant/lib/collection/benches/batch_search_bench.rs
deleted file mode 100644
index 748c3b8..0000000
--- a/crates/qdrant/lib/collection/benches/batch_search_bench.rs
+++ /dev/null
@@ -1,202 +0,0 @@
-#[cfg(not(target_os = "windows"))]
-mod prof;
-
-use std::num::{NonZeroU32, NonZeroU64};
-use std::sync::Arc;
-
-use collection::config::{CollectionConfig, CollectionParams, WalConfig};
-use collection::operations::point_ops::{PointInsertOperations, PointOperations, PointStruct};
-use collection::operations::types::{SearchRequest, SearchRequestBatch, VectorParams};
-use collection::operations::CollectionUpdateOperations;
-use collection::optimizers_builder::OptimizersConfig;
-use collection::shards::local_shard::LocalShard;
-use collection::shards::shard_trait::ShardOperation;
-use criterion::{criterion_group, criterion_main, Criterion};
-use rand::thread_rng;
-use segment::data_types::vectors::only_default_vector;
-use segment::fixtures::payload_fixtures::random_vector;
-use segment::types::{Condition, Distance, FieldCondition, Filter, Payload, Range};
-use serde_json::Map;
-use tempfile::Builder;
-use tokio::runtime::Runtime;
-use tokio::sync::RwLock;
-
-fn create_rnd_batch() -> CollectionUpdateOperations {
-    let mut rng = thread_rng();
-    let num_points = 2000;
-    let dim = 100;
-    let mut points = Vec::with_capacity(num_points);
-    for i in 0..num_points {
-        let mut payload_map = Map::new();
-        payload_map.insert("a".to_string(), (i % 5).into());
-        let vector = random_vector(&mut rng, dim);
-        let vectors = only_default_vector(&vector);
-        let point = PointStruct {
-            id: (i as u64).into(),
-            vector: vectors.into(),
-            payload: Some(Payload(payload_map)),
-        };
-        points.push(point);
-    }
-    CollectionUpdateOperations::PointOperation(PointOperations::UpsertPoints(
-        PointInsertOperations::PointsList(points),
-    ))
-}
-
-fn batch_search_bench(c: &mut Criterion) {
-    let storage_dir = Builder::new().prefix("storage").tempdir().unwrap();
-
-    let runtime = Runtime::new().unwrap();
-    let search_runtime = Runtime::new().unwrap();
-    let search_runtime_handle = search_runtime.handle();
-    let handle = runtime.handle().clone();
-
-    let wal_config = WalConfig {
-        wal_capacity_mb: 1,
-        wal_segments_ahead: 0,
-    };
-
-    let collection_params = CollectionParams {
-        vectors: VectorParams {
-            size: NonZeroU64::new(100).unwrap(),
-            distance: Distance::Dot,
-            hnsw_config: None,
-            quantization_config: None,
-            on_disk: None,
-        }
-        .into(),
-        shard_number: NonZeroU32::new(1).expect("Shard number can not be zero"),
-        replication_factor: NonZeroU32::new(1).unwrap(),
-        write_consistency_factor: NonZeroU32::new(1).unwrap(),
-        on_disk_payload: false,
-    };
-
-    let collection_config = CollectionConfig {
-        params: collection_params,
-        optimizer_config: OptimizersConfig {
-            deleted_threshold: 0.9,
-            vacuum_min_vector_number: 1000,
-            default_segment_number: 2,
-            max_segment_size: Some(100_000),
-            memmap_threshold: Some(100_000),
-            indexing_threshold: Some(50_000),
-            flush_interval_sec: 30,
-            max_optimization_threads: 2,
-        },
-        wal_config,
-        hnsw_config: Default::default(),
-        quantization_config: Default::default(),
-    };
-
-    let shared_config = Arc::new(RwLock::new(collection_config));
-
-    let shard = handle
-        .block_on(LocalShard::build_local(
-            0,
-            "test_collection".to_string(),
-            storage_dir.path(),
-            shared_config,
-            Default::default(),
-            handle.clone(),
-        ))
-        .unwrap();
-
-    let rnd_batch = create_rnd_batch();
-
-    handle.block_on(shard.update(rnd_batch, true)).unwrap();
-
-    let mut group = c.benchmark_group("batch-search-bench");
-
-    let filters = vec![
-        None,
-        Some(Filter::new_must(Condition::Field(
-            FieldCondition::new_match("a".to_string(), 3.into()),
-        ))),
-        Some(Filter::new_must(Condition::Field(
-            FieldCondition::new_range(
-                "a".to_string(),
-                Range {
-                    lt: None,
-                    gt: Some(-1.),
-                    gte: None,
-                    lte: Some(100.0),
-                },
-            ),
-        ))),
-    ];
-
-    let batch_size = 100;
-
-    for (fid, filter) in filters.into_iter().enumerate() {
-        group.bench_function(format!("search-{fid}"), |b| {
-            b.iter(|| {
-                runtime.block_on(async {
-                    let mut rng = thread_rng();
-                    for _i in 0..batch_size {
-                        let query = random_vector(&mut rng, 100);
-                        let search_query = SearchRequest {
-                            vector: query.into(),
-                            filter: filter.clone(),
-                            params: None,
-                            limit: 10,
-                            offset: 0,
-                            with_payload: None,
-                            with_vector: None,
-                            score_threshold: None,
-                        };
-                        let result = shard
-                            .search(
-                                Arc::new(SearchRequestBatch {
-                                    searches: vec![search_query],
-                                }),
-                                search_runtime_handle,
-                            )
-                            .await
-                            .unwrap();
-                        assert!(!result.is_empty());
-                    }
-                });
-            })
-        });
-
-        group.bench_function(format!("search-batch-{fid}"), |b| {
-            b.iter(|| {
-                runtime.block_on(async {
-                    let mut rng = thread_rng();
-                    let mut searches = Vec::with_capacity(batch_size);
-                    for _i in 0..batch_size {
-                        let query = random_vector(&mut rng, 100);
-                        let search_query = SearchRequest {
-                            vector: query.into(),
-                            filter: filter.clone(),
-                            params: None,
-                            limit: 10,
-                            offset: 0,
-                            with_payload: None,
-                            with_vector: None,
-                            score_threshold: None,
-                        };
-                        searches.push(search_query);
-                    }
-
-                    let search_query = SearchRequestBatch { searches };
-                    let result = shard
-                        .search(Arc::new(search_query), search_runtime_handle)
-                        .await
-                        .unwrap();
-                    assert!(!result.is_empty());
-                });
-            })
-        });
-    }
-
-    group.finish();
-}
-
-criterion_group! {
-    name = benches;
-    config = Criterion::default();
-    targets = batch_search_bench,
-}
-
-criterion_main!(benches);
diff --git a/crates/qdrant/lib/collection/benches/hash_ring_bench.rs b/crates/qdrant/lib/collection/benches/hash_ring_bench.rs
deleted file mode 100644
index 1fb95f6..0000000
--- a/crates/qdrant/lib/collection/benches/hash_ring_bench.rs
+++ /dev/null
@@ -1,43 +0,0 @@
-#[cfg(not(target_os = "windows"))]
-mod prof;
-
-use collection::hash_ring::HashRing;
-use criterion::{criterion_group, criterion_main, Criterion};
-use rand::Rng;
-
-fn hash_ring_bench(c: &mut Criterion) {
-    let mut group = c.benchmark_group("hash-ring-bench");
-
-    let mut ring_raw = HashRing::raw();
-    let mut ring_fair = HashRing::fair(100);
-
-    // add 10 shards to ring
-    for i in 0..10 {
-        ring_raw.add(i);
-        ring_fair.add(i);
-    }
-
-    let mut rnd = rand::thread_rng();
-
-    group.bench_function("hash-ring-fair", |b| {
-        b.iter(|| {
-            let point = rnd.gen_range(0..100000);
-            let _shard = ring_fair.get(&point);
-        })
-    });
-
-    group.bench_function("hash-ring-raw", |b| {
-        b.iter(|| {
-            let point = rnd.gen_range(0..100000);
-            let _shard = ring_raw.get(&point);
-        })
-    });
-}
-
-criterion_group! {
-    name = benches;
-    config = Criterion::default();
-    targets = hash_ring_bench,
-}
-
-criterion_main!(benches);
diff --git a/crates/qdrant/lib/collection/benches/prof.rs b/crates/qdrant/lib/collection/benches/prof.rs
deleted file mode 100644
index eeb8ab6..0000000
--- a/crates/qdrant/lib/collection/benches/prof.rs
+++ /dev/null
@@ -1,89 +0,0 @@
-use std::fs::File;
-use std::io::Write;
-use std::os::raw::c_int;
-use std::path::Path;
-
-use criterion::profiler::Profiler;
-use pprof::flamegraph::TextTruncateDirection;
-use pprof::protos::Message;
-use pprof::ProfilerGuard;
-
-/// Small custom profiler that can be used with Criterion to create a flamegraph for benchmarks.
-/// Also see [the Criterion documentation on this][custom-profiler].
-///
-/// ## Example on how to enable the custom profiler:
-///
-/// ```
-/// mod perf;
-/// use perf::FlamegraphProfiler;
-///
-/// fn fibonacci_profiled(criterion: &mut Criterion) {
-///     // Use the criterion struct as normal here.
-/// }
-///
-/// fn custom() -> Criterion {
-///     Criterion::default().with_profiler(FlamegraphProfiler::new())
-/// }
-///
-/// criterion_group! {
-///     name = benches;
-///     config = custom();
-///     targets = fibonacci_profiled
-/// }
-/// ```
-///
-/// The neat thing about this is that it will sample _only_ the benchmark, and not other stuff like
-/// the setup process.
-///
-/// Further, it will only kick in if `--profile-time <time>` is passed to the benchmark binary.
-/// A flamegraph will be created for each individual benchmark in its report directory under
-/// `profile/flamegraph.svg`.
-///
-/// [custom-profiler]: https://bheisler.github.io/criterion.rs/book/user_guide/profiling.html#implementing-in-process-profiling-hooks
-pub struct FlamegraphProfiler<'a> {
-    frequency: c_int,
-    active_profiler: Option<ProfilerGuard<'a>>,
-}
-
-impl<'a> FlamegraphProfiler<'a> {
-    #[allow(dead_code)]
-    pub fn new(frequency: c_int) -> Self {
-        FlamegraphProfiler {
-            frequency,
-            active_profiler: None,
-        }
-    }
-}
-
-impl<'a> Profiler for FlamegraphProfiler<'a> {
-    fn start_profiling(&mut self, _benchmark_id: &str, _benchmark_dir: &Path) {
-        self.active_profiler = Some(ProfilerGuard::new(self.frequency).unwrap());
-    }
-
-    fn stop_profiling(&mut self, _benchmark_id: &str, benchmark_dir: &Path) {
-        std::fs::create_dir_all(benchmark_dir).unwrap();
-        let pprof_path = benchmark_dir.join("profile.pb");
-        let flamegraph_path = benchmark_dir.join("flamegraph.svg");
-        eprintln!("\nflamegraph_path = {flamegraph_path:#?}");
-        let flamegraph_file = File::create(&flamegraph_path)
-            .expect("File system error while creating flamegraph.svg");
-        let mut options = pprof::flamegraph::Options::default();
-        options.hash = true;
-        options.image_width = Some(2500);
-        options.text_truncate_direction = TextTruncateDirection::Left;
-        options.font_size /= 3;
-        if let Some(profiler) = self.active_profiler.take() {
-            let report = profiler.report().build().unwrap();
-
-            let mut file = File::create(pprof_path).unwrap();
-            let profile = report.pprof().unwrap();
-            let mut content = Vec::new();
-            profile.encode(&mut content).unwrap();
-            file.write_all(&content).unwrap();
-
-            report
-                .flamegraph_with_options(flamegraph_file, &mut options)
-                .expect("Error writing flamegraph");
-        }
-    }
-}
diff --git a/crates/qdrant/lib/collection/docs/collection-struct.mmd b/crates/qdrant/lib/collection/docs/collection-struct.mmd
deleted file mode 100644
index 78d6997..0000000
--- a/crates/qdrant/lib/collection/docs/collection-struct.mmd
+++ /dev/null
@@ -1,24 +0,0 @@
-flowchart LR
-	collection --o segment1
-	collection --o segment2
-	collection --o segment3-proxy
-	collection --o WAL
-	collection --o Updaters>Updater Process]
-
-	subgraph segments
-		subgraph segment1
-			Vectors1[Vector-store]
-			Payload1[Payload]
-		end
-		subgraph segment2
-			Payload -.- Payload-index
-			Vector-store -.- Vector-index
-			ID-mapping
-			Version-store
-		end
-		subgraph segment3-proxy
-			removed-list
-			old-segment -.->|copy| copy-on-write-segment
-			old-segment -->|rebuild| optimized-segment
-		end
-	end
\ No newline at end of file
diff --git a/crates/qdrant/lib/collection/docs/collection-struct.mmd.png b/crates/qdrant/lib/collection/docs/collection-struct.mmd.png
deleted file mode 100644
index b75eb45..0000000
Binary files a/crates/qdrant/lib/collection/docs/collection-struct.mmd.png and /dev/null differ
diff --git a/crates/qdrant/lib/collection/docs/update-sequence.mmd b/crates/qdrant/lib/collection/docs/update-sequence.mmd
deleted file mode 100644
index efbd6a9..0000000
--- a/crates/qdrant/lib/collection/docs/update-sequence.mmd
+++ /dev/null
@@ -1,20 +0,0 @@
-sequenceDiagram
-	User->>Collection: Request
-	activate Collection
-	loop
-		Collection->>Collection: Write request to WAL
-	end
-	Collection->>Updater: Update Request
-	deactivate Collection
-	activate Updater
-	Updater-->>Optimizer: Notify changed
-	Updater-->>Collection: Notify done
-	deactivate Updater
-	activate Collection
-	Collection->>User: Response
-	deactivate Collection
-	activate Optimizer
-	opt
-		Optimizer->>Optimizer: optimize
-	end
-	deactivate Optimizer
diff --git a/crates/qdrant/lib/collection/docs/update-sequence.mmd.png b/crates/qdrant/lib/collection/docs/update-sequence.mmd.png
deleted file mode 100644
index 14c8ec0..0000000
Binary files a/crates/qdrant/lib/collection/docs/update-sequence.mmd.png and /dev/null differ
diff --git a/crates/qdrant/lib/collection/src/collection.rs b/crates/qdrant/lib/collection/src/collection.rs
deleted file mode 100644
index f5299f4..0000000
--- a/crates/qdrant/lib/collection/src/collection.rs
+++ /dev/null
@@ -1,1778 +0,0 @@
-use std::cmp::max;
-use std::collections::hash_map::Entry;
-use std::collections::{HashMap, HashSet};
-use std::future::Future;
-use std::ops::Deref;
-use std::path::{Path, PathBuf};
-use std::sync::Arc;
-use std::time::Duration;
-
-use futures::future::{join_all, try_join_all};
-use itertools::Itertools;
-use segment::common::version::StorageVersion;
-use segment::spaces::tools::{peek_top_largest_iterable, peek_top_smallest_iterable};
-use segment::types::{
-    ExtendedPointId, Order, QuantizationConfig, ScoredPoint, WithPayload, WithPayloadInterface,
-    WithVector,
-};
-use semver::Version;
-use tar::Builder as TarBuilder;
-use tokio::fs::{copy, create_dir_all, remove_dir_all, remove_file, rename};
-use tokio::runtime::Handle;
-use tokio::sync::{Mutex, RwLock, RwLockWriteGuard};
-use validator::Validate;
-
-use crate::collection_state::{ShardInfo, State};
-use crate::common::is_ready::IsReady;
-use crate::config::CollectionConfig;
-use crate::hash_ring::HashRing;
-use crate::operations::config_diff::{
-    CollectionParamsDiff, DiffConfig, HnswConfigDiff, OptimizersConfigDiff, QuantizationConfigDiff,
-};
-use crate::operations::consistency_params::ReadConsistency;
-use crate::operations::point_ops::WriteOrdering;
-use crate::operations::shared_storage_config::SharedStorageConfig;
-use crate::operations::snapshot_ops::{
-    get_snapshot_description, list_snapshots_in_directory, SnapshotDescription,
-};
-use crate::operations::types::{
-    CollectionClusterInfo, CollectionError, CollectionInfo, CollectionResult, CountRequest,
-    CountResult, LocalShardInfo, NodeType, PointRequest, Record, RemoteShardInfo, ScrollRequest,
-    ScrollResult, SearchRequest, SearchRequestBatch, UpdateResult, VectorsConfigDiff,
-};
-use crate::operations::CollectionUpdateOperations;
-use crate::optimizers_builder::OptimizersConfig;
-use crate::shards::channel_service::ChannelService;
-use crate::shards::collection_shard_distribution::CollectionShardDistribution;
-use crate::shards::local_shard::LocalShard;
-use crate::shards::remote_shard::RemoteShard;
-use crate::shards::replica_set::ReplicaState::{Active, Dead, Initializing, Listener};
-use crate::shards::replica_set::{
-    Change, ChangePeerState, ReplicaState, ShardReplicaSet as ReplicaSetShard,
-}; // TODO rename ReplicaShard to ReplicaSetShard
-use crate::shards::shard::{PeerId, ShardId};
-use crate::shards::shard_config::{self, ShardConfig};
-use crate::shards::shard_holder::{LockedShardHolder, ShardHolder};
-use crate::shards::shard_versioning::versioned_shard_path;
-use crate::shards::transfer::shard_transfer::{
-    change_remote_shard_route, check_transfer_conflicts_strict, finalize_partial_shard,
-    handle_transferred_shard_proxy, revert_proxy_shard_to_local, spawn_transfer_task,
-    ShardTransfer, ShardTransferKey,
-};
-use crate::shards::transfer::transfer_tasks_pool::{TaskResult, TransferTasksPool};
-use crate::shards::{replica_set, CollectionId, HASH_RING_SHARD_SCALE};
-use crate::telemetry::CollectionTelemetry;
-
-pub type VectorLookupFuture<'a> = Box<dyn Future<Output = CollectionResult<Vec<Record>>> + 'a>;
-pub type OnTransferFailure = Arc<dyn Fn(ShardTransfer, CollectionId, &str) + Send + Sync>;
-pub type OnTransferSuccess = Arc<dyn Fn(ShardTransfer, CollectionId) + Send + Sync>;
-pub type RequestShardTransfer = Arc<dyn Fn(ShardTransfer) + Send + Sync>;
-
-struct CollectionVersion;
-
-impl StorageVersion for CollectionVersion {
-    fn current() -> String {
-        env!("CARGO_PKG_VERSION").to_string()
-    }
-}
-
-/// Collection's data is split into several shards.
-pub struct Collection {
-    pub(crate) id: CollectionId,
-    pub(crate) shards_holder: Arc<LockedShardHolder>,
-    pub(crate) collection_config: Arc<RwLock<CollectionConfig>>,
-    pub(crate) shared_storage_config: Arc<SharedStorageConfig>,
-    this_peer_id: PeerId,
-    path: PathBuf,
-    snapshots_path: PathBuf,
-    channel_service: ChannelService,
-    transfer_tasks: Mutex<TransferTasksPool>,
-    request_shard_transfer_cb: RequestShardTransfer,
-    #[allow(dead_code)] //Might be useful in case of repartition implementation
-    notify_peer_failure_cb: ChangePeerState,
-    init_time: Duration,
-    // One-way boolean flag that is set to true when the collection is fully initialized
-    // i.e. all shards are activated for the first time.
-    is_initialized: Arc<IsReady>,
-    // Lock to temporary block collection update operations while the collection is being migrated.
-    // Lock is acquired for read on update operation and can be acquired for write externally,
-    // which will block all update operations until the lock is released.
-    updates_lock: RwLock<()>,
-    // Update runtime handle.
-    update_runtime: Handle,
-}
-
-impl Collection {
-    pub fn name(&self) -> String {
-        self.id.clone()
-    }
-
-    #[allow(clippy::too_many_arguments)]
-    pub async fn new(
-        name: CollectionId,
-        this_peer_id: PeerId,
-        path: &Path,
-        snapshots_path: &Path,
-        collection_config: &CollectionConfig,
-        shared_storage_config: Arc<SharedStorageConfig>,
-        shard_distribution: CollectionShardDistribution,
-        channel_service: ChannelService,
-        on_replica_failure: ChangePeerState,
-        request_shard_transfer: RequestShardTransfer,
-        search_runtime: Option<Handle>,
-        update_runtime: Option<Handle>,
-    ) -> Result<Self, CollectionError> {
-        let start_time = std::time::Instant::now();
-
-        let mut shard_holder = ShardHolder::new(path, HashRing::fair(HASH_RING_SHARD_SCALE))?;
-
-        let shared_collection_config = Arc::new(RwLock::new(collection_config.clone()));
-        for (shard_id, mut peers) in shard_distribution.shards {
-            let is_local = peers.remove(&this_peer_id);
-
-            let replica_set = ReplicaSetShard::build(
-                shard_id,
-                name.clone(),
-                this_peer_id,
-                is_local,
-                peers,
-                on_replica_failure.clone(),
-                path,
-                shared_collection_config.clone(),
-                shared_storage_config.clone(),
-                channel_service.clone(),
-                update_runtime.clone().unwrap_or_else(Handle::current),
-                search_runtime.clone().unwrap_or_else(Handle::current),
-            )
-            .await?;
-
-            shard_holder.add_shard(shard_id, replica_set);
-        }
-
-        let locked_shard_holder = Arc::new(LockedShardHolder::new(shard_holder));
-
-        // Once the config is persisted - the collection is considered to be successfully created.
-        CollectionVersion::save(path)?;
-        collection_config.save(path)?;
-
-        Ok(Self {
-            id: name.clone(),
-            shards_holder: locked_shard_holder,
-            collection_config: shared_collection_config,
-            shared_storage_config,
-            this_peer_id,
-            path: path.to_owned(),
-            snapshots_path: snapshots_path.to_owned(),
-            channel_service,
-            transfer_tasks: Mutex::new(TransferTasksPool::new(name.clone())),
-            request_shard_transfer_cb: request_shard_transfer.clone(),
-            notify_peer_failure_cb: on_replica_failure.clone(),
-            init_time: start_time.elapsed(),
-            is_initialized: Arc::new(Default::default()),
-            updates_lock: RwLock::new(()),
-            update_runtime: update_runtime.unwrap_or_else(Handle::current),
-        })
-    }
-
-    /// Check if stored version have consequent version.
-    /// If major version is different, then it is not compatible.
-    /// If the difference in consecutive versions is greater than 1 in patch,
-    /// then the collection is not compatible with the current version.
-    ///
-    /// Example:
-    ///   0.4.0 -> 0.4.1 = true
-    ///   0.4.0 -> 0.4.2 = false
-    ///   0.4.0 -> 0.5.0 = false
-    ///   0.4.0 -> 0.5.1 = false
-    pub fn can_upgrade_storage(stored: &Version, app: &Version) -> bool {
-        if stored.major != app.major {
-            return false;
-        }
-        if stored.minor != app.minor {
-            return false;
-        }
-        if stored.patch + 1 < app.patch {
-            return false;
-        }
-        true
-    }
-
-    #[allow(clippy::too_many_arguments)]
-    pub async fn load(
-        collection_id: CollectionId,
-        this_peer_id: PeerId,
-        path: &Path,
-        snapshots_path: &Path,
-        shared_storage_config: Arc<SharedStorageConfig>,
-        channel_service: ChannelService,
-        on_replica_failure: replica_set::ChangePeerState,
-        request_shard_transfer: RequestShardTransfer,
-        search_runtime: Option<Handle>,
-        update_runtime: Option<Handle>,
-    ) -> Self {
-        let start_time = std::time::Instant::now();
-        let stored_version = CollectionVersion::load(path)
-            .expect("Can't read collection version")
-            .parse()
-            .expect("Failed to parse stored collection version as semver");
-
-        let app_version: Version = CollectionVersion::current()
-            .parse()
-            .expect("Failed to parse current collection version as semver");
-
-        if stored_version > app_version {
-            panic!("Collection version is greater than application version");
-        }
-
-        if stored_version != app_version {
-            if Self::can_upgrade_storage(&stored_version, &app_version) {
-                log::info!("Migrating collection {stored_version} -> {app_version}");
-                CollectionVersion::save(path)
-                    .unwrap_or_else(|err| panic!("Can't save collection version {err}"));
-            } else {
-                log::error!("Cannot upgrade version {stored_version} to {app_version}.");
-                panic!("Cannot upgrade version {stored_version} to {app_version}. Try to use older version of Qdrant first.");
-            }
-        }
-
-        let collection_config = CollectionConfig::load(path).unwrap_or_else(|err| {
-            panic!(
-                "Can't read collection config due to {}\nat {}",
-                err,
-                path.to_str().unwrap(),
-            )
-        });
-        collection_config.validate_and_warn();
-
-        let ring = HashRing::fair(HASH_RING_SHARD_SCALE);
-        let mut shard_holder = ShardHolder::new(path, ring).expect("Can not create shard holder");
-
-        let shared_collection_config = Arc::new(RwLock::new(collection_config.clone()));
-
-        shard_holder
-            .load_shards(
-                path,
-                &collection_id,
-                shared_collection_config.clone(),
-                shared_storage_config.clone(),
-                channel_service.clone(),
-                on_replica_failure.clone(),
-                this_peer_id,
-                update_runtime.clone().unwrap_or_else(Handle::current),
-                search_runtime.clone().unwrap_or_else(Handle::current),
-            )
-            .await;
-
-        let locked_shard_holder = Arc::new(LockedShardHolder::new(shard_holder));
-
-        Self {
-            id: collection_id.clone(),
-            shards_holder: locked_shard_holder,
-            collection_config: shared_collection_config,
-            shared_storage_config,
-            this_peer_id,
-            path: path.to_owned(),
-            snapshots_path: snapshots_path.to_owned(),
-            channel_service,
-            transfer_tasks: Mutex::new(TransferTasksPool::new(collection_id.clone())),
-            request_shard_transfer_cb: request_shard_transfer.clone(),
-            notify_peer_failure_cb: on_replica_failure,
-            init_time: start_time.elapsed(),
-            is_initialized: Arc::new(Default::default()),
-            updates_lock: RwLock::new(()),
-            update_runtime: update_runtime.unwrap_or_else(Handle::current),
-        }
-    }
-
-    /// Return a list of local shards, present on this peer
-    pub async fn get_local_shards(&self) -> Vec<ShardId> {
-        let shards_holder = self.shards_holder.read().await;
-        let mut res = vec![];
-        for (shard_id, replica_set) in shards_holder.get_shards() {
-            if replica_set.has_local_shard().await {
-                res.push(*shard_id);
-            }
-        }
-        res
-    }
-
-    pub async fn is_all_active(&self) -> bool {
-        let shards_holder = self.shards_holder.read().await;
-        for (_, replica_set) in shards_holder.get_shards() {
-            if !replica_set
-                .peers()
-                .into_iter()
-                .all(|(_, state)| state == ReplicaState::Active)
-            {
-                return false;
-            }
-        }
-        true
-    }
-
-    pub async fn set_shard_replica_state(
-        &self,
-        shard_id: ShardId,
-        peer_id: PeerId,
-        state: ReplicaState,
-        from_state: Option<ReplicaState>,
-    ) -> CollectionResult<()> {
-        let shard_holder = self.shards_holder.read().await;
-        let replica_set =
-            shard_holder
-                .get_shard(&shard_id)
-                .ok_or_else(|| CollectionError::NotFound {
-                    what: format!("Shard {shard_id}"),
-                })?;
-
-        log::debug!(
-            "Changing shard {}:{shard_id} replica state from {:?} to {state:?}",
-            self.id,
-            replica_set.peer_state(&peer_id),
-        );
-
-        // Validation:
-        // 0. Check that `from_state` matches current state
-
-        if from_state.is_some() {
-            let current_state = replica_set.peer_state(&peer_id);
-            if current_state != from_state {
-                return Err(CollectionError::bad_input(format!(
-                    "Replica {peer_id} of shard {shard_id} has state {current_state:?}, but expected {from_state:?}"
-                )));
-            }
-        }
-
-        // 1. Do not deactivate the last active replica
-
-        if state != ReplicaState::Active {
-            let active_replicas: HashSet<_> = replica_set
-                .peers()
-                .into_iter()
-                .filter_map(|(peer, state)| {
-                    if state == ReplicaState::Active {
-                        Some(peer)
-                    } else {
-                        None
-                    }
-                })
-                .collect();
-            if active_replicas.len() == 1 && active_replicas.contains(&peer_id) {
-                return Err(CollectionError::bad_input(format!(
-                    "Cannot deactivate the last active replica {peer_id} of shard {shard_id}"
-                )));
-            }
-        }
-
-        replica_set
-            .ensure_replica_with_state(&peer_id, state)
-            .await?;
-
-        if state == ReplicaState::Dead {
-            // Terminate transfer if source or target replicas are now dead
-            let related_transfers = shard_holder.get_related_transfers(&shard_id, &peer_id);
-            for transfer in related_transfers {
-                self._abort_shard_transfer(transfer.key(), &shard_holder)
-                    .await?;
-            }
-        }
-
-        if !self.is_initialized.check_ready() {
-            // If not initialized yet, we need to check if it was initialized by this call
-            let state = self.state().await;
-            let mut is_fully_active = true;
-            for (_shard_id, shard_info) in state.shards {
-                if shard_info
-                    .replicas
-                    .into_iter()
-                    .any(|(_peer_id, state)| state != ReplicaState::Active)
-                {
-                    is_fully_active = false;
-                    break;
-                }
-            }
-            if is_fully_active {
-                self.is_initialized.make_ready();
-            }
-        }
-
-        // Try to request shard transfer if replicas on the current peer are dead
-        if state == ReplicaState::Dead && self.this_peer_id == peer_id {
-            let transfer_from = replica_set
-                .peers()
-                .into_iter()
-                .find(|(_, state)| state == &ReplicaState::Active)
-                .map(|(peer_id, _)| peer_id);
-            if let Some(transfer_from) = transfer_from {
-                self.request_shard_transfer(ShardTransfer {
-                    shard_id,
-                    from: transfer_from,
-                    to: self.this_peer_id,
-                    sync: true,
-                })
-            } else {
-                log::warn!("No alive replicas to recover shard {shard_id}");
-            }
-        }
-
-        Ok(())
-    }
-
-    pub async fn contains_shard(&self, shard_id: ShardId) -> bool {
-        let shard_holder_read = self.shards_holder.read().await;
-        shard_holder_read.contains_shard(&shard_id)
-    }
-
-    /// Returns true if shard it explicitly local, false otherwise.
-    pub async fn is_shard_local(&self, shard_id: &ShardId) -> Option<bool> {
-        let shard_holder_read = self.shards_holder.read().await;
-        if let Some(shard) = shard_holder_read.get_shard(shard_id) {
-            Some(shard.is_local().await)
-        } else {
-            None
-        }
-    }
-
-    pub async fn check_transfer_exists(&self, transfer_key: &ShardTransferKey) -> bool {
-        let shard_holder_read = self.shards_holder.read().await;
-        let matched = shard_holder_read
-            .shard_transfers
-            .read()
-            .iter()
-            .any(|transfer| transfer_key.check(transfer));
-        matched
-    }
-
-    pub async fn get_transfer(&self, transfer_key: &ShardTransferKey) -> Option<ShardTransfer> {
-        let shard_holder_read = self.shards_holder.read().await;
-        let transfer = shard_holder_read
-            .shard_transfers
-            .read()
-            .iter()
-            .find(|transfer| transfer_key.check(transfer))
-            .cloned();
-        transfer
-    }
-
-    pub async fn get_outgoing_transfers(&self, current_peer_id: &PeerId) -> Vec<ShardTransfer> {
-        self.get_transfers(|transfer| transfer.from == *current_peer_id)
-            .await
-    }
-
-    pub async fn get_transfers<F>(&self, mut predicate: F) -> Vec<ShardTransfer>
-    where
-        F: FnMut(&ShardTransfer) -> bool,
-    {
-        let shard_holder = self.shards_holder.read().await;
-        let transfers = shard_holder
-            .shard_transfers
-            .read()
-            .iter()
-            .filter(|&transfer| predicate(transfer))
-            .cloned()
-            .collect();
-        transfers
-    }
-
-    async fn send_shard<OF, OE>(&self, transfer: ShardTransfer, on_finish: OF, on_error: OE)
-    where
-        OF: Future<Output = ()> + Send + 'static,
-        OE: Future<Output = ()> + Send + 'static,
-    {
-        let mut active_transfer_tasks = self.transfer_tasks.lock().await;
-        let task_result = active_transfer_tasks.stop_if_exists(&transfer.key()).await;
-
-        debug_assert_eq!(task_result, TaskResult::NotFound);
-
-        let shard_holder = self.shards_holder.clone();
-        let collection_id = self.id.clone();
-        let channel_service = self.channel_service.clone();
-
-        let transfer_task = spawn_transfer_task(
-            shard_holder,
-            transfer.clone(),
-            collection_id,
-            channel_service,
-            on_finish,
-            on_error,
-        );
-
-        active_transfer_tasks.add_task(&transfer, transfer_task);
-    }
-
-    pub async fn start_shard_transfer<T, F>(
-        &self,
-        shard_transfer: ShardTransfer,
-        on_finish: T,
-        on_error: F,
-    ) -> CollectionResult<bool>
-    where
-        T: Future<Output = ()> + Send + 'static,
-        F: Future<Output = ()> + Send + 'static,
-    {
-        let shard_id = shard_transfer.shard_id;
-        let do_transfer = {
-            let shards_holder = self.shards_holder.read().await;
-            let _was_not_transferred =
-                shards_holder.register_start_shard_transfer(shard_transfer.clone())?;
-            let replica_set_opt = shards_holder.get_shard(&shard_id);
-
-            // Check if current node owns the shard which should be transferred
-            // and therefore able to transfer
-            let replica_set = if let Some(replica_set) = replica_set_opt {
-                replica_set
-            } else {
-                // Service error, because it means the validation was incorrect
-                return Err(CollectionError::service_error(format!(
-                    "Shard {shard_id} doesn't exist"
-                )));
-            };
-
-            let is_local = replica_set.is_local().await;
-            let is_receiver = replica_set.this_peer_id() == shard_transfer.to;
-            let is_sender = replica_set.this_peer_id() == shard_transfer.from;
-
-            // Create local shard if it does not exist on receiver, or simply set replica state otherwise
-            // (on all peers, regardless if shard is local or remote on that peer).
-            //
-            // This should disable queries to receiver replica even if it was active before.
-            if !is_local && is_receiver {
-                let shard = LocalShard::build(
-                    shard_id,
-                    self.name(),
-                    &replica_set.shard_path,
-                    self.collection_config.clone(),
-                    self.shared_storage_config.clone(),
-                    self.update_runtime.clone(),
-                )
-                .await?;
-
-                replica_set
-                    .set_local(shard, Some(ReplicaState::Partial))
-                    .await?;
-            } else {
-                replica_set.set_replica_state(&shard_transfer.to, ReplicaState::Partial)?;
-            }
-
-            is_local && is_sender
-        };
-        if do_transfer {
-            self.send_shard(shard_transfer, on_finish, on_error).await;
-        }
-        Ok(do_transfer)
-    }
-
-    /// Handles finishing of the shard transfer.
-    ///
-    /// Returns true if state was changed, false otherwise.
-    pub async fn finish_shard_transfer(&self, transfer: ShardTransfer) -> CollectionResult<()> {
-        let transfer_finished = self
-            .transfer_tasks
-            .lock()
-            .await
-            .stop_if_exists(&transfer.key())
-            .await
-            .is_finished();
-        log::debug!("transfer_finished: {}", transfer_finished);
-
-        let shards_holder_guard = self.shards_holder.read().await;
-
-        // Should happen on transfer side
-        // Unwrap forward proxy into local shard, or replace it with remote shard
-        // depending on the `sync` flag.
-        if self.this_peer_id == transfer.from {
-            let proxy_promoted = handle_transferred_shard_proxy(
-                &shards_holder_guard,
-                transfer.shard_id,
-                transfer.to,
-                transfer.sync,
-            )
-            .await?;
-            log::debug!("proxy_promoted: {}", proxy_promoted);
-        }
-
-        // Should happen on receiving side
-        // Promote partial shard to active shard
-        if self.this_peer_id == transfer.to {
-            let shard_promoted =
-                finalize_partial_shard(&shards_holder_guard, transfer.shard_id).await?;
-            log::debug!(
-                "shard_promoted: {}, shard_id: {}, peer_id: {}",
-                shard_promoted,
-                transfer.shard_id,
-                self.this_peer_id
-            );
-        }
-
-        // Should happen on a third-party side
-        // Change direction of the remote shards or add a new remote shard
-        if self.this_peer_id != transfer.from {
-            let remote_shard_rerouted = change_remote_shard_route(
-                &shards_holder_guard,
-                transfer.shard_id,
-                transfer.from,
-                transfer.to,
-                transfer.sync,
-            )
-            .await?;
-            log::debug!("remote_shard_rerouted: {}", remote_shard_rerouted);
-        }
-        let finish_was_registered =
-            shards_holder_guard.register_finish_transfer(&transfer.key())?;
-        log::debug!("finish_was_registered: {}", finish_was_registered);
-        Ok(())
-    }
-
-    async fn _abort_shard_transfer(
-        &self,
-        transfer_key: ShardTransferKey,
-        shard_holder_guard: &ShardHolder,
-    ) -> CollectionResult<()> {
-        let _transfer_finished = self
-            .transfer_tasks
-            .lock()
-            .await
-            .stop_if_exists(&transfer_key)
-            .await
-            .is_finished();
-
-        let replica_set =
-            if let Some(replica_set) = shard_holder_guard.get_shard(&transfer_key.shard_id) {
-                replica_set
-            } else {
-                return Err(CollectionError::bad_request(format!(
-                    "Shard {} doesn't exist",
-                    transfer_key.shard_id
-                )));
-            };
-
-        let transfer = self.get_transfer(&transfer_key).await;
-
-        if transfer.map(|x| x.sync).unwrap_or(false) {
-            replica_set.set_replica_state(&transfer_key.to, ReplicaState::Dead)?;
-        } else {
-            replica_set.remove_peer(transfer_key.to).await?;
-        }
-
-        if self.this_peer_id == transfer_key.from {
-            revert_proxy_shard_to_local(shard_holder_guard, transfer_key.shard_id).await?;
-        }
-
-        let _finish_was_registered = shard_holder_guard.register_finish_transfer(&transfer_key)?;
-
-        Ok(())
-    }
-
-    /// Handles abort of the transfer
-    ///
-    /// 1. Unregister the transfer
-    /// 2. Stop transfer task
-    /// 3. Unwrap the proxy
-    /// 4. Remove temp shard, or mark it as dead
-    pub async fn abort_shard_transfer(
-        &self,
-        transfer_key: ShardTransferKey,
-    ) -> CollectionResult<()> {
-        let shard_holder_guard = self.shards_holder.read().await;
-        // Internal implementation, used to prevents double-read deadlock
-        self._abort_shard_transfer(transfer_key, &shard_holder_guard)
-            .await
-    }
-
-    /// Initiate local partial shard
-    pub fn initiate_shard_transfer(
-        &self,
-        shard_id: ShardId,
-    ) -> impl Future<Output = CollectionResult<()>> + 'static {
-        let shards_holder = self.shards_holder.clone();
-
-        async move {
-            let shards_holder = shards_holder.read_owned().await;
-
-            let Some(replica_set) = shards_holder.get_shard(&shard_id) else {
-                return Err(CollectionError::service_error(format!(
-                    "Shard {shard_id} doesn't exist, repartition is not supported yet"
-                )));
-            };
-
-            if !replica_set.is_local().await {
-                // We have proxy or something, we need to unwrap it
-                log::warn!("Unwrapping proxy shard {}", shard_id);
-                replica_set.un_proxify_local().await?
-            }
-
-            if replica_set.is_dummy().await {
-                return Err(CollectionError::service_error(format!(
-                    "Shard {shard_id} is a \"dummy\" shard"
-                )));
-            }
-
-            let this_peer_id = replica_set.this_peer_id();
-
-            let shard_transfer_requested = tokio::task::spawn_blocking(move || {
-                shards_holder.shard_transfers.wait_for(
-                    |shard_transfers| {
-                        shard_transfers.iter().any(|shard_transfer| {
-                            shard_transfer.shard_id == shard_id && shard_transfer.to == this_peer_id
-                        })
-                    },
-                    Duration::from_secs(60),
-                )
-            });
-
-            match shard_transfer_requested.await {
-                Ok(true) => Ok(()),
-
-                Ok(false) => {
-                    let description = "\
-                        Failed to initiate shard transfer: \
-                        Didn't receive shard transfer notification from consensus in 60 seconds";
-
-                    Err(CollectionError::Timeout {
-                        description: description.into(),
-                    })
-                }
-
-                Err(err) => Err(CollectionError::service_error(format!(
-                    "Failed to initiate shard transfer: \
-                     Failed to execute wait-for-consensus-notification task: \
-                     {err}"
-                ))),
-            }
-        }
-    }
-
-    /// Handle collection updates from peers.
-    ///
-    /// Shard transfer aware.
-    pub async fn update_from_peer(
-        &self,
-        operation: CollectionUpdateOperations,
-        shard_selection: ShardId,
-        wait: bool,
-    ) -> CollectionResult<UpdateResult> {
-        let _update_lock = self.updates_lock.read().await;
-        let shard_holder_guard = self.shards_holder.read().await;
-
-        let res = match shard_holder_guard.get_shard(&shard_selection) {
-            None => None,
-            Some(target_shard) => target_shard.update_local(operation.clone(), wait).await?,
-        };
-
-        if let Some(res) = res {
-            Ok(res)
-        } else {
-            Err(CollectionError::service_error(format!(
-                "No target shard {shard_selection} found for update"
-            )))
-        }
-    }
-
-    pub async fn update_from_client(
-        &self,
-        operation: CollectionUpdateOperations,
-        wait: bool,
-        ordering: WriteOrdering,
-    ) -> CollectionResult<UpdateResult> {
-        operation.validate()?;
-        let _update_lock = self.updates_lock.read().await;
-
-        let mut results = {
-            let shards_holder = self.shards_holder.read().await;
-            let shard_to_op = shards_holder.split_by_shard(operation);
-
-            if shard_to_op.is_empty() {
-                return Err(CollectionError::bad_request(
-                    "Empty update request".to_string(),
-                ));
-            }
-
-            let shard_requests = shard_to_op
-                .into_iter()
-                .map(move |(replica_set, operation)| {
-                    replica_set.update_with_consistency(operation, wait, ordering)
-                });
-            join_all(shard_requests).await
-        };
-
-        let with_error = results
-            .iter()
-            .filter(|result| matches!(result, Err(_)))
-            .count();
-
-        // one request per shard
-        let result_len = results.len();
-
-        if with_error > 0 {
-            let first_err = results
-                .into_iter()
-                .find(|result| matches!(result, Err(_)))
-                .unwrap();
-            // inconsistent if only a subset of the requests fail - one request per shard.
-            if with_error < result_len {
-                first_err.map_err(|err| {
-                    // compute final status code based on the first error
-                    // e.g. a partially successful batch update failing because of bad input is a client error
-                    CollectionError::InconsistentShardFailure {
-                        shards_total: result_len as u32, // report only the number of shards that took part in the update
-                        shards_failed: with_error as u32,
-                        first_err: Box::new(err),
-                    }
-                })
-            } else {
-                // all requests per shard failed - propagate first error (assume there are all the same)
-                first_err
-            }
-        } else {
-            // At least one result is always present.
-            results.pop().unwrap()
-        }
-    }
-
-    pub async fn search_batch(
-        &self,
-        request: SearchRequestBatch,
-        read_consistency: Option<ReadConsistency>,
-        shard_selection: Option<ShardId>,
-    ) -> CollectionResult<Vec<Vec<ScoredPoint>>> {
-        // shortcuts batch if all requests with limit=0
-        if request.searches.iter().all(|s| s.limit == 0) {
-            return Ok(vec![]);
-        }
-        // A factor which determines if we need to use the 2-step search or not
-        // Should be adjusted based on usage statistics.
-        const PAYLOAD_TRANSFERS_FACTOR_THRESHOLD: usize = 10;
-
-        let is_payload_required = request.searches.iter().all(|s| {
-            s.with_payload
-                .clone()
-                .map(|p| p.is_required())
-                .unwrap_or_default()
-        });
-        let with_vectors = request.searches.iter().all(|s| {
-            s.with_vector
-                .as_ref()
-                .map(|wv| wv.is_some())
-                .unwrap_or(false)
-        });
-
-        let metadata_required = is_payload_required || with_vectors;
-
-        let sum_limits: usize = request.searches.iter().map(|s| s.limit).sum();
-        let sum_offsets: usize = request.searches.iter().map(|s| s.offset).sum();
-
-        // Number of records we need to retrieve to fill the search result.
-        let require_transfers = self.shards_holder.read().await.len() * (sum_limits + sum_offsets);
-        // Actually used number of records.
-        let used_transfers = sum_limits;
-
-        let is_required_transfer_large_enough =
-            require_transfers > used_transfers * PAYLOAD_TRANSFERS_FACTOR_THRESHOLD;
-
-        if metadata_required && is_required_transfer_large_enough {
-            // If there is a significant offset, we need to retrieve the whole result
-            // set without payload first and then retrieve the payload.
-            // It is required to do this because the payload might be too large to send over the
-            // network.
-            let mut without_payload_requests = Vec::with_capacity(request.searches.len());
-            for search in &request.searches {
-                let mut without_payload_request = search.clone();
-                without_payload_request.with_payload = None;
-                without_payload_request.with_vector = None;
-                without_payload_requests.push(without_payload_request);
-            }
-            let without_payload_batch = SearchRequestBatch {
-                searches: without_payload_requests,
-            };
-            let without_payload_results = self
-                ._search_batch(without_payload_batch, read_consistency, shard_selection)
-                .await?;
-            let filled_results = without_payload_results
-                .into_iter()
-                .zip(request.clone().searches.into_iter())
-                .map(|(without_payload_result, req)| {
-                    self.fill_search_result_with_payload(
-                        without_payload_result,
-                        req.with_payload.clone(),
-                        req.with_vector.unwrap_or_default(),
-                        read_consistency,
-                        shard_selection,
-                    )
-                });
-            try_join_all(filled_results).await
-        } else {
-            let result = self
-                ._search_batch(request, read_consistency, shard_selection)
-                .await?;
-            Ok(result)
-        }
-    }
-
-    pub async fn _search_batch(
-        &self,
-        request: SearchRequestBatch,
-        read_consistency: Option<ReadConsistency>,
-        shard_selection: Option<ShardId>,
-    ) -> CollectionResult<Vec<Vec<ScoredPoint>>> {
-        let batch_size = request.searches.len();
-        let request = Arc::new(request);
-
-        // query all shards concurrently
-        let mut all_searches_res = {
-            let shard_holder = self.shards_holder.read().await;
-            let target_shards = shard_holder.target_shard(shard_selection)?;
-            let all_searches = target_shards
-                .iter()
-                .map(|shard| shard.search(request.clone(), read_consistency));
-            try_join_all(all_searches).await?
-        };
-
-        // merge results from shards in order
-        let mut merged_results: Vec<Vec<ScoredPoint>> = vec![vec![]; batch_size];
-        for shard_searches_results in all_searches_res.iter_mut() {
-            for (index, shard_searches_result) in shard_searches_results.iter_mut().enumerate() {
-                merged_results[index].append(shard_searches_result)
-            }
-        }
-        let collection_params = self.collection_config.read().await.params.clone();
-        let top_results: Vec<_> = merged_results
-            .into_iter()
-            .zip(request.searches.iter())
-            .map(|(res, request)| {
-                let distance = collection_params
-                    .get_vector_params(request.vector.get_name())?
-                    .distance;
-                let mut top_res = match distance.distance_order() {
-                    Order::LargeBetter => {
-                        peek_top_largest_iterable(res, request.limit + request.offset)
-                    }
-                    Order::SmallBetter => {
-                        peek_top_smallest_iterable(res, request.limit + request.offset)
-                    }
-                };
-                // Remove `offset` from top result only for client requests
-                // to avoid applying `offset` twice in distributed mode.
-                if shard_selection.is_none() && request.offset > 0 {
-                    if top_res.len() >= request.offset {
-                        // Panics if the end point > length of the vector.
-                        top_res.drain(..request.offset);
-                    } else {
-                        top_res.clear()
-                    }
-                }
-                Ok(top_res)
-            })
-            .collect::<CollectionResult<Vec<_>>>()?;
-
-        Ok(top_results)
-    }
-
-    pub(crate) async fn fill_search_result_with_payload(
-        &self,
-        search_result: Vec<ScoredPoint>,
-        with_payload: Option<WithPayloadInterface>,
-        with_vector: WithVector,
-        read_consistency: Option<ReadConsistency>,
-        shard_selection: Option<ShardId>,
-    ) -> CollectionResult<Vec<ScoredPoint>> {
-        // short-circuit if not needed
-        if let (&Some(WithPayloadInterface::Bool(false)), &WithVector::Bool(false)) =
-            (&with_payload, &with_vector)
-        {
-            return Ok(search_result
-                .into_iter()
-                .map(|point| ScoredPoint {
-                    payload: None,
-                    vector: None,
-                    ..point
-                })
-                .collect());
-        };
-
-        let retrieve_request = PointRequest {
-            ids: search_result.iter().map(|x| x.id).collect(),
-            with_payload,
-            with_vector,
-        };
-        let retrieved_records = self
-            .retrieve(retrieve_request, read_consistency, shard_selection)
-            .await?;
-        let mut records_map: HashMap<ExtendedPointId, Record> = retrieved_records
-            .into_iter()
-            .map(|rec| (rec.id, rec))
-            .collect();
-        let enriched_result = search_result
-            .into_iter()
-            .filter_map(|mut scored_point| {
-                // Points might get deleted between search and retrieve.
-                // But it's not a problem, because we don't want to return deleted points.
-                // So we just filter out them.
-                records_map.remove(&scored_point.id).map(|record| {
-                    scored_point.payload = record.payload;
-                    scored_point.vector = record.vector;
-                    scored_point
-                })
-            })
-            .collect();
-        Ok(enriched_result)
-    }
-
-    pub async fn search(
-        &self,
-        request: SearchRequest,
-        read_consistency: Option<ReadConsistency>,
-        shard_selection: Option<ShardId>,
-    ) -> CollectionResult<Vec<ScoredPoint>> {
-        if request.limit == 0 {
-            return Ok(vec![]);
-        }
-        // search is a special case of search_batch with a single batch
-        let request_batch = SearchRequestBatch {
-            searches: vec![request],
-        };
-        let results = self
-            ._search_batch(request_batch, read_consistency, shard_selection)
-            .await?;
-        Ok(results.into_iter().next().unwrap())
-    }
-
-    pub async fn scroll_by(
-        &self,
-        request: ScrollRequest,
-        read_consistency: Option<ReadConsistency>,
-        shard_selection: Option<ShardId>,
-    ) -> CollectionResult<ScrollResult> {
-        let default_request = ScrollRequest::default();
-
-        let offset = request.offset;
-        let limit = request
-            .limit
-            .unwrap_or_else(|| default_request.limit.unwrap());
-        let with_payload_interface = request
-            .with_payload
-            .clone()
-            .unwrap_or_else(|| default_request.with_payload.clone().unwrap());
-        let with_vector = request.with_vector;
-
-        if limit == 0 {
-            return Err(CollectionError::BadRequest {
-                description: "Limit cannot be 0".to_string(),
-            });
-        }
-
-        // Needed to return next page offset.
-        let limit = limit + 1;
-        let retrieved_points: Vec<_> = {
-            let shards_holder = self.shards_holder.read().await;
-            let target_shards = shards_holder.target_shard(shard_selection)?;
-            let scroll_futures = target_shards.into_iter().map(|shard| {
-                shard.scroll_by(
-                    offset,
-                    limit,
-                    &with_payload_interface,
-                    &with_vector,
-                    request.filter.as_ref(),
-                    read_consistency,
-                )
-            });
-
-            try_join_all(scroll_futures).await?
-        };
-        let mut points: Vec<_> = retrieved_points
-            .into_iter()
-            .flatten()
-            .sorted_by_key(|point| point.id)
-            .take(limit)
-            .collect();
-
-        let next_page_offset = if points.len() < limit {
-            // This was the last page
-            None
-        } else {
-            // remove extra point, it would be a first point of the next page
-            Some(points.pop().unwrap().id)
-        };
-        Ok(ScrollResult {
-            points,
-            next_page_offset,
-        })
-    }
-
-    pub async fn count(
-        &self,
-        request: CountRequest,
-        shard_selection: Option<ShardId>,
-    ) -> CollectionResult<CountResult> {
-        let request = Arc::new(request);
-
-        let counts: Vec<_> = {
-            let shards_holder = self.shards_holder.read().await;
-            let target_shards = shards_holder.target_shard(shard_selection)?;
-            let count_futures = target_shards
-                .into_iter()
-                .map(|shard| shard.count(request.clone()));
-            try_join_all(count_futures).await?.into_iter().collect()
-        };
-
-        let total_count = counts.iter().map(|x| x.count).sum::<usize>();
-        let aggregated_count = CountResult { count: total_count };
-        Ok(aggregated_count)
-    }
-
-    pub async fn retrieve(
-        &self,
-        request: PointRequest,
-        read_consistency: Option<ReadConsistency>,
-        shard_selection: Option<ShardId>,
-    ) -> CollectionResult<Vec<Record>> {
-        let with_payload_interface = request
-            .with_payload
-            .as_ref()
-            .unwrap_or(&WithPayloadInterface::Bool(false));
-        let with_payload = WithPayload::from(with_payload_interface);
-        let request = Arc::new(request);
-        let all_shard_collection_results = {
-            let shard_holder = self.shards_holder.read().await;
-            let target_shards = shard_holder.target_shard(shard_selection)?;
-            let retrieve_futures = target_shards.into_iter().map(|shard| {
-                shard.retrieve(
-                    request.clone(),
-                    &with_payload,
-                    &request.with_vector,
-                    read_consistency,
-                )
-            });
-            try_join_all(retrieve_futures).await?
-        };
-        let points = all_shard_collection_results.into_iter().flatten().collect();
-        Ok(points)
-    }
-
-    /// Updates collection params:
-    /// Saves new params on disk
-    ///
-    /// After this, `recreate_optimizers_blocking` must be called to create new optimizers using
-    /// the updated configuration.
-    pub async fn update_params_from_diff(
-        &self,
-        params_diff: CollectionParamsDiff,
-    ) -> CollectionResult<()> {
-        {
-            let mut config = self.collection_config.write().await;
-            config.params = params_diff.update(&config.params)?;
-        }
-        self.collection_config.read().await.save(&self.path)?;
-        Ok(())
-    }
-
-    /// Updates HNSW config:
-    /// Saves new params on disk
-    ///
-    /// After this, `recreate_optimizers_blocking` must be called to create new optimizers using
-    /// the updated configuration.
-    pub async fn update_hnsw_config_from_diff(
-        &self,
-        hnsw_config_diff: HnswConfigDiff,
-    ) -> CollectionResult<()> {
-        {
-            let mut config = self.collection_config.write().await;
-            config.hnsw_config = hnsw_config_diff.update(&config.hnsw_config)?;
-        }
-        self.collection_config.read().await.save(&self.path)?;
-        Ok(())
-    }
-
-    /// Updates quantization config:
-    /// Saves new params on disk
-    ///
-    /// After this, `recreate_optimizers_blocking` must be called to create new optimizers using
-    /// the updated configuration.
-    pub async fn update_quantization_config_from_diff(
-        &self,
-        quantization_config_diff: QuantizationConfigDiff,
-    ) -> CollectionResult<()> {
-        {
-            let mut config = self.collection_config.write().await;
-            match quantization_config_diff {
-                QuantizationConfigDiff::Scalar(scalar) => {
-                    config
-                        .quantization_config
-                        .replace(QuantizationConfig::Scalar(scalar));
-                }
-                QuantizationConfigDiff::Product(product) => {
-                    config
-                        .quantization_config
-                        .replace(QuantizationConfig::Product(product));
-                }
-                QuantizationConfigDiff::Disabled(_) => {
-                    config.quantization_config = None;
-                }
-            }
-        }
-        self.collection_config.read().await.save(&self.path)?;
-        Ok(())
-    }
-
-    /// Updates vectors config:
-    /// Saves new params on disk
-    ///
-    /// After this, `recreate_optimizers_blocking` must be called to create new optimizers using
-    /// the updated configuration.
-    pub async fn update_vectors_from_diff(
-        &self,
-        update_vectors_diff: &VectorsConfigDiff,
-    ) -> CollectionResult<()> {
-        let mut config = self.collection_config.write().await;
-        update_vectors_diff.check_vector_names(&config.params)?;
-        config
-            .params
-            .update_vectors_from_diff(update_vectors_diff)?;
-        config.save(&self.path)?;
-        Ok(())
-    }
-
-    pub fn request_shard_transfer(&self, shard_transfer: ShardTransfer) {
-        self.request_shard_transfer_cb.deref()(shard_transfer)
-    }
-
-    /// Handle replica changes
-    ///
-    /// add and remove replicas from replica set
-    pub async fn handle_replica_changes(
-        &self,
-        replica_changes: Vec<Change>,
-    ) -> CollectionResult<()> {
-        if replica_changes.is_empty() {
-            return Ok(());
-        }
-        let read_shard_holder = self.shards_holder.read().await;
-
-        for change in replica_changes {
-            match change {
-                Change::Remove(shard_id, peer_id) => {
-                    let replica_set_opt = read_shard_holder.get_shard(&shard_id);
-                    let replica_set = if let Some(replica_set) = replica_set_opt {
-                        replica_set
-                    } else {
-                        return Err(CollectionError::BadRequest {
-                            description: format!("Shard {} of {} not found", shard_id, self.name()),
-                        });
-                    };
-
-                    let peers = replica_set.peers();
-
-                    if !peers.contains_key(&peer_id) {
-                        return Err(CollectionError::BadRequest {
-                            description: format!(
-                                "Peer {peer_id} has no replica of shard {shard_id}"
-                            ),
-                        });
-                    }
-
-                    if peers.len() == 1 {
-                        return Err(CollectionError::BadRequest {
-                            description: format!("Shard {shard_id} must have at least one replica"),
-                        });
-                    }
-
-                    replica_set.remove_peer(peer_id).await?;
-                }
-            }
-        }
-        Ok(())
-    }
-
-    /// Updates shard optimization params:
-    /// Saves new params on disk
-    ///
-    /// After this, `recreate_optimizers_blocking` must be called to create new optimizers using
-    /// the updated configuration.
-    pub async fn update_optimizer_params_from_diff(
-        &self,
-        optimizer_config_diff: OptimizersConfigDiff,
-    ) -> CollectionResult<()> {
-        {
-            let mut config = self.collection_config.write().await;
-            config.optimizer_config =
-                DiffConfig::update(optimizer_config_diff, &config.optimizer_config)?;
-        }
-        self.collection_config.read().await.save(&self.path)?;
-        Ok(())
-    }
-
-    /// Updates shard optimization params: Saves new params on disk
-    ///
-    /// After this, `recreate_optimizers_blocking` must be called to create new optimizers using
-    /// the updated configuration.
-    pub async fn update_optimizer_params(
-        &self,
-        optimizer_config: OptimizersConfig,
-    ) -> CollectionResult<()> {
-        {
-            let mut config = self.collection_config.write().await;
-            config.optimizer_config = optimizer_config;
-        }
-        self.collection_config.read().await.save(&self.path)?;
-        Ok(())
-    }
-
-    /// Recreate the optimizers on all shards for this collection
-    ///
-    /// This will stop existing optimizers, and start new ones with new configurations.
-    ///
-    /// # Blocking
-    ///
-    /// Partially blocking. Stopping existing optimizers is blocking. Starting new optimizers is
-    /// not blocking.
-    pub async fn recreate_optimizers_blocking(&self) -> CollectionResult<()> {
-        let shard_holder = self.shards_holder.read().await;
-        let updates = shard_holder
-            .all_shards()
-            .map(|replica_set| replica_set.on_optimizer_config_update());
-        try_join_all(updates).await?;
-        Ok(())
-    }
-
-    pub async fn info(&self, shard_selection: Option<ShardId>) -> CollectionResult<CollectionInfo> {
-        let (all_shard_collection_results, mut info) = {
-            let shards_holder = self.shards_holder.read().await;
-
-            let target_shards = shards_holder.target_shard(shard_selection)?;
-
-            let first_shard = *target_shards.first().ok_or_else(|| {
-                CollectionError::service_error(
-                    "There are no shards for selected collection".to_string(),
-                )
-            })?;
-
-            let info = first_shard.info().await?;
-            let info_futures = target_shards.into_iter().skip(1).map(|shard| shard.info());
-
-            (try_join_all(info_futures).await?, info)
-        };
-
-        all_shard_collection_results
-            .into_iter()
-            .for_each(|shard_info| {
-                info.status = max(info.status, shard_info.status);
-                info.optimizer_status =
-                    max(info.optimizer_status.clone(), shard_info.optimizer_status);
-                info.vectors_count += shard_info.vectors_count;
-                info.indexed_vectors_count += shard_info.indexed_vectors_count;
-                info.points_count += shard_info.points_count;
-                info.segments_count += shard_info.segments_count;
-                for (key, schema) in shard_info.payload_schema {
-                    match info.payload_schema.entry(key) {
-                        Entry::Occupied(o) => {
-                            o.into_mut().points += schema.points;
-                        }
-                        Entry::Vacant(v) => {
-                            v.insert(schema);
-                        }
-                    };
-                }
-            });
-        Ok(info)
-    }
-
-    pub async fn cluster_info(&self, peer_id: PeerId) -> CollectionResult<CollectionClusterInfo> {
-        let shards_holder = self.shards_holder.read().await;
-        let shard_count = shards_holder.len();
-        let mut local_shards = Vec::new();
-        let mut remote_shards = Vec::new();
-        let count_request = Arc::new(CountRequest {
-            filter: None,
-            exact: false, // Don't need exact count of unique ids here, only size estimation
-        });
-        // extract shards info
-        for (shard_id, replica_set) in shards_holder.get_shards() {
-            let shard_id = *shard_id;
-            let peers = replica_set.peers();
-
-            if replica_set.has_local_shard().await {
-                let state = peers
-                    .get(&replica_set.this_peer_id())
-                    .copied()
-                    .unwrap_or(ReplicaState::Dead);
-                let count_result = replica_set.count_local(count_request.clone()).await?;
-                let points_count = count_result.map(|x| x.count).unwrap_or(0);
-                local_shards.push(LocalShardInfo {
-                    shard_id,
-                    points_count,
-                    state,
-                })
-            }
-            for (peer_id, state) in replica_set.peers().into_iter() {
-                if peer_id == replica_set.this_peer_id() {
-                    continue;
-                }
-                remote_shards.push(RemoteShardInfo {
-                    shard_id,
-                    peer_id,
-                    state,
-                });
-            }
-        }
-        let shard_transfers = shards_holder.get_shard_transfer_info();
-
-        // sort by shard_id
-        local_shards.sort_by_key(|k| k.shard_id);
-        remote_shards.sort_by_key(|k| k.shard_id);
-
-        let info = CollectionClusterInfo {
-            peer_id,
-            shard_count,
-            local_shards,
-            remote_shards,
-            shard_transfers,
-        };
-        Ok(info)
-    }
-
-    pub async fn state(&self) -> State {
-        let shards_holder = self.shards_holder.read().await;
-        let transfers = shards_holder.shard_transfers.read().clone();
-        State {
-            config: self.collection_config.read().await.clone(),
-            shards: shards_holder
-                .get_shards()
-                .map(|(shard_id, replicas)| {
-                    let shard_info = ShardInfo {
-                        replicas: replicas.peers(),
-                    };
-                    (*shard_id, shard_info)
-                })
-                .collect(),
-            transfers,
-        }
-    }
-
-    pub async fn apply_state(
-        &self,
-        state: State,
-        this_peer_id: PeerId,
-        abort_transfer: impl FnMut(ShardTransfer),
-    ) -> CollectionResult<()> {
-        state.apply(this_peer_id, self, abort_transfer).await
-    }
-
-    pub async fn get_telemetry_data(&self) -> CollectionTelemetry {
-        let (shards_telemetry, transfers) = {
-            let mut shards_telemetry = Vec::new();
-            let shards_holder = self.shards_holder.read().await;
-            for shard in shards_holder.all_shards() {
-                shards_telemetry.push(shard.get_telemetry_data().await)
-            }
-            (shards_telemetry, shards_holder.get_shard_transfer_info())
-        };
-
-        CollectionTelemetry {
-            id: self.name(),
-            init_time_ms: self.init_time.as_millis() as u64,
-            config: self.collection_config.read().await.clone(),
-            shards: shards_telemetry,
-            transfers,
-        }
-    }
-
-    pub async fn list_snapshots(&self) -> CollectionResult<Vec<SnapshotDescription>> {
-        list_snapshots_in_directory(&self.snapshots_path).await
-    }
-
-    pub async fn get_snapshot_path(&self, snapshot_name: &str) -> CollectionResult<PathBuf> {
-        let snapshot_path = self.snapshots_path.join(snapshot_name);
-
-        let absolute_snapshot_path =
-            snapshot_path
-                .canonicalize()
-                .map_err(|_| CollectionError::NotFound {
-                    what: format!("Snapshot {snapshot_name}"),
-                })?;
-
-        let absolute_snapshot_dir =
-            self.snapshots_path
-                .canonicalize()
-                .map_err(|_| CollectionError::NotFound {
-                    what: format!("Snapshot directory: {}", self.snapshots_path.display()),
-                })?;
-
-        if !absolute_snapshot_path.starts_with(absolute_snapshot_dir) {
-            return Err(CollectionError::NotFound {
-                what: format!("Snapshot {snapshot_name}"),
-            });
-        }
-
-        if !snapshot_path.exists() {
-            return Err(CollectionError::NotFound {
-                what: format!("Snapshot {snapshot_name}"),
-            });
-        }
-        Ok(snapshot_path)
-    }
-
-    pub async fn create_snapshot(
-        &self,
-        temp_dir: &Path,
-        this_peer_id: PeerId,
-    ) -> CollectionResult<SnapshotDescription> {
-        let snapshot_name = format!(
-            "{}-{}-{}.snapshot",
-            self.name(),
-            this_peer_id,
-            chrono::Utc::now().format("%Y-%m-%d-%H-%M-%S")
-        );
-        let snapshot_path = self.snapshots_path.join(&snapshot_name);
-        log::info!(
-            "Creating collection snapshot {} into {:?}",
-            snapshot_name,
-            snapshot_path
-        );
-        let snapshot_path_tmp = snapshot_path.with_extension("tmp");
-
-        let snapshot_path_with_tmp_extension = temp_dir.join(&snapshot_name).with_extension("tmp");
-        let snapshot_path_with_arc_extension = temp_dir.join(&snapshot_name).with_extension("arc");
-
-        create_dir_all(&snapshot_path_with_tmp_extension).await?;
-
-        {
-            let shards_holder = self.shards_holder.read().await;
-            // Create snapshot of each shard
-            for (shard_id, replica_set) in shards_holder.get_shards() {
-                let shard_snapshot_path =
-                    versioned_shard_path(&snapshot_path_with_tmp_extension, *shard_id, 0);
-                create_dir_all(&shard_snapshot_path).await?;
-                // If node is listener, we can save whatever currently is in the storage
-                let save_wal = self.shared_storage_config.node_type != NodeType::Listener;
-                replica_set
-                    .create_snapshot(temp_dir, &shard_snapshot_path, save_wal)
-                    .await?;
-            }
-        }
-
-        CollectionVersion::save(&snapshot_path_with_tmp_extension)?;
-        self.collection_config
-            .read()
-            .await
-            .save(&snapshot_path_with_tmp_extension)?;
-
-        let snapshot_path_with_arc_extension_clone = snapshot_path_with_arc_extension.clone();
-        let snapshot_path_with_tmp_extension_clone = snapshot_path_with_tmp_extension.clone();
-        log::debug!("Archiving snapshot {:?}", snapshot_path_with_tmp_extension);
-        let archiving = tokio::task::spawn_blocking(move || {
-            // have to use std here, cause TarBuilder is not async
-            let file = std::fs::File::create(&snapshot_path_with_arc_extension_clone)?;
-            let mut builder = TarBuilder::new(file);
-            // archive recursively collection directory `snapshot_path_with_arc_extension` into `snapshot_path`
-            builder.append_dir_all(".", &snapshot_path_with_tmp_extension_clone)?;
-            builder.finish()?;
-            Ok::<_, CollectionError>(())
-        });
-
-        archiving.await??;
-
-        // remove temporary snapshot directory
-        remove_dir_all(&snapshot_path_with_tmp_extension).await?;
-
-        // move snapshot to permanent location
-        // We can't move right away, because snapshot folder can be on another mounting point.
-        // We can't copy to the target location directly, cause copy is not atomic.
-        copy(&snapshot_path_with_arc_extension, &snapshot_path_tmp).await?;
-        rename(&snapshot_path_tmp, &snapshot_path).await?;
-        remove_file(snapshot_path_with_arc_extension).await?;
-
-        log::info!(
-            "Collection snapshot {} completed into {:?}",
-            snapshot_name,
-            snapshot_path
-        );
-        get_snapshot_description(&snapshot_path).await
-    }
-
-    pub async fn recover_local_shard_from(
-        &self,
-        snapshot_shard_path: &Path,
-        shard_id: ShardId,
-    ) -> CollectionResult<bool> {
-        let shard_holder = self.shards_holder.read().await;
-        let replica_set =
-            shard_holder
-                .get_shard(&shard_id)
-                .ok_or_else(|| CollectionError::NotFound {
-                    what: format!("Shard {shard_id}"),
-                })?;
-
-        replica_set
-            .restore_local_replica_from(snapshot_shard_path)
-            .await
-    }
-
-    /// Restore collection from snapshot
-    ///
-    /// This method performs blocking IO.
-    pub fn restore_snapshot(
-        snapshot_path: &Path,
-        target_dir: &Path,
-        this_peer_id: PeerId,
-        is_distributed: bool,
-    ) -> CollectionResult<()> {
-        // decompress archive
-        let archive_file = std::fs::File::open(snapshot_path)?;
-        let mut ar = tar::Archive::new(archive_file);
-        ar.unpack(target_dir)?;
-
-        let config = CollectionConfig::load(target_dir)?;
-        config.validate_and_warn();
-        let configured_shards = config.params.shard_number.get();
-
-        for shard_id in 0..configured_shards {
-            let shard_path = versioned_shard_path(target_dir, shard_id, 0);
-            let shard_config_opt = ShardConfig::load(&shard_path)?;
-            if let Some(shard_config) = shard_config_opt {
-                match shard_config.r#type {
-                    shard_config::ShardType::Local => LocalShard::restore_snapshot(&shard_path)?,
-                    shard_config::ShardType::Remote { .. } => {
-                        RemoteShard::restore_snapshot(&shard_path)
-                    }
-                    shard_config::ShardType::Temporary => {}
-                    shard_config::ShardType::ReplicaSet { .. } => {
-                        ReplicaSetShard::restore_snapshot(
-                            &shard_path,
-                            this_peer_id,
-                            is_distributed,
-                        )?
-                    }
-                }
-            } else {
-                return Err(CollectionError::service_error(format!(
-                    "Can't read shard config at {}",
-                    shard_path.display()
-                )));
-            }
-        }
-
-        Ok(())
-    }
-
-    pub async fn remove_shards_at_peer(&self, peer_id: PeerId) -> CollectionResult<()> {
-        let shard_holder = self.shards_holder.read().await;
-
-        for (_shard_id, replica_set) in shard_holder.get_shards() {
-            replica_set.remove_peer(peer_id).await?;
-        }
-        Ok(())
-    }
-
-    pub async fn sync_local_state(
-        &self,
-        on_transfer_failure: OnTransferFailure,
-        on_transfer_success: OnTransferSuccess,
-        on_finish_init: ChangePeerState,
-        on_convert_to_listener: ChangePeerState,
-        on_convert_from_listener: ChangePeerState,
-    ) -> CollectionResult<()> {
-        // Check for disabled replicas
-        let shard_holder = self.shards_holder.read().await;
-        for replica_set in shard_holder.all_shards() {
-            replica_set.sync_local_state().await?;
-        }
-
-        // Check for un-reported finished transfers
-        let outgoing_transfers = self.get_outgoing_transfers(&self.this_peer_id).await;
-        let tasks_lock = self.transfer_tasks.lock().await;
-        for transfer in outgoing_transfers {
-            match tasks_lock.get_task_result(&transfer.key()) {
-                None => {
-                    if !tasks_lock.check_if_still_running(&transfer.key()) {
-                        log::debug!(
-                            "Transfer {:?} does not exist, but not reported as cancelled. Reporting now.",
-                            transfer.key()
-                        );
-                        on_transfer_failure(transfer, self.name(), "transfer task does not exist");
-                    }
-                }
-                Some(true) => {
-                    log::debug!(
-                        "Transfer {:?} is finished successfully, but not reported. Reporting now.",
-                        transfer.key()
-                    );
-                    on_transfer_success(transfer, self.name());
-                }
-                Some(false) => {
-                    log::debug!(
-                        "Transfer {:?} is failed, but not reported as failed. Reporting now.",
-                        transfer.key()
-                    );
-                    on_transfer_failure(transfer, self.name(), "transfer failed");
-                }
-            }
-        }
-
-        // Check for proper replica states
-        for replica_set in shard_holder.all_shards() {
-            let this_peer_id = &replica_set.this_peer_id();
-            let shard_id = replica_set.shard_id;
-
-            let peers = replica_set.peers();
-            let this_peer_state = peers.get(this_peer_id).copied();
-            let is_last_active = peers.values().filter(|state| **state == Active).count() == 1;
-
-            if this_peer_state == Some(Initializing) {
-                // It is possible, that collection creation didn't report
-                // Try to activate shard, as the collection clearly exists
-                on_finish_init(*this_peer_id, shard_id);
-                continue;
-            }
-
-            if self.shared_storage_config.node_type == NodeType::Listener {
-                if this_peer_state == Some(Active) && !is_last_active {
-                    // Convert active node from active to listener
-                    on_convert_to_listener(*this_peer_id, shard_id);
-                    continue;
-                }
-            } else if this_peer_state == Some(Listener) {
-                // Convert listener node to active
-                on_convert_from_listener(*this_peer_id, shard_id);
-                continue;
-            }
-
-            if this_peer_state != Some(Dead) || replica_set.is_dummy().await {
-                continue; // All good
-            }
-
-            // Try to find dead replicas with no active transfers
-            let transfers = self.get_transfers(|_| true).await;
-
-            // Try to find a replica to transfer from
-            for replica_id in replica_set.active_remote_shards().await {
-                let transfer = ShardTransfer {
-                    from: replica_id,
-                    to: *this_peer_id,
-                    shard_id,
-                    sync: true,
-                };
-                if check_transfer_conflicts_strict(&transfer, transfers.iter()).is_some() {
-                    continue; // this transfer won't work
-                }
-                log::debug!(
-                    "Recovering shard {}:{} on peer {} by requesting it from {}",
-                    self.name(),
-                    shard_id,
-                    this_peer_id,
-                    replica_id
-                );
-                self.request_shard_transfer(transfer);
-                break;
-            }
-        }
-
-        Ok(())
-    }
-
-    pub fn wait_collection_initiated(&self, timeout: Duration) -> bool {
-        self.is_initialized.await_ready_for_timeout(timeout)
-    }
-
-    pub async fn lock_updates(&self) -> RwLockWriteGuard<()> {
-        self.updates_lock.write().await
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/collection_manager/collection_updater.rs b/crates/qdrant/lib/collection/src/collection_manager/collection_updater.rs
deleted file mode 100644
index 5756cdd..0000000
--- a/crates/qdrant/lib/collection/src/collection_manager/collection_updater.rs
+++ /dev/null
@@ -1,287 +0,0 @@
-use parking_lot::RwLock;
-use segment::types::SeqNumberType;
-
-use crate::collection_manager::holders::segment_holder::SegmentHolder;
-use crate::collection_manager::segments_updater::*;
-use crate::operations::types::CollectionResult;
-use crate::operations::CollectionUpdateOperations;
-
-/// Implementation of the update operation
-#[derive(Default)]
-pub struct CollectionUpdater {}
-
-impl CollectionUpdater {
-    pub fn new() -> Self {
-        Self {}
-    }
-
-    fn handle_update_result(
-        segments: &RwLock<SegmentHolder>,
-        op_num: SeqNumberType,
-        operation_result: &CollectionResult<usize>,
-    ) {
-        match operation_result {
-            Ok(_) => {
-                if !segments.read().failed_operation.is_empty() {
-                    let mut write_segments = segments.write();
-                    if write_segments.failed_operation.contains(&op_num) {
-                        // Failed operation successfully fixed
-                        write_segments.failed_operation.remove(&op_num);
-                    }
-                }
-            }
-            Err(collection_error) => {
-                if collection_error.is_transient() {
-                    let mut write_segments = segments.write();
-                    write_segments.failed_operation.insert(op_num);
-                    log::error!("Update operation failed: {}", collection_error)
-                } else {
-                    log::warn!("Update operation declined: {}", collection_error)
-                }
-            }
-        }
-    }
-
-    pub fn update(
-        segments: &RwLock<SegmentHolder>,
-        op_num: SeqNumberType,
-        operation: CollectionUpdateOperations,
-    ) -> CollectionResult<usize> {
-        // Allow only one update at a time, ensure no data races between segments.
-        // let _lock = self.update_lock.lock().unwrap();
-        let operation_result = match operation {
-            CollectionUpdateOperations::PointOperation(point_operation) => {
-                process_point_operation(segments, op_num, point_operation)
-            }
-            CollectionUpdateOperations::VectorOperation(vector_operation) => {
-                process_vector_operation(segments, op_num, vector_operation)
-            }
-            CollectionUpdateOperations::PayloadOperation(payload_operation) => {
-                process_payload_operation(segments, op_num, payload_operation)
-            }
-            CollectionUpdateOperations::FieldIndexOperation(index_operation) => {
-                process_field_index_operation(segments, op_num, &index_operation)
-            }
-        };
-
-        CollectionUpdater::handle_update_result(segments, op_num, &operation_result);
-
-        operation_result
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use segment::data_types::vectors::{only_default_vector, DEFAULT_VECTOR_NAME};
-    use segment::types::{Payload, WithPayload};
-    use serde_json::json;
-    use tempfile::Builder;
-
-    use super::*;
-    use crate::collection_manager::fixtures::build_test_holder;
-    use crate::collection_manager::segments_searcher::SegmentsSearcher;
-    use crate::collection_manager::segments_updater::upsert_points;
-    use crate::operations::payload_ops::{DeletePayload, PayloadOps, SetPayload};
-    use crate::operations::point_ops::{PointOperations, PointStruct};
-
-    #[test]
-    fn test_sync_ops() {
-        let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-
-        let segments = build_test_holder(dir.path());
-
-        let vec11 = only_default_vector(&[1.0, 1.0, 1.0, 1.0]);
-        let vec12 = only_default_vector(&[1.0, 1.0, 1.0, 0.0]);
-        let vec13 = only_default_vector(&[1.0, 0.0, 1.0, 1.0]);
-
-        let points = vec![
-            PointStruct {
-                id: 11.into(),
-                vector: vec11.into(),
-                payload: None,
-            },
-            PointStruct {
-                id: 12.into(),
-                vector: vec12.into(),
-                payload: None,
-            },
-            PointStruct {
-                id: 13.into(),
-                vector: vec13.into(),
-                payload: Some(json!({ "color": "red" }).into()),
-            },
-            PointStruct {
-                id: 14.into(),
-                vector: vec![0., 0., 0., 0.].into(),
-                payload: None,
-            },
-            PointStruct {
-                id: 500.into(),
-                vector: vec![2., 0., 2., 0.].into(),
-                payload: None,
-            },
-        ];
-
-        let (num_deleted, num_new, num_updated) =
-            sync_points(&segments.read(), 100, Some(10.into()), None, &points).unwrap();
-
-        assert_eq!(num_deleted, 1); // delete point 15
-        assert_eq!(num_new, 1); // insert point 500
-        assert_eq!(num_updated, 2); // upsert point 13 and 14 as it has updated data
-                                    // points 11 and 12 are not updated as they are same as before
-    }
-
-    #[test]
-    fn test_point_ops() {
-        let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-
-        let segments = build_test_holder(dir.path());
-        let points = vec![
-            PointStruct {
-                id: 1.into(),
-                vector: vec![2., 2., 2., 2.].into(),
-                payload: None,
-            },
-            PointStruct {
-                id: 500.into(),
-                vector: vec![2., 0., 2., 0.].into(),
-                payload: None,
-            },
-        ];
-
-        let res = upsert_points(&segments.read(), 100, &points);
-        assert!(matches!(res, Ok(1)));
-
-        let records = SegmentsSearcher::retrieve(
-            &segments,
-            &[1.into(), 2.into(), 500.into()],
-            &WithPayload::from(true),
-            &true.into(),
-        )
-        .unwrap();
-
-        assert_eq!(records.len(), 3);
-
-        for record in records {
-            let v = record.vector.unwrap();
-
-            if record.id == 1.into() {
-                assert_eq!(v.get(DEFAULT_VECTOR_NAME), Some(&vec![2., 2., 2., 2.]))
-            }
-            if record.id == 500.into() {
-                assert_eq!(v.get(DEFAULT_VECTOR_NAME), Some(&vec![2., 0., 2., 0.]))
-            }
-        }
-
-        process_point_operation(
-            &segments,
-            101,
-            PointOperations::DeletePoints {
-                ids: vec![500.into()],
-            },
-        )
-        .unwrap();
-
-        let records = SegmentsSearcher::retrieve(
-            &segments,
-            &[1.into(), 2.into(), 500.into()],
-            &WithPayload::from(true),
-            &true.into(),
-        )
-        .unwrap();
-
-        for record in records {
-            assert!(record.vector.is_some());
-            assert_ne!(record.id, 500.into());
-        }
-    }
-
-    #[test]
-    fn test_payload_ops() {
-        let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-        let segments = build_test_holder(dir.path());
-
-        let payload: Payload = serde_json::from_str(r#"{"color":"red"}"#).unwrap();
-
-        let points = vec![1.into(), 2.into(), 3.into()];
-
-        process_payload_operation(
-            &segments,
-            100,
-            PayloadOps::SetPayload(SetPayload {
-                payload,
-                points: Some(points.clone()),
-                filter: None,
-            }),
-        )
-        .unwrap();
-
-        let res =
-            SegmentsSearcher::retrieve(&segments, &points, &WithPayload::from(true), &false.into())
-                .unwrap();
-
-        assert_eq!(res.len(), 3);
-
-        match res.get(0) {
-            None => panic!(),
-            Some(r) => match &r.payload {
-                None => panic!("No payload assigned"),
-                Some(payload) => {
-                    assert!(payload.contains_key("color"))
-                }
-            },
-        };
-
-        // Test payload delete
-        process_payload_operation(
-            &segments,
-            101,
-            PayloadOps::DeletePayload(DeletePayload {
-                points: Some(vec![3.into()]),
-                keys: vec!["color".to_string(), "empty".to_string()],
-                filter: None,
-            }),
-        )
-        .unwrap();
-
-        let res = SegmentsSearcher::retrieve(
-            &segments,
-            &[3.into()],
-            &WithPayload::from(true),
-            &false.into(),
-        )
-        .unwrap();
-        assert_eq!(res.len(), 1);
-        assert!(!res[0].payload.as_ref().unwrap().contains_key("color"));
-
-        // Test clear payload
-
-        let res = SegmentsSearcher::retrieve(
-            &segments,
-            &[2.into()],
-            &WithPayload::from(true),
-            &false.into(),
-        )
-        .unwrap();
-        assert_eq!(res.len(), 1);
-        assert!(res[0].payload.as_ref().unwrap().contains_key("color"));
-
-        process_payload_operation(
-            &segments,
-            102,
-            PayloadOps::ClearPayload {
-                points: vec![2.into()],
-            },
-        )
-        .unwrap();
-        let res = SegmentsSearcher::retrieve(
-            &segments,
-            &[2.into()],
-            &WithPayload::from(true),
-            &false.into(),
-        )
-        .unwrap();
-        assert_eq!(res.len(), 1);
-        assert!(!res[0].payload.as_ref().unwrap().contains_key("color"));
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/collection_manager/fixtures.rs b/crates/qdrant/lib/collection/src/collection_manager/fixtures.rs
deleted file mode 100644
index 5384e45..0000000
--- a/crates/qdrant/lib/collection/src/collection_manager/fixtures.rs
+++ /dev/null
@@ -1,256 +0,0 @@
-use std::collections::HashSet;
-use std::num::{NonZeroU32, NonZeroU64};
-use std::path::Path;
-
-use parking_lot::RwLock;
-use rand::rngs::ThreadRng;
-use rand::Rng;
-use segment::data_types::named_vectors::NamedVectors;
-use segment::data_types::vectors::only_default_vector;
-use segment::entry::entry_point::SegmentEntry;
-use segment::segment::Segment;
-use segment::segment_constructor::simple_segment_constructor::{
-    build_multivec_segment, build_simple_segment,
-};
-use segment::types::{Distance, Payload, PointIdType, SeqNumberType};
-use serde_json::json;
-
-use crate::collection_manager::holders::segment_holder::SegmentHolder;
-use crate::collection_manager::optimizers::indexing_optimizer::IndexingOptimizer;
-use crate::collection_manager::optimizers::merge_optimizer::MergeOptimizer;
-use crate::collection_manager::optimizers::segment_optimizer::OptimizerThresholds;
-use crate::config::CollectionParams;
-use crate::operations::types::{VectorParams, VectorsConfig};
-
-pub fn empty_segment(path: &Path) -> Segment {
-    build_simple_segment(path, 4, Distance::Dot).unwrap()
-}
-
-/// A generator for random point IDs
-#[derive(Default)]
-struct PointIdGenerator {
-    thread_rng: ThreadRng,
-    used: HashSet<u64>,
-}
-
-impl PointIdGenerator {
-    #[inline]
-    pub fn random(&mut self) -> PointIdType {
-        self.thread_rng.gen_range(1..u64::MAX).into()
-    }
-
-    #[inline]
-    pub fn unique(&mut self) -> PointIdType {
-        for _ in 0..100_000 {
-            let id = self.random();
-            if let PointIdType::NumId(num) = id {
-                if self.used.insert(num) {
-                    return id;
-                }
-            }
-        }
-        panic!("failed to generate unique point ID after 100000 attempts");
-    }
-}
-
-pub fn random_multi_vec_segment(
-    path: &Path,
-    opnum: SeqNumberType,
-    num_vectors: u64,
-    dim1: usize,
-    dim2: usize,
-) -> Segment {
-    let mut id_gen = PointIdGenerator::default();
-    let mut segment = build_multivec_segment(path, dim1, dim2, Distance::Dot).unwrap();
-    let mut rnd = rand::thread_rng();
-    let payload_key = "number";
-    let keyword_key = "keyword";
-    for _ in 0..num_vectors {
-        let random_vector1: Vec<_> = (0..dim1).map(|_| rnd.gen_range(0.0..1.0)).collect();
-        let random_vector2: Vec<_> = (0..dim2).map(|_| rnd.gen_range(0.0..1.0)).collect();
-        let mut vectors = NamedVectors::default();
-        vectors.insert("vector1".to_owned(), random_vector1);
-        vectors.insert("vector2".to_owned(), random_vector2);
-
-        let point_id: PointIdType = id_gen.unique();
-        let payload_value = rnd.gen_range(1..1_000);
-        let random_keyword = format!("keyword_{}", rnd.gen_range(1..10));
-        let payload: Payload =
-            json!({ payload_key: vec![payload_value], keyword_key: random_keyword}).into();
-        segment.upsert_point(opnum, point_id, vectors).unwrap();
-        segment.set_payload(opnum, point_id, &payload).unwrap();
-    }
-    segment
-}
-
-pub fn random_segment(path: &Path, opnum: SeqNumberType, num_vectors: u64, dim: usize) -> Segment {
-    let mut id_gen = PointIdGenerator::default();
-    let mut segment = build_simple_segment(path, dim, Distance::Dot).unwrap();
-    let mut rnd = rand::thread_rng();
-    let payload_key = "number";
-    for _ in 0..num_vectors {
-        let random_vector: Vec<_> = (0..dim).map(|_| rnd.gen_range(0.0..1.0)).collect();
-        let point_id: PointIdType = id_gen.unique();
-        let payload_value = rnd.gen_range(1..1_000);
-        let payload: Payload = json!({ payload_key: vec![payload_value] }).into();
-        segment
-            .upsert_point(opnum, point_id, only_default_vector(&random_vector))
-            .unwrap();
-        segment.set_payload(opnum, point_id, &payload).unwrap();
-    }
-    segment
-}
-
-pub fn build_segment_1(path: &Path) -> Segment {
-    let mut segment1 = empty_segment(path);
-
-    let vec1 = vec![1.0, 0.0, 1.0, 1.0];
-    let vec2 = vec![1.0, 0.0, 1.0, 0.0];
-    let vec3 = vec![1.0, 1.0, 1.0, 1.0];
-    let vec4 = vec![1.0, 1.0, 0.0, 1.0];
-    let vec5 = vec![1.0, 0.0, 0.0, 0.0];
-
-    segment1
-        .upsert_point(1, 1.into(), only_default_vector(&vec1))
-        .unwrap();
-    segment1
-        .upsert_point(2, 2.into(), only_default_vector(&vec2))
-        .unwrap();
-    segment1
-        .upsert_point(3, 3.into(), only_default_vector(&vec3))
-        .unwrap();
-    segment1
-        .upsert_point(4, 4.into(), only_default_vector(&vec4))
-        .unwrap();
-    segment1
-        .upsert_point(5, 5.into(), only_default_vector(&vec5))
-        .unwrap();
-
-    let payload_key = "color";
-
-    let payload_option1: Payload = json!({ payload_key: vec!["red".to_owned()] }).into();
-    let payload_option2: Payload =
-        json!({ payload_key: vec!["red".to_owned(), "blue".to_owned()] }).into();
-    let payload_option3: Payload = json!({ payload_key: vec!["blue".to_owned()] }).into();
-
-    segment1.set_payload(6, 1.into(), &payload_option1).unwrap();
-    segment1.set_payload(6, 2.into(), &payload_option1).unwrap();
-    segment1.set_payload(6, 3.into(), &payload_option3).unwrap();
-    segment1.set_payload(6, 4.into(), &payload_option2).unwrap();
-    segment1.set_payload(6, 5.into(), &payload_option2).unwrap();
-
-    segment1
-}
-
-pub fn build_segment_2(path: &Path) -> Segment {
-    let mut segment2 = empty_segment(path);
-
-    let vec4 = vec![1.0, 1.0, 0.0, 1.0];
-    let vec5 = vec![1.0, 0.0, 0.0, 0.0];
-
-    let vec11 = vec![1.0, 1.0, 1.0, 1.0];
-    let vec12 = vec![1.0, 1.0, 1.0, 0.0];
-    let vec13 = vec![1.0, 0.0, 1.0, 1.0];
-    let vec14 = vec![1.0, 0.0, 0.0, 1.0];
-    let vec15 = vec![1.0, 1.0, 0.0, 0.0];
-
-    segment2
-        .upsert_point(7, 4.into(), only_default_vector(&vec4))
-        .unwrap();
-    segment2
-        .upsert_point(8, 5.into(), only_default_vector(&vec5))
-        .unwrap();
-
-    segment2
-        .upsert_point(11, 11.into(), only_default_vector(&vec11))
-        .unwrap();
-    segment2
-        .upsert_point(12, 12.into(), only_default_vector(&vec12))
-        .unwrap();
-    segment2
-        .upsert_point(13, 13.into(), only_default_vector(&vec13))
-        .unwrap();
-    segment2
-        .upsert_point(14, 14.into(), only_default_vector(&vec14))
-        .unwrap();
-    segment2
-        .upsert_point(15, 15.into(), only_default_vector(&vec15))
-        .unwrap();
-
-    segment2
-}
-
-pub fn build_test_holder(path: &Path) -> RwLock<SegmentHolder> {
-    let segment1 = build_segment_1(path);
-    let segment2 = build_segment_2(path);
-
-    let mut holder = SegmentHolder::default();
-
-    let _sid1 = holder.add(segment1);
-    let _sid2 = holder.add(segment2);
-
-    RwLock::new(holder)
-}
-
-pub(crate) fn get_merge_optimizer(
-    segment_path: &Path,
-    collection_temp_dir: &Path,
-    dim: usize,
-) -> MergeOptimizer {
-    MergeOptimizer::new(
-        5,
-        OptimizerThresholds {
-            max_segment_size: 100_000,
-            memmap_threshold: 1000000,
-            indexing_threshold: 1000000,
-        },
-        segment_path.to_owned(),
-        collection_temp_dir.to_owned(),
-        CollectionParams {
-            vectors: VectorsConfig::Single(VectorParams {
-                size: NonZeroU64::new(dim as u64).unwrap(),
-                distance: Distance::Dot,
-                hnsw_config: None,
-                quantization_config: None,
-                on_disk: None,
-            }),
-            shard_number: NonZeroU32::new(1).unwrap(),
-            on_disk_payload: false,
-            replication_factor: NonZeroU32::new(1).unwrap(),
-            write_consistency_factor: NonZeroU32::new(1).unwrap(),
-        },
-        Default::default(),
-        Default::default(),
-    )
-}
-
-pub(crate) fn get_indexing_optimizer(
-    segment_path: &Path,
-    collection_temp_dir: &Path,
-    dim: usize,
-) -> IndexingOptimizer {
-    IndexingOptimizer::new(
-        OptimizerThresholds {
-            max_segment_size: 100_000,
-            memmap_threshold: 100,
-            indexing_threshold: 100,
-        },
-        segment_path.to_owned(),
-        collection_temp_dir.to_owned(),
-        CollectionParams {
-            vectors: VectorsConfig::Single(VectorParams {
-                size: NonZeroU64::new(dim as u64).unwrap(),
-                distance: Distance::Dot,
-                hnsw_config: None,
-                quantization_config: None,
-                on_disk: None,
-            }),
-            shard_number: NonZeroU32::new(1).unwrap(),
-            on_disk_payload: false,
-            replication_factor: NonZeroU32::new(1).unwrap(),
-            write_consistency_factor: NonZeroU32::new(1).unwrap(),
-        },
-        Default::default(),
-        Default::default(),
-    )
-}
diff --git a/crates/qdrant/lib/collection/src/collection_manager/holders/mod.rs b/crates/qdrant/lib/collection/src/collection_manager/holders/mod.rs
deleted file mode 100644
index 8947705..0000000
--- a/crates/qdrant/lib/collection/src/collection_manager/holders/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-pub mod proxy_segment;
-pub mod segment_holder;
diff --git a/crates/qdrant/lib/collection/src/collection_manager/holders/proxy_segment.rs b/crates/qdrant/lib/collection/src/collection_manager/holders/proxy_segment.rs
deleted file mode 100644
index 6195401..0000000
--- a/crates/qdrant/lib/collection/src/collection_manager/holders/proxy_segment.rs
+++ /dev/null
@@ -1,1416 +0,0 @@
-use std::cmp::max;
-use std::collections::{HashMap, HashSet};
-use std::path::{Path, PathBuf};
-use std::sync::atomic::AtomicBool;
-use std::sync::Arc;
-
-use parking_lot::{RwLock, RwLockUpgradableReadGuard};
-use segment::data_types::named_vectors::NamedVectors;
-use segment::data_types::vectors::VectorElementType;
-use segment::entry::entry_point::{OperationResult, SegmentEntry, SegmentFailedState};
-use segment::index::field_index::CardinalityEstimation;
-use segment::telemetry::SegmentTelemetry;
-use segment::types::{
-    Condition, Filter, Payload, PayloadFieldSchema, PayloadKeyType, PayloadKeyTypeRef, PointIdType,
-    ScoredPoint, SearchParams, SegmentConfig, SegmentInfo, SegmentType, SeqNumberType, WithPayload,
-    WithVector,
-};
-
-use crate::collection_manager::holders::segment_holder::LockedSegment;
-
-type LockedRmSet = Arc<RwLock<HashSet<PointIdType>>>;
-type LockedFieldsSet = Arc<RwLock<HashSet<PayloadKeyType>>>;
-type LockedFieldsMap = Arc<RwLock<HashMap<PayloadKeyType, PayloadFieldSchema>>>;
-
-/// This object is a wrapper around read-only segment.
-/// It could be used to provide all read and write operations while wrapped segment is being optimized (i.e. not available for writing)
-/// It writes all changed records into a temporary `write_segment` and keeps track on changed points
-pub struct ProxySegment {
-    pub write_segment: LockedSegment,
-    pub wrapped_segment: LockedSegment,
-    /// Points which should not longer used from wrapped_segment
-    /// May contain points which are not in wrapped_segment,
-    /// because the set is shared among all proxy segments
-    deleted_points: LockedRmSet,
-    deleted_indexes: LockedFieldsSet,
-    created_indexes: LockedFieldsMap,
-    last_flushed_version: Arc<RwLock<Option<SeqNumberType>>>,
-}
-
-impl ProxySegment {
-    pub fn new(
-        segment: LockedSegment,
-        write_segment: LockedSegment,
-        deleted_points: LockedRmSet,
-        created_indexes: LockedFieldsMap,
-        deleted_indexes: LockedFieldsSet,
-    ) -> Self {
-        ProxySegment {
-            write_segment,
-            wrapped_segment: segment,
-            deleted_points,
-            created_indexes,
-            deleted_indexes,
-            last_flushed_version: Arc::new(RwLock::new(None)),
-        }
-    }
-
-    /// Ensure that write segment have same indexes as wrapped segment
-    pub fn replicate_field_indexes(&mut self, op_num: SeqNumberType) -> OperationResult<()> {
-        let existing_indexes = self.write_segment.get().read().get_indexed_fields();
-        let expected_indexes = self.wrapped_segment.get().read().get_indexed_fields();
-        // create missing indexes
-        for (expected_field, expected_schema) in &expected_indexes {
-            let existing_schema = existing_indexes.get(expected_field);
-
-            if existing_schema != Some(expected_schema) {
-                if existing_schema.is_some() {
-                    self.write_segment
-                        .get()
-                        .write()
-                        .delete_field_index(op_num, expected_field)?;
-                }
-                self.write_segment.get().write().create_field_index(
-                    op_num,
-                    expected_field,
-                    Some(expected_schema),
-                )?;
-            }
-        }
-        // remove extra indexes
-        for existing_field in existing_indexes.keys() {
-            if !expected_indexes.contains_key(existing_field) {
-                self.write_segment
-                    .get()
-                    .write()
-                    .delete_field_index(op_num, existing_field)?;
-            }
-        }
-        Ok(())
-    }
-
-    fn move_if_exists(
-        &self,
-        op_num: SeqNumberType,
-        point_id: PointIdType,
-    ) -> OperationResult<bool> {
-        let deleted_points_guard = self.deleted_points.upgradable_read();
-        if deleted_points_guard.contains(&point_id) {
-            // Point is already removed from wrapped segment
-            return Ok(false);
-        }
-        let wrapped_segment = self.wrapped_segment.get();
-        let wrapped_segment_guard = wrapped_segment.read();
-        if !wrapped_segment_guard.has_point(point_id) {
-            // Point is not in wrapped segment
-            return Ok(false);
-        }
-
-        let (all_vectors, payload) = (
-            wrapped_segment_guard.all_vectors(point_id)?,
-            wrapped_segment_guard.payload(point_id)?,
-        );
-
-        {
-            let mut deleted_points_write = RwLockUpgradableReadGuard::upgrade(deleted_points_guard);
-            deleted_points_write.insert(point_id);
-        }
-
-        let segment_arc = self.write_segment.get();
-        let mut write_segment = segment_arc.write();
-
-        write_segment.upsert_point(op_num, point_id, all_vectors)?;
-        write_segment.set_full_payload(op_num, point_id, &payload)?;
-
-        Ok(true)
-    }
-
-    fn add_deleted_points_condition_to_filter(
-        &self,
-        filter: Option<&Filter>,
-        deleted_points: &HashSet<PointIdType>,
-    ) -> Filter {
-        let wrapper_condition = Condition::HasId(deleted_points.clone().into());
-        match filter {
-            None => Filter::new_must_not(wrapper_condition),
-            Some(f) => {
-                let mut new_filter = f.clone();
-                let must_not = new_filter.must_not;
-
-                let new_must_not = match must_not {
-                    None => Some(vec![wrapper_condition]),
-                    Some(mut conditions) => {
-                        conditions.push(wrapper_condition);
-                        Some(conditions)
-                    }
-                };
-                new_filter.must_not = new_must_not;
-                new_filter
-            }
-        }
-    }
-}
-
-impl SegmentEntry for ProxySegment {
-    fn version(&self) -> SeqNumberType {
-        max(
-            self.wrapped_segment.get().read().version(),
-            self.write_segment.get().read().version(),
-        )
-    }
-
-    fn point_version(&self, point_id: PointIdType) -> Option<SeqNumberType> {
-        // Write version is always higher if presence
-        self.write_segment
-            .get()
-            .read()
-            .point_version(point_id)
-            .or_else(|| self.wrapped_segment.get().read().point_version(point_id))
-    }
-
-    fn search(
-        &self,
-        vector_name: &str,
-        vector: &[VectorElementType],
-        with_payload: &WithPayload,
-        with_vector: &WithVector,
-        filter: Option<&Filter>,
-        top: usize,
-        params: Option<&SearchParams>,
-        is_stopped: &AtomicBool,
-    ) -> OperationResult<Vec<ScoredPoint>> {
-        let deleted_points = self.deleted_points.read();
-
-        // Some point might be deleted after temporary segment creation
-        // We need to prevent them from being found by search request
-        // That is why we need to pass additional filter for deleted points
-        let do_update_filter = !deleted_points.is_empty();
-        let mut wrapped_result = if do_update_filter {
-            // ToDo: Come up with better way to pass deleted points into Filter
-            // e.g. implement AtomicRefCell for Serializer.
-            // This copy might slow process down if there will be a lot of deleted points
-            let wrapped_filter =
-                self.add_deleted_points_condition_to_filter(filter, &deleted_points);
-
-            self.wrapped_segment.get().read().search(
-                vector_name,
-                vector,
-                with_payload,
-                with_vector,
-                Some(&wrapped_filter),
-                top,
-                params,
-                is_stopped,
-            )?
-        } else {
-            self.wrapped_segment.get().read().search(
-                vector_name,
-                vector,
-                with_payload,
-                with_vector,
-                filter,
-                top,
-                params,
-                is_stopped,
-            )?
-        };
-
-        let mut write_result = self.write_segment.get().read().search(
-            vector_name,
-            vector,
-            with_payload,
-            with_vector,
-            filter,
-            top,
-            params,
-            is_stopped,
-        )?;
-
-        wrapped_result.append(&mut write_result);
-        Ok(wrapped_result)
-    }
-
-    fn search_batch(
-        &self,
-        vector_name: &str,
-        vectors: &[&[VectorElementType]],
-        with_payload: &WithPayload,
-        with_vector: &WithVector,
-        filter: Option<&Filter>,
-        top: usize,
-        params: Option<&SearchParams>,
-        is_stopped: &AtomicBool,
-    ) -> OperationResult<Vec<Vec<ScoredPoint>>> {
-        let deleted_points = self.deleted_points.read();
-
-        // Some point might be deleted after temporary segment creation
-        // We need to prevent them from being found by search request
-        // That is why we need to pass additional filter for deleted points
-        let do_update_filter = !deleted_points.is_empty();
-        let mut wrapped_results = if do_update_filter {
-            // ToDo: Come up with better way to pass deleted points into Filter
-            // e.g. implement AtomicRefCell for Serializer.
-            // This copy might slow process down if there will be a lot of deleted points
-            let wrapped_filter =
-                self.add_deleted_points_condition_to_filter(filter, &deleted_points);
-
-            self.wrapped_segment.get().read().search_batch(
-                vector_name,
-                vectors,
-                with_payload,
-                with_vector,
-                Some(&wrapped_filter),
-                top,
-                params,
-                is_stopped,
-            )?
-        } else {
-            self.wrapped_segment.get().read().search_batch(
-                vector_name,
-                vectors,
-                with_payload,
-                with_vector,
-                filter,
-                top,
-                params,
-                is_stopped,
-            )?
-        };
-        let mut write_results = self.write_segment.get().read().search_batch(
-            vector_name,
-            vectors,
-            with_payload,
-            with_vector,
-            filter,
-            top,
-            params,
-            is_stopped,
-        )?;
-        for (index, write_result) in write_results.iter_mut().enumerate() {
-            wrapped_results[index].append(write_result)
-        }
-        Ok(wrapped_results)
-    }
-
-    fn upsert_point(
-        &mut self,
-        op_num: SeqNumberType,
-        point_id: PointIdType,
-        vectors: NamedVectors,
-    ) -> OperationResult<bool> {
-        self.move_if_exists(op_num, point_id)?;
-        self.write_segment
-            .get()
-            .write()
-            .upsert_point(op_num, point_id, vectors)
-    }
-
-    fn delete_point(
-        &mut self,
-        op_num: SeqNumberType,
-        point_id: PointIdType,
-    ) -> OperationResult<bool> {
-        let mut was_deleted = false;
-        if self.wrapped_segment.get().read().has_point(point_id) {
-            was_deleted = self.deleted_points.write().insert(point_id);
-        }
-        let was_deleted_in_writable = self
-            .write_segment
-            .get()
-            .write()
-            .delete_point(op_num, point_id)?;
-
-        Ok(was_deleted || was_deleted_in_writable)
-    }
-
-    fn update_vectors(
-        &mut self,
-        op_num: SeqNumberType,
-        point_id: PointIdType,
-        vectors: NamedVectors,
-    ) -> OperationResult<bool> {
-        self.move_if_exists(op_num, point_id)?;
-        self.write_segment
-            .get()
-            .write()
-            .update_vectors(op_num, point_id, vectors)
-    }
-
-    fn delete_vector(
-        &mut self,
-        op_num: SeqNumberType,
-        point_id: PointIdType,
-        vector_name: &str,
-    ) -> OperationResult<bool> {
-        self.move_if_exists(op_num, point_id)?;
-        self.write_segment
-            .get()
-            .write()
-            .delete_vector(op_num, point_id, vector_name)
-    }
-
-    fn set_full_payload(
-        &mut self,
-        op_num: SeqNumberType,
-        point_id: PointIdType,
-        full_payload: &Payload,
-    ) -> OperationResult<bool> {
-        self.move_if_exists(op_num, point_id)?;
-        self.write_segment
-            .get()
-            .write()
-            .set_full_payload(op_num, point_id, full_payload)
-    }
-
-    fn set_payload(
-        &mut self,
-        op_num: SeqNumberType,
-        point_id: PointIdType,
-        payload: &Payload,
-    ) -> OperationResult<bool> {
-        self.move_if_exists(op_num, point_id)?;
-        self.write_segment
-            .get()
-            .write()
-            .set_payload(op_num, point_id, payload)
-    }
-
-    fn delete_payload(
-        &mut self,
-        op_num: SeqNumberType,
-        point_id: PointIdType,
-        key: PayloadKeyTypeRef,
-    ) -> OperationResult<bool> {
-        self.move_if_exists(op_num, point_id)?;
-        self.write_segment
-            .get()
-            .write()
-            .delete_payload(op_num, point_id, key)
-    }
-
-    fn clear_payload(
-        &mut self,
-        op_num: SeqNumberType,
-        point_id: PointIdType,
-    ) -> OperationResult<bool> {
-        self.move_if_exists(op_num, point_id)?;
-        self.write_segment
-            .get()
-            .write()
-            .clear_payload(op_num, point_id)
-    }
-
-    fn vector(
-        &self,
-        vector_name: &str,
-        point_id: PointIdType,
-    ) -> OperationResult<Option<Vec<VectorElementType>>> {
-        return if self.deleted_points.read().contains(&point_id) {
-            self.write_segment
-                .get()
-                .read()
-                .vector(vector_name, point_id)
-        } else {
-            {
-                let write_segment = self.write_segment.get();
-                let segment_guard = write_segment.read();
-                if segment_guard.has_point(point_id) {
-                    return segment_guard.vector(vector_name, point_id);
-                }
-            }
-            self.wrapped_segment
-                .get()
-                .read()
-                .vector(vector_name, point_id)
-        };
-    }
-
-    fn all_vectors(&self, point_id: PointIdType) -> OperationResult<NamedVectors> {
-        let mut result = NamedVectors::default();
-        for vector_name in self
-            .wrapped_segment
-            .get()
-            .read()
-            .config()
-            .vector_data
-            .keys()
-        {
-            if let Some(vector) = self.vector(vector_name, point_id)? {
-                result.insert(vector_name.clone(), vector);
-            }
-        }
-        Ok(result)
-    }
-
-    fn payload(&self, point_id: PointIdType) -> OperationResult<Payload> {
-        return if self.deleted_points.read().contains(&point_id) {
-            self.write_segment.get().read().payload(point_id)
-        } else {
-            {
-                let write_segment = self.write_segment.get();
-                let segment_guard = write_segment.read();
-                if segment_guard.has_point(point_id) {
-                    return segment_guard.payload(point_id);
-                }
-            }
-            self.wrapped_segment.get().read().payload(point_id)
-        };
-    }
-
-    /// Not implemented for proxy
-    fn iter_points(&self) -> Box<dyn Iterator<Item = PointIdType> + '_> {
-        // iter_points is not available for Proxy implementation
-        // Due to internal locks it is almost impossible to return iterator with proper owning, lifetimes, e.t.c.
-        unimplemented!("call to iter_points is not implemented for Proxy segment")
-    }
-
-    fn read_filtered<'a>(
-        &'a self,
-        offset: Option<PointIdType>,
-        limit: Option<usize>,
-        filter: Option<&'a Filter>,
-    ) -> Vec<PointIdType> {
-        let deleted_points = self.deleted_points.read();
-        let mut read_points = if deleted_points.is_empty() {
-            self.wrapped_segment
-                .get()
-                .read()
-                .read_filtered(offset, limit, filter)
-        } else {
-            let wrapped_filter =
-                self.add_deleted_points_condition_to_filter(filter, &deleted_points);
-            self.wrapped_segment
-                .get()
-                .read()
-                .read_filtered(offset, limit, Some(&wrapped_filter))
-        };
-        let mut write_segment_points = self
-            .write_segment
-            .get()
-            .read()
-            .read_filtered(offset, limit, filter);
-        read_points.append(&mut write_segment_points);
-        read_points.sort_unstable();
-        read_points
-    }
-
-    /// Read points in [from; to) range
-    fn read_range(&self, from: Option<PointIdType>, to: Option<PointIdType>) -> Vec<PointIdType> {
-        let deleted_points = self.deleted_points.read();
-        let mut read_points = self.wrapped_segment.get().read().read_range(from, to);
-        if !deleted_points.is_empty() {
-            read_points.retain(|idx| !deleted_points.contains(idx))
-        }
-        let mut write_segment_points = self.write_segment.get().read().read_range(from, to);
-        read_points.append(&mut write_segment_points);
-        read_points.sort_unstable();
-        read_points
-    }
-
-    fn has_point(&self, point_id: PointIdType) -> bool {
-        return if self.deleted_points.read().contains(&point_id) {
-            self.write_segment.get().read().has_point(point_id)
-        } else {
-            self.write_segment.get().read().has_point(point_id)
-                || self.wrapped_segment.get().read().has_point(point_id)
-        };
-    }
-
-    fn available_point_count(&self) -> usize {
-        let deleted_points_count = self.deleted_points.read().len();
-        let wrapped_segment_count = self.wrapped_segment.get().read().available_point_count();
-        let write_segment_count = self.write_segment.get().read().available_point_count();
-        (wrapped_segment_count + write_segment_count).saturating_sub(deleted_points_count)
-    }
-
-    fn deleted_point_count(&self) -> usize {
-        self.write_segment.get().read().deleted_point_count()
-    }
-
-    fn estimate_point_count<'a>(&'a self, filter: Option<&'a Filter>) -> CardinalityEstimation {
-        let deleted_point_count = self.deleted_points.read().len();
-
-        let (wrapped_segment_est, total_wrapped_size) = {
-            let wrapped_segment = self.wrapped_segment.get();
-            let wrapped_segment_guard = wrapped_segment.read();
-            (
-                wrapped_segment_guard.estimate_point_count(filter),
-                wrapped_segment_guard.available_point_count(),
-            )
-        };
-
-        let write_segment_est = self.write_segment.get().read().estimate_point_count(filter);
-
-        let expected_deleted_count = if total_wrapped_size > 0 {
-            (wrapped_segment_est.exp as f64
-                * (deleted_point_count as f64 / total_wrapped_size as f64)) as usize
-        } else {
-            0
-        };
-
-        let primary_clauses =
-            if wrapped_segment_est.primary_clauses == write_segment_est.primary_clauses {
-                wrapped_segment_est.primary_clauses
-            } else {
-                vec![]
-            };
-
-        CardinalityEstimation {
-            primary_clauses,
-            min: wrapped_segment_est.min.saturating_sub(deleted_point_count)
-                + write_segment_est.min,
-            exp: (wrapped_segment_est.exp + write_segment_est.exp)
-                .saturating_sub(expected_deleted_count),
-            max: wrapped_segment_est.max + write_segment_est.max,
-        }
-    }
-
-    fn segment_type(&self) -> SegmentType {
-        SegmentType::Special
-    }
-
-    fn info(&self) -> SegmentInfo {
-        let wrapped_info = self.wrapped_segment.get().read().info();
-        let write_info = self.write_segment.get().read().info();
-
-        // This is a best estimate
-        let num_vectors = {
-            let vector_name_count = self.config().vector_data.len();
-            let deleted_points_count = self.deleted_points.read().len();
-            (wrapped_info.num_vectors + write_info.num_vectors)
-                .saturating_sub(deleted_points_count * vector_name_count)
-        };
-
-        SegmentInfo {
-            segment_type: SegmentType::Special,
-            num_vectors,
-            num_points: self.available_point_count(),
-            num_deleted_vectors: write_info.num_deleted_vectors,
-            ram_usage_bytes: wrapped_info.ram_usage_bytes + write_info.ram_usage_bytes,
-            disk_usage_bytes: wrapped_info.disk_usage_bytes + write_info.disk_usage_bytes,
-            is_appendable: false,
-            index_schema: wrapped_info.index_schema,
-        }
-    }
-
-    fn config(&self) -> SegmentConfig {
-        self.wrapped_segment.get().read().config()
-    }
-
-    fn is_appendable(&self) -> bool {
-        true
-    }
-
-    fn flush(&self, sync: bool) -> OperationResult<SeqNumberType> {
-        let deleted_points_guard = self.deleted_points.read();
-        let deleted_indexes_guard = self.deleted_indexes.read();
-        let created_indexes_guard = self.created_indexes.read();
-
-        if deleted_points_guard.is_empty()
-            && deleted_indexes_guard.is_empty()
-            && created_indexes_guard.is_empty()
-        {
-            // Proxy changes are empty, therefore it is safe to flush write segment
-            // This workaround only makes sense in a context of batch update of new points:
-            //  - initial upload
-            //  - incremental updates
-            let wrapped_version = self.wrapped_segment.get().read().flush(sync)?;
-            let write_segment_version = self.write_segment.get().read().flush(sync)?;
-            let flushed_version = max(wrapped_version, write_segment_version);
-            *self.last_flushed_version.write() = Some(flushed_version);
-            Ok(flushed_version)
-        } else {
-            // If intermediate state is not empty - that is possible that some changes are not persisted
-            Ok(self
-                .last_flushed_version
-                .read()
-                .unwrap_or_else(|| self.wrapped_segment.get().read().version()))
-        }
-    }
-
-    fn drop_data(self) -> OperationResult<()> {
-        self.wrapped_segment.drop_data()
-    }
-
-    fn data_path(&self) -> PathBuf {
-        self.wrapped_segment.get().read().data_path()
-    }
-
-    fn delete_field_index(&mut self, op_num: u64, key: PayloadKeyTypeRef) -> OperationResult<bool> {
-        if self.version() > op_num {
-            return Ok(false);
-        }
-        self.deleted_indexes.write().insert(key.into());
-        self.created_indexes.write().remove(key);
-        self.write_segment
-            .get()
-            .write()
-            .delete_field_index(op_num, key)
-    }
-
-    fn create_field_index(
-        &mut self,
-        op_num: u64,
-        key: PayloadKeyTypeRef,
-        field_schema: Option<&PayloadFieldSchema>,
-    ) -> OperationResult<bool> {
-        if self.version() > op_num {
-            return Ok(false);
-        }
-
-        self.write_segment
-            .get()
-            .write()
-            .create_field_index(op_num, key, field_schema)?;
-        let indexed_fields = self.write_segment.get().read().get_indexed_fields();
-
-        let payload_schema = match indexed_fields.get(key) {
-            Some(schema_type) => schema_type,
-            None => return Ok(false),
-        };
-
-        self.created_indexes
-            .write()
-            .insert(key.into(), payload_schema.to_owned());
-        self.deleted_indexes.write().remove(key);
-
-        Ok(true)
-    }
-
-    fn get_indexed_fields(&self) -> HashMap<PayloadKeyType, PayloadFieldSchema> {
-        let indexed_fields = self.wrapped_segment.get().read().get_indexed_fields();
-        indexed_fields
-            .into_iter()
-            .chain(
-                self.created_indexes
-                    .read()
-                    .iter()
-                    .map(|(k, v)| (k.to_owned(), v.to_owned())),
-            )
-            .filter(|(key, _)| !self.deleted_indexes.read().contains(key))
-            .collect()
-    }
-
-    fn check_error(&self) -> Option<SegmentFailedState> {
-        self.write_segment.get().read().check_error()
-    }
-
-    fn delete_filtered<'a>(
-        &'a mut self,
-        op_num: SeqNumberType,
-        filter: &'a Filter,
-    ) -> OperationResult<usize> {
-        let mut deleted_points = 0;
-
-        let points_to_delete =
-            self.wrapped_segment
-                .get()
-                .read()
-                .read_filtered(None, None, Some(filter));
-        if !points_to_delete.is_empty() {
-            deleted_points += points_to_delete.len();
-            let mut deleted_points_guard = self.deleted_points.write();
-            deleted_points_guard.extend(points_to_delete);
-        }
-
-        deleted_points += self
-            .write_segment
-            .get()
-            .write()
-            .delete_filtered(op_num, filter)?;
-
-        Ok(deleted_points)
-    }
-
-    fn vector_dim(&self, vector_name: &str) -> OperationResult<usize> {
-        self.write_segment.get().read().vector_dim(vector_name)
-    }
-
-    fn vector_dims(&self) -> HashMap<String, usize> {
-        self.write_segment.get().read().vector_dims()
-    }
-
-    fn take_snapshot(
-        &self,
-        temp_path: &Path,
-        snapshot_dir_path: &Path,
-    ) -> OperationResult<PathBuf> {
-        log::info!(
-            "Taking a snapshot of a proxy segment into {:?}",
-            snapshot_dir_path
-        );
-
-        let archive_path = {
-            let wrapped_segment_arc = self.wrapped_segment.get();
-            let wrapped_segment_guard = wrapped_segment_arc.read();
-
-            // snapshot wrapped segment data into the temporary dir
-            wrapped_segment_guard.take_snapshot(temp_path, snapshot_dir_path)?
-        };
-
-        // snapshot write_segment
-        let write_segment_rw = self.write_segment.get();
-        let write_segment_guard = write_segment_rw.read();
-
-        // Write segment is not unique to the proxy segment, therefore it might overwrite an existing snapshot.
-        write_segment_guard.take_snapshot(temp_path, snapshot_dir_path)?;
-
-        Ok(archive_path)
-    }
-
-    fn get_telemetry_data(&self) -> SegmentTelemetry {
-        self.wrapped_segment.get().read().get_telemetry_data()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::fs::read_dir;
-
-    use segment::data_types::vectors::{only_default_vector, DEFAULT_VECTOR_NAME};
-    use segment::types::{FieldCondition, PayloadSchemaType};
-    use serde_json::json;
-    use tempfile::{Builder, TempDir};
-
-    use super::*;
-    use crate::collection_manager::fixtures::{
-        build_segment_1, build_segment_2, empty_segment, random_segment,
-    };
-
-    #[test]
-    fn test_writing() {
-        let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-        let original_segment = LockedSegment::new(build_segment_1(dir.path()));
-        let write_segment = LockedSegment::new(empty_segment(dir.path()));
-        let deleted_points = Arc::new(RwLock::new(HashSet::<PointIdType>::new()));
-
-        let deleted_indexes = Arc::new(RwLock::new(HashSet::<PayloadKeyType>::new()));
-        let created_indexes = Arc::new(RwLock::new(
-            HashMap::<PayloadKeyType, PayloadFieldSchema>::new(),
-        ));
-
-        let mut proxy_segment = ProxySegment::new(
-            original_segment,
-            write_segment,
-            deleted_points,
-            created_indexes,
-            deleted_indexes,
-        );
-
-        let vec4 = vec![1.1, 1.0, 0.0, 1.0];
-        proxy_segment
-            .upsert_point(100, 4.into(), only_default_vector(&vec4))
-            .unwrap();
-        let vec6 = vec![1.0, 1.0, 0.5, 1.0];
-        proxy_segment
-            .upsert_point(101, 6.into(), only_default_vector(&vec6))
-            .unwrap();
-        proxy_segment.delete_point(102, 1.into()).unwrap();
-
-        let query_vector = vec![1.0, 1.0, 1.0, 1.0];
-        let search_result = proxy_segment
-            .search(
-                DEFAULT_VECTOR_NAME,
-                &query_vector,
-                &WithPayload::default(),
-                &false.into(),
-                None,
-                10,
-                None,
-                &false.into(),
-            )
-            .unwrap();
-
-        eprintln!("search_result = {search_result:#?}");
-
-        let mut seen_points: HashSet<PointIdType> = Default::default();
-        for res in search_result {
-            if seen_points.contains(&res.id) {
-                panic!("point {} appears multiple times", res.id);
-            }
-            seen_points.insert(res.id);
-        }
-
-        assert!(seen_points.contains(&4.into()));
-        assert!(seen_points.contains(&6.into()));
-        assert!(!seen_points.contains(&1.into()));
-
-        assert!(!proxy_segment.write_segment.get().read().has_point(2.into()));
-
-        let payload_key = "color".to_owned();
-        proxy_segment
-            .delete_payload(103, 2.into(), &payload_key)
-            .unwrap();
-
-        assert!(proxy_segment.write_segment.get().read().has_point(2.into()))
-    }
-
-    #[test]
-    fn test_search_batch_equivalence_single() {
-        let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-        let original_segment = LockedSegment::new(build_segment_1(dir.path()));
-        let write_segment = LockedSegment::new(empty_segment(dir.path()));
-        let deleted_points = Arc::new(RwLock::new(HashSet::<PointIdType>::new()));
-
-        let deleted_indexes = Arc::new(RwLock::new(HashSet::<PayloadKeyType>::new()));
-        let created_indexes = Arc::new(RwLock::new(
-            HashMap::<PayloadKeyType, PayloadFieldSchema>::new(),
-        ));
-
-        let mut proxy_segment = ProxySegment::new(
-            original_segment,
-            write_segment,
-            deleted_points,
-            created_indexes,
-            deleted_indexes,
-        );
-
-        let vec4 = vec![1.1, 1.0, 0.0, 1.0];
-        proxy_segment
-            .upsert_point(100, 4.into(), only_default_vector(&vec4))
-            .unwrap();
-        let vec6 = vec![1.0, 1.0, 0.5, 1.0];
-        proxy_segment
-            .upsert_point(101, 6.into(), only_default_vector(&vec6))
-            .unwrap();
-        proxy_segment.delete_point(102, 1.into()).unwrap();
-
-        let query_vector = vec![1.0, 1.0, 1.0, 1.0];
-        let search_result = proxy_segment
-            .search(
-                DEFAULT_VECTOR_NAME,
-                &query_vector,
-                &WithPayload::default(),
-                &false.into(),
-                None,
-                10,
-                None,
-                &false.into(),
-            )
-            .unwrap();
-
-        eprintln!("search_result = {search_result:#?}");
-
-        let search_batch_result = proxy_segment
-            .search_batch(
-                DEFAULT_VECTOR_NAME,
-                &[&query_vector],
-                &WithPayload::default(),
-                &false.into(),
-                None,
-                10,
-                None,
-                &false.into(),
-            )
-            .unwrap();
-
-        eprintln!("search_batch_result = {search_batch_result:#?}");
-
-        assert!(!search_result.is_empty());
-        assert_eq!(search_result, search_batch_result[0].clone())
-    }
-
-    #[test]
-    fn test_search_batch_equivalence_single_random() {
-        let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-        let original_segment = LockedSegment::new(random_segment(dir.path(), 100, 200, 4));
-        let write_segment = LockedSegment::new(empty_segment(dir.path()));
-        let deleted_points = Arc::new(RwLock::new(HashSet::<PointIdType>::new()));
-
-        let deleted_indexes = Arc::new(RwLock::new(HashSet::<PayloadKeyType>::new()));
-        let created_indexes = Arc::new(RwLock::new(
-            HashMap::<PayloadKeyType, PayloadFieldSchema>::new(),
-        ));
-
-        let proxy_segment = ProxySegment::new(
-            original_segment,
-            write_segment,
-            deleted_points,
-            created_indexes,
-            deleted_indexes,
-        );
-
-        let query_vector = vec![1.0, 1.0, 1.0, 1.0];
-        let search_result = proxy_segment
-            .search(
-                DEFAULT_VECTOR_NAME,
-                &query_vector,
-                &WithPayload::default(),
-                &false.into(),
-                None,
-                10,
-                None,
-                &false.into(),
-            )
-            .unwrap();
-
-        eprintln!("search_result = {search_result:#?}");
-
-        let search_batch_result = proxy_segment
-            .search_batch(
-                DEFAULT_VECTOR_NAME,
-                &[&query_vector],
-                &WithPayload::default(),
-                &false.into(),
-                None,
-                10,
-                None,
-                &false.into(),
-            )
-            .unwrap();
-
-        eprintln!("search_batch_result = {search_batch_result:#?}");
-
-        assert!(!search_result.is_empty());
-        assert_eq!(search_result, search_batch_result[0].clone())
-    }
-
-    #[test]
-    fn test_search_batch_equivalence_multi_random() {
-        let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-        let original_segment = LockedSegment::new(random_segment(dir.path(), 100, 200, 4));
-        let write_segment = LockedSegment::new(empty_segment(dir.path()));
-        let deleted_points = Arc::new(RwLock::new(HashSet::<PointIdType>::new()));
-
-        let deleted_indexes = Arc::new(RwLock::new(HashSet::<PayloadKeyType>::new()));
-        let created_indexes = Arc::new(RwLock::new(
-            HashMap::<PayloadKeyType, PayloadFieldSchema>::new(),
-        ));
-
-        let proxy_segment = ProxySegment::new(
-            original_segment,
-            write_segment,
-            deleted_points,
-            created_indexes,
-            deleted_indexes,
-        );
-
-        let q1 = vec![1.0, 1.0, 1.0, 0.1];
-        let q2 = vec![1.0, 1.0, 0.1, 0.1];
-        let q3 = vec![1.0, 0.1, 1.0, 0.1];
-        let q4 = vec![0.1, 1.0, 1.0, 0.1];
-
-        let query_vectors: &[&[VectorElementType]] =
-            &[q1.as_slice(), q2.as_slice(), q3.as_slice(), q4.as_slice()];
-
-        let mut all_single_results = Vec::with_capacity(query_vectors.len());
-        for query_vector in query_vectors {
-            let res = proxy_segment
-                .search(
-                    DEFAULT_VECTOR_NAME,
-                    query_vector,
-                    &WithPayload::default(),
-                    &false.into(),
-                    None,
-                    10,
-                    None,
-                    &false.into(),
-                )
-                .unwrap();
-            all_single_results.push(res);
-        }
-
-        eprintln!("search_result = {all_single_results:#?}");
-
-        let search_batch_result = proxy_segment
-            .search_batch(
-                DEFAULT_VECTOR_NAME,
-                query_vectors,
-                &WithPayload::default(),
-                &false.into(),
-                None,
-                10,
-                None,
-                &false.into(),
-            )
-            .unwrap();
-
-        eprintln!("search_batch_result = {search_batch_result:#?}");
-
-        assert_eq!(all_single_results, search_batch_result)
-    }
-
-    fn wrap_proxy(dir: &TempDir, original_segment: LockedSegment) -> ProxySegment {
-        let write_segment = LockedSegment::new(empty_segment(dir.path()));
-        let deleted_points = Arc::new(RwLock::new(HashSet::<PointIdType>::new()));
-
-        let deleted_indexes = Arc::new(RwLock::new(HashSet::<PayloadKeyType>::new()));
-        let created_indexes = Arc::new(RwLock::new(
-            HashMap::<PayloadKeyType, PayloadFieldSchema>::new(),
-        ));
-
-        ProxySegment::new(
-            original_segment,
-            write_segment,
-            deleted_points,
-            created_indexes,
-            deleted_indexes,
-        )
-    }
-
-    #[test]
-    fn test_read_filter() {
-        let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-        let original_segment = LockedSegment::new(build_segment_1(dir.path()));
-
-        let filter = Filter::new_must_not(Condition::Field(FieldCondition::new_match(
-            "color".to_string(),
-            "blue".to_string().into(),
-        )));
-
-        let original_points = original_segment
-            .get()
-            .read()
-            .read_filtered(None, Some(100), None);
-
-        let original_points_filtered =
-            original_segment
-                .get()
-                .read()
-                .read_filtered(None, Some(100), Some(&filter));
-
-        let mut proxy_segment = wrap_proxy(&dir, original_segment);
-
-        proxy_segment.delete_point(100, 2.into()).unwrap();
-
-        let proxy_res = proxy_segment.read_filtered(None, Some(100), None);
-        let proxy_res_filtered = proxy_segment.read_filtered(None, Some(100), Some(&filter));
-
-        assert_eq!(original_points_filtered.len() - 1, proxy_res_filtered.len());
-        assert_eq!(original_points.len() - 1, proxy_res.len());
-    }
-
-    #[test]
-    fn test_read_range() {
-        let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-        let original_segment = LockedSegment::new(build_segment_1(dir.path()));
-
-        let original_points = original_segment
-            .get()
-            .read()
-            .read_range(None, Some(10.into()));
-
-        let mut proxy_segment = wrap_proxy(&dir, original_segment);
-
-        proxy_segment.delete_point(100, 2.into()).unwrap();
-
-        proxy_segment
-            .set_payload(
-                101,
-                3.into(),
-                &json!({ "color": vec!["red".to_owned()] }).into(),
-            )
-            .unwrap();
-        let proxy_res = proxy_segment.read_range(None, Some(10.into()));
-
-        assert_eq!(original_points.len() - 1, proxy_res.len());
-    }
-
-    #[test]
-    fn test_sync_indexes() {
-        let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-        let original_segment = LockedSegment::new(build_segment_1(dir.path()));
-        let write_segment = LockedSegment::new(empty_segment(dir.path()));
-
-        let deleted_points = Arc::new(RwLock::new(HashSet::<PointIdType>::new()));
-        let deleted_indexes = Arc::new(RwLock::new(HashSet::<PayloadKeyType>::new()));
-        let created_indexes = Arc::new(RwLock::new(
-            HashMap::<PayloadKeyType, PayloadFieldSchema>::new(),
-        ));
-
-        original_segment
-            .get()
-            .write()
-            .create_field_index(10, "color", Some(&PayloadSchemaType::Keyword.into()))
-            .unwrap();
-
-        let mut proxy_segment = ProxySegment::new(
-            original_segment.clone(),
-            write_segment.clone(),
-            deleted_points,
-            created_indexes,
-            deleted_indexes,
-        );
-
-        proxy_segment.replicate_field_indexes(0).unwrap();
-
-        assert!(write_segment
-            .get()
-            .read()
-            .get_indexed_fields()
-            .contains_key("color"));
-
-        original_segment
-            .get()
-            .write()
-            .create_field_index(11, "location", Some(&PayloadSchemaType::Geo.into()))
-            .unwrap();
-
-        original_segment
-            .get()
-            .write()
-            .delete_field_index(12, "color")
-            .unwrap();
-
-        proxy_segment.replicate_field_indexes(0).unwrap();
-
-        assert!(write_segment
-            .get()
-            .read()
-            .get_indexed_fields()
-            .contains_key("location"));
-        assert!(!write_segment
-            .get()
-            .read()
-            .get_indexed_fields()
-            .contains_key("color"));
-    }
-
-    #[test]
-    fn test_take_snapshot() {
-        let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-        let original_segment = LockedSegment::new(build_segment_1(dir.path()));
-        let original_segment_2 = LockedSegment::new(build_segment_2(dir.path()));
-        let write_segment = LockedSegment::new(empty_segment(dir.path()));
-        let deleted_points = Arc::new(RwLock::new(HashSet::<PointIdType>::new()));
-
-        let deleted_indexes = Arc::new(RwLock::new(HashSet::<PayloadKeyType>::new()));
-        let created_indexes = Arc::new(RwLock::new(
-            HashMap::<PayloadKeyType, PayloadFieldSchema>::new(),
-        ));
-
-        let mut proxy_segment = ProxySegment::new(
-            original_segment,
-            write_segment.clone(),
-            deleted_points.clone(),
-            created_indexes.clone(),
-            deleted_indexes.clone(),
-        );
-
-        let mut proxy_segment2 = ProxySegment::new(
-            original_segment_2,
-            write_segment,
-            deleted_points,
-            created_indexes,
-            deleted_indexes,
-        );
-
-        let vec4 = vec![1.1, 1.0, 0.0, 1.0];
-        proxy_segment
-            .upsert_point(100, 4.into(), only_default_vector(&vec4))
-            .unwrap();
-        let vec6 = vec![1.0, 1.0, 0.5, 1.0];
-        proxy_segment
-            .upsert_point(101, 6.into(), only_default_vector(&vec6))
-            .unwrap();
-        proxy_segment.delete_point(102, 1.into()).unwrap();
-
-        proxy_segment2
-            .upsert_point(201, 11.into(), only_default_vector(&vec6))
-            .unwrap();
-
-        let snapshot_dir = Builder::new().prefix("snapshot_dir").tempdir().unwrap();
-        eprintln!("Snapshot into {:?}", snapshot_dir.path());
-
-        let temp_dir = Builder::new().prefix("temp_dir").tempdir().unwrap();
-        let temp_dir2 = Builder::new().prefix("temp_dir").tempdir().unwrap();
-
-        proxy_segment
-            .take_snapshot(temp_dir.path(), snapshot_dir.path())
-            .unwrap();
-        proxy_segment2
-            .take_snapshot(temp_dir2.path(), snapshot_dir.path())
-            .unwrap();
-
-        // validate that 3 archives were created:
-        // wrapped_segment1, wrapped_segment2 & shared write_segment
-        let archive_count = read_dir(&snapshot_dir).unwrap().count();
-        assert_eq!(archive_count, 3);
-
-        for archive in read_dir(&snapshot_dir).unwrap() {
-            let archive_path = archive.unwrap().path();
-            let archive_extension = archive_path.extension().unwrap();
-            // correct file extension
-            assert_eq!(archive_extension, "tar");
-        }
-    }
-
-    #[test]
-    fn test_point_vector_count() {
-        let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-        let original_segment = LockedSegment::new(build_segment_1(dir.path()));
-        let write_segment = LockedSegment::new(empty_segment(dir.path()));
-        let deleted_points = Arc::new(RwLock::new(HashSet::<PointIdType>::new()));
-
-        let deleted_indexes = Arc::new(RwLock::new(HashSet::<PayloadKeyType>::new()));
-        let created_indexes = Arc::new(RwLock::new(
-            HashMap::<PayloadKeyType, PayloadFieldSchema>::new(),
-        ));
-
-        let mut proxy_segment = ProxySegment::new(
-            original_segment,
-            write_segment,
-            deleted_points,
-            created_indexes,
-            deleted_indexes,
-        );
-
-        // We have 5 points by default, assert counts
-        let segment_info = proxy_segment.info();
-        assert_eq!(segment_info.num_points, 5);
-        assert_eq!(segment_info.num_vectors, 5);
-
-        // Delete non-existent point, counts should remain the same
-        proxy_segment.delete_point(101, 99999.into()).unwrap();
-        let segment_info = proxy_segment.info();
-        assert_eq!(segment_info.num_points, 5);
-        assert_eq!(segment_info.num_vectors, 5);
-
-        // Delete point 1, counts should derease by 1
-        proxy_segment.delete_point(102, 4.into()).unwrap();
-        let segment_info = proxy_segment.info();
-        assert_eq!(segment_info.num_points, 4);
-        assert_eq!(segment_info.num_vectors, 4);
-
-        // Delete vector of point 2, vector count should now be zero
-        proxy_segment
-            .delete_vector(103, 2.into(), DEFAULT_VECTOR_NAME)
-            .unwrap();
-        let segment_info = proxy_segment.info();
-        assert_eq!(segment_info.num_points, 4);
-        assert_eq!(segment_info.num_vectors, 3);
-    }
-
-    #[test]
-    fn test_point_vector_count_multivec() {
-        use segment::segment_constructor::build_segment;
-        use segment::types::{Distance, Indexes, VectorDataConfig, VectorStorageType};
-
-        // Create proxyied multivec segment
-        let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-        let dim = 1;
-        let config = SegmentConfig {
-            vector_data: HashMap::from([
-                (
-                    "a".into(),
-                    VectorDataConfig {
-                        size: dim,
-                        distance: Distance::Dot,
-                        storage_type: VectorStorageType::Memory,
-                        index: Indexes::Plain {},
-                        quantization_config: None,
-                    },
-                ),
-                (
-                    "b".into(),
-                    VectorDataConfig {
-                        size: dim,
-                        distance: Distance::Dot,
-                        storage_type: VectorStorageType::Memory,
-                        index: Indexes::Plain {},
-                        quantization_config: None,
-                    },
-                ),
-            ]),
-            payload_storage_type: Default::default(),
-        };
-        let mut original_segment = build_segment(dir.path(), &config, true).unwrap();
-        let write_segment = build_segment(dir.path(), &config, true).unwrap();
-
-        original_segment
-            .upsert_point(
-                100,
-                4.into(),
-                NamedVectors::from([("a".into(), vec![0.4]), ("b".into(), vec![0.5])]),
-            )
-            .unwrap();
-        original_segment
-            .upsert_point(
-                101,
-                6.into(),
-                NamedVectors::from([("a".into(), vec![0.6]), ("b".into(), vec![0.7])]),
-            )
-            .unwrap();
-
-        let original_segment = LockedSegment::new(original_segment);
-        let write_segment = LockedSegment::new(write_segment);
-        let deleted_points = Arc::new(RwLock::new(HashSet::<PointIdType>::new()));
-
-        let deleted_indexes = Arc::new(RwLock::new(HashSet::<PayloadKeyType>::new()));
-        let created_indexes = Arc::new(RwLock::new(
-            HashMap::<PayloadKeyType, PayloadFieldSchema>::new(),
-        ));
-
-        let mut proxy_segment = ProxySegment::new(
-            original_segment,
-            write_segment,
-            deleted_points,
-            created_indexes,
-            deleted_indexes,
-        );
-
-        // Assert counts from original segment
-        let segment_info = proxy_segment.info();
-        assert_eq!(segment_info.num_points, 2);
-        assert_eq!(segment_info.num_vectors, 4);
-
-        // Insert point ID 8 and 10 partially, assert counts
-        proxy_segment
-            .upsert_point(102, 8.into(), NamedVectors::from([("a".into(), vec![0.0])]))
-            .unwrap();
-        proxy_segment
-            .upsert_point(
-                103,
-                10.into(),
-                NamedVectors::from([("b".into(), vec![1.0])]),
-            )
-            .unwrap();
-        let segment_info = proxy_segment.info();
-        assert_eq!(segment_info.num_points, 4);
-        assert_eq!(segment_info.num_vectors, 6);
-
-        // Delete non-existent point, counts should remain the same
-        proxy_segment.delete_point(104, 1.into()).unwrap();
-        let segment_info = proxy_segment.info();
-        assert_eq!(segment_info.num_points, 4);
-        assert_eq!(segment_info.num_vectors, 6);
-
-        // Delete point 4, counts should derease by 1
-        proxy_segment.delete_point(105, 4.into()).unwrap();
-        let segment_info = proxy_segment.info();
-        assert_eq!(segment_info.num_points, 3);
-        assert_eq!(segment_info.num_vectors, 4);
-
-        // Delete vector 'a' of point 6, vector count should decrease by 1
-        proxy_segment.delete_vector(106, 6.into(), "a").unwrap();
-        let segment_info = proxy_segment.info();
-        assert_eq!(segment_info.num_points, 3);
-        assert_eq!(segment_info.num_vectors, 3);
-
-        // Deleting it again shouldn't chain anything
-        proxy_segment.delete_vector(107, 6.into(), "a").unwrap();
-        let segment_info = proxy_segment.info();
-        assert_eq!(segment_info.num_points, 3);
-        assert_eq!(segment_info.num_vectors, 3);
-
-        // Replace vector 'a' for point 8, counts should remain the same
-        proxy_segment
-            .upsert_point(108, 8.into(), NamedVectors::from([("a".into(), vec![0.0])]))
-            .unwrap();
-        let segment_info = proxy_segment.info();
-        assert_eq!(segment_info.num_points, 3);
-        assert_eq!(segment_info.num_vectors, 3);
-
-        // Replace both vectors for point 8, adding a new vector
-        proxy_segment
-            .upsert_point(
-                109,
-                8.into(),
-                NamedVectors::from([("a".into(), vec![0.0]), ("b".into(), vec![0.0])]),
-            )
-            .unwrap();
-        let segment_info = proxy_segment.info();
-        assert_eq!(segment_info.num_points, 3);
-        assert_eq!(segment_info.num_vectors, 4);
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/collection_manager/holders/segment_holder.rs b/crates/qdrant/lib/collection/src/collection_manager/holders/segment_holder.rs
deleted file mode 100644
index 8f51238..0000000
--- a/crates/qdrant/lib/collection/src/collection_manager/holders/segment_holder.rs
+++ /dev/null
@@ -1,768 +0,0 @@
-use std::cmp::{max, min};
-use std::collections::{BTreeMap, BTreeSet, BinaryHeap, HashMap, HashSet};
-use std::ops::{Deref, Mul};
-use std::path::Path;
-use std::sync::Arc;
-use std::thread::sleep;
-use std::time::Duration;
-
-use itertools::Itertools;
-use parking_lot::{RwLock, RwLockReadGuard, RwLockUpgradableReadGuard, RwLockWriteGuard};
-use rand::seq::SliceRandom;
-use rand::{thread_rng, Rng};
-use segment::entry::entry_point::{OperationError, OperationResult, SegmentEntry};
-use segment::segment::Segment;
-use segment::types::{PointIdType, SeqNumberType};
-
-use crate::collection_manager::holders::proxy_segment::ProxySegment;
-use crate::operations::types::CollectionError;
-
-pub type SegmentId = usize;
-
-const DROP_SPIN_TIMEOUT: Duration = Duration::from_millis(10);
-const DROP_DATA_TIMEOUT: Duration = Duration::from_secs(60 * 60);
-
-/// Object, which unifies the access to different types of segments, but still allows to
-/// access the original type of the segment if it is required for more efficient operations.
-pub enum LockedSegment {
-    Original(Arc<RwLock<Segment>>),
-    Proxy(Arc<RwLock<ProxySegment>>),
-}
-
-/// Internal structure for deduplication of points. Used for BinaryHeap
-#[derive(Eq, PartialEq)]
-struct DedupPoint {
-    point_id: PointIdType,
-    segment_id: SegmentId,
-}
-
-impl Ord for DedupPoint {
-    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
-        self.point_id.cmp(&other.point_id).reverse()
-    }
-}
-
-impl PartialOrd for DedupPoint {
-    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-fn try_unwrap_with_timeout<T>(
-    mut arc: Arc<T>,
-    spin: Duration,
-    timeout: Duration,
-) -> Result<T, Arc<T>> {
-    if timeout.is_zero() {
-        return Err(arc);
-    }
-
-    loop {
-        match Arc::try_unwrap(arc) {
-            inner @ Ok(_) => return inner,
-            Err(inner) => {
-                arc = inner;
-                sleep(spin);
-            }
-        }
-    }
-}
-
-impl LockedSegment {
-    pub fn new<T>(segment: T) -> Self
-    where
-        T: Into<LockedSegment>,
-    {
-        segment.into()
-    }
-
-    pub fn get(&self) -> Arc<RwLock<dyn SegmentEntry>> {
-        match self {
-            LockedSegment::Original(segment) => segment.clone(),
-            LockedSegment::Proxy(proxy) => proxy.clone(),
-        }
-    }
-
-    /// Consume the LockedSegment and drop the underlying segment data.
-    /// Operation fails if the segment is used by other thread for longer than `timeout`.
-    pub fn drop_data(self) -> OperationResult<()> {
-        match self {
-            LockedSegment::Original(segment) => {
-                match try_unwrap_with_timeout(segment, DROP_SPIN_TIMEOUT, DROP_DATA_TIMEOUT) {
-                    Ok(raw_locked_segment) => raw_locked_segment.into_inner().drop_data(),
-                    Err(locked_segment) => Err(OperationError::service_error(format!(
-                        "Removing segment which is still in use: {:?}",
-                        locked_segment.read().data_path()
-                    ))),
-                }
-            }
-            LockedSegment::Proxy(proxy) => {
-                match try_unwrap_with_timeout(proxy, DROP_SPIN_TIMEOUT, DROP_DATA_TIMEOUT) {
-                    Ok(raw_locked_segment) => raw_locked_segment.into_inner().drop_data(),
-                    Err(locked_segment) => Err(OperationError::service_error(format!(
-                        "Removing proxy segment which is still in use: {:?}",
-                        locked_segment.read().data_path()
-                    ))),
-                }
-            }
-        }
-    }
-}
-
-impl Clone for LockedSegment {
-    fn clone(&self) -> Self {
-        match self {
-            LockedSegment::Original(x) => LockedSegment::Original(x.clone()),
-            LockedSegment::Proxy(x) => LockedSegment::Proxy(x.clone()),
-        }
-    }
-
-    fn clone_from(&mut self, source: &Self) {
-        *self = source.clone();
-    }
-}
-
-impl From<Segment> for LockedSegment {
-    fn from(s: Segment) -> Self {
-        LockedSegment::Original(Arc::new(RwLock::new(s)))
-    }
-}
-
-impl From<ProxySegment> for LockedSegment {
-    fn from(s: ProxySegment) -> Self {
-        LockedSegment::Proxy(Arc::new(RwLock::new(s)))
-    }
-}
-
-#[derive(Default)]
-pub struct SegmentHolder {
-    segments: HashMap<SegmentId, LockedSegment>,
-    /// Seq number of the first un-recovered operation.
-    /// If there are no failed operation - None
-    pub failed_operation: BTreeSet<SeqNumberType>,
-
-    /// Holds the first uncorrected error happened with optimizer
-    pub optimizer_errors: Option<CollectionError>,
-}
-
-pub type LockedSegmentHolder = Arc<RwLock<SegmentHolder>>;
-
-impl<'s> SegmentHolder {
-    pub fn iter(&'s self) -> impl Iterator<Item = (&SegmentId, &LockedSegment)> + 's {
-        self.segments.iter()
-    }
-
-    pub fn len(&self) -> usize {
-        self.segments.len()
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.segments.is_empty()
-    }
-
-    fn generate_new_key(&self) -> SegmentId {
-        let key = thread_rng().gen::<SegmentId>();
-        if self.segments.contains_key(&key) {
-            self.generate_new_key()
-        } else {
-            key
-        }
-    }
-
-    /// Add new segment to storage
-    pub fn add<T>(&mut self, segment: T) -> SegmentId
-    where
-        T: Into<LockedSegment>,
-    {
-        let key = self.generate_new_key();
-        self.segments.insert(key, segment.into());
-        key
-    }
-
-    /// Add new segment to storage which is already LockedSegment
-    pub fn add_locked(&mut self, segment: LockedSegment) -> SegmentId {
-        let key = self.generate_new_key();
-        self.segments.insert(key, segment);
-        key
-    }
-
-    pub fn remove(&mut self, remove_ids: &[SegmentId]) -> Vec<LockedSegment> {
-        let mut removed_segments = vec![];
-        for remove_id in remove_ids {
-            let removed_segment = self.segments.remove(remove_id);
-            if let Some(segment) = removed_segment {
-                removed_segments.push(segment);
-            }
-        }
-        removed_segments
-    }
-
-    /// Replace old segments with a new one
-    ///
-    /// # Arguments
-    ///
-    /// * `segment` - segment to insert
-    /// * `remove_ids` - ids of segments to replace
-    ///
-    /// # Result
-    ///
-    /// Pair of (id of newly inserted segment, Vector of replaced segments)
-    ///
-    pub fn swap<T>(
-        &mut self,
-        segment: T,
-        remove_ids: &[SegmentId],
-    ) -> (SegmentId, Vec<LockedSegment>)
-    where
-        T: Into<LockedSegment>,
-    {
-        let new_id = self.add(segment);
-        (new_id, self.remove(remove_ids))
-    }
-
-    pub fn get(&self, id: SegmentId) -> Option<&LockedSegment> {
-        self.segments.get(&id)
-    }
-
-    pub fn appendable_segments(&self) -> Vec<SegmentId> {
-        self.segments
-            .iter()
-            .filter(|(_idx, seg)| seg.get().read().is_appendable())
-            .map(|(idx, _seg)| *idx)
-            .collect()
-    }
-
-    pub fn non_appendable_segments(&self) -> Vec<SegmentId> {
-        self.segments
-            .iter()
-            .filter(|(_idx, seg)| !seg.get().read().is_appendable())
-            .map(|(idx, _seg)| *idx)
-            .collect()
-    }
-
-    pub fn random_appendable_segment(&self) -> Option<LockedSegment> {
-        let segment_ids: Vec<_> = self.appendable_segments();
-        segment_ids
-            .choose(&mut rand::thread_rng())
-            .and_then(|idx| self.segments.get(idx).cloned())
-    }
-
-    /// Selects point ids, which is stored in this segment
-    fn segment_points(&self, ids: &[PointIdType], segment: &dyn SegmentEntry) -> Vec<PointIdType> {
-        ids.iter()
-            .cloned()
-            .filter(|id| segment.has_point(*id))
-            .collect()
-    }
-
-    pub fn for_each_segment<F>(&self, mut f: F) -> OperationResult<usize>
-    where
-        F: FnMut(&RwLockReadGuard<dyn SegmentEntry + 'static>) -> OperationResult<bool>,
-    {
-        let mut processed_segments = 0;
-        for segment in self.segments.values() {
-            let is_applied = f(&segment.get().read())?;
-            processed_segments += is_applied as usize;
-        }
-        Ok(processed_segments)
-    }
-
-    pub fn apply_segments<F>(&self, mut f: F) -> OperationResult<usize>
-    where
-        F: FnMut(&mut RwLockWriteGuard<dyn SegmentEntry + 'static>) -> OperationResult<bool>,
-    {
-        let mut processed_segments = 0;
-        for segment in self.segments.values() {
-            let is_applied = f(&mut segment.get().write())?;
-            processed_segments += is_applied as usize;
-        }
-        Ok(processed_segments)
-    }
-
-    pub fn apply_points<F>(&self, ids: &[PointIdType], mut f: F) -> OperationResult<usize>
-    where
-        F: FnMut(
-            PointIdType,
-            SegmentId,
-            &mut RwLockWriteGuard<dyn SegmentEntry>,
-        ) -> OperationResult<bool>,
-    {
-        let mut applied_points = 0;
-        for (idx, segment) in &self.segments {
-            // Collect affected points first, we want to lock segment for writing as rare as possible
-            let segment_arc = segment.get();
-            let segment_lock = segment_arc.upgradable_read();
-            let segment_points = self.segment_points(ids, segment_lock.deref());
-            if !segment_points.is_empty() {
-                let mut write_segment = RwLockUpgradableReadGuard::upgrade(segment_lock);
-                for point_id in segment_points {
-                    let is_applied = f(point_id, *idx, &mut write_segment)?;
-                    applied_points += is_applied as usize;
-                }
-            }
-        }
-        Ok(applied_points)
-    }
-
-    /// Try to acquire write lock over random segment with increasing wait time.
-    /// Should prevent deadlock in case if multiple threads tries to lock segments sequentially.
-    pub fn aloha_random_write<F>(
-        &self,
-        segment_ids: &[SegmentId],
-        mut apply: F,
-    ) -> OperationResult<bool>
-    where
-        F: FnMut(SegmentId, &mut RwLockWriteGuard<dyn SegmentEntry>) -> OperationResult<bool>,
-    {
-        if segment_ids.is_empty() {
-            return Err(OperationError::service_error(
-                "No appendable segments exists, expected at least one",
-            ));
-        }
-
-        let mut entries: Vec<_> = Default::default();
-
-        // Try to access each segment first without any timeout (fast)
-        for segment_id in segment_ids {
-            let segment_opt = self.segments.get(segment_id).map(|x| x.get());
-            match segment_opt {
-                None => {}
-                Some(segment_lock) => {
-                    match segment_lock.try_write() {
-                        None => {}
-                        Some(mut lock) => return apply(*segment_id, &mut lock),
-                    }
-                    // save segments for further lock attempts
-                    entries.push((*segment_id, segment_lock))
-                }
-            };
-        }
-
-        let mut rng = rand::thread_rng();
-        let mut timeout = Duration::from_nanos(100);
-        loop {
-            let (segment_id, segment_lock) = entries.choose(&mut rng).unwrap();
-            let opt_segment_guard = segment_lock.try_write_for(timeout);
-
-            match opt_segment_guard {
-                None => timeout = timeout.mul(2), // Wait longer next time
-                Some(mut lock) => {
-                    return apply(*segment_id, &mut lock);
-                }
-            }
-        }
-    }
-
-    /// Update function wrapper, which ensures that updates are not applied written to un-appendable segment.
-    /// In case of such attempt, this function will move data into a mutable segment and remove data from un-appendable.
-    /// Returns: Set of point ids which were successfully(already) applied to segments
-    pub fn apply_points_to_appendable<F>(
-        &self,
-        op_num: SeqNumberType,
-        ids: &[PointIdType],
-        mut f: F,
-    ) -> OperationResult<HashSet<PointIdType>>
-    where
-        F: FnMut(PointIdType, &mut RwLockWriteGuard<dyn SegmentEntry>) -> OperationResult<bool>,
-    {
-        // Choose random appendable segment from this
-        let appendable_segments = self.appendable_segments();
-
-        let mut applied_points: HashSet<PointIdType> = Default::default();
-
-        let _applied_points_count = self.apply_points(ids, |point_id, _idx, write_segment| {
-            if let Some(point_version) = write_segment.point_version(point_id) {
-                if point_version >= op_num {
-                    applied_points.insert(point_id);
-                    return Ok(false);
-                }
-            }
-
-            let is_applied = if write_segment.is_appendable() {
-                f(point_id, write_segment)?
-            } else {
-                self.aloha_random_write(
-                    &appendable_segments,
-                    |_appendable_idx, appendable_write_segment| {
-                        let all_vectors = write_segment.all_vectors(point_id)?;
-                        let payload = write_segment.payload(point_id)?;
-
-                        appendable_write_segment.upsert_point(op_num, point_id, all_vectors)?;
-                        appendable_write_segment.set_full_payload(op_num, point_id, &payload)?;
-
-                        write_segment.delete_point(op_num, point_id)?;
-
-                        f(point_id, appendable_write_segment)
-                    },
-                )?
-            };
-            applied_points.insert(point_id);
-            Ok(is_applied)
-        })?;
-        Ok(applied_points)
-    }
-
-    pub fn read_points<F>(&self, ids: &[PointIdType], mut f: F) -> OperationResult<usize>
-    where
-        F: FnMut(PointIdType, &RwLockReadGuard<dyn SegmentEntry>) -> OperationResult<bool>,
-    {
-        let mut read_points = 0;
-        for segment in self.segments.values() {
-            let segment_arc = segment.get();
-            let read_segment = segment_arc.read();
-            for point in ids.iter().cloned().filter(|id| read_segment.has_point(*id)) {
-                let is_ok = f(point, &read_segment)?;
-                read_points += is_ok as usize;
-            }
-        }
-        Ok(read_points)
-    }
-
-    /// Defines flush ordering for segments.
-    ///
-    /// Flush appendable segments first, then non-appendable.
-    /// This is done to ensure that all data, transferred from non-appendable segments to appendable segments
-    /// is persisted, before marking records in non-appendable segments as removed.
-    fn segment_flush_ordering(&self) -> impl Iterator<Item = SegmentId> {
-        let appendable_segments = self.appendable_segments();
-        let non_appendable_segments = self.non_appendable_segments();
-
-        appendable_segments
-            .into_iter()
-            .chain(non_appendable_segments.into_iter())
-    }
-
-    /// Flushes all segments and returns maximum version to persist
-    ///
-    /// If there are unsaved changes after flush - detects lowest unsaved change version.
-    /// If all changes are saved - returns max version.
-    pub fn flush_all(&self, sync: bool) -> OperationResult<SeqNumberType> {
-        let mut max_persisted_version: SeqNumberType = SeqNumberType::MIN;
-        let mut min_unsaved_version: SeqNumberType = SeqNumberType::MAX;
-        let mut has_unsaved = false;
-
-        for segment_id in self.segment_flush_ordering() {
-            let segment = self.segments.get(&segment_id).unwrap();
-            let segment_lock = segment.get();
-            let read_segment = segment_lock.read();
-            let segment_version = read_segment.version();
-            let segment_persisted_version = read_segment.flush(sync)?;
-
-            if segment_version > segment_persisted_version {
-                has_unsaved = true;
-                min_unsaved_version = min(min_unsaved_version, segment_persisted_version);
-            }
-
-            max_persisted_version = max(max_persisted_version, segment_persisted_version)
-        }
-        if has_unsaved {
-            Ok(min_unsaved_version)
-        } else {
-            Ok(max_persisted_version)
-        }
-    }
-
-    /// Take a snapshot of all segments into `snapshot_dir_path`
-    ///
-    /// Shortcuts at the first failing segment snapshot
-    pub fn snapshot_all_segments(
-        &self,
-        temp_dir: &Path,
-        snapshot_dir_path: &Path,
-    ) -> OperationResult<()> {
-        for segment in self.segments.values() {
-            let segment_lock = segment.get();
-            let read_segment = segment_lock.read();
-            read_segment.take_snapshot(temp_dir, snapshot_dir_path)?;
-        }
-        Ok(())
-    }
-
-    pub fn report_optimizer_error<E: Into<CollectionError>>(&mut self, error: E) {
-        if self.optimizer_errors.is_none() {
-            self.optimizer_errors = Some(error.into());
-        }
-    }
-
-    /// Duplicated points can appear in case of interrupted optimization.
-    /// LocalShard can still work with duplicated points, but it is better to remove them.
-    /// Duplicated points should not affect the search results.
-    ///
-    /// Checks all segments and removes duplicated and outdated points.
-    /// If two points have the same id, the point with the highest version is kept.
-    /// If two points have the same id and version, one of them is kept.
-    ///
-    /// Deduplication works with plain segments only.
-    pub fn deduplicate_points(&self) -> OperationResult<usize> {
-        let points_to_remove = self.find_duplicated_points()?;
-
-        let mut removed_points = 0;
-        for (segment_id, points) in points_to_remove {
-            let locked_segment = self.segments.get(&segment_id).unwrap();
-            let segment_arc = locked_segment.get();
-            let mut write_segment = segment_arc.write();
-            for point_id in points {
-                if let Some(point_version) = write_segment.point_version(point_id) {
-                    removed_points += 1;
-                    write_segment.delete_point(point_version, point_id)?;
-                }
-            }
-        }
-        Ok(removed_points)
-    }
-
-    fn find_duplicated_points(&self) -> OperationResult<HashMap<SegmentId, Vec<PointIdType>>> {
-        let segments = self
-            .segments
-            .iter()
-            .map(|(&segment_id, locked_segment)| (segment_id, locked_segment.get()))
-            .collect_vec();
-        let locked_segments = BTreeMap::from_iter(
-            segments
-                .iter()
-                .map(|(segment_id, locked_segment)| (*segment_id, locked_segment.read())),
-        );
-        let mut iterators = BTreeMap::from_iter(
-            locked_segments
-                .iter()
-                .map(|(segment_id, locked_segment)| (*segment_id, locked_segment.iter_points())),
-        );
-
-        // heap contains the current iterable point id from each segment
-        let mut heap = iterators
-            .iter_mut()
-            .filter_map(|(&segment_id, iter)| {
-                iter.next().map(|point_id| DedupPoint {
-                    segment_id,
-                    point_id,
-                })
-            })
-            .collect::<BinaryHeap<_>>();
-
-        let mut last_point_id_opt = None;
-        let mut last_segment_id_opt = None;
-        let mut last_point_version_opt = None;
-        let mut points_to_remove: HashMap<SegmentId, Vec<PointIdType>> = Default::default();
-
-        while let Some(entry) = heap.pop() {
-            let point_id = entry.point_id;
-            let segment_id = entry.segment_id;
-            if let Some(next_point_id) = iterators.get_mut(&segment_id).and_then(|i| i.next()) {
-                heap.push(DedupPoint {
-                    segment_id,
-                    point_id: next_point_id,
-                });
-            }
-
-            if last_point_id_opt == Some(point_id) {
-                let last_point_id = last_point_id_opt.unwrap();
-                let last_segment_id = last_segment_id_opt.unwrap();
-
-                let point_version = locked_segments[&segment_id].point_version(point_id);
-                let last_point_version = if let Some(last_point_version) = last_point_version_opt {
-                    last_point_version
-                } else {
-                    let version = locked_segments[&last_segment_id].point_version(last_point_id);
-                    last_point_version_opt = Some(version);
-                    version
-                };
-
-                // choose newer version between point_id and last_point_id
-                if point_version < last_point_version {
-                    points_to_remove
-                        .entry(segment_id)
-                        .or_default()
-                        .push(point_id);
-                } else {
-                    last_point_id_opt = Some(point_id);
-                    last_segment_id_opt = Some(segment_id);
-                    last_point_version_opt = Some(point_version);
-                    points_to_remove
-                        .entry(last_segment_id)
-                        .or_default()
-                        .push(last_point_id);
-                }
-            } else {
-                last_point_id_opt = Some(point_id);
-                last_segment_id_opt = Some(segment_id);
-            }
-        }
-
-        Ok(points_to_remove)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::fs::read_dir;
-    use std::{thread, time};
-
-    use segment::segment_constructor::simple_segment_constructor::build_simple_segment;
-    use segment::types::Distance;
-    use serde_json::json;
-    use tempfile::Builder;
-
-    use super::*;
-    use crate::collection_manager::fixtures::{build_segment_1, build_segment_2};
-
-    #[test]
-    fn test_add_and_swap() {
-        let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-        let segment1 = build_segment_1(dir.path());
-        let segment2 = build_segment_2(dir.path());
-
-        let mut holder = SegmentHolder::default();
-
-        let sid1 = holder.add(segment1);
-        let sid2 = holder.add(segment2);
-
-        assert_ne!(sid1, sid2);
-
-        let segment3 = build_simple_segment(dir.path(), 4, Distance::Dot).unwrap();
-
-        let (_sid3, replaced_segments) = holder.swap(segment3, &[sid1, sid2]);
-        replaced_segments
-            .into_iter()
-            .for_each(|s| s.drop_data().unwrap());
-    }
-
-    #[test]
-    fn test_aloha_locking() {
-        let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-
-        let segment1 = build_segment_1(dir.path());
-        let segment2 = build_segment_2(dir.path());
-
-        let mut holder = SegmentHolder::default();
-
-        let sid1 = holder.add(segment1);
-        let sid2 = holder.add(segment2);
-
-        let locked_segment1 = holder.get(sid1).unwrap().get();
-        let locked_segment2 = holder.get(sid2).unwrap().clone();
-
-        let _read_lock_1 = locked_segment1.read();
-
-        let handler = thread::spawn(move || {
-            let lc = locked_segment2.get();
-            let _guard = lc.read();
-            thread::sleep(time::Duration::from_millis(100));
-        });
-
-        thread::sleep(time::Duration::from_millis(10));
-
-        holder
-            .aloha_random_write(&[sid1, sid2], |idx, _seg| {
-                assert_eq!(idx, sid2);
-                Ok(true)
-            })
-            .unwrap();
-
-        handler.join().unwrap();
-    }
-
-    #[test]
-    fn test_apply_to_appendable() {
-        let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-
-        let segment1 = build_segment_1(dir.path());
-        let mut segment2 = build_segment_2(dir.path());
-
-        segment2.appendable_flag = false;
-
-        let mut holder = SegmentHolder::default();
-
-        let sid1 = holder.add(segment1);
-        let _sid2 = holder.add(segment2);
-
-        let op_num = 100;
-        let mut processed_points: Vec<PointIdType> = vec![];
-        holder
-            .apply_points_to_appendable(
-                op_num,
-                &[1.into(), 2.into(), 11.into(), 12.into()],
-                |point_id, segment| {
-                    processed_points.push(point_id);
-                    assert!(segment.has_point(point_id));
-                    Ok(true)
-                },
-            )
-            .unwrap();
-
-        assert_eq!(4, processed_points.len());
-
-        let locked_segment_1 = holder.get(sid1).unwrap().get();
-        let read_segment_1 = locked_segment_1.read();
-
-        assert!(read_segment_1.has_point(1.into()));
-        assert!(read_segment_1.has_point(2.into()));
-
-        // Points moved on apply
-        assert!(read_segment_1.has_point(11.into()));
-        assert!(read_segment_1.has_point(12.into()));
-    }
-
-    #[test]
-    fn test_points_deduplication() {
-        let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-
-        let mut segment1 = build_segment_1(dir.path());
-        let mut segment2 = build_segment_1(dir.path());
-
-        segment1
-            .set_payload(100, 1.into(), &json!({}).into())
-            .unwrap();
-        segment1
-            .set_payload(100, 2.into(), &json!({}).into())
-            .unwrap();
-
-        segment2
-            .set_payload(200, 4.into(), &json!({}).into())
-            .unwrap();
-        segment2
-            .set_payload(200, 5.into(), &json!({}).into())
-            .unwrap();
-
-        let mut holder = SegmentHolder::default();
-
-        let sid1 = holder.add(segment1);
-        let sid2 = holder.add(segment2);
-
-        let res = holder.deduplicate_points().unwrap();
-
-        assert_eq!(5, res);
-
-        assert!(holder.get(sid1).unwrap().get().read().has_point(1.into()));
-        assert!(holder.get(sid1).unwrap().get().read().has_point(2.into()));
-        assert!(!holder.get(sid2).unwrap().get().read().has_point(1.into()));
-        assert!(!holder.get(sid2).unwrap().get().read().has_point(2.into()));
-
-        assert!(holder.get(sid2).unwrap().get().read().has_point(4.into()));
-        assert!(holder.get(sid2).unwrap().get().read().has_point(5.into()));
-        assert!(!holder.get(sid1).unwrap().get().read().has_point(4.into()));
-        assert!(!holder.get(sid1).unwrap().get().read().has_point(5.into()));
-    }
-
-    #[test]
-    fn test_snapshot_all() {
-        let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-        let segment1 = build_segment_1(dir.path());
-        let segment2 = build_segment_2(dir.path());
-
-        let mut holder = SegmentHolder::default();
-
-        let sid1 = holder.add(segment1);
-        let sid2 = holder.add(segment2);
-        assert_ne!(sid1, sid2);
-
-        let temp_dir = Builder::new().prefix("temp_dir").tempdir().unwrap();
-        let snapshot_dir = Builder::new().prefix("snapshot_dir").tempdir().unwrap();
-        holder
-            .snapshot_all_segments(temp_dir.path(), snapshot_dir.path())
-            .unwrap();
-
-        let archive_count = read_dir(&snapshot_dir).unwrap().count();
-        // one archive produced per concrete segment in the SegmentHolder
-        assert_eq!(archive_count, 2);
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/collection_manager/mod.rs b/crates/qdrant/lib/collection/src/collection_manager/mod.rs
deleted file mode 100644
index a7c456a..0000000
--- a/crates/qdrant/lib/collection/src/collection_manager/mod.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-pub mod collection_updater;
-pub mod holders;
-pub mod optimizers;
-pub mod segments_searcher;
-
-mod probabilistic_segment_search_sampling;
-mod search_result_aggregator;
-mod segments_updater;
-
-#[allow(dead_code)]
-pub(crate) mod fixtures;
-
-#[cfg(test)]
-mod tests;
diff --git a/crates/qdrant/lib/collection/src/collection_manager/optimizers/config_mismatch_optimizer.rs b/crates/qdrant/lib/collection/src/collection_manager/optimizers/config_mismatch_optimizer.rs
deleted file mode 100644
index 3f6e623..0000000
--- a/crates/qdrant/lib/collection/src/collection_manager/optimizers/config_mismatch_optimizer.rs
+++ /dev/null
@@ -1,714 +0,0 @@
-use std::borrow::Cow;
-use std::collections::HashSet;
-use std::path::{Path, PathBuf};
-use std::sync::Arc;
-
-use parking_lot::Mutex;
-use segment::common::operation_time_statistics::{
-    OperationDurationStatistics, OperationDurationsAggregator,
-};
-use segment::types::{HnswConfig, Indexes, QuantizationConfig, SegmentType, VECTOR_ELEMENT_SIZE};
-
-use crate::collection_manager::holders::segment_holder::{LockedSegmentHolder, SegmentId};
-use crate::collection_manager::optimizers::segment_optimizer::{
-    OptimizerThresholds, SegmentOptimizer,
-};
-use crate::config::CollectionParams;
-use crate::operations::config_diff::DiffConfig;
-
-/// Looks for segments having a mismatch between configured and actual parameters
-///
-/// For example, a user may change the HNSW parameters for a collection. A segment that was already
-/// indexed with different parameters now has a mismatch. This segment should be optimized (and
-/// indexed) again in order to update the effective configuration.
-pub struct ConfigMismatchOptimizer {
-    thresholds_config: OptimizerThresholds,
-    segments_path: PathBuf,
-    collection_temp_dir: PathBuf,
-    collection_params: CollectionParams,
-    hnsw_config: HnswConfig,
-    quantization_config: Option<QuantizationConfig>,
-    telemetry_durations_aggregator: Arc<Mutex<OperationDurationsAggregator>>,
-}
-
-impl ConfigMismatchOptimizer {
-    pub fn new(
-        thresholds_config: OptimizerThresholds,
-        segments_path: PathBuf,
-        collection_temp_dir: PathBuf,
-        collection_params: CollectionParams,
-        hnsw_config: HnswConfig,
-        quantization_config: Option<QuantizationConfig>,
-    ) -> Self {
-        ConfigMismatchOptimizer {
-            thresholds_config,
-            segments_path,
-            collection_temp_dir,
-            collection_params,
-            hnsw_config,
-            quantization_config,
-            telemetry_durations_aggregator: OperationDurationsAggregator::new(),
-        }
-    }
-
-    /// Check if current configuration requires vectors to be stored on disk
-    fn check_if_vectors_on_disk(&self, vector_name: &str) -> Option<bool> {
-        self.collection_params
-            .vectors
-            .get_params(vector_name)
-            .and_then(|vector_params| vector_params.on_disk)
-    }
-
-    /// Calculates and HNSW config that should be used for a given vector
-    /// with current configuration.
-    ///
-    /// Takes vector-specific HNSW config (if any) and merges it with the collection-wide config.
-    fn get_required_hnsw_config(&self, vector_name: &str) -> Cow<HnswConfig> {
-        let target_hnsw_collection = &self.hnsw_config;
-        // Select vector specific target HNSW config
-        let target_hnsw_vector = self
-            .collection_params
-            .vectors
-            .get_params(vector_name)
-            .and_then(|vector_params| vector_params.hnsw_config)
-            .map(|vector_hnsw| vector_hnsw.update(target_hnsw_collection))
-            .and_then(|hnsw| match hnsw {
-                Ok(hnsw) => Some(hnsw),
-                Err(err) => {
-                    log::warn!(
-                        "Failed to merge collection and vector HNSW config, ignoring: {err}"
-                    );
-                    None
-                }
-            });
-        match target_hnsw_vector {
-            Some(target_hnsw) => Cow::Owned(target_hnsw),
-            None => Cow::Borrowed(target_hnsw_collection),
-        }
-    }
-
-    fn worst_segment(
-        &self,
-        segments: LockedSegmentHolder,
-        excluded_ids: &HashSet<SegmentId>,
-    ) -> Vec<SegmentId> {
-        let segments_read_guard = segments.read();
-        let candidates: Vec<_> = segments_read_guard
-            .iter()
-            // Excluded externally, might already be scheduled for optimization
-            .filter(|(idx, _)| !excluded_ids.contains(idx))
-            .filter_map(|(idx, segment)| {
-                let segment_entry = segment.get();
-                let read_segment = segment_entry.read();
-                let point_count = read_segment.available_point_count();
-                let vector_size = point_count
-                    * read_segment
-                        .vector_dims()
-                        .values()
-                        .max()
-                        .copied()
-                        .unwrap_or(0)
-                    * VECTOR_ELEMENT_SIZE;
-
-                let segment_config = read_segment.config();
-
-                if read_segment.segment_type() == SegmentType::Special {
-                    return None; // Never optimize already optimized segment
-                }
-
-                if self.collection_params.on_disk_payload
-                    != segment_config.payload_storage_type.is_on_disk()
-                {
-                    return Some((*idx, vector_size)); // Skip segments with payload mismatch
-                }
-
-                // Determine whether segment has mismatch
-                let has_mismatch =
-                    segment_config
-                        .vector_data
-                        .iter()
-                        .any(|(vector_name, vector_data)| {
-                            // Check HNSW mismatch
-                            match &vector_data.index {
-                                Indexes::Plain {} => {}
-                                Indexes::Hnsw(effective_hnsw) => {
-                                    // Select segment if we have an HNSW mismatch that requires rebuild
-                                    let target_hnsw = self.get_required_hnsw_config(vector_name);
-                                    if effective_hnsw.mismatch_requires_rebuild(&target_hnsw) {
-                                        return true;
-                                    }
-                                }
-                            }
-
-                            if let Some(is_required_on_disk) =
-                                self.check_if_vectors_on_disk(vector_name)
-                            {
-                                if is_required_on_disk != vector_data.storage_type.is_on_disk() {
-                                    return true;
-                                }
-                            }
-
-                            // Check quantization mismatch
-                            let target_quantization_collection = self.quantization_config.as_ref();
-                            let target_quantization_vector = self
-                                .collection_params
-                                .vectors
-                                .get_params(vector_name)
-                                .and_then(|vector_params| {
-                                    vector_params.quantization_config.clone()
-                                });
-                            let target_quantization = target_quantization_vector
-                                .as_ref()
-                                .or(target_quantization_collection);
-                            let quantization_mismatch = vector_data
-                                .quantization_config
-                                .as_ref()
-                                .zip(target_quantization)
-                                // Rebuild if current parameters differ from target parameters
-                                .map(|(current, target)| current.mismatch_requires_rebuild(target))
-                                // Or rebuild if we now change the enabled state on an indexed segment
-                                .unwrap_or_else(|| {
-                                    vector_data.index.is_indexed()
-                                        && (vector_data.quantization_config.is_some()
-                                            != target_quantization.is_some())
-                                });
-
-                            quantization_mismatch
-                        });
-
-                has_mismatch.then_some((*idx, vector_size))
-            })
-            .collect();
-
-        // Select segment with largest vector size
-        candidates
-            .into_iter()
-            .max_by_key(|(_, vector_size)| *vector_size)
-            .map(|(segment_id, _)| segment_id)
-            .into_iter()
-            .collect()
-    }
-}
-
-impl SegmentOptimizer for ConfigMismatchOptimizer {
-    fn collection_path(&self) -> &Path {
-        self.segments_path.as_path()
-    }
-
-    fn temp_path(&self) -> &Path {
-        self.collection_temp_dir.as_path()
-    }
-
-    fn collection_params(&self) -> CollectionParams {
-        self.collection_params.clone()
-    }
-
-    fn hnsw_config(&self) -> &HnswConfig {
-        &self.hnsw_config
-    }
-
-    fn quantization_config(&self) -> Option<QuantizationConfig> {
-        self.quantization_config.clone()
-    }
-
-    fn threshold_config(&self) -> &OptimizerThresholds {
-        &self.thresholds_config
-    }
-
-    fn check_condition(
-        &self,
-        segments: LockedSegmentHolder,
-        excluded_ids: &HashSet<SegmentId>,
-    ) -> Vec<SegmentId> {
-        self.worst_segment(segments, excluded_ids)
-    }
-
-    fn get_telemetry_data(&self) -> OperationDurationStatistics {
-        self.get_telemetry_counter().lock().get_statistics()
-    }
-
-    fn get_telemetry_counter(&self) -> Arc<Mutex<OperationDurationsAggregator>> {
-        self.telemetry_durations_aggregator.clone()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::collections::BTreeMap;
-    use std::sync::Arc;
-
-    use parking_lot::RwLock;
-    use segment::entry::entry_point::SegmentEntry;
-    use segment::types::{
-        CompressionRatio, Distance, ProductQuantization, ProductQuantizationConfig,
-        ScalarQuantizationConfig, ScalarType,
-    };
-    use tempfile::Builder;
-
-    use super::*;
-    use crate::collection_manager::fixtures::{random_multi_vec_segment, random_segment};
-    use crate::collection_manager::holders::segment_holder::{LockedSegment, SegmentHolder};
-    use crate::collection_manager::optimizers::indexing_optimizer::IndexingOptimizer;
-    use crate::operations::config_diff::HnswConfigDiff;
-    use crate::operations::types::{VectorParams, VectorsConfig};
-
-    /// This test the config mismatch optimizer for a changed HNSW config
-    ///
-    /// It tests whether:
-    /// - the condition check for HNSW mismatches works
-    /// - optimized segments (and vector storages) use the updated configuration
-    ///
-    /// In short, this is what happens in this test:
-    /// - create randomized segment as base
-    /// - use indexing optimizer to build index for our segment
-    /// - test config mismatch condition: should not trigger yet
-    /// - change collection HNSW config
-    /// - test config mismatch condition: should trigger due to HNSW change
-    /// - optimize segment with config mismatch optimizer
-    /// - assert segment uses changed configuration
-    #[test]
-    fn test_hnsw_config_mismatch() {
-        // Collection configuration
-        let (point_count, dim) = (1000, 10);
-        let thresholds_config = OptimizerThresholds {
-            max_segment_size: std::usize::MAX,
-            memmap_threshold: std::usize::MAX,
-            indexing_threshold: 10,
-        };
-        let collection_params = CollectionParams {
-            vectors: VectorsConfig::Single(VectorParams {
-                size: dim.try_into().unwrap(),
-                distance: Distance::Dot,
-                hnsw_config: None,
-                quantization_config: None,
-                on_disk: None,
-            }),
-            shard_number: 1.try_into().unwrap(),
-            on_disk_payload: false,
-            replication_factor: 1.try_into().unwrap(),
-            write_consistency_factor: 1.try_into().unwrap(),
-        };
-
-        // Base segment
-        let temp_dir = Builder::new().prefix("segment_temp_dir").tempdir().unwrap();
-        let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-        let mut holder = SegmentHolder::default();
-
-        let segment = random_segment(dir.path(), 100, point_count, dim as usize);
-
-        let segment_id = holder.add(segment);
-        let locked_holder: Arc<RwLock<_>> = Arc::new(RwLock::new(holder));
-
-        let hnsw_config = HnswConfig {
-            m: 16,
-            ef_construct: 100,
-            full_scan_threshold: 10,
-            max_indexing_threads: 0,
-            on_disk: None,
-            payload_m: None,
-        };
-
-        // Optimizers used in test
-        let index_optimizer = IndexingOptimizer::new(
-            thresholds_config.clone(),
-            dir.path().to_owned(),
-            temp_dir.path().to_owned(),
-            collection_params.clone(),
-            hnsw_config.clone(),
-            Default::default(),
-        );
-        let mut config_mismatch_optimizer = ConfigMismatchOptimizer::new(
-            thresholds_config,
-            dir.path().to_owned(),
-            temp_dir.path().to_owned(),
-            collection_params,
-            hnsw_config.clone(),
-            Default::default(),
-        );
-
-        // Use indexing optimizer to build index for HNSW mismatch test
-        let changed = index_optimizer
-            .optimize(locked_holder.clone(), vec![segment_id], &false.into())
-            .unwrap();
-        assert!(changed, "optimizer should have rebuilt this segment");
-        assert!(
-            locked_holder.read().get(segment_id).is_none(),
-            "optimized segment should be gone",
-        );
-        assert_eq!(locked_holder.read().len(), 2, "index must be built");
-
-        // Mismatch optimizer should not optimize yet, HNSW config is not changed yet
-        let suggested_to_optimize =
-            config_mismatch_optimizer.check_condition(locked_holder.clone(), &Default::default());
-        assert_eq!(suggested_to_optimize.len(), 0);
-
-        // Create changed HNSW config with other m/ef_construct value, update it in the optimizer
-        let mut changed_hnsw_config = hnsw_config;
-        changed_hnsw_config.m /= 2;
-        changed_hnsw_config.ef_construct /= 5;
-        config_mismatch_optimizer.hnsw_config = changed_hnsw_config.clone();
-
-        // Run mismatch optimizer again, make sure it optimizes now
-        let suggested_to_optimize =
-            config_mismatch_optimizer.check_condition(locked_holder.clone(), &Default::default());
-        assert_eq!(suggested_to_optimize.len(), 1);
-        let changed = config_mismatch_optimizer
-            .optimize(locked_holder.clone(), suggested_to_optimize, &false.into())
-            .unwrap();
-        assert!(changed, "optimizer should have rebuilt this segment");
-
-        // Ensure new segment has changed HNSW config
-        locked_holder
-            .read()
-            .iter()
-            .map(|(_, segment)| match segment {
-                LockedSegment::Original(s) => s.read(),
-                LockedSegment::Proxy(_) => unreachable!(),
-            })
-            .filter(|segment| segment.total_point_count() > 0)
-            .for_each(|segment| {
-                assert_eq!(
-                    segment.config().vector_data[""].index,
-                    Indexes::Hnsw(changed_hnsw_config.clone()),
-                    "segment must be optimized with changed HNSW config",
-                );
-            });
-    }
-
-    /// This test the config mismatch optimizer for a changed vector specific HNSW config
-    ///
-    /// Similar to `test_hnsw_config_mismatch` but for multi vector segment with a vector specific
-    /// change.
-    ///
-    /// It tests whether:
-    /// - the condition check for HNSW mismatches works for a vector specific change
-    /// - optimized segments (and vector storages) use the updated configuration
-    ///
-    /// In short, this is what happens in this test:
-    /// - create randomized multi segment as base
-    /// - use indexing optimizer to build index for our segment
-    /// - test config mismatch condition: should not trigger yet
-    /// - change HNSW config for vector2
-    /// - test config mismatch condition: should trigger due to HNSW change
-    /// - optimize segment with config mismatch optimizer
-    /// - assert segment uses changed configuration
-    #[test]
-    fn test_hnsw_config_mismatch_vector_specific() {
-        // Collection configuration
-        let (point_count, vector1_dim, vector2_dim) = (1000, 10, 20);
-        let thresholds_config = OptimizerThresholds {
-            max_segment_size: std::usize::MAX,
-            memmap_threshold: std::usize::MAX,
-            indexing_threshold: 10,
-        };
-        let hnsw_config_vector1 = HnswConfigDiff {
-            m: Some(10),
-            ef_construct: Some(40),
-            on_disk: Some(true),
-            ..Default::default()
-        };
-        let collection_params = CollectionParams {
-            vectors: VectorsConfig::Multi(BTreeMap::from([
-                (
-                    "vector1".into(),
-                    VectorParams {
-                        size: vector1_dim.try_into().unwrap(),
-                        distance: Distance::Dot,
-                        hnsw_config: Some(hnsw_config_vector1),
-                        quantization_config: None,
-                        on_disk: None,
-                    },
-                ),
-                (
-                    "vector2".into(),
-                    VectorParams {
-                        size: vector2_dim.try_into().unwrap(),
-                        distance: Distance::Dot,
-                        hnsw_config: None,
-                        quantization_config: None,
-                        on_disk: None,
-                    },
-                ),
-            ])),
-            shard_number: 1.try_into().unwrap(),
-            on_disk_payload: false,
-            replication_factor: 1.try_into().unwrap(),
-            write_consistency_factor: 1.try_into().unwrap(),
-        };
-
-        // Base segment
-        let temp_dir = Builder::new().prefix("segment_temp_dir").tempdir().unwrap();
-        let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-        let mut holder = SegmentHolder::default();
-
-        let segment = random_multi_vec_segment(
-            dir.path(),
-            100,
-            point_count,
-            vector1_dim as usize,
-            vector2_dim as usize,
-        );
-
-        let segment_id = holder.add(segment);
-        let locked_holder: Arc<RwLock<_>> = Arc::new(RwLock::new(holder));
-
-        let hnsw_config_collection = HnswConfig {
-            m: 16,
-            ef_construct: 100,
-            full_scan_threshold: 10,
-            max_indexing_threads: 0,
-            on_disk: None,
-            payload_m: None,
-        };
-
-        // Optimizers used in test
-        let index_optimizer = IndexingOptimizer::new(
-            thresholds_config.clone(),
-            dir.path().to_owned(),
-            temp_dir.path().to_owned(),
-            collection_params.clone(),
-            hnsw_config_collection.clone(),
-            Default::default(),
-        );
-        let mut config_mismatch_optimizer = ConfigMismatchOptimizer::new(
-            thresholds_config,
-            dir.path().to_owned(),
-            temp_dir.path().to_owned(),
-            collection_params,
-            hnsw_config_collection.clone(),
-            Default::default(),
-        );
-
-        // Use indexing optimizer to build index for HNSW mismatch test
-        let changed = index_optimizer
-            .optimize(locked_holder.clone(), vec![segment_id], &false.into())
-            .unwrap();
-        assert!(changed, "optimizer should have rebuilt this segment");
-        assert!(
-            locked_holder.read().get(segment_id).is_none(),
-            "optimized segment should be gone",
-        );
-        assert_eq!(locked_holder.read().len(), 2, "index must be built");
-
-        // Mismatch optimizer should not optimize yet, HNSW config is not changed yet
-        let suggested_to_optimize =
-            config_mismatch_optimizer.check_condition(locked_holder.clone(), &Default::default());
-        assert_eq!(suggested_to_optimize.len(), 0);
-
-        // Create changed HNSW config for vector2, update it in the optimizer
-        let mut hnsw_config_vector2 = hnsw_config_vector1;
-        hnsw_config_vector2.m = hnsw_config_vector1.m.map(|m| m / 2);
-        hnsw_config_vector2.ef_construct = None;
-        match config_mismatch_optimizer.collection_params.vectors {
-            VectorsConfig::Single(_) => unreachable!(),
-            VectorsConfig::Multi(ref mut map) => {
-                map.get_mut("vector2")
-                    .unwrap()
-                    .hnsw_config
-                    .replace(hnsw_config_vector2);
-            }
-        }
-
-        // Run mismatch optimizer again, make sure it optimizes now
-        let suggested_to_optimize =
-            config_mismatch_optimizer.check_condition(locked_holder.clone(), &Default::default());
-        assert_eq!(suggested_to_optimize.len(), 1);
-        let changed = config_mismatch_optimizer
-            .optimize(locked_holder.clone(), suggested_to_optimize, &false.into())
-            .unwrap();
-        assert!(changed, "optimizer should have rebuilt this segment");
-
-        // Ensure new segment has changed HNSW config
-        locked_holder
-            .read()
-            .iter()
-            .map(|(_, segment)| match segment {
-                LockedSegment::Original(s) => s.read(),
-                LockedSegment::Proxy(_) => unreachable!(),
-            })
-            .filter(|segment| segment.total_point_count() > 0)
-            .for_each(|segment| {
-                assert_eq!(
-                    segment.config().vector_data["vector1"].index,
-                    Indexes::Hnsw(hnsw_config_vector1.update(&hnsw_config_collection).unwrap()),
-                    "HNSW config of vector1 is not what we expect",
-                );
-                assert_eq!(
-                    segment.config().vector_data["vector2"].index,
-                    Indexes::Hnsw(hnsw_config_vector2.update(&hnsw_config_collection).unwrap()),
-                    "HNSW config of vector2 is not what we expect",
-                );
-            });
-    }
-
-    /// This test the config mismatch optimizer for a changed vector specific HNSW config
-    ///
-    /// Similar to `test_hnsw_config_mismatch` but for multi vector segment with a vector specific
-    /// change.
-    ///
-    /// It tests whether:
-    /// - the condition check for HNSW mismatches works for a vector specific change
-    /// - optimized segments (and vector storages) use the updated configuration
-    ///
-    /// In short, this is what happens in this test:
-    /// - create randomized multi segment as base
-    /// - use indexing optimizer to build index for our segment
-    /// - test config mismatch condition: should not trigger yet
-    /// - change HNSW config for vector2
-    /// - test config mismatch condition: should trigger due to HNSW change
-    /// - optimize segment with config mismatch optimizer
-    /// - assert segment uses changed configuration
-    #[test]
-    fn test_quantization_config_mismatch_vector_specific() {
-        // Collection configuration
-        let (point_count, vector1_dim, vector2_dim) = (1000, 10, 20);
-        let thresholds_config = OptimizerThresholds {
-            max_segment_size: std::usize::MAX,
-            memmap_threshold: std::usize::MAX,
-            indexing_threshold: 10,
-        };
-        let quantization_config_vector1 =
-            QuantizationConfig::Scalar(segment::types::ScalarQuantization {
-                scalar: ScalarQuantizationConfig {
-                    r#type: ScalarType::Int8,
-                    quantile: Some(0.99),
-                    always_ram: Some(true),
-                },
-            });
-        let collection_params = CollectionParams {
-            vectors: VectorsConfig::Multi(BTreeMap::from([
-                (
-                    "vector1".into(),
-                    VectorParams {
-                        size: vector1_dim.try_into().unwrap(),
-                        distance: Distance::Dot,
-                        hnsw_config: None,
-                        quantization_config: Some(quantization_config_vector1.clone()),
-                        on_disk: None,
-                    },
-                ),
-                (
-                    "vector2".into(),
-                    VectorParams {
-                        size: vector2_dim.try_into().unwrap(),
-                        distance: Distance::Dot,
-                        hnsw_config: None,
-                        quantization_config: None,
-                        on_disk: None,
-                    },
-                ),
-            ])),
-            shard_number: 1.try_into().unwrap(),
-            on_disk_payload: false,
-            replication_factor: 1.try_into().unwrap(),
-            write_consistency_factor: 1.try_into().unwrap(),
-        };
-
-        // Base segment
-        let temp_dir = Builder::new().prefix("segment_temp_dir").tempdir().unwrap();
-        let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-        let mut holder = SegmentHolder::default();
-
-        let segment = random_multi_vec_segment(
-            dir.path(),
-            100,
-            point_count,
-            vector1_dim as usize,
-            vector2_dim as usize,
-        );
-
-        let segment_id = holder.add(segment);
-        let locked_holder: Arc<RwLock<_>> = Arc::new(RwLock::new(holder));
-
-        let quantization_config_collection =
-            QuantizationConfig::Scalar(segment::types::ScalarQuantization {
-                scalar: ScalarQuantizationConfig {
-                    r#type: ScalarType::Int8,
-                    quantile: Some(0.91),
-                    always_ram: None,
-                },
-            });
-
-        // Optimizers used in test
-        let index_optimizer = IndexingOptimizer::new(
-            thresholds_config.clone(),
-            dir.path().to_owned(),
-            temp_dir.path().to_owned(),
-            collection_params.clone(),
-            Default::default(),
-            Some(quantization_config_collection.clone()),
-        );
-        let mut config_mismatch_optimizer = ConfigMismatchOptimizer::new(
-            thresholds_config,
-            dir.path().to_owned(),
-            temp_dir.path().to_owned(),
-            collection_params,
-            Default::default(),
-            Some(quantization_config_collection),
-        );
-
-        // Use indexing optimizer to build index for quantization mismatch test
-        let changed = index_optimizer
-            .optimize(locked_holder.clone(), vec![segment_id], &false.into())
-            .unwrap();
-        assert!(changed, "optimizer should have rebuilt this segment");
-        assert!(
-            locked_holder.read().get(segment_id).is_none(),
-            "optimized segment should be gone",
-        );
-        assert_eq!(locked_holder.read().len(), 2, "index must be built");
-
-        // Mismatch optimizer should not optimize yet, quantization config is not changed yet
-        let suggested_to_optimize =
-            config_mismatch_optimizer.check_condition(locked_holder.clone(), &Default::default());
-        assert_eq!(suggested_to_optimize.len(), 0);
-
-        // Create changed quantization config for vector2, update it in the optimizer
-        let quantization_config_vector2 = QuantizationConfig::Product(ProductQuantization {
-            product: ProductQuantizationConfig {
-                compression: CompressionRatio::X32,
-                always_ram: Some(true),
-            },
-        });
-        match config_mismatch_optimizer.collection_params.vectors {
-            VectorsConfig::Single(_) => unreachable!(),
-            VectorsConfig::Multi(ref mut map) => {
-                map.get_mut("vector2")
-                    .unwrap()
-                    .quantization_config
-                    .replace(quantization_config_vector2.clone());
-            }
-        }
-
-        // Run mismatch optimizer again, make sure it optimizes now
-        let suggested_to_optimize =
-            config_mismatch_optimizer.check_condition(locked_holder.clone(), &Default::default());
-        assert_eq!(suggested_to_optimize.len(), 1);
-        let changed = config_mismatch_optimizer
-            .optimize(locked_holder.clone(), suggested_to_optimize, &false.into())
-            .unwrap();
-        assert!(changed, "optimizer should have rebuilt this segment");
-
-        // Ensure new segment has changed quantization config
-        locked_holder
-            .read()
-            .iter()
-            .map(|(_, segment)| match segment {
-                LockedSegment::Original(s) => s.read(),
-                LockedSegment::Proxy(_) => unreachable!(),
-            })
-            .filter(|segment| segment.total_point_count() > 0)
-            .for_each(|segment| {
-                assert_eq!(
-                    segment.config().vector_data["vector1"].quantization_config,
-                    Some(quantization_config_vector1.clone()),
-                    "Quantization config of vector1 is not what we expect",
-                );
-                assert_eq!(
-                    segment.config().vector_data["vector2"].quantization_config,
-                    Some(quantization_config_vector2.clone()),
-                    "Quantization config of vector2 is not what we expect",
-                );
-            });
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/collection_manager/optimizers/indexing_optimizer.rs b/crates/qdrant/lib/collection/src/collection_manager/optimizers/indexing_optimizer.rs
deleted file mode 100644
index 2b1ff73..0000000
--- a/crates/qdrant/lib/collection/src/collection_manager/optimizers/indexing_optimizer.rs
+++ /dev/null
@@ -1,644 +0,0 @@
-use std::collections::HashSet;
-use std::path::{Path, PathBuf};
-use std::sync::Arc;
-
-use parking_lot::Mutex;
-use segment::common::operation_time_statistics::{
-    OperationDurationStatistics, OperationDurationsAggregator,
-};
-use segment::types::{HnswConfig, QuantizationConfig, SegmentType, VECTOR_ELEMENT_SIZE};
-
-use crate::collection_manager::holders::segment_holder::{
-    LockedSegmentHolder, SegmentHolder, SegmentId,
-};
-use crate::collection_manager::optimizers::segment_optimizer::{
-    OptimizerThresholds, SegmentOptimizer,
-};
-use crate::config::CollectionParams;
-
-const BYTES_IN_KB: usize = 1024;
-
-/// Looks for the segments, which require to be indexed.
-/// If segment is too large, but still does not have indexes - it is time to create some indexes.
-/// The process of index creation is slow and CPU-bounded, so it is convenient to perform
-/// index building in a same way as segment re-creation.
-pub struct IndexingOptimizer {
-    thresholds_config: OptimizerThresholds,
-    segments_path: PathBuf,
-    collection_temp_dir: PathBuf,
-    collection_params: CollectionParams,
-    hnsw_config: HnswConfig,
-    quantization_config: Option<QuantizationConfig>,
-    telemetry_durations_aggregator: Arc<Mutex<OperationDurationsAggregator>>,
-}
-
-impl IndexingOptimizer {
-    pub fn new(
-        thresholds_config: OptimizerThresholds,
-        segments_path: PathBuf,
-        collection_temp_dir: PathBuf,
-        collection_params: CollectionParams,
-        hnsw_config: HnswConfig,
-        quantization_config: Option<QuantizationConfig>,
-    ) -> Self {
-        IndexingOptimizer {
-            thresholds_config,
-            segments_path,
-            collection_temp_dir,
-            collection_params,
-            hnsw_config,
-            quantization_config,
-            telemetry_durations_aggregator: OperationDurationsAggregator::new(),
-        }
-    }
-
-    fn smallest_indexed_segment(
-        &self,
-        segments: &SegmentHolder,
-        excluded_ids: &HashSet<SegmentId>,
-    ) -> Option<(SegmentId, usize)> {
-        segments
-            .iter()
-            // Excluded externally, might already be scheduled for optimization
-            .filter(|(idx, _)| !excluded_ids.contains(idx))
-            .filter_map(|(idx, segment)| {
-                let segment_entry = segment.get();
-                let read_segment = segment_entry.read();
-                let point_count = read_segment.available_point_count();
-                let vector_size = point_count
-                    * read_segment
-                        .vector_dims()
-                        .values()
-                        .max()
-                        .copied()
-                        .unwrap_or(0)
-                    * VECTOR_ELEMENT_SIZE;
-
-                if read_segment.segment_type() == SegmentType::Special {
-                    return None; // Never optimize already optimized segment
-                }
-
-                let segment_config = read_segment.config();
-                let is_any_vector_indexed = segment_config.is_any_vector_indexed();
-                let is_any_on_disk = segment_config.is_any_on_disk();
-
-                if !(is_any_vector_indexed || is_any_on_disk) {
-                    return None;
-                }
-
-                Some((idx, vector_size))
-            })
-            .min_by_key(|(_, vector_size)| *vector_size)
-            .map(|(idx, size)| (*idx, size))
-    }
-
-    fn worst_segment(
-        &self,
-        segments: LockedSegmentHolder,
-        excluded_ids: &HashSet<SegmentId>,
-    ) -> Vec<SegmentId> {
-        let segments_read_guard = segments.read();
-        let candidates: Vec<_> = segments_read_guard
-            .iter()
-            // Excluded externally, might already be scheduled for optimization
-            .filter(|(idx, _)| !excluded_ids.contains(idx))
-            .filter_map(|(idx, segment)| {
-                let segment_entry = segment.get();
-                let read_segment = segment_entry.read();
-                let point_count = read_segment.available_point_count();
-                let vector_size = point_count
-                    * read_segment
-                        .vector_dims()
-                        .values()
-                        .max()
-                        .copied()
-                        .unwrap_or(0)
-                    * VECTOR_ELEMENT_SIZE;
-
-                let segment_config = read_segment.config();
-
-                if read_segment.segment_type() == SegmentType::Special {
-                    return None; // Never optimize already optimized segment
-                }
-
-                // Apply indexing to plain segments which have grown too big
-                let are_all_vectors_indexed = segment_config.are_all_vectors_indexed();
-                let is_any_on_disk = segment_config.is_any_on_disk();
-
-                let big_for_mmap = vector_size
-                    >= self
-                        .thresholds_config
-                        .memmap_threshold
-                        .saturating_mul(BYTES_IN_KB);
-                let big_for_index = vector_size
-                    >= self
-                        .thresholds_config
-                        .indexing_threshold
-                        .saturating_mul(BYTES_IN_KB);
-
-                let require_indexing = (big_for_mmap && !is_any_on_disk)
-                    || (big_for_index && !are_all_vectors_indexed);
-
-                require_indexing.then_some((*idx, vector_size))
-            })
-            .collect();
-
-        // Select the largest unindexed segment, return if none
-        let selected_segment = candidates
-            .iter()
-            .max_by_key(|(_, vector_size)| *vector_size);
-        if selected_segment.is_none() {
-            return vec![];
-        }
-        let (selected_segment_id, selected_segment_size) = *selected_segment.unwrap();
-
-        // It is better for scheduling if indexing optimizer optimizes 2 segments.
-        // Because result of the optimization is usually 2 segment - it should preserve
-        // overall count of segments.
-
-        // Find smallest unindexed to check if we can index together
-        let smallest_unindexed = candidates
-            .iter()
-            .min_by_key(|(_, vector_size)| *vector_size);
-        if let Some((idx, size)) = smallest_unindexed {
-            if *idx != selected_segment_id
-                && selected_segment_size + size
-                    < self
-                        .thresholds_config
-                        .max_segment_size
-                        .saturating_mul(BYTES_IN_KB)
-            {
-                return vec![selected_segment_id, *idx];
-            }
-        }
-
-        // Find smallest indexed to check if we can reindex together
-        let smallest_indexed = self.smallest_indexed_segment(&segments_read_guard, excluded_ids);
-        if let Some((idx, size)) = smallest_indexed {
-            if idx != selected_segment_id
-                && selected_segment_size + size
-                    < self
-                        .thresholds_config
-                        .max_segment_size
-                        .saturating_mul(BYTES_IN_KB)
-            {
-                return vec![selected_segment_id, idx];
-            }
-        }
-
-        vec![selected_segment_id]
-    }
-}
-
-impl SegmentOptimizer for IndexingOptimizer {
-    fn collection_path(&self) -> &Path {
-        self.segments_path.as_path()
-    }
-
-    fn temp_path(&self) -> &Path {
-        self.collection_temp_dir.as_path()
-    }
-
-    fn collection_params(&self) -> CollectionParams {
-        self.collection_params.clone()
-    }
-
-    fn hnsw_config(&self) -> &HnswConfig {
-        &self.hnsw_config
-    }
-
-    fn quantization_config(&self) -> Option<QuantizationConfig> {
-        self.quantization_config.clone()
-    }
-
-    fn threshold_config(&self) -> &OptimizerThresholds {
-        &self.thresholds_config
-    }
-
-    fn check_condition(
-        &self,
-        segments: LockedSegmentHolder,
-        excluded_ids: &HashSet<SegmentId>,
-    ) -> Vec<SegmentId> {
-        self.worst_segment(segments, excluded_ids)
-    }
-
-    fn get_telemetry_data(&self) -> OperationDurationStatistics {
-        self.get_telemetry_counter().lock().get_statistics()
-    }
-
-    fn get_telemetry_counter(&self) -> Arc<Mutex<OperationDurationsAggregator>> {
-        self.telemetry_durations_aggregator.clone()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::collections::BTreeMap;
-    use std::num::{NonZeroU32, NonZeroU64};
-    use std::ops::Deref;
-    use std::sync::atomic::AtomicBool;
-    use std::sync::Arc;
-
-    use itertools::Itertools;
-    use parking_lot::lock_api::RwLock;
-    use rand::thread_rng;
-    use segment::data_types::vectors::DEFAULT_VECTOR_NAME;
-    use segment::fixtures::index_fixtures::random_vector;
-    use segment::types::{Payload, PayloadSchemaType};
-    use serde_json::json;
-    use tempfile::Builder;
-
-    use super::*;
-    use crate::collection_manager::fixtures::{random_multi_vec_segment, random_segment};
-    use crate::collection_manager::holders::segment_holder::SegmentHolder;
-    use crate::collection_manager::segments_updater::{
-        process_field_index_operation, process_point_operation,
-    };
-    use crate::operations::point_ops::{Batch, PointInsertOperations, PointOperations};
-    use crate::operations::types::{VectorParams, VectorsConfig};
-    use crate::operations::{CreateIndex, FieldIndexOperations};
-
-    fn init() {
-        let _ = env_logger::builder().is_test(true).try_init();
-    }
-
-    #[test]
-    fn test_multi_vector_optimization() {
-        init();
-        let mut holder = SegmentHolder::default();
-
-        let stopped = AtomicBool::new(false);
-        let dim1 = 128;
-        let dim2 = 256;
-
-        let segments_dir = Builder::new().prefix("segments_dir").tempdir().unwrap();
-        let segments_temp_dir = Builder::new()
-            .prefix("segments_temp_dir")
-            .tempdir()
-            .unwrap();
-        let mut opnum = 101..1000000;
-
-        let large_segment =
-            random_multi_vec_segment(segments_dir.path(), opnum.next().unwrap(), 200, dim1, dim2);
-
-        let segment_config = large_segment.segment_config.clone();
-
-        let large_segment_id = holder.add(large_segment);
-
-        let vectors_config: BTreeMap<String, VectorParams> = segment_config
-            .vector_data
-            .iter()
-            .map(|(name, params)| {
-                (
-                    name.to_string(),
-                    VectorParams {
-                        size: NonZeroU64::new(params.size as u64).unwrap(),
-                        distance: params.distance,
-                        hnsw_config: None,
-                        quantization_config: None,
-                        on_disk: None,
-                    },
-                )
-            })
-            .collect();
-
-        let mut index_optimizer = IndexingOptimizer::new(
-            OptimizerThresholds {
-                max_segment_size: 300,
-                memmap_threshold: 1000,
-                indexing_threshold: 1000,
-            },
-            segments_dir.path().to_owned(),
-            segments_temp_dir.path().to_owned(),
-            CollectionParams {
-                vectors: VectorsConfig::Multi(vectors_config),
-                shard_number: NonZeroU32::new(1).unwrap(),
-                replication_factor: NonZeroU32::new(1).unwrap(),
-                write_consistency_factor: NonZeroU32::new(1).unwrap(),
-                on_disk_payload: false,
-            },
-            Default::default(),
-            Default::default(),
-        );
-        let locked_holder: Arc<RwLock<_, _>> = Arc::new(RwLock::new(holder));
-
-        let excluded_ids = Default::default();
-
-        let suggested_to_optimize =
-            index_optimizer.check_condition(locked_holder.clone(), &excluded_ids);
-        assert!(suggested_to_optimize.is_empty());
-
-        index_optimizer.thresholds_config.memmap_threshold = 1000;
-        index_optimizer.thresholds_config.indexing_threshold = 50;
-
-        let suggested_to_optimize =
-            index_optimizer.check_condition(locked_holder.clone(), &excluded_ids);
-        assert!(suggested_to_optimize.contains(&large_segment_id));
-
-        index_optimizer
-            .optimize(locked_holder.clone(), suggested_to_optimize, &stopped)
-            .unwrap();
-
-        let infos = locked_holder
-            .read()
-            .iter()
-            .map(|(_sid, segment)| segment.get().read().info())
-            .collect_vec();
-        let configs = locked_holder
-            .read()
-            .iter()
-            .map(|(_sid, segment)| segment.get().read().config())
-            .collect_vec();
-
-        assert_eq!(infos.len(), 2);
-        assert_eq!(configs.len(), 2);
-
-        let total_points: usize = infos.iter().map(|info| info.num_points).sum();
-        let total_vectors: usize = infos.iter().map(|info| info.num_vectors).sum();
-        assert_eq!(total_points, 200);
-        assert_eq!(total_vectors, 400);
-
-        for config in configs {
-            assert_eq!(config.vector_data.len(), 2);
-            assert_eq!(config.vector_data.get("vector1").unwrap().size, dim1);
-            assert_eq!(config.vector_data.get("vector2").unwrap().size, dim2);
-        }
-    }
-
-    #[test]
-    fn test_indexing_optimizer() {
-        init();
-
-        let mut rng = thread_rng();
-        let mut holder = SegmentHolder::default();
-
-        let payload_field = "number".to_owned();
-
-        let stopped = AtomicBool::new(false);
-        let dim = 256;
-
-        let segments_dir = Builder::new().prefix("segments_dir").tempdir().unwrap();
-        let segments_temp_dir = Builder::new()
-            .prefix("segments_temp_dir")
-            .tempdir()
-            .unwrap();
-        let mut opnum = 101..1000000;
-
-        let small_segment = random_segment(segments_dir.path(), opnum.next().unwrap(), 25, dim);
-        let middle_low_segment =
-            random_segment(segments_dir.path(), opnum.next().unwrap(), 90, dim);
-        let middle_segment = random_segment(segments_dir.path(), opnum.next().unwrap(), 100, dim);
-        let large_segment = random_segment(segments_dir.path(), opnum.next().unwrap(), 200, dim);
-
-        let segment_config = small_segment.segment_config.clone();
-
-        let small_segment_id = holder.add(small_segment);
-        let middle_low_segment_id = holder.add(middle_low_segment);
-        let middle_segment_id = holder.add(middle_segment);
-        let large_segment_id = holder.add(large_segment);
-
-        let mut index_optimizer = IndexingOptimizer::new(
-            OptimizerThresholds {
-                max_segment_size: 300,
-                memmap_threshold: 1000,
-                indexing_threshold: 1000,
-            },
-            segments_dir.path().to_owned(),
-            segments_temp_dir.path().to_owned(),
-            CollectionParams {
-                vectors: VectorsConfig::Single(VectorParams {
-                    size: NonZeroU64::new(
-                        segment_config.vector_data[DEFAULT_VECTOR_NAME].size as u64,
-                    )
-                    .unwrap(),
-                    distance: segment_config.vector_data[DEFAULT_VECTOR_NAME].distance,
-                    hnsw_config: None,
-                    quantization_config: None,
-                    on_disk: None,
-                }),
-                shard_number: NonZeroU32::new(1).unwrap(),
-                replication_factor: NonZeroU32::new(1).unwrap(),
-                write_consistency_factor: NonZeroU32::new(1).unwrap(),
-                on_disk_payload: false,
-            },
-            Default::default(),
-            Default::default(),
-        );
-
-        let locked_holder: Arc<RwLock<_, _>> = Arc::new(RwLock::new(holder));
-
-        let excluded_ids = Default::default();
-
-        // ---- check condition for MMap optimization
-        let suggested_to_optimize =
-            index_optimizer.check_condition(locked_holder.clone(), &excluded_ids);
-        assert!(suggested_to_optimize.is_empty());
-
-        index_optimizer.thresholds_config.memmap_threshold = 1000;
-        index_optimizer.thresholds_config.indexing_threshold = 50;
-
-        let suggested_to_optimize =
-            index_optimizer.check_condition(locked_holder.clone(), &excluded_ids);
-        assert!(suggested_to_optimize.contains(&large_segment_id));
-        assert!(suggested_to_optimize.contains(&middle_low_segment_id));
-
-        index_optimizer.thresholds_config.memmap_threshold = 1000;
-        index_optimizer.thresholds_config.indexing_threshold = 1000;
-
-        let suggested_to_optimize =
-            index_optimizer.check_condition(locked_holder.clone(), &excluded_ids);
-        assert!(suggested_to_optimize.is_empty());
-
-        index_optimizer.thresholds_config.memmap_threshold = 50;
-        index_optimizer.thresholds_config.indexing_threshold = 1000;
-
-        let suggested_to_optimize =
-            index_optimizer.check_condition(locked_holder.clone(), &excluded_ids);
-        assert!(suggested_to_optimize.contains(&large_segment_id));
-
-        index_optimizer.thresholds_config.memmap_threshold = 150;
-        index_optimizer.thresholds_config.indexing_threshold = 50;
-
-        // ----- CREATE AN INDEXED FIELD ------
-        process_field_index_operation(
-            locked_holder.deref(),
-            opnum.next().unwrap(),
-            &FieldIndexOperations::CreateIndex(CreateIndex {
-                field_name: payload_field.to_owned(),
-                field_schema: Some(PayloadSchemaType::Integer.into()),
-            }),
-        )
-        .unwrap();
-
-        // ------ Plain -> Mmap & Indexed payload
-        let suggested_to_optimize =
-            index_optimizer.check_condition(locked_holder.clone(), &excluded_ids);
-        assert!(suggested_to_optimize.contains(&large_segment_id));
-        eprintln!("suggested_to_optimize = {suggested_to_optimize:#?}");
-        index_optimizer
-            .optimize(locked_holder.clone(), suggested_to_optimize, &stopped)
-            .unwrap();
-        eprintln!("Done");
-
-        // ------ Plain -> Indexed payload
-        let suggested_to_optimize =
-            index_optimizer.check_condition(locked_holder.clone(), &excluded_ids);
-        assert!(suggested_to_optimize.contains(&middle_segment_id));
-        index_optimizer
-            .optimize(locked_holder.clone(), suggested_to_optimize, &stopped)
-            .unwrap();
-
-        // ------- Keep smallest segment without changes
-        let suggested_to_optimize =
-            index_optimizer.check_condition(locked_holder.clone(), &excluded_ids);
-        assert!(suggested_to_optimize.is_empty());
-
-        assert_eq!(
-            locked_holder.read().len(),
-            3,
-            "Testing no new segments were created"
-        );
-
-        let infos = locked_holder
-            .read()
-            .iter()
-            .map(|(_sid, segment)| segment.get().read().info())
-            .collect_vec();
-        let configs = locked_holder
-            .read()
-            .iter()
-            .map(|(_sid, segment)| segment.get().read().config())
-            .collect_vec();
-
-        let indexed_count = infos
-            .iter()
-            .filter(|info| info.segment_type == SegmentType::Indexed)
-            .count();
-        assert_eq!(
-            indexed_count, 2,
-            "Testing that 2 segments are actually indexed"
-        );
-
-        let on_disk_count = configs
-            .iter()
-            .filter(|config| config.is_any_on_disk())
-            .count();
-        assert_eq!(
-            on_disk_count, 1,
-            "Testing that only largest segment is not Mmap"
-        );
-
-        let segment_dirs = segments_dir.path().read_dir().unwrap().collect_vec();
-        assert_eq!(
-            segment_dirs.len(),
-            locked_holder.read().len(),
-            "Testing that new segments are persisted and old data is removed"
-        );
-
-        for info in &infos {
-            assert!(
-                info.index_schema.contains_key(&payload_field),
-                "Testing that payload is not lost"
-            );
-            assert_eq!(
-                info.index_schema[&payload_field].data_type,
-                PayloadSchemaType::Integer,
-                "Testing that payload type is not lost"
-            );
-        }
-
-        let point_payload: Payload = json!({"number":10000i64}).into();
-        let insert_point_ops =
-            PointOperations::UpsertPoints(PointInsertOperations::PointsBatch(Batch {
-                ids: vec![501.into(), 502.into(), 503.into()],
-                vectors: vec![
-                    random_vector(&mut rng, dim),
-                    random_vector(&mut rng, dim),
-                    random_vector(&mut rng, dim),
-                ]
-                .into(),
-                payloads: Some(vec![
-                    Some(point_payload.clone()),
-                    Some(point_payload.clone()),
-                    Some(point_payload),
-                ]),
-            }));
-
-        let smallest_size = infos
-            .iter()
-            .min_by_key(|info| info.num_vectors)
-            .unwrap()
-            .num_vectors;
-
-        process_point_operation(
-            locked_holder.deref(),
-            opnum.next().unwrap(),
-            insert_point_ops,
-        )
-        .unwrap();
-
-        let new_infos = locked_holder
-            .read()
-            .iter()
-            .map(|(_sid, segment)| segment.get().read().info())
-            .collect_vec();
-        let new_smallest_size = new_infos
-            .iter()
-            .min_by_key(|info| info.num_vectors)
-            .unwrap()
-            .num_vectors;
-
-        assert_eq!(
-            new_smallest_size,
-            smallest_size + 3,
-            "Testing that new data is added to an appendable segment only"
-        );
-
-        // ---- New appendable segment should be created if none left
-
-        // Index even the smallest segment
-        index_optimizer.thresholds_config.indexing_threshold = 20;
-        let suggested_to_optimize =
-            index_optimizer.check_condition(locked_holder.clone(), &Default::default());
-        assert!(suggested_to_optimize.contains(&small_segment_id));
-        index_optimizer
-            .optimize(locked_holder.clone(), suggested_to_optimize, &stopped)
-            .unwrap();
-
-        let new_infos2 = locked_holder
-            .read()
-            .iter()
-            .map(|(_sid, segment)| segment.get().read().info())
-            .collect_vec();
-
-        let mut has_empty = false;
-        for info in new_infos2 {
-            has_empty |= info.num_vectors == 0;
-        }
-
-        assert!(
-            has_empty,
-            "Testing that new segment is created if none left"
-        );
-
-        let insert_point_ops =
-            PointOperations::UpsertPoints(PointInsertOperations::PointsBatch(Batch {
-                ids: vec![601.into(), 602.into(), 603.into()],
-                vectors: vec![
-                    random_vector(&mut rng, dim),
-                    random_vector(&mut rng, dim),
-                    random_vector(&mut rng, dim),
-                ]
-                .into(),
-                payloads: None,
-            }));
-
-        process_point_operation(
-            locked_holder.deref(),
-            opnum.next().unwrap(),
-            insert_point_ops,
-        )
-        .unwrap();
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/collection_manager/optimizers/merge_optimizer.rs b/crates/qdrant/lib/collection/src/collection_manager/optimizers/merge_optimizer.rs
deleted file mode 100644
index 3c3daae..0000000
--- a/crates/qdrant/lib/collection/src/collection_manager/optimizers/merge_optimizer.rs
+++ /dev/null
@@ -1,278 +0,0 @@
-use std::collections::HashSet;
-use std::path::{Path, PathBuf};
-use std::sync::Arc;
-
-use itertools::Itertools;
-use parking_lot::Mutex;
-use segment::common::operation_time_statistics::{
-    OperationDurationStatistics, OperationDurationsAggregator,
-};
-use segment::types::{HnswConfig, QuantizationConfig, SegmentType, VECTOR_ELEMENT_SIZE};
-
-use crate::collection_manager::holders::segment_holder::{
-    LockedSegment, LockedSegmentHolder, SegmentId,
-};
-use crate::collection_manager::optimizers::segment_optimizer::{
-    OptimizerThresholds, SegmentOptimizer,
-};
-use crate::config::CollectionParams;
-
-const BYTES_IN_KB: usize = 1024;
-
-/// Optimizer that tries to reduce number of segments until it fits configured value.
-/// It merges 3 smallest segments into a single large segment.
-/// Merging 3 segments instead of 2 guarantees that after the optimization the number of segments
-/// will be less than before.
-pub struct MergeOptimizer {
-    max_segments: usize,
-    thresholds_config: OptimizerThresholds,
-    segments_path: PathBuf,
-    collection_temp_dir: PathBuf,
-    collection_params: CollectionParams,
-    hnsw_config: HnswConfig,
-    quantization_config: Option<QuantizationConfig>,
-    telemetry_durations_aggregator: Arc<Mutex<OperationDurationsAggregator>>,
-}
-
-impl MergeOptimizer {
-    #[allow(clippy::too_many_arguments)]
-    pub fn new(
-        max_segments: usize,
-        thresholds_config: OptimizerThresholds,
-        segments_path: PathBuf,
-        collection_temp_dir: PathBuf,
-        collection_params: CollectionParams,
-        hnsw_config: HnswConfig,
-        quantization_config: Option<QuantizationConfig>,
-    ) -> Self {
-        MergeOptimizer {
-            max_segments,
-            thresholds_config,
-            segments_path,
-            collection_temp_dir,
-            collection_params,
-            hnsw_config,
-            quantization_config,
-            telemetry_durations_aggregator: OperationDurationsAggregator::new(),
-        }
-    }
-}
-
-impl SegmentOptimizer for MergeOptimizer {
-    fn collection_path(&self) -> &Path {
-        self.segments_path.as_path()
-    }
-
-    fn temp_path(&self) -> &Path {
-        self.collection_temp_dir.as_path()
-    }
-
-    fn collection_params(&self) -> CollectionParams {
-        self.collection_params.clone()
-    }
-
-    fn hnsw_config(&self) -> &HnswConfig {
-        &self.hnsw_config
-    }
-
-    fn quantization_config(&self) -> Option<QuantizationConfig> {
-        self.quantization_config.clone()
-    }
-
-    fn threshold_config(&self) -> &OptimizerThresholds {
-        &self.thresholds_config
-    }
-
-    fn check_condition(
-        &self,
-        segments: LockedSegmentHolder,
-        excluded_ids: &HashSet<SegmentId>,
-    ) -> Vec<SegmentId> {
-        let read_segments = segments.read();
-
-        let raw_segments = read_segments
-            .iter()
-            .filter(|(sid, segment)| {
-                matches!(segment, LockedSegment::Original(_)) && !excluded_ids.contains(sid)
-            })
-            .collect_vec();
-
-        if raw_segments.len() <= self.max_segments {
-            return vec![];
-        }
-        let max_candidates = raw_segments.len() - self.max_segments + 2;
-
-        // Find at least top-3 smallest segments to join.
-        // We need 3 segments because in this case we can guarantee that total segments number will be less
-
-        let candidates: Vec<_> = raw_segments
-            .iter()
-            .cloned()
-            .filter_map(|(idx, segment)| {
-                let segment_entry = segment.get();
-                let read_segment = segment_entry.read();
-                (read_segment.segment_type() != SegmentType::Special).then_some((
-                    *idx,
-                    read_segment.available_point_count()
-                        * read_segment
-                            .vector_dims()
-                            .values()
-                            .max()
-                            .copied()
-                            .unwrap_or(0)
-                        * VECTOR_ELEMENT_SIZE,
-                ))
-            })
-            .sorted_by_key(|(_, size)| *size)
-            .scan(0, |size_sum, (sid, size)| {
-                *size_sum += size; // produce a cumulative sum of segment sizes starting from smallest
-                Some((sid, *size_sum))
-            })
-            .take_while(|(_, size)| {
-                *size
-                    < self
-                        .thresholds_config
-                        .max_segment_size
-                        .saturating_mul(BYTES_IN_KB)
-            })
-            .take(max_candidates)
-            .map(|x| x.0)
-            .collect();
-
-        if candidates.len() < 3 {
-            return vec![];
-        }
-        log::debug!("Merge candidates: {:?}", candidates);
-        candidates
-    }
-
-    fn get_telemetry_data(&self) -> OperationDurationStatistics {
-        self.get_telemetry_counter().lock().get_statistics()
-    }
-
-    fn get_telemetry_counter(&self) -> Arc<Mutex<OperationDurationsAggregator>> {
-        self.telemetry_durations_aggregator.clone()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::sync::atomic::AtomicBool;
-    use std::sync::Arc;
-
-    use parking_lot::RwLock;
-    use tempfile::Builder;
-
-    use super::*;
-    use crate::collection_manager::fixtures::{get_merge_optimizer, random_segment};
-    use crate::collection_manager::holders::segment_holder::{LockedSegment, SegmentHolder};
-
-    #[test]
-    fn test_max_merge_size() {
-        let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-        let temp_dir = Builder::new().prefix("segment_temp_dir").tempdir().unwrap();
-
-        let mut holder = SegmentHolder::default();
-        let dim = 256;
-
-        let _segments_to_merge = vec![
-            holder.add(random_segment(dir.path(), 100, 40, dim)),
-            holder.add(random_segment(dir.path(), 100, 50, dim)),
-            holder.add(random_segment(dir.path(), 100, 60, dim)),
-        ];
-
-        let mut merge_optimizer = get_merge_optimizer(dir.path(), temp_dir.path(), dim);
-
-        let locked_holder = Arc::new(RwLock::new(holder));
-
-        merge_optimizer.max_segments = 1;
-
-        merge_optimizer.thresholds_config.max_segment_size = 100;
-
-        let check_result_empty =
-            merge_optimizer.check_condition(locked_holder.clone(), &Default::default());
-
-        assert!(check_result_empty.is_empty());
-
-        merge_optimizer.thresholds_config.max_segment_size = 200;
-
-        let check_result = merge_optimizer.check_condition(locked_holder, &Default::default());
-
-        assert_eq!(check_result.len(), 3);
-    }
-
-    #[test]
-    fn test_merge_optimizer() {
-        let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-        let temp_dir = Builder::new().prefix("segment_temp_dir").tempdir().unwrap();
-
-        let mut holder = SegmentHolder::default();
-        let dim = 256;
-
-        let segments_to_merge = vec![
-            holder.add(random_segment(dir.path(), 100, 3, dim)),
-            holder.add(random_segment(dir.path(), 100, 3, dim)),
-            holder.add(random_segment(dir.path(), 100, 3, dim)),
-            holder.add(random_segment(dir.path(), 100, 10, dim)),
-        ];
-
-        let other_segment_ids: Vec<SegmentId> = vec![
-            holder.add(random_segment(dir.path(), 100, 20, dim)),
-            holder.add(random_segment(dir.path(), 100, 20, dim)),
-            holder.add(random_segment(dir.path(), 100, 20, dim)),
-        ];
-
-        let merge_optimizer = get_merge_optimizer(dir.path(), temp_dir.path(), dim);
-
-        let locked_holder: Arc<RwLock<_>> = Arc::new(RwLock::new(holder));
-
-        let suggested_for_merge =
-            merge_optimizer.check_condition(locked_holder.clone(), &Default::default());
-
-        assert_eq!(suggested_for_merge.len(), 4);
-
-        for segment_in in &suggested_for_merge {
-            assert!(segments_to_merge.contains(segment_in));
-        }
-
-        let old_path = segments_to_merge
-            .iter()
-            .map(|sid| match locked_holder.read().get(*sid).unwrap() {
-                LockedSegment::Original(x) => x.read().current_path.clone(),
-                LockedSegment::Proxy(_) => panic!("Not expected"),
-            })
-            .collect_vec();
-
-        merge_optimizer
-            .optimize(
-                locked_holder.clone(),
-                suggested_for_merge,
-                &AtomicBool::new(false),
-            )
-            .unwrap();
-
-        let after_optimization_segments =
-            locked_holder.read().iter().map(|(x, _)| *x).collect_vec();
-
-        // Check proper number of segments after optimization
-        assert!(after_optimization_segments.len() <= 5);
-        assert!(after_optimization_segments.len() > 3);
-
-        // Check other segments are untouched
-        for segment_id in &other_segment_ids {
-            assert!(after_optimization_segments.contains(segment_id))
-        }
-
-        // Check new optimized segment have all vectors in it
-        for segment_id in after_optimization_segments {
-            if !other_segment_ids.contains(&segment_id) {
-                let holder_guard = locked_holder.read();
-                let new_segment = holder_guard.get(segment_id).unwrap();
-                assert_eq!(new_segment.get().read().available_point_count(), 3 * 3 + 10);
-            }
-        }
-
-        // Check if optimized segments removed from disk
-        old_path.into_iter().for_each(|x| assert!(!x.exists()));
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/collection_manager/optimizers/mod.rs b/crates/qdrant/lib/collection/src/collection_manager/optimizers/mod.rs
deleted file mode 100644
index 1c9edd9..0000000
--- a/crates/qdrant/lib/collection/src/collection_manager/optimizers/mod.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-pub mod config_mismatch_optimizer;
-pub mod indexing_optimizer;
-pub mod merge_optimizer;
-pub mod segment_optimizer;
-pub mod vacuum_optimizer;
diff --git a/crates/qdrant/lib/collection/src/collection_manager/optimizers/segment_optimizer.rs b/crates/qdrant/lib/collection/src/collection_manager/optimizers/segment_optimizer.rs
deleted file mode 100644
index 9f829e4..0000000
--- a/crates/qdrant/lib/collection/src/collection_manager/optimizers/segment_optimizer.rs
+++ /dev/null
@@ -1,570 +0,0 @@
-use std::collections::{HashMap, HashSet};
-use std::path::Path;
-use std::sync::atomic::{AtomicBool, Ordering};
-use std::sync::Arc;
-
-use itertools::Itertools;
-use parking_lot::{Mutex, RwLock, RwLockUpgradableReadGuard};
-use segment::common::operation_time_statistics::{
-    OperationDurationStatistics, OperationDurationsAggregator, ScopeDurationMeasurer,
-};
-use segment::common::version::StorageVersion;
-use segment::entry::entry_point::{check_process_stopped, SegmentEntry};
-use segment::segment::{Segment, SegmentVersion};
-use segment::segment_constructor::build_segment;
-use segment::segment_constructor::segment_builder::SegmentBuilder;
-use segment::types::{
-    HnswConfig, Indexes, PayloadFieldSchema, PayloadKeyType, PayloadStorageType, PointIdType,
-    QuantizationConfig, SegmentConfig, VectorStorageType, VECTOR_ELEMENT_SIZE,
-};
-
-use crate::collection_manager::holders::proxy_segment::ProxySegment;
-use crate::collection_manager::holders::segment_holder::{
-    LockedSegment, LockedSegmentHolder, SegmentId,
-};
-use crate::config::CollectionParams;
-use crate::operations::config_diff::DiffConfig;
-use crate::operations::types::{CollectionError, CollectionResult};
-
-const BYTES_IN_KB: usize = 1024;
-
-#[derive(Debug, Clone)]
-pub struct OptimizerThresholds {
-    pub max_segment_size: usize,
-    pub memmap_threshold: usize,
-    pub indexing_threshold: usize,
-}
-
-/// SegmentOptimizer - trait implementing common functionality of the optimizers
-///
-/// It provides functions which allow to re-build specified segments into a new, better one.
-/// Process allows read and write (with some tricks) access to the optimized segments.
-///
-/// Process of the optimization is same for all optimizers.
-/// The selection of the candidates for optimization and the configuration
-/// of resulting segment are up to concrete implementations.
-pub trait SegmentOptimizer {
-    /// Get path of the whole collection
-    fn collection_path(&self) -> &Path;
-
-    /// Get temp path, where optimized segments could be temporary stored
-    fn temp_path(&self) -> &Path;
-
-    /// Get basic segment config
-    fn collection_params(&self) -> CollectionParams;
-
-    /// Get HNSW config
-    fn hnsw_config(&self) -> &HnswConfig;
-
-    /// Get quantization config
-    fn quantization_config(&self) -> Option<QuantizationConfig>;
-
-    /// Get thresholds configuration for the current optimizer
-    fn threshold_config(&self) -> &OptimizerThresholds;
-
-    /// Checks if segment optimization is required
-    fn check_condition(
-        &self,
-        segments: LockedSegmentHolder,
-        excluded_ids: &HashSet<SegmentId>,
-    ) -> Vec<SegmentId>;
-
-    fn get_telemetry_data(&self) -> OperationDurationStatistics;
-
-    fn get_telemetry_counter(&self) -> Arc<Mutex<OperationDurationsAggregator>>;
-
-    /// Build temp segment
-    fn temp_segment(&self, save_version: bool) -> CollectionResult<LockedSegment> {
-        let collection_params = self.collection_params();
-        let config = SegmentConfig {
-            vector_data: collection_params.into_base_vector_data()?,
-            payload_storage_type: if collection_params.on_disk_payload {
-                PayloadStorageType::OnDisk
-            } else {
-                PayloadStorageType::InMemory
-            },
-        };
-        Ok(LockedSegment::new(build_segment(
-            self.collection_path(),
-            &config,
-            save_version,
-        )?))
-    }
-
-    /// Build optimized segment
-    fn optimized_segment_builder(
-        &self,
-        optimizing_segments: &[LockedSegment],
-    ) -> CollectionResult<SegmentBuilder> {
-        // Example:
-        //
-        // S1: {
-        //     text_vectors: 10000,
-        //     image_vectors: 100
-        // }
-        // S2: {
-        //     text_vectors: 200,
-        //     image_vectors: 10000
-        // }
-
-        // Example: bytes_count_by_vector_name = {
-        //     text_vectors: 10200 * dim * VECTOR_ELEMENT_SIZE
-        //     image_vectors: 10100 * dim * VECTOR_ELEMENT_SIZE
-        // }
-        let mut bytes_count_by_vector_name = HashMap::new();
-
-        for segment in optimizing_segments {
-            let segment = match segment {
-                LockedSegment::Original(segment) => segment,
-                LockedSegment::Proxy(_) => {
-                    return Err(CollectionError::service_error(
-                        "Proxy segment is not expected here".to_string(),
-                    ))
-                }
-            };
-            let locked_segment = segment.read();
-
-            for (vector_name, dim) in locked_segment.vector_dims() {
-                let available_vectors =
-                    locked_segment.available_vector_count(&vector_name).unwrap();
-                let vector_size = dim * VECTOR_ELEMENT_SIZE * available_vectors;
-                let size = bytes_count_by_vector_name.entry(vector_name).or_insert(0);
-                *size += vector_size;
-            }
-        }
-
-        // Example: maximal_vector_store_size_bytes = 10200 * dim * VECTOR_ELEMENT_SIZE
-        let maximal_vector_store_size_bytes = bytes_count_by_vector_name
-            .values()
-            .max()
-            .copied()
-            .unwrap_or(0);
-
-        let thresholds = self.threshold_config();
-        let collection_params = self.collection_params();
-
-        let is_indexed = maximal_vector_store_size_bytes
-            >= thresholds.indexing_threshold.saturating_mul(BYTES_IN_KB);
-
-        let is_on_disk = maximal_vector_store_size_bytes
-            >= thresholds.memmap_threshold.saturating_mul(BYTES_IN_KB);
-
-        let mut vector_data = collection_params.into_base_vector_data()?;
-
-        // If indexing, change to HNSW index and quantization
-        if is_indexed {
-            let collection_hnsw = self.hnsw_config();
-            let collection_quantization = self.quantization_config();
-            vector_data.iter_mut().for_each(|(vector_name, config)| {
-                // Assign HNSW index
-                let param_hnsw = collection_params
-                    .vectors
-                    .get_params(vector_name)
-                    .and_then(|params| params.hnsw_config);
-                let vector_hnsw = param_hnsw
-                    .and_then(|c| c.update(collection_hnsw).ok())
-                    .unwrap_or_else(|| collection_hnsw.clone());
-                config.index = Indexes::Hnsw(vector_hnsw);
-
-                // Assign quantization config
-                let param_quantization = collection_params
-                    .vectors
-                    .get_params(vector_name)
-                    .and_then(|params| params.quantization_config.as_ref());
-                let vector_quantization = param_quantization
-                    .or(collection_quantization.as_ref())
-                    .cloned();
-                config.quantization_config = vector_quantization;
-            });
-        }
-
-        // If storing on disk, set storage type
-        if is_on_disk {
-            vector_data.values_mut().for_each(|config| {
-                config.storage_type = VectorStorageType::Mmap;
-            });
-        }
-
-        let optimized_config = SegmentConfig {
-            vector_data,
-            payload_storage_type: if collection_params.on_disk_payload {
-                PayloadStorageType::OnDisk
-            } else {
-                PayloadStorageType::InMemory
-            },
-        };
-
-        Ok(SegmentBuilder::new(
-            self.collection_path(),
-            self.temp_path(),
-            &optimized_config,
-        )?)
-    }
-
-    /// Restores original segments from proxies
-    ///
-    /// # Arguments
-    ///
-    /// * `segments` - segment holder
-    /// * `proxy_ids` - ids of poxy-wrapped segment to restore
-    ///
-    /// # Result
-    ///
-    /// Original segments are pushed into `segments`, proxies removed.
-    /// Returns IDs on restored segments
-    ///
-    fn unwrap_proxy(
-        &self,
-        segments: &LockedSegmentHolder,
-        proxy_ids: &[SegmentId],
-    ) -> Vec<SegmentId> {
-        let mut segments_lock = segments.write();
-        let mut restored_segment_ids = vec![];
-        for &proxy_id in proxy_ids {
-            if let Some(proxy_segment_ref) = segments_lock.get(proxy_id) {
-                let locked_proxy_segment = proxy_segment_ref.clone();
-                match locked_proxy_segment {
-                    LockedSegment::Original(_) => {
-                        /* Already unwrapped. It should not actually be here */
-                        log::warn!("Attempt to unwrap raw segment! Should not happen.")
-                    }
-                    LockedSegment::Proxy(proxy_segment) => {
-                        let wrapped_segment = proxy_segment.read().wrapped_segment.clone();
-                        let (restored_id, _proxies) =
-                            segments_lock.swap(wrapped_segment, &[proxy_id]);
-                        restored_segment_ids.push(restored_id);
-                    }
-                }
-            }
-        }
-        restored_segment_ids
-    }
-
-    /// Checks if optimization cancellation is requested.
-    fn check_cancellation(&self, stopped: &AtomicBool) -> CollectionResult<()> {
-        if stopped.load(Ordering::Relaxed) {
-            return Err(CollectionError::Cancelled {
-                description: "optimization cancelled by service".to_string(),
-            });
-        }
-        Ok(())
-    }
-
-    /// Unwraps proxy, adds temp segment into collection and returns a `Cancelled` error.
-    ///
-    /// # Arguments
-    ///
-    /// * `segments` - all registered segments of the collection
-    /// * `proxy_ids` - currently used proxies
-    /// * `temp_segment` - currently used temporary segment
-    ///
-    /// # Result
-    ///
-    /// Rolls back back optimization state.
-    /// All processed changes will still be there, but the collection should be returned into state
-    /// before optimization.
-    fn handle_cancellation(
-        &self,
-        segments: &LockedSegmentHolder,
-        proxy_ids: &[SegmentId],
-        temp_segment: &LockedSegment,
-    ) {
-        self.unwrap_proxy(segments, proxy_ids);
-        if temp_segment.get().read().available_point_count() > 0 {
-            let mut write_segments = segments.write();
-            write_segments.add_locked(temp_segment.clone());
-        }
-    }
-
-    /// Function to wrap slow part of optimization. Performs proxy rollback in case of cancellation.
-    /// Warn: this function might be _VERY_ CPU intensive,
-    /// so it is necessary to avoid any locks inside this part of the code
-    ///
-    /// # Arguments
-    ///
-    /// * `optimizing_segments` - Segments to optimize
-    /// * `proxy_deleted_points` - Holds a set of points, deleted while optimization was running
-    /// * `proxy_deleted_indexes` - Holds a set of Indexes, deleted while optimization was running
-    /// * `proxy_created_indexes` - Holds a set of Indexes, created while optimization was running
-    /// * `stopped` - flag to check if optimization was cancelled by external thread
-    ///
-    /// # Result
-    ///
-    /// Constructs optimized segment
-    fn build_new_segment(
-        &self,
-        optimizing_segments: &[LockedSegment],
-        proxy_deleted_points: Arc<RwLock<HashSet<PointIdType>>>,
-        proxy_deleted_indexes: Arc<RwLock<HashSet<PayloadKeyType>>>,
-        proxy_created_indexes: Arc<RwLock<HashMap<PayloadKeyType, PayloadFieldSchema>>>,
-        stopped: &AtomicBool,
-    ) -> CollectionResult<Segment> {
-        let mut segment_builder = self.optimized_segment_builder(optimizing_segments)?;
-
-        self.check_cancellation(stopped)?;
-
-        for segment in optimizing_segments {
-            match segment {
-                LockedSegment::Original(segment_arc) => {
-                    let segment_guard = segment_arc.read();
-                    segment_builder.update_from(&segment_guard, stopped)?;
-                }
-                LockedSegment::Proxy(_) => panic!("Attempt to optimize segment which is already currently under optimization. Should never happen"),
-            }
-        }
-
-        for field in proxy_deleted_indexes.read().iter() {
-            segment_builder.indexed_fields.remove(field);
-        }
-        for (field, schema_type) in proxy_created_indexes.read().iter() {
-            segment_builder
-                .indexed_fields
-                .insert(field.to_owned(), schema_type.to_owned());
-        }
-
-        let mut optimized_segment: Segment = segment_builder.build(stopped)?;
-
-        // Delete points in 2 steps
-        // First step - delete all points with read lock
-        // Second step - delete all the rest points with full write lock
-        //
-        // Use collection copy to prevent long time lock of `proxy_deleted_points`
-        let deleted_points_snapshot: Vec<PointIdType> =
-            proxy_deleted_points.read().iter().cloned().collect();
-
-        for &point_id in &deleted_points_snapshot {
-            optimized_segment
-                .delete_point(optimized_segment.version(), point_id)
-                .unwrap();
-        }
-
-        let deleted_indexes = proxy_deleted_indexes.read().iter().cloned().collect_vec();
-        let create_indexes = proxy_created_indexes.read().clone();
-
-        for delete_field_name in &deleted_indexes {
-            optimized_segment.delete_field_index(optimized_segment.version(), delete_field_name)?;
-            self.check_cancellation(stopped)?;
-        }
-
-        for (create_field_name, schema) in create_indexes {
-            optimized_segment.create_field_index(
-                optimized_segment.version(),
-                &create_field_name,
-                Some(&schema),
-            )?;
-            self.check_cancellation(stopped)?;
-        }
-
-        Ok(optimized_segment)
-    }
-
-    /// Performs optimization of collections's segments, including:
-    ///     - Segment rebuilding
-    ///     - Segment joining
-    ///
-    /// # Arguments
-    ///
-    /// * `segments` - segments holder
-    /// * `ids` - list of segment ids to perform optimization on. All segments will be merged into single one
-    /// * `stopped` - flag for early stopping of the optimization.
-    ///               If appears to be `true` - optimization process should be cancelled, all segments unwrapped
-    ///
-    /// # Result
-    ///
-    /// New optimized segment should be added into `segments`.
-    /// If there were any record changes during the optimization - an additional plain segment will be created.
-    ///
-    fn optimize(
-        &self,
-        segments: LockedSegmentHolder,
-        ids: Vec<SegmentId>,
-        stopped: &AtomicBool,
-    ) -> CollectionResult<bool> {
-        check_process_stopped(stopped)?;
-
-        let mut timer = ScopeDurationMeasurer::new(&self.get_telemetry_counter());
-        timer.set_success(false);
-
-        // On the one hand - we want to check consistently if all provided segments are
-        // available for optimization (not already under one) and we want to do it before creating a temp segment
-        // which is an expensive operation. So we can't not unlock `segments` after the check and before the insert.
-        //
-        // On the other hand - we do not want to hold write lock during the segment creation.
-        // Solution in the middle - is a upgradable lock. It ensures consistency after the check and allows to perform read operation.
-        let segment_lock = segments.upgradable_read();
-
-        let optimizing_segments: Vec<_> = ids
-            .iter()
-            .cloned()
-            .map(|id| segment_lock.get(id))
-            .filter_map(|x| x.cloned())
-            .collect();
-
-        // Check if all segments are not under other optimization or some ids are missing
-        let all_segments_ok = optimizing_segments.len() == ids.len()
-            && optimizing_segments
-                .iter()
-                .all(|s| matches!(s, LockedSegment::Original(_)));
-
-        if !all_segments_ok {
-            // Cancel the optimization
-            return Ok(false);
-        }
-
-        check_process_stopped(stopped)?;
-
-        let tmp_segment = self.temp_segment(false)?;
-
-        let proxy_deleted_points = Arc::new(RwLock::new(HashSet::<PointIdType>::new()));
-        let proxy_deleted_indexes = Arc::new(RwLock::new(HashSet::<PayloadKeyType>::new()));
-        let proxy_created_indexes = Arc::new(RwLock::new(HashMap::<
-            PayloadKeyType,
-            PayloadFieldSchema,
-        >::new()));
-
-        let mut proxies = Vec::new();
-        for sg in optimizing_segments.iter() {
-            let mut proxy = ProxySegment::new(
-                sg.clone(),
-                tmp_segment.clone(),
-                proxy_deleted_points.clone(),
-                proxy_created_indexes.clone(),
-                proxy_deleted_indexes.clone(),
-            );
-            // Wrapped segment is fresh, so it has no operations
-            // Operation with number 0 will be applied
-            proxy.replicate_field_indexes(0)?;
-            proxies.push(proxy);
-        }
-
-        // Save segment version once all payload indices have been converted
-        // If this ends up not being saved due to a crash, the segment will not be used
-        match &tmp_segment {
-            LockedSegment::Original(segment) => {
-                let segment_path = &segment.read().current_path;
-                SegmentVersion::save(segment_path)?;
-            }
-            LockedSegment::Proxy(_) => unreachable!(),
-        }
-
-        let proxy_ids: Vec<_> = {
-            // Exclusive lock for the segments operations.
-            let mut write_segments = RwLockUpgradableReadGuard::upgrade(segment_lock);
-            let mut proxy_ids = Vec::new();
-            for (mut proxy, idx) in proxies.into_iter().zip(ids.iter().cloned()) {
-                // replicate_field_indexes for the second time,
-                // because optimized segments could have been changed.
-                // The probability is small, though,
-                // so we can afford this operation under the full collection write lock
-                let op_num = 0;
-                proxy.replicate_field_indexes(op_num)?; // Slow only in case the index is change in the gap between two calls
-                proxy_ids.push(write_segments.swap(proxy, &[idx]).0);
-            }
-            proxy_ids
-        };
-
-        check_process_stopped(stopped).map_err(|error| {
-            self.handle_cancellation(&segments, &proxy_ids, &tmp_segment);
-            error
-        })?;
-
-        // ---- SLOW PART -----
-
-        let mut optimized_segment = match self.build_new_segment(
-            &optimizing_segments,
-            proxy_deleted_points.clone(),
-            proxy_deleted_indexes.clone(),
-            proxy_created_indexes.clone(),
-            stopped,
-        ) {
-            Ok(segment) => segment,
-            Err(error) => {
-                if matches!(error, CollectionError::Cancelled { .. }) {
-                    self.handle_cancellation(&segments, &proxy_ids, &tmp_segment);
-                }
-                return Err(error);
-            }
-        };
-
-        // Avoid unnecessary point removing in the critical section:
-        // - save already removed points while avoiding long read locks
-        // - exclude already removed points from post-optimization removing
-        let already_remove_points = {
-            let mut all_removed_points: HashSet<_> =
-                proxy_deleted_points.read().iter().cloned().collect();
-            for existing_point in optimized_segment.iter_points() {
-                all_removed_points.remove(&existing_point);
-            }
-            all_removed_points
-        };
-
-        // ---- SLOW PART ENDS HERE -----
-
-        check_process_stopped(stopped).map_err(|error| {
-            self.handle_cancellation(&segments, &proxy_ids, &tmp_segment);
-            error
-        })?;
-
-        {
-            // This block locks all operations with collection. It should be fast
-            let mut write_segments_guard = segments.write();
-            let deleted_points = proxy_deleted_points.read();
-            let points_diff = deleted_points.difference(&already_remove_points);
-            for &point_id in points_diff {
-                optimized_segment
-                    .delete_point(optimized_segment.version(), point_id)
-                    .unwrap();
-            }
-
-            for deleted_field_name in proxy_deleted_indexes.read().iter() {
-                optimized_segment
-                    .delete_field_index(optimized_segment.version(), deleted_field_name)?;
-            }
-
-            for (created_field_name, schema_type) in proxy_created_indexes.read().iter() {
-                optimized_segment.create_field_index(
-                    optimized_segment.version(),
-                    created_field_name,
-                    Some(schema_type),
-                )?;
-            }
-
-            optimized_segment.prefault_mmap_pages();
-
-            let (_, proxies) = write_segments_guard.swap(optimized_segment, &proxy_ids);
-
-            let has_appendable_segments =
-                write_segments_guard.random_appendable_segment().is_some();
-
-            // Release reference counter of the optimized segments
-            drop(optimizing_segments);
-
-            // Append a temp segment to a collection if it is not empty or there is no other appendable segment
-            if tmp_segment.get().read().available_point_count() > 0 || !has_appendable_segments {
-                write_segments_guard.add_locked(tmp_segment);
-
-                // unlock collection for search and updates
-                drop(write_segments_guard);
-                // After the collection is unlocked - we can remove data as slow as we want.
-
-                // Only remove data after we ensure the consistency of the collection.
-                // If remove fails - we will still have operational collection with reported error.
-                for proxy in proxies {
-                    proxy.drop_data()?;
-                }
-            } else {
-                // unlock collection for search and updates
-                drop(write_segments_guard);
-                // After the collection is unlocked - we can remove data as slow as we want.
-
-                // Proxy contains pointer to the `tmp_segment`, so they should be removed first
-                for proxy in proxies {
-                    proxy.drop_data()?;
-                }
-                tmp_segment.drop_data()?;
-            }
-        }
-        timer.set_success(true);
-        Ok(true)
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/collection_manager/optimizers/vacuum_optimizer.rs b/crates/qdrant/lib/collection/src/collection_manager/optimizers/vacuum_optimizer.rs
deleted file mode 100644
index ceabc32..0000000
--- a/crates/qdrant/lib/collection/src/collection_manager/optimizers/vacuum_optimizer.rs
+++ /dev/null
@@ -1,615 +0,0 @@
-use std::collections::HashSet;
-use std::path::{Path, PathBuf};
-use std::sync::Arc;
-
-use ordered_float::OrderedFloat;
-use parking_lot::Mutex;
-use segment::common::operation_time_statistics::{
-    OperationDurationStatistics, OperationDurationsAggregator,
-};
-use segment::entry::entry_point::SegmentEntry;
-use segment::index::VectorIndex;
-use segment::types::{HnswConfig, QuantizationConfig, SegmentType};
-use segment::vector_storage::VectorStorage;
-
-use crate::collection_manager::holders::segment_holder::{
-    LockedSegment, LockedSegmentHolder, SegmentId,
-};
-use crate::collection_manager::optimizers::segment_optimizer::{
-    OptimizerThresholds, SegmentOptimizer,
-};
-use crate::config::CollectionParams;
-
-/// Optimizer which looks for segments with high amount of soft-deleted points or vectors
-///
-/// Since the creation of a segment, a lot of points or vectors may have been soft-deleted. This
-/// results in the index slowly breaking apart, and unnecessary storage usage.
-///
-/// This optimizer will look for the worst segment to rebuilt the index and minimize storage usage.
-pub struct VacuumOptimizer {
-    deleted_threshold: f64,
-    min_vectors_number: usize,
-    thresholds_config: OptimizerThresholds,
-    segments_path: PathBuf,
-    collection_temp_dir: PathBuf,
-    collection_params: CollectionParams,
-    hnsw_config: HnswConfig,
-    quantization_config: Option<QuantizationConfig>,
-    telemetry_durations_aggregator: Arc<Mutex<OperationDurationsAggregator>>,
-}
-
-impl VacuumOptimizer {
-    #[allow(clippy::too_many_arguments)]
-    pub fn new(
-        deleted_threshold: f64,
-        min_vectors_number: usize,
-        thresholds_config: OptimizerThresholds,
-        segments_path: PathBuf,
-        collection_temp_dir: PathBuf,
-        collection_params: CollectionParams,
-        hnsw_config: HnswConfig,
-        quantization_config: Option<QuantizationConfig>,
-    ) -> Self {
-        VacuumOptimizer {
-            deleted_threshold,
-            min_vectors_number,
-            thresholds_config,
-            segments_path,
-            collection_temp_dir,
-            collection_params,
-            hnsw_config,
-            quantization_config,
-            telemetry_durations_aggregator: OperationDurationsAggregator::new(),
-        }
-    }
-
-    fn worst_segment(
-        &self,
-        segments: LockedSegmentHolder,
-        excluded_ids: &HashSet<SegmentId>,
-    ) -> Option<(SegmentId, LockedSegment)> {
-        let segments_read_guard = segments.read();
-        segments_read_guard
-            .iter()
-            // Excluded externally, might already be scheduled for optimization
-            .filter(|(idx, _segment)| !excluded_ids.contains(idx))
-            .flat_map(|(idx, segment)| {
-                // Calculate littered ratio for segment and named vectors
-                let littered_ratio_segment = self.littered_ratio_segment(segment);
-                let littered_ratio_vectors = self.littered_vectors_index_ratio(segment);
-                [littered_ratio_segment, littered_ratio_vectors]
-                    .into_iter()
-                    .flatten()
-                    .map(|ratio| (*idx, ratio))
-            })
-            .max_by_key(|(_, ratio)| OrderedFloat(*ratio))
-            .map(|(idx, _)| (idx, segments_read_guard.get(idx).unwrap().clone()))
-    }
-
-    /// Calculate littered ratio for segment on point level
-    ///
-    /// Returns `None` if littered ratio did not reach vacuum thresholds.
-    fn littered_ratio_segment(&self, segment: &LockedSegment) -> Option<f64> {
-        let segment_entry = match segment {
-            LockedSegment::Original(segment) => segment,
-            LockedSegment::Proxy(_) => return None,
-        };
-        let read_segment = segment_entry.read();
-
-        let littered_ratio =
-            read_segment.deleted_point_count() as f64 / read_segment.total_point_count() as f64;
-        let is_big = read_segment.total_point_count() >= self.min_vectors_number;
-        let is_littered = littered_ratio > self.deleted_threshold;
-
-        (is_big && is_littered).then_some(littered_ratio)
-    }
-
-    /// Calculate littered ratio for segment on vector index level
-    ///
-    /// If a segment has multiple named vectors, it checks each one.
-    /// We are only interested in indexed vectors, as they are the ones affected by soft-deletes.
-    ///
-    /// This finds the maximum deletion ratio for a named vector. The ratio is based on the number
-    /// of deleted vectors versus the number of indexed vector.s
-    ///
-    /// Returns `None` if littered ratio did not reach vacuum thresholds for no named vectors.
-    fn littered_vectors_index_ratio(&self, segment: &LockedSegment) -> Option<f64> {
-        {
-            let segment_entry = segment.get();
-            let read_segment = segment_entry.read();
-
-            // Never optimize special segments
-            if read_segment.segment_type() == SegmentType::Special {
-                return None;
-            }
-
-            // Segment must have any index
-            let segment_config = read_segment.config();
-            if !segment_config.is_any_vector_indexed() {
-                return None;
-            }
-        }
-
-        // We can only work with original segments
-        let real_segment = match segment {
-            LockedSegment::Original(segment) => segment.read(),
-            LockedSegment::Proxy(_) => return None,
-        };
-
-        // In this segment, check the index of each named vector for a high deletion ratio.
-        // Return the worst ratio.
-        real_segment
-            .vector_data
-            .values()
-            .filter(|vector_data| vector_data.vector_index.borrow().is_index())
-            .filter_map(|vector_data| {
-                // We use the number of now available vectors against the number of indexed vectors
-                // to determine how many are soft-deleted from the index.
-                let vector_index = vector_data.vector_index.borrow();
-                let vector_storage = vector_data.vector_storage.borrow();
-                let indexed_vector_count = vector_index.indexed_vector_count();
-                let deleted_from_index =
-                    indexed_vector_count.saturating_sub(vector_storage.available_vector_count());
-                let deleted_ratio = if indexed_vector_count != 0 {
-                    deleted_from_index as f64 / indexed_vector_count as f64
-                } else {
-                    0.0
-                };
-
-                let reached_minimum = deleted_from_index >= self.min_vectors_number;
-                let reached_ratio = deleted_ratio > self.deleted_threshold;
-                (reached_minimum && reached_ratio).then_some(deleted_ratio)
-            })
-            .max_by_key(|ratio| OrderedFloat(*ratio))
-    }
-}
-
-impl SegmentOptimizer for VacuumOptimizer {
-    fn collection_path(&self) -> &Path {
-        self.segments_path.as_path()
-    }
-
-    fn temp_path(&self) -> &Path {
-        self.collection_temp_dir.as_path()
-    }
-
-    fn collection_params(&self) -> CollectionParams {
-        self.collection_params.clone()
-    }
-
-    fn hnsw_config(&self) -> &HnswConfig {
-        &self.hnsw_config
-    }
-
-    fn quantization_config(&self) -> Option<QuantizationConfig> {
-        self.quantization_config.clone()
-    }
-
-    fn threshold_config(&self) -> &OptimizerThresholds {
-        &self.thresholds_config
-    }
-
-    fn check_condition(
-        &self,
-        segments: LockedSegmentHolder,
-        excluded_ids: &HashSet<SegmentId>,
-    ) -> Vec<SegmentId> {
-        match self.worst_segment(segments, excluded_ids) {
-            None => vec![],
-            Some((segment_id, _segment)) => vec![segment_id],
-        }
-    }
-
-    fn get_telemetry_data(&self) -> OperationDurationStatistics {
-        self.get_telemetry_counter().lock().get_statistics()
-    }
-
-    fn get_telemetry_counter(&self) -> Arc<Mutex<OperationDurationsAggregator>> {
-        self.telemetry_durations_aggregator.clone()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::collections::BTreeMap;
-    use std::num::{NonZeroU32, NonZeroU64};
-    use std::sync::atomic::AtomicBool;
-    use std::sync::Arc;
-
-    use itertools::Itertools;
-    use parking_lot::RwLock;
-    use segment::entry::entry_point::SegmentEntry;
-    use segment::types::{Distance, PayloadContainer, PayloadSchemaType};
-    use serde_json::{json, Value};
-    use tempfile::Builder;
-
-    use super::*;
-    use crate::collection_manager::fixtures::{random_multi_vec_segment, random_segment};
-    use crate::collection_manager::holders::segment_holder::SegmentHolder;
-    use crate::collection_manager::optimizers::indexing_optimizer::IndexingOptimizer;
-    use crate::operations::types::{VectorParams, VectorsConfig};
-
-    #[test]
-    fn test_vacuum_conditions() {
-        let temp_dir = Builder::new().prefix("segment_temp_dir").tempdir().unwrap();
-        let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-        let mut holder = SegmentHolder::default();
-        let segment_id = holder.add(random_segment(dir.path(), 100, 200, 4));
-
-        let segment = holder.get(segment_id).unwrap();
-
-        let original_segment_path = match segment {
-            LockedSegment::Original(s) => s.read().current_path.clone(),
-            LockedSegment::Proxy(_) => panic!("Not expected"),
-        };
-
-        let segment_points_to_delete = segment
-            .get()
-            .read()
-            .iter_points()
-            .enumerate()
-            .filter_map(|(i, point_id)| (i % 2 == 0).then_some(point_id))
-            .collect_vec();
-
-        for &point_id in &segment_points_to_delete {
-            segment.get().write().delete_point(101, point_id).unwrap();
-        }
-
-        let segment_points_to_assign1 = segment
-            .get()
-            .read()
-            .iter_points()
-            .enumerate()
-            .filter_map(|(i, point_id)| (i % 20 == 0).then_some(point_id))
-            .collect_vec();
-
-        let segment_points_to_assign2 = segment
-            .get()
-            .read()
-            .iter_points()
-            .enumerate()
-            .filter_map(|(i, point_id)| (i % 20 == 0).then_some(point_id))
-            .collect_vec();
-
-        for &point_id in &segment_points_to_assign1 {
-            segment
-                .get()
-                .write()
-                .set_payload(102, point_id, &json!({ "color": "red" }).into())
-                .unwrap();
-        }
-
-        for &point_id in &segment_points_to_assign2 {
-            segment
-                .get()
-                .write()
-                .set_payload(102, point_id, &json!({"size": 0.42}).into())
-                .unwrap();
-        }
-
-        let locked_holder: Arc<RwLock<_>> = Arc::new(RwLock::new(holder));
-
-        let vacuum_optimizer = VacuumOptimizer::new(
-            0.2,
-            50,
-            OptimizerThresholds {
-                max_segment_size: 1000000,
-                memmap_threshold: 1000000,
-                indexing_threshold: 1000000,
-            },
-            dir.path().to_owned(),
-            temp_dir.path().to_owned(),
-            CollectionParams {
-                vectors: VectorsConfig::Single(VectorParams {
-                    size: NonZeroU64::new(4).unwrap(),
-                    distance: Distance::Dot,
-                    hnsw_config: None,
-                    quantization_config: None,
-                    on_disk: None,
-                }),
-                shard_number: NonZeroU32::new(1).unwrap(),
-                on_disk_payload: false,
-                replication_factor: NonZeroU32::new(1).unwrap(),
-                write_consistency_factor: NonZeroU32::new(1).unwrap(),
-            },
-            Default::default(),
-            Default::default(),
-        );
-
-        let suggested_to_optimize =
-            vacuum_optimizer.check_condition(locked_holder.clone(), &Default::default());
-
-        // Check that only one segment is selected for optimization
-        assert_eq!(suggested_to_optimize.len(), 1);
-
-        vacuum_optimizer
-            .optimize(
-                locked_holder.clone(),
-                suggested_to_optimize,
-                &AtomicBool::new(false),
-            )
-            .unwrap();
-
-        let after_optimization_segments =
-            locked_holder.read().iter().map(|(x, _)| *x).collect_vec();
-
-        // Check only one new segment
-        assert_eq!(after_optimization_segments.len(), 1);
-
-        let optimized_segment_id = *after_optimization_segments.first().unwrap();
-
-        let holder_guard = locked_holder.read();
-        let optimized_segment = holder_guard.get(optimized_segment_id).unwrap();
-        let segment_arc = optimized_segment.get();
-        let segment_guard = segment_arc.read();
-
-        // Check new segment have proper amount of points
-        assert_eq!(
-            segment_guard.available_point_count(),
-            200 - segment_points_to_delete.len(),
-        );
-
-        // Check payload is preserved in optimized segment
-        for &point_id in &segment_points_to_assign1 {
-            assert!(segment_guard.has_point(point_id));
-            let payload = segment_guard.payload(point_id).unwrap();
-            let payload_color = &(*payload.get_value("color").into_iter().next().unwrap()).clone();
-
-            match payload_color {
-                Value::String(x) => assert_eq!(x, "red"),
-                _ => panic!(),
-            }
-        }
-
-        // Check old segment data is removed from disk
-        assert!(!original_segment_path.exists());
-    }
-
-    /// This tests the vacuum optimizer when many vectors get deleted.
-    ///
-    /// It tests whether:
-    /// - the condition check for deleted vectors work
-    /// - optimized segments (and vector storages) are properly rebuilt
-    ///
-    /// In short, this is what happens in this test:
-    /// - create randomized multi vector segment as base
-    /// - use indexing optimizer to build index for our segment
-    /// - test vacuum deleted vectors condition: should not trigger yet
-    /// - delete many points and vectors
-    /// - assert deletions are stored properly
-    /// - test vacuum deleted vectors condition: should trigger due to deletions
-    /// - optimize segment with vacuum optimizer
-    /// - assert segment is properly optimized
-    #[test]
-    fn test_vacuum_deleted_vectors() {
-        // Collection configuration
-        let (point_count, vector1_dim, vector2_dim) = (1000, 10, 20);
-        let thresholds_config = OptimizerThresholds {
-            max_segment_size: std::usize::MAX,
-            memmap_threshold: std::usize::MAX,
-            indexing_threshold: 10,
-        };
-        let collection_params = CollectionParams {
-            vectors: VectorsConfig::Multi(BTreeMap::from([
-                (
-                    "vector1".into(),
-                    VectorParams {
-                        size: vector1_dim.try_into().unwrap(),
-                        distance: Distance::Dot,
-                        hnsw_config: None,
-                        quantization_config: None,
-                        on_disk: None,
-                    },
-                ),
-                (
-                    "vector2".into(),
-                    VectorParams {
-                        size: vector2_dim.try_into().unwrap(),
-                        distance: Distance::Dot,
-                        hnsw_config: None,
-                        quantization_config: None,
-                        on_disk: None,
-                    },
-                ),
-            ])),
-            shard_number: 1.try_into().unwrap(),
-            on_disk_payload: false,
-            replication_factor: 1.try_into().unwrap(),
-            write_consistency_factor: 1.try_into().unwrap(),
-        };
-
-        // Base segment
-        let temp_dir = Builder::new().prefix("segment_temp_dir").tempdir().unwrap();
-        let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-        let mut holder = SegmentHolder::default();
-
-        let mut segment = random_multi_vec_segment(
-            dir.path(),
-            100,
-            point_count,
-            vector1_dim as usize,
-            vector2_dim as usize,
-        );
-
-        segment
-            .create_field_index(101, "keyword", Some(&PayloadSchemaType::Keyword.into()))
-            .unwrap();
-
-        let mut segment_id = holder.add(segment);
-        let locked_holder: Arc<RwLock<_>> = Arc::new(RwLock::new(holder));
-
-        let hnsw_config = HnswConfig {
-            m: 16,
-            ef_construct: 100,
-            full_scan_threshold: 10, // Force to build HNSW links for payload
-            max_indexing_threads: 0,
-            on_disk: None,
-            payload_m: None,
-        };
-
-        // Optimizers used in test
-        let index_optimizer = IndexingOptimizer::new(
-            thresholds_config.clone(),
-            dir.path().to_owned(),
-            temp_dir.path().to_owned(),
-            collection_params.clone(),
-            hnsw_config.clone(),
-            Default::default(),
-        );
-        let vacuum_optimizer = VacuumOptimizer::new(
-            0.2,
-            5,
-            thresholds_config,
-            dir.path().to_owned(),
-            temp_dir.path().to_owned(),
-            collection_params,
-            hnsw_config,
-            Default::default(),
-        );
-
-        // Use indexing optimizer to build index for vacuum index test
-        let changed = index_optimizer
-            .optimize(locked_holder.clone(), vec![segment_id], &false.into())
-            .unwrap();
-        assert!(changed, "optimizer should have rebuilt this segment");
-        assert!(
-            locked_holder.read().get(segment_id).is_none(),
-            "optimized segment should be gone",
-        );
-        assert_eq!(locked_holder.read().len(), 2, "index must be built");
-
-        // Update working segment ID
-        segment_id = *locked_holder
-            .read()
-            .iter()
-            .find(|(_, segment)| {
-                let segment = match segment {
-                    LockedSegment::Original(s) => s.read(),
-                    LockedSegment::Proxy(_) => unreachable!(),
-                };
-                segment.total_point_count() > 0
-            })
-            .unwrap()
-            .0;
-
-        // Vacuum optimizer should not optimize yet, no points/vectors have been deleted
-        let suggested_to_optimize =
-            vacuum_optimizer.check_condition(locked_holder.clone(), &Default::default());
-        assert_eq!(suggested_to_optimize.len(), 0);
-
-        // Delete some points and vectors
-        {
-            let holder = locked_holder.write();
-            let segment = holder.get(segment_id).unwrap();
-            let mut segment = match segment {
-                LockedSegment::Original(s) => s.write(),
-                LockedSegment::Proxy(_) => unreachable!(),
-            };
-
-            // Delete 10% of points
-            let segment_points_to_delete = segment
-                .iter_points()
-                .enumerate()
-                .filter_map(|(i, point_id)| (i % 10 == 3).then_some(point_id))
-                .collect_vec();
-            for &point_id in &segment_points_to_delete {
-                segment.delete_point(201, point_id).unwrap();
-            }
-
-            // Delete 25% of vectors named vector1
-            {
-                let id_tracker = segment.id_tracker.clone();
-                let vector1_data = segment.vector_data.get_mut("vector1").unwrap();
-                let mut vector1_storage = vector1_data.vector_storage.borrow_mut();
-
-                let vector1_vecs_to_delete = id_tracker
-                    .borrow()
-                    .iter_external()
-                    .enumerate()
-                    .filter_map(|(i, point_id)| (i % 4 == 0).then_some(point_id))
-                    .collect_vec();
-                for &point_id in &vector1_vecs_to_delete {
-                    let id = id_tracker.borrow().internal_id(point_id).unwrap();
-                    vector1_storage.delete_vector(id).unwrap();
-                }
-            }
-
-            // Delete 10% of vectors named vector2
-            {
-                let id_tracker = segment.id_tracker.clone();
-                let vector2_data = segment.vector_data.get_mut("vector2").unwrap();
-                let mut vector2_storage = vector2_data.vector_storage.borrow_mut();
-
-                let vector2_vecs_to_delete = id_tracker
-                    .borrow()
-                    .iter_external()
-                    .enumerate()
-                    .filter_map(|(i, point_id)| (i % 10 == 7).then_some(point_id))
-                    .collect_vec();
-                for &point_id in &vector2_vecs_to_delete {
-                    let id = id_tracker.borrow().internal_id(point_id).unwrap();
-                    vector2_storage.delete_vector(id).unwrap();
-                }
-            }
-        }
-
-        // Ensure deleted points and vectors are stored properly before optimizing
-        locked_holder
-            .read()
-            .iter()
-            .map(|(_, segment)| match segment {
-                LockedSegment::Original(s) => s.read(),
-                LockedSegment::Proxy(_) => unreachable!(),
-            })
-            .filter(|segment| segment.total_point_count() > 0)
-            .for_each(|segment| {
-                // We should still have all points
-                assert_eq!(segment.total_point_count(), point_count as usize);
-
-                // Named vector storages should have deletions, but not at creation
-                segment.vector_data.values().for_each(|vector_data| {
-                    let vector_storage = vector_data.vector_storage.borrow();
-                    assert!(vector_storage.deleted_vector_count() > 0);
-                });
-            });
-
-        // Run vacuum index optimizer, make sure it optimizes properly
-        let suggested_to_optimize =
-            vacuum_optimizer.check_condition(locked_holder.clone(), &Default::default());
-        assert_eq!(suggested_to_optimize.len(), 1);
-        let changed = vacuum_optimizer
-            .optimize(locked_holder.clone(), suggested_to_optimize, &false.into())
-            .unwrap();
-        assert!(changed, "optimizer should have rebuilt this segment");
-
-        // Ensure deleted points and vectors are optimized
-        locked_holder
-            .read()
-            .iter()
-            .map(|(_, segment)| match segment {
-                LockedSegment::Original(s) => s.read(),
-                LockedSegment::Proxy(_) => unreachable!(),
-            })
-            .filter(|segment| segment.total_point_count() > 0)
-            .for_each(|segment| {
-                // We should have deleted some points
-                assert!(segment.total_point_count() < point_count as usize);
-
-                // Named vector storages should have:
-                // - deleted vectors
-                // - indexed vectors (more than 0)
-                // - indexed less vectors than the total available
-                segment.vector_data.values().for_each(|vector_data| {
-                    let vector_index = vector_data.vector_index.borrow();
-                    let vector_storage = vector_data.vector_storage.borrow();
-
-                    assert!(vector_storage.available_vector_count() > 0);
-                    assert!(vector_storage.deleted_vector_count() > 0);
-                    assert_eq!(
-                        vector_index.indexed_vector_count(),
-                        vector_storage.available_vector_count(),
-                    );
-                });
-            });
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/collection_manager/probabilistic_segment_search_sampling.rs b/crates/qdrant/lib/collection/src/collection_manager/probabilistic_segment_search_sampling.rs
deleted file mode 100644
index 0f2cdeb..0000000
--- a/crates/qdrant/lib/collection/src/collection_manager/probabilistic_segment_search_sampling.rs
+++ /dev/null
@@ -1,153 +0,0 @@
-/// Precomputed sampling table for the probabilistic segment search algorithm.
-///
-/// Associate a lambda factor from the [Poisson distribution](https://en.wikipedia.org/wiki/Poisson_distribution) to a sampling size.
-///
-/// The table is precomputed for a range of segments and a range of `top` params.
-///
-/// TODO attach proper python code to generate the table
-/// Python code to generate the table:
-/// from scipy.stats import poisson
-/// q = 0.999 # probability to cover full top in all segments
-/// res = []
-/// for s in range(2, 1000): # Number of segments
-///   for n in range(100, 10000, 50): # top param
-///     lmbda = n * (1/s)
-///     k = poisson.ppf(q**(1/s), lmbda)
-///     res.append((lmbda, int(k)))
-/// res = sorted(res, key=lambda x: x[0])
-///
-/// with additional code to remove duplicates and values within 5% of each other.
-const POISSON_DISTRIBUTION_SEARCH_SAMPLING: [(f64, usize); 121] = [
-    (0.19342359767891684, 4),
-    (0.398406374501992, 5),
-    (0.6666666666666667, 6),
-    (0.9900990099009901, 7),
-    (1.3513513513513513, 8),
-    (1.7543859649122806, 9),
-    (2.2222222222222223, 10),
-    (2.7027027027027026, 11),
-    (3.125, 12),
-    (3.7037037037037033, 13),
-    (4.166666666666666, 14),
-    (4.761904761904762, 15),
-    (5.263157894736842, 16),
-    (5.88235294117647, 17),
-    (6.25, 18),
-    (7.142857142857142, 19),
-    (7.6923076923076925, 20),
-    (9.090909090909092, 22),
-    (10.0, 24),
-    (11.538461538461538, 26),
-    (12.5, 28),
-    (14.285714285714285, 30),
-    (15.384615384615385, 32),
-    (16.666666666666668, 34),
-    (18.181818181818183, 36),
-    (20.0, 38),
-    (21.428571428571427, 40),
-    (23.076923076923077, 43),
-    (25.0, 46),
-    (27.777777777777775, 49),
-    (30.0, 52),
-    (33.33333333333333, 55),
-    (33.333333333333336, 58),
-    (37.5, 61),
-    (39.285714285714285, 65),
-    (42.857142857142854, 69),
-    (45.83333333333333, 73),
-    (50.0, 77),
-    (50.0, 81),
-    (56.25, 86),
-    (60.0, 91),
-    (66.66666666666666, 96),
-    (70.0, 101),
-    (75.0, 107),
-    (78.57142857142857, 113),
-    (83.33333333333333, 119),
-    (90.0, 125),
-    (94.44444444444444, 132),
-    (100.0, 139),
-    (106.25, 146),
-    (111.53846153846155, 154),
-    (117.6470588235294, 162),
-    (125.0, 171),
-    (137.5, 180),
-    (143.75, 190),
-    (150.0, 200),
-    (162.5, 211),
-    (170.83333333333331, 222),
-    (183.33333333333331, 234),
-    (191.66666666666666, 246),
-    (200.0, 259),
-    (215.0, 272),
-    (230.0, 286),
-    (242.85714285714283, 301),
-    (257.1428571428571, 317),
-    (271.4285714285714, 333),
-    (285.0, 350),
-    (300.0, 368),
-    (318.1818181818182, 387),
-    (340.0, 407),
-    (360.0, 429),
-    (380.0, 451),
-    (400.0, 474),
-    (421.4285714285714, 498),
-    (443.75, 523),
-    (468.1818181818182, 551),
-    (494.4444444444444, 579),
-    (519.2307692307693, 608),
-    (550.0, 639),
-    (576.6666666666666, 671),
-    (614.2857142857142, 706),
-    (650.0, 742),
-    (678.5714285714286, 780),
-    (716.6666666666666, 820),
-    (759.0909090909091, 864),
-    (800.0, 908),
-    (844.4444444444443, 954),
-    (892.8571428571428, 1003),
-    (941.6666666666666, 1054),
-    (991.6666666666666, 1107),
-    (1043.75, 1164),
-    (1100.0, 1224),
-    (1175.0, 1289),
-    (1233.3333333333333, 1355),
-    (1291.6666666666665, 1423),
-    (1364.2857142857142, 1500),
-    (1440.0, 1576),
-    (1516.6666666666665, 1658),
-    (1600.0, 1741),
-    (1687.5, 1832),
-    (1780.0, 1931),
-    (1875.0, 2028),
-    (1975.0, 2132),
-    (2083.333333333333, 2240),
-    (2200.0, 2356),
-    (2316.6666666666665, 2482),
-    (2437.5, 2611),
-    (2575.0, 2744),
-    (2716.6666666666665, 2896),
-    (2866.6666666666665, 3051),
-    (3016.6666666666665, 3205),
-    (3183.333333333333, 3377),
-    (3375.0, 3568),
-    (3550.0, 3748),
-    (3750.0, 3953),
-    (3950.0, 4158),
-    (4175.0, 4389),
-    (4400.0, 4620),
-    (4650.0, 4876),
-    (4900.0, 5132),
-    (f64::MAX, usize::MAX),
-];
-
-/// Uses binary search to find the sampling size for a given lambda.
-pub fn find_search_sampling_over_point_distribution(n: f64, p: f64) -> Option<usize> {
-    let target_lambda = p * n;
-    let k = POISSON_DISTRIBUTION_SEARCH_SAMPLING
-        .binary_search_by(|&(lambda, _sampling)| lambda.partial_cmp(&target_lambda).unwrap());
-    match k {
-        Ok(k) => Some(POISSON_DISTRIBUTION_SEARCH_SAMPLING[k].1),
-        Err(insert) => Some(POISSON_DISTRIBUTION_SEARCH_SAMPLING[insert].1),
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/collection_manager/search_result_aggregator.rs b/crates/qdrant/lib/collection/src/collection_manager/search_result_aggregator.rs
deleted file mode 100644
index d8a4280..0000000
--- a/crates/qdrant/lib/collection/src/collection_manager/search_result_aggregator.rs
+++ /dev/null
@@ -1,107 +0,0 @@
-use std::cmp::max;
-use std::collections::{HashMap, HashSet};
-
-use common::fixed_length_priority_queue::FixedLengthPriorityQueue;
-use segment::types::{PointIdType, ScoreType, ScoredPoint, SeqNumberType};
-
-pub struct SearchResultAggregator {
-    queue: FixedLengthPriorityQueue<ScoredPoint>,
-    seen: HashSet<PointIdType>, // Point ids seen
-}
-
-impl SearchResultAggregator {
-    pub fn new(limit: usize) -> Self {
-        SearchResultAggregator {
-            queue: FixedLengthPriorityQueue::new(limit),
-            seen: HashSet::new(),
-        }
-    }
-
-    pub fn push(&mut self, point: ScoredPoint) {
-        let point_id = point.id;
-        if !self.seen.contains(&point_id) {
-            self.seen.insert(point_id);
-            self.queue.push(point);
-        }
-    }
-
-    pub fn into_vec(self) -> Vec<ScoredPoint> {
-        self.queue.into_vec()
-    }
-
-    pub fn lowest(&self) -> Option<&ScoredPoint> {
-        self.queue.top()
-    }
-}
-
-pub struct BatchResultAggregator {
-    // result aggregators for each batched request
-    batch_aggregators: Vec<SearchResultAggregator>,
-    // Store max version for each point id to exclude outdated points from the result
-    point_versions: HashMap<PointIdType, SeqNumberType>,
-}
-
-impl BatchResultAggregator {
-    pub fn new(tops: impl Iterator<Item = usize>) -> Self {
-        let mut merged_results_per_batch = vec![];
-        for top in tops {
-            merged_results_per_batch.push(SearchResultAggregator::new(top));
-        }
-
-        BatchResultAggregator {
-            batch_aggregators: merged_results_per_batch,
-            point_versions: HashMap::new(),
-        }
-    }
-
-    pub fn update_point_versions(&mut self, search_results: &Vec<Vec<Vec<ScoredPoint>>>) {
-        for segment_result in search_results {
-            for segment_batch_result in segment_result {
-                for point in segment_batch_result {
-                    let point_id = point.id;
-                    let point_version =
-                        self.point_versions.entry(point_id).or_insert(point.version);
-                    *point_version = max(*point_version, point.version);
-                }
-            }
-        }
-    }
-
-    /// Updates the specific batch result aggregator with the new points
-    /// Point must be:
-    /// - not seen before
-    /// - not outdated (not less than the version stored in point_versions)
-    ///
-    /// WARN: Must be called after `update_point_versions`, so that `point_versions` is up to date
-    pub fn update_batch_results(
-        &mut self,
-        batch_id: usize,
-        search_results: impl Iterator<Item = ScoredPoint>,
-    ) {
-        let aggregator = &mut self.batch_aggregators[batch_id];
-        for scored_point in search_results {
-            debug_assert!(self.point_versions.contains_key(&scored_point.id));
-            let point_max_version = self
-                .point_versions
-                .get(&scored_point.id)
-                .copied()
-                .unwrap_or(0);
-            if scored_point.version >= point_max_version {
-                aggregator.push(scored_point);
-            }
-        }
-    }
-
-    /// Return lowest acceptable score for given batch id
-    pub fn batch_lowest_scores(&self, batch_id: usize) -> Option<ScoreType> {
-        let batch_scores = &self.batch_aggregators[batch_id];
-        batch_scores.lowest().map(|x| x.score)
-    }
-
-    pub fn into_topk(self) -> Vec<Vec<ScoredPoint>> {
-        self.batch_aggregators
-            .into_iter()
-            .map(|x| x.into_vec())
-            .collect()
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/collection_manager/segments_searcher.rs b/crates/qdrant/lib/collection/src/collection_manager/segments_searcher.rs
deleted file mode 100644
index ca8d01d..0000000
--- a/crates/qdrant/lib/collection/src/collection_manager/segments_searcher.rs
+++ /dev/null
@@ -1,674 +0,0 @@
-use std::collections::HashMap;
-use std::sync::atomic::AtomicBool;
-use std::sync::Arc;
-
-use futures::future::try_join_all;
-use ordered_float::Float;
-use parking_lot::RwLock;
-use segment::data_types::named_vectors::NamedVectors;
-use segment::data_types::vectors::VectorElementType;
-use segment::entry::entry_point::OperationError;
-use segment::types::{
-    Filter, Indexes, PointIdType, ScoreType, ScoredPoint, SearchParams, SegmentConfig,
-    SeqNumberType, WithPayload, WithPayloadInterface, WithVector,
-};
-use tokio::runtime::Handle;
-use tokio::task::JoinHandle;
-
-use crate::collection_manager::holders::segment_holder::{LockedSegment, SegmentHolder};
-use crate::collection_manager::probabilistic_segment_search_sampling::find_search_sampling_over_point_distribution;
-use crate::collection_manager::search_result_aggregator::BatchResultAggregator;
-use crate::operations::types::{CollectionResult, Record, SearchRequestBatch};
-
-type BatchOffset = usize;
-type SegmentOffset = usize;
-
-// batch -> point for one segment
-type SegmentBatchSearchResult = Vec<Vec<ScoredPoint>>;
-// Segment -> batch -> point
-type BatchSearchResult = Vec<SegmentBatchSearchResult>;
-
-// Result of batch search in one segment
-type SegmentSearchExecutedResult = CollectionResult<(SegmentBatchSearchResult, Vec<bool>)>;
-
-/// Simple implementation of segment manager
-///  - rebuild segment for memory optimization purposes
-#[derive(Default)]
-pub struct SegmentsSearcher {}
-
-impl SegmentsSearcher {
-    async fn execute_searches(
-        searches: Vec<JoinHandle<SegmentSearchExecutedResult>>,
-    ) -> CollectionResult<(BatchSearchResult, Vec<Vec<bool>>)> {
-        let searches = try_join_all(searches);
-        let search_results_per_segment_res = searches.await?;
-
-        let mut search_results_per_segment = vec![];
-        let mut further_searches_per_segment = vec![];
-        for search_result in search_results_per_segment_res {
-            let (search_results, further_searches) = search_result?;
-            debug_assert!(search_results.len() == further_searches.len());
-            search_results_per_segment.push(search_results);
-            further_searches_per_segment.push(further_searches);
-        }
-        Ok((search_results_per_segment, further_searches_per_segment))
-    }
-
-    /// Processes search result of [segment_size x batch_size]
-    ///
-    /// # Arguments
-    /// * search_result - [segment_size x batch_size]
-    /// * limits - [batch_size] - how many results to return for each batched request
-    /// * further_searches - [segment_size x batch_size] - whether we can search further in the segment
-    ///
-    /// Returns batch results aggregated by [batch_size] and list of queries, grouped by segment to re-run
-    pub(crate) fn process_search_result_step1(
-        search_result: BatchSearchResult,
-        limits: Vec<usize>,
-        further_results: Vec<Vec<bool>>,
-    ) -> (
-        BatchResultAggregator,
-        HashMap<SegmentOffset, Vec<BatchOffset>>,
-    ) {
-        let number_segments = search_result.len();
-        let batch_size = limits.len();
-
-        // The lowest scored element must be larger or equal to the worst scored element in each segment.
-        // Otherwise, the sampling is invalid and some points might be missing.
-        // e.g. with 3 segments with the following sampled ranges:
-        // s1 - [0.91 -> 0.87]
-        // s2 - [0.92 -> 0.86]
-        // s3 - [0.93 -> 0.85]
-        // If the top merged scores result range is [0.93 -> 0.86] then we do not know if s1 could have contributed more points at the lower part between [0.87 -> 0.86]
-        // In that case, we need to re-run the search without sampling on that segment.
-
-        // Initialize result aggregators for each batched request
-        let mut result_aggregator = BatchResultAggregator::new(limits.iter().copied());
-        result_aggregator.update_point_versions(&search_result);
-
-        // Therefore we need to track the lowest scored element per segment for each batch
-        let mut lowest_scores_per_request: Vec<Vec<ScoreType>> = vec![
-            vec![f32::max_value(); batch_size]; // initial max score value for each batch
-            number_segments
-        ];
-
-        let mut retrieved_points_per_request: Vec<Vec<BatchOffset>> = vec![
-            vec![0; batch_size]; // initial max score value for each batch
-            number_segments
-        ];
-
-        // Batch results merged from all segments
-        for (segment_idx, segment_result) in search_result.into_iter().enumerate() {
-            // merge results for each batch search request across segments
-            for (batch_req_idx, query_res) in segment_result.into_iter().enumerate() {
-                retrieved_points_per_request[segment_idx][batch_req_idx] = query_res.len();
-                lowest_scores_per_request[segment_idx][batch_req_idx] = query_res
-                    .last()
-                    .map(|x| x.score)
-                    .unwrap_or_else(f32::min_value);
-                result_aggregator.update_batch_results(batch_req_idx, query_res.into_iter());
-            }
-        }
-
-        // segment id -> list of batch ids
-        let mut searches_to_rerun: HashMap<SegmentOffset, Vec<BatchOffset>> = HashMap::new();
-
-        // Check if we want to re-run the search without sampling on some segments
-        for (batch_id, required_limit) in limits.iter().copied().enumerate() {
-            let lowest_batch_score_opt = result_aggregator.batch_lowest_scores(batch_id);
-
-            // If there are no results, we do not need to re-run the search
-            if let Some(lowest_batch_score) = lowest_batch_score_opt {
-                for segment_id in 0..number_segments {
-                    let segment_lowest_score = lowest_scores_per_request[segment_id][batch_id];
-                    let retrieved_points = retrieved_points_per_request[segment_id][batch_id];
-                    let have_further_results = further_results[segment_id][batch_id];
-
-                    if have_further_results
-                        && retrieved_points < required_limit
-                        && segment_lowest_score >= lowest_batch_score
-                    {
-                        log::debug!("Search to re-run without sampling on segment_id: {segment_id} segment_lowest_score: {segment_lowest_score}, lowest_batch_score: {lowest_batch_score}, retrieved_points: {retrieved_points}, required_limit: {required_limit}");
-                        // It is possible, that current segment can have better results than
-                        // the lowest score in the batch. In that case, we need to re-run the search
-                        // without sampling on that segment.
-                        searches_to_rerun
-                            .entry(segment_id)
-                            .or_insert_with(Vec::new)
-                            .push(batch_id);
-                    }
-                }
-            }
-        }
-
-        (result_aggregator, searches_to_rerun)
-    }
-
-    pub async fn search(
-        segments: &RwLock<SegmentHolder>,
-        batch_request: Arc<SearchRequestBatch>,
-        runtime_handle: &Handle,
-        sampling_enabled: bool,
-        is_stopped: Arc<AtomicBool>,
-    ) -> CollectionResult<Vec<Vec<ScoredPoint>>> {
-        // Using { } block to ensure segments variable is dropped in the end of it
-        // and is not transferred across the all_searches.await? boundary as it
-        // does not impl Send trait
-        let (locked_segments, searches): (Vec<_>, Vec<_>) = {
-            let segments = segments.read();
-
-            let some_segment = segments.iter().next();
-            if some_segment.is_none() {
-                return Ok(vec![]);
-            }
-
-            // Probabilistic sampling for the `limit` parameter avoids over-fetching points from segments.
-            // e.g. 10 segments with limit 1000 would fetch 10000 points in total and discard 9000 points.
-            // With probabilistic sampling we determine a smaller sampling limit for each segment.
-            // Use probabilistic sampling if:
-            // - sampling is enabled
-            // - more than 1 segment
-            // - segments are not empty
-            let available_points_segments = segments
-                .iter()
-                .map(|(_, segment)| segment.get().read().available_point_count())
-                .sum();
-            let use_sampling =
-                sampling_enabled && segments.len() > 1 && available_points_segments > 0;
-
-            segments
-                .iter()
-                .map(|(_id, segment)| {
-                    let search = runtime_handle.spawn_blocking({
-                        let (segment, batch_request) = (segment.clone(), batch_request.clone());
-                        let is_stopped_clone = is_stopped.clone();
-                        move || {
-                            search_in_segment(
-                                segment,
-                                batch_request,
-                                available_points_segments,
-                                use_sampling,
-                                &is_stopped_clone,
-                            )
-                        }
-                    });
-                    (segment.clone(), search)
-                })
-                .unzip()
-        };
-        // perform search on all segments concurrently
-        // the resulting Vec is in the same order as the segment searches were provided.
-        let (all_search_results_per_segment, further_results) =
-            Self::execute_searches(searches).await?;
-        debug_assert!(all_search_results_per_segment.len() == locked_segments.len());
-
-        let (mut result_aggregator, searches_to_rerun) = Self::process_search_result_step1(
-            all_search_results_per_segment,
-            batch_request
-                .searches
-                .iter()
-                .map(|request| request.limit + request.offset)
-                .collect(),
-            further_results,
-        );
-        // The second step of the search is to re-run the search without sampling on some segments
-        // Expected that this stage will be executed rarely
-        if !searches_to_rerun.is_empty() {
-            // TODO notify telemetry of failing sampling
-            // Ensure consistent order of segment ids
-            let searches_to_rerun: Vec<(SegmentOffset, Vec<BatchOffset>)> =
-                searches_to_rerun.into_iter().collect();
-
-            let secondary_searches: Vec<_> = {
-                let mut res = vec![];
-                for (segment_id, batch_ids) in searches_to_rerun.iter() {
-                    let segment = locked_segments[*segment_id].clone();
-                    let partial_batch_request = Arc::new(SearchRequestBatch {
-                        searches: batch_ids
-                            .iter()
-                            .map(|batch_id| batch_request.searches[*batch_id].clone())
-                            .collect(),
-                    });
-                    let is_stopped_clone = is_stopped.clone();
-                    res.push(runtime_handle.spawn_blocking(move || {
-                        search_in_segment(
-                            segment,
-                            partial_batch_request,
-                            0,
-                            false,
-                            &is_stopped_clone,
-                        )
-                    }))
-                }
-                res
-            };
-
-            let (secondary_search_results_per_segment, _) =
-                Self::execute_searches(secondary_searches).await?;
-
-            result_aggregator.update_point_versions(&secondary_search_results_per_segment);
-
-            for ((_segment_id, batch_ids), segments_result) in searches_to_rerun
-                .into_iter()
-                .zip(secondary_search_results_per_segment.into_iter())
-            {
-                for (batch_id, secondary_batch_result) in
-                    batch_ids.into_iter().zip(segments_result.into_iter())
-                {
-                    result_aggregator
-                        .update_batch_results(batch_id, secondary_batch_result.into_iter());
-                }
-            }
-        }
-
-        let top_scores: Vec<_> = result_aggregator.into_topk();
-        Ok(top_scores)
-    }
-
-    pub fn retrieve(
-        segments: &RwLock<SegmentHolder>,
-        points: &[PointIdType],
-        with_payload: &WithPayload,
-        with_vector: &WithVector,
-    ) -> CollectionResult<Vec<Record>> {
-        let mut point_version: HashMap<PointIdType, SeqNumberType> = Default::default();
-        let mut point_records: HashMap<PointIdType, Record> = Default::default();
-
-        segments.read().read_points(points, |id, segment| {
-            let version = segment.point_version(id).ok_or_else(|| {
-                OperationError::service_error(format!("No version for point {id}"))
-            })?;
-            // If this point was not found yet or this segment have later version
-            if !point_version.contains_key(&id) || point_version[&id] < version {
-                point_records.insert(
-                    id,
-                    Record {
-                        id,
-                        payload: if with_payload.enable {
-                            if let Some(selector) = &with_payload.payload_selector {
-                                Some(selector.process(segment.payload(id)?))
-                            } else {
-                                Some(segment.payload(id)?)
-                            }
-                        } else {
-                            None
-                        },
-                        vector: match with_vector {
-                            WithVector::Bool(true) => Some(segment.all_vectors(id)?.into()),
-                            WithVector::Bool(false) => None,
-                            WithVector::Selector(vector_names) => {
-                                let mut selected_vectors = NamedVectors::default();
-                                for vector_name in vector_names {
-                                    if let Some(vector) = segment.vector(vector_name, id)? {
-                                        selected_vectors.insert(vector_name.into(), vector);
-                                    }
-                                }
-                                Some(selected_vectors.into())
-                            }
-                        },
-                    },
-                );
-                point_version.insert(id, version);
-            }
-            Ok(true)
-        })?;
-        Ok(point_records.into_values().collect())
-    }
-}
-
-#[derive(PartialEq, Default, Debug)]
-struct BatchSearchParams<'a> {
-    pub vector_name: &'a str,
-    pub filter: Option<&'a Filter>,
-    pub with_payload: WithPayload,
-    pub with_vector: WithVector,
-    pub top: usize,
-    pub params: Option<&'a SearchParams>,
-}
-
-/// Returns suggested search sampling size for a given number of points and required limit.
-fn sampling_limit(
-    limit: usize,
-    ef_limit: Option<usize>,
-    segment_points: usize,
-    total_points: usize,
-) -> usize {
-    // shortcut empty segment
-    if segment_points == 0 {
-        return 0;
-    }
-    let segment_probability = segment_points as f64 / total_points as f64;
-    let poisson_sampling =
-        find_search_sampling_over_point_distribution(limit as f64, segment_probability)
-            .unwrap_or(limit);
-    let effective = effective_limit(limit, ef_limit.unwrap_or(0), poisson_sampling);
-    log::trace!("sampling: {effective}, poisson: {poisson_sampling} segment_probability: {segment_probability}, segment_points: {segment_points}, total_points: {total_points}");
-    effective
-}
-
-/// Determines the effective ef limit value for the given parameters.
-fn effective_limit(limit: usize, ef_limit: usize, poisson_sampling: usize) -> usize {
-    // Prefer the highest of poisson_sampling/ef_limit, but never be higher than limit
-    poisson_sampling.max(ef_limit).min(limit)
-}
-
-/// Process sequentially contiguous batches
-///
-/// # Arguments
-///
-/// * `segment` - Locked segment to search in
-/// * `request` - Batch of search requests
-/// * `total_points` - Number of points in all segments combined
-/// * `use_sampling` - If true, try to use probabilistic sampling
-///
-/// # Returns
-///
-/// Collection Result of:
-/// * Vector of ScoredPoints for each request in the batch
-/// * Vector of boolean indicating if the segment have further points to search
-fn search_in_segment(
-    segment: LockedSegment,
-    request: Arc<SearchRequestBatch>,
-    total_points: usize,
-    use_sampling: bool,
-    is_stopped: &AtomicBool,
-) -> CollectionResult<(Vec<Vec<ScoredPoint>>, Vec<bool>)> {
-    let batch_size = request.searches.len();
-
-    let mut result: Vec<Vec<ScoredPoint>> = Vec::with_capacity(batch_size);
-    let mut further_results: Vec<bool> = Vec::with_capacity(batch_size); // if segment have more points to return
-    let mut vectors_batch: Vec<&[VectorElementType]> = vec![];
-    let mut prev_params = BatchSearchParams::default();
-
-    for search_query in &request.searches {
-        let with_payload_interface = search_query
-            .with_payload
-            .as_ref()
-            .unwrap_or(&WithPayloadInterface::Bool(false));
-
-        let params = BatchSearchParams {
-            vector_name: search_query.vector.get_name(),
-            filter: search_query.filter.as_ref(),
-            with_payload: WithPayload::from(with_payload_interface),
-            with_vector: search_query.with_vector.clone().unwrap_or_default(),
-            top: search_query.limit + search_query.offset,
-            params: search_query.params.as_ref(),
-        };
-
-        // same params enables batching
-        if params == prev_params {
-            vectors_batch.push(search_query.vector.get_vector().as_slice());
-        } else {
-            // different params means different batches
-            // execute what has been batched so far
-            if !vectors_batch.is_empty() {
-                let locked_segment = segment.get();
-                let read_segment = locked_segment.read();
-                let segment_points = read_segment.available_point_count();
-                let top = if use_sampling {
-                    let ef_limit = prev_params.params.and_then(|p| p.hnsw_ef).or_else(|| {
-                        get_hnsw_ef_construct(read_segment.config(), prev_params.vector_name)
-                    });
-                    sampling_limit(prev_params.top, ef_limit, segment_points, total_points)
-                } else {
-                    prev_params.top
-                };
-
-                let mut res = read_segment.search_batch(
-                    prev_params.vector_name,
-                    &vectors_batch,
-                    &prev_params.with_payload,
-                    &prev_params.with_vector,
-                    prev_params.filter,
-                    top,
-                    prev_params.params,
-                    is_stopped,
-                )?;
-                for batch_result in &res {
-                    further_results.push(batch_result.len() == top);
-                }
-                result.append(&mut res);
-                // clear current batch
-                vectors_batch.clear();
-            }
-            // start new batch for current search query
-            vectors_batch.push(search_query.vector.get_vector().as_slice());
-            prev_params = params;
-        }
-    }
-
-    // run last batch if any
-    if !vectors_batch.is_empty() {
-        let locked_segment = segment.get();
-        let read_segment = locked_segment.read();
-        let segment_points = read_segment.available_point_count();
-        let top = if use_sampling {
-            let ef_limit = prev_params
-                .params
-                .and_then(|p| p.hnsw_ef)
-                .or_else(|| get_hnsw_ef_construct(read_segment.config(), prev_params.vector_name));
-            sampling_limit(prev_params.top, ef_limit, segment_points, total_points)
-        } else {
-            prev_params.top
-        };
-        let mut res = read_segment.search_batch(
-            prev_params.vector_name,
-            &vectors_batch,
-            &prev_params.with_payload,
-            &prev_params.with_vector,
-            prev_params.filter,
-            top,
-            prev_params.params,
-            is_stopped,
-        )?;
-        for batch_result in &res {
-            further_results.push(batch_result.len() == top);
-        }
-        result.append(&mut res);
-    }
-
-    Ok((result, further_results))
-}
-
-/// Find the HNSW ef_construct for a named vector
-///
-/// If the given named vector has no HNSW index, `None` is returned.
-fn get_hnsw_ef_construct(config: SegmentConfig, vector_name: &str) -> Option<usize> {
-    config
-        .vector_data
-        .get(vector_name)
-        .and_then(|config| match &config.index {
-            Indexes::Plain {} => None,
-            Indexes::Hnsw(hnsw) => Some(hnsw),
-        })
-        .map(|hnsw| hnsw.ef_construct)
-}
-
-#[cfg(test)]
-mod tests {
-    use segment::fixtures::index_fixtures::random_vector;
-    use tempfile::Builder;
-
-    use super::*;
-    use crate::collection_manager::fixtures::{build_test_holder, random_segment};
-    use crate::operations::types::SearchRequest;
-
-    #[tokio::test]
-    async fn test_segments_search() {
-        let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-
-        let segment_holder = build_test_holder(dir.path());
-
-        let query = vec![1.0, 1.0, 1.0, 1.0];
-
-        let req = SearchRequest {
-            vector: query.into(),
-            with_payload: None,
-            with_vector: None,
-            filter: None,
-            params: None,
-            limit: 5,
-            score_threshold: None,
-            offset: 0,
-        };
-
-        let batch_request = SearchRequestBatch {
-            searches: vec![req],
-        };
-
-        let result = SegmentsSearcher::search(
-            &segment_holder,
-            Arc::new(batch_request),
-            &Handle::current(),
-            true,
-            Arc::new(AtomicBool::new(false)),
-        )
-        .await
-        .unwrap()
-        .into_iter()
-        .next()
-        .unwrap();
-
-        // eprintln!("result = {:?}", &result);
-
-        assert_eq!(result.len(), 5);
-
-        assert!(result[0].id == 3.into() || result[0].id == 11.into());
-        assert!(result[1].id == 3.into() || result[1].id == 11.into());
-    }
-
-    #[tokio::test]
-    async fn test_segments_search_sampling() {
-        let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-
-        let segment1 = random_segment(dir.path(), 10, 2000, 4);
-        let segment2 = random_segment(dir.path(), 10, 4000, 4);
-
-        let mut holder = SegmentHolder::default();
-
-        let _sid1 = holder.add(segment1);
-        let _sid2 = holder.add(segment2);
-
-        let segment_holder = RwLock::new(holder);
-
-        let mut rnd = rand::thread_rng();
-
-        for _ in 0..100 {
-            let req1 = SearchRequest {
-                vector: random_vector(&mut rnd, 4).into(),
-                limit: 150, // more than LOWER_SEARCH_LIMIT_SAMPLING
-                offset: 0,
-                with_payload: None,
-                with_vector: None,
-                filter: None,
-                params: None,
-                score_threshold: None,
-            };
-            let req2 = SearchRequest {
-                vector: random_vector(&mut rnd, 4).into(),
-                limit: 50, // less than LOWER_SEARCH_LIMIT_SAMPLING
-                offset: 0,
-                filter: None,
-                params: None,
-                with_payload: None,
-                with_vector: None,
-                score_threshold: None,
-            };
-
-            let batch_request = SearchRequestBatch {
-                searches: vec![req1, req2],
-            };
-
-            let result_no_sampling = SegmentsSearcher::search(
-                &segment_holder,
-                Arc::new(batch_request.clone()),
-                &Handle::current(),
-                false,
-                Arc::new(false.into()),
-            )
-            .await
-            .unwrap();
-
-            assert!(!result_no_sampling.is_empty());
-
-            let result_sampling = SegmentsSearcher::search(
-                &segment_holder,
-                Arc::new(batch_request),
-                &Handle::current(),
-                true,
-                Arc::new(false.into()),
-            )
-            .await
-            .unwrap();
-            assert!(!result_sampling.is_empty());
-
-            // assert equivalence in depth
-            assert_eq!(result_no_sampling[0].len(), result_sampling[0].len());
-            assert_eq!(result_no_sampling[1].len(), result_sampling[1].len());
-
-            for (no_sampling, sampling) in
-                result_no_sampling[0].iter().zip(result_sampling[0].iter())
-            {
-                assert_eq!(no_sampling.score, sampling.score); // different IDs may have same scores
-            }
-        }
-    }
-
-    #[test]
-    fn test_retrieve() {
-        let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-        let segment_holder = build_test_holder(dir.path());
-
-        let records = SegmentsSearcher::retrieve(
-            &segment_holder,
-            &[1.into(), 2.into(), 3.into()],
-            &WithPayload::from(true),
-            &true.into(),
-        )
-        .unwrap();
-        assert_eq!(records.len(), 3);
-    }
-
-    #[test]
-    fn test_sampling_limit() {
-        assert_eq!(sampling_limit(1000, None, 464530, 35103551), 30);
-    }
-
-    #[test]
-    fn test_sampling_limit_ef() {
-        assert_eq!(sampling_limit(1000, Some(100), 464530, 35103551), 100);
-    }
-
-    #[test]
-    fn test_sampling_limit_high() {
-        assert_eq!(sampling_limit(1000000, None, 464530, 35103551), 1000000);
-    }
-
-    /// Tests whether calculating the effective ef limit value is correct.
-    ///
-    /// Because there was confustion about what the effective value should be for some input
-    /// combinations, we decided to write this tests to ensure correctness.
-    ///
-    /// See: <https://github.com/qdrant/qdrant/pull/1694>
-    #[test]
-    fn test_effective_limit() {
-        // Test cases to assert: (limit, ef_limit, poisson_sampling, effective)
-        let tests = [
-            (1000, 128, 150, 150),
-            (1000, 128, 110, 128),
-            (130, 128, 150, 130),
-            (130, 128, 110, 128),
-            (50, 128, 150, 50),
-            (50, 128, 110, 50),
-            (500, 1000, 300, 500),
-            (500, 400, 300, 400),
-            (1000, 0, 150, 150),
-            (1000, 0, 110, 110),
-        ];
-        tests.into_iter().for_each(|(limit, ef_limit, poisson_sampling, effective)| assert_eq!(
-            effective_limit(limit, ef_limit, poisson_sampling),
-            effective,
-            "effective limit for [limit: {limit}, ef_limit: {ef_limit}, poisson_sampling: {poisson_sampling}] must be {effective}",
-        ));
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/collection_manager/segments_updater.rs b/crates/qdrant/lib/collection/src/collection_manager/segments_updater.rs
deleted file mode 100644
index 06193d7..0000000
--- a/crates/qdrant/lib/collection/src/collection_manager/segments_updater.rs
+++ /dev/null
@@ -1,547 +0,0 @@
-//! A collection of functions for updating points and payloads stored in segments
-
-use std::collections::{HashMap, HashSet};
-
-use parking_lot::{RwLock, RwLockWriteGuard};
-use segment::data_types::named_vectors::NamedVectors;
-use segment::entry::entry_point::{OperationError, OperationResult, SegmentEntry};
-use segment::types::{
-    Filter, Payload, PayloadFieldSchema, PayloadKeyType, PayloadKeyTypeRef, PointIdType,
-    SeqNumberType,
-};
-
-use crate::collection_manager::holders::segment_holder::SegmentHolder;
-use crate::operations::payload_ops::PayloadOps;
-use crate::operations::point_ops::{PointInsertOperations, PointOperations, PointStruct};
-use crate::operations::types::{CollectionError, CollectionResult};
-use crate::operations::vector_ops::{PointVectors, VectorOperations};
-use crate::operations::FieldIndexOperations;
-
-pub(crate) fn check_unprocessed_points(
-    points: &[PointIdType],
-    processed: &HashSet<PointIdType>,
-) -> CollectionResult<usize> {
-    let first_missed_point = points.iter().copied().find(|p| !processed.contains(p));
-
-    match first_missed_point {
-        None => Ok(processed.len()),
-        Some(missed_point_id) => Err(CollectionError::PointNotFound { missed_point_id }),
-    }
-}
-
-/// Tries to delete points from all segments, returns number of actually deleted points
-pub(crate) fn delete_points(
-    segments: &SegmentHolder,
-    op_num: SeqNumberType,
-    ids: &[PointIdType],
-) -> CollectionResult<usize> {
-    segments
-        .apply_points(ids, |id, _idx, write_segment| {
-            write_segment.delete_point(op_num, id)
-        })
-        .map_err(Into::into)
-}
-
-/// Update the specified named vectors of a point, keeping unspecified vectors intact.
-pub(crate) fn update_vectors(
-    segments: &SegmentHolder,
-    op_num: SeqNumberType,
-    points: &[PointVectors],
-) -> CollectionResult<usize> {
-    let points_map: HashMap<PointIdType, &PointVectors> =
-        points.iter().map(|p| (p.id, p)).collect();
-    let ids: Vec<PointIdType> = points_map.keys().copied().collect();
-
-    let updated_points =
-        segments.apply_points_to_appendable(op_num, &ids, |id, write_segment| {
-            let vectors = points_map[&id].vector.clone().into_all_vectors();
-            write_segment.update_vectors(op_num, id, vectors)
-        })?;
-    check_unprocessed_points(&ids, &updated_points)?;
-    Ok(updated_points.len())
-}
-
-/// Delete the given named vectors for the given points, keeping other vectors intact.
-pub(crate) fn delete_vectors(
-    segments: &SegmentHolder,
-    op_num: SeqNumberType,
-    points: &[PointIdType],
-    vector_names: &[String],
-) -> CollectionResult<usize> {
-    segments
-        .apply_points(points, |id, _idx, write_segment| {
-            let mut res = true;
-            for name in vector_names {
-                res &= write_segment.delete_vector(op_num, id, name)?;
-            }
-            Ok(res)
-        })
-        .map_err(Into::into)
-}
-
-/// Delete the given named vectors for points matching the given filter, keeping other vectors intact.
-pub(crate) fn delete_vectors_by_filter(
-    segments: &SegmentHolder,
-    op_num: SeqNumberType,
-    filter: &Filter,
-    vector_names: &[String],
-) -> CollectionResult<usize> {
-    let affected_points = points_by_filter(segments, filter)?;
-    delete_vectors(segments, op_num, &affected_points, vector_names)
-}
-
-pub(crate) fn overwrite_payload(
-    segments: &SegmentHolder,
-    op_num: SeqNumberType,
-    payload: &Payload,
-    points: &[PointIdType],
-) -> CollectionResult<usize> {
-    let updated_points =
-        segments.apply_points_to_appendable(op_num, points, |id, write_segment| {
-            write_segment.set_full_payload(op_num, id, payload)?;
-            Ok(true)
-        })?;
-
-    check_unprocessed_points(points, &updated_points)?;
-    Ok(updated_points.len())
-}
-
-pub(crate) fn overwrite_payload_by_filter(
-    segments: &SegmentHolder,
-    op_num: SeqNumberType,
-    payload: &Payload,
-    filter: &Filter,
-) -> CollectionResult<usize> {
-    let affected_points = points_by_filter(segments, filter)?;
-    overwrite_payload(segments, op_num, payload, &affected_points)
-}
-
-pub(crate) fn set_payload(
-    segments: &SegmentHolder,
-    op_num: SeqNumberType,
-    payload: &Payload,
-    points: &[PointIdType],
-) -> CollectionResult<usize> {
-    let updated_points =
-        segments.apply_points_to_appendable(op_num, points, |id, write_segment| {
-            write_segment.set_payload(op_num, id, payload)?;
-            Ok(true)
-        })?;
-
-    check_unprocessed_points(points, &updated_points)?;
-    Ok(updated_points.len())
-}
-
-fn points_by_filter(
-    segments: &SegmentHolder,
-    filter: &Filter,
-) -> CollectionResult<Vec<PointIdType>> {
-    let mut affected_points: Vec<PointIdType> = Vec::new();
-    segments.for_each_segment(|s| {
-        let points = s.read_filtered(None, None, Some(filter));
-        affected_points.extend_from_slice(points.as_slice());
-        Ok(true)
-    })?;
-    Ok(affected_points)
-}
-
-pub(crate) fn set_payload_by_filter(
-    segments: &SegmentHolder,
-    op_num: SeqNumberType,
-    payload: &Payload,
-    filter: &Filter,
-) -> CollectionResult<usize> {
-    let affected_points = points_by_filter(segments, filter)?;
-    set_payload(segments, op_num, payload, &affected_points)
-}
-
-pub(crate) fn delete_payload(
-    segments: &SegmentHolder,
-    op_num: SeqNumberType,
-    points: &[PointIdType],
-    keys: &[PayloadKeyType],
-) -> CollectionResult<usize> {
-    let updated_points =
-        segments.apply_points_to_appendable(op_num, points, |id, write_segment| {
-            let mut res = true;
-            for key in keys {
-                res &= write_segment.delete_payload(op_num, id, key)?;
-            }
-            Ok(res)
-        })?;
-
-    check_unprocessed_points(points, &updated_points)?;
-    Ok(updated_points.len())
-}
-
-pub(crate) fn delete_payload_by_filter(
-    segments: &SegmentHolder,
-    op_num: SeqNumberType,
-    filter: &Filter,
-    keys: &[PayloadKeyType],
-) -> CollectionResult<usize> {
-    let affected_points = points_by_filter(segments, filter)?;
-    delete_payload(segments, op_num, &affected_points, keys)
-}
-
-pub(crate) fn clear_payload(
-    segments: &SegmentHolder,
-    op_num: SeqNumberType,
-    points: &[PointIdType],
-) -> CollectionResult<usize> {
-    let updated_points =
-        segments.apply_points_to_appendable(op_num, points, |id, write_segment| {
-            write_segment.clear_payload(op_num, id)
-        })?;
-
-    check_unprocessed_points(points, &updated_points)?;
-    Ok(updated_points.len())
-}
-
-/// Clear Payloads from all segments matching the given filter
-pub(crate) fn clear_payload_by_filter(
-    segments: &SegmentHolder,
-    op_num: SeqNumberType,
-    filter: &Filter,
-) -> CollectionResult<usize> {
-    let points_to_clear = points_by_filter(segments, filter)?;
-
-    let updated_points = segments.apply_points_to_appendable(
-        op_num,
-        points_to_clear.as_slice(),
-        |id, write_segment| write_segment.clear_payload(op_num, id),
-    )?;
-
-    Ok(updated_points.len())
-}
-
-pub(crate) fn create_field_index(
-    segments: &SegmentHolder,
-    op_num: SeqNumberType,
-    field_name: PayloadKeyTypeRef,
-    field_schema: Option<&PayloadFieldSchema>,
-) -> CollectionResult<usize> {
-    segments
-        .apply_segments(|write_segment| {
-            write_segment.create_field_index(op_num, field_name, field_schema)
-        })
-        .map_err(Into::into)
-}
-
-pub(crate) fn delete_field_index(
-    segments: &SegmentHolder,
-    op_num: SeqNumberType,
-    field_name: PayloadKeyTypeRef,
-) -> CollectionResult<usize> {
-    segments
-        .apply_segments(|write_segment| write_segment.delete_field_index(op_num, field_name))
-        .map_err(Into::into)
-}
-
-///
-/// Returns
-/// - Ok(true) if the operation was successful and point replaced existing value
-/// - Ok(false) if the operation was successful and point was inserted
-/// - Err if the operation failed
-fn upsert_with_payload(
-    segment: &mut RwLockWriteGuard<dyn SegmentEntry>,
-    op_num: SeqNumberType,
-    point_id: PointIdType,
-    vectors: NamedVectors,
-    payload: Option<&Payload>,
-) -> OperationResult<bool> {
-    let mut res = segment.upsert_point(op_num, point_id, vectors)?;
-    if let Some(full_payload) = payload {
-        res &= segment.set_full_payload(op_num, point_id, full_payload)?;
-    }
-    Ok(res)
-}
-
-/// Sync points within a given [from_id; to_id) range
-///
-/// 1. Retrieve existing points for a range
-/// 2. Remove points, which are not present in the sync operation
-/// 3. Retrieve overlapping points, detect which one of them are changed
-/// 4. Select new points
-/// 5. Upsert points which differ from the stored ones
-///
-/// Returns:
-///     (number of deleted points, number of new points, number of updated points)
-pub(crate) fn sync_points(
-    segments: &SegmentHolder,
-    op_num: SeqNumberType,
-    from_id: Option<PointIdType>,
-    to_id: Option<PointIdType>,
-    points: &[PointStruct],
-) -> CollectionResult<(usize, usize, usize)> {
-    let id_to_point = points
-        .iter()
-        .map(|p| (p.id, p))
-        .collect::<HashMap<PointIdType, &PointStruct>>();
-    let sync_points: HashSet<_> = points.iter().map(|p| p.id).collect();
-    // 1. Retrieve existing points for a range
-    let stored_point_ids: HashSet<_> = segments
-        .iter()
-        .flat_map(|(_, segment)| segment.get().read().read_range(from_id, to_id))
-        .collect();
-    // 2. Remove points, which are not present in the sync operation
-    let points_to_remove: Vec<_> = stored_point_ids.difference(&sync_points).copied().collect();
-    let deleted = delete_points(segments, op_num, points_to_remove.as_slice())?;
-    // 3. Retrieve overlapping points, detect which one of them are changed
-    let existing_point_ids: Vec<_> = stored_point_ids
-        .intersection(&sync_points)
-        .copied()
-        .collect();
-
-    let mut points_to_update: Vec<_> = Vec::new();
-    let _num_updated = segments.read_points(existing_point_ids.as_slice(), |id, segment| {
-        let all_vectors = match segment.all_vectors(id) {
-            Ok(v) => v,
-            Err(OperationError::InconsistentStorage { .. }) => NamedVectors::default(),
-            Err(e) => return Err(e),
-        };
-        let payload = segment.payload(id)?;
-        let point = id_to_point.get(&id).unwrap();
-        if point.get_vectors() != all_vectors {
-            points_to_update.push(*point);
-            Ok(true)
-        } else {
-            let payload_match = match point.payload {
-                Some(ref p) => p == &payload,
-                None => Payload::default() == payload,
-            };
-            if !payload_match {
-                points_to_update.push(*point);
-                Ok(true)
-            } else {
-                Ok(false)
-            }
-        }
-    })?;
-
-    // 4. Select new points
-    let num_updated = points_to_update.len();
-    let mut num_new = 0;
-    sync_points
-        .difference(&stored_point_ids)
-        .copied()
-        .for_each(|id| {
-            num_new += 1;
-            points_to_update.push(*id_to_point.get(&id).unwrap());
-        });
-
-    // 5. Upsert points which differ from the stored ones
-    let num_replaced = upsert_points(segments, op_num, points_to_update)?;
-    debug_assert_eq!(num_replaced, num_updated);
-
-    Ok((deleted, num_new, num_updated))
-}
-
-/// Checks point id in each segment, update point if found.
-/// All not found points are inserted into random segment.
-/// Returns: number of updated points.
-pub(crate) fn upsert_points<'a, T>(
-    segments: &SegmentHolder,
-    op_num: SeqNumberType,
-    points: T,
-) -> CollectionResult<usize>
-where
-    T: IntoIterator<Item = &'a PointStruct>,
-{
-    let points_map: HashMap<PointIdType, &PointStruct> =
-        points.into_iter().map(|p| (p.id, p)).collect();
-    let ids: Vec<PointIdType> = points_map.keys().copied().collect();
-
-    // Update points in writable segments
-    let updated_points =
-        segments.apply_points_to_appendable(op_num, &ids, |id, write_segment| {
-            let point = points_map[&id];
-            upsert_with_payload(
-                write_segment,
-                op_num,
-                id,
-                point.get_vectors(),
-                point.payload.as_ref(),
-            )
-        })?;
-
-    let mut res = updated_points.len();
-    // Insert new points, which was not updated or existed
-    let new_point_ids = ids
-        .iter()
-        .cloned()
-        .filter(|x| !(updated_points.contains(x)));
-
-    {
-        let default_write_segment = segments.random_appendable_segment().ok_or_else(|| {
-            CollectionError::service_error("No segments exists, expected at least one".to_string())
-        })?;
-
-        let segment_arc = default_write_segment.get();
-        let mut write_segment = segment_arc.write();
-        for point_id in new_point_ids {
-            let point = points_map[&point_id];
-            res += upsert_with_payload(
-                &mut write_segment,
-                op_num,
-                point_id,
-                point.get_vectors(),
-                point.payload.as_ref(),
-            )? as usize;
-        }
-        RwLockWriteGuard::unlock_fair(write_segment);
-    };
-
-    Ok(res)
-}
-
-pub(crate) fn process_point_operation(
-    segments: &RwLock<SegmentHolder>,
-    op_num: SeqNumberType,
-    point_operation: PointOperations,
-) -> CollectionResult<usize> {
-    match point_operation {
-        PointOperations::DeletePoints { ids, .. } => delete_points(&segments.read(), op_num, &ids),
-        PointOperations::UpsertPoints(operation) => {
-            let points: Vec<_> = match operation {
-                PointInsertOperations::PointsBatch(batch) => {
-                    let all_vectors = batch.vectors.into_all_vectors(batch.ids.len());
-                    let vectors_iter = batch.ids.into_iter().zip(all_vectors.into_iter());
-                    match batch.payloads {
-                        None => vectors_iter
-                            .map(|(id, vectors)| PointStruct {
-                                id,
-                                vector: vectors.into(),
-                                payload: None,
-                            })
-                            .collect(),
-                        Some(payloads) => vectors_iter
-                            .zip(payloads.into_iter())
-                            .map(|((id, vectors), payload)| PointStruct {
-                                id,
-                                vector: vectors.into(),
-                                payload,
-                            })
-                            .collect(),
-                    }
-                }
-                PointInsertOperations::PointsList(points) => points,
-            };
-            let res = upsert_points(&segments.read(), op_num, points.iter())?;
-            Ok(res)
-        }
-        PointOperations::DeletePointsByFilter(filter) => {
-            delete_points_by_filter(&segments.read(), op_num, &filter)
-        }
-        PointOperations::SyncPoints(operation) => {
-            let (deleted, new, updated) = sync_points(
-                &segments.read(),
-                op_num,
-                operation.from_id,
-                operation.to_id,
-                &operation.points,
-            )?;
-            Ok(deleted + new + updated)
-        }
-    }
-}
-
-pub(crate) fn process_vector_operation(
-    segments: &RwLock<SegmentHolder>,
-    op_num: SeqNumberType,
-    vector_operation: VectorOperations,
-) -> CollectionResult<usize> {
-    match vector_operation {
-        VectorOperations::UpdateVectors(operation) => {
-            update_vectors(&segments.read(), op_num, &operation.points)
-        }
-        VectorOperations::DeleteVectors(ids, vector_names) => {
-            delete_vectors(&segments.read(), op_num, &ids.points, &vector_names)
-        }
-        VectorOperations::DeleteVectorsByFilter(filter, vector_names) => {
-            delete_vectors_by_filter(&segments.read(), op_num, &filter, &vector_names)
-        }
-    }
-}
-
-pub(crate) fn process_payload_operation(
-    segments: &RwLock<SegmentHolder>,
-    op_num: SeqNumberType,
-    payload_operation: PayloadOps,
-) -> CollectionResult<usize> {
-    match payload_operation {
-        PayloadOps::SetPayload(sp) => {
-            let payload: Payload = sp.payload;
-            if let Some(points) = sp.points {
-                set_payload(&segments.read(), op_num, &payload, &points)
-            } else if let Some(filter) = sp.filter {
-                set_payload_by_filter(&segments.read(), op_num, &payload, &filter)
-            } else {
-                Err(CollectionError::BadRequest {
-                    description: "No points or filter specified".to_string(),
-                })
-            }
-        }
-        PayloadOps::DeletePayload(dp) => {
-            if let Some(points) = dp.points {
-                delete_payload(&segments.read(), op_num, &points, &dp.keys)
-            } else if let Some(filter) = dp.filter {
-                delete_payload_by_filter(&segments.read(), op_num, &filter, &dp.keys)
-            } else {
-                Err(CollectionError::BadRequest {
-                    description: "No points or filter specified".to_string(),
-                })
-            }
-        }
-        PayloadOps::ClearPayload { ref points, .. } => {
-            clear_payload(&segments.read(), op_num, points)
-        }
-        PayloadOps::ClearPayloadByFilter(ref filter) => {
-            clear_payload_by_filter(&segments.read(), op_num, filter)
-        }
-        PayloadOps::OverwritePayload(sp) => {
-            let payload: Payload = sp.payload;
-            if let Some(points) = sp.points {
-                overwrite_payload(&segments.read(), op_num, &payload, &points)
-            } else if let Some(filter) = sp.filter {
-                overwrite_payload_by_filter(&segments.read(), op_num, &payload, &filter)
-            } else {
-                Err(CollectionError::BadRequest {
-                    description: "No points or filter specified".to_string(),
-                })
-            }
-        }
-    }
-}
-
-pub(crate) fn process_field_index_operation(
-    segments: &RwLock<SegmentHolder>,
-    op_num: SeqNumberType,
-    field_index_operation: &FieldIndexOperations,
-) -> CollectionResult<usize> {
-    match field_index_operation {
-        FieldIndexOperations::CreateIndex(index_data) => create_field_index(
-            &segments.read(),
-            op_num,
-            &index_data.field_name,
-            index_data.field_schema.as_ref(),
-        ),
-        FieldIndexOperations::DeleteIndex(field_name) => {
-            delete_field_index(&segments.read(), op_num, field_name)
-        }
-    }
-}
-
-/// Deletes points from all segments matching the given filter
-pub(crate) fn delete_points_by_filter(
-    segments: &SegmentHolder,
-    op_num: SeqNumberType,
-    filter: &Filter,
-) -> CollectionResult<usize> {
-    let mut deleted = 0;
-    segments.apply_segments(|s| {
-        deleted += s.delete_filtered(op_num, filter)?;
-        Ok(true)
-    })?;
-    Ok(deleted)
-}
diff --git a/crates/qdrant/lib/collection/src/collection_manager/tests/mod.rs b/crates/qdrant/lib/collection/src/collection_manager/tests/mod.rs
deleted file mode 100644
index dc4907c..0000000
--- a/crates/qdrant/lib/collection/src/collection_manager/tests/mod.rs
+++ /dev/null
@@ -1,179 +0,0 @@
-mod test_search_aggregation;
-
-use std::collections::{HashMap, HashSet};
-use std::path::Path;
-use std::sync::Arc;
-
-use itertools::Itertools;
-use parking_lot::RwLock;
-use segment::data_types::vectors::only_default_vector;
-use segment::entry::entry_point::SegmentEntry;
-use segment::types::{PayloadFieldSchema, PayloadKeyType, PointIdType};
-use tempfile::Builder;
-
-use crate::collection_manager::fixtures::{build_segment_1, build_segment_2, empty_segment};
-use crate::collection_manager::holders::proxy_segment::ProxySegment;
-use crate::collection_manager::holders::segment_holder::{
-    LockedSegment, LockedSegmentHolder, SegmentHolder, SegmentId,
-};
-use crate::collection_manager::segments_updater::upsert_points;
-use crate::operations::point_ops::PointStruct;
-
-fn wrap_proxy(segments: LockedSegmentHolder, sid: SegmentId, path: &Path) -> SegmentId {
-    let mut write_segments = segments.write();
-
-    let temp_segment: LockedSegment = empty_segment(path).into();
-
-    let optimizing_segment = write_segments.get(sid).unwrap().clone();
-
-    let proxy_deleted_points = Arc::new(RwLock::new(HashSet::<PointIdType>::new()));
-    let proxy_deleted_indexes = Arc::new(RwLock::new(HashSet::<PayloadKeyType>::new()));
-    let proxy_created_indexes = Arc::new(RwLock::new(
-        HashMap::<PayloadKeyType, PayloadFieldSchema>::new(),
-    ));
-
-    let proxy = ProxySegment::new(
-        optimizing_segment,
-        temp_segment,
-        proxy_deleted_points,
-        proxy_created_indexes,
-        proxy_deleted_indexes,
-    );
-
-    let (new_id, _replaced_segments) = write_segments.swap(proxy, &[sid]);
-    new_id
-}
-
-#[test]
-fn test_update_proxy_segments() {
-    let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-
-    let segment1 = build_segment_1(dir.path());
-    let segment2 = build_segment_2(dir.path());
-
-    let mut holder = SegmentHolder::default();
-
-    let sid1 = holder.add(segment1);
-    let _sid2 = holder.add(segment2);
-
-    let segments = Arc::new(RwLock::new(holder));
-
-    let _proxy_id = wrap_proxy(segments.clone(), sid1, dir.path());
-
-    let vectors = vec![
-        only_default_vector(&[0.0, 0.0, 0.0, 0.0]),
-        only_default_vector(&[0.0, 0.0, 0.0, 0.0]),
-    ];
-
-    for i in 1..10 {
-        let points = vec![
-            PointStruct {
-                id: (100 * i + 1).into(),
-                vector: vectors[0].clone().into(),
-                payload: None,
-            },
-            PointStruct {
-                id: (100 * i + 2).into(),
-                vector: vectors[1].clone().into(),
-                payload: None,
-            },
-        ];
-        upsert_points(&segments.read(), 1000 + i, &points).unwrap();
-    }
-
-    let all_ids = segments
-        .read()
-        .iter()
-        .flat_map(|(_id, segment)| segment.get().read().read_filtered(None, Some(100), None))
-        .sorted()
-        .collect_vec();
-
-    for i in 1..10 {
-        let idx = 100 * i + 1;
-        assert!(all_ids.contains(&idx.into()), "Not found {idx}")
-    }
-}
-
-#[test]
-fn test_move_points_to_copy_on_write() {
-    let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-
-    let segment1 = build_segment_1(dir.path());
-    let segment2 = build_segment_2(dir.path());
-
-    let mut holder = SegmentHolder::default();
-
-    let sid1 = holder.add(segment1);
-    let _sid2 = holder.add(segment2);
-
-    let segments = Arc::new(RwLock::new(holder));
-
-    let proxy_id = wrap_proxy(segments.clone(), sid1, dir.path());
-
-    let points = vec![
-        PointStruct {
-            id: 1.into(),
-            vector: vec![0.0, 0.0, 0.0, 0.0].into(),
-            payload: None,
-        },
-        PointStruct {
-            id: 2.into(),
-            vector: vec![0.0, 0.0, 0.0, 0.0].into(),
-            payload: None,
-        },
-    ];
-
-    upsert_points(&segments.read(), 1001, &points).unwrap();
-
-    let points = vec![
-        PointStruct {
-            id: 2.into(),
-            vector: vec![0.0, 0.0, 0.0, 0.0].into(),
-            payload: None,
-        },
-        PointStruct {
-            id: 3.into(),
-            vector: vec![0.0, 0.0, 0.0, 0.0].into(),
-            payload: None,
-        },
-    ];
-
-    upsert_points(&segments.read(), 1002, &points).unwrap();
-
-    let segments_write = segments.write();
-
-    let locked_proxy = match segments_write.get(proxy_id).unwrap() {
-        LockedSegment::Original(_) => panic!("wrong type"),
-        LockedSegment::Proxy(locked_proxy) => locked_proxy,
-    };
-
-    let read_proxy = locked_proxy.read();
-
-    let copy_on_write_segment = match read_proxy.write_segment.clone() {
-        LockedSegment::Original(locked_segment) => locked_segment,
-        LockedSegment::Proxy(_) => panic!("wrong type"),
-    };
-
-    let copy_on_write_segment_read = copy_on_write_segment.read();
-
-    let copy_on_write_points = copy_on_write_segment_read.iter_points().collect_vec();
-
-    let id_mapper = copy_on_write_segment_read.id_tracker.clone();
-
-    eprintln!("copy_on_write_points = {copy_on_write_points:#?}");
-
-    for idx in copy_on_write_points {
-        let internal = id_mapper.borrow().internal_id(idx).unwrap();
-        eprintln!("{idx} -> {internal}");
-    }
-
-    let id_tracker = copy_on_write_segment_read.id_tracker.clone();
-    let internal_ids = id_tracker.borrow().iter_ids().collect_vec();
-
-    eprintln!("internal_ids = {internal_ids:#?}");
-
-    for idx in internal_ids {
-        let external = id_mapper.borrow().external_id(idx).unwrap();
-        eprintln!("{idx} -> {external}");
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/collection_manager/tests/test_search_aggregation.rs b/crates/qdrant/lib/collection/src/collection_manager/tests/test_search_aggregation.rs
deleted file mode 100644
index a4391ba..0000000
--- a/crates/qdrant/lib/collection/src/collection_manager/tests/test_search_aggregation.rs
+++ /dev/null
@@ -1,117 +0,0 @@
-use segment::types::{PointIdType, ScoreType, ScoredPoint, SeqNumberType};
-
-use crate::collection_manager::segments_searcher::SegmentsSearcher;
-
-fn score_point(id: usize, score: ScoreType, version: SeqNumberType) -> ScoredPoint {
-    ScoredPoint {
-        id: PointIdType::NumId(id as u64),
-        version,
-        score,
-        payload: None,
-        vector: None,
-    }
-}
-
-fn search_result_b0_s0() -> Vec<ScoredPoint> {
-    vec![
-        score_point(11, 0.91, 11),
-        score_point(12, 0.81, 23),
-        score_point(13, 0.71, 12),
-        score_point(14, 0.61, 12),
-        score_point(15, 0.51, 12),
-        score_point(16, 0.41, 31), // Have points, but all bad
-    ]
-}
-
-fn search_result_b0_s1() -> Vec<ScoredPoint> {
-    vec![
-        score_point(21, 0.92, 42),
-        score_point(22, 0.82, 12),
-        score_point(23, 0.74, 32),
-        score_point(24, 0.73, 21),
-        score_point(25, 0.72, 55),
-        score_point(26, 0.71, 10), // may contain more interesting points
-    ]
-}
-
-fn search_result_b0_s2() -> Vec<ScoredPoint> {
-    vec![
-        score_point(31, 0.93, 52),
-        score_point(32, 0.83, 22),
-        score_point(33, 0.73, 21), // less point than expected
-    ]
-}
-
-fn search_result_b1_s0() -> Vec<ScoredPoint> {
-    vec![
-        score_point(111, 0.92, 11),
-        score_point(112, 0.81, 23),
-        score_point(113, 0.71, 12),
-    ]
-}
-
-fn search_result_b1_s1() -> Vec<ScoredPoint> {
-    vec![
-        score_point(111, 0.91, 14),
-        score_point(112, 0.81, 23),
-        score_point(113, 0.71, 12),
-    ]
-}
-
-fn search_result_b1_s2() -> Vec<ScoredPoint> {
-    vec![
-        score_point(111, 0.91, 11),
-        score_point(112, 0.81, 23),
-        score_point(113, 0.71, 12),
-    ]
-}
-
-#[test]
-fn test_aggregation_of_batch_search_results() {
-    let search_results = vec![
-        vec![search_result_b0_s0(), search_result_b1_s0()],
-        vec![search_result_b0_s1(), search_result_b1_s1()],
-        vec![search_result_b0_s2(), search_result_b1_s2()],
-    ];
-
-    let result_limits = vec![12, 5];
-
-    let further_results = vec![vec![true, true], vec![true, true], vec![false, true]];
-
-    let (aggregator, re_request) = SegmentsSearcher::process_search_result_step1(
-        search_results,
-        result_limits,
-        further_results,
-    );
-
-    // ------------Segment----------batch---
-    assert!(re_request[&1].contains(&0));
-
-    assert!(re_request[&0].contains(&1)); // re-request all segments
-    assert!(re_request[&1].contains(&1));
-    assert!(re_request[&2].contains(&1));
-
-    let top_results = aggregator.into_topk();
-
-    eprintln!("top_results = {top_results:#?}");
-
-    assert_eq!(top_results.len(), 2);
-    assert_eq!(top_results[0].len(), 12);
-    assert_eq!(top_results[1].len(), 3);
-
-    assert_eq!(top_results[0][0].id, PointIdType::NumId(31));
-    assert_eq!(top_results[0][1].id, PointIdType::NumId(21));
-    assert_eq!(top_results[0][2].id, PointIdType::NumId(11));
-
-    assert_eq!(top_results[1][0].id, PointIdType::NumId(111));
-    assert_eq!(top_results[1][0].version, 14);
-    assert_eq!(top_results[1][0].score, 0.91);
-
-    assert_eq!(top_results[1][1].id, PointIdType::NumId(112));
-    assert_eq!(top_results[1][1].version, 23);
-    assert_eq!(top_results[1][1].score, 0.81);
-
-    assert_eq!(top_results[1][2].id, PointIdType::NumId(113));
-    assert_eq!(top_results[1][2].version, 12);
-    assert_eq!(top_results[1][2].score, 0.71);
-}
diff --git a/crates/qdrant/lib/collection/src/collection_state.rs b/crates/qdrant/lib/collection/src/collection_state.rs
deleted file mode 100644
index 3680a81..0000000
--- a/crates/qdrant/lib/collection/src/collection_state.rs
+++ /dev/null
@@ -1,108 +0,0 @@
-use std::collections::{HashMap, HashSet};
-
-use serde::{Deserialize, Serialize};
-use validator::Validate;
-
-use crate::collection::Collection;
-use crate::config::CollectionConfig;
-use crate::operations::types::CollectionResult;
-use crate::shards::replica_set::ReplicaState;
-use crate::shards::shard::{PeerId, ShardId};
-use crate::shards::transfer::shard_transfer::ShardTransfer;
-
-#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
-pub struct ShardInfo {
-    pub replicas: HashMap<PeerId, ReplicaState>,
-}
-
-#[derive(Debug, Serialize, Deserialize, Validate, Clone, PartialEq)]
-pub struct State {
-    #[validate]
-    pub config: CollectionConfig,
-    pub shards: HashMap<ShardId, ShardInfo>,
-    #[serde(default)]
-    pub transfers: HashSet<ShardTransfer>,
-}
-
-impl State {
-    pub async fn apply(
-        self,
-        this_peer_id: PeerId,
-        collection: &Collection,
-        abort_transfer: impl FnMut(ShardTransfer),
-    ) -> CollectionResult<()> {
-        Self::apply_config(self.config, collection).await?;
-        Self::apply_shard_transfers(self.transfers, collection, this_peer_id, abort_transfer)
-            .await?;
-        Self::apply_shard_info(self.shards, collection).await?;
-        Ok(())
-    }
-
-    async fn apply_shard_transfers(
-        shard_transfers: HashSet<ShardTransfer>,
-        collection: &Collection,
-        this_peer_id: PeerId,
-        mut abort_transfer: impl FnMut(ShardTransfer),
-    ) -> CollectionResult<()> {
-        let old_transfers = collection
-            .shards_holder
-            .read()
-            .await
-            .shard_transfers
-            .read()
-            .clone();
-        for transfer in shard_transfers.difference(&old_transfers) {
-            if transfer.from == this_peer_id {
-                // Abort transfer as sender should not learn about the transfer from snapshot
-                // If this happens it mean the sender is probably outdated and it is safer to abort
-                abort_transfer(transfer.clone())
-            }
-        }
-        collection
-            .shards_holder
-            .write()
-            .await
-            .shard_transfers
-            .write(|transfers| *transfers = shard_transfers)?;
-        Ok(())
-    }
-
-    async fn apply_config(
-        new_config: CollectionConfig,
-        collection: &Collection,
-    ) -> CollectionResult<()> {
-        log::warn!("Applying only optimizers config snapshot. Other config updates are not yet implemented.");
-        collection
-            .update_optimizer_params(new_config.optimizer_config)
-            .await?;
-
-        // Update replication factor
-        {
-            let mut config = collection.collection_config.write().await;
-            config.params.replication_factor = new_config.params.replication_factor;
-            config.params.write_consistency_factor = new_config.params.write_consistency_factor;
-        }
-
-        collection.recreate_optimizers_blocking().await?;
-
-        Ok(())
-    }
-
-    async fn apply_shard_info(
-        shards: HashMap<ShardId, ShardInfo>,
-        collection: &Collection,
-    ) -> CollectionResult<()> {
-        for (shard_id, shard_info) in shards {
-            let shards_holder = collection.shards_holder.read().await;
-            match shards_holder.get_shard(&shard_id) {
-                Some(replica_set) => replica_set.apply_state(shard_info.replicas).await?,
-                None => {
-                    // If collection exists - it means it should know about all of its shards.
-                    // This holds true until shard number scaling is implemented.
-                    log::warn!("Shard number scaling is not yet implemented. Failed to add shard {shard_id} to an initialized collection {}", collection.name());
-                }
-            }
-        }
-        Ok(())
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/common/is_ready.rs b/crates/qdrant/lib/collection/src/common/is_ready.rs
deleted file mode 100644
index 20ff35d..0000000
--- a/crates/qdrant/lib/collection/src/common/is_ready.rs
+++ /dev/null
@@ -1,52 +0,0 @@
-use std::time::Duration;
-
-use parking_lot::{Condvar, Mutex};
-
-pub struct IsReady {
-    condvar: Condvar,
-    value: Mutex<bool>,
-}
-
-impl Default for IsReady {
-    fn default() -> Self {
-        Self {
-            condvar: Condvar::new(),
-            value: Mutex::new(false),
-        }
-    }
-}
-
-impl IsReady {
-    pub fn make_ready(&self) {
-        let mut is_ready = self.value.lock();
-        if !*is_ready {
-            *is_ready = true;
-            self.condvar.notify_all();
-        }
-    }
-
-    pub fn make_not_ready(&self) {
-        *self.value.lock() = false;
-    }
-
-    pub fn check_ready(&self) -> bool {
-        *self.value.lock()
-    }
-
-    pub fn await_ready(&self) {
-        let mut is_ready = self.value.lock();
-        if !*is_ready {
-            self.condvar.wait(&mut is_ready);
-        }
-    }
-
-    /// Return `true` if ready, `false` if timed out.
-    pub fn await_ready_for_timeout(&self, timeout: Duration) -> bool {
-        let mut is_ready = self.value.lock();
-        if !*is_ready {
-            !self.condvar.wait_for(&mut is_ready, timeout).timed_out()
-        } else {
-            true
-        }
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/common/mod.rs b/crates/qdrant/lib/collection/src/common/mod.rs
deleted file mode 100644
index a45afc3..0000000
--- a/crates/qdrant/lib/collection/src/common/mod.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-pub mod is_ready;
-pub mod stoppable_task;
-pub mod stoppable_task_async;
-pub mod stopping_guard;
diff --git a/crates/qdrant/lib/collection/src/common/stoppable_task.rs b/crates/qdrant/lib/collection/src/common/stoppable_task.rs
deleted file mode 100644
index c99f825..0000000
--- a/crates/qdrant/lib/collection/src/common/stoppable_task.rs
+++ /dev/null
@@ -1,142 +0,0 @@
-use std::sync::atomic::{AtomicBool, Ordering};
-use std::sync::{Arc, Weak};
-
-use tokio::task::JoinHandle;
-
-pub struct StoppableTaskHandle<T> {
-    pub join_handle: JoinHandle<Option<T>>,
-    started: Arc<AtomicBool>,
-    stopped: Weak<AtomicBool>,
-}
-
-impl<T> StoppableTaskHandle<T> {
-    pub fn is_started(&self) -> bool {
-        self.started.load(Ordering::Relaxed)
-    }
-
-    pub fn is_finished(&self) -> bool {
-        self.join_handle.is_finished()
-    }
-
-    pub fn ask_to_stop(&self) {
-        if let Some(v) = self.stopped.upgrade() {
-            v.store(true, Ordering::Relaxed);
-        }
-    }
-
-    pub fn stop(self) -> Option<JoinHandle<Option<T>>> {
-        self.ask_to_stop();
-        self.is_started().then_some(self.join_handle)
-    }
-}
-
-pub fn spawn_stoppable<F, T>(f: F) -> StoppableTaskHandle<T>
-where
-    F: FnOnce(&AtomicBool) -> T + Send + 'static,
-    T: Send + 'static,
-{
-    let started = Arc::new(AtomicBool::new(false));
-    let started_c = started.clone();
-
-    let stopped = Arc::new(AtomicBool::new(false));
-    // We are OK if original value is destroyed with the thread
-    // Weak reference is sufficient
-    let stopped_w = Arc::downgrade(&stopped);
-
-    StoppableTaskHandle {
-        join_handle: tokio::task::spawn_blocking(move || {
-            // TODO: Should we use `Ordering::Acquire` or `Ordering::SeqCst`? 🤔
-            if stopped.load(Ordering::Relaxed) {
-                return None;
-            }
-
-            // TODO: Should we use `Ordering::Release` or `Ordering::SeqCst`? 🤔
-            started.store(true, Ordering::Relaxed);
-
-            Some(f(&stopped))
-        }),
-        started: started_c,
-        stopped: stopped_w,
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::thread;
-    use std::time::{Duration, Instant};
-
-    use tokio::time::sleep;
-
-    use super::*;
-
-    const STEP: Duration = Duration::from_millis(5);
-
-    /// Simple stoppable task counting steps until stopped. Panics after 1 minute.
-    fn counting_task(stop: &AtomicBool) -> usize {
-        let mut count = 0;
-        let start = Instant::now();
-
-        while !stop.load(Ordering::SeqCst) {
-            count += 1;
-
-            if start.elapsed() > Duration::from_secs(60) {
-                panic!("Task is not stopped within 60 seconds");
-            }
-
-            thread::sleep(STEP);
-        }
-
-        count
-    }
-
-    #[tokio::test(flavor = "multi_thread")]
-    async fn test_task_stop() {
-        let handle = spawn_stoppable(counting_task);
-
-        // Signal task to stop after ~20 steps
-        sleep(STEP * 20).await;
-        assert!(!handle.is_finished());
-        handle.ask_to_stop();
-
-        sleep(Duration::from_secs(1)).await;
-        assert!(handle.is_finished());
-
-        // Expect task counter to be between [5, 25], we cannot be exact on busy systems
-        if let Some(handle) = handle.stop() {
-            if let Some(count) = handle.await.unwrap() {
-                assert!(
-                    count < 25,
-                    "Stoppable task should have count should be less than 25, but it is {count}",
-                );
-            }
-        }
-    }
-
-    #[tokio::test(flavor = "multi_thread")]
-    async fn test_task_stop_many() {
-        const TASKS: usize = 64;
-
-        let handles = (0..TASKS)
-            .map(|_| spawn_stoppable(counting_task))
-            .collect::<Vec<_>>();
-
-        // Signal tasks to stop after ~20 steps
-        sleep(STEP * 20).await;
-        for handle in &handles {
-            assert!(!handle.is_finished());
-            handle.ask_to_stop();
-        }
-
-        // Expect task counters to be between [5, 30], we cannot be exact on busy systems
-        for handle in handles {
-            if let Some(handle) = handle.stop() {
-                if let Some(count) = handle.await.unwrap() {
-                    assert!(
-                        count < 30, // 10 extra steps to stop all tasks
-                        "Stoppable task should have count should be less than 30, but it is {count}",
-                    );
-                }
-            }
-        }
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/common/stoppable_task_async.rs b/crates/qdrant/lib/collection/src/common/stoppable_task_async.rs
deleted file mode 100644
index e825d05..0000000
--- a/crates/qdrant/lib/collection/src/common/stoppable_task_async.rs
+++ /dev/null
@@ -1,109 +0,0 @@
-use std::future::Future;
-use std::sync::atomic::{AtomicBool, Ordering};
-use std::sync::{Arc, Weak};
-
-use parking_lot::Mutex;
-use tokio::task::JoinHandle;
-
-pub struct StoppableAsyncTaskHandle<T: Clone> {
-    pub join_handle: JoinHandle<T>,
-    result_holder: Arc<Mutex<Option<T>>>,
-    finished: Arc<AtomicBool>,
-    stopped: Weak<AtomicBool>,
-}
-
-impl<T: Clone> StoppableAsyncTaskHandle<T> {
-    pub fn is_finished(&self) -> bool {
-        self.finished.load(Ordering::Relaxed)
-    }
-
-    pub fn ask_to_stop(&self) {
-        if let Some(v) = self.stopped.upgrade() {
-            v.store(true, Ordering::Relaxed);
-        }
-    }
-
-    pub fn stop(self) -> JoinHandle<T> {
-        self.ask_to_stop();
-        self.join_handle
-    }
-
-    pub fn get_result(&self) -> Option<T> {
-        self.result_holder.lock().clone()
-    }
-}
-
-pub fn spawn_async_stoppable<F, T>(f: F) -> StoppableAsyncTaskHandle<T::Output>
-where
-    F: FnOnce(Arc<AtomicBool>) -> T,
-    F: Send + 'static,
-    T: Future + Send + 'static,
-    T::Output: Clone + Send + 'static,
-{
-    let finished = Arc::new(AtomicBool::new(false));
-    let finished_c = finished.clone();
-
-    let stopped = Arc::new(AtomicBool::new(false));
-    // We are OK if original value is destroyed with the thread
-    // Weak reference is sufficient
-    let stopped_w = Arc::downgrade(&stopped);
-
-    let result_holder = Arc::new(Mutex::new(None));
-    let result_holder_c = result_holder.clone();
-
-    StoppableAsyncTaskHandle {
-        join_handle: tokio::task::spawn(async move {
-            let res = f(stopped).await;
-            let mut result_holder_w = result_holder_c.lock();
-            result_holder_w.replace(res.clone());
-
-            // We use `Release` ordering to ensure that `f` won't be moved after the `store`
-            // by the compiler
-            finished.store(true, Ordering::Release);
-            res
-        }),
-        result_holder,
-        stopped: stopped_w,
-        finished: finished_c,
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::time::Duration;
-
-    use tokio::time::sleep;
-
-    use super::*;
-
-    const STEP_MILLIS: u64 = 5;
-
-    async fn long_task(stop: Arc<AtomicBool>) -> i32 {
-        let mut n = 0;
-        for i in 0..10 {
-            n = i;
-            if stop.load(Ordering::Relaxed) {
-                break;
-            }
-            sleep(Duration::from_millis(STEP_MILLIS)).await;
-        }
-        n
-    }
-
-    #[tokio::test]
-    async fn test_task_stop() {
-        let handle = spawn_async_stoppable(long_task);
-
-        sleep(Duration::from_millis(STEP_MILLIS * 5)).await;
-        assert!(!handle.is_finished());
-        handle.ask_to_stop();
-        sleep(Duration::from_millis(STEP_MILLIS * 3)).await;
-        // If windows, we need to wait a bit more
-        #[cfg(windows)]
-        sleep(Duration::from_millis(STEP_MILLIS * 10)).await;
-        assert!(handle.is_finished());
-
-        let res = handle.stop().await.unwrap();
-        assert!(res < 10);
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/common/stopping_guard.rs b/crates/qdrant/lib/collection/src/common/stopping_guard.rs
deleted file mode 100644
index 2668bd9..0000000
--- a/crates/qdrant/lib/collection/src/common/stopping_guard.rs
+++ /dev/null
@@ -1,42 +0,0 @@
-use std::sync::atomic::AtomicBool;
-use std::sync::Arc;
-
-/// Structure that ensures that `is_stopped` flag is set to `true` when dropped.
-pub struct StoppingGuard {
-    is_stopped: Arc<AtomicBool>,
-}
-
-impl StoppingGuard {
-    /// Creates a new `StopGuard` instance.
-    pub fn new() -> Self {
-        Self {
-            is_stopped: Arc::new(AtomicBool::new(false)),
-        }
-    }
-
-    pub fn check_is_stopped(&self) -> bool {
-        self.is_stopped.load(std::sync::atomic::Ordering::Relaxed)
-    }
-
-    pub fn stop(&self) {
-        self.is_stopped
-            .store(true, std::sync::atomic::Ordering::Relaxed);
-    }
-
-    pub fn get_is_stopped(&self) -> Arc<AtomicBool> {
-        self.is_stopped.clone()
-    }
-}
-
-impl Default for StoppingGuard {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl Drop for StoppingGuard {
-    fn drop(&mut self) {
-        self.is_stopped
-            .store(true, std::sync::atomic::Ordering::Relaxed);
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/config.rs b/crates/qdrant/lib/collection/src/config.rs
deleted file mode 100644
index 8af1a09..0000000
--- a/crates/qdrant/lib/collection/src/config.rs
+++ /dev/null
@@ -1,252 +0,0 @@
-use std::collections::HashMap;
-use std::fs::File;
-use std::io::{Read, Write};
-use std::num::NonZeroU32;
-use std::path::Path;
-
-use atomicwrites::AtomicFile;
-use atomicwrites::OverwriteBehavior::AllowOverwrite;
-use schemars::JsonSchema;
-use segment::common::anonymize::Anonymize;
-use segment::data_types::vectors::DEFAULT_VECTOR_NAME;
-use segment::types::{
-    HnswConfig, Indexes, QuantizationConfig, VectorDataConfig, VectorStorageType,
-};
-use serde::{Deserialize, Serialize};
-use validator::Validate;
-use wal::WalOptions;
-
-use crate::operations::config_diff::{DiffConfig, QuantizationConfigDiff};
-use crate::operations::types::{
-    CollectionError, CollectionResult, VectorParams, VectorParamsDiff, VectorsConfig,
-    VectorsConfigDiff,
-};
-use crate::operations::validation;
-use crate::optimizers_builder::OptimizersConfig;
-
-pub const COLLECTION_CONFIG_FILE: &str = "config.json";
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Validate, Clone, PartialEq, Eq)]
-pub struct WalConfig {
-    /// Size of a single WAL segment in MB
-    #[validate(range(min = 1))]
-    pub wal_capacity_mb: usize,
-    /// Number of WAL segments to create ahead of actually used ones
-    pub wal_segments_ahead: usize,
-}
-
-impl From<&WalConfig> for WalOptions {
-    fn from(config: &WalConfig) -> Self {
-        WalOptions {
-            segment_capacity: config.wal_capacity_mb * 1024 * 1024,
-            segment_queue_len: config.wal_segments_ahead,
-        }
-    }
-}
-
-impl Default for WalConfig {
-    fn default() -> Self {
-        WalConfig {
-            wal_capacity_mb: 32,
-            wal_segments_ahead: 0,
-        }
-    }
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Validate, Clone, PartialEq, Eq)]
-#[serde(rename_all = "snake_case")]
-pub struct CollectionParams {
-    /// Configuration of the vector storage
-    #[validate]
-    pub vectors: VectorsConfig,
-    /// Number of shards the collection has
-    #[serde(default = "default_shard_number")]
-    pub shard_number: NonZeroU32,
-    /// Number of replicas for each shard
-    #[serde(default = "default_replication_factor")]
-    pub replication_factor: NonZeroU32,
-    /// Defines how many replicas should apply the operation for us to consider it successful.
-    /// Increasing this number will make the collection more resilient to inconsistencies, but will
-    /// also make it fail if not enough replicas are available.
-    /// Does not have any performance impact.
-    #[serde(default = "default_write_consistency_factor")]
-    pub write_consistency_factor: NonZeroU32,
-    /// If true - point's payload will not be stored in memory.
-    /// It will be read from the disk every time it is requested.
-    /// This setting saves RAM by (slightly) increasing the response time.
-    /// Note: those payload values that are involved in filtering and are indexed - remain in RAM.
-    #[serde(default = "default_on_disk_payload")]
-    pub on_disk_payload: bool,
-}
-
-impl Anonymize for CollectionParams {
-    fn anonymize(&self) -> Self {
-        CollectionParams {
-            vectors: self.vectors.anonymize(),
-            shard_number: self.shard_number,
-            replication_factor: self.replication_factor,
-            write_consistency_factor: self.write_consistency_factor,
-            on_disk_payload: self.on_disk_payload,
-        }
-    }
-}
-
-fn default_shard_number() -> NonZeroU32 {
-    NonZeroU32::new(1).unwrap()
-}
-
-pub fn default_replication_factor() -> NonZeroU32 {
-    NonZeroU32::new(1).unwrap()
-}
-
-pub fn default_write_consistency_factor() -> NonZeroU32 {
-    NonZeroU32::new(1).unwrap()
-}
-
-const fn default_on_disk_payload() -> bool {
-    false
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Validate, Clone, PartialEq)]
-pub struct CollectionConfig {
-    #[validate]
-    pub params: CollectionParams,
-    #[validate]
-    pub hnsw_config: HnswConfig,
-    #[validate]
-    pub optimizer_config: OptimizersConfig,
-    #[validate]
-    pub wal_config: WalConfig,
-    #[serde(default)]
-    pub quantization_config: Option<QuantizationConfig>,
-}
-
-impl CollectionConfig {
-    pub fn save(&self, path: &Path) -> CollectionResult<()> {
-        let config_path = path.join(COLLECTION_CONFIG_FILE);
-        let af = AtomicFile::new(&config_path, AllowOverwrite);
-        let state_bytes = serde_json::to_vec(self).unwrap();
-        af.write(|f| f.write_all(&state_bytes)).map_err(|err| {
-            CollectionError::service_error(format!("Can't write {config_path:?}, error: {err}"))
-        })?;
-        Ok(())
-    }
-
-    pub fn load(path: &Path) -> CollectionResult<Self> {
-        let config_path = path.join(COLLECTION_CONFIG_FILE);
-        let mut contents = String::new();
-        let mut file = File::open(config_path)?;
-        file.read_to_string(&mut contents)?;
-        Ok(serde_json::from_str(&contents)?)
-    }
-
-    /// Check if collection config exists
-    pub fn check(path: &Path) -> bool {
-        let config_path = path.join(COLLECTION_CONFIG_FILE);
-        config_path.exists()
-    }
-
-    pub fn validate_and_warn(&self) {
-        if let Err(ref errs) = self.validate() {
-            validation::warn_validation_errors("Collection configuration file", errs);
-        }
-    }
-}
-
-impl CollectionParams {
-    pub fn get_vector_params(&self, vector_name: &str) -> CollectionResult<VectorParams> {
-        self.vectors
-            .get_params(vector_name)
-            .cloned()
-            .ok_or_else(|| CollectionError::BadInput {
-                description: if vector_name == DEFAULT_VECTOR_NAME {
-                    "Default vector params are not specified in config".into()
-                } else {
-                    format!("Vector params for {vector_name} are not specified in config")
-                },
-            })
-    }
-
-    fn get_vector_params_mut(&mut self, vector_name: &str) -> CollectionResult<&mut VectorParams> {
-        self.vectors
-            .get_params_mut(vector_name)
-            .ok_or_else(|| CollectionError::BadInput {
-                description: if vector_name == DEFAULT_VECTOR_NAME {
-                    "Default vector params are not specified in config".into()
-                } else {
-                    format!("Vector params for {vector_name} are not specified in config")
-                },
-            })
-    }
-
-    /// Update collection vectors from the given update vectors config
-    pub fn update_vectors_from_diff(
-        &mut self,
-        update_vectors_diff: &VectorsConfigDiff,
-    ) -> CollectionResult<()> {
-        for (vector_name, update_params) in update_vectors_diff.0.iter() {
-            let vector_params = self.get_vector_params_mut(vector_name)?;
-
-            let VectorParamsDiff {
-                hnsw_config,
-                quantization_config,
-                on_disk,
-            } = update_params.clone();
-
-            if let Some(hnsw_diff) = hnsw_config {
-                if let Some(existing_hnsw) = &vector_params.hnsw_config {
-                    vector_params.hnsw_config = Some(hnsw_diff.update(existing_hnsw)?);
-                } else {
-                    vector_params.hnsw_config = Some(hnsw_diff);
-                }
-            }
-
-            if let Some(quantization_diff) = quantization_config {
-                vector_params.quantization_config = match quantization_diff.clone() {
-                    QuantizationConfigDiff::Scalar(scalar) => {
-                        Some(QuantizationConfig::Scalar(scalar))
-                    }
-                    QuantizationConfigDiff::Product(product) => {
-                        Some(QuantizationConfig::Product(product))
-                    }
-                    QuantizationConfigDiff::Disabled(_) => None,
-                }
-            }
-
-            if let Some(on_disk) = on_disk {
-                vector_params.on_disk = Some(on_disk);
-            }
-        }
-        Ok(())
-    }
-
-    /// Convert into unoptimized named vector data configs
-    ///
-    /// It is the job of the segment optimizer to change this configuration with optimized settings
-    /// based on threshold configurations.
-    pub fn into_base_vector_data(&self) -> CollectionResult<HashMap<String, VectorDataConfig>> {
-        Ok(self
-            .vectors
-            .params_iter()
-            .map(|(name, params)| {
-                (
-                    name.into(),
-                    VectorDataConfig {
-                        size: params.size.get() as usize,
-                        distance: params.distance,
-                        // Plain (disabled) index
-                        index: Indexes::Plain {},
-                        // Disabled quantization
-                        quantization_config: None,
-                        // Default to in memory storage
-                        storage_type: if params.on_disk.unwrap_or_default() {
-                            VectorStorageType::ChunkedMmap
-                        } else {
-                            VectorStorageType::Memory
-                        },
-                    },
-                )
-            })
-            .collect())
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/grouping/aggregator.rs b/crates/qdrant/lib/collection/src/grouping/aggregator.rs
deleted file mode 100644
index 1824b2f..0000000
--- a/crates/qdrant/lib/collection/src/grouping/aggregator.rs
+++ /dev/null
@@ -1,434 +0,0 @@
-use std::collections::hash_map::Entry;
-use std::collections::{HashMap, HashSet};
-
-use itertools::Itertools;
-use ordered_float::OrderedFloat;
-use segment::data_types::groups::GroupId;
-use segment::spaces::tools::{peek_top_largest_iterable, peek_top_smallest_iterable};
-use segment::types::{
-    ExtendedPointId, Order, PayloadContainer, PointIdType, ScoreType, ScoredPoint,
-};
-use serde_json::Value;
-
-use super::types::AggregatorError::{self, *};
-use super::types::Group;
-
-type Hits = HashMap<PointIdType, ScoredPoint>;
-pub(super) struct GroupsAggregator {
-    groups: HashMap<GroupId, Hits>,
-    max_group_size: usize,
-    grouped_by: String,
-    max_groups: usize,
-    full_groups: HashSet<GroupId>,
-    group_best_scores: HashMap<GroupId, ScoreType>,
-    all_ids: HashSet<ExtendedPointId>,
-    order: Order,
-}
-
-impl GroupsAggregator {
-    pub(super) fn new(groups: usize, group_size: usize, grouped_by: String, order: Order) -> Self {
-        Self {
-            groups: HashMap::with_capacity(groups),
-            max_group_size: group_size,
-            grouped_by,
-            max_groups: groups,
-            full_groups: HashSet::with_capacity(groups),
-            group_best_scores: HashMap::with_capacity(groups),
-            all_ids: HashSet::with_capacity(groups * group_size),
-            order,
-        }
-    }
-
-    /// Adds a point to the group that corresponds based on the group_by field, assumes that the point has the group_by field
-    fn add_point(&mut self, point: ScoredPoint) -> Result<(), AggregatorError> {
-        // extract all values from the group_by field
-        let payload_values: Vec<_> = point
-            .payload
-            .as_ref()
-            .map(|p| {
-                p.get_value(&self.grouped_by)
-                    .values()
-                    .into_iter()
-                    .flat_map(|v| match v {
-                        Value::Array(arr) => arr.iter().collect(),
-                        _ => vec![v],
-                    })
-                    .collect()
-            })
-            .ok_or(KeyNotFound)?;
-
-        let group_keys = payload_values
-            .into_iter()
-            .map(GroupId::try_from)
-            .collect::<Result<Vec<GroupId>, ()>>()
-            .map_err(|_| BadKeyType)?;
-
-        let unique_group_keys: Vec<_> = group_keys.into_iter().unique().collect();
-
-        for group_key in unique_group_keys {
-            let group = self
-                .groups
-                .entry(group_key.clone())
-                .or_insert_with(|| HashMap::with_capacity(self.max_group_size));
-
-            let entry = group.entry(point.id);
-
-            // if the point is already in the group, check if it has newer version
-            match entry {
-                Entry::Occupied(mut o) => {
-                    if o.get().version < point.version {
-                        o.insert(point.clone());
-                    }
-                }
-                Entry::Vacant(v) => {
-                    v.insert(point.clone());
-                    self.all_ids.insert(point.id);
-                }
-            }
-
-            if group.len() == self.max_group_size {
-                self.full_groups.insert(group_key.clone());
-            }
-
-            // Insert score if better than the group best score
-            self.group_best_scores
-                .entry(group_key.clone())
-                .and_modify(|e| {
-                    *e = match self.order {
-                        Order::LargeBetter => point.score.max(*e),
-                        Order::SmallBetter => point.score.min(*e),
-                    }
-                })
-                .or_insert(point.score);
-        }
-        Ok(())
-    }
-
-    /// Adds multiple points to the group that they corresponds based on the group_by field, assumes that the points always have the grouped_by field, else it just ignores them
-    pub(super) fn add_points(&mut self, points: &[ScoredPoint]) {
-        for point in points {
-            match self.add_point(point.to_owned()) {
-                Ok(()) | Err(KeyNotFound | BadKeyType) => continue, // ignore points that don't have the group_by field
-            }
-        }
-    }
-
-    #[cfg(test)]
-    pub(super) fn len(&self) -> usize {
-        self.groups.len()
-    }
-
-    /// Return `max_groups` number of keys of the groups with the best score
-    fn best_group_keys(&self) -> impl Iterator<Item = &GroupId> {
-        self.group_best_scores
-            .iter()
-            .sorted_by_key(|(_, score)| match self.order {
-                Order::LargeBetter => -OrderedFloat(**score),
-                Order::SmallBetter => OrderedFloat(**score),
-            })
-            .take(self.max_groups)
-            .map(|(k, _)| k)
-    }
-
-    /// Gets the keys of the groups that have less than the max group size
-    pub(super) fn keys_of_unfilled_best_groups(&self) -> Vec<Value> {
-        let best_group_keys: HashSet<_> = self.best_group_keys().cloned().collect();
-        best_group_keys
-            .difference(&self.full_groups)
-            .cloned()
-            .map_into()
-            .collect()
-    }
-
-    /// Gets the keys of the groups that have reached the max group size
-    pub(super) fn keys_of_filled_groups(&self) -> Vec<Value> {
-        self.full_groups.iter().cloned().map_into().collect()
-    }
-
-    /// Gets the amount of best groups that have reached the max group size
-    pub(super) fn len_of_filled_best_groups(&self) -> usize {
-        let best_group_keys: HashSet<_> = self.best_group_keys().cloned().collect();
-        best_group_keys.intersection(&self.full_groups).count()
-    }
-
-    /// Gets the ids of the already present points across all the groups
-    pub(super) fn ids(&self) -> &HashSet<ExtendedPointId> {
-        &self.all_ids
-    }
-
-    /// Returns the best groups sorted by their best hit. The hits are sorted too.
-    pub(super) fn distill(mut self) -> Vec<Group> {
-        let best_groups: Vec<_> = self.best_group_keys().cloned().collect();
-        let mut groups = Vec::with_capacity(best_groups.len());
-
-        for group_key in best_groups {
-            let mut group = self.groups.remove(&group_key).unwrap();
-            let scored_points_iter = group.drain().map(|(_, hit)| hit);
-            let hits = match self.order {
-                Order::LargeBetter => {
-                    peek_top_largest_iterable(scored_points_iter, self.max_group_size)
-                }
-                Order::SmallBetter => {
-                    peek_top_smallest_iterable(scored_points_iter, self.max_group_size)
-                }
-            };
-            groups.push(Group {
-                hits,
-                key: group_key,
-            });
-        }
-
-        groups
-    }
-}
-
-#[cfg(test)]
-mod unit_tests {
-
-    use segment::types::{Payload, ScoreType};
-    use serde_json::json;
-
-    use super::*;
-
-    fn point(idx: u64, score: ScoreType, payloads: Value) -> ScoredPoint {
-        ScoredPoint {
-            id: idx.into(),
-            version: 0,
-            score,
-            payload: Some(Payload::from(serde_json::json!({ "docId": payloads }))),
-            vector: None,
-        }
-    }
-
-    fn empty_point(idx: u64, score: ScoreType) -> ScoredPoint {
-        ScoredPoint {
-            id: idx.into(),
-            version: 0,
-            score,
-            payload: None,
-            vector: None,
-        }
-    }
-
-    #[test]
-    fn test_group_with_multiple_payload_values() {
-        let scored_points = vec![
-            point(1, 0.99, json!(["a", "a"])),
-            point(2, 0.85, json!(["a", "b"])),
-            point(3, 0.75, json!("b")),
-        ];
-
-        let mut aggregator = GroupsAggregator::new(3, 2, "docId".to_string(), Order::LargeBetter);
-        for point in scored_points {
-            aggregator.add_point(point).unwrap();
-        }
-
-        let result = aggregator.distill();
-
-        assert_eq!(result.len(), 2);
-
-        assert_eq!(result[0].hits.len(), 2);
-        assert_eq!(result[0].hits[0].id, 1.into());
-        assert_eq!(result[0].hits[1].id, 2.into());
-
-        assert_eq!(result[1].hits.len(), 2);
-        assert_eq!(result[1].hits[0].id, 2.into());
-        assert_eq!(result[1].hits[1].id, 3.into());
-    }
-
-    struct Case {
-        point: ScoredPoint,
-        key: Value,
-        group_size: usize,
-        groups_count: usize,
-        expected_result: Result<(), AggregatorError>,
-    }
-
-    impl Case {
-        fn new(
-            key: Value,
-            group_size: usize,
-            groups_count: usize,
-            expected_result: Result<(), AggregatorError>,
-            point: ScoredPoint,
-        ) -> Self {
-            Self {
-                point,
-                key,
-                group_size,
-                groups_count,
-                expected_result,
-            }
-        }
-    }
-
-    #[test]
-    fn it_adds_single_points() {
-        let mut aggregator = GroupsAggregator::new(4, 3, "docId".to_string(), Order::LargeBetter);
-
-        // cases
-        #[rustfmt::skip]
-        [
-            Case::new(json!("a"), 1, 1, Ok(()), point(1, 0.99, json!("a"))),
-            Case::new(json!("a"), 1, 1, Ok(()), point(1, 0.97, json!("a"))), // should not add it because it already has a point with the same id
-            Case::new(json!("a"), 2, 2, Ok(()), point(2, 0.81, json!(["a", "b"]))), // to both groups
-            Case::new(json!("b"), 2, 2, Ok(()), point(3, 0.84, json!("b"))), // check that `b` of size 2
-            Case::new(json!("a"), 3, 2, Ok(()), point(4, 0.9, json!("a"))), // grow beyond the max groups, as we sort later
-            Case::new(json!(3), 1, 3, Ok(()), point(5, 0.4, json!(3))),     // check that `3` of size 2
-            Case::new(json!("d"), 1, 4, Ok(()), point(6, 0.3, json!("d"))),
-            Case::new(json!("a"), 4, 4, Ok(()), point(100, 0.31, json!("a"))), // small score 'a'
-            Case::new(json!("a"), 5, 4, Ok(()), point(101, 0.32, json!("a"))), // small score 'a'
-            Case::new(json!("a"), 6, 4, Ok(()), point(102, 0.33, json!("a"))), // small score 'a'
-            Case::new(json!("a"), 7, 4, Ok(()), point(103, 0.34, json!("a"))), // small score 'a'
-            Case::new(json!("a"), 8, 4, Ok(()), point(104, 0.35, json!("a"))), // small score 'a'
-            Case::new(json!("a"), 9, 4, Ok(()), point(105, 0.36, json!("a"))), // small score 'a'
-            Case::new(json!("b"), 3, 4, Ok(()), point(7, 1.0, json!("b"))),
-            Case::new(json!("false"), 0, 4, Err(BadKeyType), point(8, 1.0, json!(false))),
-            Case::new(json!("none"), 0, 4, Err(KeyNotFound), empty_point(9, 1.0)),
-            Case::new(json!(3), 2, 4, Ok(()), point(10, 0.6, json!(3))),
-            Case::new(json!(3), 3, 4, Ok(()), point(11, 0.1, json!(3))),
-        ]
-        .into_iter()
-        .enumerate()
-        .for_each(|(case_idx, case)| {
-            let result = aggregator.add_point(case.point);
-
-            assert_eq!(result, case.expected_result, "case {case_idx}");
-
-            assert_eq!(aggregator.len(), case.groups_count, "case {case_idx}");
-
-            let key = &GroupId::try_from(&case.key).unwrap();
-            if case.group_size > 0 {
-                assert_eq!(
-                    aggregator.groups.get(key).unwrap().len(),
-                    case.group_size,
-                    "case {case_idx}"
-                );
-            } else {
-                assert!(aggregator.groups.get(key).is_none(), "case {case_idx}");
-            }
-        });
-
-        // assert final groups
-        assert_eq!(aggregator.full_groups.len(), 3);
-
-        assert_eq!(aggregator.keys_of_unfilled_best_groups(), vec![json!("d")]);
-
-        assert_eq!(aggregator.len_of_filled_best_groups(), 3);
-
-        let groups = aggregator.distill();
-
-        #[rustfmt::skip]
-        let expected_groups = vec![
-            (
-                GroupId::from("b"),
-                vec![
-                    empty_point(7, 1.0),
-                    empty_point(3, 0.84),
-                    empty_point(2, 0.81),
-                ],
-            ),
-            (
-                GroupId::from("a"),
-                vec![
-                    empty_point(1, 0.99),
-                    empty_point(4, 0.9),
-                    empty_point(2, 0.81)
-                ],
-            ),
-            (
-                GroupId::try_from(&json!(3)).unwrap(),
-                vec![
-                    empty_point(10, 0.6),
-                    empty_point(5, 0.4),
-                    empty_point(11, 0.1),
-                ],
-            ),
-            (
-                GroupId::from("d"),
-                vec![
-                    empty_point(6, 0.3),
-                ],
-            ),
-        ];
-
-        for ((key, expected_group_points), group) in
-            expected_groups.into_iter().zip(groups.into_iter())
-        {
-            assert_eq!(key, group.key);
-            let expected_id_score: Vec<_> = expected_group_points
-                .into_iter()
-                .map(|x| (x.id, x.score))
-                .collect();
-            let group_id_score: Vec<_> = group.hits.into_iter().map(|x| (x.id, x.score)).collect();
-            assert_eq!(expected_id_score, group_id_score);
-        }
-    }
-
-    #[test]
-    fn test_aggregate_less_groups() {
-        let mut aggregator = GroupsAggregator::new(3, 2, "docId".to_string(), Order::LargeBetter);
-
-        // cases
-        [
-            point(1, 0.99, json!("a")),
-            point(1, 0.97, json!("a")), // should not add it because it already has a point with the same id
-            point(2, 0.81, json!(["a", "b"])), // to both groups
-            point(3, 0.84, json!("b")), // check that `b` of size 2
-            point(4, 0.9, json!("a")),  // grow beyond the max groups, as we sort later
-            point(5, 0.4, json!(3)),    // check that `3` of size 2
-            point(6, 0.3, json!("d")),
-            point(100, 0.31, json!("a")), // small score 'a'
-            point(101, 0.32, json!("a")), // small score 'a'
-            point(102, 0.33, json!("a")), // small score 'a'
-            point(103, 0.34, json!("a")), // small score 'a'
-            point(104, 0.35, json!("a")), // small score 'a'
-            point(105, 0.36, json!("a")), // small score 'a'
-            point(7, 1.0, json!("b")),
-            point(10, 0.6, json!(3)),
-            point(11, 0.1, json!(3)),
-        ]
-        .into_iter()
-        .for_each(|point| {
-            aggregator.add_point(point).unwrap();
-        });
-
-        let groups = aggregator.distill();
-
-        #[rustfmt::skip]
-        let expected_groups = vec![
-            (
-                GroupId::from("b"),
-                vec![
-                    empty_point(7, 1.0),
-                    empty_point(3, 0.84),
-                ],
-            ),
-            (
-                GroupId::from("a"),
-                vec![
-                    empty_point(1, 0.99),
-                    empty_point(4, 0.9),
-                ],
-            ),
-            (
-                GroupId::try_from(&json!(3)).unwrap(),
-                vec![
-                    empty_point(10, 0.6),
-                    empty_point(5, 0.4),
-                ],
-            ),
-        ];
-        for ((key, expected_group_points), group) in
-            expected_groups.into_iter().zip(groups.into_iter())
-        {
-            assert_eq!(key, group.key);
-            let expected_id_score: Vec<_> = expected_group_points
-                .into_iter()
-                .map(|x| (x.id, x.score))
-                .collect();
-            let group_id_score: Vec<_> = group.hits.into_iter().map(|x| (x.id, x.score)).collect();
-            assert_eq!(expected_id_score, group_id_score);
-        }
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/grouping/builder.rs b/crates/qdrant/lib/collection/src/grouping/builder.rs
deleted file mode 100644
index 60a5384..0000000
--- a/crates/qdrant/lib/collection/src/grouping/builder.rs
+++ /dev/null
@@ -1,89 +0,0 @@
-use futures::Future;
-use itertools::Itertools;
-use tokio::sync::RwLockReadGuard;
-
-use super::group_by::{group_by, GroupRequest};
-use crate::collection::Collection;
-use crate::lookup::lookup_ids;
-use crate::lookup::types::PseudoId;
-use crate::operations::consistency_params::ReadConsistency;
-use crate::operations::types::{CollectionResult, PointGroup};
-use crate::shards::shard::ShardId;
-
-/// Builds on top of the group_by function to add lookup and possibly other features
-pub struct GroupBy<'a, F, Fut>
-where
-    F: Fn(String) -> Fut + Clone,
-    Fut: Future<Output = Option<RwLockReadGuard<'a, Collection>>>,
-{
-    group_by: GroupRequest,
-    collection: &'a Collection,
-    /// `Fn` to get a collection having its name. Obligatory for recommend and lookup
-    collection_by_name: F,
-    read_consistency: Option<ReadConsistency>,
-    shard_selection: Option<ShardId>,
-}
-
-impl<'a, F, Fut> GroupBy<'a, F, Fut>
-where
-    F: Fn(String) -> Fut + Clone,
-    Fut: Future<Output = Option<RwLockReadGuard<'a, Collection>>>,
-{
-    /// Creates a basic GroupBy builder
-    pub fn new(group_by: GroupRequest, collection: &'a Collection, collection_by_name: F) -> Self {
-        Self {
-            group_by,
-            collection,
-            collection_by_name,
-            read_consistency: None,
-            shard_selection: None,
-        }
-    }
-
-    pub fn with_read_consistency(mut self, read_consistency: ReadConsistency) -> Self {
-        self.read_consistency = Some(read_consistency);
-        self
-    }
-
-    pub fn with_shard_selection(mut self, shard_selection: ShardId) -> Self {
-        self.shard_selection = Some(shard_selection);
-        self
-    }
-
-    pub async fn execute(self) -> CollectionResult<Vec<PointGroup>> {
-        let mut groups = group_by(
-            self.group_by.clone(),
-            self.collection,
-            self.collection_by_name.clone(),
-            self.read_consistency,
-            self.shard_selection,
-        )
-        .await?;
-
-        if let Some(lookup) = self.group_by.with_lookup {
-            let mut lookups = {
-                let pseudo_ids = groups
-                    .iter()
-                    .map(|group| group.id.clone())
-                    .map_into()
-                    .collect();
-
-                lookup_ids(
-                    lookup,
-                    pseudo_ids,
-                    self.collection_by_name,
-                    self.read_consistency,
-                    self.shard_selection,
-                )
-                .await?
-            };
-
-            // Put the lookups in their respective groups
-            groups.iter_mut().for_each(|group| {
-                group.lookup = lookups.remove(&PseudoId::from(group.id.clone()));
-            });
-        }
-
-        Ok(groups)
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/grouping/group_by.rs b/crates/qdrant/lib/collection/src/grouping/group_by.rs
deleted file mode 100644
index a3ed551..0000000
--- a/crates/qdrant/lib/collection/src/grouping/group_by.rs
+++ /dev/null
@@ -1,578 +0,0 @@
-use std::collections::HashMap;
-use std::future::Future;
-
-use itertools::Itertools;
-use segment::data_types::vectors::DEFAULT_VECTOR_NAME;
-use segment::types::{
-    AnyVariants, Condition, FieldCondition, Filter, Match, ScoredPoint, WithPayloadInterface,
-    WithVector,
-};
-use serde_json::Value;
-use tokio::sync::RwLockReadGuard;
-
-use super::aggregator::GroupsAggregator;
-use crate::collection::Collection;
-use crate::lookup::WithLookup;
-use crate::operations::consistency_params::ReadConsistency;
-use crate::operations::types::{
-    BaseGroupRequest, CollectionError, CollectionResult, PointGroup, RecommendGroupsRequest,
-    RecommendRequest, SearchGroupsRequest, SearchRequest, UsingVector,
-};
-use crate::recommendations::recommend_by;
-use crate::shards::shard::ShardId;
-
-const MAX_GET_GROUPS_REQUESTS: usize = 5;
-const MAX_GROUP_FILLING_REQUESTS: usize = 5;
-
-#[derive(Clone, Debug)]
-pub enum SourceRequest {
-    Search(SearchRequest),
-    Recommend(RecommendRequest),
-}
-
-impl SourceRequest {
-    fn vector_field_name(&self) -> &str {
-        match self {
-            SourceRequest::Search(request) => request.vector.get_name(),
-            SourceRequest::Recommend(request) => {
-                if let Some(UsingVector::Name(name)) = &request.using {
-                    name
-                } else {
-                    DEFAULT_VECTOR_NAME
-                }
-            }
-        }
-    }
-
-    fn merge_filter(&mut self, filter: &Filter) {
-        match self {
-            SourceRequest::Search(request) => {
-                request.filter = Some(request.filter.clone().unwrap_or_default().merge(filter))
-            }
-            SourceRequest::Recommend(request) => {
-                request.filter = Some(request.filter.clone().unwrap_or_default().merge(filter))
-            }
-        }
-    }
-
-    fn with_payload(&self) -> Option<WithPayloadInterface> {
-        match self {
-            SourceRequest::Search(request) => request.with_payload.clone(),
-            SourceRequest::Recommend(request) => request.with_payload.clone(),
-        }
-    }
-
-    fn with_vector(&self) -> Option<WithVector> {
-        match self {
-            SourceRequest::Search(request) => request.with_vector.clone(),
-            SourceRequest::Recommend(request) => request.with_vector.clone(),
-        }
-    }
-}
-
-#[derive(Clone)]
-pub struct GroupRequest {
-    /// Request to use (search or recommend)
-    pub source: SourceRequest,
-
-    /// Path to the field to group by
-    pub group_by: String,
-
-    /// Limit of points to return per group
-    pub group_size: usize,
-
-    /// Limit of groups to return
-    pub limit: usize,
-
-    /// Options for specifying how to use the group id to lookup points in another collection
-    pub with_lookup: Option<WithLookup>,
-}
-
-impl GroupRequest {
-    pub fn with_limit_from_request(
-        source: SourceRequest,
-        group_by: String,
-        group_size: usize,
-    ) -> Self {
-        let limit = match &source {
-            SourceRequest::Search(request) => request.limit,
-            SourceRequest::Recommend(request) => request.limit,
-        };
-        Self {
-            source,
-            group_by,
-            group_size,
-            limit,
-            with_lookup: None,
-        }
-    }
-
-    /// Apply a bunch of hacks to make `group_by` field selector work with as `with_payload`.
-    fn _group_by_to_payload_selector(&self, group_by: &str) -> CollectionResult<String> {
-        // Hack 1: `with_payload` only works with top-level fields. (ToDo: maybe fix this?)
-        group_by.split('.').next().map_or_else(
-            || {
-                Err(CollectionError::bad_request(format!(
-                    "Malformed group_by parameter which uses unsupported nested path: {}",
-                    group_by
-                )))
-            },
-            |field| {
-                // Hack 2: `with_payload` doesn't work with `[]` at the end of the field name.
-                // Remove the ending `[]`.
-                Ok(field.strip_suffix("[]").unwrap_or(field).to_owned())
-            },
-        )
-    }
-
-    async fn r#do<'a, F, Fut>(
-        &self,
-        collection: &Collection,
-        // only used for recommend
-        collection_by_name: F,
-        read_consistency: Option<ReadConsistency>,
-        shard_selection: Option<ShardId>,
-    ) -> CollectionResult<Vec<ScoredPoint>>
-    where
-        F: Fn(String) -> Fut,
-        Fut: Future<Output = Option<RwLockReadGuard<'a, Collection>>>,
-    {
-        let include_group_by = self._group_by_to_payload_selector(&self.group_by)?;
-
-        let only_group_by_key = Some(WithPayloadInterface::Fields(vec![include_group_by]));
-
-        let key_not_empty = Filter::new_must_not(Condition::IsEmpty(self.group_by.clone().into()));
-
-        match self.source.clone() {
-            SourceRequest::Search(mut request) => {
-                request.limit = self.limit * self.group_size;
-
-                request.filter = Some(request.filter.unwrap_or_default().merge(&key_not_empty));
-
-                // We're enriching the final results at the end, so we'll keep this minimal
-                request.with_payload = only_group_by_key;
-                request.with_vector = None;
-
-                collection
-                    .search(request, read_consistency, shard_selection)
-                    .await
-            }
-            SourceRequest::Recommend(mut request) => {
-                request.limit = self.limit * self.group_size;
-
-                request.filter = Some(request.filter.unwrap_or_default().merge(&key_not_empty));
-
-                // We're enriching the final results at the end, so we'll keep this minimal
-                request.with_payload = only_group_by_key;
-                request.with_vector = None;
-
-                recommend_by(request, collection, collection_by_name, read_consistency).await
-            }
-        }
-    }
-}
-
-impl From<SearchGroupsRequest> for GroupRequest {
-    fn from(request: SearchGroupsRequest) -> Self {
-        let SearchGroupsRequest {
-            vector,
-            filter,
-            params,
-            with_payload,
-            with_vector,
-            score_threshold,
-            group_request:
-                BaseGroupRequest {
-                    group_by,
-                    group_size,
-                    limit,
-                    with_lookup: with_lookup_interface,
-                },
-        } = request;
-
-        let search = SearchRequest {
-            vector,
-            filter,
-            params,
-            limit: 0,
-            offset: 0,
-            with_payload,
-            with_vector,
-            score_threshold,
-        };
-
-        GroupRequest {
-            source: SourceRequest::Search(search),
-            group_by,
-            group_size: group_size as usize,
-            limit: limit as usize,
-            with_lookup: with_lookup_interface.map(Into::into),
-        }
-    }
-}
-
-impl From<RecommendGroupsRequest> for GroupRequest {
-    fn from(request: RecommendGroupsRequest) -> Self {
-        let RecommendGroupsRequest {
-            positive,
-            negative,
-            filter,
-            params,
-            with_payload,
-            with_vector,
-            score_threshold,
-            using,
-            lookup_from,
-            group_request:
-                BaseGroupRequest {
-                    group_by,
-                    group_size,
-                    limit,
-                    with_lookup: with_lookup_interface,
-                },
-        } = request;
-
-        let recommend = RecommendRequest {
-            positive,
-            negative,
-            filter,
-            params,
-            limit: 0,
-            offset: 0,
-            with_payload,
-            with_vector,
-            score_threshold,
-            using,
-            lookup_from,
-        };
-
-        GroupRequest {
-            source: SourceRequest::Recommend(recommend),
-            group_by,
-            group_size: group_size as usize,
-            limit: limit as usize,
-            with_lookup: with_lookup_interface.map(Into::into),
-        }
-    }
-}
-
-/// Uses the request to fill up groups of points.
-pub async fn group_by<'a, F, Fut>(
-    request: GroupRequest,
-    collection: &Collection,
-    // Obligatory for recommend
-    collection_by_name: F,
-    read_consistency: Option<ReadConsistency>,
-    shard_selection: Option<ShardId>,
-) -> CollectionResult<Vec<PointGroup>>
-where
-    F: Fn(String) -> Fut + Clone,
-    Fut: Future<Output = Option<RwLockReadGuard<'a, Collection>>>,
-{
-    let score_ordering = {
-        let vector_name = request.source.vector_field_name();
-        let collection_params = collection.collection_config.read().await;
-        let vector_params = collection_params.params.get_vector_params(vector_name)?;
-        vector_params.distance.distance_order()
-    };
-
-    let mut aggregator = GroupsAggregator::new(
-        request.limit,
-        request.group_size,
-        request.group_by.clone(),
-        score_ordering,
-    );
-
-    // Try to complete amount of groups
-    let mut needs_filling = true;
-    for _ in 0..MAX_GET_GROUPS_REQUESTS {
-        let mut request = request.clone();
-
-        let source = &mut request.source;
-
-        // construct filter to exclude already found groups
-        let full_groups = aggregator.keys_of_filled_groups();
-        if !full_groups.is_empty() {
-            let except_any = except_on(&request.group_by, full_groups);
-            if !except_any.is_empty() {
-                let exclude_groups = Filter {
-                    must: Some(except_any),
-                    ..Default::default()
-                };
-                source.merge_filter(&exclude_groups);
-            }
-        }
-
-        // exclude already aggregated points
-        let ids = aggregator.ids().clone();
-        if !ids.is_empty() {
-            let exclude_ids = Filter::new_must_not(Condition::HasId(ids.into()));
-            source.merge_filter(&exclude_ids);
-        }
-
-        let points = request
-            .r#do(
-                collection,
-                collection_by_name.clone(),
-                read_consistency,
-                shard_selection,
-            )
-            .await?;
-
-        if points.is_empty() {
-            break;
-        }
-
-        aggregator.add_points(&points);
-
-        // TODO: should we break early if we have some amount of "enough" groups?
-        if aggregator.len_of_filled_best_groups() >= request.limit {
-            needs_filling = false;
-            break;
-        }
-    }
-
-    // Try to fill up groups
-    if needs_filling {
-        for _ in 0..MAX_GROUP_FILLING_REQUESTS {
-            let mut request = request.clone();
-
-            let source = &mut request.source;
-
-            // construct filter to only include unsatisfied groups
-            let unsatisfied_groups = aggregator.keys_of_unfilled_best_groups();
-            let match_any = match_on(&request.group_by, unsatisfied_groups);
-            if !match_any.is_empty() {
-                let include_groups = Filter {
-                    must: Some(match_any),
-                    ..Default::default()
-                };
-                source.merge_filter(&include_groups);
-            }
-
-            // exclude already aggregated points
-            let ids = aggregator.ids().clone();
-            if !ids.is_empty() {
-                let exclude_ids = Filter::new_must_not(Condition::HasId(ids.into()));
-                source.merge_filter(&exclude_ids);
-            }
-
-            let points = request
-                .r#do(
-                    collection,
-                    collection_by_name.clone(),
-                    read_consistency,
-                    shard_selection,
-                )
-                .await?;
-
-            if points.is_empty() {
-                break;
-            }
-
-            aggregator.add_points(&points);
-
-            if aggregator.len_of_filled_best_groups() >= request.limit {
-                break;
-            }
-        }
-    }
-
-    // extract best results
-    let mut groups = aggregator.distill();
-
-    // flatten results
-    let bare_points = groups
-        .iter()
-        .cloned()
-        .flat_map(|group| group.hits)
-        .collect();
-
-    // enrich with payload and vector
-    let enriched_points: HashMap<_, _> = collection
-        .fill_search_result_with_payload(
-            bare_points,
-            request.source.with_payload(),
-            request.source.with_vector().unwrap_or_default(),
-            read_consistency,
-            None,
-        )
-        .await?
-        .into_iter()
-        .map(|point| (point.id, point))
-        .collect();
-
-    // hydrate groups with enriched points
-    groups
-        .iter_mut()
-        .for_each(|group| group.hydrate_from(&enriched_points));
-
-    // turn into output form
-    let groups = groups.into_iter().map(PointGroup::from).collect();
-
-    Ok(groups)
-}
-
-/// Uses the set of values to create Match::Except's, if possible
-fn except_on(path: &str, values: Vec<Value>) -> Vec<Condition> {
-    values_to_any_variants(values)
-        .into_iter()
-        .map(|v| Condition::Field(FieldCondition::new_match(path, Match::new_except(v))))
-        .collect()
-}
-
-/// Uses the set of values to create Match::Any's, if possible
-fn match_on(path: &str, values: Vec<Value>) -> Vec<Condition> {
-    values_to_any_variants(values)
-        .into_iter()
-        .map(|any_variants| {
-            Condition::Field(FieldCondition::new_match(
-                path,
-                Match::new_any(any_variants),
-            ))
-        })
-        .collect()
-}
-
-fn values_to_any_variants(values: Vec<Value>) -> Vec<AnyVariants> {
-    let mut any_variants = Vec::new();
-
-    // gather int values
-    let ints = values.iter().filter_map(|v| v.as_i64()).collect_vec();
-
-    if !ints.is_empty() {
-        any_variants.push(AnyVariants::Integers(ints));
-    }
-
-    // gather string values
-    let strs = values
-        .iter()
-        .filter_map(|v| v.as_str().map(|s| s.to_owned()))
-        .collect_vec();
-
-    if !strs.is_empty() {
-        any_variants.push(AnyVariants::Keywords(strs));
-    }
-
-    any_variants
-}
-
-#[cfg(test)]
-mod tests {
-    use std::collections::HashMap;
-
-    use segment::data_types::groups::GroupId;
-    use segment::types::{Payload, ScoredPoint};
-
-    use crate::grouping::types::Group;
-
-    #[test]
-    fn test_hydrated_from() {
-        // arrange
-        let mut groups: Vec<Group> = Vec::new();
-        [
-            (
-                "a",
-                [
-                    ScoredPoint {
-                        id: 1.into(),
-                        version: 0,
-                        score: 1.0,
-                        payload: None,
-                        vector: None,
-                    },
-                    ScoredPoint {
-                        id: 2.into(),
-                        version: 0,
-                        score: 1.0,
-                        payload: None,
-                        vector: None,
-                    },
-                ],
-            ),
-            (
-                "b",
-                [
-                    ScoredPoint {
-                        id: 3.into(),
-                        version: 0,
-                        score: 1.0,
-                        payload: None,
-                        vector: None,
-                    },
-                    ScoredPoint {
-                        id: 4.into(),
-                        version: 0,
-                        score: 1.0,
-                        payload: None,
-                        vector: None,
-                    },
-                ],
-            ),
-        ]
-        .into_iter()
-        .for_each(|(key, points)| {
-            let group = Group {
-                key: GroupId::from(key),
-                hits: points.into_iter().collect(),
-            };
-            groups.push(group);
-        });
-
-        let payload_a = Payload::from(serde_json::json!({"some_key": "some value a"}));
-        let payload_b = Payload::from(serde_json::json!({"some_key": "some value b"}));
-
-        let hydrated = vec![
-            ScoredPoint {
-                id: 1.into(),
-                version: 0,
-                score: 1.0,
-                payload: Some(payload_a.clone()),
-                vector: None,
-            },
-            ScoredPoint {
-                id: 2.into(),
-                version: 0,
-                score: 1.0,
-                payload: Some(payload_a.clone()),
-                vector: None,
-            },
-            ScoredPoint {
-                id: 3.into(),
-                version: 0,
-                score: 1.0,
-                payload: Some(payload_b.clone()),
-                vector: None,
-            },
-            ScoredPoint {
-                id: 4.into(),
-                version: 0,
-                score: 1.0,
-                payload: Some(payload_b.clone()),
-                vector: None,
-            },
-        ];
-
-        let set: HashMap<_, _> = hydrated.into_iter().map(|p| (p.id, p)).collect();
-
-        // act
-        groups.iter_mut().for_each(|group| group.hydrate_from(&set));
-
-        // assert
-        assert_eq!(groups.len(), 2);
-        assert_eq!(groups.get(0).unwrap().hits.len(), 2);
-        assert_eq!(groups.get(1).unwrap().hits.len(), 2);
-
-        let a = groups.get(0).unwrap();
-        let b = groups.get(1).unwrap();
-
-        assert!(a
-            .hits
-            .iter()
-            .all(|x| x.payload.as_ref() == Some(&payload_a)));
-        assert!(b
-            .hits
-            .iter()
-            .all(|x| x.payload.as_ref() == Some(&payload_b)));
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/grouping/mod.rs b/crates/qdrant/lib/collection/src/grouping/mod.rs
deleted file mode 100644
index 97fc9e6..0000000
--- a/crates/qdrant/lib/collection/src/grouping/mod.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-mod aggregator;
-mod builder;
-pub mod group_by;
-mod types;
-
-pub use builder::GroupBy;
diff --git a/crates/qdrant/lib/collection/src/grouping/types.rs b/crates/qdrant/lib/collection/src/grouping/types.rs
deleted file mode 100644
index 2eda81c..0000000
--- a/crates/qdrant/lib/collection/src/grouping/types.rs
+++ /dev/null
@@ -1,79 +0,0 @@
-use std::collections::HashMap;
-
-use segment::data_types::groups::GroupId;
-use segment::types::{PointIdType, ScoredPoint};
-
-use crate::operations::types::PointGroup;
-
-#[derive(PartialEq, Debug)]
-pub(super) enum AggregatorError {
-    BadKeyType,
-    KeyNotFound,
-}
-#[derive(Debug, Clone)]
-pub(super) struct Group {
-    pub hits: Vec<ScoredPoint>,
-    pub key: GroupId,
-}
-
-impl Group {
-    pub(super) fn hydrate_from(&mut self, map: &HashMap<PointIdType, ScoredPoint>) {
-        self.hits.iter_mut().for_each(|hit| {
-            if let Some(point) = map.get(&hit.id) {
-                hit.payload = point.payload.clone();
-                hit.vector = point.vector.clone();
-            }
-        });
-    }
-}
-
-impl From<Group> for PointGroup {
-    fn from(group: Group) -> Self {
-        Self {
-            hits: group.hits,
-            id: group.key,
-            lookup: None,
-        }
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use segment::data_types::groups::GroupId;
-
-    #[test]
-    fn group_key_from_values() {
-        use std::convert::TryFrom;
-
-        use serde_json::json;
-
-        let string = GroupId::try_from(&json!("string")).unwrap();
-        let int = GroupId::try_from(&json!(1)).unwrap();
-
-        assert!(GroupId::try_from(&json!(2.42)).is_err());
-
-        assert!(GroupId::try_from(&json!([5, 6, 7])).is_err());
-        assert!(GroupId::try_from(&json!(["a", "b", "c"])).is_err());
-
-        assert_eq!(string, GroupId::String("string".to_string()));
-        assert_eq!(int.as_u64().unwrap(), 1);
-
-        let bad_key = GroupId::try_from(&json!(true));
-        assert!(bad_key.is_err());
-
-        let empty_array = GroupId::try_from(&json!([]));
-        assert!(empty_array.is_err());
-
-        let empty_object = GroupId::try_from(&json!({}));
-        assert!(empty_object.is_err());
-
-        let null = GroupId::try_from(&serde_json::Value::Null);
-        assert!(null.is_err());
-
-        let nested_array = GroupId::try_from(&json!([[1, 2, 3], [4, 5, 6]]));
-        assert!(nested_array.is_err());
-
-        let nested_object = GroupId::try_from(&json!({"a": 1, "b": 2}));
-        assert!(nested_object.is_err());
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/hash_ring.rs b/crates/qdrant/lib/collection/src/hash_ring.rs
deleted file mode 100644
index bdddacf..0000000
--- a/crates/qdrant/lib/collection/src/hash_ring.rs
+++ /dev/null
@@ -1,58 +0,0 @@
-use std::hash::Hash;
-
-pub enum HashRing<T: Hash + Copy> {
-    Raw(hashring::HashRing<T>),
-    Fair {
-        ring: hashring::HashRing<(T, u32)>,
-        scale: u32,
-    },
-}
-
-impl<T: Hash + Copy> HashRing<T> {
-    pub fn raw() -> Self {
-        Self::Raw(hashring::HashRing::new())
-    }
-
-    /// Constructs a HashRing that tries to give all shards equal space on the ring.
-    /// The higher the `scale` - the more equal the distribution of points on the shards will be,
-    /// but shard search might be slower.
-    pub fn fair(scale: u32) -> Self {
-        Self::Fair {
-            ring: hashring::HashRing::new(),
-            scale,
-        }
-    }
-
-    pub fn add(&mut self, shard: T) {
-        match self {
-            HashRing::Raw(ring) => ring.add(shard),
-            HashRing::Fair { ring, scale } => {
-                for i in 0..*scale {
-                    ring.add((shard, i))
-                }
-            }
-        }
-    }
-
-    pub fn remove(&mut self, shard: &T) -> bool {
-        match self {
-            HashRing::Raw(ring) => ring.remove(shard).is_some(),
-            HashRing::Fair { ring, scale } => {
-                let mut removed = false;
-                for i in 0..*scale {
-                    if ring.remove(&(*shard, i)).is_some() {
-                        removed = true;
-                    }
-                }
-                removed
-            }
-        }
-    }
-
-    pub fn get<U: Hash>(&self, key: &U) -> Option<&T> {
-        match self {
-            HashRing::Raw(ring) => ring.get(key),
-            HashRing::Fair { ring, .. } => ring.get(key).map(|(shard, _)| shard),
-        }
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/lib.rs b/crates/qdrant/lib/collection/src/lib.rs
deleted file mode 100644
index 4393a7e..0000000
--- a/crates/qdrant/lib/collection/src/lib.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-pub mod collection;
-pub mod collection_manager;
-pub mod collection_state;
-pub mod common;
-pub mod config;
-pub mod grouping;
-pub mod hash_ring;
-pub mod lookup;
-pub mod operations;
-pub mod optimizers_builder;
-pub mod recommendations;
-pub mod save_on_disk;
-pub mod shards;
-pub mod telemetry;
-mod update_handler;
-pub mod wal;
-
-#[cfg(test)]
-mod tests;
diff --git a/crates/qdrant/lib/collection/src/lookup/mod.rs b/crates/qdrant/lib/collection/src/lookup/mod.rs
deleted file mode 100644
index 94454a6..0000000
--- a/crates/qdrant/lib/collection/src/lookup/mod.rs
+++ /dev/null
@@ -1,78 +0,0 @@
-pub mod types;
-
-use std::collections::HashMap;
-
-use futures::Future;
-use itertools::Itertools;
-use schemars::JsonSchema;
-use segment::types::{PointIdType, WithPayloadInterface, WithVector};
-use serde::{Deserialize, Serialize};
-use tokio::sync::RwLockReadGuard;
-use types::PseudoId;
-
-use crate::collection::Collection;
-use crate::operations::consistency_params::ReadConsistency;
-use crate::operations::types::{CollectionError, CollectionResult, PointRequest, Record};
-use crate::shards::shard::ShardId;
-
-#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema)]
-pub struct WithLookup {
-    /// Name of the collection to use for points lookup
-    #[serde(rename = "collection")]
-    pub collection_name: String,
-
-    /// Options for specifying which payload to include (or not)
-    #[serde(default = "default_with_payload")]
-    pub with_payload: Option<WithPayloadInterface>,
-
-    /// Options for specifying which vectors to include (or not)
-    #[serde(alias = "with_vector")]
-    #[serde(default)]
-    pub with_vectors: Option<WithVector>,
-}
-
-const fn default_with_payload() -> Option<WithPayloadInterface> {
-    Some(WithPayloadInterface::Bool(true))
-}
-
-pub async fn lookup_ids<'a, F, Fut>(
-    request: WithLookup,
-    values: Vec<PseudoId>,
-    collection_by_name: F,
-    read_consistency: Option<ReadConsistency>,
-    shard_selection: Option<ShardId>,
-) -> CollectionResult<HashMap<PseudoId, Record>>
-where
-    F: FnOnce(String) -> Fut,
-    Fut: Future<Output = Option<RwLockReadGuard<'a, Collection>>>,
-{
-    let collection = collection_by_name(request.collection_name.clone())
-        .await
-        .ok_or(CollectionError::NotFound {
-            what: format!("Collection {}", request.collection_name),
-        })?;
-
-    let ids = values
-        .into_iter()
-        .filter_map(|v| PointIdType::try_from(v).ok())
-        .collect_vec();
-
-    if ids.is_empty() {
-        return Ok(HashMap::new());
-    }
-
-    let point_request = PointRequest {
-        ids,
-        with_payload: request.with_payload,
-        with_vector: request.with_vectors.unwrap_or_default(),
-    };
-
-    let result = collection
-        .retrieve(point_request, read_consistency, shard_selection)
-        .await?
-        .into_iter()
-        .map(|point| (PseudoId::from(point.id), point))
-        .collect();
-
-    Ok(result)
-}
diff --git a/crates/qdrant/lib/collection/src/lookup/types.rs b/crates/qdrant/lib/collection/src/lookup/types.rs
deleted file mode 100644
index 6556fa8..0000000
--- a/crates/qdrant/lib/collection/src/lookup/types.rs
+++ /dev/null
@@ -1,122 +0,0 @@
-use std::fmt::Display;
-
-use schemars::JsonSchema;
-use segment::data_types::groups::GroupId;
-use segment::types::PointIdType;
-use serde::{Deserialize, Serialize};
-use uuid::Uuid;
-
-use super::WithLookup;
-
-#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone)]
-#[serde(untagged)]
-pub enum WithLookupInterface {
-    Collection(String),
-    WithLookup(WithLookup),
-}
-
-impl From<WithLookupInterface> for WithLookup {
-    fn from(with_lookup: WithLookupInterface) -> Self {
-        match with_lookup {
-            WithLookupInterface::Collection(collection_name) => Self {
-                collection_name,
-                with_payload: Some(true.into()),
-                with_vectors: Some(false.into()),
-            },
-            WithLookupInterface::WithLookup(with_lookup) => with_lookup,
-        }
-    }
-}
-
-/// A value that can be used as a temporary ID
-#[derive(Debug, Eq, PartialEq, Clone, Hash)]
-pub enum PseudoId {
-    String(String),
-    NumberU64(u64),
-    NumberI64(i64),
-}
-
-impl Display for PseudoId {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            PseudoId::String(s) => write!(f, "{}", s),
-            PseudoId::NumberU64(n) => write!(f, "{}", n),
-            PseudoId::NumberI64(n) => write!(f, "{}", n),
-        }
-    }
-}
-
-impl From<GroupId> for PseudoId {
-    fn from(id: GroupId) -> Self {
-        match id {
-            GroupId::String(s) => Self::String(s),
-            GroupId::NumberU64(n) => Self::NumberU64(n),
-            GroupId::NumberI64(n) => Self::NumberI64(n),
-        }
-    }
-}
-
-impl From<PseudoId> for GroupId {
-    fn from(id: PseudoId) -> Self {
-        match id {
-            PseudoId::String(s) => Self::String(s),
-            PseudoId::NumberU64(n) => Self::NumberU64(n),
-            PseudoId::NumberI64(n) => Self::NumberI64(n),
-        }
-    }
-}
-
-#[derive(Debug)]
-pub enum ConversionError {
-    IntError(core::num::TryFromIntError),
-    ParseError(uuid::Error),
-}
-
-impl TryFrom<PseudoId> for PointIdType {
-    type Error = ConversionError;
-
-    fn try_from(value: PseudoId) -> Result<Self, Self::Error> {
-        match value {
-            PseudoId::String(s) => Ok(PointIdType::Uuid(
-                Uuid::try_parse(&s).map_err(ConversionError::ParseError)?,
-            )),
-            PseudoId::NumberU64(n) => Ok(PointIdType::NumId(n)),
-            PseudoId::NumberI64(n) => Ok(PointIdType::NumId(
-                u64::try_from(n).map_err(ConversionError::IntError)?,
-            )),
-        }
-    }
-}
-
-impl From<PointIdType> for PseudoId {
-    fn from(id: PointIdType) -> Self {
-        match id {
-            PointIdType::NumId(n) => PseudoId::NumberU64(n),
-            PointIdType::Uuid(u) => PseudoId::String(u.to_string()),
-        }
-    }
-}
-
-impl From<u64> for PseudoId {
-    fn from(id: u64) -> Self {
-        PseudoId::NumberU64(id)
-    }
-}
-
-impl From<i64> for PseudoId {
-    fn from(id: i64) -> Self {
-        PseudoId::NumberI64(id)
-    }
-}
-
-impl From<String> for PseudoId {
-    fn from(id: String) -> Self {
-        PseudoId::String(id)
-    }
-}
-
-impl From<&str> for PseudoId {
-    fn from(id: &str) -> Self {
-        PseudoId::String(id.to_string())
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/operations/cluster_ops.rs b/crates/qdrant/lib/collection/src/operations/cluster_ops.rs
deleted file mode 100644
index b626f17..0000000
--- a/crates/qdrant/lib/collection/src/operations/cluster_ops.rs
+++ /dev/null
@@ -1,69 +0,0 @@
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use validator::Validate;
-
-use crate::shards::shard::{PeerId, ShardId};
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone)]
-#[serde(rename_all = "snake_case")]
-#[serde(untagged)]
-pub enum ClusterOperations {
-    /// Move shard to a different peer
-    MoveShard(MoveShardOperation),
-    /// Replicate shard to a different peer
-    ReplicateShard(ReplicateShardOperation),
-    /// Abort currently running shard moving operation
-    AbortTransfer(AbortTransferOperation),
-    /// Drop replica of a shard from a peer
-    DropReplica(DropReplicaOperation),
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Validate, Clone)]
-#[serde(rename_all = "snake_case")]
-pub struct MoveShardOperation {
-    pub move_shard: MoveShard,
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Validate, Clone)]
-#[serde(rename_all = "snake_case")]
-pub struct ReplicateShardOperation {
-    pub replicate_shard: MoveShard,
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Validate, Clone)]
-#[serde(rename_all = "snake_case")]
-pub struct DropReplicaOperation {
-    pub drop_replica: Replica,
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Validate, Clone)]
-#[serde(rename_all = "snake_case")]
-pub struct AbortTransferOperation {
-    pub abort_transfer: MoveShard,
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Validate, Clone)]
-#[serde(rename_all = "snake_case")]
-pub struct MoveShard {
-    pub shard_id: ShardId,
-    pub to_peer_id: PeerId,
-    pub from_peer_id: PeerId,
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Validate, Clone)]
-#[serde(rename_all = "snake_case")]
-pub struct Replica {
-    pub shard_id: ShardId,
-    pub peer_id: PeerId,
-}
-
-impl Validate for ClusterOperations {
-    fn validate(&self) -> Result<(), validator::ValidationErrors> {
-        match self {
-            ClusterOperations::MoveShard(op) => op.validate(),
-            ClusterOperations::ReplicateShard(op) => op.validate(),
-            ClusterOperations::AbortTransfer(op) => op.validate(),
-            ClusterOperations::DropReplica(op) => op.validate(),
-        }
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/operations/config_diff.rs b/crates/qdrant/lib/collection/src/operations/config_diff.rs
deleted file mode 100644
index b57fdeb..0000000
--- a/crates/qdrant/lib/collection/src/operations/config_diff.rs
+++ /dev/null
@@ -1,392 +0,0 @@
-use std::num::NonZeroU32;
-
-use merge::Merge;
-use schemars::JsonSchema;
-use segment::types::{HnswConfig, ProductQuantization, ScalarQuantization};
-use serde::de::DeserializeOwned;
-use serde::{Deserialize, Serialize};
-use serde_json::Value;
-use validator::{Validate, ValidationErrors};
-
-use crate::config::{CollectionParams, WalConfig};
-use crate::operations::types::CollectionResult;
-use crate::optimizers_builder::OptimizersConfig;
-
-// Structures for partial update of collection params
-// TODO: make auto-generated somehow...
-
-pub trait DiffConfig<T: DeserializeOwned + Serialize> {
-    /// Update the given `config` with fields in this diff
-    ///
-    /// This clones, modifies and returns `config`.
-    ///
-    /// This diff has higher priority, meaning that fields specified in this diff will always be in
-    /// the returned object.
-    fn update(self, config: &T) -> CollectionResult<T>
-    where
-        Self: Sized + Serialize + DeserializeOwned + Merge,
-    {
-        update_config(config, self)
-    }
-
-    fn from_full(full: &T) -> CollectionResult<Self>
-    where
-        Self: Sized + Serialize + DeserializeOwned,
-    {
-        from_full(full)
-    }
-}
-
-#[derive(
-    Debug,
-    Default,
-    Deserialize,
-    Serialize,
-    JsonSchema,
-    Validate,
-    Copy,
-    Clone,
-    PartialEq,
-    Eq,
-    Merge,
-    Hash,
-)]
-#[serde(rename_all = "snake_case")]
-pub struct HnswConfigDiff {
-    /// Number of edges per node in the index graph. Larger the value - more accurate the search, more space required.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub m: Option<usize>,
-    /// Number of neighbours to consider during the index building. Larger the value - more accurate the search, more time required to build the index.
-    #[validate(range(min = 4))]
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub ef_construct: Option<usize>,
-    /// Minimal size (in kilobytes) of vectors for additional payload-based indexing.
-    /// If payload chunk is smaller than `full_scan_threshold_kb` additional indexing won't be used -
-    /// in this case full-scan search should be preferred by query planner and additional indexing is not required.
-    /// Note: 1Kb = 1 vector of size 256
-    #[serde(
-        alias = "full_scan_threshold_kb",
-        default,
-        skip_serializing_if = "Option::is_none"
-    )]
-    #[validate(range(min = 10))]
-    pub full_scan_threshold: Option<usize>,
-    /// Number of parallel threads used for background index building. If 0 - auto selection.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub max_indexing_threads: Option<usize>,
-    /// Store HNSW index on disk. If set to false, the index will be stored in RAM. Default: false
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub on_disk: Option<bool>,
-    /// Custom M param for additional payload-aware HNSW links. If not set, default M will be used.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub payload_m: Option<usize>,
-}
-
-#[derive(
-    Debug, Deserialize, Serialize, JsonSchema, Validate, Clone, Merge, PartialEq, Eq, Hash,
-)]
-pub struct WalConfigDiff {
-    /// Size of a single WAL segment in MB
-    #[validate(range(min = 1))]
-    pub wal_capacity_mb: Option<usize>,
-    /// Number of WAL segments to create ahead of actually used ones
-    pub wal_segments_ahead: Option<usize>,
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone, Merge, PartialEq, Eq, Hash)]
-pub struct CollectionParamsDiff {
-    /// Number of replicas for each shard
-    pub replication_factor: Option<NonZeroU32>,
-    /// Minimal number successful responses from replicas to consider operation successful
-    pub write_consistency_factor: Option<NonZeroU32>,
-    /// If true - point's payload will not be stored in memory.
-    /// It will be read from the disk every time it is requested.
-    /// This setting saves RAM by (slightly) increasing the response time.
-    /// Note: those payload values that are involved in filtering and are indexed - remain in RAM.
-    #[serde(default)]
-    pub on_disk_payload: Option<bool>,
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Validate, Clone, Merge)]
-pub struct OptimizersConfigDiff {
-    /// The minimal fraction of deleted vectors in a segment, required to perform segment optimization
-    pub deleted_threshold: Option<f64>,
-    /// The minimal number of vectors in a segment, required to perform segment optimization
-    pub vacuum_min_vector_number: Option<usize>,
-    /// Target amount of segments optimizer will try to keep.
-    /// Real amount of segments may vary depending on multiple parameters:
-    ///  - Amount of stored points
-    ///  - Current write RPS
-    ///
-    /// It is recommended to select default number of segments as a factor of the number of search threads,
-    /// so that each segment would be handled evenly by one of the threads
-    /// If `default_segment_number = 0`, will be automatically selected by the number of available CPUs
-    pub default_segment_number: Option<usize>,
-    /// Do not create segments larger this size (in kilobytes).
-    /// Large segments might require disproportionately long indexation times,
-    /// therefore it makes sense to limit the size of segments.
-    ///
-    /// If indexation speed have more priority for your - make this parameter lower.
-    /// If search speed is more important - make this parameter higher.
-    /// Note: 1Kb = 1 vector of size 256
-    #[serde(alias = "max_segment_size_kb")]
-    pub max_segment_size: Option<usize>,
-    /// Maximum size (in kilobytes) of vectors to store in-memory per segment.
-    /// Segments larger than this threshold will be stored as read-only memmaped file.
-    ///
-    /// Memmap storage is disabled by default, to enable it, set this threshold to a reasonable value.
-    ///
-    /// To disable memmap storage, set this to `0`.
-    ///
-    /// Note: 1Kb = 1 vector of size 256
-    #[serde(alias = "memmap_threshold_kb")]
-    pub memmap_threshold: Option<usize>,
-    /// Maximum size (in kilobytes) of vectors allowed for plain index, exceeding this threshold will enable vector indexing
-    ///
-    /// Default value is 20,000, based on <https://github.com/google-research/google-research/blob/master/scann/docs/algorithms.md>.
-    ///
-    /// To disable vector indexing, set to `0`.
-    ///
-    /// Note: 1kB = 1 vector of size 256.
-    #[serde(alias = "indexing_threshold_kb")]
-    pub indexing_threshold: Option<usize>,
-    /// Minimum interval between forced flushes.
-    pub flush_interval_sec: Option<u64>,
-    /// Maximum available threads for optimization workers
-    pub max_optimization_threads: Option<usize>,
-}
-
-impl std::hash::Hash for OptimizersConfigDiff {
-    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
-        self.deleted_threshold.map(f64::to_le_bytes).hash(state);
-        self.vacuum_min_vector_number.hash(state);
-        self.default_segment_number.hash(state);
-        self.max_segment_size.hash(state);
-        self.memmap_threshold.hash(state);
-        self.indexing_threshold.hash(state);
-        self.flush_interval_sec.hash(state);
-        self.max_optimization_threads.hash(state);
-    }
-}
-
-impl PartialEq for OptimizersConfigDiff {
-    fn eq(&self, other: &Self) -> bool {
-        self.deleted_threshold.map(f64::to_le_bytes)
-            == other.deleted_threshold.map(f64::to_le_bytes)
-            && self.vacuum_min_vector_number == other.vacuum_min_vector_number
-            && self.default_segment_number == other.default_segment_number
-            && self.max_segment_size == other.max_segment_size
-            && self.memmap_threshold == other.memmap_threshold
-            && self.indexing_threshold == other.indexing_threshold
-            && self.flush_interval_sec == other.flush_interval_sec
-            && self.max_optimization_threads == other.max_optimization_threads
-    }
-}
-
-impl Eq for OptimizersConfigDiff {}
-
-impl DiffConfig<HnswConfig> for HnswConfigDiff {}
-
-impl DiffConfig<HnswConfigDiff> for HnswConfigDiff {}
-
-impl DiffConfig<OptimizersConfig> for OptimizersConfigDiff {}
-
-impl DiffConfig<WalConfig> for WalConfigDiff {}
-
-impl DiffConfig<CollectionParams> for CollectionParamsDiff {}
-
-impl From<HnswConfig> for HnswConfigDiff {
-    fn from(config: HnswConfig) -> Self {
-        HnswConfigDiff::from_full(&config).unwrap()
-    }
-}
-
-impl From<OptimizersConfig> for OptimizersConfigDiff {
-    fn from(config: OptimizersConfig) -> Self {
-        OptimizersConfigDiff::from_full(&config).unwrap()
-    }
-}
-
-impl From<WalConfig> for WalConfigDiff {
-    fn from(config: WalConfig) -> Self {
-        WalConfigDiff::from_full(&config).unwrap()
-    }
-}
-
-impl From<CollectionParams> for CollectionParamsDiff {
-    fn from(config: CollectionParams) -> Self {
-        CollectionParamsDiff::from_full(&config).unwrap()
-    }
-}
-
-pub fn from_full<T: DeserializeOwned + Serialize, Y: DeserializeOwned + Serialize>(
-    full_config: &T,
-) -> CollectionResult<Y> {
-    let json = serde_json::to_value(full_config)?;
-    let res = serde_json::from_value(json)?;
-    Ok(res)
-}
-
-/// Merge first level of JSON values, if diff values present explicitly
-///
-/// Example:
-///
-/// base: {"a": 1, "b": 2}
-/// diff: {"a": 3}
-/// result: {"a": 3, "b": 2}
-///
-/// base: {"a": 1, "b": 2}
-/// diff: {"a": null}
-/// result: {"a": 1, "b": 2}
-fn merge_level_0(base: &mut Value, diff: Value) {
-    match (base, diff) {
-        (base @ &mut Value::Object(_), Value::Object(diff)) => {
-            let base = base.as_object_mut().unwrap();
-            for (k, v) in diff {
-                if !v.is_null() {
-                    base.insert(k, v);
-                }
-            }
-        }
-        (_base, _diff) => {}
-    }
-}
-
-/// Hacky way to update configuration structures with diff-updates.
-/// Intended to only be used in non critical for speed places.
-/// TODO: replace with proc macro
-pub fn update_config<T: DeserializeOwned + Serialize, Y: DeserializeOwned + Serialize + Merge>(
-    config: &T,
-    update: Y,
-) -> CollectionResult<T> {
-    let mut config_values = serde_json::to_value(config)?;
-    let diff_values = serde_json::to_value(&update)?;
-    merge_level_0(&mut config_values, diff_values);
-    let res = serde_json::from_value(config_values)?;
-    Ok(res)
-}
-
-/// Hacky way to figure out if the given configuration is considered empty
-///
-/// The following types are considered empty:
-/// - Null
-/// - Empty string
-/// - Array or object with zero items
-///
-/// Intended to only be used in non critical for speed places.
-pub fn is_empty<T: Serialize>(config: &T) -> CollectionResult<bool> {
-    let config_values = serde_json::to_value(config)?;
-
-    Ok(match config_values {
-        Value::Null => true,
-        Value::String(value) => value.is_empty(),
-        Value::Array(values) => values.is_empty(),
-        Value::Object(values) => values.is_empty(),
-        Value::Bool(_) | Value::Number(_) => false,
-    })
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone, PartialEq, Eq, Hash)]
-pub enum Disabled {
-    Disabled,
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone, PartialEq, Eq, Hash)]
-#[serde(rename_all = "snake_case")]
-#[serde(untagged)]
-pub enum QuantizationConfigDiff {
-    Scalar(ScalarQuantization),
-    Product(ProductQuantization),
-    Disabled(Disabled),
-}
-
-impl QuantizationConfigDiff {
-    pub fn new_disabled() -> Self {
-        QuantizationConfigDiff::Disabled(Disabled::Disabled)
-    }
-}
-
-impl Validate for QuantizationConfigDiff {
-    fn validate(&self) -> Result<(), ValidationErrors> {
-        match self {
-            QuantizationConfigDiff::Scalar(scalar) => scalar.validate(),
-            QuantizationConfigDiff::Product(product) => product.validate(),
-            QuantizationConfigDiff::Disabled(_) => Ok(()),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::num::NonZeroU64;
-
-    use segment::types::{Distance, HnswConfig};
-
-    use super::*;
-    use crate::operations::types::VectorParams;
-    use crate::optimizers_builder::OptimizersConfig;
-
-    #[test]
-    fn test_update_collection_params() {
-        let params = CollectionParams {
-            vectors: VectorParams {
-                size: NonZeroU64::new(128).unwrap(),
-                distance: Distance::Cosine,
-                hnsw_config: None,
-                quantization_config: None,
-                on_disk: None,
-            }
-            .into(),
-            shard_number: NonZeroU32::new(1).unwrap(),
-            replication_factor: NonZeroU32::new(1).unwrap(),
-            write_consistency_factor: NonZeroU32::new(1).unwrap(),
-            on_disk_payload: false,
-        };
-
-        let diff = CollectionParamsDiff {
-            replication_factor: None,
-            write_consistency_factor: Some(NonZeroU32::new(2).unwrap()),
-            on_disk_payload: None,
-        };
-
-        let new_params = diff.update(&params).unwrap();
-
-        assert_eq!(new_params.replication_factor.get(), 1);
-        assert_eq!(new_params.write_consistency_factor.get(), 2);
-        assert!(!new_params.on_disk_payload);
-    }
-
-    #[test]
-    fn test_hnsw_update() {
-        let base_config = HnswConfig::default();
-        let update: HnswConfigDiff = serde_json::from_str(r#"{ "m": 32 }"#).unwrap();
-        let new_config = update.update(&base_config).unwrap();
-        assert_eq!(new_config.m, 32)
-    }
-
-    #[test]
-    fn test_optimizer_update() {
-        let base_config = OptimizersConfig {
-            deleted_threshold: 0.9,
-            vacuum_min_vector_number: 1000,
-            default_segment_number: 10,
-            max_segment_size: None,
-            memmap_threshold: None,
-            indexing_threshold: Some(50_000),
-            flush_interval_sec: 30,
-            max_optimization_threads: 1,
-        };
-        let update: OptimizersConfigDiff =
-            serde_json::from_str(r#"{ "indexing_threshold": 10000 }"#).unwrap();
-        let new_config = update.update(&base_config).unwrap();
-        assert_eq!(new_config.indexing_threshold, Some(10000))
-    }
-
-    #[test]
-    fn test_wal_config() {
-        let base_config = WalConfig::default();
-        let update: WalConfigDiff = serde_json::from_str(r#"{ "wal_segments_ahead": 2 }"#).unwrap();
-        let new_config = update.update(&base_config).unwrap();
-        assert_eq!(new_config.wal_segments_ahead, 2)
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/operations/consistency_params.rs b/crates/qdrant/lib/collection/src/operations/consistency_params.rs
deleted file mode 100644
index 9e981d4..0000000
--- a/crates/qdrant/lib/collection/src/operations/consistency_params.rs
+++ /dev/null
@@ -1,246 +0,0 @@
-use std::borrow::Cow;
-
-use api::grpc::qdrant::{
-    read_consistency, ReadConsistency as ReadConsistencyGrpc,
-    ReadConsistencyType as ReadConsistencyTypeGrpc,
-};
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use validator::{Validate, ValidationError as ValidatorError, ValidationErrors};
-
-/// Read consistency parameter
-///
-/// Defines how many replicas should be queried to get the result
-///
-/// * `N` - send N random request and return points, which present on all of them
-///
-/// * `majority` - send N/2+1 random request and return points, which present on all of them
-///
-/// * `quorum` - send requests to all nodes and return points which present on majority of them
-///
-/// * `all` - send requests to all nodes and return points which present on all of them
-///
-/// Default value is `Factor(1)`
-#[derive(Copy, Clone, Debug, Eq, PartialEq, Deserialize, Serialize, JsonSchema)]
-#[serde(untagged)]
-pub enum ReadConsistency {
-    // send N random request and return points, which present on all of them
-    Factor(#[serde(deserialize_with = "deserialize_factor")] usize),
-    Type(ReadConsistencyType),
-}
-
-impl Validate for ReadConsistency {
-    fn validate(&self) -> Result<(), ValidationErrors> {
-        match self {
-            ReadConsistency::Factor(factor) if *factor == 0 => {
-                let mut errors = ValidationErrors::new();
-                errors.add("factor", {
-                    let mut error = ValidatorError::new("range");
-                    error.add_param(Cow::from("value"), factor);
-                    error.add_param(Cow::from("min"), &1);
-                    error
-                });
-                Err(errors)
-            }
-            ReadConsistency::Factor(_) | ReadConsistency::Type(_) => Ok(()),
-        }
-    }
-}
-
-impl Default for ReadConsistency {
-    fn default() -> Self {
-        ReadConsistency::Factor(1)
-    }
-}
-
-impl ReadConsistency {
-    pub fn try_from_optional(
-        consistency: Option<ReadConsistencyGrpc>,
-    ) -> Result<Option<Self>, tonic::Status> {
-        consistency.map(TryFrom::try_from).transpose()
-    }
-}
-
-impl TryFrom<Option<ReadConsistencyGrpc>> for ReadConsistency {
-    type Error = tonic::Status;
-
-    fn try_from(consistency: Option<ReadConsistencyGrpc>) -> Result<Self, Self::Error> {
-        match consistency {
-            Some(consistency) => consistency.try_into(),
-            None => Ok(Self::Factor(1)),
-        }
-    }
-}
-
-impl TryFrom<ReadConsistencyGrpc> for ReadConsistency {
-    type Error = tonic::Status;
-
-    fn try_from(consistency: ReadConsistencyGrpc) -> Result<Self, Self::Error> {
-        let value = consistency.value.ok_or_else(|| {
-            tonic::Status::invalid_argument(
-                "invalid read consistency message: `ReadConsistency::value` field is `None`",
-            )
-        })?;
-
-        let consistency = match value {
-            read_consistency::Value::Factor(factor) => Self::Factor(
-                usize::try_from(factor)
-                    .map_err(|err| tonic::Status::invalid_argument(err.to_string()))?,
-            ),
-            read_consistency::Value::Type(consistency) => Self::Type(consistency.try_into()?),
-        };
-
-        Ok(consistency)
-    }
-}
-
-impl From<ReadConsistency> for ReadConsistencyGrpc {
-    fn from(consistency: ReadConsistency) -> Self {
-        let value = match consistency {
-            ReadConsistency::Factor(factor) => {
-                read_consistency::Value::Factor(factor.try_into().unwrap())
-            }
-            ReadConsistency::Type(consistency) => read_consistency::Value::Type(consistency.into()),
-        };
-
-        ReadConsistencyGrpc { value: Some(value) }
-    }
-}
-
-fn deserialize_factor<'de, D>(deserializer: D) -> Result<usize, D::Error>
-where
-    D: serde::Deserializer<'de>,
-{
-    #[derive(Deserialize)]
-    #[serde(untagged)]
-    enum Factor<'a> {
-        Usize(usize),
-        Str(&'a str),
-        String(String),
-    }
-
-    let factor = match Factor::deserialize(deserializer)? {
-        Factor::Usize(factor) => Ok(factor),
-        Factor::Str(str) => str.parse(),
-        Factor::String(str) => str.parse(),
-    };
-
-    let factor = factor.map_err(|err| {
-        serde::de::Error::custom(format!(
-            "failed to deserialize read consistency factor value: {err}"
-        ))
-    })?;
-
-    if factor > 0 {
-        Ok(factor)
-    } else {
-        Err(serde::de::Error::custom(
-            "read consistency factor can't be zero",
-        ))
-    }
-}
-
-/// * `majority` - send N/2+1 random request and return points, which present on all of them
-///
-/// * `quorum` - send requests to all nodes and return points which present on majority of nodes
-///
-/// * `all` - send requests to all nodes and return points which present on all nodes
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Copy, Clone, PartialEq, Eq)]
-#[serde(rename_all = "snake_case")]
-pub enum ReadConsistencyType {
-    // send N/2+1 random request and return points, which present on all of them
-    Majority,
-    // send requests to all nodes and return points which present on majority of nodes
-    Quorum,
-    // send requests to all nodes and return points which present on all nodes
-    All,
-}
-
-impl TryFrom<i32> for ReadConsistencyType {
-    type Error = tonic::Status;
-
-    fn try_from(consistency: i32) -> Result<Self, Self::Error> {
-        let consistency = ReadConsistencyTypeGrpc::from_i32(consistency).ok_or_else(|| {
-            tonic::Status::invalid_argument(format!(
-                "invalid read consistency type value {consistency}",
-            ))
-        })?;
-
-        Ok(consistency.into())
-    }
-}
-
-impl From<ReadConsistencyTypeGrpc> for ReadConsistencyType {
-    fn from(consistency: ReadConsistencyTypeGrpc) -> Self {
-        match consistency {
-            ReadConsistencyTypeGrpc::Majority => Self::Majority,
-            ReadConsistencyTypeGrpc::Quorum => Self::Quorum,
-            ReadConsistencyTypeGrpc::All => Self::All,
-        }
-    }
-}
-
-impl From<ReadConsistencyType> for i32 {
-    fn from(consistency: ReadConsistencyType) -> Self {
-        ReadConsistencyTypeGrpc::from(consistency) as _
-    }
-}
-
-impl From<ReadConsistencyType> for ReadConsistencyTypeGrpc {
-    fn from(consistency: ReadConsistencyType) -> Self {
-        match consistency {
-            ReadConsistencyType::Majority => ReadConsistencyTypeGrpc::Majority,
-            ReadConsistencyType::Quorum => ReadConsistencyTypeGrpc::Quorum,
-            ReadConsistencyType::All => ReadConsistencyTypeGrpc::All,
-        }
-    }
-}
-
-#[derive(Copy, Clone, Debug, thiserror::Error)]
-#[error("Read consistency factor cannot be less than 1")]
-pub struct ValidationError;
-
-#[cfg(test)]
-mod tests {
-    use schemars::schema_for;
-
-    use super::*;
-
-    #[test]
-    fn test_read_consistency_deserialization() {
-        let consistency = ReadConsistency::Type(ReadConsistencyType::Majority);
-        let json = serde_json::to_string(&consistency).unwrap();
-        println!("{json}");
-
-        let json = "2";
-        let consistency: ReadConsistency = serde_json::from_str(json).unwrap();
-        assert_eq!(consistency, ReadConsistency::Factor(2));
-
-        let json = "0";
-        let consistency: Result<ReadConsistency, _> = serde_json::from_str(json);
-        assert!(consistency.is_err());
-
-        let json = "\"majority\"";
-        let consistency: ReadConsistency = serde_json::from_str(json).unwrap();
-        assert_eq!(
-            consistency,
-            ReadConsistency::Type(ReadConsistencyType::Majority)
-        );
-
-        let consistency = ReadConsistency::Type(ReadConsistencyType::All);
-        let json = serde_json::to_string(&consistency).unwrap();
-        assert_eq!(json, "\"all\"");
-
-        let consistency = ReadConsistency::Factor(1);
-        let json = serde_json::to_string(&consistency).unwrap();
-        assert_eq!(json, "1");
-
-        let json = "\"all\"";
-        let consistency: ReadConsistency = serde_json::from_str(json).unwrap();
-        assert_eq!(consistency, ReadConsistency::Type(ReadConsistencyType::All));
-
-        let schema = schema_for!(ReadConsistency);
-        let schema_str = serde_json::to_string_pretty(&schema).unwrap();
-        println!("{schema_str}")
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/operations/conversions.rs b/crates/qdrant/lib/collection/src/operations/conversions.rs
deleted file mode 100644
index 78071d7..0000000
--- a/crates/qdrant/lib/collection/src/operations/conversions.rs
+++ /dev/null
@@ -1,1072 +0,0 @@
-use std::collections::{BTreeMap, HashMap};
-use std::num::{NonZeroU32, NonZeroU64};
-
-use api::grpc::conversions::{from_grpc_dist, payload_to_proto, proto_to_payloads};
-use api::grpc::qdrant::quantization_config_diff::Quantization;
-use api::grpc::qdrant::update_collection_cluster_setup_request::Operation as ClusterOperationsPb;
-use itertools::Itertools;
-use segment::data_types::vectors::{NamedVector, VectorStruct, DEFAULT_VECTOR_NAME};
-use segment::types::{Distance, QuantizationConfig};
-use tonic::Status;
-
-use super::types::{
-    BaseGroupRequest, GroupsResult, PointGroup, RecommendGroupsRequest, SearchGroupsRequest,
-    VectorParamsDiff, VectorsConfigDiff,
-};
-use crate::config::{
-    default_replication_factor, default_write_consistency_factor, CollectionConfig,
-    CollectionParams, WalConfig,
-};
-use crate::lookup::types::WithLookupInterface;
-use crate::lookup::WithLookup;
-use crate::operations::cluster_ops::{
-    AbortTransferOperation, ClusterOperations, DropReplicaOperation, MoveShard, MoveShardOperation,
-    Replica, ReplicateShardOperation,
-};
-use crate::operations::config_diff::{
-    CollectionParamsDiff, HnswConfigDiff, OptimizersConfigDiff, QuantizationConfigDiff,
-    WalConfigDiff,
-};
-use crate::operations::point_ops::PointsSelector::PointIdsSelector;
-use crate::operations::point_ops::{
-    Batch, FilterSelector, PointIdsList, PointStruct, PointsSelector, WriteOrdering,
-};
-use crate::operations::types::{
-    AliasDescription, CollectionClusterInfo, CollectionInfo, CollectionStatus, CountResult,
-    LocalShardInfo, LookupLocation, OptimizersStatus, RecommendRequest, Record, RemoteShardInfo,
-    SearchRequest, ShardTransferInfo, UpdateResult, UpdateStatus, VectorParams, VectorsConfig,
-};
-use crate::optimizers_builder::OptimizersConfig;
-use crate::shards::remote_shard::CollectionSearchRequest;
-
-pub fn write_ordering_to_proto(ordering: WriteOrdering) -> api::grpc::qdrant::WriteOrdering {
-    api::grpc::qdrant::WriteOrdering {
-        r#type: match ordering {
-            WriteOrdering::Weak => api::grpc::qdrant::WriteOrderingType::Weak as i32,
-            WriteOrdering::Medium => api::grpc::qdrant::WriteOrderingType::Medium as i32,
-            WriteOrdering::Strong => api::grpc::qdrant::WriteOrderingType::Strong as i32,
-        },
-    }
-}
-
-pub fn write_ordering_from_proto(
-    ordering: Option<api::grpc::qdrant::WriteOrdering>,
-) -> Result<WriteOrdering, Status> {
-    let ordering_parsed = match ordering {
-        None => api::grpc::qdrant::WriteOrderingType::Weak,
-        Some(write_ordering) => {
-            match api::grpc::qdrant::WriteOrderingType::from_i32(write_ordering.r#type) {
-                None => {
-                    return Err(Status::invalid_argument(format!(
-                        "cannot convert ordering: {}",
-                        write_ordering.r#type
-                    )))
-                }
-                Some(res) => res,
-            }
-        }
-    };
-
-    Ok(match ordering_parsed {
-        api::grpc::qdrant::WriteOrderingType::Weak => WriteOrdering::Weak,
-        api::grpc::qdrant::WriteOrderingType::Medium => WriteOrdering::Medium,
-        api::grpc::qdrant::WriteOrderingType::Strong => WriteOrdering::Strong,
-    })
-}
-
-pub fn try_record_from_grpc(
-    point: api::grpc::qdrant::RetrievedPoint,
-    with_payload: bool,
-) -> Result<Record, tonic::Status> {
-    let id = point
-        .id
-        .ok_or_else(|| tonic::Status::invalid_argument("retrieved point does not have an ID"))?
-        .try_into()?;
-
-    let payload = if with_payload {
-        Some(api::grpc::conversions::proto_to_payloads(point.payload)?)
-    } else {
-        debug_assert!(point.payload.is_empty());
-        None
-    };
-
-    let vector = point
-        .vectors
-        .map(|vectors| vectors.try_into())
-        .transpose()?;
-
-    Ok(Record {
-        id,
-        payload,
-        vector,
-    })
-}
-
-impl From<api::grpc::qdrant::HnswConfigDiff> for HnswConfigDiff {
-    fn from(value: api::grpc::qdrant::HnswConfigDiff) -> Self {
-        Self {
-            m: value.m.map(|v| v as usize),
-            ef_construct: value.ef_construct.map(|v| v as usize),
-            full_scan_threshold: value.full_scan_threshold.map(|v| v as usize),
-            max_indexing_threads: value.max_indexing_threads.map(|v| v as usize),
-            on_disk: value.on_disk,
-            payload_m: value.payload_m.map(|v| v as usize),
-        }
-    }
-}
-
-impl From<HnswConfigDiff> for api::grpc::qdrant::HnswConfigDiff {
-    fn from(value: HnswConfigDiff) -> Self {
-        Self {
-            m: value.m.map(|v| v as u64),
-            ef_construct: value.ef_construct.map(|v| v as u64),
-            full_scan_threshold: value.full_scan_threshold.map(|v| v as u64),
-            max_indexing_threads: value.max_indexing_threads.map(|v| v as u64),
-            on_disk: value.on_disk,
-            payload_m: value.payload_m.map(|v| v as u64),
-        }
-    }
-}
-
-impl From<api::grpc::qdrant::WalConfigDiff> for WalConfigDiff {
-    fn from(value: api::grpc::qdrant::WalConfigDiff) -> Self {
-        Self {
-            wal_capacity_mb: value.wal_capacity_mb.map(|v| v as usize),
-            wal_segments_ahead: value.wal_segments_ahead.map(|v| v as usize),
-        }
-    }
-}
-
-impl TryFrom<api::grpc::qdrant::CollectionParamsDiff> for CollectionParamsDiff {
-    type Error = Status;
-
-    fn try_from(value: api::grpc::qdrant::CollectionParamsDiff) -> Result<Self, Self::Error> {
-        Ok(Self {
-            replication_factor: value
-                .replication_factor
-                .map(|factor| {
-                    NonZeroU32::new(factor)
-                        .ok_or_else(|| Status::invalid_argument("`replication_factor` cannot be 0"))
-                })
-                .transpose()?,
-            write_consistency_factor: value
-                .write_consistency_factor
-                .map(|factor| {
-                    NonZeroU32::new(factor).ok_or_else(|| {
-                        Status::invalid_argument("`write_consistency_factor` cannot be 0")
-                    })
-                })
-                .transpose()?,
-            on_disk_payload: value.on_disk_payload,
-        })
-    }
-}
-
-impl From<api::grpc::qdrant::OptimizersConfigDiff> for OptimizersConfigDiff {
-    fn from(value: api::grpc::qdrant::OptimizersConfigDiff) -> Self {
-        Self {
-            deleted_threshold: value.deleted_threshold,
-            vacuum_min_vector_number: value.vacuum_min_vector_number.map(|v| v as usize),
-            default_segment_number: value.default_segment_number.map(|v| v as usize),
-            max_segment_size: value.max_segment_size.map(|v| v as usize),
-            memmap_threshold: value.memmap_threshold.map(|v| v as usize),
-            indexing_threshold: value.indexing_threshold.map(|v| v as usize),
-            flush_interval_sec: value.flush_interval_sec,
-            max_optimization_threads: value.max_optimization_threads.map(|v| v as usize),
-        }
-    }
-}
-
-impl TryFrom<api::grpc::qdrant::QuantizationConfigDiff> for QuantizationConfigDiff {
-    type Error = Status;
-
-    fn try_from(value: api::grpc::qdrant::QuantizationConfigDiff) -> Result<Self, Self::Error> {
-        match value.quantization {
-            None => Err(Status::invalid_argument(
-                "Quantization type is not specified",
-            )),
-            Some(quantization) => match quantization {
-                Quantization::Scalar(scalar) => Ok(Self::Scalar(scalar.try_into()?)),
-                Quantization::Product(product) => Ok(Self::Product(product.try_into()?)),
-                Quantization::Disabled(_) => Ok(Self::new_disabled()),
-            },
-        }
-    }
-}
-
-impl From<CollectionInfo> for api::grpc::qdrant::CollectionInfo {
-    fn from(value: CollectionInfo) -> Self {
-        let CollectionInfo {
-            status,
-            optimizer_status,
-            vectors_count,
-            indexed_vectors_count,
-            points_count,
-            segments_count,
-            config,
-            payload_schema,
-        } = value;
-
-        api::grpc::qdrant::CollectionInfo {
-            status: match status {
-                CollectionStatus::Green => api::grpc::qdrant::CollectionStatus::Green,
-                CollectionStatus::Yellow => api::grpc::qdrant::CollectionStatus::Yellow,
-                CollectionStatus::Red => api::grpc::qdrant::CollectionStatus::Red,
-            }
-            .into(),
-            optimizer_status: Some(match optimizer_status {
-                OptimizersStatus::Ok => api::grpc::qdrant::OptimizerStatus {
-                    ok: true,
-                    error: "".to_string(),
-                },
-                OptimizersStatus::Error(error) => {
-                    api::grpc::qdrant::OptimizerStatus { ok: false, error }
-                }
-            }),
-            vectors_count: vectors_count as u64,
-            indexed_vectors_count: Some(indexed_vectors_count as u64),
-            points_count: points_count as u64,
-            segments_count: segments_count as u64,
-            config: Some(api::grpc::qdrant::CollectionConfig {
-                params: Some(api::grpc::qdrant::CollectionParams {
-                    vectors_config: {
-                        let config = match config.params.vectors {
-                            VectorsConfig::Single(vector_params) => {
-                                Some(api::grpc::qdrant::vectors_config::Config::Params(
-                                    vector_params.into(),
-                                ))
-                            }
-                            VectorsConfig::Multi(vectors_params) => {
-                                Some(api::grpc::qdrant::vectors_config::Config::ParamsMap(
-                                    api::grpc::qdrant::VectorParamsMap {
-                                        map: vectors_params
-                                            .iter()
-                                            .map(|(vector_name, vector_param)| {
-                                                (vector_name.clone(), vector_param.clone().into())
-                                            })
-                                            .collect(),
-                                    },
-                                ))
-                            }
-                        };
-                        Some(api::grpc::qdrant::VectorsConfig { config })
-                    },
-                    shard_number: config.params.shard_number.get(),
-                    replication_factor: Some(config.params.replication_factor.get()),
-                    on_disk_payload: config.params.on_disk_payload,
-                    write_consistency_factor: Some(config.params.write_consistency_factor.get()),
-                }),
-                hnsw_config: Some(api::grpc::qdrant::HnswConfigDiff {
-                    m: Some(config.hnsw_config.m as u64),
-                    ef_construct: Some(config.hnsw_config.ef_construct as u64),
-                    full_scan_threshold: Some(config.hnsw_config.full_scan_threshold as u64),
-                    max_indexing_threads: Some(config.hnsw_config.max_indexing_threads as u64),
-                    on_disk: config.hnsw_config.on_disk,
-                    payload_m: config.hnsw_config.payload_m.map(|v| v as u64),
-                }),
-                optimizer_config: Some(api::grpc::qdrant::OptimizersConfigDiff {
-                    deleted_threshold: Some(config.optimizer_config.deleted_threshold),
-                    vacuum_min_vector_number: Some(
-                        config.optimizer_config.vacuum_min_vector_number as u64,
-                    ),
-                    default_segment_number: Some(
-                        config.optimizer_config.default_segment_number as u64,
-                    ),
-                    max_segment_size: config.optimizer_config.max_segment_size.map(|x| x as u64),
-                    memmap_threshold: config.optimizer_config.memmap_threshold.map(|x| x as u64),
-                    indexing_threshold: config
-                        .optimizer_config
-                        .indexing_threshold
-                        .map(|x| x as u64),
-                    flush_interval_sec: Some(config.optimizer_config.flush_interval_sec),
-                    max_optimization_threads: Some(
-                        config.optimizer_config.max_optimization_threads as u64,
-                    ),
-                }),
-                wal_config: Some(api::grpc::qdrant::WalConfigDiff {
-                    wal_capacity_mb: Some(config.wal_config.wal_capacity_mb as u64),
-                    wal_segments_ahead: Some(config.wal_config.wal_segments_ahead as u64),
-                }),
-                quantization_config: config.quantization_config.map(|x| x.into()),
-            }),
-            payload_schema: payload_schema
-                .into_iter()
-                .map(|(k, v)| (k, v.into()))
-                .collect(),
-        }
-    }
-}
-
-impl From<Record> for api::grpc::qdrant::RetrievedPoint {
-    fn from(record: Record) -> Self {
-        let vectors = record.vector.map(|vector_struct| vector_struct.into());
-
-        Self {
-            id: Some(record.id.into()),
-            payload: record.payload.map(payload_to_proto).unwrap_or_default(),
-            vectors,
-        }
-    }
-}
-
-impl TryFrom<i32> for CollectionStatus {
-    type Error = Status;
-
-    fn try_from(value: i32) -> Result<Self, Self::Error> {
-        match value {
-            1 => Ok(CollectionStatus::Green),
-            2 => Ok(CollectionStatus::Yellow),
-            3 => Ok(CollectionStatus::Red),
-            _ => Err(Status::invalid_argument("Malformed CollectionStatus type")),
-        }
-    }
-}
-
-impl From<api::grpc::qdrant::OptimizersConfigDiff> for OptimizersConfig {
-    fn from(optimizer_config: api::grpc::qdrant::OptimizersConfigDiff) -> Self {
-        Self {
-            deleted_threshold: optimizer_config.deleted_threshold.unwrap_or_default(),
-            vacuum_min_vector_number: optimizer_config
-                .vacuum_min_vector_number
-                .unwrap_or_default() as usize,
-            default_segment_number: optimizer_config.default_segment_number.unwrap_or_default()
-                as usize,
-            max_segment_size: optimizer_config.max_segment_size.map(|x| x as usize),
-            memmap_threshold: optimizer_config.memmap_threshold.map(|x| x as usize),
-            indexing_threshold: optimizer_config.indexing_threshold.map(|x| x as usize),
-            flush_interval_sec: optimizer_config.flush_interval_sec.unwrap_or_default(),
-            max_optimization_threads: optimizer_config
-                .max_optimization_threads
-                .unwrap_or_default() as usize,
-        }
-    }
-}
-
-impl From<api::grpc::qdrant::WalConfigDiff> for WalConfig {
-    fn from(wal_config: api::grpc::qdrant::WalConfigDiff) -> Self {
-        Self {
-            wal_capacity_mb: wal_config.wal_capacity_mb.unwrap_or_default() as usize,
-            wal_segments_ahead: wal_config.wal_segments_ahead.unwrap_or_default() as usize,
-        }
-    }
-}
-
-impl TryFrom<api::grpc::qdrant::vectors_config::Config> for VectorsConfig {
-    type Error = Status;
-
-    fn try_from(value: api::grpc::qdrant::vectors_config::Config) -> Result<Self, Self::Error> {
-        Ok(match value {
-            api::grpc::qdrant::vectors_config::Config::Params(vector_params) => {
-                VectorsConfig::Single(vector_params.try_into()?)
-            }
-            api::grpc::qdrant::vectors_config::Config::ParamsMap(vectors_params) => {
-                let mut params_map = BTreeMap::new();
-                for (name, params) in vectors_params.map {
-                    params_map.insert(name, params.try_into()?);
-                }
-                VectorsConfig::Multi(params_map)
-            }
-        })
-    }
-}
-
-impl TryFrom<api::grpc::qdrant::vectors_config_diff::Config> for VectorsConfigDiff {
-    type Error = Status;
-
-    fn try_from(
-        value: api::grpc::qdrant::vectors_config_diff::Config,
-    ) -> Result<Self, Self::Error> {
-        Ok(match value {
-            api::grpc::qdrant::vectors_config_diff::Config::Params(vector_params) => {
-                let diff: VectorParamsDiff = vector_params.try_into()?;
-                VectorsConfigDiff::from(diff)
-            }
-            api::grpc::qdrant::vectors_config_diff::Config::ParamsMap(vectors_params) => {
-                let mut params_map = BTreeMap::new();
-                for (name, params) in vectors_params.map {
-                    params_map.insert(name, params.try_into()?);
-                }
-                VectorsConfigDiff(params_map)
-            }
-        })
-    }
-}
-
-impl TryFrom<api::grpc::qdrant::VectorParams> for VectorParams {
-    type Error = Status;
-
-    fn try_from(vector_params: api::grpc::qdrant::VectorParams) -> Result<Self, Self::Error> {
-        Ok(Self {
-            size: NonZeroU64::new(vector_params.size).ok_or_else(|| {
-                Status::invalid_argument("VectorParams size must be greater than zero")
-            })?,
-            distance: from_grpc_dist(vector_params.distance)?,
-            hnsw_config: vector_params.hnsw_config.map(Into::into),
-            quantization_config: vector_params
-                .quantization_config
-                .map(grpc_to_segment_quantization_config)
-                .transpose()?,
-            on_disk: vector_params.on_disk,
-        })
-    }
-}
-
-impl TryFrom<api::grpc::qdrant::VectorParamsDiff> for VectorParamsDiff {
-    type Error = Status;
-
-    fn try_from(vector_params: api::grpc::qdrant::VectorParamsDiff) -> Result<Self, Self::Error> {
-        Ok(Self {
-            hnsw_config: vector_params.hnsw_config.map(Into::into),
-            quantization_config: vector_params
-                .quantization_config
-                .map(TryInto::try_into)
-                .transpose()?,
-            on_disk: vector_params.on_disk,
-        })
-    }
-}
-
-fn grpc_to_segment_quantization_config(
-    value: api::grpc::qdrant::QuantizationConfig,
-) -> Result<QuantizationConfig, Status> {
-    let quantization = value
-        .quantization
-        .ok_or_else(|| Status::invalid_argument("QuantizationConfig must contain quantization"))?;
-    match quantization {
-        api::grpc::qdrant::quantization_config::Quantization::Scalar(config) => {
-            Ok(QuantizationConfig::Scalar(config.try_into()?))
-        }
-        api::grpc::qdrant::quantization_config::Quantization::Product(config) => {
-            Ok(QuantizationConfig::Product(config.try_into()?))
-        }
-    }
-}
-
-impl TryFrom<api::grpc::qdrant::CollectionConfig> for CollectionConfig {
-    type Error = Status;
-
-    fn try_from(config: api::grpc::qdrant::CollectionConfig) -> Result<Self, Self::Error> {
-        Ok(Self {
-            params: match config.params {
-                None => return Err(Status::invalid_argument("Malformed CollectionParams type")),
-                Some(params) => CollectionParams {
-                    vectors: match params.vectors_config {
-                        None => {
-                            return Err(Status::invalid_argument(
-                                "Expected `vectors` - configuration for vector storage",
-                            ))
-                        }
-                        Some(vector_config) => match vector_config.config {
-                            None => {
-                                return Err(Status::invalid_argument(
-                                    "Expected `vectors` - configuration for vector storage",
-                                ))
-                            }
-                            Some(api::grpc::qdrant::vectors_config::Config::Params(params)) => {
-                                VectorsConfig::Single(params.try_into()?)
-                            }
-                            Some(api::grpc::qdrant::vectors_config::Config::ParamsMap(
-                                params_map,
-                            )) => VectorsConfig::Multi(
-                                params_map
-                                    .map
-                                    .into_iter()
-                                    .map(|(k, v)| Ok((k, v.try_into()?)))
-                                    .collect::<Result<BTreeMap<String, VectorParams>, Status>>()?,
-                            ),
-                        },
-                    },
-                    shard_number: NonZeroU32::new(params.shard_number)
-                        .ok_or_else(|| Status::invalid_argument("`shard_number` cannot be zero"))?,
-                    on_disk_payload: params.on_disk_payload,
-                    replication_factor: NonZeroU32::new(
-                        params
-                            .replication_factor
-                            .unwrap_or_else(|| default_replication_factor().get()),
-                    )
-                    .ok_or_else(|| {
-                        Status::invalid_argument("`replication_factor` cannot be zero")
-                    })?,
-                    write_consistency_factor: NonZeroU32::new(
-                        params
-                            .write_consistency_factor
-                            .unwrap_or_else(|| default_write_consistency_factor().get()),
-                    )
-                    .ok_or_else(|| {
-                        Status::invalid_argument("`write_consistency_factor` cannot be zero")
-                    })?,
-                },
-            },
-            hnsw_config: match config.hnsw_config {
-                None => return Err(Status::invalid_argument("Malformed HnswConfig type")),
-                Some(hnsw_config) => hnsw_config.into(),
-            },
-            optimizer_config: match config.optimizer_config {
-                None => return Err(Status::invalid_argument("Malformed OptimizerConfig type")),
-                Some(optimizer_config) => optimizer_config.into(),
-            },
-            wal_config: match config.wal_config {
-                None => return Err(Status::invalid_argument("Malformed WalConfig type")),
-                Some(wal_config) => wal_config.into(),
-            },
-            quantization_config: {
-                if let Some(config) = config.quantization_config {
-                    Some(config.try_into()?)
-                } else {
-                    None
-                }
-            },
-        })
-    }
-}
-
-impl TryFrom<api::grpc::qdrant::GetCollectionInfoResponse> for CollectionInfo {
-    type Error = Status;
-
-    fn try_from(
-        collection_info_response: api::grpc::qdrant::GetCollectionInfoResponse,
-    ) -> Result<Self, Self::Error> {
-        match collection_info_response.result {
-            None => Err(Status::invalid_argument("Malformed CollectionInfo type")),
-            Some(collection_info_response) => Ok(Self {
-                status: collection_info_response.status.try_into()?,
-                optimizer_status: match collection_info_response.optimizer_status {
-                    None => return Err(Status::invalid_argument("Malformed OptimizerStatus type")),
-                    Some(api::grpc::qdrant::OptimizerStatus { ok, error }) => {
-                        if ok {
-                            OptimizersStatus::Ok
-                        } else {
-                            OptimizersStatus::Error(error)
-                        }
-                    }
-                },
-                vectors_count: collection_info_response.vectors_count as usize,
-                indexed_vectors_count: collection_info_response
-                    .indexed_vectors_count
-                    .unwrap_or_default() as usize,
-                points_count: collection_info_response.points_count as usize,
-                segments_count: collection_info_response.segments_count as usize,
-                config: match collection_info_response.config {
-                    None => {
-                        return Err(Status::invalid_argument("Malformed CollectionConfig type"))
-                    }
-                    Some(config) => config.try_into()?,
-                },
-                payload_schema: collection_info_response
-                    .payload_schema
-                    .into_iter()
-                    .map(|(k, v)| v.try_into().map(|v| (k, v)))
-                    .try_collect()?,
-            }),
-        }
-    }
-}
-
-impl TryFrom<api::grpc::qdrant::PointStruct> for PointStruct {
-    type Error = Status;
-
-    fn try_from(value: api::grpc::qdrant::PointStruct) -> Result<Self, Self::Error> {
-        let api::grpc::qdrant::PointStruct {
-            id,
-            vectors,
-            payload,
-        } = value;
-
-        let converted_payload = proto_to_payloads(payload)?;
-
-        let vector_struct: VectorStruct = match vectors {
-            None => return Err(Status::invalid_argument("Expected some vectors")),
-            Some(vectors) => vectors.try_into()?,
-        };
-
-        Ok(Self {
-            id: id
-                .ok_or_else(|| Status::invalid_argument("Empty ID is not allowed"))?
-                .try_into()?,
-            vector: vector_struct,
-            payload: Some(converted_payload),
-        })
-    }
-}
-
-impl TryFrom<PointStruct> for api::grpc::qdrant::PointStruct {
-    type Error = Status;
-
-    fn try_from(value: PointStruct) -> Result<Self, Self::Error> {
-        let vectors: api::grpc::qdrant::Vectors = value.vector.into();
-
-        let id = value.id;
-        let payload = value.payload;
-
-        let converted_payload = match payload {
-            None => HashMap::new(),
-            Some(payload) => payload_to_proto(payload),
-        };
-
-        Ok(Self {
-            id: Some(id.into()),
-            vectors: Some(vectors),
-            payload: converted_payload,
-        })
-    }
-}
-
-impl TryFrom<Batch> for Vec<api::grpc::qdrant::PointStruct> {
-    type Error = Status;
-
-    fn try_from(batch: Batch) -> Result<Self, Self::Error> {
-        let mut points = Vec::new();
-        let all_vectors = batch.vectors.into_all_vectors(batch.ids.len());
-        for (i, p_id) in batch.ids.into_iter().enumerate() {
-            let id = Some(p_id.into());
-            let vector = all_vectors.get(i).cloned();
-            let payload = batch.payloads.as_ref().and_then(|payloads| {
-                payloads.get(i).map(|payload| match payload {
-                    None => HashMap::new(),
-                    Some(payload) => payload_to_proto(payload.clone()),
-                })
-            });
-            let vectors: Option<VectorStruct> = vector.map(|v| v.into());
-
-            let point = api::grpc::qdrant::PointStruct {
-                id,
-                vectors: vectors.map(|v| v.into()),
-                payload: payload.unwrap_or_default(),
-            };
-            points.push(point);
-        }
-
-        Ok(points)
-    }
-}
-
-impl TryFrom<api::grpc::qdrant::PointsSelector> for PointsSelector {
-    type Error = Status;
-
-    fn try_from(value: api::grpc::qdrant::PointsSelector) -> Result<Self, Self::Error> {
-        match value.points_selector_one_of {
-            Some(api::grpc::qdrant::points_selector::PointsSelectorOneOf::Points(points)) => {
-                Ok(PointIdsSelector(PointIdsList {
-                    points: points
-                        .ids
-                        .into_iter()
-                        .map(|p| p.try_into())
-                        .collect::<Result<Vec<_>, _>>()?,
-                }))
-            }
-            Some(api::grpc::qdrant::points_selector::PointsSelectorOneOf::Filter(f)) => {
-                Ok(PointsSelector::FilterSelector(FilterSelector {
-                    filter: f.try_into()?,
-                }))
-            }
-            _ => Err(Status::invalid_argument("Malformed PointsSelector type")),
-        }
-    }
-}
-
-impl From<UpdateResult> for api::grpc::qdrant::UpdateResult {
-    fn from(value: UpdateResult) -> Self {
-        Self {
-            operation_id: value.operation_id,
-            status: match value.status {
-                UpdateStatus::Acknowledged => api::grpc::qdrant::UpdateStatus::Acknowledged as i32,
-                UpdateStatus::Completed => api::grpc::qdrant::UpdateStatus::Completed as i32,
-            },
-        }
-    }
-}
-
-impl TryFrom<api::grpc::qdrant::UpdateResult> for UpdateResult {
-    type Error = Status;
-
-    fn try_from(value: api::grpc::qdrant::UpdateResult) -> Result<Self, Self::Error> {
-        Ok(Self {
-            operation_id: value.operation_id,
-            status: match value.status {
-                status if status == api::grpc::qdrant::UpdateStatus::Acknowledged as i32 => {
-                    UpdateStatus::Acknowledged
-                }
-                status if status == api::grpc::qdrant::UpdateStatus::Completed as i32 => {
-                    UpdateStatus::Completed
-                }
-                _ => return Err(Status::invalid_argument("Malformed UpdateStatus type")),
-            },
-        })
-    }
-}
-
-impl From<api::grpc::qdrant::CountResult> for CountResult {
-    fn from(value: api::grpc::qdrant::CountResult) -> Self {
-        Self {
-            count: value.count as usize,
-        }
-    }
-}
-
-impl From<CountResult> for api::grpc::qdrant::CountResult {
-    fn from(value: CountResult) -> Self {
-        Self {
-            count: value.count as u64,
-        }
-    }
-}
-
-// Use wrapper type to bundle CollectionId & SearchRequest
-impl<'a> From<CollectionSearchRequest<'a>> for api::grpc::qdrant::SearchPoints {
-    fn from(value: CollectionSearchRequest<'a>) -> Self {
-        let (collection_id, request) = value.0;
-
-        api::grpc::qdrant::SearchPoints {
-            collection_name: collection_id,
-            vector: request.vector.get_vector().clone(),
-            filter: request.filter.clone().map(|f| f.into()),
-            limit: request.limit as u64,
-            with_vectors: request.with_vector.clone().map(|wv| wv.into()),
-            with_payload: request.with_payload.clone().map(|wp| wp.into()),
-            params: request.params.map(|sp| sp.into()),
-            score_threshold: request.score_threshold,
-            offset: Some(request.offset as u64),
-            vector_name: match request.vector.get_name() {
-                DEFAULT_VECTOR_NAME => None,
-                vector_name => Some(vector_name.to_string()),
-            },
-            read_consistency: None,
-        }
-    }
-}
-
-impl TryFrom<api::grpc::qdrant::WithLookup> for WithLookup {
-    type Error = Status;
-
-    fn try_from(value: api::grpc::qdrant::WithLookup) -> Result<Self, Self::Error> {
-        let with_default_payload = || Some(segment::types::WithPayloadInterface::Bool(true));
-
-        Ok(Self {
-            collection_name: value.collection,
-            with_payload: value
-                .with_payload
-                .map(|wp| wp.try_into())
-                .transpose()?
-                .or_else(with_default_payload),
-            with_vectors: value.with_vectors.map(|wv| wv.into()),
-        })
-    }
-}
-
-impl TryFrom<api::grpc::qdrant::WithLookup> for WithLookupInterface {
-    type Error = Status;
-
-    fn try_from(value: api::grpc::qdrant::WithLookup) -> Result<Self, Self::Error> {
-        Ok(Self::WithLookup(value.try_into()?))
-    }
-}
-
-impl TryFrom<api::grpc::qdrant::SearchPoints> for SearchRequest {
-    type Error = Status;
-
-    fn try_from(value: api::grpc::qdrant::SearchPoints) -> Result<Self, Self::Error> {
-        Ok(SearchRequest {
-            vector: match value.vector_name {
-                Some(vector_name) => NamedVector {
-                    name: vector_name,
-                    vector: value.vector,
-                }
-                .into(),
-                None => value.vector.into(),
-            },
-            filter: value.filter.map(|f| f.try_into()).transpose()?,
-            params: value.params.map(|p| p.into()),
-            limit: value.limit as usize,
-            offset: value.offset.unwrap_or_default() as usize,
-            with_payload: value.with_payload.map(|wp| wp.try_into()).transpose()?,
-            with_vector: Some(
-                value
-                    .with_vectors
-                    .map(|with_vectors| with_vectors.into())
-                    .unwrap_or_default(),
-            ),
-            score_threshold: value.score_threshold,
-        })
-    }
-}
-
-impl TryFrom<api::grpc::qdrant::SearchPointGroups> for SearchGroupsRequest {
-    type Error = Status;
-
-    fn try_from(value: api::grpc::qdrant::SearchPointGroups) -> Result<Self, Self::Error> {
-        let search_points = api::grpc::qdrant::SearchPoints {
-            vector: value.vector,
-            filter: value.filter,
-            params: value.params,
-            with_payload: value.with_payload,
-            with_vectors: value.with_vectors,
-            score_threshold: value.score_threshold,
-            vector_name: value.vector_name,
-            limit: 0,
-            offset: None,
-            collection_name: String::new(),
-            read_consistency: None,
-        };
-
-        let SearchRequest {
-            vector,
-            filter,
-            params,
-            limit: _,
-            offset: _,
-            with_payload,
-            with_vector,
-            score_threshold,
-        } = search_points.try_into()?;
-
-        Ok(SearchGroupsRequest {
-            vector,
-            filter,
-            params,
-            with_payload,
-            with_vector,
-            score_threshold,
-            group_request: BaseGroupRequest {
-                group_by: value.group_by,
-                limit: value.limit,
-                group_size: value.group_size,
-                with_lookup: value.with_lookup.map(|l| l.try_into()).transpose()?,
-            },
-        })
-    }
-}
-
-impl From<PointGroup> for api::grpc::qdrant::PointGroup {
-    fn from(group: PointGroup) -> Self {
-        Self {
-            hits: group.hits.into_iter().map_into().collect(),
-            id: Some(group.id.into()),
-            lookup: group.lookup.map(|record| record.into()),
-        }
-    }
-}
-
-impl From<api::grpc::qdrant::LookupLocation> for LookupLocation {
-    fn from(value: api::grpc::qdrant::LookupLocation) -> Self {
-        Self {
-            collection: value.collection_name,
-            vector: value.vector_name,
-        }
-    }
-}
-
-impl TryFrom<api::grpc::qdrant::RecommendPoints> for RecommendRequest {
-    type Error = Status;
-
-    fn try_from(value: api::grpc::qdrant::RecommendPoints) -> Result<Self, Self::Error> {
-        Ok(RecommendRequest {
-            positive: value
-                .positive
-                .into_iter()
-                .map(|p| p.try_into())
-                .collect::<Result<_, _>>()?,
-            negative: value
-                .negative
-                .into_iter()
-                .map(|p| p.try_into())
-                .collect::<Result<_, _>>()?,
-            filter: value.filter.map(|f| f.try_into()).transpose()?,
-            params: value.params.map(|p| p.into()),
-            limit: value.limit as usize,
-            offset: value.offset.unwrap_or_default() as usize,
-            with_payload: value.with_payload.map(|wp| wp.try_into()).transpose()?,
-            with_vector: Some(
-                value
-                    .with_vectors
-                    .map(|with_vectors| with_vectors.into())
-                    .unwrap_or_default(),
-            ),
-            score_threshold: value.score_threshold,
-            using: value.using.map(|name| name.into()),
-            lookup_from: value.lookup_from.map(|x| x.into()),
-        })
-    }
-}
-
-impl TryFrom<api::grpc::qdrant::RecommendPointGroups> for RecommendGroupsRequest {
-    type Error = Status;
-
-    fn try_from(value: api::grpc::qdrant::RecommendPointGroups) -> Result<Self, Self::Error> {
-        let recommend_points = api::grpc::qdrant::RecommendPoints {
-            positive: value.positive,
-            negative: value.negative,
-            using: value.using,
-            lookup_from: value.lookup_from,
-            filter: value.filter,
-            params: value.params,
-            with_payload: value.with_payload,
-            with_vectors: value.with_vectors,
-            score_threshold: value.score_threshold,
-            read_consistency: None,
-            limit: 0,
-            offset: None,
-            collection_name: String::new(),
-        };
-
-        let RecommendRequest {
-            positive,
-            negative,
-            using,
-            lookup_from,
-            filter,
-            params,
-            with_payload,
-            with_vector,
-            score_threshold,
-            limit: _,
-            offset: _,
-        } = recommend_points.try_into()?;
-
-        Ok(RecommendGroupsRequest {
-            positive,
-            negative,
-            using,
-            lookup_from,
-            filter,
-            params,
-            with_payload,
-            with_vector,
-            score_threshold,
-            group_request: BaseGroupRequest {
-                group_by: value.group_by,
-                limit: value.limit,
-                group_size: value.group_size,
-                with_lookup: value.with_lookup.map(|l| l.try_into()).transpose()?,
-            },
-        })
-    }
-}
-
-impl From<GroupsResult> for api::grpc::qdrant::GroupsResult {
-    fn from(value: GroupsResult) -> Self {
-        Self {
-            groups: value.groups.into_iter().map(Into::into).collect(),
-        }
-    }
-}
-
-impl From<VectorParams> for api::grpc::qdrant::VectorParams {
-    fn from(value: VectorParams) -> Self {
-        api::grpc::qdrant::VectorParams {
-            size: value.size.get(),
-            distance: match value.distance {
-                Distance::Cosine => api::grpc::qdrant::Distance::Cosine,
-                Distance::Euclid => api::grpc::qdrant::Distance::Euclid,
-                Distance::Dot => api::grpc::qdrant::Distance::Dot,
-            }
-            .into(),
-            hnsw_config: value.hnsw_config.map(Into::into),
-            quantization_config: value.quantization_config.map(Into::into),
-            on_disk: value.on_disk,
-        }
-    }
-}
-
-impl From<AliasDescription> for api::grpc::qdrant::AliasDescription {
-    fn from(value: AliasDescription) -> Self {
-        api::grpc::qdrant::AliasDescription {
-            alias_name: value.alias_name,
-            collection_name: value.collection_name,
-        }
-    }
-}
-
-impl From<LocalShardInfo> for api::grpc::qdrant::LocalShardInfo {
-    fn from(value: LocalShardInfo) -> Self {
-        Self {
-            shard_id: value.shard_id,
-            points_count: value.points_count as u64,
-            state: value.state as i32,
-        }
-    }
-}
-
-impl From<RemoteShardInfo> for api::grpc::qdrant::RemoteShardInfo {
-    fn from(value: RemoteShardInfo) -> Self {
-        Self {
-            shard_id: value.shard_id,
-            peer_id: value.peer_id,
-            state: value.state as i32,
-        }
-    }
-}
-
-impl From<ShardTransferInfo> for api::grpc::qdrant::ShardTransferInfo {
-    fn from(value: ShardTransferInfo) -> Self {
-        Self {
-            shard_id: value.shard_id,
-            from: value.from,
-            to: value.to,
-            sync: value.sync,
-        }
-    }
-}
-
-impl From<CollectionClusterInfo> for api::grpc::qdrant::CollectionClusterInfoResponse {
-    fn from(value: CollectionClusterInfo) -> Self {
-        Self {
-            peer_id: value.peer_id,
-            shard_count: value.shard_count as u64,
-            local_shards: value
-                .local_shards
-                .into_iter()
-                .map(|shard| shard.into())
-                .collect(),
-            remote_shards: value
-                .remote_shards
-                .into_iter()
-                .map(|shard| shard.into())
-                .collect(),
-            shard_transfers: value
-                .shard_transfers
-                .into_iter()
-                .map(|shard| shard.into())
-                .collect(),
-        }
-    }
-}
-
-impl From<api::grpc::qdrant::MoveShard> for MoveShard {
-    fn from(value: api::grpc::qdrant::MoveShard) -> Self {
-        Self {
-            shard_id: value.shard_id,
-            from_peer_id: value.from_peer_id,
-            to_peer_id: value.to_peer_id,
-        }
-    }
-}
-
-impl From<ClusterOperationsPb> for ClusterOperations {
-    fn from(value: ClusterOperationsPb) -> Self {
-        match value {
-            ClusterOperationsPb::MoveShard(op) => {
-                ClusterOperations::MoveShard(MoveShardOperation {
-                    move_shard: op.into(),
-                })
-            }
-            ClusterOperationsPb::ReplicateShard(op) => {
-                ClusterOperations::ReplicateShard(ReplicateShardOperation {
-                    replicate_shard: op.into(),
-                })
-            }
-            ClusterOperationsPb::AbortTransfer(op) => {
-                ClusterOperations::AbortTransfer(AbortTransferOperation {
-                    abort_transfer: op.into(),
-                })
-            }
-            ClusterOperationsPb::DropReplica(op) => {
-                ClusterOperations::DropReplica(DropReplicaOperation {
-                    drop_replica: Replica {
-                        shard_id: op.shard_id,
-                        peer_id: op.peer_id,
-                    },
-                })
-            }
-        }
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/operations/mod.rs b/crates/qdrant/lib/collection/src/operations/mod.rs
deleted file mode 100644
index 4dc9d88..0000000
--- a/crates/qdrant/lib/collection/src/operations/mod.rs
+++ /dev/null
@@ -1,197 +0,0 @@
-pub mod cluster_ops;
-pub mod config_diff;
-pub mod consistency_params;
-pub mod conversions;
-pub mod operation_effect;
-pub mod payload_ops;
-pub mod point_ops;
-pub mod shared_storage_config;
-pub mod snapshot_ops;
-pub mod types;
-pub mod validation;
-pub mod vector_ops;
-
-use std::collections::HashMap;
-
-use segment::types::{ExtendedPointId, PayloadFieldSchema};
-use serde::{Deserialize, Serialize};
-use validator::Validate;
-
-use crate::hash_ring::HashRing;
-use crate::shards::shard::ShardId;
-
-#[derive(Debug, Deserialize, Serialize, Validate, Default, Clone)]
-#[serde(rename_all = "snake_case")]
-pub struct CreateIndex {
-    pub field_name: String,
-    pub field_schema: Option<PayloadFieldSchema>,
-}
-
-#[derive(Debug, Deserialize, Serialize, Clone)]
-#[serde(rename_all = "snake_case")]
-pub enum FieldIndexOperations {
-    /// Create index for payload field
-    CreateIndex(CreateIndex),
-    /// Delete index for the field
-    DeleteIndex(String),
-}
-
-#[derive(Debug, Deserialize, Serialize, Clone)]
-#[serde(rename_all = "snake_case")]
-#[serde(untagged)]
-pub enum CollectionUpdateOperations {
-    PointOperation(point_ops::PointOperations),
-    VectorOperation(vector_ops::VectorOperations),
-    PayloadOperation(payload_ops::PayloadOps),
-    FieldIndexOperation(FieldIndexOperations),
-}
-
-/// A mapping of operation to shard.
-/// Is a result of splitting one operation into several shards by corresponding PointIds
-pub enum OperationToShard<O> {
-    ByShard(Vec<(ShardId, O)>),
-    ToAll(O),
-}
-
-impl<O> OperationToShard<O> {
-    pub fn by_shard(operations: impl IntoIterator<Item = (ShardId, O)>) -> Self {
-        Self::ByShard(operations.into_iter().collect())
-    }
-
-    pub fn to_none() -> Self {
-        Self::ByShard(Vec::new())
-    }
-
-    pub fn to_all(operation: O) -> Self {
-        Self::ToAll(operation)
-    }
-
-    pub fn map<O2>(self, f: impl Fn(O) -> O2) -> OperationToShard<O2> {
-        match self {
-            OperationToShard::ByShard(operation_to_shard) => OperationToShard::ByShard(
-                operation_to_shard
-                    .into_iter()
-                    .map(|(id, operation)| (id, f(operation)))
-                    .collect(),
-            ),
-            OperationToShard::ToAll(to_all) => OperationToShard::ToAll(f(to_all)),
-        }
-    }
-}
-
-impl FieldIndexOperations {
-    pub fn is_write_operation(&self) -> bool {
-        match self {
-            FieldIndexOperations::CreateIndex(_) => true,
-            FieldIndexOperations::DeleteIndex(_) => false,
-        }
-    }
-}
-
-impl Validate for FieldIndexOperations {
-    fn validate(&self) -> Result<(), validator::ValidationErrors> {
-        match self {
-            FieldIndexOperations::CreateIndex(create_index) => create_index.validate(),
-            FieldIndexOperations::DeleteIndex(_) => Ok(()),
-        }
-    }
-}
-
-impl Validate for CollectionUpdateOperations {
-    fn validate(&self) -> Result<(), validator::ValidationErrors> {
-        match self {
-            CollectionUpdateOperations::PointOperation(operation) => operation.validate(),
-            CollectionUpdateOperations::VectorOperation(operation) => operation.validate(),
-            CollectionUpdateOperations::PayloadOperation(operation) => operation.validate(),
-            CollectionUpdateOperations::FieldIndexOperation(operation) => operation.validate(),
-        }
-    }
-}
-
-fn point_to_shard(point_id: ExtendedPointId, ring: &HashRing<ShardId>) -> ShardId {
-    *ring
-        .get(&point_id)
-        .expect("Hash ring is guaranteed to be non-empty")
-}
-
-/// Split iterator of items that have point ids by shard
-fn split_iter_by_shard<I, F, O>(
-    iter: I,
-    id_extractor: F,
-    ring: &HashRing<ShardId>,
-) -> OperationToShard<Vec<O>>
-where
-    I: IntoIterator<Item = O>,
-    F: Fn(&O) -> ExtendedPointId,
-{
-    let mut op_vec_by_shard: HashMap<ShardId, Vec<O>> = HashMap::new();
-    for operation in iter {
-        let shard_id = point_to_shard(id_extractor(&operation), ring);
-        op_vec_by_shard
-            .entry(shard_id)
-            .or_insert_with(Vec::new)
-            .push(operation);
-    }
-    OperationToShard::by_shard(op_vec_by_shard)
-}
-
-/// Trait for Operation enums to split them by shard.
-pub trait SplitByShard {
-    fn split_by_shard(self, ring: &HashRing<ShardId>) -> OperationToShard<Self>
-    where
-        Self: Sized;
-}
-
-impl SplitByShard for CollectionUpdateOperations {
-    fn split_by_shard(self, ring: &HashRing<ShardId>) -> OperationToShard<Self> {
-        match self {
-            CollectionUpdateOperations::PointOperation(operation) => operation
-                .split_by_shard(ring)
-                .map(CollectionUpdateOperations::PointOperation),
-            CollectionUpdateOperations::VectorOperation(operation) => operation
-                .split_by_shard(ring)
-                .map(CollectionUpdateOperations::VectorOperation),
-            CollectionUpdateOperations::PayloadOperation(operation) => operation
-                .split_by_shard(ring)
-                .map(CollectionUpdateOperations::PayloadOperation),
-            operation @ CollectionUpdateOperations::FieldIndexOperation(_) => {
-                OperationToShard::to_all(operation)
-            }
-        }
-    }
-}
-
-impl CollectionUpdateOperations {
-    pub fn is_write_operation(&self) -> bool {
-        match self {
-            CollectionUpdateOperations::PointOperation(operation) => operation.is_write_operation(),
-            CollectionUpdateOperations::VectorOperation(operation) => {
-                operation.is_write_operation()
-            }
-            CollectionUpdateOperations::PayloadOperation(operation) => {
-                operation.is_write_operation()
-            }
-            CollectionUpdateOperations::FieldIndexOperation(operation) => {
-                operation.is_write_operation()
-            }
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use serde_json;
-
-    use super::*;
-
-    #[test]
-    fn test_deserialize() {
-        let op =
-            CollectionUpdateOperations::PayloadOperation(payload_ops::PayloadOps::ClearPayload {
-                points: vec![1.into(), 2.into(), 3.into()],
-            });
-
-        let json = serde_json::to_string_pretty(&op).unwrap();
-        println!("{json}")
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/operations/operation_effect.rs b/crates/qdrant/lib/collection/src/operations/operation_effect.rs
deleted file mode 100644
index da77ef3..0000000
--- a/crates/qdrant/lib/collection/src/operations/operation_effect.rs
+++ /dev/null
@@ -1,132 +0,0 @@
-use segment::types::{Filter, PointIdType};
-
-use super::vector_ops;
-use crate::operations::payload_ops::PayloadOps;
-use crate::operations::{point_ops, CollectionUpdateOperations};
-
-/// Structure to define what part of the shard are affected by the operation
-pub enum OperationEffectArea {
-    Empty,
-    Points(Vec<PointIdType>),
-    Filter(Filter),
-}
-
-/// Estimate how many points will be affected by the operation
-pub enum PointsOperationEffect {
-    /// No points affected
-    Empty,
-    /// Some points are affected
-    Some(Vec<PointIdType>),
-    /// Too many to enumerate, so we just say that it is a lot
-    Many,
-}
-
-pub trait EstimateOperationEffectArea {
-    fn estimate_effect_area(&self) -> OperationEffectArea;
-}
-
-impl EstimateOperationEffectArea for CollectionUpdateOperations {
-    fn estimate_effect_area(&self) -> OperationEffectArea {
-        match self {
-            CollectionUpdateOperations::PointOperation(point_operation) => {
-                point_operation.estimate_effect_area()
-            }
-            CollectionUpdateOperations::VectorOperation(vector_operation) => {
-                vector_operation.estimate_effect_area()
-            }
-            CollectionUpdateOperations::PayloadOperation(payload_operation) => {
-                payload_operation.estimate_effect_area()
-            }
-            CollectionUpdateOperations::FieldIndexOperation(_) => OperationEffectArea::Empty,
-        }
-    }
-}
-
-impl EstimateOperationEffectArea for point_ops::PointOperations {
-    fn estimate_effect_area(&self) -> OperationEffectArea {
-        match self {
-            point_ops::PointOperations::UpsertPoints(insert_operations) => {
-                insert_operations.estimate_effect_area()
-            }
-            point_ops::PointOperations::DeletePoints { ids } => {
-                OperationEffectArea::Points(ids.clone())
-            }
-            point_ops::PointOperations::DeletePointsByFilter(filter) => {
-                OperationEffectArea::Filter(filter.clone())
-            }
-            point_ops::PointOperations::SyncPoints(sync_op) => {
-                debug_assert!(
-                    false,
-                    "SyncPoints operation should not be used during transfer"
-                );
-                OperationEffectArea::Points(sync_op.points.iter().map(|x| x.id).collect())
-            }
-        }
-    }
-}
-
-impl EstimateOperationEffectArea for vector_ops::VectorOperations {
-    fn estimate_effect_area(&self) -> OperationEffectArea {
-        match self {
-            vector_ops::VectorOperations::UpdateVectors(update_operation) => {
-                let ids = update_operation.points.iter().map(|p| p.id).collect();
-                OperationEffectArea::Points(ids)
-            }
-            vector_ops::VectorOperations::DeleteVectors(ids, _) => {
-                OperationEffectArea::Points(ids.points.clone())
-            }
-            vector_ops::VectorOperations::DeleteVectorsByFilter(filter, _) => {
-                OperationEffectArea::Filter(filter.clone())
-            }
-        }
-    }
-}
-
-impl EstimateOperationEffectArea for point_ops::PointInsertOperations {
-    fn estimate_effect_area(&self) -> OperationEffectArea {
-        match self {
-            point_ops::PointInsertOperations::PointsBatch(batch) => {
-                OperationEffectArea::Points(batch.ids.clone())
-            }
-            point_ops::PointInsertOperations::PointsList(list) => {
-                OperationEffectArea::Points(list.iter().map(|x| x.id).collect())
-            }
-        }
-    }
-}
-
-impl EstimateOperationEffectArea for PayloadOps {
-    fn estimate_effect_area(&self) -> OperationEffectArea {
-        match self {
-            PayloadOps::SetPayload(set_payload) => {
-                if let Some(points) = &set_payload.points {
-                    OperationEffectArea::Points(points.clone())
-                } else if let Some(filter) = &set_payload.filter {
-                    OperationEffectArea::Filter(filter.clone())
-                } else {
-                    OperationEffectArea::Empty
-                }
-            }
-            PayloadOps::DeletePayload(delete_payload) => {
-                if let Some(points) = &delete_payload.points {
-                    OperationEffectArea::Points(points.clone())
-                } else if let Some(filter) = &delete_payload.filter {
-                    OperationEffectArea::Filter(filter.clone())
-                } else {
-                    OperationEffectArea::Empty
-                }
-            }
-            PayloadOps::ClearPayload { points } => OperationEffectArea::Points(points.clone()),
-            PayloadOps::ClearPayloadByFilter(filter) => OperationEffectArea::Filter(filter.clone()),
-            PayloadOps::OverwritePayload(set_payload) => {
-                if let Some(points) = &set_payload.points {
-                    OperationEffectArea::Points(points.clone())
-                } else if let Some(filter) = &set_payload.filter {
-                    OperationEffectArea::Filter(filter.clone())
-                } else {
-                    OperationEffectArea::Empty
-                }
-            }
-        }
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/operations/payload_ops.rs b/crates/qdrant/lib/collection/src/operations/payload_ops.rs
deleted file mode 100644
index 7164b27..0000000
--- a/crates/qdrant/lib/collection/src/operations/payload_ops.rs
+++ /dev/null
@@ -1,254 +0,0 @@
-use schemars::JsonSchema;
-use segment::types::{Filter, Payload, PayloadKeyType, PointIdType};
-use serde;
-use serde::{Deserialize, Serialize};
-use validator::Validate;
-
-use super::{split_iter_by_shard, OperationToShard, SplitByShard};
-use crate::hash_ring::HashRing;
-use crate::shards::shard::ShardId;
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Validate, Clone)]
-#[serde(try_from = "SetPayloadShadow")]
-pub struct SetPayload {
-    pub payload: Payload,
-    /// Assigns payload to each point in this list
-    pub points: Option<Vec<PointIdType>>,
-    /// Assigns payload to each point that satisfy this filter condition
-    pub filter: Option<Filter>,
-}
-
-#[derive(Deserialize)]
-struct SetPayloadShadow {
-    pub payload: Payload,
-    pub points: Option<Vec<PointIdType>>,
-    pub filter: Option<Filter>,
-}
-
-pub struct PointsSelectorValidationError;
-
-impl std::fmt::Display for PointsSelectorValidationError {
-    fn fmt(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(
-            formatter,
-            "Either list of point ids or filter must be provided"
-        )
-    }
-}
-
-impl TryFrom<SetPayloadShadow> for SetPayload {
-    type Error = PointsSelectorValidationError;
-
-    fn try_from(value: SetPayloadShadow) -> Result<Self, Self::Error> {
-        if value.points.is_some() || value.filter.is_some() {
-            Ok(SetPayload {
-                payload: value.payload,
-                points: value.points,
-                filter: value.filter,
-            })
-        } else {
-            Err(PointsSelectorValidationError)
-        }
-    }
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Validate, Clone)]
-#[serde(try_from = "DeletePayloadShadow")]
-pub struct DeletePayload {
-    /// List of payload keys to remove from payload
-    pub keys: Vec<PayloadKeyType>,
-    /// Deletes values from each point in this list
-    pub points: Option<Vec<PointIdType>>,
-    /// Deletes values from points that satisfy this filter condition
-    pub filter: Option<Filter>,
-}
-
-#[derive(Deserialize)]
-struct DeletePayloadShadow {
-    pub keys: Vec<PayloadKeyType>,
-    pub points: Option<Vec<PointIdType>>,
-    pub filter: Option<Filter>,
-}
-
-impl TryFrom<DeletePayloadShadow> for DeletePayload {
-    type Error = PointsSelectorValidationError;
-
-    fn try_from(value: DeletePayloadShadow) -> Result<Self, Self::Error> {
-        if value.points.is_some() || value.filter.is_some() {
-            Ok(DeletePayload {
-                keys: value.keys,
-                points: value.points,
-                filter: value.filter,
-            })
-        } else {
-            Err(PointsSelectorValidationError)
-        }
-    }
-}
-
-/// Define operations description for point payloads manipulation
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone)]
-#[serde(rename_all = "snake_case")]
-pub enum PayloadOps {
-    /// Set payload value, overrides if it is already exists
-    SetPayload(SetPayload),
-    /// Deletes specified payload values if they are assigned
-    DeletePayload(DeletePayload),
-    /// Drops all Payload values associated with given points.
-    ClearPayload { points: Vec<PointIdType> },
-    /// Clear all Payload values by given filter criteria.
-    ClearPayloadByFilter(Filter),
-    /// Overwrite full payload with given keys
-    OverwritePayload(SetPayload),
-}
-
-impl PayloadOps {
-    pub fn is_write_operation(&self) -> bool {
-        match self {
-            PayloadOps::SetPayload(_) => true,
-            PayloadOps::DeletePayload(_) => false,
-            PayloadOps::ClearPayload { .. } => false,
-            PayloadOps::ClearPayloadByFilter(_) => false,
-            PayloadOps::OverwritePayload(_) => true,
-        }
-    }
-}
-
-impl Validate for PayloadOps {
-    fn validate(&self) -> Result<(), validator::ValidationErrors> {
-        match self {
-            PayloadOps::SetPayload(operation) => operation.validate(),
-            PayloadOps::DeletePayload(operation) => operation.validate(),
-            PayloadOps::ClearPayload { .. } => Ok(()),
-            PayloadOps::ClearPayloadByFilter(_) => Ok(()),
-            PayloadOps::OverwritePayload(operation) => operation.validate(),
-        }
-    }
-}
-
-impl SplitByShard for PayloadOps {
-    fn split_by_shard(self, ring: &HashRing<ShardId>) -> OperationToShard<Self> {
-        match self {
-            PayloadOps::SetPayload(operation) => {
-                operation.split_by_shard(ring).map(PayloadOps::SetPayload)
-            }
-            PayloadOps::DeletePayload(operation) => operation
-                .split_by_shard(ring)
-                .map(PayloadOps::DeletePayload),
-            PayloadOps::ClearPayload { points } => split_iter_by_shard(points, |id| *id, ring)
-                .map(|points| PayloadOps::ClearPayload { points }),
-            operation @ PayloadOps::ClearPayloadByFilter(_) => OperationToShard::to_all(operation),
-            PayloadOps::OverwritePayload(operation) => operation
-                .split_by_shard(ring)
-                .map(PayloadOps::OverwritePayload),
-        }
-    }
-}
-
-impl SplitByShard for DeletePayload {
-    fn split_by_shard(self, ring: &HashRing<ShardId>) -> OperationToShard<Self> {
-        match (&self.points, &self.filter) {
-            (Some(_), _) => {
-                split_iter_by_shard(self.points.unwrap(), |id| *id, ring).map(|points| {
-                    DeletePayload {
-                        points: Some(points),
-                        keys: self.keys.clone(),
-                        filter: self.filter.clone(),
-                    }
-                })
-            }
-            (None, Some(_)) => OperationToShard::to_all(self),
-            (None, None) => OperationToShard::to_none(),
-        }
-    }
-}
-
-impl SplitByShard for SetPayload {
-    fn split_by_shard(self, ring: &HashRing<ShardId>) -> OperationToShard<Self> {
-        match (&self.points, &self.filter) {
-            (Some(_), _) => {
-                split_iter_by_shard(self.points.unwrap(), |id| *id, ring).map(|points| SetPayload {
-                    points: Some(points),
-                    payload: self.payload.clone(),
-                    filter: self.filter.clone(),
-                })
-            }
-            (None, Some(_)) => OperationToShard::to_all(self),
-            (None, None) => OperationToShard::to_none(),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use segment::types::{Payload, PayloadContainer};
-    use serde_json::Value;
-
-    use super::*;
-
-    #[derive(Debug, Deserialize, Serialize)]
-    pub struct TextSelector {
-        pub points: Vec<PointIdType>,
-    }
-
-    #[derive(Debug, Deserialize, Serialize)]
-    pub struct TextSelectorOpt {
-        pub points: Option<Vec<PointIdType>>,
-        pub filter: Option<Filter>,
-    }
-
-    #[test]
-    fn test_replace_with_opt_in_cbor() {
-        let obj1 = TextSelector {
-            points: vec![1.into(), 2.into(), 3.into()],
-        };
-        let raw_cbor = serde_cbor::to_vec(&obj1).unwrap();
-        let obj2 = serde_cbor::from_slice::<TextSelectorOpt>(&raw_cbor).unwrap();
-        eprintln!("obj2 = {obj2:#?}");
-        assert_eq!(obj1.points, obj2.points.unwrap());
-    }
-
-    #[test]
-    fn test_serialization() {
-        let query1 = r#"
-        {
-            "set_payload": {
-                "points": [1, 2, 3],
-                "payload": {
-                    "key1":  "hello" ,
-                    "key2": [1,2,3,4],
-                    "key3": {"json": {"key1":"value1"} }
-                }
-            }
-        }
-        "#;
-
-        let operation: PayloadOps = serde_json::from_str(query1).unwrap();
-
-        match operation {
-            PayloadOps::SetPayload(set_payload) => {
-                let payload: Payload = set_payload.payload;
-                assert_eq!(payload.len(), 3);
-
-                assert!(payload.contains_key("key1"));
-
-                let payload_type = payload
-                    .get_value("key1")
-                    .into_iter()
-                    .next()
-                    .cloned()
-                    .expect("No key key1");
-
-                match payload_type {
-                    Value::String(x) => assert_eq!(x, "hello"),
-                    _ => panic!("Wrong payload type"),
-                }
-
-                let payload_type_json = payload.get_value("key3").into_iter().next().cloned();
-
-                assert!(matches!(payload_type_json, Some(Value::Object(_))))
-            }
-            _ => panic!("Wrong operation"),
-        }
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/operations/point_ops.rs b/crates/qdrant/lib/collection/src/operations/point_ops.rs
deleted file mode 100644
index 0f5ca1e..0000000
--- a/crates/qdrant/lib/collection/src/operations/point_ops.rs
+++ /dev/null
@@ -1,503 +0,0 @@
-use std::borrow::Cow;
-use std::collections::HashMap;
-
-use itertools::izip;
-use schemars::gen::SchemaGenerator;
-use schemars::schema::{ObjectValidation, Schema, SchemaObject, SubschemaValidation};
-use schemars::JsonSchema;
-use segment::common::utils::transpose_map_into_named_vector;
-use segment::data_types::named_vectors::NamedVectors;
-use segment::data_types::vectors::{only_default_vector, BatchVectorStruct, VectorStruct};
-use segment::types::{Filter, Payload, PointIdType};
-use serde::{Deserialize, Serialize};
-use validator::Validate;
-
-use super::{point_to_shard, split_iter_by_shard, OperationToShard, SplitByShard};
-use crate::hash_ring::HashRing;
-use crate::operations::types::Record;
-use crate::shards::shard::ShardId;
-
-/// Defines write ordering guarantees for collection operations
-///
-/// * `weak` - write operations may be reordered, works faster, default
-///
-/// * `medium` - write operations go through dynamically selected leader, may be inconsistent for a short period of time in case of leader change
-///
-/// * `strong` - Write operations go through the permanent leader, consistent, but may be unavailable if leader is down
-///
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone, Copy, Default)]
-#[serde(rename_all = "snake_case")]
-pub enum WriteOrdering {
-    #[default]
-    Weak,
-    Medium,
-    Strong,
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone)]
-#[serde(rename_all = "snake_case")]
-pub struct PointStruct {
-    /// Point id
-    pub id: PointIdType,
-    /// Vectors
-    #[serde(alias = "vectors")]
-    pub vector: VectorStruct,
-    /// Payload values (optional)
-    pub payload: Option<Payload>,
-}
-
-/// Warn: panics if the vector is empty
-impl TryFrom<Record> for PointStruct {
-    type Error = String;
-
-    fn try_from(record: Record) -> Result<Self, Self::Error> {
-        let Record {
-            id,
-            payload,
-            vector,
-        } = record;
-
-        if vector.is_none() {
-            return Err("Vector is empty".to_string());
-        }
-
-        Ok(Self {
-            id,
-            payload,
-            vector: vector.unwrap(),
-        })
-    }
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone)]
-#[serde(rename_all = "snake_case")]
-pub struct Batch {
-    pub ids: Vec<PointIdType>,
-    pub vectors: BatchVectorStruct,
-    pub payloads: Option<Vec<Option<Payload>>>,
-}
-
-impl Batch {
-    pub fn empty() -> Self {
-        Self {
-            ids: vec![],
-            vectors: BatchVectorStruct::Multi(HashMap::new()),
-            payloads: Some(vec![]),
-        }
-    }
-
-    pub fn empty_no_payload() -> Self {
-        Self {
-            ids: vec![],
-            vectors: BatchVectorStruct::Multi(HashMap::new()),
-            payloads: None,
-        }
-    }
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Validate, Clone)]
-#[serde(rename_all = "snake_case")]
-pub struct PointIdsList {
-    pub points: Vec<PointIdType>,
-}
-
-impl From<Vec<PointIdType>> for PointIdsList {
-    fn from(points: Vec<PointIdType>) -> Self {
-        Self { points }
-    }
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Validate)]
-#[serde(rename_all = "snake_case")]
-pub struct FilterSelector {
-    pub filter: Filter,
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-#[serde(untagged)]
-pub enum PointsSelector {
-    /// Select points by list of IDs
-    PointIdsSelector(PointIdsList),
-    /// Select points by filtering condition
-    FilterSelector(FilterSelector),
-}
-
-impl Validate for PointsSelector {
-    fn validate(&self) -> Result<(), validator::ValidationErrors> {
-        match self {
-            PointsSelector::PointIdsSelector(ids) => ids.validate(),
-            PointsSelector::FilterSelector(filter) => filter.validate(),
-        }
-    }
-}
-
-// Structure used for deriving custom JsonSchema only
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Validate)]
-struct PointsList {
-    points: Vec<PointStruct>,
-}
-
-#[derive(Debug, Deserialize, Serialize, Clone)]
-pub struct PointSyncOperation {
-    /// Minimal id of the sync range
-    pub from_id: Option<PointIdType>,
-    /// Maximal id og
-    pub to_id: Option<PointIdType>,
-    pub points: Vec<PointStruct>,
-}
-
-#[derive(Debug, Deserialize, Serialize, Clone)]
-#[serde(rename_all = "snake_case")]
-pub enum PointInsertOperations {
-    /// Inset points from a batch.
-    #[serde(rename = "batch")]
-    PointsBatch(Batch),
-    /// Insert points from a list
-    #[serde(rename = "points")]
-    PointsList(Vec<PointStruct>),
-}
-
-impl JsonSchema for PointInsertOperations {
-    fn schema_name() -> String {
-        "PointInsertOperations".to_string()
-    }
-
-    fn json_schema(gen: &mut SchemaGenerator) -> Schema {
-        let def_path = gen.settings().definitions_path.clone();
-        let a_schema: Schema = Batch::json_schema(gen);
-        let proxy_b_schema = PointsList::json_schema(gen);
-        let definitions = gen.definitions_mut();
-        definitions.insert(Batch::schema_name(), a_schema);
-
-        let field_a_name = "batch".to_string();
-
-        let get_obj_schema = |field: String, schema_name: String| {
-            let schema_ref = Schema::Object(SchemaObject {
-                reference: Some(format!("{def_path}{schema_name}")),
-                ..Default::default()
-            });
-            Schema::Object(SchemaObject {
-                object: Some(Box::new(ObjectValidation {
-                    required: vec![field.clone()].into_iter().collect(),
-                    properties: vec![(field, schema_ref)].into_iter().collect(),
-                    ..Default::default()
-                })),
-                ..Default::default()
-            })
-        };
-
-        let proxy_a_schema = get_obj_schema(field_a_name, Batch::schema_name());
-
-        let proxy_a_name = "PointsBatch".to_string();
-
-        definitions.insert(proxy_a_name.clone(), proxy_a_schema);
-        definitions.insert(PointsList::schema_name(), proxy_b_schema);
-
-        let proxy_a_ref = Schema::Object(SchemaObject {
-            reference: Some(format!("{def_path}{proxy_a_name}")),
-            ..Default::default()
-        });
-
-        let proxy_b_ref = Schema::Object(SchemaObject {
-            reference: Some(format!("{}{}", def_path, PointsList::schema_name())),
-            ..Default::default()
-        });
-
-        Schema::Object(SchemaObject {
-            subschemas: Some(Box::new(SubschemaValidation {
-                one_of: Some(vec![proxy_a_ref, proxy_b_ref]),
-                ..Default::default()
-            })),
-            ..Default::default()
-        })
-    }
-}
-
-impl Validate for PointInsertOperations {
-    fn validate(&self) -> Result<(), validator::ValidationErrors> {
-        match self {
-            PointInsertOperations::PointsList(_) => Ok(()),
-            PointInsertOperations::PointsBatch(batch) => {
-                let bad_input_description = |ids: usize, vecs: usize| -> String {
-                    format!("number of ids and vectors must be equal ({ids} != {vecs})")
-                };
-                let create_error = |message: String| -> validator::ValidationErrors {
-                    let mut errors = validator::ValidationErrors::new();
-                    errors.add("batch", {
-                        let mut error = validator::ValidationError::new("point_insert_operation");
-                        error.message.replace(Cow::from(message));
-                        error
-                    });
-                    errors
-                };
-
-                match &batch.vectors {
-                    BatchVectorStruct::Single(vectors) => {
-                        if batch.ids.len() != vectors.len() {
-                            return Err(create_error(bad_input_description(
-                                batch.ids.len(),
-                                vectors.len(),
-                            )));
-                        }
-                    }
-                    BatchVectorStruct::Multi(named_vectors) => {
-                        for vectors in named_vectors.values() {
-                            if batch.ids.len() != vectors.len() {
-                                return Err(create_error(bad_input_description(
-                                    batch.ids.len(),
-                                    vectors.len(),
-                                )));
-                            }
-                        }
-                    }
-                }
-                if let Some(payload_vector) = &batch.payloads {
-                    if payload_vector.len() != batch.ids.len() {
-                        return Err(create_error(format!(
-                            "number of ids and payloads must be equal ({} != {})",
-                            batch.ids.len(),
-                            payload_vector.len(),
-                        )));
-                    }
-                }
-                Ok(())
-            }
-        }
-    }
-}
-
-impl SplitByShard for PointInsertOperations {
-    fn split_by_shard(self, ring: &HashRing<ShardId>) -> OperationToShard<Self> {
-        match self {
-            PointInsertOperations::PointsBatch(batch) => batch
-                .split_by_shard(ring)
-                .map(PointInsertOperations::PointsBatch),
-            PointInsertOperations::PointsList(list) => list
-                .split_by_shard(ring)
-                .map(PointInsertOperations::PointsList),
-        }
-    }
-}
-
-impl From<Batch> for PointInsertOperations {
-    fn from(batch: Batch) -> Self {
-        PointInsertOperations::PointsBatch(batch)
-    }
-}
-
-impl From<Vec<PointStruct>> for PointInsertOperations {
-    fn from(points: Vec<PointStruct>) -> Self {
-        PointInsertOperations::PointsList(points)
-    }
-}
-
-#[derive(Debug, Deserialize, Serialize, Clone)]
-#[serde(rename_all = "snake_case")]
-pub enum PointOperations {
-    /// Insert or update points
-    UpsertPoints(PointInsertOperations),
-    /// Delete point if exists
-    DeletePoints { ids: Vec<PointIdType> },
-    /// Delete points by given filter criteria
-    DeletePointsByFilter(Filter),
-    /// Points Sync
-    SyncPoints(PointSyncOperation),
-}
-
-impl PointOperations {
-    pub fn is_write_operation(&self) -> bool {
-        match self {
-            PointOperations::UpsertPoints(_) => true,
-            PointOperations::DeletePoints { .. } => false,
-            PointOperations::DeletePointsByFilter(_) => false,
-            PointOperations::SyncPoints(_) => true,
-        }
-    }
-}
-
-impl Validate for PointOperations {
-    fn validate(&self) -> Result<(), validator::ValidationErrors> {
-        match self {
-            PointOperations::UpsertPoints(upsert_points) => upsert_points.validate(),
-            PointOperations::DeletePoints { ids: _ } => Ok(()),
-            PointOperations::DeletePointsByFilter(_) => Ok(()),
-            PointOperations::SyncPoints(_) => Ok(()),
-        }
-    }
-}
-
-impl SplitByShard for Batch {
-    fn split_by_shard(self, ring: &HashRing<ShardId>) -> OperationToShard<Self> {
-        let batch = self;
-        let mut batch_by_shard: HashMap<ShardId, Batch> = HashMap::new();
-        let Batch {
-            ids,
-            vectors,
-            payloads,
-        } = batch;
-
-        if let Some(payloads) = payloads {
-            match vectors {
-                BatchVectorStruct::Single(vectors) => {
-                    for (id, vector, payload) in izip!(ids, vectors, payloads) {
-                        let shard_id = point_to_shard(id, ring);
-                        let batch = batch_by_shard.entry(shard_id).or_insert_with(|| Batch {
-                            ids: vec![],
-                            vectors: BatchVectorStruct::Single(vec![]),
-                            payloads: Some(vec![]),
-                        });
-                        batch.ids.push(id);
-                        batch.vectors.single().push(vector);
-                        batch.payloads.as_mut().unwrap().push(payload);
-                    }
-                }
-                BatchVectorStruct::Multi(named_vectors) => {
-                    let named_vectors_list = if !named_vectors.is_empty() {
-                        transpose_map_into_named_vector(named_vectors)
-                    } else {
-                        vec![NamedVectors::default(); ids.len()]
-                    };
-                    for (id, named_vector, payload) in izip!(ids, named_vectors_list, payloads) {
-                        let shard_id = point_to_shard(id, ring);
-                        let batch = batch_by_shard.entry(shard_id).or_insert_with(|| Batch {
-                            ids: vec![],
-                            vectors: BatchVectorStruct::Multi(HashMap::new()),
-                            payloads: Some(vec![]),
-                        });
-                        batch.ids.push(id);
-                        let batch_vectors = batch.vectors.multi();
-                        for (name, vector) in named_vector {
-                            let name = name.into_owned();
-                            let vector = vector.into_owned();
-                            batch_vectors
-                                .entry(name)
-                                .or_insert_with(Vec::new)
-                                .push(vector);
-                        }
-                        batch.payloads.as_mut().unwrap().push(payload);
-                    }
-                }
-            }
-        } else {
-            match vectors {
-                BatchVectorStruct::Single(vectors) => {
-                    for (id, vector) in izip!(ids, vectors) {
-                        let shard_id = point_to_shard(id, ring);
-                        let batch = batch_by_shard.entry(shard_id).or_insert_with(|| Batch {
-                            ids: vec![],
-                            vectors: BatchVectorStruct::Single(vec![]),
-                            payloads: None,
-                        });
-                        batch.ids.push(id);
-                        batch.vectors.single().push(vector);
-                    }
-                }
-                BatchVectorStruct::Multi(named_vectors) => {
-                    let named_vectors_list = if !named_vectors.is_empty() {
-                        transpose_map_into_named_vector(named_vectors)
-                    } else {
-                        vec![NamedVectors::default(); ids.len()]
-                    };
-                    for (id, named_vector) in izip!(ids, named_vectors_list) {
-                        let shard_id = point_to_shard(id, ring);
-                        let batch = batch_by_shard.entry(shard_id).or_insert_with(|| Batch {
-                            ids: vec![],
-                            vectors: BatchVectorStruct::Multi(HashMap::new()),
-                            payloads: None,
-                        });
-                        batch.ids.push(id);
-                        let batch_vectors = batch.vectors.multi();
-                        for (name, vector) in named_vector {
-                            let name = name.into_owned();
-                            let vector = vector.into_owned();
-                            batch_vectors
-                                .entry(name)
-                                .or_insert_with(Vec::new)
-                                .push(vector);
-                        }
-                    }
-                }
-            }
-        }
-
-        OperationToShard::by_shard(batch_by_shard)
-    }
-}
-
-impl SplitByShard for Vec<PointStruct> {
-    fn split_by_shard(self, ring: &HashRing<ShardId>) -> OperationToShard<Self> {
-        split_iter_by_shard(self, |point| point.id, ring)
-    }
-}
-
-impl SplitByShard for PointOperations {
-    fn split_by_shard(self, ring: &HashRing<ShardId>) -> OperationToShard<Self> {
-        match self {
-            PointOperations::UpsertPoints(upsert_points) => upsert_points
-                .split_by_shard(ring)
-                .map(PointOperations::UpsertPoints),
-            PointOperations::DeletePoints { ids } => split_iter_by_shard(ids, |id| *id, ring)
-                .map(|ids| PointOperations::DeletePoints { ids }),
-            by_filter @ PointOperations::DeletePointsByFilter(_) => {
-                OperationToShard::to_all(by_filter)
-            }
-            PointOperations::SyncPoints(_) => {
-                #[cfg(debug_assertions)]
-                panic!("SyncPoints operation is intended to by applied to specific shard only");
-                #[cfg(not(debug_assertions))]
-                OperationToShard::by_shard(vec![])
-            }
-        }
-    }
-}
-
-impl From<Batch> for PointOperations {
-    fn from(batch: Batch) -> Self {
-        PointOperations::UpsertPoints(PointInsertOperations::PointsBatch(batch))
-    }
-}
-
-impl From<Vec<PointStruct>> for PointOperations {
-    fn from(points: Vec<PointStruct>) -> Self {
-        PointOperations::UpsertPoints(PointInsertOperations::PointsList(points))
-    }
-}
-
-impl PointStruct {
-    pub fn get_vectors(&self) -> NamedVectors {
-        match &self.vector {
-            VectorStruct::Single(vector) => only_default_vector(vector),
-            VectorStruct::Multi(vectors) => NamedVectors::from_map_ref(vectors),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn validate_batch() {
-        let batch = PointInsertOperations::PointsBatch(Batch {
-            ids: vec![PointIdType::NumId(0)],
-            vectors: vec![].into(),
-            payloads: None,
-        });
-        assert!(matches!(batch.validate(), Err(_)));
-
-        let batch = PointInsertOperations::PointsBatch(Batch {
-            ids: vec![PointIdType::NumId(0)],
-            vectors: vec![vec![0.1]].into(),
-            payloads: None,
-        });
-        assert!(matches!(batch.validate(), Ok(())));
-
-        let batch = PointInsertOperations::PointsBatch(Batch {
-            ids: vec![PointIdType::NumId(0)],
-            vectors: vec![vec![0.1]].into(),
-            payloads: Some(vec![]),
-        });
-        assert!(matches!(batch.validate(), Err(_)));
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/operations/shared_storage_config.rs b/crates/qdrant/lib/collection/src/operations/shared_storage_config.rs
deleted file mode 100644
index 8aaf766..0000000
--- a/crates/qdrant/lib/collection/src/operations/shared_storage_config.rs
+++ /dev/null
@@ -1,56 +0,0 @@
-use std::time::Duration;
-
-use crate::operations::types::NodeType;
-
-/// Default timeout for search requests.
-/// In cluster mode, this should be aligned with collection timeout.
-const DEFAULT_SEARCH_TIMEOUT: Duration = Duration::from_secs(60);
-const DEFAULT_UPDATE_QUEUE_SIZE: usize = 100;
-const DEFAULT_UPDATE_QUEUE_SIZE_LISTENER: usize = 10_000;
-
-/// Storage configuration shared between all collections.
-/// Represents a per-node configuration, which might be changes with restart.
-/// Vales of this struct are not persisted.
-#[derive(Clone, Debug)]
-pub struct SharedStorageConfig {
-    pub update_queue_size: usize,
-    pub node_type: NodeType,
-    pub handle_collection_load_errors: bool,
-    pub recovery_mode: Option<String>,
-    pub search_timeout: Duration,
-}
-
-impl Default for SharedStorageConfig {
-    fn default() -> Self {
-        Self {
-            update_queue_size: DEFAULT_UPDATE_QUEUE_SIZE,
-            node_type: Default::default(),
-            handle_collection_load_errors: false,
-            recovery_mode: None,
-            search_timeout: DEFAULT_SEARCH_TIMEOUT,
-        }
-    }
-}
-
-impl SharedStorageConfig {
-    pub fn new(
-        update_queue_size: Option<usize>,
-        node_type: NodeType,
-        handle_collection_load_errors: bool,
-        recovery_mode: Option<String>,
-        search_timeout: Option<Duration>,
-    ) -> Self {
-        let update_queue_size = update_queue_size.unwrap_or(match node_type {
-            NodeType::Normal => DEFAULT_UPDATE_QUEUE_SIZE,
-            NodeType::Listener => DEFAULT_UPDATE_QUEUE_SIZE_LISTENER,
-        });
-
-        Self {
-            update_queue_size,
-            node_type,
-            handle_collection_load_errors,
-            recovery_mode,
-            search_timeout: search_timeout.unwrap_or(DEFAULT_SEARCH_TIMEOUT),
-        }
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/operations/snapshot_ops.rs b/crates/qdrant/lib/collection/src/operations/snapshot_ops.rs
deleted file mode 100644
index 3990d45..0000000
--- a/crates/qdrant/lib/collection/src/operations/snapshot_ops.rs
+++ /dev/null
@@ -1,87 +0,0 @@
-use std::path::Path;
-use std::time::SystemTime;
-
-use api::grpc::conversions::date_time_to_proto;
-use chrono::NaiveDateTime;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use url::Url;
-use validator::Validate;
-
-use crate::operations::types::CollectionResult;
-
-/// Defines source of truth for snapshot recovery
-/// `Snapshot` means - prefer snapshot data over the current state
-/// `Replica` means - prefer existing data over the snapshot
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Default, Clone, Copy)]
-#[serde(rename_all = "snake_case")]
-pub enum SnapshotPriority {
-    Snapshot,
-    #[default]
-    Replica,
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Validate, Clone)]
-pub struct SnapshotRecover {
-    /// Examples:
-    /// - URL `http://localhost:8080/collections/my_collection/snapshots/my_snapshot`
-    /// - Local path `file:///qdrant/snapshots/test_collection-2022-08-04-10-49-10.snapshot`
-    pub location: Url,
-
-    /// Defines which data should be used as a source of truth if there are other replicas in the cluster.
-    /// If set to `Snapshot`, the snapshot will be used as a source of truth, and the current state will be overwritten.
-    /// If set to `Replica`, the current state will be used as a source of truth, and after recovery if will be synchronized with the snapshot.
-    #[serde(default)]
-    pub priority: Option<SnapshotPriority>,
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone)]
-pub struct SnapshotDescription {
-    pub name: String,
-    pub creation_time: Option<NaiveDateTime>,
-    pub size: u64,
-}
-
-impl From<SnapshotDescription> for api::grpc::qdrant::SnapshotDescription {
-    fn from(value: SnapshotDescription) -> Self {
-        Self {
-            name: value.name,
-            creation_time: value.creation_time.map(date_time_to_proto),
-            size: value.size as i64,
-        }
-    }
-}
-
-pub async fn get_snapshot_description(path: &Path) -> CollectionResult<SnapshotDescription> {
-    let name = path.file_name().unwrap().to_str().unwrap();
-    let file_meta = tokio::fs::metadata(&path).await?;
-    let creation_time = file_meta.created().ok().and_then(|created_time| {
-        created_time
-            .duration_since(SystemTime::UNIX_EPOCH)
-            .ok()
-            .map(|duration| {
-                NaiveDateTime::from_timestamp_opt(duration.as_secs() as i64, 0).unwrap()
-            })
-    });
-    let size = file_meta.len();
-    Ok(SnapshotDescription {
-        name: name.to_string(),
-        creation_time,
-        size,
-    })
-}
-
-pub async fn list_snapshots_in_directory(
-    directory: &Path,
-) -> CollectionResult<Vec<SnapshotDescription>> {
-    let mut snapshots = Vec::new();
-    let mut entries = tokio::fs::read_dir(directory).await?;
-    while let Some(entry) = entries.next_entry().await? {
-        let entry = entry;
-        let path = entry.path();
-        if !path.is_dir() && path.extension().map(|s| s == "snapshot").unwrap_or(false) {
-            snapshots.push(get_snapshot_description(&path).await?);
-        }
-    }
-    Ok(snapshots)
-}
diff --git a/crates/qdrant/lib/collection/src/operations/types.rs b/crates/qdrant/lib/collection/src/operations/types.rs
deleted file mode 100644
index a3482af..0000000
--- a/crates/qdrant/lib/collection/src/operations/types.rs
+++ /dev/null
@@ -1,1099 +0,0 @@
-use std::backtrace::Backtrace;
-use std::collections::{BTreeMap, HashMap};
-use std::error::Error as _;
-use std::fmt::Write as _;
-use std::iter;
-use std::num::NonZeroU64;
-use std::time::SystemTimeError;
-
-use api::grpc::transport_channel_pool::RequestError;
-use futures::io;
-use merge::Merge;
-use schemars::JsonSchema;
-use segment::common::anonymize::Anonymize;
-use segment::common::file_operations::FileStorageError;
-use segment::data_types::groups::GroupId;
-use segment::data_types::vectors::{
-    NamedVectorStruct, VectorStruct, VectorType, DEFAULT_VECTOR_NAME,
-};
-use segment::entry::entry_point::OperationError;
-use segment::types::{
-    Distance, Filter, Payload, PayloadIndexInfo, PayloadKeyType, PointIdType, QuantizationConfig,
-    ScoreType, ScoredPoint, SearchParams, SeqNumberType, WithPayloadInterface, WithVector,
-};
-use serde;
-use serde::{Deserialize, Serialize};
-use serde_json::Error as JsonError;
-use thiserror::Error;
-use tokio::sync::mpsc::error::SendError;
-use tokio::sync::oneshot::error::RecvError as OneshotRecvError;
-use tokio::task::JoinError;
-use tonic::codegen::http::uri::InvalidUri;
-use validator::{Validate, ValidationErrors};
-
-use super::config_diff;
-use crate::config::{CollectionConfig, CollectionParams};
-use crate::lookup::types::WithLookupInterface;
-use crate::operations::config_diff::{HnswConfigDiff, QuantizationConfigDiff};
-use crate::save_on_disk;
-use crate::shards::replica_set::ReplicaState;
-use crate::shards::shard::{PeerId, ShardId};
-use crate::wal::WalError;
-
-/// Current state of the collection.
-/// `Green` - all good. `Yellow` - optimization is running, `Red` - some operations failed and was not recovered
-#[derive(
-    Debug, Deserialize, Serialize, JsonSchema, PartialEq, Eq, PartialOrd, Ord, Copy, Clone,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum CollectionStatus {
-    // Collection if completely ready for requests
-    Green,
-    // Collection is available, but some segments might be under optimization
-    Yellow,
-    // Something is not OK:
-    // - some operations failed and was not recovered
-    Red,
-}
-
-/// Current state of the collection
-#[derive(
-    Debug, Default, Deserialize, Serialize, JsonSchema, PartialEq, Eq, PartialOrd, Ord, Clone,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum OptimizersStatus {
-    /// Optimizers are reporting as expected
-    #[default]
-    Ok,
-    /// Something wrong happened with optimizers
-    Error(String),
-}
-
-/// Point data
-#[derive(Clone, Debug, PartialEq, Deserialize, Serialize, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub struct Record {
-    /// Id of the point
-    pub id: PointIdType,
-    /// Payload - values assigned to the point
-    pub payload: Option<Payload>,
-    /// Vector of the point
-    pub vector: Option<VectorStruct>,
-}
-
-/// Current statistics and configuration of the collection
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Validate)]
-pub struct CollectionInfo {
-    /// Status of the collection
-    pub status: CollectionStatus,
-    /// Status of optimizers
-    pub optimizer_status: OptimizersStatus,
-    /// Number of vectors in collection
-    /// All vectors in collection are available for querying
-    /// Calculated as `points_count x vectors_per_point`
-    /// Where `vectors_per_point` is a number of named vectors in schema
-    pub vectors_count: usize,
-    /// Number of indexed vectors in the collection.
-    /// Indexed vectors in large segments are faster to query,
-    /// as it is stored in vector index (HNSW)
-    pub indexed_vectors_count: usize,
-    /// Number of points (vectors + payloads) in collection
-    /// Each point could be accessed by unique id
-    pub points_count: usize,
-    /// Number of segments in collection.
-    /// Each segment has independent vector as payload indexes
-    pub segments_count: usize,
-    /// Collection settings
-    #[validate]
-    pub config: CollectionConfig,
-    /// Types of stored payload
-    pub payload_schema: HashMap<PayloadKeyType, PayloadIndexInfo>,
-}
-
-/// Current clustering distribution for the collection
-#[derive(Debug, Deserialize, Serialize, JsonSchema)]
-pub struct CollectionClusterInfo {
-    /// ID of this peer
-    pub peer_id: PeerId,
-    /// Total number of shards
-    pub shard_count: usize,
-    /// Local shards
-    pub local_shards: Vec<LocalShardInfo>,
-    /// Remote shards
-    pub remote_shards: Vec<RemoteShardInfo>,
-    /// Shard transfers
-    pub shard_transfers: Vec<ShardTransferInfo>,
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone)]
-pub struct ShardTransferInfo {
-    pub shard_id: ShardId,
-    pub from: PeerId,
-    pub to: PeerId,
-    /// If `true` transfer is a synchronization of a replicas
-    /// If `false` transfer is a moving of a shard from one peer to another
-    pub sync: bool,
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub struct LocalShardInfo {
-    /// Local shard id
-    pub shard_id: ShardId,
-    /// Number of points in the shard
-    pub points_count: usize,
-    /// Is replica active
-    pub state: ReplicaState,
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub struct RemoteShardInfo {
-    /// Remote shard id
-    pub shard_id: ShardId,
-    /// Remote peer id
-    pub peer_id: PeerId,
-    /// Is replica active
-    pub state: ReplicaState,
-}
-
-/// `Acknowledged` - Request is saved to WAL and will be process in a queue.
-/// `Completed` - Request is completed, changes are actual.
-#[derive(Debug, Deserialize, Serialize, JsonSchema, PartialEq, Eq)]
-#[serde(rename_all = "snake_case")]
-pub enum UpdateStatus {
-    Acknowledged,
-    Completed,
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub struct UpdateResult {
-    /// Sequential number of the operation
-    pub operation_id: SeqNumberType,
-    /// Update status
-    pub status: UpdateStatus,
-}
-
-/// Scroll request - paginate over all points which matches given condition
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Validate, Clone)]
-#[serde(rename_all = "snake_case")]
-pub struct ScrollRequest {
-    /// Start ID to read points from.
-    pub offset: Option<PointIdType>,
-    /// Page size. Default: 10
-    #[validate(range(min = 1))]
-    pub limit: Option<usize>,
-    /// Look only for points which satisfies this conditions. If not provided - all points.
-    pub filter: Option<Filter>,
-    /// Select which payload to return with the response. Default: All
-    pub with_payload: Option<WithPayloadInterface>,
-    /// Whether to return the point vector with the result?
-    #[serde(default, alias = "with_vectors")]
-    pub with_vector: WithVector,
-}
-
-impl Default for ScrollRequest {
-    fn default() -> Self {
-        ScrollRequest {
-            offset: None,
-            limit: Some(10),
-            filter: None,
-            with_payload: Some(WithPayloadInterface::Bool(true)),
-            with_vector: WithVector::Bool(false),
-        }
-    }
-}
-
-/// Result of the points read request
-#[derive(Debug, Deserialize, Serialize, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub struct ScrollResult {
-    /// List of retrieved points
-    pub points: Vec<Record>,
-    /// Offset which should be used to retrieve a next page result
-    pub next_page_offset: Option<PointIdType>,
-}
-
-/// Search request.
-/// Holds all conditions and parameters for the search of most similar points by vector similarity
-/// given the filtering restrictions.
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Validate, Clone)]
-#[serde(rename_all = "snake_case")]
-pub struct SearchRequest {
-    /// Look for vectors closest to this
-    pub vector: NamedVectorStruct,
-    /// Look only for points which satisfies this conditions
-    pub filter: Option<Filter>,
-    /// Additional search params
-    #[validate]
-    pub params: Option<SearchParams>,
-    /// Max number of result to return
-    #[serde(alias = "top")]
-    #[validate(range(min = 1))]
-    pub limit: usize,
-    /// Offset of the first result to return.
-    /// May be used to paginate results.
-    /// Note: large offset values may cause performance issues.
-    #[serde(default)]
-    pub offset: usize,
-    /// Select which payload to return with the response. Default: None
-    pub with_payload: Option<WithPayloadInterface>,
-    /// Whether to return the point vector with the result?
-    #[serde(default, alias = "with_vectors")]
-    pub with_vector: Option<WithVector>,
-    /// Define a minimal score threshold for the result.
-    /// If defined, less similar results will not be returned.
-    /// Score of the returned result might be higher or smaller than the threshold depending on the
-    /// Distance function used. E.g. for cosine similarity only higher scores will be returned.
-    pub score_threshold: Option<ScoreType>,
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Validate, Clone)]
-#[serde(rename_all = "snake_case")]
-pub struct SearchRequestBatch {
-    #[validate]
-    pub searches: Vec<SearchRequest>,
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Validate, Clone)]
-pub struct SearchGroupsRequest {
-    /// Look for vectors closest to this
-    pub vector: NamedVectorStruct,
-
-    /// Look only for points which satisfies this conditions
-    pub filter: Option<Filter>,
-
-    /// Additional search params
-    #[validate]
-    pub params: Option<SearchParams>,
-
-    /// Select which payload to return with the response. Default: None
-    pub with_payload: Option<WithPayloadInterface>,
-
-    /// Whether to return the point vector with the result?
-    #[serde(default, alias = "with_vectors")]
-    pub with_vector: Option<WithVector>,
-
-    /// Define a minimal score threshold for the result.
-    /// If defined, less similar results will not be returned.
-    /// Score of the returned result might be higher or smaller than the threshold depending on the
-    /// Distance function used. E.g. for cosine similarity only higher scores will be returned.
-    pub score_threshold: Option<ScoreType>,
-
-    #[serde(flatten)]
-    #[validate]
-    pub group_request: BaseGroupRequest,
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Validate)]
-#[serde(rename_all = "snake_case")]
-pub struct PointRequest {
-    /// Look for points with ids
-    pub ids: Vec<PointIdType>,
-    /// Select which payload to return with the response. Default: All
-    pub with_payload: Option<WithPayloadInterface>,
-    /// Whether to return the point vector with the result?
-    #[serde(default, alias = "with_vectors")]
-    pub with_vector: WithVector,
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone)]
-#[serde(rename_all = "snake_case", untagged)]
-pub enum UsingVector {
-    Name(String),
-}
-
-impl From<String> for UsingVector {
-    fn from(name: String) -> Self {
-        UsingVector::Name(name)
-    }
-}
-
-/// Defines a location to use for looking up the vector.
-/// Specifies collection and vector field name.
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone)]
-#[serde(rename_all = "snake_case")]
-pub struct LookupLocation {
-    /// Name of the collection used for lookup
-    pub collection: String,
-    /// Optional name of the vector field within the collection.
-    /// If not provided, the default vector field will be used.
-    #[serde(default)]
-    pub vector: Option<String>,
-}
-
-/// Recommendation request.
-/// Provides positive and negative examples of the vectors, which
-/// are already stored in the collection.
-///
-/// Service should look for the points which are closer to positive examples and at the same time
-/// further to negative examples. The concrete way of how to compare negative and positive distances
-/// is up to implementation in `segment` crate.
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Validate, Default, Clone)]
-#[serde(rename_all = "snake_case")]
-pub struct RecommendRequest {
-    /// Look for vectors closest to those
-    pub positive: Vec<PointIdType>,
-    /// Try to avoid vectors like this
-    #[serde(default)]
-    pub negative: Vec<PointIdType>,
-    /// Look only for points which satisfies this conditions
-    pub filter: Option<Filter>,
-    /// Additional search params
-    #[validate]
-    pub params: Option<SearchParams>,
-    /// Max number of result to return
-    #[serde(alias = "top")]
-    #[validate(range(min = 1))]
-    pub limit: usize,
-    /// Offset of the first result to return.
-    /// May be used to paginate results.
-    /// Note: large offset values may cause performance issues.
-    #[serde(default)]
-    pub offset: usize,
-    /// Select which payload to return with the response. Default: None
-    pub with_payload: Option<WithPayloadInterface>,
-    /// Whether to return the point vector with the result?
-    #[serde(default, alias = "with_vectors")]
-    pub with_vector: Option<WithVector>,
-    /// Define a minimal score threshold for the result.
-    /// If defined, less similar results will not be returned.
-    /// Score of the returned result might be higher or smaller than the threshold depending on the
-    /// Distance function used. E.g. for cosine similarity only higher scores will be returned.
-    pub score_threshold: Option<ScoreType>,
-    /// Define which vector to use for recommendation, if not specified - try to use default vector
-    #[serde(default)]
-    pub using: Option<UsingVector>,
-    /// The location used to lookup vectors. If not specified - use current collection.
-    /// Note: the other collection should have the same vector size as the current collection
-    #[serde(default)]
-    pub lookup_from: Option<LookupLocation>,
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Validate)]
-#[serde(rename_all = "snake_case")]
-pub struct RecommendRequestBatch {
-    #[validate]
-    pub searches: Vec<RecommendRequest>,
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Validate, Clone)]
-pub struct RecommendGroupsRequest {
-    /// Look for vectors closest to those
-    pub positive: Vec<PointIdType>,
-
-    /// Try to avoid vectors like this
-    #[serde(default)]
-    pub negative: Vec<PointIdType>,
-
-    /// Look only for points which satisfies this conditions
-    pub filter: Option<Filter>,
-
-    /// Additional search params
-    #[validate]
-    pub params: Option<SearchParams>,
-
-    /// Select which payload to return with the response. Default: None
-    pub with_payload: Option<WithPayloadInterface>,
-
-    /// Whether to return the point vector with the result?
-    #[serde(default, alias = "with_vectors")]
-    pub with_vector: Option<WithVector>,
-
-    /// Define a minimal score threshold for the result.
-    /// If defined, less similar results will not be returned.
-    /// Score of the returned result might be higher or smaller than the threshold depending on the
-    /// Distance function used. E.g. for cosine similarity only higher scores will be returned.
-    pub score_threshold: Option<ScoreType>,
-
-    /// Define which vector to use for recommendation, if not specified - try to use default vector
-    #[serde(default)]
-    pub using: Option<UsingVector>,
-
-    /// The location used to lookup vectors. If not specified - use current collection.
-    /// Note: the other collection should have the same vector size as the current collection
-    #[serde(default)]
-    pub lookup_from: Option<LookupLocation>,
-
-    #[serde(flatten)]
-    pub group_request: BaseGroupRequest,
-}
-
-#[derive(Debug, Serialize, Deserialize, JsonSchema, Clone)]
-pub struct PointGroup {
-    /// Scored points that have the same value of the group_by key
-    pub hits: Vec<ScoredPoint>,
-    /// Value of the group_by key, shared across all the hits in the group
-    pub id: GroupId,
-    /// Record that has been looked up using the group id
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub lookup: Option<Record>,
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema)]
-pub struct GroupsResult {
-    pub groups: Vec<PointGroup>,
-}
-
-/// Count Request
-/// Counts the number of points which satisfy the given filter.
-/// If filter is not provided, the count of all points in the collection will be returned.
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Validate)]
-#[serde(rename_all = "snake_case")]
-pub struct CountRequest {
-    /// Look only for points which satisfies this conditions
-    pub filter: Option<Filter>,
-    /// If true, count exact number of points. If false, count approximate number of points faster.
-    /// Approximate count might be unreliable during the indexing process. Default: true
-    #[serde(default = "default_exact_count")]
-    pub exact: bool,
-}
-
-pub const fn default_exact_count() -> bool {
-    true
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub struct CountResult {
-    /// Number of points which satisfy the conditions
-    pub count: usize,
-}
-
-#[derive(Error, Debug, Clone)]
-#[error("{0}")]
-pub enum CollectionError {
-    #[error("Wrong input: {description}")]
-    BadInput { description: String },
-    #[error("{what} not found")]
-    NotFound { what: String },
-    #[error("No point with id {missed_point_id} found")]
-    PointNotFound { missed_point_id: PointIdType },
-    #[error("Service internal error: {error}")]
-    ServiceError {
-        error: String,
-        backtrace: Option<String>,
-    },
-    #[error("Bad request: {description}")]
-    BadRequest { description: String },
-    #[error("Operation Cancelled: {description}")]
-    Cancelled { description: String },
-    #[error("Bad shard selection: {description}")]
-    BadShardSelection { description: String },
-    #[error(
-    "{shards_failed} out of {shards_total} shards failed to apply operation. First error captured: {first_err}"
-    )]
-    InconsistentShardFailure {
-        shards_total: u32,
-        shards_failed: u32,
-        first_err: Box<CollectionError>,
-    },
-    #[error("Remote shard on {peer_id} failed during forward proxy operation: {error}")]
-    ForwardProxyError { peer_id: PeerId, error: Box<Self> },
-    #[error("Out of memory, free: {free}, {description}")]
-    OutOfMemory { description: String, free: u64 },
-    #[error("Timeout error: {description}")]
-    Timeout { description: String },
-}
-
-impl CollectionError {
-    pub fn timeout(timeout_sec: usize, operation: impl Into<String>) -> CollectionError {
-        CollectionError::Timeout {
-            description: format!(
-                "Operation '{}' timed out after {timeout_sec} seconds",
-                operation.into()
-            ),
-        }
-    }
-
-    pub fn service_error(error: String) -> CollectionError {
-        CollectionError::ServiceError {
-            error,
-            backtrace: Some(Backtrace::force_capture().to_string()),
-        }
-    }
-
-    pub fn bad_input(description: String) -> CollectionError {
-        CollectionError::BadInput { description }
-    }
-
-    pub fn bad_request(description: String) -> CollectionError {
-        CollectionError::BadRequest { description }
-    }
-
-    pub fn bad_shard_selection(description: String) -> CollectionError {
-        CollectionError::BadShardSelection { description }
-    }
-
-    pub fn forward_proxy_error(peer_id: PeerId, error: impl Into<Self>) -> Self {
-        Self::ForwardProxyError {
-            peer_id,
-            error: Box::new(error.into()),
-        }
-    }
-
-    pub fn remote_peer_id(&self) -> Option<PeerId> {
-        match self {
-            Self::ForwardProxyError { peer_id, .. } => Some(*peer_id),
-            _ => None,
-        }
-    }
-
-    /// Returns true if the error is transient and the operation can be retried.
-    /// Returns false if the error is not transient and the operation should fail on all replicas.
-    pub fn is_transient(&self) -> bool {
-        match self {
-            // Transient
-            Self::ServiceError { .. } => true,
-            Self::Timeout { .. } => true,
-            Self::Cancelled { .. } => true,
-            Self::OutOfMemory { .. } => true,
-            // Not transient
-            Self::BadInput { .. } => false,
-            Self::NotFound { .. } => false,
-            Self::PointNotFound { .. } => false,
-            Self::BadRequest { .. } => false,
-            Self::BadShardSelection { .. } => false,
-            Self::InconsistentShardFailure { .. } => false,
-            Self::ForwardProxyError { .. } => false,
-        }
-    }
-}
-
-impl From<SystemTimeError> for CollectionError {
-    fn from(error: SystemTimeError) -> CollectionError {
-        CollectionError::ServiceError {
-            error: format!("System time error: {error}"),
-            backtrace: Some(Backtrace::force_capture().to_string()),
-        }
-    }
-}
-
-impl From<String> for CollectionError {
-    fn from(error: String) -> CollectionError {
-        CollectionError::ServiceError {
-            error,
-            backtrace: Some(Backtrace::force_capture().to_string()),
-        }
-    }
-}
-
-impl From<OperationError> for CollectionError {
-    fn from(err: OperationError) -> Self {
-        match err {
-            OperationError::WrongVector { .. } => Self::BadInput {
-                description: format!("{err}"),
-            },
-            OperationError::VectorNameNotExists { .. } => Self::BadInput {
-                description: format!("{err}"),
-            },
-            OperationError::MissedVectorName { .. } => Self::BadInput {
-                description: format!("{err}"),
-            },
-            OperationError::PointIdError { missed_point_id } => {
-                Self::PointNotFound { missed_point_id }
-            }
-            OperationError::ServiceError {
-                description,
-                backtrace,
-            } => Self::ServiceError {
-                error: description,
-                backtrace,
-            },
-            OperationError::TypeError { .. } => Self::BadInput {
-                description: format!("{err}"),
-            },
-            OperationError::Cancelled { description } => Self::Cancelled { description },
-            OperationError::TypeInferenceError { .. } => Self::BadInput {
-                description: format!("{err}"),
-            },
-            OperationError::OutOfMemory { description, free } => {
-                Self::OutOfMemory { description, free }
-            }
-            OperationError::InconsistentStorage { .. } => Self::ServiceError {
-                error: format!("{err}"),
-                backtrace: None,
-            },
-        }
-    }
-}
-
-impl From<OneshotRecvError> for CollectionError {
-    fn from(err: OneshotRecvError) -> Self {
-        Self::ServiceError {
-            error: format!("{err}"),
-            backtrace: Some(Backtrace::force_capture().to_string()),
-        }
-    }
-}
-
-impl From<JoinError> for CollectionError {
-    fn from(err: JoinError) -> Self {
-        Self::ServiceError {
-            error: format!("{err}"),
-            backtrace: Some(Backtrace::force_capture().to_string()),
-        }
-    }
-}
-
-impl From<WalError> for CollectionError {
-    fn from(err: WalError) -> Self {
-        Self::ServiceError {
-            error: format!("{err}"),
-            backtrace: Some(Backtrace::force_capture().to_string()),
-        }
-    }
-}
-
-impl<T> From<SendError<T>> for CollectionError {
-    fn from(err: SendError<T>) -> Self {
-        Self::ServiceError {
-            error: format!("Can't reach one of the workers: {err}"),
-            backtrace: Some(Backtrace::force_capture().to_string()),
-        }
-    }
-}
-
-impl From<JsonError> for CollectionError {
-    fn from(err: JsonError) -> Self {
-        CollectionError::ServiceError {
-            error: format!("Json error: {err}"),
-            backtrace: Some(Backtrace::force_capture().to_string()),
-        }
-    }
-}
-
-impl From<io::Error> for CollectionError {
-    fn from(err: io::Error) -> Self {
-        CollectionError::ServiceError {
-            error: format!("File IO error: {err}"),
-            backtrace: Some(Backtrace::force_capture().to_string()),
-        }
-    }
-}
-
-impl From<tonic::transport::Error> for CollectionError {
-    fn from(err: tonic::transport::Error) -> Self {
-        CollectionError::ServiceError {
-            error: format!("Tonic transport error: {err}"),
-            backtrace: Some(Backtrace::force_capture().to_string()),
-        }
-    }
-}
-
-impl From<InvalidUri> for CollectionError {
-    fn from(err: InvalidUri) -> Self {
-        CollectionError::ServiceError {
-            error: format!("Invalid URI error: {err}"),
-            backtrace: Some(Backtrace::force_capture().to_string()),
-        }
-    }
-}
-
-impl From<tonic::Status> for CollectionError {
-    fn from(err: tonic::Status) -> Self {
-        match err.code() {
-            tonic::Code::InvalidArgument => CollectionError::BadInput {
-                description: format!("InvalidArgument: {err}"),
-            },
-            tonic::Code::AlreadyExists => CollectionError::BadInput {
-                description: format!("AlreadyExists: {err}"),
-            },
-            tonic::Code::NotFound => CollectionError::NotFound {
-                what: format!("{err}"),
-            },
-            tonic::Code::Internal => CollectionError::ServiceError {
-                error: format!("Internal error: {err}"),
-                backtrace: Some(Backtrace::force_capture().to_string()),
-            },
-            tonic::Code::DeadlineExceeded => CollectionError::Timeout {
-                description: format!("Deadline Exceeded: {err}"),
-            },
-            other => CollectionError::ServiceError {
-                error: format!("Tonic status error: {other}"),
-                backtrace: Some(Backtrace::force_capture().to_string()),
-            },
-        }
-    }
-}
-
-impl<Guard> From<std::sync::PoisonError<Guard>> for CollectionError {
-    fn from(err: std::sync::PoisonError<Guard>) -> Self {
-        CollectionError::ServiceError {
-            error: format!("Mutex lock poisoned: {err}"),
-            backtrace: Some(Backtrace::force_capture().to_string()),
-        }
-    }
-}
-
-impl From<FileStorageError> for CollectionError {
-    fn from(err: FileStorageError) -> Self {
-        Self::service_error(err.to_string())
-    }
-}
-
-impl From<RequestError<tonic::Status>> for CollectionError {
-    fn from(err: RequestError<tonic::Status>) -> Self {
-        match err {
-            RequestError::FromClosure(status) => status.into(),
-            RequestError::Tonic(err) => {
-                let mut msg = err.to_string();
-                for src in iter::successors(err.source(), |&src| src.source()) {
-                    write!(&mut msg, ": {src}").unwrap();
-                }
-                CollectionError::service_error(msg)
-            }
-        }
-    }
-}
-
-impl From<save_on_disk::Error> for CollectionError {
-    fn from(err: save_on_disk::Error) -> Self {
-        CollectionError::ServiceError {
-            error: err.to_string(),
-            backtrace: Some(Backtrace::force_capture().to_string()),
-        }
-    }
-}
-
-impl From<validator::ValidationErrors> for CollectionError {
-    fn from(err: validator::ValidationErrors) -> Self {
-        CollectionError::BadInput {
-            description: format!("{err}"),
-        }
-    }
-}
-
-pub type CollectionResult<T> = Result<T, CollectionError>;
-
-impl Record {
-    pub fn vector_names(&self) -> Vec<&str> {
-        match &self.vector {
-            None => vec![],
-            Some(vectors) => match vectors {
-                VectorStruct::Single(_) => vec![DEFAULT_VECTOR_NAME],
-                VectorStruct::Multi(vectors) => vectors.keys().map(|x| x.as_str()).collect(),
-            },
-        }
-    }
-
-    pub fn get_vector_by_name(&self, name: &str) -> Option<&VectorType> {
-        match &self.vector {
-            Some(VectorStruct::Single(vector)) => {
-                if name == DEFAULT_VECTOR_NAME {
-                    Some(vector)
-                } else {
-                    None
-                }
-            }
-            Some(VectorStruct::Multi(vectors)) => vectors.get(name),
-            None => None,
-        }
-    }
-}
-
-/// Params of single vector data storage
-#[derive(Debug, Hash, Deserialize, Serialize, JsonSchema, Validate, Clone, PartialEq, Eq)]
-#[serde(rename_all = "snake_case")]
-pub struct VectorParams {
-    /// Size of a vectors used
-    pub size: NonZeroU64,
-    /// Type of distance function used for measuring distance between vectors
-    pub distance: Distance,
-    /// Custom params for HNSW index. If none - values from collection configuration are used.
-    #[serde(default, skip_serializing_if = "is_hnsw_diff_empty")]
-    #[validate]
-    pub hnsw_config: Option<HnswConfigDiff>,
-    /// Custom params for quantization. If none - values from collection configuration are used.
-    #[serde(
-        default,
-        alias = "quantization",
-        skip_serializing_if = "Option::is_none"
-    )]
-    #[validate]
-    pub quantization_config: Option<QuantizationConfig>,
-    /// If true, vectors are served from disk, improving RAM usage at the cost of latency
-    /// Default: false
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub on_disk: Option<bool>,
-}
-
-/// Is considered empty if `None` or if diff has no field specified
-fn is_hnsw_diff_empty(hnsw_config: &Option<HnswConfigDiff>) -> bool {
-    hnsw_config
-        .as_ref()
-        .and_then(|config| config_diff::is_empty(config).ok())
-        .unwrap_or(true)
-}
-
-impl Anonymize for VectorParams {
-    fn anonymize(&self) -> Self {
-        self.clone()
-    }
-}
-
-/// Vector params separator for single and multiple vector modes
-/// Single mode:
-///
-/// { "size": 128, "distance": "Cosine" }
-///
-/// or multiple mode:
-///
-/// {
-///      "default": {
-///          "size": 128,
-///          "distance": "Cosine"
-///      }
-/// }
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone, PartialEq, Hash, Eq)]
-#[serde(rename_all = "snake_case", untagged)]
-pub enum VectorsConfig {
-    Single(VectorParams),
-    Multi(BTreeMap<String, VectorParams>),
-}
-
-impl VectorsConfig {
-    pub fn get_params(&self, name: &str) -> Option<&VectorParams> {
-        match self {
-            VectorsConfig::Single(params) => (name == DEFAULT_VECTOR_NAME).then_some(params),
-            VectorsConfig::Multi(params) => params.get(name),
-        }
-    }
-
-    pub fn get_params_mut(&mut self, name: &str) -> Option<&mut VectorParams> {
-        match self {
-            VectorsConfig::Single(params) => (name == DEFAULT_VECTOR_NAME).then_some(params),
-            VectorsConfig::Multi(params) => params.get_mut(name),
-        }
-    }
-
-    /// Iterate over the named vector parameters.
-    ///
-    /// If this is `Single` it iterates over a single parameter named [`DEFAULT_VECTOR_NAME`].
-    pub fn params_iter<'a>(&'a self) -> Box<dyn Iterator<Item = (&str, &VectorParams)> + 'a> {
-        match self {
-            VectorsConfig::Single(p) => Box::new(std::iter::once((DEFAULT_VECTOR_NAME, p))),
-            VectorsConfig::Multi(p) => Box::new(p.iter().map(|(n, p)| (n.as_str(), p))),
-        }
-    }
-
-    fn check_vector_params_compatibility(
-        self_params: &VectorParams,
-        other_params: &VectorParams,
-        vector_name: &str,
-    ) -> Result<(), CollectionError> {
-        if self_params.size != other_params.size {
-            return Err(CollectionError::BadInput {
-                description: format!(
-                    "Vectors configuration is not compatible: origin vector {} size: {}, while other vector size: {}",
-                    vector_name, self_params.size, other_params.size
-                )
-            });
-        }
-
-        if self_params.distance != other_params.distance {
-            return Err(CollectionError::BadInput {
-                description: format!(
-                    "Vectors configuration is not compatible: origin vector {} distance: {:?}, while other vector distance: {:?}",
-                    vector_name, self_params.distance, other_params.distance
-                )
-            });
-        }
-
-        Ok(())
-    }
-
-    pub fn check_compatible(&self, other: &Self) -> Result<(), CollectionError> {
-        match (self, other) {
-            (VectorsConfig::Single(self_single), VectorsConfig::Single(other_single)) => {
-                Self::check_vector_params_compatibility(
-                    self_single,
-                    other_single,
-                    DEFAULT_VECTOR_NAME,
-                )
-            }
-            (VectorsConfig::Multi(self_params), VectorsConfig::Multi(other_params)) => {
-                for (self_vector_name, self_vector_params) in self_params {
-                    if let Some(other_vector_params) = other_params.get(self_vector_name) {
-                        Self::check_vector_params_compatibility(
-                            self_vector_params,
-                            other_vector_params,
-                            self_vector_name,
-                        )?;
-                    } else {
-                        return Err(CollectionError::BadInput {
-                            description: format!(
-                                "Vectors configuration is not compatible: origin collection have vector {}, while other collection does not",
-                                self_vector_name
-                            )
-                        });
-                    }
-                }
-                Ok(())
-            }
-            _ => {
-                let self_vectors = self
-                    .params_iter()
-                    .map(|(name, _)| name)
-                    .collect::<Vec<_>>()
-                    .join(", ");
-                let other_vectors = other
-                    .params_iter()
-                    .map(|(name, _)| name)
-                    .collect::<Vec<_>>()
-                    .join(", ");
-                Err(CollectionError::BadInput {
-                    description: format!("Vectors configuration is not compatible: origin collection have vectors: [{}], while other vectors: [{}]", self_vectors, other_vectors)
-                })
-            }
-        }
-    }
-}
-
-impl Anonymize for VectorsConfig {
-    fn anonymize(&self) -> Self {
-        match self {
-            VectorsConfig::Single(params) => VectorsConfig::Single(params.clone()),
-            VectorsConfig::Multi(params) => VectorsConfig::Multi(params.anonymize()),
-        }
-    }
-}
-
-impl Validate for VectorsConfig {
-    fn validate(&self) -> Result<(), ValidationErrors> {
-        match self {
-            VectorsConfig::Single(single) => single.validate(),
-            VectorsConfig::Multi(multi) => {
-                let errors = multi
-                    .values()
-                    .filter_map(|v| v.validate().err())
-                    .fold(Err(ValidationErrors::new()), |bag, err| {
-                        ValidationErrors::merge(bag, "?", Err(err))
-                    })
-                    .unwrap_err();
-                errors.errors().is_empty().then_some(()).ok_or(errors)
-            }
-        }
-    }
-}
-
-impl From<VectorParams> for VectorsConfig {
-    fn from(params: VectorParams) -> Self {
-        VectorsConfig::Single(params)
-    }
-}
-
-#[derive(
-    Debug, Hash, Deserialize, Serialize, JsonSchema, Validate, Clone, PartialEq, Eq, Merge,
-)]
-#[serde(rename_all = "snake_case")]
-pub struct VectorParamsDiff {
-    /// Update params for HNSW index. If empty object - it will be unset.
-    #[serde(default, skip_serializing_if = "is_hnsw_diff_empty")]
-    #[validate]
-    pub hnsw_config: Option<HnswConfigDiff>,
-    /// Update params for quantization. If none - it is left unchanged.
-    #[serde(
-        default,
-        alias = "quantization",
-        skip_serializing_if = "Option::is_none"
-    )]
-    #[validate]
-    pub quantization_config: Option<QuantizationConfigDiff>,
-    /// If true, vectors are served from disk, improving RAM usage at the cost of latency
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub on_disk: Option<bool>,
-}
-
-/// Vector update params for multiple vectors
-///
-/// {
-///     "vector_name": {
-///         "hnsw_config": { "m": 8 }
-///     }
-/// }
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone, PartialEq, Hash, Eq)]
-pub struct VectorsConfigDiff(pub BTreeMap<String, VectorParamsDiff>);
-
-impl VectorsConfigDiff {
-    /// Check that the vector names in this config are part of the given collection.
-    ///
-    /// Returns an error if incompatible.
-    pub fn check_vector_names(&self, collection: &CollectionParams) -> CollectionResult<()> {
-        for vector_name in self.0.keys() {
-            collection
-                .vectors
-                .get_params(vector_name)
-                .map(|_| ())
-                .ok_or_else(|| OperationError::VectorNameNotExists {
-                    received_name: vector_name.into(),
-                })?;
-        }
-        Ok(())
-    }
-}
-
-impl Validate for VectorsConfigDiff {
-    fn validate(&self) -> Result<(), ValidationErrors> {
-        let errors = self
-            .0
-            .values()
-            .filter_map(|v| v.validate().err())
-            .fold(Err(ValidationErrors::new()), |bag, err| {
-                ValidationErrors::merge(bag, "?", Err(err))
-            })
-            .unwrap_err();
-        errors.errors().is_empty().then_some(()).ok_or(errors)
-    }
-}
-
-impl From<VectorParamsDiff> for VectorsConfigDiff {
-    fn from(params: VectorParamsDiff) -> Self {
-        VectorsConfigDiff(BTreeMap::from([("".into(), params)]))
-    }
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub struct AliasDescription {
-    pub alias_name: String,
-    pub collection_name: String,
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub struct CollectionsAliasesResponse {
-    pub aliases: Vec<AliasDescription>,
-}
-
-#[derive(Clone, Debug, Deserialize, Default, Copy, PartialEq)]
-pub enum NodeType {
-    /// Regular node, participates in the cluster
-    #[default]
-    Normal,
-    /// Node that does only receive data, but is not used for search/read operations
-    /// This is useful for nodes that are only used for writing data
-    /// and backup purposes
-    Listener,
-}
-
-#[derive(Validate, Serialize, Deserialize, JsonSchema, Debug, Clone)]
-pub struct BaseGroupRequest {
-    /// Payload field to group by, must be a string or number field.
-    /// If the field contains more than 1 value, all values will be used for grouping.
-    /// One point can be in multiple groups.
-    #[validate(length(min = 1))]
-    pub group_by: String,
-
-    /// Maximum amount of points to return per group
-    #[validate(range(min = 1))]
-    pub group_size: u32,
-
-    /// Maximum amount of groups to return
-    #[validate(range(min = 1))]
-    pub limit: u32,
-
-    /// Look for points in another collection using the group ids
-    pub with_lookup: Option<WithLookupInterface>,
-}
diff --git a/crates/qdrant/lib/collection/src/operations/validation.rs b/crates/qdrant/lib/collection/src/operations/validation.rs
deleted file mode 100644
index bea2943..0000000
--- a/crates/qdrant/lib/collection/src/operations/validation.rs
+++ /dev/null
@@ -1,193 +0,0 @@
-use actix_web_validator::error::flatten_errors;
-use validator::{ValidationError, ValidationErrors};
-
-/// Warn about validation errors in the log.
-///
-/// Validation errors are pretty printed field-by-field.
-pub fn warn_validation_errors(description: &str, errs: &ValidationErrors) {
-    log::warn!("{description} has validation errors:");
-    describe_errors(errs)
-        .into_iter()
-        .for_each(|(key, msg)| log::warn!("- {key}: {}", msg));
-}
-
-/// Label the given validation errors in a single string.
-pub fn label_errors(label: impl AsRef<str>, errs: &ValidationErrors) -> String {
-    format!(
-        "{}: [{}]",
-        label.as_ref(),
-        describe_errors(errs)
-            .into_iter()
-            .map(|(field, err)| format!("{field}: {err}"))
-            .collect::<Vec<_>>()
-            .join("; ")
-    )
-}
-
-/// Describe the given validation errors.
-///
-/// Returns a list of error messages for fields: `(field, message)`
-fn describe_errors(errs: &ValidationErrors) -> Vec<(String, String)> {
-    flatten_errors(errs)
-        .into_iter()
-        .map(|(_, name, err)| (name, describe_error(err)))
-        .collect()
-}
-
-/// Describe a specific validation error.
-fn describe_error(
-    err @ ValidationError {
-        code,
-        message,
-        params,
-    }: &ValidationError,
-) -> String {
-    // Prefer to return message if set
-    if let Some(message) = message {
-        return message.to_string();
-    }
-
-    // Generate messages based on codes
-    match code.as_ref() {
-        "range" => {
-            let msg = match (params.get("min"), params.get("max")) {
-                (Some(min), None) => format!("must be {min} or larger"),
-                (Some(min), Some(max)) => format!("must be from {min} to {max}"),
-                (None, Some(max)) => format!("must be {max} or smaller"),
-                // Should be unreachable
-                _ => err.to_string(),
-            };
-            match params.get("value") {
-                Some(value) => format!("value {value} invalid, {msg}"),
-                None => msg,
-            }
-        }
-        "length" => {
-            let msg = match (params.get("equal"), params.get("min"), params.get("max")) {
-                (Some(equal), _, _) => format!("must be exactly {equal} characters"),
-                (None, Some(min), None) => format!("must be at least {min} characters"),
-                (None, Some(min), Some(max)) => {
-                    format!("must be from {min} to {max} characters")
-                }
-                (None, None, Some(max)) => format!("must be at most {max} characters"),
-                // Should be unreachable
-                _ => err.to_string(),
-            };
-            match params.get("value") {
-                Some(value) => format!("value {value} invalid, {msg}"),
-                None => msg,
-            }
-        }
-        "does_not_contain" => match params.get("pattern") {
-            Some(pattern) => format!("cannot contain {pattern}"),
-            None => err.to_string(),
-        },
-        "not_empty" => match params.get("value") {
-            Some(value) => format!("value {value} invalid, must not be empty"),
-            None => err.to_string(),
-        },
-        "closed_polygon" => {
-            "the first and the last points should be same to form a closed polygon".to_string()
-        }
-        "min_polygon_length" => match (params.get("min_length"), params.get("length")) {
-            (Some(min_length), Some(length)) => {
-                format! {"size must be at least {}, got {}", min_length, length}
-            }
-            _ => err.to_string(),
-        },
-        // Undescribed error codes
-        _ => err.to_string(),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use api::grpc::qdrant::{GeoPoint, GeoPolygon};
-    use validator::Validate;
-
-    use super::*;
-
-    #[derive(Validate, Debug)]
-    struct SomeThing {
-        #[validate(range(min = 1))]
-        pub idx: usize,
-    }
-
-    #[derive(Validate, Debug)]
-    struct OtherThing {
-        #[validate]
-        pub things: Vec<SomeThing>,
-    }
-
-    #[test]
-    fn test_validation() {
-        let bad_config = OtherThing {
-            things: vec![SomeThing { idx: 0 }],
-        };
-        assert!(
-            bad_config.validate().is_err(),
-            "validation of bad config should fail"
-        );
-    }
-
-    #[test]
-    fn test_validation_render() {
-        let bad_config = OtherThing {
-            things: vec![
-                SomeThing { idx: 0 },
-                SomeThing { idx: 1 },
-                SomeThing { idx: 2 },
-            ],
-        };
-
-        let errors = bad_config
-            .validate()
-            .expect_err("validation of bad config should fail");
-
-        assert_eq!(
-            describe_errors(&errors),
-            vec![(
-                "things[0].idx".into(),
-                "value 0 invalid, must be 1.0 or larger".into()
-            )]
-        );
-
-        let bad_polygon = GeoPolygon {
-            points: vec![
-                GeoPoint { lat: 1., lon: 1. },
-                GeoPoint { lat: 2., lon: 2. },
-                GeoPoint { lat: 1., lon: 1. },
-            ],
-        };
-
-        let errors = bad_polygon
-            .validate()
-            .expect_err("validation of bad polygon should fail");
-
-        assert_eq!(
-            describe_errors(&errors),
-            vec![("points".into(), "size must be at least 4, got 3".into())]
-        );
-
-        let bad_polygon = GeoPolygon {
-            points: vec![
-                GeoPoint { lat: 1., lon: 1. },
-                GeoPoint { lat: 2., lon: 2. },
-                GeoPoint { lat: 3., lon: 3. },
-                GeoPoint { lat: 4., lon: 4. },
-            ],
-        };
-
-        let errors = bad_polygon
-            .validate()
-            .expect_err("validation of bad polygon should fail");
-
-        assert_eq!(
-            describe_errors(&errors),
-            vec![(
-                "points".into(),
-                "the first and the last points should be same to form a closed polygon".into()
-            )]
-        );
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/operations/vector_ops.rs b/crates/qdrant/lib/collection/src/operations/vector_ops.rs
deleted file mode 100644
index b258781..0000000
--- a/crates/qdrant/lib/collection/src/operations/vector_ops.rs
+++ /dev/null
@@ -1,127 +0,0 @@
-use std::borrow::Cow;
-use std::collections::{HashMap, HashSet};
-
-use schemars::JsonSchema;
-use segment::data_types::vectors::VectorStruct;
-use segment::types::{Filter, PointIdType};
-use serde::{Deserialize, Serialize};
-use validator::{Validate, ValidationError};
-
-use super::point_ops::PointIdsList;
-use super::{point_to_shard, split_iter_by_shard, OperationToShard, SplitByShard};
-use crate::hash_ring::HashRing;
-use crate::shards::shard::ShardId;
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Validate, Clone)]
-pub struct UpdateVectors {
-    /// Points with named vectors
-    #[validate]
-    #[validate(length(min = 1, message = "must specify points to update"))]
-    pub points: Vec<PointVectors>,
-}
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Validate, Clone)]
-pub struct PointVectors {
-    /// Point id
-    pub id: PointIdType,
-    /// Vectors
-    #[serde(alias = "vectors")]
-    #[validate(custom(
-        function = "validate_vector_struct_not_empty",
-        message = "must specify vectors to update for point"
-    ))]
-    pub vector: VectorStruct,
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Validate)]
-pub struct DeleteVectors {
-    /// Deletes values from each point in this list
-    pub points: Option<Vec<PointIdType>>,
-    /// Deletes values from points that satisfy this filter condition
-    pub filter: Option<Filter>,
-    /// Vector names
-    #[serde(alias = "vectors")]
-    #[validate(length(min = 1, message = "must specify vector names to delete"))]
-    pub vector: HashSet<String>,
-}
-
-#[derive(Debug, Deserialize, Serialize, Clone)]
-#[serde(rename_all = "snake_case")]
-pub enum VectorOperations {
-    /// Update vectors
-    UpdateVectors(UpdateVectors),
-    /// Delete vectors if exists
-    DeleteVectors(PointIdsList, Vec<String>),
-    /// Delete vectors by given filter criteria
-    DeleteVectorsByFilter(Filter, Vec<String>),
-}
-
-impl VectorOperations {
-    pub fn is_write_operation(&self) -> bool {
-        match self {
-            VectorOperations::UpdateVectors(_) => true,
-            VectorOperations::DeleteVectors(..) => false,
-            VectorOperations::DeleteVectorsByFilter(..) => false,
-        }
-    }
-}
-
-impl Validate for VectorOperations {
-    fn validate(&self) -> Result<(), validator::ValidationErrors> {
-        match self {
-            VectorOperations::UpdateVectors(update_vectors) => update_vectors.validate(),
-            VectorOperations::DeleteVectors(..) => Ok(()),
-            VectorOperations::DeleteVectorsByFilter(..) => Ok(()),
-        }
-    }
-}
-
-impl SplitByShard for Vec<PointVectors> {
-    fn split_by_shard(self, ring: &HashRing<ShardId>) -> OperationToShard<Self> {
-        split_iter_by_shard(self, |point| point.id, ring)
-    }
-}
-
-impl SplitByShard for VectorOperations {
-    fn split_by_shard(self, ring: &HashRing<ShardId>) -> OperationToShard<Self> {
-        match self {
-            VectorOperations::UpdateVectors(update_vectors) => {
-                let shard_points = update_vectors
-                    .points
-                    .into_iter()
-                    .map(|point| {
-                        let shard_id = point_to_shard(point.id, ring);
-                        (shard_id, point)
-                    })
-                    .fold(HashMap::new(), |mut map, (shard_id, points)| {
-                        map.entry(shard_id).or_insert(vec![]).push(points);
-                        map
-                    });
-                let shard_ops = shard_points.into_iter().map(|(shard_id, points)| {
-                    (
-                        shard_id,
-                        VectorOperations::UpdateVectors(UpdateVectors { points }),
-                    )
-                });
-                OperationToShard::by_shard(shard_ops)
-            }
-            VectorOperations::DeleteVectors(ids, vector_names) => {
-                split_iter_by_shard(ids.points, |id| *id, ring)
-                    .map(|ids| VectorOperations::DeleteVectors(ids.into(), vector_names.clone()))
-            }
-            by_filter @ VectorOperations::DeleteVectorsByFilter(..) => {
-                OperationToShard::to_all(by_filter)
-            }
-        }
-    }
-}
-
-/// Validate the vector struct is not empty.
-fn validate_vector_struct_not_empty(value: &VectorStruct) -> Result<(), ValidationError> {
-    if !value.is_empty() {
-        return Ok(());
-    }
-
-    let mut err = ValidationError::new("length");
-    err.add_param(Cow::from("min"), &1);
-    Err(err)
-}
diff --git a/crates/qdrant/lib/collection/src/optimizers_builder.rs b/crates/qdrant/lib/collection/src/optimizers_builder.rs
deleted file mode 100644
index f296b3d..0000000
--- a/crates/qdrant/lib/collection/src/optimizers_builder.rs
+++ /dev/null
@@ -1,192 +0,0 @@
-use std::path::Path;
-use std::sync::Arc;
-
-use schemars::JsonSchema;
-use segment::common::cpu::get_num_cpus;
-use segment::types::{HnswConfig, QuantizationConfig};
-use serde::{Deserialize, Serialize};
-use validator::Validate;
-
-use crate::collection_manager::optimizers::config_mismatch_optimizer::ConfigMismatchOptimizer;
-use crate::collection_manager::optimizers::indexing_optimizer::IndexingOptimizer;
-use crate::collection_manager::optimizers::merge_optimizer::MergeOptimizer;
-use crate::collection_manager::optimizers::segment_optimizer::OptimizerThresholds;
-use crate::collection_manager::optimizers::vacuum_optimizer::VacuumOptimizer;
-use crate::config::CollectionParams;
-use crate::update_handler::Optimizer;
-
-const DEFAULT_MAX_SEGMENT_PER_CPU_KB: usize = 200_000;
-const DEFAULT_INDEXING_THRESHOLD_KB: usize = 20_000;
-const SEGMENTS_PATH: &str = "segments";
-const TEMP_SEGMENTS_PATH: &str = "temp_segments";
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Validate, Clone, PartialEq)]
-pub struct OptimizersConfig {
-    /// The minimal fraction of deleted vectors in a segment, required to perform segment optimization
-    #[validate(range(min = 0.0, max = 1.0))]
-    pub deleted_threshold: f64,
-    /// The minimal number of vectors in a segment, required to perform segment optimization
-    #[validate(range(min = 100))]
-    pub vacuum_min_vector_number: usize,
-    /// Target amount of segments optimizer will try to keep.
-    /// Real amount of segments may vary depending on multiple parameters:
-    ///  - Amount of stored points
-    ///  - Current write RPS
-    ///
-    /// It is recommended to select default number of segments as a factor of the number of search threads,
-    /// so that each segment would be handled evenly by one of the threads.
-    /// If `default_segment_number = 0`, will be automatically selected by the number of available CPUs.
-    pub default_segment_number: usize,
-    /// Do not create segments larger this size (in kilobytes).
-    /// Large segments might require disproportionately long indexation times,
-    /// therefore it makes sense to limit the size of segments.
-    ///
-    /// If indexing speed is more important - make this parameter lower.
-    /// If search speed is more important - make this parameter higher.
-    /// Note: 1Kb = 1 vector of size 256
-    /// If not set, will be automatically selected considering the number of available CPUs.
-    #[serde(alias = "max_segment_size_kb")]
-    #[serde(default)]
-    pub max_segment_size: Option<usize>,
-    /// Maximum size (in kilobytes) of vectors to store in-memory per segment.
-    /// Segments larger than this threshold will be stored as read-only memmaped file.
-    ///
-    /// Memmap storage is disabled by default, to enable it, set this threshold to a reasonable value.
-    ///
-    /// To disable memmap storage, set this to `0`. Internally it will use the largest threshold possible.
-    ///
-    /// Note: 1Kb = 1 vector of size 256
-    #[serde(alias = "memmap_threshold_kb")]
-    #[serde(default)]
-    pub memmap_threshold: Option<usize>,
-    /// Maximum size (in kilobytes) of vectors allowed for plain index, exceeding this threshold will enable vector indexing
-    ///
-    /// Default value is 20,000, based on <https://github.com/google-research/google-research/blob/master/scann/docs/algorithms.md>.
-    ///
-    /// To disable vector indexing, set to `0`.
-    ///
-    /// Note: 1kB = 1 vector of size 256.
-    #[serde(alias = "indexing_threshold_kb")]
-    #[serde(default)]
-    pub indexing_threshold: Option<usize>,
-    /// Minimum interval between forced flushes.
-    pub flush_interval_sec: u64,
-    /// Maximum available threads for optimization workers
-    pub max_optimization_threads: usize,
-}
-
-impl OptimizersConfig {
-    #[cfg(test)]
-    pub fn fixture() -> Self {
-        Self {
-            deleted_threshold: 0.1,
-            vacuum_min_vector_number: 1000,
-            default_segment_number: 0,
-            max_segment_size: None,
-            memmap_threshold: None,
-            indexing_threshold: Some(100_000),
-            flush_interval_sec: 60,
-            max_optimization_threads: 0,
-        }
-    }
-
-    pub fn get_number_segments(&self) -> usize {
-        if self.default_segment_number == 0 {
-            let num_cpus = get_num_cpus();
-            // Do not configure less than 2 and more than 8 segments
-            // until it is not explicitly requested
-            num_cpus.clamp(2, 8)
-        } else {
-            self.default_segment_number
-        }
-    }
-
-    pub fn get_max_segment_size(&self) -> usize {
-        if let Some(max_segment_size) = self.max_segment_size {
-            max_segment_size
-        } else {
-            let num_cpus = get_num_cpus();
-            num_cpus.saturating_mul(DEFAULT_MAX_SEGMENT_PER_CPU_KB)
-        }
-    }
-}
-
-pub fn clear_temp_segments(shard_path: &Path) {
-    let temp_segments_path = shard_path.join(TEMP_SEGMENTS_PATH);
-    if temp_segments_path.exists() {
-        log::debug!("Removing temp_segments directory: {:?}", temp_segments_path);
-        if let Err(err) = std::fs::remove_dir_all(&temp_segments_path) {
-            log::warn!(
-                "Failed to remove temp_segments directory: {:?}, error: {:?}",
-                temp_segments_path,
-                err
-            );
-        }
-    }
-}
-
-pub fn build_optimizers(
-    shard_path: &Path,
-    collection_params: &CollectionParams,
-    optimizers_config: &OptimizersConfig,
-    hnsw_config: &HnswConfig,
-    quantization_config: &Option<QuantizationConfig>,
-) -> Arc<Vec<Arc<Optimizer>>> {
-    let segments_path = shard_path.join(SEGMENTS_PATH);
-    let temp_segments_path = shard_path.join(TEMP_SEGMENTS_PATH);
-
-    let indexing_threshold = match optimizers_config.indexing_threshold {
-        None => DEFAULT_INDEXING_THRESHOLD_KB, // default value
-        Some(0) => usize::MAX,                 // disable vector index
-        Some(custom) => custom,
-    };
-
-    let memmap_threshold = match optimizers_config.memmap_threshold {
-        None | Some(0) => usize::MAX, // default | disable memmap
-        Some(custom) => custom,
-    };
-
-    let threshold_config = OptimizerThresholds {
-        memmap_threshold,
-        indexing_threshold,
-        max_segment_size: optimizers_config.get_max_segment_size(),
-    };
-
-    Arc::new(vec![
-        Arc::new(MergeOptimizer::new(
-            optimizers_config.get_number_segments(),
-            threshold_config.clone(),
-            segments_path.clone(),
-            temp_segments_path.clone(),
-            collection_params.clone(),
-            hnsw_config.clone(),
-            quantization_config.clone(),
-        )),
-        Arc::new(IndexingOptimizer::new(
-            threshold_config.clone(),
-            segments_path.clone(),
-            temp_segments_path.clone(),
-            collection_params.clone(),
-            hnsw_config.clone(),
-            quantization_config.clone(),
-        )),
-        Arc::new(VacuumOptimizer::new(
-            optimizers_config.deleted_threshold,
-            optimizers_config.vacuum_min_vector_number,
-            threshold_config.clone(),
-            segments_path.clone(),
-            temp_segments_path.clone(),
-            collection_params.clone(),
-            hnsw_config.clone(),
-            quantization_config.clone(),
-        )),
-        Arc::new(ConfigMismatchOptimizer::new(
-            threshold_config,
-            segments_path,
-            temp_segments_path,
-            collection_params.clone(),
-            hnsw_config.clone(),
-            quantization_config.clone(),
-        )),
-    ])
-}
diff --git a/crates/qdrant/lib/collection/src/recommendations.rs b/crates/qdrant/lib/collection/src/recommendations.rs
deleted file mode 100644
index 8890dda..0000000
--- a/crates/qdrant/lib/collection/src/recommendations.rs
+++ /dev/null
@@ -1,314 +0,0 @@
-use std::collections::{HashMap, HashSet};
-use std::future::Future;
-
-use futures::future::try_join_all;
-use itertools::Itertools;
-use segment::data_types::vectors::{NamedVector, VectorElementType, DEFAULT_VECTOR_NAME};
-use segment::types::{
-    Condition, Filter, HasIdCondition, PointIdType, ScoredPoint, WithPayloadInterface, WithVector,
-};
-use tokio::sync::RwLockReadGuard;
-
-use crate::collection::Collection;
-use crate::operations::consistency_params::ReadConsistency;
-use crate::operations::types::{
-    CollectionError, CollectionResult, PointRequest, RecommendRequest, RecommendRequestBatch,
-    Record, SearchRequest, SearchRequestBatch, UsingVector,
-};
-
-fn avg_vectors<'a>(
-    vectors: impl Iterator<Item = &'a Vec<VectorElementType>>,
-) -> Vec<VectorElementType> {
-    let mut count: usize = 0;
-    let mut avg_vector: Vec<VectorElementType> = vec![];
-    for vector in vectors {
-        count += 1;
-        for i in 0..vector.len() {
-            if i >= avg_vector.len() {
-                avg_vector.push(vector[i])
-            } else {
-                avg_vector[i] += vector[i];
-            }
-        }
-    }
-
-    for item in &mut avg_vector {
-        *item /= count as VectorElementType;
-    }
-
-    avg_vector
-}
-
-pub async fn recommend_by<'a, F, Fut>(
-    request: RecommendRequest,
-    collection: &Collection,
-    collection_by_name: F,
-    read_consistency: Option<ReadConsistency>,
-) -> CollectionResult<Vec<ScoredPoint>>
-where
-    F: Fn(String) -> Fut,
-    Fut: Future<Output = Option<RwLockReadGuard<'a, Collection>>>,
-{
-    if request.limit == 0 {
-        return Ok(vec![]);
-    }
-    // `recommend_by` is a special case of recommend_by_batch with a single batch
-    let request_batch = RecommendRequestBatch {
-        searches: vec![request],
-    };
-    let results = recommend_batch_by(
-        request_batch,
-        collection,
-        collection_by_name,
-        read_consistency,
-    )
-    .await?;
-    Ok(results.into_iter().next().unwrap())
-}
-
-async fn retrieve_points(
-    collection: &Collection,
-    ids: Vec<PointIdType>,
-    vector_names: Vec<String>,
-    read_consistency: Option<ReadConsistency>,
-) -> CollectionResult<Vec<Record>> {
-    collection
-        .retrieve(
-            PointRequest {
-                ids,
-                with_payload: Some(WithPayloadInterface::Bool(false)),
-                with_vector: WithVector::Selector(vector_names),
-            },
-            read_consistency,
-            None,
-        )
-        .await
-}
-
-enum CollectionRefHolder<'a> {
-    Ref(&'a Collection),
-    Guard(RwLockReadGuard<'a, Collection>),
-}
-
-async fn retrieve_points_with_locked_collection(
-    collection_holder: CollectionRefHolder<'_>,
-    ids: Vec<PointIdType>,
-    vector_names: Vec<String>,
-    read_consistency: Option<ReadConsistency>,
-) -> CollectionResult<Vec<Record>> {
-    match collection_holder {
-        CollectionRefHolder::Ref(collection) => {
-            retrieve_points(collection, ids, vector_names, read_consistency).await
-        }
-        CollectionRefHolder::Guard(guard) => {
-            retrieve_points(&guard, ids, vector_names, read_consistency).await
-        }
-    }
-}
-
-fn get_search_vector_name(request: &RecommendRequest) -> String {
-    match &request.lookup_from {
-        None => match &request.using {
-            None => DEFAULT_VECTOR_NAME.to_owned(),
-            Some(UsingVector::Name(vector_name)) => vector_name.clone(),
-        },
-        Some(lookup_from) => match &lookup_from.vector {
-            None => DEFAULT_VECTOR_NAME.to_owned(),
-            Some(vector_name) => vector_name.clone(),
-        },
-    }
-}
-
-/// Search points in a collection by already existing points in this or another collection.
-///
-/// Function works in following stages:
-///
-/// - Constructs queries to retrieve points from the existing collections
-/// - Executes queries in parallel
-/// - Converts retrieve results into lookup table
-/// - Constructs regular search queries, execute them as single batch
-///
-/// # Arguments
-///
-/// * `request_batch` - batch recommendations request
-/// * `search_runtime_handle` - tokio runtime handle to execute search queries
-/// * `collection` - collection to search in
-/// * `collection_by_name` - function to retrieve collection by name, used to retrieve points from other collections
-///
-pub async fn recommend_batch_by<'a, F, Fut>(
-    request_batch: RecommendRequestBatch,
-    collection: &Collection,
-    collection_by_name: F,
-    read_consistency: Option<ReadConsistency>,
-) -> CollectionResult<Vec<Vec<ScoredPoint>>>
-where
-    F: Fn(String) -> Fut,
-    Fut: Future<Output = Option<RwLockReadGuard<'a, Collection>>>,
-{
-    // shortcuts batch if all requests with limit=0
-    if request_batch.searches.iter().all(|s| s.limit == 0) {
-        return Ok(vec![]);
-    }
-    // pack all reference vector ids
-    let mut all_reference_vectors_ids: HashMap<_, HashSet<PointIdType>> = Default::default();
-    let mut vector_names_per_collection: HashMap<_, HashSet<String>> = Default::default();
-
-    for request in &request_batch.searches {
-        if request.positive.is_empty() {
-            return Err(CollectionError::BadRequest {
-                description: "At least one positive vector ID required".to_owned(),
-            });
-        }
-        let collection_name = request.lookup_from.as_ref().map(|x| &x.collection);
-
-        let reference_vectors_ids = all_reference_vectors_ids
-            .entry(collection_name)
-            .or_insert_with(HashSet::new);
-
-        let vector_names = vector_names_per_collection
-            .entry(collection_name)
-            .or_insert_with(HashSet::new);
-
-        vector_names.insert(get_search_vector_name(request));
-
-        for point_id in request.positive.iter().chain(&request.negative) {
-            reference_vectors_ids.insert(*point_id);
-        }
-    }
-
-    debug_assert!(all_reference_vectors_ids.len() == vector_names_per_collection.len());
-
-    let mut collections_names: Vec<_> = Default::default();
-    let mut vector_retrieves: Vec<_> = Default::default();
-    for (collection_name, reference_vectors_ids) in all_reference_vectors_ids.into_iter() {
-        collections_names.push(collection_name);
-        let points: Vec<_> = reference_vectors_ids.into_iter().collect();
-        let vector_names: Vec<_> = vector_names_per_collection
-            .remove(&collection_name)
-            .unwrap()
-            .into_iter()
-            .collect();
-        match collection_name {
-            None => vector_retrieves.push(retrieve_points_with_locked_collection(
-                CollectionRefHolder::Ref(collection),
-                points,
-                vector_names,
-                read_consistency,
-            )),
-            Some(name) => {
-                let other_collection = collection_by_name(name.to_string()).await;
-                match other_collection {
-                    Some(other_collection) => {
-                        vector_retrieves.push(retrieve_points_with_locked_collection(
-                            CollectionRefHolder::Guard(other_collection),
-                            points,
-                            vector_names,
-                            read_consistency,
-                        ))
-                    }
-                    None => {
-                        return Err(CollectionError::NotFound {
-                            what: format!("Collection {name}"),
-                        })
-                    }
-                }
-            }
-        }
-    }
-
-    let all_reference_vectors: Vec<Vec<Record>> = try_join_all(vector_retrieves).await?;
-
-    let mut all_vectors_records_map: HashMap<_, _> = Default::default();
-
-    for (collection_name, reference_vectors) in
-        collections_names.into_iter().zip(all_reference_vectors)
-    {
-        for rec in reference_vectors {
-            all_vectors_records_map.insert((collection_name, rec.id), rec);
-        }
-    }
-
-    let mut searches = Vec::with_capacity(request_batch.searches.len());
-
-    for request in &request_batch.searches {
-        let vector_name = match &request.using {
-            None => DEFAULT_VECTOR_NAME,
-            Some(UsingVector::Name(name)) => name,
-        };
-
-        let lookup_vector_name = get_search_vector_name(request);
-
-        let reference_vectors_ids = request
-            .positive
-            .iter()
-            .chain(&request.negative)
-            .cloned()
-            .collect_vec();
-
-        let request_from_collection = request.lookup_from.as_ref().map(|x| &x.collection);
-
-        for &point_id in &reference_vectors_ids {
-            if !all_vectors_records_map.contains_key(&(request_from_collection, point_id)) {
-                return Err(CollectionError::PointNotFound {
-                    missed_point_id: point_id,
-                });
-            }
-        }
-
-        let avg_positive = avg_vectors(request.positive.iter().filter_map(|vid| {
-            let rec = all_vectors_records_map
-                .get(&(request_from_collection, *vid))
-                .unwrap();
-            rec.get_vector_by_name(&lookup_vector_name)
-        }));
-
-        let search_vector = if request.negative.is_empty() {
-            avg_positive
-        } else {
-            let avg_negative = avg_vectors(request.negative.iter().filter_map(|vid| {
-                let rec = all_vectors_records_map
-                    .get(&(request_from_collection, *vid))
-                    .unwrap();
-                rec.get_vector_by_name(&lookup_vector_name)
-            }));
-
-            avg_positive
-                .iter()
-                .cloned()
-                .zip(avg_negative.iter().cloned())
-                .map(|(pos, neg)| pos + pos - neg)
-                .collect()
-        };
-
-        let search_request = SearchRequest {
-            vector: NamedVector {
-                name: vector_name.to_string(),
-                vector: search_vector,
-            }
-            .into(),
-            filter: Some(Filter {
-                should: None,
-                must: request
-                    .filter
-                    .clone()
-                    .map(|filter| vec![Condition::Filter(filter)]),
-                must_not: Some(vec![Condition::HasId(HasIdCondition {
-                    has_id: reference_vectors_ids.iter().cloned().collect(),
-                })]),
-            }),
-            with_payload: request.with_payload.clone(),
-            with_vector: request.with_vector.clone(),
-            params: request.params,
-            limit: request.limit,
-            score_threshold: request.score_threshold,
-            offset: request.offset,
-        };
-        searches.push(search_request)
-    }
-
-    let search_batch_request = SearchRequestBatch { searches };
-
-    collection
-        .search_batch(search_batch_request, read_consistency, None)
-        .await
-}
diff --git a/crates/qdrant/lib/collection/src/save_on_disk.rs b/crates/qdrant/lib/collection/src/save_on_disk.rs
deleted file mode 100644
index f90c44e..0000000
--- a/crates/qdrant/lib/collection/src/save_on_disk.rs
+++ /dev/null
@@ -1,199 +0,0 @@
-use std::fs::File;
-use std::io::BufWriter;
-use std::ops::{Deref, DerefMut};
-use std::path::PathBuf;
-
-use atomicwrites::OverwriteBehavior::AllowOverwrite;
-use atomicwrites::{AtomicFile, Error as AtomicWriteError};
-use parking_lot::{Condvar, Mutex, RwLock, RwLockReadGuard, RwLockUpgradableReadGuard};
-use serde::{Deserialize, Serialize};
-
-/// Functions as a smart pointer which gives a write guard and saves data on disk
-/// when write guard is dropped.
-#[derive(Debug, Default)]
-pub struct SaveOnDisk<T> {
-    change_notification: Condvar,
-    notification_lock: Mutex<()>,
-    data: RwLock<T>,
-    path: PathBuf,
-}
-
-pub struct WriteGuard<'a, T: Serialize>(&'a mut SaveOnDisk<T>);
-
-#[derive(thiserror::Error, Debug)]
-pub enum Error {
-    #[error("Failed to save structure on disk with error: {0}")]
-    AtomicWrite(#[from] AtomicWriteError<serde_json::Error>),
-    #[error("Failed to perform io operation: {0}")]
-    IoError(#[from] std::io::Error),
-    #[error("Failed to (de)serialize from/to json: {0}")]
-    JsonError(#[from] serde_json::Error),
-    #[error("Error in write closure: {0}")]
-    FromClosure(Box<dyn std::error::Error>),
-}
-
-impl<T: Serialize + Default + for<'de> Deserialize<'de> + Clone> SaveOnDisk<T> {
-    pub fn load_or_init(path: impl Into<PathBuf>) -> Result<Self, Error> {
-        let path: PathBuf = path.into();
-        let data = if path.exists() {
-            let file = File::open(&path)?;
-            serde_json::from_reader(&file)?
-        } else {
-            Default::default()
-        };
-        Ok(Self {
-            change_notification: Condvar::new(),
-            notification_lock: Default::default(),
-            data: RwLock::new(data),
-            path,
-        })
-    }
-
-    /// Wait for a condition on data to be true.
-    ///
-    /// Returns `true` if condition is true, `false` if timed out.
-    pub fn wait_for<F>(&self, check: F, timeout: std::time::Duration) -> bool
-    where
-        F: Fn(&T) -> bool,
-    {
-        let start = std::time::Instant::now();
-        while start.elapsed() < timeout {
-            let mut data_read_guard = self.data.read();
-            if check(&data_read_guard) {
-                return true;
-            }
-            let notification_guard = self.notification_lock.lock();
-            // Based on https://github.com/Amanieu/parking_lot/issues/165
-            RwLockReadGuard::unlocked(&mut data_read_guard, || {
-                // Move the guard in so it gets unlocked before we re-lock g
-                let mut guard = notification_guard;
-                self.change_notification.wait_for(&mut guard, timeout);
-            });
-        }
-        false
-    }
-
-    pub fn write<O>(&self, f: impl FnOnce(&mut T) -> O) -> Result<O, Error> {
-        let read_data = self.data.upgradable_read();
-        let mut data_copy = (*read_data).clone();
-        let output = f(&mut data_copy);
-        Self::save_data_to(&self.path, &data_copy)?;
-
-        let mut write_data = RwLockUpgradableReadGuard::upgrade(read_data);
-
-        *write_data = data_copy;
-        self.change_notification.notify_all();
-        Ok(output)
-    }
-
-    fn save_data_to(path: impl Into<PathBuf>, data: &T) -> Result<(), Error> {
-        let path: PathBuf = path.into();
-        AtomicFile::new(path, AllowOverwrite).write(|file| {
-            let writer = BufWriter::new(file);
-            serde_json::to_writer(writer, data)
-        })?;
-        Ok(())
-    }
-
-    pub fn save(&self) -> Result<(), Error> {
-        self.save_to(&self.path)
-    }
-
-    pub fn save_to(&self, path: impl Into<PathBuf>) -> Result<(), Error> {
-        Self::save_data_to(path, &self.data.read())
-    }
-}
-
-impl<T> Deref for SaveOnDisk<T> {
-    type Target = RwLock<T>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.data
-    }
-}
-
-impl<T> DerefMut for SaveOnDisk<T> {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.data
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::sync::Arc;
-    use std::thread::sleep;
-    use std::time::Duration;
-    use std::{fs, thread};
-
-    use tempfile::Builder;
-
-    use super::SaveOnDisk;
-
-    #[test]
-    fn saves_data() {
-        let dir = Builder::new().prefix("test").tempdir().unwrap();
-        let counter_file = dir.path().join("counter");
-        let counter: SaveOnDisk<u32> = SaveOnDisk::load_or_init(&counter_file).unwrap();
-        counter.write(|counter| *counter += 1).unwrap();
-        assert_eq!(*counter.read(), 1);
-        assert_eq!(
-            counter.read().to_string(),
-            fs::read_to_string(&counter_file).unwrap()
-        );
-        counter.write(|counter| *counter += 1).unwrap();
-        assert_eq!(*counter.read(), 2);
-        assert_eq!(
-            counter.read().to_string(),
-            fs::read_to_string(&counter_file).unwrap()
-        );
-    }
-
-    #[test]
-    fn loads_data() {
-        let dir = Builder::new().prefix("test").tempdir().unwrap();
-        let counter_file = dir.path().join("counter");
-        let counter: SaveOnDisk<u32> = SaveOnDisk::load_or_init(&counter_file).unwrap();
-        counter.write(|counter| *counter += 1).unwrap();
-        let counter: SaveOnDisk<u32> = SaveOnDisk::load_or_init(&counter_file).unwrap();
-        let value = *counter.read();
-        assert_eq!(value, 1)
-    }
-
-    #[test]
-    fn test_wait_for_condition_change() {
-        let dir = Builder::new().prefix("test").tempdir().unwrap();
-        let counter_file = dir.path().join("counter");
-        let counter: Arc<SaveOnDisk<u32>> =
-            Arc::new(SaveOnDisk::load_or_init(counter_file).unwrap());
-        let counter_copy = counter.clone();
-        let handle = thread::spawn(move || {
-            sleep(Duration::from_millis(100));
-            counter_copy.write(|counter| *counter += 3).unwrap();
-            sleep(Duration::from_millis(100));
-            counter_copy.write(|counter| *counter += 7).unwrap();
-            sleep(Duration::from_millis(100));
-        });
-
-        assert!(counter.wait_for(|counter| *counter > 5, Duration::from_secs(1)));
-        handle.join().unwrap();
-    }
-
-    #[test]
-    fn test_wait_for_condition_change_timeout() {
-        let dir = Builder::new().prefix("test").tempdir().unwrap();
-        let counter_file = dir.path().join("counter");
-        let counter: Arc<SaveOnDisk<u32>> =
-            Arc::new(SaveOnDisk::load_or_init(counter_file).unwrap());
-        let counter_copy = counter.clone();
-        let handle = thread::spawn(move || {
-            sleep(Duration::from_millis(200));
-            counter_copy.write(|counter| *counter += 3).unwrap();
-            sleep(Duration::from_millis(200));
-            counter_copy.write(|counter| *counter += 7).unwrap();
-            sleep(Duration::from_millis(200));
-        });
-
-        assert!(!counter.wait_for(|counter| *counter > 5, Duration::from_millis(300)));
-        handle.join().unwrap();
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/shards/channel_service.rs b/crates/qdrant/lib/collection/src/shards/channel_service.rs
deleted file mode 100644
index 01ca214..0000000
--- a/crates/qdrant/lib/collection/src/shards/channel_service.rs
+++ /dev/null
@@ -1,33 +0,0 @@
-use std::collections::HashMap;
-use std::sync::Arc;
-
-use api::grpc::transport_channel_pool::TransportChannelPool;
-use tonic::transport::Uri;
-
-use crate::shards::shard::PeerId;
-
-#[derive(Clone, Default)]
-pub struct ChannelService {
-    // Shared with consensus_state
-    pub id_to_address: Arc<parking_lot::RwLock<HashMap<PeerId, Uri>>>,
-    pub channel_pool: Arc<TransportChannelPool>,
-}
-
-impl ChannelService {
-    pub fn new(
-        id_to_address: Arc<parking_lot::RwLock<HashMap<PeerId, Uri>>>,
-        channel_pool: Arc<TransportChannelPool>,
-    ) -> Self {
-        Self {
-            id_to_address,
-            channel_pool,
-        }
-    }
-
-    pub async fn remove_peer(&self, peer_id: PeerId) {
-        let removed = self.id_to_address.write().remove(&peer_id);
-        if let Some(uri) = removed {
-            self.channel_pool.drop_pool(&uri).await;
-        }
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/shards/collection_shard_distribution.rs b/crates/qdrant/lib/collection/src/shards/collection_shard_distribution.rs
deleted file mode 100644
index b625ed5..0000000
--- a/crates/qdrant/lib/collection/src/shards/collection_shard_distribution.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-use std::collections::{HashMap, HashSet};
-
-use crate::collection_state::ShardInfo;
-use crate::shards::shard::{PeerId, ShardId};
-
-#[derive(Debug, Clone)]
-pub struct CollectionShardDistribution {
-    pub shards: HashMap<ShardId, HashSet<PeerId>>,
-}
-
-impl CollectionShardDistribution {
-    pub fn all_local(shard_number: Option<u32>, this_peer_id: PeerId) -> Self {
-        Self {
-            shards: (0..shard_number.unwrap_or(1))
-                .map(|shard_id| (shard_id, vec![this_peer_id].into_iter().collect()))
-                .collect(),
-        }
-    }
-
-    pub fn from_shards_info(shards_info: HashMap<ShardId, ShardInfo>) -> Self {
-        Self {
-            shards: shards_info
-                .into_iter()
-                .map(|(shard_id, info)| (shard_id, info.replicas.into_keys().collect()))
-                .collect(),
-        }
-    }
-
-    pub fn shard_count(&self) -> usize {
-        self.shards.len()
-    }
-
-    pub fn shard_replica_count(&self) -> usize {
-        self.shards.values().map(|shard| shard.len()).sum()
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/shards/conversions.rs b/crates/qdrant/lib/collection/src/shards/conversions.rs
deleted file mode 100644
index 88675b0..0000000
--- a/crates/qdrant/lib/collection/src/shards/conversions.rs
+++ /dev/null
@@ -1,394 +0,0 @@
-use api::grpc::conversions::payload_to_proto;
-use api::grpc::qdrant::points_selector::PointsSelectorOneOf;
-use api::grpc::qdrant::{
-    ClearPayloadPoints, ClearPayloadPointsInternal, CreateFieldIndexCollection,
-    CreateFieldIndexCollectionInternal, DeleteFieldIndexCollection,
-    DeleteFieldIndexCollectionInternal, DeletePayloadPoints, DeletePayloadPointsInternal,
-    DeletePointVectors, DeletePoints, DeletePointsInternal, DeleteVectorsInternal, PointVectors,
-    PointsIdsList, PointsSelector, SetPayloadPoints, SetPayloadPointsInternal, SyncPoints,
-    SyncPointsInternal, UpdatePointVectors, UpdateVectorsInternal, UpsertPoints,
-    UpsertPointsInternal, VectorsSelector,
-};
-use segment::types::{Filter, PayloadFieldSchema, PayloadSchemaParams, PointIdType, ScoredPoint};
-use tonic::Status;
-
-use crate::operations::conversions::write_ordering_to_proto;
-use crate::operations::payload_ops::{DeletePayload, SetPayload};
-use crate::operations::point_ops::{PointInsertOperations, PointSyncOperation, WriteOrdering};
-use crate::operations::types::CollectionResult;
-use crate::operations::vector_ops::UpdateVectors;
-use crate::operations::CreateIndex;
-use crate::shards::shard::ShardId;
-
-pub fn internal_sync_points(
-    shard_id: Option<ShardId>,
-    collection_name: String,
-    points_sync_operation: PointSyncOperation,
-    wait: bool,
-    ordering: Option<WriteOrdering>,
-) -> CollectionResult<SyncPointsInternal> {
-    Ok(SyncPointsInternal {
-        shard_id,
-        sync_points: Some(SyncPoints {
-            collection_name,
-            wait: Some(wait),
-            points: points_sync_operation
-                .points
-                .into_iter()
-                .map(|x| x.try_into())
-                .collect::<Result<Vec<_>, Status>>()?,
-            from_id: points_sync_operation.from_id.map(|x| x.into()),
-            to_id: points_sync_operation.to_id.map(|x| x.into()),
-            ordering: ordering.map(write_ordering_to_proto),
-        }),
-    })
-}
-
-pub fn internal_upsert_points(
-    shard_id: Option<ShardId>,
-    collection_name: String,
-    point_insert_operations: PointInsertOperations,
-    wait: bool,
-    ordering: Option<WriteOrdering>,
-) -> CollectionResult<UpsertPointsInternal> {
-    Ok(UpsertPointsInternal {
-        shard_id,
-        upsert_points: Some(UpsertPoints {
-            collection_name,
-            wait: Some(wait),
-            points: match point_insert_operations {
-                PointInsertOperations::PointsBatch(batch) => batch.try_into()?,
-                PointInsertOperations::PointsList(list) => list
-                    .into_iter()
-                    .map(|id| id.try_into())
-                    .collect::<Result<Vec<_>, Status>>()?,
-            },
-            ordering: ordering.map(write_ordering_to_proto),
-        }),
-    })
-}
-
-pub fn internal_delete_points(
-    shard_id: Option<ShardId>,
-    collection_name: String,
-    ids: Vec<PointIdType>,
-    wait: bool,
-    ordering: Option<WriteOrdering>,
-) -> DeletePointsInternal {
-    DeletePointsInternal {
-        shard_id,
-        delete_points: Some(DeletePoints {
-            collection_name,
-            wait: Some(wait),
-            points: Some(PointsSelector {
-                points_selector_one_of: Some(PointsSelectorOneOf::Points(PointsIdsList {
-                    ids: ids.into_iter().map(|id| id.into()).collect(),
-                })),
-            }),
-            ordering: ordering.map(write_ordering_to_proto),
-        }),
-    }
-}
-
-pub fn internal_delete_points_by_filter(
-    shard_id: Option<ShardId>,
-    collection_name: String,
-    filter: Filter,
-    wait: bool,
-    ordering: Option<WriteOrdering>,
-) -> DeletePointsInternal {
-    DeletePointsInternal {
-        shard_id,
-        delete_points: Some(DeletePoints {
-            collection_name,
-            wait: Some(wait),
-            points: Some(PointsSelector {
-                points_selector_one_of: Some(PointsSelectorOneOf::Filter(filter.into())),
-            }),
-            ordering: ordering.map(write_ordering_to_proto),
-        }),
-    }
-}
-
-pub fn internal_update_vectors(
-    shard_id: Option<ShardId>,
-    collection_name: String,
-    update_vectors: UpdateVectors,
-    wait: bool,
-    ordering: Option<WriteOrdering>,
-) -> UpdateVectorsInternal {
-    UpdateVectorsInternal {
-        shard_id,
-        update_vectors: Some(UpdatePointVectors {
-            collection_name,
-            wait: Some(wait),
-            points: update_vectors
-                .points
-                .into_iter()
-                .map(|point| PointVectors {
-                    id: Some(point.id.into()),
-                    vectors: Some(point.vector.into()),
-                })
-                .collect(),
-            ordering: ordering.map(write_ordering_to_proto),
-        }),
-    }
-}
-
-pub fn internal_delete_vectors(
-    shard_id: Option<ShardId>,
-    collection_name: String,
-    ids: Vec<PointIdType>,
-    vector_names: Vec<String>,
-    wait: bool,
-    ordering: Option<WriteOrdering>,
-) -> DeleteVectorsInternal {
-    DeleteVectorsInternal {
-        shard_id,
-        delete_vectors: Some(DeletePointVectors {
-            collection_name,
-            wait: Some(wait),
-            points_selector: Some(PointsSelector {
-                points_selector_one_of: Some(PointsSelectorOneOf::Points(PointsIdsList {
-                    ids: ids.into_iter().map(|id| id.into()).collect(),
-                })),
-            }),
-            vectors: Some(VectorsSelector {
-                names: vector_names,
-            }),
-            ordering: ordering.map(write_ordering_to_proto),
-        }),
-    }
-}
-
-pub fn internal_delete_vectors_by_filter(
-    shard_id: Option<ShardId>,
-    collection_name: String,
-    filter: Filter,
-    vector_names: Vec<String>,
-    wait: bool,
-    ordering: Option<WriteOrdering>,
-) -> DeleteVectorsInternal {
-    DeleteVectorsInternal {
-        shard_id,
-        delete_vectors: Some(DeletePointVectors {
-            collection_name,
-            wait: Some(wait),
-            points_selector: Some(PointsSelector {
-                points_selector_one_of: Some(PointsSelectorOneOf::Filter(filter.into())),
-            }),
-            vectors: Some(VectorsSelector {
-                names: vector_names,
-            }),
-            ordering: ordering.map(write_ordering_to_proto),
-        }),
-    }
-}
-
-pub fn internal_set_payload(
-    shard_id: Option<ShardId>,
-    collection_name: String,
-    set_payload: SetPayload,
-    wait: bool,
-    ordering: Option<WriteOrdering>,
-) -> SetPayloadPointsInternal {
-    let points_selector = if let Some(points) = set_payload.points {
-        Some(PointsSelector {
-            points_selector_one_of: Some(PointsSelectorOneOf::Points(PointsIdsList {
-                ids: points.into_iter().map(|id| id.into()).collect(),
-            })),
-        })
-    } else {
-        set_payload.filter.map(|filter| PointsSelector {
-            points_selector_one_of: Some(PointsSelectorOneOf::Filter(filter.into())),
-        })
-    };
-
-    SetPayloadPointsInternal {
-        shard_id,
-        set_payload_points: Some(SetPayloadPoints {
-            collection_name,
-            wait: Some(wait),
-            payload: payload_to_proto(set_payload.payload),
-            points_selector,
-            ordering: ordering.map(write_ordering_to_proto),
-        }),
-    }
-}
-
-pub fn internal_delete_payload(
-    shard_id: Option<ShardId>,
-    collection_name: String,
-    delete_payload: DeletePayload,
-    wait: bool,
-    ordering: Option<WriteOrdering>,
-) -> DeletePayloadPointsInternal {
-    let points_selector = if let Some(points) = delete_payload.points {
-        Some(PointsSelector {
-            points_selector_one_of: Some(PointsSelectorOneOf::Points(PointsIdsList {
-                ids: points.into_iter().map(|id| id.into()).collect(),
-            })),
-        })
-    } else {
-        delete_payload.filter.map(|filter| PointsSelector {
-            points_selector_one_of: Some(PointsSelectorOneOf::Filter(filter.into())),
-        })
-    };
-
-    DeletePayloadPointsInternal {
-        shard_id,
-        delete_payload_points: Some(DeletePayloadPoints {
-            collection_name,
-            wait: Some(wait),
-            keys: delete_payload.keys,
-            points_selector,
-            ordering: ordering.map(write_ordering_to_proto),
-        }),
-    }
-}
-
-pub fn internal_clear_payload(
-    shard_id: Option<ShardId>,
-    collection_name: String,
-    points: Vec<PointIdType>,
-    wait: bool,
-    ordering: Option<WriteOrdering>,
-) -> ClearPayloadPointsInternal {
-    ClearPayloadPointsInternal {
-        shard_id,
-        clear_payload_points: Some(ClearPayloadPoints {
-            collection_name,
-            wait: Some(wait),
-            points: Some(PointsSelector {
-                points_selector_one_of: Some(PointsSelectorOneOf::Points(PointsIdsList {
-                    ids: points.into_iter().map(|id| id.into()).collect(),
-                })),
-            }),
-            ordering: ordering.map(write_ordering_to_proto),
-        }),
-    }
-}
-
-pub fn internal_clear_payload_by_filter(
-    shard_id: Option<ShardId>,
-    collection_name: String,
-    filter: Filter,
-    wait: bool,
-    ordering: Option<WriteOrdering>,
-) -> ClearPayloadPointsInternal {
-    ClearPayloadPointsInternal {
-        shard_id,
-        clear_payload_points: Some(ClearPayloadPoints {
-            collection_name,
-            wait: Some(wait),
-            points: Some(PointsSelector {
-                points_selector_one_of: Some(PointsSelectorOneOf::Filter(filter.into())),
-            }),
-            ordering: ordering.map(write_ordering_to_proto),
-        }),
-    }
-}
-
-pub fn internal_create_index(
-    shard_id: Option<ShardId>,
-    collection_name: String,
-    create_index: CreateIndex,
-    wait: bool,
-    ordering: Option<WriteOrdering>,
-) -> CreateFieldIndexCollectionInternal {
-    let (field_type, field_index_params) = create_index
-        .field_schema
-        .map(|field_schema| match field_schema {
-            PayloadFieldSchema::FieldType(field_type) => (
-                match field_type {
-                    segment::types::PayloadSchemaType::Keyword => {
-                        api::grpc::qdrant::FieldType::Keyword as i32
-                    }
-                    segment::types::PayloadSchemaType::Integer => {
-                        api::grpc::qdrant::FieldType::Integer as i32
-                    }
-                    segment::types::PayloadSchemaType::Float => {
-                        api::grpc::qdrant::FieldType::Float as i32
-                    }
-                    segment::types::PayloadSchemaType::Geo => {
-                        api::grpc::qdrant::FieldType::Geo as i32
-                    }
-                    segment::types::PayloadSchemaType::Text => {
-                        api::grpc::qdrant::FieldType::Text as i32
-                    }
-                    segment::types::PayloadSchemaType::Bool => {
-                        api::grpc::qdrant::FieldType::Bool as i32
-                    }
-                },
-                None,
-            ),
-            PayloadFieldSchema::FieldParams(field_params) => match field_params {
-                PayloadSchemaParams::Text(text_index_params) => (
-                    api::grpc::qdrant::FieldType::Text as i32,
-                    Some(text_index_params.into()),
-                ),
-            },
-        })
-        .map(|(field_type, field_params)| (Some(field_type), field_params))
-        .unwrap_or((None, None));
-
-    CreateFieldIndexCollectionInternal {
-        shard_id,
-        create_field_index_collection: Some(CreateFieldIndexCollection {
-            collection_name,
-            wait: Some(wait),
-            field_name: create_index.field_name,
-            field_type,
-            field_index_params,
-            ordering: ordering.map(write_ordering_to_proto),
-        }),
-    }
-}
-
-pub fn internal_delete_index(
-    shard_id: Option<ShardId>,
-    collection_name: String,
-    delete_index: String,
-    wait: bool,
-    ordering: Option<WriteOrdering>,
-) -> DeleteFieldIndexCollectionInternal {
-    DeleteFieldIndexCollectionInternal {
-        shard_id,
-        delete_field_index_collection: Some(DeleteFieldIndexCollection {
-            collection_name,
-            wait: Some(wait),
-            field_name: delete_index,
-            ordering: ordering.map(write_ordering_to_proto),
-        }),
-    }
-}
-
-pub fn try_scored_point_from_grpc(
-    point: api::grpc::qdrant::ScoredPoint,
-    with_payload: bool,
-) -> Result<ScoredPoint, tonic::Status> {
-    let id = point
-        .id
-        .ok_or_else(|| tonic::Status::invalid_argument("scored point does not have an ID"))?
-        .try_into()?;
-
-    let payload = if with_payload {
-        Some(api::grpc::conversions::proto_to_payloads(point.payload)?)
-    } else {
-        debug_assert!(point.payload.is_empty());
-        None
-    };
-
-    let vector = point
-        .vectors
-        .map(|vectors| vectors.try_into())
-        .transpose()?;
-
-    Ok(ScoredPoint {
-        id,
-        version: point.version,
-        score: point.score,
-        payload,
-        vector,
-    })
-}
diff --git a/crates/qdrant/lib/collection/src/shards/dummy_shard.rs b/crates/qdrant/lib/collection/src/shards/dummy_shard.rs
deleted file mode 100644
index f521db2..0000000
--- a/crates/qdrant/lib/collection/src/shards/dummy_shard.rs
+++ /dev/null
@@ -1,103 +0,0 @@
-use std::path::Path;
-use std::sync::Arc;
-
-use async_trait::async_trait;
-use segment::types::{
-    ExtendedPointId, Filter, ScoredPoint, WithPayload, WithPayloadInterface, WithVector,
-};
-use tokio::runtime::Handle;
-
-use crate::operations::types::{
-    CollectionError, CollectionInfo, CollectionResult, CountRequest, CountResult, PointRequest,
-    Record, SearchRequestBatch, UpdateResult,
-};
-use crate::operations::CollectionUpdateOperations;
-use crate::shards::shard_trait::ShardOperation;
-use crate::shards::telemetry::LocalShardTelemetry;
-
-#[derive(Clone, Debug)]
-pub struct DummyShard {
-    message: String,
-}
-
-impl DummyShard {
-    pub fn new(message: impl Into<String>) -> Self {
-        Self {
-            message: message.into(),
-        }
-    }
-
-    pub async fn create_snapshot(
-        &self,
-        _temp_path: &Path,
-        _target_path: &Path,
-        _save_wal: bool,
-    ) -> CollectionResult<()> {
-        self.dummy()
-    }
-
-    pub async fn on_optimizer_config_update(&self) -> CollectionResult<()> {
-        self.dummy()
-    }
-
-    pub fn get_telemetry_data(&self) -> LocalShardTelemetry {
-        LocalShardTelemetry {
-            variant_name: Some("dummy shard".into()),
-            segments: vec![],
-            optimizations: Default::default(),
-        }
-    }
-
-    fn dummy<T>(&self) -> CollectionResult<T> {
-        Err(CollectionError::service_error(self.message.to_string()))
-    }
-}
-
-#[async_trait]
-impl ShardOperation for DummyShard {
-    async fn info(&self) -> CollectionResult<CollectionInfo> {
-        self.dummy()
-    }
-
-    async fn update(
-        &self,
-        _: CollectionUpdateOperations,
-        _: bool,
-    ) -> CollectionResult<UpdateResult> {
-        self.dummy()
-    }
-
-    /// Forward read-only `scroll_by` to `wrapped_shard`
-    async fn scroll_by(
-        &self,
-        _: Option<ExtendedPointId>,
-        _: usize,
-        _: &WithPayloadInterface,
-        _: &WithVector,
-        _: Option<&Filter>,
-        _: &Handle,
-    ) -> CollectionResult<Vec<Record>> {
-        self.dummy()
-    }
-
-    async fn search(
-        &self,
-        _: Arc<SearchRequestBatch>,
-        _: &Handle,
-    ) -> CollectionResult<Vec<Vec<ScoredPoint>>> {
-        self.dummy()
-    }
-
-    async fn count(&self, _: Arc<CountRequest>) -> CollectionResult<CountResult> {
-        self.dummy()
-    }
-
-    async fn retrieve(
-        &self,
-        _: Arc<PointRequest>,
-        _: &WithPayload,
-        _: &WithVector,
-    ) -> CollectionResult<Vec<Record>> {
-        self.dummy()
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/shards/forward_proxy_shard.rs b/crates/qdrant/lib/collection/src/shards/forward_proxy_shard.rs
deleted file mode 100644
index fba9f62..0000000
--- a/crates/qdrant/lib/collection/src/shards/forward_proxy_shard.rs
+++ /dev/null
@@ -1,218 +0,0 @@
-use std::path::Path;
-use std::sync::Arc;
-
-use async_trait::async_trait;
-use segment::types::{
-    ExtendedPointId, Filter, PointIdType, ScoredPoint, WithPayload, WithPayloadInterface,
-    WithVector,
-};
-use tokio::runtime::Handle;
-use tokio::sync::Mutex;
-
-use crate::operations::point_ops::{PointOperations, PointStruct, PointSyncOperation};
-use crate::operations::types::{
-    CollectionError, CollectionInfo, CollectionResult, CountRequest, CountResult, PointRequest,
-    Record, SearchRequestBatch, UpdateResult,
-};
-use crate::operations::{CollectionUpdateOperations, CreateIndex, FieldIndexOperations};
-use crate::shards::local_shard::LocalShard;
-use crate::shards::remote_shard::RemoteShard;
-use crate::shards::shard_trait::ShardOperation;
-use crate::shards::telemetry::LocalShardTelemetry;
-
-/// ForwardProxyShard
-///
-/// ForwardProxyShard is a wrapper type for a LocalShard.
-///
-/// It can be used to provide all read and write operations while the wrapped shard is being transferred to another node.
-/// Proxy forwards all operations to remote shards.
-pub struct ForwardProxyShard {
-    pub(crate) wrapped_shard: LocalShard,
-    pub(crate) remote_shard: RemoteShard,
-    /// Lock required to protect transfer-in-progress updates.
-    /// It should block data updating operations while the batch is being transferred.
-    update_lock: Mutex<()>,
-}
-
-impl ForwardProxyShard {
-    pub fn new(wrapped_shard: LocalShard, remote_shard: RemoteShard) -> Self {
-        Self {
-            wrapped_shard,
-            remote_shard,
-            update_lock: Mutex::new(()),
-        }
-    }
-
-    /// Create payload indexes in the remote shard same as in the wrapped shard.
-    pub async fn transfer_indexes(&self) -> CollectionResult<()> {
-        let _update_lock = self.update_lock.lock().await;
-        for (index_key, index_type) in self.wrapped_shard.info().await?.payload_schema {
-            self.remote_shard
-                .update(
-                    CollectionUpdateOperations::FieldIndexOperation(
-                        FieldIndexOperations::CreateIndex(CreateIndex {
-                            field_name: index_key,
-                            field_schema: Some(index_type.try_into()?),
-                        }),
-                    ),
-                    false,
-                )
-                .await?;
-        }
-        Ok(())
-    }
-
-    /// Move batch of points to the remote shard.
-    /// Returns an offset of the next batch to be transferred.
-    pub async fn transfer_batch(
-        &self,
-        offset: Option<PointIdType>,
-        batch_size: usize,
-        runtime_handle: &Handle,
-    ) -> CollectionResult<Option<PointIdType>> {
-        debug_assert!(batch_size > 0);
-        let limit = batch_size + 1;
-        let _update_lock = self.update_lock.lock().await;
-        let mut batch = self
-            .wrapped_shard
-            .scroll_by(
-                offset,
-                limit,
-                &WithPayloadInterface::Bool(true),
-                &true.into(),
-                None,
-                runtime_handle,
-            )
-            .await?;
-        let next_page_offset = if batch.len() < limit {
-            // This was the last page
-            None
-        } else {
-            // remove extra point, it would be a first point of the next page
-            Some(batch.pop().unwrap().id)
-        };
-
-        let points: Result<Vec<PointStruct>, String> =
-            batch.into_iter().map(|point| point.try_into()).collect();
-
-        let points = points?;
-
-        // Use sync API to leverage potentially existing points
-        let insert_points_operation = {
-            CollectionUpdateOperations::PointOperation(PointOperations::SyncPoints(
-                PointSyncOperation {
-                    from_id: offset,
-                    to_id: next_page_offset,
-                    points,
-                },
-            ))
-        };
-
-        // We only need to wait for the last batch.
-        let wait = next_page_offset.is_none();
-        self.remote_shard
-            .update(insert_points_operation, wait)
-            .await?;
-
-        Ok(next_page_offset)
-    }
-
-    pub fn deconstruct(self) -> (LocalShard, RemoteShard) {
-        (self.wrapped_shard, self.remote_shard)
-    }
-
-    /// Forward `create_snapshot` to `wrapped_shard`
-    pub async fn create_snapshot(
-        &self,
-        temp_path: &Path,
-        target_path: &Path,
-        save_wal: bool,
-    ) -> CollectionResult<()> {
-        self.wrapped_shard
-            .create_snapshot(temp_path, target_path, save_wal)
-            .await
-    }
-
-    pub async fn on_optimizer_config_update(&self) -> CollectionResult<()> {
-        self.wrapped_shard.on_optimizer_config_update().await
-    }
-
-    pub fn get_telemetry_data(&self) -> LocalShardTelemetry {
-        self.wrapped_shard.get_telemetry_data()
-    }
-}
-
-#[async_trait]
-impl ShardOperation for ForwardProxyShard {
-    /// Update `wrapped_shard` while keeping track of the changed points
-    async fn update(
-        &self,
-        operation: CollectionUpdateOperations,
-        wait: bool,
-    ) -> CollectionResult<UpdateResult> {
-        let _update_lock = self.update_lock.lock().await;
-        let local_shard = &self.wrapped_shard;
-        // Shard update is within a write lock scope, because we need a way to block the shard updates
-        // during the transfer restart and finalization.
-        local_shard.update(operation.clone(), wait).await?;
-
-        self.remote_shard
-            .update(operation, false)
-            .await
-            .map_err(|err| CollectionError::forward_proxy_error(self.remote_shard.peer_id, err))
-    }
-
-    /// Forward read-only `scroll_by` to `wrapped_shard`
-    async fn scroll_by(
-        &self,
-        offset: Option<ExtendedPointId>,
-        limit: usize,
-        with_payload_interface: &WithPayloadInterface,
-        with_vector: &WithVector,
-        filter: Option<&Filter>,
-        search_runtime_handle: &Handle,
-    ) -> CollectionResult<Vec<Record>> {
-        let local_shard = &self.wrapped_shard;
-        local_shard
-            .scroll_by(
-                offset,
-                limit,
-                with_payload_interface,
-                with_vector,
-                filter,
-                search_runtime_handle,
-            )
-            .await
-    }
-
-    async fn info(&self) -> CollectionResult<CollectionInfo> {
-        let local_shard = &self.wrapped_shard;
-        local_shard.info().await
-    }
-
-    async fn search(
-        &self,
-        request: Arc<SearchRequestBatch>,
-        search_runtime_handle: &Handle,
-    ) -> CollectionResult<Vec<Vec<ScoredPoint>>> {
-        let local_shard = &self.wrapped_shard;
-        local_shard.search(request, search_runtime_handle).await
-    }
-
-    async fn count(&self, request: Arc<CountRequest>) -> CollectionResult<CountResult> {
-        let local_shard = &self.wrapped_shard;
-        local_shard.count(request).await
-    }
-
-    async fn retrieve(
-        &self,
-        request: Arc<PointRequest>,
-        with_payload: &WithPayload,
-        with_vector: &WithVector,
-    ) -> CollectionResult<Vec<Record>> {
-        let local_shard = &self.wrapped_shard;
-        local_shard
-            .retrieve(request, with_payload, with_vector)
-            .await
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/shards/local_shard.rs b/crates/qdrant/lib/collection/src/shards/local_shard.rs
deleted file mode 100644
index e91163c..0000000
--- a/crates/qdrant/lib/collection/src/shards/local_shard.rs
+++ /dev/null
@@ -1,821 +0,0 @@
-use std::collections::hash_map::Entry;
-use std::collections::{BTreeSet, HashMap};
-use std::mem::size_of;
-use std::ops::Deref;
-use std::path::{Path, PathBuf};
-use std::sync::Arc;
-use std::thread;
-
-use arc_swap::ArcSwap;
-use indicatif::{ProgressBar, ProgressStyle};
-use itertools::Itertools;
-use parking_lot::{Mutex as ParkingMutex, RwLock};
-use segment::data_types::vectors::VectorElementType;
-use segment::entry::entry_point::SegmentEntry;
-use segment::index::field_index::CardinalityEstimation;
-use segment::segment::Segment;
-use segment::segment_constructor::{build_segment, load_segment};
-use segment::types::{
-    CompressionRatio, Filter, PayloadIndexInfo, PayloadKeyType, PayloadStorageType, PointIdType,
-    QuantizationConfig, SegmentConfig, SegmentType,
-};
-use segment::utils::mem::Mem;
-use tokio::fs::{copy, create_dir_all, remove_dir_all};
-use tokio::runtime::Handle;
-use tokio::sync::mpsc::Sender;
-use tokio::sync::{mpsc, oneshot, Mutex, RwLock as TokioRwLock};
-use uuid::Uuid;
-use wal::{Wal, WalOptions};
-
-use crate::collection_manager::collection_updater::CollectionUpdater;
-use crate::collection_manager::holders::segment_holder::{LockedSegment, SegmentHolder};
-use crate::config::CollectionConfig;
-use crate::operations::shared_storage_config::SharedStorageConfig;
-use crate::operations::types::{
-    CollectionError, CollectionInfo, CollectionResult, CollectionStatus, OptimizersStatus,
-};
-use crate::operations::CollectionUpdateOperations;
-use crate::optimizers_builder::{build_optimizers, clear_temp_segments};
-use crate::shards::shard::ShardId;
-use crate::shards::shard_config::{ShardConfig, SHARD_CONFIG_FILE};
-use crate::shards::telemetry::{LocalShardTelemetry, OptimizerTelemetry};
-use crate::shards::CollectionId;
-use crate::update_handler::{Optimizer, UpdateHandler, UpdateSignal};
-use crate::wal::SerdeWal;
-
-pub type LockedWal = Arc<ParkingMutex<SerdeWal<CollectionUpdateOperations>>>;
-
-/// LocalShard
-///
-/// LocalShard is an entity that can be moved between peers and contains some part of one collections data.
-///
-/// Holds all object, required for collection functioning
-pub struct LocalShard {
-    pub(super) segments: Arc<RwLock<SegmentHolder>>,
-    pub(super) collection_config: Arc<TokioRwLock<CollectionConfig>>,
-    pub(super) shared_storage_config: Arc<SharedStorageConfig>,
-    pub(super) wal: LockedWal,
-    pub(super) update_handler: Arc<Mutex<UpdateHandler>>,
-    pub(super) update_sender: ArcSwap<Sender<UpdateSignal>>,
-    pub(super) path: PathBuf,
-    pub(super) optimizers: Arc<Vec<Arc<Optimizer>>>,
-    update_runtime: Handle,
-}
-
-/// Shard holds information about segments and WAL.
-impl LocalShard {
-    pub async fn move_data(from: &Path, to: &Path) -> CollectionResult<()> {
-        let wal_from = Self::wal_path(from);
-        let wal_to = Self::wal_path(to);
-        let segments_from = Self::segments_path(from);
-        let segments_to = Self::segments_path(to);
-        tokio::fs::rename(wal_from, wal_to).await?;
-        tokio::fs::rename(segments_from, segments_to).await?;
-        Ok(())
-    }
-
-    /// Checks if path have local shard data present
-    pub fn check_data(shard_path: &Path) -> bool {
-        let wal_path = Self::wal_path(shard_path);
-        let segments_path = Self::segments_path(shard_path);
-        wal_path.exists() && segments_path.exists()
-    }
-
-    /// Clear local shard related data.
-    ///
-    /// Do NOT remove config file.
-    pub async fn clear(shard_path: &Path) -> CollectionResult<()> {
-        // Delete WAL
-        let wal_path = Self::wal_path(shard_path);
-        if wal_path.exists() {
-            remove_dir_all(wal_path).await?;
-        }
-        // Delete segments
-        let segments_path = Self::segments_path(shard_path);
-        if segments_path.exists() {
-            remove_dir_all(segments_path).await?;
-        }
-
-        Ok(())
-    }
-
-    pub async fn new(
-        segment_holder: SegmentHolder,
-        collection_config: Arc<TokioRwLock<CollectionConfig>>,
-        shared_storage_config: Arc<SharedStorageConfig>,
-        wal: SerdeWal<CollectionUpdateOperations>,
-        optimizers: Arc<Vec<Arc<Optimizer>>>,
-        shard_path: &Path,
-        update_runtime: Handle,
-    ) -> Self {
-        let segment_holder = Arc::new(RwLock::new(segment_holder));
-        let config = collection_config.read().await;
-        let locked_wal = Arc::new(ParkingMutex::new(wal));
-
-        let mut update_handler = UpdateHandler::new(
-            shared_storage_config.clone(),
-            optimizers.clone(),
-            update_runtime.clone(),
-            segment_holder.clone(),
-            locked_wal.clone(),
-            config.optimizer_config.flush_interval_sec,
-            config.optimizer_config.max_optimization_threads,
-        );
-
-        let (update_sender, update_receiver) =
-            mpsc::channel(shared_storage_config.update_queue_size);
-        update_handler.run_workers(update_receiver);
-
-        drop(config); // release `shared_config` from borrow checker
-
-        Self {
-            segments: segment_holder,
-            collection_config,
-            shared_storage_config,
-            wal: locked_wal,
-            update_handler: Arc::new(Mutex::new(update_handler)),
-            update_sender: ArcSwap::from_pointee(update_sender),
-            path: shard_path.to_owned(),
-            update_runtime,
-            optimizers,
-        }
-    }
-
-    pub(super) fn segments(&self) -> &RwLock<SegmentHolder> {
-        self.segments.deref()
-    }
-
-    /// Recovers shard from disk.
-    pub async fn load(
-        id: ShardId,
-        collection_id: CollectionId,
-        shard_path: &Path,
-        collection_config: Arc<TokioRwLock<CollectionConfig>>,
-        shared_storage_config: Arc<SharedStorageConfig>,
-        update_runtime: Handle,
-    ) -> CollectionResult<LocalShard> {
-        let collection_config_read = collection_config.read().await;
-
-        let wal_path = Self::wal_path(shard_path);
-        let segments_path = Self::segments_path(shard_path);
-        let mut segment_holder = SegmentHolder::default();
-
-        let wal: SerdeWal<CollectionUpdateOperations> = SerdeWal::new(
-            wal_path.to_str().unwrap(),
-            (&collection_config_read.wal_config).into(),
-        )
-        .map_err(|e| CollectionError::service_error(format!("Wal error: {e}")))?;
-
-        let segment_dirs = std::fs::read_dir(&segments_path).map_err(|err| {
-            CollectionError::service_error(format!(
-                "Can't read segments directory due to {}\nat {}",
-                err,
-                segments_path.to_str().unwrap()
-            ))
-        })?;
-
-        let mut load_handlers = vec![];
-
-        for entry in segment_dirs {
-            let segments_path = entry.unwrap().path();
-            load_handlers.push(
-                thread::Builder::new()
-                    .name(format!("shard-load-{collection_id}-{id}"))
-                    .spawn(move || {
-                        let mut res = load_segment(&segments_path)?;
-                        if let Some(segment) = &mut res {
-                            segment.check_consistency_and_repair()?;
-                        } else {
-                            std::fs::remove_dir_all(&segments_path).map_err(|err| {
-                                CollectionError::service_error(format!(
-                                    "Can't remove leftover segment {}, due to {}",
-                                    segments_path.to_str().unwrap(),
-                                    err
-                                ))
-                            })?;
-                        }
-                        Ok::<_, CollectionError>(res)
-                    })?,
-            );
-        }
-
-        for handler in load_handlers {
-            let segment_opt = handler.join().map_err(|err| {
-                CollectionError::service_error(format!(
-                    "Can't join segment load thread: {:?}",
-                    err.type_id()
-                ))
-            })??;
-            if let Some(segment) = segment_opt {
-                segment_holder.add(segment);
-            }
-        }
-
-        let res = segment_holder.deduplicate_points()?;
-        if res > 0 {
-            log::debug!("Deduplicated {} points", res);
-        }
-
-        clear_temp_segments(shard_path);
-        let optimizers = build_optimizers(
-            shard_path,
-            &collection_config_read.params,
-            &collection_config_read.optimizer_config,
-            &collection_config_read.hnsw_config,
-            &collection_config_read.quantization_config,
-        );
-
-        drop(collection_config_read); // release `shared_config` from borrow checker
-
-        let collection = LocalShard::new(
-            segment_holder,
-            collection_config,
-            shared_storage_config,
-            wal,
-            optimizers,
-            shard_path,
-            update_runtime,
-        )
-        .await;
-
-        collection.load_from_wal(collection_id)?;
-
-        let available_memory_bytes = Mem::new().available_memory_bytes() as usize;
-        let vectors_size_bytes = collection.estimate_vector_data_size().await;
-
-        // Simple heuristic to exclude mmap prefaulting for colletions that won't benefit from it.
-        //
-        // We assume that mmap prefaulting is beneficial if we can put significant part of data
-        // into RAM in advance. However, if we can see that the data is too big to fit into RAM,
-        // it is better to avoid prefaulting, because it will only cause extra disk IO.
-        //
-        // This heuristic is not perfect, but it exclude cases when we don't have enough RAM
-        // even to store half of the vector data.
-        let do_mmap_prefault = available_memory_bytes * 2 > vectors_size_bytes;
-
-        if do_mmap_prefault {
-            for (_, segment) in collection.segments.read().iter() {
-                if let LockedSegment::Original(segment) = segment {
-                    segment.read().prefault_mmap_pages();
-                }
-            }
-        }
-
-        Ok(collection)
-    }
-
-    pub fn shard_path(&self) -> PathBuf {
-        self.path.clone()
-    }
-
-    pub fn wal_path(shard_path: &Path) -> PathBuf {
-        shard_path.join("wal")
-    }
-
-    pub fn segments_path(shard_path: &Path) -> PathBuf {
-        shard_path.join("segments")
-    }
-
-    pub async fn build_local(
-        id: ShardId,
-        collection_id: CollectionId,
-        shard_path: &Path,
-        collection_config: Arc<TokioRwLock<CollectionConfig>>,
-        shared_storage_config: Arc<SharedStorageConfig>,
-        update_runtime: Handle,
-    ) -> CollectionResult<LocalShard> {
-        // initialize local shard config file
-        let local_shard_config = ShardConfig::new_replica_set();
-        let shard = Self::build(
-            id,
-            collection_id,
-            shard_path,
-            collection_config,
-            shared_storage_config,
-            update_runtime,
-        )
-        .await?;
-        local_shard_config.save(shard_path)?;
-        Ok(shard)
-    }
-
-    /// Creates new empty shard with given configuration, initializing all storages, optimizers and directories.
-    pub async fn build(
-        id: ShardId,
-        collection_id: CollectionId,
-        shard_path: &Path,
-        collection_config: Arc<TokioRwLock<CollectionConfig>>,
-        shared_storage_config: Arc<SharedStorageConfig>,
-        update_runtime: Handle,
-    ) -> CollectionResult<LocalShard> {
-        let config = collection_config.read().await;
-
-        let wal_path = shard_path.join("wal");
-
-        create_dir_all(&wal_path).await.map_err(|err| {
-            CollectionError::service_error(format!(
-                "Can't create shard wal directory. Error: {err}"
-            ))
-        })?;
-
-        let segments_path = shard_path.join("segments");
-
-        create_dir_all(&segments_path).await.map_err(|err| {
-            CollectionError::service_error(format!(
-                "Can't create shard segments directory. Error: {err}"
-            ))
-        })?;
-
-        let mut segment_holder = SegmentHolder::default();
-        let mut build_handlers = vec![];
-
-        let vector_params = config.params.into_base_vector_data()?;
-        let segment_number = config.optimizer_config.get_number_segments();
-
-        for _sid in 0..segment_number {
-            let path_clone = segments_path.clone();
-            let segment_config = SegmentConfig {
-                vector_data: vector_params.clone(),
-                payload_storage_type: if config.params.on_disk_payload {
-                    PayloadStorageType::OnDisk
-                } else {
-                    PayloadStorageType::InMemory
-                },
-            };
-            let segment = thread::Builder::new()
-                .name(format!("shard-build-{collection_id}-{id}"))
-                .spawn(move || build_segment(&path_clone, &segment_config, true))
-                .unwrap();
-            build_handlers.push(segment);
-        }
-
-        let join_results = build_handlers
-            .into_iter()
-            .map(|handler| handler.join())
-            .collect_vec();
-
-        for join_result in join_results {
-            let segment = join_result.map_err(|e| {
-                let error_msg = if let Some(s) = e.downcast_ref::<&str>() {
-                    format!("Segment DB create panicked with:\n{s}")
-                } else if let Some(s) = e.downcast_ref::<String>() {
-                    format!("Segment DB create panicked with:\n{s}")
-                } else {
-                    "Segment DB create failed with unknown reason".to_string()
-                };
-                CollectionError::service_error(error_msg)
-            })??;
-            segment_holder.add(segment);
-        }
-
-        let wal: SerdeWal<CollectionUpdateOperations> =
-            SerdeWal::new(wal_path.to_str().unwrap(), (&config.wal_config).into())?;
-
-        let optimizers = build_optimizers(
-            shard_path,
-            &config.params,
-            &config.optimizer_config,
-            &config.hnsw_config,
-            &config.quantization_config,
-        );
-
-        drop(config); // release `shared_config` from borrow checker
-
-        let collection = LocalShard::new(
-            segment_holder,
-            collection_config,
-            shared_storage_config,
-            wal,
-            optimizers,
-            shard_path,
-            update_runtime,
-        )
-        .await;
-
-        Ok(collection)
-    }
-
-    pub async fn stop_flush_worker(&self) {
-        let mut update_handler = self.update_handler.lock().await;
-        update_handler.stop_flush_worker()
-    }
-
-    pub async fn wait_update_workers_stop(&self) -> CollectionResult<()> {
-        let mut update_handler = self.update_handler.lock().await;
-        update_handler.wait_workers_stops().await
-    }
-
-    /// Loads latest collection operations from WAL
-    pub fn load_from_wal(&self, collection_id: CollectionId) -> CollectionResult<()> {
-        let wal = self.wal.lock();
-        let bar = ProgressBar::new(wal.len());
-
-        let progress_style = ProgressStyle::default_bar()
-            .template("{msg} [{elapsed_precise}] {wide_bar} {pos}/{len} (eta:{eta})")
-            .expect("Failed to create progress style");
-        bar.set_style(progress_style);
-
-        bar.set_message(format!("Recovering collection {collection_id}"));
-        let segments = self.segments();
-
-        // When `Segment`s are flushed, WAL is truncated up to the index of the last operation
-        // that has been applied and flushed.
-        //
-        // `SerdeWal` wrapper persists/keeps track of this index (in addition to any handling
-        // in the `wal` crate itself).
-        //
-        // `SerdeWal::read_all` starts reading WAL from the first "un-truncated" index,
-        // so no additional handling required to "skip" any potentially applied entries.
-        //
-        // Note, that it's not guaranteed that some operation won't be re-applied to the storage.
-        // (`SerdeWal::read_all` may even start reading WAL from some already truncated
-        // index *occasionally*), but the storage can handle it.
-
-        for (op_num, update) in wal.read_all() {
-            // Propagate `CollectionError::ServiceError`, but skip other error types.
-            match &CollectionUpdater::update(segments, op_num, update) {
-                Err(err @ CollectionError::ServiceError { error, backtrace }) => {
-                    let path = self.path.display();
-
-                    log::error!(
-                        "Can't apply WAL operation: {error}, \
-                         collection: {collection_id}, \
-                         shard: {path}, \
-                         op_num: {op_num}"
-                    );
-
-                    if let Some(backtrace) = &backtrace {
-                        log::error!("Backtrace: {}", backtrace);
-                    }
-
-                    return Err(err.clone());
-                }
-                Err(err @ CollectionError::OutOfMemory { .. }) => {
-                    log::error!("{err}");
-                    return Err(err.clone());
-                }
-                Err(err @ CollectionError::NotFound { .. }) => log::warn!("{err}"),
-                Err(err) => log::error!("{err}"),
-                Ok(_) => (),
-            }
-            bar.inc(1);
-        }
-
-        self.segments.read().flush_all(true)?;
-        bar.finish();
-
-        Ok(())
-    }
-
-    pub async fn on_optimizer_config_update(&self) -> CollectionResult<()> {
-        let config = self.collection_config.read().await;
-        let mut update_handler = self.update_handler.lock().await;
-
-        let (update_sender, update_receiver) =
-            mpsc::channel(self.shared_storage_config.update_queue_size);
-        // makes sure that the Stop signal is the last one in this channel
-        let old_sender = self.update_sender.swap(Arc::new(update_sender));
-        old_sender.send(UpdateSignal::Stop).await?;
-        update_handler.stop_flush_worker();
-
-        update_handler.wait_workers_stops().await?;
-        let new_optimizers = build_optimizers(
-            &self.path,
-            &config.params,
-            &config.optimizer_config,
-            &config.hnsw_config,
-            &config.quantization_config,
-        );
-        update_handler.optimizers = new_optimizers;
-        update_handler.flush_interval_sec = config.optimizer_config.flush_interval_sec;
-        update_handler.run_workers(update_receiver);
-        self.update_sender.load().send(UpdateSignal::Nop).await?;
-
-        Ok(())
-    }
-
-    /// Finishes ongoing update tasks
-    pub async fn stop_gracefully(&self) {
-        if let Err(err) = self.update_sender.load().send(UpdateSignal::Stop).await {
-            log::warn!("Error sending stop signal to update handler: {}", err);
-        }
-
-        self.stop_flush_worker().await;
-
-        if let Err(err) = self.wait_update_workers_stop().await {
-            log::warn!("Update workers failed with: {}", err);
-        }
-    }
-
-    pub fn restore_snapshot(snapshot_path: &Path) -> CollectionResult<()> {
-        // recover segments
-        let segments_path = LocalShard::segments_path(snapshot_path);
-        // iterate over segments directory and recover each segment
-        for entry in std::fs::read_dir(segments_path)? {
-            let entry_path = entry?.path();
-            if entry_path.extension().map(|s| s == "tar").unwrap_or(false) {
-                let segment_id_opt = entry_path
-                    .file_stem()
-                    .map(|s| s.to_str().unwrap().to_owned());
-                if segment_id_opt.is_none() {
-                    return Err(CollectionError::service_error(
-                        "Segment ID is empty".to_string(),
-                    ));
-                }
-                let segment_id = segment_id_opt.unwrap();
-                Segment::restore_snapshot(&entry_path, &segment_id)?;
-                std::fs::remove_file(&entry_path)?;
-            }
-        }
-        Ok(())
-    }
-
-    /// Create snapshot for local shard into `target_path`
-    pub async fn create_snapshot(
-        &self,
-        temp_path: &Path,
-        target_path: &Path,
-        save_wal: bool,
-    ) -> CollectionResult<()> {
-        let snapshot_shard_path = target_path;
-
-        // snapshot all shard's segment
-        let snapshot_segments_shard_path = snapshot_shard_path.join("segments");
-        create_dir_all(&snapshot_segments_shard_path).await?;
-
-        let segments = self.segments.clone();
-        let wal = self.wal.clone();
-        let snapshot_shard_path_owned = snapshot_shard_path.to_owned();
-
-        if !save_wal {
-            // If we are not saving WAL, we still need to make sure that all submitted by this point
-            // updates have made it to the segments. So we use the Plunger to achieve that.
-            // It will notify us when all submitted updates so far have been processed.
-            let (tx, rx) = oneshot::channel();
-            let plunger = UpdateSignal::Plunger(tx);
-            self.update_sender.load().send(plunger).await?;
-            rx.await?;
-        }
-
-        let temp_path = temp_path.join(format!("snapshot-{}", Uuid::new_v4()));
-        create_dir_all(&temp_path).await?;
-
-        tokio::task::spawn_blocking(move || {
-            let segments_read = segments.read();
-
-            // Do not change segments while snapshotting
-            segments_read.snapshot_all_segments(&temp_path, &snapshot_segments_shard_path)?;
-
-            if save_wal {
-                // snapshot all shard's WAL
-                Self::snapshot_wal(wal, &snapshot_shard_path_owned)
-            } else {
-                Self::snapshot_empty_wal(wal, &snapshot_shard_path_owned)
-            }
-        })
-        .await??;
-
-        // copy shard's config
-        let shard_config_path = ShardConfig::get_config_path(&self.path);
-        let target_shard_config_path = snapshot_shard_path.join(SHARD_CONFIG_FILE);
-        copy(&shard_config_path, &target_shard_config_path).await?;
-        Ok(())
-    }
-
-    /// Create empty WAL which is compatible with currently stored data
-    pub fn snapshot_empty_wal(wal: LockedWal, snapshot_shard_path: &Path) -> CollectionResult<()> {
-        let (segment_capacity, latest_op_num) = {
-            let wal_guard = wal.lock();
-            (wal_guard.segment_capacity(), wal_guard.last_index())
-        };
-
-        let target_path = Self::wal_path(snapshot_shard_path);
-
-        // Create directory if it does not exist
-        std::fs::create_dir_all(&target_path).map_err(|err| {
-            CollectionError::service_error(format!(
-                "Can not crate directory {}: {}",
-                target_path.display(),
-                err
-            ))
-        })?;
-
-        Wal::generate_empty_wal_starting_at_index(
-            target_path,
-            &WalOptions {
-                segment_capacity,
-                segment_queue_len: 0,
-            },
-            latest_op_num,
-        )
-        .map_err(|err| {
-            CollectionError::service_error(format!("Error while create empty WAL: {err}"))
-        })
-    }
-
-    /// snapshot WAL
-    ///
-    /// copies all WAL files into `snapshot_shard_path/wal`
-    pub fn snapshot_wal(wal: LockedWal, snapshot_shard_path: &Path) -> CollectionResult<()> {
-        // lock wal during snapshot
-        let mut wal_guard = wal.lock();
-        wal_guard.flush()?;
-        let source_wal_path = wal_guard.path();
-        let options = fs_extra::dir::CopyOptions::new();
-        fs_extra::dir::copy(source_wal_path, snapshot_shard_path, &options).map_err(|err| {
-            CollectionError::service_error(format!(
-                "Error while copy WAL {snapshot_shard_path:?} {err}"
-            ))
-        })?;
-        Ok(())
-    }
-
-    pub fn estimate_cardinality<'a>(
-        &'a self,
-        filter: Option<&'a Filter>,
-    ) -> CollectionResult<CardinalityEstimation> {
-        let segments = self.segments().read();
-        let some_segment = segments.iter().next();
-
-        if some_segment.is_none() {
-            return Ok(CardinalityEstimation::exact(0));
-        }
-        let cardinality = segments
-            .iter()
-            .map(|(_id, segment)| segment.get().read().estimate_point_count(filter))
-            .fold(CardinalityEstimation::exact(0), |acc, x| {
-                CardinalityEstimation {
-                    primary_clauses: vec![],
-                    min: acc.min + x.min,
-                    exp: acc.exp + x.exp,
-                    max: acc.max + x.max,
-                }
-            });
-        Ok(cardinality)
-    }
-
-    pub fn read_filtered<'a>(
-        &'a self,
-        filter: Option<&'a Filter>,
-    ) -> CollectionResult<BTreeSet<PointIdType>> {
-        let segments = self.segments().read();
-        let some_segment = segments.iter().next();
-
-        if some_segment.is_none() {
-            return Ok(Default::default());
-        }
-        let all_points: BTreeSet<_> = segments
-            .iter()
-            .flat_map(|(_id, segment)| segment.get().read().read_filtered(None, None, filter))
-            .collect();
-        Ok(all_points)
-    }
-
-    pub fn get_telemetry_data(&self) -> LocalShardTelemetry {
-        let segments_read_guard = self.segments.read();
-        let segments: Vec<_> = segments_read_guard
-            .iter()
-            .map(|(_id, segment)| segment.get().read().get_telemetry_data())
-            .collect();
-
-        let optimizer_status = match &segments_read_guard.optimizer_errors {
-            None => OptimizersStatus::Ok,
-            Some(error) => OptimizersStatus::Error(error.to_string()),
-        };
-        drop(segments_read_guard);
-        let optimizations = self
-            .optimizers
-            .iter()
-            .map(|optimizer| optimizer.get_telemetry_data())
-            .fold(Default::default(), |acc, x| acc + x);
-
-        LocalShardTelemetry {
-            variant_name: None,
-            segments,
-            optimizations: OptimizerTelemetry {
-                status: optimizer_status,
-                optimizations,
-            },
-        }
-    }
-
-    /// Returns estimated size of vector data in bytes
-    async fn estimate_vector_data_size(&self) -> usize {
-        let info = self.local_shard_info().await;
-
-        let vector_size: usize = info
-            .config
-            .params
-            .vectors
-            .params_iter()
-            .map(|(_, value)| {
-                let vector_size = value.size.get() as usize;
-
-                let quantization_config = value
-                    .quantization_config
-                    .as_ref()
-                    .or(info.config.quantization_config.as_ref());
-
-                let quantized_size_bytes = match quantization_config {
-                    None => 0,
-                    Some(QuantizationConfig::Scalar(_)) => vector_size,
-                    Some(QuantizationConfig::Product(pq)) => match pq.product.compression {
-                        CompressionRatio::X4 => vector_size,
-                        CompressionRatio::X8 => vector_size / 2,
-                        CompressionRatio::X16 => vector_size / 4,
-                        CompressionRatio::X32 => vector_size / 8,
-                        CompressionRatio::X64 => vector_size / 16,
-                    },
-                };
-
-                vector_size * size_of::<VectorElementType>() + quantized_size_bytes
-            })
-            .sum();
-
-        vector_size * info.points_count
-    }
-
-    pub async fn local_shard_info(&self) -> CollectionInfo {
-        let collection_config = self.collection_config.read().await.clone();
-        let segments = self.segments().read();
-        let mut vectors_count = 0;
-        let mut indexed_vectors_count = 0;
-        let mut points_count = 0;
-        let mut segments_count = 0;
-        let mut status = CollectionStatus::Green;
-        let mut schema: HashMap<PayloadKeyType, PayloadIndexInfo> = Default::default();
-        for (_idx, segment) in segments.iter() {
-            segments_count += 1;
-
-            let segment_info = match segment {
-                LockedSegment::Original(original_segment) => {
-                    let info = original_segment.read().info();
-                    if info.segment_type == SegmentType::Indexed {
-                        indexed_vectors_count += info.num_vectors;
-                    }
-                    info
-                }
-                LockedSegment::Proxy(proxy_segment) => {
-                    let proxy_segment_lock = proxy_segment.read();
-                    let proxy_segment_info = proxy_segment_lock.info();
-
-                    let wrapped_info = proxy_segment_lock.wrapped_segment.get().read().info();
-                    if wrapped_info.segment_type == SegmentType::Indexed {
-                        indexed_vectors_count += wrapped_info.num_vectors;
-                    }
-                    proxy_segment_info
-                }
-            };
-
-            if segment_info.segment_type == SegmentType::Special {
-                status = CollectionStatus::Yellow;
-            }
-            vectors_count += segment_info.num_vectors;
-            points_count += segment_info.num_points;
-            for (key, val) in segment_info.index_schema {
-                match schema.entry(key) {
-                    Entry::Occupied(o) => {
-                        o.into_mut().points += val.points;
-                    }
-                    Entry::Vacant(v) => {
-                        v.insert(val);
-                    }
-                }
-            }
-        }
-        if !segments.failed_operation.is_empty() || segments.optimizer_errors.is_some() {
-            status = CollectionStatus::Red;
-        }
-
-        let optimizer_status = match &segments.optimizer_errors {
-            None => OptimizersStatus::Ok,
-            Some(error) => OptimizersStatus::Error(error.to_string()),
-        };
-
-        CollectionInfo {
-            status,
-            optimizer_status,
-            vectors_count,
-            indexed_vectors_count,
-            points_count,
-            segments_count,
-            config: collection_config,
-            payload_schema: schema,
-        }
-    }
-}
-
-impl Drop for LocalShard {
-    fn drop(&mut self) {
-        thread::scope(|s| {
-            let handle = thread::Builder::new()
-                .name("drop-shard".to_string())
-                .spawn_scoped(s, || {
-                    // Needs dedicated thread to avoid `Cannot start a runtime from within a runtime` error.
-                    self.update_runtime
-                        .block_on(async { self.stop_gracefully().await })
-                });
-            handle.expect("Failed to create thread for shard drop");
-        })
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/shards/local_shard_operations.rs b/crates/qdrant/lib/collection/src/shards/local_shard_operations.rs
deleted file mode 100644
index 34254e7..0000000
--- a/crates/qdrant/lib/collection/src/shards/local_shard_operations.rs
+++ /dev/null
@@ -1,194 +0,0 @@
-use std::sync::Arc;
-
-use async_trait::async_trait;
-use futures::future::try_join_all;
-use itertools::Itertools;
-use segment::types::{
-    ExtendedPointId, Filter, ScoredPoint, WithPayload, WithPayloadInterface, WithVector,
-};
-use tokio::runtime::Handle;
-use tokio::sync::oneshot;
-
-use crate::collection_manager::segments_searcher::SegmentsSearcher;
-use crate::common::stopping_guard::StoppingGuard;
-use crate::operations::types::{
-    CollectionError, CollectionInfo, CollectionResult, CountRequest, CountResult, PointRequest,
-    Record, SearchRequestBatch, UpdateResult, UpdateStatus,
-};
-use crate::operations::CollectionUpdateOperations;
-use crate::shards::local_shard::LocalShard;
-use crate::shards::shard_trait::ShardOperation;
-use crate::update_handler::{OperationData, UpdateSignal};
-
-#[async_trait]
-impl ShardOperation for LocalShard {
-    /// Imply interior mutability.
-    /// Performs update operation on this collection asynchronously.
-    /// Explicitly waits for result to be updated.
-    async fn update(
-        &self,
-        operation: CollectionUpdateOperations,
-        wait: bool,
-    ) -> CollectionResult<UpdateResult> {
-        let (callback_sender, callback_receiver) = if wait {
-            let (tx, rx) = oneshot::channel();
-            (Some(tx), Some(rx))
-        } else {
-            (None, None)
-        };
-
-        let operation_id = {
-            let update_sender = self.update_sender.load();
-            let channel_permit = update_sender.reserve().await?;
-            let mut wal_lock = self.wal.lock();
-            let operation_id = wal_lock.write(&operation)?;
-            channel_permit.send(UpdateSignal::Operation(OperationData {
-                op_num: operation_id,
-                operation,
-                sender: callback_sender,
-                wait,
-            }));
-            operation_id
-        };
-
-        if let Some(receiver) = callback_receiver {
-            let _res = receiver.await??;
-            Ok(UpdateResult {
-                operation_id,
-                status: UpdateStatus::Completed,
-            })
-        } else {
-            Ok(UpdateResult {
-                operation_id,
-                status: UpdateStatus::Acknowledged,
-            })
-        }
-    }
-
-    async fn scroll_by(
-        &self,
-        offset: Option<ExtendedPointId>,
-        limit: usize,
-        with_payload_interface: &WithPayloadInterface,
-        with_vector: &WithVector,
-        filter: Option<&Filter>,
-        search_runtime_handle: &Handle,
-    ) -> CollectionResult<Vec<Record>> {
-        // ToDo: Make faster points selection with a set
-        let segments = self.segments();
-        let read_handles: Vec<_> = {
-            let segments_guard = segments.read();
-            segments_guard
-                .iter()
-                .map(|(_, segment)| {
-                    let segment = segment.clone();
-                    let filter = filter.cloned();
-                    search_runtime_handle.spawn_blocking(move || {
-                        segment
-                            .get()
-                            .read()
-                            .read_filtered(offset, Some(limit), filter.as_ref())
-                    })
-                })
-                .collect()
-        };
-        let all_points = try_join_all(read_handles).await?;
-
-        let point_ids = all_points
-            .into_iter()
-            .flatten()
-            .sorted()
-            .dedup()
-            .take(limit)
-            .collect_vec();
-
-        let with_payload = WithPayload::from(with_payload_interface);
-        let mut points =
-            SegmentsSearcher::retrieve(segments, &point_ids, &with_payload, with_vector)?;
-        points.sort_by_key(|point| point.id);
-
-        Ok(points)
-    }
-
-    /// Collect overview information about the shard
-    async fn info(&self) -> CollectionResult<CollectionInfo> {
-        Ok(self.local_shard_info().await)
-    }
-
-    async fn search(
-        &self,
-        request: Arc<SearchRequestBatch>,
-        search_runtime_handle: &Handle,
-    ) -> CollectionResult<Vec<Vec<ScoredPoint>>> {
-        let collection_params = self.collection_config.read().await.params.clone();
-        // check vector names existing
-        for req in &request.searches {
-            collection_params.get_vector_params(req.vector.get_name())?;
-        }
-
-        let is_stopped = StoppingGuard::new();
-
-        let search_request = SegmentsSearcher::search(
-            self.segments(),
-            request.clone(),
-            search_runtime_handle,
-            true,
-            is_stopped.get_is_stopped(),
-        );
-        let timeout = self.shared_storage_config.search_timeout;
-        let res: Vec<Vec<ScoredPoint>> = tokio::select! {
-            res = search_request => res,
-            _ = tokio::time::sleep(timeout) => {
-                is_stopped.stop();
-                log::debug!("Search timeout reached: {} seconds", timeout.as_secs());
-                Err(CollectionError::timeout(timeout.as_secs() as usize, "Search"))
-            }
-        }?;
-
-        let top_results = res
-            .into_iter()
-            .zip(request.searches.iter())
-            .map(|(vector_res, req)| {
-                let vector_name = req.vector.get_name();
-                let distance = collection_params
-                    .get_vector_params(vector_name)
-                    .unwrap()
-                    .distance;
-                let processed_res = vector_res.into_iter().map(|mut scored_point| {
-                    scored_point.score = distance.postprocess_score(scored_point.score);
-                    scored_point
-                });
-
-                if let Some(threshold) = req.score_threshold {
-                    processed_res
-                        .take_while(|scored_point| {
-                            distance.check_threshold(scored_point.score, threshold)
-                        })
-                        .collect()
-                } else {
-                    processed_res.collect()
-                }
-            })
-            .collect();
-        Ok(top_results)
-    }
-
-    async fn count(&self, request: Arc<CountRequest>) -> CollectionResult<CountResult> {
-        let total_count = if request.exact {
-            let all_points = self.read_filtered(request.filter.as_ref())?;
-            all_points.len()
-        } else {
-            self.estimate_cardinality(request.filter.as_ref())?.exp
-        };
-        Ok(CountResult { count: total_count })
-    }
-
-    async fn retrieve(
-        &self,
-        request: Arc<PointRequest>,
-        with_payload: &WithPayload,
-        with_vector: &WithVector,
-    ) -> CollectionResult<Vec<Record>> {
-        SegmentsSearcher::retrieve(self.segments(), &request.ids, with_payload, with_vector)
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/shards/mod.rs b/crates/qdrant/lib/collection/src/shards/mod.rs
deleted file mode 100644
index 3e959a7..0000000
--- a/crates/qdrant/lib/collection/src/shards/mod.rs
+++ /dev/null
@@ -1,52 +0,0 @@
-pub mod channel_service;
-pub mod collection_shard_distribution;
-mod conversions;
-pub mod dummy_shard;
-pub mod forward_proxy_shard;
-pub mod local_shard;
-pub mod local_shard_operations;
-pub mod proxy_shard;
-pub mod remote_shard;
-#[allow(dead_code)]
-pub mod replica_set;
-pub mod resolve;
-pub mod shard;
-pub mod shard_config;
-pub mod shard_holder;
-pub mod shard_trait;
-pub mod shard_versioning;
-pub mod telemetry;
-pub mod transfer;
-
-use std::path::{Path, PathBuf};
-
-use shard::ShardId;
-
-use crate::operations::types::{CollectionError, CollectionResult};
-use crate::shards::shard_versioning::versioned_shard_path;
-
-pub const HASH_RING_SHARD_SCALE: u32 = 100;
-
-pub type CollectionId = String;
-
-pub type ShardVersion = usize;
-
-pub async fn create_shard_dir(
-    collection_path: &Path,
-    shard_id: ShardId,
-) -> CollectionResult<PathBuf> {
-    let shard_path = versioned_shard_path(collection_path, shard_id, 0);
-    match tokio::fs::create_dir(&shard_path).await {
-        Ok(_) => Ok(shard_path),
-        Err(e) => {
-            if e.kind() == std::io::ErrorKind::AlreadyExists {
-                Err(CollectionError::service_error(format!(
-                    "shard path already exists: {:?}",
-                    shard_path
-                )))
-            } else {
-                Err(CollectionError::from(e))
-            }
-        }
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/shards/proxy_shard.rs b/crates/qdrant/lib/collection/src/shards/proxy_shard.rs
deleted file mode 100644
index 77e9bb1..0000000
--- a/crates/qdrant/lib/collection/src/shards/proxy_shard.rs
+++ /dev/null
@@ -1,227 +0,0 @@
-use std::collections::HashSet;
-use std::path::Path;
-use std::sync::atomic::AtomicBool;
-use std::sync::Arc;
-use std::time::Duration;
-
-use async_trait::async_trait;
-use segment::types::{
-    ExtendedPointId, Filter, PointIdType, ScoredPoint, WithPayload, WithPayloadInterface,
-    WithVector,
-};
-use tokio::runtime::Handle;
-use tokio::sync::{oneshot, RwLock};
-use tokio::time::timeout;
-
-use crate::operations::operation_effect::{
-    EstimateOperationEffectArea, OperationEffectArea, PointsOperationEffect,
-};
-use crate::operations::types::{
-    CollectionError, CollectionInfo, CollectionResult, CountRequest, CountResult, PointRequest,
-    Record, SearchRequestBatch, UpdateResult,
-};
-use crate::operations::CollectionUpdateOperations;
-use crate::shards::local_shard::LocalShard;
-use crate::shards::shard_trait::ShardOperation;
-use crate::shards::telemetry::LocalShardTelemetry;
-use crate::update_handler::UpdateSignal;
-
-type ChangedPointsSet = Arc<RwLock<HashSet<PointIdType>>>;
-
-/// ProxyShard
-///
-/// ProxyShard is a wrapper type for a LocalShard.
-///
-/// It can be used to provide all read and write operations while the wrapped shard is being transferred to another node.
-/// It keeps track of changed points during the shard transfer to assure consistency.
-pub struct ProxyShard {
-    wrapped_shard: LocalShard,
-    changed_points: ChangedPointsSet,
-    pub changed_alot: AtomicBool,
-}
-
-/// Max number of updates tracked to synchronize after the transfer.
-const MAX_CHANGES_TRACKED_COUNT: usize = 10_000;
-
-/// How much time can we wait for the update queue to be empty.
-/// We don't want false positive here, so it should be large.
-/// If the queue stuck - it means something wrong with application logic.
-const UPDATE_QUEUE_CLEAR_TIMEOUT: Duration = Duration::from_secs(1);
-const UPDATE_QUEUE_CLEAR_MAX_TIMEOUT: Duration = Duration::from_secs(128);
-
-impl ProxyShard {
-    #[allow(unused)]
-    pub async fn new(wrapped_shard: LocalShard) -> Self {
-        let res = Self {
-            wrapped_shard,
-            changed_points: Default::default(),
-            changed_alot: Default::default(),
-        };
-        res.reinit_changelog().await;
-        res
-    }
-
-    /// Forward `create_snapshot` to `wrapped_shard`
-    pub async fn create_snapshot(
-        &self,
-        temp_path: &Path,
-        target_path: &Path,
-        save_wal: bool,
-    ) -> CollectionResult<()> {
-        self.wrapped_shard
-            .create_snapshot(temp_path, target_path, save_wal)
-            .await
-    }
-
-    pub async fn on_optimizer_config_update(&self) -> CollectionResult<()> {
-        self.wrapped_shard.on_optimizer_config_update().await
-    }
-
-    pub async fn reinit_changelog(&self) -> CollectionResult<()> {
-        // Blocks updates in the wrapped shard.
-        let mut changed_points_guard = self.changed_points.write().await;
-        // Clear the update queue
-        let mut attempt = 1;
-        loop {
-            let (tx, rx) = oneshot::channel();
-            let plunger = UpdateSignal::Plunger(tx);
-            self.wrapped_shard
-                .update_sender
-                .load()
-                .send(plunger)
-                .await?;
-            let attempt_timeout = UPDATE_QUEUE_CLEAR_TIMEOUT * (2_u32).pow(attempt);
-            // It is possible, that the queue is recreated while we are waiting for plunger.
-            // So we will timeout and try again
-            if timeout(attempt_timeout, rx).await.is_err() {
-                log::warn!("Timeout {} while waiting for the wrapped shard to finish the update queue, retrying", attempt_timeout.as_secs());
-                attempt += 1;
-                if attempt_timeout > UPDATE_QUEUE_CLEAR_MAX_TIMEOUT {
-                    return Err(CollectionError::service_error(
-                        "Timeout while waiting for the wrapped shard to finish the update queue"
-                            .to_string(),
-                    ));
-                }
-                continue;
-            }
-            break;
-        }
-        // Update queue is clear now
-        // Clear the changed_points set
-        changed_points_guard.clear();
-
-        // Clear changed_alot flag
-        self.changed_alot
-            .store(false, std::sync::atomic::Ordering::Relaxed);
-        Ok(())
-    }
-
-    pub fn get_telemetry_data(&self) -> LocalShardTelemetry {
-        self.wrapped_shard.get_telemetry_data()
-    }
-}
-
-#[async_trait]
-impl ShardOperation for ProxyShard {
-    /// Update `wrapped_shard` while keeping track of the changed points
-    async fn update(
-        &self,
-        operation: CollectionUpdateOperations,
-        wait: bool,
-    ) -> CollectionResult<UpdateResult> {
-        let local_shard = &self.wrapped_shard;
-        let estimate_effect = operation.estimate_effect_area();
-        let points_operation_effect: PointsOperationEffect = match estimate_effect {
-            OperationEffectArea::Empty => PointsOperationEffect::Empty,
-            OperationEffectArea::Points(points) => PointsOperationEffect::Some(points),
-            OperationEffectArea::Filter(filter) => {
-                let cardinality = local_shard.estimate_cardinality(Some(&filter))?;
-                // validate the size of the change set before retrieving it
-                if cardinality.max > MAX_CHANGES_TRACKED_COUNT {
-                    PointsOperationEffect::Many
-                } else {
-                    let points = local_shard.read_filtered(Some(&filter))?;
-                    PointsOperationEffect::Some(points.into_iter().collect())
-                }
-            }
-        };
-
-        {
-            let mut changed_points_guard = self.changed_points.write().await;
-            match points_operation_effect {
-                PointsOperationEffect::Empty => {}
-                PointsOperationEffect::Some(points) => {
-                    for point in points {
-                        // points updates are recorded but never trigger in `changed_alot`
-                        changed_points_guard.insert(point);
-                    }
-                }
-                PointsOperationEffect::Many => {
-                    self.changed_alot
-                        .store(true, std::sync::atomic::Ordering::Relaxed);
-                }
-            }
-            // Shard update is within a write lock scope, because we need a way to block the shard updates
-            // during the transfer restart and finalization.
-            local_shard.update(operation, wait).await
-        }
-    }
-
-    /// Forward read-only `scroll_by` to `wrapped_shard`
-    async fn scroll_by(
-        &self,
-        offset: Option<ExtendedPointId>,
-        limit: usize,
-        with_payload_interface: &WithPayloadInterface,
-        with_vector: &WithVector,
-        filter: Option<&Filter>,
-        search_runtime_handle: &Handle,
-    ) -> CollectionResult<Vec<Record>> {
-        let local_shard = &self.wrapped_shard;
-        local_shard
-            .scroll_by(
-                offset,
-                limit,
-                with_payload_interface,
-                with_vector,
-                filter,
-                search_runtime_handle,
-            )
-            .await
-    }
-
-    /// Forward read-only `info` to `wrapped_shard`
-    async fn info(&self) -> CollectionResult<CollectionInfo> {
-        let local_shard = &self.wrapped_shard;
-        local_shard.info().await
-    }
-
-    /// Forward read-only `search` to `wrapped_shard`
-    async fn search(
-        &self,
-        request: Arc<SearchRequestBatch>,
-        search_runtime_handle: &Handle,
-    ) -> CollectionResult<Vec<Vec<ScoredPoint>>> {
-        let local_shard = &self.wrapped_shard;
-        local_shard.search(request, search_runtime_handle).await
-    }
-
-    /// Forward read-only `count` to `wrapped_shard`
-    async fn count(&self, request: Arc<CountRequest>) -> CollectionResult<CountResult> {
-        let local_shard = &self.wrapped_shard;
-        local_shard.count(request).await
-    }
-
-    /// Forward read-only `retrieve` to `wrapped_shard`
-    async fn retrieve(
-        &self,
-        request: Arc<PointRequest>,
-        with_payload: &WithPayload,
-        with_vector: &WithVector,
-    ) -> CollectionResult<Vec<Record>> {
-        let local_shard = &self.wrapped_shard;
-        local_shard
-            .retrieve(request, with_payload, with_vector)
-            .await
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/shards/remote_shard.rs b/crates/qdrant/lib/collection/src/shards/remote_shard.rs
deleted file mode 100644
index d798dc0..0000000
--- a/crates/qdrant/lib/collection/src/shards/remote_shard.rs
+++ /dev/null
@@ -1,593 +0,0 @@
-use std::future::Future;
-use std::path::Path;
-use std::sync::Arc;
-
-use api::grpc::qdrant::collections_internal_client::CollectionsInternalClient;
-use api::grpc::qdrant::points_internal_client::PointsInternalClient;
-use api::grpc::qdrant::{
-    CollectionOperationResponse, CountPoints, CountPointsInternal, GetCollectionInfoRequest,
-    GetCollectionInfoRequestInternal, GetPoints, GetPointsInternal, InitiateShardTransferRequest,
-    ScrollPoints, ScrollPointsInternal, SearchBatchPointsInternal,
-};
-use async_trait::async_trait;
-use parking_lot::Mutex;
-use segment::common::operation_time_statistics::{
-    OperationDurationsAggregator, ScopeDurationMeasurer,
-};
-use segment::types::{
-    ExtendedPointId, Filter, ScoredPoint, WithPayload, WithPayloadInterface, WithVector,
-};
-use tokio::runtime::Handle;
-use tonic::transport::{Channel, Uri};
-use tonic::Status;
-
-use super::conversions::{
-    internal_delete_vectors, internal_delete_vectors_by_filter, internal_update_vectors,
-};
-use crate::operations::conversions::try_record_from_grpc;
-use crate::operations::payload_ops::PayloadOps;
-use crate::operations::point_ops::{PointOperations, WriteOrdering};
-use crate::operations::types::{
-    CollectionError, CollectionInfo, CollectionResult, CountRequest, CountResult, PointRequest,
-    Record, SearchRequest, SearchRequestBatch, UpdateResult,
-};
-use crate::operations::vector_ops::VectorOperations;
-use crate::operations::{CollectionUpdateOperations, FieldIndexOperations};
-use crate::shards::channel_service::ChannelService;
-use crate::shards::conversions::{
-    internal_clear_payload, internal_clear_payload_by_filter, internal_create_index,
-    internal_delete_index, internal_delete_payload, internal_delete_points,
-    internal_delete_points_by_filter, internal_set_payload, internal_sync_points,
-    internal_upsert_points, try_scored_point_from_grpc,
-};
-use crate::shards::shard::{PeerId, ShardId};
-use crate::shards::shard_trait::ShardOperation;
-use crate::shards::telemetry::RemoteShardTelemetry;
-use crate::shards::CollectionId;
-
-/// RemoteShard
-///
-/// Remote Shard is a representation of a shard that is located on a remote peer.
-pub struct RemoteShard {
-    pub(crate) id: ShardId,
-    pub(crate) collection_id: CollectionId,
-    pub peer_id: PeerId,
-    pub channel_service: ChannelService,
-    telemetry_search_durations: Arc<Mutex<OperationDurationsAggregator>>,
-    telemetry_update_durations: Arc<Mutex<OperationDurationsAggregator>>,
-}
-
-impl RemoteShard {
-    /// Instantiate a new remote shard in memory
-    pub fn new(
-        id: ShardId,
-        collection_id: CollectionId,
-        peer_id: PeerId,
-        channel_service: ChannelService,
-    ) -> Self {
-        Self {
-            id,
-            collection_id,
-            peer_id,
-            channel_service,
-            telemetry_search_durations: OperationDurationsAggregator::new(),
-            telemetry_update_durations: OperationDurationsAggregator::new(),
-        }
-    }
-
-    pub fn restore_snapshot(_snapshot_path: &Path) {
-        // NO extra actions needed for remote shards
-    }
-
-    fn current_address(&self) -> CollectionResult<Uri> {
-        let guard_peer_address = self.channel_service.id_to_address.read();
-        let peer_address = guard_peer_address.get(&self.peer_id).cloned();
-        match peer_address {
-            None => Err(CollectionError::service_error(format!(
-                "no address found for peer {}",
-                self.peer_id
-            ))),
-            Some(peer_address) => Ok(peer_address),
-        }
-    }
-
-    async fn with_points_client<T, O: Future<Output = Result<T, Status>>>(
-        &self,
-        f: impl Fn(PointsInternalClient<Channel>) -> O,
-    ) -> CollectionResult<T> {
-        let current_address = self.current_address()?;
-        self.channel_service
-            .channel_pool
-            .with_channel(&current_address, |channel| {
-                let client = PointsInternalClient::new(channel);
-                let client = client.max_decoding_message_size(usize::MAX);
-                f(client)
-            })
-            .await
-            .map_err(|err| err.into())
-    }
-
-    async fn with_collections_client<T, O: Future<Output = Result<T, Status>>>(
-        &self,
-        f: impl Fn(CollectionsInternalClient<Channel>) -> O,
-    ) -> CollectionResult<T> {
-        let current_address = self.current_address()?;
-        self.channel_service
-            .channel_pool
-            .with_channel(&current_address, |channel| {
-                let client = CollectionsInternalClient::new(channel);
-                let client = client.max_decoding_message_size(usize::MAX);
-                f(client)
-            })
-            .await
-            .map_err(|err| err.into())
-    }
-
-    pub fn get_telemetry_data(&self) -> RemoteShardTelemetry {
-        RemoteShardTelemetry {
-            shard_id: self.id,
-            peer_id: Some(self.peer_id),
-            searches: self.telemetry_search_durations.lock().get_statistics(),
-            updates: self.telemetry_update_durations.lock().get_statistics(),
-        }
-    }
-
-    pub async fn initiate_transfer(&self) -> CollectionResult<CollectionOperationResponse> {
-        let res = self
-            .with_collections_client(|mut client| async move {
-                client
-                    .initiate(InitiateShardTransferRequest {
-                        collection_name: self.collection_id.clone(),
-                        shard_id: self.id,
-                    })
-                    .await
-            })
-            .await?
-            .into_inner();
-        Ok(res)
-    }
-
-    pub async fn forward_update(
-        &self,
-        operation: CollectionUpdateOperations,
-        wait: bool,
-        ordering: WriteOrdering,
-    ) -> CollectionResult<UpdateResult> {
-        // the target shard is None because the operation is forwarded as if it came from the client
-        self.execute_update_operation(
-            None,
-            self.collection_id.clone(),
-            operation,
-            wait,
-            Some(ordering),
-        )
-        .await
-    }
-
-    pub async fn execute_update_operation(
-        &self,
-        shard_id: Option<ShardId>,
-        collection_name: String,
-        operation: CollectionUpdateOperations,
-        wait: bool,
-        ordering: Option<WriteOrdering>,
-    ) -> CollectionResult<UpdateResult> {
-        let mut timer = ScopeDurationMeasurer::new(&self.telemetry_update_durations);
-        timer.set_success(false);
-
-        let point_operation_response = match operation {
-            CollectionUpdateOperations::PointOperation(point_ops) => match point_ops {
-                PointOperations::UpsertPoints(point_insert_operations) => {
-                    let request = &internal_upsert_points(
-                        shard_id,
-                        collection_name,
-                        point_insert_operations,
-                        wait,
-                        ordering,
-                    )?;
-                    self.with_points_client(|mut client| async move {
-                        client.upsert(tonic::Request::new(request.clone())).await
-                    })
-                    .await?
-                    .into_inner()
-                }
-                PointOperations::DeletePoints { ids } => {
-                    let request =
-                        &internal_delete_points(shard_id, collection_name, ids, wait, ordering);
-                    self.with_points_client(|mut client| async move {
-                        client.delete(tonic::Request::new(request.clone())).await
-                    })
-                    .await?
-                    .into_inner()
-                }
-                PointOperations::DeletePointsByFilter(filter) => {
-                    let request = &internal_delete_points_by_filter(
-                        shard_id,
-                        collection_name,
-                        filter,
-                        wait,
-                        ordering,
-                    );
-                    self.with_points_client(|mut client| async move {
-                        client.delete(tonic::Request::new(request.clone())).await
-                    })
-                    .await?
-                    .into_inner()
-                }
-                PointOperations::SyncPoints(operation) => {
-                    let request = &internal_sync_points(
-                        shard_id,
-                        collection_name,
-                        operation,
-                        wait,
-                        ordering,
-                    )?;
-                    self.with_points_client(|mut client| async move {
-                        client.sync(tonic::Request::new(request.clone())).await
-                    })
-                    .await?
-                    .into_inner()
-                }
-            },
-            CollectionUpdateOperations::VectorOperation(vector_ops) => match vector_ops {
-                VectorOperations::UpdateVectors(update_operation) => {
-                    let request = &internal_update_vectors(
-                        shard_id,
-                        collection_name,
-                        update_operation,
-                        wait,
-                        ordering,
-                    );
-                    self.with_points_client(|mut client| async move {
-                        client
-                            .update_vectors(tonic::Request::new(request.clone()))
-                            .await
-                    })
-                    .await?
-                    .into_inner()
-                }
-                VectorOperations::DeleteVectors(ids, vector_names) => {
-                    let request = &internal_delete_vectors(
-                        shard_id,
-                        collection_name,
-                        ids.points,
-                        vector_names.clone(),
-                        wait,
-                        ordering,
-                    );
-                    self.with_points_client(|mut client| async move {
-                        client
-                            .delete_vectors(tonic::Request::new(request.clone()))
-                            .await
-                    })
-                    .await?
-                    .into_inner()
-                }
-                VectorOperations::DeleteVectorsByFilter(filter, vector_names) => {
-                    let request = &internal_delete_vectors_by_filter(
-                        shard_id,
-                        collection_name,
-                        filter,
-                        vector_names.clone(),
-                        wait,
-                        ordering,
-                    );
-                    self.with_points_client(|mut client| async move {
-                        client
-                            .delete_vectors(tonic::Request::new(request.clone()))
-                            .await
-                    })
-                    .await?
-                    .into_inner()
-                }
-            },
-            CollectionUpdateOperations::PayloadOperation(payload_ops) => match payload_ops {
-                PayloadOps::SetPayload(set_payload) => {
-                    let request = &internal_set_payload(
-                        shard_id,
-                        collection_name,
-                        set_payload,
-                        wait,
-                        ordering,
-                    );
-                    self.with_points_client(|mut client| async move {
-                        client
-                            .set_payload(tonic::Request::new(request.clone()))
-                            .await
-                    })
-                    .await?
-                    .into_inner()
-                }
-                PayloadOps::DeletePayload(delete_payload) => {
-                    let request = &internal_delete_payload(
-                        shard_id,
-                        collection_name,
-                        delete_payload,
-                        wait,
-                        ordering,
-                    );
-                    self.with_points_client(|mut client| async move {
-                        client
-                            .delete_payload(tonic::Request::new(request.clone()))
-                            .await
-                    })
-                    .await?
-                    .into_inner()
-                }
-                PayloadOps::ClearPayload { points } => {
-                    let request =
-                        &internal_clear_payload(shard_id, collection_name, points, wait, ordering);
-                    self.with_points_client(|mut client| async move {
-                        client
-                            .clear_payload(tonic::Request::new(request.clone()))
-                            .await
-                    })
-                    .await?
-                    .into_inner()
-                }
-                PayloadOps::ClearPayloadByFilter(filter) => {
-                    let request = &internal_clear_payload_by_filter(
-                        shard_id,
-                        collection_name,
-                        filter,
-                        wait,
-                        ordering,
-                    );
-                    self.with_points_client(|mut client| async move {
-                        client
-                            .clear_payload(tonic::Request::new(request.clone()))
-                            .await
-                    })
-                    .await?
-                    .into_inner()
-                }
-                PayloadOps::OverwritePayload(set_payload) => {
-                    let request = &internal_set_payload(
-                        shard_id,
-                        collection_name,
-                        set_payload,
-                        wait,
-                        ordering,
-                    );
-                    self.with_points_client(|mut client| async move {
-                        client
-                            .overwrite_payload(tonic::Request::new(request.clone()))
-                            .await
-                    })
-                    .await?
-                    .into_inner()
-                }
-            },
-            CollectionUpdateOperations::FieldIndexOperation(field_index_op) => match field_index_op
-            {
-                FieldIndexOperations::CreateIndex(create_index) => {
-                    let request = &internal_create_index(
-                        shard_id,
-                        collection_name,
-                        create_index,
-                        wait,
-                        ordering,
-                    );
-                    self.with_points_client(|mut client| async move {
-                        client
-                            .create_field_index(tonic::Request::new(request.clone()))
-                            .await
-                    })
-                    .await?
-                    .into_inner()
-                }
-                FieldIndexOperations::DeleteIndex(delete_index) => {
-                    let request = &internal_delete_index(
-                        shard_id,
-                        collection_name,
-                        delete_index,
-                        wait,
-                        ordering,
-                    );
-                    self.with_points_client(|mut client| async move {
-                        client
-                            .delete_field_index(tonic::Request::new(request.clone()))
-                            .await
-                    })
-                    .await?
-                    .into_inner()
-                }
-            },
-        };
-        match point_operation_response.result {
-            None => Err(CollectionError::service_error(
-                "Malformed UpdateResult type".to_string(),
-            )),
-            Some(update_result) => update_result.try_into().map_err(|e: Status| e.into()),
-        }
-    }
-}
-
-// New-type to own the type in the crate for conversions via From
-pub struct CollectionSearchRequest<'a>(pub(crate) (CollectionId, &'a SearchRequest));
-
-#[async_trait]
-#[allow(unused_variables)]
-impl ShardOperation for RemoteShard {
-    async fn update(
-        &self,
-        operation: CollectionUpdateOperations,
-        wait: bool,
-    ) -> CollectionResult<UpdateResult> {
-        // targets the shard explicitly
-        let shard_id = Some(self.id);
-        self.execute_update_operation(shard_id, self.collection_id.clone(), operation, wait, None)
-            .await
-    }
-
-    async fn scroll_by(
-        &self,
-        offset: Option<ExtendedPointId>,
-        limit: usize,
-        with_payload_interface: &WithPayloadInterface,
-        with_vector: &WithVector,
-        filter: Option<&Filter>,
-        search_runtime_handle: &Handle,
-    ) -> CollectionResult<Vec<Record>> {
-        let scroll_points = ScrollPoints {
-            collection_name: self.collection_id.clone(),
-            filter: filter.map(|f| f.clone().into()),
-            offset: offset.map(|o| o.into()),
-            limit: Some(limit as u32),
-            with_payload: Some(with_payload_interface.clone().into()),
-            with_vectors: Some(with_vector.clone().into()),
-            read_consistency: None,
-        };
-        let request = &ScrollPointsInternal {
-            scroll_points: Some(scroll_points),
-            shard_id: Some(self.id),
-        };
-
-        let scroll_response = self
-            .with_points_client(|mut client| async move {
-                client.scroll(tonic::Request::new(request.clone())).await
-            })
-            .await?
-            .into_inner();
-
-        let result: Result<Vec<Record>, Status> = scroll_response
-            .result
-            .into_iter()
-            .map(|point| try_record_from_grpc(point, with_payload_interface.is_required()))
-            .collect();
-
-        result.map_err(|e| e.into())
-    }
-
-    async fn info(&self) -> CollectionResult<CollectionInfo> {
-        let get_collection_info_request = GetCollectionInfoRequest {
-            collection_name: self.collection_id.clone(),
-        };
-        let request = &GetCollectionInfoRequestInternal {
-            get_collection_info_request: Some(get_collection_info_request),
-            shard_id: self.id,
-        };
-        let get_collection_response = self
-            .with_collections_client(|mut client| async move {
-                client.get(tonic::Request::new(request.clone())).await
-            })
-            .await?
-            .into_inner();
-
-        let result: Result<CollectionInfo, Status> = get_collection_response.try_into();
-        result.map_err(|e| e.into())
-    }
-
-    async fn search(
-        &self,
-        batch_request: Arc<SearchRequestBatch>,
-        search_runtime_handle: &Handle,
-    ) -> CollectionResult<Vec<Vec<ScoredPoint>>> {
-        let mut timer = ScopeDurationMeasurer::new(&self.telemetry_search_durations);
-        timer.set_success(false);
-
-        let search_points = batch_request
-            .searches
-            .iter()
-            .map(|s| CollectionSearchRequest((self.collection_id.clone(), s)).into())
-            .collect();
-
-        let request = &SearchBatchPointsInternal {
-            collection_name: self.collection_id.clone(),
-            search_points,
-            shard_id: Some(self.id),
-        };
-        let search_batch_response = self
-            .with_points_client(|mut client| async move {
-                client
-                    .search_batch(tonic::Request::new(request.clone()))
-                    .await
-            })
-            .await?
-            .into_inner();
-
-        let result: Result<Vec<Vec<ScoredPoint>>, Status> = search_batch_response
-            .result
-            .into_iter()
-            .zip(batch_request.searches.iter())
-            .map(|(batch_result, request)| {
-                let is_payload_required = request
-                    .with_payload
-                    .as_ref()
-                    .map_or(false, |with_payload| with_payload.is_required());
-
-                batch_result
-                    .result
-                    .into_iter()
-                    .map(|point| try_scored_point_from_grpc(point, is_payload_required))
-                    .collect()
-            })
-            .collect();
-        let result = result.map_err(|e| e.into());
-        if result.is_ok() {
-            timer.set_success(true);
-        }
-        result
-    }
-
-    async fn count(&self, request: Arc<CountRequest>) -> CollectionResult<CountResult> {
-        let count_points = CountPoints {
-            collection_name: self.collection_id.clone(),
-            filter: request.filter.clone().map(|f| f.into()),
-            exact: Some(request.exact),
-        };
-
-        let request = &CountPointsInternal {
-            count_points: Some(count_points),
-            shard_id: Some(self.id),
-        };
-        let count_response = self
-            .with_points_client(|mut client| async move {
-                client.count(tonic::Request::new(request.clone())).await
-            })
-            .await?
-            .into_inner();
-        count_response.result.map_or_else(
-            || {
-                Err(CollectionError::service_error(
-                    "Unexpected empty CountResult".to_string(),
-                ))
-            },
-            |count_result| Ok(count_result.into()),
-        )
-    }
-
-    async fn retrieve(
-        &self,
-        request: Arc<PointRequest>,
-        with_payload: &WithPayload,
-        with_vector: &WithVector,
-    ) -> CollectionResult<Vec<Record>> {
-        let get_points = GetPoints {
-            collection_name: self.collection_id.clone(),
-            ids: request.ids.iter().copied().map(|v| v.into()).collect(),
-            with_payload: request.with_payload.clone().map(|wp| wp.into()),
-            with_vectors: Some(with_vector.clone().into()),
-            read_consistency: None,
-        };
-        let request = &GetPointsInternal {
-            get_points: Some(get_points),
-            shard_id: Some(self.id),
-        };
-
-        let get_response = self
-            .with_points_client(|mut client| async move {
-                client.get(tonic::Request::new(request.clone())).await
-            })
-            .await?
-            .into_inner();
-
-        let result: Result<Vec<Record>, Status> = get_response
-            .result
-            .into_iter()
-            .map(|point| try_record_from_grpc(point, with_payload.enable))
-            .collect();
-
-        result.map_err(|e| e.into())
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/shards/replica_set.rs b/crates/qdrant/lib/collection/src/shards/replica_set.rs
deleted file mode 100644
index b46cc92..0000000
--- a/crates/qdrant/lib/collection/src/shards/replica_set.rs
+++ /dev/null
@@ -1,1677 +0,0 @@
-use std::cmp;
-use std::cmp::max;
-use std::collections::{HashMap, HashSet};
-use std::fmt::Write as _;
-use std::future::Future;
-use std::ops::Deref;
-use std::path::{Path, PathBuf};
-use std::sync::Arc;
-use std::time::Duration;
-
-use futures::future::{join, join_all};
-use futures::stream::FuturesUnordered;
-use futures::{FutureExt, StreamExt};
-use itertools::Itertools;
-use rand::seq::SliceRandom;
-use schemars::JsonSchema;
-use segment::types::{
-    ExtendedPointId, Filter, PointIdType, ScoredPoint, WithPayload, WithPayloadInterface,
-    WithVector,
-};
-use serde::{Deserialize, Serialize};
-use tokio::runtime::Handle;
-use tokio::sync::{Mutex, RwLock};
-
-use super::local_shard::LocalShard;
-use super::remote_shard::RemoteShard;
-use super::resolve::{Resolve, ResolveCondition};
-use super::{create_shard_dir, CollectionId};
-use crate::config::CollectionConfig;
-use crate::operations::consistency_params::{ReadConsistency, ReadConsistencyType};
-use crate::operations::point_ops::WriteOrdering;
-use crate::operations::shared_storage_config::SharedStorageConfig;
-use crate::operations::types::{
-    CollectionError, CollectionInfo, CollectionResult, CountRequest, CountResult, PointRequest,
-    Record, SearchRequestBatch, UpdateResult,
-};
-use crate::operations::CollectionUpdateOperations;
-use crate::save_on_disk::SaveOnDisk;
-use crate::shards::channel_service::ChannelService;
-use crate::shards::dummy_shard::DummyShard;
-use crate::shards::forward_proxy_shard::ForwardProxyShard;
-use crate::shards::shard::Shard::{Dummy, ForwardProxy, Local};
-use crate::shards::shard::{PeerId, Shard, ShardId};
-use crate::shards::shard_config::ShardConfig;
-use crate::shards::shard_trait::ShardOperation;
-use crate::shards::telemetry::ReplicaSetTelemetry;
-
-pub type ActivatePeer = Arc<dyn Fn(PeerId, ShardId) + Send + Sync>;
-pub type ChangePeerState = Arc<dyn Fn(PeerId, ShardId) + Send + Sync>;
-pub type OnPeerCreated = Arc<dyn Fn(PeerId, ShardId) + Send + Sync>;
-
-const DEFAULT_SHARD_DEACTIVATION_TIMEOUT: Duration = Duration::from_secs(30);
-
-const READ_REMOTE_REPLICAS: u32 = 2;
-
-const REPLICA_STATE_FILE: &str = "replica_state.json";
-
-//    │    Collection Created
-//    │
-//    ▼
-//  ┌──────────────┐
-//  │              │
-//  │ Initializing │
-//  │              │
-//  └──────┬───────┘
-//         │  Report created    ┌───────────┐
-//         └────────────────────►           │
-//             Activate         │ Consensus │
-//        ┌─────────────────────┤           │
-//        │                     └───────────┘
-//  ┌─────▼───────┐   User Promote           ┌──────────┐
-//  │             ◄──────────────────────────►          │
-//  │ Active      │                          │ Listener │
-//  │             ◄───────────┐              │          │
-//  └──┬──────────┘           │Transfer      └──┬───────┘
-//     │                      │Finished         │
-//     │               ┌──────┴────────┐        │Update
-//     │Update         │               │        │Failure
-//     │Failure        │ Partial       ├───┐    │
-//     │               │               │   │    │
-//     │               └───────▲───────┘   │    │
-//     │                       │           │    │
-//  ┌──▼──────────┐ Transfer   │           │    │
-//  │             │ Started    │           │    │
-//  │ Dead        ├────────────┘           │    │
-//  │             │                        │    │
-//  └─▲───────▲───┘        Transfer        │    │
-//    │       │            Failed/Cancelled│    │
-//    │       └────────────────────────────┘    │
-//    │                                         │
-//    └─────────────────────────────────────────┘
-//
-
-/// State of the single shard within a replica set.
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Default, PartialEq, Eq, Hash, Clone, Copy)]
-pub enum ReplicaState {
-    // Active and sound
-    #[default]
-    Active,
-    // Failed for some reason
-    Dead,
-    // The shard is partially loaded and is currently receiving data from other shards
-    Partial,
-    // Collection is being created
-    Initializing,
-    // A shard which receives data, but is not used for search
-    // Useful for backup shards
-    Listener,
-}
-
-/// Represents a change in replica set, due to scaling of `replication_factor`
-#[derive(Debug, Deserialize, Serialize, PartialEq, Eq, Hash, Clone)]
-pub enum Change {
-    Remove(ShardId, PeerId),
-}
-
-/// Represents a replica set state
-#[derive(Debug, Deserialize, Serialize, Default, PartialEq, Eq, Clone)]
-pub struct ReplicaSetState {
-    pub is_local: bool,
-    pub this_peer_id: PeerId,
-    peers: HashMap<PeerId, ReplicaState>,
-}
-
-impl ReplicaSetState {
-    pub fn get_peer_state(&self, peer_id: &PeerId) -> Option<&ReplicaState> {
-        self.peers.get(peer_id)
-    }
-
-    pub fn set_peer_state(&mut self, peer_id: PeerId, state: ReplicaState) {
-        self.peers.insert(peer_id, state);
-    }
-
-    pub fn remove_peer_state(&mut self, peer_id: &PeerId) -> Option<ReplicaState> {
-        self.peers.remove(peer_id)
-    }
-
-    pub fn peers(&self) -> HashMap<PeerId, ReplicaState> {
-        self.peers.clone()
-    }
-
-    pub fn set_peers(&mut self, peers: HashMap<PeerId, ReplicaState>) {
-        self.peers = peers;
-    }
-}
-
-/// A set of shard replicas.
-/// Handles operations so that the state is consistent across all the replicas of the shard.
-/// Prefers local shard for read-only operations.
-/// Perform updates on all replicas and report error if there is at least one failure.
-///
-pub struct ShardReplicaSet {
-    local: RwLock<Option<Shard>>, // Abstract Shard to be able to use a Proxy during replication
-    remotes: RwLock<Vec<RemoteShard>>,
-    replica_state: Arc<SaveOnDisk<ReplicaSetState>>,
-    /// List of peers that are marked as dead locally, but are not yet submitted to the consensus.
-    /// List is checked on each consensus round and submitted to the consensus.
-    /// If the state of the peer is changed in the consensus, it is removed from the list.
-    /// Update and read operations are not performed on the peers marked as dead.
-    locally_disabled_peers: parking_lot::RwLock<HashSet<PeerId>>,
-    pub(crate) shard_path: PathBuf,
-    pub(crate) shard_id: ShardId,
-    /// Number of remote replicas to send read requests to.
-    /// If actual number of peers is less than this, then read request will be sent to all of them.
-    read_remote_replicas: u32,
-    notify_peer_failure_cb: ChangePeerState,
-    channel_service: ChannelService,
-    collection_id: CollectionId,
-    collection_config: Arc<RwLock<CollectionConfig>>,
-    shared_storage_config: Arc<SharedStorageConfig>,
-    update_runtime: Handle,
-    search_runtime: Handle,
-    /// Lock to serialized write operations on the replicaset when a write ordering is used.
-    write_ordering_lock: Mutex<()>,
-}
-
-impl ShardReplicaSet {
-    pub async fn is_local(&self) -> bool {
-        let local_read = self.local.read().await;
-        matches!(*local_read, Some(Local(_) | Dummy(_)))
-    }
-
-    pub async fn is_dummy(&self) -> bool {
-        let local_read = self.local.read().await;
-        matches!(*local_read, Some(Dummy(_)))
-    }
-
-    pub async fn has_local_shard(&self) -> bool {
-        self.local.read().await.is_some()
-    }
-
-    pub fn peers(&self) -> HashMap<PeerId, ReplicaState> {
-        self.replica_state.read().peers()
-    }
-
-    pub fn this_peer_id(&self) -> PeerId {
-        self.replica_state.read().this_peer_id
-    }
-
-    pub fn highest_replica_peer_id(&self) -> Option<PeerId> {
-        self.replica_state.read().peers.keys().max().cloned()
-    }
-
-    pub fn highest_alive_replica_peer_id(&self) -> Option<PeerId> {
-        let read_lock = self.replica_state.read();
-        let peer_ids = read_lock.peers.keys().cloned().collect::<Vec<_>>();
-        drop(read_lock);
-
-        peer_ids
-            .into_iter()
-            .filter(|peer_id| self.peer_is_active(peer_id)) // re-acquire replica_state read lock
-            .max()
-    }
-
-    pub async fn remote_peers(&self) -> Vec<PeerId> {
-        self.remotes
-            .read()
-            .await
-            .iter()
-            .map(|r| r.peer_id)
-            .collect()
-    }
-
-    pub async fn active_remote_shards(&self) -> Vec<PeerId> {
-        self.remote_peers()
-            .await
-            .into_iter()
-            .filter(|peer_id| self.peer_is_active(peer_id))
-            .collect()
-    }
-
-    fn init_remote_shards(
-        shard_id: ShardId,
-        collection_id: CollectionId,
-        state: &ReplicaSetState,
-        channel_service: &ChannelService,
-    ) -> Vec<RemoteShard> {
-        state
-            .peers()
-            .iter()
-            .filter(|(peer, _)| **peer != state.this_peer_id)
-            .map(|(peer_id, _is_active)| {
-                RemoteShard::new(
-                    shard_id,
-                    collection_id.clone(),
-                    *peer_id,
-                    channel_service.clone(),
-                )
-            })
-            .collect()
-    }
-
-    /// Create a new fresh replica set, no previous state is expected.
-    #[allow(clippy::too_many_arguments)]
-    pub async fn build(
-        shard_id: ShardId,
-        collection_id: CollectionId,
-        this_peer_id: PeerId,
-        local: bool,
-        remotes: HashSet<PeerId>,
-        on_peer_failure: ChangePeerState,
-        collection_path: &Path,
-        collection_config: Arc<RwLock<CollectionConfig>>,
-        shared_storage_config: Arc<SharedStorageConfig>,
-        channel_service: ChannelService,
-        update_runtime: Handle,
-        search_runtime: Handle,
-    ) -> CollectionResult<Self> {
-        let shard_path = create_shard_dir(collection_path, shard_id).await?;
-        let local = if local {
-            let shard = LocalShard::build(
-                shard_id,
-                collection_id.clone(),
-                &shard_path,
-                collection_config.clone(),
-                shared_storage_config.clone(),
-                update_runtime.clone(),
-            )
-            .await?;
-            Some(Local(shard))
-        } else {
-            None
-        };
-        let replica_state: SaveOnDisk<ReplicaSetState> =
-            SaveOnDisk::load_or_init(shard_path.join(REPLICA_STATE_FILE))?;
-        replica_state.write(|rs| {
-            rs.this_peer_id = this_peer_id;
-            if local.is_some() {
-                rs.is_local = true;
-                rs.set_peer_state(this_peer_id, ReplicaState::Initializing);
-            }
-            for peer in remotes {
-                rs.set_peer_state(peer, ReplicaState::Initializing);
-            }
-        })?;
-
-        let remote_shards = Self::init_remote_shards(
-            shard_id,
-            collection_id.clone(),
-            &replica_state.read(),
-            &channel_service,
-        );
-
-        // Save shard config as the last step, to ensure that the file state is consistent
-        // Presence of shard config indicates that the shard is ready to be used
-        let replica_set_shard_config = ShardConfig::new_replica_set();
-        replica_set_shard_config.save(&shard_path)?;
-
-        Ok(Self {
-            shard_id,
-            local: RwLock::new(local),
-            remotes: RwLock::new(remote_shards),
-            replica_state: replica_state.into(),
-            locally_disabled_peers: Default::default(),
-            shard_path,
-            // TODO: move to collection config
-            read_remote_replicas: READ_REMOTE_REPLICAS,
-            notify_peer_failure_cb: on_peer_failure,
-            channel_service,
-            collection_id,
-            collection_config,
-            shared_storage_config,
-            update_runtime,
-            search_runtime,
-            write_ordering_lock: Mutex::new(()),
-        })
-    }
-
-    pub async fn remove_remote(&self, peer_id: PeerId) -> CollectionResult<()> {
-        self.replica_state.write(|rs| {
-            rs.remove_peer_state(&peer_id);
-        })?;
-
-        self.update_locally_disabled(peer_id);
-
-        let mut remotes = self.remotes.write().await;
-        remotes.retain(|remote| remote.peer_id != peer_id);
-        Ok(())
-    }
-
-    pub async fn add_remote(&self, peer_id: PeerId, state: ReplicaState) -> CollectionResult<()> {
-        self.replica_state.write(|rs| {
-            rs.set_peer_state(peer_id, state);
-        })?;
-
-        self.update_locally_disabled(peer_id);
-
-        let mut remotes = self.remotes.write().await;
-
-        // check remote already exists
-        if remotes.iter().any(|remote| remote.peer_id == peer_id) {
-            return Ok(());
-        }
-
-        remotes.push(RemoteShard::new(
-            self.shard_id,
-            self.collection_id.clone(),
-            peer_id,
-            self.channel_service.clone(),
-        ));
-
-        Ok(())
-    }
-
-    pub async fn remove_local(&self) -> CollectionResult<()> {
-        self.replica_state.write(|rs| {
-            rs.is_local = false;
-            let this_peer_id = rs.this_peer_id;
-            rs.remove_peer_state(&this_peer_id);
-        })?;
-
-        self.update_locally_disabled(self.this_peer_id());
-
-        let removing_local = {
-            let mut local = self.local.write().await;
-            local.take()
-        };
-
-        if let Some(removing_local) = removing_local {
-            // stop ongoing tasks and delete data
-            drop(removing_local);
-            LocalShard::clear(&self.shard_path).await?;
-        }
-        Ok(())
-    }
-
-    pub async fn set_local(
-        &self,
-        local: LocalShard,
-        state: Option<ReplicaState>,
-    ) -> CollectionResult<Option<Shard>> {
-        let old_shard = self.local.write().await.replace(Local(local));
-
-        if !self.replica_state.read().is_local || state.is_some() {
-            self.replica_state.write(|rs| {
-                rs.is_local = true;
-                if let Some(active) = state {
-                    rs.set_peer_state(self.this_peer_id(), active);
-                }
-            })?;
-        }
-        self.update_locally_disabled(self.this_peer_id());
-        Ok(old_shard)
-    }
-
-    pub async fn remove_peer(&self, peer_id: PeerId) -> CollectionResult<()> {
-        if self.this_peer_id() == peer_id {
-            self.remove_local().await?;
-        } else {
-            self.remove_remote(peer_id).await?;
-        }
-        Ok(())
-    }
-
-    pub async fn add_peer(&self, peer_id: PeerId, state: ReplicaState) -> CollectionResult<()> {
-        if self.this_peer_id() == peer_id {
-            let mut local = self.local.write().await;
-            let new_local = if local.is_none() {
-                Some(Local(
-                    LocalShard::build(
-                        self.shard_id,
-                        self.collection_id.clone(),
-                        &self.shard_path,
-                        self.collection_config.clone(),
-                        self.shared_storage_config.clone(),
-                        self.update_runtime.clone(),
-                    )
-                    .await?,
-                ))
-            } else {
-                None
-            };
-
-            self.set_replica_state(&peer_id, state)?;
-            if new_local.is_some() {
-                *local = new_local;
-            }
-        } else {
-            self.add_remote(peer_id, state).await?;
-        }
-        Ok(())
-    }
-
-    /// Recovers shard from disk.
-    ///
-    /// WARN: This method intended to be used only on the initial start of the node.
-    /// It does not implement any logic to recover from a failure.
-    /// Will panic or load partial state if there is a failure.
-    #[allow(clippy::too_many_arguments)]
-    pub async fn load(
-        shard_id: ShardId,
-        collection_id: CollectionId,
-        shard_path: &Path,
-        collection_config: Arc<RwLock<CollectionConfig>>,
-        shared_storage_config: Arc<SharedStorageConfig>,
-        channel_service: ChannelService,
-        on_peer_failure: ChangePeerState,
-        this_peer_id: PeerId,
-        update_runtime: Handle,
-        search_runtime: Handle,
-    ) -> Self {
-        let replica_state: SaveOnDisk<ReplicaSetState> =
-            SaveOnDisk::load_or_init(shard_path.join(REPLICA_STATE_FILE)).unwrap();
-
-        if replica_state.read().this_peer_id != this_peer_id {
-            replica_state
-                .write(|rs| {
-                    let this_peer_id = rs.this_peer_id;
-                    let local_state = rs.remove_peer_state(&this_peer_id);
-                    if let Some(state) = local_state {
-                        rs.set_peer_state(this_peer_id, state);
-                    }
-                    rs.this_peer_id = this_peer_id;
-                })
-                .map_err(|e| {
-                    panic!("Failed to update replica state in {shard_path:?}: {e}");
-                })
-                .unwrap();
-        }
-
-        let remote_shards: Vec<_> = Self::init_remote_shards(
-            shard_id,
-            collection_id.clone(),
-            &replica_state.read(),
-            &channel_service,
-        );
-
-        let local = if replica_state.read().is_local {
-            let shard = if let Some(recovery_reason) = &shared_storage_config.recovery_mode {
-                Dummy(DummyShard::new(recovery_reason))
-            } else {
-                let res = LocalShard::load(
-                    shard_id,
-                    collection_id.clone(),
-                    shard_path,
-                    collection_config.clone(),
-                    shared_storage_config.clone(),
-                    update_runtime.clone(),
-                )
-                .await;
-
-                match res {
-                    Ok(shard) => Local(shard),
-                    Err(err) => {
-                        if !shared_storage_config.handle_collection_load_errors {
-                            panic!("Failed to load local shard {shard_path:?}: {err}")
-                        }
-
-                        log::error!(
-                            "Failed to load local shard {shard_path:?}, \
-                         initializing \"dummy\" shard instead: \
-                         {err}"
-                        );
-
-                        Dummy(DummyShard::new(format!(
-                            "Failed to load local shard {shard_path:?}: {err}"
-                        )))
-                    }
-                }
-            };
-
-            Some(shard)
-        } else {
-            None
-        };
-
-        Self {
-            shard_id,
-            local: RwLock::new(local),
-            remotes: RwLock::new(remote_shards),
-            replica_state: replica_state.into(),
-            // TODO: move to collection config
-            locally_disabled_peers: Default::default(),
-            shard_path: shard_path.to_path_buf(),
-            read_remote_replicas: READ_REMOTE_REPLICAS,
-            notify_peer_failure_cb: on_peer_failure,
-            channel_service,
-            collection_id,
-            collection_config,
-            shared_storage_config,
-            update_runtime,
-            search_runtime,
-            write_ordering_lock: Mutex::new(()),
-        }
-    }
-
-    pub fn notify_peer_failure(&self, peer_id: PeerId) {
-        log::debug!("Notify peer failure: {}", peer_id);
-        self.notify_peer_failure_cb.deref()(peer_id, self.shard_id)
-    }
-
-    /// Change state of the replica to the given.
-    /// Ensure that remote shard is initialized.
-    pub async fn ensure_replica_with_state(
-        &self,
-        peer_id: &PeerId,
-        state: ReplicaState,
-    ) -> CollectionResult<()> {
-        if *peer_id == self.replica_state.read().this_peer_id {
-            self.set_replica_state(peer_id, state)?;
-        } else {
-            // Create remote shard if necessary
-            self.add_remote(*peer_id, state).await?;
-        }
-        Ok(())
-    }
-
-    pub fn set_replica_state(&self, peer_id: &PeerId, state: ReplicaState) -> CollectionResult<()> {
-        log::debug!(
-            "Changing local shard {}:{} state from {:?} to {state:?}",
-            self.collection_id,
-            self.shard_id,
-            self.replica_state.read().get_peer_state(peer_id),
-        );
-
-        self.replica_state.write(|rs| {
-            if rs.this_peer_id == *peer_id {
-                rs.is_local = true;
-            }
-            rs.set_peer_state(*peer_id, state);
-        })?;
-        self.update_locally_disabled(*peer_id);
-        Ok(())
-    }
-
-    pub async fn apply_state(
-        &self,
-        replicas: HashMap<PeerId, ReplicaState>,
-    ) -> CollectionResult<()> {
-        let old_peers = self.replica_state.read().peers();
-
-        self.replica_state.write(|state| {
-            state.set_peers(replicas.clone());
-        })?;
-
-        self.locally_disabled_peers.write().clear();
-
-        let removed_peers = old_peers
-            .keys()
-            .filter(|peer_id| !replicas.contains_key(peer_id))
-            .copied()
-            .collect::<Vec<_>>();
-        for peer_id in removed_peers {
-            self.remove_peer(peer_id).await?;
-        }
-
-        for (peer_id, state) in replicas {
-            let peer_already_exists = old_peers.get(&peer_id).is_some();
-
-            if peer_already_exists {
-                // do nothing
-                // We only need to change state and it is already saved
-                continue;
-            }
-
-            if peer_id == self.this_peer_id() {
-                // Consensus wants a local replica on this peer
-                let local_shard = LocalShard::build(
-                    self.shard_id,
-                    self.collection_id.clone(),
-                    &self.shard_path,
-                    self.collection_config.clone(),
-                    self.shared_storage_config.clone(),
-                    self.update_runtime.clone(),
-                )
-                .await?;
-                match state {
-                    ReplicaState::Active => {
-                        // No way we can provide up-to-date replica right away at this point,
-                        // so we report a failure to consensus
-                        self.set_local(local_shard, Some(ReplicaState::Active))
-                            .await?;
-                        self.notify_peer_failure(peer_id);
-                    }
-                    ReplicaState::Dead => {
-                        self.set_local(local_shard, Some(ReplicaState::Dead))
-                            .await?;
-                    }
-                    ReplicaState::Partial => {
-                        self.set_local(local_shard, Some(ReplicaState::Partial))
-                            .await?;
-                    }
-                    ReplicaState::Initializing => {
-                        self.set_local(local_shard, Some(ReplicaState::Initializing))
-                            .await?;
-                    }
-                    ReplicaState::Listener => {
-                        // Same as `Active`, we report a failure to consensus
-                        self.set_local(local_shard, Some(ReplicaState::Listener))
-                            .await?;
-                        self.notify_peer_failure(peer_id);
-                    }
-                }
-                continue;
-            }
-
-            // Otherwise it is a missing remote replica, we simply create it
-
-            let new_remote = RemoteShard::new(
-                self.shard_id,
-                self.collection_id.clone(),
-                peer_id,
-                self.channel_service.clone(),
-            );
-            self.remotes.write().await.push(new_remote);
-        }
-        Ok(())
-    }
-
-    pub fn is_locally_disabled(&self, peer_id: &PeerId) -> bool {
-        self.locally_disabled_peers.read().contains(peer_id)
-    }
-
-    /// Check whether a peer is registered as `active`.
-    /// Unknown peers are not active.
-    pub fn peer_is_active(&self, peer_id: &PeerId) -> bool {
-        self.peer_state(peer_id) == Some(ReplicaState::Active) && !self.is_locally_disabled(peer_id)
-    }
-
-    pub fn peer_is_active_or_pending(&self, peer_id: &PeerId) -> bool {
-        let res = match self.peer_state(peer_id) {
-            Some(ReplicaState::Active) => true,
-            Some(ReplicaState::Partial) => true,
-            Some(ReplicaState::Initializing) => true,
-            Some(ReplicaState::Dead) => false,
-            Some(ReplicaState::Listener) => true,
-            None => false,
-        };
-        res && !self.is_locally_disabled(peer_id)
-    }
-
-    pub fn peer_state(&self, peer_id: &PeerId) -> Option<ReplicaState> {
-        self.replica_state.read().get_peer_state(peer_id).copied()
-    }
-
-    /// Execute read op. on replica set:
-    /// 1 - Prefer local replica
-    /// 2 - Otherwise uses `read_fan_out_ratio` to compute list of active remote shards.
-    /// 3 - Fallbacks to all remaining shards if the optimisations fails.
-    /// It does not report failing peer_ids to the consensus.
-    pub async fn execute_read_operation<'a, F, Fut, Res>(
-        &self,
-        read_operation: F,
-        local: &'a Option<Shard>,
-        remotes: &'a [RemoteShard],
-    ) -> CollectionResult<Res>
-    where
-        F: Fn(&'a (dyn ShardOperation + Send + Sync)) -> Fut,
-        Fut: Future<Output = CollectionResult<Res>>,
-    {
-        let mut local_result = None;
-        // 1 - prefer the local shard if it is active
-        if let Some(local) = local {
-            if self.peer_is_active(&self.this_peer_id()) {
-                let read_operation_res = read_operation(local.get()).await;
-                match &read_operation_res {
-                    Ok(_) => return read_operation_res,
-                    Err(error) => {
-                        if error.is_transient() {
-                            log::debug!("Local read op. failed: {}", error);
-                            local_result = Some(read_operation_res);
-                        } else {
-                            return read_operation_res;
-                        }
-                    }
-                }
-            }
-        }
-
-        // 2 - try a subset of active remote shards in parallel for fast response
-        let mut active_remote_shards: Vec<_> = remotes
-            .iter()
-            .filter(|rs| self.peer_is_active(&rs.peer_id))
-            .collect();
-
-        if active_remote_shards.is_empty() {
-            if let Some(local_result) = local_result {
-                return local_result;
-            }
-
-            return Err(CollectionError::service_error(format!(
-                "The replica set for shard {} on peer {} has no active replica",
-                self.shard_id,
-                self.this_peer_id()
-            )));
-        }
-
-        // Shuffle the list of active remote shards to avoid biasing the first ones
-        active_remote_shards.shuffle(&mut rand::thread_rng());
-
-        let fan_out_selection = cmp::min(
-            active_remote_shards.len(),
-            self.read_remote_replicas as usize,
-        );
-
-        let mut futures = FuturesUnordered::new();
-        for remote in &active_remote_shards[0..fan_out_selection] {
-            let fut = read_operation(*remote);
-            futures.push(fut);
-        }
-
-        // shortcut at first successful result
-        let mut captured_error = None;
-        while let Some(result) = futures.next().await {
-            match &result {
-                Ok(_) => return result,
-                Err(error) => {
-                    if error.is_transient() {
-                        log::debug!("Local read op. failed: {}", error);
-                        captured_error = Some(result);
-                    } else {
-                        return result;
-                    }
-                }
-            }
-        }
-        debug_assert!(
-            captured_error.is_some(),
-            "there must be at least one failure"
-        );
-
-        // 3 - fallback to remaining remote shards as last chance
-        let mut futures = FuturesUnordered::new();
-        for remote in &active_remote_shards[fan_out_selection..] {
-            let fut = read_operation(*remote);
-            futures.push(fut);
-        }
-
-        // shortcut at first successful result
-        while let Some(result) = futures.next().await {
-            match &result {
-                Ok(_) => return result,
-                Err(error) => {
-                    if error.is_transient() {
-                        log::debug!("Local read op. failed: {}", error);
-                        captured_error = Some(result);
-                    } else {
-                        return result;
-                    }
-                }
-            }
-        }
-        captured_error.expect("at this point `captured_error` must be defined by construction")
-    }
-
-    pub async fn execute_and_resolve_read_operation<'a, F, Fut, Res>(
-        &self,
-        read_operation: F,
-        local: &'a Option<Shard>,
-        remotes: &'a [RemoteShard],
-        read_consistency: ReadConsistency,
-    ) -> CollectionResult<Res>
-    where
-        F: Fn(&'a (dyn ShardOperation + Send + Sync)) -> Fut,
-        Fut: Future<Output = CollectionResult<Res>>,
-        Res: Resolve,
-    {
-        let local_count = usize::from(local.is_some());
-        let remotes_count = remotes.len();
-
-        let active_local = local
-            .as_ref()
-            .filter(|_| self.peer_is_active(&self.this_peer_id()));
-
-        let active_remotes_iter = remotes
-            .iter()
-            .filter(|remote| self.peer_is_active(&remote.peer_id));
-
-        let active_local_count = usize::from(active_local.is_some());
-        let active_remotes_count = active_remotes_iter.clone().count();
-
-        let total_count = local_count + remotes_count;
-        let active_count = active_local_count + active_remotes_count;
-
-        let (factor, condition) = match read_consistency {
-            ReadConsistency::Type(ReadConsistencyType::All) => (total_count, ResolveCondition::All),
-
-            ReadConsistency::Type(ReadConsistencyType::Majority) => {
-                (total_count, ResolveCondition::Majority)
-            }
-
-            ReadConsistency::Type(ReadConsistencyType::Quorum) => {
-                (total_count / 2 + 1, ResolveCondition::All)
-            }
-
-            ReadConsistency::Factor(factor) => {
-                (factor.clamp(1, total_count), ResolveCondition::All)
-            }
-        };
-
-        if active_count < factor {
-            return Err(CollectionError::service_error(format!(
-                "The replica set for shard {} on peer {} does not have enough active replicas",
-                self.shard_id,
-                self.this_peer_id(),
-            )));
-        }
-
-        let mut active_remotes: Vec<_> = active_remotes_iter.collect();
-        active_remotes.shuffle(&mut rand::thread_rng());
-
-        let local_operations = active_local
-            .into_iter()
-            .map(|local| read_operation(local.get()).left_future());
-
-        let remote_operations = active_remotes
-            .into_iter()
-            .map(|remote| read_operation(remote).right_future());
-
-        let mut operations = local_operations.chain(remote_operations);
-
-        let required_reads = if active_local_count > 0 {
-            // If there is a local shard, we can ignore fan-out `read_remote_replicas` param,
-            // as we already know that the local peer is working.
-            factor
-        } else {
-            max(factor, usize::try_from(self.read_remote_replicas).unwrap())
-        };
-
-        let mut pending_operations: FuturesUnordered<_> =
-            operations.by_ref().take(required_reads).collect();
-
-        let mut responses = Vec::new();
-        let mut errors = Vec::new();
-
-        while let Some(result) = pending_operations.next().await {
-            match result {
-                Ok(resp) => responses.push(resp),
-
-                Err(err) => {
-                    let is_transient = err.is_transient();
-
-                    if is_transient {
-                        log::debug!("Read operation failed: {err}");
-                        errors.push(err);
-                    } else {
-                        return Err(err);
-                    }
-                }
-            }
-
-            if responses.len() >= factor {
-                break;
-            }
-
-            let maybe_responses = responses.len() + pending_operations.len();
-
-            let schedule = factor.saturating_sub(maybe_responses);
-            pending_operations.extend(operations.by_ref().take(schedule));
-
-            let maybe_responses = responses.len() + pending_operations.len();
-
-            if maybe_responses < factor {
-                break;
-            }
-        }
-
-        if responses.len() >= factor {
-            if factor == 1 {
-                Ok(responses.into_iter().next().unwrap())
-            } else {
-                Ok(Res::resolve(responses, condition))
-            }
-        } else {
-            let success_count = responses.len();
-            let error_count = errors.len();
-
-            Err(CollectionError::service_error(format!(
-                "{error_count} of {} shards failed with: {}",
-                success_count + error_count,
-                errors.into_iter().fold(String::new(), |mut msg, err| {
-                    if msg.is_empty() {
-                        msg = err.to_string();
-                    } else {
-                        write!(&mut msg, ", {err}").unwrap(); // Writing into `String` never fails
-                    }
-
-                    msg
-                })
-            )))
-        }
-    }
-
-    pub(crate) async fn on_optimizer_config_update(&self) -> CollectionResult<()> {
-        let read_local = self.local.read().await;
-        if let Some(shard) = &*read_local {
-            shard.on_optimizer_config_update().await
-        } else {
-            Ok(())
-        }
-    }
-
-    pub(crate) async fn get_telemetry_data(&self) -> ReplicaSetTelemetry {
-        let local_shard = self.local.read().await;
-        let local = local_shard
-            .as_ref()
-            .map(|local_shard| local_shard.get_telemetry_data());
-        ReplicaSetTelemetry {
-            id: self.shard_id,
-            local,
-            remote: self
-                .remotes
-                .read()
-                .await
-                .iter()
-                .map(|remote| remote.get_telemetry_data())
-                .collect(),
-            replicate_states: self.replica_state.read().peers(),
-        }
-    }
-
-    /// Returns if local shard was recovered from path
-    pub async fn restore_local_replica_from(&self, replica_path: &Path) -> CollectionResult<bool> {
-        if LocalShard::check_data(replica_path) {
-            let mut local = self.local.write().await;
-            let removed_local = local.take();
-
-            if let Some(removing_local) = removed_local {
-                drop(removing_local); // release file handlers
-                LocalShard::clear(&self.shard_path).await?;
-            }
-            LocalShard::move_data(replica_path, &self.shard_path).await?;
-
-            let new_local_shard = LocalShard::load(
-                self.shard_id,
-                self.collection_id.clone(),
-                &self.shard_path,
-                self.collection_config.clone(),
-                self.shared_storage_config.clone(),
-                self.update_runtime.clone(),
-            )
-            .await?;
-
-            local.replace(Local(new_local_shard));
-            Ok(true)
-        } else {
-            Ok(false)
-        }
-    }
-
-    pub fn restore_snapshot(
-        snapshot_path: &Path,
-        this_peer_id: PeerId,
-        is_distributed: bool,
-    ) -> CollectionResult<()> {
-        let replica_state: SaveOnDisk<ReplicaSetState> =
-            SaveOnDisk::load_or_init(snapshot_path.join(REPLICA_STATE_FILE))?;
-
-        // If this shard have local data
-        let is_snapshot_local = replica_state.read().is_local;
-
-        if !is_distributed && !is_snapshot_local {
-            return Err(CollectionError::service_error(format!(
-                "Can't restore snapshot is local mode with missing data at shard: {}",
-                snapshot_path.display()
-            )));
-        }
-
-        replica_state.write(|state| {
-            state.this_peer_id = this_peer_id;
-            if is_distributed {
-                state
-                    .peers
-                    .remove(&this_peer_id)
-                    .and_then(|replica_state| state.peers.insert(this_peer_id, replica_state));
-            } else {
-                // In local mode we don't want any remote peers
-                state.peers.clear();
-                state.peers.insert(this_peer_id, ReplicaState::Active);
-            }
-        })?;
-
-        if replica_state.read().is_local {
-            LocalShard::restore_snapshot(snapshot_path)?;
-        }
-        Ok(())
-    }
-
-    pub async fn create_snapshot(
-        &self,
-        temp_path: &Path,
-        target_path: &Path,
-        save_wal: bool,
-    ) -> CollectionResult<()> {
-        let local_read = self.local.read().await;
-
-        if let Some(local) = &*local_read {
-            local
-                .create_snapshot(temp_path, target_path, save_wal)
-                .await?
-        }
-
-        self.replica_state
-            .save_to(target_path.join(REPLICA_STATE_FILE))?;
-
-        let shard_config = ShardConfig::new_replica_set();
-        shard_config.save(target_path)?;
-        Ok(())
-    }
-
-    pub async fn proxify_local(&self, remote_shard: RemoteShard) -> CollectionResult<()> {
-        let mut local_write = self.local.write().await;
-
-        match &*local_write {
-            Some(Local(_)) => {
-                // Do nothing, we proceed further
-            }
-            Some(ForwardProxy(proxy)) => {
-                return if proxy.remote_shard.peer_id == remote_shard.peer_id {
-                    Ok(())
-                } else {
-                    Err(CollectionError::service_error(format!(
-                        "Cannot proxify local shard {} to peer {} because it is already proxified to peer {}",
-                        self.shard_id, remote_shard.peer_id, proxy.remote_shard.peer_id
-                    )))
-                }
-            }
-            Some(shard) => {
-                return Err(CollectionError::service_error(format!(
-                    "Cannot proxify local shard {} - {} to peer {} because it is already proxified to another peer",
-                    shard.variant_name(), self.shard_id, remote_shard.peer_id
-                )))
-            }
-            None => {
-                return Err(CollectionError::service_error(format!(
-                    "Cannot proxify local shard {} on peer {} because it is not active",
-                    self.shard_id,
-                    self.this_peer_id()
-                )));
-            }
-        };
-
-        if let Some(Local(local)) = local_write.take() {
-            let proxy_shard = ForwardProxyShard::new(local, remote_shard);
-            let _ = local_write.insert(ForwardProxy(proxy_shard));
-        }
-
-        Ok(())
-    }
-
-    /// Un-proxify local shard.
-    ///
-    /// Returns true if the replica was un-proxified, false if it was already handled
-    pub async fn un_proxify_local(&self) -> CollectionResult<()> {
-        let mut local_write = self.local.write().await;
-
-        match &*local_write {
-            Some(ForwardProxy(_)) => {
-                // Do nothing, we proceed further
-            }
-            Some(Local(_)) => return Ok(()),
-            Some(shard) => {
-                return Err(CollectionError::service_error(format!(
-                    "Cannot un-proxify local shard {} because it has unexpected type - {}",
-                    self.shard_id,
-                    shard.variant_name(),
-                )))
-            }
-            None => {
-                return Err(CollectionError::service_error(format!(
-                    "Cannot un-proxify local shard {} on peer {} because it is not active",
-                    self.shard_id,
-                    self.this_peer_id()
-                )));
-            }
-        };
-
-        if let Some(ForwardProxy(proxy)) = local_write.take() {
-            let local_shard = proxy.wrapped_shard;
-            let _ = local_write.insert(Local(local_shard));
-        }
-
-        Ok(())
-    }
-
-    /// Update local shard if any without forwarding to remote shards
-    pub async fn update_local(
-        &self,
-        operation: CollectionUpdateOperations,
-        wait: bool,
-    ) -> CollectionResult<Option<UpdateResult>> {
-        if let Some(local_shard) = &*self.local.read().await {
-            match self.peer_state(&self.this_peer_id()) {
-                Some(ReplicaState::Active) => {
-                    Ok(Some(local_shard.get().update(operation, wait).await?))
-                }
-                Some(ReplicaState::Partial) => {
-                    Ok(Some(local_shard.get().update(operation, wait).await?))
-                }
-                Some(ReplicaState::Initializing) => {
-                    Ok(Some(local_shard.get().update(operation, wait).await?))
-                }
-                Some(ReplicaState::Listener) => {
-                    Ok(Some(local_shard.get().update(operation, false).await?))
-                }
-                Some(ReplicaState::Dead) | None => Ok(None),
-            }
-        } else {
-            Ok(None)
-        }
-    }
-
-    /// Custom operation for transferring data from one shard to another during transfer
-    pub async fn transfer_batch(
-        &self,
-        offset: Option<PointIdType>,
-        batch_size: usize,
-    ) -> CollectionResult<Option<PointIdType>> {
-        let read_local = self.local.read().await;
-        if let Some(ForwardProxy(proxy)) = &*read_local {
-            proxy
-                .transfer_batch(offset, batch_size, &self.search_runtime)
-                .await
-        } else {
-            Err(CollectionError::service_error(format!(
-                "Cannot transfer batch from shard {} because it is not proxified",
-                self.shard_id
-            )))
-        }
-    }
-
-    /// Custom operation for transferring indexes from one shard to another during transfer
-    pub async fn transfer_indexes(&self) -> CollectionResult<()> {
-        let read_local = self.local.read().await;
-        if let Some(ForwardProxy(proxy)) = &*read_local {
-            proxy.transfer_indexes().await
-        } else {
-            Err(CollectionError::service_error(format!(
-                "Cannot transfer indexes from shard {} because it is not proxified",
-                self.shard_id
-            )))
-        }
-    }
-
-    fn handle_failed_replicas(
-        &self,
-        failures: &Vec<(PeerId, CollectionError)>,
-        state: &ReplicaSetState,
-    ) -> bool {
-        let mut wait_for_deactivation = false;
-
-        for (peer_id, err) in failures {
-            log::warn!(
-                "Failed to update shard {}:{} on peer {}, error: {}",
-                self.collection_id,
-                self.shard_id,
-                peer_id,
-                err
-            );
-
-            let Some(&peer_state) = state.get_peer_state(peer_id) else {
-                continue;
-            };
-
-            if peer_state != ReplicaState::Active && peer_state != ReplicaState::Initializing {
-                continue;
-            }
-
-            if err.is_transient() || peer_state == ReplicaState::Initializing {
-                // If the error is transient, we should not deactivate the peer
-                // before allowing other operations to continue.
-                // Otherwise, the failed node can become responsive again, before
-                // the other nodes deactivate it, so the storage might be inconsistent.
-                wait_for_deactivation = true;
-            }
-
-            log::debug!(
-                "Deactivating peer {} because of failed update of shard {}:{}",
-                peer_id,
-                self.collection_id,
-                self.shard_id
-            );
-
-            self.locally_disabled_peers.write().insert(*peer_id);
-            self.notify_peer_failure(*peer_id);
-        }
-
-        wait_for_deactivation
-    }
-
-    // Make sure that locally disabled peers do not contradict the consensus
-    fn update_locally_disabled(&self, peer_id_to_remove: PeerId) {
-        // Check that we are not trying to disable the last active peer
-        let peers = self.peers();
-
-        let active_peers: HashSet<_> = peers
-            .iter()
-            .filter(|(_, state)| **state == ReplicaState::Active)
-            .map(|(peer, _)| *peer)
-            .collect();
-
-        let mut locally_disabled = self.locally_disabled_peers.write();
-
-        locally_disabled.remove(&peer_id_to_remove);
-
-        if active_peers.is_subset(&locally_disabled) {
-            log::warn!("Resolving consensus/local state inconsistency");
-            locally_disabled.clear();
-        }
-    }
-
-    /// Check if the are any locally disabled peers
-    /// And if so, report them to the consensus
-    pub async fn sync_local_state(&self) -> CollectionResult<()> {
-        for failed_peer in self.locally_disabled_peers.read().iter() {
-            self.notify_peer_failure(*failed_peer);
-        }
-        Ok(())
-    }
-
-    pub async fn update_with_consistency(
-        &self,
-        operation: CollectionUpdateOperations,
-        wait: bool,
-        ordering: WriteOrdering,
-    ) -> CollectionResult<UpdateResult> {
-        match self.leader_peer_for_update(ordering) {
-            None => Err(CollectionError::service_error(format!(
-                "Cannot update shard {}:{} with {ordering:?} ordering because no leader could be selected",
-                self.collection_id, self.shard_id
-            ))),
-            Some(leader_peer) => {
-                // If we are the leader, run the update from this replica set
-                if leader_peer == self.this_peer_id() {
-                    // lock updates if ordering is medium or strong
-                    let _guard = match ordering {
-                        WriteOrdering::Weak => None, // no locking required
-                        WriteOrdering::Medium | WriteOrdering::Strong => Some(self.write_ordering_lock.lock().await), // one request at a time
-                    };
-                    self.update(operation, wait).await
-                } else {
-                    // forward the update to the designated leader
-                    self.forward_update(leader_peer, operation, wait, ordering)
-                        .await
-                        .map_err(|err| {
-                            if err.is_transient() {
-                                // Deactivate the peer if forwarding failed with transient error
-                                self.locally_disabled_peers.write().insert(leader_peer);
-                                self.notify_peer_failure(leader_peer);
-                                // return service error
-                                CollectionError::service_error(format!(
-                                    "Failed to apply update with {ordering:?} ordering via leader peer {leader_peer}: {err}"
-                                ))
-                            } else {
-                                err
-                            }
-                        })
-                }
-            }
-        }
-    }
-
-    /// Designated a leader replica for the update based on the WriteOrdering
-    pub fn leader_peer_for_update(&self, ordering: WriteOrdering) -> Option<PeerId> {
-        match ordering {
-            WriteOrdering::Weak => Some(self.this_peer_id()), // no requirement for consistency
-            WriteOrdering::Medium => self.highest_alive_replica_peer_id(), // consistency with highest alive replica
-            WriteOrdering::Strong => self.highest_replica_peer_id(), // consistency with highest replica
-        }
-    }
-
-    /// Forward update to the leader replica
-    pub async fn forward_update(
-        &self,
-        leader_peer: PeerId,
-        operation: CollectionUpdateOperations,
-        wait: bool,
-        ordering: WriteOrdering,
-    ) -> CollectionResult<UpdateResult> {
-        let remotes_guard = self.remotes.read().await;
-        let remote_leader = remotes_guard.iter().find(|r| r.peer_id == leader_peer);
-
-        match remote_leader {
-            Some(remote_leader) => {
-                remote_leader
-                    .forward_update(operation, wait, ordering)
-                    .await
-            }
-            None => Err(CollectionError::service_error(format!(
-                "Cannot forward update to shard {} because was removed from the replica set",
-                self.shard_id
-            ))),
-        }
-    }
-
-    pub async fn update(
-        &self,
-        operation: CollectionUpdateOperations,
-        wait: bool,
-    ) -> CollectionResult<UpdateResult> {
-        let all_res: Vec<Result<_, _>> = {
-            let local = self.local.read().await;
-            let remotes = self.remotes.read().await;
-            let this_peer_id = self.this_peer_id();
-
-            // target all remote peers that can receive updates
-            let active_remote_shards: Vec<_> = remotes
-                .iter()
-                .filter(|rs| self.peer_is_active_or_pending(&rs.peer_id))
-                .collect();
-
-            // local is defined AND the peer itself can receive updates
-            let local_is_updatable =
-                local.is_some() && self.peer_is_active_or_pending(&this_peer_id);
-
-            if active_remote_shards.is_empty() && !local_is_updatable {
-                return Err(CollectionError::service_error(format!(
-                    "The replica set for shard {} on peer {} has no active replica",
-                    self.shard_id, this_peer_id
-                )));
-            }
-
-            let mut remote_futures = Vec::new();
-            for remote in active_remote_shards {
-                let op = operation.clone();
-                remote_futures.push(async move {
-                    remote
-                        .update(op, wait)
-                        .await
-                        .map_err(|err| (remote.peer_id, err))
-                });
-            }
-
-            match local.deref() {
-                Some(local) if self.peer_is_active_or_pending(&this_peer_id) => {
-                    let local_wait =
-                        if self.peer_state(&this_peer_id) == Some(ReplicaState::Listener) {
-                            false
-                        } else {
-                            wait
-                        };
-
-                    let local_update = async move {
-                        local
-                            .get()
-                            .update(operation.clone(), local_wait)
-                            .await
-                            .map_err(|err| {
-                                let peer_id = err.remote_peer_id().unwrap_or(this_peer_id);
-
-                                (peer_id, err)
-                            })
-                    };
-                    let remote_updates = join_all(remote_futures);
-
-                    // run local and remote shards read concurrently
-                    let (mut remote_res, local_res): (
-                        Vec<Result<UpdateResult, (PeerId, CollectionError)>>,
-                        _,
-                    ) = join(remote_updates, local_update).await;
-                    // return both remote and local results
-                    remote_res.push(local_res);
-                    remote_res
-                }
-                _ => join_all(remote_futures).await,
-            }
-        };
-
-        let total_results = all_res.len();
-
-        let (successes, failures): (Vec<_>, Vec<_>) = all_res.into_iter().partition_result();
-
-        // Notify consensus about failures if:
-        // 1. There is at least one success, otherwise it might be a problem of sending node
-        // 2. ???
-
-        if !successes.is_empty() {
-            let wait_for_deactivation =
-                self.handle_failed_replicas(&failures, &self.replica_state.read());
-            // report all failing peers to consensus
-            if wait && wait_for_deactivation && !failures.is_empty() {
-                // ToDo: allow timeout configuration in API
-                let timeout = DEFAULT_SHARD_DEACTIVATION_TIMEOUT;
-
-                let replica_state = self.replica_state.clone();
-                let peer_ids: Vec<_> = failures.iter().map(|(peer_id, _)| *peer_id).collect();
-
-                let shards_disabled = tokio::task::spawn_blocking(move || {
-                    replica_state.wait_for(
-                        |state| {
-                            peer_ids.iter().all(|peer_id| {
-                                state
-                                    .peers
-                                    .get(peer_id)
-                                    .map(|state| state != &ReplicaState::Active)
-                                    .unwrap_or(true) // not found means that peer is dead
-                            })
-                        },
-                        DEFAULT_SHARD_DEACTIVATION_TIMEOUT,
-                    )
-                })
-                .await?;
-
-                if !shards_disabled {
-                    return Err(CollectionError::service_error(format!(
-                        "Some replica of shard {} failed to apply operation and deactivation \
-                         timed out after {} seconds. Consistency of this update is not guaranteed. Please retry.",
-                        self.shard_id, timeout.as_secs()
-                    )));
-                }
-            }
-        }
-
-        if !failures.is_empty() {
-            let write_consistency_factor = self
-                .collection_config
-                .read()
-                .await
-                .params
-                .write_consistency_factor
-                .get() as usize;
-            let minimal_success_count = write_consistency_factor.min(total_results);
-            if successes.len() < minimal_success_count {
-                // completely failed - report error to user
-                let (_peer_id, err) = failures.into_iter().next().expect("failures is not empty");
-                return Err(err);
-            }
-        }
-        // there are enough successes, return the first one
-        let res = successes
-            .into_iter()
-            .next()
-            .expect("successes is not empty");
-        Ok(res)
-    }
-
-    #[allow(clippy::too_many_arguments)]
-    pub async fn scroll_by(
-        &self,
-        offset: Option<ExtendedPointId>,
-        limit: usize,
-        with_payload_interface: &WithPayloadInterface,
-        with_vector: &WithVector,
-        filter: Option<&Filter>,
-        read_consistency: Option<ReadConsistency>,
-    ) -> CollectionResult<Vec<Record>> {
-        let local = self.local.read().await;
-        let remotes = self.remotes.read().await;
-
-        self.execute_and_resolve_read_operation(
-            |shard| {
-                shard.scroll_by(
-                    offset,
-                    limit,
-                    with_payload_interface,
-                    with_vector,
-                    filter,
-                    &self.search_runtime,
-                )
-            },
-            &local,
-            &remotes,
-            read_consistency.unwrap_or_default(),
-        )
-        .await
-    }
-
-    pub async fn info(&self) -> CollectionResult<CollectionInfo> {
-        let local = self.local.read().await;
-        let remotes = self.remotes.read().await;
-
-        self.execute_read_operation(|shard| shard.info(), &local, &remotes)
-            .await
-    }
-
-    pub async fn search(
-        &self,
-        request: Arc<SearchRequestBatch>,
-        read_consistency: Option<ReadConsistency>,
-    ) -> CollectionResult<Vec<Vec<ScoredPoint>>> {
-        let local = self.local.read().await;
-        let remotes = self.remotes.read().await;
-
-        self.execute_and_resolve_read_operation(
-            |shard| shard.search(request.clone(), &self.search_runtime),
-            &local,
-            &remotes,
-            read_consistency.unwrap_or_default(),
-        )
-        .await
-    }
-
-    pub async fn count_local(
-        &self,
-        request: Arc<CountRequest>,
-    ) -> CollectionResult<Option<CountResult>> {
-        let local = self.local.read().await;
-        match &*local {
-            None => Ok(None),
-            Some(shard) => Ok(Some(shard.get().count(request).await?)),
-        }
-    }
-
-    pub async fn count(&self, request: Arc<CountRequest>) -> CollectionResult<CountResult> {
-        let local = self.local.read().await;
-        let remotes = self.remotes.read().await;
-
-        self.execute_read_operation(|shard| shard.count(request.clone()), &local, &remotes)
-            .await
-    }
-
-    pub async fn retrieve(
-        &self,
-        request: Arc<PointRequest>,
-        with_payload: &WithPayload,
-        with_vector: &WithVector,
-        read_consistency: Option<ReadConsistency>,
-    ) -> CollectionResult<Vec<Record>> {
-        let local = self.local.read().await;
-        let remotes = self.remotes.read().await;
-
-        self.execute_and_resolve_read_operation(
-            |shard| shard.retrieve(request.clone(), with_payload, with_vector),
-            &local,
-            &remotes,
-            read_consistency.unwrap_or_default(),
-        )
-        .await
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::num::{NonZeroU32, NonZeroU64};
-
-    use segment::types::Distance;
-    use tempfile::{Builder, TempDir};
-
-    use super::*;
-    use crate::config::*;
-    use crate::operations::types::{VectorParams, VectorsConfig};
-    use crate::optimizers_builder::OptimizersConfig;
-
-    const TEST_OPTIMIZERS_CONFIG: OptimizersConfig = OptimizersConfig {
-        deleted_threshold: 0.9,
-        vacuum_min_vector_number: 1000,
-        default_segment_number: 2,
-        max_segment_size: None,
-        memmap_threshold: None,
-        indexing_threshold: Some(50_000),
-        flush_interval_sec: 30,
-        max_optimization_threads: 2,
-    };
-
-    pub fn dummy_on_replica_failure() -> ChangePeerState {
-        Arc::new(move |_peer_id, _shard_id| {})
-    }
-
-    async fn new_shard_replica_set(collection_dir: &TempDir) -> ShardReplicaSet {
-        let update_runtime = Handle::current();
-        let search_runtime = Handle::current();
-
-        let wal_config = WalConfig {
-            wal_capacity_mb: 1,
-            wal_segments_ahead: 0,
-        };
-
-        let collection_params = CollectionParams {
-            vectors: VectorsConfig::Single(VectorParams {
-                size: NonZeroU64::new(4).unwrap(),
-                distance: Distance::Dot,
-                hnsw_config: None,
-                quantization_config: None,
-                on_disk: None,
-            }),
-            shard_number: NonZeroU32::new(4).unwrap(),
-            replication_factor: NonZeroU32::new(3).unwrap(),
-            write_consistency_factor: NonZeroU32::new(2).unwrap(),
-            on_disk_payload: false,
-        };
-
-        let config = CollectionConfig {
-            params: collection_params,
-            optimizer_config: TEST_OPTIMIZERS_CONFIG.clone(),
-            wal_config,
-            hnsw_config: Default::default(),
-            quantization_config: None,
-        };
-
-        let shared_config = Arc::new(RwLock::new(config.clone()));
-        let remotes = HashSet::from([2, 3, 4, 5]);
-        ShardReplicaSet::build(
-            1,
-            "test_collection".to_string(),
-            1,
-            false,
-            remotes,
-            dummy_on_replica_failure(),
-            collection_dir.path(),
-            shared_config,
-            Default::default(),
-            Default::default(),
-            update_runtime,
-            search_runtime,
-        )
-        .await
-        .unwrap()
-    }
-
-    #[tokio::test]
-    async fn test_highest_replica_peer_id() {
-        let collection_dir = Builder::new().prefix("test_collection").tempdir().unwrap();
-        let rs = new_shard_replica_set(&collection_dir).await;
-
-        assert_eq!(rs.highest_replica_peer_id(), Some(5));
-        // at build time the replicas are all dead, they need to be activated
-        assert_eq!(rs.highest_alive_replica_peer_id(), None);
-
-        rs.set_replica_state(&1, ReplicaState::Active).unwrap();
-        rs.set_replica_state(&3, ReplicaState::Active).unwrap();
-        rs.set_replica_state(&4, ReplicaState::Active).unwrap();
-        rs.set_replica_state(&5, ReplicaState::Partial).unwrap();
-
-        assert_eq!(rs.highest_replica_peer_id(), Some(5));
-        assert_eq!(rs.highest_alive_replica_peer_id(), Some(4));
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/shards/resolve.rs b/crates/qdrant/lib/collection/src/shards/resolve.rs
deleted file mode 100644
index c2d5467..0000000
--- a/crates/qdrant/lib/collection/src/shards/resolve.rs
+++ /dev/null
@@ -1,546 +0,0 @@
-use std::collections::{HashMap, HashSet};
-use std::hash;
-
-use segment::types::{Payload, ScoredPoint};
-use tinyvec::TinyVec;
-
-use crate::operations::types::Record;
-
-#[derive(Copy, Clone, Debug, Eq, PartialEq)]
-pub enum ResolveCondition {
-    All,
-    Majority,
-}
-
-pub trait Resolve: Sized {
-    fn resolve(responses: Vec<Self>, condition: ResolveCondition) -> Self;
-}
-
-impl Resolve for Vec<Record> {
-    fn resolve(records: Vec<Self>, condition: ResolveCondition) -> Self {
-        let mut resolved = Resolver::resolve(records, |record| record.id, record_eq, condition);
-        resolved.sort_unstable_by_key(|record| record.id);
-        resolved
-    }
-}
-
-impl Resolve for Vec<Vec<ScoredPoint>> {
-    fn resolve(batches: Vec<Self>, condition: ResolveCondition) -> Self {
-        // batches: <replica_id, <batch_id, ScoredPoint>>
-        // transpose to <batch_id, <replica_id, ScoredPoint>>
-
-        let batches = transpose(batches);
-
-        batches
-            .into_iter()
-            .map(|points| {
-                let mut resolved =
-                    Resolver::resolve(points, |point| point.id, scored_point_eq, condition);
-
-                resolved.sort_unstable();
-                resolved
-            })
-            .collect()
-    }
-}
-
-fn transpose<T>(vec: Vec<Vec<T>>) -> Vec<Vec<T>> {
-    if vec.is_empty() {
-        return Vec::new();
-    }
-
-    let len = vec[0].len();
-
-    let mut iters: Vec<_> = vec.into_iter().map(IntoIterator::into_iter).collect();
-
-    (0..len)
-        .map(|_| iters.iter_mut().filter_map(Iterator::next).collect())
-        .collect()
-}
-
-fn record_eq(this: &Record, other: &Record) -> bool {
-    this.id == other.id && this.vector == other.vector && payload_eq(&this.payload, &other.payload)
-}
-
-fn scored_point_eq(this: &ScoredPoint, other: &ScoredPoint) -> bool {
-    this.id == other.id
-        && this.score == other.score
-        && this.vector == other.vector
-        && payload_eq(&this.payload, &other.payload)
-}
-
-fn payload_eq(this: &Option<Payload>, other: &Option<Payload>) -> bool {
-    match (this, other) {
-        (Some(payload), None) | (None, Some(payload)) => payload.is_empty(),
-        (this, other) => this == other,
-    }
-}
-
-struct Resolver<'a, Item, Id, Ident, Cmp> {
-    items: HashMap<Id, ResolverRecords<'a, Item>>,
-    identify: Ident,
-    compare: Cmp,
-}
-
-type ResolverRecords<'a, Item> = TinyVec<[ResolverRecord<'a, Item>; RESOLVER_RECORDS_CAPACITY]>;
-
-const RESOLVER_RECORDS_CAPACITY: usize = 5; // Expected number of replicas
-
-impl<'a, Item, Id, Ident, Cmp> Resolver<'a, Item, Id, Ident, Cmp>
-where
-    Id: Eq + hash::Hash,
-    Ident: Fn(&Item) -> Id,
-    Cmp: Fn(&Item, &Item) -> bool,
-{
-    pub fn resolve(
-        items: Vec<Vec<Item>>,
-        identify: Ident,
-        compare: Cmp,
-        condition: ResolveCondition,
-    ) -> Vec<Item> {
-        let resolution_count = match condition {
-            ResolveCondition::All => items.len(),
-            ResolveCondition::Majority => items.len() / 2 + 1,
-        };
-
-        let mut resolver = Resolver::new(items.first().map_or(0, Vec::len), identify, compare);
-        resolver.add_all(&items);
-
-        // Select coordinates of accepted items, avoiding copying
-        let resolved_items: HashSet<_> = resolver
-            .items
-            .into_iter()
-            .filter_map(|(_, points)| {
-                points
-                    .into_iter()
-                    .find(|point| point.count >= resolution_count)
-                    .map(|point| (point.row, point.index))
-            })
-            .collect();
-
-        // Shortcut if everything is consistent: return first items, avoiding filtering
-        let is_consistent = resolved_items.len() == items.first().map_or(0, Vec::len)
-            && resolved_items.iter().all(|&(row, _)| row == 0);
-
-        if is_consistent {
-            items.into_iter().next().unwrap_or_default()
-        } else {
-            items
-                .into_iter()
-                .enumerate()
-                .flat_map(|(row, items)| {
-                    items
-                        .into_iter()
-                        .enumerate()
-                        .map(move |(index, item)| (row, index, item))
-                })
-                .filter_map(|(row, index, item)| {
-                    if resolved_items.contains(&(row, index)) {
-                        Some(item)
-                    } else {
-                        None
-                    }
-                })
-                .collect()
-        }
-    }
-
-    fn new(capacity: usize, identify: Ident, compare: Cmp) -> Self {
-        Self {
-            items: HashMap::with_capacity(capacity),
-            identify,
-            compare,
-        }
-    }
-
-    fn add_all<I>(&mut self, items: I)
-    where
-        I: IntoIterator,
-        I::Item: IntoIterator<Item = &'a Item>,
-    {
-        for (row, items) in items.into_iter().enumerate() {
-            for (index, item) in items.into_iter().enumerate() {
-                self.add((self.identify)(item), item, row, index);
-            }
-        }
-    }
-
-    fn add(&mut self, id: Id, item: &'a Item, row: usize, index: usize) {
-        let points = self.items.entry(id).or_default();
-
-        for point in points.iter_mut() {
-            if (self.compare)(item, point.item.unwrap()) {
-                point.count += 1;
-                return;
-            }
-        }
-
-        points.push(ResolverRecord::new(item, row, index));
-    }
-}
-
-#[derive(Debug)]
-struct ResolverRecord<'a, T> {
-    item: Option<&'a T>,
-    row: usize,
-    index: usize,
-    count: usize,
-}
-
-impl<'a, T> Copy for ResolverRecord<'a, T> {}
-
-impl<'a, T> Clone for ResolverRecord<'a, T> {
-    fn clone(&self) -> Self {
-        *self
-    }
-}
-
-impl<'a, T> Default for ResolverRecord<'a, T> {
-    fn default() -> Self {
-        Self {
-            item: None,
-            row: 0,
-            index: 0,
-            count: 0,
-        }
-    }
-}
-
-impl<'a, T> ResolverRecord<'a, T> {
-    fn new(item: &'a T, row: usize, index: usize) -> Self {
-        Self {
-            item: Some(item),
-            row,
-            index,
-            count: 1,
-        }
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use std::fmt;
-
-    use segment::types::ScoreType;
-
-    use super::*;
-
-    #[rustfmt::skip]
-    fn resolve_scored_points_batch_4_data() -> [Vec<ScoredPoint>; 3] {
-        [
-            vec![
-                point(14, 0.0), point(17, 0.1), point(15, 0.1),
-                point(13, 0.2), point(11, 0.2), point(12, 0.3),
-                point(18, 0.3), point(16, 0.4), point(10, 0.5),
-            ],
-            vec![
-                point(23, 0.0), point(21, 0.1), point(25, 0.2),
-                point(22, 0.2), point(20, 0.3), point(24, 0.3),
-            ],
-            vec![
-                point(30, 0.1), point(31, 0.1), point(32, 0.1),
-                point(33, 0.2), point(34, 0.2), point(35, 0.3),
-            ],
-        ]
-    }
-
-    fn point(id: u64, score: ScoreType) -> ScoredPoint {
-        ScoredPoint {
-            id: id.into(),
-            version: 1,
-            score,
-            payload: None,
-            vector: None,
-        }
-    }
-
-    #[rustfmt::skip]
-    fn resolve_scored_points_batch_4_input() -> Vec<Vec<Vec<ScoredPoint>>> {
-        let [batch1, batch2, batch3] = resolve_scored_points_batch_4_data();
-
-        vec![
-            vec![
-                batch(&batch1, [remove(2), remove(3)]),
-                batch(&batch2, [remove(0), remove(3)]),
-                batch(&batch3, [remove(4), remove(5)]),
-            ],
-
-            vec![
-                batch(&batch1, [remove(1), modify(3)]),
-                batch(&batch2, [modify(0), remove(2)]),
-                batch(&batch3, [remove(3), modify(5)]),
-            ],
-
-            vec![
-                batch(&batch1, [remove(1), modify(4)]),
-                batch(&batch2, [modify(3), remove(5)]),
-                batch(&batch3, [remove(2), modify(5)]),
-            ],
-
-            vec![
-                batch1,
-                batch2,
-                batch3,
-            ],
-        ]
-    }
-
-    fn batch<const N: usize>(batch: &[ScoredPoint], mut actions: [Action; N]) -> Vec<ScoredPoint> {
-        let mut batch = batch.to_owned();
-
-        actions.sort_unstable_by_key(|action| action.index());
-
-        let mut removed = Vec::new();
-
-        for action in actions.into_iter() {
-            let offset = removed
-                .iter()
-                .filter(|&&removed| removed <= action.index())
-                .count();
-
-            match action {
-                Action::Remove(index) => {
-                    batch.remove(index - offset);
-                    removed.push(index);
-                }
-
-                Action::Modify(index) => {
-                    batch[index - offset].score += 1.0;
-                }
-            }
-        }
-
-        batch
-    }
-
-    #[derive(Copy, Clone, Debug)]
-    enum Action {
-        Remove(usize),
-        Modify(usize),
-    }
-
-    impl Action {
-        pub fn index(self) -> usize {
-            match self {
-                Self::Remove(index) => index,
-                Self::Modify(index) => index,
-            }
-        }
-    }
-
-    fn remove(index: usize) -> Action {
-        Action::Remove(index)
-    }
-
-    fn modify(index: usize) -> Action {
-        Action::Modify(index)
-    }
-
-    #[test]
-    fn resolve_scored_points_batch_4_all() {
-        let [mut batch1, mut batch2, mut batch3] = resolve_scored_points_batch_4_data();
-
-        batch1.remove(4);
-        batch1.remove(3);
-        batch1.remove(2);
-        batch1.remove(1);
-
-        batch2.remove(5);
-        batch2.remove(3);
-        batch2.remove(2);
-        batch2.remove(0);
-
-        batch3.remove(5);
-        batch3.remove(4);
-        batch3.remove(3);
-        batch3.remove(2);
-
-        test_resolve(
-            resolve_scored_points_batch_4_input(),
-            [batch1, batch2, batch3],
-            ResolveCondition::All,
-        );
-    }
-
-    #[test]
-    fn resolve_scored_points_batch_4_majority() {
-        let [mut batch1, mut batch2, mut batch3] = resolve_scored_points_batch_4_data();
-
-        batch1.remove(3);
-        batch1.remove(1);
-
-        batch2.remove(3);
-        batch2.remove(0);
-
-        batch3.remove(5);
-
-        test_resolve(
-            resolve_scored_points_batch_4_input(),
-            [batch1, batch2, batch3],
-            ResolveCondition::Majority,
-        );
-    }
-
-    fn data_simple() -> [i32; 9] {
-        [1, 2, 3, 4, 5, 6, 7, 8, 9]
-    }
-
-    #[rustfmt::skip]
-    fn input_2() -> [Vec<i32>; 2] {
-        [
-            vec![1, 2, 3,       6, 7,    9,     11, 12, 13],
-            vec![      3, 4, 5, 6,    8,    10, 11,       ],
-        ]
-    }
-
-    fn expected_2() -> [i32; 3] {
-        [3, 6, 11]
-    }
-
-    #[rustfmt::skip]
-    fn input_3() -> [Vec<i32>; 3] {
-        [
-            vec![1, 2,          6, 7, 8,       11,      13, 14, 15,       ],
-            vec![   2, 3, 4,       7,    9, 10,         13, 14,     16,   ],
-            vec![         4, 5, 6, 7,    9,    11, 12,      14,         17],
-        ]
-    }
-
-    fn expected_3_all() -> [i32; 2] {
-        [7, 14]
-    }
-
-    fn expected_3_majority() -> [i32; 8] {
-        [2, 4, 6, 7, 9, 11, 13, 14]
-    }
-
-    #[rustfmt::skip]
-    fn input_4() -> [Vec<i32>; 4] {
-        [
-            vec![1, 2, 3,                9,     11, 12, 13, 14,     16,         19,     21, 22,     24,     27,     29],
-            vec![   2, 3, 4, 5, 6,                  12, 13,     15,     17,     19,         22,     24, 26, 27, 28,   ],
-            vec![      3,    5, 6, 7, 8, 9,             13,     15, 16,     18,     20,     22,         26, 27, 28,   ],
-            vec![               6,    8, 9, 10, 11, 12, 13,         16,     18, 19,     21,     23,     26, 27,     29],
-        ]
-    }
-
-    fn expected_4_all() -> [i32; 2] {
-        [13, 27]
-    }
-
-    fn expected_4_majority() -> [i32; 10] {
-        [3, 6, 9, 12, 13, 16, 19, 22, 26, 27]
-    }
-
-    #[test]
-    fn resolve_0_all() {
-        resolve_0(ResolveCondition::All);
-    }
-
-    #[test]
-    fn resolve_0_majority() {
-        resolve_0(ResolveCondition::Majority);
-    }
-
-    fn resolve_0(condition: ResolveCondition) {
-        test_resolve_simple(Vec::<Vec<i32>>::new(), Vec::new(), condition);
-    }
-
-    #[test]
-    fn resolve_simple_all() {
-        for replicas in 1..=5 {
-            resolve_simple(replicas, ResolveCondition::All);
-        }
-    }
-
-    #[test]
-    fn resolve_simple_majority() {
-        for replicas in 1..=5 {
-            resolve_simple(replicas, ResolveCondition::All);
-        }
-    }
-
-    fn resolve_simple(replicas: usize, condition: ResolveCondition) {
-        let input: Vec<_> = (0..replicas).map(|_| data_simple()).collect();
-        let expected = data_simple();
-
-        test_resolve_simple(input, expected, condition)
-    }
-
-    #[test]
-    fn resolve_2_all() {
-        test_resolve_simple(input_2(), expected_2(), ResolveCondition::All);
-    }
-
-    #[test]
-    fn resolve_2_majority() {
-        test_resolve_simple(input_2(), expected_2(), ResolveCondition::Majority);
-    }
-
-    #[test]
-    fn resolve_3_all() {
-        test_resolve_simple(input_3(), expected_3_all(), ResolveCondition::All);
-    }
-
-    #[test]
-    fn resolve_3_majority() {
-        test_resolve_simple(input_3(), expected_3_majority(), ResolveCondition::Majority);
-    }
-
-    #[test]
-    fn resolve_4_all() {
-        test_resolve_simple(input_4(), expected_4_all(), ResolveCondition::All);
-    }
-
-    #[test]
-    fn resolve_4_majority() {
-        test_resolve_simple(input_4(), expected_4_majority(), ResolveCondition::Majority);
-    }
-
-    fn test_resolve<T, E>(input: Vec<T>, expected: E, condition: ResolveCondition)
-    where
-        T: Resolve + Clone + PartialEq<E> + fmt::Debug,
-        E: fmt::Debug,
-    {
-        assert_eq!(T::resolve(input, condition), expected);
-    }
-
-    fn test_resolve_simple<I, E>(input: I, expected: E, condition: ResolveCondition)
-    where
-        I: IntoIterator,
-        I::Item: IntoIterator<Item = i32>,
-        E: IntoIterator<Item = i32>,
-    {
-        test_resolve(simple_input(input), simple_expected(expected), condition);
-    }
-
-    fn simple_input<I>(input: I) -> Vec<Vec<Val>>
-    where
-        I: IntoIterator,
-        I::Item: IntoIterator<Item = i32>,
-    {
-        input
-            .into_iter()
-            .map(|items| items.into_iter().map(Val).collect())
-            .collect()
-    }
-
-    fn simple_expected<E>(expected: E) -> Vec<Val>
-    where
-        E: IntoIterator<Item = i32>,
-    {
-        expected.into_iter().map(Val).collect()
-    }
-
-    #[derive(Copy, Clone, Debug, Eq, PartialEq, Ord, PartialOrd)]
-    struct Val(i32);
-
-    impl Resolve for Vec<Val> {
-        fn resolve(values: Vec<Self>, condition: ResolveCondition) -> Self {
-            let mut resolved = Resolver::resolve(values, |val| val.0, PartialEq::eq, condition);
-
-            resolved.sort_unstable();
-            resolved
-        }
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/shards/shard.rs b/crates/qdrant/lib/collection/src/shards/shard.rs
deleted file mode 100644
index 82d0eea..0000000
--- a/crates/qdrant/lib/collection/src/shards/shard.rs
+++ /dev/null
@@ -1,96 +0,0 @@
-use core::marker::{Send, Sync};
-use std::path::Path;
-
-use crate::operations::types::CollectionResult;
-use crate::shards::dummy_shard::DummyShard;
-use crate::shards::forward_proxy_shard::ForwardProxyShard;
-use crate::shards::local_shard::LocalShard;
-use crate::shards::proxy_shard::ProxyShard;
-use crate::shards::shard_trait::ShardOperation;
-use crate::shards::telemetry::LocalShardTelemetry;
-
-pub type ShardId = u32;
-
-pub type PeerId = u64;
-
-/// Shard
-///
-/// Contains a part of the collection's points
-///
-#[allow(clippy::large_enum_variant)]
-pub enum Shard {
-    Local(LocalShard),
-    Proxy(ProxyShard),
-    ForwardProxy(ForwardProxyShard),
-    Dummy(DummyShard),
-}
-
-impl Shard {
-    pub fn variant_name(&self) -> &str {
-        match self {
-            Shard::Local(_) => "local shard",
-            Shard::Proxy(_) => "proxy shard",
-            Shard::ForwardProxy(_) => "forward proxy shard",
-            Shard::Dummy(_) => "dummy shard",
-        }
-    }
-
-    pub fn get(&self) -> &(dyn ShardOperation + Sync + Send + '_) {
-        match self {
-            Shard::Local(local_shard) => local_shard,
-            Shard::Proxy(proxy_shard) => proxy_shard,
-            Shard::ForwardProxy(proxy_shard) => proxy_shard,
-            Shard::Dummy(dummy_shard) => dummy_shard,
-        }
-    }
-
-    pub fn get_telemetry_data(&self) -> LocalShardTelemetry {
-        let mut telemetry = match self {
-            Shard::Local(local_shard) => local_shard.get_telemetry_data(),
-            Shard::Proxy(proxy_shard) => proxy_shard.get_telemetry_data(),
-            Shard::ForwardProxy(proxy_shard) => proxy_shard.get_telemetry_data(),
-            Shard::Dummy(dummy_shard) => dummy_shard.get_telemetry_data(),
-        };
-        telemetry.variant_name = Some(self.variant_name().to_string());
-        telemetry
-    }
-
-    pub async fn create_snapshot(
-        &self,
-        temp_path: &Path,
-        target_path: &Path,
-        save_wal: bool,
-    ) -> CollectionResult<()> {
-        match self {
-            Shard::Local(local_shard) => {
-                local_shard
-                    .create_snapshot(temp_path, target_path, save_wal)
-                    .await
-            }
-            Shard::Proxy(proxy_shard) => {
-                proxy_shard
-                    .create_snapshot(temp_path, target_path, save_wal)
-                    .await
-            }
-            Shard::ForwardProxy(proxy_shard) => {
-                proxy_shard
-                    .create_snapshot(temp_path, target_path, save_wal)
-                    .await
-            }
-            Shard::Dummy(dummy_shard) => {
-                dummy_shard
-                    .create_snapshot(temp_path, target_path, save_wal)
-                    .await
-            }
-        }
-    }
-
-    pub async fn on_optimizer_config_update(&self) -> CollectionResult<()> {
-        match self {
-            Shard::Local(local_shard) => local_shard.on_optimizer_config_update().await,
-            Shard::Proxy(proxy_shard) => proxy_shard.on_optimizer_config_update().await,
-            Shard::ForwardProxy(proxy_shard) => proxy_shard.on_optimizer_config_update().await,
-            Shard::Dummy(dummy_shard) => dummy_shard.on_optimizer_config_update().await,
-        }
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/shards/shard_config.rs b/crates/qdrant/lib/collection/src/shards/shard_config.rs
deleted file mode 100644
index 2e62546..0000000
--- a/crates/qdrant/lib/collection/src/shards/shard_config.rs
+++ /dev/null
@@ -1,48 +0,0 @@
-use std::path::{Path, PathBuf};
-
-use segment::common::file_operations::{atomic_save_json, read_json};
-use serde::{Deserialize, Serialize};
-
-use crate::operations::types::CollectionResult;
-use crate::shards::shard::PeerId;
-
-pub const SHARD_CONFIG_FILE: &str = "shard_config.json";
-
-#[derive(Debug, Deserialize, Serialize, Clone, PartialEq, Eq)]
-pub enum ShardType {
-    Local,                      // Deprecated
-    Remote { peer_id: PeerId }, // Deprecated
-    Temporary,                  // Deprecated
-    ReplicaSet,
-}
-
-#[derive(Debug, Deserialize, Serialize, Clone, PartialEq, Eq)]
-pub struct ShardConfig {
-    pub r#type: ShardType,
-}
-
-impl ShardConfig {
-    pub fn get_config_path(shard_path: &Path) -> PathBuf {
-        shard_path.join(SHARD_CONFIG_FILE)
-    }
-
-    pub fn new_replica_set() -> Self {
-        Self {
-            r#type: ShardType::ReplicaSet,
-        }
-    }
-
-    pub fn load(shard_path: &Path) -> CollectionResult<Option<Self>> {
-        let config_path = Self::get_config_path(shard_path);
-        if !config_path.exists() {
-            log::info!("Detected missing shard config file in {:?}", shard_path);
-            return Ok(None);
-        }
-        Ok(Some(read_json(&config_path)?))
-    }
-
-    pub fn save(&self, shard_path: &Path) -> CollectionResult<()> {
-        let config_path = Self::get_config_path(shard_path);
-        Ok(atomic_save_json(&config_path, self)?)
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/shards/shard_holder.rs b/crates/qdrant/lib/collection/src/shards/shard_holder.rs
deleted file mode 100644
index 59e6b4a..0000000
--- a/crates/qdrant/lib/collection/src/shards/shard_holder.rs
+++ /dev/null
@@ -1,275 +0,0 @@
-use std::collections::{HashMap, HashSet};
-use std::path::Path;
-use std::sync::Arc;
-
-use tokio::runtime::Handle;
-use tokio::sync::RwLock;
-
-use crate::config::CollectionConfig;
-use crate::hash_ring::HashRing;
-use crate::operations::shared_storage_config::SharedStorageConfig;
-use crate::operations::types::{CollectionResult, ShardTransferInfo};
-use crate::operations::{OperationToShard, SplitByShard};
-use crate::save_on_disk::SaveOnDisk;
-use crate::shards::channel_service::ChannelService;
-use crate::shards::local_shard::LocalShard;
-use crate::shards::replica_set::{ChangePeerState, ReplicaState, ShardReplicaSet};
-use crate::shards::shard::{PeerId, ShardId};
-use crate::shards::shard_config::{ShardConfig, ShardType};
-use crate::shards::shard_versioning::latest_shard_paths;
-use crate::shards::transfer::shard_transfer::{ShardTransfer, ShardTransferKey};
-use crate::shards::CollectionId;
-
-const SHARD_TRANSFERS_FILE: &str = "shard_transfers";
-
-pub struct ShardHolder {
-    shards: HashMap<ShardId, ShardReplicaSet>,
-    pub(crate) shard_transfers: SaveOnDisk<HashSet<ShardTransfer>>,
-    ring: HashRing<ShardId>,
-}
-
-pub type LockedShardHolder = RwLock<ShardHolder>;
-
-impl ShardHolder {
-    pub fn new(collection_path: &Path, hashring: HashRing<ShardId>) -> CollectionResult<Self> {
-        let shard_transfers = SaveOnDisk::load_or_init(collection_path.join(SHARD_TRANSFERS_FILE))?;
-        Ok(Self {
-            shards: HashMap::new(),
-            shard_transfers,
-            ring: hashring,
-        })
-    }
-
-    pub fn add_shard(&mut self, shard_id: ShardId, shard: ShardReplicaSet) {
-        self.shards.insert(shard_id, shard);
-        self.ring.add(shard_id);
-    }
-
-    pub fn remove_shard(&mut self, shard_id: ShardId) -> Option<ShardReplicaSet> {
-        let shard = self.shards.remove(&shard_id);
-        self.ring.remove(&shard_id);
-        shard
-    }
-
-    /// Take shard
-    ///
-    /// remove shard and return ownership
-    pub fn take_shard(&mut self, shard_id: ShardId) -> Option<ShardReplicaSet> {
-        self.shards.remove(&shard_id)
-    }
-
-    /// Replace shard
-    ///
-    /// return old shard
-    pub fn replace_shard(
-        &mut self,
-        shard_id: ShardId,
-        shard: ShardReplicaSet,
-    ) -> Option<ShardReplicaSet> {
-        self.shards.insert(shard_id, shard)
-    }
-
-    pub fn contains_shard(&self, shard_id: &ShardId) -> bool {
-        self.shards.contains_key(shard_id)
-    }
-
-    pub fn get_shard(&self, shard_id: &ShardId) -> Option<&ShardReplicaSet> {
-        self.shards.get(shard_id)
-    }
-
-    pub fn get_mut_shard(&mut self, shard_id: &ShardId) -> Option<&mut ShardReplicaSet> {
-        self.shards.get_mut(shard_id)
-    }
-
-    pub fn get_shards(&self) -> impl Iterator<Item = (&ShardId, &ShardReplicaSet)> {
-        self.shards.iter()
-    }
-
-    pub fn all_shards(&self) -> impl Iterator<Item = &ShardReplicaSet> {
-        self.shards.values()
-    }
-
-    pub fn split_by_shard<O: SplitByShard + Clone>(
-        &self,
-        operation: O,
-    ) -> Vec<(&ShardReplicaSet, O)> {
-        let operation_to_shard = operation.split_by_shard(&self.ring);
-        let shard_ops: Vec<_> = match operation_to_shard {
-            OperationToShard::ByShard(by_shard) => by_shard
-                .into_iter()
-                .map(|(shard_id, operation)| (self.shards.get(&shard_id).unwrap(), operation))
-                .collect(),
-            OperationToShard::ToAll(operation) => self
-                .all_shards()
-                .map(|shard| (shard, operation.clone()))
-                .collect(),
-        };
-        shard_ops
-    }
-
-    pub fn register_start_shard_transfer(&self, transfer: ShardTransfer) -> CollectionResult<bool> {
-        Ok(self
-            .shard_transfers
-            .write(|transfers| transfers.insert(transfer))?)
-    }
-
-    pub fn register_finish_transfer(&self, key: &ShardTransferKey) -> CollectionResult<bool> {
-        Ok(self.shard_transfers.write(|transfers| {
-            let before_remove = transfers.len();
-            transfers.retain(|transfer| !key.check(transfer));
-            before_remove != transfers.len() // `true` if something was removed
-        })?)
-    }
-
-    pub fn get_shard_transfer_info(&self) -> Vec<ShardTransferInfo> {
-        let mut shard_transfers = vec![];
-        for shard_transfer in self.shard_transfers.read().iter() {
-            let shard_id = shard_transfer.shard_id;
-            let to = shard_transfer.to;
-            let from = shard_transfer.from;
-            let sync = shard_transfer.sync;
-            shard_transfers.push(ShardTransferInfo {
-                shard_id,
-                from,
-                to,
-                sync,
-            })
-        }
-        shard_transfers.sort_by_key(|k| k.shard_id);
-        shard_transfers
-    }
-
-    pub fn get_related_transfers(
-        &self,
-        shard_id: &ShardId,
-        peer_id: &PeerId,
-    ) -> Vec<ShardTransfer> {
-        self.shard_transfers
-            .read()
-            .iter()
-            .filter(|transfer| transfer.shard_id == *shard_id)
-            .filter(|transfer| transfer.from == *peer_id || transfer.to == *peer_id)
-            .cloned()
-            .collect()
-    }
-
-    pub fn target_shard(
-        &self,
-        shard_selection: Option<ShardId>,
-    ) -> CollectionResult<Vec<&ShardReplicaSet>> {
-        match shard_selection {
-            None => Ok(self.all_shards().collect()),
-            Some(shard_selection) => {
-                let shard_opt = self.get_shard(&shard_selection);
-                let shards = match shard_opt {
-                    None => vec![],
-                    Some(shard) => vec![shard],
-                };
-                Ok(shards)
-            }
-        }
-    }
-
-    pub fn len(&self) -> usize {
-        self.shards.len()
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.shards.is_empty()
-    }
-
-    #[allow(clippy::too_many_arguments)]
-    pub async fn load_shards(
-        &mut self,
-        collection_path: &Path,
-        collection_id: &CollectionId,
-        collection_config: Arc<RwLock<CollectionConfig>>,
-        shared_storage_config: Arc<SharedStorageConfig>,
-        channel_service: ChannelService,
-        on_peer_failure: ChangePeerState,
-        this_peer_id: PeerId,
-        update_runtime: Handle,
-        search_runtime: Handle,
-    ) {
-        let shard_number = collection_config.read().await.params.shard_number.get();
-        // ToDo: remove after version 0.11.0
-        for shard_id in 0..shard_number {
-            for (path, _shard_version, shard_type) in
-                latest_shard_paths(collection_path, shard_id).await.unwrap()
-            {
-                let replica_set = ShardReplicaSet::load(
-                    shard_id,
-                    collection_id.clone(),
-                    &path,
-                    collection_config.clone(),
-                    shared_storage_config.clone(),
-                    channel_service.clone(),
-                    on_peer_failure.clone(),
-                    this_peer_id,
-                    update_runtime.clone(),
-                    search_runtime.clone(),
-                )
-                .await;
-
-                let mut require_migration = true;
-                match shard_type {
-                    ShardType::Local => {
-                        // deprecated
-                        let local_shard = LocalShard::load(
-                            shard_id,
-                            collection_id.clone(),
-                            &path,
-                            collection_config.clone(),
-                            shared_storage_config.clone(),
-                            update_runtime.clone(),
-                        )
-                        .await
-                        .unwrap();
-                        replica_set
-                            .set_local(local_shard, Some(ReplicaState::Active))
-                            .await
-                            .unwrap();
-                    }
-                    ShardType::Remote { peer_id } => {
-                        // deprecated
-                        replica_set
-                            .add_remote(peer_id, ReplicaState::Active)
-                            .await
-                            .unwrap();
-                    }
-                    ShardType::Temporary => {
-                        // deprecated
-                        let temp_shard = LocalShard::load(
-                            shard_id,
-                            collection_id.clone(),
-                            &path,
-                            collection_config.clone(),
-                            shared_storage_config.clone(),
-                            update_runtime.clone(),
-                        )
-                        .await
-                        .unwrap();
-
-                        replica_set
-                            .set_local(temp_shard, Some(ReplicaState::Partial))
-                            .await
-                            .unwrap();
-                    }
-                    ShardType::ReplicaSet => {
-                        require_migration = false;
-                        // nothing to do, replicate set should be loaded already
-                    }
-                }
-                // Migrate shard config to replica set
-                // Override existing shard configuration
-                if require_migration {
-                    ShardConfig::new_replica_set()
-                        .save(&path)
-                        .map_err(|e| panic!("Failed to save shard config {path:?}: {e}"))
-                        .unwrap();
-                }
-                self.add_shard(shard_id, replica_set);
-            }
-        }
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/shards/shard_trait.rs b/crates/qdrant/lib/collection/src/shards/shard_trait.rs
deleted file mode 100644
index 49758ee..0000000
--- a/crates/qdrant/lib/collection/src/shards/shard_trait.rs
+++ /dev/null
@@ -1,52 +0,0 @@
-use std::sync::Arc;
-
-use async_trait::async_trait;
-use segment::types::{
-    ExtendedPointId, Filter, ScoredPoint, WithPayload, WithPayloadInterface, WithVector,
-};
-use tokio::runtime::Handle;
-
-use crate::operations::types::{
-    CollectionInfo, CollectionResult, CountRequest, CountResult, PointRequest, Record,
-    SearchRequestBatch, UpdateResult,
-};
-use crate::operations::CollectionUpdateOperations;
-
-#[async_trait]
-pub trait ShardOperation {
-    async fn update(
-        &self,
-        operation: CollectionUpdateOperations,
-        wait: bool,
-    ) -> CollectionResult<UpdateResult>;
-
-    #[allow(clippy::too_many_arguments)]
-    async fn scroll_by(
-        &self,
-        offset: Option<ExtendedPointId>,
-        limit: usize,
-        with_payload_interface: &WithPayloadInterface,
-        with_vector: &WithVector,
-        filter: Option<&Filter>,
-        search_runtime_handle: &Handle,
-    ) -> CollectionResult<Vec<Record>>;
-
-    async fn info(&self) -> CollectionResult<CollectionInfo>;
-
-    async fn search(
-        &self,
-        request: Arc<SearchRequestBatch>,
-        search_runtime_handle: &Handle,
-    ) -> CollectionResult<Vec<Vec<ScoredPoint>>>;
-
-    async fn count(&self, request: Arc<CountRequest>) -> CollectionResult<CountResult>;
-
-    async fn retrieve(
-        &self,
-        request: Arc<PointRequest>,
-        with_payload: &WithPayload,
-        with_vector: &WithVector,
-    ) -> CollectionResult<Vec<Record>>;
-}
-
-pub type ShardOperationSS = dyn ShardOperation + Send + Sync;
diff --git a/crates/qdrant/lib/collection/src/shards/shard_versioning.rs b/crates/qdrant/lib/collection/src/shards/shard_versioning.rs
deleted file mode 100644
index 1403d96..0000000
--- a/crates/qdrant/lib/collection/src/shards/shard_versioning.rs
+++ /dev/null
@@ -1,115 +0,0 @@
-use std::path::{Path, PathBuf};
-
-use crate::operations::types::{CollectionError, CollectionResult};
-use crate::shards::shard::ShardId;
-use crate::shards::shard_config::{ShardConfig, ShardType};
-use crate::shards::ShardVersion;
-
-async fn shards_versions(
-    collection_path: &Path,
-    shard_id: ShardId,
-) -> CollectionResult<Vec<(ShardVersion, PathBuf)>> {
-    let mut entries = tokio::fs::read_dir(collection_path).await?;
-    let mut all_versions: Vec<(ShardVersion, PathBuf)> = vec![];
-    while let Some(entry) = entries.next_entry().await? {
-        let path = entry.path();
-        if path.is_dir() {
-            let file_name_opt = path.file_name().and_then(|file_name| file_name.to_str());
-
-            if file_name_opt.is_none() {
-                continue;
-            }
-
-            let file_name = file_name_opt.unwrap();
-
-            if file_name.starts_with(&format!("{shard_id}-")) {
-                let version_opt = file_name
-                    .split('-')
-                    .nth(1)
-                    .and_then(|version_str| version_str.parse::<ShardVersion>().ok());
-
-                if version_opt.is_none() {
-                    continue;
-                }
-                let version = version_opt.unwrap();
-                all_versions.push((version, path.clone()));
-            } else if file_name == format!("{shard_id}") {
-                let version = 0;
-                all_versions.push((version, path.clone()));
-            }
-        }
-    }
-    all_versions.sort_by_key(|(version, _)| *version);
-    all_versions = all_versions.into_iter().rev().collect();
-    Ok(all_versions)
-}
-
-pub async fn drop_old_shards(collection_path: &Path, shard_id: ShardId) -> CollectionResult<()> {
-    for (_version, old_path) in shards_versions(collection_path, shard_id)
-        .await?
-        .into_iter()
-        .skip(1)
-    {
-        // delete old shard's data folder
-        tokio::fs::remove_dir_all(&old_path).await?;
-    }
-    Ok(())
-}
-
-pub fn versioned_shard_path(
-    collection_path: &Path,
-    shard_id: ShardId,
-    version: ShardVersion,
-) -> PathBuf {
-    if version == 0 {
-        collection_path.join(format!("{shard_id}"))
-    } else {
-        collection_path.join(format!("{shard_id}-{version}"))
-    }
-}
-
-pub async fn latest_shard_paths(
-    collection_path: &Path,
-    shard_id: ShardId,
-) -> CollectionResult<Vec<(PathBuf, ShardVersion, ShardType)>> {
-    // Assume `all_versions` is sorted by version in descending order.
-    let mut res = vec![];
-    let mut seen_temp_shard = false;
-    let all_versions = shards_versions(collection_path, shard_id).await?;
-    for (version, path) in all_versions {
-        let shard_config_opt = ShardConfig::load(&path)?;
-
-        if let Some(shard_config) = shard_config_opt {
-            match shard_config.r#type {
-                ShardType::Local => {
-                    res.push((path, version, shard_config.r#type));
-                    break; // We don't need older local shards.
-                }
-                ShardType::Remote { .. } => {
-                    res.push((path, version, shard_config.r#type));
-                    break; // We don't need older remote shards.
-                }
-                ShardType::Temporary => {
-                    if !seen_temp_shard {
-                        res.push((path, version, shard_config.r#type));
-                        seen_temp_shard = true;
-                    }
-                }
-                ShardType::ReplicaSet => {
-                    res.push((path, version, shard_config.r#type));
-                    break; // We don't need older replica set shards.
-                }
-            }
-        } else {
-            log::warn!("Shard config not found for {}, skipping", path.display());
-        }
-    }
-    if (seen_temp_shard && res.len() < 2) || res.is_empty() {
-        return Err(CollectionError::service_error(format!(
-            "No shard found: {shard_id} at {collection_path}",
-            shard_id = shard_id,
-            collection_path = collection_path.display()
-        )));
-    }
-    Ok(res)
-}
diff --git a/crates/qdrant/lib/collection/src/shards/telemetry.rs b/crates/qdrant/lib/collection/src/shards/telemetry.rs
deleted file mode 100644
index e5e3d91..0000000
--- a/crates/qdrant/lib/collection/src/shards/telemetry.rs
+++ /dev/null
@@ -1,93 +0,0 @@
-use std::cmp::max;
-use std::collections::HashMap;
-
-use schemars::JsonSchema;
-use segment::common::anonymize::Anonymize;
-use segment::common::operation_time_statistics::OperationDurationStatistics;
-use segment::telemetry::SegmentTelemetry;
-use serde::{Deserialize, Serialize};
-
-use crate::operations::types::OptimizersStatus;
-use crate::shards::replica_set::ReplicaState;
-use crate::shards::shard::{PeerId, ShardId};
-
-#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema)]
-pub struct ReplicaSetTelemetry {
-    pub id: ShardId,
-    pub local: Option<LocalShardTelemetry>,
-    pub remote: Vec<RemoteShardTelemetry>,
-    pub replicate_states: HashMap<PeerId, ReplicaState>,
-}
-
-#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema)]
-pub struct RemoteShardTelemetry {
-    pub shard_id: ShardId,
-    pub peer_id: Option<PeerId>,
-    pub searches: OperationDurationStatistics,
-    pub updates: OperationDurationStatistics,
-}
-
-#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema)]
-pub struct LocalShardTelemetry {
-    pub variant_name: Option<String>,
-    pub segments: Vec<SegmentTelemetry>,
-    pub optimizations: OptimizerTelemetry,
-}
-
-#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default)]
-pub struct OptimizerTelemetry {
-    pub status: OptimizersStatus,
-    pub optimizations: OperationDurationStatistics,
-}
-
-impl std::ops::Add for OptimizerTelemetry {
-    type Output = Self;
-
-    fn add(self, other: Self) -> Self {
-        Self {
-            status: max(self.status, other.status),
-            optimizations: self.optimizations + other.optimizations,
-        }
-    }
-}
-
-impl Anonymize for OptimizerTelemetry {
-    fn anonymize(&self) -> Self {
-        Self {
-            status: self.status.clone(),
-            optimizations: self.optimizations.anonymize(),
-        }
-    }
-}
-
-impl Anonymize for LocalShardTelemetry {
-    fn anonymize(&self) -> Self {
-        LocalShardTelemetry {
-            variant_name: self.variant_name.clone(),
-            segments: self.segments.anonymize(),
-            optimizations: self.optimizations.anonymize(),
-        }
-    }
-}
-
-impl Anonymize for RemoteShardTelemetry {
-    fn anonymize(&self) -> Self {
-        RemoteShardTelemetry {
-            shard_id: self.shard_id,
-            peer_id: None,
-            searches: self.searches.anonymize(),
-            updates: self.updates.anonymize(),
-        }
-    }
-}
-
-impl Anonymize for ReplicaSetTelemetry {
-    fn anonymize(&self) -> Self {
-        ReplicaSetTelemetry {
-            id: self.id,
-            local: self.local.anonymize(),
-            remote: self.remote.anonymize(),
-            replicate_states: Default::default(),
-        }
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/shards/transfer/mod.rs b/crates/qdrant/lib/collection/src/shards/transfer/mod.rs
deleted file mode 100644
index ad5fc6c..0000000
--- a/crates/qdrant/lib/collection/src/shards/transfer/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-pub mod shard_transfer;
-pub mod transfer_tasks_pool;
diff --git a/crates/qdrant/lib/collection/src/shards/transfer/shard_transfer.rs b/crates/qdrant/lib/collection/src/shards/transfer/shard_transfer.rs
deleted file mode 100644
index 0266603..0000000
--- a/crates/qdrant/lib/collection/src/shards/transfer/shard_transfer.rs
+++ /dev/null
@@ -1,517 +0,0 @@
-use std::cmp::Ordering;
-use std::collections::{HashMap, HashSet};
-use std::future::Future;
-use std::sync::atomic::AtomicBool;
-use std::sync::Arc;
-use std::time::Duration;
-
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use tokio::time::sleep;
-
-use crate::common::stoppable_task_async::{spawn_async_stoppable, StoppableAsyncTaskHandle};
-use crate::operations::types::{CollectionError, CollectionResult};
-use crate::shards::channel_service::ChannelService;
-use crate::shards::remote_shard::RemoteShard;
-use crate::shards::replica_set::ReplicaState;
-use crate::shards::shard::{PeerId, ShardId};
-use crate::shards::shard_holder::{LockedShardHolder, ShardHolder};
-use crate::shards::CollectionId;
-
-const TRANSFER_BATCH_SIZE: usize = 100;
-const RETRY_TIMEOUT: Duration = Duration::from_secs(1);
-const MAX_RETRY_COUNT: usize = 3;
-
-#[derive(Debug, Clone, Hash, PartialEq, Eq, Serialize, Deserialize, JsonSchema)]
-pub struct ShardTransfer {
-    pub shard_id: ShardId,
-    pub from: PeerId,
-    pub to: PeerId,
-    /// If this flag is true, the is a replication related transfer of shard from 1 peer to another
-    /// Shard on original peer will not be deleted in this case
-    pub sync: bool,
-}
-
-/// Unique identifier of a transfer
-#[derive(Debug, Clone, Hash, PartialEq, Eq, Serialize, Deserialize, JsonSchema)]
-pub struct ShardTransferKey {
-    pub shard_id: ShardId,
-    pub from: PeerId,
-    pub to: PeerId,
-}
-
-impl ShardTransferKey {
-    pub fn check(&self, transfer: &ShardTransfer) -> bool {
-        self.shard_id == transfer.shard_id && self.from == transfer.from && self.to == transfer.to
-    }
-}
-
-impl ShardTransfer {
-    pub fn key(&self) -> ShardTransferKey {
-        ShardTransferKey {
-            shard_id: self.shard_id,
-            from: self.from,
-            to: self.to,
-        }
-    }
-}
-
-async fn transfer_batches(
-    shard_holder: Arc<LockedShardHolder>,
-    shard_id: ShardId,
-    stopped: Arc<AtomicBool>,
-) -> CollectionResult<()> {
-    // Create payload indexes on the remote shard.
-    {
-        let shard_holder_guard = shard_holder.read().await;
-        let transferring_shard_opt = shard_holder_guard.get_shard(&shard_id);
-        if let Some(replica_set) = transferring_shard_opt {
-            replica_set.transfer_indexes().await?;
-        } else {
-            // Forward proxy gone?!
-            // That would be a programming error.
-            return Err(CollectionError::service_error(format!(
-                "Shard {shard_id} is not a forward proxy shard"
-            )));
-        }
-    }
-
-    // Transfer contents batch by batch
-    let initial_offset = None;
-    let mut offset = initial_offset;
-    loop {
-        if stopped.load(std::sync::atomic::Ordering::Relaxed) {
-            return Err(CollectionError::Cancelled {
-                description: "Transfer cancelled".to_string(),
-            });
-        }
-        let shard_holder_guard = shard_holder.read().await;
-        let transferring_shard_opt = shard_holder_guard.get_shard(&shard_id);
-
-        if let Some(replica_set) = transferring_shard_opt {
-            offset = replica_set
-                .transfer_batch(offset, TRANSFER_BATCH_SIZE)
-                .await?;
-            if offset.is_none() {
-                // That was the last batch, all look good
-                break;
-            }
-        } else {
-            // Forward proxy gone?!
-            // That would be a programming error.
-            return Err(CollectionError::service_error(format!(
-                "Shard {shard_id} is not found"
-            )));
-        }
-    }
-    Ok(())
-}
-
-/// Return local shard back from the forward proxy
-pub async fn revert_proxy_shard_to_local(
-    shard_holder: &ShardHolder,
-    shard_id: ShardId,
-) -> CollectionResult<bool> {
-    let replica_set = match shard_holder.get_shard(&shard_id) {
-        None => return Ok(false),
-        Some(replica_set) => replica_set,
-    };
-    replica_set.un_proxify_local().await?;
-    Ok(true)
-}
-
-pub async fn change_remote_shard_route(
-    shard_holder: &ShardHolder,
-    shard_id: ShardId,
-    old_peer_id: PeerId,
-    new_peer_id: PeerId,
-    sync: bool,
-) -> CollectionResult<bool> {
-    let replica_set = match shard_holder.get_shard(&shard_id) {
-        None => return Ok(false),
-        Some(replica_set) => replica_set,
-    };
-
-    if replica_set.this_peer_id() != new_peer_id {
-        replica_set
-            .add_remote(new_peer_id, ReplicaState::Active)
-            .await?;
-    }
-
-    if !sync {
-        // Transfer was a move, we need to remove the old peer
-        replica_set.remove_remote(old_peer_id).await?;
-    }
-    Ok(true)
-}
-
-/// Mark partial shard as ready
-///
-/// Returns `true` if the shard was promoted, `false` if the shard was not found.
-pub async fn finalize_partial_shard(
-    shard_holder: &ShardHolder,
-    shard_id: ShardId,
-) -> CollectionResult<bool> {
-    let replica_set = match shard_holder.get_shard(&shard_id) {
-        None => return Ok(false),
-        Some(replica_set) => replica_set,
-    };
-
-    if !replica_set.has_local_shard().await {
-        return Ok(false);
-    }
-
-    replica_set.set_replica_state(&replica_set.this_peer_id(), ReplicaState::Active)?;
-    Ok(true)
-}
-
-/// Promotes wrapped local shard to remote shard
-///
-/// Returns true if the shard was promoted, false if it was already handled
-pub async fn handle_transferred_shard_proxy(
-    shard_holder: &ShardHolder,
-    shard_id: ShardId,
-    to: PeerId,
-    sync: bool,
-) -> CollectionResult<bool> {
-    let replica_set = match shard_holder.get_shard(&shard_id) {
-        None => return Ok(false),
-        Some(replica_set) => replica_set,
-    };
-
-    replica_set.add_remote(to, ReplicaState::Active).await?;
-
-    if sync {
-        // Keep local shard in the replica set
-        replica_set.un_proxify_local().await?;
-    } else {
-        // Remove local proxy
-        replica_set.remove_local().await?;
-    }
-
-    Ok(true)
-}
-
-pub async fn transfer_shard(
-    shard_holder: Arc<LockedShardHolder>,
-    shard_id: ShardId,
-    collection_id: CollectionId,
-    peer_id: PeerId,
-    channel_service: ChannelService,
-    stopped: Arc<AtomicBool>,
-) -> CollectionResult<()> {
-    // Initiate shard on a remote peer
-    let remote_shard = RemoteShard::new(shard_id, collection_id.clone(), peer_id, channel_service);
-
-    // ToDo: Initial fast file-based transfer (optional)
-    // * Create shard snapshot - save the latest version of point updates in the snapshot
-    // * Initiate shard, use snapshot link for initialization
-    // * Transfer difference between snapshot and current shard state
-
-    remote_shard.initiate_transfer().await?;
-    {
-        let shard_holder_guard = shard_holder.read().await;
-        let transferring_shard = shard_holder_guard.get_shard(&shard_id);
-        if let Some(replica_set) = transferring_shard {
-            replica_set.proxify_local(remote_shard).await?;
-        } else {
-            return Err(CollectionError::service_error(format!(
-                "Shard {shard_id} cannot be proxied because it does not exist"
-            )));
-        }
-    };
-    // Transfer contents batch by batch
-    transfer_batches(shard_holder.clone(), shard_id, stopped.clone()).await
-}
-
-pub fn validate_transfer_exists(
-    transfer_key: &ShardTransferKey,
-    current_transfers: &HashSet<ShardTransfer>,
-) -> CollectionResult<()> {
-    if !current_transfers.iter().any(|t| &t.key() == transfer_key) {
-        return Err(CollectionError::bad_request(format!(
-            "There is no transfer for shard {} from {} to {}",
-            transfer_key.shard_id, transfer_key.from, transfer_key.to
-        )));
-    }
-
-    Ok(())
-}
-
-/// Confirms that the transfer does not conflict with any other active transfers
-///
-/// returns `None` if there is no conflicts, otherwise returns conflicting transfer
-pub fn check_transfer_conflicts<'a, I>(
-    transfer: &ShardTransfer,
-    current_transfers: I,
-) -> Option<ShardTransfer>
-where
-    I: Iterator<Item = &'a ShardTransfer>,
-{
-    let res = current_transfers
-        .filter(|t| t.shard_id == transfer.shard_id)
-        .find(|t| {
-            t.from == transfer.from
-                || t.to == transfer.from
-                || t.from == transfer.to
-                || t.to == transfer.to
-        });
-    res.cloned()
-}
-
-/// Same as `check_transfer_conflicts` but doesn't allow transfers to/from the same peer
-/// more than once for the whole collection
-pub fn check_transfer_conflicts_strict<'a, I>(
-    transfer: &ShardTransfer,
-    mut current_transfers: I,
-) -> Option<ShardTransfer>
-where
-    I: Iterator<Item = &'a ShardTransfer>,
-{
-    let res = current_transfers.find(|t| {
-        t.from == transfer.from
-            || t.to == transfer.from
-            || t.from == transfer.to
-            || t.to == transfer.to
-    });
-    res.cloned()
-}
-
-/// Confirms that the transfer makes sense with the current state cluster
-///
-/// Checks:
-/// 1. If `from` and `to` exists
-/// 2. If `from` have local shard and it is active
-/// 3. If there is no active transfers which involve `from` or `to`
-///
-/// If validation fails, return `BadRequest` error.
-pub fn validate_transfer(
-    transfer: &ShardTransfer,
-    all_peers: &HashSet<PeerId>,
-    shard_state: Option<&HashMap<PeerId, ReplicaState>>,
-    current_transfers: &HashSet<ShardTransfer>,
-) -> CollectionResult<()> {
-    let shard_state = if let Some(shard_state) = shard_state {
-        shard_state
-    } else {
-        return Err(CollectionError::service_error(format!(
-            "Shard {} does not exist",
-            transfer.shard_id
-        )));
-    };
-
-    if !all_peers.contains(&transfer.from) {
-        return Err(CollectionError::bad_request(format!(
-            "Peer {} does not exist",
-            transfer.from
-        )));
-    }
-
-    if !all_peers.contains(&transfer.to) {
-        return Err(CollectionError::bad_request(format!(
-            "Peer {} does not exist",
-            transfer.to
-        )));
-    }
-
-    if shard_state.get(&transfer.from) != Some(&ReplicaState::Active) {
-        return Err(CollectionError::bad_request(format!(
-            "Shard {} is not active on peer {}",
-            transfer.shard_id, transfer.from
-        )));
-    }
-
-    if let Some(existing_transfer) = check_transfer_conflicts(transfer, current_transfers.iter()) {
-        return Err(CollectionError::bad_request(format!(
-            "Shard {} is already involved in transfer {} -> {}",
-            transfer.shard_id, existing_transfer.from, existing_transfer.to
-        )));
-    }
-
-    Ok(())
-}
-
-/// Selects a best peer to transfer shard from.
-///
-/// Requirements:
-/// 1. Peer should have an active replica of the shard
-/// 2. There should be no active transfers from this peer with the same shard
-/// 3. Prefer peer with the lowest number of active transfers
-///
-/// If there are no peers that satisfy the requirements, returns `None`.
-pub fn suggest_transfer_source(
-    shard_id: ShardId,
-    target_peer: PeerId,
-    current_transfers: &[ShardTransfer],
-    shard_peers: &HashMap<PeerId, ReplicaState>,
-) -> Option<PeerId> {
-    let mut candidates = HashSet::new();
-    for (peer_id, state) in shard_peers {
-        if *state == ReplicaState::Active && *peer_id != target_peer {
-            candidates.insert(*peer_id);
-        }
-    }
-
-    let currently_transferring = current_transfers
-        .iter()
-        .filter(|transfer| transfer.shard_id == shard_id)
-        .map(|transfer| transfer.from)
-        .collect::<HashSet<PeerId>>();
-
-    candidates = candidates
-        .difference(&currently_transferring)
-        .cloned()
-        .collect();
-
-    let transfer_counts = current_transfers
-        .iter()
-        .fold(HashMap::new(), |mut counts, transfer| {
-            *counts.entry(transfer.from).or_insert(0_usize) += 1;
-            counts
-        });
-
-    // Sort candidates by the number of active transfers
-    let mut candidates = candidates
-        .into_iter()
-        .map(|peer_id| (peer_id, transfer_counts.get(&peer_id).unwrap_or(&0)))
-        .collect::<Vec<(PeerId, &usize)>>();
-    candidates.sort_unstable_by_key(|(_, count)| **count);
-
-    candidates.first().map(|(peer_id, _)| *peer_id)
-}
-
-/// Selects the best peer to add a replica to.
-///
-/// Requirements:
-/// 1. Peer should not have an active replica of the shard
-/// 2. Peer should have minimal number of active transfers
-pub fn suggest_peer_to_add_replica(
-    shard_id: ShardId,
-    shard_distribution: HashMap<ShardId, HashSet<PeerId>>,
-) -> Option<PeerId> {
-    let mut peer_loads: HashMap<PeerId, usize> = HashMap::new();
-    for peers in shard_distribution.values() {
-        for peer_id in peers {
-            *peer_loads.entry(*peer_id).or_insert(0_usize) += 1;
-        }
-    }
-    let peers_with_shard = shard_distribution
-        .get(&shard_id)
-        .cloned()
-        .unwrap_or_default();
-    for peer_with_shard in peers_with_shard {
-        peer_loads.remove(&peer_with_shard);
-    }
-
-    let mut candidates = peer_loads.into_iter().collect::<Vec<(PeerId, usize)>>();
-    candidates.sort_unstable_by_key(|(_, count)| *count);
-    candidates.first().map(|(peer_id, _)| *peer_id)
-}
-
-/// Selects the best peer to remove a replica from.
-///
-/// Requirements:
-/// 1. Peer should have a replica of the shard
-/// 2. Peer should maximal number of active shards
-/// 3. Shard replica should preferably be non-active
-pub fn suggest_peer_to_remove_replica(
-    shard_distribution: HashMap<ShardId, HashSet<PeerId>>,
-    shard_peers: HashMap<PeerId, ReplicaState>,
-) -> Option<PeerId> {
-    let mut peer_loads: HashMap<PeerId, usize> = HashMap::new();
-    for (_, peers) in shard_distribution {
-        for peer_id in peers {
-            *peer_loads.entry(peer_id).or_insert(0_usize) += 1;
-        }
-    }
-
-    let mut candidates: Vec<_> = shard_peers
-        .into_iter()
-        .map(|(peer_id, status)| {
-            (
-                peer_id,
-                status,
-                peer_loads.get(&peer_id).copied().unwrap_or(0),
-            )
-        })
-        .collect();
-
-    candidates.sort_unstable_by(|(_, status1, count1), (_, status2, count2)| {
-        match (status1, status2) {
-            (ReplicaState::Active, ReplicaState::Active) => count2.cmp(count1),
-            (ReplicaState::Active, _) => Ordering::Less,
-            (_, ReplicaState::Active) => Ordering::Greater,
-            (_, _) => count2.cmp(count1),
-        }
-    });
-
-    candidates.first().map(|(peer_id, _, _)| *peer_id)
-}
-
-pub fn spawn_transfer_task<T, F>(
-    shards_holder: Arc<LockedShardHolder>,
-    transfer: ShardTransfer,
-    collection_id: CollectionId,
-    channel_service: ChannelService,
-    on_finish: T,
-    on_error: F,
-) -> StoppableAsyncTaskHandle<bool>
-where
-    T: Future<Output = ()> + Send + 'static,
-    F: Future<Output = ()> + Send + 'static,
-{
-    spawn_async_stoppable(move |stopped| async move {
-        let mut tries = MAX_RETRY_COUNT;
-        let mut finished = false;
-        while !finished && tries > 0 {
-            let transfer_result = transfer_shard(
-                shards_holder.clone(),
-                transfer.shard_id,
-                collection_id.clone(),
-                transfer.to,
-                channel_service.clone(),
-                stopped.clone(),
-            )
-            .await;
-            finished = match transfer_result {
-                Ok(()) => true,
-                Err(error) => {
-                    if matches!(error, CollectionError::Cancelled { .. }) {
-                        return false;
-                    }
-                    log::error!(
-                        "Failed to transfer shard {} -> {}: {}",
-                        transfer.shard_id,
-                        transfer.to,
-                        error
-                    );
-                    false
-                }
-            };
-            if stopped.load(std::sync::atomic::Ordering::Relaxed) {
-                return false;
-            }
-            if !finished {
-                tries -= 1;
-                log::warn!(
-                    "Retrying transfer shard {} -> {} (retry {})",
-                    transfer.shard_id,
-                    transfer.to,
-                    MAX_RETRY_COUNT - tries
-                );
-                let exp_timeout = RETRY_TIMEOUT * (MAX_RETRY_COUNT - tries) as u32;
-                sleep(exp_timeout).await;
-            }
-        }
-
-        if finished {
-            // On the end of transfer, the new shard is active but most likely is under the optimization
-            // process. Requests to this node might be slow, but we rely on the assumption that
-            // there should be at least one other replica that is not under optimization.
-            on_finish.await;
-        } else {
-            on_error.await;
-        }
-        finished
-    })
-}
diff --git a/crates/qdrant/lib/collection/src/shards/transfer/transfer_tasks_pool.rs b/crates/qdrant/lib/collection/src/shards/transfer/transfer_tasks_pool.rs
deleted file mode 100644
index 7a8c6da..0000000
--- a/crates/qdrant/lib/collection/src/shards/transfer/transfer_tasks_pool.rs
+++ /dev/null
@@ -1,101 +0,0 @@
-use std::collections::HashMap;
-
-use crate::common::stoppable_task_async::StoppableAsyncTaskHandle;
-use crate::shards::transfer::shard_transfer::{ShardTransfer, ShardTransferKey};
-use crate::shards::CollectionId;
-
-pub struct TransferTasksPool {
-    collection_id: CollectionId,
-    tasks: HashMap<ShardTransferKey, StoppableAsyncTaskHandle<bool>>,
-}
-
-#[derive(Debug, PartialEq, Eq, Hash, Clone)]
-pub enum TaskResult {
-    Finished,
-    NotFound,
-    Stopped,
-    Failed,
-}
-
-impl TaskResult {
-    pub fn is_finished(&self) -> bool {
-        matches!(self, TaskResult::Finished)
-    }
-}
-
-impl TransferTasksPool {
-    pub fn new(collection_id: CollectionId) -> Self {
-        Self {
-            collection_id,
-            tasks: HashMap::new(),
-        }
-    }
-
-    /// Returns true if transfer task is still running
-    pub fn check_if_still_running(&self, transfer_key: &ShardTransferKey) -> bool {
-        if let Some(task) = self.tasks.get(transfer_key) {
-            !task.is_finished()
-        } else {
-            false
-        }
-    }
-
-    /// Return true if task finished
-    /// Return false if task failed or stopped
-    /// Return None if task not found or not finished
-    pub fn get_task_result(&self, transfer_key: &ShardTransferKey) -> Option<bool> {
-        if let Some(task) = self.tasks.get(transfer_key) {
-            task.get_result()
-        } else {
-            None
-        }
-    }
-
-    /// Returns true if the task was actually stopped
-    /// Returns false if the task was not found
-    pub async fn stop_if_exists(&mut self, transfer_key: &ShardTransferKey) -> TaskResult {
-        if let Some(task) = self.tasks.remove(transfer_key) {
-            match task.stop().await {
-                Ok(res) => {
-                    if res {
-                        log::info!(
-                            "Transfer of shard {}:{} -> {} finished",
-                            self.collection_id,
-                            transfer_key.shard_id,
-                            transfer_key.to
-                        );
-                        TaskResult::Finished
-                    } else {
-                        log::info!(
-                            "Transfer of shard {}:{} -> {} stopped",
-                            self.collection_id,
-                            transfer_key.shard_id,
-                            transfer_key.to
-                        );
-                        TaskResult::Stopped
-                    }
-                }
-                Err(err) => {
-                    log::warn!(
-                        "Transfer task for shard {}:{} -> {} failed: {}",
-                        self.collection_id,
-                        transfer_key.shard_id,
-                        transfer_key.to,
-                        err
-                    );
-                    TaskResult::Failed
-                }
-            }
-        } else {
-            TaskResult::NotFound
-        }
-    }
-
-    pub fn add_task(
-        &mut self,
-        shard_transfer: &ShardTransfer,
-        task: StoppableAsyncTaskHandle<bool>,
-    ) {
-        self.tasks.insert(shard_transfer.key(), task);
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/telemetry.rs b/crates/qdrant/lib/collection/src/telemetry.rs
deleted file mode 100644
index e2a60f4..0000000
--- a/crates/qdrant/lib/collection/src/telemetry.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-use schemars::JsonSchema;
-use segment::common::anonymize::Anonymize;
-use serde::{Deserialize, Serialize};
-
-use crate::config::CollectionConfig;
-use crate::operations::types::ShardTransferInfo;
-use crate::shards::telemetry::ReplicaSetTelemetry;
-
-#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema)]
-pub struct CollectionTelemetry {
-    pub id: String,
-    pub init_time_ms: u64,
-    pub config: CollectionConfig,
-    pub shards: Vec<ReplicaSetTelemetry>,
-    pub transfers: Vec<ShardTransferInfo>,
-}
-
-impl CollectionTelemetry {
-    pub fn count_vectors(&self) -> usize {
-        self.shards
-            .iter()
-            .flat_map(|shard| shard.local.as_ref())
-            .flat_map(|x| x.segments.iter())
-            .map(|s| s.info.num_vectors)
-            .sum()
-    }
-}
-
-impl Anonymize for CollectionTelemetry {
-    fn anonymize(&self) -> Self {
-        Self {
-            id: self.id.anonymize(),
-            config: self.config.anonymize(),
-            init_time_ms: self.init_time_ms,
-            shards: self.shards.anonymize(),
-            transfers: vec![],
-        }
-    }
-}
-
-impl Anonymize for CollectionConfig {
-    fn anonymize(&self) -> Self {
-        CollectionConfig {
-            params: self.params.clone(),
-            hnsw_config: self.hnsw_config.clone(),
-            optimizer_config: self.optimizer_config.clone(),
-            wal_config: self.wal_config.clone(),
-            quantization_config: self.quantization_config.clone(),
-        }
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/tests/mod.rs b/crates/qdrant/lib/collection/src/tests/mod.rs
deleted file mode 100644
index c742fd7..0000000
--- a/crates/qdrant/lib/collection/src/tests/mod.rs
+++ /dev/null
@@ -1,140 +0,0 @@
-mod snapshot_test;
-mod wal_recovery_test;
-
-use std::sync::Arc;
-use std::time::Duration;
-
-use futures::future::join_all;
-use itertools::Itertools;
-use parking_lot::RwLock;
-use tempfile::Builder;
-use tokio::time::{sleep, Instant};
-
-use crate::collection::Collection;
-use crate::collection_manager::fixtures::{
-    get_indexing_optimizer, get_merge_optimizer, random_segment,
-};
-use crate::collection_manager::holders::segment_holder::{LockedSegment, SegmentHolder, SegmentId};
-use crate::update_handler::{Optimizer, UpdateHandler};
-
-#[tokio::test]
-async fn test_optimization_process() {
-    let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-    let temp_dir = Builder::new().prefix("segment_temp_dir").tempdir().unwrap();
-
-    let dim = 256;
-    let mut holder = SegmentHolder::default();
-
-    let segments_to_merge = vec![
-        holder.add(random_segment(dir.path(), 100, 3, dim)),
-        holder.add(random_segment(dir.path(), 100, 3, dim)),
-        holder.add(random_segment(dir.path(), 100, 3, dim)),
-    ];
-
-    let segment_to_index = holder.add(random_segment(dir.path(), 100, 110, dim));
-
-    let _other_segment_ids: Vec<SegmentId> = vec![
-        holder.add(random_segment(dir.path(), 100, 20, dim)),
-        holder.add(random_segment(dir.path(), 100, 20, dim)),
-    ];
-
-    let merge_optimizer: Arc<Optimizer> =
-        Arc::new(get_merge_optimizer(dir.path(), temp_dir.path(), dim));
-    let indexing_optimizer: Arc<Optimizer> =
-        Arc::new(get_indexing_optimizer(dir.path(), temp_dir.path(), dim));
-
-    let optimizers = Arc::new(vec![merge_optimizer, indexing_optimizer]);
-
-    let segments: Arc<RwLock<_>> = Arc::new(RwLock::new(holder));
-    let handles = UpdateHandler::launch_optimization(optimizers.clone(), segments.clone(), |_| {});
-
-    assert_eq!(handles.len(), 2);
-
-    let join_res = join_all(handles.into_iter().map(|x| x.join_handle).collect_vec()).await;
-
-    let handles_2 =
-        UpdateHandler::launch_optimization(optimizers.clone(), segments.clone(), |_| {});
-
-    assert_eq!(handles_2.len(), 0);
-
-    for res in join_res {
-        assert!(res.is_ok());
-        assert_eq!(res.unwrap(), Some(true));
-    }
-
-    assert_eq!(segments.read().len(), 4);
-
-    assert!(segments.read().get(segment_to_index).is_none());
-
-    for sid in segments_to_merge {
-        assert!(segments.read().get(sid).is_none());
-    }
-}
-
-#[tokio::test]
-async fn test_cancel_optimization() {
-    let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-    let temp_dir = Builder::new().prefix("segment_temp_dir").tempdir().unwrap();
-
-    let mut holder = SegmentHolder::default();
-    let dim = 256;
-
-    for _ in 0..5 {
-        holder.add(random_segment(dir.path(), 100, 1000, dim));
-    }
-
-    let indexing_optimizer: Arc<Optimizer> =
-        Arc::new(get_indexing_optimizer(dir.path(), temp_dir.path(), dim));
-
-    let optimizers = Arc::new(vec![indexing_optimizer]);
-
-    let now = Instant::now();
-
-    let segments: Arc<RwLock<_>> = Arc::new(RwLock::new(holder));
-    let handles = UpdateHandler::launch_optimization(optimizers.clone(), segments.clone(), |_| {});
-
-    sleep(Duration::from_millis(100)).await;
-
-    let join_handles = handles.into_iter().filter_map(|h| h.stop()).collect_vec();
-
-    let optimization_res = join_all(join_handles).await;
-
-    let actual_optimization_duration = now.elapsed().as_millis();
-    eprintln!("actual_optimization_duration = {actual_optimization_duration:#?} ms");
-
-    for res in optimization_res {
-        let was_finished = res.expect("Should be no errors during optimization");
-        assert_ne!(was_finished, Some(true));
-    }
-
-    for (_idx, segment) in segments.read().iter() {
-        match segment {
-            LockedSegment::Original(_) => {}
-            LockedSegment::Proxy(_) => panic!("segment is not restored"),
-        }
-    }
-}
-
-#[test]
-fn check_version_upgrade() {
-    assert!(!Collection::can_upgrade_storage(
-        &"0.3.1".parse().unwrap(),
-        &"0.4.0".parse().unwrap()
-    ));
-    assert!(!Collection::can_upgrade_storage(
-        &"0.4.0".parse().unwrap(),
-        &"0.5.0".parse().unwrap()
-    ));
-    assert!(!Collection::can_upgrade_storage(
-        &"0.4.0".parse().unwrap(),
-        &"0.4.2".parse().unwrap()
-    ));
-    assert!(Collection::can_upgrade_storage(
-        &"0.4.0".parse().unwrap(),
-        &"0.4.1".parse().unwrap()
-    ));
-    assert!(Collection::can_upgrade_storage(
-        &"0.4.1".parse().unwrap(),
-        &"0.4.2".parse().unwrap()
-    ));
-}
diff --git a/crates/qdrant/lib/collection/src/tests/snapshot_test.rs b/crates/qdrant/lib/collection/src/tests/snapshot_test.rs
deleted file mode 100644
index 6c8c428..0000000
--- a/crates/qdrant/lib/collection/src/tests/snapshot_test.rs
+++ /dev/null
@@ -1,160 +0,0 @@
-use std::collections::{HashMap, HashSet};
-use std::num::{NonZeroU32, NonZeroU64};
-use std::sync::Arc;
-
-use segment::types::Distance;
-use tempfile::Builder;
-
-use crate::collection::{Collection, RequestShardTransfer};
-use crate::config::{CollectionConfig, CollectionParams, WalConfig};
-use crate::operations::shared_storage_config::SharedStorageConfig;
-use crate::operations::types::{NodeType, VectorParams, VectorsConfig};
-use crate::optimizers_builder::OptimizersConfig;
-use crate::shards::channel_service::ChannelService;
-use crate::shards::collection_shard_distribution::CollectionShardDistribution;
-use crate::shards::replica_set::ChangePeerState;
-
-pub const TEST_OPTIMIZERS_CONFIG: OptimizersConfig = OptimizersConfig {
-    deleted_threshold: 0.9,
-    vacuum_min_vector_number: 1000,
-    default_segment_number: 2,
-    max_segment_size: None,
-    memmap_threshold: None,
-    indexing_threshold: Some(50_000),
-    flush_interval_sec: 30,
-    max_optimization_threads: 2,
-};
-
-pub fn dummy_on_replica_failure() -> ChangePeerState {
-    Arc::new(move |_peer_id, _shard_id| {})
-}
-
-pub fn dummy_request_shard_transfer() -> RequestShardTransfer {
-    Arc::new(move |_transfer| {})
-}
-
-async fn _test_snapshot_collection(node_type: NodeType) {
-    let wal_config = WalConfig {
-        wal_capacity_mb: 1,
-        wal_segments_ahead: 0,
-    };
-
-    let collection_params = CollectionParams {
-        vectors: VectorsConfig::Single(VectorParams {
-            size: NonZeroU64::new(4).unwrap(),
-            distance: Distance::Dot,
-            hnsw_config: None,
-            quantization_config: None,
-            on_disk: None,
-        }),
-        shard_number: NonZeroU32::new(4).unwrap(),
-        replication_factor: NonZeroU32::new(3).unwrap(),
-        write_consistency_factor: NonZeroU32::new(2).unwrap(),
-        on_disk_payload: false,
-    };
-
-    let config = CollectionConfig {
-        params: collection_params,
-        optimizer_config: TEST_OPTIMIZERS_CONFIG.clone(),
-        wal_config,
-        hnsw_config: Default::default(),
-        quantization_config: Default::default(),
-    };
-
-    let snapshots_path = Builder::new().prefix("test_snapshots").tempdir().unwrap();
-    let collection_dir = Builder::new().prefix("test_collection").tempdir().unwrap();
-    let recover_dir = Builder::new()
-        .prefix("test_collection_rec")
-        .tempdir()
-        .unwrap();
-    let collection_name = "test".to_string();
-    let collection_name_rec = "test_rec".to_string();
-    let mut shards = HashMap::new();
-    shards.insert(0, HashSet::from([1]));
-    shards.insert(1, HashSet::from([1]));
-    shards.insert(2, HashSet::from([10_000])); // remote shard
-    shards.insert(3, HashSet::from([1, 20_000, 30_000]));
-
-    let storage_config: SharedStorageConfig = SharedStorageConfig {
-        node_type,
-        ..Default::default()
-    };
-
-    let collection = Collection::new(
-        collection_name,
-        1,
-        collection_dir.path(),
-        snapshots_path.path(),
-        &config,
-        Arc::new(storage_config),
-        CollectionShardDistribution { shards },
-        ChannelService::default(),
-        dummy_on_replica_failure(),
-        dummy_request_shard_transfer(),
-        None,
-        None,
-    )
-    .await
-    .unwrap();
-
-    let snapshots_temp_dir = Builder::new().prefix("temp_dir").tempdir().unwrap();
-    let snapshot_description = collection
-        .create_snapshot(snapshots_temp_dir.path(), 0)
-        .await
-        .unwrap();
-
-    // Do not recover in local mode if some shards are remote
-    assert!(Collection::restore_snapshot(
-        &snapshots_path.path().join(&snapshot_description.name),
-        recover_dir.path(),
-        0,
-        false,
-    )
-    .is_err());
-
-    if let Err(err) = Collection::restore_snapshot(
-        &snapshots_path.path().join(snapshot_description.name),
-        recover_dir.path(),
-        0,
-        true,
-    ) {
-        panic!("Failed to restore snapshot: {err}")
-    }
-
-    let recovered_collection = Collection::load(
-        collection_name_rec,
-        1,
-        recover_dir.path(),
-        snapshots_path.path(),
-        Default::default(),
-        ChannelService::default(),
-        dummy_on_replica_failure(),
-        dummy_request_shard_transfer(),
-        None,
-        None,
-    )
-    .await;
-
-    {
-        let shards_holder = &recovered_collection.shards_holder.read().await;
-
-        let replica_ser_0 = shards_holder.get_shard(&0).unwrap();
-        assert!(replica_ser_0.is_local().await);
-        let replica_ser_1 = shards_holder.get_shard(&1).unwrap();
-        assert!(replica_ser_1.is_local().await);
-        let replica_ser_2 = shards_holder.get_shard(&2).unwrap();
-        assert!(!replica_ser_2.is_local().await);
-        assert_eq!(replica_ser_2.peers().len(), 1);
-
-        let replica_ser_3 = shards_holder.get_shard(&3).unwrap();
-
-        assert!(replica_ser_3.is_local().await);
-        assert_eq!(replica_ser_3.peers().len(), 3); // 2 remotes + 1 local
-    }
-}
-
-#[tokio::test(flavor = "multi_thread")]
-async fn test_snapshot_collection() {
-    _test_snapshot_collection(NodeType::Normal).await;
-    _test_snapshot_collection(NodeType::Listener).await;
-}
diff --git a/crates/qdrant/lib/collection/src/tests/wal_recovery_test.rs b/crates/qdrant/lib/collection/src/tests/wal_recovery_test.rs
deleted file mode 100644
index dff9724..0000000
--- a/crates/qdrant/lib/collection/src/tests/wal_recovery_test.rs
+++ /dev/null
@@ -1,185 +0,0 @@
-use std::num::{NonZeroU32, NonZeroU64};
-use std::sync::Arc;
-
-use segment::types::{Distance, PayloadFieldSchema, PayloadSchemaType};
-use tempfile::Builder;
-use tokio::runtime::Handle;
-use tokio::sync::RwLock;
-
-use crate::config::{CollectionConfig, CollectionParams, WalConfig};
-use crate::operations::point_ops::{PointOperations, PointStruct};
-use crate::operations::types::{VectorParams, VectorsConfig};
-use crate::operations::{CollectionUpdateOperations, CreateIndex, FieldIndexOperations};
-use crate::shards::local_shard::LocalShard;
-use crate::shards::shard_trait::ShardOperation;
-use crate::tests::snapshot_test::TEST_OPTIMIZERS_CONFIG;
-
-fn create_collection_config() -> CollectionConfig {
-    let wal_config = WalConfig {
-        wal_capacity_mb: 1,
-        wal_segments_ahead: 0,
-    };
-
-    let collection_params = CollectionParams {
-        vectors: VectorsConfig::Single(VectorParams {
-            size: NonZeroU64::new(4).unwrap(),
-            distance: Distance::Dot,
-            hnsw_config: None,
-            quantization_config: None,
-            on_disk: None,
-        }),
-        shard_number: NonZeroU32::new(1).unwrap(),
-        replication_factor: NonZeroU32::new(1).unwrap(),
-        write_consistency_factor: NonZeroU32::new(1).unwrap(),
-        on_disk_payload: false,
-    };
-
-    let mut optimizer_config = TEST_OPTIMIZERS_CONFIG.clone();
-
-    optimizer_config.default_segment_number = 1;
-    optimizer_config.flush_interval_sec = 0;
-
-    CollectionConfig {
-        params: collection_params,
-        optimizer_config,
-        wal_config,
-        hnsw_config: Default::default(),
-        quantization_config: Default::default(),
-    }
-}
-
-fn upsert_operation() -> CollectionUpdateOperations {
-    CollectionUpdateOperations::PointOperation(
-        vec![
-            PointStruct {
-                id: 1.into(),
-                vector: vec![1.0, 2.0, 3.0, 4.0].into(),
-                payload: Some(
-                    serde_json::from_str(r#"{ "location": { "lat": 10.12, "lon": 32.12  } }"#).unwrap(),
-                ),
-            },
-            PointStruct {
-                id: 2.into(),
-                vector: vec![2.0, 1.0, 3.0, 4.0].into(),
-                payload: Some(
-                    serde_json::from_str(r#"{ "location": { "lat": 11.12, "lon": 34.82  } }"#).unwrap(),
-                ),
-            },
-            PointStruct {
-                id: 3.into(),
-                vector: vec![3.0, 2.0, 1.0, 4.0].into(),
-                payload: Some(
-                    serde_json::from_str(r#"{ "location": [ { "lat": 12.12, "lon": 34.82  }, { "lat": 12.2, "lon": 12.82  }] }"#).unwrap(),
-                ),
-            },
-            PointStruct {
-                id: 4.into(),
-                vector: vec![4.0, 2.0, 3.0, 1.0].into(),
-                payload: Some(
-                    serde_json::from_str(r#"{ "location": { "lat": 13.12, "lon": 34.82  } }"#).unwrap(),
-                ),
-            },
-            PointStruct {
-                id: 5.into(),
-                vector: vec![5.0, 2.0, 3.0, 4.0].into(),
-                payload: Some(
-                    serde_json::from_str(r#"{ "location": { "lat": 14.12, "lon": 32.12  } }"#).unwrap(),
-                ),
-            },
-
-        ]
-        .into(),
-    )
-}
-
-fn create_payload_index_operation() -> CollectionUpdateOperations {
-    CollectionUpdateOperations::FieldIndexOperation(FieldIndexOperations::CreateIndex(
-        CreateIndex {
-            field_name: "location".to_string(),
-            field_schema: Some(PayloadFieldSchema::FieldType(PayloadSchemaType::Geo)),
-        },
-    ))
-}
-
-fn delete_point_operation(idx: u64) -> CollectionUpdateOperations {
-    CollectionUpdateOperations::PointOperation(PointOperations::DeletePoints {
-        ids: vec![idx.into()],
-    })
-}
-
-#[tokio::test(flavor = "multi_thread")]
-async fn test_delete_from_indexed_payload() {
-    let collection_dir = Builder::new().prefix("test_collection").tempdir().unwrap();
-
-    let config = create_collection_config();
-
-    let collection_name = "test".to_string();
-
-    let current_runtime: Handle = Handle::current();
-
-    let shard = LocalShard::build(
-        0,
-        collection_name.clone(),
-        collection_dir.path(),
-        Arc::new(RwLock::new(config.clone())),
-        Arc::new(Default::default()),
-        current_runtime.clone(),
-    )
-    .await
-    .unwrap();
-
-    let upsert_ops = upsert_operation();
-
-    shard.update(upsert_ops, true).await.unwrap();
-
-    let index_op = create_payload_index_operation();
-
-    shard.update(index_op, true).await.unwrap();
-
-    let delete_point_op = delete_point_operation(4);
-    shard.update(delete_point_op, true).await.unwrap();
-
-    let info = shard.info().await.unwrap();
-    eprintln!("info = {:#?}", info.payload_schema);
-    let number_of_indexed_points = info.payload_schema.get("location").unwrap().points;
-
-    drop(shard);
-
-    let shard = LocalShard::load(
-        0,
-        collection_name.clone(),
-        collection_dir.path(),
-        Arc::new(RwLock::new(config.clone())),
-        Arc::new(Default::default()),
-        current_runtime.clone(),
-    )
-    .await
-    .unwrap();
-
-    tokio::time::sleep(std::time::Duration::from_secs(1)).await;
-
-    eprintln!("dropping point 5");
-    let delete_point_op = delete_point_operation(5);
-    shard.update(delete_point_op, true).await.unwrap();
-
-    drop(shard);
-
-    let shard = LocalShard::load(
-        0,
-        collection_name,
-        collection_dir.path(),
-        Arc::new(RwLock::new(config)),
-        Arc::new(Default::default()),
-        current_runtime,
-    )
-    .await
-    .unwrap();
-
-    let info = shard.info().await.unwrap();
-    eprintln!("info = {:#?}", info.payload_schema);
-
-    let number_of_indexed_points_after_load = info.payload_schema.get("location").unwrap().points;
-
-    assert_eq!(number_of_indexed_points, 4);
-    assert_eq!(number_of_indexed_points_after_load, 3);
-}
diff --git a/crates/qdrant/lib/collection/src/update_handler.rs b/crates/qdrant/lib/collection/src/update_handler.rs
deleted file mode 100644
index 05ef0d1..0000000
--- a/crates/qdrant/lib/collection/src/update_handler.rs
+++ /dev/null
@@ -1,452 +0,0 @@
-use std::cmp::min;
-use std::collections::HashSet;
-use std::sync::Arc;
-
-use itertools::Itertools;
-use log::{debug, error, info, trace, warn};
-use segment::entry::entry_point::OperationResult;
-use segment::types::SeqNumberType;
-use tokio::runtime::Handle;
-use tokio::sync::mpsc::{self, Receiver, Sender};
-use tokio::sync::{oneshot, Mutex as TokioMutex};
-use tokio::task::JoinHandle;
-use tokio::time::Duration;
-
-use crate::collection_manager::collection_updater::CollectionUpdater;
-use crate::collection_manager::holders::segment_holder::LockedSegmentHolder;
-use crate::collection_manager::optimizers::segment_optimizer::SegmentOptimizer;
-use crate::common::stoppable_task::{spawn_stoppable, StoppableTaskHandle};
-use crate::operations::shared_storage_config::SharedStorageConfig;
-use crate::operations::types::{CollectionError, CollectionResult};
-use crate::operations::CollectionUpdateOperations;
-use crate::shards::local_shard::LockedWal;
-use crate::wal::WalError;
-
-pub type Optimizer = dyn SegmentOptimizer + Sync + Send;
-
-/// Information, required to perform operation and notify regarding the result
-#[derive(Debug)]
-pub struct OperationData {
-    /// Sequential number of the operation
-    pub op_num: SeqNumberType,
-    /// Operation
-    pub operation: CollectionUpdateOperations,
-    /// If operation was requested to wait for result
-    pub wait: bool,
-    /// Callback notification channel
-    pub sender: Option<oneshot::Sender<CollectionResult<usize>>>,
-}
-
-/// Signal, used to inform Updater process
-#[derive(Debug)]
-pub enum UpdateSignal {
-    /// Requested operation to perform
-    Operation(OperationData),
-    /// Stop all optimizers and listening
-    Stop,
-    /// Empty signal used to trigger optimizers
-    Nop,
-    /// Ensures that previous updates are applied
-    Plunger(oneshot::Sender<()>),
-}
-
-/// Signal, used to inform Optimization process
-#[derive(PartialEq, Eq, Clone, Copy)]
-pub enum OptimizerSignal {
-    /// Sequential number of the operation
-    Operation(SeqNumberType),
-    /// Stop all optimizers and listening
-    Stop,
-    /// Empty signal used to trigger optimizers
-    Nop,
-}
-
-/// Structure, which holds object, required for processing updates of the collection
-pub struct UpdateHandler {
-    shared_storage_config: Arc<SharedStorageConfig>,
-    /// List of used optimizers
-    pub optimizers: Arc<Vec<Arc<Optimizer>>>,
-    /// How frequent can we flush data
-    pub flush_interval_sec: u64,
-    segments: LockedSegmentHolder,
-    /// Process, that listens updates signals and perform updates
-    update_worker: Option<JoinHandle<()>>,
-    /// Process, that listens for post-update signals and performs optimization
-    optimizer_worker: Option<JoinHandle<()>>,
-    /// Process that periodically flushes segments and tries to truncate wal
-    flush_worker: Option<JoinHandle<()>>,
-    /// Sender to stop flush worker
-    flush_stop: Option<oneshot::Sender<()>>,
-    runtime_handle: Handle,
-    /// WAL, required for operations
-    wal: LockedWal,
-    optimization_handles: Arc<TokioMutex<Vec<StoppableTaskHandle<bool>>>>,
-    max_optimization_threads: usize,
-}
-
-impl UpdateHandler {
-    pub fn new(
-        shared_storage_config: Arc<SharedStorageConfig>,
-        optimizers: Arc<Vec<Arc<Optimizer>>>,
-        runtime_handle: Handle,
-        segments: LockedSegmentHolder,
-        wal: LockedWal,
-        flush_interval_sec: u64,
-        max_optimization_threads: usize,
-    ) -> UpdateHandler {
-        UpdateHandler {
-            shared_storage_config,
-            optimizers,
-            segments,
-            update_worker: None,
-            optimizer_worker: None,
-            flush_worker: None,
-            flush_stop: None,
-            runtime_handle,
-            wal,
-            flush_interval_sec,
-            optimization_handles: Arc::new(TokioMutex::new(vec![])),
-            max_optimization_threads,
-        }
-    }
-
-    pub fn run_workers(&mut self, update_receiver: Receiver<UpdateSignal>) {
-        let (tx, rx) = mpsc::channel(self.shared_storage_config.update_queue_size);
-        self.optimizer_worker = Some(self.runtime_handle.spawn(Self::optimization_worker_fn(
-            self.optimizers.clone(),
-            tx.clone(),
-            rx,
-            self.segments.clone(),
-            self.wal.clone(),
-            self.optimization_handles.clone(),
-            self.max_optimization_threads,
-        )));
-        self.update_worker = Some(self.runtime_handle.spawn(Self::update_worker_fn(
-            update_receiver,
-            tx,
-            self.wal.clone(),
-            self.segments.clone(),
-        )));
-        let (flush_tx, flush_rx) = oneshot::channel();
-        self.flush_worker = Some(self.runtime_handle.spawn(Self::flush_worker(
-            self.segments.clone(),
-            self.wal.clone(),
-            self.flush_interval_sec,
-            flush_rx,
-        )));
-        self.flush_stop = Some(flush_tx);
-    }
-
-    pub fn stop_flush_worker(&mut self) {
-        if let Some(flush_stop) = self.flush_stop.take() {
-            if let Err(()) = flush_stop.send(()) {
-                warn!("Failed to stop flush worker as it is already stopped.");
-            }
-        }
-    }
-
-    /// Gracefully wait before all optimizations stop
-    /// If some optimization is in progress - it will be finished before shutdown.
-    pub async fn wait_workers_stops(&mut self) -> CollectionResult<()> {
-        let maybe_handle = self.update_worker.take();
-        if let Some(handle) = maybe_handle {
-            handle.await?;
-        }
-        let maybe_handle = self.optimizer_worker.take();
-        if let Some(handle) = maybe_handle {
-            handle.await?;
-        }
-        let maybe_handle = self.flush_worker.take();
-        if let Some(handle) = maybe_handle {
-            handle.await?;
-        }
-
-        let mut opt_handles_guard = self.optimization_handles.lock().await;
-        let opt_handles = std::mem::take(&mut *opt_handles_guard);
-        let stopping_handles = opt_handles
-            .into_iter()
-            .filter_map(|h| h.stop())
-            .collect_vec();
-
-        for res in stopping_handles {
-            res.await?;
-        }
-
-        Ok(())
-    }
-
-    /// Checks if there are any failed operations.
-    /// If so - attempts to re-apply all failed operations.
-    async fn try_recover(segments: LockedSegmentHolder, wal: LockedWal) -> CollectionResult<usize> {
-        // Try to re-apply everything starting from the first failed operation
-        let first_failed_operation_option = segments.read().failed_operation.iter().cloned().min();
-        match first_failed_operation_option {
-            None => {}
-            Some(first_failed_op) => {
-                let wal_lock = wal.lock();
-                for (op_num, operation) in wal_lock.read(first_failed_op) {
-                    CollectionUpdater::update(&segments, op_num, operation)?;
-                }
-            }
-        };
-        Ok(0)
-    }
-
-    /// Checks conditions for all optimizers until there is no suggested segment
-    /// Starts a task for each optimization
-    /// Returns handles for started tasks
-    pub(crate) fn launch_optimization<F>(
-        optimizers: Arc<Vec<Arc<Optimizer>>>,
-        segments: LockedSegmentHolder,
-        callback: F,
-    ) -> Vec<StoppableTaskHandle<bool>>
-    where
-        F: FnOnce(bool),
-        F: Send + 'static,
-        F: Clone,
-    {
-        let mut scheduled_segment_ids: HashSet<_> = Default::default();
-        let mut handles = vec![];
-        for optimizer in optimizers.iter() {
-            loop {
-                let nonoptimal_segment_ids =
-                    optimizer.check_condition(segments.clone(), &scheduled_segment_ids);
-                if nonoptimal_segment_ids.is_empty() {
-                    break;
-                } else {
-                    let optim = optimizer.clone();
-                    let segs = segments.clone();
-                    let nsi = nonoptimal_segment_ids.clone();
-                    for sid in &nsi {
-                        scheduled_segment_ids.insert(*sid);
-                    }
-                    let callback_cloned = callback.clone();
-
-                    handles.push(spawn_stoppable(move |stopped| {
-                        match optim.as_ref().optimize(segs.clone(), nsi, stopped) {
-                            Ok(result) => {
-                                callback_cloned(result); // Perform some actions when optimization if finished
-                                result
-                            }
-                            Err(error) => match error {
-                                CollectionError::Cancelled { description } => {
-                                    log::debug!("Optimization cancelled - {}", description);
-                                    false
-                                }
-                                _ => {
-                                    // Save only the first error
-                                    // If is more likely to be the real cause of all further problems
-                                    segs.write().report_optimizer_error(error.clone());
-
-                                    // Error of the optimization can not be handled by API user
-                                    // It is only possible to fix after full restart,
-                                    // so the best available action here is to stop whole
-                                    // optimization thread and log the error
-                                    log::error!("Optimization error: {}", error);
-                                    panic!("Optimization error: {error}");
-                                }
-                            },
-                        }
-                    }));
-                }
-            }
-        }
-        handles
-    }
-
-    pub(crate) async fn process_optimization(
-        optimizers: Arc<Vec<Arc<Optimizer>>>,
-        segments: LockedSegmentHolder,
-        optimization_handles: Arc<TokioMutex<Vec<StoppableTaskHandle<bool>>>>,
-        sender: Sender<OptimizerSignal>,
-    ) {
-        let mut new_handles = Self::launch_optimization(
-            optimizers.clone(),
-            segments.clone(),
-            move |_optimization_result| {
-                // After optimization is finished, we still need to check if there are
-                // some further optimizations possible.
-                // If receiver is already dead - we do not care.
-                // If channel is full - optimization will be triggered by some other signal
-                let _ = sender.try_send(OptimizerSignal::Nop);
-            },
-        );
-        let mut handles = optimization_handles.lock().await;
-        handles.append(&mut new_handles);
-        handles.retain(|h| !h.is_finished())
-    }
-
-    async fn optimization_worker_fn(
-        optimizers: Arc<Vec<Arc<Optimizer>>>,
-        sender: Sender<OptimizerSignal>,
-        mut receiver: Receiver<OptimizerSignal>,
-        segments: LockedSegmentHolder,
-        wal: LockedWal,
-        optimization_handles: Arc<TokioMutex<Vec<StoppableTaskHandle<bool>>>>,
-        max_handles: usize,
-    ) {
-        while let Some(signal) = receiver.recv().await {
-            match signal {
-                OptimizerSignal::Nop | OptimizerSignal::Operation(_) => {
-                    if signal != OptimizerSignal::Nop
-                        && optimization_handles.lock().await.len() >= max_handles
-                    {
-                        let mut handles = optimization_handles.lock().await;
-                        handles.retain(|h| !h.is_finished());
-                        continue;
-                    }
-                    // We skip the check for number of optimization handles here
-                    // Because `Nop` usually means that we need to force the optimization
-                    if Self::try_recover(segments.clone(), wal.clone())
-                        .await
-                        .is_err()
-                    {
-                        continue;
-                    }
-                    Self::process_optimization(
-                        optimizers.clone(),
-                        segments.clone(),
-                        optimization_handles.clone(),
-                        sender.clone(),
-                    )
-                    .await;
-                }
-
-                OptimizerSignal::Stop => break,
-            }
-        }
-    }
-
-    async fn update_worker_fn(
-        mut receiver: Receiver<UpdateSignal>,
-        optimize_sender: Sender<OptimizerSignal>,
-        wal: LockedWal,
-        segments: LockedSegmentHolder,
-    ) {
-        while let Some(signal) = receiver.recv().await {
-            match signal {
-                UpdateSignal::Operation(OperationData {
-                    op_num,
-                    operation,
-                    sender,
-                    wait,
-                }) => {
-                    let flush_res = if wait {
-                        wal.lock().flush().map_err(|err| {
-                            CollectionError::service_error(format!(
-                                "Can't flush WAL before operation {} - {}",
-                                op_num, err
-                            ))
-                        })
-                    } else {
-                        Ok(())
-                    };
-
-                    let operation_result = flush_res
-                        .and_then(|_| CollectionUpdater::update(&segments, op_num, operation));
-
-                    let res = match operation_result {
-                        Ok(update_res) => optimize_sender
-                            .send(OptimizerSignal::Operation(op_num))
-                            .await
-                            .and(Ok(update_res))
-                            .map_err(|send_err| send_err.into()),
-                        Err(err) => Err(err),
-                    };
-
-                    if let Some(feedback) = sender {
-                        feedback.send(res).unwrap_or_else(|_| {
-                            info!(
-                                "Can't report operation {} result. Assume already not required",
-                                op_num
-                            );
-                        });
-                    };
-                }
-                UpdateSignal::Stop => {
-                    optimize_sender
-                        .send(OptimizerSignal::Stop)
-                        .await
-                        .unwrap_or_else(|_| debug!("Optimizer already stopped"));
-                    break;
-                }
-                UpdateSignal::Nop => optimize_sender
-                    .send(OptimizerSignal::Nop)
-                    .await
-                    .unwrap_or_else(|_| {
-                        info!(
-                            "Can't notify optimizers, assume process is dead. Restart is required"
-                        );
-                    }),
-                UpdateSignal::Plunger(callback_sender) => {
-                    callback_sender.send(()).unwrap_or_else(|_| {
-                        debug!("Can't notify sender, assume nobody is waiting anymore");
-                    });
-                }
-            }
-        }
-        // Transmitter was destroyed
-        optimize_sender
-            .send(OptimizerSignal::Stop)
-            .await
-            .unwrap_or_else(|_| debug!("Optimizer already stopped"));
-    }
-
-    async fn flush_worker(
-        segments: LockedSegmentHolder,
-        wal: LockedWal,
-        flush_interval_sec: u64,
-        mut stop_receiver: oneshot::Receiver<()>,
-    ) {
-        loop {
-            // Stop flush worker on signal or if sender was dropped
-            // Even if timer did not finish
-            tokio::select! {
-                _ = tokio::time::sleep(Duration::from_secs(flush_interval_sec)) => {},
-                _ = &mut stop_receiver => {
-                    debug!("Stopping flush worker.");
-                    return;
-                }
-            };
-
-            trace!("Attempting flushing");
-            let wal_flash_job = wal.lock().flush_async();
-
-            if let Err(err) = wal_flash_job.join() {
-                error!("Failed to flush wal: {:?}", err);
-                segments
-                    .write()
-                    .report_optimizer_error(WalError::WriteWalError(format!(
-                        "WAL flush error: {err:?}"
-                    )));
-                continue;
-            }
-
-            let confirmed_version = Self::flush_segments(segments.clone());
-            let confirmed_version = match confirmed_version {
-                Ok(version) => version,
-                Err(err) => {
-                    error!("Failed to flush: {err}");
-                    segments.write().report_optimizer_error(err);
-                    continue;
-                }
-            };
-            if let Err(err) = wal.lock().ack(confirmed_version) {
-                segments.write().report_optimizer_error(err);
-            }
-        }
-    }
-
-    /// Returns confirmed version after flush of all segments
-    ///
-    /// # Errors
-    /// Returns an error on flush failure
-    fn flush_segments(segments: LockedSegmentHolder) -> OperationResult<SeqNumberType> {
-        let read_segments = segments.read();
-        let flushed_version = read_segments.flush_all(false)?;
-        Ok(match read_segments.failed_operation.iter().cloned().min() {
-            None => flushed_version,
-            Some(failed_operation) => min(failed_operation, flushed_version),
-        })
-    }
-}
diff --git a/crates/qdrant/lib/collection/src/wal.rs b/crates/qdrant/lib/collection/src/wal.rs
deleted file mode 100644
index 3f2f1ba..0000000
--- a/crates/qdrant/lib/collection/src/wal.rs
+++ /dev/null
@@ -1,296 +0,0 @@
-use std::fmt::Debug;
-use std::marker::PhantomData;
-use std::path::Path;
-use std::result;
-use std::thread::JoinHandle;
-
-use segment::common::file_operations::{atomic_save_json, read_json};
-use serde::de::DeserializeOwned;
-use serde::{Deserialize, Serialize};
-use thiserror::Error;
-use wal::{Wal, WalOptions};
-
-#[allow(clippy::enum_variant_names)]
-#[derive(Error, Debug)]
-#[error("{0}")]
-pub enum WalError {
-    #[error("Can't init WAL: {0}")]
-    InitWalError(String),
-    #[error("Can't write WAL: {0}")]
-    WriteWalError(String),
-    #[error("Can't truncate WAL: {0}")]
-    TruncateWalError(String),
-}
-
-#[derive(Debug, Deserialize, Serialize)]
-#[serde(rename_all = "snake_case")]
-struct TestInternalStruct1 {
-    data: usize,
-}
-
-#[derive(Debug, Deserialize, Serialize)]
-#[serde(rename_all = "snake_case")]
-struct TestInternalStruct2 {
-    a: i32,
-    b: i32,
-}
-
-#[derive(Debug, Deserialize, Serialize)]
-#[serde(rename_all = "snake_case")]
-#[serde(untagged)]
-enum TestRecord {
-    Struct1(TestInternalStruct1),
-    Struct2(TestInternalStruct2),
-}
-
-type Result<T> = result::Result<T, WalError>;
-
-#[derive(Debug, Deserialize, Serialize)]
-struct WalState {
-    pub ack_index: u64,
-}
-
-impl WalState {
-    pub fn new(ack_index: u64) -> Self {
-        Self { ack_index }
-    }
-}
-
-/// Write-Ahead-Log wrapper with built-in type parsing.
-/// Stores sequences of records of type `R` in binary files.
-///
-/// Each stored record is enumerated with sequential number.
-/// Sequential number can be used to read stored records starting from some IDs,
-/// for removing old, no longer required, records.
-pub struct SerdeWal<R> {
-    record: PhantomData<R>,
-    wal: Wal,
-    options: WalOptions,
-    first_index: Option<u64>,
-}
-
-const FIRST_INDEX_FILE: &str = "first-index";
-
-impl<'s, R: DeserializeOwned + Serialize + Debug> SerdeWal<R> {
-    pub fn new(dir: &str, wal_options: WalOptions) -> Result<SerdeWal<R>> {
-        let wal = Wal::with_options(dir, &wal_options)
-            .map_err(|err| WalError::InitWalError(format!("{err:?}")))?;
-
-        let first_index_path = Path::new(dir).join(FIRST_INDEX_FILE);
-
-        let first_index = if first_index_path.exists() {
-            let wal_state: WalState = read_json(&first_index_path).map_err(|err| {
-                WalError::InitWalError(format!("failed to read first-index file: {err}"))
-            })?;
-
-            let first_index = wal_state
-                .ack_index
-                .max(wal.first_index())
-                .min(wal.last_index());
-            Some(first_index)
-        } else {
-            None
-        };
-
-        Ok(SerdeWal {
-            record: PhantomData,
-            wal,
-            options: wal_options,
-            first_index,
-        })
-    }
-
-    /// Write a record to the WAL but does guarantee durability.
-    pub fn write(&mut self, entity: &R) -> Result<u64> {
-        // ToDo: Replace back to faster rmp, once this https://github.com/serde-rs/serde/issues/2055 solved
-        let binary_entity = serde_cbor::to_vec(&entity).unwrap();
-        self.wal
-            .append(&binary_entity)
-            .map_err(|err| WalError::WriteWalError(format!("{err:?}")))
-    }
-
-    pub fn read_all(&'s self) -> impl Iterator<Item = (u64, R)> + 's {
-        self.read(self.first_index())
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.len() == 0
-    }
-
-    pub fn len(&self) -> u64 {
-        self.wal
-            .num_entries()
-            .saturating_sub(self.truncated_prefix_entries_num())
-    }
-
-    // WAL operates in *segments*, so when `Wal::prefix_truncate` is called (during `SerdeWal::ack`),
-    // WAL is not truncated precisely up to the `until_index`, but up to the nearest segment with
-    // `last_index` that is less-or-equal than `until_index`.
-    //
-    // Consider the pseudo-graphic illustration of the WAL that was truncated up to index 35:
-    //
-    // | -------- | -------- | ===='++++ | ++++++++ | ++++++++ | ++++++++ |
-    // 10         20         30    35    40         50         60         70
-    //
-    // - ' marks the index 35 that has been truncated-to
-    // - --- marks segments 10-30 that has been physically deleted
-    // - +++ marks segments 35-70 that are still valid
-    // - and === marks part of segment 30-35, that is still physically present on disk,
-    //   but that is "logically" deleted
-    //
-    // `truncated_prefix_entries_num` returns the length of the "logically deleted" part of the WAL.
-    fn truncated_prefix_entries_num(&self) -> u64 {
-        self.first_index().saturating_sub(self.wal.first_index())
-    }
-
-    pub fn read(&'s self, start_from: u64) -> impl Iterator<Item = (u64, R)> + 's {
-        let first_index = self.first_index();
-        let len = self.len();
-
-        (start_from..(first_index + len)).map(move |idx| {
-            let record_bin = self.wal.entry(idx).expect("Can't read entry from WAL");
-            let record: R = serde_cbor::from_slice(&record_bin)
-                .or_else(|_err| rmp_serde::from_slice(&record_bin))
-                .expect("Can't deserialize entry, probably corrupted WAL on version mismatch");
-            (idx, record)
-        })
-    }
-
-    /// Inform WAL, that records older than `until_index` are no longer required.
-    /// If it is possible, WAL will remove unused files.
-    ///
-    /// # Arguments
-    ///
-    /// * `until_index` - the newest no longer required record sequence number
-    ///
-    pub fn ack(&mut self, until_index: u64) -> Result<()> {
-        // Truncate WAL
-        self.wal
-            .prefix_truncate(until_index)
-            .map_err(|err| WalError::TruncateWalError(format!("{err:?}")))?;
-
-        // Acknowledge index should not decrease
-        let minimal_first_index = self.first_index.unwrap_or(self.wal.first_index());
-        let new_first_index = Some(
-            until_index
-                .max(minimal_first_index)
-                .min(self.wal.last_index()),
-        );
-        // Update current `first_index`
-        if self.first_index != new_first_index {
-            self.first_index = new_first_index;
-            // Persist current `first_index` value on disk
-            // TODO: Should we log this error and continue instead of failing?
-            self.flush_first_index()?;
-        }
-
-        Ok(())
-    }
-
-    fn flush_first_index(&self) -> Result<()> {
-        let Some(first_index) = self.first_index else {
-            return Ok(());
-        };
-
-        atomic_save_json(
-            &self.path().join(FIRST_INDEX_FILE),
-            &WalState::new(first_index),
-        )
-        .map_err(|err| {
-            WalError::TruncateWalError(format!("failed to write first-index file: {err:?}"))
-        })?;
-
-        Ok(())
-    }
-
-    pub fn flush(&mut self) -> Result<()> {
-        self.wal
-            .flush_open_segment()
-            .map_err(|err| WalError::WriteWalError(format!("{err:?}")))
-    }
-
-    pub fn flush_async(&mut self) -> JoinHandle<std::io::Result<()>> {
-        self.wal.flush_open_segment_async()
-    }
-
-    pub fn path(&self) -> &Path {
-        self.wal.path()
-    }
-
-    pub fn first_index(&self) -> u64 {
-        self.first_index.unwrap_or_else(|| self.wal.first_index())
-    }
-
-    pub fn last_index(&self) -> u64 {
-        self.wal.last_index()
-    }
-
-    pub fn segment_capacity(&self) -> usize {
-        self.options.segment_capacity
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    #[cfg(not(target_os = "windows"))]
-    use std::fs;
-    #[cfg(not(target_os = "windows"))]
-    use std::os::unix::fs::MetadataExt;
-
-    use tempfile::Builder;
-
-    use super::*;
-
-    #[test]
-    fn test_wal() {
-        let dir = Builder::new().prefix("wal_test").tempdir().unwrap();
-        let capacity = 32 * 1024 * 1024;
-        let wal_options = WalOptions {
-            segment_capacity: capacity,
-            segment_queue_len: 0,
-        };
-
-        let mut serde_wal: SerdeWal<TestRecord> =
-            SerdeWal::new(dir.path().to_str().unwrap(), wal_options).unwrap();
-
-        let record = TestRecord::Struct1(TestInternalStruct1 { data: 10 });
-
-        serde_wal.write(&record).expect("Can't write");
-
-        #[cfg(not(target_os = "windows"))]
-        {
-            let metadata = fs::metadata(dir.path().join("open-1").to_str().unwrap()).unwrap();
-            println!("file size: {}", metadata.size());
-            assert_eq!(metadata.size() as usize, capacity);
-        };
-
-        for (_idx, rec) in serde_wal.read(0) {
-            println!("{rec:?}");
-        }
-
-        let record = TestRecord::Struct2(TestInternalStruct2 { a: 12, b: 13 });
-
-        serde_wal.write(&record).expect("Can't write");
-
-        let mut read_iterator = serde_wal.read(0);
-
-        let (idx1, record1) = read_iterator.next().unwrap();
-        let (idx2, record2) = read_iterator.next().unwrap();
-
-        assert_eq!(idx1, 0);
-        assert_eq!(idx2, 1);
-
-        match record1 {
-            TestRecord::Struct1(x) => assert_eq!(x.data, 10),
-            TestRecord::Struct2(_) => panic!("Wrong structure"),
-        }
-
-        match record2 {
-            TestRecord::Struct1(_) => panic!("Wrong structure"),
-            TestRecord::Struct2(x) => {
-                assert_eq!(x.a, 12);
-                assert_eq!(x.b, 13);
-            }
-        }
-    }
-}
diff --git a/crates/qdrant/lib/collection/tests/integration/collection_restore_test.rs b/crates/qdrant/lib/collection/tests/integration/collection_restore_test.rs
deleted file mode 100644
index 38e67e4..0000000
--- a/crates/qdrant/lib/collection/tests/integration/collection_restore_test.rs
+++ /dev/null
@@ -1,231 +0,0 @@
-use collection::operations::point_ops::{
-    Batch, PointInsertOperations, PointOperations, WriteOrdering,
-};
-use collection::operations::types::ScrollRequest;
-use collection::operations::CollectionUpdateOperations;
-use itertools::Itertools;
-use segment::types::{PayloadContainer, PayloadSelectorExclude, WithPayloadInterface};
-use serde_json::Value;
-use tempfile::Builder;
-
-use crate::common::{load_local_collection, simple_collection_fixture, N_SHARDS};
-
-#[tokio::test(flavor = "multi_thread")]
-async fn test_collection_reloading() {
-    test_collection_reloading_with_shards(1).await;
-    test_collection_reloading_with_shards(N_SHARDS).await;
-}
-
-async fn test_collection_reloading_with_shards(shard_number: u32) {
-    let collection_dir = Builder::new().prefix("collection").tempdir().unwrap();
-
-    let collection = simple_collection_fixture(collection_dir.path(), shard_number).await;
-    drop(collection);
-    for _i in 0..5 {
-        let collection_path = collection_dir.path();
-        let collection = load_local_collection(
-            "test".to_string(),
-            collection_path,
-            &collection_path.join("snapshots"),
-        )
-        .await;
-        let insert_points = CollectionUpdateOperations::PointOperation(
-            PointOperations::UpsertPoints(PointInsertOperations::PointsBatch(Batch {
-                ids: vec![0, 1].into_iter().map(|x| x.into()).collect_vec(),
-                vectors: vec![vec![1.0, 0.0, 1.0, 1.0], vec![1.0, 0.0, 1.0, 0.0]].into(),
-                payloads: None,
-            })),
-        );
-        collection
-            .update_from_client(insert_points, true, WriteOrdering::default())
-            .await
-            .unwrap();
-    }
-
-    let collection_path = collection_dir.path();
-    let collection = load_local_collection(
-        "test".to_string(),
-        collection_path,
-        &collection_path.join("snapshots"),
-    )
-    .await;
-    assert_eq!(collection.info(None).await.unwrap().vectors_count, 2);
-}
-
-#[tokio::test(flavor = "multi_thread")]
-async fn test_collection_payload_reloading() {
-    test_collection_payload_reloading_with_shards(1).await;
-    test_collection_payload_reloading_with_shards(N_SHARDS).await;
-}
-
-async fn test_collection_payload_reloading_with_shards(shard_number: u32) {
-    let collection_dir = Builder::new().prefix("collection").tempdir().unwrap();
-    {
-        let collection = simple_collection_fixture(collection_dir.path(), shard_number).await;
-        let insert_points = CollectionUpdateOperations::PointOperation(
-            PointOperations::UpsertPoints(PointInsertOperations::PointsBatch(Batch {
-                ids: vec![0, 1].into_iter().map(|x| x.into()).collect_vec(),
-                vectors: vec![vec![1.0, 0.0, 1.0, 1.0], vec![1.0, 0.0, 1.0, 0.0]].into(),
-                payloads: serde_json::from_str(r#"[{ "k": "v1" } , { "k": "v2"}]"#).unwrap(),
-            })),
-        );
-        collection
-            .update_from_client(insert_points, true, WriteOrdering::default())
-            .await
-            .unwrap();
-    }
-    let collection_path = collection_dir.path();
-    let collection = load_local_collection(
-        "test".to_string(),
-        collection_path,
-        &collection_path.join("snapshots"),
-    )
-    .await;
-
-    let res = collection
-        .scroll_by(
-            ScrollRequest {
-                offset: None,
-                limit: Some(10),
-                filter: None,
-                with_payload: Some(WithPayloadInterface::Bool(true)),
-                with_vector: true.into(),
-            },
-            None,
-            None,
-        )
-        .await
-        .unwrap();
-
-    assert_eq!(res.points.len(), 2);
-
-    match res.points[0]
-        .payload
-        .as_ref()
-        .expect("has payload")
-        .get_value("k")
-        .into_iter()
-        .next()
-        .expect("has value")
-    {
-        Value::String(value) => assert_eq!("v1", value),
-        _ => panic!("unexpected type"),
-    }
-
-    eprintln!(
-        "res = {:#?}",
-        res.points[0].payload.as_ref().unwrap().get_value("k")
-    );
-}
-
-#[tokio::test(flavor = "multi_thread")]
-async fn test_collection_payload_custom_payload() {
-    test_collection_payload_custom_payload_with_shards(1).await;
-    test_collection_payload_custom_payload_with_shards(N_SHARDS).await;
-}
-
-async fn test_collection_payload_custom_payload_with_shards(shard_number: u32) {
-    let collection_dir = Builder::new().prefix("collection").tempdir().unwrap();
-    {
-        let collection = simple_collection_fixture(collection_dir.path(), shard_number).await;
-        let insert_points = CollectionUpdateOperations::PointOperation(
-            PointOperations::UpsertPoints(PointInsertOperations::PointsBatch(Batch {
-                ids: vec![0.into(), 1.into()],
-                vectors: vec![vec![1.0, 0.0, 1.0, 1.0], vec![1.0, 0.0, 1.0, 0.0]].into(),
-                payloads: serde_json::from_str(
-                    r#"[{ "k1": "v1" }, { "k1": "v2" , "k2": "v3", "k3": "v4"}]"#,
-                )
-                .unwrap(),
-            })),
-        );
-        collection
-            .update_from_client(insert_points, true, WriteOrdering::default())
-            .await
-            .unwrap();
-    }
-
-    let collection_path = collection_dir.path();
-    let collection = load_local_collection(
-        "test".to_string(),
-        collection_path,
-        &collection_path.join("snapshots"),
-    )
-    .await;
-
-    // Test res with filter payload
-    let res_with_custom_payload = collection
-        .scroll_by(
-            ScrollRequest {
-                offset: None,
-                limit: Some(10),
-                filter: None,
-                with_payload: Some(WithPayloadInterface::Fields(vec![String::from("k2")])),
-                with_vector: true.into(),
-            },
-            None,
-            None,
-        )
-        .await
-        .unwrap();
-    assert!(res_with_custom_payload.points[0]
-        .payload
-        .as_ref()
-        .expect("has payload")
-        .is_empty());
-
-    match res_with_custom_payload.points[1]
-        .payload
-        .as_ref()
-        .expect("has payload")
-        .get_value("k2")
-        .into_iter()
-        .next()
-        .expect("has value")
-    {
-        Value::String(value) => assert_eq!("v3", value),
-        _ => panic!("unexpected type"),
-    }
-
-    // Test res with filter payload dict
-    let res_with_custom_payload = collection
-        .scroll_by(
-            ScrollRequest {
-                offset: None,
-                limit: Some(10),
-                filter: None,
-                with_payload: Some(PayloadSelectorExclude::new(vec!["k1".to_string()]).into()),
-                with_vector: false.into(),
-            },
-            None,
-            None,
-        )
-        .await
-        .unwrap();
-    assert!(res_with_custom_payload.points[0]
-        .payload
-        .as_ref()
-        .expect("has payload")
-        .is_empty());
-
-    assert_eq!(
-        res_with_custom_payload.points[1]
-            .payload
-            .as_ref()
-            .expect("has payload")
-            .len(),
-        2
-    );
-
-    match res_with_custom_payload.points[1]
-        .payload
-        .as_ref()
-        .expect("has payload")
-        .get_value("k3")
-        .into_iter()
-        .next()
-        .expect("has value")
-    {
-        Value::String(value) => assert_eq!("v4", value),
-        _ => panic!("unexpected type"),
-    }
-}
diff --git a/crates/qdrant/lib/collection/tests/integration/collection_test.rs b/crates/qdrant/lib/collection/tests/integration/collection_test.rs
deleted file mode 100644
index c40ed77..0000000
--- a/crates/qdrant/lib/collection/tests/integration/collection_test.rs
+++ /dev/null
@@ -1,484 +0,0 @@
-use std::collections::HashSet;
-
-use collection::operations::payload_ops::{PayloadOps, SetPayload};
-use collection::operations::point_ops::{Batch, PointOperations, PointStruct, WriteOrdering};
-use collection::operations::types::{
-    CountRequest, PointRequest, RecommendRequest, ScrollRequest, SearchRequest, UpdateStatus,
-};
-use collection::operations::CollectionUpdateOperations;
-use collection::recommendations::recommend_by;
-use itertools::Itertools;
-use segment::data_types::vectors::VectorStruct;
-use segment::types::{
-    Condition, FieldCondition, Filter, HasIdCondition, Payload, PointIdType, WithPayloadInterface,
-};
-use tempfile::Builder;
-
-use crate::common::{load_local_collection, simple_collection_fixture, N_SHARDS};
-
-#[tokio::test(flavor = "multi_thread")]
-async fn test_collection_updater() {
-    test_collection_updater_with_shards(1).await;
-    test_collection_updater_with_shards(N_SHARDS).await;
-}
-
-async fn test_collection_updater_with_shards(shard_number: u32) {
-    let collection_dir = Builder::new().prefix("collection").tempdir().unwrap();
-
-    let collection = simple_collection_fixture(collection_dir.path(), shard_number).await;
-
-    let insert_points = CollectionUpdateOperations::PointOperation(
-        Batch {
-            ids: vec![0, 1, 2, 3, 4]
-                .into_iter()
-                .map(|x| x.into())
-                .collect_vec(),
-            vectors: vec![
-                vec![1.0, 0.0, 1.0, 1.0],
-                vec![1.0, 0.0, 1.0, 0.0],
-                vec![1.0, 1.0, 1.0, 1.0],
-                vec![1.0, 1.0, 0.0, 1.0],
-                vec![1.0, 0.0, 0.0, 0.0],
-            ]
-            .into(),
-            payloads: None,
-        }
-        .into(),
-    );
-
-    let insert_result = collection
-        .update_from_client(insert_points, true, WriteOrdering::default())
-        .await;
-
-    match insert_result {
-        Ok(res) => {
-            assert_eq!(res.status, UpdateStatus::Completed)
-        }
-        Err(err) => panic!("operation failed: {err:?}"),
-    }
-
-    let search_request = SearchRequest {
-        vector: vec![1.0, 1.0, 1.0, 1.0].into(),
-        with_payload: None,
-        with_vector: None,
-        filter: None,
-        params: None,
-        limit: 3,
-        offset: 0,
-        score_threshold: None,
-    };
-
-    let search_res = collection.search(search_request, None, None).await;
-
-    match search_res {
-        Ok(res) => {
-            assert_eq!(res.len(), 3);
-            assert_eq!(res[0].id, 2.into());
-            assert!(res[0].payload.is_none());
-        }
-        Err(err) => panic!("search failed: {err:?}"),
-    }
-}
-
-#[tokio::test(flavor = "multi_thread")]
-async fn test_collection_search_with_payload_and_vector() {
-    test_collection_search_with_payload_and_vector_with_shards(1).await;
-    test_collection_search_with_payload_and_vector_with_shards(N_SHARDS).await;
-}
-
-async fn test_collection_search_with_payload_and_vector_with_shards(shard_number: u32) {
-    let collection_dir = Builder::new().prefix("collection").tempdir().unwrap();
-
-    let collection = simple_collection_fixture(collection_dir.path(), shard_number).await;
-
-    let insert_points = CollectionUpdateOperations::PointOperation(
-        Batch {
-            ids: vec![0.into(), 1.into()],
-            vectors: vec![vec![1.0, 0.0, 1.0, 1.0], vec![1.0, 0.0, 1.0, 0.0]].into(),
-            payloads: serde_json::from_str(
-                r#"[{ "k": { "type": "keyword", "value": "v1" } }, { "k": "v2" , "v": "v3"}]"#,
-            )
-            .unwrap(),
-        }
-        .into(),
-    );
-
-    let insert_result = collection
-        .update_from_client(insert_points, true, WriteOrdering::default())
-        .await;
-
-    match insert_result {
-        Ok(res) => {
-            assert_eq!(res.status, UpdateStatus::Completed)
-        }
-        Err(err) => panic!("operation failed: {err:?}"),
-    }
-
-    let search_request = SearchRequest {
-        vector: vec![1.0, 0.0, 1.0, 1.0].into(),
-        with_payload: Some(WithPayloadInterface::Bool(true)),
-        with_vector: Some(true.into()),
-        filter: None,
-        params: None,
-        limit: 3,
-        offset: 0,
-        score_threshold: None,
-    };
-
-    let search_res = collection.search(search_request, None, None).await;
-
-    match search_res {
-        Ok(res) => {
-            assert_eq!(res.len(), 2);
-            assert_eq!(res[0].id, 0.into());
-            assert_eq!(res[0].payload.as_ref().unwrap().len(), 1);
-            match &res[0].vector {
-                Some(VectorStruct::Single(v)) => assert_eq!(v, &vec![1.0, 0.0, 1.0, 1.0]),
-                _ => panic!("vector is not returned"),
-            }
-        }
-        Err(err) => panic!("search failed: {err:?}"),
-    }
-
-    let count_request = CountRequest {
-        filter: Some(Filter::new_must(Condition::Field(FieldCondition {
-            key: "k".to_string(),
-            r#match: Some(serde_json::from_str(r#"{ "value": "v2" }"#).unwrap()),
-            range: None,
-            geo_bounding_box: None,
-            geo_radius: None,
-            values_count: None,
-            geo_polygon: None,
-        }))),
-        exact: true,
-    };
-
-    let count_res = collection.count(count_request, None).await.unwrap();
-    assert_eq!(count_res.count, 1);
-}
-
-// FIXME: dos not work
-#[tokio::test(flavor = "multi_thread")]
-async fn test_collection_loading() {
-    test_collection_loading_with_shards(1).await;
-    test_collection_loading_with_shards(N_SHARDS).await;
-}
-
-async fn test_collection_loading_with_shards(shard_number: u32) {
-    let collection_dir = Builder::new().prefix("collection").tempdir().unwrap();
-
-    {
-        let collection = simple_collection_fixture(collection_dir.path(), shard_number).await;
-        let insert_points = CollectionUpdateOperations::PointOperation(
-            Batch {
-                ids: vec![0, 1, 2, 3, 4]
-                    .into_iter()
-                    .map(|x| x.into())
-                    .collect_vec(),
-                vectors: vec![
-                    vec![1.0, 0.0, 1.0, 1.0],
-                    vec![1.0, 0.0, 1.0, 0.0],
-                    vec![1.0, 1.0, 1.0, 1.0],
-                    vec![1.0, 1.0, 0.0, 1.0],
-                    vec![1.0, 0.0, 0.0, 0.0],
-                ]
-                .into(),
-                payloads: None,
-            }
-            .into(),
-        );
-
-        collection
-            .update_from_client(insert_points, true, WriteOrdering::default())
-            .await
-            .unwrap();
-
-        let payload: Payload = serde_json::from_str(r#"{"color":"red"}"#).unwrap();
-
-        let assign_payload =
-            CollectionUpdateOperations::PayloadOperation(PayloadOps::SetPayload(SetPayload {
-                payload,
-                points: Some(vec![2.into(), 3.into()]),
-                filter: None,
-            }));
-
-        collection
-            .update_from_client(assign_payload, true, WriteOrdering::default())
-            .await
-            .unwrap();
-    }
-
-    let collection_path = collection_dir.path();
-    let loaded_collection = load_local_collection(
-        "test".to_string(),
-        collection_path,
-        &collection_path.join("snapshots"),
-    )
-    .await;
-    let request = PointRequest {
-        ids: vec![1.into(), 2.into()],
-        with_payload: Some(WithPayloadInterface::Bool(true)),
-        with_vector: true.into(),
-    };
-    let retrieved = loaded_collection
-        .retrieve(request, None, None)
-        .await
-        .unwrap();
-
-    assert_eq!(retrieved.len(), 2);
-
-    for record in retrieved {
-        if record.id == 2.into() {
-            let non_empty_payload = record.payload.unwrap();
-
-            assert_eq!(non_empty_payload.len(), 1)
-        }
-    }
-    println!("Function end");
-}
-
-#[test]
-fn test_deserialization() {
-    let insert_points = CollectionUpdateOperations::PointOperation(
-        Batch {
-            ids: vec![0.into(), 1.into()],
-            vectors: vec![vec![1.0, 0.0, 1.0, 1.0], vec![1.0, 0.0, 1.0, 0.0]].into(),
-            payloads: None,
-        }
-        .into(),
-    );
-    let json_str = serde_json::to_string_pretty(&insert_points).unwrap();
-
-    let _read_obj: CollectionUpdateOperations = serde_json::from_str(&json_str).unwrap();
-
-    let crob_bytes = rmp_serde::to_vec(&insert_points).unwrap();
-
-    let _read_obj2: CollectionUpdateOperations = rmp_serde::from_slice(&crob_bytes).unwrap();
-}
-
-#[test]
-fn test_deserialization2() {
-    let insert_points = CollectionUpdateOperations::PointOperation(
-        vec![
-            PointStruct {
-                id: 0.into(),
-                vector: vec![1.0, 0.0, 1.0, 1.0].into(),
-                payload: None,
-            },
-            PointStruct {
-                id: 1.into(),
-                vector: vec![1.0, 0.0, 1.0, 0.0].into(),
-                payload: None,
-            },
-        ]
-        .into(),
-    );
-
-    let json_str = serde_json::to_string_pretty(&insert_points).unwrap();
-
-    let _read_obj: CollectionUpdateOperations = serde_json::from_str(&json_str).unwrap();
-
-    let raw_bytes = rmp_serde::to_vec(&insert_points).unwrap();
-
-    let _read_obj2: CollectionUpdateOperations = rmp_serde::from_slice(&raw_bytes).unwrap();
-}
-
-// Request to find points sent to all shards but they might not have a particular id, so they will return an error
-#[tokio::test(flavor = "multi_thread")]
-async fn test_recommendation_api() {
-    test_recommendation_api_with_shards(1).await;
-    test_recommendation_api_with_shards(N_SHARDS).await;
-}
-
-async fn test_recommendation_api_with_shards(shard_number: u32) {
-    let collection_dir = Builder::new().prefix("collection").tempdir().unwrap();
-    let collection = simple_collection_fixture(collection_dir.path(), shard_number).await;
-
-    let insert_points = CollectionUpdateOperations::PointOperation(
-        Batch {
-            ids: vec![0, 1, 2, 3, 4, 5, 6, 7, 8]
-                .into_iter()
-                .map(|x| x.into())
-                .collect_vec(),
-            vectors: vec![
-                vec![0.0, 0.0, 1.0, 1.0],
-                vec![1.0, 0.0, 0.0, 0.0],
-                vec![1.0, 0.0, 0.0, 0.0],
-                vec![0.0, 1.0, 0.0, 0.0],
-                vec![0.0, 1.0, 0.0, 0.0],
-                vec![0.0, 0.0, 1.0, 0.0],
-                vec![0.0, 0.0, 1.0, 0.0],
-                vec![0.0, 0.0, 0.0, 1.0],
-                vec![0.0, 0.0, 0.0, 1.0],
-            ]
-            .into(),
-            payloads: None,
-        }
-        .into(),
-    );
-
-    collection
-        .update_from_client(insert_points, true, WriteOrdering::default())
-        .await
-        .unwrap();
-    let result = recommend_by(
-        RecommendRequest {
-            positive: vec![0.into()],
-            negative: vec![8.into()],
-            limit: 5,
-            ..Default::default()
-        },
-        &collection,
-        |_name| async { unreachable!("Should not be called in this test") },
-        None,
-    )
-    .await
-    .unwrap();
-    assert!(!result.is_empty());
-    let top1 = &result[0];
-
-    assert!(top1.id == 5.into() || top1.id == 6.into());
-}
-
-#[tokio::test(flavor = "multi_thread")]
-async fn test_read_api() {
-    test_read_api_with_shards(1).await;
-    test_read_api_with_shards(N_SHARDS).await;
-}
-
-async fn test_read_api_with_shards(shard_number: u32) {
-    let collection_dir = Builder::new().prefix("collection").tempdir().unwrap();
-    let collection = simple_collection_fixture(collection_dir.path(), shard_number).await;
-
-    let insert_points = CollectionUpdateOperations::PointOperation(PointOperations::UpsertPoints(
-        Batch {
-            ids: vec![0, 1, 2, 3, 4, 5, 6, 7, 8]
-                .into_iter()
-                .map(|x| x.into())
-                .collect_vec(),
-            vectors: vec![
-                vec![0.0, 0.0, 1.0, 1.0],
-                vec![1.0, 0.0, 0.0, 0.0],
-                vec![1.0, 0.0, 0.0, 0.0],
-                vec![0.0, 1.0, 0.0, 0.0],
-                vec![0.0, 1.0, 0.0, 0.0],
-                vec![0.0, 0.0, 1.0, 0.0],
-                vec![0.0, 0.0, 1.0, 0.0],
-                vec![0.0, 0.0, 0.0, 1.0],
-                vec![0.0, 0.0, 0.0, 1.0],
-            ]
-            .into(),
-            payloads: None,
-        }
-        .into(),
-    ));
-
-    collection
-        .update_from_client(insert_points, true, WriteOrdering::default())
-        .await
-        .unwrap();
-
-    let result = collection
-        .scroll_by(
-            ScrollRequest {
-                offset: None,
-                limit: Some(2),
-                filter: None,
-                with_payload: Some(WithPayloadInterface::Bool(true)),
-                with_vector: false.into(),
-            },
-            None,
-            None,
-        )
-        .await
-        .unwrap();
-
-    assert_eq!(result.next_page_offset, Some(2.into()));
-    assert_eq!(result.points.len(), 2);
-}
-
-#[tokio::test(flavor = "multi_thread")]
-async fn test_collection_delete_points_by_filter() {
-    test_collection_delete_points_by_filter_with_shards(1).await;
-    test_collection_delete_points_by_filter_with_shards(N_SHARDS).await;
-}
-
-async fn test_collection_delete_points_by_filter_with_shards(shard_number: u32) {
-    let collection_dir = Builder::new().prefix("collection").tempdir().unwrap();
-
-    let collection = simple_collection_fixture(collection_dir.path(), shard_number).await;
-
-    let insert_points = CollectionUpdateOperations::PointOperation(
-        Batch {
-            ids: vec![0, 1, 2, 3, 4]
-                .into_iter()
-                .map(|x| x.into())
-                .collect_vec(),
-            vectors: vec![
-                vec![1.0, 0.0, 1.0, 1.0],
-                vec![1.0, 0.0, 1.0, 0.0],
-                vec![1.0, 1.0, 1.0, 1.0],
-                vec![1.0, 1.0, 0.0, 1.0],
-                vec![1.0, 0.0, 0.0, 0.0],
-            ]
-            .into(),
-            payloads: None,
-        }
-        .into(),
-    );
-
-    let insert_result = collection
-        .update_from_client(insert_points, true, WriteOrdering::default())
-        .await;
-
-    match insert_result {
-        Ok(res) => {
-            assert_eq!(res.status, UpdateStatus::Completed)
-        }
-        Err(err) => panic!("operation failed: {err:?}"),
-    }
-
-    // delete points with id (0, 3)
-    let to_be_deleted: HashSet<PointIdType> = vec![0.into(), 3.into()].into_iter().collect();
-    let delete_filter = segment::types::Filter {
-        should: None,
-        must: Some(vec![Condition::HasId(HasIdCondition::from(to_be_deleted))]),
-        must_not: None,
-    };
-
-    let delete_points = CollectionUpdateOperations::PointOperation(
-        PointOperations::DeletePointsByFilter(delete_filter),
-    );
-
-    let delete_result = collection
-        .update_from_client(delete_points, true, WriteOrdering::default())
-        .await;
-
-    match delete_result {
-        Ok(res) => {
-            assert_eq!(res.status, UpdateStatus::Completed)
-        }
-        Err(err) => panic!("operation failed: {err:?}"),
-    }
-
-    let result = collection
-        .scroll_by(
-            ScrollRequest {
-                offset: None,
-                limit: Some(10),
-                filter: None,
-                with_payload: Some(WithPayloadInterface::Bool(false)),
-                with_vector: false.into(),
-            },
-            None,
-            None,
-        )
-        .await
-        .unwrap();
-
-    // check if we only have 3 out of 5 points left and that the point id were really deleted
-    assert_eq!(result.points.len(), 3);
-    assert_eq!(result.points.get(0).unwrap().id, 1.into());
-    assert_eq!(result.points.get(1).unwrap().id, 2.into());
-    assert_eq!(result.points.get(2).unwrap().id, 4.into());
-}
diff --git a/crates/qdrant/lib/collection/tests/integration/common/mod.rs b/crates/qdrant/lib/collection/tests/integration/common/mod.rs
deleted file mode 100644
index 1df2c51..0000000
--- a/crates/qdrant/lib/collection/tests/integration/common/mod.rs
+++ /dev/null
@@ -1,141 +0,0 @@
-#![allow(deprecated)]
-
-use std::num::{NonZeroU32, NonZeroU64};
-use std::path::Path;
-use std::sync::Arc;
-
-use collection::collection::{Collection, RequestShardTransfer};
-use collection::config::{CollectionConfig, CollectionParams, WalConfig};
-use collection::operations::types::{CollectionError, VectorParams};
-use collection::optimizers_builder::OptimizersConfig;
-use collection::shards::channel_service::ChannelService;
-use collection::shards::collection_shard_distribution::CollectionShardDistribution;
-use collection::shards::replica_set::{ChangePeerState, ReplicaState};
-use collection::shards::CollectionId;
-use segment::types::Distance;
-
-/// Test collections for this upper bound of shards.
-/// Testing with more shards is problematic due to `number of open files problem`
-/// See https://github.com/qdrant/qdrant/issues/379
-#[allow(dead_code)]
-pub const N_SHARDS: u32 = 3;
-
-pub const TEST_OPTIMIZERS_CONFIG: OptimizersConfig = OptimizersConfig {
-    deleted_threshold: 0.9,
-    vacuum_min_vector_number: 1000,
-    default_segment_number: 2,
-    max_segment_size: None,
-    memmap_threshold: None,
-    indexing_threshold: Some(50_000),
-    flush_interval_sec: 30,
-    max_optimization_threads: 2,
-};
-
-#[cfg(test)]
-#[allow(dead_code)]
-pub async fn simple_collection_fixture(collection_path: &Path, shard_number: u32) -> Collection {
-    let wal_config = WalConfig {
-        wal_capacity_mb: 1,
-        wal_segments_ahead: 0,
-    };
-
-    let collection_params = CollectionParams {
-        vectors: VectorParams {
-            size: NonZeroU64::new(4).unwrap(),
-            distance: Distance::Dot,
-            hnsw_config: None,
-            quantization_config: None,
-            on_disk: None,
-        }
-        .into(),
-        shard_number: NonZeroU32::new(shard_number).expect("Shard number can not be zero"),
-        replication_factor: NonZeroU32::new(1).unwrap(),
-        write_consistency_factor: NonZeroU32::new(1).unwrap(),
-        on_disk_payload: false,
-    };
-
-    let collection_config = CollectionConfig {
-        params: collection_params,
-        optimizer_config: TEST_OPTIMIZERS_CONFIG.clone(),
-        wal_config,
-        hnsw_config: Default::default(),
-        quantization_config: Default::default(),
-    };
-
-    let snapshot_path = collection_path.join("snapshots");
-
-    // Default to a collection with all the shards local
-    new_local_collection(
-        "test".to_string(),
-        collection_path,
-        &snapshot_path,
-        &collection_config,
-    )
-    .await
-    .unwrap()
-}
-
-pub fn dummy_on_replica_failure() -> ChangePeerState {
-    Arc::new(move |_peer_id, _shard_id| {})
-}
-
-pub fn dummy_request_shard_transfer() -> RequestShardTransfer {
-    Arc::new(move |_transfer| {})
-}
-
-/// Default to a collection with all the shards local
-#[cfg(test)]
-pub async fn new_local_collection(
-    id: CollectionId,
-    path: &Path,
-    snapshots_path: &Path,
-    config: &CollectionConfig,
-) -> Result<Collection, CollectionError> {
-    let collection = Collection::new(
-        id,
-        0,
-        path,
-        snapshots_path,
-        config,
-        Default::default(),
-        CollectionShardDistribution::all_local(Some(config.params.shard_number.into()), 0),
-        ChannelService::default(),
-        dummy_on_replica_failure(),
-        dummy_request_shard_transfer(),
-        None,
-        None,
-    )
-    .await;
-
-    let collection = collection?;
-
-    let local_shards = collection.get_local_shards().await;
-    for shard_id in local_shards {
-        collection
-            .set_shard_replica_state(shard_id, 0, ReplicaState::Active, None)
-            .await?;
-    }
-    Ok(collection)
-}
-
-/// Default to a collection with all the shards local
-#[allow(dead_code)]
-pub async fn load_local_collection(
-    id: CollectionId,
-    path: &Path,
-    snapshots_path: &Path,
-) -> Collection {
-    Collection::load(
-        id,
-        0,
-        path,
-        snapshots_path,
-        Default::default(),
-        ChannelService::default(),
-        dummy_on_replica_failure(),
-        dummy_request_shard_transfer(),
-        None,
-        None,
-    )
-    .await
-}
diff --git a/crates/qdrant/lib/collection/tests/integration/grouping_test.rs b/crates/qdrant/lib/collection/tests/integration/grouping_test.rs
deleted file mode 100644
index 4c3cb1b..0000000
--- a/crates/qdrant/lib/collection/tests/integration/grouping_test.rs
+++ /dev/null
@@ -1,654 +0,0 @@
-use collection::collection::Collection;
-use collection::grouping::group_by::{group_by, GroupRequest, SourceRequest};
-use collection::operations::consistency_params::ReadConsistency;
-use collection::operations::point_ops::{Batch, WriteOrdering};
-use collection::operations::types::{RecommendRequest, SearchRequest, UpdateStatus};
-use collection::operations::CollectionUpdateOperations;
-use collection::shards::shard::ShardId;
-use itertools::Itertools;
-use rand::distributions::Uniform;
-use rand::rngs::ThreadRng;
-use rand::Rng;
-use segment::data_types::vectors::VectorType;
-use segment::types::{Filter, Payload, WithPayloadInterface, WithVector};
-use serde_json::json;
-
-use crate::common::simple_collection_fixture;
-
-fn rand_vector(rng: &mut ThreadRng, size: usize) -> VectorType {
-    rng.sample_iter(Uniform::new(0.4, 0.6)).take(size).collect()
-}
-
-mod group_by {
-
-    use super::*;
-
-    struct Resources {
-        request: GroupRequest,
-        collection: Collection,
-        read_consistency: Option<ReadConsistency>,
-        shard_selection: Option<ShardId>,
-    }
-
-    async fn setup(docs: u64, chunks: u64) -> Resources {
-        let mut rng = rand::thread_rng();
-
-        let source = SourceRequest::Search(SearchRequest {
-            vector: vec![0.5, 0.5, 0.5, 0.5].into(),
-            filter: None,
-            params: None,
-            limit: 4,
-            offset: 0,
-            with_payload: None,
-            with_vector: None,
-            score_threshold: None,
-        });
-
-        let request = GroupRequest::with_limit_from_request(source, "docId".to_string(), 3);
-
-        let collection_dir = tempfile::Builder::new()
-            .prefix("collection")
-            .tempdir()
-            .unwrap();
-
-        let collection = simple_collection_fixture(collection_dir.path(), 1).await;
-
-        let insert_points = CollectionUpdateOperations::PointOperation(
-            Batch {
-                ids: (0..docs * chunks).map(|x| x.into()).collect_vec(),
-                vectors: (0..docs * chunks)
-                    .map(|_| rand_vector(&mut rng, 4))
-                    .collect_vec()
-                    .into(),
-                payloads: (0..docs)
-                    .flat_map(|x| {
-                        (0..chunks).map(move |_| {
-                            Some(Payload::from(
-                                json!({ "docId": x , "other_stuff": x.to_string() + "foo" }),
-                            ))
-                        })
-                    })
-                    .collect_vec()
-                    .into(),
-            }
-            .into(),
-        );
-
-        let insert_result = collection
-            .update_from_client(insert_points, true, WriteOrdering::default())
-            .await
-            .expect("insert failed");
-
-        assert_eq!(insert_result.status, UpdateStatus::Completed);
-
-        Resources {
-            request,
-            collection,
-            read_consistency: None,
-            shard_selection: None,
-        }
-    }
-
-    #[tokio::test(flavor = "multi_thread")]
-    async fn searching() {
-        let resources = setup(16, 8).await;
-
-        let result = group_by(
-            resources.request.clone(),
-            &resources.collection,
-            |_name| async { unreachable!() },
-            resources.read_consistency,
-            resources.shard_selection,
-        )
-        .await;
-
-        assert!(result.is_ok());
-
-        let result = result.unwrap();
-
-        let group_req = resources.request;
-
-        assert_eq!(result.len(), group_req.limit);
-        assert_eq!(result[0].hits.len(), group_req.group_size);
-
-        // is sorted?
-        let mut last_group_best_score = f32::MAX;
-        for group in result {
-            assert!(group.hits[0].score <= last_group_best_score);
-            last_group_best_score = group.hits[0].score;
-
-            let mut last_score = f32::MAX;
-            for hit in group.hits {
-                assert!(hit.score <= last_score);
-                last_score = hit.score;
-            }
-        }
-    }
-
-    #[tokio::test(flavor = "multi_thread")]
-    async fn recommending() {
-        let resources = setup(16, 8).await;
-
-        let request = GroupRequest::with_limit_from_request(
-            SourceRequest::Recommend(RecommendRequest {
-                filter: None,
-                params: None,
-                limit: 4,
-                offset: 0,
-                with_payload: None,
-                with_vector: None,
-                score_threshold: None,
-                positive: vec![1.into(), 2.into(), 3.into()],
-                negative: Vec::new(),
-                using: None,
-                lookup_from: None,
-            }),
-            "docId".to_string(),
-            2,
-        );
-
-        let result = group_by(
-            request.clone(),
-            &resources.collection,
-            |_name| async { unreachable!() },
-            resources.read_consistency,
-            resources.shard_selection,
-        )
-        .await;
-
-        assert!(result.is_ok());
-
-        let result = result.unwrap();
-
-        assert_eq!(result.len(), request.limit);
-
-        let mut last_group_best_score = f32::MAX;
-        for group in result {
-            assert_eq!(group.hits.len(), request.group_size);
-
-            // is sorted?
-            assert!(group.hits[0].score <= last_group_best_score);
-            last_group_best_score = group.hits[0].score;
-
-            let mut last_score = f32::MAX;
-            for hit in group.hits {
-                assert!(hit.score <= last_score);
-                last_score = hit.score;
-            }
-        }
-    }
-
-    #[tokio::test(flavor = "multi_thread")]
-    async fn with_filter() {
-        let resources = setup(16, 8).await;
-
-        let filter: Filter = serde_json::from_value(json!({
-            "must": [
-                {
-                    "key": "docId",
-                    "range": {
-                        "gte": 1,
-                        "lte": 2
-                    }
-                }
-            ]
-        }))
-        .unwrap();
-
-        let group_by_request = GroupRequest::with_limit_from_request(
-            SourceRequest::Search(SearchRequest {
-                vector: vec![0.5, 0.5, 0.5, 0.5].into(),
-                filter: Some(filter.clone()),
-                params: None,
-                limit: 4,
-                offset: 0,
-                with_payload: None,
-                with_vector: None,
-                score_threshold: None,
-            }),
-            "docId".to_string(),
-            3,
-        );
-
-        let result = group_by(
-            group_by_request,
-            &resources.collection,
-            |_name| async { unreachable!() },
-            resources.read_consistency,
-            resources.shard_selection,
-        )
-        .await;
-
-        assert!(result.is_ok());
-
-        let result = result.unwrap();
-
-        assert_eq!(result.len(), 2);
-    }
-
-    #[tokio::test(flavor = "multi_thread")]
-    async fn with_payload_and_vectors() {
-        let resources = setup(16, 8).await;
-
-        let group_by_request = GroupRequest::with_limit_from_request(
-            SourceRequest::Search(SearchRequest {
-                vector: vec![0.5, 0.5, 0.5, 0.5].into(),
-                filter: None,
-                params: None,
-                limit: 4,
-                offset: 0,
-                with_payload: Some(WithPayloadInterface::Bool(true)),
-                with_vector: Some(WithVector::Bool(true)),
-                score_threshold: None,
-            }),
-            "docId".to_string(),
-            3,
-        );
-
-        let result = group_by(
-            group_by_request.clone(),
-            &resources.collection,
-            |_name| async { unreachable!() },
-            resources.read_consistency,
-            resources.shard_selection,
-        )
-        .await;
-
-        assert!(result.is_ok());
-
-        let result = result.unwrap();
-
-        assert_eq!(result.len(), 4);
-
-        for group in result {
-            assert_eq!(group.hits.len(), group_by_request.group_size);
-            assert!(group.hits[0].payload.is_some());
-            assert!(group.hits[0].vector.is_some());
-        }
-    }
-
-    #[tokio::test(flavor = "multi_thread")]
-    async fn group_by_string_field() {
-        let Resources {
-            collection,
-            read_consistency,
-            shard_selection,
-            ..
-        } = setup(16, 8).await;
-
-        let group_by_request = GroupRequest::with_limit_from_request(
-            SourceRequest::Search(SearchRequest {
-                vector: vec![0.5, 0.5, 0.5, 0.5].into(),
-                filter: None,
-                params: None,
-                limit: 4,
-                offset: 0,
-                with_payload: Some(WithPayloadInterface::Bool(true)),
-                with_vector: Some(WithVector::Bool(true)),
-                score_threshold: None,
-            }),
-            "other_stuff".to_string(),
-            3,
-        );
-
-        let result = group_by(
-            group_by_request.clone(),
-            &collection,
-            |_name| async { unreachable!() },
-            read_consistency,
-            shard_selection,
-        )
-        .await;
-
-        assert!(result.is_ok());
-
-        let result = result.unwrap();
-
-        assert_eq!(result.len(), 4);
-
-        for group in result {
-            assert_eq!(group.hits.len(), group_by_request.group_size);
-        }
-    }
-
-    #[tokio::test(flavor = "multi_thread")]
-    async fn zero_group_size() {
-        let Resources {
-            collection,
-            read_consistency,
-            shard_selection,
-            ..
-        } = setup(16, 8).await;
-
-        let group_by_request = GroupRequest::with_limit_from_request(
-            SourceRequest::Search(SearchRequest {
-                vector: vec![0.5, 0.5, 0.5, 0.5].into(),
-                filter: None,
-                params: None,
-                limit: 4,
-                offset: 0,
-                with_payload: None,
-                with_vector: None,
-                score_threshold: None,
-            }),
-            "docId".to_string(),
-            0,
-        );
-
-        let result = group_by(
-            group_by_request.clone(),
-            &collection,
-            |_name| async { unreachable!() },
-            read_consistency,
-            shard_selection,
-        )
-        .await;
-
-        assert!(result.is_ok());
-
-        let result = result.unwrap();
-
-        assert_eq!(result.len(), 0);
-    }
-
-    #[tokio::test(flavor = "multi_thread")]
-    async fn zero_limit_groups() {
-        let Resources {
-            collection,
-            read_consistency,
-            shard_selection,
-            ..
-        } = setup(16, 8).await;
-
-        let group_by_request = GroupRequest::with_limit_from_request(
-            SourceRequest::Search(SearchRequest {
-                vector: vec![0.5, 0.5, 0.5, 0.5].into(),
-                filter: None,
-                params: None,
-                limit: 0,
-                offset: 0,
-                with_payload: None,
-                with_vector: None,
-                score_threshold: None,
-            }),
-            "docId".to_string(),
-            3,
-        );
-
-        let result = group_by(
-            group_by_request.clone(),
-            &collection,
-            |_name| async { unreachable!() },
-            read_consistency,
-            shard_selection,
-        )
-        .await;
-
-        assert!(result.is_ok());
-
-        let result = result.unwrap();
-
-        assert_eq!(result.len(), 0);
-    }
-
-    #[tokio::test(flavor = "multi_thread")]
-    async fn big_limit_groups() {
-        let Resources {
-            collection,
-            read_consistency,
-            shard_selection,
-            ..
-        } = setup(1000, 5).await;
-
-        let group_by_request = GroupRequest::with_limit_from_request(
-            SourceRequest::Search(SearchRequest {
-                vector: vec![0.5, 0.5, 0.5, 0.5].into(),
-                filter: None,
-                params: None,
-                limit: 500,
-                offset: 0,
-                with_payload: None,
-                with_vector: None,
-                score_threshold: None,
-            }),
-            "docId".to_string(),
-            3,
-        );
-
-        let result = group_by(
-            group_by_request.clone(),
-            &collection,
-            |_name| async { unreachable!() },
-            read_consistency,
-            shard_selection,
-        )
-        .await;
-
-        assert!(result.is_ok());
-
-        let result = result.unwrap();
-
-        assert_eq!(result.len(), group_by_request.limit);
-
-        for group in result {
-            assert_eq!(group.hits.len(), group_by_request.group_size);
-        }
-    }
-
-    #[tokio::test(flavor = "multi_thread")]
-    async fn big_group_size_groups() {
-        let Resources {
-            collection,
-            read_consistency,
-            shard_selection,
-            ..
-        } = setup(10, 500).await;
-
-        let group_by_request = GroupRequest::with_limit_from_request(
-            SourceRequest::Search(SearchRequest {
-                vector: vec![0.5, 0.5, 0.5, 0.5].into(),
-                filter: None,
-                params: None,
-                limit: 3,
-                offset: 0,
-                with_payload: None,
-                with_vector: None,
-                score_threshold: None,
-            }),
-            "docId".to_string(),
-            400,
-        );
-
-        let result = group_by(
-            group_by_request.clone(),
-            &collection,
-            |_name| async { unreachable!() },
-            read_consistency,
-            shard_selection,
-        )
-        .await;
-
-        assert!(result.is_ok());
-
-        let result = result.unwrap();
-
-        assert_eq!(result.len(), group_by_request.limit);
-
-        for group in result {
-            assert_eq!(group.hits.len(), group_by_request.group_size);
-        }
-    }
-}
-
-/// Tests out the different features working together. The individual features are already tested in other places.
-mod group_by_builder {
-
-    use collection::grouping::GroupBy;
-    use collection::lookup::types::PseudoId;
-    use collection::lookup::WithLookup;
-    use tokio::sync::RwLock;
-
-    use super::*;
-
-    const BODY_TEXT: &str = "lorem ipsum dolor sit amet";
-
-    struct Resources {
-        request: GroupRequest,
-        lookup_collection: RwLock<Collection>,
-        collection: Collection,
-    }
-
-    /// Sets up two collections: one for chunks and one for docs.
-    async fn setup(docs: u64, chunks_per_doc: u64) -> Resources {
-        let mut rng = rand::thread_rng();
-
-        let source_request = SourceRequest::Search(SearchRequest {
-            vector: vec![0.5, 0.5, 0.5, 0.5].into(),
-            filter: None,
-            params: None,
-            limit: 4,
-            offset: 0,
-            with_payload: None,
-            with_vector: None,
-            score_threshold: None,
-        });
-
-        let request = GroupRequest::with_limit_from_request(source_request, "docId".to_string(), 3);
-
-        let collection_dir = tempfile::Builder::new().prefix("chunks").tempdir().unwrap();
-        let collection = simple_collection_fixture(collection_dir.path(), 1).await;
-
-        // insert chunk points
-        {
-            let insert_points = CollectionUpdateOperations::PointOperation(
-                Batch {
-                    ids: (0..docs * chunks_per_doc).map(|x| x.into()).collect_vec(),
-                    vectors: (0..docs * chunks_per_doc)
-                        .map(|_| rand_vector(&mut rng, 4))
-                        .collect_vec()
-                        .into(),
-                    payloads: (0..docs)
-                        .flat_map(|x| {
-                            (0..chunks_per_doc)
-                                .map(move |_| Some(Payload::from(json!({ "docId": x }))))
-                        })
-                        .collect_vec()
-                        .into(),
-                }
-                .into(),
-            );
-
-            let insert_result = collection
-                .update_from_client(insert_points, true, WriteOrdering::default())
-                .await
-                .expect("insert failed");
-
-            assert_eq!(insert_result.status, UpdateStatus::Completed);
-        }
-
-        let lookup_dir = tempfile::Builder::new().prefix("lookup").tempdir().unwrap();
-        let lookup_collection = simple_collection_fixture(lookup_dir.path(), 1).await;
-
-        // insert doc points
-        {
-            let insert_points = CollectionUpdateOperations::PointOperation(
-                Batch {
-                    ids: (0..docs).map(|x| x.into()).collect_vec(),
-                    vectors: (0..docs)
-                        .map(|_| rand_vector(&mut rng, 4))
-                        .collect_vec()
-                        .into(),
-                    payloads: (0..docs)
-                        .map(|x| {
-                            Some(Payload::from(
-                                json!({ "docId": x, "body": format!("{x} {BODY_TEXT}") }),
-                            ))
-                        })
-                        .collect_vec()
-                        .into(),
-                }
-                .into(),
-            );
-            let insert_result = lookup_collection
-                .update_from_client(insert_points, true, WriteOrdering::default())
-                .await
-                .expect("insert failed");
-
-            assert_eq!(insert_result.status, UpdateStatus::Completed);
-        }
-
-        let lookup_collection = RwLock::new(lookup_collection);
-
-        Resources {
-            request,
-            collection,
-            lookup_collection,
-        }
-    }
-
-    #[tokio::test(flavor = "multi_thread")]
-    async fn only_group_by() {
-        let Resources {
-            request,
-            collection,
-            ..
-        } = setup(16, 8).await;
-
-        let collection_by_name = |_: String| async { unreachable!() };
-
-        let result = GroupBy::new(request.clone(), &collection, collection_by_name)
-            .execute()
-            .await;
-
-        assert!(result.is_ok());
-
-        let result = result.unwrap();
-
-        // minimal assertion
-        assert_eq!(result.len(), request.limit);
-        for group in result {
-            assert_eq!(group.hits.len(), request.group_size);
-            assert!(group.lookup.is_none());
-        }
-    }
-
-    #[tokio::test(flavor = "multi_thread")]
-    async fn group_by_with_lookup() {
-        let Resources {
-            mut request,
-            collection,
-            lookup_collection,
-            ..
-        } = setup(16, 8).await;
-
-        request.with_lookup = Some(WithLookup {
-            collection_name: "test".to_string(),
-            with_payload: Some(true.into()),
-            with_vectors: Some(true.into()),
-        });
-
-        let collection_by_name = |_: String| async { Some(lookup_collection.read().await) };
-
-        let result = GroupBy::new(request.clone(), &collection, collection_by_name)
-            .execute()
-            .await;
-
-        assert!(result.is_ok());
-
-        let result = result.unwrap();
-
-        assert_eq!(result.len(), request.limit);
-
-        for group in result {
-            assert_eq!(group.hits.len(), request.group_size);
-
-            let lookup = group.lookup.expect("lookup not found");
-
-            assert_eq!(PseudoId::from(group.id), PseudoId::from(lookup.id));
-
-            let payload = lookup.payload.unwrap();
-            let body = payload.0.get("body").unwrap().as_str().unwrap();
-            assert_eq!(body, &format!("{} {BODY_TEXT}", lookup.id));
-        }
-    }
-}
diff --git a/crates/qdrant/lib/collection/tests/integration/lookup_test.rs b/crates/qdrant/lib/collection/tests/integration/lookup_test.rs
deleted file mode 100644
index 28f2ad0..0000000
--- a/crates/qdrant/lib/collection/tests/integration/lookup_test.rs
+++ /dev/null
@@ -1,232 +0,0 @@
-use collection::collection::Collection;
-use collection::lookup::types::PseudoId;
-use collection::lookup::{lookup_ids, WithLookup};
-use collection::operations::consistency_params::ReadConsistency;
-use collection::operations::point_ops::{Batch, WriteOrdering};
-use collection::shards::shard::ShardId;
-use itertools::Itertools;
-use rand::rngs::SmallRng;
-use rand::{self, Rng, SeedableRng};
-use rstest::*;
-use segment::data_types::vectors::VectorStruct;
-use segment::types::{Payload, PointIdType};
-use serde_json::json;
-use tempfile::Builder;
-use tokio::sync::RwLock;
-use uuid::Uuid;
-
-use crate::common::simple_collection_fixture;
-
-const SEED: u64 = 42;
-
-struct Resources {
-    request: WithLookup,
-    collection: RwLock<Collection>,
-    read_consistency: Option<ReadConsistency>,
-    shard_selection: Option<ShardId>,
-}
-
-async fn setup() -> Resources {
-    let request = WithLookup {
-        collection_name: "test".to_string(),
-        with_payload: None,
-        with_vectors: None,
-    };
-
-    let collection_dir = Builder::new().prefix("storage").tempdir().unwrap();
-
-    let collection = simple_collection_fixture(collection_dir.path(), 1).await;
-
-    let int_ids = (0..1000).map(PointIdType::from);
-
-    let mut rng = SmallRng::seed_from_u64(SEED);
-    let uuids = (0..1000).map(|_| PointIdType::Uuid(Uuid::from_u128(rng.gen())));
-
-    let ids = int_ids.chain(uuids).collect_vec();
-
-    let mut rng = SmallRng::seed_from_u64(SEED);
-    let vectors = (0..2000)
-        .map(|_| rng.gen::<[f32; 4]>().to_vec())
-        .collect_vec();
-
-    let payloads = ids
-        .iter()
-        .map(|i| Some(Payload::from(json!({ "foo": format!("bar {}", i) }))))
-        .collect_vec();
-
-    let upsert_points = collection::operations::CollectionUpdateOperations::PointOperation(
-        Batch {
-            ids,
-            vectors: vectors.into(),
-            payloads: Some(payloads),
-        }
-        .into(),
-    );
-
-    collection
-        .update_from_client(upsert_points, true, WriteOrdering::default())
-        .await
-        .unwrap();
-
-    let read_consistency = None;
-
-    let shard_selection = None;
-
-    Resources {
-        request,
-        collection: RwLock::new(collection),
-        read_consistency,
-        shard_selection,
-    }
-}
-
-#[tokio::test(flavor = "multi_thread")]
-async fn happy_lookup_ids() {
-    let Resources {
-        mut request,
-        collection,
-        read_consistency,
-        shard_selection,
-    } = setup().await;
-
-    let collection = collection.read().await;
-
-    let collection_by_name = |_: String| async { Some(collection) };
-
-    let n = 100u64;
-    let ints = (0..n).map_into();
-
-    let mut rng = SmallRng::seed_from_u64(SEED);
-    let uuids = (0..n)
-        .map(|_| Uuid::from_u128(rng.gen()).to_string())
-        .map_into();
-
-    let values = ints.chain(uuids).collect_vec();
-    request.with_payload = Some(true.into());
-    request.with_vectors = Some(true.into());
-
-    let result = lookup_ids(
-        request.clone(),
-        values.clone(),
-        collection_by_name,
-        read_consistency,
-        shard_selection,
-    )
-    .await;
-
-    assert!(result.is_ok());
-
-    let result = result.unwrap();
-
-    assert_eq!(result.len(), (n * 2) as usize);
-
-    let mut rng = SmallRng::seed_from_u64(SEED);
-
-    // use points 0..n and 1000..1000+n as expected vectors
-    let expected_vectors = (0..1000 + n)
-        .map(|i| (i, rng.gen::<[f32; 4]>().to_vec()))
-        .filter(|(i, _)| !(&n..&1000).contains(&i))
-        .map(|(_, v)| v)
-        .map(VectorStruct::from);
-
-    for (id_value, vector) in values.into_iter().zip(expected_vectors) {
-        let record = result
-            .get(&id_value)
-            .unwrap_or_else(|| panic!("Expected to find record for id {}", id_value));
-
-        assert_eq!(record.id, PointIdType::try_from(id_value.clone()).unwrap());
-        assert_eq!(
-            record.payload,
-            Some(Payload::from(json!({ "foo": format!("bar {}", id_value) })))
-        );
-        assert_eq!(record.vector, Some(vector));
-    }
-}
-
-fn first_uuid() -> String {
-    let mut rng = SmallRng::seed_from_u64(SEED);
-    Uuid::from_u128(rng.gen()).to_string()
-}
-
-#[rstest]
-#[case::existing_uuid(first_uuid())]
-#[case::zero_int(0i64)]
-#[case::positive_int(1i64)]
-#[case::existing_uint(999u64)]
-fn parsable_pseudo_id_to_point_id(#[case] value: impl Into<PseudoId>) {
-    let value = value.into();
-    assert!(PointIdType::try_from(value).is_ok());
-}
-
-#[rstest]
-#[case::negative_int(-1i64)]
-#[case::non_uuid_string("not a uuid")]
-fn non_parsable_pseudo_id_to_point_id(#[case] value: impl Into<PseudoId>) {
-    let value = value.into();
-    assert!(PointIdType::try_from(value).is_err());
-}
-
-#[rstest]
-#[case::uuid(Uuid::new_v4().to_string())]
-#[case::int(1001u64)]
-#[tokio::test(flavor = "multi_thread")]
-async fn inexisting_lookup_ids_are_ignored(#[case] value: impl Into<PseudoId>) {
-    let value = value.into();
-
-    let Resources {
-        mut request,
-        collection,
-        read_consistency,
-        shard_selection,
-    } = setup().await;
-
-    let collection = collection.read().await;
-
-    let collection_by_name = |_: String| async { Some(collection) };
-
-    let values = vec![value];
-    request.with_payload = Some(true.into());
-    request.with_vectors = Some(true.into());
-
-    let result = lookup_ids(
-        request,
-        values,
-        collection_by_name,
-        read_consistency,
-        shard_selection,
-    )
-    .await;
-
-    assert!(result.is_ok());
-
-    let result = result.unwrap();
-
-    assert_eq!(result.len(), 0);
-}
-
-#[tokio::test(flavor = "multi_thread")]
-async fn err_when_collection_by_name_returns_none() {
-    let Resources {
-        request,
-        read_consistency,
-        shard_selection,
-        ..
-    } = setup().await;
-
-    let collection_by_name = |_: String| async { None };
-
-    let result = lookup_ids(
-        request,
-        vec![],
-        collection_by_name,
-        read_consistency,
-        shard_selection,
-    )
-    .await;
-
-    assert!(result.is_err());
-    assert_eq!(
-        result.unwrap_err().to_string(),
-        "Collection test not found".to_string()
-    );
-}
diff --git a/crates/qdrant/lib/collection/tests/integration/main.rs b/crates/qdrant/lib/collection/tests/integration/main.rs
deleted file mode 100644
index 457043d..0000000
--- a/crates/qdrant/lib/collection/tests/integration/main.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-#[cfg(test)]
-pub mod collection_restore_test;
-#[cfg(test)]
-pub mod collection_test;
-#[cfg(test)]
-pub mod common;
-#[cfg(test)]
-pub mod grouping_test;
-#[cfg(test)]
-pub mod lookup_test;
-#[cfg(test)]
-pub mod multi_vec_test;
-#[cfg(test)]
-pub mod pagination_test;
-#[cfg(test)]
-pub mod snapshot_recovery_test;
diff --git a/crates/qdrant/lib/collection/tests/integration/multi_vec_test.rs b/crates/qdrant/lib/collection/tests/integration/multi_vec_test.rs
deleted file mode 100644
index e636cba..0000000
--- a/crates/qdrant/lib/collection/tests/integration/multi_vec_test.rs
+++ /dev/null
@@ -1,269 +0,0 @@
-use std::collections::BTreeMap;
-use std::num::{NonZeroU32, NonZeroU64};
-use std::path::Path;
-
-use collection::collection::Collection;
-use collection::config::{CollectionConfig, CollectionParams, WalConfig};
-use collection::operations::point_ops::{
-    PointInsertOperations, PointOperations, PointStruct, WriteOrdering,
-};
-use collection::operations::types::{
-    CollectionError, PointRequest, RecommendRequest, SearchRequest, VectorParams, VectorsConfig,
-};
-use collection::operations::CollectionUpdateOperations;
-use collection::recommendations::recommend_by;
-use segment::data_types::named_vectors::NamedVectors;
-use segment::data_types::vectors::{NamedVector, VectorStruct};
-use segment::types::{Distance, WithPayloadInterface, WithVector};
-use tempfile::Builder;
-
-use crate::common::{new_local_collection, N_SHARDS, TEST_OPTIMIZERS_CONFIG};
-
-const VEC_NAME1: &str = "vec1";
-const VEC_NAME2: &str = "vec2";
-
-#[tokio::test(flavor = "multi_thread")]
-async fn test_multi_vec() {
-    test_multi_vec_with_shards(1).await;
-    test_multi_vec_with_shards(N_SHARDS).await;
-}
-
-#[cfg(test)]
-pub async fn multi_vec_collection_fixture(collection_path: &Path, shard_number: u32) -> Collection {
-    let wal_config = WalConfig {
-        wal_capacity_mb: 1,
-        wal_segments_ahead: 0,
-    };
-
-    let vector_params1 = VectorParams {
-        size: NonZeroU64::new(4).unwrap(),
-        distance: Distance::Dot,
-        hnsw_config: None,
-        quantization_config: None,
-        on_disk: None,
-    };
-    let vector_params2 = VectorParams {
-        size: NonZeroU64::new(4).unwrap(),
-        distance: Distance::Dot,
-        hnsw_config: None,
-        quantization_config: None,
-        on_disk: None,
-    };
-
-    let mut vectors_config = BTreeMap::new();
-
-    vectors_config.insert(VEC_NAME1.to_string(), vector_params1);
-    vectors_config.insert(VEC_NAME2.to_string(), vector_params2);
-
-    let collection_params = CollectionParams {
-        vectors: VectorsConfig::Multi(vectors_config),
-        shard_number: NonZeroU32::new(shard_number).expect("Shard number can not be zero"),
-        replication_factor: NonZeroU32::new(1).unwrap(),
-        write_consistency_factor: NonZeroU32::new(1).unwrap(),
-        on_disk_payload: false,
-    };
-
-    let collection_config = CollectionConfig {
-        params: collection_params,
-        optimizer_config: TEST_OPTIMIZERS_CONFIG.clone(),
-        wal_config,
-        hnsw_config: Default::default(),
-        quantization_config: Default::default(),
-    };
-
-    let snapshot_path = collection_path.join("snapshots");
-
-    // Default to a collection with all the shards local
-    new_local_collection(
-        "test".to_string(),
-        collection_path,
-        &snapshot_path,
-        &collection_config,
-    )
-    .await
-    .unwrap()
-}
-
-async fn test_multi_vec_with_shards(shard_number: u32) {
-    let collection_dir = Builder::new()
-        .prefix("test_multi_vec_with_shards")
-        .tempdir()
-        .unwrap();
-
-    let collection = multi_vec_collection_fixture(collection_dir.path(), shard_number).await;
-
-    // Upload 1000 random vectors to the collection
-    let mut points = Vec::new();
-    for i in 0..1000 {
-        let mut vectors = NamedVectors::default();
-        vectors.insert(VEC_NAME1.to_string(), vec![i as f32, 0.0, 0.0, 0.0]);
-        vectors.insert(VEC_NAME2.to_string(), vec![0.0, i as f32, 0.0, 0.0]);
-
-        points.push(PointStruct {
-            id: i.into(),
-            vector: vectors.into(),
-            payload: Some(serde_json::from_str(r#"{"number": "John Doe"}"#).unwrap()),
-        });
-    }
-    let insert_points = CollectionUpdateOperations::PointOperation(PointOperations::UpsertPoints(
-        PointInsertOperations::PointsList(points),
-    ));
-    collection
-        .update_from_client(insert_points, true, WriteOrdering::default())
-        .await
-        .unwrap();
-
-    let query_vector = vec![6.0, 0.0, 0.0, 0.0];
-
-    let full_search_request = SearchRequest {
-        vector: NamedVector {
-            name: VEC_NAME1.to_string(),
-            vector: query_vector,
-        }
-        .into(),
-        filter: None,
-        limit: 10,
-        offset: 0,
-        with_payload: Some(WithPayloadInterface::Bool(true)),
-        with_vector: Some(true.into()),
-        params: None,
-        score_threshold: None,
-    };
-
-    let result = collection
-        .search(full_search_request, None, None)
-        .await
-        .unwrap();
-
-    for hit in result {
-        match hit.vector.unwrap() {
-            VectorStruct::Single(_) => panic!("expected multi vector"),
-            VectorStruct::Multi(vectors) => {
-                assert!(vectors.contains_key(VEC_NAME1));
-                assert!(vectors.contains_key(VEC_NAME2));
-            }
-        }
-    }
-
-    let query_vector = vec![0.0, 2.0, 0.0, 0.0];
-
-    let failed_search_request = SearchRequest {
-        vector: query_vector.clone().into(),
-        filter: None,
-        limit: 10,
-        offset: 0,
-        with_payload: Some(WithPayloadInterface::Bool(true)),
-        with_vector: Some(true.into()),
-        params: None,
-        score_threshold: None,
-    };
-
-    let result = collection.search(failed_search_request, None, None).await;
-
-    assert!(
-        matches!(result, Err(CollectionError::BadInput { .. })),
-        "{result:?}"
-    );
-
-    let full_search_request = SearchRequest {
-        vector: NamedVector {
-            name: VEC_NAME2.to_string(),
-            vector: query_vector,
-        }
-        .into(),
-        filter: None,
-        limit: 10,
-        offset: 0,
-        with_payload: Some(WithPayloadInterface::Bool(true)),
-        with_vector: Some(true.into()),
-        params: None,
-        score_threshold: None,
-    };
-
-    let result = collection
-        .search(full_search_request, None, None)
-        .await
-        .unwrap();
-
-    for hit in result {
-        match hit.vector.unwrap() {
-            VectorStruct::Single(_) => panic!("expected multi vector"),
-            VectorStruct::Multi(vectors) => {
-                assert!(vectors.contains_key(VEC_NAME1));
-                assert!(vectors.contains_key(VEC_NAME2));
-            }
-        }
-    }
-
-    let retrieve = collection
-        .retrieve(
-            PointRequest {
-                ids: vec![6.into()],
-                with_payload: Some(WithPayloadInterface::Bool(false)),
-                with_vector: WithVector::Selector(vec![VEC_NAME1.to_string()]),
-            },
-            None,
-            None,
-        )
-        .await
-        .unwrap();
-
-    assert_eq!(retrieve.len(), 1);
-    match retrieve[0].vector.as_ref().unwrap() {
-        VectorStruct::Single(_) => panic!("expected multi vector"),
-        VectorStruct::Multi(vectors) => {
-            assert!(vectors.contains_key(VEC_NAME1));
-            assert!(!vectors.contains_key(VEC_NAME2));
-        }
-    }
-
-    let recommend_result = recommend_by(
-        RecommendRequest {
-            positive: vec![6.into()],
-            with_payload: Some(WithPayloadInterface::Bool(false)),
-            with_vector: Some(WithVector::Selector(vec![VEC_NAME2.to_string()])),
-            limit: 10,
-            ..Default::default()
-        },
-        &collection,
-        |_name| async { unreachable!("should not be called in this test") },
-        None,
-    )
-    .await;
-
-    match recommend_result {
-        Ok(_) => panic!("Error expected"),
-        Err(err) => match err {
-            CollectionError::BadRequest { .. } => {}
-            CollectionError::BadInput { .. } => {}
-            error => panic!("Unexpected error {error}"),
-        },
-    }
-
-    let recommend_result = recommend_by(
-        RecommendRequest {
-            positive: vec![6.into()],
-            with_payload: Some(WithPayloadInterface::Bool(false)),
-            with_vector: Some(WithVector::Selector(vec![VEC_NAME2.to_string()])),
-            limit: 10,
-            using: Some(VEC_NAME1.to_string().into()),
-            ..Default::default()
-        },
-        &collection,
-        |_name| async { unreachable!("should not be called in this test") },
-        None,
-    )
-    .await
-    .unwrap();
-
-    assert_eq!(recommend_result.len(), 10);
-    for hit in recommend_result {
-        match hit.vector.as_ref().unwrap() {
-            VectorStruct::Single(_) => panic!("expected multi vector"),
-            VectorStruct::Multi(vectors) => {
-                assert!(!vectors.contains_key(VEC_NAME1));
-                assert!(vectors.contains_key(VEC_NAME2));
-            }
-        }
-    }
-}
diff --git a/crates/qdrant/lib/collection/tests/integration/pagination_test.rs b/crates/qdrant/lib/collection/tests/integration/pagination_test.rs
deleted file mode 100644
index 13964e8..0000000
--- a/crates/qdrant/lib/collection/tests/integration/pagination_test.rs
+++ /dev/null
@@ -1,102 +0,0 @@
-use collection::operations::point_ops::{
-    PointInsertOperations, PointOperations, PointStruct, WriteOrdering,
-};
-use collection::operations::types::SearchRequest;
-use collection::operations::CollectionUpdateOperations;
-use segment::types::WithPayloadInterface;
-use tempfile::Builder;
-
-use crate::common::{simple_collection_fixture, N_SHARDS};
-
-#[tokio::test(flavor = "multi_thread")]
-async fn test_collection_paginated_search() {
-    test_collection_paginated_search_with_shards(1).await;
-    test_collection_paginated_search_with_shards(N_SHARDS).await;
-}
-
-async fn test_collection_paginated_search_with_shards(shard_number: u32) {
-    let collection_dir = Builder::new()
-        .prefix("test_collection_paginated_search")
-        .tempdir()
-        .unwrap();
-
-    let collection = simple_collection_fixture(collection_dir.path(), shard_number).await;
-
-    // Upload 1000 random vectors to the collection
-    let mut points = Vec::new();
-    for i in 0..1000 {
-        points.push(PointStruct {
-            id: i.into(),
-            vector: vec![i as f32, 0.0, 0.0, 0.0].into(),
-            payload: Some(serde_json::from_str(r#"{"number": "John Doe"}"#).unwrap()),
-        });
-    }
-    let insert_points = CollectionUpdateOperations::PointOperation(PointOperations::UpsertPoints(
-        PointInsertOperations::PointsList(points),
-    ));
-    collection
-        .update_from_client(insert_points, true, WriteOrdering::default())
-        .await
-        .unwrap();
-
-    let query_vector = vec![1.0, 0.0, 0.0, 0.0];
-
-    let full_search_request = SearchRequest {
-        vector: query_vector.clone().into(),
-        filter: None,
-        limit: 100,
-        offset: 0,
-        with_payload: Some(WithPayloadInterface::Bool(true)),
-        with_vector: None,
-        params: None,
-        score_threshold: None,
-    };
-
-    let reference_result = collection
-        .search(full_search_request, None, None)
-        .await
-        .unwrap();
-
-    assert_eq!(reference_result.len(), 100);
-    assert_eq!(reference_result[0].id, 999.into());
-
-    let page_size = 10;
-
-    let page_1_request = SearchRequest {
-        vector: query_vector.clone().into(),
-        filter: None,
-        limit: 10,
-        offset: page_size,
-        with_payload: Some(WithPayloadInterface::Bool(true)),
-        with_vector: None,
-        params: None,
-        score_threshold: None,
-    };
-
-    let page_1_result = collection.search(page_1_request, None, None).await.unwrap();
-
-    // Check that the first page is the same as the reference result
-    assert_eq!(page_1_result.len(), 10);
-    for i in 0..10 {
-        assert_eq!(page_1_result[i], reference_result[page_size + i]);
-    }
-
-    let page_9_request = SearchRequest {
-        vector: query_vector.into(),
-        filter: None,
-        limit: 10,
-        offset: page_size * 9,
-        with_payload: Some(WithPayloadInterface::Bool(true)),
-        with_vector: None,
-        params: None,
-        score_threshold: None,
-    };
-
-    let page_9_result = collection.search(page_9_request, None, None).await.unwrap();
-
-    // Check that the 9th page is the same as the reference result
-    assert_eq!(page_9_result.len(), 10);
-    for i in 0..10 {
-        assert_eq!(page_9_result[i], reference_result[page_size * 9 + i]);
-    }
-}
diff --git a/crates/qdrant/lib/collection/tests/integration/snapshot_recovery_test.rs b/crates/qdrant/lib/collection/tests/integration/snapshot_recovery_test.rs
deleted file mode 100644
index 9d2f986..0000000
--- a/crates/qdrant/lib/collection/tests/integration/snapshot_recovery_test.rs
+++ /dev/null
@@ -1,182 +0,0 @@
-use std::num::{NonZeroU32, NonZeroU64};
-use std::sync::Arc;
-
-use collection::collection::Collection;
-use collection::config::{CollectionConfig, CollectionParams, WalConfig};
-use collection::operations::point_ops::{
-    PointInsertOperations, PointOperations, PointStruct, WriteOrdering,
-};
-use collection::operations::shared_storage_config::SharedStorageConfig;
-use collection::operations::types::{NodeType, SearchRequest, VectorParams, VectorsConfig};
-use collection::operations::CollectionUpdateOperations;
-use collection::shards::channel_service::ChannelService;
-use collection::shards::collection_shard_distribution::CollectionShardDistribution;
-use collection::shards::replica_set::ReplicaState;
-use segment::types::{Distance, WithPayloadInterface, WithVector};
-use tempfile::Builder;
-
-use crate::common::{
-    dummy_on_replica_failure, dummy_request_shard_transfer, TEST_OPTIMIZERS_CONFIG,
-};
-
-async fn _test_snapshot_and_recover_collection(node_type: NodeType) {
-    let wal_config = WalConfig {
-        wal_capacity_mb: 1,
-        wal_segments_ahead: 0,
-    };
-
-    let collection_params = CollectionParams {
-        vectors: VectorsConfig::Single(VectorParams {
-            size: NonZeroU64::new(4).unwrap(),
-            distance: Distance::Dot,
-            hnsw_config: None,
-            quantization_config: None,
-            on_disk: None,
-        }),
-        shard_number: NonZeroU32::new(1).unwrap(),
-        replication_factor: NonZeroU32::new(1).unwrap(),
-        write_consistency_factor: NonZeroU32::new(1).unwrap(),
-        on_disk_payload: false,
-    };
-
-    let config = CollectionConfig {
-        params: collection_params,
-        optimizer_config: TEST_OPTIMIZERS_CONFIG.clone(),
-        wal_config,
-        hnsw_config: Default::default(),
-        quantization_config: Default::default(),
-    };
-
-    let snapshots_path = Builder::new().prefix("test_snapshots").tempdir().unwrap();
-    let collection_dir = Builder::new().prefix("test_collection").tempdir().unwrap();
-    let recover_dir = Builder::new()
-        .prefix("test_collection_rec")
-        .tempdir()
-        .unwrap();
-    let collection_name = "test".to_string();
-    let collection_name_rec = "test_rec".to_string();
-
-    let storage_config: SharedStorageConfig = SharedStorageConfig {
-        node_type,
-        ..Default::default()
-    };
-
-    let this_peer_id = 0;
-    let shard_distribution = CollectionShardDistribution::all_local(
-        Some(config.params.shard_number.into()),
-        this_peer_id,
-    );
-
-    let collection = Collection::new(
-        collection_name,
-        this_peer_id,
-        collection_dir.path(),
-        snapshots_path.path(),
-        &config,
-        Arc::new(storage_config),
-        shard_distribution,
-        ChannelService::default(),
-        dummy_on_replica_failure(),
-        dummy_request_shard_transfer(),
-        None,
-        None,
-    )
-    .await
-    .unwrap();
-
-    let local_shards = collection.get_local_shards().await;
-    for shard_id in local_shards {
-        collection
-            .set_shard_replica_state(shard_id, 0, ReplicaState::Active, None)
-            .await
-            .unwrap();
-    }
-
-    // Upload 1000 random vectors to the collection
-    let mut points = Vec::new();
-    for i in 0..100 {
-        points.push(PointStruct {
-            id: i.into(),
-            vector: vec![i as f32, 0.0, 0.0, 0.0].into(),
-            payload: Some(serde_json::from_str(r#"{"number": "John Doe"}"#).unwrap()),
-        });
-    }
-    let insert_points = CollectionUpdateOperations::PointOperation(PointOperations::UpsertPoints(
-        PointInsertOperations::PointsList(points),
-    ));
-    collection
-        .update_from_client(insert_points, true, WriteOrdering::default())
-        .await
-        .unwrap();
-
-    // Take a snapshot
-    let snapshots_temp_dir = Builder::new().prefix("temp_dir").tempdir().unwrap();
-    let snapshot_description = collection
-        .create_snapshot(snapshots_temp_dir.path(), 0)
-        .await
-        .unwrap();
-
-    if let Err(err) = Collection::restore_snapshot(
-        &snapshots_path.path().join(snapshot_description.name),
-        recover_dir.path(),
-        0,
-        false,
-    ) {
-        panic!("Failed to restore snapshot: {err}")
-    }
-
-    let recovered_collection = Collection::load(
-        collection_name_rec,
-        this_peer_id,
-        recover_dir.path(),
-        snapshots_path.path(),
-        Default::default(),
-        ChannelService::default(),
-        dummy_on_replica_failure(),
-        dummy_request_shard_transfer(),
-        None,
-        None,
-    )
-    .await;
-
-    let query_vector = vec![1.0, 0.0, 0.0, 0.0];
-
-    let full_search_request = SearchRequest {
-        vector: query_vector.clone().into(),
-        filter: None,
-        limit: 100,
-        offset: 0,
-        with_payload: Some(WithPayloadInterface::Bool(true)),
-        with_vector: Some(WithVector::Bool(true)),
-        params: None,
-        score_threshold: None,
-    };
-
-    let reference_result = collection
-        .search(full_search_request.clone(), None, None)
-        .await
-        .unwrap();
-
-    let recovered_result = recovered_collection
-        .search(full_search_request, None, None)
-        .await
-        .unwrap();
-
-    assert_eq!(reference_result.len(), recovered_result.len());
-
-    for (reference, recovered) in reference_result.iter().zip(recovered_result.iter()) {
-        assert_eq!(reference.id, recovered.id);
-        assert_eq!(reference.payload, recovered.payload);
-        assert_eq!(reference.vector, recovered.vector);
-    }
-}
-
-#[tokio::test(flavor = "multi_thread")]
-async fn test_snapshot_and_recover_collection_normal() {
-    _test_snapshot_and_recover_collection(NodeType::Normal).await;
-}
-
-#[tokio::test(flavor = "multi_thread")]
-async fn test_snapshot_and_recover_collection_listener() {
-    _test_snapshot_and_recover_collection(NodeType::Listener).await;
-}
diff --git a/crates/qdrant/lib/common/Cargo.toml b/crates/qdrant/lib/common/Cargo.toml
deleted file mode 100644
index 9dc8ad3..0000000
--- a/crates/qdrant/lib/common/Cargo.toml
+++ /dev/null
@@ -1,12 +0,0 @@
-[package]
-name = "common"
-version = "0.1.0"
-authors = [
-    "Andrey Vasnetsov <vasnetsov93@gmail.com>",
-    "Qdrant Team <info@qdrant.tech>",
-]
-license = "Apache-2.0"
-edition = "2021"
-
-[dependencies]
-serde = "~1.0"
\ No newline at end of file
diff --git a/crates/qdrant/lib/common/src/fixed_length_priority_queue.rs b/crates/qdrant/lib/common/src/fixed_length_priority_queue.rs
deleted file mode 100644
index d2bd460..0000000
--- a/crates/qdrant/lib/common/src/fixed_length_priority_queue.rs
+++ /dev/null
@@ -1,112 +0,0 @@
-use std::cmp::Reverse;
-use std::collections::binary_heap::Iter as BinaryHeapIter;
-use std::collections::BinaryHeap;
-use std::iter::Rev;
-use std::vec::IntoIter as VecIntoIter;
-
-use serde::{Deserialize, Serialize};
-
-/// This is a MinHeap by default - it will keep the largest elements, pop smallest
-#[derive(Deserialize, Serialize, Clone, Debug)]
-pub struct FixedLengthPriorityQueue<T: Ord> {
-    heap: BinaryHeap<Reverse<T>>,
-    length: usize,
-}
-
-impl<T: Ord> FixedLengthPriorityQueue<T> {
-    pub fn new(length: usize) -> Self {
-        assert!(length > 0);
-        FixedLengthPriorityQueue::<T> {
-            heap: BinaryHeap::with_capacity(length + 1),
-            length,
-        }
-    }
-
-    pub fn push(&mut self, value: T) -> Option<T> {
-        if self.heap.len() < self.length {
-            self.heap.push(Reverse(value));
-            return None;
-        }
-
-        let mut x = self.heap.peek_mut().unwrap();
-        let mut value = Reverse(value);
-        if x.0 < value.0 {
-            std::mem::swap(&mut *x, &mut value);
-        }
-        Some(value.0)
-    }
-
-    pub fn into_vec(self) -> Vec<T> {
-        self.heap
-            .into_sorted_vec()
-            .into_iter()
-            .map(|Reverse(x)| x)
-            .collect()
-    }
-
-    pub fn iter(&self) -> Iter<'_, T> {
-        Iter {
-            it: self.heap.iter().rev(),
-        }
-    }
-
-    pub fn top(&self) -> Option<&T> {
-        self.heap.peek().map(|x| &x.0)
-    }
-
-    /// Returns actual length of the queue
-    pub fn len(&self) -> usize {
-        self.heap.len()
-    }
-
-    /// Checks if the queue is empty
-    pub fn is_empty(&self) -> bool {
-        self.heap.is_empty()
-    }
-}
-
-pub struct Iter<'a, T> {
-    it: Rev<BinaryHeapIter<'a, Reverse<T>>>,
-}
-
-pub struct IntoIter<T> {
-    it: VecIntoIter<Reverse<T>>,
-}
-
-impl<'a, T> Iterator for Iter<'a, T> {
-    type Item = &'a T;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        self.it.next().map(|Reverse(x)| x)
-    }
-}
-
-impl<T> Iterator for IntoIter<T> {
-    type Item = T;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        self.it.next().map(|Reverse(x)| x)
-    }
-}
-
-impl<'a, T: Ord> IntoIterator for &'a FixedLengthPriorityQueue<T> {
-    type Item = &'a T;
-
-    type IntoIter = Iter<'a, T>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        self.iter()
-    }
-}
-
-impl<T: Ord> IntoIterator for FixedLengthPriorityQueue<T> {
-    type Item = T;
-
-    type IntoIter = IntoIter<T>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        IntoIter {
-            it: self.heap.into_sorted_vec().into_iter(),
-        }
-    }
-}
diff --git a/crates/qdrant/lib/common/src/lib.rs b/crates/qdrant/lib/common/src/lib.rs
deleted file mode 100644
index 6dea0ba..0000000
--- a/crates/qdrant/lib/common/src/lib.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub mod fixed_length_priority_queue;
diff --git a/crates/qdrant/lib/segment/Cargo.toml b/crates/qdrant/lib/segment/Cargo.toml
deleted file mode 100644
index d25c70a..0000000
--- a/crates/qdrant/lib/segment/Cargo.toml
+++ /dev/null
@@ -1,110 +0,0 @@
-[package]
-name = "segment"
-version = "0.6.0"
-authors = [
-    "Andrey Vasnetsov <vasnetsov93@gmail.com>",
-    "Qdrant Team <info@qdrant.tech>",
-]
-license = "Apache-2.0"
-edition = "2021"
-
-[features]
-multiling-chinese = ["charabia/chinese"]
-multiling-japanese = ["charabia/japanese"]
-multiling-korean = ["charabia/korean"]
-
-[dev-dependencies]
-tempfile = "3.7.1"
-criterion = "0.5"
-rmp-serde = "~1.1"
-rand_distr = "0.4.3"
-walkdir = "2.3.3"
-rstest = "0.18.1"
-
-[target.'cfg(not(target_os = "windows"))'.dev-dependencies]
-pprof = { version = "0.12", features = ["flamegraph", "prost-codec"] }
-
-
-[dependencies]
-
-parking_lot = "0.12"
-rayon = "1.7.0"
-num_cpus = "1.16"
-itertools = "0.11"
-rocksdb = { version = "0.21.0", default-features = false, features = [ "snappy" ] }
-uuid = { version = "1.4", features = ["v4", "serde"] }
-bincode = "1.3"
-serde = { version = "~1.0", features = ["derive", "rc"] }
-serde_json = "~1.0"
-serde_cbor = "0.11.2"
-serde-value = "0.7"
-ordered-float = "3.7"
-thiserror = "1.0"
-atomic_refcell = "0.1.10"
-atomicwrites = "0.4.1"
-memmap2 = "0.7.1"
-schemars = { version = "0.8.12", features = ["uuid1", "preserve_order", "chrono"] }
-log = "0.4"
-geo = "0.26.0"
-geohash = "0.13.0"
-num-traits = "0.2.16"
-num-derive = "0.4.0"
-rand = "0.8"
-bitvec = "1.0.1"
-seahash = "4.1.0"
-tar = "0.4.40"
-fs_extra = "1.3.0"
-semver = "1.0.18"
-tinyvec = { version = "1.6.0", features = ["alloc"] }
-quantization = { git = "https://github.com/qdrant/quantization.git" }
-validator = { version = "0.16", features = ["derive"] }
-chrono = { version = "0.4.26", features = ["serde"] }
-smol_str = "0.2.0"
-
-sysinfo = "0.29"
-futures = "0.3.28"
-charabia = { version = "0.8.2", default-features = false, features = ["greek", "hebrew", "thai"] }
-
-common = {path = "../common"}
-
-[target.'cfg(target_os = "linux")'.dependencies]
-cgroups-rs = "0.3"
-procfs = { version = "0.15", default-features = false }
-io-uring = "0.6.0"
-
-[[bench]]
-name = "vector_search"
-harness = false
-
-[[bench]]
-name = "hnsw_build_graph"
-harness = false
-
-[[bench]]
-name = "hnsw_search_graph"
-harness = false
-
-[[bench]]
-name = "conditional_search"
-harness = false
-
-[[bench]]
-name = "hnsw_build_asymptotic"
-harness = false
-
-[[bench]]
-name = "serde_formats"
-harness = false
-
-[[bench]]
-name = "id_type_benchmark"
-harness = false
-
-[[bench]]
-name = "map_benchmark"
-harness = false
-
-[[bench]]
-name = "boolean_filtering"
-harness = false
-
diff --git a/crates/qdrant/lib/segment/benches/boolean_filtering.rs b/crates/qdrant/lib/segment/benches/boolean_filtering.rs
deleted file mode 100644
index ca19fd4..0000000
--- a/crates/qdrant/lib/segment/benches/boolean_filtering.rs
+++ /dev/null
@@ -1,129 +0,0 @@
-use std::sync::Arc;
-
-use atomic_refcell::AtomicRefCell;
-use criterion::{criterion_group, criterion_main, Criterion};
-use rand::rngs::StdRng;
-use rand::{Rng, SeedableRng};
-use segment::fixtures::payload_context_fixture::{
-    create_payload_storage_fixture, create_plain_payload_index, create_struct_payload_index,
-    FixtureIdTracker,
-};
-use segment::fixtures::payload_fixtures::BOOL_KEY;
-use segment::index::struct_payload_index::StructPayloadIndex;
-use segment::index::PayloadIndex;
-use segment::types::{Condition, FieldCondition, Filter, Match, PayloadSchemaType, ValueVariants};
-use tempfile::Builder;
-mod prof;
-
-const NUM_POINTS: usize = 100000;
-
-fn random_bool_filter<R: Rng + ?Sized>(rng: &mut R) -> Filter {
-    Filter::new_must(Condition::Field(FieldCondition::new_match(
-        BOOL_KEY,
-        Match::new_value(ValueVariants::Bool(rng.gen_bool(0.5))),
-    )))
-}
-
-pub fn plain_boolean_query_points(c: &mut Criterion) {
-    let seed = 42;
-
-    let mut rng = StdRng::seed_from_u64(seed);
-    let mut group = c.benchmark_group("boolean-query-points");
-
-    let dir = Builder::new().prefix("storage_dir").tempdir().unwrap();
-    let plain_index = create_plain_payload_index(dir.path(), NUM_POINTS, seed);
-
-    let mut result_size = 0;
-    let mut query_count = 0;
-
-    group.bench_function("plain", |b| {
-        b.iter(|| {
-            let filter = random_bool_filter(&mut rng);
-            result_size += plain_index.query_points(&filter).len();
-            query_count += 1;
-        })
-    });
-    eprintln!(
-        "result_size / query_count = {:#?}",
-        result_size / query_count
-    );
-}
-
-pub fn struct_boolean_query_points(c: &mut Criterion) {
-    let seed = 42;
-
-    let mut rng = StdRng::seed_from_u64(seed);
-
-    let dir = Builder::new().prefix("storage_dir").tempdir().unwrap();
-    let struct_index = create_struct_payload_index(dir.path(), NUM_POINTS, seed);
-
-    let mut group = c.benchmark_group("boolean-query-points");
-
-    let mut result_size = 0;
-    let mut query_count = 0;
-    group.bench_function("binary-index", |b| {
-        b.iter(|| {
-            let filter = random_bool_filter(&mut rng);
-            result_size += struct_index.query_points(&filter).len();
-            query_count += 1;
-        })
-    });
-    eprintln!(
-        "result_size / query_count = {:#?}",
-        result_size / query_count
-    );
-
-    group.finish();
-}
-
-pub fn keyword_index_boolean_query_points(c: &mut Criterion) {
-    let seed = 42;
-
-    let mut rng = StdRng::seed_from_u64(seed);
-
-    let dir = Builder::new().prefix("storage_dir").tempdir().unwrap();
-    let payload_storage = Arc::new(AtomicRefCell::new(
-        create_payload_storage_fixture(NUM_POINTS, seed).into(),
-    ));
-    let id_tracker = Arc::new(AtomicRefCell::new(FixtureIdTracker::new(NUM_POINTS)));
-
-    let mut index = StructPayloadIndex::open(payload_storage, id_tracker, dir.path()).unwrap();
-
-    index
-        .set_indexed(BOOL_KEY, PayloadSchemaType::Keyword.into())
-        .unwrap();
-
-    let mut group = c.benchmark_group("boolean-query-points");
-
-    let mut result_size = 0;
-    let mut query_count = 0;
-    group.bench_function("keyword-index", |b| {
-        b.iter(|| {
-            let filter = random_bool_filter(&mut rng);
-            result_size += index.query_points(&filter).len();
-            query_count += 1;
-        })
-    });
-    eprintln!(
-        "result_size / query_count = {:#?}",
-        result_size / query_count
-    );
-
-    group.finish();
-}
-
-#[cfg(not(target_os = "windows"))]
-criterion_group! {
-    name = benches;
-    config = Criterion::default().with_profiler(prof::FlamegraphProfiler::new(100));
-    targets = plain_boolean_query_points, struct_boolean_query_points, keyword_index_boolean_query_points
-}
-
-#[cfg(target_os = "windows")]
-criterion_group! {
-    name = benches;
-    config = Criterion::default();
-    targets = plain_boolean_query_points, struct_boolean_query_points, keyword_index_boolean_query_points
-}
-
-criterion_main!(benches);
diff --git a/crates/qdrant/lib/segment/benches/conditional_search.rs b/crates/qdrant/lib/segment/benches/conditional_search.rs
deleted file mode 100644
index c96f665..0000000
--- a/crates/qdrant/lib/segment/benches/conditional_search.rs
+++ /dev/null
@@ -1,161 +0,0 @@
-#[cfg(not(target_os = "windows"))]
-mod prof;
-
-use criterion::{criterion_group, criterion_main, Criterion};
-use itertools::Itertools;
-use rand::rngs::StdRng;
-use rand::{Rng, SeedableRng};
-use segment::fixtures::payload_context_fixture::{
-    create_plain_payload_index, create_struct_payload_index,
-};
-use segment::fixtures::payload_fixtures::random_must_filter;
-use segment::index::PayloadIndex;
-use segment::types::PointOffsetType;
-use tempfile::Builder;
-
-const NUM_POINTS: usize = 100000;
-const CHECK_SAMPLE_SIZE: usize = 1000;
-
-fn conditional_plain_search_benchmark(c: &mut Criterion) {
-    let seed = 42;
-
-    let mut rng = StdRng::seed_from_u64(seed);
-    let mut group = c.benchmark_group("conditional-search-group");
-
-    let dir = Builder::new().prefix("storage_dir").tempdir().unwrap();
-    let plain_index = create_plain_payload_index(dir.path(), NUM_POINTS, seed);
-
-    let mut result_size = 0;
-    let mut query_count = 0;
-
-    group.bench_function("conditional-search-query-points", |b| {
-        b.iter(|| {
-            let filter = random_must_filter(&mut rng, 2);
-            result_size += plain_index.query_points(&filter).len();
-            query_count += 1;
-        })
-    });
-    eprintln!(
-        "result_size / query_count = {:#?}",
-        result_size / query_count
-    );
-
-    let mut result_size = 0;
-    let mut query_count = 0;
-
-    // Same benchmark, but with larger expected result
-    group.bench_function("conditional-search-query-points-large", |b| {
-        b.iter(|| {
-            let filter = random_must_filter(&mut rng, 1);
-            result_size += plain_index.query_points(&filter).len();
-            query_count += 1;
-        })
-    });
-    eprintln!(
-        "result_size / query_count = {:#?}",
-        result_size / query_count
-    );
-
-    let mut result_size = 0;
-    let mut query_count = 0;
-
-    group.bench_function("conditional-search-context-check", |b| {
-        b.iter(|| {
-            let filter = random_must_filter(&mut rng, 2);
-            let sample = (0..CHECK_SAMPLE_SIZE)
-                .map(|_| rng.gen_range(0..NUM_POINTS) as PointOffsetType)
-                .collect_vec();
-            let context = plain_index.filter_context(&filter);
-
-            let filtered_sample = sample
-                .into_iter()
-                .filter(|id| context.check(*id))
-                .collect_vec();
-            result_size += filtered_sample.len();
-            query_count += 1;
-        })
-    });
-
-    eprintln!(
-        "result_size / query_count = {:#?}",
-        result_size / query_count
-    );
-
-    group.finish();
-}
-
-fn conditional_struct_search_benchmark(c: &mut Criterion) {
-    let mut rng = StdRng::seed_from_u64(42);
-    let mut group = c.benchmark_group("conditional-search-group");
-
-    let seed = 42;
-
-    let dir = Builder::new().prefix("storage_dir").tempdir().unwrap();
-    let struct_index = create_struct_payload_index(dir.path(), NUM_POINTS, seed);
-
-    let mut result_size = 0;
-    let mut query_count = 0;
-
-    let filter = random_must_filter(&mut rng, 2);
-    let cardinality = struct_index.estimate_cardinality(&filter);
-
-    let indexed_fields = struct_index.indexed_fields();
-
-    eprintln!("cardinality = {cardinality:#?}");
-    eprintln!("indexed_fields = {indexed_fields:#?}");
-
-    group.bench_function("struct-conditional-search-query-points", |b| {
-        b.iter(|| {
-            let filter = random_must_filter(&mut rng, 2);
-            result_size += struct_index.query_points(&filter).len();
-            query_count += 1;
-        })
-    });
-    eprintln!(
-        "result_size / query_count = {:#?}",
-        result_size / query_count
-    );
-
-    let mut result_size = 0;
-    let mut query_count = 0;
-
-    group.bench_function("struct-conditional-search-context-check", |b| {
-        b.iter(|| {
-            let filter = random_must_filter(&mut rng, 2);
-            let sample = (0..CHECK_SAMPLE_SIZE)
-                .map(|_| rng.gen_range(0..NUM_POINTS) as PointOffsetType)
-                .collect_vec();
-            let context = struct_index.filter_context(&filter);
-
-            let filtered_sample = sample
-                .into_iter()
-                .filter(|id| context.check(*id))
-                .collect_vec();
-            result_size += filtered_sample.len();
-            query_count += 1;
-        })
-    });
-
-    eprintln!(
-        "result_size / query_count = {:#?}",
-        result_size / query_count
-    );
-
-    group.finish();
-}
-
-#[cfg(not(target_os = "windows"))]
-criterion_group! {
-    name = benches;
-    config = Criterion::default().with_profiler(prof::FlamegraphProfiler::new(100));
-    targets = conditional_struct_search_benchmark, conditional_plain_search_benchmark
-}
-
-#[cfg(target_os = "windows")]
-criterion_group! {
-    name = benches;
-    config = Criterion::default();
-    targets = conditional_struct_search_benchmark, conditional_plain_search_benchmark
-}
-
-criterion_main!(benches);
diff --git a/crates/qdrant/lib/segment/benches/hnsw_build_asymptotic.rs b/crates/qdrant/lib/segment/benches/hnsw_build_asymptotic.rs
deleted file mode 100644
index f6aeebb..0000000
--- a/crates/qdrant/lib/segment/benches/hnsw_build_asymptotic.rs
+++ /dev/null
@@ -1,242 +0,0 @@
-#[cfg(not(target_os = "windows"))]
-mod prof;
-
-use criterion::{criterion_group, criterion_main, Criterion};
-use itertools::Itertools;
-use rand::{thread_rng, Rng};
-use segment::data_types::vectors::VectorElementType;
-use segment::fixtures::index_fixtures::{random_vector, FakeFilterContext, TestRawScorerProducer};
-use segment::index::hnsw_index::graph_layers::GraphLayers;
-use segment::index::hnsw_index::graph_layers_builder::GraphLayersBuilder;
-use segment::index::hnsw_index::graph_links::GraphLinksRam;
-use segment::index::hnsw_index::point_scorer::FilteredScorer;
-use segment::spaces::metric::Metric;
-use segment::spaces::simple::CosineMetric;
-use segment::types::{Distance, PointOffsetType, ScoreType};
-
-const NUM_VECTORS: usize = 5_000;
-const DIM: usize = 16;
-const M: usize = 16;
-const TOP: usize = 10;
-const EF_CONSTRUCT: usize = 64;
-const EF: usize = 64;
-const USE_HEURISTIC: bool = true;
-
-fn build_index<TMetric: Metric>(
-    num_vectors: usize,
-) -> (TestRawScorerProducer<TMetric>, GraphLayers<GraphLinksRam>) {
-    let mut rng = thread_rng();
-
-    let vector_holder = TestRawScorerProducer::<TMetric>::new(DIM, num_vectors, &mut rng);
-    let mut graph_layers_builder =
-        GraphLayersBuilder::new(num_vectors, M, M * 2, EF_CONSTRUCT, 10, USE_HEURISTIC);
-    let fake_filter_context = FakeFilterContext {};
-    for idx in 0..(num_vectors as PointOffsetType) {
-        let added_vector = vector_holder.vectors.get(idx).to_vec();
-        let raw_scorer = vector_holder.get_raw_scorer(added_vector);
-        let scorer = FilteredScorer::new(raw_scorer.as_ref(), Some(&fake_filter_context));
-        let level = graph_layers_builder.get_random_layer(&mut rng);
-        graph_layers_builder.set_levels(idx, level);
-        graph_layers_builder.link_new_point(idx, scorer);
-    }
-    (
-        vector_holder,
-        graph_layers_builder.into_graph_layers(None).unwrap(),
-    )
-}
-
-fn hnsw_build_asymptotic(c: &mut Criterion) {
-    let mut group = c.benchmark_group("hnsw-index-build-asymptotic");
-
-    let mut rng = thread_rng();
-
-    let (vector_holder, graph_layers) = build_index::<CosineMetric>(NUM_VECTORS);
-
-    group.bench_function("build-n-search-hnsw", |b| {
-        b.iter(|| {
-            let fake_filter_context = FakeFilterContext {};
-            let query = random_vector(&mut rng, DIM);
-            let raw_scorer = vector_holder.get_raw_scorer(query);
-            let scorer = FilteredScorer::new(raw_scorer.as_ref(), Some(&fake_filter_context));
-            graph_layers.search(TOP, EF, scorer);
-        })
-    });
-
-    for _ in 0..10 {
-        let fake_filter_context = FakeFilterContext {};
-        let query = random_vector(&mut rng, DIM);
-        let raw_scorer = vector_holder.get_raw_scorer(query);
-        let scorer = FilteredScorer::new(raw_scorer.as_ref(), Some(&fake_filter_context));
-        graph_layers.search(TOP, EF, scorer);
-    }
-
-    let (vector_holder, graph_layers) = build_index::<CosineMetric>(NUM_VECTORS * 10);
-
-    group.bench_function("build-n-search-hnsw-10x", |b| {
-        b.iter(|| {
-            let fake_filter_context = FakeFilterContext {};
-            let query = random_vector(&mut rng, DIM);
-            let raw_scorer = vector_holder.get_raw_scorer(query);
-            let scorer = FilteredScorer::new(raw_scorer.as_ref(), Some(&fake_filter_context));
-            graph_layers.search(TOP, EF, scorer);
-        })
-    });
-
-    group.bench_function("build-n-search-hnsw-10x-score-point", |b| {
-        b.iter(|| {
-            let fake_filter_context = FakeFilterContext {};
-            let query = random_vector(&mut rng, DIM);
-            let raw_scorer = vector_holder.get_raw_scorer(query);
-            let mut scorer = FilteredScorer::new(raw_scorer.as_ref(), Some(&fake_filter_context));
-
-            let mut points_to_score = (0..1500)
-                .map(|_| rng.gen_range(0..(NUM_VECTORS * 10)) as u32)
-                .collect_vec();
-            scorer.score_points(&mut points_to_score, 1000);
-        })
-    });
-
-    for _ in 0..10 {
-        let fake_filter_context = FakeFilterContext {};
-        let query = random_vector(&mut rng, DIM);
-        let raw_scorer = vector_holder.get_raw_scorer(query);
-        let scorer = FilteredScorer::new(raw_scorer.as_ref(), Some(&fake_filter_context));
-        graph_layers.search(TOP, EF, scorer);
-    }
-}
-
-#[derive(Clone)]
-struct FakeMetric {}
-
-impl Metric for FakeMetric {
-    fn distance() -> Distance {
-        unreachable!("FakeMetric::distance")
-    }
-
-    fn similarity(v1: &[VectorElementType], v2: &[VectorElementType]) -> ScoreType {
-        v1[0] + v2[0]
-    }
-
-    fn preprocess(_vector: &[VectorElementType]) -> Option<Vec<VectorElementType>> {
-        None
-    }
-
-    fn postprocess(score: ScoreType) -> ScoreType {
-        score
-    }
-}
-
-fn scoring_vectors(c: &mut Criterion) {
-    let mut group = c.benchmark_group("scoring-vector");
-    let mut rng = thread_rng();
-    let points_per_cycle = 1000;
-    let base_num_vectors = 10_000;
-
-    let num_vectors = base_num_vectors;
-    let vector_holder = TestRawScorerProducer::<FakeMetric>::new(DIM, num_vectors, &mut rng);
-
-    group.bench_function("score-point", |b| {
-        b.iter(|| {
-            let fake_filter_context = FakeFilterContext {};
-            let query = random_vector(&mut rng, DIM);
-            let raw_scorer = vector_holder.get_raw_scorer(query);
-            let mut scorer = FilteredScorer::new(raw_scorer.as_ref(), Some(&fake_filter_context));
-
-            let mut points_to_score = (0..points_per_cycle)
-                .map(|_| rng.gen_range(0..num_vectors) as u32)
-                .collect_vec();
-            scorer.score_points(&mut points_to_score, points_per_cycle);
-        })
-    });
-
-    let num_vectors = base_num_vectors * 10;
-    let vector_holder = TestRawScorerProducer::<FakeMetric>::new(DIM, num_vectors, &mut rng);
-
-    group.bench_function("score-point-10x", |b| {
-        b.iter(|| {
-            let fake_filter_context = FakeFilterContext {};
-            let query = random_vector(&mut rng, DIM);
-            let raw_scorer = vector_holder.get_raw_scorer(query);
-            let mut scorer = FilteredScorer::new(raw_scorer.as_ref(), Some(&fake_filter_context));
-
-            let mut points_to_score = (0..points_per_cycle)
-                .map(|_| rng.gen_range(0..num_vectors) as u32)
-                .collect_vec();
-            scorer.score_points(&mut points_to_score, points_per_cycle);
-        })
-    });
-
-    let num_vectors = base_num_vectors * 50;
-    let vector_holder = TestRawScorerProducer::<FakeMetric>::new(DIM, num_vectors, &mut rng);
-
-    group.bench_function("score-point-50x", |b| {
-        b.iter(|| {
-            let fake_filter_context = FakeFilterContext {};
-            let query = random_vector(&mut rng, DIM);
-            let raw_scorer = vector_holder.get_raw_scorer(query);
-            let mut scorer = FilteredScorer::new(raw_scorer.as_ref(), Some(&fake_filter_context));
-
-            let mut points_to_score = (0..points_per_cycle)
-                .map(|_| rng.gen_range(0..num_vectors) as u32)
-                .collect_vec();
-            scorer.score_points(&mut points_to_score, points_per_cycle);
-        })
-    });
-}
-
-fn basic_scoring_vectors(c: &mut Criterion) {
-    let mut group = c.benchmark_group("scoring-vector");
-    let mut rng = thread_rng();
-    let points_per_cycle = 1000;
-    let base_num_vectors = 10_000_000;
-
-    let num_vectors = base_num_vectors;
-
-    let vectors = (0..num_vectors)
-        .map(|_| random_vector(&mut rng, DIM))
-        .collect_vec();
-
-    group.bench_function("basic-score-point", |b| {
-        b.iter(|| {
-            let query = random_vector(&mut rng, DIM);
-            let points_to_score = (0..points_per_cycle).map(|_| rng.gen_range(0..num_vectors));
-
-            let _s: f32 = points_to_score
-                .map(|x| FakeMetric::similarity(&vectors[x], &query))
-                .sum();
-        })
-    });
-
-    let num_vectors = base_num_vectors * 2;
-
-    let vectors = (0..num_vectors)
-        .map(|_| random_vector(&mut rng, DIM))
-        .collect_vec();
-
-    group.bench_function("basic-score-point-10x", |b| {
-        b.iter(|| {
-            let query = random_vector(&mut rng, DIM);
-            let points_to_score = (0..points_per_cycle).map(|_| rng.gen_range(0..num_vectors));
-
-            let _s: f32 = points_to_score
-                .map(|x| FakeMetric::similarity(&vectors[x], &query))
-                .sum();
-        })
-    });
-}
-
-#[cfg(not(target_os = "windows"))]
-criterion_group! {
-    name = benches;
-    config = Criterion::default().with_profiler(prof::FlamegraphProfiler::new(100));
-    targets = hnsw_build_asymptotic, scoring_vectors, basic_scoring_vectors
-}
-
-#[cfg(target_os = "windows")]
-criterion_group! {
-    name = benches;
-    config = Criterion::default();
-    targets = hnsw_build_asymptotic, scoring_vectors, basic_scoring_vectors
-}
-
-criterion_main!(benches);
diff --git a/crates/qdrant/lib/segment/benches/hnsw_build_graph.rs b/crates/qdrant/lib/segment/benches/hnsw_build_graph.rs
deleted file mode 100644
index 56dd30a..0000000
--- a/crates/qdrant/lib/segment/benches/hnsw_build_graph.rs
+++ /dev/null
@@ -1,57 +0,0 @@
-#[cfg(not(target_os = "windows"))]
-mod prof;
-
-use criterion::{criterion_group, criterion_main, Criterion};
-use rand::rngs::StdRng;
-use rand::{thread_rng, SeedableRng};
-use segment::fixtures::index_fixtures::{FakeFilterContext, TestRawScorerProducer};
-use segment::index::hnsw_index::graph_layers_builder::GraphLayersBuilder;
-use segment::index::hnsw_index::point_scorer::FilteredScorer;
-use segment::spaces::simple::CosineMetric;
-use segment::types::PointOffsetType;
-
-const NUM_VECTORS: usize = 10000;
-const DIM: usize = 32;
-const M: usize = 16;
-const EF_CONSTRUCT: usize = 64;
-const USE_HEURISTIC: bool = true;
-
-fn hnsw_benchmark(c: &mut Criterion) {
-    let mut rng = StdRng::seed_from_u64(42);
-    let vector_holder = TestRawScorerProducer::<CosineMetric>::new(DIM, NUM_VECTORS, &mut rng);
-    let mut group = c.benchmark_group("hnsw-index-build-group");
-    group.sample_size(10);
-    group.bench_function("hnsw_index", |b| {
-        b.iter(|| {
-            let mut rng = thread_rng();
-            let mut graph_layers_builder =
-                GraphLayersBuilder::new(NUM_VECTORS, M, M * 2, EF_CONSTRUCT, 10, USE_HEURISTIC);
-            let fake_filter_context = FakeFilterContext {};
-            for idx in 0..(NUM_VECTORS as PointOffsetType) {
-                let added_vector = vector_holder.vectors.get(idx).to_vec();
-                let raw_scorer = vector_holder.get_raw_scorer(added_vector);
-                let scorer = FilteredScorer::new(raw_scorer.as_ref(), Some(&fake_filter_context));
-                let level = graph_layers_builder.get_random_layer(&mut rng);
-                graph_layers_builder.set_levels(idx, level);
-                graph_layers_builder.link_new_point(idx, scorer);
-            }
-        })
-    });
-    group.finish();
-}
-
-#[cfg(not(target_os = "windows"))]
-criterion_group! {
-    name = benches;
-    config = Criterion::default().with_profiler(prof::FlamegraphProfiler::new(100));
-    targets = hnsw_benchmark
-}
-
-#[cfg(target_os = "windows")]
-criterion_group! {
-    name = benches;
-    config = Criterion::default();
-    targets = hnsw_benchmark
-}
-
-criterion_main!(benches);
diff --git a/crates/qdrant/lib/segment/benches/hnsw_search_graph.rs b/crates/qdrant/lib/segment/benches/hnsw_search_graph.rs
deleted file mode 100644
index 43f53c6..0000000
--- a/crates/qdrant/lib/segment/benches/hnsw_search_graph.rs
+++ /dev/null
@@ -1,90 +0,0 @@
-#[cfg(not(target_os = "windows"))]
-mod prof;
-
-use criterion::{criterion_group, criterion_main, Criterion};
-use rand::rngs::StdRng;
-use rand::{thread_rng, SeedableRng};
-use segment::fixtures::index_fixtures::{random_vector, FakeFilterContext, TestRawScorerProducer};
-use segment::index::hnsw_index::graph_layers_builder::GraphLayersBuilder;
-use segment::index::hnsw_index::graph_links::GraphLinksRam;
-use segment::index::hnsw_index::point_scorer::FilteredScorer;
-use segment::spaces::simple::CosineMetric;
-use segment::types::PointOffsetType;
-
-const NUM_VECTORS: usize = 100000;
-const DIM: usize = 64;
-const M: usize = 16;
-const TOP: usize = 10;
-const EF_CONSTRUCT: usize = 100;
-const EF: usize = 100;
-const USE_HEURISTIC: bool = true;
-
-fn hnsw_benchmark(c: &mut Criterion) {
-    let mut rng = StdRng::seed_from_u64(42);
-    let vector_holder = TestRawScorerProducer::<CosineMetric>::new(DIM, NUM_VECTORS, &mut rng);
-    let mut group = c.benchmark_group("hnsw-index-search-group");
-    let mut rng = thread_rng();
-    let fake_filter_context = FakeFilterContext {};
-
-    let mut graph_layers_builder =
-        GraphLayersBuilder::new(NUM_VECTORS, M, M * 2, EF_CONSTRUCT, 10, USE_HEURISTIC);
-    for idx in 0..(NUM_VECTORS as PointOffsetType) {
-        let added_vector = vector_holder.vectors.get(idx).to_vec();
-        let raw_scorer = vector_holder.get_raw_scorer(added_vector);
-        let scorer = FilteredScorer::new(raw_scorer.as_ref(), Some(&fake_filter_context));
-        let level = graph_layers_builder.get_random_layer(&mut rng);
-        graph_layers_builder.set_levels(idx, level);
-        graph_layers_builder.link_new_point(idx, scorer);
-    }
-    let graph_layers = graph_layers_builder
-        .into_graph_layers::<GraphLinksRam>(None)
-        .unwrap();
-
-    group.bench_function("hnsw_search", |b| {
-        b.iter(|| {
-            let query = random_vector(&mut rng, DIM);
-
-            let raw_scorer = vector_holder.get_raw_scorer(query);
-            let scorer = FilteredScorer::new(raw_scorer.as_ref(), Some(&fake_filter_context));
-
-            graph_layers.search(TOP, EF, scorer);
-        })
-    });
-
-    let mut plain_search_range: Vec<PointOffsetType> =
-        (0..NUM_VECTORS as PointOffsetType).collect();
-    group.bench_function("plain_search", |b| {
-        b.iter(|| {
-            let query = random_vector(&mut rng, DIM);
-
-            let raw_scorer = vector_holder.get_raw_scorer(query);
-            let mut scorer = FilteredScorer::new(raw_scorer.as_ref(), Some(&fake_filter_context));
-
-            let mut top_score = 0.;
-            let scores = scorer.score_points(&mut plain_search_range, NUM_VECTORS);
-            scores.iter().copied().for_each(|score| {
-                if score.score > top_score {
-                    top_score = score.score
-                }
-            });
-        })
-    });
-
-    group.finish();
-}
-
-#[cfg(not(target_os = "windows"))]
-criterion_group! {
-    name = benches;
-    config = Criterion::default().with_profiler(prof::FlamegraphProfiler::new(100));
-    targets = hnsw_benchmark
-}
-
-#[cfg(target_os = "windows")]
-criterion_group! {
-    name = benches;
-    config = Criterion::default();
-    targets = hnsw_benchmark
-}
-
-criterion_main!(benches);
diff --git a/crates/qdrant/lib/segment/benches/id_type_benchmark.rs b/crates/qdrant/lib/segment/benches/id_type_benchmark.rs
deleted file mode 100644
index 3877dd4..0000000
--- a/crates/qdrant/lib/segment/benches/id_type_benchmark.rs
+++ /dev/null
@@ -1,180 +0,0 @@
-#[cfg(not(target_os = "windows"))]
-mod prof;
-
-use std::collections::{BTreeMap, HashMap};
-
-use criterion::{criterion_group, criterion_main, Criterion};
-use rand::Rng;
-use serde::{Deserialize, Serialize};
-use uuid::Uuid;
-
-#[derive(Debug, Deserialize, Serialize, Copy, Clone, PartialEq, Eq, Hash, Ord, PartialOrd)]
-enum EnumIdTagged {
-    Num(u64),
-    Uuid(Uuid),
-}
-
-#[derive(Debug, Deserialize, Serialize, Copy, Clone, PartialEq, Eq, Hash, Ord, PartialOrd)]
-#[serde(untagged)]
-enum EnumId {
-    Num(u64),
-    Uuid(Uuid),
-}
-
-#[derive(Debug, Deserialize, Serialize, Copy, Clone, PartialEq, Eq, Hash, Ord, PartialOrd)]
-struct StructId {
-    id: Option<u64>,
-    uuid: Option<Uuid>,
-}
-
-fn id_serialization_speed(c: &mut Criterion) {
-    let mut group = c.benchmark_group("serialization-group");
-    let mut rng = rand::thread_rng();
-
-    group.bench_function("u64", |b| {
-        b.iter(|| {
-            let key: u64 = rng.gen_range(0..100000000);
-            bincode::serialize(&key).unwrap();
-        });
-    });
-
-    group.bench_function("u128", |b| {
-        b.iter(|| {
-            let key: u64 = rng.gen_range(0..100000000);
-            let new_key = key as u128;
-            bincode::serialize(&new_key).unwrap();
-        });
-    });
-
-    group.bench_function("struct-u64", |b| {
-        b.iter(|| {
-            let key: u64 = rng.gen_range(0..100000000);
-            let new_key = StructId {
-                id: Some(key),
-                uuid: None,
-            };
-            bincode::serialize(&new_key).unwrap();
-        });
-    });
-
-    group.bench_function("struct-uuid", |b| {
-        b.iter(|| {
-            let key: u64 = rng.gen_range(0..100000000);
-            let new_key = StructId {
-                id: None,
-                uuid: Some(Uuid::from_u128(key as u128)),
-            };
-            bincode::serialize(&new_key).unwrap();
-        });
-    });
-
-    group.bench_function("enum-u64", |b| {
-        b.iter(|| {
-            let key: u64 = rng.gen_range(0..100000000);
-            let new_key = EnumIdTagged::Num(key);
-            bincode::serialize(&new_key).unwrap();
-        });
-    });
-
-    group.bench_function("enum-uuid", |b| {
-        b.iter(|| {
-            let key: u64 = rng.gen_range(0..100000000);
-            let new_key = EnumIdTagged::Uuid(Uuid::from_u128(key as u128));
-            bincode::serialize(&new_key).unwrap();
-        });
-    });
-
-    group.bench_function("struct-cbor-u128", |b| {
-        b.iter(|| {
-            let key: u64 = rng.gen_range(0..100000000);
-            let new_key = key as u128;
-            serde_cbor::to_vec(&new_key).unwrap();
-        });
-    });
-
-    group.bench_function("struct-cbor-u64", |b| {
-        b.iter(|| {
-            let key: u64 = rng.gen_range(0..100000000);
-            let new_key = StructId {
-                id: Some(key),
-                uuid: None,
-            };
-            serde_cbor::to_vec(&new_key).unwrap();
-        });
-    });
-
-    group.bench_function("struct-cbor-uuid", |b| {
-        b.iter(|| {
-            let key: u64 = rng.gen_range(0..100000000);
-            let new_key = StructId {
-                id: None,
-                uuid: Some(Uuid::from_u128(key as u128)),
-            };
-            serde_cbor::to_vec(&new_key).unwrap();
-        });
-    });
-
-    group.bench_function("enum-cbor-u64", |b| {
-        b.iter(|| {
-            let key: u64 = rng.gen_range(0..100000000);
-            let new_key = EnumId::Num(key);
-            serde_cbor::to_vec(&new_key).unwrap();
-        });
-    });
-
-    group.bench_function("enum-cbor-uuid", |b| {
-        b.iter(|| {
-            let key: u64 = rng.gen_range(0..100000000);
-            let new_key = EnumId::Uuid(Uuid::from_u128(key as u128));
-            serde_cbor::to_vec(&new_key).unwrap();
-        });
-    });
-}
-
-fn u128_hash_search(c: &mut Criterion) {
-    let mut group = c.benchmark_group("hash-search-group");
-
-    let mut data: HashMap<u128, bool> = HashMap::default();
-    let key: u128 = 123;
-    let val = true;
-
-    group.bench_function("u128", |b| {
-        b.iter(|| {
-            data.insert(key, val);
-            data.get(&key);
-        });
-    });
-}
-
-fn enum_hash_search(c: &mut Criterion) {
-    let mut group = c.benchmark_group("hash-search-group");
-
-    let mut data: BTreeMap<EnumId, bool> = BTreeMap::default();
-    let key: EnumId = EnumId::Num(123);
-    let val = true;
-
-    group.bench_function("enum-u64", |b| {
-        b.iter(|| {
-            data.insert(key, val);
-            data.get(&key);
-        });
-    });
-
-    let key: EnumId = EnumId::Uuid(Uuid::from_u128(123));
-    let val = true;
-
-    group.bench_function("enum-uuid", |b| {
-        b.iter(|| {
-            data.insert(key, val);
-            data.get(&key);
-        });
-    });
-}
-
-criterion_group! {
-    name = benches;
-    config = Criterion::default();
-    targets = id_serialization_speed, u128_hash_search, enum_hash_search
-}
-
-criterion_main!(benches);
diff --git a/crates/qdrant/lib/segment/benches/map_benchmark.rs b/crates/qdrant/lib/segment/benches/map_benchmark.rs
deleted file mode 100644
index c88a646..0000000
--- a/crates/qdrant/lib/segment/benches/map_benchmark.rs
+++ /dev/null
@@ -1,71 +0,0 @@
-#[cfg(not(target_os = "windows"))]
-mod prof;
-
-use std::collections::{BTreeMap, HashMap};
-
-use criterion::{criterion_group, criterion_main, Criterion};
-use rand::rngs::StdRng;
-use rand::SeedableRng;
-use segment::data_types::tiny_map::TinyMap;
-use segment::fixtures::index_fixtures::random_vector;
-
-const DIM: usize = 100;
-
-fn small_map_obj(c: &mut Criterion) {
-    let mut group = c.benchmark_group("small-map-obj-group");
-
-    let mut rng = StdRng::seed_from_u64(42);
-    let default_key = "vector".to_string();
-    let default_key_2 = "vector1".to_string();
-    let default_key_3 = "vector2".to_string();
-    let random_vector = random_vector(&mut rng, DIM);
-
-    group.bench_function("hash-map", |b| {
-        b.iter(|| {
-            let mut map = HashMap::new();
-            map.insert(default_key.clone(), random_vector.clone());
-            map.insert(default_key_2.clone(), random_vector.clone());
-            map.insert(default_key_3.clone(), random_vector.clone());
-            let _ = map.get(&default_key_3);
-        });
-    });
-
-    group.bench_function("btree-map", |b| {
-        b.iter(|| {
-            let mut map = BTreeMap::new();
-            map.insert(default_key.clone(), random_vector.clone());
-            map.insert(default_key_2.clone(), random_vector.clone());
-            map.insert(default_key_3.clone(), random_vector.clone());
-            let _ = map.get(&default_key_3);
-        });
-    });
-
-    #[allow(clippy::vec_init_then_push)]
-    group.bench_function("vec-map", |b| {
-        b.iter(|| {
-            let mut map = Vec::with_capacity(3);
-            map.push((default_key.clone(), random_vector.clone()));
-            map.push((default_key_2.clone(), random_vector.clone()));
-            map.push((default_key_3.clone(), random_vector.clone()));
-            let _ = map.iter().find(|(k, _)| k == &default_key_3);
-        });
-    });
-
-    group.bench_function("tiny-map", |b| {
-        b.iter(|| {
-            let mut map = TinyMap::new();
-            map.insert(default_key.clone(), random_vector.clone());
-            map.insert(default_key_2.clone(), random_vector.clone());
-            map.insert(default_key_3.clone(), random_vector.clone());
-            let _ = map.get(&default_key_3);
-        });
-    });
-}
-
-criterion_group! {
-    name = benches;
-    config = Criterion::default();
-    targets = small_map_obj
-}
-
-criterion_main!(benches);
diff --git a/crates/qdrant/lib/segment/benches/prof.rs b/crates/qdrant/lib/segment/benches/prof.rs
deleted file mode 100644
index eeb8ab6..0000000
--- a/crates/qdrant/lib/segment/benches/prof.rs
+++ /dev/null
@@ -1,89 +0,0 @@
-use std::fs::File;
-use std::io::Write;
-use std::os::raw::c_int;
-use std::path::Path;
-
-use criterion::profiler::Profiler;
-use pprof::flamegraph::TextTruncateDirection;
-use pprof::protos::Message;
-use pprof::ProfilerGuard;
-
-/// Small custom profiler that can be used with Criterion to create a flamegraph for benchmarks.
-/// Also see [the Criterion documentation on this][custom-profiler].
-///
-/// ## Example on how to enable the custom profiler:
-///
-/// ```
-/// mod perf;
-/// use perf::FlamegraphProfiler;
-///
-/// fn fibonacci_profiled(criterion: &mut Criterion) {
-///     // Use the criterion struct as normal here.
-/// }
-///
-/// fn custom() -> Criterion {
-///     Criterion::default().with_profiler(FlamegraphProfiler::new())
-/// }
-///
-/// criterion_group! {
-///     name = benches;
-///     config = custom();
-///     targets = fibonacci_profiled
-/// }
-/// ```
-///
-/// The neat thing about this is that it will sample _only_ the benchmark, and not other stuff like
-/// the setup process.
-///
-/// Further, it will only kick in if `--profile-time <time>` is passed to the benchmark binary.
-/// A flamegraph will be created for each individual benchmark in its report directory under
-/// `profile/flamegraph.svg`.
-///
-/// [custom-profiler]: https://bheisler.github.io/criterion.rs/book/user_guide/profiling.html#implementing-in-process-profiling-hooks
-pub struct FlamegraphProfiler<'a> {
-    frequency: c_int,
-    active_profiler: Option<ProfilerGuard<'a>>,
-}
-
-impl<'a> FlamegraphProfiler<'a> {
-    #[allow(dead_code)]
-    pub fn new(frequency: c_int) -> Self {
-        FlamegraphProfiler {
-            frequency,
-            active_profiler: None,
-        }
-    }
-}
-
-impl<'a> Profiler for FlamegraphProfiler<'a> {
-    fn start_profiling(&mut self, _benchmark_id: &str, _benchmark_dir: &Path) {
-        self.active_profiler = Some(ProfilerGuard::new(self.frequency).unwrap());
-    }
-
-    fn stop_profiling(&mut self, _benchmark_id: &str, benchmark_dir: &Path) {
-        std::fs::create_dir_all(benchmark_dir).unwrap();
-        let pprof_path = benchmark_dir.join("profile.pb");
-        let flamegraph_path = benchmark_dir.join("flamegraph.svg");
-        eprintln!("\nflamegraph_path = {flamegraph_path:#?}");
-        let flamegraph_file = File::create(&flamegraph_path)
-            .expect("File system error while creating flamegraph.svg");
-        let mut options = pprof::flamegraph::Options::default();
-        options.hash = true;
-        options.image_width = Some(2500);
-        options.text_truncate_direction = TextTruncateDirection::Left;
-        options.font_size /= 3;
-        if let Some(profiler) = self.active_profiler.take() {
-            let report = profiler.report().build().unwrap();
-
-            let mut file = File::create(pprof_path).unwrap();
-            let profile = report.pprof().unwrap();
-            let mut content = Vec::new();
-            profile.encode(&mut content).unwrap();
-            file.write_all(&content).unwrap();
-
-            report
-                .flamegraph_with_options(flamegraph_file, &mut options)
-                .expect("Error writing flamegraph");
-        }
-    }
-}
diff --git a/crates/qdrant/lib/segment/benches/serde_formats.rs b/crates/qdrant/lib/segment/benches/serde_formats.rs
deleted file mode 100644
index 7cce09b..0000000
--- a/crates/qdrant/lib/segment/benches/serde_formats.rs
+++ /dev/null
@@ -1,70 +0,0 @@
-#[cfg(not(target_os = "windows"))]
-mod prof;
-
-use criterion::{criterion_group, criterion_main, Criterion};
-use itertools::Itertools;
-use segment::types::Payload;
-use serde_json::json;
-
-fn serde_formats_bench(c: &mut Criterion) {
-    let mut group = c.benchmark_group("serde-formats-group");
-
-    let payloads = (0..1000)
-        .map(|x| {
-            let payload: Payload = json!({"val":format!("val_{x}"),}).into();
-            payload
-        })
-        .collect_vec();
-
-    let cbor_bytes = payloads
-        .iter()
-        .map(|p| serde_cbor::to_vec(p).unwrap())
-        .collect_vec();
-
-    let rmp_bytes = payloads
-        .iter()
-        .map(|p| rmp_serde::to_vec(p).unwrap())
-        .collect_vec();
-
-    group.bench_function("serde-serialize-cbor", |b| {
-        b.iter(|| {
-            for payload in &payloads {
-                let vec = serde_cbor::to_vec(payload);
-                vec.unwrap();
-            }
-        });
-    });
-
-    group.bench_function("serde-deserialize-cbor", |b| {
-        b.iter(|| {
-            for bytes in &cbor_bytes {
-                let _payload: Payload = serde_cbor::from_slice(bytes).unwrap();
-            }
-        });
-    });
-
-    group.bench_function("serde-serialize-rmp", |b| {
-        b.iter(|| {
-            for payload in &payloads {
-                let vec = rmp_serde::to_vec(payload);
-                vec.unwrap();
-            }
-        });
-    });
-
-    group.bench_function("serde-deserialize-rmp", |b| {
-        b.iter(|| {
-            for bytes in &rmp_bytes {
-                let _payload: Payload = rmp_serde::from_slice(bytes).unwrap();
-            }
-        });
-    });
-}
-
-criterion_group! {
-    name = benches;
-    config = Criterion::default();
-    targets = serde_formats_bench
-}
-
-criterion_main!(benches);
diff --git a/crates/qdrant/lib/segment/benches/vector_search.rs b/crates/qdrant/lib/segment/benches/vector_search.rs
deleted file mode 100644
index 366b17a..0000000
--- a/crates/qdrant/lib/segment/benches/vector_search.rs
+++ /dev/null
@@ -1,102 +0,0 @@
-use std::path::Path;
-use std::sync::Arc;
-
-use atomic_refcell::AtomicRefCell;
-use criterion::{criterion_group, criterion_main, Criterion};
-use rand::distributions::Standard;
-use rand::Rng;
-use segment::common::rocksdb_wrapper::{open_db, DB_VECTOR_CF};
-use segment::data_types::vectors::VectorElementType;
-use segment::fixtures::payload_context_fixture::FixtureIdTracker;
-use segment::id_tracker::IdTrackerSS;
-use segment::types::{Distance, PointOffsetType};
-use segment::vector_storage::simple_vector_storage::open_simple_vector_storage;
-use segment::vector_storage::{new_raw_scorer, VectorStorage, VectorStorageEnum};
-use tempfile::Builder;
-
-const NUM_VECTORS: usize = 100000;
-const DIM: usize = 1024; // Larger dimensionality - greater the SIMD advantage
-
-fn random_vector(size: usize) -> Vec<VectorElementType> {
-    let rng = rand::thread_rng();
-
-    rng.sample_iter(Standard).take(size).collect()
-}
-
-fn init_vector_storage(
-    path: &Path,
-    dim: usize,
-    num: usize,
-    dist: Distance,
-) -> (
-    Arc<AtomicRefCell<VectorStorageEnum>>,
-    Arc<AtomicRefCell<IdTrackerSS>>,
-) {
-    let db = open_db(path, &[DB_VECTOR_CF]).unwrap();
-    let id_tracker = Arc::new(AtomicRefCell::new(FixtureIdTracker::new(num)));
-    let storage = open_simple_vector_storage(db, DB_VECTOR_CF, dim, dist).unwrap();
-    {
-        let mut borrowed_storage = storage.borrow_mut();
-        for i in 0..num {
-            let vector: Vec<VectorElementType> = random_vector(dim);
-            borrowed_storage
-                .insert_vector(i as PointOffsetType, &vector)
-                .unwrap();
-        }
-    }
-
-    (storage, id_tracker)
-}
-
-fn benchmark_naive(c: &mut Criterion) {
-    let dir = Builder::new().prefix("storage_dir").tempdir().unwrap();
-
-    let dist = Distance::Dot;
-    let (storage, id_tracker) = init_vector_storage(dir.path(), DIM, NUM_VECTORS, dist);
-    let borrowed_storage = storage.borrow();
-    let borrowed_id_tracker = id_tracker.borrow();
-
-    let mut group = c.benchmark_group("storage-score-all");
-
-    group.bench_function("storage vector search", |b| {
-        b.iter(|| {
-            let vector = random_vector(DIM);
-            new_raw_scorer(
-                vector,
-                &borrowed_storage,
-                borrowed_id_tracker.deleted_point_bitslice(),
-            )
-            .peek_top_all(10)
-        })
-    });
-}
-
-fn random_access_benchmark(c: &mut Criterion) {
-    let dir = Builder::new().prefix("storage_dir").tempdir().unwrap();
-
-    let dist = Distance::Dot;
-    let (storage, id_tracker) = init_vector_storage(dir.path(), DIM, NUM_VECTORS, dist);
-    let borrowed_storage = storage.borrow();
-    let borrowed_id_tracker = id_tracker.borrow();
-
-    let mut group = c.benchmark_group("storage-score-random");
-
-    let vector = random_vector(DIM);
-    let scorer = new_raw_scorer(
-        vector,
-        &borrowed_storage,
-        borrowed_id_tracker.deleted_point_bitslice(),
-    );
-
-    let mut total_score = 0.;
-    group.bench_function("storage vector search", |b| {
-        b.iter(|| {
-            let random_id = rand::thread_rng().gen_range(0..NUM_VECTORS) as PointOffsetType;
-            total_score += scorer.score_point(random_id);
-        })
-    });
-    eprintln!("total_score = {:?}", total_score);
-}
-
-criterion_group!(benches, benchmark_naive, random_access_benchmark);
-criterion_main!(benches);
diff --git a/crates/qdrant/lib/segment/src/common/anonymize.rs b/crates/qdrant/lib/segment/src/common/anonymize.rs
deleted file mode 100644
index 3115aeb..0000000
--- a/crates/qdrant/lib/segment/src/common/anonymize.rs
+++ /dev/null
@@ -1,72 +0,0 @@
-use std::collections::hash_map::DefaultHasher;
-use std::collections::{BTreeMap, HashMap};
-use std::hash::{Hash, Hasher};
-
-use chrono::{DateTime, Utc};
-
-pub trait Anonymize {
-    fn anonymize(&self) -> Self;
-}
-
-impl<T: Anonymize> Anonymize for Option<T> {
-    fn anonymize(&self) -> Self {
-        self.as_ref().map(|t| t.anonymize())
-    }
-}
-
-impl<T: Anonymize> Anonymize for Vec<T> {
-    fn anonymize(&self) -> Self {
-        self.iter().map(|e| e.anonymize()).collect()
-    }
-}
-
-impl<T: Anonymize> Anonymize for Box<T> {
-    fn anonymize(&self) -> Self {
-        Box::new(self.as_ref().anonymize())
-    }
-}
-
-impl<K: Anonymize + Hash + Eq, V: Anonymize> Anonymize for HashMap<K, V> {
-    fn anonymize(&self) -> Self {
-        self.iter()
-            .map(|(k, v)| (k.anonymize(), v.anonymize()))
-            .collect()
-    }
-}
-
-impl<K: Anonymize + Eq + Ord, V: Anonymize> Anonymize for BTreeMap<K, V> {
-    fn anonymize(&self) -> Self {
-        self.iter()
-            .map(|(k, v)| (k.anonymize(), v.anonymize()))
-            .collect()
-    }
-}
-
-impl Anonymize for String {
-    fn anonymize(&self) -> Self {
-        let mut hasher = DefaultHasher::new();
-        self.hash(&mut hasher);
-        hasher.finish().to_string()
-    }
-}
-
-impl Anonymize for usize {
-    fn anonymize(&self) -> Self {
-        let log10 = (*self as f32).log10().round() as u32;
-        if log10 > 4 {
-            let skip_digits = log10 - 4;
-            let coeff = 10usize.pow(skip_digits);
-            (*self / coeff) * coeff
-        } else {
-            *self
-        }
-    }
-}
-
-impl Anonymize for DateTime<Utc> {
-    fn anonymize(&self) -> Self {
-        let coeff: f32 = rand::random();
-
-        *self + chrono::Duration::seconds(((coeff * 20.0) - 10.0) as i64)
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/common/arc_atomic_ref_cell_iterator.rs b/crates/qdrant/lib/segment/src/common/arc_atomic_ref_cell_iterator.rs
deleted file mode 100644
index 5b6f3ef..0000000
--- a/crates/qdrant/lib/segment/src/common/arc_atomic_ref_cell_iterator.rs
+++ /dev/null
@@ -1,53 +0,0 @@
-use std::sync::Arc;
-
-use atomic_refcell::AtomicRefCell;
-
-/// Intermediate data structure intended to help returning an iterator
-/// which depends on some guarded internal object.
-///
-/// The main idea is that we create a special implementation of iterator, which holds
-/// all required temporary values, which guarantees that source data for the iterator
-/// will be available during the whole time of the iterator existence.
-///
-/// In this specific case implemented support for `AtomicRefCell` but this code can easily
-/// be modified to other structures like `Mutex`, `RwLock`, e.t.c.
-pub struct ArcAtomicRefCellIterator<T: ?Sized, I> {
-    _holder: Arc<AtomicRefCell<T>>,
-    iterator: I,
-}
-
-impl<'a, T: 'a + ?Sized, I> ArcAtomicRefCellIterator<T, I> {
-    pub fn new<F>(holder: Arc<AtomicRefCell<T>>, f: F) -> Self
-    where
-        F: FnOnce(&'a T) -> I + 'a,
-    {
-        // We want to express that it's safe to keep the iterator around for as long as the
-        // Arc is around. Unfortunately, we can't say this directly with lifetimes, because
-        // we have to return iterator which depends on temporary `.borrow()` value:
-        //
-        // ```
-        // let reference = holder.borrow();
-        // //                    ^^^^^^^^^^ - temporary value created
-        // return ref.iter()
-        // ```
-        //
-        // Rust does not like that.
-        // That is why we use unsafe `.as_ptr()` to bypass the borrow checker.
-        // This operation should be safe overall, once we are keeping actual source of data alive
-        // with `_holder` in our reference counter.
-        // Even if the all other handlers are dropped - iterator will stay valid due to the reference counter.
-        let reference = unsafe { holder.as_ptr().as_ref().unwrap() };
-        Self {
-            _holder: holder,
-            iterator: f(reference),
-        }
-    }
-}
-
-impl<T: ?Sized, I: Iterator> Iterator for ArcAtomicRefCellIterator<T, I> {
-    type Item = I::Item;
-
-    fn next(&mut self) -> Option<<Self as Iterator>::Item> {
-        self.iterator.next()
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/common/cpu.rs b/crates/qdrant/lib/segment/src/common/cpu.rs
deleted file mode 100644
index 0b1d2e3..0000000
--- a/crates/qdrant/lib/segment/src/common/cpu.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-/// Try to read number of CPUs from environment variable `QDRANT_NUM_CPUS`.
-/// If it is not set, use `num_cpus::get()`.
-pub fn get_num_cpus() -> usize {
-    match std::env::var("QDRANT_NUM_CPUS") {
-        Ok(val) => {
-            let num_cpus = val.parse::<usize>().unwrap_or(0);
-            if num_cpus > 0 {
-                num_cpus
-            } else {
-                num_cpus::get()
-            }
-        }
-        Err(_) => num_cpus::get(),
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/common/error_logging.rs b/crates/qdrant/lib/segment/src/common/error_logging.rs
deleted file mode 100644
index 2f6f170..0000000
--- a/crates/qdrant/lib/segment/src/common/error_logging.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-use log::debug;
-
-pub trait LogError {
-    fn describe(self, msg: &str) -> Self;
-}
-
-impl<T, E> LogError for Result<T, E> {
-    fn describe(self, msg: &str) -> Self {
-        if self.is_err() {
-            debug!("Error while: {}", msg);
-        }
-        self
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/common/file_operations.rs b/crates/qdrant/lib/segment/src/common/file_operations.rs
deleted file mode 100644
index 09635de..0000000
--- a/crates/qdrant/lib/segment/src/common/file_operations.rs
+++ /dev/null
@@ -1,74 +0,0 @@
-use std::fs::File;
-use std::io::{self, BufReader, BufWriter};
-use std::path::Path;
-use std::result;
-
-use atomicwrites::{AtomicFile, OverwriteBehavior};
-use serde::de::DeserializeOwned;
-use serde::Serialize;
-
-pub fn atomic_save_bin<T: Serialize>(path: &Path, object: &T) -> Result<()> {
-    let af = AtomicFile::new(path, OverwriteBehavior::AllowOverwrite);
-    af.write(|f| bincode::serialize_into(BufWriter::new(f), object))?;
-    Ok(())
-}
-
-pub fn atomic_save_json<T: Serialize>(path: &Path, object: &T) -> Result<()> {
-    let af = AtomicFile::new(path, OverwriteBehavior::AllowOverwrite);
-    af.write(|f| serde_json::to_writer(BufWriter::new(f), object))?;
-    Ok(())
-}
-
-pub fn read_json<T: DeserializeOwned>(path: &Path) -> Result<T> {
-    Ok(serde_json::from_reader(BufReader::new(File::open(path)?))?)
-}
-
-pub fn read_bin<T: DeserializeOwned>(path: &Path) -> Result<T> {
-    Ok(bincode::deserialize_from(BufReader::new(File::open(
-        path,
-    )?))?)
-}
-
-pub type FileOperationResult<T> = Result<T>;
-pub type FileStorageError = Error;
-
-pub type Result<T, E = Error> = result::Result<T, E>;
-
-#[derive(Debug, thiserror::Error)]
-pub enum Error {
-    #[error("{0}")]
-    Io(#[from] io::Error),
-
-    #[error("{0}")]
-    Bincode(#[from] bincode::ErrorKind),
-
-    #[error("{0}")]
-    SerdeJson(#[from] serde_json::Error),
-
-    #[error("{0}")]
-    Generic(String),
-}
-
-impl Error {
-    pub fn generic(msg: impl Into<String>) -> Self {
-        Self::Generic(msg.into())
-    }
-}
-
-impl<E> From<atomicwrites::Error<E>> for Error
-where
-    Self: From<E>,
-{
-    fn from(err: atomicwrites::Error<E>) -> Self {
-        match err {
-            atomicwrites::Error::Internal(err) => err.into(),
-            atomicwrites::Error::User(err) => err.into(),
-        }
-    }
-}
-
-impl From<bincode::Error> for Error {
-    fn from(err: bincode::Error) -> Self {
-        Self::Bincode(*err)
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/common/mmap_ops.rs b/crates/qdrant/lib/segment/src/common/mmap_ops.rs
deleted file mode 100644
index ec15a1a..0000000
--- a/crates/qdrant/lib/segment/src/common/mmap_ops.rs
+++ /dev/null
@@ -1,116 +0,0 @@
-use std::fs::OpenOptions;
-use std::hint::black_box;
-use std::mem::size_of;
-use std::path::{Path, PathBuf};
-use std::sync::Arc;
-use std::{mem, ops, time};
-
-use memmap2::{Mmap, MmapMut};
-
-use crate::entry::entry_point::OperationResult;
-use crate::madvise;
-use crate::madvise::Madviseable;
-
-pub fn create_and_ensure_length(path: &Path, length: usize) -> OperationResult<()> {
-    let file = OpenOptions::new()
-        .read(true)
-        .write(true)
-        .create(true)
-        .open(path)?;
-
-    file.set_len(length as u64)?;
-    Ok(())
-}
-
-pub fn open_read_mmap(path: &Path) -> OperationResult<Mmap> {
-    let file = OpenOptions::new()
-        .read(true)
-        .write(false)
-        .append(true)
-        .create(true)
-        .open(path)?;
-
-    let mmap = unsafe { Mmap::map(&file)? };
-    madvise::madvise(&mmap, madvise::get_global())?;
-
-    Ok(mmap)
-}
-
-pub fn open_write_mmap(path: &Path) -> OperationResult<MmapMut> {
-    let file = OpenOptions::new()
-        .read(true)
-        .write(true)
-        .create(false)
-        .open(path)?;
-
-    let mmap = unsafe { MmapMut::map_mut(&file)? };
-    madvise::madvise(&mmap, madvise::get_global())?;
-
-    Ok(mmap)
-}
-
-#[derive(Clone, Debug)]
-pub struct PrefaultMmapPages {
-    mmap: Arc<Mmap>,
-    path: Option<PathBuf>,
-}
-
-impl PrefaultMmapPages {
-    pub fn new(mmap: Arc<Mmap>, path: Option<impl Into<PathBuf>>) -> Self {
-        Self {
-            mmap,
-            path: path.map(Into::into),
-        }
-    }
-
-    pub fn exec(&self) {
-        prefault_mmap_pages(self.mmap.as_ref(), self.path.as_deref());
-    }
-}
-
-fn prefault_mmap_pages<T>(mmap: &T, path: Option<&Path>)
-where
-    T: Madviseable + ops::Deref<Target = [u8]>,
-{
-    let separator = path.map_or("", |_| " "); // space if `path` is `Some` or nothing
-    let path = path.unwrap_or(Path::new("")); // path if `path` is `Some` or nothing
-
-    log::trace!("Reading mmap{separator}{path:?} to populate cache...");
-
-    let instant = time::Instant::now();
-
-    let mut dst = [0; 8096];
-
-    for chunk in mmap.chunks(dst.len()) {
-        dst[..chunk.len()].copy_from_slice(chunk);
-    }
-
-    black_box(dst);
-
-    log::trace!(
-        "Reading mmap{separator}{path:?} to populate cache took {:?}",
-        instant.elapsed()
-    );
-}
-
-pub fn transmute_to_u8<T>(v: &T) -> &[u8] {
-    unsafe { std::slice::from_raw_parts(v as *const T as *const u8, mem::size_of_val(v)) }
-}
-
-pub fn transmute_from_u8_to_slice<T>(data: &[u8]) -> &[T] {
-    debug_assert_eq!(data.len() % size_of::<T>(), 0);
-    let len = data.len() / size_of::<T>();
-    let ptr = data.as_ptr() as *const T;
-    unsafe { std::slice::from_raw_parts(ptr, len) }
-}
-
-pub fn transmute_from_u8_to_mut_slice<T>(data: &mut [u8]) -> &mut [T] {
-    debug_assert_eq!(data.len() % size_of::<T>(), 0);
-    let len = data.len() / size_of::<T>();
-    let ptr = data.as_mut_ptr() as *mut T;
-    unsafe { std::slice::from_raw_parts_mut(ptr, len) }
-}
-
-pub fn transmute_to_u8_slice<T>(v: &[T]) -> &[u8] {
-    unsafe { std::slice::from_raw_parts(v.as_ptr() as *const u8, mem::size_of_val(v)) }
-}
diff --git a/crates/qdrant/lib/segment/src/common/mmap_type.rs b/crates/qdrant/lib/segment/src/common/mmap_type.rs
deleted file mode 100644
index 68553a1..0000000
--- a/crates/qdrant/lib/segment/src/common/mmap_type.rs
+++ /dev/null
@@ -1,629 +0,0 @@
-//! Typed memory maps
-//!
-//! This module adds type to directly map types and a slice of types onto a memory mapped file.
-//! The typed memory maps can be directly used as if it were that type.
-//!
-//! Types:
-//! - [`MmapType`]
-//! - [`MmapSlice`]
-//! - [`MmapBitSlice`]
-//!
-//! Various additional functions are added for use within Qdrant, such as `flusher` to obtain a
-//! flusher handle to explicitly flush the underlying memory map at a later time.
-//!
-//! # Safety
-//!
-//! Code in this module is `unsafe` and very error prone. It is therefore compacted in this single
-//! module to make it easier to review, to make it easier to check for soundness, and to make it
-//! easier to reason about. The interface provided by types in this module is as-safe-as-possible
-//! and uses `unsafe` where appropriate.
-//!
-//! Please prevent touching code in this file. If modifications must be done, please do so with the
-//! utmost care. Security is critical here as this is an easy place to introduce undefined
-//! behavior. Problems caused by this are very hard to debug.
-
-use std::ops::{Deref, DerefMut};
-use std::sync::Arc;
-use std::{mem, slice};
-
-use bitvec::slice::BitSlice;
-use memmap2::MmapMut;
-
-use crate::common::Flusher;
-
-/// Result for mmap errors.
-type Result<T> = std::result::Result<T, Error>;
-
-/// Type `T` on a memory mapped file
-///
-/// Functions as if it is `T` because this implements [`Deref`] and [`DerefMut`].
-///
-/// # Safety
-///
-/// This directly maps (transmutes) the type onto the memory mapped data. This is dangerous and
-/// very error prone and must be used with utmost care. Types holding references are not supported
-/// for example. Malformed data in the mmap will break type `T` and will cause undefined behavior.
-pub struct MmapType<T>
-where
-    T: ?Sized + 'static,
-{
-    /// Type accessor: mutable reference to access the type
-    ///
-    /// This has the same lifetime as the backing `mmap`, and thus this struct. A borrow must
-    /// never be leased out for longer.
-    ///
-    /// Since we own this reference inside this struct, we can guarantee we never lease it out for
-    /// longer.
-    ///
-    /// # Safety
-    ///
-    /// This is an alias to the data inside `mmap`. We should prevent using both together at all
-    /// costs because the Rust compiler assumes `noalias` for optimization.
-    ///
-    /// See: <https://doc.rust-lang.org/nomicon/aliasing.html>
-    r#type: &'static mut T,
-    /// Type storage: memory mapped file as backing store for type
-    ///
-    /// Has an exact size to fit the type.
-    ///
-    /// This should never be accessed directly, because it shares a mutable reference with
-    /// `r#type`. That must be used instead. The sole purpose of this is to keep ownership of the
-    /// mmap, and to allow properly cleaning up when this struct is dropped.
-    mmap: Arc<MmapMut>,
-}
-
-impl<T> MmapType<T>
-where
-    T: Sized + 'static,
-{
-    /// Transform a mmap into a typed mmap of type `T`.
-    ///
-    /// # Safety
-    ///
-    /// Unsafe because malformed data in the mmap may break type `T` resulting in undefined
-    /// behavior.
-    ///
-    /// # Panics
-    ///
-    /// - panics when the size of the mmap doesn't match size `T`
-    /// - panics when the mmap data is not correctly aligned for type `T`
-    /// - See: [`mmap_to_type_unbounded`]
-    pub unsafe fn from(mmap_with_type: MmapMut) -> Self {
-        Self::try_from(mmap_with_type).unwrap()
-    }
-
-    /// Transform a mmap into a typed mmap of type `T`.
-    ///
-    /// Returns an error when the mmap has an incorrect size.
-    ///
-    /// # Safety
-    ///
-    /// Unsafe because malformed data in the mmap may break type `T` resulting in undefined
-    /// behavior.
-    ///
-    /// # Panics
-    ///
-    /// - panics when the mmap data is not correctly aligned for type `T`
-    /// - See: [`mmap_to_type_unbounded`]
-    pub unsafe fn try_from(mut mmap_with_type: MmapMut) -> Result<Self> {
-        let r#type = mmap_to_type_unbounded(&mut mmap_with_type)?;
-        let mmap = Arc::new(mmap_with_type);
-        Ok(Self { r#type, mmap })
-    }
-}
-
-impl<T> MmapType<[T]>
-where
-    T: 'static,
-{
-    /// Transform a mmap into a typed slice mmap of type `&[T]`.
-    ///
-    /// # Warning
-    ///
-    /// This does not support slices, because those cannot be transmuted directly because it has
-    /// extra parts. See [`MmapSlice`], [`MmapType::slice_from`] and
-    /// [`std::slice::from_raw_parts`].
-    ///
-    /// # Safety
-    ///
-    /// Unsafe because malformed data in the mmap may break type `T` resulting in undefined
-    /// behavior.
-    ///
-    /// # Panics
-    ///
-    /// - panics when the size of the mmap isn't a multiple of size `T`
-    /// - panics when the mmap data is not correctly aligned for type `T`
-    /// - See: [`mmap_to_slice_unbounded`]
-    pub unsafe fn slice_from(mmap_with_slice: MmapMut) -> Self {
-        Self::try_slice_from(mmap_with_slice).unwrap()
-    }
-
-    /// Transform a mmap into a typed slice mmap of type `&[T]`.
-    ///
-    /// Returns an error when the mmap has an incorrect size.
-    ///
-    /// # Warning
-    ///
-    /// This does not support slices, because those cannot be transmuted directly because it has
-    /// extra parts. See [`MmapSlice`], [`MmapType::slice_from`] and
-    /// [`std::slice::from_raw_parts`].
-    ///
-    /// # Safety
-    ///
-    /// Unsafe because malformed data in the mmap may break type `T` resulting in undefined
-    /// behavior.
-    ///
-    /// # Panics
-    ///
-    /// - panics when the mmap data is not correctly aligned for type `T`
-    /// - See: [`mmap_to_slice_unbounded`]
-    pub unsafe fn try_slice_from(mut mmap_with_slice: MmapMut) -> Result<Self> {
-        let r#type = mmap_to_slice_unbounded(&mut mmap_with_slice, 0)?;
-        let mmap = Arc::new(mmap_with_slice);
-        Ok(Self { r#type, mmap })
-    }
-}
-
-impl<T> MmapType<T>
-where
-    T: ?Sized + 'static,
-{
-    /// Get flusher to explicitly flush mmap at a later time
-    pub fn flusher(&self) -> Flusher {
-        // TODO: if we explicitly flush when dropping this type, we can switch to a weak reference
-        // here to only flush if it hasn't been done already
-        Box::new({
-            let mmap = self.mmap.clone();
-            move || {
-                mmap.flush()?;
-                Ok(())
-            }
-        })
-    }
-}
-
-impl<T> Deref for MmapType<T>
-where
-    T: ?Sized + 'static,
-{
-    type Target = T;
-
-    // Has explicit 'bounded lifetime to clarify the inner reference never outlives this struct,
-    // even though the reference has a static lifetime internally.
-    #[allow(clippy::needless_lifetimes)]
-    fn deref<'bounded>(&'bounded self) -> &'bounded Self::Target {
-        self.r#type
-    }
-}
-
-impl<T> DerefMut for MmapType<T>
-where
-    T: ?Sized + 'static,
-{
-    // Has explicit 'bounded lifetime to clarify the inner reference never outlives this struct,
-    // even though the reference has a static lifetime internally.
-    #[allow(clippy::needless_lifetimes)]
-    fn deref_mut<'bounded>(&'bounded mut self) -> &'bounded mut Self::Target {
-        self.r#type
-    }
-}
-
-/// Slice of type `T` on a memory mapped file
-///
-/// Functions as if it is `&[T]` because this implements [`Deref`] and [`DerefMut`].
-///
-/// A helper because [`MmapType`] doesn't support slices directly.
-pub struct MmapSlice<T>
-where
-    T: Sized + 'static,
-{
-    mmap: MmapType<[T]>,
-}
-
-impl<T> MmapSlice<T> {
-    /// Transform a mmap into a typed slice mmap of type `&[T]`.
-    ///
-    /// This method is specifically intended for slices.
-    ///
-    /// # Safety
-    ///
-    /// Unsafe because malformed data in the mmap may break type `T` resulting in undefined
-    /// behavior.
-    ///
-    /// # Panics
-    ///
-    /// - panics when the size of the mmap isn't a multiple of size `T`
-    /// - panics when the mmap data is not correctly aligned for type `T`
-    /// - See: [`mmap_to_slice_unbounded`]
-    pub unsafe fn from(mmap_with_slice: MmapMut) -> Self {
-        Self::try_from(mmap_with_slice).unwrap()
-    }
-
-    /// Transform a mmap into a typed slice mmap of type `&[T]`.
-    ///
-    /// This method is specifically intended for slices.
-    ///
-    /// Returns an error when the mmap has an incorrect size.
-    ///
-    /// # Safety
-    ///
-    /// Unsafe because malformed data in the mmap may break type `T` resulting in undefined
-    /// behavior.
-    ///
-    /// # Panics
-    ///
-    /// - panics when the mmap data is not correctly aligned for type `T`
-    /// - See: [`mmap_to_slice_unbounded`]
-    pub unsafe fn try_from(mmap_with_slice: MmapMut) -> Result<Self> {
-        MmapType::try_slice_from(mmap_with_slice).map(|mmap| Self { mmap })
-    }
-
-    /// Get flusher to explicitly flush mmap at a later time
-    pub fn flusher(&self) -> Flusher {
-        self.mmap.flusher()
-    }
-}
-
-impl<T> Deref for MmapSlice<T> {
-    type Target = MmapType<[T]>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.mmap
-    }
-}
-
-impl<T> DerefMut for MmapSlice<T> {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.mmap
-    }
-}
-
-/// [`BitSlice`] on a memory mapped file
-///
-/// Functions as if it is a [`BitSlice`] because this implements [`Deref`] and [`DerefMut`].
-pub struct MmapBitSlice {
-    mmap: MmapType<BitSlice>,
-}
-
-impl MmapBitSlice {
-    /// Transform a mmap into a [`BitSlice`].
-    ///
-    /// A (non-zero) header size in bytes may be provided to omit from the BitSlice data.
-    ///
-    /// # Panics
-    ///
-    /// - panics when the size of the mmap isn't a multiple of the inner [`BitSlice`] type
-    /// - panics when the mmap data is not correctly aligned to the inner [`BitSlice`] type
-    /// - panics when the header size isn't a multiple of the inner [`BitSlice`] type
-    /// - See: [`mmap_to_slice_unbounded`]
-    pub fn from(mmap: MmapMut, header_size: usize) -> Self {
-        Self::try_from(mmap, header_size).unwrap()
-    }
-
-    /// Transform a mmap into a [`BitSlice`].
-    ///
-    /// Returns an error when the mmap has an incorrect size.
-    ///
-    /// A (non-zero) header size in bytes may be provided to omit from the BitSlice data.
-    ///
-    /// # Panics
-    ///
-    /// - panics when the mmap data is not correctly aligned to the inner [`BitSlice`] type
-    /// - panics when the header size isn't a multiple of the inner [`BitSlice`] type
-    /// - See: [`mmap_to_slice_unbounded`]
-    pub fn try_from(mut mmap: MmapMut, header_size: usize) -> Result<Self> {
-        let data = unsafe { mmap_to_slice_unbounded(&mut mmap, header_size)? };
-        let bitslice = BitSlice::from_slice_mut(data);
-        let mmap = Arc::new(mmap);
-
-        Ok(Self {
-            mmap: MmapType {
-                r#type: bitslice,
-                mmap,
-            },
-        })
-    }
-
-    /// Get flusher to explicitly flush mmap at a later time
-    pub fn flusher(&self) -> Flusher {
-        self.mmap.flusher()
-    }
-}
-
-impl Deref for MmapBitSlice {
-    type Target = BitSlice;
-
-    fn deref(&self) -> &BitSlice {
-        &self.mmap
-    }
-}
-
-impl DerefMut for MmapBitSlice {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.mmap
-    }
-}
-
-/// Typed mmap errors.
-#[derive(thiserror::Error, Clone, Debug)]
-pub enum Error {
-    #[error("Mmap length must be {0} to match the size of type, but it is {1}")]
-    SizeExact(usize, usize),
-    #[error("Mmap length must be multiple of {0} to match the size of type, but it is {1}")]
-    SizeMultiple(usize, usize),
-}
-
-/// Get a second mutable reference for type `T` from the given mmap
-///
-/// # Warning
-///
-/// The returned reference is unbounded. The user must ensure it never outlives the `mmap` type.
-///
-/// # Safety
-///
-/// - unsafe because we create a second (unbounded) mutable reference
-/// - malformed data in the mmap may break the transmuted type `T` resulting in undefined behavior
-///
-/// # Panics
-///
-/// - panics when the mmap data is not correctly aligned for type `T`
-unsafe fn mmap_to_type_unbounded<'unbnd, T>(mmap: &mut MmapMut) -> Result<&'unbnd mut T>
-where
-    T: Sized,
-{
-    let size_t = mem::size_of::<T>();
-
-    // Assert size
-    if mmap.len() != size_t {
-        return Err(Error::SizeExact(size_t, mmap.len()));
-    }
-
-    // Obtain unbounded bytes slice into mmap
-    let bytes: &'unbnd mut [u8] = {
-        let slice = mmap.deref_mut();
-        slice::from_raw_parts_mut(slice.as_mut_ptr(), slice.len())
-    };
-
-    // Assert alignment and size
-    assert_alignment::<_, T>(bytes);
-    debug_assert_eq!(mmap.len(), bytes.len());
-    if bytes.len() != mem::size_of::<T>() {
-        return Err(Error::SizeExact(mem::size_of::<T>(), bytes.len()));
-    }
-
-    let ptr = bytes.as_mut_ptr() as *mut T;
-    Ok(unsafe { &mut *ptr })
-}
-
-/// Get a second mutable reference for a slice of type `T` from the given mmap
-///
-/// A (non-zero) header size in bytes may be provided to omit from the BitSlice data.
-///
-/// # Warning
-///
-/// The returned reference is unbounded. The user must ensure it never outlives the `mmap` type.
-///
-/// # Safety
-///
-/// - unsafe because we create a second (unbounded) mutable reference
-/// - malformed data in the mmap may break the transmuted slice for type `T` resulting in undefined
-///   behavior
-///
-/// # Panics
-///
-/// - panics when the mmap data is not correctly aligned for type `T`
-/// - panics when the header size isn't a multiple of size `T`
-unsafe fn mmap_to_slice_unbounded<'unbnd, T>(
-    mmap: &mut MmapMut,
-    header_size: usize,
-) -> Result<&'unbnd mut [T]>
-where
-    T: Sized,
-{
-    let size_t = mem::size_of::<T>();
-
-    // Assert size
-    if size_t == 0 {
-        // For zero-sized T, data part must be zero-sized as well, we cannot have infinite slice
-        debug_assert_eq!(
-            mmap.len().saturating_sub(header_size),
-            0,
-            "mmap data must be zero-sized, because size T is zero",
-        );
-    } else {
-        // Must be multiple of size T
-        debug_assert_eq!(header_size % size_t, 0, "header not multiple of size T");
-        if mmap.len() % size_t != 0 {
-            return Err(Error::SizeMultiple(size_t, mmap.len()));
-        }
-    }
-
-    // Obtain unbounded bytes slice into mmap
-    let bytes: &'unbnd mut [u8] = {
-        let slice = mmap.deref_mut();
-        &mut slice::from_raw_parts_mut(slice.as_mut_ptr(), slice.len())[header_size..]
-    };
-
-    // Assert alignment and bytes size
-    assert_alignment::<_, T>(bytes);
-    debug_assert_eq!(bytes.len() + header_size, mmap.len());
-
-    // Transmute slice types
-    Ok(slice::from_raw_parts_mut(
-        bytes.as_mut_ptr() as *mut T,
-        bytes.len().checked_div(size_t).unwrap_or(0),
-    ))
-}
-
-/// Assert slice `&[S]` is correctly aligned for type `T`.
-///
-/// # Panics
-///
-/// Panics when alignment is wrong.
-fn assert_alignment<S, T>(bytes: &[S]) {
-    assert_eq!(
-        bytes.as_ptr().align_offset(mem::align_of::<T>()),
-        0,
-        "type must be aligned",
-    );
-}
-
-#[cfg(test)]
-mod tests {
-    use std::fmt::Debug;
-    use std::iter;
-
-    use rand::rngs::StdRng;
-    use rand::{Rng, SeedableRng};
-    use tempfile::{Builder, NamedTempFile};
-
-    use super::*;
-    use crate::common::mmap_ops;
-
-    fn create_temp_mmap_file(len: usize) -> NamedTempFile {
-        let tempfile = Builder::new()
-            .prefix("test.")
-            .suffix(".mmap")
-            .tempfile()
-            .unwrap();
-        tempfile.as_file().set_len(len as u64).unwrap();
-        tempfile
-    }
-
-    #[test]
-    fn test_open_zero_type() {
-        check_open_zero_type::<()>(());
-        check_open_zero_type::<u8>(0);
-        check_open_zero_type::<usize>(0);
-        check_open_zero_type::<f32>(0.0);
-    }
-
-    fn check_open_zero_type<T: Sized + PartialEq + Debug + 'static>(zero: T) {
-        let bytes = mem::size_of::<T>();
-        let tempfile = create_temp_mmap_file(bytes);
-        let mmap = mmap_ops::open_write_mmap(tempfile.path()).unwrap();
-
-        let mmap_type: MmapType<T> = unsafe { MmapType::from(mmap) };
-        assert_eq!(mmap_type.deref(), &zero);
-    }
-
-    #[test]
-    fn test_open_zero_slice() {
-        check_open_zero_slice::<()>(0, ());
-        check_open_zero_slice::<u8>(0, 0);
-        check_open_zero_slice::<u8>(1, 0);
-        check_open_zero_slice::<u8>(131, 0);
-        check_open_zero_slice::<usize>(0, 0);
-        check_open_zero_slice::<usize>(1, 0);
-        check_open_zero_slice::<usize>(131, 0);
-        check_open_zero_slice::<f32>(0, 0.0);
-        check_open_zero_slice::<f32>(1, 0.0);
-        check_open_zero_slice::<f32>(131, 0.0);
-    }
-
-    #[test]
-    #[should_panic]
-    fn test_open_zero_slice_infinite_length() {
-        // A slice with zero-sized type T can never be more than 0 bytes
-        check_open_zero_slice::<()>(1, ());
-    }
-
-    fn check_open_zero_slice<T: Sized + PartialEq + Debug + 'static>(len: usize, zero: T) {
-        let bytes = mem::size_of::<T>() * len;
-        let tempfile = create_temp_mmap_file(bytes);
-        let mmap = mmap_ops::open_write_mmap(tempfile.path()).unwrap();
-
-        let mmap_slice: MmapSlice<T> = unsafe { MmapSlice::from(mmap) };
-        assert_eq!(mmap_slice.len(), len);
-        assert!(mmap_slice.iter().all(|i| i == &zero));
-    }
-
-    #[test]
-    fn test_reopen_random() {
-        let mut rng = StdRng::seed_from_u64(42);
-        check_reopen_random::<(), _>(0, || rng.gen());
-        check_reopen_random::<u8, _>(0, || rng.gen());
-        check_reopen_random::<u8, _>(1, || rng.gen());
-        check_reopen_random::<u8, _>(131, || rng.gen());
-        check_reopen_random::<usize, _>(0, || rng.gen());
-        check_reopen_random::<usize, _>(1, || rng.gen());
-        check_reopen_random::<usize, _>(131, || rng.gen());
-        check_reopen_random::<f32, _>(0, || rng.gen());
-        check_reopen_random::<f32, _>(1, || rng.gen());
-        check_reopen_random::<f32, _>(131, || rng.gen());
-    }
-
-    fn check_reopen_random<T, R>(len: usize, rng: R)
-    where
-        T: Sized + Copy + PartialEq + Debug + 'static,
-        R: FnMut() -> T,
-    {
-        let bytes = mem::size_of::<T>() * len;
-        let tempfile = create_temp_mmap_file(bytes);
-
-        let template: Vec<T> = iter::repeat_with(rng).take(len).collect();
-
-        // Write random values from template into mmap
-        {
-            let mmap = mmap_ops::open_write_mmap(tempfile.path()).unwrap();
-            let mut mmap_slice: MmapSlice<T> = unsafe { MmapSlice::from(mmap) };
-            assert_eq!(mmap_slice.len(), len);
-            mmap_slice.copy_from_slice(&template);
-        }
-
-        // Reopen and assert values from template
-        {
-            let mmap = mmap_ops::open_write_mmap(tempfile.path()).unwrap();
-            let mmap_slice: MmapSlice<T> = unsafe { MmapSlice::from(mmap) };
-            assert_eq!(mmap_slice.as_ref(), template);
-        }
-    }
-
-    #[test]
-    fn test_bitslice() {
-        check_bitslice_with_header(0, 0);
-        check_bitslice_with_header(0, 128);
-        check_bitslice_with_header(512, 0);
-        check_bitslice_with_header(512, 256);
-        check_bitslice_with_header(11721 * 8, 256);
-    }
-
-    fn check_bitslice_with_header(bits: usize, header_size: usize) {
-        let bytes = (mem::size_of::<usize>() * bits / 8) + header_size;
-        let tempfile = create_temp_mmap_file(bytes);
-
-        // Fill bitslice
-        {
-            let mut rng = StdRng::seed_from_u64(42);
-            let mmap = mmap_ops::open_write_mmap(tempfile.path()).unwrap();
-            let mut mmap_bitslice = MmapBitSlice::from(mmap, header_size);
-            (0..bits).for_each(|i| mmap_bitslice.set(i, rng.gen()));
-        }
-
-        // Reopen and assert contents
-        {
-            let mut rng = StdRng::seed_from_u64(42);
-            let mmap = mmap_ops::open_write_mmap(tempfile.path()).unwrap();
-            let mmap_bitslice = MmapBitSlice::from(mmap, header_size);
-            (0..bits).for_each(|i| assert_eq!(mmap_bitslice[i], rng.gen::<bool>()));
-        }
-    }
-
-    #[test]
-    fn test_zero_sized_type() {
-        {
-            let tempfile = create_temp_mmap_file(0);
-            let mmap = mmap_ops::open_write_mmap(tempfile.path()).unwrap();
-            let result = unsafe { MmapType::<()>::try_from(mmap).unwrap() };
-            assert_eq!(result.deref(), &());
-        }
-
-        {
-            let tempfile = create_temp_mmap_file(0);
-            let mmap = mmap_ops::open_write_mmap(tempfile.path()).unwrap();
-            let result = unsafe { MmapSlice::<()>::try_from(mmap).unwrap() };
-            assert_eq!(result.as_ref(), &[]);
-            assert_alignment::<_, ()>(result.as_ref());
-        }
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/common/mod.rs b/crates/qdrant/lib/segment/src/common/mod.rs
deleted file mode 100644
index 0d7ed19..0000000
--- a/crates/qdrant/lib/segment/src/common/mod.rs
+++ /dev/null
@@ -1,113 +0,0 @@
-pub mod anonymize;
-pub mod arc_atomic_ref_cell_iterator;
-pub mod cpu;
-pub mod error_logging;
-pub mod file_operations;
-pub mod mmap_ops;
-pub mod mmap_type;
-pub mod operation_time_statistics;
-pub mod rocksdb_buffered_delete_wrapper;
-pub mod rocksdb_wrapper;
-pub mod utils;
-pub mod vector_utils;
-pub mod version;
-
-use std::sync::atomic::AtomicBool;
-
-use crate::data_types::named_vectors::NamedVectors;
-use crate::data_types::vectors::VectorElementType;
-use crate::entry::entry_point::{OperationError, OperationResult};
-use crate::types::{SegmentConfig, VectorDataConfig};
-
-pub type Flusher = Box<dyn FnOnce() -> OperationResult<()> + Send>;
-
-/// Check that the given vector name is part of the segment config.
-///
-/// Returns an error if incompatible.
-pub fn check_vector_name(vector_name: &str, segment_config: &SegmentConfig) -> OperationResult<()> {
-    get_vector_config_or_error(vector_name, segment_config)?;
-    Ok(())
-}
-
-/// Check that the given vector name and elements are compatible with the given segment config.
-///
-/// Returns an error if incompatible.
-pub fn check_vector(
-    vector_name: &str,
-    vector: &[VectorElementType],
-    segment_config: &SegmentConfig,
-) -> OperationResult<()> {
-    let vector_config = get_vector_config_or_error(vector_name, segment_config)?;
-    check_vector_against_config(vector, vector_config)?;
-    Ok(())
-}
-
-/// Check that the given vector name and elements are compatible with the given segment config.
-///
-/// Returns an error if incompatible.
-pub fn check_vectors(
-    vector_name: &str,
-    vectors: &[&[VectorElementType]],
-    segment_config: &SegmentConfig,
-) -> OperationResult<()> {
-    let vector_config = get_vector_config_or_error(vector_name, segment_config)?;
-    for vector in vectors {
-        check_vector_against_config(vector, vector_config)?;
-    }
-    Ok(())
-}
-
-/// Check that the given named vectors are compatible with the given segment config.
-///
-/// Returns an error if incompatible.
-pub fn check_named_vectors(
-    vectors: &NamedVectors,
-    segment_config: &SegmentConfig,
-) -> OperationResult<()> {
-    for (vector_name, vector_data) in vectors.iter() {
-        check_vector(vector_name, vector_data, segment_config)?;
-    }
-    Ok(())
-}
-
-/// Get the vector config for the given name, or return a name error.
-///
-/// Returns an error if incompatible.
-fn get_vector_config_or_error<'a>(
-    vector_name: &str,
-    segment_config: &'a SegmentConfig,
-) -> OperationResult<&'a VectorDataConfig> {
-    segment_config
-        .vector_data
-        .get(vector_name)
-        .ok_or_else(|| OperationError::VectorNameNotExists {
-            received_name: vector_name.into(),
-        })
-}
-
-/// Check if the given vector data is compatible with the given configuration.
-///
-/// Returns an error if incompatible.
-fn check_vector_against_config(
-    vector: &[VectorElementType],
-    vector_config: &VectorDataConfig,
-) -> OperationResult<()> {
-    // Check dimensionality
-    let dim = vector_config.size;
-    if vector.len() != dim {
-        return Err(OperationError::WrongVector {
-            expected_dim: dim,
-            received_dim: vector.len(),
-        });
-    }
-    Ok(())
-}
-
-pub fn check_stopped(is_stopped: &AtomicBool) -> OperationResult<()> {
-    if is_stopped.load(std::sync::atomic::Ordering::Relaxed) {
-        return Err(OperationError::Cancelled {
-            description: "Operation is stopped externally".to_string(),
-        });
-    }
-    Ok(())
-}
diff --git a/crates/qdrant/lib/segment/src/common/operation_time_statistics.rs b/crates/qdrant/lib/segment/src/common/operation_time_statistics.rs
deleted file mode 100644
index 06a9748..0000000
--- a/crates/qdrant/lib/segment/src/common/operation_time_statistics.rs
+++ /dev/null
@@ -1,254 +0,0 @@
-use std::sync::Arc;
-use std::time::{Duration, Instant};
-
-use chrono::{DateTime, SubsecRound, Utc};
-use parking_lot::Mutex;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-
-use crate::common::anonymize::Anonymize;
-
-const AVG_DATASET_LEN: usize = 128;
-const SLIDING_WINDOW_LEN: usize = 8;
-
-#[derive(Serialize, Deserialize, Clone, Default, Debug, JsonSchema)]
-pub struct OperationDurationStatistics {
-    pub count: usize,
-
-    #[serde(skip_serializing_if = "num_traits::identities::Zero::is_zero")]
-    #[serde(default)]
-    pub fail_count: usize,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    #[serde(default)]
-    pub avg_duration_micros: Option<f32>,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    #[serde(default)]
-    pub min_duration_micros: Option<f32>,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    #[serde(default)]
-    pub max_duration_micros: Option<f32>,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    #[serde(default)]
-    pub last_responded: Option<DateTime<Utc>>,
-}
-
-pub struct OperationDurationsAggregator {
-    ok_count: usize,
-    fail_count: usize,
-    timings: [f32; AVG_DATASET_LEN],
-    timing_index: usize,
-    timing_loops: usize,
-    min_value: Option<f32>,
-    max_value: Option<f32>,
-    last_response_date: Option<DateTime<Utc>>,
-}
-
-pub struct ScopeDurationMeasurer {
-    aggregator: Arc<Mutex<OperationDurationsAggregator>>,
-    instant: Instant,
-    success: bool,
-}
-
-impl Anonymize for OperationDurationStatistics {
-    fn anonymize(&self) -> Self {
-        Self {
-            count: self.count.anonymize(),
-            fail_count: self.fail_count.anonymize(),
-            last_responded: self.last_responded.anonymize(),
-            ..*self
-        }
-    }
-}
-
-impl std::ops::Add for OperationDurationStatistics {
-    type Output = Self;
-
-    fn add(self, other: Self) -> Self {
-        Self {
-            count: self.count + other.count,
-            fail_count: self.fail_count + other.fail_count,
-            avg_duration_micros: Self::weighted_mean_duration(
-                self.avg_duration_micros,
-                self.count,
-                other.avg_duration_micros,
-                other.count,
-            ),
-            min_duration_micros: Self::compared_duration(
-                self.min_duration_micros,
-                other.min_duration_micros,
-                |a, b| a < b,
-            ),
-            max_duration_micros: Self::compared_duration(
-                self.max_duration_micros,
-                other.max_duration_micros,
-                |a, b| a > b,
-            ),
-            last_responded: std::cmp::max(self.last_responded, other.last_responded),
-        }
-    }
-}
-
-impl OperationDurationStatistics {
-    pub fn is_empty(&self) -> bool {
-        self.count == 0
-    }
-
-    fn weighted_mean_duration(
-        duration1: Option<f32>,
-        count1: usize,
-        duration2: Option<f32>,
-        count2: usize,
-    ) -> Option<f32> {
-        if let Some(duration1) = duration1 {
-            if let Some(duration2) = duration2 {
-                let count1 = count1 as f32;
-                let count2 = count2 as f32;
-                Some((duration1 * count1 + duration2 * count2) / (count1 + count2))
-            } else {
-                Some(duration1)
-            }
-        } else {
-            duration2
-        }
-    }
-
-    fn compared_duration(
-        duration1: Option<f32>,
-        duration2: Option<f32>,
-        compare: impl Fn(f32, f32) -> bool,
-    ) -> Option<f32> {
-        if let Some(duration1) = duration1 {
-            if let Some(duration2) = duration2 {
-                if compare(duration1, duration2) {
-                    Some(duration1)
-                } else {
-                    Some(duration2)
-                }
-            } else {
-                Some(duration1)
-            }
-        } else {
-            duration2
-        }
-    }
-}
-
-impl ScopeDurationMeasurer {
-    pub fn new(aggregator: &Arc<Mutex<OperationDurationsAggregator>>) -> Self {
-        Self {
-            aggregator: aggregator.clone(),
-            instant: Instant::now(),
-            success: true,
-        }
-    }
-
-    pub fn new_with_instant(
-        aggregator: &Arc<Mutex<OperationDurationsAggregator>>,
-        instant: Instant,
-    ) -> Self {
-        Self {
-            aggregator: aggregator.clone(),
-            instant,
-            success: true,
-        }
-    }
-
-    pub fn set_success(&mut self, success: bool) {
-        self.success = success
-    }
-}
-
-impl Drop for ScopeDurationMeasurer {
-    fn drop(&mut self) {
-        self.aggregator
-            .lock()
-            .add_operation_result(self.success, self.instant.elapsed());
-    }
-}
-
-impl OperationDurationsAggregator {
-    pub fn new() -> Arc<Mutex<Self>> {
-        Arc::new(Mutex::new(Self {
-            ok_count: 0,
-            fail_count: 0,
-            timings: [0.; AVG_DATASET_LEN],
-            timing_index: 0,
-            timing_loops: 0,
-            min_value: None,
-            max_value: None,
-            last_response_date: Some(Utc::now().round_subsecs(2)),
-        }))
-    }
-
-    pub fn add_operation_result(&mut self, success: bool, duration: Duration) {
-        if success {
-            let duration = duration.as_micros() as f32;
-            self.min_value = Some(match self.min_value {
-                Some(min_value) => min_value.min(duration),
-                None => duration,
-            });
-            self.max_value = Some(match self.max_value {
-                Some(max_value) => max_value.max(duration),
-                None => duration,
-            });
-
-            self.ok_count += 1;
-            self.timings[self.timing_index] = duration;
-            self.timing_index += 1;
-            if self.timing_index >= AVG_DATASET_LEN {
-                self.timing_index = 0;
-                self.timing_loops += 1;
-            }
-        } else {
-            self.fail_count += 1;
-        }
-
-        self.last_response_date = Some(Utc::now().round_subsecs(2));
-    }
-
-    pub fn get_statistics(&self) -> OperationDurationStatistics {
-        OperationDurationStatistics {
-            count: self.ok_count,
-            fail_count: self.fail_count,
-            avg_duration_micros: if self.ok_count > 0 {
-                Some(self.calculate_avg())
-            } else {
-                None
-            },
-            min_duration_micros: self.min_value,
-            max_duration_micros: self.max_value,
-            last_responded: self.last_response_date,
-        }
-    }
-
-    fn calculate_avg(&self) -> f32 {
-        let data: Vec<f32> = if self.timing_loops > 0 {
-            let mut result = Vec::new();
-            result.extend_from_slice(&self.timings[self.timing_index..]);
-            result.extend_from_slice(&self.timings[..self.timing_index]);
-            result
-        } else {
-            self.timings[..self.timing_index].to_vec()
-        };
-
-        let mut sliding_window_avg = vec![0.; data.len()];
-        for i in 0..data.len() {
-            let from = if i < SLIDING_WINDOW_LEN {
-                0
-            } else {
-                i - SLIDING_WINDOW_LEN
-            };
-            sliding_window_avg[i] = Self::simple_moving_average(&data[from..i + 1]);
-        }
-
-        Self::simple_moving_average(&sliding_window_avg)
-    }
-
-    fn simple_moving_average(data: &[f32]) -> f32 {
-        data.iter().sum::<f32>() / data.len() as f32
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/common/rocksdb_buffered_delete_wrapper.rs b/crates/qdrant/lib/segment/src/common/rocksdb_buffered_delete_wrapper.rs
deleted file mode 100644
index 7612409..0000000
--- a/crates/qdrant/lib/segment/src/common/rocksdb_buffered_delete_wrapper.rs
+++ /dev/null
@@ -1,62 +0,0 @@
-use std::collections::HashSet;
-use std::mem;
-
-use parking_lot::Mutex;
-
-use crate::common::rocksdb_wrapper::{DatabaseColumnWrapper, LockedDatabaseColumnWrapper};
-use crate::common::Flusher;
-use crate::entry::entry_point::OperationResult;
-
-/// Wrapper around `DatabaseColumnWrapper` that ensures, that keys that were removed from the
-/// database are only persisted on flush explicitly.
-///
-/// This might be required to guarantee consistency of the database component.
-/// E.g. copy-on-write implementation should guarantee that data in the `write` component is
-/// persisted before it is removed from the `copy` component.
-pub struct DatabaseColumnScheduledDeleteWrapper {
-    db: DatabaseColumnWrapper,
-    deleted_pending_persistence: Mutex<HashSet<Vec<u8>>>,
-}
-
-impl DatabaseColumnScheduledDeleteWrapper {
-    pub fn new(db: DatabaseColumnWrapper) -> Self {
-        Self {
-            db,
-            deleted_pending_persistence: Mutex::new(HashSet::new()),
-        }
-    }
-
-    pub fn put<K, V>(&self, key: K, value: V) -> OperationResult<()>
-    where
-        K: AsRef<[u8]>,
-        V: AsRef<[u8]>,
-    {
-        self.deleted_pending_persistence.lock().remove(key.as_ref());
-        self.db.put(key, value)
-    }
-
-    pub fn remove<K>(&self, key: K) -> OperationResult<()>
-    where
-        K: AsRef<[u8]>,
-    {
-        self.deleted_pending_persistence
-            .lock()
-            .insert(key.as_ref().to_vec());
-        Ok(())
-    }
-
-    pub fn flusher(&self) -> Flusher {
-        let ids_to_delete = mem::take(&mut *self.deleted_pending_persistence.lock());
-        let wrapper = self.db.clone();
-        Box::new(move || {
-            for id in ids_to_delete {
-                wrapper.remove(id)?;
-            }
-            wrapper.flusher()()
-        })
-    }
-
-    pub fn lock_db(&self) -> LockedDatabaseColumnWrapper {
-        self.db.lock_db()
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/common/rocksdb_wrapper.rs b/crates/qdrant/lib/segment/src/common/rocksdb_wrapper.rs
deleted file mode 100644
index 7468440..0000000
--- a/crates/qdrant/lib/segment/src/common/rocksdb_wrapper.rs
+++ /dev/null
@@ -1,283 +0,0 @@
-use std::path::Path;
-use std::sync::Arc;
-
-use parking_lot::RwLock;
-//use atomic_refcell::{AtomicRef, AtomicRefCell};
-use rocksdb::{ColumnFamily, LogLevel, Options, WriteOptions, DB};
-
-use crate::common::Flusher;
-//use crate::common::arc_rwlock_iterator::ArcRwLockIterator;
-use crate::entry::entry_point::{OperationError, OperationResult};
-
-const DB_CACHE_SIZE: usize = 10 * 1024 * 1024; // 10 mb
-const DB_MAX_LOG_SIZE: usize = 1024 * 1024; // 1 mb
-const DB_MAX_OPEN_FILES: usize = 256;
-
-pub const DB_VECTOR_CF: &str = "vector";
-pub const DB_PAYLOAD_CF: &str = "payload";
-pub const DB_MAPPING_CF: &str = "mapping";
-pub const DB_VERSIONS_CF: &str = "version";
-
-#[derive(Clone)]
-pub struct DatabaseColumnWrapper {
-    pub database: Arc<RwLock<DB>>,
-    pub column_name: String,
-}
-
-pub struct DatabaseColumnIterator<'a> {
-    pub handle: &'a ColumnFamily,
-    pub iter: rocksdb::DBRawIterator<'a>,
-    pub just_seeked: bool,
-}
-
-pub struct LockedDatabaseColumnWrapper<'a> {
-    guard: parking_lot::RwLockReadGuard<'a, DB>,
-    column_name: &'a str,
-}
-
-pub fn db_options() -> Options {
-    let mut options: Options = Options::default();
-    options.set_write_buffer_size(DB_CACHE_SIZE);
-    options.create_if_missing(true);
-    options.set_log_level(LogLevel::Error);
-    options.set_recycle_log_file_num(2);
-    options.set_max_log_file_size(DB_MAX_LOG_SIZE);
-    options.create_missing_column_families(true);
-    options.set_max_open_files(DB_MAX_OPEN_FILES as i32);
-    #[cfg(debug_assertions)]
-    {
-        options.set_paranoid_checks(true);
-    }
-    options
-}
-
-pub fn open_db<T: AsRef<str>>(
-    path: &Path,
-    vector_pathes: &[T],
-) -> Result<Arc<RwLock<DB>>, rocksdb::Error> {
-    let mut column_families = vec![DB_PAYLOAD_CF, DB_MAPPING_CF, DB_VERSIONS_CF];
-    for vector_path in vector_pathes {
-        column_families.push(vector_path.as_ref());
-    }
-    let db = DB::open_cf(&db_options(), path, column_families)?;
-    Ok(Arc::new(RwLock::new(db)))
-}
-
-pub fn check_db_exists(path: &Path) -> bool {
-    let db_file = path.join("CURRENT");
-    db_file.exists()
-}
-
-pub fn open_db_with_existing_cf(path: &Path) -> Result<Arc<RwLock<DB>>, rocksdb::Error> {
-    let existing_column_families = if check_db_exists(path) {
-        DB::list_cf(&db_options(), path)?
-    } else {
-        vec![]
-    };
-    let db = DB::open_cf(&db_options(), path, existing_column_families)?;
-    Ok(Arc::new(RwLock::new(db)))
-}
-
-pub fn db_write_options() -> WriteOptions {
-    let mut write_options = WriteOptions::default();
-    write_options.set_sync(false);
-    write_options.disable_wal(true);
-    write_options
-}
-
-pub fn create_db_cf_if_not_exists(
-    db: Arc<RwLock<DB>>,
-    store_cf_name: &str,
-) -> Result<(), rocksdb::Error> {
-    let mut db_mut = db.write();
-    if db_mut.cf_handle(store_cf_name).is_none() {
-        db_mut.create_cf(store_cf_name, &db_options())?;
-    }
-    Ok(())
-}
-
-pub fn recreate_cf(db: Arc<RwLock<DB>>, store_cf_name: &str) -> Result<(), rocksdb::Error> {
-    let mut db_mut = db.write();
-
-    if db_mut.cf_handle(store_cf_name).is_some() {
-        db_mut.drop_cf(store_cf_name)?;
-    }
-
-    db_mut.create_cf(store_cf_name, &db_options())?;
-    Ok(())
-}
-
-impl DatabaseColumnWrapper {
-    pub fn new(database: Arc<RwLock<DB>>, column_name: &str) -> Self {
-        Self {
-            database,
-            column_name: column_name.to_string(),
-        }
-    }
-
-    pub fn put<K, V>(&self, key: K, value: V) -> OperationResult<()>
-    where
-        K: AsRef<[u8]>,
-        V: AsRef<[u8]>,
-    {
-        let db = self.database.read();
-        let cf_handle = self.get_column_family(&db)?;
-        db.put_cf_opt(cf_handle, key, value, &Self::get_write_options())
-            .map_err(|err| OperationError::service_error(format!("RocksDB put_cf error: {err}")))?;
-        Ok(())
-    }
-
-    pub fn get_pinned<T, F>(&self, key: &[u8], f: F) -> OperationResult<Option<T>>
-    where
-        F: FnOnce(&[u8]) -> T,
-    {
-        let db = self.database.read();
-        let cf_handle = self.get_column_family(&db)?;
-        let result = db
-            .get_pinned_cf(cf_handle, key)
-            .map_err(|err| {
-                OperationError::service_error(format!("RocksDB get_pinned_cf error: {err}"))
-            })?
-            .map(|value| f(&value));
-        Ok(result)
-    }
-
-    pub fn remove<K>(&self, key: K) -> OperationResult<()>
-    where
-        K: AsRef<[u8]>,
-    {
-        let db = self.database.read();
-        let cf_handle = self.get_column_family(&db)?;
-        db.delete_cf(cf_handle, key).map_err(|err| {
-            OperationError::service_error(format!("RocksDB delete_cf error: {err}"))
-        })?;
-        Ok(())
-    }
-
-    pub fn lock_db(&self) -> LockedDatabaseColumnWrapper {
-        LockedDatabaseColumnWrapper {
-            guard: self.database.read(),
-            column_name: &self.column_name,
-        }
-    }
-
-    pub fn flusher(&self) -> Flusher {
-        let database = self.database.clone();
-        let column_name = self.column_name.clone();
-        Box::new(move || {
-            let db = database.read();
-            let column_family = db.cf_handle(&column_name).ok_or_else(|| {
-                OperationError::service_error(format!(
-                    "RocksDB cf_handle error: Cannot find column family {}",
-                    &column_name
-                ))
-            })?;
-
-            db.flush_cf(column_family).map_err(|err| {
-                OperationError::service_error(format!("RocksDB flush_cf error: {err}"))
-            })?;
-            Ok(())
-        })
-    }
-
-    pub fn create_column_family_if_not_exists(&self) -> OperationResult<()> {
-        let mut db = self.database.write();
-        if db.cf_handle(&self.column_name).is_none() {
-            db.create_cf(&self.column_name, &db_options())
-                .map_err(|err| {
-                    OperationError::service_error(format!("RocksDB create_cf error: {err}"))
-                })?;
-        }
-        Ok(())
-    }
-
-    pub fn recreate_column_family(&self) -> OperationResult<()> {
-        self.remove_column_family()?;
-        self.create_column_family_if_not_exists()
-    }
-
-    pub fn remove_column_family(&self) -> OperationResult<()> {
-        let mut db = self.database.write();
-        if db.cf_handle(&self.column_name).is_some() {
-            db.drop_cf(&self.column_name).map_err(|err| {
-                OperationError::service_error(format!("RocksDB drop_cf error: {err}"))
-            })?;
-        }
-        Ok(())
-    }
-
-    pub fn has_column_family(&self) -> OperationResult<bool> {
-        let db = self.database.read();
-        Ok(db.cf_handle(&self.column_name).is_some())
-    }
-
-    fn get_write_options() -> WriteOptions {
-        let mut write_options = WriteOptions::default();
-        write_options.set_sync(false);
-        write_options.disable_wal(true);
-        write_options
-    }
-
-    fn get_column_family<'a>(
-        &self,
-        db: &'a parking_lot::RwLockReadGuard<'_, DB>,
-    ) -> OperationResult<&'a ColumnFamily> {
-        db.cf_handle(&self.column_name).ok_or_else(|| {
-            OperationError::service_error(format!(
-                "RocksDB cf_handle error: Cannot find column family {}",
-                &self.column_name
-            ))
-        })
-    }
-}
-
-impl<'a> LockedDatabaseColumnWrapper<'a> {
-    pub fn iter(&self) -> OperationResult<DatabaseColumnIterator> {
-        DatabaseColumnIterator::new(&self.guard, self.column_name)
-    }
-}
-
-impl<'a> DatabaseColumnIterator<'a> {
-    pub fn new(db: &'a DB, column_name: &str) -> OperationResult<DatabaseColumnIterator<'a>> {
-        let handle = db.cf_handle(column_name).ok_or_else(|| {
-            OperationError::service_error(format!(
-                "RocksDB cf_handle error: Cannot find column family {column_name}"
-            ))
-        })?;
-        let mut iter = db.raw_iterator_cf(&handle);
-        iter.seek_to_first();
-        Ok(DatabaseColumnIterator {
-            handle,
-            iter,
-            just_seeked: true,
-        })
-    }
-}
-
-impl<'a> Iterator for DatabaseColumnIterator<'a> {
-    type Item = (Box<[u8]>, Box<[u8]>);
-
-    fn next(&mut self) -> Option<Self::Item> {
-        if !self.iter.valid() {
-            return None;
-        }
-
-        // Initial call to next() after seeking should not move the iterator
-        // or the first item will not be returned
-        if self.just_seeked {
-            self.just_seeked = false;
-        } else {
-            self.iter.next();
-        }
-
-        if self.iter.valid() {
-            // .key() and .value() only ever return None if valid == false, which we've just checked
-            Some((
-                Box::from(self.iter.key().unwrap()),
-                Box::from(self.iter.value().unwrap()),
-            ))
-        } else {
-            None
-        }
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/common/utils.rs b/crates/qdrant/lib/segment/src/common/utils.rs
deleted file mode 100644
index 3dbae3e..0000000
--- a/crates/qdrant/lib/segment/src/common/utils.rs
+++ /dev/null
@@ -1,631 +0,0 @@
-use std::collections::HashMap;
-
-use serde_json::Value;
-
-use crate::data_types::named_vectors::NamedVectors;
-use crate::data_types::vectors::VectorElementType;
-use crate::index::field_index::FieldIndex;
-use crate::types::PayloadKeyType;
-
-/// Avoids allocating Vec with a single element
-#[derive(Debug)]
-pub enum MultiValue<T> {
-    Single(Option<T>),
-    Multiple(Vec<T>),
-}
-
-impl<T> Default for MultiValue<T> {
-    fn default() -> Self {
-        Self::Single(None)
-    }
-}
-
-impl<T> MultiValue<T> {
-    pub(crate) fn one(value: T) -> Self {
-        Self::Single(Some(value))
-    }
-
-    fn option(value: Option<T>) -> Self {
-        Self::Single(value)
-    }
-
-    fn push(&mut self, value: T) {
-        match self {
-            Self::Single(opt) => match opt.take() {
-                Some(v) => {
-                    *self = Self::Multiple(vec![v, value]);
-                }
-                None => {
-                    *self = Self::Single(Some(value));
-                }
-            },
-            Self::Multiple(vec) => {
-                vec.push(value);
-            }
-        }
-    }
-
-    fn extend<I: IntoIterator<Item = T>>(&mut self, iter: I) {
-        for value in iter {
-            self.push(value);
-        }
-    }
-
-    pub fn values(self) -> Vec<T> {
-        match self {
-            Self::Single(opt) => opt.into_iter().collect(),
-            Self::Multiple(vec) => vec,
-        }
-    }
-
-    #[cfg(test)]
-    pub(crate) fn as_ref(&self) -> MultiValue<&T> {
-        match self {
-            Self::Single(opt) => MultiValue::option(opt.as_ref()),
-            Self::Multiple(vec) => MultiValue::Multiple(vec.iter().collect()),
-        }
-    }
-}
-
-impl MultiValue<&Value> {
-    pub(crate) fn check_is_empty(&self) -> bool {
-        match self {
-            Self::Multiple(vec) => vec.iter().all(|x| match x {
-                Value::Array(vec) => vec.is_empty(),
-                Value::Null => true,
-                _ => false,
-            }),
-            Self::Single(val) => match val {
-                None => true,
-                Some(Value::Array(vec)) => vec.is_empty(),
-                Some(Value::Null) => true,
-                _ => false,
-            },
-        }
-    }
-
-    pub(crate) fn check_is_null(&self) -> bool {
-        match self {
-            MultiValue::Single(val) => {
-                if let Some(val) = val {
-                    return val.is_null();
-                }
-                false
-            }
-            // { "a": [ { "b": null }, { "b": 1 } ] } => true
-            // { "a": [ { "b": 1 }, { "b": null } ] } => true
-            // { "a": [ { "b": 1 }, { "b": 2 } ] } => false
-            MultiValue::Multiple(vals) => vals.iter().any(|val| val.is_null()),
-        }
-    }
-}
-
-impl<T> IntoIterator for MultiValue<T> {
-    type Item = T;
-    // propagate to Vec internal iterator
-    type IntoIter = std::vec::IntoIter<Self::Item>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        match self {
-            Self::Single(None) => vec![].into_iter(),
-            Self::Single(Some(a)) => vec![a].into_iter(),
-            Self::Multiple(vec) => vec.into_iter(),
-        }
-    }
-}
-
-pub fn rev_range(a: usize, b: usize) -> impl Iterator<Item = usize> {
-    (b + 1..=a).rev()
-}
-
-/// Parse array path and index from path
-///
-/// return Some((path, Some(index))) if path is an array path with index
-fn parse_array_path(path: &str) -> Option<(&str, Option<u32>)> {
-    // shortcut no array path
-    if !path.contains('[') || !path.ends_with(']') {
-        return None;
-    }
-    let mut path = path.split('[');
-    let element = path.next();
-    let index = path.next();
-    match (element, index) {
-        (Some(element), None) => Some((element, None)), // no index info
-        (Some(element), Some("]")) => Some((element, None)), // full array
-        (Some(element), Some(index)) => {
-            let trimmed_index = index.trim_matches(']');
-            // get numeric index
-            match trimmed_index.parse::<u32>() {
-                Ok(num_index) => Some((element, Some(num_index))),
-                Err(_) => None, // not a well formed path array
-            }
-        }
-        _ => None,
-    }
-}
-
-/// Focus on array values references according to array path
-///
-/// Expects to be called with a path that is a path to an Array
-fn focus_array_path<'a>(
-    array_path: &str,
-    array_index: Option<u32>,
-    rest_path: Option<&str>,
-    value: &'a serde_json::Map<String, Value>,
-) -> MultiValue<&'a Value> {
-    match value.get(array_path) {
-        Some(Value::Array(array)) => {
-            let mut values: MultiValue<_> = MultiValue::default();
-            for (i, value) in array.iter().enumerate() {
-                if let Some(array_index) = array_index {
-                    if i == array_index as usize {
-                        match rest_path {
-                            Some(rest_path) => {
-                                // expect an Object if there is a rest path
-                                if let Value::Object(map) = value {
-                                    values.extend(get_value_from_json_map(rest_path, map))
-                                }
-                            }
-                            None => values.push(value),
-                        }
-                    }
-                } else {
-                    match rest_path {
-                        Some(rest_path) => {
-                            // expect an Object if there is a rest path
-                            if let Value::Object(map) = value {
-                                values.extend(get_value_from_json_map(rest_path, map))
-                            }
-                        }
-                        None => values.push(value),
-                    }
-                }
-            }
-            values
-        }
-        _ => MultiValue::default(),
-    }
-}
-
-/// Focus on value references according to path
-/// Flatten intermediate arrays but keep leaf array values on demand.
-/// E.g
-/// {
-///   "arr": [
-///       { "a": [1, 2, 3] },
-///       { "a": 4 },
-///       { "b": 5 }
-///   ]
-/// }
-///
-/// path: "arr[].a"   => Vec![Value::Array[ 1, 2, 3], 4]
-/// path: "arr[].a[]" => Vec![ 1, 2, 3, 4]
-///
-pub fn get_value_from_json_map<'a>(
-    path: &str,
-    value: &'a serde_json::Map<String, Value>,
-) -> MultiValue<&'a Value> {
-    // check if leaf path element
-    match path.split_once('.') {
-        Some((element, rest_path)) => {
-            // check if targeting array
-            match parse_array_path(element) {
-                Some((array_element_path, array_index)) => {
-                    focus_array_path(array_element_path, array_index, Some(rest_path), value)
-                }
-                None => {
-                    // no array notation
-                    match value.get(element) {
-                        Some(Value::Object(map)) => get_value_from_json_map(rest_path, map),
-                        Some(value) => match rest_path.is_empty() {
-                            true => MultiValue::one(value),
-                            false => MultiValue::default(),
-                        },
-                        None => MultiValue::default(),
-                    }
-                }
-            }
-        }
-        None => match parse_array_path(path) {
-            Some((array_element_path, array_index)) => {
-                focus_array_path(array_element_path, array_index, None, value)
-            }
-            None => match value.get(path) {
-                Some(value) => MultiValue::one(value),
-                None => MultiValue::default(),
-            },
-        },
-    }
-}
-
-/// Delete array values according to array path
-///
-/// Expects to be called with a path that is a path to an Array
-fn delete_array_path(
-    array_path: &str,
-    array_index: Option<u32>,
-    rest_path: Option<&str>,
-    value: &mut serde_json::Map<String, Value>,
-) -> MultiValue<Value> {
-    if let Some(Value::Array(array)) = value.get_mut(array_path) {
-        match rest_path {
-            None => {
-                // end of path - delete and collect
-                if let Some(array_index) = array_index {
-                    if array.len() > array_index as usize {
-                        return MultiValue::one(array.remove(array_index as usize));
-                    }
-                } else {
-                    return MultiValue::one(Value::Array(std::mem::take(array)));
-                }
-            }
-            Some(rest_path) => {
-                // dig deeper
-                let mut values = MultiValue::default();
-                for (i, value) in array.iter_mut().enumerate() {
-                    if let Value::Object(map) = value {
-                        if let Some(array_index) = array_index {
-                            if i == array_index as usize {
-                                values.extend(remove_value_from_json_map(rest_path, map));
-                            }
-                        } else {
-                            values.extend(remove_value_from_json_map(rest_path, map));
-                        }
-                    }
-                }
-                return values;
-            }
-        }
-    }
-    // no array found
-    MultiValue::default()
-}
-
-pub fn remove_value_from_json_map(
-    path: &str,
-    value: &mut serde_json::Map<String, Value>,
-) -> MultiValue<Value> {
-    // check if leaf path element
-    match path.split_once('.') {
-        Some((element, rest_path)) => {
-            // check if targeting array
-            match parse_array_path(element) {
-                Some((array_element_path, array_index)) => {
-                    delete_array_path(array_element_path, array_index, Some(rest_path), value)
-                }
-                None => {
-                    // no array notation
-                    if rest_path.is_empty() {
-                        MultiValue::option(value.remove(element))
-                    } else {
-                        match value.get_mut(element) {
-                            None => MultiValue::default(),
-                            Some(Value::Object(map)) => remove_value_from_json_map(rest_path, map),
-                            Some(_value) => MultiValue::default(),
-                        }
-                    }
-                }
-            }
-        }
-        None => match parse_array_path(path) {
-            Some((array_element_path, array_index)) => {
-                delete_array_path(array_element_path, array_index, None, value)
-            }
-            None => MultiValue::option(value.remove(path)),
-        },
-    }
-}
-
-pub fn transpose_map_into_named_vector(
-    map: HashMap<String, Vec<Vec<VectorElementType>>>,
-) -> Vec<NamedVectors<'static>> {
-    let mut result = Vec::new();
-    for (key, values) in map {
-        result.resize_with(values.len(), NamedVectors::default);
-        for (i, value) in values.into_iter().enumerate() {
-            result[i].insert(key.clone(), value);
-        }
-    }
-    result
-}
-
-/// Light abstraction over a JSON path to avoid concatenating strings
-#[derive(Debug, Clone)]
-pub struct JsonPathPayload {
-    pub path: String,
-}
-
-impl JsonPathPayload {
-    pub fn new(path: String) -> Self {
-        Self { path }
-    }
-
-    pub fn extend(&self, segment: &str) -> Self {
-        let full_path = format!("{}.{}", self.path, segment);
-        JsonPathPayload::new(full_path)
-    }
-
-    pub fn extend_or_new(base: Option<&Self>, segment: &str) -> Self {
-        match base {
-            Some(path) => path.extend(segment),
-            None => JsonPathPayload::new(segment.to_string()),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_get_nested_value_from_json_map() {
-        let map = serde_json::from_str::<serde_json::Map<String, Value>>(
-            r#"
-            {
-                "a": {
-                    "b": {
-                        "c": 1
-                    }
-                },
-                "d": 2
-            }
-            "#,
-        )
-        .unwrap();
-
-        assert_eq!(
-            get_value_from_json_map("a.b", &map).values(),
-            vec![&Value::Object(serde_json::Map::from_iter(vec![(
-                "c".to_string(),
-                Value::Number(1.into())
-            )]))]
-        );
-
-        // going deeper
-        assert_eq!(
-            get_value_from_json_map("a.b.c", &map).values(),
-            vec![&Value::Number(1.into())]
-        );
-
-        // missing path
-        assert!(get_value_from_json_map("a.b.c.d", &map).check_is_empty());
-    }
-
-    #[test]
-    fn test_is_empty() {
-        let map = serde_json::from_str::<serde_json::Map<String, Value>>(
-            r#"
-                {
-                   "a": [
-                     { "b": 1 },
-                     { "b": 2 },
-                     { "b": null },
-                     { "d": [] },
-                     { "d": [] },
-                     { "f": null }
-                   ]
-                }
-            "#,
-        )
-        .unwrap();
-        let multivalue = get_value_from_json_map("a[].b", &map);
-        let is_empty = multivalue.check_is_empty();
-
-        assert!(!is_empty, "a[].b is not empty");
-
-        let multivalue = get_value_from_json_map("a[].c", &map);
-        let is_empty = multivalue.check_is_empty();
-
-        assert!(is_empty, "a[].c is empty");
-
-        let multivalue = get_value_from_json_map("a[].d", &map);
-        let is_empty = multivalue.check_is_empty();
-        assert!(is_empty, "a[].d is empty");
-
-        let multivalue = get_value_from_json_map("a[].f", &map);
-        let is_empty = multivalue.check_is_empty();
-        assert!(is_empty, "a[].f is empty");
-    }
-
-    #[test]
-    fn test_get_nested_array_value_from_json_map() {
-        let map = serde_json::from_str::<serde_json::Map<String, Value>>(
-            r#"
-            {
-                "a": {
-                    "b": [
-                        { "c": 1 },
-                        { "c": 2 },
-                        { "d": { "e": 3 } }
-                    ]
-                },
-                "f": 3,
-                "g": ["g0", "g1", "g2"]
-            }
-            "#,
-        )
-        .unwrap();
-
-        // get JSON array
-        assert_eq!(
-            get_value_from_json_map("a.b", &map).values(),
-            vec![&Value::Array(vec![
-                Value::Object(serde_json::Map::from_iter(vec![(
-                    "c".to_string(),
-                    Value::Number(1.into())
-                )])),
-                Value::Object(serde_json::Map::from_iter(vec![(
-                    "c".to_string(),
-                    Value::Number(2.into())
-                )])),
-                Value::Object(serde_json::Map::from_iter(vec![(
-                    "d".to_string(),
-                    Value::Object(serde_json::Map::from_iter(vec![(
-                        "e".to_string(),
-                        Value::Number(3.into())
-                    )]))
-                )]))
-            ])]
-        );
-
-        // a.b[] extract all elements from array
-        assert_eq!(
-            get_value_from_json_map("a.b[]", &map).values(),
-            vec![
-                &Value::Object(serde_json::Map::from_iter(vec![(
-                    "c".to_string(),
-                    Value::Number(1.into())
-                )])),
-                &Value::Object(serde_json::Map::from_iter(vec![(
-                    "c".to_string(),
-                    Value::Number(2.into())
-                )])),
-                &Value::Object(serde_json::Map::from_iter(vec![(
-                    "d".to_string(),
-                    Value::Object(serde_json::Map::from_iter(vec![(
-                        "e".to_string(),
-                        Value::Number(3.into())
-                    )]))
-                )]))
-            ]
-        );
-
-        // project scalar field through array
-        assert_eq!(
-            get_value_from_json_map("a.b[].c", &map).values(),
-            vec![&Value::Number(1.into()), &Value::Number(2.into())]
-        );
-
-        // project object field through array
-        assert_eq!(
-            get_value_from_json_map("a.b[].d", &map).values(),
-            vec![&Value::Object(serde_json::Map::from_iter(vec![(
-                "e".to_string(),
-                Value::Number(3.into())
-            )]))]
-        );
-
-        // select scalar element from array
-        assert_eq!(
-            get_value_from_json_map("a.b[0]", &map).values(),
-            vec![&Value::Object(serde_json::Map::from_iter(vec![(
-                "c".to_string(),
-                Value::Number(1.into())
-            )]))]
-        );
-
-        // select scalar object from array different index
-        assert_eq!(
-            get_value_from_json_map("a.b[1]", &map).values(),
-            vec![&Value::Object(serde_json::Map::from_iter(vec![(
-                "c".to_string(),
-                Value::Number(2.into())
-            )]))]
-        );
-
-        // select field element from array different index
-        assert_eq!(
-            get_value_from_json_map("a.b[1].c", &map).values(),
-            vec![&Value::Number(2.into())]
-        );
-
-        // select scalar element from array different index
-        assert_eq!(
-            get_value_from_json_map("g[2]", &map).values(),
-            vec![&Value::String("g2".to_string())]
-        );
-
-        // select object element from array
-        assert_eq!(
-            get_value_from_json_map("a.b[2]", &map).values(),
-            vec![&Value::Object(serde_json::Map::from_iter(vec![(
-                "d".to_string(),
-                Value::Object(serde_json::Map::from_iter(vec![(
-                    "e".to_string(),
-                    Value::Number(3.into())
-                )]))
-            )]))]
-        );
-
-        // select out of bound index from array
-        assert!(get_value_from_json_map("a.b[3]", &map).check_is_empty());
-
-        // select bad index from array
-        assert!(get_value_from_json_map("a.b[z]", &map).check_is_empty());
-    }
-
-    #[test]
-    fn test_get_deeply_nested_array_value_from_json_map() {
-        let map = serde_json::from_str::<serde_json::Map<String, Value>>(
-            r#"
-            {
-                "arr1": [
-                    {
-                        "arr2": [
-                            {"a": 1, "b": 2}
-                        ]
-                    },
-                    {
-                        "arr2": [
-                            {"a": 3, "b": 4},
-                            {"a": 5, "b": 6}
-                        ]
-                    }
-                ]
-            }
-            "#,
-        )
-        .unwrap();
-
-        // extract and flatten all elements from arrays
-        assert_eq!(
-            get_value_from_json_map("arr1[].arr2[].a", &map).values(),
-            vec![
-                &Value::Number(1.into()),
-                &Value::Number(3.into()),
-                &Value::Number(5.into()),
-            ]
-        );
-    }
-
-    #[test]
-    fn test_no_flatten_array_value_from_json_map() {
-        let map = serde_json::from_str::<serde_json::Map<String, Value>>(
-            r#"
-            {
-                "arr": [
-                    { "a": [1, 2, 3] },
-                    { "a": 4 },
-                    { "b": 5 }
-                ]
-            }
-            "#,
-        )
-        .unwrap();
-
-        // extract and retain structure for arrays arrays
-        assert_eq!(
-            get_value_from_json_map("arr[].a", &map).values(),
-            vec![
-                &Value::Array(vec![
-                    Value::Number(1.into()),
-                    Value::Number(2.into()),
-                    Value::Number(3.into()),
-                ]),
-                &Value::Number(4.into()),
-            ]
-        );
-
-        // expect an array as leaf, ignore non arrays
-        assert_eq!(
-            get_value_from_json_map("arr[].a[]", &map).values(),
-            vec![
-                &Value::Number(1.into()),
-                &Value::Number(2.into()),
-                &Value::Number(3.into()),
-            ]
-        );
-    }
-}
-
-pub type IndexesMap = HashMap<PayloadKeyType, Vec<FieldIndex>>;
diff --git a/crates/qdrant/lib/segment/src/common/vector_utils.rs b/crates/qdrant/lib/segment/src/common/vector_utils.rs
deleted file mode 100644
index 88d169b..0000000
--- a/crates/qdrant/lib/segment/src/common/vector_utils.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-use std::collections::TryReserveError;
-
-pub trait TrySetCapacity {
-    fn try_set_capacity(&mut self, capacity: usize) -> Result<(), TryReserveError>;
-}
-
-pub trait TrySetCapacityExact {
-    fn try_set_capacity_exact(&mut self, capacity: usize) -> Result<(), TryReserveError>;
-}
-
-impl<T> TrySetCapacity for Vec<T> {
-    fn try_set_capacity(&mut self, capacity: usize) -> Result<(), TryReserveError> {
-        let current_capacity = self.capacity();
-        let additional_capacity = capacity.saturating_sub(current_capacity);
-        self.try_reserve(additional_capacity)
-    }
-}
-
-impl<T> TrySetCapacityExact for Vec<T> {
-    fn try_set_capacity_exact(&mut self, capacity: usize) -> Result<(), TryReserveError> {
-        let current_capacity = self.capacity();
-        let additional_capacity = capacity.saturating_sub(current_capacity);
-        self.try_reserve_exact(additional_capacity)
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/common/version.rs b/crates/qdrant/lib/segment/src/common/version.rs
deleted file mode 100644
index 681b15c..0000000
--- a/crates/qdrant/lib/segment/src/common/version.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-use std::fs::File;
-use std::io::{Read, Write};
-use std::path::Path;
-
-use atomicwrites::{AllowOverwrite, AtomicFile};
-
-use crate::common::file_operations::{FileOperationResult, FileStorageError};
-
-pub const VERSION_FILE: &str = "version.info";
-
-/// Structure to save and load version with which the storage was create
-pub trait StorageVersion {
-    // Current crate version needs to be defined in each crate separately,
-    // since the package version is provided at compile time
-    fn current() -> String;
-
-    fn check_exists(path: &Path) -> bool {
-        let version_file = path.join(VERSION_FILE);
-        version_file.exists()
-    }
-
-    fn load(path: &Path) -> FileOperationResult<String> {
-        let version_file = path.join(VERSION_FILE);
-        let mut contents = String::new();
-        let mut file = File::open(version_file)?;
-        file.read_to_string(&mut contents)?;
-        Ok(contents)
-    }
-
-    fn save(path: &Path) -> FileOperationResult<()> {
-        let version_file = path.join(VERSION_FILE);
-        let af = AtomicFile::new(&version_file, AllowOverwrite);
-        let current_version = Self::current();
-        af.write(|f| f.write_all(current_version.as_bytes()))
-            .map_err(|err| {
-                FileStorageError::generic(format!("Can't write {version_file:?}, error: {err}"))
-            })
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/compat.rs b/crates/qdrant/lib/segment/src/compat.rs
deleted file mode 100644
index 7e67cb3..0000000
--- a/crates/qdrant/lib/segment/src/compat.rs
+++ /dev/null
@@ -1,303 +0,0 @@
-#![allow(deprecated)]
-
-use std::collections::HashMap;
-
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-
-use crate::types::{
-    Distance, HnswConfig, Indexes, PayloadStorageType, QuantizationConfig, SegmentConfig,
-    SegmentState, SeqNumberType, VectorDataConfig, VectorStorageType,
-};
-
-#[derive(Default, Debug, Deserialize, Serialize, JsonSchema, Clone)]
-#[serde(rename_all = "snake_case")]
-#[deprecated = "use SegmentConfig instead"]
-pub struct SegmentConfigV5 {
-    pub vector_data: HashMap<String, VectorDataConfigV5>,
-    /// Type of index used for search
-    pub index: Indexes,
-    /// Type of vector storage
-    pub storage_type: StorageTypeV5,
-    /// Defines payload storage type
-    #[serde(default)]
-    pub payload_storage_type: PayloadStorageType,
-    /// Quantization parameters. If none - quantization is disabled.
-    #[serde(default)]
-    pub quantization_config: Option<QuantizationConfig>,
-}
-
-impl From<SegmentConfigV5> for SegmentConfig {
-    fn from(old_segment: SegmentConfigV5) -> Self {
-        let vector_data = old_segment
-            .vector_data
-            .into_iter()
-            .map(|(vector_name, old_data)| {
-                let new_data = VectorDataConfig {
-                    size: old_data.size,
-                    distance: old_data.distance,
-                    // Use HNSW index if vector specific one is set, or fall back to segment index
-                    index: match old_data.hnsw_config {
-                        Some(hnsw_config) => Indexes::Hnsw(hnsw_config),
-                        None => old_segment.index.clone(),
-                    },
-                    // Remove vector specific quantization config if no segment one is set
-                    // This is required because in some cases this was incorrectly set on the vector
-                    // level
-                    quantization_config: old_segment
-                        .quantization_config
-                        .as_ref()
-                        .and(old_data.quantization_config),
-                    // Mmap if explicitly on disk, otherwise convert old storage type
-                    storage_type: (old_data.on_disk == Some(true))
-                        .then_some(VectorStorageType::Mmap)
-                        .unwrap_or_else(|| old_segment.storage_type.into()),
-                };
-
-                (vector_name, new_data)
-            })
-            .collect();
-
-        SegmentConfig {
-            vector_data,
-            payload_storage_type: old_segment.payload_storage_type,
-        }
-    }
-}
-
-/// Type of vector storage
-#[derive(Default, Debug, Deserialize, Serialize, JsonSchema, Copy, Clone, PartialEq, Eq)]
-#[serde(rename_all = "snake_case")]
-#[serde(tag = "type", content = "options")]
-#[deprecated]
-pub enum StorageTypeV5 {
-    // Store vectors in memory and use persistence storage only if vectors are changed
-    #[default]
-    InMemory,
-    // Use memmap to store vectors, a little slower than `InMemory`, but requires little RAM
-    Mmap,
-}
-
-impl From<StorageTypeV5> for VectorStorageType {
-    fn from(old: StorageTypeV5) -> Self {
-        match old {
-            StorageTypeV5::InMemory => Self::Memory,
-            StorageTypeV5::Mmap => Self::Mmap,
-        }
-    }
-}
-
-/// Config of single vector data storage
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone)]
-#[serde(rename_all = "snake_case")]
-#[deprecated = "use VectorDataConfig instead"]
-pub struct VectorDataConfigV5 {
-    /// Size of a vectors used
-    pub size: usize,
-    /// Type of distance function used for measuring distance between vectors
-    pub distance: Distance,
-    /// Vector specific HNSW config that overrides collection config
-    #[serde(default)]
-    pub hnsw_config: Option<HnswConfig>,
-    /// Vector specific quantization config that overrides collection config
-    #[serde(default)]
-    pub quantization_config: Option<QuantizationConfig>,
-    /// If true - vectors will not be stored in memory.
-    /// Instead, it will store vectors on mmap-files.
-    /// If enabled, search performance will defined by disk speed
-    /// and fraction of vectors that fit in RAM.
-    #[serde(default)]
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub on_disk: Option<bool>,
-}
-
-#[derive(Debug, Deserialize, Clone)]
-#[serde(rename_all = "snake_case")]
-#[deprecated = "use SegmentState instead"]
-pub struct SegmentStateV5 {
-    pub version: Option<SeqNumberType>,
-    pub config: SegmentConfigV5,
-}
-
-impl From<SegmentStateV5> for SegmentState {
-    fn from(old: SegmentStateV5) -> Self {
-        Self {
-            version: old.version,
-            config: old.config.into(),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::types::{ScalarQuantization, ScalarQuantizationConfig};
-
-    #[test]
-    fn convert_from_v5_to_newest() {
-        let old_segment = SegmentConfigV5 {
-            vector_data: vec![
-                (
-                    "vec1".to_string(),
-                    VectorDataConfigV5 {
-                        size: 10,
-                        distance: Distance::Dot,
-                        hnsw_config: Some(HnswConfig {
-                            m: 20,
-                            ef_construct: 100,
-                            full_scan_threshold: 10000,
-                            max_indexing_threads: 0,
-                            on_disk: None,
-                            payload_m: Some(10),
-                        }),
-                        quantization_config: None,
-                        on_disk: None,
-                    },
-                ),
-                (
-                    "vec2".to_string(),
-                    VectorDataConfigV5 {
-                        size: 10,
-                        distance: Distance::Dot,
-                        hnsw_config: None,
-                        quantization_config: Some(QuantizationConfig::Scalar(ScalarQuantization {
-                            scalar: ScalarQuantizationConfig {
-                                r#type: Default::default(),
-                                quantile: Some(0.99),
-                                always_ram: Some(true),
-                            },
-                        })),
-                        on_disk: None,
-                    },
-                ),
-            ]
-            .into_iter()
-            .collect(),
-            index: Indexes::Hnsw(HnswConfig {
-                m: 25,
-                ef_construct: 120,
-                full_scan_threshold: 10000,
-                max_indexing_threads: 0,
-                on_disk: None,
-                payload_m: None,
-            }),
-            storage_type: StorageTypeV5::InMemory,
-            payload_storage_type: PayloadStorageType::default(),
-            quantization_config: None,
-        };
-
-        let new_segment: SegmentConfig = old_segment.into();
-
-        eprintln!("new = {:#?}", new_segment);
-
-        match &new_segment.vector_data.get("vec1").unwrap().index {
-            Indexes::Plain { .. } => panic!("expected HNSW index"),
-            Indexes::Hnsw(hnsw) => {
-                assert_eq!(hnsw.m, 20);
-            }
-        }
-
-        match &new_segment.vector_data.get("vec2").unwrap().index {
-            Indexes::Plain { .. } => panic!("expected HNSW index"),
-            Indexes::Hnsw(hnsw) => {
-                assert_eq!(hnsw.m, 25);
-            }
-        }
-
-        if new_segment
-            .vector_data
-            .get("vec1")
-            .unwrap()
-            .quantization_config
-            .is_some()
-        {
-            panic!("expected no quantization");
-        }
-    }
-
-    #[test]
-    fn convert_from_v5_to_newest_2() {
-        let old_segment = SegmentConfigV5 {
-            vector_data: vec![
-                (
-                    "vec1".to_string(),
-                    VectorDataConfigV5 {
-                        size: 10,
-                        distance: Distance::Dot,
-                        hnsw_config: None,
-                        quantization_config: None,
-                        on_disk: None,
-                    },
-                ),
-                (
-                    "vec2".to_string(),
-                    VectorDataConfigV5 {
-                        size: 10,
-                        distance: Distance::Dot,
-                        hnsw_config: None,
-                        quantization_config: Some(QuantizationConfig::Scalar(ScalarQuantization {
-                            scalar: ScalarQuantizationConfig {
-                                r#type: Default::default(),
-                                quantile: Some(0.99),
-                                always_ram: Some(true),
-                            },
-                        })),
-                        on_disk: None,
-                    },
-                ),
-            ]
-            .into_iter()
-            .collect(),
-            index: Indexes::Hnsw(HnswConfig {
-                m: 25,
-                ef_construct: 120,
-                full_scan_threshold: 10000,
-                max_indexing_threads: 0,
-                on_disk: None,
-                payload_m: None,
-            }),
-            storage_type: StorageTypeV5::InMemory,
-            payload_storage_type: PayloadStorageType::default(),
-            quantization_config: Some(QuantizationConfig::Scalar(ScalarQuantization {
-                scalar: ScalarQuantizationConfig {
-                    r#type: Default::default(),
-                    quantile: Some(0.95),
-                    always_ram: Some(true),
-                },
-            })),
-        };
-
-        let new_segment: SegmentConfig = old_segment.into();
-
-        eprintln!("new = {:#?}", new_segment);
-
-        if new_segment
-            .vector_data
-            .get("vec1")
-            .unwrap()
-            .quantization_config
-            .is_some()
-        {
-            panic!("expected no quantization");
-        }
-
-        match &new_segment
-            .vector_data
-            .get("vec2")
-            .unwrap()
-            .quantization_config
-        {
-            Some(q) => match q {
-                QuantizationConfig::Scalar(scalar) => {
-                    assert_eq!(scalar.scalar.quantile, Some(0.99));
-                }
-                QuantizationConfig::Product(_) => {
-                    panic!("expected scalar quantization")
-                }
-            },
-            _ => {
-                panic!("expected quantization")
-            }
-        }
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/data_types/groups.rs b/crates/qdrant/lib/segment/src/data_types/groups.rs
deleted file mode 100644
index 9000c9f..0000000
--- a/crates/qdrant/lib/segment/src/data_types/groups.rs
+++ /dev/null
@@ -1,85 +0,0 @@
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use serde_json::json;
-
-/// Value of the group_by key, shared across all the hits in the group
-#[derive(Debug, Serialize, Deserialize, JsonSchema, Eq, PartialEq, Clone, Hash)]
-#[serde(untagged)]
-pub enum GroupId {
-    String(String),
-    NumberU64(u64),
-    NumberI64(i64),
-}
-
-impl From<u64> for GroupId {
-    fn from(id: u64) -> Self {
-        GroupId::NumberU64(id)
-    }
-}
-
-impl From<i64> for GroupId {
-    fn from(id: i64) -> Self {
-        GroupId::NumberI64(id)
-    }
-}
-
-impl From<String> for GroupId {
-    fn from(id: String) -> Self {
-        GroupId::String(id)
-    }
-}
-
-impl From<&str> for GroupId {
-    fn from(id: &str) -> Self {
-        GroupId::String(id.to_string())
-    }
-}
-
-impl From<GroupId> for serde_json::Value {
-    fn from(key: GroupId) -> Self {
-        match key {
-            GroupId::String(s) => serde_json::Value::String(s),
-            GroupId::NumberU64(n) => json!(n),
-            GroupId::NumberI64(n) => json!(n),
-        }
-    }
-}
-
-impl TryFrom<&serde_json::Value> for GroupId {
-    type Error = ();
-
-    /// Only allows Strings and Numbers to be converted into GroupId
-    fn try_from(value: &serde_json::Value) -> Result<Self, Self::Error> {
-        match value {
-            serde_json::Value::String(s) => Ok(Self::String(s.to_string())),
-            serde_json::Value::Number(n) => {
-                if let Some(n_u64) = n.as_u64() {
-                    Ok(Self::NumberU64(n_u64))
-                } else if let Some(n_i64) = n.as_i64() {
-                    Ok(Self::NumberI64(n_i64))
-                } else {
-                    Err(())
-                }
-            }
-            _ => Err(()),
-        }
-    }
-}
-
-impl GroupId {
-    pub fn as_i64(&self) -> Option<i64> {
-        match self {
-            GroupId::NumberI64(id) => Some(*id),
-            GroupId::NumberU64(id) => i64::try_from(*id).ok(),
-            GroupId::String(_) => None,
-        }
-    }
-
-    pub fn as_u64(&self) -> Option<u64> {
-        match self {
-            GroupId::NumberI64(id) => u64::try_from(*id).ok(),
-            GroupId::NumberU64(id) => Some(*id),
-            GroupId::String(_) => None,
-        }
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/data_types/mod.rs b/crates/qdrant/lib/segment/src/data_types/mod.rs
deleted file mode 100644
index cf1a5b5..0000000
--- a/crates/qdrant/lib/segment/src/data_types/mod.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-pub mod groups;
-pub mod named_vectors;
-pub mod text_index;
-pub mod tiny_map;
-pub mod vectors;
diff --git a/crates/qdrant/lib/segment/src/data_types/named_vectors.rs b/crates/qdrant/lib/segment/src/data_types/named_vectors.rs
deleted file mode 100644
index 78fc323..0000000
--- a/crates/qdrant/lib/segment/src/data_types/named_vectors.rs
+++ /dev/null
@@ -1,120 +0,0 @@
-use std::borrow::Cow;
-use std::collections::HashMap;
-
-use super::tiny_map;
-use super::vectors::{VectorElementType, DEFAULT_VECTOR_NAME};
-use crate::types::Distance;
-
-type CowKey<'a> = Cow<'a, str>;
-type CowValue<'a> = Cow<'a, [VectorElementType]>;
-type TinyMap<'a> = tiny_map::TinyMap<CowKey<'a>, CowValue<'a>>;
-
-#[derive(Clone, Debug, Default, PartialEq)]
-pub struct NamedVectors<'a> {
-    map: TinyMap<'a>,
-}
-
-impl<'a> NamedVectors<'a> {
-    pub fn from_ref(key: &'a str, value: &'a [VectorElementType]) -> Self {
-        let mut map = TinyMap::new();
-        map.insert(Cow::Borrowed(key), Cow::Borrowed(value));
-        Self { map }
-    }
-
-    pub fn from<const N: usize>(arr: [(String, Vec<VectorElementType>); N]) -> Self {
-        NamedVectors {
-            map: arr
-                .into_iter()
-                .map(|(k, v)| (CowKey::from(k), CowValue::from(v)))
-                .collect(),
-        }
-    }
-
-    pub fn from_map(map: HashMap<String, Vec<VectorElementType>>) -> Self {
-        Self {
-            map: map
-                .into_iter()
-                .map(|(k, v)| (CowKey::from(k), CowValue::from(v)))
-                .collect(),
-        }
-    }
-
-    pub fn from_map_ref(map: &'a HashMap<String, Vec<VectorElementType>>) -> Self {
-        Self {
-            map: map
-                .iter()
-                .map(|(k, v)| (CowKey::from(k), CowValue::from(v)))
-                .collect(),
-        }
-    }
-
-    pub fn insert(&mut self, name: String, vector: Vec<VectorElementType>) {
-        self.map
-            .insert(CowKey::Owned(name), CowValue::Owned(vector));
-    }
-
-    pub fn insert_ref(&mut self, name: &'a str, vector: &'a [VectorElementType]) {
-        self.map
-            .insert(CowKey::Borrowed(name), CowValue::Borrowed(vector));
-    }
-
-    pub fn contains_key(&self, key: &str) -> bool {
-        self.map.contains_key(key)
-    }
-
-    pub fn len(&self) -> usize {
-        self.map.len()
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.map.is_empty()
-    }
-
-    pub fn keys(&self) -> impl Iterator<Item = &str> {
-        self.map.iter().map(|(k, _)| k.as_ref())
-    }
-
-    pub fn into_default_vector(mut self) -> Option<Vec<VectorElementType>> {
-        self.map
-            .get_mut(DEFAULT_VECTOR_NAME)
-            .map(|src| std::mem::take(src).into_owned())
-    }
-
-    pub fn into_owned_map(self) -> HashMap<String, Vec<VectorElementType>> {
-        self.map
-            .into_iter()
-            .map(|(k, v)| (k.into_owned(), v.into_owned()))
-            .collect()
-    }
-
-    pub fn iter(&self) -> impl Iterator<Item = (&str, &[VectorElementType])> {
-        self.map.iter().map(|(k, v)| (k.as_ref(), v.as_ref()))
-    }
-
-    pub fn get(&self, key: &str) -> Option<&[VectorElementType]> {
-        self.map.get(key).map(|v| v.as_ref())
-    }
-
-    pub fn preprocess<F>(&mut self, distance_map: F)
-    where
-        F: Fn(&str) -> Distance,
-    {
-        for (name, vector) in self.map.iter_mut() {
-            let distance = distance_map(name);
-            if let Some(preprocessed_vector) = distance.preprocess_vector(vector) {
-                *vector = CowValue::Owned(preprocessed_vector);
-            }
-        }
-    }
-}
-
-impl<'a> IntoIterator for NamedVectors<'a> {
-    type Item = (CowKey<'a>, CowValue<'a>);
-
-    type IntoIter =
-        tinyvec::TinyVecIterator<[(CowKey<'a>, CowValue<'a>); super::tiny_map::CAPACITY]>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        self.map.into_iter()
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/data_types/text_index.rs b/crates/qdrant/lib/segment/src/data_types/text_index.rs
deleted file mode 100644
index ffe6576..0000000
--- a/crates/qdrant/lib/segment/src/data_types/text_index.rs
+++ /dev/null
@@ -1,44 +0,0 @@
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-
-// #[derive(Debug, Deserialize, Serialize, JsonSchema, Clone, Copy, PartialEq, Hash, Eq)]
-// #[serde(rename_all = "snake_case")]
-// pub enum TextFieldType {
-//     Text
-// }
-
-#[derive(Default, Debug, Deserialize, Serialize, JsonSchema, Clone, Copy, PartialEq, Hash, Eq)]
-#[serde(rename_all = "snake_case")]
-pub enum TokenizerType {
-    Prefix,
-    Whitespace,
-    #[default]
-    Word,
-    Multilingual,
-}
-
-#[derive(Default, Debug, Deserialize, Serialize, JsonSchema, Clone, Copy, PartialEq, Hash, Eq)]
-#[serde(rename_all = "snake_case")]
-pub enum TextIndexType {
-    #[default]
-    Text,
-}
-
-#[derive(Debug, Default, Deserialize, Serialize, JsonSchema, Clone, PartialEq, Hash, Eq)]
-#[serde(rename_all = "snake_case")]
-pub struct TextIndexParams {
-    // Required for OpenAPI pattern matching
-    pub r#type: TextIndexType,
-    #[serde(default)]
-    pub tokenizer: TokenizerType,
-    #[serde(default)]
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub min_token_len: Option<usize>,
-    #[serde(default)]
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub max_token_len: Option<usize>,
-    #[serde(default)]
-    #[serde(skip_serializing_if = "Option::is_none")]
-    /// If true, lowercase all tokens. Default: true
-    pub lowercase: Option<bool>,
-}
diff --git a/crates/qdrant/lib/segment/src/data_types/tiny_map.rs b/crates/qdrant/lib/segment/src/data_types/tiny_map.rs
deleted file mode 100644
index 3406c3f..0000000
--- a/crates/qdrant/lib/segment/src/data_types/tiny_map.rs
+++ /dev/null
@@ -1,221 +0,0 @@
-use std::{borrow, iter, mem, slice};
-
-use tinyvec::TinyVec;
-
-pub const CAPACITY: usize = 3;
-
-#[derive(Clone, Debug, Default)]
-pub struct TinyMap<K, V>
-where
-    K: Default,
-    V: Default,
-{
-    list: TinyVec<[(K, V); CAPACITY]>,
-}
-
-impl<K, V> TinyMap<K, V>
-where
-    K: Default,
-    V: Default,
-{
-    pub fn new() -> Self {
-        Self {
-            list: TinyVec::new(),
-        }
-    }
-
-    pub fn insert_no_check(&mut self, key: K, value: V) {
-        self.list.push((key, value));
-    }
-
-    pub fn len(&self) -> usize {
-        self.list.len()
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.list.is_empty()
-    }
-
-    pub fn iter(&self) -> slice::Iter<'_, (K, V)> {
-        self.list.iter()
-    }
-
-    pub fn iter_mut(&mut self) -> slice::IterMut<'_, (K, V)> {
-        self.list.iter_mut()
-    }
-
-    pub fn clear(&mut self) {
-        self.list.clear();
-    }
-
-    pub fn keys(&self) -> impl Iterator<Item = &K> {
-        self.list.iter().map(|(k, _)| k)
-    }
-
-    pub fn values(&self) -> impl Iterator<Item = &V> {
-        self.list.iter().map(|(_, v)| v)
-    }
-
-    pub fn values_mut(&mut self) -> impl Iterator<Item = &mut V> {
-        self.list.iter_mut().map(|(_, v)| v)
-    }
-}
-
-impl<K, V> TinyMap<K, V>
-where
-    K: Default + Eq,
-    V: Default,
-{
-    pub fn insert(&mut self, key: K, value: V) -> Option<V> {
-        let found = self.list.iter_mut().find(|(k, _)| k == &key);
-        match found {
-            Some((_, v)) => {
-                let old = mem::replace(v, value);
-                Some(old)
-            }
-            None => {
-                self.list.push((key, value));
-                None
-            }
-        }
-    }
-
-    pub fn get<Q: ?Sized>(&self, key: &Q) -> Option<&V>
-    where
-        K: borrow::Borrow<Q>,
-        Q: Eq,
-    {
-        self.list
-            .iter()
-            .find(|(k, _)| k.borrow() == key)
-            .map(|(_, v)| v)
-    }
-
-    pub fn get_mut<Q: ?Sized>(&mut self, key: &Q) -> Option<&mut V>
-    where
-        K: borrow::Borrow<Q>,
-        Q: Eq,
-    {
-        self.list
-            .iter_mut()
-            .find(|(k, _)| k.borrow() == key)
-            .map(|(_, v)| v)
-    }
-
-    pub fn remove(&mut self, key: &K) -> Option<V> {
-        let found = self.list.iter().position(|(k, _)| k == key);
-        match found {
-            Some(i) => {
-                let (_, v) = self.list.remove(i);
-                Some(v)
-            }
-            None => None,
-        }
-    }
-
-    pub fn contains_key<Q: ?Sized>(&self, key: &Q) -> bool
-    where
-        K: borrow::Borrow<Q>,
-        Q: Eq,
-    {
-        self.list.iter().any(|(k, _)| k.borrow() == key)
-    }
-}
-
-impl<K, V> PartialEq for TinyMap<K, V>
-where
-    K: Default + Eq,
-    V: Default + PartialEq,
-{
-    fn eq(&self, other: &Self) -> bool {
-        if self.len() != other.len() {
-            return false;
-        }
-
-        for (k, v) in self.iter() {
-            if other.get(k) != Some(v) {
-                return false;
-            }
-        }
-
-        true
-    }
-}
-
-impl<K, V> IntoIterator for TinyMap<K, V>
-where
-    K: Default,
-    V: Default,
-{
-    type Item = (K, V);
-
-    type IntoIter = tinyvec::TinyVecIterator<[(K, V); CAPACITY]>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        self.list.into_iter()
-    }
-}
-
-impl<K, V> iter::FromIterator<(K, V)> for TinyMap<K, V>
-where
-    K: Default,
-    V: Default,
-{
-    fn from_iter<T: IntoIterator<Item = (K, V)>>(iter: T) -> Self {
-        Self {
-            list: iter::FromIterator::from_iter(iter),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_tiny_map_basic_operations() {
-        // Create dummy data
-        let mut map: TinyMap<String, String> = TinyMap::new();
-        let key = "key".to_string();
-        let mut value = "value".to_string();
-        let key2 = "key2".to_string();
-        let value2 = "value2".to_string();
-        let key3 = "key3".to_string();
-        let value3 = "value3".to_string();
-
-        // Test insert
-        map.insert(key.clone(), value.clone());
-        assert_eq!(map.len(), 1);
-        assert_eq!(map.get(&key), Some(&value));
-
-        // Test insert_no_check
-        map.insert_no_check(key2.clone(), value2.clone());
-        assert_eq!(map.len(), 2);
-        assert_eq!(map.get(&key2), Some(&value2));
-
-        // Test insert overwrite
-        map.insert(key.clone(), value3.clone());
-        assert_eq!(map.len(), 2);
-        assert_eq!(map.get(&key), Some(&value3));
-
-        // Test remove
-        map.remove(&key);
-        assert_eq!(map.len(), 1);
-        assert_eq!(map.get(&key), None);
-
-        // Test get_mut
-        map.clear();
-        map.insert(key.clone(), value.clone());
-        assert_eq!(map.get_mut(&key), Some(&mut value));
-        *map.get_mut(&key).unwrap() = value3.clone();
-        assert_eq!(map.get(&key), Some(&value3));
-
-        // Test iter
-        map.clear();
-        map.insert(key2.clone(), value2.clone());
-        map.insert(key3.clone(), value3.clone());
-        let mut iter = map.iter();
-        assert_eq!(iter.next(), Some(&(key2, value2)));
-        assert_eq!(iter.next(), Some(&(key3, value3)));
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/data_types/vectors.rs b/crates/qdrant/lib/segment/src/data_types/vectors.rs
deleted file mode 100644
index 6f74616..0000000
--- a/crates/qdrant/lib/segment/src/data_types/vectors.rs
+++ /dev/null
@@ -1,205 +0,0 @@
-use std::collections::HashMap;
-
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-
-use super::named_vectors::NamedVectors;
-use crate::common::utils::transpose_map_into_named_vector;
-
-/// Type of vector element.
-pub type VectorElementType = f32;
-
-pub const DEFAULT_VECTOR_NAME: &str = "";
-
-/// Type for vector
-pub type VectorType = Vec<VectorElementType>;
-
-pub fn default_vector(vec: Vec<VectorElementType>) -> NamedVectors<'static> {
-    NamedVectors::from([(DEFAULT_VECTOR_NAME.to_owned(), vec)])
-}
-
-pub fn only_default_vector(vec: &[VectorElementType]) -> NamedVectors {
-    NamedVectors::from_ref(DEFAULT_VECTOR_NAME, vec)
-}
-
-/// Full vector data per point separator with single and multiple vector modes
-#[derive(Clone, Debug, PartialEq, Deserialize, Serialize, JsonSchema)]
-#[serde(untagged, rename_all = "snake_case")]
-pub enum VectorStruct {
-    Single(VectorType),
-    Multi(HashMap<String, VectorType>),
-}
-
-impl VectorStruct {
-    /// Check if this vector struct is empty.
-    pub fn is_empty(&self) -> bool {
-        match self {
-            VectorStruct::Single(vector) => vector.is_empty(),
-            VectorStruct::Multi(vectors) => vectors.values().all(|v| v.is_empty()),
-        }
-    }
-}
-
-impl From<VectorType> for VectorStruct {
-    fn from(v: VectorType) -> Self {
-        VectorStruct::Single(v)
-    }
-}
-
-impl From<&[VectorElementType]> for VectorStruct {
-    fn from(v: &[VectorElementType]) -> Self {
-        VectorStruct::Single(v.to_vec())
-    }
-}
-
-impl<'a> From<NamedVectors<'a>> for VectorStruct {
-    fn from(v: NamedVectors) -> Self {
-        if v.len() == 1 && v.contains_key(DEFAULT_VECTOR_NAME) {
-            VectorStruct::Single(v.into_default_vector().unwrap())
-        } else {
-            VectorStruct::Multi(v.into_owned_map())
-        }
-    }
-}
-
-impl VectorStruct {
-    pub fn get(&self, name: &str) -> Option<&VectorType> {
-        match self {
-            VectorStruct::Single(v) => (name == DEFAULT_VECTOR_NAME).then_some(v),
-            VectorStruct::Multi(v) => v.get(name),
-        }
-    }
-
-    pub fn into_all_vectors(self) -> NamedVectors<'static> {
-        match self {
-            VectorStruct::Single(v) => default_vector(v),
-            VectorStruct::Multi(v) => NamedVectors::from_map(v),
-        }
-    }
-}
-
-/// Vector data with name
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone)]
-#[serde(rename_all = "snake_case")]
-pub struct NamedVector {
-    /// Name of vector data
-    pub name: String,
-    /// Vector data
-    pub vector: VectorType,
-}
-
-/// Vector data separator for named and unnamed modes
-/// Unanmed mode:
-///
-/// {
-///   "vector": [1.0, 2.0, 3.0]
-/// }
-///
-/// or named mode:
-///
-/// {
-///   "vector": {
-///     "vector": [1.0, 2.0, 3.0],
-///     "name": "image-embeddings"
-///   }
-/// }
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone)]
-#[serde(rename_all = "snake_case")]
-#[serde(untagged)]
-pub enum NamedVectorStruct {
-    Default(VectorType),
-    Named(NamedVector),
-}
-
-impl From<VectorType> for NamedVectorStruct {
-    fn from(v: VectorType) -> Self {
-        NamedVectorStruct::Default(v)
-    }
-}
-
-impl From<NamedVectorStruct> for NamedVector {
-    fn from(v: NamedVectorStruct) -> Self {
-        match v {
-            NamedVectorStruct::Default(v) => NamedVector {
-                name: DEFAULT_VECTOR_NAME.to_owned(),
-                vector: v,
-            },
-            NamedVectorStruct::Named(v) => v,
-        }
-    }
-}
-
-impl From<NamedVector> for NamedVectorStruct {
-    fn from(v: NamedVector) -> Self {
-        NamedVectorStruct::Named(v)
-    }
-}
-
-impl NamedVectorStruct {
-    pub fn get_name(&self) -> &str {
-        match self {
-            NamedVectorStruct::Default(_) => DEFAULT_VECTOR_NAME,
-            NamedVectorStruct::Named(v) => &v.name,
-        }
-    }
-
-    pub fn get_vector(&self) -> &VectorType {
-        match self {
-            NamedVectorStruct::Default(v) => v,
-            NamedVectorStruct::Named(v) => &v.vector,
-        }
-    }
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone)]
-#[serde(rename_all = "snake_case")]
-#[serde(untagged)]
-pub enum BatchVectorStruct {
-    Single(Vec<VectorType>),
-    Multi(HashMap<String, Vec<VectorType>>),
-}
-
-impl From<Vec<VectorType>> for BatchVectorStruct {
-    fn from(v: Vec<VectorType>) -> Self {
-        BatchVectorStruct::Single(v)
-    }
-}
-
-impl From<HashMap<String, Vec<VectorType>>> for BatchVectorStruct {
-    fn from(v: HashMap<String, Vec<VectorType>>) -> Self {
-        if v.len() == 1 && v.contains_key(DEFAULT_VECTOR_NAME) {
-            BatchVectorStruct::Single(v.into_iter().next().unwrap().1)
-        } else {
-            BatchVectorStruct::Multi(v)
-        }
-    }
-}
-
-impl BatchVectorStruct {
-    pub fn single(&mut self) -> &mut Vec<VectorType> {
-        match self {
-            BatchVectorStruct::Single(v) => v,
-            BatchVectorStruct::Multi(v) => v.get_mut(DEFAULT_VECTOR_NAME).unwrap(),
-        }
-    }
-
-    pub fn multi(&mut self) -> &mut HashMap<String, Vec<VectorType>> {
-        match self {
-            BatchVectorStruct::Single(_) => panic!("BatchVectorStruct is not Single"),
-            BatchVectorStruct::Multi(v) => v,
-        }
-    }
-
-    pub fn into_all_vectors(self, num_records: usize) -> Vec<NamedVectors<'static>> {
-        match self {
-            BatchVectorStruct::Single(vectors) => vectors.into_iter().map(default_vector).collect(),
-            BatchVectorStruct::Multi(named_vectors) => {
-                if named_vectors.is_empty() {
-                    vec![NamedVectors::default(); num_records]
-                } else {
-                    transpose_map_into_named_vector(named_vectors)
-                }
-            }
-        }
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/entry/entry_point.rs b/crates/qdrant/lib/segment/src/entry/entry_point.rs
deleted file mode 100644
index 70dc6de..0000000
--- a/crates/qdrant/lib/segment/src/entry/entry_point.rs
+++ /dev/null
@@ -1,383 +0,0 @@
-use std::backtrace::Backtrace;
-use std::collections::{HashMap, TryReserveError};
-use std::io::{Error as IoError, ErrorKind};
-use std::path::{Path, PathBuf};
-use std::result;
-use std::sync::atomic::{AtomicBool, Ordering};
-
-use atomicwrites::Error as AtomicIoError;
-use rayon::ThreadPoolBuildError;
-use thiserror::Error;
-
-use crate::common::file_operations::FileStorageError;
-use crate::common::mmap_type::Error as MmapError;
-use crate::data_types::named_vectors::NamedVectors;
-use crate::data_types::vectors::VectorElementType;
-use crate::index::field_index::CardinalityEstimation;
-use crate::telemetry::SegmentTelemetry;
-use crate::types::{
-    Filter, Payload, PayloadFieldSchema, PayloadKeyType, PayloadKeyTypeRef, PointIdType,
-    ScoredPoint, SearchParams, SegmentConfig, SegmentInfo, SegmentType, SeqNumberType, WithPayload,
-    WithVector,
-};
-use crate::utils::mem::Mem;
-
-#[derive(Error, Debug, Clone)]
-#[error("{0}")]
-pub enum OperationError {
-    #[error("Vector inserting error: expected dim: {expected_dim}, got {received_dim}")]
-    WrongVector {
-        expected_dim: usize,
-        received_dim: usize,
-    },
-    #[error("Not existing vector name error: {received_name}")]
-    VectorNameNotExists { received_name: String },
-    #[error("Missed vector name error: {received_name}")]
-    MissedVectorName { received_name: String },
-    #[error("No point with id {missed_point_id}")]
-    PointIdError { missed_point_id: PointIdType },
-    #[error("Payload type does not match with previously given for field {field_name}. Expected: {expected_type}")]
-    TypeError {
-        field_name: PayloadKeyType,
-        expected_type: String,
-    },
-    #[error("Unable to infer type for the field '{field_name}'. Please specify `field_type`")]
-    TypeInferenceError { field_name: PayloadKeyType },
-    /// Service Error prevents further update of the collection until it is fixed.
-    /// Should only be used for hardware, data corruption, IO, or other unexpected internal errors.
-    #[error("Service runtime error: {description}")]
-    ServiceError {
-        description: String,
-        backtrace: Option<String>,
-    },
-    #[error("Inconsistent storage: {description}")]
-    InconsistentStorage { description: String },
-    #[error("Out of memory, free: {free}, {description}")]
-    OutOfMemory { description: String, free: u64 },
-    #[error("Operation cancelled: {description}")]
-    Cancelled { description: String },
-}
-
-impl OperationError {
-    pub fn service_error(description: impl Into<String>) -> OperationError {
-        OperationError::ServiceError {
-            description: description.into(),
-            backtrace: Some(Backtrace::force_capture().to_string()),
-        }
-    }
-}
-
-pub fn check_process_stopped(stopped: &AtomicBool) -> OperationResult<()> {
-    if stopped.load(Ordering::Relaxed) {
-        return Err(OperationError::Cancelled {
-            description: "process cancelled by service".to_string(),
-        });
-    }
-    Ok(())
-}
-
-/// Contains information regarding last operation error, which should be fixed before next operation could be processed
-#[derive(Debug, Clone)]
-pub struct SegmentFailedState {
-    pub version: SeqNumberType,
-    pub point_id: Option<PointIdType>,
-    pub error: OperationError,
-}
-
-impl From<semver::Error> for OperationError {
-    fn from(error: semver::Error) -> Self {
-        OperationError::ServiceError {
-            description: error.to_string(),
-            backtrace: Some(Backtrace::force_capture().to_string()),
-        }
-    }
-}
-
-impl From<ThreadPoolBuildError> for OperationError {
-    fn from(error: ThreadPoolBuildError) -> Self {
-        OperationError::ServiceError {
-            description: format!("{error}"),
-            backtrace: Some(Backtrace::force_capture().to_string()),
-        }
-    }
-}
-
-impl From<FileStorageError> for OperationError {
-    fn from(err: FileStorageError) -> Self {
-        Self::service_error(err.to_string())
-    }
-}
-
-impl From<MmapError> for OperationError {
-    fn from(err: MmapError) -> Self {
-        Self::service_error(err.to_string())
-    }
-}
-
-impl From<serde_cbor::Error> for OperationError {
-    fn from(err: serde_cbor::Error) -> Self {
-        OperationError::service_error(format!("Failed to parse data: {err}"))
-    }
-}
-
-impl<E> From<AtomicIoError<E>> for OperationError {
-    fn from(err: AtomicIoError<E>) -> Self {
-        match err {
-            AtomicIoError::Internal(io_err) => OperationError::from(io_err),
-            AtomicIoError::User(_user_err) => {
-                OperationError::service_error("Unknown atomic write error")
-            }
-        }
-    }
-}
-
-impl From<IoError> for OperationError {
-    fn from(err: IoError) -> Self {
-        match err.kind() {
-            ErrorKind::OutOfMemory => {
-                let free_memory = Mem::new().available_memory_bytes();
-                OperationError::OutOfMemory {
-                    description: format!("IO Error: {err}"),
-                    free: free_memory,
-                }
-            }
-            _ => OperationError::service_error(format!("IO Error: {err}")),
-        }
-    }
-}
-
-impl From<serde_json::Error> for OperationError {
-    fn from(err: serde_json::Error) -> Self {
-        OperationError::service_error(format!("Json error: {err}"))
-    }
-}
-
-impl From<fs_extra::error::Error> for OperationError {
-    fn from(err: fs_extra::error::Error) -> Self {
-        OperationError::service_error(format!("File system error: {err}"))
-    }
-}
-
-impl From<quantization::EncodingError> for OperationError {
-    fn from(err: quantization::EncodingError) -> Self {
-        OperationError::service_error(format!("Quantization encoding error: {err}"))
-    }
-}
-
-impl From<TryReserveError> for OperationError {
-    fn from(err: TryReserveError) -> Self {
-        let free_memory = Mem::new().available_memory_bytes();
-        OperationError::OutOfMemory {
-            description: format!("Failed to reserve memory: {err}"),
-            free: free_memory,
-        }
-    }
-}
-
-pub type OperationResult<T> = result::Result<T, OperationError>;
-
-pub fn get_service_error<T>(err: &OperationResult<T>) -> Option<OperationError> {
-    match err {
-        Ok(_) => None,
-        Err(error) => match error {
-            OperationError::ServiceError { .. } => Some(error.clone()),
-            _ => None,
-        },
-    }
-}
-
-/// Define all operations which can be performed with Segment or Segment-like entity.
-///
-/// Assume all operations are idempotent - which means that no matter how many times an operation
-/// is executed - the storage state will be the same.
-pub trait SegmentEntry {
-    /// Get current update version of the segment
-    fn version(&self) -> SeqNumberType;
-
-    /// Get version of specified point
-    fn point_version(&self, point_id: PointIdType) -> Option<SeqNumberType>;
-
-    #[allow(clippy::too_many_arguments)]
-    fn search(
-        &self,
-        vector_name: &str,
-        vector: &[VectorElementType],
-        with_payload: &WithPayload,
-        with_vector: &WithVector,
-        filter: Option<&Filter>,
-        top: usize,
-        params: Option<&SearchParams>,
-        is_stopped: &AtomicBool,
-    ) -> OperationResult<Vec<ScoredPoint>>;
-
-    #[allow(clippy::too_many_arguments)]
-    fn search_batch(
-        &self,
-        vector_name: &str,
-        vectors: &[&[VectorElementType]],
-        with_payload: &WithPayload,
-        with_vector: &WithVector,
-        filter: Option<&Filter>,
-        top: usize,
-        params: Option<&SearchParams>,
-        is_stopped: &AtomicBool,
-    ) -> OperationResult<Vec<Vec<ScoredPoint>>>;
-
-    fn upsert_point(
-        &mut self,
-        op_num: SeqNumberType,
-        point_id: PointIdType,
-        vectors: NamedVectors,
-    ) -> OperationResult<bool>;
-
-    fn delete_point(
-        &mut self,
-        op_num: SeqNumberType,
-        point_id: PointIdType,
-    ) -> OperationResult<bool>;
-
-    fn update_vectors(
-        &mut self,
-        op_num: SeqNumberType,
-        point_id: PointIdType,
-        vectors: NamedVectors,
-    ) -> OperationResult<bool>;
-
-    fn delete_vector(
-        &mut self,
-        op_num: SeqNumberType,
-        point_id: PointIdType,
-        vector_name: &str,
-    ) -> OperationResult<bool>;
-
-    fn set_payload(
-        &mut self,
-        op_num: SeqNumberType,
-        point_id: PointIdType,
-        payload: &Payload,
-    ) -> OperationResult<bool>;
-
-    fn set_full_payload(
-        &mut self,
-        op_num: SeqNumberType,
-        point_id: PointIdType,
-        full_payload: &Payload,
-    ) -> OperationResult<bool>;
-
-    fn delete_payload(
-        &mut self,
-        op_num: SeqNumberType,
-        point_id: PointIdType,
-        key: PayloadKeyTypeRef,
-    ) -> OperationResult<bool>;
-
-    fn clear_payload(
-        &mut self,
-        op_num: SeqNumberType,
-        point_id: PointIdType,
-    ) -> OperationResult<bool>;
-
-    fn vector(
-        &self,
-        vector_name: &str,
-        point_id: PointIdType,
-    ) -> OperationResult<Option<Vec<VectorElementType>>>;
-
-    fn all_vectors(&self, point_id: PointIdType) -> OperationResult<NamedVectors>;
-
-    fn payload(&self, point_id: PointIdType) -> OperationResult<Payload>;
-
-    /// Iterator over all points in segment in ascending order.
-    fn iter_points(&self) -> Box<dyn Iterator<Item = PointIdType> + '_>;
-
-    /// Paginate over points which satisfies filtering condition starting with `offset` id including.
-    fn read_filtered<'a>(
-        &'a self,
-        offset: Option<PointIdType>,
-        limit: Option<usize>,
-        filter: Option<&'a Filter>,
-    ) -> Vec<PointIdType>;
-
-    /// Read points in [from; to) range
-    fn read_range(&self, from: Option<PointIdType>, to: Option<PointIdType>) -> Vec<PointIdType>;
-
-    /// Check if there is point with `point_id` in this segment.
-    fn has_point(&self, point_id: PointIdType) -> bool;
-
-    /// Estimate available point count in this segment for given filter.
-    fn estimate_point_count<'a>(&'a self, filter: Option<&'a Filter>) -> CardinalityEstimation;
-
-    fn vector_dim(&self, vector_name: &str) -> OperationResult<usize>;
-
-    fn vector_dims(&self) -> HashMap<String, usize>;
-
-    /// Number of available points
-    ///
-    /// - excludes soft deleted points
-    fn available_point_count(&self) -> usize;
-
-    /// Number of deleted points
-    fn deleted_point_count(&self) -> usize;
-
-    /// Get segment type
-    fn segment_type(&self) -> SegmentType;
-
-    /// Get current stats of the segment
-    fn info(&self) -> SegmentInfo;
-
-    /// Get segment configuration
-    fn config(&self) -> SegmentConfig;
-
-    /// Get current stats of the segment
-    fn is_appendable(&self) -> bool;
-
-    /// Flushes current segment state into a persistent storage, if possible
-    /// if sync == true, block current thread while flushing
-    ///
-    /// Returns maximum version number which is guaranteed to be persisted.
-    fn flush(&self, sync: bool) -> OperationResult<SeqNumberType>;
-
-    /// Removes all persisted data and forces to destroy segment
-    fn drop_data(self) -> OperationResult<()>;
-
-    /// Path to data, owned by segment
-    fn data_path(&self) -> PathBuf;
-
-    /// Delete field index, if exists
-    fn delete_field_index(
-        &mut self,
-        op_num: SeqNumberType,
-        key: PayloadKeyTypeRef,
-    ) -> OperationResult<bool>;
-
-    /// Create index for a payload field, if not exists
-    fn create_field_index(
-        &mut self,
-        op_num: SeqNumberType,
-        key: PayloadKeyTypeRef,
-        field_schema: Option<&PayloadFieldSchema>,
-    ) -> OperationResult<bool>;
-
-    /// Get indexed fields
-    fn get_indexed_fields(&self) -> HashMap<PayloadKeyType, PayloadFieldSchema>;
-
-    /// Checks if segment errored during last operations
-    fn check_error(&self) -> Option<SegmentFailedState>;
-
-    /// Delete points by the given filter
-    fn delete_filtered<'a>(
-        &'a mut self,
-        op_num: SeqNumberType,
-        filter: &'a Filter,
-    ) -> OperationResult<usize>;
-
-    /// Take a snapshot of the segment.
-    ///
-    /// Creates a tar archive of the segment directory into `snapshot_dir_path`.
-    /// Uses `temp_path` to prepare files to archive.
-    fn take_snapshot(&self, temp_path: &Path, snapshot_dir_path: &Path)
-        -> OperationResult<PathBuf>;
-
-    // Get collected telemetry data of segment
-    fn get_telemetry_data(&self) -> SegmentTelemetry;
-}
diff --git a/crates/qdrant/lib/segment/src/entry/mod.rs b/crates/qdrant/lib/segment/src/entry/mod.rs
deleted file mode 100644
index 5779863..0000000
--- a/crates/qdrant/lib/segment/src/entry/mod.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub mod entry_point;
diff --git a/crates/qdrant/lib/segment/src/fixtures/index_fixtures.rs b/crates/qdrant/lib/segment/src/fixtures/index_fixtures.rs
deleted file mode 100644
index df4adb8..0000000
--- a/crates/qdrant/lib/segment/src/fixtures/index_fixtures.rs
+++ /dev/null
@@ -1,153 +0,0 @@
-use std::marker::PhantomData;
-use std::ops::Range;
-use std::path::{Path, PathBuf};
-use std::sync::atomic::AtomicBool;
-
-use bitvec::prelude::{BitSlice, BitVec};
-use rand::Rng;
-
-use crate::common::Flusher;
-use crate::data_types::vectors::VectorElementType;
-use crate::entry::entry_point::OperationResult;
-use crate::payload_storage::FilterContext;
-use crate::spaces::metric::Metric;
-use crate::types::{Distance, PointOffsetType, QuantizationConfig};
-use crate::vector_storage::chunked_vectors::ChunkedVectors;
-use crate::vector_storage::quantized::quantized_vectors::QuantizedVectors;
-use crate::vector_storage::{
-    raw_scorer_impl, RawScorer, VectorStorage, VectorStorageEnum, DEFAULT_STOPPED,
-};
-
-pub fn random_vector<R: Rng + ?Sized>(rnd_gen: &mut R, size: usize) -> Vec<VectorElementType> {
-    (0..size).map(|_| rnd_gen.gen_range(0.0..1.0)).collect()
-}
-
-pub struct FakeFilterContext {}
-
-impl FilterContext for FakeFilterContext {
-    fn check(&self, _point_id: PointOffsetType) -> bool {
-        true
-    }
-}
-
-pub struct TestRawScorerProducer<TMetric: Metric> {
-    pub vectors: ChunkedVectors<VectorElementType>,
-    pub deleted_points: BitVec,
-    pub deleted_vectors: BitVec,
-    pub metric: PhantomData<TMetric>,
-}
-
-impl<TMetric: Metric> VectorStorage for TestRawScorerProducer<TMetric> {
-    fn vector_dim(&self) -> usize {
-        self.vectors.get(0).len()
-    }
-
-    fn distance(&self) -> Distance {
-        TMetric::distance()
-    }
-
-    fn total_vector_count(&self) -> usize {
-        self.vectors.len()
-    }
-
-    fn get_vector(&self, key: PointOffsetType) -> &[VectorElementType] {
-        self.vectors.get(key)
-    }
-
-    fn insert_vector(
-        &mut self,
-        key: PointOffsetType,
-        vector: &[VectorElementType],
-    ) -> OperationResult<()> {
-        self.vectors.insert(key, vector)?;
-        Ok(())
-    }
-
-    fn update_from(
-        &mut self,
-        _other: &VectorStorageEnum,
-        _other_ids: &mut dyn Iterator<Item = PointOffsetType>,
-        _stopped: &AtomicBool,
-    ) -> OperationResult<Range<PointOffsetType>> {
-        todo!()
-    }
-
-    fn flusher(&self) -> Flusher {
-        Box::new(|| Ok(()))
-    }
-
-    fn quantize(
-        &mut self,
-        _data_path: &Path,
-        _quantization_config: &QuantizationConfig,
-        _max_threads: usize,
-        _stopped: &AtomicBool,
-    ) -> OperationResult<()> {
-        Ok(())
-    }
-
-    fn load_quantization(&mut self, _data_path: &Path) -> OperationResult<()> {
-        Ok(())
-    }
-
-    fn quantized_storage(&self) -> Option<&QuantizedVectors> {
-        None
-    }
-
-    fn files(&self) -> Vec<PathBuf> {
-        vec![]
-    }
-
-    fn delete_vector(&mut self, key: PointOffsetType) -> OperationResult<bool> {
-        Ok(!self.deleted_vectors.replace(key as usize, true))
-    }
-
-    fn is_deleted_vector(&self, key: PointOffsetType) -> bool {
-        self.deleted_vectors[key as usize]
-    }
-
-    fn deleted_vector_count(&self) -> usize {
-        self.deleted_vectors.count_ones()
-    }
-
-    fn deleted_vector_bitslice(&self) -> &BitSlice {
-        &self.deleted_vectors
-    }
-
-    fn is_appendable(&self) -> bool {
-        true
-    }
-}
-
-impl<TMetric> TestRawScorerProducer<TMetric>
-where
-    TMetric: Metric,
-{
-    pub fn new<R>(dim: usize, num_vectors: usize, rng: &mut R) -> Self
-    where
-        R: Rng + ?Sized,
-    {
-        let mut vectors = ChunkedVectors::new(dim);
-        for _ in 0..num_vectors {
-            let rnd_vec = random_vector(rng, dim);
-            let rnd_vec = TMetric::preprocess(&rnd_vec).unwrap_or(rnd_vec);
-            vectors.push(&rnd_vec).unwrap();
-        }
-        TestRawScorerProducer::<TMetric> {
-            vectors,
-            deleted_points: BitVec::repeat(false, num_vectors),
-            deleted_vectors: BitVec::repeat(false, num_vectors),
-            metric: PhantomData,
-        }
-    }
-
-    pub fn get_raw_scorer(&self, query: Vec<VectorElementType>) -> Box<dyn RawScorer + '_> {
-        let query = TMetric::preprocess(&query).unwrap_or(query);
-        raw_scorer_impl(
-            query,
-            self,
-            self.deleted_vector_bitslice(),
-            &DEFAULT_STOPPED,
-        )
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/fixtures/mod.rs b/crates/qdrant/lib/segment/src/fixtures/mod.rs
deleted file mode 100644
index aac1016..0000000
--- a/crates/qdrant/lib/segment/src/fixtures/mod.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-pub mod index_fixtures;
-pub mod payload_context_fixture;
-pub mod payload_fixtures;
-pub mod segment_fixtures;
diff --git a/crates/qdrant/lib/segment/src/fixtures/payload_context_fixture.rs b/crates/qdrant/lib/segment/src/fixtures/payload_context_fixture.rs
deleted file mode 100644
index 73bd782..0000000
--- a/crates/qdrant/lib/segment/src/fixtures/payload_context_fixture.rs
+++ /dev/null
@@ -1,252 +0,0 @@
-use std::path::Path;
-use std::sync::Arc;
-
-use atomic_refcell::AtomicRefCell;
-use bitvec::prelude::{BitSlice, BitVec};
-use rand::prelude::StdRng;
-use rand::SeedableRng;
-
-use super::payload_fixtures::BOOL_KEY;
-use crate::common::Flusher;
-use crate::entry::entry_point::OperationResult;
-use crate::fixtures::payload_fixtures::{
-    generate_diverse_payload, FLT_KEY, GEO_KEY, INT_KEY, STR_KEY, TEXT_KEY,
-};
-use crate::id_tracker::IdTracker;
-use crate::index::plain_payload_index::PlainPayloadIndex;
-use crate::index::struct_payload_index::StructPayloadIndex;
-use crate::index::PayloadIndex;
-use crate::payload_storage::in_memory_payload_storage::InMemoryPayloadStorage;
-use crate::payload_storage::query_checker::SimpleConditionChecker;
-use crate::payload_storage::PayloadStorage;
-use crate::types::{PayloadSchemaType, PointIdType, PointOffsetType, SeqNumberType};
-
-/// Warn: Use for tests only
-///
-/// This struct mimics the interface of `PointsIterator` and `IdTracker` only for basic cases
-pub struct FixtureIdTracker {
-    ids: Vec<PointOffsetType>,
-    deleted: BitVec,
-    deleted_count: usize,
-}
-
-impl FixtureIdTracker {
-    pub fn new(num_points: usize) -> Self {
-        Self {
-            ids: (0..num_points).map(|x| x as PointOffsetType).collect(),
-            deleted: BitVec::repeat(false, num_points),
-            deleted_count: 0,
-        }
-    }
-}
-
-impl IdTracker for FixtureIdTracker {
-    fn internal_version(&self, _internal_id: PointOffsetType) -> Option<SeqNumberType> {
-        Some(0)
-    }
-
-    fn set_internal_version(
-        &mut self,
-        _internal_id: PointOffsetType,
-        _version: SeqNumberType,
-    ) -> OperationResult<()> {
-        Ok(())
-    }
-
-    fn internal_id(&self, external_id: PointIdType) -> Option<PointOffsetType> {
-        Some(match external_id {
-            PointIdType::NumId(id) => {
-                assert!(id < self.ids.len() as u64);
-                id as PointOffsetType
-            }
-            PointIdType::Uuid(_) => unreachable!(),
-        })
-    }
-
-    fn external_id(&self, internal_id: PointOffsetType) -> Option<PointIdType> {
-        assert!(internal_id < self.ids.len() as PointOffsetType);
-        Some(PointIdType::NumId(internal_id as u64))
-    }
-
-    fn set_link(
-        &mut self,
-        _external_id: PointIdType,
-        _internal_id: PointOffsetType,
-    ) -> OperationResult<()> {
-        Ok(())
-    }
-
-    fn drop(&mut self, external_id: PointIdType) -> OperationResult<()> {
-        let internal_id = self.internal_id(external_id).unwrap() as usize;
-        if !self.deleted.replace(internal_id, true) {
-            self.deleted_count += 1;
-        }
-        Ok(())
-    }
-
-    fn iter_external(&self) -> Box<dyn Iterator<Item = PointIdType> + '_> {
-        Box::new(
-            self.ids
-                .iter()
-                .copied()
-                .map(|id| PointIdType::NumId(id as u64)),
-        )
-    }
-
-    fn iter_internal(&self) -> Box<dyn Iterator<Item = PointOffsetType> + '_> {
-        Box::new(self.ids.iter().copied())
-    }
-
-    fn iter_from(
-        &self,
-        external_id: Option<PointIdType>,
-    ) -> Box<dyn Iterator<Item = (PointIdType, PointOffsetType)> + '_> {
-        let start = match external_id {
-            None => 0,
-            Some(id) => match id {
-                PointIdType::NumId(num) => num,
-                PointIdType::Uuid(_) => unreachable!(),
-            },
-        } as PointOffsetType;
-
-        Box::new(
-            self.ids
-                .iter()
-                .copied()
-                .skip_while(move |x| *x < start)
-                .map(|x| (PointIdType::NumId(x as u64), x)),
-        )
-    }
-
-    fn total_point_count(&self) -> usize {
-        self.ids.len()
-    }
-
-    fn deleted_point_count(&self) -> usize {
-        self.deleted_count
-    }
-
-    fn iter_ids(&self) -> Box<dyn Iterator<Item = PointOffsetType> + '_> {
-        Box::new(
-            self.ids
-                .iter()
-                .copied()
-                .filter(|id| !self.is_deleted_point(*id)),
-        )
-    }
-
-    fn mapping_flusher(&self) -> Flusher {
-        Box::new(|| Ok(()))
-    }
-
-    fn versions_flusher(&self) -> Flusher {
-        Box::new(|| Ok(()))
-    }
-
-    fn is_deleted_point(&self, key: PointOffsetType) -> bool {
-        let key = key as usize;
-        if key >= self.deleted.len() {
-            return true;
-        }
-        self.deleted[key]
-    }
-
-    fn deleted_point_bitslice(&self) -> &BitSlice {
-        &self.deleted
-    }
-}
-
-/// Creates in-memory payload storage and fills it with random points
-///
-/// # Arguments
-///
-/// * `num_points` - how many random points to insert
-///
-/// # Result
-///
-/// Payload storage fixture
-///
-pub fn create_payload_storage_fixture(num_points: usize, seed: u64) -> InMemoryPayloadStorage {
-    let mut payload_storage = InMemoryPayloadStorage::default();
-    let mut rng = StdRng::seed_from_u64(seed);
-
-    for id in 0..num_points {
-        let payload = generate_diverse_payload(&mut rng);
-        payload_storage
-            .assign(id as PointOffsetType, &payload)
-            .unwrap();
-    }
-
-    payload_storage
-}
-
-/// Function generates `PlainPayloadIndex` with random payload for testing
-///
-/// # Arguments
-///
-/// * `path` - temp directory path
-/// * `num_points` - how many payloads generate?
-///
-/// # Result
-///
-/// `PlainPayloadIndex`
-///
-pub fn create_plain_payload_index(path: &Path, num_points: usize, seed: u64) -> PlainPayloadIndex {
-    let payload_storage = create_payload_storage_fixture(num_points, seed);
-    let id_tracker = Arc::new(AtomicRefCell::new(FixtureIdTracker::new(num_points)));
-
-    let condition_checker = Arc::new(SimpleConditionChecker::new(
-        Arc::new(AtomicRefCell::new(payload_storage.into())),
-        id_tracker.clone(),
-    ));
-
-    PlainPayloadIndex::open(condition_checker, id_tracker, path).unwrap()
-}
-
-/// Function generates `StructPayloadIndex` with random payload for testing.
-/// It will also create indexes for payloads
-///
-/// # Arguments
-///
-/// * `path` - temp directory path
-/// * `num_points` - how many payloads generate?
-///
-/// # Result
-///
-/// `StructPayloadIndex`
-///
-pub fn create_struct_payload_index(
-    path: &Path,
-    num_points: usize,
-    seed: u64,
-) -> StructPayloadIndex {
-    let payload_storage = Arc::new(AtomicRefCell::new(
-        create_payload_storage_fixture(num_points, seed).into(),
-    ));
-    let id_tracker = Arc::new(AtomicRefCell::new(FixtureIdTracker::new(num_points)));
-
-    let mut index = StructPayloadIndex::open(payload_storage, id_tracker, path).unwrap();
-
-    index
-        .set_indexed(STR_KEY, PayloadSchemaType::Keyword.into())
-        .unwrap();
-    index
-        .set_indexed(INT_KEY, PayloadSchemaType::Integer.into())
-        .unwrap();
-    index
-        .set_indexed(FLT_KEY, PayloadSchemaType::Float.into())
-        .unwrap();
-    index
-        .set_indexed(GEO_KEY, PayloadSchemaType::Geo.into())
-        .unwrap();
-
-    index
-        .set_indexed(TEXT_KEY, PayloadSchemaType::Text.into())
-        .unwrap();
-
-    index
-        .set_indexed(BOOL_KEY, PayloadSchemaType::Bool.into())
-        .unwrap();
-
-    index
-}
diff --git a/crates/qdrant/lib/segment/src/fixtures/payload_fixtures.rs b/crates/qdrant/lib/segment/src/fixtures/payload_fixtures.rs
deleted file mode 100644
index a431ec4..0000000
--- a/crates/qdrant/lib/segment/src/fixtures/payload_fixtures.rs
+++ /dev/null
@@ -1,329 +0,0 @@
-use std::ops::{Range, RangeInclusive};
-
-use itertools::Itertools;
-use rand::seq::SliceRandom;
-use rand::Rng;
-use serde_json::{json, Value};
-
-use crate::data_types::vectors::VectorElementType;
-use crate::types::{
-    Condition, ExtendedPointId, FieldCondition, Filter, HasIdCondition, IsEmptyCondition, Match,
-    Payload, PayloadField, Range as RangeCondition, ValuesCount,
-};
-
-const ADJECTIVE: &[&str] = &[
-    "jobless",
-    "rightful",
-    "breakable",
-    "impartial",
-    "shocking",
-    "faded",
-    "phobic",
-    "overt",
-    "like",
-    "wide-eyed",
-    "broad",
-];
-
-const NOUN: &[&str] = &[
-    "territory",
-    "jam",
-    "neck",
-    "chicken",
-    "cap",
-    "kiss",
-    "veil",
-    "trail",
-    "size",
-    "digestion",
-    "rod",
-    "seed",
-];
-
-const INT_RANGE: Range<i64> = 0..500;
-pub const LON_RANGE: Range<f64> = -180.0..180.0;
-pub const LAT_RANGE: Range<f64> = -90.0..90.0;
-
-pub const STR_KEY: &str = "kvd";
-pub const STR_PROJ_KEY: &str = "kvd_proj";
-pub const STR_ROOT_PROJ_KEY: &str = "kvd_root_proj";
-pub const INT_KEY: &str = "int";
-pub const INT_KEY_2: &str = "int2";
-pub const FLT_KEY: &str = "flt";
-pub const FLICKING_KEY: &str = "flicking";
-pub const GEO_KEY: &str = "geo";
-pub const TEXT_KEY: &str = "text";
-pub const BOOL_KEY: &str = "bool";
-
-pub fn random_adj<R: Rng + ?Sized>(rnd_gen: &mut R) -> String {
-    ADJECTIVE.choose(rnd_gen).unwrap().to_string()
-}
-
-pub fn random_keyword<R: Rng + ?Sized>(rnd_gen: &mut R) -> String {
-    let random_adj = ADJECTIVE.choose(rnd_gen).unwrap();
-    let random_noun = NOUN.choose(rnd_gen).unwrap();
-    format!("{random_adj} {random_noun}")
-}
-
-pub fn random_keyword_payload<R: Rng + ?Sized>(
-    rnd_gen: &mut R,
-    num_values: RangeInclusive<usize>,
-) -> Value {
-    let sample_num_values = rnd_gen.gen_range(num_values);
-    if sample_num_values > 1 {
-        Value::Array(
-            (0..sample_num_values)
-                .map(|_| Value::String(random_keyword(rnd_gen)))
-                .collect(),
-        )
-    } else {
-        Value::String(random_keyword(rnd_gen))
-    }
-}
-
-pub fn random_int_payload<R: Rng + ?Sized>(
-    rnd_gen: &mut R,
-    num_values: RangeInclusive<usize>,
-) -> Vec<i64> {
-    (0..rnd_gen.gen_range(num_values))
-        .map(|_| rnd_gen.gen_range(INT_RANGE))
-        .collect_vec()
-}
-
-pub fn random_geo_payload<R: Rng + ?Sized>(
-    rnd_gen: &mut R,
-    num_values: RangeInclusive<usize>,
-) -> Vec<Value> {
-    (0..rnd_gen.gen_range(num_values))
-        .map(|_| {
-            json!( {
-                "lon": rnd_gen.gen_range(LON_RANGE),
-                "lat": rnd_gen.gen_range(LAT_RANGE),
-            })
-        })
-        .collect_vec()
-}
-
-pub fn random_bool_payload<R: Rng + ?Sized>(
-    rnd_gen: &mut R,
-    num_values: RangeInclusive<usize>,
-) -> Vec<Value> {
-    (0..rnd_gen.gen_range(num_values))
-        .map(|_| Value::Bool(rnd_gen.gen()))
-        .collect_vec()
-}
-
-pub fn random_vector<R: Rng + ?Sized>(rnd_gen: &mut R, size: usize) -> Vec<VectorElementType> {
-    (0..size).map(|_| rnd_gen.gen()).collect()
-}
-
-pub fn random_uncommon_condition<R: Rng + ?Sized>(rnd_gen: &mut R) -> Condition {
-    let switch = rnd_gen.gen_range(0..=3);
-    match switch {
-        0 => Condition::Field(FieldCondition::new_values_count(
-            STR_KEY.to_string(),
-            ValuesCount {
-                lt: None,
-                gt: None,
-                gte: Some(3),
-                lte: None,
-            },
-        )),
-        1 => Condition::Field(FieldCondition::new_values_count(
-            STR_KEY.to_string(),
-            ValuesCount {
-                lt: None,
-                gt: None,
-                gte: None,
-                lte: Some(2),
-            },
-        )),
-        2 => Condition::HasId(HasIdCondition {
-            has_id: (0..rnd_gen.gen_range(10..50))
-                .map(|_| ExtendedPointId::NumId(rnd_gen.gen_range(0..1000)))
-                .collect(),
-        }),
-        3 => Condition::IsEmpty(IsEmptyCondition {
-            is_empty: PayloadField {
-                key: FLICKING_KEY.to_string(),
-            },
-        }),
-        _ => unreachable!(),
-    }
-}
-
-pub fn random_simple_condition<R: Rng + ?Sized>(rnd_gen: &mut R) -> Condition {
-    let str_or_int: bool = rnd_gen.gen();
-    if str_or_int {
-        let kv_or_txt: bool = rnd_gen.gen();
-        if kv_or_txt {
-            Condition::Field(FieldCondition::new_match(
-                STR_KEY.to_string(),
-                random_keyword(rnd_gen).into(),
-            ))
-        } else {
-            Condition::Field(FieldCondition::new_match(
-                TEXT_KEY.to_string(),
-                Match::Text(random_adj(rnd_gen).into()),
-            ))
-        }
-    } else {
-        Condition::Field(FieldCondition::new_range(
-            INT_KEY.to_string(),
-            RangeCondition {
-                lt: None,
-                gt: None,
-                gte: Some(rnd_gen.gen_range(INT_RANGE) as f64),
-                lte: Some(rnd_gen.gen_range(INT_RANGE) as f64),
-            },
-        ))
-    }
-}
-
-pub fn random_condition<R: Rng + ?Sized>(rnd_gen: &mut R) -> Condition {
-    let is_simple: bool = rnd_gen.gen_range(0..100) < 80;
-    if is_simple {
-        random_simple_condition(rnd_gen)
-    } else {
-        random_uncommon_condition(rnd_gen)
-    }
-}
-
-pub fn random_must_filter<R: Rng + ?Sized>(rnd_gen: &mut R, num_conditions: usize) -> Filter {
-    let must_conditions = (0..num_conditions)
-        .map(|_| random_simple_condition(rnd_gen))
-        .collect_vec();
-
-    Filter {
-        should: None,
-        must: Some(must_conditions),
-        must_not: None,
-    }
-}
-
-pub fn random_filter<R: Rng + ?Sized>(rnd_gen: &mut R, total_conditions: usize) -> Filter {
-    let num_should = rnd_gen.gen_range(0..=total_conditions);
-    let num_must = total_conditions - num_should;
-
-    let should_conditions = (0..num_should)
-        .map(|_| random_condition(rnd_gen))
-        .collect_vec();
-
-    let should_conditions_opt = if !should_conditions.is_empty() {
-        Some(should_conditions)
-    } else {
-        None
-    };
-
-    let must_conditions = (0..num_must)
-        .map(|_| random_condition(rnd_gen))
-        .collect_vec();
-
-    let must_conditions_opt = if !must_conditions.is_empty() {
-        Some(must_conditions)
-    } else {
-        None
-    };
-
-    Filter {
-        should: should_conditions_opt,
-        must: must_conditions_opt,
-        must_not: None,
-    }
-}
-
-pub fn random_nested_filter<R: Rng + ?Sized>(rnd_gen: &mut R) -> Filter {
-    let nested_or_proj: bool = rnd_gen.gen();
-    let nested_str_key = if nested_or_proj {
-        format!("{}.{}.{}", STR_KEY, "nested_1", "nested_2")
-    } else {
-        format!("{}.{}[].{}", STR_PROJ_KEY, "nested_1", "nested_2")
-    };
-    let condition = Condition::Field(FieldCondition::new_match(
-        nested_str_key,
-        random_keyword(rnd_gen).into(),
-    ));
-    Filter {
-        should: Some(vec![condition]),
-        must: None,
-        must_not: None,
-    }
-}
-
-fn random_json<R: Rng + ?Sized>(rnd_gen: &mut R) -> Value {
-    if rnd_gen.gen_range(0.0..1.0) < 0.5 {
-        json!({
-            STR_KEY: random_keyword_payload(rnd_gen, 1..=3),
-            INT_KEY: random_int_payload(rnd_gen, 1..=3),
-            INT_KEY_2: random_int_payload(rnd_gen, 1..=2),
-            FLT_KEY: rnd_gen.gen_range(0.0..10.0),
-            GEO_KEY: random_geo_payload(rnd_gen, 1..=3),
-            TEXT_KEY: random_keyword_payload(rnd_gen, 1..=1),
-            BOOL_KEY: random_bool_payload(rnd_gen, 1..=1),
-        })
-    } else {
-        json!({
-            STR_KEY: random_keyword_payload(rnd_gen, 1..=2),
-            INT_KEY: random_int_payload(rnd_gen, 1..=3),
-            INT_KEY_2: random_int_payload(rnd_gen, 1..=2),
-            FLT_KEY: rnd_gen.gen_range(0.0..10.0),
-            GEO_KEY: random_geo_payload(rnd_gen, 1..=3),
-            TEXT_KEY: random_keyword_payload(rnd_gen, 1..=1),
-            BOOL_KEY: random_bool_payload(rnd_gen, 1..=2),
-            FLICKING_KEY: random_int_payload(rnd_gen, 1..=3)
-        })
-    }
-}
-
-pub fn generate_diverse_payload<R: Rng + ?Sized>(rnd_gen: &mut R) -> Payload {
-    random_json(rnd_gen).into()
-}
-
-pub fn generate_diverse_nested_payload<R: Rng + ?Sized>(rnd_gen: &mut R) -> Payload {
-    json!({
-        STR_KEY: {
-            "nested_1": {
-                "nested_2": random_keyword_payload(rnd_gen, 1..=3)
-            }
-        },
-        STR_PROJ_KEY: {
-            "nested_1": [
-                { "nested_2": random_keyword_payload(rnd_gen, 1..=3) }
-            ]
-        },
-        STR_ROOT_PROJ_KEY: [
-            {
-                "nested_1": [
-                    { "nested_2":  random_keyword_payload(rnd_gen, 1..=3) }
-                ]
-            }
-        ],
-    })
-    .into()
-}
-
-pub const NESTED_ARRAY_1: &str = "arr1";
-pub const NESTED_ARRAY_2: &str = "arr2";
-pub const NESTED_ARRAY_3: &str = "arr3";
-
-pub fn generate_nested_array_payload<R: Rng + ?Sized>(rnd_gen: &mut R) -> Payload {
-    json!({
-        NESTED_ARRAY_1: [
-            random_json(rnd_gen),
-            random_json(rnd_gen),
-            random_json(rnd_gen),
-            random_json(rnd_gen),
-        ],
-        NESTED_ARRAY_2: [
-            {
-                   NESTED_ARRAY_3: [
-                       random_json(rnd_gen),
-                       random_json(rnd_gen),
-                       random_json(rnd_gen),
-                       random_json(rnd_gen),
-                   ]
-            }
-        ]
-    })
-    .into()
-}
diff --git a/crates/qdrant/lib/segment/src/fixtures/segment_fixtures.rs b/crates/qdrant/lib/segment/src/fixtures/segment_fixtures.rs
deleted file mode 100644
index ca4d8a8..0000000
--- a/crates/qdrant/lib/segment/src/fixtures/segment_fixtures.rs
+++ /dev/null
@@ -1,37 +0,0 @@
-use std::path::Path;
-
-use crate::data_types::named_vectors::NamedVectors;
-use crate::data_types::vectors::DEFAULT_VECTOR_NAME;
-use crate::entry::entry_point::SegmentEntry;
-use crate::fixtures::index_fixtures::random_vector;
-use crate::fixtures::payload_fixtures::generate_diverse_payload;
-use crate::segment::Segment;
-use crate::segment_constructor::simple_segment_constructor::build_simple_segment;
-use crate::types::Distance;
-
-pub fn random_segment(path: &Path, num_points: usize) -> Segment {
-    let dim = 4;
-    let distance = Distance::Dot;
-
-    let mut rnd_gen = rand::thread_rng();
-
-    let mut segment = build_simple_segment(path, dim, distance).unwrap();
-
-    for point_id in 0..num_points {
-        let vector = random_vector(&mut rnd_gen, dim);
-        let payload = generate_diverse_payload(&mut rnd_gen);
-
-        segment
-            .upsert_point(
-                100,
-                (point_id as u64).into(),
-                NamedVectors::from_ref(DEFAULT_VECTOR_NAME, &vector),
-            )
-            .unwrap();
-        segment
-            .set_payload(100, (point_id as u64).into(), &payload)
-            .unwrap();
-    }
-
-    segment
-}
diff --git a/crates/qdrant/lib/segment/src/id_tracker/id_tracker_base.rs b/crates/qdrant/lib/segment/src/id_tracker/id_tracker_base.rs
deleted file mode 100644
index cc9cf96..0000000
--- a/crates/qdrant/lib/segment/src/id_tracker/id_tracker_base.rs
+++ /dev/null
@@ -1,140 +0,0 @@
-use bitvec::prelude::BitSlice;
-use rand::rngs::StdRng;
-use rand::{Rng, SeedableRng};
-
-use crate::common::Flusher;
-use crate::entry::entry_point::OperationResult;
-use crate::types::{PointIdType, PointOffsetType, SeqNumberType};
-
-/// Sampling randomess seed
-///
-/// Using seeded randomness so search results don't show randomness or 'inconsistencies' which
-/// would otherwise be introduced by HNSW/ID tracker point sampling.
-const SEED: u64 = 0b1011000011011110001110010101001010001011001101001010010001111010;
-
-/// Trait for point ids tracker.
-///
-/// This tracker is used to convert external (i.e. user-facing) point id into internal point id
-/// as well as for keeping track on point version
-/// Internal ids are useful for contiguous-ness
-pub trait IdTracker {
-    fn internal_version(&self, internal_id: PointOffsetType) -> Option<SeqNumberType>;
-
-    fn set_internal_version(
-        &mut self,
-        internal_id: PointOffsetType,
-        version: SeqNumberType,
-    ) -> OperationResult<()>;
-
-    /// Returns internal ID of the point, which is used inside this segment
-    fn internal_id(&self, external_id: PointIdType) -> Option<PointOffsetType>;
-
-    /// Return external ID for internal point, defined by user
-    fn external_id(&self, internal_id: PointOffsetType) -> Option<PointIdType>;
-
-    /// Set mapping
-    fn set_link(
-        &mut self,
-        external_id: PointIdType,
-        internal_id: PointOffsetType,
-    ) -> OperationResult<()>;
-
-    /// Drop mapping
-    fn drop(&mut self, external_id: PointIdType) -> OperationResult<()>;
-
-    /// Iterate over all external IDs
-    ///
-    /// Count should match `available_point_count`.
-    fn iter_external(&self) -> Box<dyn Iterator<Item = PointIdType> + '_>;
-
-    /// Iterate over all internal IDs
-    ///
-    /// Count should match `total_point_count`.
-    fn iter_internal(&self) -> Box<dyn Iterator<Item = PointOffsetType> + '_>;
-
-    /// Iterate starting from a given ID
-    fn iter_from(
-        &self,
-        external_id: Option<PointIdType>,
-    ) -> Box<dyn Iterator<Item = (PointIdType, PointOffsetType)> + '_>;
-
-    /// Iterate over internal IDs (offsets)
-    ///
-    /// - excludes removed points
-    fn iter_ids(&self) -> Box<dyn Iterator<Item = PointOffsetType> + '_>;
-
-    /// Iterate over internal IDs (offsets)
-    ///
-    /// - excludes removed points
-    /// - excludes flagged items from `exclude_bitslice`
-    fn iter_ids_excluding<'a>(
-        &'a self,
-        exclude_bitslice: &'a BitSlice,
-    ) -> Box<dyn Iterator<Item = PointOffsetType> + '_> {
-        Box::new(self.iter_ids().filter(|point| {
-            !exclude_bitslice
-                .get(*point as usize)
-                .as_deref()
-                .copied()
-                .unwrap_or(false)
-        }))
-    }
-
-    /// Flush id mapping to disk
-    fn mapping_flusher(&self) -> Flusher;
-
-    /// Flush points versions to disk
-    fn versions_flusher(&self) -> Flusher;
-
-    /// Number of total points
-    ///
-    /// - includes soft deleted points
-    fn total_point_count(&self) -> usize;
-
-    /// Number of available points
-    ///
-    /// - excludes soft deleted points
-    fn available_point_count(&self) -> usize {
-        self.total_point_count() - self.deleted_point_count()
-    }
-
-    /// Number of deleted points
-    fn deleted_point_count(&self) -> usize;
-
-    /// Get [`BitSlice`] representation for deleted points with deletion flags
-    ///
-    /// The size of this slice is not guaranteed. It may be smaller/larger than the number of
-    /// vectors in this segment.
-    fn deleted_point_bitslice(&self) -> &BitSlice;
-
-    /// Check whether the given point is soft deleted
-    fn is_deleted_point(&self, internal_id: PointOffsetType) -> bool;
-
-    /// Iterator over `n` random IDs which are not deleted
-    ///
-    /// A [`BitSlice`] of deleted vectors may optionally be given to also consider deleted named
-    /// vectors.
-    fn sample_ids<'a>(
-        &'a self,
-        deleted_vector_bitslice: Option<&'a BitSlice>,
-    ) -> Box<dyn Iterator<Item = PointOffsetType> + '_> {
-        // Use seeded randomness, prevents 'inconsistencies' in search results with sampling
-        let mut rng = StdRng::seed_from_u64(SEED);
-
-        let total = self.total_point_count() as PointOffsetType;
-        Box::new(
-            (0..total)
-                .map(move |_| rng.gen_range(0..total))
-                .filter(move |x| {
-                    // Check for deleted vector first, as that is more likely
-                    !deleted_vector_bitslice
-                        .and_then(|d| d.get(*x as usize).as_deref().copied())
-                        .unwrap_or(false)
-                    // Also check point deletion for integrity
-                    && !self.is_deleted_point(*x)
-                }),
-        )
-    }
-}
-
-pub type IdTrackerSS = dyn IdTracker + Sync + Send;
diff --git a/crates/qdrant/lib/segment/src/id_tracker/mod.rs b/crates/qdrant/lib/segment/src/id_tracker/mod.rs
deleted file mode 100644
index 0bddf73..0000000
--- a/crates/qdrant/lib/segment/src/id_tracker/mod.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-pub mod id_tracker_base;
-pub mod simple_id_tracker;
-
-pub use id_tracker_base::*;
diff --git a/crates/qdrant/lib/segment/src/id_tracker/simple_id_tracker.rs b/crates/qdrant/lib/segment/src/id_tracker/simple_id_tracker.rs
deleted file mode 100644
index c913109..0000000
--- a/crates/qdrant/lib/segment/src/id_tracker/simple_id_tracker.rs
+++ /dev/null
@@ -1,473 +0,0 @@
-use std::collections::BTreeMap;
-use std::sync::Arc;
-
-use bincode;
-use bitvec::prelude::{BitSlice, BitVec};
-use parking_lot::RwLock;
-use rocksdb::DB;
-use serde::{Deserialize, Serialize};
-use uuid::Uuid;
-
-use crate::common::rocksdb_buffered_delete_wrapper::DatabaseColumnScheduledDeleteWrapper;
-use crate::common::rocksdb_wrapper::{DatabaseColumnWrapper, DB_MAPPING_CF, DB_VERSIONS_CF};
-use crate::common::Flusher;
-use crate::entry::entry_point::OperationResult;
-use crate::id_tracker::IdTracker;
-use crate::types::{ExtendedPointId, PointIdType, PointOffsetType, SeqNumberType};
-
-/// Point Id type used for storing ids internally
-/// Should be serializable by `bincode`, therefore is not untagged.
-#[derive(Debug, Deserialize, Serialize, Clone, PartialEq, Eq, Hash, Ord, PartialOrd)]
-enum StoredPointId {
-    NumId(u64),
-    Uuid(Uuid),
-    String(String),
-}
-
-impl From<&ExtendedPointId> for StoredPointId {
-    fn from(point_id: &ExtendedPointId) -> Self {
-        match point_id {
-            ExtendedPointId::NumId(idx) => StoredPointId::NumId(*idx),
-            ExtendedPointId::Uuid(uuid) => StoredPointId::Uuid(*uuid),
-        }
-    }
-}
-
-impl From<StoredPointId> for ExtendedPointId {
-    fn from(point_id: StoredPointId) -> Self {
-        match point_id {
-            StoredPointId::NumId(idx) => ExtendedPointId::NumId(idx),
-            StoredPointId::Uuid(uuid) => ExtendedPointId::Uuid(uuid),
-            StoredPointId::String(str) => {
-                unimplemented!("cannot convert internal string id '{str}' to external id")
-            }
-        }
-    }
-}
-
-#[inline]
-fn stored_to_external_id(point_id: StoredPointId) -> PointIdType {
-    point_id.into()
-}
-
-#[inline]
-fn external_to_stored_id(point_id: &PointIdType) -> StoredPointId {
-    point_id.into()
-}
-
-pub struct SimpleIdTracker {
-    deleted: BitVec,
-    internal_to_external: Vec<PointIdType>,
-    internal_to_version: Vec<SeqNumberType>,
-    external_to_internal_num: BTreeMap<u64, PointOffsetType>,
-    external_to_internal_uuid: BTreeMap<Uuid, PointOffsetType>,
-    mapping_db_wrapper: DatabaseColumnScheduledDeleteWrapper,
-    versions_db_wrapper: DatabaseColumnScheduledDeleteWrapper,
-}
-
-impl SimpleIdTracker {
-    pub fn open(store: Arc<RwLock<DB>>) -> OperationResult<Self> {
-        let mut deleted = BitVec::new();
-        let mut internal_to_external: Vec<PointIdType> = Default::default();
-        let mut external_to_internal_num: BTreeMap<u64, PointOffsetType> = Default::default();
-        let mut external_to_internal_uuid: BTreeMap<Uuid, PointOffsetType> = Default::default();
-
-        let mapping_db_wrapper = DatabaseColumnScheduledDeleteWrapper::new(
-            DatabaseColumnWrapper::new(store.clone(), DB_MAPPING_CF),
-        );
-        for (key, val) in mapping_db_wrapper.lock_db().iter()? {
-            let external_id = Self::restore_key(&key);
-            let internal_id: PointOffsetType =
-                bincode::deserialize::<PointOffsetType>(&val).unwrap();
-            if internal_id as usize >= internal_to_external.len() {
-                internal_to_external.resize(internal_id as usize + 1, PointIdType::NumId(u64::MAX));
-            }
-            if internal_id as usize >= deleted.len() {
-                deleted.resize(internal_id as usize + 1, true);
-            }
-
-            let replaced_id = internal_to_external[internal_id as usize];
-            internal_to_external[internal_id as usize] = external_id;
-            if !deleted[internal_id as usize] {
-                // Fixing corrupted mapping - this id should be recovered from WAL
-                // This should not happen in normal operation, but it can happen if
-                // the database is corrupted.
-                log::warn!(
-                    "removing duplicated external id {} in internal id {}",
-                    external_id,
-                    replaced_id
-                );
-                match external_id {
-                    PointIdType::NumId(idx) => {
-                        external_to_internal_num.remove(&idx);
-                    }
-                    PointIdType::Uuid(uuid) => {
-                        external_to_internal_uuid.remove(&uuid);
-                    }
-                }
-            }
-            deleted.set(internal_id as usize, false);
-
-            match external_id {
-                PointIdType::NumId(idx) => {
-                    external_to_internal_num.insert(idx, internal_id);
-                }
-                PointIdType::Uuid(uuid) => {
-                    external_to_internal_uuid.insert(uuid, internal_id);
-                }
-            }
-        }
-
-        let mut internal_to_version: Vec<SeqNumberType> = Default::default();
-        let versions_db_wrapper = DatabaseColumnScheduledDeleteWrapper::new(
-            DatabaseColumnWrapper::new(store, DB_VERSIONS_CF),
-        );
-        for (key, val) in versions_db_wrapper.lock_db().iter()? {
-            let external_id = Self::restore_key(&key);
-            let version: SeqNumberType = bincode::deserialize(&val).unwrap();
-            let internal_id = match external_id {
-                PointIdType::NumId(idx) => external_to_internal_num.get(&idx).copied(),
-                PointIdType::Uuid(uuid) => external_to_internal_uuid.get(&uuid).copied(),
-            };
-            if let Some(internal_id) = internal_id {
-                if internal_id as usize >= internal_to_version.len() {
-                    internal_to_version.resize(internal_id as usize + 1, 0);
-                }
-                internal_to_version[internal_id as usize] = version;
-            } else {
-                log::debug!(
-                    "Found version without internal id, external id: {}",
-                    external_id
-                );
-            }
-        }
-
-        #[cfg(debug_assertions)]
-        {
-            for (idx, id) in external_to_internal_num.iter() {
-                debug_assert!(
-                    internal_to_external[*id as usize] == PointIdType::NumId(*idx),
-                    "Internal id {id} is mapped to external id {}, but should be {}",
-                    internal_to_external[*id as usize],
-                    PointIdType::NumId(*idx)
-                );
-            }
-        }
-
-        Ok(SimpleIdTracker {
-            deleted,
-            internal_to_external,
-            internal_to_version,
-            external_to_internal_num,
-            external_to_internal_uuid,
-            mapping_db_wrapper,
-            versions_db_wrapper,
-        })
-    }
-
-    fn store_key(external_id: &PointIdType) -> Vec<u8> {
-        bincode::serialize(&external_to_stored_id(external_id)).unwrap()
-    }
-
-    fn restore_key(data: &[u8]) -> PointIdType {
-        let stored_external_id: StoredPointId = bincode::deserialize(data).unwrap();
-        stored_to_external_id(stored_external_id)
-    }
-
-    fn delete_key(&self, external_id: &PointIdType) -> OperationResult<()> {
-        self.mapping_db_wrapper
-            .remove(Self::store_key(external_id))?;
-        self.versions_db_wrapper
-            .remove(Self::store_key(external_id))?;
-        Ok(())
-    }
-
-    fn persist_key(&self, external_id: &PointIdType, internal_id: usize) -> OperationResult<()> {
-        self.mapping_db_wrapper.put(
-            Self::store_key(external_id),
-            bincode::serialize(&internal_id).unwrap(),
-        )
-    }
-}
-
-impl IdTracker for SimpleIdTracker {
-    fn internal_version(&self, internal_id: PointOffsetType) -> Option<SeqNumberType> {
-        self.internal_to_version.get(internal_id as usize).copied()
-    }
-
-    fn set_internal_version(
-        &mut self,
-        internal_id: PointOffsetType,
-        version: SeqNumberType,
-    ) -> OperationResult<()> {
-        if let Some(external_id) = self.external_id(internal_id) {
-            if internal_id as usize >= self.internal_to_version.len() {
-                self.internal_to_version.resize(internal_id as usize + 1, 0);
-            }
-            self.internal_to_version[internal_id as usize] = version;
-            self.versions_db_wrapper.put(
-                Self::store_key(&external_id),
-                bincode::serialize(&version).unwrap(),
-            )?;
-        }
-        Ok(())
-    }
-
-    fn internal_id(&self, external_id: PointIdType) -> Option<PointOffsetType> {
-        match external_id {
-            PointIdType::NumId(idx) => self.external_to_internal_num.get(&idx).copied(),
-            PointIdType::Uuid(uuid) => self.external_to_internal_uuid.get(&uuid).copied(),
-        }
-    }
-
-    fn external_id(&self, internal_id: PointOffsetType) -> Option<PointIdType> {
-        if let Some(deleted) = self.deleted.get(internal_id as usize) {
-            if !deleted {
-                return self.internal_to_external.get(internal_id as usize).copied();
-            }
-        }
-        None
-    }
-
-    fn set_link(
-        &mut self,
-        external_id: PointIdType,
-        internal_id: PointOffsetType,
-    ) -> OperationResult<()> {
-        match external_id {
-            PointIdType::NumId(idx) => {
-                self.external_to_internal_num.insert(idx, internal_id);
-            }
-            PointIdType::Uuid(uuid) => {
-                self.external_to_internal_uuid.insert(uuid, internal_id);
-            }
-        }
-
-        let internal_id = internal_id as usize;
-        if internal_id >= self.internal_to_external.len() {
-            self.internal_to_external
-                .resize(internal_id + 1, PointIdType::NumId(u64::MAX));
-        }
-        if internal_id >= self.deleted.len() {
-            self.deleted.resize(internal_id + 1, true);
-        }
-        self.internal_to_external[internal_id] = external_id;
-        self.deleted.set(internal_id, false);
-
-        self.persist_key(&external_id, internal_id)?;
-        Ok(())
-    }
-
-    fn drop(&mut self, external_id: PointIdType) -> OperationResult<()> {
-        let internal_id = match &external_id {
-            PointIdType::NumId(idx) => self.external_to_internal_num.remove(idx),
-            PointIdType::Uuid(uuid) => self.external_to_internal_uuid.remove(uuid),
-        };
-        if let Some(internal_id) = internal_id {
-            self.deleted.set(internal_id as usize, true);
-            self.internal_to_external[internal_id as usize] = PointIdType::NumId(u64::MAX);
-        }
-        self.delete_key(&external_id)?;
-        Ok(())
-    }
-
-    fn iter_external(&self) -> Box<dyn Iterator<Item = PointIdType> + '_> {
-        let iter_num = self
-            .external_to_internal_num
-            .keys()
-            .copied()
-            .map(PointIdType::NumId);
-        let iter_uuid = self
-            .external_to_internal_uuid
-            .keys()
-            .copied()
-            .map(PointIdType::Uuid);
-        // order is important here, we want to iterate over the u64 ids first
-        Box::new(iter_num.chain(iter_uuid))
-    }
-
-    fn iter_internal(&self) -> Box<dyn Iterator<Item = PointOffsetType> + '_> {
-        Box::new(
-            (0..self.internal_to_external.len() as PointOffsetType)
-                .filter(move |i| !self.deleted[*i as usize]),
-        )
-    }
-
-    fn iter_from(
-        &self,
-        external_id: Option<PointIdType>,
-    ) -> Box<dyn Iterator<Item = (PointIdType, PointOffsetType)> + '_> {
-        let full_num_iter = || {
-            self.external_to_internal_num
-                .iter()
-                .map(|(k, v)| (PointIdType::NumId(*k), *v))
-        };
-        let offset_num_iter = |offset: u64| {
-            self.external_to_internal_num
-                .range(offset..)
-                .map(|(k, v)| (PointIdType::NumId(*k), *v))
-        };
-        let full_uuid_iter = || {
-            self.external_to_internal_uuid
-                .iter()
-                .map(|(k, v)| (PointIdType::Uuid(*k), *v))
-        };
-        let offset_uuid_iter = |offset: Uuid| {
-            self.external_to_internal_uuid
-                .range(offset..)
-                .map(|(k, v)| (PointIdType::Uuid(*k), *v))
-        };
-
-        match external_id {
-            None => {
-                let iter_num = full_num_iter();
-                let iter_uuid = full_uuid_iter();
-                // order is important here, we want to iterate over the u64 ids first
-                Box::new(iter_num.chain(iter_uuid))
-            }
-            Some(offset) => match offset {
-                PointIdType::NumId(idx) => {
-                    // Because u64 keys are less that uuid key, we can just use the full iterator for uuid
-                    let iter_num = offset_num_iter(idx);
-                    let iter_uuid = full_uuid_iter();
-                    // order is important here, we want to iterate over the u64 ids first
-                    Box::new(iter_num.chain(iter_uuid))
-                }
-                PointIdType::Uuid(uuid) => {
-                    // if offset is a uuid, we can only iterate over uuids
-                    Box::new(offset_uuid_iter(uuid))
-                }
-            },
-        }
-    }
-
-    fn total_point_count(&self) -> usize {
-        self.internal_to_external.len()
-    }
-
-    fn available_point_count(&self) -> usize {
-        self.external_to_internal_num.len() + self.external_to_internal_uuid.len()
-    }
-
-    fn deleted_point_count(&self) -> usize {
-        self.total_point_count() - self.available_point_count()
-    }
-
-    fn iter_ids(&self) -> Box<dyn Iterator<Item = PointOffsetType> + '_> {
-        self.iter_internal()
-    }
-
-    /// Creates a flusher function, that persists the removed points in the mapping database
-    /// and flushes the mapping to disk.
-    /// This function should be called _before_ flushing the version database.
-    fn mapping_flusher(&self) -> Flusher {
-        self.mapping_db_wrapper.flusher()
-    }
-
-    /// Creates a flusher function, that persists the removed points in the version database
-    /// and flushes the version database to disk.
-    /// This function should be called _after_ flushing the mapping database.
-    fn versions_flusher(&self) -> Flusher {
-        self.versions_db_wrapper.flusher()
-    }
-
-    fn is_deleted_point(&self, key: PointOffsetType) -> bool {
-        let key = key as usize;
-        if key >= self.deleted.len() {
-            return true;
-        }
-        self.deleted[key]
-    }
-
-    fn deleted_point_bitslice(&self) -> &BitSlice {
-        &self.deleted
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use itertools::Itertools;
-    use serde::de::DeserializeOwned;
-    use tempfile::Builder;
-
-    use super::*;
-    use crate::common::rocksdb_wrapper::{open_db, DB_VECTOR_CF};
-
-    fn check_bincode_serialization<
-        T: Serialize + DeserializeOwned + PartialEq + std::fmt::Debug,
-    >(
-        record: T,
-    ) {
-        let binary_entity = bincode::serialize(&record).expect("serialization ok");
-        let de_record: T = bincode::deserialize(&binary_entity).expect("deserialization ok");
-
-        assert_eq!(record, de_record);
-    }
-
-    #[test]
-    fn test_serialization() {
-        check_bincode_serialization(StoredPointId::NumId(123));
-        check_bincode_serialization(StoredPointId::Uuid(Uuid::from_u128(123_u128)));
-        check_bincode_serialization(StoredPointId::String("hello".to_string()));
-    }
-
-    #[test]
-    fn test_iterator() {
-        let dir = Builder::new().prefix("storage_dir").tempdir().unwrap();
-        let db = open_db(dir.path(), &[DB_VECTOR_CF]).unwrap();
-
-        let mut id_tracker = SimpleIdTracker::open(db).unwrap();
-
-        id_tracker.set_link(200.into(), 0).unwrap();
-        id_tracker.set_link(100.into(), 1).unwrap();
-        id_tracker.set_link(150.into(), 2).unwrap();
-        id_tracker.set_link(120.into(), 3).unwrap();
-        id_tracker.set_link(180.into(), 4).unwrap();
-        id_tracker.set_link(110.into(), 5).unwrap();
-        id_tracker.set_link(115.into(), 6).unwrap();
-        id_tracker.set_link(190.into(), 7).unwrap();
-        id_tracker.set_link(177.into(), 8).unwrap();
-        id_tracker.set_link(118.into(), 9).unwrap();
-
-        let first_four = id_tracker.iter_from(None).take(4).collect_vec();
-
-        assert_eq!(first_four.len(), 4);
-        assert_eq!(first_four[0].0, 100.into());
-
-        let last = id_tracker.iter_from(Some(first_four[3].0)).collect_vec();
-        assert_eq!(last.len(), 7);
-    }
-
-    #[test]
-    fn test_mixed_types_iterator() {
-        let dir = Builder::new().prefix("storage_dir").tempdir().unwrap();
-        let db = open_db(dir.path(), &[DB_VECTOR_CF]).unwrap();
-
-        let mut id_tracker = SimpleIdTracker::open(db).unwrap();
-
-        let mut values: Vec<PointIdType> = vec![
-            100.into(),
-            PointIdType::Uuid(Uuid::from_u128(123_u128)),
-            PointIdType::Uuid(Uuid::from_u128(156_u128)),
-            150.into(),
-            120.into(),
-            PointIdType::Uuid(Uuid::from_u128(12_u128)),
-            180.into(),
-            110.into(),
-            115.into(),
-            PointIdType::Uuid(Uuid::from_u128(673_u128)),
-            190.into(),
-            177.into(),
-            PointIdType::Uuid(Uuid::from_u128(971_u128)),
-        ];
-
-        for (id, value) in values.iter().enumerate() {
-            id_tracker.set_link(*value, id as PointOffsetType).unwrap();
-        }
-
-        let sorted_from_tracker = id_tracker.iter_from(None).map(|(k, _)| k).collect_vec();
-        values.sort();
-
-        assert_eq!(sorted_from_tracker, values);
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/index/field_index/binary_index.rs b/crates/qdrant/lib/segment/src/index/field_index/binary_index.rs
deleted file mode 100644
index 9b502cb..0000000
--- a/crates/qdrant/lib/segment/src/index/field_index/binary_index.rs
+++ /dev/null
@@ -1,522 +0,0 @@
-use std::sync::Arc;
-
-use parking_lot::RwLock;
-use rocksdb::DB;
-
-use self::memory::{BinaryItem, BinaryMemory};
-use super::{CardinalityEstimation, PayloadFieldIndex, PrimaryCondition, ValueIndexer};
-use crate::common::rocksdb_wrapper::DatabaseColumnWrapper;
-use crate::entry::entry_point::OperationResult;
-use crate::telemetry::PayloadIndexTelemetry;
-use crate::types::{
-    FieldCondition, Match, MatchValue, PayloadKeyType, PointOffsetType, ValueVariants,
-};
-
-mod memory {
-    use bitvec::vec::BitVec;
-
-    use crate::types::PointOffsetType;
-
-    pub struct BinaryItem {
-        value: u8,
-    }
-
-    impl BinaryItem {
-        const HAS_TRUE: u8 = 0b0000_0001;
-        const HAS_FALSE: u8 = 0b0000_0010;
-
-        pub fn empty() -> Self {
-            Self { value: 0 }
-        }
-
-        pub fn has_true(&self) -> bool {
-            self.value & Self::HAS_TRUE != 0
-        }
-
-        pub fn has_false(&self) -> bool {
-            self.value & Self::HAS_FALSE != 0
-        }
-
-        pub fn set(&mut self, flag: u8, value: bool) {
-            if value {
-                self.value |= flag;
-            } else {
-                self.value &= !flag;
-            }
-        }
-
-        pub fn from_bools(has_true: bool, has_false: bool) -> Self {
-            let mut item = Self::empty();
-            item.set(Self::HAS_TRUE, has_true);
-            item.set(Self::HAS_FALSE, has_false);
-            item
-        }
-
-        pub fn as_bytes(&self) -> [u8; 1] {
-            [self.value]
-        }
-    }
-
-    impl From<u8> for BinaryItem {
-        fn from(value: u8) -> Self {
-            Self { value }
-        }
-    }
-
-    pub struct BinaryMemory {
-        trues: BitVec,
-        falses: BitVec,
-        trues_count: usize,
-        falses_count: usize,
-        indexed_count: usize,
-    }
-
-    impl BinaryMemory {
-        pub fn new() -> Self {
-            Self {
-                trues: BitVec::new(),
-                falses: BitVec::new(),
-                trues_count: 0,
-                falses_count: 0,
-                indexed_count: 0,
-            }
-        }
-
-        pub fn get(&self, id: PointOffsetType) -> BinaryItem {
-            debug_assert!(self.trues.len() == self.falses.len());
-
-            let has_true = self.trues.get(id as usize).map(|v| *v).unwrap_or(false);
-            let has_false = self.falses.get(id as usize).map(|v| *v).unwrap_or(false);
-
-            BinaryItem::from_bools(has_true, has_false)
-        }
-
-        pub fn set_or_insert(&mut self, id: PointOffsetType, item: &BinaryItem) {
-            if (id as usize) >= self.trues.len() {
-                self.trues.resize(id as usize + 1, false);
-                self.falses.resize(id as usize + 1, false);
-            }
-
-            debug_assert!(self.trues.len() == self.falses.len());
-
-            let has_true = item.has_true();
-            let had_true = self.trues.replace(id as usize, has_true);
-            match (had_true, has_true) {
-                (false, true) => self.trues_count += 1,
-                (true, false) => self.trues_count -= 1,
-                _ => {}
-            }
-
-            let has_false = item.has_false();
-            let had_false = self.falses.replace(id as usize, has_false);
-            match (had_false, has_false) {
-                (false, true) => self.falses_count += 1,
-                (true, false) => self.falses_count -= 1,
-                _ => {}
-            }
-
-            self.indexed_count += 1;
-        }
-
-        /// Removes the point from the index and tries to shrink the vectors if possible. If the index is not within bounds, does nothing
-        pub fn remove(&mut self, id: PointOffsetType) {
-            if (id as usize) >= self.trues.len() {
-                return;
-            }
-
-            let had_true = self.trues.replace(id as usize, false);
-            let had_false = self.falses.replace(id as usize, false);
-
-            if had_true {
-                self.trues_count -= 1;
-            }
-            if had_false {
-                self.falses_count -= 1;
-            }
-
-            if had_false || had_true {
-                self.indexed_count -= 1;
-            }
-        }
-
-        pub fn trues_count(&self) -> usize {
-            self.trues_count
-        }
-
-        pub fn falses_count(&self) -> usize {
-            self.falses_count
-        }
-
-        pub fn indexed_count(&self) -> usize {
-            self.indexed_count
-        }
-
-        pub fn iter_has_true(&self) -> impl Iterator<Item = PointOffsetType> + '_ {
-            self.trues.iter_ones().map(|v| v as PointOffsetType)
-        }
-
-        pub fn iter_has_false(&self) -> impl Iterator<Item = PointOffsetType> + '_ {
-            self.falses.iter_ones().map(|v| v as PointOffsetType)
-        }
-    }
-}
-
-pub struct BinaryIndex {
-    memory: BinaryMemory,
-    db_wrapper: DatabaseColumnWrapper,
-}
-
-impl BinaryIndex {
-    pub fn new(db: Arc<RwLock<DB>>, field_name: &str) -> BinaryIndex {
-        let store_cf_name = Self::storage_cf_name(field_name);
-        let db_wrapper = DatabaseColumnWrapper::new(db, &store_cf_name);
-        Self {
-            memory: BinaryMemory::new(),
-            db_wrapper,
-        }
-    }
-
-    fn storage_cf_name(field: &str) -> String {
-        format!("{}_binary", field)
-    }
-
-    pub fn recreate(&self) -> OperationResult<()> {
-        self.db_wrapper.recreate_column_family()
-    }
-
-    pub fn get_telemetry_data(&self) -> PayloadIndexTelemetry {
-        PayloadIndexTelemetry {
-            field_name: None,
-            points_count: self.memory.indexed_count(),
-            points_values_count: self.memory.trues_count() + self.memory.falses_count(),
-            histogram_bucket_size: None,
-        }
-    }
-
-    pub fn values_count(&self, point_id: PointOffsetType) -> usize {
-        let binary_item = self.memory.get(point_id);
-        binary_item.has_true() as usize + binary_item.has_false() as usize
-    }
-
-    pub fn values_is_empty(&self, point_id: PointOffsetType) -> bool {
-        self.values_count(point_id) == 0
-    }
-}
-
-impl PayloadFieldIndex for BinaryIndex {
-    fn load(&mut self) -> OperationResult<bool> {
-        if !self.db_wrapper.has_column_family()? {
-            return Ok(false);
-        }
-
-        for (key, value) in self.db_wrapper.lock_db().iter()? {
-            let idx = PointOffsetType::from_be_bytes(key.as_ref().try_into().unwrap());
-
-            debug_assert_eq!(value.len(), 1);
-
-            let item = BinaryItem::from(value[0]);
-            self.memory.set_or_insert(idx, &item);
-        }
-        Ok(true)
-    }
-
-    fn clear(self) -> OperationResult<()> {
-        self.db_wrapper.remove_column_family()
-    }
-
-    fn flusher(&self) -> crate::common::Flusher {
-        self.db_wrapper.flusher()
-    }
-
-    fn filter<'a>(
-        &'a self,
-        condition: &'a crate::types::FieldCondition,
-    ) -> Option<Box<dyn Iterator<Item = PointOffsetType> + 'a>> {
-        match &condition.r#match {
-            Some(Match::Value(MatchValue {
-                value: ValueVariants::Bool(value),
-            })) => {
-                if *value {
-                    Some(Box::new(self.memory.iter_has_true()))
-                } else {
-                    Some(Box::new(self.memory.iter_has_false()))
-                }
-            }
-            _ => None,
-        }
-    }
-
-    fn estimate_cardinality(&self, condition: &FieldCondition) -> Option<CardinalityEstimation> {
-        match &condition.r#match {
-            Some(Match::Value(MatchValue {
-                value: ValueVariants::Bool(value),
-            })) => {
-                let count = if *value {
-                    self.memory.trues_count()
-                } else {
-                    self.memory.falses_count()
-                };
-
-                let estimation = CardinalityEstimation::exact(count)
-                    .with_primary_clause(PrimaryCondition::Condition(condition.clone()));
-
-                Some(estimation)
-            }
-            _ => None,
-        }
-    }
-
-    fn payload_blocks(
-        &self,
-        threshold: usize,
-        key: PayloadKeyType,
-    ) -> Box<dyn Iterator<Item = super::PayloadBlockCondition> + '_> {
-        let make_block = |count, value, key: PayloadKeyType| {
-            if count > threshold {
-                Some(super::PayloadBlockCondition {
-                    condition: FieldCondition::new_match(
-                        key,
-                        Match::Value(MatchValue {
-                            value: ValueVariants::Bool(value),
-                        }),
-                    ),
-                    cardinality: count,
-                })
-            } else {
-                None
-            }
-        };
-
-        // just two possible blocks: true and false
-        let iter = [
-            make_block(self.memory.trues_count(), true, key.clone()),
-            make_block(self.memory.falses_count(), false, key),
-        ]
-        .into_iter()
-        .flatten();
-
-        Box::new(iter)
-    }
-
-    fn count_indexed_points(&self) -> usize {
-        self.memory.indexed_count()
-    }
-}
-
-impl ValueIndexer<bool> for BinaryIndex {
-    fn add_many(&mut self, id: PointOffsetType, values: Vec<bool>) -> OperationResult<()> {
-        if values.is_empty() {
-            return Ok(());
-        }
-
-        let has_true = values.iter().any(|v| *v);
-        let has_false = values.iter().any(|v| !*v);
-
-        let item = BinaryItem::from_bools(has_true, has_false);
-
-        self.memory.set_or_insert(id, &item);
-
-        self.db_wrapper.put(id.to_be_bytes(), item.as_bytes())?;
-
-        Ok(())
-    }
-
-    fn get_value(&self, value: &serde_json::Value) -> Option<bool> {
-        value.as_bool()
-    }
-
-    fn remove_point(
-        &mut self,
-        id: PointOffsetType,
-    ) -> crate::entry::entry_point::OperationResult<()> {
-        self.memory.remove(id);
-        self.db_wrapper.remove(id.to_be_bytes())?;
-        Ok(())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use itertools::Itertools;
-    use rstest::rstest;
-    use serde_json::json;
-    use tempfile::{Builder, TempDir};
-
-    use super::BinaryIndex;
-    use crate::common::rocksdb_wrapper::open_db_with_existing_cf;
-    use crate::common::utils::MultiValue;
-    use crate::index::field_index::{PayloadFieldIndex, ValueIndexer};
-
-    const FIELD_NAME: &str = "bool_field";
-    const DB_NAME: &str = "test_db";
-
-    fn new_binary_index() -> (TempDir, BinaryIndex) {
-        let tmp_dir = Builder::new().prefix(DB_NAME).tempdir().unwrap();
-        let db = open_db_with_existing_cf(tmp_dir.path()).unwrap();
-        let index = BinaryIndex::new(db, FIELD_NAME);
-        index.recreate().unwrap();
-        (tmp_dir, index)
-    }
-
-    fn match_bool(value: bool) -> crate::types::FieldCondition {
-        crate::types::FieldCondition::new_match(
-            FIELD_NAME.to_string(),
-            crate::types::Match::Value(crate::types::MatchValue {
-                value: crate::types::ValueVariants::Bool(value),
-            }),
-        )
-    }
-
-    fn bools_fixture() -> Vec<serde_json::Value> {
-        vec![
-            json!(true),
-            json!(false),
-            json!([true, false]),
-            json!([false, true]),
-            json!([true, true]),
-            json!([false, false]),
-            json!([true, false, true]),
-            serde_json::Value::Null,
-            json!(1),
-            json!("test"),
-            json!([false]),
-            json!([true]),
-        ]
-    }
-
-    fn filter(given: serde_json::Value, match_on: bool, expected_count: usize) {
-        let (_tmp_dir, mut index) = new_binary_index();
-
-        index.add_point(0, &MultiValue::one(&given)).unwrap();
-
-        let count = index.filter(&match_bool(match_on)).unwrap().count();
-
-        assert_eq!(count, expected_count);
-    }
-
-    #[rstest]
-    #[case(json!(true), 1)]
-    #[case(json!(false), 0)]
-    #[case(json!([true]), 1)]
-    #[case(json!([false]), 0)]
-    #[case(json!([true, false]), 1)]
-    #[case(json!([false, true]), 1)]
-    #[case(json!([false, false]), 0)]
-    #[case(json!([true, true]), 1)]
-    fn filter_true(#[case] given: serde_json::Value, #[case] expected_count: usize) {
-        filter(given, true, expected_count)
-    }
-
-    #[rstest]
-    #[case(json!(true), 0)]
-    #[case(json!(false), 1)]
-    #[case(json!([true]), 0)]
-    #[case(json!([false]), 1)]
-    #[case(json!([true, false]), 1)]
-    #[case(json!([false, true]), 1)]
-    #[case(json!([false, false]), 1)]
-    #[case(json!([true, true]), 0)]
-    fn filter_false(#[case] given: serde_json::Value, #[case] expected_count: usize) {
-        filter(given, false, expected_count)
-    }
-
-    #[test]
-    fn load_from_disk() {
-        let (_tmp_dir, mut index) = new_binary_index();
-
-        bools_fixture()
-            .into_iter()
-            .enumerate()
-            .for_each(|(i, value)| {
-                let payload = MultiValue::one(&value);
-                index.add_point(i as u32, &payload).unwrap();
-            });
-
-        index.flusher()().unwrap();
-        let db = index.db_wrapper.database;
-
-        let mut new_index = BinaryIndex::new(db, FIELD_NAME);
-        assert!(new_index.load().unwrap());
-
-        let point_offsets = new_index.filter(&match_bool(false)).unwrap().collect_vec();
-        assert_eq!(point_offsets, vec![1, 2, 3, 5, 6, 10]);
-
-        let point_offsets = new_index.filter(&match_bool(true)).unwrap().collect_vec();
-        assert_eq!(point_offsets, vec![0, 2, 3, 4, 6, 11]);
-    }
-
-    #[rstest]
-    #[case(json!(false), json!(true))]
-    #[case(json!([false, true]), json!(true))]
-    /// Try to modify from falsy to only true
-    fn modify_value(#[case] before: serde_json::Value, #[case] after: serde_json::Value) {
-        let (_tmp_dir, mut index) = new_binary_index();
-
-        let idx = 1000;
-        index.add_point(idx, &MultiValue::one(&before)).unwrap();
-
-        let point_offsets = index.filter(&match_bool(false)).unwrap().collect_vec();
-        assert_eq!(point_offsets, vec![idx]);
-
-        index.add_point(idx, &MultiValue::one(&after)).unwrap();
-
-        let point_offsets = index.filter(&match_bool(true)).unwrap().collect_vec();
-        assert_eq!(point_offsets, vec![idx]);
-        let point_offsets = index.filter(&match_bool(false)).unwrap().collect_vec();
-        assert!(point_offsets.is_empty());
-    }
-
-    #[test]
-    fn indexed_count() {
-        let (_tmp_dir, mut index) = new_binary_index();
-
-        bools_fixture()
-            .into_iter()
-            .enumerate()
-            .for_each(|(i, value)| {
-                let payload = MultiValue::one(&value);
-                index.add_point(i as u32, &payload).unwrap();
-            });
-
-        assert_eq!(index.count_indexed_points(), 9);
-    }
-
-    #[test]
-    fn payload_blocks() {
-        let (_tmp_dir, mut index) = new_binary_index();
-
-        bools_fixture()
-            .into_iter()
-            .enumerate()
-            .for_each(|(i, value)| {
-                let payload = MultiValue::one(&value);
-                index.add_point(i as u32, &payload).unwrap();
-            });
-
-        let blocks = index
-            .payload_blocks(0, FIELD_NAME.to_string())
-            .collect_vec();
-        assert_eq!(blocks.len(), 2);
-        assert_eq!(blocks[0].cardinality, 6);
-        assert_eq!(blocks[1].cardinality, 6);
-    }
-
-    #[test]
-    fn estimate_cardinality() {
-        let (_tmp_dir, mut index) = new_binary_index();
-
-        bools_fixture()
-            .into_iter()
-            .enumerate()
-            .for_each(|(i, value)| {
-                let payload = MultiValue::one(&value);
-                index.add_point(i as u32, &payload).unwrap();
-            });
-
-        let cardinality = index.estimate_cardinality(&match_bool(true)).unwrap();
-        assert_eq!(cardinality.exp, 6);
-
-        let cardinality = index.estimate_cardinality(&match_bool(false)).unwrap();
-        assert_eq!(cardinality.exp, 6);
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/index/field_index/field_index_base.rs b/crates/qdrant/lib/segment/src/index/field_index/field_index_base.rs
deleted file mode 100644
index f3774b8..0000000
--- a/crates/qdrant/lib/segment/src/index/field_index/field_index_base.rs
+++ /dev/null
@@ -1,332 +0,0 @@
-use serde_json::Value;
-use smol_str::SmolStr;
-
-use crate::common::utils::MultiValue;
-use crate::common::Flusher;
-use crate::entry::entry_point::OperationResult;
-use crate::index::field_index::binary_index::BinaryIndex;
-use crate::index::field_index::full_text_index::text_index::FullTextIndex;
-use crate::index::field_index::geo_index::GeoMapIndex;
-use crate::index::field_index::map_index::MapIndex;
-use crate::index::field_index::numeric_index::NumericIndex;
-use crate::index::field_index::{CardinalityEstimation, PayloadBlockCondition};
-use crate::telemetry::PayloadIndexTelemetry;
-use crate::types::{
-    FieldCondition, FloatPayloadType, IntPayloadType, Match, MatchText, PayloadKeyType,
-    PointOffsetType,
-};
-
-pub trait PayloadFieldIndex {
-    /// Return number of points with at least one value indexed in here
-    fn count_indexed_points(&self) -> usize;
-
-    /// Load index from disk.
-    fn load(&mut self) -> OperationResult<bool>;
-
-    /// Remove db content of the current payload index
-    fn clear(self) -> OperationResult<()>;
-
-    /// Return function that flushes all pending updates to disk.
-    fn flusher(&self) -> Flusher;
-
-    /// Get iterator over points fitting given `condition`
-    /// Return `None` if condition does not match the index type
-    fn filter<'a>(
-        &'a self,
-        condition: &'a FieldCondition,
-    ) -> Option<Box<dyn Iterator<Item = PointOffsetType> + 'a>>;
-
-    /// Return estimation of points amount which satisfy given condition
-    fn estimate_cardinality(&self, condition: &FieldCondition) -> Option<CardinalityEstimation>;
-
-    /// Iterate conditions for payload blocks with minimum size of `threshold`
-    /// Required for building HNSW index
-    fn payload_blocks(
-        &self,
-        threshold: usize,
-        key: PayloadKeyType,
-    ) -> Box<dyn Iterator<Item = PayloadBlockCondition> + '_>;
-}
-
-pub trait ValueIndexer<T> {
-    /// Add multiple values associated with a single point
-    /// This function should be called only once for each point
-    fn add_many(&mut self, id: PointOffsetType, values: Vec<T>) -> OperationResult<()>;
-
-    /// Extract index-able value from payload `Value`
-    fn get_value(&self, value: &Value) -> Option<T>;
-
-    /// Try to extract index-able values from payload `Value`, even if it is an array
-    fn get_values(&self, value: &Value) -> Vec<T> {
-        match value {
-            Value::Array(values) => values.iter().flat_map(|x| self.get_value(x)).collect(),
-            _ => self.get_value(value).map(|x| vec![x]).unwrap_or_default(),
-        }
-    }
-
-    /// Add point with payload to index
-    fn add_point(
-        &mut self,
-        id: PointOffsetType,
-        payload: &MultiValue<&Value>,
-    ) -> OperationResult<()> {
-        match payload {
-            MultiValue::Multiple(values) => {
-                self.remove_point(id)?;
-                let mut flatten_values: Vec<_> = vec![];
-
-                for value in values {
-                    match value {
-                        Value::Array(values) => {
-                            flatten_values.extend(values.iter().flat_map(|x| self.get_value(x)));
-                        }
-                        _ => {
-                            if let Some(x) = self.get_value(value) {
-                                flatten_values.push(x);
-                            }
-                        }
-                    }
-                }
-                self.add_many(id, flatten_values)
-            }
-            MultiValue::Single(Some(Value::Array(values))) => {
-                self.remove_point(id)?;
-                self.add_many(id, values.iter().flat_map(|x| self.get_value(x)).collect())
-            }
-            MultiValue::Single(Some(value)) => {
-                if let Some(x) = self.get_value(value) {
-                    self.remove_point(id)?;
-                    self.add_many(id, vec![x])
-                } else {
-                    Ok(())
-                }
-            }
-            MultiValue::Single(None) => Ok(()),
-        }
-    }
-
-    /// remove a point from the index
-    fn remove_point(&mut self, id: PointOffsetType) -> OperationResult<()>;
-}
-
-/// Common interface for all possible types of field indexes
-/// Enables polymorphism on field indexes
-/// TODO: Rename with major release
-#[allow(clippy::enum_variant_names)]
-pub enum FieldIndex {
-    IntIndex(NumericIndex<IntPayloadType>),
-    IntMapIndex(MapIndex<IntPayloadType>),
-    KeywordIndex(MapIndex<SmolStr>),
-    FloatIndex(NumericIndex<FloatPayloadType>),
-    GeoIndex(GeoMapIndex),
-    FullTextIndex(FullTextIndex),
-    BinaryIndex(BinaryIndex),
-}
-
-impl FieldIndex {
-    /// Try to check condition for a payload given a field index.
-    /// Required because some index parameters may influence the condition checking logic.
-    /// For example, full text index may have different tokenizers.
-    ///
-    /// Returns `None` if there is no special logic for the given index
-    /// returns `Some(true)` if condition is satisfied
-    /// returns `Some(false)` if condition is not satisfied
-    pub fn check_condition(
-        &self,
-        condition: &FieldCondition,
-        payload_value: &Value,
-    ) -> Option<bool> {
-        match self {
-            FieldIndex::IntIndex(_) => None,
-            FieldIndex::IntMapIndex(_) => None,
-            FieldIndex::KeywordIndex(_) => None,
-            FieldIndex::FloatIndex(_) => None,
-            FieldIndex::GeoIndex(_) => None,
-            FieldIndex::BinaryIndex(_) => None,
-            FieldIndex::FullTextIndex(full_text_index) => match &condition.r#match {
-                Some(Match::Text(MatchText { text })) => {
-                    let query = full_text_index.parse_query(text);
-                    for value in full_text_index.get_values(payload_value) {
-                        let document = full_text_index.parse_document(&value);
-                        if query.check_match(&document) {
-                            return Some(true);
-                        }
-                    }
-                    Some(false)
-                }
-                _ => None,
-            },
-        }
-    }
-
-    fn get_payload_field_index(&self) -> &dyn PayloadFieldIndex {
-        match self {
-            FieldIndex::IntIndex(payload_field_index) => payload_field_index,
-            FieldIndex::IntMapIndex(payload_field_index) => payload_field_index,
-            FieldIndex::KeywordIndex(payload_field_index) => payload_field_index,
-            FieldIndex::FloatIndex(payload_field_index) => payload_field_index,
-            FieldIndex::GeoIndex(payload_field_index) => payload_field_index,
-            FieldIndex::BinaryIndex(payload_field_index) => payload_field_index,
-            FieldIndex::FullTextIndex(payload_field_index) => payload_field_index,
-        }
-    }
-
-    #[allow(dead_code)]
-    fn get_payload_field_index_mut(&mut self) -> &mut dyn PayloadFieldIndex {
-        match self {
-            FieldIndex::IntIndex(ref mut payload_field_index) => payload_field_index,
-            FieldIndex::IntMapIndex(ref mut payload_field_index) => payload_field_index,
-            FieldIndex::KeywordIndex(ref mut payload_field_index) => payload_field_index,
-            FieldIndex::FloatIndex(ref mut payload_field_index) => payload_field_index,
-            FieldIndex::GeoIndex(ref mut payload_field_index) => payload_field_index,
-            FieldIndex::BinaryIndex(ref mut payload_field_index) => payload_field_index,
-            FieldIndex::FullTextIndex(ref mut payload_field_index) => payload_field_index,
-        }
-    }
-
-    pub fn load(&mut self) -> OperationResult<bool> {
-        match self {
-            FieldIndex::IntIndex(ref mut payload_field_index) => payload_field_index.load(),
-            FieldIndex::IntMapIndex(ref mut payload_field_index) => payload_field_index.load(),
-            FieldIndex::KeywordIndex(ref mut payload_field_index) => payload_field_index.load(),
-            FieldIndex::FloatIndex(ref mut payload_field_index) => payload_field_index.load(),
-            FieldIndex::GeoIndex(ref mut payload_field_index) => payload_field_index.load(),
-            FieldIndex::BinaryIndex(ref mut payload_field_index) => payload_field_index.load(),
-            FieldIndex::FullTextIndex(ref mut payload_field_index) => payload_field_index.load(),
-        }
-    }
-
-    pub fn clear(self) -> OperationResult<()> {
-        match self {
-            FieldIndex::IntIndex(index) => index.clear(),
-            FieldIndex::IntMapIndex(index) => index.clear(),
-            FieldIndex::KeywordIndex(index) => index.clear(),
-            FieldIndex::FloatIndex(index) => index.clear(),
-            FieldIndex::GeoIndex(index) => index.clear(),
-            FieldIndex::BinaryIndex(index) => index.clear(),
-            FieldIndex::FullTextIndex(index) => index.clear(),
-        }
-    }
-
-    pub fn recreate(&self) -> OperationResult<()> {
-        match self {
-            FieldIndex::IntIndex(index) => index.recreate(),
-            FieldIndex::IntMapIndex(index) => index.recreate(),
-            FieldIndex::KeywordIndex(index) => index.recreate(),
-            FieldIndex::FloatIndex(index) => index.recreate(),
-            FieldIndex::GeoIndex(index) => index.recreate(),
-            FieldIndex::BinaryIndex(index) => index.recreate(),
-            FieldIndex::FullTextIndex(index) => index.recreate(),
-        }
-    }
-
-    pub fn count_indexed_points(&self) -> usize {
-        self.get_payload_field_index().count_indexed_points()
-    }
-
-    pub fn flusher(&self) -> Flusher {
-        self.get_payload_field_index().flusher()
-    }
-
-    pub fn filter<'a>(
-        &'a self,
-        condition: &'a FieldCondition,
-    ) -> Option<Box<dyn Iterator<Item = PointOffsetType> + 'a>> {
-        self.get_payload_field_index().filter(condition)
-    }
-
-    pub fn estimate_cardinality(
-        &self,
-        condition: &FieldCondition,
-    ) -> Option<CardinalityEstimation> {
-        self.get_payload_field_index()
-            .estimate_cardinality(condition)
-    }
-
-    pub fn payload_blocks(
-        &self,
-        threshold: usize,
-        key: PayloadKeyType,
-    ) -> Box<dyn Iterator<Item = PayloadBlockCondition> + '_> {
-        self.get_payload_field_index()
-            .payload_blocks(threshold, key)
-    }
-
-    pub fn add_point(
-        &mut self,
-        id: PointOffsetType,
-        payload: &MultiValue<&Value>,
-    ) -> OperationResult<()> {
-        match self {
-            FieldIndex::IntIndex(ref mut payload_field_index) => {
-                payload_field_index.add_point(id, payload)
-            }
-            FieldIndex::IntMapIndex(ref mut payload_field_index) => {
-                payload_field_index.add_point(id, payload)
-            }
-            FieldIndex::KeywordIndex(ref mut payload_field_index) => {
-                payload_field_index.add_point(id, payload)
-            }
-            FieldIndex::FloatIndex(ref mut payload_field_index) => {
-                payload_field_index.add_point(id, payload)
-            }
-            FieldIndex::GeoIndex(ref mut payload_field_index) => {
-                payload_field_index.add_point(id, payload)
-            }
-            FieldIndex::BinaryIndex(ref mut payload_field_index) => {
-                payload_field_index.add_point(id, payload)
-            }
-            FieldIndex::FullTextIndex(ref mut payload_field_index) => {
-                payload_field_index.add_point(id, payload)
-            }
-        }
-    }
-
-    pub fn remove_point(&mut self, point_id: PointOffsetType) -> OperationResult<()> {
-        match self {
-            FieldIndex::IntIndex(index) => index.remove_point(point_id),
-            FieldIndex::IntMapIndex(index) => index.remove_point(point_id),
-            FieldIndex::KeywordIndex(index) => index.remove_point(point_id),
-            FieldIndex::FloatIndex(index) => index.remove_point(point_id),
-            FieldIndex::GeoIndex(index) => index.remove_point(point_id),
-            FieldIndex::BinaryIndex(index) => index.remove_point(point_id),
-            FieldIndex::FullTextIndex(index) => index.remove_point(point_id),
-        }
-    }
-
-    pub fn get_telemetry_data(&self) -> PayloadIndexTelemetry {
-        match self {
-            FieldIndex::IntIndex(index) => index.get_telemetry_data(),
-            FieldIndex::IntMapIndex(index) => index.get_telemetry_data(),
-            FieldIndex::KeywordIndex(index) => index.get_telemetry_data(),
-            FieldIndex::FloatIndex(index) => index.get_telemetry_data(),
-            FieldIndex::GeoIndex(index) => index.get_telemetry_data(),
-            FieldIndex::BinaryIndex(index) => index.get_telemetry_data(),
-            FieldIndex::FullTextIndex(index) => index.get_telemetry_data(),
-        }
-    }
-
-    pub fn values_count(&self, point_id: PointOffsetType) -> usize {
-        match self {
-            FieldIndex::IntIndex(index) => index.values_count(point_id),
-            FieldIndex::IntMapIndex(index) => index.values_count(point_id),
-            FieldIndex::KeywordIndex(index) => index.values_count(point_id),
-            FieldIndex::FloatIndex(index) => index.values_count(point_id),
-            FieldIndex::GeoIndex(index) => index.values_count(point_id),
-            FieldIndex::BinaryIndex(index) => index.values_count(point_id),
-            FieldIndex::FullTextIndex(index) => index.values_count(point_id),
-        }
-    }
-
-    pub fn values_is_empty(&self, point_id: PointOffsetType) -> bool {
-        match self {
-            FieldIndex::IntIndex(index) => index.values_is_empty(point_id),
-            FieldIndex::IntMapIndex(index) => index.values_is_empty(point_id),
-            FieldIndex::KeywordIndex(index) => index.values_is_empty(point_id),
-            FieldIndex::FloatIndex(index) => index.values_is_empty(point_id),
-            FieldIndex::GeoIndex(index) => index.values_is_empty(point_id),
-            FieldIndex::BinaryIndex(index) => index.values_is_empty(point_id),
-            FieldIndex::FullTextIndex(index) => index.values_is_empty(point_id),
-        }
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/index/field_index/full_text_index/inverted_index.rs b/crates/qdrant/lib/segment/src/index/field_index/full_text_index/inverted_index.rs
deleted file mode 100644
index cc2215b..0000000
--- a/crates/qdrant/lib/segment/src/index/field_index/full_text_index/inverted_index.rs
+++ /dev/null
@@ -1,255 +0,0 @@
-use std::collections::{BTreeSet, HashMap};
-
-use serde::{Deserialize, Serialize};
-
-use super::posting_list::PostingList;
-use super::postings_iterator::intersect_postings_iterator;
-use crate::index::field_index::{CardinalityEstimation, PayloadBlockCondition, PrimaryCondition};
-use crate::types::{FieldCondition, Match, MatchText, PayloadKeyType, PointOffsetType};
-
-pub type TokenId = u32;
-
-#[derive(Default, Serialize, Deserialize, Debug, Clone)]
-pub struct Document {
-    tokens: Vec<TokenId>,
-}
-
-impl Document {
-    pub fn new(mut tokens: Vec<TokenId>) -> Self {
-        tokens.sort_unstable();
-        Self { tokens }
-    }
-
-    pub fn len(&self) -> usize {
-        self.tokens.len()
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.tokens.is_empty()
-    }
-
-    pub fn tokens(&self) -> &[TokenId] {
-        &self.tokens
-    }
-
-    pub fn check(&self, token: TokenId) -> bool {
-        self.tokens.binary_search(&token).is_ok()
-    }
-}
-
-#[derive(Debug)]
-pub struct ParsedQuery {
-    pub tokens: Vec<Option<TokenId>>,
-}
-
-impl ParsedQuery {
-    pub fn check_match(&self, document: &Document) -> bool {
-        if self.tokens.contains(&None) {
-            return false;
-        }
-        // Check that all tokens are in document
-        self.tokens
-            .iter()
-            // unwrap crash safety: all tokens exist in the vocabulary if it passes the above check
-            .all(|query_token| document.check(query_token.unwrap()))
-    }
-}
-
-#[derive(Default)]
-pub struct InvertedIndex {
-    postings: Vec<Option<PostingList>>,
-    pub vocab: HashMap<String, TokenId>,
-    pub point_to_docs: Vec<Option<Document>>,
-    pub points_count: usize,
-}
-
-impl InvertedIndex {
-    pub fn new() -> InvertedIndex {
-        Default::default()
-    }
-
-    pub fn document_from_tokens(&mut self, tokens: &BTreeSet<String>) -> Document {
-        let mut document_tokens = vec![];
-        for token in tokens {
-            // check if in vocab
-            let vocab_idx = match self.vocab.get(token) {
-                Some(&idx) => idx,
-                None => {
-                    let next_token_id = self.vocab.len() as TokenId;
-                    self.vocab.insert(token.to_string(), next_token_id);
-                    next_token_id
-                }
-            };
-            document_tokens.push(vocab_idx);
-        }
-
-        Document::new(document_tokens)
-    }
-
-    pub fn index_document(&mut self, idx: PointOffsetType, document: Document) {
-        self.points_count += 1;
-        if self.point_to_docs.len() <= idx as usize {
-            self.point_to_docs
-                .resize(idx as usize + 1, Default::default());
-        }
-
-        for token_idx in document.tokens() {
-            let token_idx_usize = *token_idx as usize;
-            if self.postings.len() <= token_idx_usize {
-                self.postings
-                    .resize(token_idx_usize + 1, Default::default());
-            }
-            let posting = self
-                .postings
-                .get_mut(token_idx_usize)
-                .expect("posting must exist even if with None");
-            match posting {
-                None => *posting = Some(PostingList::new(idx)),
-                Some(vec) => vec.insert(idx),
-            }
-        }
-        self.point_to_docs[idx as usize] = Some(document);
-    }
-
-    pub fn remove_document(&mut self, idx: PointOffsetType) -> Option<Document> {
-        if self.point_to_docs.len() <= idx as usize {
-            return None; // Already removed or never actually existed
-        }
-
-        let removed_doc = match std::mem::take(&mut self.point_to_docs[idx as usize]) {
-            Some(doc) => doc,
-            None => return None,
-        };
-
-        self.points_count -= 1;
-
-        for removed_token in removed_doc.tokens() {
-            // unwrap safety: posting list exists and contains the document id
-            let posting = self.postings.get_mut(*removed_token as usize).unwrap();
-            if let Some(vec) = posting {
-                vec.remove(idx);
-            }
-        }
-        Some(removed_doc)
-    }
-
-    pub fn filter(&self, query: &ParsedQuery) -> Box<dyn Iterator<Item = PointOffsetType> + '_> {
-        let postings_opt: Option<Vec<_>> = query
-            .tokens
-            .iter()
-            .map(|&vocab_idx| match vocab_idx {
-                None => None,
-                // if a ParsedQuery token was given an index, then it must exist in the vocabulary
-                // dictionary. Posting list entry can be None but it exists.
-                Some(idx) => self.postings.get(idx as usize).unwrap().as_ref(),
-            })
-            .collect();
-        if postings_opt.is_none() {
-            // There are unseen tokens -> no matches
-            return Box::new(vec![].into_iter());
-        }
-        let postings = postings_opt.unwrap();
-        if postings.is_empty() {
-            // Empty request -> no matches
-            return Box::new(vec![].into_iter());
-        }
-        intersect_postings_iterator(postings)
-    }
-
-    pub fn estimate_cardinality(
-        &self,
-        query: &ParsedQuery,
-        condition: &FieldCondition,
-    ) -> CardinalityEstimation {
-        let postings_opt: Option<Vec<_>> = query
-            .tokens
-            .iter()
-            .map(|&vocab_idx| match vocab_idx {
-                None => None,
-                // unwrap safety: same as in filter()
-                Some(idx) => self.postings.get(idx as usize).unwrap().as_ref(),
-            })
-            .collect();
-        if postings_opt.is_none() {
-            // There are unseen tokens -> no matches
-            return CardinalityEstimation {
-                primary_clauses: vec![PrimaryCondition::Condition(condition.clone())],
-                min: 0,
-                exp: 0,
-                max: 0,
-            };
-        }
-        let postings = postings_opt.unwrap();
-        if postings.is_empty() {
-            // Empty request -> no matches
-            return CardinalityEstimation {
-                primary_clauses: vec![PrimaryCondition::Condition(condition.clone())],
-                min: 0,
-                exp: 0,
-                max: 0,
-            };
-        }
-        // Smallest posting is the largest possible cardinality
-        let smallest_posting = postings.iter().map(|posting| posting.len()).min().unwrap();
-
-        return if postings.len() == 1 {
-            CardinalityEstimation {
-                primary_clauses: vec![PrimaryCondition::Condition(condition.clone())],
-                min: smallest_posting,
-                exp: smallest_posting,
-                max: smallest_posting,
-            }
-        } else {
-            let expected_frac: f64 = postings
-                .iter()
-                .map(|posting| posting.len() as f64 / self.points_count as f64)
-                .product();
-            let exp = (expected_frac * self.points_count as f64) as usize;
-            CardinalityEstimation {
-                primary_clauses: vec![PrimaryCondition::Condition(condition.clone())],
-                min: 0, // ToDo: make better estimation
-                exp,
-                max: smallest_posting,
-            }
-        };
-    }
-
-    pub fn payload_blocks(
-        &self,
-        threshold: usize,
-        key: PayloadKeyType,
-    ) -> Box<dyn Iterator<Item = PayloadBlockCondition> + '_> {
-        // It might be very hard to predict possible combinations of conditions,
-        // so we only build it for individual tokens
-        Box::new(
-            self.vocab
-                .iter()
-                .filter(|(_token, &posting_idx)| self.postings[posting_idx as usize].is_some())
-                .filter(move |(_token, &posting_idx)| {
-                    // unwrap crash safety: all tokens that passes the first filter should have postings
-                    self.postings[posting_idx as usize].as_ref().unwrap().len() >= threshold
-                })
-                .map(|(token, &posting_idx)| {
-                    (
-                        token,
-                        // same as the above case
-                        self.postings[posting_idx as usize].as_ref().unwrap(),
-                    )
-                })
-                .map(move |(token, posting)| PayloadBlockCondition {
-                    condition: FieldCondition {
-                        key: key.clone(),
-                        r#match: Some(Match::Text(MatchText {
-                            text: token.clone(),
-                        })),
-                        range: None,
-                        geo_bounding_box: None,
-                        geo_radius: None,
-                        geo_polygon: None,
-                        values_count: None,
-                    },
-                    cardinality: posting.len(),
-                }),
-        )
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/index/field_index/full_text_index/mod.rs b/crates/qdrant/lib/segment/src/index/field_index/full_text_index/mod.rs
deleted file mode 100644
index 3268977..0000000
--- a/crates/qdrant/lib/segment/src/index/field_index/full_text_index/mod.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-mod inverted_index;
-mod posting_list;
-mod postings_iterator;
-pub mod text_index;
-mod tokenizers;
-
-#[cfg(test)]
-mod tests;
diff --git a/crates/qdrant/lib/segment/src/index/field_index/full_text_index/posting_list.rs b/crates/qdrant/lib/segment/src/index/field_index/full_text_index/posting_list.rs
deleted file mode 100644
index 8586659..0000000
--- a/crates/qdrant/lib/segment/src/index/field_index/full_text_index/posting_list.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-use crate::types::PointOffsetType;
-
-#[derive(Clone, Debug, Default)]
-pub struct PostingList {
-    list: Vec<PointOffsetType>,
-}
-
-impl PostingList {
-    pub fn new(idx: PointOffsetType) -> Self {
-        Self { list: vec![idx] }
-    }
-
-    pub fn insert(&mut self, idx: PointOffsetType) {
-        if let Err(insertion_idx) = self.list.binary_search(&idx) {
-            // Yes, this is O(n) but:
-            // 1. That would give us maximal search performance with minimal memory usage
-            // 2. Documents are inserted mostly sequentially, especially in large segments
-            // 3. Vector indexing is more expensive anyway
-            // 4. We can separate updatable and remove-only indexes later
-            self.list.insert(insertion_idx, idx);
-        }
-    }
-
-    pub fn remove(&mut self, idx: PointOffsetType) {
-        if let Ok(removal_idx) = self.list.binary_search(&idx) {
-            self.list.remove(removal_idx);
-        }
-    }
-
-    pub fn len(&self) -> usize {
-        self.list.len()
-    }
-
-    pub fn contains(&self, val: &PointOffsetType) -> bool {
-        self.list.binary_search(val).is_ok()
-    }
-
-    pub fn iter(&self) -> impl Iterator<Item = PointOffsetType> + '_ {
-        self.list.iter().copied()
-    }
-}
-
-impl IntoIterator for PostingList {
-    type Item = PointOffsetType;
-    type IntoIter = std::vec::IntoIter<Self::Item>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        self.list.into_iter()
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/index/field_index/full_text_index/postings_iterator.rs b/crates/qdrant/lib/segment/src/index/field_index/full_text_index/postings_iterator.rs
deleted file mode 100644
index 61b546d..0000000
--- a/crates/qdrant/lib/segment/src/index/field_index/full_text_index/postings_iterator.rs
+++ /dev/null
@@ -1,53 +0,0 @@
-use super::posting_list::PostingList;
-use crate::types::PointOffsetType;
-
-pub fn intersect_postings_iterator<'a>(
-    mut postings: Vec<&'a PostingList>,
-) -> Box<dyn Iterator<Item = PointOffsetType> + 'a> {
-    let smallest_posting_idx = postings
-        .iter()
-        .enumerate()
-        .min_by_key(|(_idx, posting)| posting.len())
-        .map(|(idx, _posting)| idx)
-        .unwrap();
-    let smallest_posting = postings.remove(smallest_posting_idx);
-
-    let and_iter = smallest_posting
-        .iter()
-        .filter(move |doc_id| postings.iter().all(|posting| posting.contains(doc_id)));
-
-    Box::new(and_iter)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_postings_iterator() {
-        let mut p1 = PostingList::default();
-        p1.insert(1);
-        p1.insert(2);
-        p1.insert(3);
-        p1.insert(4);
-        p1.insert(5);
-        let mut p2 = PostingList::default();
-        p2.insert(2);
-        p2.insert(4);
-        p2.insert(5);
-        p2.insert(5);
-        let mut p3 = PostingList::default();
-        p3.insert(1);
-        p3.insert(2);
-        p3.insert(5);
-        p3.insert(6);
-        p3.insert(7);
-
-        let postings = vec![&p1, &p2, &p3];
-        let merged = intersect_postings_iterator(postings);
-
-        let res = merged.collect::<Vec<_>>();
-
-        assert_eq!(res, vec![2, 5]);
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/index/field_index/full_text_index/tests/mod.rs b/crates/qdrant/lib/segment/src/index/field_index/full_text_index/tests/mod.rs
deleted file mode 100644
index ad7e709..0000000
--- a/crates/qdrant/lib/segment/src/index/field_index/full_text_index/tests/mod.rs
+++ /dev/null
@@ -1,196 +0,0 @@
-use tempfile::Builder;
-
-use crate::common::rocksdb_wrapper::open_db_with_existing_cf;
-use crate::data_types::text_index::{TextIndexParams, TextIndexType, TokenizerType};
-use crate::index::field_index::full_text_index::text_index::FullTextIndex;
-use crate::index::field_index::ValueIndexer;
-use crate::types::PointOffsetType;
-
-fn get_texts() -> Vec<String> {
-    vec![
-        "2430 A.D.".to_string(),
-        "The Acquisitive Chuckle".to_string(),
-        "Author! Author!".to_string(),
-        "The Bicentennial Man".to_string(),
-        "Big Game".to_string(),
-        "The Billiard Ball".to_string(),
-        "Birth of a Notion".to_string(),
-        "Black Friar of the Flame".to_string(),
-        "Blank!".to_string(),
-        "Blind Alley".to_string(),
-        "Breeds There a Man...?".to_string(),
-        "Button, Button".to_string(),
-        "Buy Jupiter".to_string(),
-        "C-Chute".to_string(),
-        "Cal".to_string(),
-        "The Callistan Menace".to_string(),
-        "Catch That Rabbit".to_string(),
-        "Christmas on Ganymede".to_string(),
-        "Darwinian Pool Room".to_string(),
-        "Day of the Hunters".to_string(),
-        "Death Sentence".to_string(),
-        "Does a Bee Care?".to_string(),
-        "Dreaming Is a Private Thing".to_string(),
-        "The Dust of Death".to_string(),
-        "The Dying Night".to_string(),
-        "Each an Explorer".to_string(),
-        "Escape!".to_string(),
-        "Everest".to_string(),
-        "Evidence".to_string(),
-        "The Evitable Conflict".to_string(),
-        "Exile to Hell".to_string(),
-        "Eyes Do More Than See".to_string(),
-        "The Feeling of Power".to_string(),
-        "Feminine Intuition".to_string(),
-        "First Law".to_string(),
-        "Flies".to_string(),
-        "For the Birds".to_string(),
-        "Founding Father".to_string(),
-        "The Fun They Had".to_string(),
-        "Galley Slave".to_string(),
-        "The Gentle Vultures".to_string(),
-        "Getting Even".to_string(),
-        "Gimmicks Three".to_string(),
-        "Gold".to_string(),
-        "Good Taste".to_string(),
-        "The Greatest Asset".to_string(),
-        "Green Patches".to_string(),
-        "Half-Breed".to_string(),
-        "Half-Breeds on Venus".to_string(),
-        "Hallucination".to_string(),
-        "The Hazing".to_string(),
-        "Hell-Fire".to_string(),
-        "Heredity".to_string(),
-        "History".to_string(),
-        "Homo Sol".to_string(),
-        "Hostess".to_string(),
-        "I Just Make Them Up, See!".to_string(),
-        "I'm in Marsport Without Hilda".to_string(),
-        "The Imaginary".to_string(),
-        "The Immortal Bard".to_string(),
-        "In a Good Cause—".to_string(),
-        "Insert Knob A in Hole B".to_string(),
-        "The Instability".to_string(),
-        "It's Such a Beautiful Day".to_string(),
-        "The Key".to_string(),
-        "Kid Stuff".to_string(),
-        "The Last Answer".to_string(),
-        "The Last Question".to_string(),
-        "The Last Trump".to_string(),
-        "Left to Right".to_string(),
-        "Legal Rites".to_string(),
-        "Lenny".to_string(),
-        "Lest We Remember".to_string(),
-        "Let's Not".to_string(),
-        "Liar!".to_string(),
-        "Light Verse".to_string(),
-        "Little Lost Robot".to_string(),
-        "The Little Man on the Subway".to_string(),
-        "Living Space".to_string(),
-        "A Loint of Paw".to_string(),
-        "The Magnificent Possession".to_string(),
-        "Marching In".to_string(),
-        "Marooned off Vesta".to_string(),
-        "The Message".to_string(),
-        "Mirror Image".to_string(),
-        "Mother Earth".to_string(),
-        "My Son, the Physicist".to_string(),
-        "No Connection".to_string(),
-        "No Refuge Could Save".to_string(),
-        "Nobody Here But—".to_string(),
-        "Not Final!".to_string(),
-        "Obituary".to_string(),
-        "Old-fashioned".to_string(),
-        "Pâté de Foie Gras".to_string(),
-        "The Pause".to_string(),
-        "Ph as in Phony".to_string(),
-        "The Portable Star".to_string(),
-        "The Proper Study".to_string(),
-        "Rain, Rain, Go Away".to_string(),
-        "Reason".to_string(),
-        "The Red Queen's Race".to_string(),
-        "Rejection Slips".to_string(),
-        "Ring Around the Sun".to_string(),
-        "Risk".to_string(),
-        "Robot AL-76 Goes Astray".to_string(),
-        "Robot Dreams".to_string(),
-        "Runaround".to_string(),
-        "Sally".to_string(),
-        "Satisfaction Guaranteed".to_string(),
-        "The Secret Sense".to_string(),
-        "Shah Guido G.".to_string(),
-        "Silly Asses".to_string(),
-        "The Singing Bell".to_string(),
-        "Sixty Million Trillion Combinations".to_string(),
-        "Spell My Name with an S".to_string(),
-        "Star Light".to_string(),
-        "A Statue for Father".to_string(),
-        "Strikebreaker".to_string(),
-        "Super-Neutron".to_string(),
-        "Take a Match".to_string(),
-        "The Talking Stone".to_string(),
-        ". . . That Thou Art Mindful of Him".to_string(),
-        "Thiotimoline".to_string(),
-        "Time Pussy".to_string(),
-        "Trends".to_string(),
-        "Truth to Tell".to_string(),
-        "The Ugly Little Boy".to_string(),
-        "The Ultimate Crime".to_string(),
-        "Unto the Fourth Generation".to_string(),
-        "The Up-to-Date Sorcerer".to_string(),
-        "Waterclap".to_string(),
-        "The Watery Place".to_string(),
-        "The Weapon".to_string(),
-        "The Weapon Too Dreadful to Use".to_string(),
-        "What If—".to_string(),
-        "What Is This Thing Called Love?".to_string(),
-        "What's in a Name?".to_string(),
-        "The Winnowing".to_string(),
-    ]
-}
-
-#[test]
-fn test_prefix_search() {
-    let temp_dir = Builder::new().prefix("test_dir").tempdir().unwrap();
-    let config = TextIndexParams {
-        r#type: TextIndexType::Text,
-        tokenizer: TokenizerType::Prefix,
-        min_token_len: None,
-        max_token_len: None,
-        lowercase: None,
-    };
-
-    let db = open_db_with_existing_cf(&temp_dir.path().join("test_db")).unwrap();
-    let mut index = FullTextIndex::new(db, config, "text");
-    index.recreate().unwrap();
-
-    let texts = get_texts();
-
-    for (i, text) in texts.iter().enumerate() {
-        index
-            .add_many(i as PointOffsetType, vec![text.to_string()])
-            .unwrap();
-    }
-
-    let res: Vec<_> = index.query("ROBO").collect();
-
-    let query = index.parse_query("ROBO");
-
-    for idx in res.iter() {
-        let doc = index.get_doc(*idx).unwrap();
-        assert!(query.check_match(doc));
-    }
-
-    assert_eq!(res.len(), 3);
-
-    let res: Vec<_> = index.query("q231").collect();
-
-    let query = index.parse_query("q231");
-
-    for idx in [1, 2, 3] {
-        let doc = index.get_doc(idx).unwrap();
-        assert!(!query.check_match(doc));
-    }
-
-    assert_eq!(res.len(), 0);
-}
diff --git a/crates/qdrant/lib/segment/src/index/field_index/full_text_index/text_index.rs b/crates/qdrant/lib/segment/src/index/field_index/full_text_index/text_index.rs
deleted file mode 100644
index a77e836..0000000
--- a/crates/qdrant/lib/segment/src/index/field_index/full_text_index/text_index.rs
+++ /dev/null
@@ -1,348 +0,0 @@
-use std::collections::{BTreeSet, HashSet};
-use std::sync::Arc;
-
-use parking_lot::RwLock;
-use rocksdb::DB;
-use serde::{Deserialize, Serialize};
-use serde_json::Value;
-
-use crate::common::rocksdb_wrapper::DatabaseColumnWrapper;
-use crate::common::Flusher;
-use crate::data_types::text_index::TextIndexParams;
-use crate::entry::entry_point::{OperationError, OperationResult};
-use crate::index::field_index::full_text_index::inverted_index::{
-    Document, InvertedIndex, ParsedQuery,
-};
-use crate::index::field_index::full_text_index::tokenizers::Tokenizer;
-use crate::index::field_index::{
-    CardinalityEstimation, PayloadBlockCondition, PayloadFieldIndex, ValueIndexer,
-};
-use crate::telemetry::PayloadIndexTelemetry;
-use crate::types::{FieldCondition, Match, PayloadKeyType, PointOffsetType};
-
-pub struct FullTextIndex {
-    inverted_index: InvertedIndex,
-    db_wrapper: DatabaseColumnWrapper,
-    config: TextIndexParams,
-}
-
-impl FullTextIndex {
-    fn store_key(id: &PointOffsetType) -> Vec<u8> {
-        bincode::serialize(&id).unwrap()
-    }
-
-    fn restore_key(data: &[u8]) -> PointOffsetType {
-        bincode::deserialize(data).unwrap()
-    }
-
-    fn serialize_document_tokens(&self, tokens: BTreeSet<String>) -> OperationResult<Vec<u8>> {
-        #[derive(Serialize)]
-        struct StoredDocument {
-            tokens: BTreeSet<String>,
-        }
-        let doc = StoredDocument { tokens };
-        serde_cbor::to_vec(&doc).map_err(|e| {
-            OperationError::service_error(format!("Failed to serialize document: {e}"))
-        })
-    }
-
-    fn deserialize_document(data: &[u8], index: &mut InvertedIndex) -> OperationResult<Document> {
-        #[derive(Deserialize)]
-        struct StoredDocument {
-            tokens: BTreeSet<String>,
-        }
-        serde_cbor::from_slice::<StoredDocument>(data)
-            .map_err(|e| {
-                OperationError::service_error(format!("Failed to deserialize document: {e}"))
-            })
-            .map(|doc| index.document_from_tokens(&doc.tokens))
-    }
-
-    fn storage_cf_name(field: &str) -> String {
-        format!("{field}_fts")
-    }
-
-    pub fn new(db: Arc<RwLock<DB>>, config: TextIndexParams, field: &str) -> Self {
-        let store_cf_name = Self::storage_cf_name(field);
-        let db_wrapper = DatabaseColumnWrapper::new(db, &store_cf_name);
-        FullTextIndex {
-            inverted_index: InvertedIndex::new(),
-            db_wrapper,
-            config,
-        }
-    }
-
-    pub fn get_doc(&self, idx: PointOffsetType) -> Option<&Document> {
-        match self.inverted_index.point_to_docs.get(idx as usize) {
-            Some(Some(doc)) => Some(doc),
-            _ => None,
-        }
-    }
-
-    pub fn get_telemetry_data(&self) -> PayloadIndexTelemetry {
-        PayloadIndexTelemetry {
-            field_name: None,
-            points_values_count: self.inverted_index.points_count,
-            points_count: self.inverted_index.points_count,
-            histogram_bucket_size: None,
-        }
-    }
-
-    pub fn recreate(&self) -> OperationResult<()> {
-        self.db_wrapper.recreate_column_family()
-    }
-
-    pub fn parse_query(&self, text: &str) -> ParsedQuery {
-        let mut tokens = HashSet::new();
-        Tokenizer::tokenize_query(text, &self.config, |token| {
-            tokens.insert(self.inverted_index.vocab.get(token).copied());
-        });
-        ParsedQuery {
-            tokens: tokens.into_iter().collect(),
-        }
-    }
-
-    pub fn parse_document(&self, text: &str) -> Document {
-        let mut document_tokens = vec![];
-        Tokenizer::tokenize_doc(text, &self.config, |token| {
-            if let Some(token_id) = self.inverted_index.vocab.get(token) {
-                document_tokens.push(*token_id);
-            }
-        });
-        Document::new(document_tokens)
-    }
-
-    #[cfg(test)]
-    pub fn query(&self, query: &str) -> Box<dyn Iterator<Item = PointOffsetType> + '_> {
-        let parsed_query = self.parse_query(query);
-        self.inverted_index.filter(&parsed_query)
-    }
-
-    pub fn values_count(&self, point_id: PointOffsetType) -> usize {
-        // Maybe we want number of documents in the future?
-        self.get_doc(point_id).map(|x| x.len()).unwrap_or(0)
-    }
-
-    pub fn values_is_empty(&self, point_id: PointOffsetType) -> bool {
-        self.get_doc(point_id).map(|x| x.is_empty()).unwrap_or(true)
-    }
-}
-
-impl ValueIndexer<String> for FullTextIndex {
-    fn add_many(&mut self, idx: PointOffsetType, values: Vec<String>) -> OperationResult<()> {
-        if values.is_empty() {
-            return Ok(());
-        }
-
-        let mut tokens: BTreeSet<String> = BTreeSet::new();
-
-        for value in values {
-            Tokenizer::tokenize_doc(&value, &self.config, |token| {
-                tokens.insert(token.to_owned());
-            });
-        }
-
-        let document = self.inverted_index.document_from_tokens(&tokens);
-        self.inverted_index.index_document(idx, document);
-
-        let db_idx = Self::store_key(&idx);
-        let db_document = self.serialize_document_tokens(tokens)?;
-
-        self.db_wrapper.put(db_idx, db_document)?;
-
-        Ok(())
-    }
-
-    fn get_value(&self, value: &Value) -> Option<String> {
-        if let Value::String(keyword) = value {
-            return Some(keyword.to_owned());
-        }
-        None
-    }
-
-    fn remove_point(&mut self, id: PointOffsetType) -> OperationResult<()> {
-        let removed_doc = self.inverted_index.remove_document(id);
-
-        if removed_doc.is_none() {
-            return Ok(());
-        }
-
-        let db_doc_id = Self::store_key(&id);
-        self.db_wrapper.remove(db_doc_id)?;
-
-        Ok(())
-    }
-}
-
-impl PayloadFieldIndex for FullTextIndex {
-    fn count_indexed_points(&self) -> usize {
-        self.inverted_index.points_count
-    }
-
-    fn load(&mut self) -> OperationResult<bool> {
-        if !self.db_wrapper.has_column_family()? {
-            return Ok(false);
-        };
-
-        for (key, value) in self.db_wrapper.lock_db().iter()? {
-            let idx = Self::restore_key(&key);
-            let document = Self::deserialize_document(&value, &mut self.inverted_index)?;
-            self.inverted_index.index_document(idx, document);
-        }
-        Ok(true)
-    }
-
-    fn clear(self) -> OperationResult<()> {
-        self.db_wrapper.remove_column_family()
-    }
-
-    fn flusher(&self) -> Flusher {
-        self.db_wrapper.flusher()
-    }
-
-    fn filter(
-        &self,
-        condition: &FieldCondition,
-    ) -> Option<Box<dyn Iterator<Item = PointOffsetType> + '_>> {
-        if let Some(Match::Text(text_match)) = &condition.r#match {
-            let parsed_query = self.parse_query(&text_match.text);
-            return Some(self.inverted_index.filter(&parsed_query));
-        }
-        None
-    }
-
-    fn estimate_cardinality(&self, condition: &FieldCondition) -> Option<CardinalityEstimation> {
-        if let Some(Match::Text(text_match)) = &condition.r#match {
-            let parsed_query = self.parse_query(&text_match.text);
-            return Some(
-                self.inverted_index
-                    .estimate_cardinality(&parsed_query, condition),
-            );
-        }
-        None
-    }
-
-    fn payload_blocks(
-        &self,
-        threshold: usize,
-        key: PayloadKeyType,
-    ) -> Box<dyn Iterator<Item = PayloadBlockCondition> + '_> {
-        self.inverted_index.payload_blocks(threshold, key)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use tempfile::Builder;
-
-    use super::*;
-    use crate::common::rocksdb_wrapper::open_db_with_existing_cf;
-    use crate::common::utils::MultiValue;
-    use crate::data_types::text_index::{TextIndexType, TokenizerType};
-    use crate::types::MatchText;
-
-    fn filter_request(text: &str) -> FieldCondition {
-        FieldCondition {
-            key: "text".to_owned(),
-            r#match: Some(Match::Text(MatchText {
-                text: text.to_owned(),
-            })),
-            range: None,
-            geo_bounding_box: None,
-            geo_radius: None,
-            values_count: None,
-            geo_polygon: None,
-        }
-    }
-
-    #[test]
-    fn test_full_text_indexing() {
-        let payloads: Vec<_> = vec![
-            serde_json::json!("The celebration had a long way to go and even in the silent depths of Multivac's underground chambers, it hung in the air."),
-            serde_json::json!("If nothing else, there was the mere fact of isolation and silence."),
-            serde_json::json!([
-                "For the first time in a decade, technicians were not scurrying about the vitals of the giant computer, ",
-                "the soft lights did not wink out their erratic patterns, the flow of information in and out had halted."
-            ]),
-            serde_json::json!("It would not be halted long, of course, for the needs of peace would be pressing."),
-            serde_json::json!("Yet now, for a day, perhaps for a week, even Multivac might celebrate the great time, and rest."),
-        ];
-
-        let temp_dir = Builder::new().prefix("test_dir").tempdir().unwrap();
-        let config = TextIndexParams {
-            r#type: TextIndexType::Text,
-            tokenizer: TokenizerType::Word,
-            min_token_len: None,
-            max_token_len: None,
-            lowercase: None,
-        };
-
-        {
-            let db = open_db_with_existing_cf(&temp_dir.path().join("test_db")).unwrap();
-
-            let mut index = FullTextIndex::new(db, config.clone(), "text");
-
-            index.recreate().unwrap();
-
-            for (idx, payload) in payloads.iter().enumerate() {
-                index
-                    .add_point(idx as PointOffsetType, &MultiValue::one(payload))
-                    .unwrap();
-            }
-
-            assert_eq!(index.count_indexed_points(), payloads.len());
-
-            let filter_condition = filter_request("multivac");
-            let search_res: Vec<_> = index.filter(&filter_condition).unwrap().collect();
-            assert_eq!(search_res, vec![0, 4]);
-
-            let filter_condition = filter_request("giant computer");
-            let search_res: Vec<_> = index.filter(&filter_condition).unwrap().collect();
-            assert_eq!(search_res, vec![2]);
-
-            let filter_condition = filter_request("the great time");
-            let search_res: Vec<_> = index.filter(&filter_condition).unwrap().collect();
-            assert_eq!(search_res, vec![4]);
-
-            index.remove_point(2).unwrap();
-            index.remove_point(3).unwrap();
-
-            let filter_condition = filter_request("giant computer");
-            assert!(index.filter(&filter_condition).unwrap().next().is_none());
-
-            assert_eq!(index.count_indexed_points(), payloads.len() - 2);
-
-            let payload = serde_json::json!([
-                "The last question was asked for the first time, half in jest, on May 21, 2061,",
-                "at a time when humanity first stepped into the light."
-            ]);
-            index.add_point(3, &MultiValue::one(&payload)).unwrap();
-
-            let payload = serde_json::json!([
-                "The question came about as a result of a five dollar bet over highballs, and it happened this way: "
-            ]);
-            index.add_point(4, &MultiValue::one(&payload)).unwrap();
-
-            assert_eq!(index.count_indexed_points(), payloads.len() - 1);
-
-            index.flusher()().unwrap();
-        }
-
-        {
-            let db = open_db_with_existing_cf(&temp_dir.path().join("test_db")).unwrap();
-            let mut index = FullTextIndex::new(db, config, "text");
-            let loaded = index.load().unwrap();
-            assert!(loaded);
-
-            assert_eq!(index.count_indexed_points(), 4);
-
-            let filter_condition = filter_request("multivac");
-            let search_res: Vec<_> = index.filter(&filter_condition).unwrap().collect();
-            assert_eq!(search_res, vec![0]);
-
-            let filter_condition = filter_request("the");
-            let search_res: Vec<_> = index.filter(&filter_condition).unwrap().collect();
-            assert_eq!(search_res, vec![0, 1, 3, 4]);
-        }
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/index/field_index/full_text_index/tokenizers.rs b/crates/qdrant/lib/segment/src/index/field_index/full_text_index/tokenizers.rs
deleted file mode 100644
index ba014a3..0000000
--- a/crates/qdrant/lib/segment/src/index/field_index/full_text_index/tokenizers.rs
+++ /dev/null
@@ -1,270 +0,0 @@
-use charabia::Tokenize;
-
-use crate::data_types::text_index::{TextIndexParams, TokenizerType};
-
-struct WhiteSpaceTokenizer;
-
-impl WhiteSpaceTokenizer {
-    fn tokenize<C: FnMut(&str)>(text: &str, callback: C) {
-        text.split_whitespace().for_each(callback);
-    }
-}
-
-struct WordTokenizer;
-
-impl WordTokenizer {
-    fn tokenize<C: FnMut(&str)>(text: &str, callback: C) {
-        text.split(|c| !char::is_alphanumeric(c))
-            .filter(|x| !x.is_empty())
-            .for_each(callback);
-    }
-}
-
-struct PrefixTokenizer;
-
-impl PrefixTokenizer {
-    fn tokenize<C: FnMut(&str)>(text: &str, min_ngram: usize, max_ngram: usize, mut callback: C) {
-        text.split(|c| !char::is_alphanumeric(c))
-            .filter(|token| !token.is_empty())
-            .for_each(|word| {
-                for n in min_ngram..=max_ngram {
-                    let ngram = word.char_indices().map(|(i, _)| i).nth(n);
-                    match ngram {
-                        Some(end) => callback(&word[..end]),
-                        None => {
-                            callback(word);
-                            break;
-                        }
-                    }
-                }
-            });
-    }
-
-    /// For querying prefixes, it makes sense to use a maximal ngram only.
-    /// E.g.
-    ///
-    /// Docs. tokens: "hello" -> ["he", "hel", "hell", "hello"]
-    /// Query tokens: "hel"   -> ["hel"]
-    /// Query tokens: "hell"  -> ["hell"]
-    /// Query tokens: "hello" -> ["hello"]
-    fn tokenize_query<C: FnMut(&str)>(text: &str, max_ngram: usize, mut callback: C) {
-        text.split(|c| !char::is_alphanumeric(c))
-            .filter(|token| !token.is_empty())
-            .for_each(|word| {
-                let ngram = word.char_indices().map(|(i, _)| i).nth(max_ngram);
-                match ngram {
-                    Some(end) => callback(&word[..end]),
-                    None => {
-                        callback(word);
-                    }
-                }
-            });
-    }
-}
-
-struct MultilingualTokenizer;
-
-impl MultilingualTokenizer {
-    fn tokenize<C: FnMut(&str)>(text: &str, mut callback: C) {
-        text.tokenize().for_each(|token| {
-            if token.is_word() {
-                callback(token.lemma());
-            }
-        });
-    }
-}
-
-pub struct Tokenizer;
-
-impl Tokenizer {
-    fn doc_token_filter<'a, C: FnMut(&str) + 'a>(
-        config: &'a TextIndexParams,
-        mut callback: C,
-    ) -> impl FnMut(&str) + 'a {
-        move |token: &str| {
-            if config
-                .min_token_len
-                .map(|min_len| token.len() < min_len && token.chars().count() < min_len)
-                .unwrap_or(false)
-            {
-                return;
-            }
-            if config
-                .max_token_len
-                .map(|max_len| token.len() > max_len && token.chars().count() > max_len)
-                .unwrap_or(false)
-            {
-                return;
-            }
-            if config.lowercase.unwrap_or(true) {
-                callback(&token.to_lowercase());
-            } else {
-                callback(token);
-            }
-        }
-    }
-
-    pub fn tokenize_doc<C: FnMut(&str)>(text: &str, config: &TextIndexParams, mut callback: C) {
-        let token_filter = Self::doc_token_filter(config, &mut callback);
-        match config.tokenizer {
-            TokenizerType::Whitespace => WhiteSpaceTokenizer::tokenize(text, token_filter),
-            TokenizerType::Word => WordTokenizer::tokenize(text, token_filter),
-            TokenizerType::Multilingual => MultilingualTokenizer::tokenize(text, token_filter),
-            TokenizerType::Prefix => PrefixTokenizer::tokenize(
-                text,
-                config.min_token_len.unwrap_or(1),
-                config.max_token_len.unwrap_or(usize::MAX),
-                token_filter,
-            ),
-        }
-    }
-
-    pub fn tokenize_query<C: FnMut(&str)>(text: &str, config: &TextIndexParams, mut callback: C) {
-        let token_filter = Self::doc_token_filter(config, &mut callback);
-        match config.tokenizer {
-            TokenizerType::Whitespace => WhiteSpaceTokenizer::tokenize(text, token_filter),
-            TokenizerType::Word => WordTokenizer::tokenize(text, token_filter),
-            TokenizerType::Multilingual => MultilingualTokenizer::tokenize(text, token_filter),
-            TokenizerType::Prefix => PrefixTokenizer::tokenize_query(
-                text,
-                config.max_token_len.unwrap_or(usize::MAX),
-                token_filter,
-            ),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::data_types::text_index::TextIndexType;
-
-    #[test]
-    fn test_whitespace_tokenizer() {
-        let text = "hello world";
-        let mut tokens = Vec::new();
-        WhiteSpaceTokenizer::tokenize(text, |token| tokens.push(token.to_owned()));
-        assert_eq!(tokens.len(), 2);
-        assert_eq!(tokens.get(0), Some(&"hello".to_owned()));
-        assert_eq!(tokens.get(1), Some(&"world".to_owned()));
-    }
-
-    #[test]
-    fn test_word_tokenizer() {
-        let text = "hello, world! Привет, мир!";
-        let mut tokens = Vec::new();
-        WordTokenizer::tokenize(text, |token| tokens.push(token.to_owned()));
-        assert_eq!(tokens.len(), 4);
-        assert_eq!(tokens.get(0), Some(&"hello".to_owned()));
-        assert_eq!(tokens.get(1), Some(&"world".to_owned()));
-        assert_eq!(tokens.get(2), Some(&"Привет".to_owned()));
-        assert_eq!(tokens.get(3), Some(&"мир".to_owned()));
-    }
-
-    #[test]
-    fn test_prefix_tokenizer() {
-        let text = "hello, мир!";
-        let mut tokens = Vec::new();
-        PrefixTokenizer::tokenize(text, 1, 4, |token| tokens.push(token.to_owned()));
-        eprintln!("tokens = {tokens:#?}");
-        assert_eq!(tokens.len(), 7);
-        assert_eq!(tokens.get(0), Some(&"h".to_owned()));
-        assert_eq!(tokens.get(1), Some(&"he".to_owned()));
-        assert_eq!(tokens.get(2), Some(&"hel".to_owned()));
-        assert_eq!(tokens.get(3), Some(&"hell".to_owned()));
-        assert_eq!(tokens.get(4), Some(&"м".to_owned()));
-        assert_eq!(tokens.get(5), Some(&"ми".to_owned()));
-        assert_eq!(tokens.get(6), Some(&"мир".to_owned()));
-    }
-
-    #[test]
-    fn test_prefix_query_tokenizer() {
-        let text = "hello, мир!";
-        let mut tokens = Vec::new();
-        PrefixTokenizer::tokenize_query(text, 4, |token| tokens.push(token.to_owned()));
-        eprintln!("tokens = {tokens:#?}");
-        assert_eq!(tokens.len(), 2);
-        assert_eq!(tokens.get(0), Some(&"hell".to_owned()));
-        assert_eq!(tokens.get(1), Some(&"мир".to_owned()));
-    }
-
-    #[cfg(feature = "multiling-japanese")]
-    #[test]
-    fn test_multilingual_tokenizer_japanese() {
-        let text = "本日の日付は";
-        let mut tokens = Vec::new();
-        MultilingualTokenizer::tokenize(text, |token| tokens.push(token.to_owned()));
-        eprintln!("tokens = {tokens:#?}");
-        assert_eq!(tokens.len(), 4);
-        assert_eq!(tokens.get(0), Some(&"本日".to_owned()));
-        assert_eq!(tokens.get(1), Some(&"の".to_owned()));
-        assert_eq!(tokens.get(2), Some(&"日付".to_owned()));
-        assert_eq!(tokens.get(3), Some(&"は".to_owned()));
-    }
-
-    #[cfg(feature = "multiling-chinese")]
-    #[test]
-    fn test_multilingual_tokenizer_chinese() {
-        let text = "今天是星期一";
-        let mut tokens = Vec::new();
-        MultilingualTokenizer::tokenize(text, |token| tokens.push(token.to_owned()));
-        eprintln!("tokens = {tokens:#?}");
-        assert_eq!(tokens.len(), 3);
-        assert_eq!(tokens.get(0), Some(&"jīntiān".to_owned()));
-        assert_eq!(tokens.get(1), Some(&"shì".to_owned()));
-        assert_eq!(tokens.get(2), Some(&"xīngqīyī".to_owned()));
-    }
-
-    #[test]
-    fn test_multilingual_tokenizer_thai() {
-        let text = "มาทำงานกันเถอะ";
-        let mut tokens = Vec::new();
-        MultilingualTokenizer::tokenize(text, |token| tokens.push(token.to_owned()));
-        eprintln!("tokens = {tokens:#?}");
-        assert_eq!(tokens.len(), 4);
-        assert_eq!(tokens.get(0), Some(&"มา".to_owned()));
-        assert_eq!(tokens.get(1), Some(&"ทางาน".to_owned()));
-        assert_eq!(tokens.get(2), Some(&"กน".to_owned()));
-        assert_eq!(tokens.get(3), Some(&"เถอะ".to_owned()));
-    }
-
-    #[test]
-    fn test_multilingual_tokenizer_english() {
-        let text = "What are you waiting for?";
-        let mut tokens = Vec::new();
-        MultilingualTokenizer::tokenize(text, |token| tokens.push(token.to_owned()));
-        eprintln!("tokens = {tokens:#?}");
-        assert_eq!(tokens.len(), 5);
-        assert_eq!(tokens.get(0), Some(&"what".to_owned()));
-        assert_eq!(tokens.get(1), Some(&"are".to_owned()));
-        assert_eq!(tokens.get(2), Some(&"you".to_owned()));
-        assert_eq!(tokens.get(3), Some(&"waiting".to_owned()));
-        assert_eq!(tokens.get(4), Some(&"for".to_owned()));
-    }
-
-    #[test]
-    fn test_tokenizer() {
-        let text = "Hello, Мир!";
-        let mut tokens = Vec::new();
-        Tokenizer::tokenize_doc(
-            text,
-            &TextIndexParams {
-                r#type: TextIndexType::Text,
-                tokenizer: TokenizerType::Prefix,
-                min_token_len: Some(1),
-                max_token_len: Some(4),
-                lowercase: Some(true),
-            },
-            |token| tokens.push(token.to_owned()),
-        );
-        eprintln!("tokens = {tokens:#?}");
-        assert_eq!(tokens.len(), 7);
-        assert_eq!(tokens.get(0), Some(&"h".to_owned()));
-        assert_eq!(tokens.get(1), Some(&"he".to_owned()));
-        assert_eq!(tokens.get(2), Some(&"hel".to_owned()));
-        assert_eq!(tokens.get(3), Some(&"hell".to_owned()));
-        assert_eq!(tokens.get(4), Some(&"м".to_owned()));
-        assert_eq!(tokens.get(5), Some(&"ми".to_owned()));
-        assert_eq!(tokens.get(6), Some(&"мир".to_owned()));
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/index/field_index/geo_hash.rs b/crates/qdrant/lib/segment/src/index/field_index/geo_hash.rs
deleted file mode 100644
index fb3044d..0000000
--- a/crates/qdrant/lib/segment/src/index/field_index/geo_hash.rs
+++ /dev/null
@@ -1,927 +0,0 @@
-use std::ops::Range;
-
-use geo::algorithm::haversine_distance::HaversineDistance;
-#[allow(deprecated)]
-use geo::{Coordinate, Point};
-use geo::{Intersects, Polygon};
-use geohash::{decode, decode_bbox, encode, Direction, GeohashError};
-use itertools::Itertools;
-
-use crate::types::{GeoBoundingBox, GeoPoint, GeoPolygon, GeoRadius};
-
-pub type GeoHash = String;
-
-/// Max size of geo-hash used for indexing. size=12 is about 6cm2
-const GEOHASH_MAX_LENGTH: usize = 12;
-
-const LON_RANGE: Range<f64> = -180.0..180.0;
-const LAT_RANGE: Range<f64> = -90.0..90.0;
-const COORD_EPS: f64 = 1e-12;
-
-#[allow(deprecated)]
-impl From<GeoPoint> for Coordinate<f64> {
-    fn from(point: GeoPoint) -> Self {
-        Self {
-            x: point.lat,
-            y: point.lon,
-        }
-    }
-}
-
-pub fn common_hash_prefix(geo_hashes: &[GeoHash]) -> GeoHash {
-    let first = &geo_hashes[0];
-    let mut prefix: usize = first.len();
-    for geo_hash in geo_hashes.iter().skip(1) {
-        for i in 0..prefix {
-            if first.as_bytes()[i] != geo_hash.as_bytes()[i] {
-                prefix = i;
-                break;
-            }
-        }
-    }
-    first[0..prefix].to_string()
-}
-
-/// Fix longitude for spherical overflow
-/// lon: 181.0 -> -179.0
-fn sphere_lon(lon: f64) -> f64 {
-    let mut res_lon = lon;
-    if res_lon > LON_RANGE.end {
-        res_lon = LON_RANGE.start + res_lon - LON_RANGE.end;
-    }
-    if res_lon < LON_RANGE.start {
-        res_lon = LON_RANGE.end + res_lon - LON_RANGE.start;
-    }
-    res_lon
-}
-
-/// Fix latitude for spherical overflow
-fn sphere_lat(lat: f64) -> f64 {
-    let mut res_lat = lat;
-    if res_lat > LAT_RANGE.end {
-        res_lat = LAT_RANGE.end - COORD_EPS;
-    }
-    if res_lat < LAT_RANGE.start {
-        res_lat = LAT_RANGE.start + COORD_EPS;
-    }
-    res_lat
-}
-
-/// Get neighbour geohash even from the other side of coordinates
-fn sphere_neighbor(hash_str: &str, direction: Direction) -> Result<GeoHash, GeohashError> {
-    let (coord, lon_err, lat_err) = decode(hash_str)?;
-    let (dlat, dlng) = direction.to_tuple();
-    let lon = sphere_lon(coord.x + 2f64 * lon_err.abs() * dlng);
-    let lat = sphere_lat(coord.y + 2f64 * lat_err.abs() * dlat);
-
-    #[allow(deprecated)]
-    let neighbor_coord = Coordinate { x: lon, y: lat };
-    encode(neighbor_coord, hash_str.len())
-}
-
-pub fn encode_max_precision(lon: f64, lat: f64) -> Result<GeoHash, GeohashError> {
-    encode((lon, lat).into(), GEOHASH_MAX_LENGTH)
-}
-
-pub fn geo_hash_to_box(geo_hash: &GeoHash) -> GeoBoundingBox {
-    let rectangle = decode_bbox(geo_hash).unwrap();
-    let top_left = GeoPoint {
-        lon: rectangle.min().x,
-        lat: rectangle.max().y,
-    };
-    let bottom_right = GeoPoint {
-        lon: rectangle.max().x,
-        lat: rectangle.min().y,
-    };
-
-    GeoBoundingBox {
-        top_left,
-        bottom_right,
-    }
-}
-
-#[derive(Debug)]
-struct GeohashBoundingBox {
-    north_west: GeoHash,
-    south_west: GeoHash,
-    #[allow(dead_code)]
-    south_east: GeoHash, // field is not involved in the calculations, but is kept for symmetry
-    north_east: GeoHash,
-}
-
-impl GeohashBoundingBox {
-    /// Calculate geo-hashes covering the rectangular region with given precision
-    ///
-    /// # Arguments
-    ///
-    /// * `precision` - precision of cover
-    /// * `max_regions` - stop early if maximal amount of regions exceeded
-    ///
-    /// # Result
-    ///
-    /// * None - if there are more regions than a limit
-    /// * Some(list of geo-hashes covering the region
-    ///
-    fn geohash_regions(&self, precision: usize, max_regions: usize) -> Option<Vec<GeoHash>> {
-        let mut seen: Vec<GeoHash> = Vec::new();
-
-        let mut from_row = self.north_west[..precision].to_owned();
-        let mut to_row = self.north_east[..precision].to_owned();
-
-        let to_column = self.south_west[..precision].to_owned();
-
-        loop {
-            let mut current = from_row.clone();
-            loop {
-                seen.push(current.clone());
-
-                if seen.len() > max_regions {
-                    return None;
-                }
-
-                if current == to_row {
-                    break;
-                }
-                current = sphere_neighbor(&current, Direction::E).unwrap();
-            }
-            if from_row == to_column {
-                break;
-            }
-
-            from_row = sphere_neighbor(&from_row, Direction::S).unwrap();
-            to_row = sphere_neighbor(&to_row, Direction::S).unwrap();
-        }
-
-        Some(seen)
-    }
-}
-
-impl From<GeoBoundingBox> for GeohashBoundingBox {
-    fn from(bounding_box: GeoBoundingBox) -> Self {
-        let GeoPoint {
-            lat: max_lat,
-            lon: min_lon,
-        } = bounding_box.top_left;
-        let GeoPoint {
-            lat: min_lat,
-            lon: max_lon,
-        } = bounding_box.bottom_right;
-
-        // Unwrap is acceptable, as data should be validated before
-        let north_west = encode_max_precision(min_lon, max_lat).unwrap();
-        let south_west = encode_max_precision(min_lon, min_lat).unwrap();
-        let south_east = encode_max_precision(max_lon, min_lat).unwrap();
-        let north_east = encode_max_precision(max_lon, max_lat).unwrap();
-
-        Self {
-            north_west,
-            south_west,
-            south_east,
-            north_east,
-        }
-    }
-}
-
-/// Check if geohash tile intersects the circle
-fn check_circle_intersection(geohash: &str, circle: &GeoRadius) -> bool {
-    let precision = geohash.len();
-    if precision == 0 {
-        return true;
-    }
-    let rect = decode_bbox(geohash).unwrap();
-    let c0 = rect.min();
-    let c1 = rect.max();
-
-    let bbox_center = Point::new((c0.x + c1.x) / 2f64, (c0.y + c1.y) / 2f64);
-    let half_diagonal = bbox_center.haversine_distance(&Point(c0));
-
-    half_diagonal + circle.radius
-        > bbox_center.haversine_distance(&Point::new(circle.center.lon, circle.center.lat))
-}
-
-/// Check if geohash tile intersects the polygon
-fn check_polygon_intersection(geohash: &str, polygon: &GeoPolygon) -> bool {
-    let precision = geohash.len();
-    if precision == 0 {
-        return true;
-    }
-    let rect = decode_bbox(geohash).unwrap();
-
-    #[allow(deprecated)]
-    let polygon_ring: Vec<Coordinate<f64>> = polygon
-        .points
-        .iter()
-        .map(|point| Coordinate {
-            x: point.lon,
-            y: point.lat,
-        })
-        .collect();
-    let polygon = Polygon::new(geo::LineString(polygon_ring), vec![]);
-
-    rect.intersects(&polygon)
-}
-
-/// Return as-high-as-possible with maximum of `max_regions`
-/// number of geo-hash guaranteed to contain the whole circle.
-pub fn circle_hashes(circle: &GeoRadius, max_regions: usize) -> Vec<GeoHash> {
-    assert_ne!(max_regions, 0, "max_regions cannot be equal to zero");
-    let geo_bounding_box = minimum_bounding_rectangle_for_circle(circle);
-    let full_geohash_bounding_box: GeohashBoundingBox = geo_bounding_box.into();
-
-    (0..=GEOHASH_MAX_LENGTH)
-        .map(|precision| {
-            full_geohash_bounding_box
-                .geohash_regions(precision, max_regions)
-                .map(|hashes| {
-                    hashes
-                        .into_iter()
-                        .filter(|hash| check_circle_intersection(hash, circle))
-                        .collect_vec()
-                })
-        })
-        .take_while(|hashes| hashes.is_some())
-        .last()
-        .expect("no hash coverage for any precision")
-        .expect("geo-hash coverage is empty")
-}
-
-/// Return as-high-as-possible with maximum of `max_regions`
-/// number of geo-hash guaranteed to contain the whole rectangle.
-pub fn rectangle_hashes(rectangle: &GeoBoundingBox, max_regions: usize) -> Vec<GeoHash> {
-    assert_ne!(max_regions, 0, "max_regions cannot be equal to zero");
-    let full_geohash_bounding_box: GeohashBoundingBox = rectangle.clone().into();
-
-    (0..=GEOHASH_MAX_LENGTH)
-        .map(|precision| full_geohash_bounding_box.geohash_regions(precision, max_regions))
-        .take_while(|hashes| hashes.is_some())
-        .last()
-        .expect("no hash coverage for any precision")
-        .expect("geo-hash coverage is empty")
-}
-
-/// Return as-high-as-possible with maximum of `max_regions`
-/// number of geo-hash guaranteed to contain the whole polygon.
-pub fn polygon_hashes(polygon: &GeoPolygon, max_regions: usize) -> Vec<GeoHash> {
-    assert_ne!(max_regions, 0, "max_regions cannot be equal to zero");
-    let geo_bounding_box = minimum_bounding_rectangle_for_polygon(polygon);
-    let full_geohash_bounding_box: GeohashBoundingBox = geo_bounding_box.into();
-
-    (0..=GEOHASH_MAX_LENGTH)
-        .map(|precision| {
-            full_geohash_bounding_box
-                .geohash_regions(precision, max_regions)
-                .map(|hashes| {
-                    hashes
-                        .into_iter()
-                        .filter(|hash| check_polygon_intersection(hash, polygon))
-                        .collect_vec()
-                })
-        })
-        .take_while(|hashes| hashes.is_some())
-        .last()
-        .expect("no hash coverage for any precision")
-        .expect("geo-hash coverage is empty")
-}
-
-/// A globally-average value is usually considered to be 6,371 kilometres (3,959 mi) with a 0.3% variability (±10 km).
-/// <https://en.wikipedia.org/wiki/Earth_radius>.
-const EARTH_RADIUS_METERS: f64 = 6371.0 * 1000.;
-
-/// Returns the GeoBoundingBox that defines the MBR
-/// <http://janmatuschek.de/LatitudeLongitudeBoundingCoordinates#Longitude>
-fn minimum_bounding_rectangle_for_circle(circle: &GeoRadius) -> GeoBoundingBox {
-    // circle.radius is in meter
-    let angular_radius: f64 = circle.radius / EARTH_RADIUS_METERS;
-
-    let angular_lat = circle.center.lat.to_radians();
-    let mut min_lat = (angular_lat - angular_radius).to_degrees();
-    let mut max_lat = (angular_lat + angular_radius).to_degrees();
-
-    let (min_lon, max_lon) = if LAT_RANGE.start < min_lat && max_lat < LAT_RANGE.end {
-        // Poles are not within the query, default scenario
-        let angular_lon = circle.center.lon.to_radians();
-        let delta_lon = (angular_radius.sin() / angular_lat.cos()).asin();
-
-        let min_lon = (angular_lon - delta_lon).to_degrees();
-        let max_lon = (angular_lon + delta_lon).to_degrees();
-
-        (min_lon, max_lon)
-    } else {
-        // poles are within circle - use whole cup
-        if LAT_RANGE.start > min_lat {
-            min_lat = LAT_RANGE.start + COORD_EPS;
-        }
-        if max_lat > LAT_RANGE.end {
-            max_lat = LAT_RANGE.end - COORD_EPS;
-        }
-
-        (LON_RANGE.start + COORD_EPS, LON_RANGE.end - COORD_EPS)
-    };
-
-    let top_left = GeoPoint {
-        lat: max_lat,
-        lon: sphere_lon(min_lon),
-    };
-    let bottom_right = GeoPoint {
-        lat: min_lat,
-        lon: sphere_lon(max_lon),
-    };
-
-    GeoBoundingBox {
-        top_left,
-        bottom_right,
-    }
-}
-
-fn minimum_bounding_rectangle_for_polygon(polygon: &GeoPolygon) -> GeoBoundingBox {
-    let mut min_lon = std::f64::MAX;
-    let mut max_lon = std::f64::MIN;
-    let mut min_lat = std::f64::MAX;
-    let mut max_lat = std::f64::MIN;
-
-    for point in &polygon.points {
-        if point.lon < min_lon {
-            min_lon = point.lon;
-        }
-        if point.lon > max_lon {
-            max_lon = point.lon;
-        }
-        if point.lat < min_lat {
-            min_lat = point.lat;
-        }
-        if point.lat > max_lat {
-            max_lat = point.lat;
-        }
-    }
-
-    let top_left = GeoPoint {
-        lon: min_lon,
-        lat: max_lat,
-    };
-    let bottom_right = GeoPoint {
-        lon: max_lon,
-        lat: min_lat,
-    };
-
-    GeoBoundingBox {
-        top_left,
-        bottom_right,
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use rand::rngs::StdRng;
-    use rand::{Rng, SeedableRng};
-
-    use super::*;
-
-    const BERLIN: GeoPoint = GeoPoint {
-        lat: 52.52437,
-        lon: 13.41053,
-    };
-
-    const NYC: GeoPoint = GeoPoint {
-        lat: 40.75798,
-        lon: -73.991516,
-    };
-
-    #[test]
-    fn geohash_encode_longitude_first() {
-        let center_hash = encode((NYC.lon, NYC.lat).into(), GEOHASH_MAX_LENGTH).unwrap();
-        assert_eq!(center_hash, "dr5ru7c02wnv");
-        let center_hash = encode((NYC.lon, NYC.lat).into(), 6).unwrap();
-        assert_eq!(center_hash, "dr5ru7");
-        let center_hash = encode((BERLIN.lon, BERLIN.lat).into(), GEOHASH_MAX_LENGTH).unwrap();
-        assert_eq!(center_hash, "u33dc1v0xupz");
-        let center_hash = encode((BERLIN.lon, BERLIN.lat).into(), 6).unwrap();
-        assert_eq!(center_hash, "u33dc1");
-    }
-
-    #[test]
-    fn rectangle_geo_hash_nyc() {
-        // data from https://www.titanwolf.org/Network/q/a98ba365-14c5-48f4-8839-86a0962e0ab9/y
-        let near_nyc_circle = GeoRadius {
-            center: NYC,
-            radius: 800.0,
-        };
-
-        let bounding_box = minimum_bounding_rectangle_for_circle(&near_nyc_circle);
-        let rectangle: GeohashBoundingBox = bounding_box.into();
-        assert_eq!(rectangle.north_west, "dr5ruj4477kd");
-        assert_eq!(rectangle.south_west, "dr5ru46ne2ux");
-        assert_eq!(rectangle.south_east, "dr5ru6ryw0cp");
-        assert_eq!(rectangle.north_east, "dr5rumpfq534");
-    }
-
-    #[test]
-    fn top_level_rectangle_geo_area() {
-        let rect = GeohashBoundingBox {
-            north_west: "u".to_string(),
-            south_west: "s".to_string(),
-            south_east: "t".to_string(),
-            north_east: "v".to_string(),
-        };
-        let mut geo_area = rect.geohash_regions(1, 100).unwrap();
-        let mut expected = vec!["u", "s", "v", "t"];
-
-        geo_area.sort_unstable();
-        expected.sort_unstable();
-        assert_eq!(geo_area, expected);
-    }
-
-    #[test]
-    fn nyc_rectangle_geo_area_high_precision() {
-        let rect = GeohashBoundingBox {
-            north_west: "dr5ruj4477kd".to_string(),
-            south_west: "dr5ru46ne2ux".to_string(),
-            south_east: "dr5ru6ryw0cp".to_string(),
-            north_east: "dr5rumpfq534".to_string(),
-        };
-
-        // calling `rect.geohash_regions()` is too expensive
-        assert!(rect.geohash_regions(12, 100).is_none());
-    }
-
-    #[test]
-    fn nyc_rectangle_geo_area_medium_precision() {
-        let rect = GeohashBoundingBox {
-            north_west: "dr5ruj4".to_string(),
-            south_west: "dr5ru46".to_string(),
-            south_east: "dr5ru6r".to_string(),
-            north_east: "dr5rump".to_string(),
-        };
-
-        let geo_area = rect.geohash_regions(7, 1000).unwrap();
-        assert_eq!(14 * 12, geo_area.len());
-    }
-
-    #[test]
-    fn nyc_rectangle_geo_area_low_precision() {
-        let rect = GeohashBoundingBox {
-            north_west: "dr5ruj".to_string(),
-            south_west: "dr5ru4".to_string(),
-            south_east: "dr5ru6".to_string(),
-            north_east: "dr5rum".to_string(),
-        };
-
-        let mut geo_area = rect.geohash_regions(6, 100).unwrap();
-        let mut expected = vec![
-            "dr5ru4", "dr5ru5", "dr5ru6", "dr5ru7", "dr5ruh", "dr5ruj", "dr5rum", "dr5ruk",
-        ];
-
-        expected.sort_unstable();
-        geo_area.sort_unstable();
-        assert_eq!(geo_area, expected);
-    }
-
-    #[test]
-    fn rectangle_hashes_nyc() {
-        // conversion to lon/lat http://geohash.co/
-        // "dr5ruj4477kd"
-        let top_left = GeoPoint {
-            lon: -74.00101399,
-            lat: 40.76517460,
-        };
-
-        // "dr5ru6ryw0cp"
-        let bottom_right = GeoPoint {
-            lon: -73.98201792,
-            lat: 40.75078539,
-        };
-
-        let near_nyc_rectangle = GeoBoundingBox {
-            top_left,
-            bottom_right,
-        };
-
-        let nyc_hashes = rectangle_hashes(&near_nyc_rectangle, 200);
-        assert_eq!(nyc_hashes.len(), 168);
-        assert!(nyc_hashes.iter().all(|h| h.len() == 7)); // geohash precision
-
-        let mut nyc_hashes = rectangle_hashes(&near_nyc_rectangle, 10);
-        nyc_hashes.sort_unstable();
-        let mut expected = vec![
-            "dr5ruj", "dr5ruh", "dr5ru5", "dr5ru4", "dr5rum", "dr5ruk", "dr5ru7", "dr5ru6",
-        ];
-        expected.sort_unstable();
-
-        assert_eq!(nyc_hashes, expected);
-
-        // Graphical proof using https://www.movable-type.co.uk/scripts/geohash.html
-
-        // dr5rgy dr5run dr5ruq dr5ruw
-        // dr5rgv dr5ruj dr5rum dr5rut
-        // dr5rgu dr5ruh dr5ruk dr5rus
-        // dr5rgg dr5ru5 dr5ru7 dr5rue
-        // dr5rgf dr5ru4 dr5ru6 dr5rud
-        // dr5rgc dr5ru1 dr5ru3 dr5ru9
-
-        // XXXXXX XXXXXX XXXXXX XXXXXX
-        // XXXXXX dr5ruj dr5rum XXXXXX
-        // XXXXXX dr5ruh dr5ruk XXXXXX
-        // XXXXXX dr5ru5 dr5ru7 XXXXXX
-        // XXXXXX dr5ru4 Xr5ru6 XXXXXX
-        // XXXXXX XXXXXX XXXXXX XXXXXX
-
-        // falls back to finest region that encompasses the whole area
-        let nyc_hashes = rectangle_hashes(&near_nyc_rectangle, 7);
-        assert_eq!(nyc_hashes, ["dr5ru"]);
-    }
-
-    #[test]
-    fn polygon_hashes_nyc() {
-        // conversion to lon/lat http://geohash.co/
-        // "dr5ruj4477kd"
-        let near_nyc_polygon = GeoPolygon {
-            points: vec![
-                GeoPoint {
-                    lon: -74.00101399,
-                    lat: 40.76517460,
-                },
-                GeoPoint {
-                    lon: -73.98201792,
-                    lat: 40.76517460,
-                },
-                GeoPoint {
-                    lon: -73.98201792,
-                    lat: 40.75078539,
-                },
-                GeoPoint {
-                    lon: -74.00101399,
-                    lat: 40.75078539,
-                },
-                GeoPoint {
-                    lon: -74.00101399,
-                    lat: 40.76517460,
-                },
-            ],
-        };
-
-        let nyc_hashes = polygon_hashes(&near_nyc_polygon, 200);
-        assert_eq!(nyc_hashes.len(), 168);
-        assert!(nyc_hashes.iter().all(|h| h.len() == 7)); // geohash precision
-
-        let mut nyc_hashes = polygon_hashes(&near_nyc_polygon, 10);
-        nyc_hashes.sort_unstable();
-        let mut expected = vec![
-            "dr5ruj", "dr5ruh", "dr5ru5", "dr5ru4", "dr5rum", "dr5ruk", "dr5ru7", "dr5ru6",
-        ];
-        expected.sort_unstable();
-
-        assert_eq!(nyc_hashes, expected);
-
-        // falls back to finest region that encompasses the whole area
-        let nyc_hashes = polygon_hashes(&near_nyc_polygon, 7);
-        assert_eq!(nyc_hashes, ["dr5ru"]);
-    }
-
-    #[test]
-    fn random_circles() {
-        let mut rnd = StdRng::seed_from_u64(42);
-        for _ in 0..1000 {
-            let r_meters = rnd.gen_range(1.0..10000.0);
-            let query = GeoRadius {
-                center: GeoPoint {
-                    lon: rnd.gen_range(LON_RANGE),
-                    lat: rnd.gen_range(LAT_RANGE),
-                },
-                radius: r_meters,
-            };
-            let max_hashes = rnd.gen_range(1..32);
-            let hashes = circle_hashes(&query, max_hashes);
-            assert!(hashes.len() <= max_hashes);
-        }
-    }
-
-    #[test]
-    fn test_check_polygon_intersection() {
-        // Create a geohash as (-135, 0), (-90, 0), (-90, 45), (-135, 45)
-        #[allow(deprecated)]
-        let geohash = encode(Coordinate { x: -115.0, y: 35.0 }, 1).unwrap();
-
-        // Test a polygon that intersects with the geohash
-        let polygon_1 = GeoPolygon {
-            points: vec![
-                GeoPoint {
-                    lon: -120.0,
-                    lat: -30.0,
-                },
-                GeoPoint {
-                    lon: -150.0,
-                    lat: -30.0,
-                },
-                GeoPoint {
-                    lon: -150.0,
-                    lat: 40.0,
-                },
-                GeoPoint {
-                    lon: -120.0,
-                    lat: 40.0,
-                },
-                GeoPoint {
-                    lon: -135.0,
-                    lat: -1.0,
-                },
-            ],
-        };
-        let intersect_1 = check_polygon_intersection(&geohash, &polygon_1);
-        assert!(intersect_1);
-
-        // Test a polygon that does not intersect with the geohash
-        let polygon_2 = GeoPolygon {
-            points: vec![
-                GeoPoint {
-                    lon: -80.0,
-                    lat: -30.0,
-                },
-                GeoPoint {
-                    lon: -80.0,
-                    lat: 40.0,
-                },
-                GeoPoint {
-                    lon: -20.0,
-                    lat: 40.0,
-                },
-                GeoPoint {
-                    lon: -20.0,
-                    lat: -30.0,
-                },
-                GeoPoint {
-                    lon: -135.0,
-                    lat: -1.0,
-                },
-            ],
-        };
-        let intersect_2 = check_polygon_intersection(&geohash, &polygon_2);
-        assert!(!intersect_2);
-
-        // Test a polygon that overlaps with the geohash
-        let polygon_3 = GeoPolygon {
-            points: vec![
-                GeoPoint {
-                    lon: -135.0,
-                    lat: 0.0,
-                },
-                GeoPoint {
-                    lon: -90.0,
-                    lat: 0.0,
-                },
-                GeoPoint {
-                    lon: -90.0,
-                    lat: 45.0,
-                },
-                GeoPoint {
-                    lon: -135.0,
-                    lat: 45.0,
-                },
-                GeoPoint {
-                    lon: -135.0,
-                    lat: -1.0,
-                },
-            ],
-        };
-        let intersect_3 = check_polygon_intersection(&geohash, &polygon_3);
-        assert!(intersect_3);
-
-        // Test a polygon that only share one edge
-        let polygon_4 = GeoPolygon {
-            points: vec![
-                GeoPoint {
-                    lon: -135.0,
-                    lat: -1.0,
-                },
-                GeoPoint {
-                    lon: -150.0,
-                    lat: -1.0,
-                },
-                GeoPoint {
-                    lon: -150.0,
-                    lat: 46.0,
-                },
-                GeoPoint {
-                    lon: -135.0,
-                    lat: 46.0,
-                },
-                GeoPoint {
-                    lon: -135.0,
-                    lat: -1.0,
-                },
-            ],
-        };
-        let intersect_4 = check_polygon_intersection(&geohash, &polygon_4);
-        assert!(intersect_4);
-
-        // Test a geohash that is within the geohash
-        let polygon_5 = GeoPolygon {
-            points: vec![
-                GeoPoint {
-                    lon: -134.0,
-                    lat: 1.0,
-                },
-                GeoPoint {
-                    lon: -91.0,
-                    lat: 1.0,
-                },
-                GeoPoint {
-                    lon: -91.0,
-                    lat: 44.0,
-                },
-                GeoPoint {
-                    lon: -134.0,
-                    lat: 44.0,
-                },
-                GeoPoint {
-                    lon: -135.0,
-                    lat: -1.0,
-                },
-            ],
-        };
-        let intersect_5 = check_polygon_intersection(&geohash, &polygon_5);
-        assert!(intersect_5);
-    }
-
-    #[test]
-    fn test_lon_threshold() {
-        let query = GeoRadius {
-            center: GeoPoint {
-                lon: 179.987181,
-                lat: 44.9811609411936,
-            },
-            radius: 100000.,
-        };
-
-        let max_hashes = 10;
-        let hashes = circle_hashes(&query, max_hashes);
-        assert_eq!(hashes, vec!["zbp", "b00", "xzz", "8pb"]);
-    }
-
-    #[test]
-    fn wide_circle_meridian() {
-        let query = GeoRadius {
-            center: GeoPoint {
-                lon: -17.81718188959701,
-                lat: 89.9811609411936,
-            },
-            radius: 9199.481636468849,
-        };
-
-        let max_hashes = 10;
-        let hashes = circle_hashes(&query, max_hashes);
-        assert!(hashes.len() <= max_hashes);
-        assert_eq!(hashes, ["b", "c", "f", "g", "u", "v", "y", "z"]);
-    }
-
-    #[test]
-    fn tight_circle_meridian() {
-        let query = GeoRadius {
-            center: GeoPoint {
-                lon: -17.81718188959701,
-                lat: 89.9811609411936,
-            },
-            radius: 1000.0,
-        };
-
-        let max_hashes = 10;
-        let hashes = circle_hashes(&query, max_hashes);
-        assert!(hashes.len() <= max_hashes);
-        assert_eq!(hashes, ["fz", "gp", "gr", "gx", "gz", "up"]);
-    }
-
-    #[test]
-    fn wide_circle_south_pole() {
-        let query = GeoRadius {
-            center: GeoPoint {
-                lon: 155.85591760141335,
-                lat: -74.19418872656166,
-            },
-            radius: 7133.775526733084,
-        };
-        let max_hashes = 10;
-        let hashes = circle_hashes(&query, max_hashes);
-        assert!(hashes.len() <= max_hashes);
-        assert_eq!(hashes, ["p6yd", "p6yf", "p6y9", "p6yc"]);
-    }
-
-    #[test]
-    fn tight_circle_south_pole() {
-        let query = GeoRadius {
-            center: GeoPoint {
-                lon: 155.85591760141335,
-                lat: -74.19418872656166,
-            },
-            radius: 1000.0,
-        };
-        let max_hashes = 10;
-        let hashes = circle_hashes(&query, max_hashes);
-        assert!(hashes.len() <= max_hashes);
-        assert_eq!(hashes, ["p6ycc", "p6ycf", "p6ycg"]);
-    }
-
-    #[test]
-    fn circle_hashes_nyc() {
-        let near_nyc_circle = GeoRadius {
-            center: NYC,
-            radius: 800.0,
-        };
-
-        let nyc_hashes = circle_hashes(&near_nyc_circle, 200);
-        assert!(nyc_hashes.iter().all(|h| h.len() == 7)); // geohash precision
-
-        let mut nyc_hashes = circle_hashes(&near_nyc_circle, 10);
-        nyc_hashes.sort_unstable();
-        let mut expected = [
-            "dr5ruj", "dr5ruh", "dr5ru5", "dr5ru4", "dr5rum", "dr5ruk", "dr5ru7", "dr5ru6",
-        ];
-        expected.sort_unstable();
-        assert_eq!(nyc_hashes, expected);
-
-        // falls back to finest region that encompasses the whole area
-        let nyc_hashes = circle_hashes(&near_nyc_circle, 7);
-        assert_eq!(nyc_hashes, ["dr5ru"]);
-    }
-
-    #[test]
-    fn go_north() {
-        let mut geohash = sphere_neighbor("ww8p", Direction::N).unwrap();
-        for _ in 0..1000 {
-            geohash = sphere_neighbor(&geohash, Direction::N).unwrap();
-        }
-    }
-
-    #[test]
-    fn go_west() {
-        let starting_hash = "ww8";
-        let mut geohash = sphere_neighbor(starting_hash, Direction::W).unwrap();
-        let mut is_earth_round = false;
-        for _ in 0..1000 {
-            geohash = sphere_neighbor(&geohash, Direction::W).unwrap();
-            if geohash == starting_hash {
-                is_earth_round = true;
-            }
-        }
-        assert!(is_earth_round)
-    }
-
-    #[test]
-    fn sphere_neighbor_corner_cases() {
-        assert_eq!(&sphere_neighbor("z", Direction::NE).unwrap(), "b");
-        assert_eq!(&sphere_neighbor("zz", Direction::NE).unwrap(), "bp");
-        assert_eq!(&sphere_neighbor("0", Direction::SW).unwrap(), "p");
-        assert_eq!(&sphere_neighbor("00", Direction::SW).unwrap(), "pb");
-
-        assert_eq!(&sphere_neighbor("8", Direction::W).unwrap(), "x");
-        assert_eq!(&sphere_neighbor("8h", Direction::W).unwrap(), "xu");
-        assert_eq!(&sphere_neighbor("r", Direction::E).unwrap(), "2");
-        assert_eq!(&sphere_neighbor("ru", Direction::E).unwrap(), "2h");
-
-        assert_eq!(
-            sphere_neighbor("ww8p1r4t8", Direction::SE).unwrap(),
-            geohash::neighbor("ww8p1r4t8", Direction::SE).unwrap()
-        );
-    }
-
-    #[test]
-    fn long_overflow_distance() {
-        let dist = Point::new(-179.999, 66.0).haversine_distance(&Point::new(179.999, 66.0));
-        eprintln!("dist` = {dist:#?}");
-        assert_eq!(dist, 90.45422731917998);
-        let dist = Point::new(0.99, 90.).haversine_distance(&Point::new(0.99, -90.0));
-        assert_eq!(dist, 20015114.442035925);
-    }
-
-    #[test]
-    fn turn_geo_hash_to_box() {
-        let geo_box = geo_hash_to_box(&"dr5ruj4477kd".to_string());
-        let center = GeoPoint {
-            lat: 40.76517460,
-            lon: -74.00101399,
-        };
-        assert!(geo_box.check_point(center.lon, center.lat));
-    }
-
-    #[test]
-    fn common_prefix() {
-        let geo_hashes = vec![
-            "abcd123".to_string(),
-            "abcd2233".to_string(),
-            "abcd3213".to_string(),
-            "abcd533".to_string(),
-        ];
-
-        let common_prefix = common_hash_prefix(&geo_hashes);
-
-        assert_eq!(common_prefix, "abcd".to_string());
-
-        let geo_hashes = vec![
-            "abcd123".to_string(),
-            "bbcd2233".to_string(),
-            "cbcd3213".to_string(),
-            "dbcd533".to_string(),
-        ];
-
-        let common_prefix = common_hash_prefix(&geo_hashes);
-
-        assert_eq!(common_prefix, "".to_string());
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/index/field_index/geo_index.rs b/crates/qdrant/lib/segment/src/index/field_index/geo_index.rs
deleted file mode 100644
index 0db21ed..0000000
--- a/crates/qdrant/lib/segment/src/index/field_index/geo_index.rs
+++ /dev/null
@@ -1,929 +0,0 @@
-use std::cmp::{max, min};
-use std::collections::{BTreeMap, HashSet};
-use std::str::FromStr;
-use std::sync::Arc;
-
-use itertools::Itertools;
-use parking_lot::RwLock;
-use rocksdb::DB;
-use serde_json::Value;
-
-use crate::common::rocksdb_wrapper::DatabaseColumnWrapper;
-use crate::common::Flusher;
-use crate::entry::entry_point::{OperationError, OperationResult};
-use crate::index::field_index::geo_hash::{
-    circle_hashes, common_hash_prefix, encode_max_precision, geo_hash_to_box, polygon_hashes,
-    rectangle_hashes, GeoHash,
-};
-use crate::index::field_index::stat_tools::estimate_multi_value_selection_cardinality;
-use crate::index::field_index::{
-    CardinalityEstimation, PayloadBlockCondition, PayloadFieldIndex, PrimaryCondition, ValueIndexer,
-};
-use crate::telemetry::PayloadIndexTelemetry;
-use crate::types::{
-    FieldCondition, GeoBoundingBox, GeoPoint, GeoRadius, PayloadKeyType, PointOffsetType,
-};
-
-/// Max number of sub-regions computed for an input geo query
-// TODO discuss value, should it be dynamically computed?
-const GEO_QUERY_MAX_REGION: usize = 12;
-
-pub struct GeoMapIndex {
-    /*
-    {
-        "d": 10,
-        "dr": 10,
-        "dr5": 4,
-        "dr5r": 3,
-        "dr5ru": 1,
-        "dr5rr": 2,
-        ...
-    }
-     */
-    points_per_hash: BTreeMap<GeoHash, usize>,
-    values_per_hash: BTreeMap<GeoHash, usize>,
-    /*
-    {
-        "dr5ru": {1},
-        "dr5rr": {2, 3},
-        ...
-    }
-     */
-    points_map: BTreeMap<GeoHash, HashSet<PointOffsetType>>,
-    point_to_values: Vec<Vec<GeoPoint>>,
-    points_count: usize,
-    values_count: usize,
-    max_values_per_point: usize,
-    db_wrapper: DatabaseColumnWrapper,
-}
-
-impl GeoMapIndex {
-    pub fn new(db: Arc<RwLock<DB>>, field: &str) -> Self {
-        let store_cf_name = Self::storage_cf_name(field);
-        let db_wrapper = DatabaseColumnWrapper::new(db, &store_cf_name);
-        GeoMapIndex {
-            points_per_hash: Default::default(),
-            values_per_hash: Default::default(),
-            points_map: Default::default(),
-            point_to_values: vec![],
-            points_count: 0,
-            values_count: 0,
-            max_values_per_point: 1,
-            db_wrapper,
-        }
-    }
-
-    fn storage_cf_name(field: &str) -> String {
-        format!("{field}_geo")
-    }
-
-    pub fn recreate(&self) -> OperationResult<()> {
-        self.db_wrapper.recreate_column_family()
-    }
-
-    fn increment_hash_value_counts(&mut self, geo_hash: &GeoHash) {
-        for i in 0..=geo_hash.len() {
-            let sub_geo_hash = &geo_hash[0..i];
-            match self.values_per_hash.get_mut(sub_geo_hash) {
-                None => {
-                    self.values_per_hash.insert(sub_geo_hash.to_string(), 1);
-                }
-                Some(count) => {
-                    *count += 1;
-                }
-            };
-        }
-    }
-
-    fn decrement_hash_value_counts(&mut self, geo_hash: &GeoHash) {
-        for i in 0..=geo_hash.len() {
-            let sub_geo_hash = &geo_hash[0..i];
-            match self.values_per_hash.get_mut(sub_geo_hash) {
-                None => {
-                    debug_assert!(
-                        false,
-                        "Hash value count is not found for hash: {}",
-                        sub_geo_hash
-                    );
-                    self.values_per_hash.insert(sub_geo_hash.to_string(), 0);
-                }
-                Some(count) => {
-                    *count -= 1;
-                }
-            };
-        }
-    }
-
-    fn increment_hash_point_counts(&mut self, geo_hashes: &[GeoHash]) {
-        let mut seen_hashes: HashSet<&str> = Default::default();
-
-        for geo_hash in geo_hashes {
-            for i in 0..=geo_hash.len() {
-                let sub_geo_hash = &geo_hash[0..i];
-                if seen_hashes.contains(sub_geo_hash) {
-                    continue;
-                }
-                seen_hashes.insert(sub_geo_hash);
-                match self.points_per_hash.get_mut(sub_geo_hash) {
-                    None => {
-                        self.points_per_hash.insert(sub_geo_hash.to_string(), 1);
-                    }
-                    Some(count) => {
-                        *count += 1;
-                    }
-                };
-            }
-        }
-    }
-
-    fn decrement_hash_point_counts(&mut self, geo_hashes: &[GeoHash]) {
-        let mut seen_hashes: HashSet<&str> = Default::default();
-        for geo_hash in geo_hashes {
-            for i in 0..=geo_hash.len() {
-                let sub_geo_hash = &geo_hash[0..i];
-                if seen_hashes.contains(sub_geo_hash) {
-                    continue;
-                }
-                seen_hashes.insert(sub_geo_hash);
-                match self.points_per_hash.get_mut(sub_geo_hash) {
-                    None => {
-                        debug_assert!(
-                            false,
-                            "Hash point count is not found for hash: {}",
-                            sub_geo_hash
-                        );
-                        self.points_per_hash.insert(sub_geo_hash.to_string(), 0);
-                    }
-                    Some(count) => {
-                        *count -= 1;
-                    }
-                };
-            }
-        }
-    }
-
-    fn load(&mut self) -> OperationResult<bool> {
-        if !self.db_wrapper.has_column_family()? {
-            return Ok(false);
-        };
-
-        let mut points_to_hashes: BTreeMap<PointOffsetType, Vec<GeoHash>> = Default::default();
-
-        for (key, value) in self.db_wrapper.lock_db().iter()? {
-            let key_str = std::str::from_utf8(&key).map_err(|_| {
-                OperationError::service_error("Index load error: UTF8 error while DB parsing")
-            })?;
-
-            let (geo_hash, idx) = Self::decode_db_key(key_str)?;
-            let geo_point = Self::decode_db_value(value)?;
-
-            if self.point_to_values.len() <= idx as usize {
-                self.point_to_values.resize(idx as usize + 1, Vec::new())
-            }
-
-            if self.point_to_values[idx as usize].is_empty() {
-                self.points_count += 1;
-            }
-
-            points_to_hashes
-                .entry(idx)
-                .or_default()
-                .push(geo_hash.clone());
-
-            self.point_to_values[idx as usize].push(geo_point);
-            self.points_map
-                .entry(geo_hash.clone())
-                .or_default()
-                .insert(idx);
-
-            self.values_count += 1;
-        }
-
-        for (_idx, geo_hashes) in points_to_hashes.into_iter() {
-            self.max_values_per_point = max(self.max_values_per_point, geo_hashes.len());
-            self.increment_hash_point_counts(&geo_hashes);
-            for geo_hash in geo_hashes {
-                self.increment_hash_value_counts(&geo_hash);
-            }
-        }
-        Ok(true)
-    }
-
-    fn encode_db_key(value: &str, idx: PointOffsetType) -> String {
-        format!("{value}/{idx}")
-    }
-
-    fn decode_db_key(s: &str) -> OperationResult<(GeoHash, PointOffsetType)> {
-        const DECODE_ERR: &str = "Index db parsing error: wrong data format";
-        let separator_pos = s
-            .rfind('/')
-            .ok_or_else(|| OperationError::service_error(DECODE_ERR))?;
-        if separator_pos == s.len() - 1 {
-            return Err(OperationError::service_error(DECODE_ERR));
-        }
-        let geohash = s[..separator_pos].to_string();
-        let idx_str = &s[separator_pos + 1..];
-        let idx = PointOffsetType::from_str(idx_str)
-            .map_err(|_| OperationError::service_error(DECODE_ERR))?;
-        Ok((geohash, idx))
-    }
-
-    fn decode_db_value<T: AsRef<[u8]>>(value: T) -> OperationResult<GeoPoint> {
-        let lat_bytes = value.as_ref()[0..8]
-            .try_into()
-            .map_err(|_| OperationError::service_error("invalid lat encoding"))?;
-
-        let lon_bytes = value.as_ref()[8..16]
-            .try_into()
-            .map_err(|_| OperationError::service_error("invalid lat encoding"))?;
-
-        let lat = f64::from_be_bytes(lat_bytes);
-        let lon = f64::from_be_bytes(lon_bytes);
-
-        Ok(GeoPoint { lon, lat })
-    }
-
-    fn encode_db_value(value: &GeoPoint) -> [u8; 16] {
-        let mut result: [u8; 16] = [0; 16];
-        result[0..8].clone_from_slice(&value.lat.to_be_bytes());
-        result[8..16].clone_from_slice(&value.lon.to_be_bytes());
-        result
-    }
-
-    pub fn flusher(&self) -> Flusher {
-        self.db_wrapper.flusher()
-    }
-
-    pub fn get_values(&self, idx: PointOffsetType) -> Option<&Vec<GeoPoint>> {
-        self.point_to_values.get(idx as usize)
-    }
-
-    pub fn check_radius(&self, idx: PointOffsetType, radius: &GeoRadius) -> bool {
-        self.get_values(idx)
-            .map(|values| values.iter().any(|x| radius.check_point(x.lon, x.lat)))
-            .unwrap_or(false)
-    }
-
-    pub fn check_box(&self, idx: PointOffsetType, bbox: &GeoBoundingBox) -> bool {
-        self.get_values(idx)
-            .map(|values| values.iter().any(|x| bbox.check_point(x.lon, x.lat)))
-            .unwrap_or(false)
-    }
-
-    pub fn match_cardinality(&self, values: &[GeoHash]) -> CardinalityEstimation {
-        let common_hash = common_hash_prefix(values);
-
-        let total_points = self.points_per_hash.get(&common_hash).copied().unwrap_or(0);
-        let total_values = self.values_per_hash.get(&common_hash).copied().unwrap_or(0);
-
-        let (sum, maximum_per_hash) = values
-            .iter()
-            .map(|region| self.points_per_hash.get(region).cloned().unwrap_or(0))
-            .fold((0, 0), |(sum, maximum), count| {
-                (sum + count, max(maximum, count))
-            });
-
-        // Assume all selected points have `max_values_per_point` value hits.
-        // Therefore number of points can't be less than `total_hits / max_values_per_point`
-        let min_hits_by_value_groups = sum / self.max_values_per_point;
-
-        // Assume that we have selected all possible duplications of the points
-        let point_duplications = total_values - total_points;
-        let possible_non_duplicated = sum.saturating_sub(point_duplications);
-
-        let estimation_min = max(
-            max(min_hits_by_value_groups, possible_non_duplicated),
-            maximum_per_hash,
-        );
-        let estimation_max = min(sum, total_points);
-
-        // estimate_multi_value_selection_cardinality might overflow at some corner cases
-        // so it is better to limit its value with min and max
-        let estimation_exp =
-            estimate_multi_value_selection_cardinality(total_points, total_values, sum).round()
-                as usize;
-
-        CardinalityEstimation {
-            primary_clauses: vec![],
-            min: estimation_min,
-            exp: min(estimation_max, max(estimation_min, estimation_exp)),
-            max: estimation_max,
-        }
-    }
-
-    pub fn get_telemetry_data(&self) -> PayloadIndexTelemetry {
-        PayloadIndexTelemetry {
-            field_name: None,
-            points_count: self.points_count,
-            points_values_count: self.values_count,
-            histogram_bucket_size: None,
-        }
-    }
-
-    fn remove_point(&mut self, idx: PointOffsetType) -> OperationResult<()> {
-        if self.point_to_values.len() <= idx as usize {
-            return Ok(()); // Already removed or never actually existed
-        }
-
-        let removed_geo_points = std::mem::take(&mut self.point_to_values[idx as usize]);
-
-        if removed_geo_points.is_empty() {
-            return Ok(());
-        }
-
-        self.points_count -= 1;
-        self.values_count -= removed_geo_points.len();
-        let mut removed_geo_hashes = Vec::with_capacity(removed_geo_points.len());
-
-        for removed_geo_point in removed_geo_points {
-            let removed_geo_hash: GeoHash =
-                encode_max_precision(removed_geo_point.lon, removed_geo_point.lat).unwrap();
-            removed_geo_hashes.push(removed_geo_hash.clone());
-
-            let key = Self::encode_db_key(&removed_geo_hash, idx);
-            self.db_wrapper.remove(key)?;
-
-            let is_last = if let Some(hash_ids) = self.points_map.get_mut(&removed_geo_hash) {
-                hash_ids.remove(&idx);
-                hash_ids.is_empty()
-            } else {
-                log::warn!(
-                    "Geo index error: no points for hash {} was found",
-                    removed_geo_hash
-                );
-                false
-            };
-
-            if is_last {
-                self.points_map.remove(&removed_geo_hash);
-            }
-
-            self.decrement_hash_value_counts(&removed_geo_hash);
-        }
-
-        self.decrement_hash_point_counts(&removed_geo_hashes);
-        Ok(())
-    }
-
-    fn add_many_geo_points(
-        &mut self,
-        idx: PointOffsetType,
-        values: &[GeoPoint],
-    ) -> OperationResult<()> {
-        if values.is_empty() {
-            return Ok(());
-        }
-
-        if self.point_to_values.len() <= idx as usize {
-            // That's a smart reallocation
-            self.point_to_values.resize(idx as usize + 1, vec![]);
-        }
-
-        self.point_to_values[idx as usize] = values.to_vec();
-
-        let mut geo_hashes = vec![];
-
-        for added_point in values {
-            let added_geo_hash: GeoHash = encode_max_precision(added_point.lon, added_point.lat)
-                .map_err(|e| OperationError::service_error(format!("Malformed geo points: {e}")))?;
-
-            let key = Self::encode_db_key(&added_geo_hash, idx);
-            let value = Self::encode_db_value(added_point);
-
-            geo_hashes.push(added_geo_hash);
-
-            self.db_wrapper.put(key, value)?;
-        }
-
-        for geo_hash in &geo_hashes {
-            self.points_map
-                .entry(geo_hash.to_owned())
-                .or_insert_with(HashSet::new)
-                .insert(idx);
-
-            self.increment_hash_value_counts(geo_hash);
-        }
-
-        self.increment_hash_point_counts(&geo_hashes);
-
-        self.values_count += values.len();
-        self.points_count += 1;
-        self.max_values_per_point = self.max_values_per_point.max(values.len());
-        Ok(())
-    }
-
-    fn get_stored_sub_regions(
-        &self,
-        geo: &GeoHash,
-    ) -> Box<dyn Iterator<Item = (&GeoHash, &HashSet<PointOffsetType>)> + '_> {
-        let geo_clone = geo.to_string();
-        Box::new(
-            self.points_map
-                .range(geo.to_string()..)
-                .take_while(move |(p, _h)| p.starts_with(&geo_clone)),
-        )
-    }
-
-    fn get_iterator(&self, values: Vec<GeoHash>) -> Box<dyn Iterator<Item = PointOffsetType> + '_> {
-        Box::new(
-            values
-                .into_iter()
-                .flat_map(|top_geo_hash| {
-                    self.get_stored_sub_regions(&top_geo_hash)
-                        .flat_map(|(_geohash, points)| points.iter().copied())
-                })
-                .unique(),
-        )
-    }
-
-    /// Get iterator over smallest geo-hash regions larger than `threshold` points
-    fn get_large_hashes(
-        &self,
-        threshold: usize,
-    ) -> Box<dyn Iterator<Item = (&GeoHash, usize)> + '_> {
-        let mut large_regions = self
-            .points_per_hash
-            .iter()
-            .filter(|(hash, size)| **size > threshold && !hash.is_empty())
-            .collect_vec();
-
-        // smallest regions first
-        large_regions.sort_by(|a, b| b.cmp(a));
-
-        let mut edge_region = vec![];
-
-        let mut current_region = "";
-
-        for (region, size) in large_regions.into_iter() {
-            if current_region.starts_with(region) {
-                continue;
-            } else {
-                current_region = region;
-                edge_region.push((region, *size));
-            }
-        }
-
-        Box::new(edge_region.into_iter())
-    }
-
-    pub fn values_count(&self, point_id: PointOffsetType) -> usize {
-        self.get_values(point_id).map(|x| x.len()).unwrap_or(0)
-    }
-
-    pub fn values_is_empty(&self, point_id: PointOffsetType) -> bool {
-        self.get_values(point_id)
-            .map(|x| x.is_empty())
-            .unwrap_or(true)
-    }
-}
-
-impl ValueIndexer<GeoPoint> for GeoMapIndex {
-    fn add_many(&mut self, id: PointOffsetType, values: Vec<GeoPoint>) -> OperationResult<()> {
-        self.add_many_geo_points(id, &values)
-    }
-
-    fn get_value(&self, value: &Value) -> Option<GeoPoint> {
-        match value {
-            Value::Object(obj) => {
-                let lon_op = obj.get("lon").and_then(|x| x.as_f64());
-                let lat_op = obj.get("lat").and_then(|x| x.as_f64());
-
-                if let (Some(lon), Some(lat)) = (lon_op, lat_op) {
-                    return GeoPoint::new(lon, lat).ok();
-                }
-                None
-            }
-            _ => None,
-        }
-    }
-
-    fn remove_point(&mut self, id: PointOffsetType) -> OperationResult<()> {
-        self.remove_point(id)
-    }
-}
-
-impl PayloadFieldIndex for GeoMapIndex {
-    fn count_indexed_points(&self) -> usize {
-        self.points_count
-    }
-
-    fn load(&mut self) -> OperationResult<bool> {
-        GeoMapIndex::load(self)
-    }
-
-    fn clear(self) -> OperationResult<()> {
-        self.db_wrapper.remove_column_family()
-    }
-
-    fn flusher(&self) -> Flusher {
-        GeoMapIndex::flusher(self)
-    }
-
-    fn filter(
-        &self,
-        condition: &FieldCondition,
-    ) -> Option<Box<dyn Iterator<Item = PointOffsetType> + '_>> {
-        if let Some(geo_bounding_box) = &condition.geo_bounding_box {
-            let geo_hashes = rectangle_hashes(geo_bounding_box, GEO_QUERY_MAX_REGION);
-            let geo_condition_copy = geo_bounding_box.clone();
-            return Some(Box::new(self.get_iterator(geo_hashes).filter(
-                move |point| {
-                    self.point_to_values
-                        .get(*point as usize)
-                        .unwrap()
-                        .iter()
-                        .any(|point| geo_condition_copy.check_point(point.lon, point.lat))
-                },
-            )));
-        }
-
-        if let Some(geo_radius) = &condition.geo_radius {
-            let geo_hashes = circle_hashes(geo_radius, GEO_QUERY_MAX_REGION);
-            let geo_condition_copy = geo_radius.clone();
-            return Some(Box::new(self.get_iterator(geo_hashes).filter(
-                move |point| {
-                    self.point_to_values
-                        .get(*point as usize)
-                        .unwrap()
-                        .iter()
-                        .any(|point| geo_condition_copy.check_point(point.lon, point.lat))
-                },
-            )));
-        }
-
-        if let Some(geo_polygon) = &condition.geo_polygon {
-            let geo_hashes = polygon_hashes(geo_polygon, GEO_QUERY_MAX_REGION);
-            let geo_condition_copy = geo_polygon.clone();
-            return Some(Box::new(self.get_iterator(geo_hashes).filter(
-                move |point| {
-                    self.point_to_values
-                        .get(*point as usize)
-                        .unwrap()
-                        .iter()
-                        .any(|point| geo_condition_copy.check_point(point.lon, point.lat))
-                },
-            )));
-        }
-
-        None
-    }
-
-    fn estimate_cardinality(&self, condition: &FieldCondition) -> Option<CardinalityEstimation> {
-        if let Some(geo_bounding_box) = &condition.geo_bounding_box {
-            let geo_hashes = rectangle_hashes(geo_bounding_box, GEO_QUERY_MAX_REGION);
-            let mut estimation = self.match_cardinality(&geo_hashes);
-            estimation
-                .primary_clauses
-                .push(PrimaryCondition::Condition(condition.clone()));
-            return Some(estimation);
-        }
-
-        if let Some(geo_radius) = &condition.geo_radius {
-            let geo_hashes = circle_hashes(geo_radius, GEO_QUERY_MAX_REGION);
-            let mut estimation = self.match_cardinality(&geo_hashes);
-            estimation
-                .primary_clauses
-                .push(PrimaryCondition::Condition(condition.clone()));
-            return Some(estimation);
-        }
-
-        None
-    }
-
-    fn payload_blocks(
-        &self,
-        threshold: usize,
-        key: PayloadKeyType,
-    ) -> Box<dyn Iterator<Item = PayloadBlockCondition> + '_> {
-        Box::new(
-            self.get_large_hashes(threshold)
-                .map(move |(geo_hash, size)| PayloadBlockCondition {
-                    condition: FieldCondition::new_geo_bounding_box(
-                        key.clone(),
-                        geo_hash_to_box(geo_hash),
-                    ),
-                    cardinality: size,
-                }),
-        )
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use itertools::Itertools;
-    use rand::prelude::StdRng;
-    use rand::SeedableRng;
-    use serde_json::json;
-    use tempfile::Builder;
-
-    use super::*;
-    use crate::common::rocksdb_wrapper::open_db_with_existing_cf;
-    use crate::common::utils::MultiValue;
-    use crate::fixtures::payload_fixtures::random_geo_payload;
-    use crate::types::GeoRadius;
-
-    const NYC: GeoPoint = GeoPoint {
-        lat: 40.75798,
-        lon: -73.991516,
-    };
-
-    const BERLIN: GeoPoint = GeoPoint {
-        lat: 52.52437,
-        lon: 13.41053,
-    };
-
-    const POTSDAM: GeoPoint = GeoPoint {
-        lat: 52.390569,
-        lon: 13.064473,
-    };
-
-    const TOKYO: GeoPoint = GeoPoint {
-        lat: 35.689487,
-        lon: 139.691706,
-    };
-
-    const FIELD_NAME: &str = "test";
-
-    fn condition_for_geo_radius(key: String, geo_radius: GeoRadius) -> FieldCondition {
-        FieldCondition::new_geo_radius(key, geo_radius)
-    }
-
-    fn build_random_index(num_points: usize, num_geo_values: usize) -> GeoMapIndex {
-        let temp_dir = Builder::new().prefix("test_dir").tempdir().unwrap();
-        let db = open_db_with_existing_cf(&temp_dir.path().join("test_db")).unwrap();
-
-        let mut rnd = StdRng::seed_from_u64(42);
-        let mut index = GeoMapIndex::new(db, FIELD_NAME);
-
-        index.recreate().unwrap();
-
-        for idx in 0..num_points {
-            let geo_points = random_geo_payload(&mut rnd, num_geo_values..=num_geo_values);
-            let array_payload = Value::Array(geo_points);
-            let payload = MultiValue::one(&array_payload);
-            index.add_point(idx as PointOffsetType, &payload).unwrap();
-        }
-        assert_eq!(index.points_count, num_points);
-        assert_eq!(index.values_count, num_points * num_geo_values);
-
-        index
-    }
-
-    #[test]
-    fn match_cardinality() {
-        let r_meters = 500_000.0;
-        let geo_radius = GeoRadius {
-            center: NYC,
-            radius: r_meters,
-        };
-
-        let field_index = build_random_index(500, 20);
-
-        let nyc_hashes = circle_hashes(&geo_radius, GEO_QUERY_MAX_REGION);
-
-        let exact_points_for_hashes = field_index.get_iterator(nyc_hashes).collect_vec();
-        let real_cardinality = exact_points_for_hashes.len();
-
-        let field_condition = condition_for_geo_radius("test".to_string(), geo_radius);
-        let card = field_index.estimate_cardinality(&field_condition);
-        let card = card.unwrap();
-
-        eprintln!("real_cardinality = {real_cardinality:#?}");
-        eprintln!("card = {card:#?}");
-
-        assert!(card.min <= real_cardinality);
-        assert!(card.max >= real_cardinality);
-
-        assert!(card.exp >= card.min);
-        assert!(card.exp <= card.max);
-    }
-
-    #[test]
-    fn geo_indexed_filtering() {
-        let r_meters = 500_000.0;
-        let geo_radius = GeoRadius {
-            center: NYC,
-            radius: r_meters,
-        };
-
-        let field_index = build_random_index(1000, 5);
-
-        let mut matched_points = field_index
-            .point_to_values
-            .iter()
-            .enumerate()
-            .filter(|(_idx, geo_points)| {
-                geo_points
-                    .iter()
-                    .any(|geo_point| geo_radius.check_point(geo_point.lon, geo_point.lat))
-            })
-            .map(|(idx, _geo_points)| idx as PointOffsetType)
-            .collect_vec();
-
-        assert!(!matched_points.is_empty());
-
-        let field_condition = condition_for_geo_radius("test".to_string(), geo_radius);
-
-        let mut indexed_matched_points =
-            field_index.filter(&field_condition).unwrap().collect_vec();
-
-        matched_points.sort_unstable();
-        indexed_matched_points.sort_unstable();
-
-        assert_eq!(matched_points, indexed_matched_points);
-    }
-
-    #[test]
-    fn test_payload_blocks() {
-        let field_index = build_random_index(1000, 5);
-        let top_level_points = field_index.points_per_hash.get("").unwrap();
-        assert_eq!(*top_level_points, 1_000);
-        let block_hashes = field_index.get_large_hashes(100).collect_vec();
-        assert!(!block_hashes.is_empty());
-        for (geohash, size) in block_hashes {
-            assert_eq!(geohash.len(), 1);
-            assert!(size > 100);
-            assert!(size < 1000);
-        }
-
-        let blocks = field_index
-            .payload_blocks(100, "test".to_string())
-            .collect_vec();
-        blocks.iter().for_each(|block| {
-            let block_points = field_index.filter(&block.condition).unwrap().collect_vec();
-            assert_eq!(block_points.len(), block.cardinality);
-        });
-    }
-
-    #[test]
-    fn match_cardinality_point_with_multi_far_geo_payload() {
-        let temp_dir = Builder::new().prefix("test_dir").tempdir().unwrap();
-        let db = open_db_with_existing_cf(&temp_dir.path().join("test_db")).unwrap();
-
-        let mut index = GeoMapIndex::new(db, FIELD_NAME);
-
-        index.recreate().unwrap();
-
-        let r_meters = 100.0;
-        let geo_values = json!([
-            {
-                "lon": BERLIN.lon,
-                "lat": BERLIN.lat
-            },
-            {
-                "lon": NYC.lon,
-                "lat": NYC.lat
-            }
-        ]);
-        let payload = MultiValue::one(&geo_values);
-        index.add_point(1, &payload).unwrap();
-
-        // around NYC
-        let nyc_geo_radius = GeoRadius {
-            center: NYC,
-            radius: r_meters,
-        };
-        let field_condition = condition_for_geo_radius("test".to_string(), nyc_geo_radius);
-        let card = index.estimate_cardinality(&field_condition);
-        let card = card.unwrap();
-        assert_eq!(card.min, 1);
-        assert_eq!(card.max, 1);
-        assert_eq!(card.exp, 1);
-
-        // around BERLIN
-        let berlin_geo_radius = GeoRadius {
-            center: BERLIN,
-            radius: r_meters,
-        };
-        let field_condition = condition_for_geo_radius("test".to_string(), berlin_geo_radius);
-        let card = index.estimate_cardinality(&field_condition);
-        let card = card.unwrap();
-        assert_eq!(card.min, 1);
-        assert_eq!(card.max, 1);
-        assert_eq!(card.exp, 1);
-
-        // around TOKYO
-        let tokyo_geo_radius = GeoRadius {
-            center: TOKYO,
-            radius: r_meters,
-        };
-        let field_condition = condition_for_geo_radius("test".to_string(), tokyo_geo_radius);
-        let card = index.estimate_cardinality(&field_condition);
-        let card = card.unwrap();
-        // no points found
-        assert_eq!(card.min, 0);
-        assert_eq!(card.max, 0);
-        assert_eq!(card.exp, 0);
-    }
-
-    #[test]
-    fn match_cardinality_point_with_multi_close_geo_payload() {
-        let temp_dir = Builder::new().prefix("test_dir").tempdir().unwrap();
-        let db = open_db_with_existing_cf(&temp_dir.path().join("test_db")).unwrap();
-
-        let mut index = GeoMapIndex::new(db, FIELD_NAME);
-
-        index.recreate().unwrap();
-
-        let geo_values = json!([
-            {
-                "lon": BERLIN.lon,
-                "lat": BERLIN.lat
-            },
-            {
-                "lon": POTSDAM.lon,
-                "lat": POTSDAM.lat
-            }
-        ]);
-        let payload = MultiValue::one(&geo_values);
-        index.add_point(1, &payload).unwrap();
-
-        let berlin_geo_radius = GeoRadius {
-            center: BERLIN,
-            radius: 50_000.0, // Berlin <-> Potsdam is 27 km
-        };
-        let field_condition = condition_for_geo_radius("test".to_string(), berlin_geo_radius);
-        let card = index.estimate_cardinality(&field_condition);
-        let card = card.unwrap();
-        // handle properly that a single point matches via two different geo payloads
-        assert_eq!(card.min, 1);
-        assert_eq!(card.max, 1);
-        assert_eq!(card.exp, 1);
-    }
-
-    #[test]
-    fn load_from_disk() {
-        let temp_dir = Builder::new().prefix("test_dir").tempdir().unwrap();
-        {
-            let db = open_db_with_existing_cf(&temp_dir.path().join("test_db")).unwrap();
-
-            let mut index = GeoMapIndex::new(db, FIELD_NAME);
-
-            index.recreate().unwrap();
-
-            let geo_values = json!([
-                {
-                    "lon": BERLIN.lon,
-                    "lat": BERLIN.lat
-                },
-                {
-                    "lon": POTSDAM.lon,
-                    "lat": POTSDAM.lat
-                }
-            ]);
-            let payload = MultiValue::one(&geo_values);
-            index.add_point(1, &payload).unwrap();
-            index.flusher()().unwrap();
-            drop(index);
-        }
-
-        let db = open_db_with_existing_cf(&temp_dir.path().join("test_db")).unwrap();
-        let mut new_index = GeoMapIndex::new(db, FIELD_NAME);
-        new_index.load().unwrap();
-
-        let berlin_geo_radius = GeoRadius {
-            center: BERLIN,
-            radius: 50_000.0, // Berlin <-> Potsdam is 27 km
-        };
-
-        let field_condition = condition_for_geo_radius("test".to_string(), berlin_geo_radius);
-        let point_offsets = new_index.filter(&field_condition).unwrap().collect_vec();
-        assert_eq!(point_offsets, vec![1]);
-    }
-
-    #[test]
-    fn same_geo_index_between_points_test() {
-        let temp_dir = Builder::new().prefix("test_dir").tempdir().unwrap();
-        {
-            let db = open_db_with_existing_cf(&temp_dir.path().join("test_db")).unwrap();
-            let mut index = GeoMapIndex::new(db, FIELD_NAME);
-            index.recreate().unwrap();
-
-            let geo_values = json!([
-                {
-                    "lon": BERLIN.lon,
-                    "lat": BERLIN.lat
-                },
-                {
-                    "lon": POTSDAM.lon,
-                    "lat": POTSDAM.lat
-                }
-            ]);
-            let payload = MultiValue::one(&geo_values);
-            index.add_point(1, &payload).unwrap();
-            index.add_point(2, &payload).unwrap();
-            index.remove_point(1).unwrap();
-            index.flusher()().unwrap();
-
-            assert_eq!(index.points_count, 1);
-            assert_eq!(index.values_count, 2);
-            drop(index);
-        }
-
-        let db = open_db_with_existing_cf(&temp_dir.path().join("test_db")).unwrap();
-        let mut new_index = GeoMapIndex::new(db, FIELD_NAME);
-        new_index.load().unwrap();
-        assert_eq!(new_index.points_count, 1);
-        assert_eq!(new_index.values_count, 2);
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/index/field_index/histogram.rs b/crates/qdrant/lib/segment/src/index/field_index/histogram.rs
deleted file mode 100644
index c626c20..0000000
--- a/crates/qdrant/lib/segment/src/index/field_index/histogram.rs
+++ /dev/null
@@ -1,698 +0,0 @@
-use std::cmp::Ordering;
-use std::collections::BTreeMap;
-use std::collections::Bound::{Excluded, Included, Unbounded};
-use std::ops::Bound;
-
-use itertools::Itertools;
-use num_traits::{Num, Signed};
-
-const MIN_BUCKET_SIZE: usize = 10;
-
-#[derive(Debug, Clone)]
-pub struct Counts {
-    pub left: usize,
-    pub right: usize,
-}
-
-#[derive(PartialEq, PartialOrd, Debug, Clone)]
-pub struct Point<T> {
-    pub val: T,
-    pub idx: usize,
-}
-
-impl<T: PartialEq> Eq for Point<T> {}
-
-#[allow(clippy::derive_ord_xor_partial_ord)]
-impl<T: PartialOrd + Copy> Ord for Point<T> {
-    fn cmp(&self, other: &Point<T>) -> Ordering {
-        (self.val, self.idx)
-            .partial_cmp(&(other.val, other.idx))
-            .unwrap()
-    }
-}
-
-/// A trait that should represent common properties of integer and floating point types.
-/// In particular, i64 and f64.
-pub trait Numericable: Num + Signed + PartialEq + PartialOrd + Copy {
-    fn min_value() -> Self;
-    fn max_value() -> Self;
-    fn to_f64(self) -> f64;
-    fn from_f64(x: f64) -> Self;
-    fn min(self, b: Self) -> Self {
-        if self < b {
-            self
-        } else {
-            b
-        }
-    }
-    fn max(self, b: Self) -> Self {
-        if self > b {
-            self
-        } else {
-            b
-        }
-    }
-    fn abs_diff(self, b: Self) -> Self {
-        if self > b {
-            self - b
-        } else {
-            b - self
-        }
-    }
-}
-
-impl Numericable for i64 {
-    fn min_value() -> Self {
-        i64::MIN
-    }
-    fn max_value() -> Self {
-        i64::MAX
-    }
-    fn to_f64(self) -> f64 {
-        self as f64
-    }
-    fn from_f64(x: f64) -> Self {
-        x as Self
-    }
-    fn abs_diff(self, b: Self) -> Self {
-        i64::abs_diff(self, b) as i64
-    }
-}
-
-impl Numericable for f64 {
-    fn min_value() -> Self {
-        f64::MIN
-    }
-    fn max_value() -> Self {
-        f64::MAX
-    }
-    fn to_f64(self) -> f64 {
-        self
-    }
-    fn from_f64(x: f64) -> Self {
-        x
-    }
-}
-
-#[derive(Debug)]
-pub struct Histogram<T: Numericable + PartialEq + PartialOrd + Copy> {
-    max_bucket_size: usize,
-    precision: f64,
-    total_count: usize,
-    borders: BTreeMap<Point<T>, Counts>,
-}
-
-impl<T: Numericable> Histogram<T> {
-    pub fn new(max_bucket_size: usize, precision: f64) -> Self {
-        assert!(precision < 1.0);
-        assert!(precision > 0.0);
-        Self {
-            max_bucket_size,
-            precision,
-            total_count: 0,
-            borders: BTreeMap::default(),
-        }
-    }
-
-    pub fn total_count(&self) -> usize {
-        self.total_count
-    }
-
-    #[cfg(test)]
-    pub fn borders(&self) -> &BTreeMap<Point<T>, Counts> {
-        &self.borders
-    }
-
-    #[allow(dead_code)]
-    fn validate(&self) -> Result<(), String> {
-        // Iterate over chunks of borders
-        for (left, right) in self.borders.values().tuple_windows() {
-            assert_eq!(left.right, right.left);
-        }
-        Ok(())
-    }
-
-    pub fn current_bucket_size(&self) -> usize {
-        let bucket_size = (self.total_count as f64 * self.precision) as usize;
-        bucket_size.clamp(MIN_BUCKET_SIZE, self.max_bucket_size)
-    }
-
-    pub fn get_total_count(&self) -> usize {
-        self.total_count
-    }
-
-    /// Infers boundaries for bucket of given size and staring point.
-    /// Returns `to` range of values starting provided `from`value which is expected to contain
-    /// `range_size` values
-    ///
-    /// Returns None if there are no points stored
-    pub fn get_range_by_size(&self, from: Bound<T>, range_size: usize) -> Bound<T> {
-        // bound_map is unstable, but can be used here
-        // let from_ = from.map(|val| Point { val, idx: usize::MIN });
-
-        let from_ = match from {
-            Included(val) => Included(Point {
-                val,
-                idx: usize::MIN,
-            }),
-            Excluded(val) => Excluded(Point {
-                val,
-                idx: usize::MAX,
-            }),
-            Unbounded => Unbounded,
-        };
-
-        let mut reached_count = 0;
-        for (border, counts) in self.borders.range((from_, Unbounded)) {
-            if reached_count + counts.left > range_size {
-                // required size reached
-                return Included(border.val);
-            } else {
-                // Size not yet reached
-                reached_count += counts.left;
-            }
-        }
-
-        Unbounded
-    }
-
-    pub fn estimate(&self, from: Bound<T>, to: Bound<T>) -> (usize, usize, usize) {
-        let from_ = match &from {
-            Included(val) => Included(Point {
-                val: *val,
-                idx: usize::MIN,
-            }),
-            Excluded(val) => Excluded(Point {
-                val: *val,
-                idx: usize::MAX,
-            }),
-            Unbounded => Unbounded,
-        };
-
-        let to_ = match &to {
-            Included(val) => Included(Point {
-                val: *val,
-                idx: usize::MAX,
-            }),
-            Excluded(val) => Excluded(Point {
-                val: *val,
-                idx: usize::MIN,
-            }),
-            Unbounded => Unbounded,
-        };
-
-        // Value for range fraction estimation
-        let from_val = match from {
-            Included(val) => val,
-            Excluded(val) => val,
-            Unbounded => T::min_value(),
-        };
-
-        let to_val = match to {
-            Included(val) => val,
-            Excluded(val) => val,
-            Unbounded => T::max_value(),
-        };
-
-        if from_val > to_val {
-            return (0, 0, 0);
-        }
-
-        let left_border = {
-            if matches!(from_, Unbounded) {
-                None
-            } else {
-                self.borders.range((Unbounded, from_.clone())).next_back()
-            }
-        };
-
-        let right_border = {
-            if matches!(to_, Unbounded) {
-                None
-            } else {
-                self.borders.range((to_.clone(), Unbounded)).next()
-            }
-        };
-
-        let estimation = left_border
-            .into_iter()
-            .chain(self.borders.range((from_, to_)))
-            .chain(right_border)
-            .tuple_windows()
-            .map(
-                |((a, a_count), (b, _b_count)): ((&Point<T>, &Counts), (&Point<T>, _))| {
-                    let val_range = (b.val - a.val).to_f64();
-
-                    if val_range == 0. {
-                        // Zero-length range is always covered
-                        let estimates = a_count.right + 1;
-                        return (estimates, estimates, estimates);
-                    }
-
-                    if a_count.right == 0 {
-                        // Range covers most-right border
-                        return (1, 1, 1);
-                    }
-
-                    let cover_range = (to_val.min(b.val) - from_val.max(a.val)).to_f64();
-
-                    let covered_frac = cover_range / val_range;
-                    let estimate = (a_count.right as f64 * covered_frac).round() as usize + 1;
-
-                    let min_estimate = if cover_range == val_range {
-                        a_count.right + 1
-                    } else {
-                        0
-                    };
-                    let max_estimate = a_count.right + 1;
-                    (min_estimate, estimate, max_estimate)
-                },
-            )
-            .reduce(|a, b| (a.0 + b.0, a.1 + b.1, a.2 + b.2))
-            .unwrap_or((0, 0, 0));
-
-        estimation
-    }
-
-    pub fn remove<F, G>(&mut self, val: &Point<T>, left_neighbour: F, right_neighbour: G)
-    where
-        F: Fn(&Point<T>) -> Option<Point<T>>,
-        G: Fn(&Point<T>) -> Option<Point<T>>,
-    {
-        let (mut close_neighbors, (mut far_left_neighbor, mut far_right_neighbor)) = {
-            let mut left_iterator = self
-                .borders
-                .range((Unbounded, Included(val.clone())))
-                .map(|(k, v)| (k.clone(), v.clone()));
-            let mut right_iterator = self
-                .borders
-                .range((Excluded(val.clone()), Unbounded))
-                .map(|(k, v)| (k.clone(), v.clone()));
-            (
-                (left_iterator.next_back(), right_iterator.next()),
-                (left_iterator.next_back(), right_iterator.next()),
-            )
-        };
-
-        let (to_remove, to_create, removed) = match &mut close_neighbors {
-            (None, None) => (None, None, false), // histogram is empty
-            (Some((left_border, ref mut left_border_count)), None) => {
-                if left_border == val {
-                    // ....|
-                    // ...|
-                    if left_border_count.left == 0 {
-                        // ...||
-                        // ...|
-                        (Some(left_border.clone()), None, true)
-                    } else {
-                        // ...|..|
-                        // ...|.|
-                        match &mut far_left_neighbor {
-                            Some((_fln, ref mut fln_count)) => fln_count.right -= 1,
-                            None => {}
-                        }
-                        let (new_border, new_border_count) = (
-                            left_neighbour(left_border).unwrap(),
-                            Counts {
-                                left: left_border_count.left - 1,
-                                right: 0,
-                            },
-                        );
-                        (
-                            Some(left_border.clone()),
-                            Some((new_border, new_border_count)),
-                            true,
-                        )
-                    }
-                } else {
-                    (None, None, false)
-                }
-            }
-            (None, Some((right_border, ref mut right_border_count))) => {
-                if right_border == val {
-                    // |...
-                    //  |..
-                    if right_border_count.right == 0 {
-                        // ||...
-                        //  |...
-                        (Some(right_border.clone()), None, true)
-                    } else {
-                        // |..|...
-                        //  |.|...
-                        match &mut far_right_neighbor {
-                            Some((_frn, ref mut frn_count)) => frn_count.left -= 1,
-                            None => {}
-                        }
-                        let (new_border, new_border_count) = (
-                            right_neighbour(right_border).unwrap(),
-                            Counts {
-                                left: 0,
-                                right: right_border_count.right - 1,
-                            },
-                        );
-                        (
-                            Some(right_border.clone()),
-                            Some((new_border, new_border_count)),
-                            true,
-                        )
-                    }
-                } else {
-                    (None, None, false)
-                }
-            }
-            (
-                Some((left_border, ref mut left_border_count)),
-                Some((right_border, ref mut right_border_count)),
-            ) => {
-                // ...|...x.|...
-                if left_border == val {
-                    // ...|....|...
-                    // ... |...|...
-                    if left_border_count.right == 0 {
-                        // ...||...
-                        // ... |...
-                        right_border_count.left = left_border_count.left;
-                        (Some(left_border.clone()), None, true)
-                    } else if right_border_count.left + left_border_count.left
-                        <= self.current_bucket_size()
-                        && far_left_neighbor.is_some()
-                    {
-                        // ...|.l..r...
-                        // ...|. ..r...
-                        match &mut far_left_neighbor {
-                            Some((_fln, ref mut fln_count)) => {
-                                fln_count.right += right_border_count.left;
-                                right_border_count.left = fln_count.right;
-                            }
-                            None => {}
-                        }
-                        (Some(left_border.clone()), None, true)
-                    } else {
-                        // ...|..|...
-                        // ... |.|...
-                        right_border_count.left -= 1;
-                        let (new_border, new_border_count) = (
-                            right_neighbour(left_border).unwrap(),
-                            Counts {
-                                left: left_border_count.left,
-                                right: left_border_count.right - 1,
-                            },
-                        );
-                        (
-                            Some(left_border.clone()),
-                            Some((new_border, new_border_count)),
-                            true,
-                        )
-                    }
-                } else if right_border == val {
-                    // ...|....|...
-                    // ...|...| ...
-                    if right_border_count.left == 0 {
-                        // ...||...
-                        // ...| ...
-                        left_border_count.right = right_border_count.left;
-                        (Some(right_border.clone()), None, true)
-                    } else if left_border_count.right + right_border_count.right
-                        <= self.current_bucket_size()
-                        && far_right_neighbor.is_some()
-                    {
-                        // ...l..r.|...
-                        // ...l.. .|...
-                        match &mut far_right_neighbor {
-                            Some((_frn, ref mut frn_count)) => {
-                                frn_count.left += left_border_count.right;
-                                left_border_count.right = frn_count.left;
-                            }
-                            None => {}
-                        }
-                        (Some(right_border.clone()), None, true)
-                    } else {
-                        // ...|..|...
-                        // ...|.| ...
-                        left_border_count.right -= 1;
-                        let (new_border, new_border_count) = (
-                            left_neighbour(right_border).unwrap(),
-                            Counts {
-                                left: right_border_count.right,
-                                right: right_border_count.left - 1,
-                            },
-                        );
-                        (
-                            Some(right_border.clone()),
-                            Some((new_border, new_border_count)),
-                            true,
-                        )
-                    }
-                } else if right_border_count.left == 0 {
-                    // ...||...
-                    // ...||...
-                    (None, None, false)
-                } else {
-                    // ...|...|...
-                    // ...|. .|...
-                    right_border_count.left -= 1;
-                    left_border_count.right -= 1;
-                    (None, None, true)
-                }
-            }
-        };
-
-        if removed {
-            self.total_count -= 1;
-        }
-
-        let (left_border_opt, right_border_opt) = close_neighbors;
-
-        if let Some((k, v)) = left_border_opt {
-            self.borders.insert(k, v);
-        }
-
-        if let Some((k, v)) = right_border_opt {
-            self.borders.insert(k, v);
-        }
-
-        if let Some((k, v)) = far_left_neighbor {
-            self.borders.insert(k, v);
-        }
-
-        if let Some((k, v)) = far_right_neighbor {
-            self.borders.insert(k, v);
-        }
-
-        if let Some(remove_border) = to_remove {
-            self.borders.remove(&remove_border);
-        }
-
-        if let Some((new_border, new_border_count)) = to_create {
-            self.borders.insert(new_border, new_border_count);
-        }
-    }
-
-    /// Warn: `val` should be unique
-    pub fn insert<F, G>(&mut self, val: Point<T>, left_neighbour: F, right_neighbour: G)
-    where
-        F: Fn(&Point<T>) -> Option<Point<T>>,
-        G: Fn(&Point<T>) -> Option<Point<T>>,
-    {
-        self.total_count += 1;
-
-        if self.borders.len() < 2 {
-            self.borders.insert(val, Counts { left: 0, right: 0 });
-            return;
-        }
-
-        let (mut close_neighbors, (mut far_left_neighbor, mut far_right_neighbor)) = {
-            let mut left_iterator = self
-                .borders
-                .range((Unbounded, Included(val.clone())))
-                .map(|(k, v)| (k.clone(), v.clone()));
-            let mut right_iterator = self
-                .borders
-                .range((Excluded(val.clone()), Unbounded))
-                .map(|(k, v)| (k.clone(), v.clone()));
-            (
-                (left_iterator.next_back(), right_iterator.next()),
-                (left_iterator.next_back(), right_iterator.next()),
-            )
-        };
-
-        let (to_remove, to_create) = match &mut close_neighbors {
-            (None, Some((right_border, right_border_count))) => {
-                // x|.....|...
-                let new_count = right_border_count.right + 1;
-                let (new_border, mut new_border_count) = (
-                    val,
-                    Counts {
-                        left: 0,
-                        right: new_count,
-                    },
-                );
-
-                if new_count > self.current_bucket_size() {
-                    // Too many values, can't move the border
-                    // x|.....|...
-                    // ||.....|...
-                    new_border_count.right = 0;
-                    (None, Some((new_border, new_border_count)))
-                } else {
-                    // x|.....|...
-                    // |......|...
-                    match &mut far_right_neighbor {
-                        Some((_frn, frn_count)) => {
-                            frn_count.left = new_count;
-                        }
-                        None => {}
-                    }
-                    (
-                        Some(right_border.clone()),
-                        Some((new_border, new_border_count)),
-                    )
-                }
-            }
-            (Some((left_border, left_border_count)), None) => {
-                // ...|.....|x
-                let new_count = left_border_count.left + 1;
-                let (new_border, mut new_border_count) = (
-                    val,
-                    Counts {
-                        left: new_count,
-                        right: 0,
-                    },
-                );
-                if new_count > self.current_bucket_size() {
-                    // Too many values, can't move the border
-                    // ...|.....|x
-                    // ...|.....||
-                    new_border_count.left = 0;
-                    (None, Some((new_border, new_border_count)))
-                } else {
-                    // ...|.....|x
-                    // ...|......|
-                    match &mut far_left_neighbor {
-                        Some((_fln, ref mut fln_count)) => fln_count.right = new_count,
-                        None => {}
-                    }
-                    (
-                        Some(left_border.clone()),
-                        Some((new_border, new_border_count)),
-                    )
-                }
-            }
-            (Some((left_border, left_border_count)), Some((right_border, right_border_count))) => {
-                if left_border_count.right != right_border_count.left {
-                    eprintln!("error");
-                }
-                assert_eq!(left_border_count.right, right_border_count.left);
-                let new_count = left_border_count.right + 1;
-
-                if new_count > self.current_bucket_size() {
-                    // Too many values, let's adjust
-                    // Decide which border to move
-                    let left_dist = val.val.abs_diff(left_border.val);
-                    let right_dist = val.val.abs_diff(right_border.val);
-                    if left_dist < right_dist {
-                        // left border closer:
-                        //  ...|..x.........|...
-                        let (new_border, mut new_border_count) = (
-                            right_neighbour(left_border).unwrap(),
-                            Counts {
-                                left: left_border_count.left + 1,
-                                right: left_border_count.right,
-                            },
-                        );
-
-                        if left_border_count.left < self.current_bucket_size()
-                            && far_left_neighbor.is_some()
-                        {
-                            //we can move
-                            //  ...|..x.........|...
-                            //  ....|.x.........|...
-                            match &mut far_left_neighbor {
-                                Some((_fln, ref mut fln_count)) => {
-                                    fln_count.right = new_border_count.left
-                                }
-                                None => {}
-                            }
-
-                            (
-                                Some(left_border.clone()),
-                                Some((new_border, new_border_count)),
-                            )
-                        } else {
-                            // Can't be moved anymore, create an additional one
-                            //  ...|..x.........|...
-                            //  ...||.x.........|...
-                            new_border_count.left = 0;
-                            left_border_count.right = 0;
-                            (None, Some((new_border, new_border_count)))
-                        }
-                    } else {
-                        // right border closer
-                        //  ...|........x...|...
-                        let (new_border, mut new_border_count) = (
-                            left_neighbour(right_border).unwrap(),
-                            Counts {
-                                left: right_border_count.left,
-                                right: right_border_count.right + 1,
-                            },
-                        );
-
-                        if right_border_count.right < self.current_bucket_size()
-                            && far_right_neighbor.is_some()
-                        {
-                            // it's ok, we can move
-                            //  1: ...|........x...|...
-                            //  2: ...|........x..|....
-                            match &mut far_right_neighbor {
-                                Some((_frn, frn_count)) => frn_count.left = new_border_count.right,
-                                None => {}
-                            }
-                            (
-                                Some(right_border.clone()),
-                                Some((new_border, new_border_count)),
-                            )
-                        } else {
-                            // Can't be moved anymore, create a new one
-                            //  1: ...|........x...|...
-                            //  2: ...|........x..||...
-                            new_border_count.right = 0;
-                            right_border_count.left = 0;
-                            (None, Some((new_border, new_border_count)))
-                        }
-                    }
-                } else {
-                    left_border_count.right = new_count;
-                    right_border_count.left = new_count;
-                    (None, None)
-                }
-            }
-            (None, None) => unreachable!(),
-        };
-
-        let (left_border_opt, right_border_opt) = close_neighbors;
-
-        if let Some((k, v)) = left_border_opt {
-            self.borders.insert(k, v);
-        }
-
-        if let Some((k, v)) = right_border_opt {
-            self.borders.insert(k, v);
-        }
-
-        if let Some((k, v)) = far_left_neighbor {
-            self.borders.insert(k, v);
-        }
-
-        if let Some((k, v)) = far_right_neighbor {
-            self.borders.insert(k, v);
-        }
-
-        if let Some(remove_border) = to_remove {
-            self.borders.remove(&remove_border);
-        }
-
-        if let Some((new_border, new_border_count)) = to_create {
-            self.borders.insert(new_border, new_border_count);
-        }
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/index/field_index/index_selector.rs b/crates/qdrant/lib/segment/src/index/field_index/index_selector.rs
deleted file mode 100644
index f4c5f3d..0000000
--- a/crates/qdrant/lib/segment/src/index/field_index/index_selector.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-use std::sync::Arc;
-
-use parking_lot::RwLock;
-use rocksdb::DB;
-
-use super::binary_index::BinaryIndex;
-use crate::index::field_index::full_text_index::text_index::FullTextIndex;
-use crate::index::field_index::geo_index::GeoMapIndex;
-use crate::index::field_index::map_index::MapIndex;
-use crate::index::field_index::numeric_index::NumericIndex;
-use crate::index::field_index::FieldIndex;
-use crate::types::{
-    FloatPayloadType, IntPayloadType, PayloadFieldSchema, PayloadSchemaParams, PayloadSchemaType,
-};
-
-/// Selects index types based on field type
-pub fn index_selector(
-    field: &str,
-    payload_schema: &PayloadFieldSchema,
-    db: Arc<RwLock<DB>>,
-) -> Vec<FieldIndex> {
-    match payload_schema {
-        PayloadFieldSchema::FieldType(payload_type) => match payload_type {
-            PayloadSchemaType::Keyword => {
-                vec![FieldIndex::KeywordIndex(MapIndex::new(db, field))]
-            }
-            PayloadSchemaType::Integer => vec![
-                FieldIndex::IntMapIndex(MapIndex::<IntPayloadType>::new(db.clone(), field)),
-                FieldIndex::IntIndex(NumericIndex::<IntPayloadType>::new(db, field)),
-            ],
-            PayloadSchemaType::Float => {
-                vec![FieldIndex::FloatIndex(
-                    NumericIndex::<FloatPayloadType>::new(db, field),
-                )]
-            }
-            PayloadSchemaType::Geo => vec![FieldIndex::GeoIndex(GeoMapIndex::new(db, field))],
-            PayloadSchemaType::Text => vec![FieldIndex::FullTextIndex(FullTextIndex::new(
-                db,
-                Default::default(),
-                field,
-            ))],
-            PayloadSchemaType::Bool => vec![FieldIndex::BinaryIndex(BinaryIndex::new(db, field))],
-        },
-        PayloadFieldSchema::FieldParams(payload_params) => match payload_params {
-            PayloadSchemaParams::Text(text_index_params) => vec![FieldIndex::FullTextIndex(
-                FullTextIndex::new(db, text_index_params.clone(), field),
-            )],
-        },
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/index/field_index/map_index.rs b/crates/qdrant/lib/segment/src/index/field_index/map_index.rs
deleted file mode 100644
index 5997b0e..0000000
--- a/crates/qdrant/lib/segment/src/index/field_index/map_index.rs
+++ /dev/null
@@ -1,639 +0,0 @@
-use std::collections::{BTreeSet, HashMap};
-use std::fmt::Display;
-use std::hash::Hash;
-use std::iter;
-use std::str::FromStr;
-use std::sync::Arc;
-
-use itertools::Itertools;
-use parking_lot::RwLock;
-use rocksdb::DB;
-use serde_json::Value;
-use smol_str::SmolStr;
-
-use crate::common::rocksdb_wrapper::DatabaseColumnWrapper;
-use crate::common::Flusher;
-use crate::entry::entry_point::{OperationError, OperationResult};
-use crate::index::field_index::stat_tools::number_of_selected_points;
-use crate::index::field_index::{
-    CardinalityEstimation, PayloadBlockCondition, PayloadFieldIndex, PrimaryCondition, ValueIndexer,
-};
-use crate::index::query_estimator::combine_should_estimations;
-use crate::telemetry::PayloadIndexTelemetry;
-use crate::types::{
-    AnyVariants, FieldCondition, IntPayloadType, Match, MatchAny, MatchExcept, MatchValue,
-    PayloadKeyType, PointOffsetType, ValueVariants,
-};
-use crate::vector_storage::div_ceil;
-
-/// HashMap-based type of index
-pub struct MapIndex<N: Hash + Eq + Clone + Display> {
-    map: HashMap<N, BTreeSet<PointOffsetType>>,
-    point_to_values: Vec<Vec<N>>,
-    /// Amount of point which have at least one indexed payload value
-    indexed_points: usize,
-    values_count: usize,
-    db_wrapper: DatabaseColumnWrapper,
-}
-
-impl<N: Hash + Eq + Clone + Display + FromStr> MapIndex<N> {
-    pub fn new(db: Arc<RwLock<DB>>, field_name: &str) -> MapIndex<N> {
-        let store_cf_name = Self::storage_cf_name(field_name);
-        let db_wrapper = DatabaseColumnWrapper::new(db, &store_cf_name);
-        MapIndex {
-            map: Default::default(),
-            point_to_values: Vec::new(),
-            indexed_points: 0,
-            values_count: 0,
-            db_wrapper,
-        }
-    }
-
-    fn storage_cf_name(field: &str) -> String {
-        format!("{field}_map")
-    }
-
-    pub fn recreate(&self) -> OperationResult<()> {
-        self.db_wrapper.recreate_column_family()
-    }
-
-    fn load(&mut self) -> OperationResult<bool> {
-        if !self.db_wrapper.has_column_family()? {
-            return Ok(false);
-        }
-        self.indexed_points = 0;
-        for (record, _) in self.db_wrapper.lock_db().iter()? {
-            let record = std::str::from_utf8(&record).map_err(|_| {
-                OperationError::service_error("Index load error: UTF8 error while DB parsing")
-            })?;
-            let (value, idx) = Self::decode_db_record(record)?;
-            if self.point_to_values.len() <= idx as usize {
-                self.point_to_values.resize(idx as usize + 1, Vec::new())
-            }
-            if self.point_to_values[idx as usize].is_empty() {
-                self.indexed_points += 1;
-            }
-            self.values_count += 1;
-            self.point_to_values[idx as usize].push(value.clone());
-            self.map.entry(value).or_default().insert(idx);
-        }
-        Ok(true)
-    }
-
-    pub fn flusher(&self) -> Flusher {
-        self.db_wrapper.flusher()
-    }
-
-    pub fn match_cardinality<Q>(&self, value: &Q) -> CardinalityEstimation
-    where
-        Q: ?Sized,
-        N: std::borrow::Borrow<Q>,
-        Q: Hash + Eq,
-    {
-        let values_count = self.map.get(value).map(|p| p.len()).unwrap_or(0);
-
-        CardinalityEstimation::exact(values_count)
-    }
-
-    pub fn get_values(&self, idx: PointOffsetType) -> Option<&Vec<N>> {
-        self.point_to_values.get(idx as usize)
-    }
-
-    pub fn get_telemetry_data(&self) -> PayloadIndexTelemetry {
-        PayloadIndexTelemetry {
-            field_name: None,
-            points_count: self.indexed_points,
-            points_values_count: self.values_count,
-            histogram_bucket_size: None,
-        }
-    }
-
-    fn add_many_to_map<Q>(&mut self, idx: PointOffsetType, values: Vec<Q>) -> OperationResult<()>
-    where
-        Q: Into<N>,
-    {
-        if values.is_empty() {
-            return Ok(());
-        }
-
-        self.values_count += values.len();
-        if self.point_to_values.len() <= idx as usize {
-            self.point_to_values.resize(idx as usize + 1, Vec::new())
-        }
-        self.point_to_values[idx as usize] = values.into_iter().map(|v| v.into()).collect();
-        for value in &self.point_to_values[idx as usize] {
-            let entry = self.map.entry(value.clone()).or_default();
-            entry.insert(idx);
-
-            let db_record = Self::encode_db_record(value, idx);
-            self.db_wrapper.put(db_record, [])?;
-        }
-        self.indexed_points += 1;
-        Ok(())
-    }
-
-    fn get_iterator<Q>(&self, value: &Q) -> Box<dyn Iterator<Item = PointOffsetType> + '_>
-    where
-        Q: ?Sized,
-        N: std::borrow::Borrow<Q>,
-        Q: Hash + Eq,
-    {
-        self.map
-            .get(value)
-            .map(|ids| Box::new(ids.iter().copied()) as Box<dyn Iterator<Item = PointOffsetType>>)
-            .unwrap_or_else(|| Box::new(iter::empty::<PointOffsetType>()))
-    }
-
-    fn encode_db_record(value: &N, idx: PointOffsetType) -> String {
-        format!("{value}/{idx}")
-    }
-
-    fn decode_db_record(s: &str) -> OperationResult<(N, PointOffsetType)> {
-        const DECODE_ERR: &str = "Index db parsing error: wrong data format";
-        let separator_pos = s
-            .rfind('/')
-            .ok_or_else(|| OperationError::service_error(DECODE_ERR))?;
-        if separator_pos == s.len() - 1 {
-            return Err(OperationError::service_error(DECODE_ERR));
-        }
-        let value_str = &s[..separator_pos];
-        let value =
-            N::from_str(value_str).map_err(|_| OperationError::service_error(DECODE_ERR))?;
-        let idx_str = &s[separator_pos + 1..];
-        let idx = PointOffsetType::from_str(idx_str)
-            .map_err(|_| OperationError::service_error(DECODE_ERR))?;
-        Ok((value, idx))
-    }
-
-    fn remove_point(&mut self, idx: PointOffsetType) -> OperationResult<()> {
-        if self.point_to_values.len() <= idx as usize {
-            return Ok(());
-        }
-
-        let removed_values = std::mem::take(&mut self.point_to_values[idx as usize]);
-
-        if !removed_values.is_empty() {
-            self.indexed_points -= 1;
-        }
-        self.values_count -= removed_values.len();
-
-        for value in &removed_values {
-            if let Some(vals) = self.map.get_mut(value) {
-                vals.remove(&idx);
-            }
-            let key = MapIndex::encode_db_record(value, idx);
-            self.db_wrapper.remove(key)?;
-        }
-
-        Ok(())
-    }
-
-    pub fn values_count(&self, point_id: PointOffsetType) -> usize {
-        self.get_values(point_id).map(|x| x.len()).unwrap_or(0)
-    }
-
-    pub fn values_is_empty(&self, point_id: PointOffsetType) -> bool {
-        self.get_values(point_id)
-            .map(|x| x.is_empty())
-            .unwrap_or(true)
-    }
-
-    /// Estimates cardinality for `except` clause
-    ///
-    /// # Arguments
-    ///
-    /// * 'excluded' - values, which are not considered as matching
-    ///
-    /// # Returns
-    ///
-    /// * `CardinalityEstimation` - estimation of cardinality
-    fn except_cardinality<Q, I>(&self, excluded: impl Iterator<Item = I>) -> CardinalityEstimation
-    where
-        I: std::borrow::Borrow<Q>,
-        Q: ?Sized,
-        N: std::borrow::Borrow<Q>,
-        Q: Hash + Eq,
-    {
-        // Minimal case: we exclude as many points as possible.
-        // In this case, excluded points do not have any other values except excluded ones.
-        // So the first step - we estimate how many other points is needed to fit unused values.
-
-        // Example:
-        // Values: 20, 20
-        // Unique values: 5
-        // Total points: 100
-        // Total values: 110
-        // total_excluded_value_count = 40
-        // non_excluded_values_count = 110 - 40 = 70
-        // max_values_per_point = 5 - 2 = 3
-        // min_not_excluded_by_values = 70 / 3 = 24
-        // min = max(24, 100 - 40) = 60
-        // exp = ...
-        // max = min(20, 70) = 20
-
-        // Values: 60, 60
-        // Unique values: 5
-        // Total points: 100
-        // Total values: 200
-        // total_excluded_value_count = 120
-        // non_excluded_values_count = 200 - 120 = 80
-        // max_values_per_point = 5 - 2 = 3
-        // min_not_excluded_by_values = 80 / 3 = 27
-        // min = max(27, 100 - 120) = 27
-        // exp = ...
-        // max = min(60, 80) = 60
-
-        // Values: 60, 60, 60
-        // Unique values: 5
-        // Total points: 100
-        // Total values: 200
-        // total_excluded_value_count = 180
-        // non_excluded_values_count = 200 - 180 = 20
-        // max_values_per_point = 5 - 3 = 2
-        // min_not_excluded_by_values = 20 / 2 = 10
-        // min = max(10, 100 - 180) = 10
-        // exp = ...
-        // max = min(60, 20) = 20
-
-        // todo
-        let excluded_value_counts: Vec<_> = excluded
-            .map(|val| {
-                self.map
-                    .get(val.borrow())
-                    .map(|points| points.len())
-                    .unwrap_or(0)
-            })
-            .collect();
-        let total_excluded_value_count: usize = excluded_value_counts.iter().sum();
-
-        debug_assert!(total_excluded_value_count <= self.values_count);
-
-        let non_excluded_values_count =
-            self.values_count.saturating_sub(total_excluded_value_count);
-        let max_values_per_point = self.map.len().saturating_sub(excluded_value_counts.len());
-
-        if max_values_per_point == 0 {
-            // All points are excluded, so we can't select any point
-            debug_assert_eq!(non_excluded_values_count, 0);
-            return CardinalityEstimation::exact(0);
-        }
-
-        // Minimal amount of points, required to fit all unused values.
-        // Cardinality can't be less than this value.
-        let min_not_excluded_by_values = div_ceil(non_excluded_values_count, max_values_per_point);
-
-        let min = min_not_excluded_by_values.max(
-            self.indexed_points
-                .saturating_sub(total_excluded_value_count),
-        );
-
-        // Maximum scenario: selected points overlap as much as possible.
-        // From one side, all excluded values should be assigned to the same point
-        // => we can take the value with the maximum amount of points.
-        // From another side, all other values should be enough to fill all other points.
-
-        let max_excluded_value_count = excluded_value_counts.iter().max().copied().unwrap_or(0);
-
-        let max = self
-            .indexed_points
-            .saturating_sub(max_excluded_value_count)
-            .min(non_excluded_values_count);
-
-        // Expected case: we assume that all points are filled equally.
-        // So we can estimate the probability of the point to have non-excluded value.
-        let exp = number_of_selected_points(self.indexed_points, non_excluded_values_count)
-            .max(min)
-            .min(max);
-
-        CardinalityEstimation {
-            primary_clauses: vec![],
-            min,
-            exp,
-            max,
-        }
-    }
-
-    fn except_iterator<'a, Q>(
-        &'a self,
-        excluded: &'a [Q],
-    ) -> Box<dyn Iterator<Item = PointOffsetType> + 'a>
-    where
-        Q: PartialEq<N>,
-    {
-        let iter = self
-            .map
-            .keys()
-            .filter(|key| !excluded.iter().any(|e| e.eq(*key)))
-            .flat_map(|key| self.get_iterator(key))
-            .unique();
-        Box::new(iter)
-    }
-}
-
-impl PayloadFieldIndex for MapIndex<SmolStr> {
-    fn count_indexed_points(&self) -> usize {
-        self.indexed_points
-    }
-
-    fn load(&mut self) -> OperationResult<bool> {
-        MapIndex::load(self)
-    }
-
-    fn clear(self) -> OperationResult<()> {
-        self.db_wrapper.recreate_column_family()
-    }
-
-    fn flusher(&self) -> Flusher {
-        MapIndex::flusher(self)
-    }
-
-    fn filter<'a>(
-        &'a self,
-        condition: &'a FieldCondition,
-    ) -> Option<Box<dyn Iterator<Item = PointOffsetType> + 'a>> {
-        match &condition.r#match {
-            Some(Match::Value(MatchValue {
-                value: ValueVariants::Keyword(keyword),
-            })) => Some(self.get_iterator(keyword.as_str())),
-            Some(Match::Any(MatchAny {
-                any: AnyVariants::Keywords(keywords),
-            })) => Some(Box::new(
-                keywords
-                    .iter()
-                    .flat_map(|keyword| self.get_iterator(keyword.as_str()))
-                    .unique(),
-            )),
-            Some(Match::Except(MatchExcept {
-                except: AnyVariants::Keywords(keywords),
-            })) => Some(self.except_iterator(keywords)),
-            _ => None,
-        }
-    }
-
-    fn estimate_cardinality(&self, condition: &FieldCondition) -> Option<CardinalityEstimation> {
-        match &condition.r#match {
-            Some(Match::Value(MatchValue {
-                value: ValueVariants::Keyword(keyword),
-            })) => {
-                let mut estimation = self.match_cardinality(keyword.as_str());
-                estimation
-                    .primary_clauses
-                    .push(PrimaryCondition::Condition(condition.clone()));
-                Some(estimation)
-            }
-            Some(Match::Any(MatchAny {
-                any: AnyVariants::Keywords(keywords),
-            })) => {
-                let estimations = keywords
-                    .iter()
-                    .map(|keyword| self.match_cardinality(keyword.as_str()))
-                    .collect::<Vec<_>>();
-                Some(combine_should_estimations(
-                    &estimations,
-                    self.indexed_points,
-                ))
-            }
-            Some(Match::Except(MatchExcept {
-                except: AnyVariants::Keywords(keywords),
-            })) => Some(self.except_cardinality::<str, &str>(keywords.iter().map(|k| k.as_str()))),
-            _ => None,
-        }
-    }
-
-    fn payload_blocks(
-        &self,
-        threshold: usize,
-        key: PayloadKeyType,
-    ) -> Box<dyn Iterator<Item = PayloadBlockCondition> + '_> {
-        let iter = self
-            .map
-            .iter()
-            .filter(move |(_value, point_ids)| point_ids.len() > threshold)
-            .map(move |(value, point_ids)| PayloadBlockCondition {
-                condition: FieldCondition::new_match(key.clone(), value.to_owned().into()),
-                cardinality: point_ids.len(),
-            });
-        Box::new(iter)
-    }
-}
-
-impl PayloadFieldIndex for MapIndex<IntPayloadType> {
-    fn count_indexed_points(&self) -> usize {
-        self.indexed_points
-    }
-
-    fn load(&mut self) -> OperationResult<bool> {
-        MapIndex::load(self)
-    }
-
-    fn clear(self) -> OperationResult<()> {
-        self.db_wrapper.recreate_column_family()
-    }
-
-    fn flusher(&self) -> Flusher {
-        MapIndex::flusher(self)
-    }
-
-    fn filter<'a>(
-        &'a self,
-        condition: &'a FieldCondition,
-    ) -> Option<Box<dyn Iterator<Item = PointOffsetType> + 'a>> {
-        match &condition.r#match {
-            Some(Match::Value(MatchValue {
-                value: ValueVariants::Integer(integer),
-            })) => Some(self.get_iterator(integer)),
-            Some(Match::Any(MatchAny {
-                any: AnyVariants::Integers(integers),
-            })) => Some(Box::new(
-                integers
-                    .iter()
-                    .flat_map(|integer| self.get_iterator(integer))
-                    .unique(),
-            )),
-            Some(Match::Except(MatchExcept {
-                except: AnyVariants::Integers(integers),
-            })) => Some(self.except_iterator(integers)),
-            _ => None,
-        }
-    }
-
-    fn estimate_cardinality(&self, condition: &FieldCondition) -> Option<CardinalityEstimation> {
-        match &condition.r#match {
-            Some(Match::Value(MatchValue {
-                value: ValueVariants::Integer(integer),
-            })) => {
-                let mut estimation = self.match_cardinality(integer);
-                estimation
-                    .primary_clauses
-                    .push(PrimaryCondition::Condition(condition.clone()));
-                Some(estimation)
-            }
-            Some(Match::Any(MatchAny {
-                any: AnyVariants::Integers(integers),
-            })) => {
-                let estimations = integers
-                    .iter()
-                    .map(|integer| self.match_cardinality(integer))
-                    .collect::<Vec<_>>();
-                Some(combine_should_estimations(
-                    &estimations,
-                    self.indexed_points,
-                ))
-            }
-            Some(Match::Except(MatchExcept {
-                except: AnyVariants::Integers(integers),
-            })) => Some(
-                self.except_cardinality::<IntPayloadType, IntPayloadType>(integers.iter().cloned()),
-            ),
-            _ => None,
-        }
-    }
-
-    fn payload_blocks(
-        &self,
-        threshold: usize,
-        key: PayloadKeyType,
-    ) -> Box<dyn Iterator<Item = PayloadBlockCondition> + '_> {
-        let iter = self
-            .map
-            .iter()
-            .filter(move |(_value, point_ids)| point_ids.len() >= threshold)
-            .map(move |(value, point_ids)| PayloadBlockCondition {
-                condition: FieldCondition::new_match(key.clone(), (*value).into()),
-                cardinality: point_ids.len(),
-            });
-        Box::new(iter)
-    }
-}
-
-impl ValueIndexer<String> for MapIndex<SmolStr> {
-    fn add_many(&mut self, id: PointOffsetType, values: Vec<String>) -> OperationResult<()> {
-        self.add_many_to_map(id, values)
-    }
-
-    fn get_value(&self, value: &Value) -> Option<String> {
-        if let Value::String(keyword) = value {
-            return Some(keyword.to_owned());
-        }
-        None
-    }
-
-    fn remove_point(&mut self, id: PointOffsetType) -> OperationResult<()> {
-        self.remove_point(id)
-    }
-}
-
-impl ValueIndexer<IntPayloadType> for MapIndex<IntPayloadType> {
-    fn add_many(
-        &mut self,
-        id: PointOffsetType,
-        values: Vec<IntPayloadType>,
-    ) -> OperationResult<()> {
-        self.add_many_to_map(id, values)
-    }
-
-    fn get_value(&self, value: &Value) -> Option<IntPayloadType> {
-        if let Value::Number(num) = value {
-            return num.as_i64();
-        }
-        None
-    }
-
-    fn remove_point(&mut self, id: PointOffsetType) -> OperationResult<()> {
-        self.remove_point(id)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::collections::HashSet;
-    use std::fmt::Debug;
-    use std::iter::FromIterator;
-    use std::path::Path;
-
-    use tempfile::Builder;
-
-    use super::*;
-    use crate::common::rocksdb_wrapper::open_db_with_existing_cf;
-
-    const FIELD_NAME: &str = "test";
-
-    fn save_map_index<N: Hash + Eq + Clone + Display + FromStr + Debug>(
-        data: &[Vec<N>],
-        path: &Path,
-    ) {
-        let mut index = MapIndex::<N>::new(open_db_with_existing_cf(path).unwrap(), FIELD_NAME);
-        index.recreate().unwrap();
-        for (idx, values) in data.iter().enumerate() {
-            index
-                .add_many_to_map(idx as PointOffsetType, values.clone())
-                .unwrap();
-        }
-        index.flusher()().unwrap();
-    }
-
-    fn load_map_index<N: Hash + Eq + Clone + Display + FromStr + Debug>(
-        data: &[Vec<N>],
-        path: &Path,
-    ) {
-        let mut index = MapIndex::<N>::new(open_db_with_existing_cf(path).unwrap(), FIELD_NAME);
-        index.load().unwrap();
-        for (idx, values) in data.iter().enumerate() {
-            let index_values: HashSet<N> = HashSet::from_iter(
-                index
-                    .get_values(idx as PointOffsetType)
-                    .unwrap()
-                    .iter()
-                    .cloned(),
-            );
-            let check_values: HashSet<N> = HashSet::from_iter(values.iter().cloned());
-            assert_eq!(index_values, check_values);
-        }
-    }
-
-    #[test]
-    fn test_int_disk_map_index() {
-        let data = vec![
-            vec![1, 2, 3, 4, 5, 6],
-            vec![1, 2, 3, 4, 5, 6],
-            vec![13, 14, 15, 16, 17, 18],
-            vec![19, 20, 21, 22, 23, 24],
-            vec![25],
-        ];
-
-        let temp_dir = Builder::new().prefix("store_dir").tempdir().unwrap();
-        save_map_index(&data, temp_dir.path());
-        load_map_index(&data, temp_dir.path());
-    }
-
-    #[test]
-    fn test_string_disk_map_index() {
-        let data = vec![
-            vec![
-                String::from("AABB"),
-                String::from("UUFF"),
-                String::from("IIBB"),
-            ],
-            vec![
-                String::from("PPMM"),
-                String::from("QQXX"),
-                String::from("YYBB"),
-            ],
-            vec![
-                String::from("FFMM"),
-                String::from("IICC"),
-                String::from("IIBB"),
-            ],
-            vec![
-                String::from("AABB"),
-                String::from("UUFF"),
-                String::from("IIBB"),
-            ],
-            vec![String::from("PPGG")],
-        ];
-
-        let temp_dir = Builder::new().prefix("store_dir").tempdir().unwrap();
-        save_map_index(&data, temp_dir.path());
-        load_map_index(&data, temp_dir.path());
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/index/field_index/mod.rs b/crates/qdrant/lib/segment/src/index/field_index/mod.rs
deleted file mode 100644
index e98b4a7..0000000
--- a/crates/qdrant/lib/segment/src/index/field_index/mod.rs
+++ /dev/null
@@ -1,74 +0,0 @@
-use std::collections::HashSet;
-
-use crate::types::{FieldCondition, IsEmptyCondition, IsNullCondition, PointOffsetType};
-
-mod field_index_base;
-pub mod full_text_index;
-pub mod geo_hash;
-pub mod geo_index;
-mod histogram;
-pub mod index_selector;
-pub mod map_index;
-pub mod numeric_index;
-mod stat_tools;
-
-pub mod binary_index;
-#[cfg(test)]
-mod tests;
-
-pub use field_index_base::*;
-
-#[derive(Debug, Clone, PartialEq)]
-#[allow(clippy::large_enum_variant)]
-pub enum PrimaryCondition {
-    Condition(FieldCondition),
-    IsEmpty(IsEmptyCondition),
-    IsNull(IsNullCondition),
-    Ids(HashSet<PointOffsetType>),
-}
-
-#[derive(Debug, Clone)]
-pub struct PayloadBlockCondition {
-    pub condition: FieldCondition,
-    pub cardinality: usize,
-}
-
-#[derive(Debug, Clone)]
-pub struct CardinalityEstimation {
-    /// Conditions that could be used to make a primary point selection.
-    pub primary_clauses: Vec<PrimaryCondition>,
-    /// Minimal possible matched points in best case for a query
-    pub min: usize,
-    /// Expected number of matched points for a query, assuming even random distribution if stored data
-    pub exp: usize,
-    /// The largest possible number of matched points in a worst case for a query
-    pub max: usize,
-}
-
-impl CardinalityEstimation {
-    #[allow(dead_code)]
-    pub fn exact(count: usize) -> Self {
-        CardinalityEstimation {
-            primary_clauses: vec![],
-            min: count,
-            exp: count,
-            max: count,
-        }
-    }
-
-    /// Generate estimation for unknown filter
-    pub fn unknown(total: usize) -> Self {
-        CardinalityEstimation {
-            primary_clauses: vec![],
-            min: 0,
-            exp: total / 2,
-            max: total,
-        }
-    }
-
-    /// Push a primary clause to the estimation
-    pub fn with_primary_clause(mut self, clause: PrimaryCondition) -> Self {
-        self.primary_clauses.push(clause);
-        self
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/index/field_index/numeric_index.rs b/crates/qdrant/lib/segment/src/index/field_index/numeric_index.rs
deleted file mode 100644
index ea87d28..0000000
--- a/crates/qdrant/lib/segment/src/index/field_index/numeric_index.rs
+++ /dev/null
@@ -1,811 +0,0 @@
-use std::cmp::{max, min};
-use std::collections::BTreeMap;
-use std::ops::Bound;
-use std::ops::Bound::{Excluded, Included, Unbounded};
-use std::sync::Arc;
-
-use parking_lot::RwLock;
-use rocksdb::DB;
-use serde_json::Value;
-
-use crate::common::rocksdb_wrapper::DatabaseColumnWrapper;
-use crate::common::Flusher;
-use crate::entry::entry_point::{OperationError, OperationResult};
-use crate::index::field_index::histogram::{Histogram, Numericable, Point};
-use crate::index::field_index::stat_tools::estimate_multi_value_selection_cardinality;
-use crate::index::field_index::{
-    CardinalityEstimation, PayloadBlockCondition, PayloadFieldIndex, PrimaryCondition, ValueIndexer,
-};
-use crate::index::key_encoding::{
-    decode_f64_key_ascending, decode_i64_key_ascending, encode_f64_key_ascending,
-    encode_i64_key_ascending,
-};
-use crate::telemetry::PayloadIndexTelemetry;
-use crate::types::{
-    FieldCondition, FloatPayloadType, IntPayloadType, PayloadKeyType, PointOffsetType, Range,
-};
-
-const HISTOGRAM_MAX_BUCKET_SIZE: usize = 10_000;
-const HISTOGRAM_PRECISION: f64 = 0.01;
-
-pub trait Encodable: Copy {
-    fn encode_key(&self, id: PointOffsetType) -> Vec<u8>;
-    fn decode_key(key: &[u8]) -> (PointOffsetType, Self);
-}
-
-impl Encodable for IntPayloadType {
-    fn encode_key(&self, id: PointOffsetType) -> Vec<u8> {
-        encode_i64_key_ascending(*self, id)
-    }
-    fn decode_key(key: &[u8]) -> (PointOffsetType, Self) {
-        decode_i64_key_ascending(key)
-    }
-}
-
-impl Encodable for FloatPayloadType {
-    fn encode_key(&self, id: PointOffsetType) -> Vec<u8> {
-        encode_f64_key_ascending(*self, id)
-    }
-    fn decode_key(key: &[u8]) -> (PointOffsetType, Self) {
-        decode_f64_key_ascending(key)
-    }
-}
-
-pub struct NumericIndex<T: Encodable + Numericable> {
-    map: BTreeMap<Vec<u8>, u32>,
-    db_wrapper: DatabaseColumnWrapper,
-    histogram: Histogram<T>,
-    points_count: usize,
-    max_values_per_point: usize,
-    point_to_values: Vec<Vec<T>>,
-}
-
-impl<T: Encodable + Numericable> NumericIndex<T> {
-    pub fn new(db: Arc<RwLock<DB>>, field: &str) -> Self {
-        let store_cf_name = Self::storage_cf_name(field);
-        let db_wrapper = DatabaseColumnWrapper::new(db, &store_cf_name);
-        Self {
-            map: BTreeMap::new(),
-            db_wrapper,
-            histogram: Histogram::new(HISTOGRAM_MAX_BUCKET_SIZE, HISTOGRAM_PRECISION),
-            points_count: 0,
-            max_values_per_point: 1,
-            point_to_values: Default::default(),
-        }
-    }
-
-    fn storage_cf_name(field: &str) -> String {
-        format!("{field}_numeric")
-    }
-
-    pub fn recreate(&self) -> OperationResult<()> {
-        self.db_wrapper.recreate_column_family()
-    }
-
-    fn add_value(&mut self, id: PointOffsetType, value: T) -> OperationResult<()> {
-        let key = value.encode_key(id);
-        self.db_wrapper.put(&key, id.to_be_bytes())?;
-        Self::add_to_map(&mut self.map, &mut self.histogram, key, id);
-        Ok(())
-    }
-
-    pub fn add_many_to_list(
-        &mut self,
-        idx: PointOffsetType,
-        values: impl IntoIterator<Item = T>,
-    ) -> OperationResult<()> {
-        if self.point_to_values.len() <= idx as usize {
-            self.point_to_values.resize(idx as usize + 1, Vec::new())
-        }
-        let values: Vec<T> = values.into_iter().collect();
-        for value in &values {
-            self.add_value(idx, *value)?;
-        }
-        if !values.is_empty() {
-            self.points_count += 1;
-            self.max_values_per_point = self.max_values_per_point.max(values.len());
-        }
-        self.point_to_values[idx as usize] = values;
-        Ok(())
-    }
-
-    pub fn load(&mut self) -> OperationResult<bool> {
-        if !self.db_wrapper.has_column_family()? {
-            return Ok(false);
-        };
-
-        for (key, value) in self.db_wrapper.lock_db().iter()? {
-            let value_idx = u32::from_be_bytes(value.as_ref().try_into().unwrap());
-            let (idx, value) = T::decode_key(&key);
-
-            if idx != value_idx {
-                return Err(OperationError::service_error("incorrect key value"));
-            }
-
-            if self.point_to_values.len() <= idx as usize {
-                self.point_to_values.resize(idx as usize + 1, Vec::new())
-            }
-
-            self.point_to_values[idx as usize].push(value);
-
-            Self::add_to_map(&mut self.map, &mut self.histogram, key.to_vec(), idx);
-        }
-        for values in &self.point_to_values {
-            if !values.is_empty() {
-                self.points_count += 1;
-                self.max_values_per_point = self.max_values_per_point.max(values.len());
-            }
-        }
-        Ok(true)
-    }
-
-    pub fn flusher(&self) -> Flusher {
-        self.db_wrapper.flusher()
-    }
-
-    pub fn remove_point(&mut self, idx: PointOffsetType) -> OperationResult<()> {
-        if self.point_to_values.len() <= idx as usize {
-            return Ok(());
-        }
-
-        let removed_values = std::mem::take(&mut self.point_to_values[idx as usize]);
-
-        for value in &removed_values {
-            let key = value.encode_key(idx);
-            self.db_wrapper.remove(&key)?;
-            Self::remove_from_map(&mut self.map, &mut self.histogram, key);
-        }
-
-        if !removed_values.is_empty() {
-            self.points_count -= 1;
-        }
-
-        Ok(())
-    }
-
-    pub fn get_values(&self, idx: PointOffsetType) -> Option<&Vec<T>> {
-        self.point_to_values.get(idx as usize)
-    }
-
-    #[allow(clippy::manual_clamp)] // false positive
-    fn range_cardinality(&self, range: &Range) -> CardinalityEstimation {
-        let lbound = if let Some(lte) = range.lte {
-            Included(T::from_f64(lte))
-        } else if let Some(lt) = range.lt {
-            Excluded(T::from_f64(lt))
-        } else {
-            Unbounded
-        };
-
-        let gbound = if let Some(gte) = range.gte {
-            Included(T::from_f64(gte))
-        } else if let Some(gt) = range.gt {
-            Excluded(T::from_f64(gt))
-        } else {
-            Unbounded
-        };
-
-        let histogram_estimation = self.histogram.estimate(gbound, lbound);
-        let min_estimation = histogram_estimation.0;
-        let max_estimation = histogram_estimation.2;
-
-        let total_values = self.map.len();
-        // Example: points_count = 1000, total values = 2000, values_count = 500
-        // min = max(1, 500 - (2000 - 1000)) = 1
-        // exp = 500 / (2000 / 1000) = 250
-        // max = min(1000, 500) = 500
-
-        // Example: points_count = 1000, total values = 1200, values_count = 500
-        // min = max(1, 500 - (1200 - 1000)) = 300
-        // exp = 500 / (1200 / 1000) = 416
-        // max = min(1000, 500) = 500
-        let expected_min = max(
-            min_estimation / self.max_values_per_point,
-            max(
-                min(1, min_estimation),
-                min_estimation.saturating_sub(total_values - self.points_count),
-            ),
-        );
-        let expected_max = min(self.points_count, max_estimation);
-
-        let estimation = estimate_multi_value_selection_cardinality(
-            self.points_count,
-            total_values,
-            histogram_estimation.1,
-        )
-        .round() as usize;
-
-        CardinalityEstimation {
-            primary_clauses: vec![],
-            min: expected_min,
-            exp: min(expected_max, max(estimation, expected_min)),
-            max: expected_max,
-        }
-    }
-
-    fn add_to_map(
-        map: &mut BTreeMap<Vec<u8>, PointOffsetType>,
-        histogram: &mut Histogram<T>,
-        key: Vec<u8>,
-        id: PointOffsetType,
-    ) {
-        let existed_value = map.insert(key.clone(), id);
-        // Histogram works with unique values (idx + value) only, so we need to
-        // make sure that we don't add the same value twice.
-        // key is a combination of value + idx, so we can use it to ensure than the pair is unique
-        if existed_value.is_none() {
-            histogram.insert(
-                Self::key_to_histogram_point(&key),
-                |x| Self::get_histogram_left_neighbor(map, x),
-                |x| Self::get_histogram_right_neighbor(map, x),
-            );
-        }
-    }
-
-    pub fn remove_from_map(
-        map: &mut BTreeMap<Vec<u8>, PointOffsetType>,
-        histogram: &mut Histogram<T>,
-        key: Vec<u8>,
-    ) {
-        let existed_val = map.remove(&key);
-        if existed_val.is_some() {
-            histogram.remove(
-                &Self::key_to_histogram_point(&key),
-                |x| Self::get_histogram_left_neighbor(map, x),
-                |x| Self::get_histogram_right_neighbor(map, x),
-            );
-        }
-    }
-
-    fn key_to_histogram_point(key: &[u8]) -> Point<T> {
-        let (decoded_idx, decoded_val) = T::decode_key(key);
-        Point {
-            val: decoded_val,
-            idx: decoded_idx as usize,
-        }
-    }
-
-    fn get_histogram_left_neighbor(
-        map: &BTreeMap<Vec<u8>, PointOffsetType>,
-        point: &Point<T>,
-    ) -> Option<Point<T>> {
-        let key = point.val.encode_key(point.idx as PointOffsetType);
-        map.range((Unbounded, Excluded(key)))
-            .next_back()
-            .map(|(key, _)| Self::key_to_histogram_point(key))
-    }
-
-    fn get_histogram_right_neighbor(
-        map: &BTreeMap<Vec<u8>, PointOffsetType>,
-        point: &Point<T>,
-    ) -> Option<Point<T>> {
-        let key = point.val.encode_key(point.idx as PointOffsetType);
-        map.range((Excluded(key), Unbounded))
-            .next()
-            .map(|(key, _)| Self::key_to_histogram_point(key))
-    }
-
-    pub fn get_telemetry_data(&self) -> PayloadIndexTelemetry {
-        PayloadIndexTelemetry {
-            field_name: None,
-            points_count: self.points_count,
-            points_values_count: self.histogram.get_total_count(),
-            histogram_bucket_size: Some(self.histogram.current_bucket_size()),
-        }
-    }
-
-    pub fn values_count(&self, point_id: PointOffsetType) -> usize {
-        self.get_values(point_id).map(|x| x.len()).unwrap_or(0)
-    }
-
-    pub fn values_is_empty(&self, point_id: PointOffsetType) -> bool {
-        self.get_values(point_id)
-            .map(|x| x.is_empty())
-            .unwrap_or(true)
-    }
-}
-
-impl<T: Encodable + Numericable> PayloadFieldIndex for NumericIndex<T> {
-    fn count_indexed_points(&self) -> usize {
-        self.points_count
-    }
-
-    fn load(&mut self) -> OperationResult<bool> {
-        NumericIndex::load(self)
-    }
-
-    fn clear(self) -> OperationResult<()> {
-        self.db_wrapper.recreate_column_family()
-    }
-
-    fn flusher(&self) -> Flusher {
-        NumericIndex::flusher(self)
-    }
-
-    fn filter(
-        &self,
-        condition: &FieldCondition,
-    ) -> Option<Box<dyn Iterator<Item = PointOffsetType> + '_>> {
-        let cond_range = condition.range.as_ref()?;
-
-        let start_bound = match cond_range {
-            Range { gt: Some(gt), .. } => {
-                let v: T = T::from_f64(*gt);
-                Excluded(v.encode_key(PointOffsetType::MAX))
-            }
-            Range { gte: Some(gte), .. } => {
-                let v: T = T::from_f64(*gte);
-                Included(v.encode_key(PointOffsetType::MIN))
-            }
-            _ => Unbounded,
-        };
-
-        let end_bound = match cond_range {
-            Range { lt: Some(lt), .. } => {
-                let v: T = T::from_f64(*lt);
-                Excluded(v.encode_key(PointOffsetType::MIN))
-            }
-            Range { lte: Some(lte), .. } => {
-                let v: T = T::from_f64(*lte);
-                Included(v.encode_key(PointOffsetType::MAX))
-            }
-            _ => Unbounded,
-        };
-
-        // map.range
-        // Panics if range start > end. Panics if range start == end and both bounds are Excluded.
-        match (&start_bound, &end_bound) {
-            (Excluded(s), Excluded(e)) if s == e => {
-                // range start and end are equal and excluded in BTreeMap
-                return Some(Box::new(vec![].into_iter()));
-            }
-            (Included(s) | Excluded(s), Included(e) | Excluded(e)) if s > e => {
-                //range start is greater than range end
-                return Some(Box::new(vec![].into_iter()));
-            }
-            _ => {}
-        }
-
-        Some(Box::new(
-            self.map.range((start_bound, end_bound)).map(|(_, v)| *v),
-        ))
-    }
-
-    fn estimate_cardinality(&self, condition: &FieldCondition) -> Option<CardinalityEstimation> {
-        condition.range.as_ref().map(|range| {
-            let mut cardinality = self.range_cardinality(range);
-            cardinality
-                .primary_clauses
-                .push(PrimaryCondition::Condition(condition.clone()));
-            cardinality
-        })
-    }
-
-    fn payload_blocks(
-        &self,
-        threshold: usize,
-        key: PayloadKeyType,
-    ) -> Box<dyn Iterator<Item = PayloadBlockCondition> + '_> {
-        let mut lower_bound = Unbounded;
-        let mut pre_lower_bound: Option<Bound<T>> = None;
-        let mut payload_conditions = Vec::new();
-
-        let value_per_point = self.map.len() as f64 / self.points_count as f64;
-        let effective_threshold = (threshold as f64 * value_per_point) as usize;
-
-        loop {
-            let upper_bound = self
-                .histogram
-                .get_range_by_size(lower_bound, effective_threshold / 2);
-
-            if let Some(pre_lower_bound) = pre_lower_bound {
-                let range = Range {
-                    lt: match upper_bound {
-                        Excluded(val) => Some(val.to_f64()),
-                        _ => None,
-                    },
-                    gt: match pre_lower_bound {
-                        Excluded(val) => Some(val.to_f64()),
-                        _ => None,
-                    },
-                    gte: match pre_lower_bound {
-                        Included(val) => Some(val.to_f64()),
-                        _ => None,
-                    },
-                    lte: match upper_bound {
-                        Included(val) => Some(val.to_f64()),
-                        _ => None,
-                    },
-                };
-                let cardinality = self.range_cardinality(&range);
-                let condition = PayloadBlockCondition {
-                    condition: FieldCondition::new_range(key.clone(), range),
-                    cardinality: cardinality.exp,
-                };
-
-                payload_conditions.push(condition);
-            } else if upper_bound == Unbounded {
-                // One block covers all points
-                payload_conditions.push(PayloadBlockCondition {
-                    condition: FieldCondition::new_range(
-                        key.clone(),
-                        Range {
-                            gte: None,
-                            lte: None,
-                            lt: None,
-                            gt: None,
-                        },
-                    ),
-                    cardinality: self.points_count,
-                });
-            }
-
-            pre_lower_bound = Some(lower_bound);
-
-            lower_bound = match upper_bound {
-                Included(val) => Excluded(val),
-                Excluded(val) => Excluded(val),
-                Unbounded => break,
-            };
-        }
-        Box::new(payload_conditions.into_iter())
-    }
-}
-
-impl ValueIndexer<IntPayloadType> for NumericIndex<IntPayloadType> {
-    fn add_many(
-        &mut self,
-        id: PointOffsetType,
-        values: Vec<IntPayloadType>,
-    ) -> OperationResult<()> {
-        self.add_many_to_list(id, values)
-    }
-
-    fn get_value(&self, value: &Value) -> Option<IntPayloadType> {
-        if let Value::Number(num) = value {
-            return num.as_i64();
-        }
-        None
-    }
-
-    fn remove_point(&mut self, id: PointOffsetType) -> OperationResult<()> {
-        NumericIndex::remove_point(self, id)
-    }
-}
-
-impl ValueIndexer<FloatPayloadType> for NumericIndex<FloatPayloadType> {
-    fn add_many(
-        &mut self,
-        id: PointOffsetType,
-        values: Vec<FloatPayloadType>,
-    ) -> OperationResult<()> {
-        self.add_many_to_list(id, values)
-    }
-
-    fn get_value(&self, value: &Value) -> Option<FloatPayloadType> {
-        if let Value::Number(num) = value {
-            return num.as_f64();
-        }
-        None
-    }
-
-    fn remove_point(&mut self, id: PointOffsetType) -> OperationResult<()> {
-        NumericIndex::remove_point(self, id)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use itertools::Itertools;
-    use rand::prelude::StdRng;
-    use rand::{Rng, SeedableRng};
-    use tempfile::{Builder, TempDir};
-
-    use super::*;
-    use crate::common::rocksdb_wrapper::open_db_with_existing_cf;
-
-    const COLUMN_NAME: &str = "test";
-
-    fn get_index() -> (TempDir, NumericIndex<f64>) {
-        let temp_dir = Builder::new()
-            .prefix("test_numeric_index")
-            .tempdir()
-            .unwrap();
-        let db = open_db_with_existing_cf(temp_dir.path()).unwrap();
-        let index: NumericIndex<_> = NumericIndex::new(db, COLUMN_NAME);
-        index.recreate().unwrap();
-        (temp_dir, index)
-    }
-
-    fn random_index(num_points: usize, values_per_point: usize) -> (TempDir, NumericIndex<f64>) {
-        let mut rng = StdRng::seed_from_u64(42);
-        let (temp_dir, mut index) = get_index();
-
-        for i in 0..num_points {
-            let values = (0..values_per_point).map(|_| rng.gen_range(0.0..100.0));
-            index
-                .add_many_to_list(i as PointOffsetType, values)
-                .unwrap();
-        }
-
-        (temp_dir, index)
-    }
-
-    fn cardinality_request(index: &NumericIndex<f64>, query: Range) -> CardinalityEstimation {
-        let estimation = index.range_cardinality(&query);
-
-        let result = index
-            .filter(&FieldCondition::new_range("".to_string(), query))
-            .unwrap()
-            .unique()
-            .collect_vec();
-
-        eprintln!("estimation = {estimation:#?}");
-        eprintln!("result.len() = {:#?}", result.len());
-        assert!(estimation.min <= result.len());
-        assert!(estimation.max >= result.len());
-        estimation
-    }
-
-    #[test]
-    fn test_cardinality_exp() {
-        let (_temp_dir, index) = random_index(1000, 1);
-
-        cardinality_request(
-            &index,
-            Range {
-                lt: Some(20.0),
-                gt: None,
-                gte: Some(10.0),
-                lte: None,
-            },
-        );
-        cardinality_request(
-            &index,
-            Range {
-                lt: Some(60.0),
-                gt: None,
-                gte: Some(10.0),
-                lte: None,
-            },
-        );
-
-        let (_temp_dir, index) = random_index(1000, 2);
-        cardinality_request(
-            &index,
-            Range {
-                lt: Some(20.0),
-                gt: None,
-                gte: Some(10.0),
-                lte: None,
-            },
-        );
-        cardinality_request(
-            &index,
-            Range {
-                lt: Some(60.0),
-                gt: None,
-                gte: Some(10.0),
-                lte: None,
-            },
-        );
-
-        cardinality_request(
-            &index,
-            Range {
-                lt: None,
-                gt: None,
-                gte: Some(10.0),
-                lte: None,
-            },
-        );
-
-        cardinality_request(
-            &index,
-            Range {
-                lt: None,
-                gt: None,
-                gte: Some(110.0),
-                lte: None,
-            },
-        );
-    }
-
-    #[test]
-    fn test_payload_blocks() {
-        let (_temp_dir, index) = random_index(1000, 2);
-        let threshold = 100;
-        let blocks = index
-            .payload_blocks(threshold, "test".to_owned())
-            .collect_vec();
-        assert!(!blocks.is_empty());
-        eprintln!("threshold {threshold}, blocks.len() = {:#?}", blocks.len());
-
-        let threshold = 500;
-        let blocks = index
-            .payload_blocks(threshold, "test".to_owned())
-            .collect_vec();
-        assert!(!blocks.is_empty());
-        eprintln!("threshold {threshold}, blocks.len() = {:#?}", blocks.len());
-
-        let threshold = 1000;
-        let blocks = index
-            .payload_blocks(threshold, "test".to_owned())
-            .collect_vec();
-        assert!(!blocks.is_empty());
-        eprintln!("threshold {threshold}, blocks.len() = {:#?}", blocks.len());
-
-        let threshold = 10000;
-        let blocks = index
-            .payload_blocks(threshold, "test".to_owned())
-            .collect_vec();
-        assert!(!blocks.is_empty());
-        eprintln!("threshold {threshold}, blocks.len() = {:#?}", blocks.len());
-    }
-
-    #[test]
-    fn test_payload_blocks_small() {
-        let (_temp_dir, mut index) = get_index();
-        let threshold = 4;
-        let values = vec![
-            vec![1.0],
-            vec![1.0],
-            vec![1.0],
-            vec![1.0],
-            vec![1.0],
-            vec![2.0],
-            vec![2.0],
-            vec![2.0],
-            vec![2.0],
-        ];
-
-        values.into_iter().enumerate().for_each(|(idx, values)| {
-            index
-                .add_many_to_list(idx as PointOffsetType + 1, values)
-                .unwrap()
-        });
-
-        let blocks = index
-            .payload_blocks(threshold, "test".to_owned())
-            .collect_vec();
-        assert!(!blocks.is_empty());
-    }
-
-    #[test]
-    fn test_numeric_index_load_from_disk() {
-        let (_temp_dir, mut index) = get_index();
-
-        let values = vec![
-            vec![1.0],
-            vec![1.0],
-            vec![1.0],
-            vec![1.0],
-            vec![1.0],
-            vec![2.0],
-            vec![2.5],
-            vec![2.6],
-            vec![3.0],
-        ];
-
-        values.into_iter().enumerate().for_each(|(idx, values)| {
-            index
-                .add_many_to_list(idx as PointOffsetType + 1, values)
-                .unwrap()
-        });
-
-        index.flusher()().unwrap();
-
-        let db_ref = index.db_wrapper.database;
-        let mut new_index: NumericIndex<f64> = NumericIndex::new(db_ref, COLUMN_NAME);
-        new_index.load().unwrap();
-
-        test_cond(
-            &new_index,
-            Range {
-                gt: None,
-                gte: None,
-                lt: None,
-                lte: Some(2.6),
-            },
-            vec![1, 2, 3, 4, 5, 6, 7, 8],
-        );
-    }
-
-    #[test]
-    fn test_numeric_index() {
-        let (_temp_dir, mut index) = get_index();
-
-        let values = vec![
-            vec![1.0],
-            vec![1.0],
-            vec![1.0],
-            vec![1.0],
-            vec![1.0],
-            vec![2.0],
-            vec![2.5],
-            vec![2.6],
-            vec![3.0],
-        ];
-
-        values.into_iter().enumerate().for_each(|(idx, values)| {
-            index
-                .add_many_to_list(idx as PointOffsetType + 1, values)
-                .unwrap()
-        });
-
-        test_cond(
-            &index,
-            Range {
-                gt: Some(1.0),
-                gte: None,
-                lt: None,
-                lte: None,
-            },
-            vec![6, 7, 8, 9],
-        );
-
-        test_cond(
-            &index,
-            Range {
-                gt: None,
-                gte: Some(1.0),
-                lt: None,
-                lte: None,
-            },
-            vec![1, 2, 3, 4, 5, 6, 7, 8, 9],
-        );
-
-        test_cond(
-            &index,
-            Range {
-                gt: None,
-                gte: None,
-                lt: Some(2.6),
-                lte: None,
-            },
-            vec![1, 2, 3, 4, 5, 6, 7],
-        );
-
-        test_cond(
-            &index,
-            Range {
-                gt: None,
-                gte: None,
-                lt: None,
-                lte: Some(2.6),
-            },
-            vec![1, 2, 3, 4, 5, 6, 7, 8],
-        );
-
-        test_cond(
-            &index,
-            Range {
-                gt: None,
-                gte: Some(2.0),
-                lt: None,
-                lte: Some(2.6),
-            },
-            vec![6, 7, 8],
-        );
-    }
-
-    fn test_cond<T: Encodable + Numericable + PartialOrd + Clone>(
-        index: &NumericIndex<T>,
-        rng: Range,
-        result: Vec<u32>,
-    ) {
-        let condition = FieldCondition {
-            key: "".to_string(),
-            r#match: None,
-            range: Some(rng),
-            geo_bounding_box: None,
-            geo_radius: None,
-            values_count: None,
-            geo_polygon: None,
-        };
-
-        let offsets = index.filter(&condition).unwrap().collect_vec();
-
-        assert_eq!(offsets, result);
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/index/field_index/stat_tools.rs b/crates/qdrant/lib/segment/src/index/field_index/stat_tools.rs
deleted file mode 100644
index 2961ae3..0000000
--- a/crates/qdrant/lib/segment/src/index/field_index/stat_tools.rs
+++ /dev/null
@@ -1,173 +0,0 @@
-use std::f64::consts::{E, PI};
-
-/// This function estimates how many real points were selected with the filter.
-/// It is assumed that each real point has, on average, X values in correspondence. As a response
-/// to the execution of the query it is possible to establish only the number of matched associated
-/// values.
-///
-/// # Arguments
-///
-/// * `total_points` - total number of the unique points in the whole collection
-/// * `total_values` - total number of payload values in the collection
-/// * `selected_values_count` - amount of values selected during the query
-///
-/// # Result
-///
-/// Expected amount of unique points contained in selected values
-/// The result might overflow at some corner cases
-///   so it is better to limit its value with min and max
-///
-pub fn estimate_multi_value_selection_cardinality(
-    total_points: usize,
-    total_values: usize,
-    selected_values_count: usize,
-) -> f64 {
-    // Value >= 1.0
-    assert!(total_values >= total_points);
-    let values_per_point = total_values as f64 / total_points as f64;
-    // Probability to select each unique value
-    let prob_select = 1. - prob_not_select(total_values, values_per_point, selected_values_count);
-    prob_select * total_points as f64
-}
-
-/// Fast approximate computation of $ln(n!)$
-/// See: <https://en.wikipedia.org/wiki/Stirling%27s_approximation>
-fn approx_fact_log(n: f64) -> f64 {
-    if n < 1.0 {
-        return 1.0; // By definition
-    }
-    (2. * PI * n).sqrt().ln() + n * (n / E).ln()
-}
-
-/// Probability of each individual unique point to be selected with the query
-///
-/// Straight equation:
-///     $\prod_{i=0}^{N-1} \frac{total - avg - i}{total - i}$
-/// , where `N` - number of selected points
-///
-/// Proof:
-///
-/// $$
-/// \prod_{i=0}^{N-1} \frac{total - avg - i}{total - i}
-///     = \frac{\prod_{i=0}^{N-1} (total - avg - i)}{\prod_{i=0}^{N-1}(total - i)}
-///     = \frac{\prod_{i=1}^{N} (total - avg - i + 1)}{\prod_{i=1}^{N}(total - i + 1)}\\
-///     = \frac{\prod_{i=1}^{N} (total - avg - (N - i + 1) + 1)}{\prod_{i=1}^{N}(total - (N - i + 1) + 1)}
-///     = \frac{\prod_{i=1}^{N} (i + total - avg - N)}{\prod_{i=1}^{N}(i + total - N)}\\
-///     = \frac{\prod_{i=1}^{total - avg} i}{\prod_{i=1}^{total - avg - N} i} \frac{\prod_{i=1}^{total - N} i}{\prod_{i=1}^{total} i}
-///     = \frac{(total - avg)!(total - N)!}{(total - avg - N)!(total)!}
-///     = \exp(\ln{\frac{(total - avg)!(total - N)!}{(total - avg - N)!(total)!}})\\
-///     = \exp(\ln((total - avg)!(total - N)!) - \ln((total - avg - N)!(total)!))
-///     = \exp( \ln((total - avg)!) + \ln((total - N)!) - \ln((total - avg - N)!) - \ln(total!))
-/// $$
-///
-/// Hint: use <https://latex.codecogs.com/eqneditor/editor.php> to render formula
-fn prob_not_select(total: usize, avg: f64, selected: usize) -> f64 {
-    let total = total as f64;
-    let selected = selected as f64;
-    (approx_fact_log(total - avg) + approx_fact_log(total - selected)
-        - approx_fact_log(total - avg - selected)
-        - approx_fact_log(total))
-    .exp()
-}
-
-/// Calculate number of selected points, based on the amount of matched values.
-/// Assuming that values are randomly distributed among points and each point can have multiple values.
-/// Math is based on: <https://en.wikipedia.org/wiki/Bloom_filter#Probability_of_false_positives>
-pub fn number_of_selected_points(points: usize, values: usize) -> usize {
-    let prob_of_selection = 1. - (-(values as f64 / points as f64)).exp();
-    (prob_of_selection * points as f64).round() as usize
-}
-
-#[cfg(test)]
-mod tests {
-    use std::collections::HashSet;
-
-    use rand::prelude::StdRng;
-    use rand::seq::SliceRandom;
-    use rand::SeedableRng;
-
-    use super::*;
-
-    #[test]
-    fn test_selected_points_est() {
-        let res = number_of_selected_points(100, 1000);
-        assert!(res > 95);
-        assert!(res <= 100);
-
-        let res = number_of_selected_points(1000, 10);
-        assert!(res > 5);
-        assert!(res <= 10);
-    }
-
-    fn simulate(uniq: usize, avg: usize, selected: usize) -> usize {
-        let mut data: Vec<_> = vec![];
-        for i in 0..uniq {
-            for _ in 0..avg {
-                data.push(i);
-            }
-        }
-        data.shuffle(&mut StdRng::seed_from_u64(42));
-
-        let mut unique_selected: HashSet<_> = Default::default();
-        for x in data.into_iter().take(selected) {
-            unique_selected.insert(x);
-        }
-
-        unique_selected.len()
-    }
-
-    #[test]
-    fn approx_factorial() {
-        let approx = approx_fact_log(10.).exp();
-        let real = (2 * 3 * 4 * 5 * 6 * 7 * 8 * 9 * 10) as f64;
-        let error = (approx / real - 1.0).abs();
-        assert!(error < 0.01);
-    }
-
-    #[test]
-    fn test_estimation_corner_cases() {
-        let count = estimate_multi_value_selection_cardinality(10, 20, 20);
-        assert!(!count.is_nan());
-        eprintln!("count = {count:#?}");
-        let count = estimate_multi_value_selection_cardinality(100, 100, 100);
-        assert!(!count.is_nan());
-        eprintln!("count = {count:#?}");
-        let count = estimate_multi_value_selection_cardinality(100, 100, 50);
-        assert!(!count.is_nan());
-        eprintln!("count = {count:#?}");
-        let count = estimate_multi_value_selection_cardinality(10, 10, 10);
-        assert!(!count.is_nan());
-        eprintln!("count = {count:#?}");
-        let count = estimate_multi_value_selection_cardinality(1, 1, 1);
-        assert!(!count.is_nan());
-        eprintln!("count = {count:#?}");
-        let count = estimate_multi_value_selection_cardinality(1, 1, 0);
-        assert!(!count.is_nan());
-        eprintln!("count = {count:#?}");
-    }
-
-    #[test]
-    fn test_estimation_1() {
-        let total = 2000;
-        let unique = 1000;
-        let selected = 50;
-
-        let estimation = estimate_multi_value_selection_cardinality(unique, total, selected);
-        let experiment = simulate(unique, total / unique, selected);
-
-        let error = (estimation / experiment as f64 - 1.0).abs();
-        assert!(error < 0.05);
-    }
-
-    #[test]
-    fn test_estimation_2() {
-        let total = 2000;
-        let unique = 1000;
-        let selected = 300;
-
-        let estimation = estimate_multi_value_selection_cardinality(unique, total, selected);
-        let experiment = simulate(unique, total / unique, selected);
-        let error = (estimation / experiment as f64 - 1.0).abs();
-        assert!(error < 0.05);
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/index/field_index/tests/histogram_i64_tests.rs b/crates/qdrant/lib/segment/src/index/field_index/tests/histogram_i64_tests.rs
deleted file mode 100644
index 35f9a5e..0000000
--- a/crates/qdrant/lib/segment/src/index/field_index/tests/histogram_i64_tests.rs
+++ /dev/null
@@ -1,202 +0,0 @@
-use std::collections::BTreeSet;
-use std::collections::Bound::Included;
-
-use rand::prelude::SliceRandom;
-
-use crate::index::field_index::histogram::{Histogram, Point};
-use crate::index::field_index::tests::histogram_test_utils::print_results;
-use crate::index::field_index::tests::histogram_tests::{build_histogram, count_range};
-
-pub fn histogram_fixture_values() -> Vec<i64> {
-    vec![
-        818038026092414779,
-        817430997309065005,
-        814525614605207302,
-        814525614605207302,
-        814525614605207302,
-        814525614605207302,
-        814525614605207302,
-        814525614605207302,
-        814525614605207302,
-        814525614605207302,
-        814525614605207302,
-        814525614605207302,
-        814525614605207302,
-        814525614605207302,
-        814525614605207302,
-        813881787313817334,
-        813881787313817334,
-        813881787313817334,
-        813881787313817334,
-        813881787313817334,
-        797077632540739163,
-        797077632540739163,
-        797077632540739163,
-        797077632540739163,
-        797077632540739163,
-        797077632540739163,
-        797077632540739163,
-        796753381031937625,
-        796753381031937625,
-        796753381031937625,
-        796753381031937625,
-        796753381031937625,
-        796753381031937625,
-        794845070900594257,
-        794845070900594257,
-        794845070900594257,
-        793390195280971343,
-        793390195280971343,
-        793390195280971343,
-        793390195280971343,
-        793390195280971343,
-        793390195280971343,
-        793390195280971343,
-        793390195280971343,
-        793390195280971343,
-        793390195280971343,
-        793390195280971343,
-        793390195280971343,
-        793353484098340430,
-        793353484098340430,
-        793353484098340430,
-        793353484098340430,
-        793353484098340430,
-        793353484098340430,
-        793353484098340430,
-        793353484098340430,
-        793353484098340430,
-        793353484098340430,
-        793353484098340430,
-        793115156044318285,
-        793115156044318285,
-        793115156044318285,
-        793115156044318285,
-        793115156044318285,
-        793115156044318285,
-        793115156044318285,
-        792916109618579020,
-        792916109618579020,
-        792916109618579020,
-        789197549817824843,
-        789197549817824843,
-        789197549817824843,
-        789197549817824843,
-        789197549817824843,
-        789197549817824843,
-        787850537872655946,
-        787850537872655946,
-        787850537872655946,
-        787850537872655946,
-        787850537872655946,
-        787850537872655946,
-        787850537872655946,
-        787850537872655946,
-        787850537872655946,
-        787850537872655946,
-        787850537872655946,
-        787850537872655946,
-        787850537872655946,
-        787850537872655946,
-        787850537872655946,
-        787850537872655946,
-        787850537872655946,
-        787649226061383241,
-        787647249260742216,
-        784221654430516807,
-        784221654430516807,
-        784221654430516807,
-        784221654430516807,
-        784221654430516807,
-        782529989596677701,
-    ]
-}
-
-#[test]
-fn test_fixture_ok() {
-    for x in histogram_fixture_values() {
-        assert!(x > 0);
-        println!("{} {}", x, x as f64);
-    }
-}
-
-#[test]
-fn test_histogram() {
-    let max_bucket_size = 1000;
-    let precision = 0.01;
-
-    // let points = (0..100000).map(|i| Point { val: rnd.gen_range(-10.0..10.0), idx: i }).collect_vec();
-    let mut points: Vec<_> = histogram_fixture_values();
-    points.shuffle(&mut rand::thread_rng());
-    let points: Vec<_> = points
-        .into_iter()
-        .enumerate()
-        .map(|(idx, val)| Point { val, idx })
-        .collect();
-
-    let (histogram, points_index) = build_histogram(max_bucket_size, precision, points);
-
-    print_results(&points_index, &histogram, None);
-}
-
-pub fn request_histogram_i64(histogram: &Histogram<i64>, points_index: &BTreeSet<Point<i64>>) {
-    let (est_min, estimation, est_max) = histogram.estimate(Included(0), Included(0));
-    let real = count_range(points_index, 0, 0);
-
-    eprintln!(
-        "{real} / ({est_min}, {estimation}, {est_max}) = {}",
-        estimation as f64 / real as f64,
-    );
-    assert!(real.abs_diff(estimation) < 2 * histogram.current_bucket_size());
-
-    let (est_min, estimation, est_max) = histogram.estimate(Included(0), Included(100));
-    let real = count_range(points_index, 0, 100);
-
-    eprintln!(
-        "{real} / ({est_min}, {estimation}, {est_max}) = {}",
-        estimation as f64 / real as f64,
-    );
-    assert!(real.abs_diff(estimation) < 2 * histogram.current_bucket_size());
-
-    let (est_min, estimation, est_max) = histogram.estimate(Included(-100), Included(100));
-    let real = count_range(points_index, -100, 100);
-
-    eprintln!(
-        "{real} / ({est_min}, {estimation}, {est_max}) = {}",
-        estimation as f64 / real as f64,
-    );
-    assert!(real.abs_diff(estimation) < 2 * histogram.current_bucket_size());
-
-    for _ in 0..100 {
-        let from = rand::random::<i64>();
-        let to = from.saturating_add(rand::random::<i64>());
-
-        let (est_min, estimation, est_max) = histogram.estimate(Included(from), Included(to));
-        let real = count_range(points_index, from, to);
-
-        eprintln!(
-            "{real} / ({est_min}, {estimation}, {est_max}) = {}",
-            estimation as f64 / real as f64,
-        );
-        assert!(real.abs_diff(estimation) < 2 * histogram.current_bucket_size());
-    }
-}
-
-#[test]
-fn test_build_i64_histogram() {
-    let max_bucket_size = 1000;
-    let precision = 0.01;
-    let num_samples = 100_000;
-
-    // let points = (0..100000).map(|i| Point { val: rnd.gen_range(-10.0..10.0), idx: i }).collect_vec();
-    let points: Vec<_> = (0..num_samples)
-        .map(|i| Point {
-            val: rand::random::<i64>(),
-            idx: i,
-        })
-        .collect();
-
-    let (histogram, points_index) = build_histogram(max_bucket_size, precision, points);
-    request_histogram_i64(&histogram, &points_index);
-    // test_range_by_cardinality(&histogram);
-}
diff --git a/crates/qdrant/lib/segment/src/index/field_index/tests/histogram_test_utils.rs b/crates/qdrant/lib/segment/src/index/field_index/tests/histogram_test_utils.rs
deleted file mode 100644
index 84d5b51..0000000
--- a/crates/qdrant/lib/segment/src/index/field_index/tests/histogram_test_utils.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-use std::collections::BTreeSet;
-use std::fmt::Display;
-use std::io;
-use std::io::Write;
-
-use crate::index::field_index::histogram::{Histogram, Numericable, Point};
-
-#[allow(dead_code)]
-pub fn print_results<T: Numericable + Display>(
-    points_index: &BTreeSet<Point<T>>,
-    histogram: &Histogram<T>,
-    pnt: Option<Point<T>>,
-) {
-    for point in points_index.iter() {
-        if let Some(border_count) = histogram.borders().get(point) {
-            if pnt.is_some() && pnt.as_ref().unwrap().idx == point.idx {
-                eprint!(" {}x{} ", border_count.left, border_count.right);
-            } else {
-                eprint!(" {}|{} ", border_count.left, border_count.right);
-            }
-        } else if pnt.is_some() && pnt.as_ref().unwrap().idx == point.idx {
-            eprint!("x");
-        } else {
-            eprint!(".");
-        }
-    }
-    eprintln!("[{}]", histogram.total_count());
-    io::stdout().flush().unwrap();
-}
diff --git a/crates/qdrant/lib/segment/src/index/field_index/tests/histogram_tests.rs b/crates/qdrant/lib/segment/src/index/field_index/tests/histogram_tests.rs
deleted file mode 100644
index 444c9ee..0000000
--- a/crates/qdrant/lib/segment/src/index/field_index/tests/histogram_tests.rs
+++ /dev/null
@@ -1,254 +0,0 @@
-use std::cell::Cell;
-use std::collections::BTreeSet;
-use std::collections::Bound::{Excluded, Included, Unbounded};
-
-use itertools::Itertools;
-use rand::prelude::StdRng;
-use rand::{Rng, SeedableRng};
-use rand_distr::StandardNormal;
-
-use crate::index::field_index::histogram::{Histogram, Numericable, Point};
-use crate::index::field_index::tests::histogram_test_utils::print_results;
-
-pub fn count_range<T: PartialOrd>(points_index: &BTreeSet<Point<T>>, a: T, b: T) -> usize {
-    points_index
-        .iter()
-        .filter(|x| a <= x.val && x.val <= b)
-        .count()
-}
-
-#[test]
-fn test_build_histogram_small() {
-    let max_bucket_size = 10;
-    let precision = 0.01;
-    let num_samples = 1000;
-    let mut rnd = StdRng::seed_from_u64(42);
-
-    // let points = (0..100000).map(|i| Point { val: rnd.gen_range(-10.0..10.0), idx: i }).collect_vec();
-    let points = (0..num_samples)
-        .map(|i| Point {
-            val: f64::round(rnd.sample::<f64, _>(StandardNormal) * 10.0),
-            idx: i % num_samples / 2,
-        })
-        .collect_vec();
-
-    let mut points_index: BTreeSet<Point<_>> = Default::default();
-
-    let mut histogram = Histogram::new(max_bucket_size, precision);
-
-    for point in &points {
-        points_index.insert(point.clone());
-        // print_results(&points_index, &histogram, Some(point.clone()));
-        histogram.insert(
-            point.clone(),
-            |x| {
-                points_index
-                    .range((Unbounded, Excluded(x)))
-                    .next_back()
-                    .cloned()
-            },
-            |x| points_index.range((Excluded(x), Unbounded)).next().cloned(),
-        );
-    }
-
-    for point in &points {
-        print_results(&points_index, &histogram, Some(point.clone()));
-        points_index.remove(point);
-        histogram.remove(
-            point,
-            |x| {
-                points_index
-                    .range((Unbounded, Excluded(x)))
-                    .next_back()
-                    .cloned()
-            },
-            |x| points_index.range((Excluded(x), Unbounded)).next().cloned(),
-        );
-    }
-}
-
-pub fn test_range_by_cardinality(histogram: &Histogram<f64>) {
-    let from = Unbounded;
-    let range_size = 100;
-    let to = histogram.get_range_by_size(from, range_size);
-    let estimation = histogram.estimate(from, to);
-    eprintln!("({from:?} - {to:?}) -> {estimation:?} / {range_size}");
-    assert!(
-        (estimation.1 as i64 - range_size as i64).abs()
-            < 2 * histogram.current_bucket_size() as i64
-    );
-
-    let from = Unbounded;
-    let range_size = 1000;
-    let to = histogram.get_range_by_size(from, range_size);
-    let estimation = histogram.estimate(from, to);
-    eprintln!("({from:?} - {to:?}) -> {estimation:?} / {range_size}");
-    assert!(
-        (estimation.1 as i64 - range_size as i64).abs()
-            < 2 * histogram.current_bucket_size() as i64
-    );
-
-    let from = Excluded(0.1);
-    let range_size = 100;
-    let to = histogram.get_range_by_size(from, range_size);
-    let estimation = histogram.estimate(from, to);
-    eprintln!("({from:?} - {to:?}) -> {estimation:?} / {range_size}");
-    assert!(
-        (estimation.1 as i64 - range_size as i64).abs()
-            < 2 * histogram.current_bucket_size() as i64
-    );
-
-    let from = Excluded(0.1);
-    let range_size = 1000;
-    let to = histogram.get_range_by_size(from, range_size);
-    let estimation = histogram.estimate(from, to);
-    eprintln!("({from:?} - {to:?}) -> {estimation:?} / {range_size}");
-    assert!(
-        (estimation.1 as i64 - range_size as i64).abs()
-            < 2 * histogram.current_bucket_size() as i64
-    );
-
-    let from = Excluded(0.1);
-    let range_size = 100_000;
-    let to = histogram.get_range_by_size(from, range_size);
-    let estimation = histogram.estimate(from, to);
-    eprintln!("({from:?} - {to:?}) -> {estimation:?} / {range_size}");
-    assert!(matches!(to, Unbounded));
-}
-
-pub fn request_histogram(histogram: &Histogram<f64>, points_index: &BTreeSet<Point<f64>>) {
-    let (est_min, estimation, est_max) = histogram.estimate(Included(0.0), Included(0.0));
-    let real = count_range(points_index, 0., 0.);
-
-    eprintln!(
-        "{real} / ({est_min}, {estimation}, {est_max}) = {}",
-        estimation as f64 / real as f64,
-    );
-    assert!(real.abs_diff(estimation) < 2 * histogram.current_bucket_size());
-
-    let (est_min, estimation, est_max) = histogram.estimate(Included(0.0), Included(0.0001));
-    let real = count_range(points_index, 0., 0.0001);
-
-    eprintln!(
-        "{real} / ({est_min}, {estimation}, {est_max}) = {}",
-        estimation as f64 / real as f64,
-    );
-    assert!(real.abs_diff(estimation) < 2 * histogram.current_bucket_size());
-
-    let (est_min, estimation, est_max) = histogram.estimate(Included(0.0), Included(0.01));
-    let real = count_range(points_index, 0., 0.01);
-
-    eprintln!(
-        "{real} / ({est_min}, {estimation}, {est_max}) = {}",
-        estimation as f64 / real as f64,
-    );
-    assert!(real.abs_diff(estimation) < 2 * histogram.current_bucket_size());
-
-    let (est_min, estimation, est_max) = histogram.estimate(Included(0.), Included(1.));
-    let real = count_range(points_index, 0., 1.);
-
-    eprintln!(
-        "{real} / ({est_min}, {estimation}, {est_max}) = {}",
-        estimation as f64 / real as f64,
-    );
-    assert!(real.abs_diff(estimation) < 2 * histogram.current_bucket_size());
-
-    let (est_min, estimation, est_max) = histogram.estimate(Included(0.), Included(100.));
-    let real = count_range(points_index, 0., 100.);
-
-    eprintln!(
-        "{real} / ({est_min}, {estimation}, {est_max}) = {}",
-        estimation as f64 / real as f64,
-    );
-    assert!(real.abs_diff(estimation) < 2 * histogram.current_bucket_size());
-
-    let (est_min, estimation, est_max) = histogram.estimate(Included(-100.), Included(100.));
-    let real = count_range(points_index, -100., 100.);
-
-    eprintln!(
-        "{real} / ({est_min}, {estimation}, {est_max}) = {}",
-        estimation as f64 / real as f64,
-    );
-    assert!(real.abs_diff(estimation) < 2 * histogram.current_bucket_size());
-
-    let (est_min, estimation, est_max) = histogram.estimate(Included(20.), Included(100.));
-    let real = count_range(points_index, 20., 100.);
-
-    eprintln!(
-        "{real} / ({est_min}, {estimation}, {est_max}) = {}",
-        estimation as f64 / real as f64,
-    );
-    assert!(real.abs_diff(estimation) < 2 * histogram.current_bucket_size());
-}
-
-pub fn build_histogram<T: Numericable + PartialEq + PartialOrd + Copy + std::fmt::Debug>(
-    max_bucket_size: usize,
-    precision: f64,
-    points: Vec<Point<T>>,
-) -> (Histogram<T>, BTreeSet<Point<T>>) {
-    let mut points_index: BTreeSet<Point<T>> = Default::default();
-    let mut histogram = Histogram::new(max_bucket_size, precision);
-
-    let read_counter = Cell::new(0);
-    for point in points {
-        points_index.insert(point.clone());
-        // print_results(&points_index, &histogram, Some(point.clone()));
-        histogram.insert(
-            point,
-            |x| {
-                read_counter.set(read_counter.get() + 1);
-                points_index
-                    .range((Unbounded, Excluded(x)))
-                    .next_back()
-                    .cloned()
-            },
-            |x| {
-                read_counter.set(read_counter.get() + 1);
-                points_index.range((Excluded(x), Unbounded)).next().cloned()
-            },
-        );
-    }
-    eprintln!("read_counter.get() = {:#?}", read_counter.get());
-    eprintln!("histogram.borders.len() = {:#?}", histogram.borders().len());
-    for border in histogram.borders().iter().take(5) {
-        eprintln!("border = {border:?}");
-    }
-    (histogram, points_index)
-}
-
-#[test]
-fn test_build_histogram_round() {
-    let max_bucket_size = 100;
-    let precision = 0.01;
-    let num_samples = 100_000;
-    let mut rnd = StdRng::seed_from_u64(42);
-
-    // let points = (0..100000).map(|i| Point { val: rnd.gen_range(-10.0..10.0), idx: i }).collect_vec();
-    let points = (0..num_samples).map(|i| Point {
-        val: f64::round(rnd.sample::<f64, _>(StandardNormal) * 100.0),
-        idx: i,
-    });
-    let (histogram, points_index) = build_histogram(max_bucket_size, precision, points.collect());
-
-    request_histogram(&histogram, &points_index);
-}
-
-#[test]
-fn test_build_histogram() {
-    let max_bucket_size = 1000;
-    let precision = 0.01;
-    let num_samples = 100_000;
-    let mut rnd = StdRng::seed_from_u64(42);
-
-    // let points = (0..100000).map(|i| Point { val: rnd.gen_range(-10.0..10.0), idx: i }).collect_vec();
-    let points = (0..num_samples)
-        .map(|i| Point {
-            val: rnd.sample(StandardNormal),
-            idx: i,
-        })
-        .collect_vec();
-
-    let (histogram, points_index) = build_histogram(max_bucket_size, precision, points);
-    request_histogram(&histogram, &points_index);
-    test_range_by_cardinality(&histogram);
-}
diff --git a/crates/qdrant/lib/segment/src/index/field_index/tests/mod.rs b/crates/qdrant/lib/segment/src/index/field_index/tests/mod.rs
deleted file mode 100644
index e7a1f02..0000000
--- a/crates/qdrant/lib/segment/src/index/field_index/tests/mod.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-mod histogram_i64_tests;
-mod histogram_test_utils;
-mod histogram_tests;
diff --git a/crates/qdrant/lib/segment/src/index/hnsw_index/build_cache.rs b/crates/qdrant/lib/segment/src/index/hnsw_index/build_cache.rs
deleted file mode 100644
index 03db7d4..0000000
--- a/crates/qdrant/lib/segment/src/index/hnsw_index/build_cache.rs
+++ /dev/null
@@ -1,110 +0,0 @@
-use std::cmp::{max, min};
-use std::hash::{Hash, Hasher};
-
-use seahash::SeaHasher;
-
-use crate::types::{PointOffsetType, ScoreType};
-
-#[derive(Hash, Eq, PartialEq, Clone, Debug)]
-struct PointPair {
-    a: PointOffsetType,
-    b: PointOffsetType,
-}
-
-impl PointPair {
-    pub fn new(a: PointOffsetType, b: PointOffsetType) -> Self {
-        PointPair {
-            a: min(a, b),
-            b: max(a, b),
-        }
-    }
-}
-
-#[derive(Clone, Debug)]
-struct CacheObj {
-    points: PointPair,
-    value: ScoreType,
-}
-
-#[derive(Debug)]
-pub struct DistanceCache {
-    cache: Vec<Option<CacheObj>>,
-    pub hits: usize,
-    pub misses: usize,
-}
-
-#[allow(dead_code)]
-impl DistanceCache {
-    fn hasher() -> impl Hasher {
-        SeaHasher::new()
-    }
-
-    pub fn new(size: usize) -> Self {
-        let mut cache = Vec::with_capacity(size);
-        cache.resize(size, None);
-        DistanceCache {
-            cache,
-            hits: 0,
-            misses: 0,
-        }
-    }
-
-    pub fn get(&self, point_a: PointOffsetType, point_b: PointOffsetType) -> Option<ScoreType> {
-        let points = PointPair::new(point_a, point_b);
-        let mut s = DistanceCache::hasher();
-        points.hash(&mut s);
-        let idx = s.finish() as usize % self.cache.len();
-
-        self.cache[idx].as_ref().and_then(|x| {
-            if x.points == points {
-                Some(x.value)
-            } else {
-                None
-            }
-        })
-    }
-
-    pub fn put(&mut self, point_a: PointOffsetType, point_b: PointOffsetType, value: ScoreType) {
-        let points = PointPair::new(point_a, point_b);
-        let mut s = DistanceCache::hasher();
-        points.hash(&mut s);
-        let idx = s.finish() as usize % self.cache.len();
-        self.cache[idx] = Some(CacheObj { points, value });
-    }
-}
-
-impl Default for DistanceCache {
-    fn default() -> Self {
-        DistanceCache::new(0)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_cache() {
-        let mut cache = DistanceCache::new(1000);
-
-        cache.put(100, 10, 0.8);
-        cache.put(10, 101, 0.7);
-        cache.put(10, 110, 0.1);
-
-        assert_eq!(cache.get(12, 99), None);
-        assert_eq!(cache.get(10, 100), Some(0.8));
-        assert_eq!(cache.get(10, 101), Some(0.7));
-    }
-
-    #[test]
-    fn test_collision() {
-        let mut cache = DistanceCache::new(1);
-
-        cache.put(1, 2, 0.8);
-        cache.put(3, 4, 0.7);
-
-        assert_eq!(cache.get(1, 2), None);
-        assert_eq!(cache.get(2, 1), None);
-        assert_eq!(cache.get(4, 3), Some(0.7));
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/index/hnsw_index/build_condition_checker.rs b/crates/qdrant/lib/segment/src/index/hnsw_index/build_condition_checker.rs
deleted file mode 100644
index 3f3322d..0000000
--- a/crates/qdrant/lib/segment/src/index/hnsw_index/build_condition_checker.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-use crate::index::visited_pool::VisitedList;
-use crate::payload_storage::FilterContext;
-use crate::types::PointOffsetType;
-
-pub struct BuildConditionChecker<'a> {
-    pub filter_list: &'a VisitedList,
-    pub current_point: PointOffsetType,
-}
-
-impl<'a> FilterContext for BuildConditionChecker<'a> {
-    fn check(&self, point_id: PointOffsetType) -> bool {
-        if point_id == self.current_point {
-            return false; // Do not match current point while inserting it (second time)
-        }
-        self.filter_list.check(point_id)
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/index/hnsw_index/config.rs b/crates/qdrant/lib/segment/src/index/hnsw_index/config.rs
deleted file mode 100644
index 6f582d2..0000000
--- a/crates/qdrant/lib/segment/src/index/hnsw_index/config.rs
+++ /dev/null
@@ -1,67 +0,0 @@
-use std::path::{Path, PathBuf};
-
-use serde::{Deserialize, Serialize};
-
-use crate::common::file_operations::{atomic_save_json, read_json};
-use crate::entry::entry_point::OperationResult;
-
-pub const HNSW_INDEX_CONFIG_FILE: &str = "hnsw_config.json";
-
-#[derive(Debug, Deserialize, Serialize, Copy, Clone, PartialEq, Eq)]
-pub struct HnswGraphConfig {
-    pub m: usize,
-    /// Requested M
-    pub m0: usize,
-    /// Actual M on level 0
-    pub ef_construct: usize,
-    /// Number of neighbours to search on construction
-    pub ef: usize,
-    /// We prefer a full scan search upto (excluding) this number of vectors.
-    ///
-    /// Note: this is number of vectors, not KiloBytes.
-    #[serde(alias = "indexing_threshold")]
-    pub full_scan_threshold: usize,
-    #[serde(default)]
-    pub max_indexing_threads: usize,
-    #[serde(default)]
-    pub payload_m: Option<usize>,
-    #[serde(default)]
-    pub payload_m0: Option<usize>,
-    #[serde(default)]
-    pub indexed_vector_count: Option<usize>,
-}
-
-impl HnswGraphConfig {
-    pub fn new(
-        m: usize,
-        ef_construct: usize,
-        full_scan_threshold: usize,
-        max_indexing_threads: usize,
-        payload_m: Option<usize>,
-        indexed_vector_count: usize,
-    ) -> Self {
-        HnswGraphConfig {
-            m,
-            m0: m * 2,
-            ef_construct,
-            ef: ef_construct,
-            full_scan_threshold,
-            max_indexing_threads,
-            payload_m,
-            payload_m0: payload_m.map(|v| v * 2),
-            indexed_vector_count: Some(indexed_vector_count),
-        }
-    }
-
-    pub fn get_config_path(path: &Path) -> PathBuf {
-        path.join(HNSW_INDEX_CONFIG_FILE)
-    }
-
-    pub fn load(path: &Path) -> OperationResult<Self> {
-        Ok(read_json(path)?)
-    }
-
-    pub fn save(&self, path: &Path) -> OperationResult<()> {
-        Ok(atomic_save_json(path, self)?)
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/index/hnsw_index/entry_points.rs b/crates/qdrant/lib/segment/src/index/hnsw_index/entry_points.rs
deleted file mode 100644
index 224ddac..0000000
--- a/crates/qdrant/lib/segment/src/index/hnsw_index/entry_points.rs
+++ /dev/null
@@ -1,146 +0,0 @@
-use std::cmp::Ordering;
-
-use common::fixed_length_priority_queue::FixedLengthPriorityQueue;
-use serde::{Deserialize, Serialize};
-
-use crate::types::PointOffsetType;
-
-#[derive(Deserialize, Serialize, Clone, Debug, PartialEq)]
-pub struct EntryPoint {
-    pub point_id: PointOffsetType,
-    pub level: usize,
-}
-
-impl Eq for EntryPoint {}
-
-impl PartialOrd for EntryPoint {
-    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-impl Ord for EntryPoint {
-    fn cmp(&self, other: &Self) -> Ordering {
-        self.level.cmp(&other.level)
-    }
-}
-
-#[derive(Deserialize, Serialize, Clone, Debug)]
-pub struct EntryPoints {
-    entry_points: Vec<EntryPoint>,
-    extra_entry_points: FixedLengthPriorityQueue<EntryPoint>,
-}
-
-impl EntryPoints {
-    pub fn new(extra_entry_points: usize) -> Self {
-        EntryPoints {
-            entry_points: vec![],
-            extra_entry_points: FixedLengthPriorityQueue::new(extra_entry_points),
-        }
-    }
-
-    pub fn merge_from_other(&mut self, mut other: EntryPoints) {
-        self.entry_points.append(&mut other.entry_points);
-        // Do not merge `extra_entry_points` to prevent duplications
-    }
-
-    pub fn new_point<F>(
-        &mut self,
-        new_point: PointOffsetType,
-        level: usize,
-        checker: F,
-    ) -> Option<EntryPoint>
-    where
-        F: Fn(PointOffsetType) -> bool,
-    {
-        // there are 3 cases:
-        // - There is proper entry point for a new point higher or same level - return the point
-        // - The new point is higher than any alternative - return the next best thing
-        // - There is no point and alternatives - return None
-
-        for i in 0..self.entry_points.len() {
-            let candidate = &self.entry_points[i];
-
-            if !checker(candidate.point_id) {
-                continue; // Checkpoint does not fulfil filtering conditions. Hence, does not "exists"
-            }
-            // Found checkpoint candidate
-            return if candidate.level >= level {
-                // The good checkpoint exists.
-                // Return it, and also try to save given if required
-                self.extra_entry_points.push(EntryPoint {
-                    point_id: new_point,
-                    level,
-                });
-                Some(candidate.clone())
-            } else {
-                // The current point is better than existing
-                let entry = self.entry_points[i].clone();
-                self.entry_points[i] = EntryPoint {
-                    point_id: new_point,
-                    level,
-                };
-                self.extra_entry_points.push(entry.clone());
-                Some(entry)
-            };
-        }
-        // No entry points found. Create a new one and return self
-        let new_entry = EntryPoint {
-            point_id: new_point,
-            level,
-        };
-        self.entry_points.push(new_entry);
-        None
-    }
-
-    /// Find the highest `EntryPoint` which satisfies filtering condition of `checker`
-    pub fn get_entry_point<F>(&self, checker: F) -> Option<EntryPoint>
-    where
-        F: Fn(PointOffsetType) -> bool,
-    {
-        self.entry_points
-            .iter()
-            .find(|entry| checker(entry.point_id))
-            .cloned()
-            .or_else(|| {
-                // Searching for at least some entry point
-                self.extra_entry_points
-                    .iter()
-                    .filter(|entry| checker(entry.point_id))
-                    .cloned()
-                    .max_by_key(|ep| ep.level)
-            })
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use rand::Rng;
-
-    use super::*;
-
-    #[test]
-    fn test_entry_points() {
-        let mut points = EntryPoints::new(10);
-
-        let mut rnd = rand::thread_rng();
-
-        for i in 0..1000 {
-            let level = rnd.gen_range(0..10000);
-            points.new_point(i, level, |_x| true);
-        }
-
-        assert_eq!(points.entry_points.len(), 1);
-        assert_eq!(points.extra_entry_points.len(), 10);
-
-        assert!(points.entry_points[0].level > 1);
-
-        for i in 1000..2000 {
-            let level = rnd.gen_range(0..10000);
-            points.new_point(i, level, |x| x % 5 == i % 5);
-        }
-
-        assert_eq!(points.entry_points.len(), 5);
-        assert_eq!(points.extra_entry_points.len(), 10);
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/index/hnsw_index/graph_layers.rs b/crates/qdrant/lib/segment/src/index/hnsw_index/graph_layers.rs
deleted file mode 100644
index 9e19307..0000000
--- a/crates/qdrant/lib/segment/src/index/hnsw_index/graph_layers.rs
+++ /dev/null
@@ -1,488 +0,0 @@
-use std::cmp::max;
-use std::path::{Path, PathBuf};
-
-use common::fixed_length_priority_queue::FixedLengthPriorityQueue;
-use itertools::Itertools;
-use serde::{Deserialize, Serialize};
-
-use super::graph_links::{GraphLinks, GraphLinksMmap};
-use crate::common::file_operations::{atomic_save_bin, read_bin, FileStorageError};
-use crate::common::mmap_ops;
-use crate::common::utils::rev_range;
-use crate::entry::entry_point::OperationResult;
-use crate::index::hnsw_index::entry_points::EntryPoints;
-use crate::index::hnsw_index::graph_links::GraphLinksConverter;
-use crate::index::hnsw_index::point_scorer::FilteredScorer;
-use crate::index::hnsw_index::search_context::SearchContext;
-use crate::index::visited_pool::{VisitedList, VisitedPool};
-use crate::types::PointOffsetType;
-use crate::vector_storage::ScoredPointOffset;
-
-pub type LinkContainer = Vec<PointOffsetType>;
-pub type LinkContainerRef<'a> = &'a [PointOffsetType];
-pub type LayersContainer = Vec<LinkContainer>;
-
-pub const HNSW_GRAPH_FILE: &str = "graph.bin";
-pub const HNSW_LINKS_FILE: &str = "links.bin";
-
-#[derive(Deserialize, Serialize, Debug)]
-pub struct GraphLayersBackwardCompatibility {
-    pub(super) max_level: usize,
-    pub(super) m: usize,
-    pub(super) m0: usize,
-    pub(super) ef_construct: usize,
-    pub(super) links_layers: Vec<LayersContainer>,
-    pub(super) entry_points: EntryPoints,
-}
-
-#[derive(Deserialize, Serialize, Debug)]
-pub struct GraphLayers<TGraphLinks: GraphLinks> {
-    pub(super) m: usize,
-    pub(super) m0: usize,
-    pub(super) ef_construct: usize,
-
-    #[serde(skip)]
-    pub(super) links: TGraphLinks,
-    pub(super) entry_points: EntryPoints,
-
-    #[serde(skip)]
-    pub(super) visited_pool: VisitedPool,
-}
-
-pub trait GraphLayersBase {
-    fn get_visited_list_from_pool(&self) -> VisitedList;
-
-    fn return_visited_list_to_pool(&self, visited_list: VisitedList);
-
-    fn links_map<F>(&self, point_id: PointOffsetType, level: usize, f: F)
-    where
-        F: FnMut(PointOffsetType);
-
-    /// Get M based on current level
-    fn get_m(&self, level: usize) -> usize;
-
-    /// Greedy search for closest points within a single graph layer
-    fn _search_on_level(
-        &self,
-        searcher: &mut SearchContext,
-        level: usize,
-        visited_list: &mut VisitedList,
-        points_scorer: &mut FilteredScorer,
-    ) {
-        let limit = self.get_m(level);
-        let mut points_ids: Vec<PointOffsetType> = Vec::with_capacity(2 * limit);
-
-        while let Some(candidate) = searcher.candidates.pop() {
-            if candidate.score < searcher.lower_bound() {
-                break;
-            }
-
-            points_ids.clear();
-            self.links_map(candidate.idx, level, |link| {
-                if !visited_list.check_and_update_visited(link) {
-                    points_ids.push(link);
-                }
-            });
-
-            let scores = points_scorer.score_points(&mut points_ids, limit);
-            scores
-                .iter()
-                .copied()
-                .for_each(|score_point| searcher.process_candidate(score_point));
-        }
-    }
-
-    fn search_on_level(
-        &self,
-        level_entry: ScoredPointOffset,
-        level: usize,
-        ef: usize,
-        points_scorer: &mut FilteredScorer,
-    ) -> FixedLengthPriorityQueue<ScoredPointOffset> {
-        let mut visited_list = self.get_visited_list_from_pool();
-        visited_list.check_and_update_visited(level_entry.idx);
-        let mut search_context = SearchContext::new(level_entry, ef);
-
-        self._search_on_level(&mut search_context, level, &mut visited_list, points_scorer);
-
-        self.return_visited_list_to_pool(visited_list);
-        search_context.nearest
-    }
-
-    /// Greedy searches for entry point of level `target_level`.
-    /// Beam size is 1.
-    fn search_entry(
-        &self,
-        entry_point: PointOffsetType,
-        top_level: usize,
-        target_level: usize,
-        points_scorer: &mut FilteredScorer,
-    ) -> ScoredPointOffset {
-        let mut links: Vec<PointOffsetType> = Vec::with_capacity(2 * self.get_m(0));
-
-        let mut current_point = ScoredPointOffset {
-            idx: entry_point,
-            score: points_scorer.score_point(entry_point),
-        };
-        for level in rev_range(top_level, target_level) {
-            let limit = self.get_m(level);
-
-            let mut changed = true;
-            while changed {
-                changed = false;
-
-                links.clear();
-                self.links_map(current_point.idx, level, |link| {
-                    links.push(link);
-                });
-
-                let scores = points_scorer.score_points(&mut links, limit);
-                scores.iter().copied().for_each(|score_point| {
-                    if score_point.score > current_point.score {
-                        changed = true;
-                        current_point = score_point;
-                    }
-                });
-            }
-        }
-        current_point
-    }
-}
-
-impl<TGraphLinks: GraphLinks> GraphLayersBase for GraphLayers<TGraphLinks> {
-    fn get_visited_list_from_pool(&self) -> VisitedList {
-        self.visited_pool.get(self.links.num_points())
-    }
-
-    fn return_visited_list_to_pool(&self, visited_list: VisitedList) {
-        self.visited_pool.return_back(visited_list);
-    }
-
-    fn links_map<F>(&self, point_id: PointOffsetType, level: usize, mut f: F)
-    where
-        F: FnMut(PointOffsetType),
-    {
-        for link in self.links.links(point_id, level) {
-            f(*link);
-        }
-    }
-
-    fn get_m(&self, level: usize) -> usize {
-        if level == 0 {
-            self.m0
-        } else {
-            self.m
-        }
-    }
-}
-
-/// Object contains links between nodes for HNSW search
-///
-/// Assume all scores are similarities. Larger score = closer points
-impl<TGraphLinks: GraphLinks> GraphLayers<TGraphLinks> {
-    pub fn point_level(&self, point_id: PointOffsetType) -> usize {
-        self.links.point_level(point_id)
-    }
-
-    pub fn search(
-        &self,
-        top: usize,
-        ef: usize,
-        mut points_scorer: FilteredScorer,
-    ) -> Vec<ScoredPointOffset> {
-        let entry_point = match self
-            .entry_points
-            .get_entry_point(|point_id| points_scorer.check_vector(point_id))
-        {
-            None => return vec![],
-            Some(ep) => ep,
-        };
-
-        let zero_level_entry = self.search_entry(
-            entry_point.point_id,
-            entry_point.level,
-            0,
-            &mut points_scorer,
-        );
-
-        let nearest = self.search_on_level(zero_level_entry, 0, max(top, ef), &mut points_scorer);
-        nearest.into_iter().take(top).collect_vec()
-    }
-
-    pub fn get_path(path: &Path) -> PathBuf {
-        path.join(HNSW_GRAPH_FILE)
-    }
-
-    pub fn get_links_path(path: &Path) -> PathBuf {
-        path.join(HNSW_LINKS_FILE)
-    }
-
-    pub fn num_points(&self) -> usize {
-        self.links.num_points()
-    }
-}
-
-impl<TGraphLinks> GraphLayers<TGraphLinks>
-where
-    TGraphLinks: GraphLinks,
-{
-    pub fn load(graph_path: &Path, links_path: &Path) -> OperationResult<Self> {
-        let try_self: Result<Self, FileStorageError> = if links_path.exists() {
-            read_bin(graph_path)
-        } else {
-            Err(FileStorageError::generic(format!(
-                "Links file does not exists: {links_path:?}"
-            )))
-        };
-
-        match try_self {
-            Ok(mut slf) => {
-                let links = TGraphLinks::load_from_file(links_path)?;
-                slf.links = links;
-                Ok(slf)
-            }
-            Err(err) => {
-                let try_legacy: Result<GraphLayersBackwardCompatibility, _> = read_bin(graph_path);
-                if let Ok(legacy) = try_legacy {
-                    log::debug!("Converting legacy graph to new format");
-
-                    let mut converter = GraphLinksConverter::new(legacy.links_layers);
-                    converter.save_as(links_path)?;
-
-                    let links = TGraphLinks::from_converter(converter)?;
-                    let slf = Self {
-                        m: legacy.m,
-                        m0: legacy.m0,
-                        ef_construct: legacy.ef_construct,
-                        links,
-                        entry_points: legacy.entry_points,
-                        visited_pool: VisitedPool::new(),
-                    };
-                    slf.save(graph_path)?;
-                    Ok(slf)
-                } else {
-                    Err(err)?
-                }
-            }
-        }
-    }
-
-    pub fn save(&self, path: &Path) -> OperationResult<()> {
-        Ok(atomic_save_bin(path, self)?)
-    }
-}
-
-impl GraphLayers<GraphLinksMmap> {
-    pub fn prefault_mmap_pages(&self, path: &Path) -> Option<mmap_ops::PrefaultMmapPages> {
-        self.links.prefault_mmap_pages(path)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::fs::File;
-    use std::io::Write;
-
-    use itertools::Itertools;
-    use rand::rngs::StdRng;
-    use rand::SeedableRng;
-    use tempfile::Builder;
-
-    use super::*;
-    use crate::data_types::vectors::VectorElementType;
-    use crate::fixtures::index_fixtures::{
-        random_vector, FakeFilterContext, TestRawScorerProducer,
-    };
-    use crate::index::hnsw_index::graph_links::GraphLinksRam;
-    use crate::index::hnsw_index::tests::create_graph_layer_fixture;
-    use crate::spaces::metric::Metric;
-    use crate::spaces::simple::{CosineMetric, DotProductMetric};
-
-    fn search_in_graph<TGraphLinks: GraphLinks>(
-        query: &[VectorElementType],
-        top: usize,
-        vector_storage: &TestRawScorerProducer<CosineMetric>,
-        graph: &GraphLayers<TGraphLinks>,
-    ) -> Vec<ScoredPointOffset> {
-        let fake_filter_context = FakeFilterContext {};
-        let raw_scorer = vector_storage.get_raw_scorer(query.to_owned());
-        let scorer = FilteredScorer::new(raw_scorer.as_ref(), Some(&fake_filter_context));
-        let ef = 16;
-        graph.search(top, ef, scorer)
-    }
-
-    const M: usize = 8;
-
-    #[test]
-    fn test_search_on_level() {
-        let dim = 8;
-        let m = 8;
-        let ef_construct = 32;
-        let entry_points_num = 10;
-        let num_vectors = 10;
-
-        let mut rng = StdRng::seed_from_u64(42);
-
-        let vector_holder =
-            TestRawScorerProducer::<DotProductMetric>::new(dim, num_vectors, &mut rng);
-
-        let mut graph_layers = GraphLayers {
-            m,
-            m0: 2 * m,
-            ef_construct,
-            links: GraphLinksRam::default(),
-            entry_points: EntryPoints::new(entry_points_num),
-            visited_pool: VisitedPool::new(),
-        };
-
-        let mut graph_links = vec![vec![Vec::new()]; num_vectors];
-        graph_links[0][0] = vec![1, 2, 3, 4, 5, 6];
-
-        graph_layers.links =
-            GraphLinksRam::from_converter(GraphLinksConverter::new(graph_links.clone())).unwrap();
-
-        let linking_idx: PointOffsetType = 7;
-
-        let fake_filter_context = FakeFilterContext {};
-        let added_vector = vector_holder.vectors.get(linking_idx).to_vec();
-        let raw_scorer = vector_holder.get_raw_scorer(added_vector);
-        let mut scorer = FilteredScorer::new(raw_scorer.as_ref(), Some(&fake_filter_context));
-
-        let nearest_on_level = graph_layers.search_on_level(
-            ScoredPointOffset {
-                idx: 0,
-                score: scorer.score_point(0),
-            },
-            0,
-            32,
-            &mut scorer,
-        );
-
-        assert_eq!(nearest_on_level.len(), graph_links[0][0].len() + 1);
-
-        for nearest in &nearest_on_level {
-            // eprintln!("nearest = {:#?}", nearest);
-            assert_eq!(
-                nearest.score,
-                scorer.score_internal(linking_idx, nearest.idx)
-            )
-        }
-    }
-
-    #[test]
-    fn test_save_and_load() {
-        let num_vectors = 100;
-        let dim = 8;
-        let top = 5;
-
-        let mut rng = StdRng::seed_from_u64(42);
-
-        let dir = Builder::new().prefix("graph_dir").tempdir().unwrap();
-        let links_path = GraphLayers::<GraphLinksRam>::get_links_path(dir.path());
-        let (vector_holder, graph_layers) = create_graph_layer_fixture::<CosineMetric, _>(
-            num_vectors,
-            M,
-            dim,
-            false,
-            &mut rng,
-            Some(&links_path),
-        );
-
-        let query = random_vector(&mut rng, dim);
-
-        let res1 = search_in_graph(&query, top, &vector_holder, &graph_layers);
-
-        let path = GraphLayers::<GraphLinksRam>::get_path(dir.path());
-        graph_layers.save(&path).unwrap();
-
-        let graph2 = GraphLayers::<GraphLinksRam>::load(&path, &links_path).unwrap();
-
-        let res2 = search_in_graph(&query, top, &vector_holder, &graph2);
-
-        assert_eq!(res1, res2)
-    }
-
-    #[test]
-    fn test_add_points() {
-        let num_vectors = 1000;
-        let dim = 8;
-
-        let mut rng = StdRng::seed_from_u64(42);
-
-        type M = CosineMetric;
-
-        let (vector_holder, graph_layers) =
-            create_graph_layer_fixture::<M, _>(num_vectors, M, dim, false, &mut rng, None);
-
-        let main_entry = graph_layers
-            .entry_points
-            .get_entry_point(|_x| true)
-            .expect("Expect entry point to exists");
-
-        assert!(main_entry.level > 0);
-
-        let num_levels = (0..num_vectors)
-            .map(|i| graph_layers.links.point_level(i as PointOffsetType))
-            .max()
-            .unwrap();
-        assert_eq!(main_entry.level, num_levels);
-
-        let total_links_0 = (0..num_vectors)
-            .map(|i| graph_layers.links.links(i as PointOffsetType, 0).len())
-            .sum::<usize>();
-
-        eprintln!("total_links_0 = {total_links_0:#?}");
-        eprintln!("num_vectors = {num_vectors:#?}");
-        assert!(total_links_0 > 0);
-        assert!(total_links_0 as f64 / num_vectors as f64 > M as f64);
-
-        let top = 5;
-        let query = random_vector(&mut rng, dim);
-        let processed_query = M::preprocess(&query).unwrap_or_else(|| query.clone());
-        let mut reference_top = FixedLengthPriorityQueue::new(top);
-        for idx in 0..vector_holder.vectors.len() as PointOffsetType {
-            let vec = &vector_holder.vectors.get(idx);
-            reference_top.push(ScoredPointOffset {
-                idx,
-                score: M::similarity(vec, &processed_query),
-            });
-        }
-
-        let graph_search = search_in_graph(&query, top, &vector_holder, &graph_layers);
-
-        assert_eq!(reference_top.into_vec(), graph_search);
-    }
-
-    #[test]
-    #[ignore]
-    fn test_draw_hnsw_graph() {
-        let dim = 2;
-        let num_vectors = 500;
-
-        let mut rng = StdRng::seed_from_u64(42);
-
-        let (vector_holder, graph_layers) = create_graph_layer_fixture::<CosineMetric, _>(
-            num_vectors,
-            M,
-            dim,
-            true,
-            &mut rng,
-            None,
-        );
-
-        let graph_json = serde_json::to_string_pretty(&graph_layers).unwrap();
-
-        let vectors_json = serde_json::to_string_pretty(
-            &(0..vector_holder.vectors.len() as PointOffsetType)
-                .map(|point_id| vector_holder.vectors.get(point_id).to_vec())
-                .collect_vec(),
-        )
-        .unwrap();
-
-        let mut file = File::create("graph.json").unwrap();
-        file.write_all(
-            format!("{{ \"graph\": {graph_json}, \n \"vectors\": {vectors_json} }}").as_bytes(),
-        )
-        .unwrap();
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/index/hnsw_index/graph_layers_builder.rs b/crates/qdrant/lib/segment/src/index/hnsw_index/graph_layers_builder.rs
deleted file mode 100644
index c5393fe..0000000
--- a/crates/qdrant/lib/segment/src/index/hnsw_index/graph_layers_builder.rs
+++ /dev/null
@@ -1,866 +0,0 @@
-use std::cmp::{max, min};
-use std::collections::BinaryHeap;
-use std::path::Path;
-use std::sync::atomic::AtomicUsize;
-
-use common::fixed_length_priority_queue::FixedLengthPriorityQueue;
-use parking_lot::{Mutex, MutexGuard, RwLock};
-use rand::distributions::Uniform;
-use rand::Rng;
-
-use super::graph_links::GraphLinks;
-use crate::entry::entry_point::OperationResult;
-use crate::index::hnsw_index::entry_points::EntryPoints;
-use crate::index::hnsw_index::graph_layers::{GraphLayers, GraphLayersBase, LinkContainer};
-use crate::index::hnsw_index::graph_links::GraphLinksConverter;
-use crate::index::hnsw_index::point_scorer::FilteredScorer;
-use crate::index::hnsw_index::search_context::SearchContext;
-use crate::index::visited_pool::{VisitedList, VisitedPool};
-use crate::types::{PointOffsetType, ScoreType};
-use crate::vector_storage::ScoredPointOffset;
-
-pub type LockedLinkContainer = RwLock<LinkContainer>;
-pub type LockedLayersContainer = Vec<LockedLinkContainer>;
-
-/// Same as `GraphLayers`,  but allows to build in parallel
-/// Convertible to `GraphLayers`
-pub struct GraphLayersBuilder {
-    max_level: AtomicUsize,
-    m: usize,
-    m0: usize,
-    ef_construct: usize,
-    // Factor of level probability
-    level_factor: f64,
-    // Exclude points according to "not closer than base" heuristic?
-    use_heuristic: bool,
-    links_layers: Vec<LockedLayersContainer>,
-    entry_points: Mutex<EntryPoints>,
-
-    // Fields used on construction phase only
-    visited_pool: VisitedPool,
-}
-
-impl GraphLayersBase for GraphLayersBuilder {
-    fn get_visited_list_from_pool(&self) -> VisitedList {
-        self.visited_pool.get(self.num_points())
-    }
-
-    fn return_visited_list_to_pool(&self, visited_list: VisitedList) {
-        self.visited_pool.return_back(visited_list);
-    }
-
-    fn links_map<F>(&self, point_id: PointOffsetType, level: usize, mut f: F)
-    where
-        F: FnMut(PointOffsetType),
-    {
-        let links = self.links_layers[point_id as usize][level].read();
-        for link in links.iter() {
-            f(*link);
-        }
-    }
-
-    fn get_m(&self, level: usize) -> usize {
-        if level == 0 {
-            self.m0
-        } else {
-            self.m
-        }
-    }
-}
-
-impl GraphLayersBuilder {
-    pub fn get_entry_points(&self) -> MutexGuard<EntryPoints> {
-        self.entry_points.lock()
-    }
-
-    pub fn into_graph_layers<TGraphLinks: GraphLinks>(
-        self,
-        path: Option<&Path>,
-    ) -> OperationResult<GraphLayers<TGraphLinks>> {
-        let unlocker_links_layers = self
-            .links_layers
-            .into_iter()
-            .map(|l| l.into_iter().map(|l| l.into_inner()).collect())
-            .collect();
-
-        let mut links_converter = GraphLinksConverter::new(unlocker_links_layers);
-        if let Some(path) = path {
-            links_converter.save_as(path)?;
-        }
-
-        let links = TGraphLinks::from_converter(links_converter)?;
-        Ok(GraphLayers {
-            m: self.m,
-            m0: self.m0,
-            ef_construct: self.ef_construct,
-            links,
-            entry_points: self.entry_points.into_inner(),
-            visited_pool: self.visited_pool,
-        })
-    }
-
-    pub fn new_with_params(
-        num_vectors: usize, // Initial number of points in index
-        m: usize,           // Expected M for non-first layer
-        m0: usize,          // Expected M for first layer
-        ef_construct: usize,
-        entry_points_num: usize, // Depends on number of points
-        use_heuristic: bool,
-        reserve: bool,
-    ) -> Self {
-        let mut links_layers: Vec<LockedLayersContainer> = vec![];
-
-        for _i in 0..num_vectors {
-            let mut links = Vec::new();
-            if reserve {
-                links.reserve(m0);
-            }
-            links_layers.push(vec![RwLock::new(links)]);
-        }
-
-        Self {
-            max_level: AtomicUsize::new(0),
-            m,
-            m0,
-            ef_construct,
-            level_factor: 1.0 / (max(m, 2) as f64).ln(),
-            use_heuristic,
-            links_layers,
-            entry_points: Mutex::new(EntryPoints::new(entry_points_num)),
-            visited_pool: VisitedPool::new(),
-        }
-    }
-
-    pub fn new(
-        num_vectors: usize, // Initial number of points in index
-        m: usize,           // Expected M for non-first layer
-        m0: usize,          // Expected M for first layer
-        ef_construct: usize,
-        entry_points_num: usize, // Depends on number of points
-        use_heuristic: bool,
-    ) -> Self {
-        Self::new_with_params(
-            num_vectors,
-            m,
-            m0,
-            ef_construct,
-            entry_points_num,
-            use_heuristic,
-            true,
-        )
-    }
-
-    pub fn merge_from_other(&mut self, other: GraphLayersBuilder) {
-        self.max_level = AtomicUsize::new(std::cmp::max(
-            self.max_level.load(std::sync::atomic::Ordering::Relaxed),
-            other.max_level.load(std::sync::atomic::Ordering::Relaxed),
-        ));
-        let mut visited_list = self.visited_pool.get(self.num_points());
-        if other.links_layers.len() > self.links_layers.len() {
-            self.links_layers
-                .resize_with(other.links_layers.len(), Vec::new);
-        }
-        for (point_id, layers) in other.links_layers.into_iter().enumerate() {
-            let current_layers = &mut self.links_layers[point_id];
-            for (level, other_links) in layers.into_iter().enumerate() {
-                if current_layers.len() <= level {
-                    current_layers.push(other_links);
-                } else {
-                    let other_links = other_links.into_inner();
-                    visited_list.next_iteration();
-                    let mut current_links = current_layers[level].write();
-                    current_links.iter().copied().for_each(|x| {
-                        visited_list.check_and_update_visited(x);
-                    });
-                    for other_link in other_links
-                        .into_iter()
-                        .filter(|x| !visited_list.check_and_update_visited(*x))
-                    {
-                        current_links.push(other_link);
-                    }
-                }
-            }
-        }
-        self.entry_points
-            .lock()
-            .merge_from_other(other.entry_points.into_inner());
-        self.visited_pool.return_back(visited_list);
-    }
-
-    fn num_points(&self) -> usize {
-        self.links_layers.len()
-    }
-
-    /// Generate random level for a new point, according to geometric distribution
-    pub fn get_random_layer<R>(&self, rng: &mut R) -> usize
-    where
-        R: Rng + ?Sized,
-    {
-        let distribution = Uniform::new(0.0, 1.0);
-        let sample: f64 = rng.sample(distribution);
-        let picked_level = -sample.ln() * self.level_factor;
-        picked_level.round() as usize
-    }
-
-    fn get_point_level(&self, point_id: PointOffsetType) -> usize {
-        self.links_layers[point_id as usize].len() - 1
-    }
-
-    pub fn set_levels(&mut self, point_id: PointOffsetType, level: usize) {
-        if self.links_layers.len() <= point_id as usize {
-            while self.links_layers.len() <= point_id as usize {
-                self.links_layers.push(vec![]);
-            }
-        }
-        let point_layers = &mut self.links_layers[point_id as usize];
-        while point_layers.len() <= level {
-            let mut links = vec![];
-            links.reserve(self.m);
-            point_layers.push(RwLock::new(links));
-        }
-        self.max_level
-            .fetch_max(level, std::sync::atomic::Ordering::Relaxed);
-    }
-
-    /// Connect new point to links, so that links contains only closest points
-    fn connect_new_point<F>(
-        links: &mut LinkContainer,
-        new_point_id: PointOffsetType,
-        target_point_id: PointOffsetType,
-        level_m: usize,
-        mut score_internal: F,
-    ) where
-        F: FnMut(PointOffsetType, PointOffsetType) -> ScoreType,
-    {
-        // ToDo: binary search here ? (most likely does not worth it)
-        let new_to_target = score_internal(target_point_id, new_point_id);
-
-        let mut id_to_insert = links.len();
-        for (i, &item) in links.iter().enumerate() {
-            let target_to_link = score_internal(target_point_id, item);
-            if target_to_link < new_to_target {
-                id_to_insert = i;
-                break;
-            }
-        }
-
-        if links.len() < level_m {
-            links.insert(id_to_insert, new_point_id);
-        } else if id_to_insert != links.len() {
-            links.pop();
-            links.insert(id_to_insert, new_point_id);
-        }
-    }
-
-    /// <https://github.com/nmslib/hnswlib/issues/99>
-    fn select_candidate_with_heuristic_from_sorted<F>(
-        candidates: impl Iterator<Item = ScoredPointOffset>,
-        m: usize,
-        mut score_internal: F,
-    ) -> Vec<PointOffsetType>
-    where
-        F: FnMut(PointOffsetType, PointOffsetType) -> ScoreType,
-    {
-        let mut result_list = vec![];
-        result_list.reserve(m);
-        for current_closest in candidates {
-            if result_list.len() >= m {
-                break;
-            }
-            let mut is_good = true;
-            for &selected_point in &result_list {
-                let dist_to_already_selected = score_internal(current_closest.idx, selected_point);
-                if dist_to_already_selected > current_closest.score {
-                    is_good = false;
-                    break;
-                }
-            }
-            if is_good {
-                result_list.push(current_closest.idx);
-            }
-        }
-
-        result_list
-    }
-
-    fn search_existing_point_on_level(
-        &self,
-        level_entry: ScoredPointOffset,
-        level: usize,
-        ef: usize,
-        points_scorer: &mut FilteredScorer,
-        point_id: PointOffsetType,
-    ) -> FixedLengthPriorityQueue<ScoredPointOffset> {
-        let mut visited_list = self.get_visited_list_from_pool();
-        visited_list.check_and_update_visited(level_entry.idx);
-        let mut search_context = SearchContext::new(level_entry, ef);
-
-        self._search_on_level(&mut search_context, level, &mut visited_list, points_scorer);
-
-        let existing_links = self.links_layers[point_id as usize][level].read();
-        for &existing_link in existing_links.iter() {
-            if !visited_list.check(existing_link) {
-                search_context.process_candidate(ScoredPointOffset {
-                    idx: existing_link,
-                    score: points_scorer.score_point(existing_link),
-                });
-            }
-        }
-
-        self.return_visited_list_to_pool(visited_list);
-        search_context.nearest
-    }
-
-    /// <https://github.com/nmslib/hnswlib/issues/99>
-    fn select_candidates_with_heuristic<F>(
-        candidates: FixedLengthPriorityQueue<ScoredPointOffset>,
-        m: usize,
-        score_internal: F,
-    ) -> Vec<PointOffsetType>
-    where
-        F: FnMut(PointOffsetType, PointOffsetType) -> ScoreType,
-    {
-        let closest_iter = candidates.into_iter();
-        Self::select_candidate_with_heuristic_from_sorted(closest_iter, m, score_internal)
-    }
-
-    pub fn link_new_point(&self, point_id: PointOffsetType, mut points_scorer: FilteredScorer) {
-        // Check if there is an suitable entry point
-        //   - entry point level if higher or equal
-        //   - it satisfies filters
-
-        let level = self.get_point_level(point_id);
-
-        let entry_point_opt = self
-            .entry_points
-            .lock()
-            .new_point(point_id, level, |point_id| {
-                points_scorer.check_vector(point_id)
-            });
-        match entry_point_opt {
-            // New point is a new empty entry (for this filter, at least)
-            // We can't do much here, so just quit
-            None => {}
-
-            // Entry point found.
-            Some(entry_point) => {
-                let mut level_entry = if entry_point.level > level {
-                    // The entry point is higher than a new point
-                    // Let's find closest one on same level
-
-                    // greedy search for a single closest point
-                    self.search_entry(
-                        entry_point.point_id,
-                        entry_point.level,
-                        level,
-                        &mut points_scorer,
-                    )
-                } else {
-                    ScoredPointOffset {
-                        idx: entry_point.point_id,
-                        score: points_scorer.score_internal(point_id, entry_point.point_id),
-                    }
-                };
-                // minimal common level for entry points
-                let linking_level = min(level, entry_point.level);
-
-                for curr_level in (0..=linking_level).rev() {
-                    let level_m = self.get_m(curr_level);
-
-                    let nearest_points = {
-                        self.search_existing_point_on_level(
-                            level_entry,
-                            curr_level,
-                            self.ef_construct,
-                            &mut points_scorer,
-                            point_id,
-                        )
-                    };
-
-                    if let Some(the_nearest) = nearest_points.iter().max() {
-                        level_entry = *the_nearest;
-                    }
-
-                    let scorer = |a, b| points_scorer.score_internal(a, b);
-
-                    if self.use_heuristic {
-                        let selected_nearest =
-                            Self::select_candidates_with_heuristic(nearest_points, level_m, scorer);
-                        self.links_layers[point_id as usize][curr_level]
-                            .write()
-                            .clone_from(&selected_nearest);
-
-                        for &other_point in &selected_nearest {
-                            let mut other_point_links =
-                                self.links_layers[other_point as usize][curr_level].write();
-                            if other_point_links.len() < level_m {
-                                // If linked point is lack of neighbours
-                                other_point_links.push(point_id);
-                            } else {
-                                let mut candidates = BinaryHeap::with_capacity(level_m + 1);
-                                candidates.push(ScoredPointOffset {
-                                    idx: point_id,
-                                    score: scorer(point_id, other_point),
-                                });
-                                for other_point_link in
-                                    other_point_links.iter().take(level_m).copied()
-                                {
-                                    candidates.push(ScoredPointOffset {
-                                        idx: other_point_link,
-                                        score: scorer(other_point_link, other_point),
-                                    });
-                                }
-                                let selected_candidates =
-                                    Self::select_candidate_with_heuristic_from_sorted(
-                                        candidates.into_sorted_vec().into_iter().rev(),
-                                        level_m,
-                                        scorer,
-                                    );
-                                other_point_links.clear(); // this do not free memory, which is good
-                                for selected in selected_candidates.iter().copied() {
-                                    other_point_links.push(selected);
-                                }
-                            }
-                        }
-                    } else {
-                        for nearest_point in &nearest_points {
-                            {
-                                let mut links =
-                                    self.links_layers[point_id as usize][curr_level].write();
-                                Self::connect_new_point(
-                                    &mut links,
-                                    nearest_point.idx,
-                                    point_id,
-                                    level_m,
-                                    scorer,
-                                );
-                            }
-
-                            {
-                                let mut links = self.links_layers[nearest_point.idx as usize]
-                                    [curr_level]
-                                    .write();
-                                Self::connect_new_point(
-                                    &mut links,
-                                    point_id,
-                                    nearest_point.idx,
-                                    level_m,
-                                    scorer,
-                                );
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use itertools::Itertools;
-    use rand::prelude::StdRng;
-    use rand::seq::SliceRandom;
-    use rand::SeedableRng;
-
-    use super::*;
-    use crate::data_types::vectors::VectorElementType;
-    use crate::fixtures::index_fixtures::{
-        random_vector, FakeFilterContext, TestRawScorerProducer,
-    };
-    use crate::index::hnsw_index::graph_links::GraphLinksRam;
-    use crate::index::hnsw_index::tests::create_graph_layer_fixture;
-    use crate::spaces::metric::Metric;
-    use crate::spaces::simple::{CosineMetric, EuclidMetric};
-
-    const M: usize = 8;
-
-    #[cfg(not(windows))]
-    fn parallel_graph_build<TMetric: Metric + Sync + Send, R>(
-        num_vectors: usize,
-        dim: usize,
-        use_heuristic: bool,
-        rng: &mut R,
-    ) -> (TestRawScorerProducer<TMetric>, GraphLayersBuilder)
-    where
-        R: Rng + ?Sized,
-    {
-        use rayon::prelude::{IntoParallelIterator, ParallelIterator};
-        let pool = rayon::ThreadPoolBuilder::new()
-            .num_threads(2)
-            .build()
-            .unwrap();
-
-        let m = M;
-        let ef_construct = 16;
-        let entry_points_num = 10;
-
-        let vector_holder = TestRawScorerProducer::<TMetric>::new(dim, num_vectors, rng);
-
-        let mut graph_layers = GraphLayersBuilder::new(
-            num_vectors,
-            m,
-            m * 2,
-            ef_construct,
-            entry_points_num,
-            use_heuristic,
-        );
-
-        for idx in 0..(num_vectors as PointOffsetType) {
-            let level = graph_layers.get_random_layer(rng);
-            graph_layers.set_levels(idx, level);
-        }
-        pool.install(|| {
-            (0..(num_vectors as PointOffsetType))
-                .into_par_iter()
-                .for_each(|idx| {
-                    let fake_filter_context = FakeFilterContext {};
-                    let added_vector = vector_holder.vectors.get(idx).to_vec();
-                    let raw_scorer = vector_holder.get_raw_scorer(added_vector);
-                    let scorer =
-                        FilteredScorer::new(raw_scorer.as_ref(), Some(&fake_filter_context));
-                    graph_layers.link_new_point(idx, scorer);
-                });
-        });
-
-        (vector_holder, graph_layers)
-    }
-
-    fn create_graph_layer<TMetric: Metric, R>(
-        num_vectors: usize,
-        dim: usize,
-        use_heuristic: bool,
-        rng: &mut R,
-    ) -> (TestRawScorerProducer<TMetric>, GraphLayersBuilder)
-    where
-        R: Rng + ?Sized,
-    {
-        let m = M;
-        let ef_construct = 16;
-        let entry_points_num = 10;
-
-        let vector_holder = TestRawScorerProducer::<TMetric>::new(dim, num_vectors, rng);
-
-        let mut graph_layers = GraphLayersBuilder::new(
-            num_vectors,
-            m,
-            m * 2,
-            ef_construct,
-            entry_points_num,
-            use_heuristic,
-        );
-
-        for idx in 0..(num_vectors as PointOffsetType) {
-            let level = graph_layers.get_random_layer(rng);
-            graph_layers.set_levels(idx, level);
-        }
-
-        for idx in 0..(num_vectors as PointOffsetType) {
-            let fake_filter_context = FakeFilterContext {};
-            let added_vector = vector_holder.vectors.get(idx).to_vec();
-            let raw_scorer = vector_holder.get_raw_scorer(added_vector.clone());
-            let scorer = FilteredScorer::new(raw_scorer.as_ref(), Some(&fake_filter_context));
-            graph_layers.link_new_point(idx, scorer);
-        }
-
-        (vector_holder, graph_layers)
-    }
-
-    #[cfg(not(windows))] // https://github.com/qdrant/qdrant/issues/1452
-    #[test]
-    fn test_parallel_graph_build() {
-        let num_vectors = 1000;
-        let dim = 8;
-
-        let mut rng = StdRng::seed_from_u64(42);
-        type M = CosineMetric;
-
-        // let (vector_holder, graph_layers_builder) =
-        //     create_graph_layer::<M, _>(num_vectors, dim, false, &mut rng);
-
-        let (vector_holder, graph_layers_builder) =
-            parallel_graph_build::<M, _>(num_vectors, dim, false, &mut rng);
-
-        let main_entry = graph_layers_builder
-            .entry_points
-            .lock()
-            .get_entry_point(|_x| true)
-            .expect("Expect entry point to exists");
-
-        assert!(main_entry.level > 0);
-
-        let num_levels = graph_layers_builder
-            .links_layers
-            .iter()
-            .map(|x| x.len())
-            .max()
-            .unwrap();
-        assert_eq!(main_entry.level + 1, num_levels);
-
-        let total_links_0: usize = graph_layers_builder
-            .links_layers
-            .iter()
-            .map(|x| x[0].read().len())
-            .sum();
-
-        assert!(total_links_0 > 0);
-
-        eprintln!("total_links_0 = {total_links_0:#?}");
-        eprintln!("num_vectors = {num_vectors:#?}");
-
-        assert!(total_links_0 as f64 / num_vectors as f64 > M as f64);
-
-        let top = 5;
-        let query = random_vector(&mut rng, dim);
-        let processed_query = M::preprocess(&query).unwrap_or_else(|| query.clone());
-        let mut reference_top = FixedLengthPriorityQueue::new(top);
-        for idx in 0..vector_holder.vectors.len() as PointOffsetType {
-            let vec = &vector_holder.vectors.get(idx);
-            reference_top.push(ScoredPointOffset {
-                idx,
-                score: M::similarity(vec, &processed_query),
-            });
-        }
-
-        let graph = graph_layers_builder
-            .into_graph_layers::<GraphLinksRam>(None)
-            .unwrap();
-
-        let fake_filter_context = FakeFilterContext {};
-        let raw_scorer = vector_holder.get_raw_scorer(query);
-        let scorer = FilteredScorer::new(raw_scorer.as_ref(), Some(&fake_filter_context));
-        let ef = 16;
-        let graph_search = graph.search(top, ef, scorer);
-
-        assert_eq!(reference_top.into_vec(), graph_search);
-    }
-
-    #[test]
-    fn test_add_points() {
-        let num_vectors = 1000;
-        let dim = 8;
-
-        let mut rng = StdRng::seed_from_u64(42);
-        let mut rng2 = StdRng::seed_from_u64(42);
-
-        type M = CosineMetric;
-
-        let (vector_holder, graph_layers_builder) =
-            create_graph_layer::<M, _>(num_vectors, dim, false, &mut rng);
-
-        let (_vector_holder_orig, graph_layers_orig) =
-            create_graph_layer_fixture::<M, _>(num_vectors, M, dim, false, &mut rng2, None);
-
-        // check is graph_layers_builder links are equeal to graph_layers_orig
-        let orig_len = graph_layers_orig.links.num_points();
-        let builder_len = graph_layers_builder.links_layers.len();
-
-        assert_eq!(orig_len, builder_len);
-
-        for idx in 0..builder_len {
-            let links_orig = &graph_layers_orig.links.links(idx as PointOffsetType, 0);
-            let links_builder = graph_layers_builder.links_layers[idx][0].read();
-            let link_container_from_builder = links_builder.iter().copied().collect::<Vec<_>>();
-            assert_eq!(links_orig, &link_container_from_builder);
-        }
-
-        let main_entry = graph_layers_builder
-            .entry_points
-            .lock()
-            .get_entry_point(|_x| true)
-            .expect("Expect entry point to exists");
-
-        assert!(main_entry.level > 0);
-
-        let num_levels = graph_layers_builder
-            .links_layers
-            .iter()
-            .map(|x| x.len())
-            .max()
-            .unwrap();
-        assert_eq!(main_entry.level + 1, num_levels);
-
-        let total_links_0: usize = graph_layers_builder
-            .links_layers
-            .iter()
-            .map(|x| x[0].read().len())
-            .sum();
-
-        assert!(total_links_0 > 0);
-
-        eprintln!("total_links_0 = {total_links_0:#?}");
-        eprintln!("num_vectors = {num_vectors:#?}");
-
-        assert!(total_links_0 as f64 / num_vectors as f64 > M as f64);
-
-        let top = 5;
-        let query = random_vector(&mut rng, dim);
-        let processed_query = M::preprocess(&query).unwrap_or_else(|| query.clone());
-        let mut reference_top = FixedLengthPriorityQueue::new(top);
-        for idx in 0..vector_holder.vectors.len() as PointOffsetType {
-            let vec = &vector_holder.vectors.get(idx);
-            reference_top.push(ScoredPointOffset {
-                idx,
-                score: M::similarity(vec, &processed_query),
-            });
-        }
-
-        let graph = graph_layers_builder
-            .into_graph_layers::<GraphLinksRam>(None)
-            .unwrap();
-
-        let fake_filter_context = FakeFilterContext {};
-        let raw_scorer = vector_holder.get_raw_scorer(query);
-        let scorer = FilteredScorer::new(raw_scorer.as_ref(), Some(&fake_filter_context));
-        let ef = 16;
-        let graph_search = graph.search(top, ef, scorer);
-
-        assert_eq!(reference_top.into_vec(), graph_search);
-    }
-
-    #[test]
-    #[ignore]
-    fn test_hnsw_graph_properties() {
-        const NUM_VECTORS: usize = 5_000;
-        const DIM: usize = 16;
-        const M: usize = 16;
-        const EF_CONSTRUCT: usize = 64;
-        const USE_HEURISTIC: bool = true;
-
-        let mut rng = StdRng::seed_from_u64(42);
-
-        let vector_holder = TestRawScorerProducer::<CosineMetric>::new(DIM, NUM_VECTORS, &mut rng);
-        let mut graph_layers_builder =
-            GraphLayersBuilder::new(NUM_VECTORS, M, M * 2, EF_CONSTRUCT, 10, USE_HEURISTIC);
-        let fake_filter_context = FakeFilterContext {};
-        for idx in 0..(NUM_VECTORS as PointOffsetType) {
-            let added_vector = vector_holder.vectors.get(idx).to_vec();
-            let raw_scorer = vector_holder.get_raw_scorer(added_vector);
-            let scorer = FilteredScorer::new(raw_scorer.as_ref(), Some(&fake_filter_context));
-            let level = graph_layers_builder.get_random_layer(&mut rng);
-            graph_layers_builder.set_levels(idx, level);
-            graph_layers_builder.link_new_point(idx, scorer);
-        }
-        let graph_layers = graph_layers_builder
-            .into_graph_layers::<GraphLinksRam>(None)
-            .unwrap();
-
-        let num_points = graph_layers.links.num_points();
-        eprintln!("number_points = {num_points:#?}");
-
-        let max_layer = (0..NUM_VECTORS)
-            .map(|i| graph_layers.links.point_level(i as PointOffsetType))
-            .max()
-            .unwrap();
-        eprintln!("max_layer = {:#?}", max_layer + 1);
-
-        let layers910 = graph_layers.links.point_level(910);
-        let links910 = (0..layers910 + 1)
-            .map(|i| graph_layers.links.links(910, i).to_vec())
-            .collect::<Vec<_>>();
-        eprintln!("graph_layers.links_layers[910] = {links910:#?}",);
-
-        let total_edges: usize = (0..NUM_VECTORS)
-            .map(|i| graph_layers.links.links(i as PointOffsetType, 0).len())
-            .sum();
-        let avg_connectivity = total_edges as f64 / NUM_VECTORS as f64;
-        eprintln!("avg_connectivity = {avg_connectivity:#?}");
-    }
-
-    #[test]
-    #[ignore]
-    fn test_candidate_selection_heuristics() {
-        const NUM_VECTORS: usize = 100;
-        const DIM: usize = 16;
-        const M: usize = 16;
-
-        let mut rng = StdRng::seed_from_u64(42);
-
-        let vector_holder = TestRawScorerProducer::<EuclidMetric>::new(DIM, NUM_VECTORS, &mut rng);
-
-        let mut candidates: FixedLengthPriorityQueue<ScoredPointOffset> =
-            FixedLengthPriorityQueue::new(NUM_VECTORS);
-
-        let new_vector_to_insert = random_vector(&mut rng, DIM);
-
-        let scorer = vector_holder.get_raw_scorer(new_vector_to_insert);
-
-        for i in 0..NUM_VECTORS {
-            candidates.push(ScoredPointOffset {
-                idx: i as PointOffsetType,
-                score: scorer.score_point(i as PointOffsetType),
-            });
-        }
-
-        let sorted_candidates = candidates.into_vec();
-
-        for x in sorted_candidates.iter().take(M) {
-            eprintln!("sorted_candidates = ({}, {})", x.idx, x.score);
-        }
-
-        let selected_candidates = GraphLayersBuilder::select_candidate_with_heuristic_from_sorted(
-            sorted_candidates.into_iter(),
-            M,
-            |a, b| scorer.score_internal(a, b),
-        );
-
-        for x in selected_candidates.iter() {
-            eprintln!("selected_candidates = {x}");
-        }
-    }
-
-    #[test]
-    fn test_connect_new_point() {
-        let num_points = 10;
-        let m = 6;
-        let ef_construct = 32;
-
-        // See illustration in docs
-        let points: Vec<Vec<VectorElementType>> = vec![
-            vec![21.79, 7.18],  // Target
-            vec![20.58, 5.46],  // 1  B - yes
-            vec![21.19, 4.51],  // 2  C
-            vec![24.73, 8.24],  // 3  D - yes
-            vec![24.55, 9.98],  // 4  E
-            vec![26.11, 6.85],  // 5  F
-            vec![17.64, 11.14], // 6  G - yes
-            vec![14.97, 11.52], // 7  I
-            vec![14.97, 9.60],  // 8  J
-            vec![16.23, 14.32], // 9  H
-            vec![12.69, 19.13], // 10 K
-        ];
-
-        let scorer = |a: PointOffsetType, b: PointOffsetType| {
-            -((points[a as usize][0] - points[b as usize][0]).powi(2)
-                + (points[a as usize][1] - points[b as usize][1]).powi(2))
-            .sqrt()
-        };
-
-        let mut insert_ids = (1..points.len() as PointOffsetType).collect_vec();
-
-        let mut candidates = FixedLengthPriorityQueue::new(insert_ids.len());
-        for &id in &insert_ids {
-            candidates.push(ScoredPointOffset {
-                idx: id,
-                score: scorer(0, id),
-            });
-        }
-
-        let res = GraphLayersBuilder::select_candidates_with_heuristic(candidates, m, scorer);
-
-        assert_eq!(&res, &vec![1, 3, 6]);
-
-        let mut rng = StdRng::seed_from_u64(42);
-
-        let graph_layers_builder = GraphLayersBuilder::new(num_points, m, m, ef_construct, 1, true);
-        insert_ids.shuffle(&mut rng);
-        for &id in &insert_ids {
-            let level_m = graph_layers_builder.get_m(0);
-            let mut links = graph_layers_builder.links_layers[0][0].write();
-            GraphLayersBuilder::connect_new_point(&mut links, id, 0, level_m, scorer)
-        }
-        let mut result = Vec::new();
-        graph_layers_builder.links_map(0, 0, |link| result.push(link));
-        assert_eq!(&result, &vec![1, 2, 3, 4, 5, 6]);
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/index/hnsw_index/graph_links.rs b/crates/qdrant/lib/segment/src/index/hnsw_index/graph_links.rs
deleted file mode 100644
index b47354b..0000000
--- a/crates/qdrant/lib/segment/src/index/hnsw_index/graph_links.rs
+++ /dev/null
@@ -1,713 +0,0 @@
-use std::cmp::max;
-use std::fs::OpenOptions;
-use std::mem::size_of;
-use std::ops::Range;
-use std::path::{Path, PathBuf};
-use std::sync::Arc;
-
-use memmap2::{Mmap, MmapMut};
-
-use crate::common::mmap_ops;
-use crate::common::vector_utils::TrySetCapacityExact;
-use crate::entry::entry_point::{OperationError, OperationResult};
-use crate::madvise;
-use crate::types::PointOffsetType;
-
-pub const MMAP_PANIC_MESSAGE: &str = "Mmap links are not loaded";
-
-/*
-Links data for whole graph layers.
-
-                                    sorted
-                     points:        points:
-points to lvl        012345         142350
-     0 -> 0
-     1 -> 4    lvl4:  7       lvl4: 7
-     2 -> 2    lvl3:  Z  Y    lvl3: ZY
-     3 -> 2    lvl2:  abcd    lvl2: adbc
-     4 -> 3    lvl1:  ABCDE   lvl1: ADBCE
-     5 -> 1    lvl0: 123456   lvl0: 123456  <- lvl 0 is not sorted
-
-
-lvl offset:        6       11     15     17
-                   │       │      │      │
-                   │       │      │      │
-                   ▼       ▼      ▼      ▼
-indexes:  012345   6789A   BCDE   FG     H
-
-flatten:  123456   ADBCE   adbc   ZY     7
-                   ▲ ▲ ▲   ▲ ▲    ▲      ▲
-                   │ │ │   │ │    │      │
-                   │ │ │   │ │    │      │
-                   │ │ │   │ │    │      │
-reindex:           142350  142350 142350 142350  (same for each level)
-
-
-for lvl > 0:
-links offset = level_offsets[level] + offsets[reindex[point_id]]
-*/
-
-#[derive(Default)]
-struct GraphLinksFileHeader {
-    pub point_count: u64,
-    pub levels_count: u64,
-    pub total_links_len: u64,
-    pub total_offsets_len: u64,
-}
-
-fn get_reindex_slice<'a>(
-    data: &'a [u8],
-    header: &'a GraphLinksFileHeader,
-) -> &'a [PointOffsetType] {
-    let reindex_range = header.get_reindex_range();
-    let reindex_byte_slice = &data[reindex_range];
-    mmap_ops::transmute_from_u8_to_slice(reindex_byte_slice)
-}
-
-fn get_links_slice<'a>(data: &'a [u8], header: &'a GraphLinksFileHeader) -> &'a [PointOffsetType] {
-    let links_range = header.get_links_range();
-    let links_byte_slice = &data[links_range];
-    mmap_ops::transmute_from_u8_to_slice(links_byte_slice)
-}
-
-fn get_offsets_slice<'a>(data: &'a [u8], header: &'a GraphLinksFileHeader) -> &'a [u64] {
-    let offsets_range = header.get_offsets_range();
-    let offsets_byte_slice = &data[offsets_range];
-    mmap_ops::transmute_from_u8_to_slice(offsets_byte_slice)
-}
-
-fn get_level_offsets<'a>(data: &'a [u8], header: &GraphLinksFileHeader) -> &'a [u64] {
-    let level_offsets_range = header.get_level_offsets_range();
-    let level_offsets_byte_slice = &data[level_offsets_range];
-    mmap_ops::transmute_from_u8_to_slice(level_offsets_byte_slice)
-}
-
-impl GraphLinksFileHeader {
-    pub fn raw_size() -> usize {
-        size_of::<u64>() * 4
-    }
-
-    pub fn serialize_bytes_to(&self, raw_data: &mut [u8]) {
-        let byte_slice = &mut raw_data[0..Self::raw_size()];
-        let arr: &mut [u64] = mmap_ops::transmute_from_u8_to_mut_slice(byte_slice);
-        arr[0] = self.point_count;
-        arr[1] = self.levels_count;
-        arr[2] = self.total_links_len;
-        arr[3] = self.total_offsets_len;
-    }
-
-    pub fn deserialize_bytes_from(raw_data: &[u8]) -> GraphLinksFileHeader {
-        let byte_slice = &raw_data[0..Self::raw_size()];
-        let arr: &[u64] = mmap_ops::transmute_from_u8_to_slice(byte_slice);
-        GraphLinksFileHeader {
-            point_count: arr[0],
-            levels_count: arr[1],
-            total_links_len: arr[2],
-            total_offsets_len: arr[3],
-        }
-    }
-
-    pub fn get_data_size(&self) -> u64 {
-        self.get_offsets_range().end as u64
-    }
-
-    pub fn get_level_offsets_range(&self) -> Range<usize> {
-        // level offsets are stored after header
-        // but we might want to have some extra space for future changes
-        let start = max(64, Self::raw_size());
-        start..start + self.levels_count as usize * size_of::<u64>()
-    }
-
-    pub fn get_reindex_range(&self) -> Range<usize> {
-        let start = self.get_level_offsets_range().end;
-        start..start + self.point_count as usize * size_of::<PointOffsetType>()
-    }
-
-    pub fn get_links_range(&self) -> Range<usize> {
-        let start = self.get_reindex_range().end;
-        start..start + self.total_links_len as usize * size_of::<PointOffsetType>()
-    }
-
-    pub fn get_offsets_range(&self) -> Range<usize> {
-        let start = self.get_links_range().end;
-        start..start + self.total_offsets_len as usize * size_of::<u64>()
-    }
-}
-
-pub struct GraphLinksConverter {
-    edges: Vec<Vec<Vec<PointOffsetType>>>,
-    reindex: Vec<PointOffsetType>,
-    back_index: Vec<usize>,
-    total_links_len: usize,
-    total_offsets_len: usize,
-    path: Option<PathBuf>,
-}
-
-impl GraphLinksConverter {
-    pub fn new(edges: Vec<Vec<Vec<PointOffsetType>>>) -> Self {
-        if edges.is_empty() {
-            return Self {
-                edges,
-                reindex: Vec::new(),
-                back_index: Vec::new(),
-                total_links_len: 0,
-                total_offsets_len: 1,
-                path: None,
-            };
-        }
-
-        // create map from index in `offsets` to point_id
-        let mut back_index: Vec<usize> = (0..edges.len()).collect();
-        // sort by max layer and use this map to build `Self.reindex`
-        back_index.sort_unstable_by_key(|&i| edges[i].len());
-        back_index.reverse();
-
-        // `reindex` is map from point id to index in `Self.offsets`
-        let mut reindex = vec![0; back_index.len()];
-        for i in 0..back_index.len() {
-            reindex[back_index[i]] = i as PointOffsetType;
-        }
-
-        // estimate size of `links` and `offsets`
-        let mut total_links_len = 0;
-        let mut total_offsets_len = 1;
-        for point in edges.iter() {
-            for layer in point.iter() {
-                total_links_len += layer.len();
-                total_offsets_len += 1;
-            }
-        }
-
-        Self {
-            edges,
-            reindex,
-            back_index,
-            total_links_len,
-            total_offsets_len,
-            path: None,
-        }
-    }
-
-    pub fn set_path(&mut self, path: PathBuf) {
-        self.path = Some(path);
-    }
-
-    fn get_header(&self) -> GraphLinksFileHeader {
-        GraphLinksFileHeader {
-            point_count: self.reindex.len() as u64,
-            levels_count: self.get_levels_count() as u64,
-            total_links_len: self.total_links_len as u64,
-            total_offsets_len: self.total_offsets_len as u64,
-        }
-    }
-
-    /// Size of compacted graph in bytes.
-    pub fn data_size(&self) -> u64 {
-        self.get_header().get_data_size()
-    }
-
-    pub fn serialize_to(&self, bytes_data: &mut [u8]) {
-        let header = GraphLinksFileHeader {
-            point_count: self.reindex.len() as u64,
-            levels_count: self.get_levels_count() as u64,
-            total_links_len: self.total_links_len as u64,
-            total_offsets_len: self.total_offsets_len as u64,
-        };
-
-        header.serialize_bytes_to(bytes_data);
-
-        {
-            let reindex_range = header.get_reindex_range();
-            let reindex_byte_slice = &mut bytes_data[reindex_range];
-            let reindex_slice: &mut [PointOffsetType] =
-                mmap_ops::transmute_from_u8_to_mut_slice(reindex_byte_slice);
-            reindex_slice.copy_from_slice(&self.reindex);
-        }
-
-        let mut level_offsets = Vec::new();
-        {
-            let links_range = header.get_links_range();
-            let offsets_range = header.get_offsets_range();
-            let union_range = links_range.start..offsets_range.end;
-            let (links_mmap, offsets_mmap) = bytes_data[union_range]
-                .as_mut()
-                .split_at_mut(links_range.len());
-            let links_mmap: &mut [PointOffsetType] =
-                mmap_ops::transmute_from_u8_to_mut_slice(links_mmap);
-            let offsets_mmap: &mut [u64] = mmap_ops::transmute_from_u8_to_mut_slice(offsets_mmap);
-            offsets_mmap[0] = 0;
-
-            let mut links_pos = 0;
-            let mut offsets_pos = 1;
-            for level in 0..header.levels_count as usize {
-                level_offsets.push(offsets_pos as u64 - 1);
-                self.iterate_level_points(level, |_, links| {
-                    links_mmap[links_pos..links_pos + links.len()].copy_from_slice(links);
-                    links_pos += links.len();
-
-                    offsets_mmap[offsets_pos] = links_pos as u64;
-                    offsets_pos += 1;
-                });
-            }
-        }
-
-        {
-            let level_offsets_range = header.get_level_offsets_range();
-            let level_offsets_byte_slice = &mut bytes_data[level_offsets_range];
-            let level_offsets_slice: &mut [u64] =
-                mmap_ops::transmute_from_u8_to_mut_slice(level_offsets_byte_slice);
-            level_offsets_slice.copy_from_slice(&level_offsets);
-        }
-    }
-
-    pub fn to_bytes(&self) -> Vec<u8> {
-        let mut bytes = vec![0; self.data_size() as usize];
-        self.serialize_to(&mut bytes);
-        bytes
-    }
-
-    pub fn save_as(&mut self, path: &Path) -> OperationResult<()> {
-        self.path = Some(path.to_path_buf());
-        let temp_path = path.with_extension("tmp");
-        {
-            let file = OpenOptions::new()
-                .read(true)
-                .write(true)
-                .create(true)
-                .open(temp_path.as_path())?;
-
-            file.set_len(self.data_size())?;
-            let m = unsafe { MmapMut::map_mut(&file) };
-            let mut mmap = m?;
-
-            self.serialize_to(&mut mmap);
-
-            mmap.flush()?;
-        }
-        std::fs::rename(temp_path, path)?;
-
-        Ok(())
-    }
-
-    pub fn get_levels_count(&self) -> usize {
-        if self.back_index.is_empty() {
-            return 0;
-        }
-        // because back_index is sorted by point`s max layer, we can retrieve max level from `point_id = back_index[0]`
-        self.edges[self.back_index[0]].len()
-    }
-
-    pub fn iterate_level_points<F>(&self, level: usize, mut f: F)
-    where
-        F: FnMut(usize, &Vec<PointOffsetType>),
-    {
-        let edges_len = self.edges.len();
-        if level == 0 {
-            (0..edges_len).for_each(|point_id| f(point_id, &self.edges[point_id][0]));
-        } else {
-            for i in 0..edges_len {
-                let point_id = self.back_index[i];
-                if level >= self.edges[point_id].len() {
-                    break;
-                }
-                f(point_id, &self.edges[point_id][level]);
-            }
-        }
-    }
-}
-
-pub trait GraphLinks: Default {
-    fn load_from_file(path: &Path) -> OperationResult<Self>;
-
-    fn from_converter(converter: GraphLinksConverter) -> OperationResult<Self>;
-
-    fn offsets_len(&self) -> usize;
-
-    fn levels_count(&self) -> usize;
-
-    fn get_links(&self, range: Range<usize>) -> &[PointOffsetType];
-
-    fn get_links_range(&self, idx: usize) -> Range<usize>;
-
-    fn get_level_offset(&self, level: usize) -> usize;
-
-    fn reindex(&self, point_id: PointOffsetType) -> PointOffsetType;
-
-    fn num_points(&self) -> usize;
-
-    fn links(&self, point_id: PointOffsetType, level: usize) -> &[PointOffsetType] {
-        if level == 0 {
-            let links_range = self.get_links_range(point_id as usize);
-            self.get_links(links_range)
-        } else {
-            let reindexed_point_id = self.reindex(point_id) as usize;
-            let layer_offsets_start = self.get_level_offset(level);
-            let links_range = self.get_links_range(layer_offsets_start + reindexed_point_id);
-            self.get_links(links_range)
-        }
-    }
-
-    fn point_level(&self, point_id: PointOffsetType) -> usize {
-        let reindexed_point_id = self.reindex(point_id) as usize;
-        // level 0 is always present, start checking from level 1. Stop checking when level is incorrect
-        for level in 1.. {
-            if let Some(offsets_range) = self.get_level_offsets_range(level) {
-                if offsets_range.start + reindexed_point_id >= offsets_range.end {
-                    // incorrect level because point_id is out of range
-                    return level - 1;
-                }
-            } else {
-                // incorrect level because this level is larger that available levels
-                return level - 1;
-            }
-        }
-        unreachable!()
-    }
-
-    fn get_level_offsets_range(&self, level: usize) -> Option<Range<usize>> {
-        if level < self.levels_count() {
-            let layer_offsets_start = self.get_level_offset(level);
-            let layer_offsets_end = if level + 1 < self.levels_count() {
-                // `level` is not last, next level_offsets is end of range
-                self.get_level_offset(level + 1)
-            } else {
-                // `level` is last, next `offsets.len()` is end of range
-                self.offsets_len() - 1
-            };
-            Some(layer_offsets_start..layer_offsets_end)
-        } else {
-            None
-        }
-    }
-}
-
-#[derive(Default)]
-pub struct GraphLinksRam {
-    // all flattened links of all levels
-    links: Vec<PointOffsetType>,
-    // all ranges in `links`. each range is `links[offsets[i]..offsets[i+1]]`
-    // ranges are sorted by level
-    offsets: Vec<u64>,
-    // start offset of each level in `offsets`
-    level_offsets: Vec<u64>,
-    // for level 1 and above: reindex[point_id] = index of point_id in offsets
-    reindex: Vec<PointOffsetType>,
-}
-
-impl GraphLinksRam {
-    pub fn load_from_memory(data: &[u8]) -> OperationResult<Self> {
-        let header = GraphLinksFileHeader::deserialize_bytes_from(data);
-
-        let mut links: Vec<PointOffsetType> = Vec::new();
-        let mut offsets: Vec<u64> = Vec::new();
-        let mut level_offsets: Vec<u64> = Vec::new();
-        let mut reindex: Vec<PointOffsetType> = Vec::new();
-
-        let link_slice = get_links_slice(data, &header);
-        links.try_set_capacity_exact(link_slice.len())?;
-        links.extend_from_slice(link_slice);
-
-        let offsets_slice = get_offsets_slice(data, &header);
-        offsets.try_set_capacity_exact(offsets_slice.len())?;
-        offsets.extend_from_slice(offsets_slice);
-
-        let level_offsets_slice = get_level_offsets(data, &header);
-        level_offsets.try_set_capacity_exact(level_offsets_slice.len())?;
-        level_offsets.extend_from_slice(level_offsets_slice);
-
-        let reindex_slice = get_reindex_slice(data, &header);
-        reindex.try_set_capacity_exact(reindex_slice.len())?;
-        reindex.extend_from_slice(reindex_slice);
-
-        let graph_links = Self {
-            links,
-            offsets,
-            level_offsets,
-            reindex,
-        };
-
-        Ok(graph_links)
-    }
-}
-
-impl GraphLinks for GraphLinksRam {
-    fn load_from_file(path: &Path) -> OperationResult<Self> {
-        let file = OpenOptions::new()
-            .read(true)
-            .write(false)
-            .create(false)
-            .open(path)?;
-
-        let mmap = unsafe { Mmap::map(&file)? };
-
-        Self::load_from_memory(&mmap)
-    }
-
-    fn from_converter(converter: GraphLinksConverter) -> OperationResult<Self> {
-        let mut data = vec![0; converter.data_size() as usize];
-        converter.serialize_to(&mut data);
-        drop(converter);
-
-        Self::load_from_memory(&data)
-    }
-
-    fn offsets_len(&self) -> usize {
-        self.offsets.len()
-    }
-
-    fn levels_count(&self) -> usize {
-        self.level_offsets.len()
-    }
-
-    fn get_links(&self, range: Range<usize>) -> &[PointOffsetType] {
-        &self.links[range]
-    }
-
-    fn get_links_range(&self, idx: usize) -> Range<usize> {
-        let start = self.offsets[idx];
-        let end = self.offsets[idx + 1];
-        start as usize..end as usize
-    }
-
-    fn get_level_offset(&self, level: usize) -> usize {
-        self.level_offsets[level] as usize
-    }
-
-    fn reindex(&self, point_id: PointOffsetType) -> PointOffsetType {
-        self.reindex[point_id as usize]
-    }
-
-    fn num_points(&self) -> usize {
-        self.reindex.len()
-    }
-}
-
-#[derive(Default)]
-pub struct GraphLinksMmap {
-    mmap: Option<Arc<Mmap>>,
-    header: GraphLinksFileHeader,
-    level_offsets: Vec<u64>,
-}
-
-impl GraphLinksMmap {
-    fn get_reindex_slice(&self) -> &[PointOffsetType] {
-        if let Some(mmap) = &self.mmap {
-            get_reindex_slice(mmap, &self.header)
-        } else {
-            panic!("{}", MMAP_PANIC_MESSAGE);
-        }
-    }
-
-    fn get_links_slice(&self) -> &[PointOffsetType] {
-        if let Some(mmap) = &self.mmap {
-            get_links_slice(mmap, &self.header)
-        } else {
-            panic!("{}", "Mmap links are not loaded");
-        }
-    }
-
-    fn get_offsets_slice(&self) -> &[u64] {
-        if let Some(mmap) = &self.mmap {
-            get_offsets_slice(mmap, &self.header)
-        } else {
-            panic!("{}", MMAP_PANIC_MESSAGE);
-        }
-    }
-
-    pub fn prefault_mmap_pages(&self, path: &Path) -> Option<mmap_ops::PrefaultMmapPages> {
-        mmap_ops::PrefaultMmapPages::new(self.mmap.clone()?, Some(path)).into()
-    }
-}
-
-impl GraphLinks for GraphLinksMmap {
-    fn load_from_file(path: &Path) -> OperationResult<Self> {
-        let file = OpenOptions::new()
-            .read(true)
-            .write(false)
-            .create(false)
-            .open(path)?;
-
-        let mmap = unsafe { Mmap::map(&file)? };
-        madvise::madvise(&mmap, madvise::get_global())?;
-
-        let header = GraphLinksFileHeader::deserialize_bytes_from(&mmap);
-        let level_offsets = get_level_offsets(&mmap, &header).to_vec();
-
-        Ok(Self {
-            mmap: Some(Arc::new(mmap)),
-            header,
-            level_offsets,
-        })
-    }
-
-    fn from_converter(converter: GraphLinksConverter) -> OperationResult<Self> {
-        if let Some(path) = converter.path {
-            GraphLinksMmap::load_from_file(&path)
-        } else {
-            Err(OperationError::service_error(
-                "HNSW links Data needs to be saved to file before it can be loaded as mmap",
-            ))
-        }
-    }
-
-    fn offsets_len(&self) -> usize {
-        self.header.get_offsets_range().len() / size_of::<u64>()
-    }
-
-    fn levels_count(&self) -> usize {
-        self.level_offsets.len()
-    }
-
-    fn get_links(&self, range: Range<usize>) -> &[PointOffsetType] {
-        &self.get_links_slice()[range]
-    }
-
-    fn get_links_range(&self, idx: usize) -> Range<usize> {
-        let offsets_slice = self.get_offsets_slice();
-        offsets_slice[idx] as usize..offsets_slice[idx + 1] as usize
-    }
-
-    fn get_level_offset(&self, level: usize) -> usize {
-        self.level_offsets[level] as usize
-    }
-
-    fn reindex(&self, point_id: PointOffsetType) -> PointOffsetType {
-        self.get_reindex_slice()[point_id as usize]
-    }
-
-    fn num_points(&self) -> usize {
-        self.header.point_count as usize
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use rand::Rng;
-    use tempfile::Builder;
-
-    use super::*;
-    use crate::types::PointOffsetType;
-
-    fn to_vec<TGraphLinks: GraphLinks>(links: &TGraphLinks) -> Vec<Vec<Vec<PointOffsetType>>> {
-        let mut result = Vec::new();
-        let num_points = links.num_points();
-        for i in 0..num_points {
-            let mut layers = Vec::new();
-            let num_levels = links.point_level(i as PointOffsetType) + 1;
-            for level in 0..num_levels {
-                let links = links.links(i as PointOffsetType, level).to_vec();
-                layers.push(links);
-            }
-            result.push(layers);
-        }
-        result
-    }
-
-    fn random_links(
-        points_count: usize,
-        max_levels_count: usize,
-    ) -> Vec<Vec<Vec<PointOffsetType>>> {
-        let mut rng = rand::thread_rng();
-        (0..points_count)
-            .map(|_| {
-                let levels_count = rng.gen_range(1..max_levels_count);
-                (0..levels_count)
-                    .map(|_| {
-                        let links_count = rng.gen_range(0..max_levels_count);
-                        (0..links_count)
-                            .map(|_| rng.gen_range(0..points_count) as PointOffsetType)
-                            .collect()
-                    })
-                    .collect()
-            })
-            .collect()
-    }
-
-    /// Test that random links can be saved by `GraphLinksConverter` and loaded correctly by a GraphLinks impl.
-    fn test_save_load<A>(points_count: usize, max_levels_count: usize)
-    where
-        A: GraphLinks,
-    {
-        let path = Builder::new().prefix("graph_dir").tempdir().unwrap();
-        let links_file = path.path().join("links.bin");
-        let links = random_links(points_count, max_levels_count);
-        {
-            let mut links_converter = GraphLinksConverter::new(links.clone());
-            links_converter.save_as(&links_file).unwrap();
-        }
-        let cmp_links = to_vec(&A::load_from_file(&links_file).unwrap());
-        assert_eq!(links, cmp_links);
-    }
-
-    #[test]
-    fn test_graph_links_construction() {
-        // no points
-        let links: Vec<Vec<Vec<PointOffsetType>>> = vec![];
-        let cmp_links = to_vec(
-            &GraphLinksRam::from_converter(GraphLinksConverter::new(links.clone())).unwrap(),
-        );
-        assert_eq!(links, cmp_links);
-
-        // 2 points without any links
-        let links: Vec<Vec<Vec<PointOffsetType>>> = vec![vec![vec![]], vec![vec![]]];
-        let cmp_links = to_vec(
-            &GraphLinksRam::from_converter(GraphLinksConverter::new(links.clone())).unwrap(),
-        );
-        assert_eq!(links, cmp_links);
-
-        // one link at level 0
-        let links: Vec<Vec<Vec<PointOffsetType>>> = vec![vec![vec![1]], vec![vec![0]]];
-        let cmp_links = to_vec(
-            &GraphLinksRam::from_converter(GraphLinksConverter::new(links.clone())).unwrap(),
-        );
-        assert_eq!(links, cmp_links);
-
-        // 3 levels with no links at second level
-        let links: Vec<Vec<Vec<PointOffsetType>>> = vec![
-            vec![vec![1, 2]],
-            vec![vec![0, 2], vec![], vec![2]],
-            vec![vec![0, 1], vec![], vec![1]],
-        ];
-        let cmp_links = to_vec(
-            &GraphLinksRam::from_converter(GraphLinksConverter::new(links.clone())).unwrap(),
-        );
-        assert_eq!(links, cmp_links);
-
-        // 3 levels with no links at last level
-        let links: Vec<Vec<Vec<PointOffsetType>>> = vec![
-            vec![vec![1, 2], vec![2], vec![]],
-            vec![vec![0, 2], vec![1], vec![]],
-            vec![vec![0, 1]],
-        ];
-        let cmp_links = to_vec(
-            &GraphLinksRam::from_converter(GraphLinksConverter::new(links.clone())).unwrap(),
-        );
-        assert_eq!(links, cmp_links);
-
-        // 4 levels with random unexists links
-        let links: Vec<Vec<Vec<PointOffsetType>>> = vec![
-            vec![vec![1, 2, 5, 6]],
-            vec![vec![0, 2, 7, 8], vec![], vec![34, 45, 10]],
-            vec![vec![0, 1, 1, 2], vec![3, 5, 9], vec![9, 8], vec![9], vec![]],
-            vec![vec![0, 1, 5, 6], vec![1, 5, 0]],
-            vec![vec![0, 1, 9, 18], vec![1, 5, 6], vec![5], vec![9]],
-        ];
-        let cmp_links = to_vec(
-            &GraphLinksRam::from_converter(GraphLinksConverter::new(links.clone())).unwrap(),
-        );
-        assert_eq!(links, cmp_links);
-
-        // fully random links
-        let links = random_links(100, 10);
-        let cmp_links = to_vec(
-            &GraphLinksRam::from_converter(GraphLinksConverter::new(links.clone())).unwrap(),
-        );
-        assert_eq!(links, cmp_links);
-    }
-
-    #[test]
-    fn test_graph_links_mmap_ram_compatibility() {
-        test_save_load::<GraphLinksRam>(1000, 10);
-        test_save_load::<GraphLinksMmap>(1000, 10);
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/index/hnsw_index/hnsw.rs b/crates/qdrant/lib/segment/src/index/hnsw_index/hnsw.rs
deleted file mode 100644
index 3dfb116..0000000
--- a/crates/qdrant/lib/segment/src/index/hnsw_index/hnsw.rs
+++ /dev/null
@@ -1,695 +0,0 @@
-use std::fs::create_dir_all;
-use std::path::{Path, PathBuf};
-use std::sync::atomic::AtomicBool;
-use std::sync::Arc;
-
-use atomic_refcell::AtomicRefCell;
-use log::debug;
-use parking_lot::Mutex;
-use rand::thread_rng;
-use rayon::prelude::*;
-use rayon::ThreadPool;
-
-use super::graph_links::{GraphLinks, GraphLinksMmap};
-use crate::common::mmap_ops;
-use crate::common::operation_time_statistics::{
-    OperationDurationsAggregator, ScopeDurationMeasurer,
-};
-use crate::data_types::vectors::VectorElementType;
-use crate::entry::entry_point::{check_process_stopped, OperationError, OperationResult};
-use crate::id_tracker::IdTrackerSS;
-use crate::index::hnsw_index::build_condition_checker::BuildConditionChecker;
-use crate::index::hnsw_index::config::HnswGraphConfig;
-use crate::index::hnsw_index::graph_layers::GraphLayers;
-use crate::index::hnsw_index::graph_layers_builder::GraphLayersBuilder;
-use crate::index::hnsw_index::max_rayon_threads;
-use crate::index::hnsw_index::point_scorer::FilteredScorer;
-use crate::index::query_estimator::adjust_to_available_vectors;
-use crate::index::sample_estimation::sample_check_cardinality;
-use crate::index::struct_payload_index::StructPayloadIndex;
-use crate::index::visited_pool::VisitedList;
-use crate::index::{PayloadIndex, VectorIndex};
-use crate::telemetry::VectorIndexSearchesTelemetry;
-use crate::types::Condition::Field;
-#[cfg(debug_assertions)]
-use crate::types::PointOffsetType;
-use crate::types::{
-    default_quantization_ignore_value, FieldCondition, Filter, HnswConfig,
-    QuantizationSearchParams, SearchParams, VECTOR_ELEMENT_SIZE,
-};
-use crate::vector_storage::{
-    new_raw_scorer, new_stoppable_raw_scorer, ScoredPointOffset, VectorStorage, VectorStorageEnum,
-};
-
-const HNSW_USE_HEURISTIC: bool = true;
-const BYTES_IN_KB: usize = 1024;
-
-pub struct HNSWIndex<TGraphLinks: GraphLinks> {
-    id_tracker: Arc<AtomicRefCell<IdTrackerSS>>,
-    vector_storage: Arc<AtomicRefCell<VectorStorageEnum>>,
-    payload_index: Arc<AtomicRefCell<StructPayloadIndex>>,
-    config: HnswGraphConfig,
-    path: PathBuf,
-    graph: Option<GraphLayers<TGraphLinks>>,
-    searches_telemetry: SearchesTelemetry,
-}
-
-struct SearchesTelemetry {
-    unfiltered_plain: Arc<Mutex<OperationDurationsAggregator>>,
-    unfiltered_hnsw: Arc<Mutex<OperationDurationsAggregator>>,
-    small_cardinality: Arc<Mutex<OperationDurationsAggregator>>,
-    large_cardinality: Arc<Mutex<OperationDurationsAggregator>>,
-    exact_filtered: Arc<Mutex<OperationDurationsAggregator>>,
-    exact_unfiltered: Arc<Mutex<OperationDurationsAggregator>>,
-}
-
-impl<TGraphLinks: GraphLinks> HNSWIndex<TGraphLinks> {
-    pub fn open(
-        path: &Path,
-        id_tracker: Arc<AtomicRefCell<IdTrackerSS>>,
-        vector_storage: Arc<AtomicRefCell<VectorStorageEnum>>,
-        payload_index: Arc<AtomicRefCell<StructPayloadIndex>>,
-        hnsw_config: HnswConfig,
-    ) -> OperationResult<Self> {
-        create_dir_all(path)?;
-
-        let config_path = HnswGraphConfig::get_config_path(path);
-        let config = if config_path.exists() {
-            HnswGraphConfig::load(&config_path)?
-        } else {
-            let vector_storage = vector_storage.borrow();
-            let available_vectors = vector_storage.available_vector_count();
-            let full_scan_threshold = hnsw_config.full_scan_threshold.saturating_mul(BYTES_IN_KB)
-                / (vector_storage.vector_dim() * VECTOR_ELEMENT_SIZE);
-
-            HnswGraphConfig::new(
-                hnsw_config.m,
-                hnsw_config.ef_construct,
-                full_scan_threshold,
-                hnsw_config.max_indexing_threads,
-                hnsw_config.payload_m,
-                available_vectors,
-            )
-        };
-
-        let graph_path = GraphLayers::<TGraphLinks>::get_path(path);
-        let graph_links_path = GraphLayers::<TGraphLinks>::get_links_path(path);
-        let graph = if graph_path.exists() {
-            Some(GraphLayers::load(&graph_path, &graph_links_path)?)
-        } else {
-            None
-        };
-
-        Ok(HNSWIndex {
-            id_tracker,
-            vector_storage,
-            payload_index,
-            config,
-            path: path.to_owned(),
-            graph,
-            searches_telemetry: SearchesTelemetry {
-                unfiltered_hnsw: OperationDurationsAggregator::new(),
-                unfiltered_plain: OperationDurationsAggregator::new(),
-                small_cardinality: OperationDurationsAggregator::new(),
-                large_cardinality: OperationDurationsAggregator::new(),
-                exact_filtered: OperationDurationsAggregator::new(),
-                exact_unfiltered: OperationDurationsAggregator::new(),
-            },
-        })
-    }
-
-    fn save_config(&self) -> OperationResult<()> {
-        let config_path = HnswGraphConfig::get_config_path(&self.path);
-        self.config.save(&config_path)
-    }
-
-    fn save_graph(&self) -> OperationResult<()> {
-        let graph_path = GraphLayers::<TGraphLinks>::get_path(&self.path);
-        if let Some(graph) = &self.graph {
-            graph.save(&graph_path)
-        } else {
-            Ok(())
-        }
-    }
-
-    pub fn save(&self) -> OperationResult<()> {
-        self.save_config()?;
-        self.save_graph()?;
-        Ok(())
-    }
-
-    pub fn build_filtered_graph(
-        &self,
-        pool: &ThreadPool,
-        stopped: &AtomicBool,
-        graph_layers_builder: &mut GraphLayersBuilder,
-        condition: FieldCondition,
-        block_filter_list: &mut VisitedList,
-    ) -> OperationResult<()> {
-        block_filter_list.next_iteration();
-
-        let filter = Filter::new_must(Field(condition));
-
-        let id_tracker = self.id_tracker.borrow();
-        let payload_index = self.payload_index.borrow();
-        let vector_storage = self.vector_storage.borrow();
-
-        let deleted_bitslice = vector_storage.deleted_vector_bitslice();
-
-        let points_to_index: Vec<_> = payload_index
-            .query_points(&filter)
-            .into_iter()
-            .filter(|&point_id| {
-                !deleted_bitslice
-                    .get(point_id as usize)
-                    .map(|x| *x)
-                    .unwrap_or(false)
-            })
-            .collect();
-
-        for block_point_id in points_to_index.iter().copied() {
-            block_filter_list.check_and_update_visited(block_point_id);
-        }
-
-        if let Some(graph) = &self.graph {
-            for &block_point_id in &points_to_index {
-                // Use same levels, as in the original graph
-                let level = graph.point_level(block_point_id);
-                graph_layers_builder.set_levels(block_point_id, level);
-            }
-        }
-
-        pool.install(|| {
-            points_to_index
-                .into_par_iter()
-                .try_for_each(|block_point_id| {
-                    check_process_stopped(stopped)?;
-
-                    let vector = vector_storage.get_vector(block_point_id).to_vec();
-                    let raw_scorer =
-                        if let Some(quantized_storage) = vector_storage.quantized_storage() {
-                            quantized_storage.raw_scorer(
-                                &vector,
-                                id_tracker.deleted_point_bitslice(),
-                                deleted_bitslice,
-                                stopped,
-                            )
-                        } else {
-                            new_raw_scorer(
-                                vector.to_owned(),
-                                &vector_storage,
-                                id_tracker.deleted_point_bitslice(),
-                            )
-                        };
-                    let block_condition_checker = BuildConditionChecker {
-                        filter_list: block_filter_list,
-                        current_point: block_point_id,
-                    };
-                    let points_scorer =
-                        FilteredScorer::new(raw_scorer.as_ref(), Some(&block_condition_checker));
-
-                    graph_layers_builder.link_new_point(block_point_id, points_scorer);
-                    Ok(())
-                })
-        })
-    }
-
-    pub fn search_with_graph(
-        &self,
-        vector: &[VectorElementType],
-        filter: Option<&Filter>,
-        top: usize,
-        params: Option<&SearchParams>,
-        is_stopped: &AtomicBool,
-    ) -> Vec<ScoredPointOffset> {
-        let ef = params
-            .and_then(|params| params.hnsw_ef)
-            .unwrap_or(self.config.ef);
-
-        let id_tracker = self.id_tracker.borrow();
-        let vector_storage = self.vector_storage.borrow();
-        let quantized_storage = vector_storage.quantized_storage();
-
-        // Check that:
-        // - `params` is `Some`
-        // - `params.quantization` is `Some`
-        // - and `params.quantization.ignore` is `false`
-        let quantization_params = params.and_then(|p| p.quantization).unwrap_or_default();
-
-        let (raw_scorer, quantized) = match quantized_storage {
-            // If `quantization_params` is `Some`, then quantization is *not* ignored
-            Some(quantized_storage) if !quantization_params.ignore => {
-                let scorer = quantized_storage.raw_scorer(
-                    vector,
-                    id_tracker.deleted_point_bitslice(),
-                    vector_storage.deleted_vector_bitslice(),
-                    is_stopped,
-                );
-
-                (scorer, true)
-            }
-
-            _ => {
-                let scorer = new_stoppable_raw_scorer(
-                    vector.to_owned(),
-                    &vector_storage,
-                    id_tracker.deleted_point_bitslice(),
-                    is_stopped,
-                );
-
-                (scorer, false)
-            }
-        };
-
-        let payload_index = self.payload_index.borrow();
-        let filter_context = filter.map(|f| payload_index.filter_context(f));
-        let points_scorer = FilteredScorer::new(raw_scorer.as_ref(), filter_context.as_deref());
-
-        let Some(graph) = &self.graph else {
-            return Vec::new();
-        };
-
-        if quantized && quantization_params.rescore {
-            let oversampling = quantization_params.oversampling.unwrap_or(1.0);
-
-            let oversampled_top = if oversampling > 1.0 {
-                (oversampling * top as f64) as usize
-            } else {
-                // Very unlikely this is reached because validation enforces oversampling >= 1.0
-                top
-            };
-
-            let search_result = graph.search(oversampled_top, ef, points_scorer);
-
-            let raw_scorer = new_stoppable_raw_scorer(
-                vector.to_owned(),
-                &vector_storage,
-                id_tracker.deleted_point_bitslice(),
-                is_stopped,
-            );
-
-            let mut ids_iterator = search_result.iter().map(|x| x.idx);
-            let mut re_scored = raw_scorer.score_points_unfiltered(&mut ids_iterator);
-
-            re_scored.sort_unstable();
-            re_scored.truncate(top);
-            re_scored
-        } else {
-            graph.search(top, ef, points_scorer)
-        }
-    }
-
-    fn search_vectors_with_graph(
-        &self,
-        vectors: &[&[VectorElementType]],
-        filter: Option<&Filter>,
-        top: usize,
-        params: Option<&SearchParams>,
-        is_stopped: &AtomicBool,
-    ) -> Vec<Vec<ScoredPointOffset>> {
-        vectors
-            .iter()
-            .map(|vector| self.search_with_graph(vector, filter, top, params, is_stopped))
-            .collect()
-    }
-
-    fn search_vectors_plain(
-        &self,
-        vectors: &[&[VectorElementType]],
-        filter: &Filter,
-        top: usize,
-        params: Option<&SearchParams>,
-        is_stopped: &AtomicBool,
-    ) -> Vec<Vec<ScoredPointOffset>> {
-        let id_tracker = self.id_tracker.borrow();
-        let payload_index = self.payload_index.borrow();
-        let vector_storage = self.vector_storage.borrow();
-        let filtered_points = payload_index.query_points(filter);
-        let ignore_quantization = params
-            .and_then(|p| p.quantization)
-            .map(|q| q.ignore)
-            .unwrap_or(default_quantization_ignore_value());
-        if ignore_quantization {
-            vectors
-                .iter()
-                .map(|vector| {
-                    new_stoppable_raw_scorer(
-                        vector.to_vec(),
-                        &vector_storage,
-                        id_tracker.deleted_point_bitslice(),
-                        is_stopped,
-                    )
-                    .peek_top_iter(&mut filtered_points.iter().copied(), top)
-                })
-                .collect()
-        } else {
-            vectors
-                .iter()
-                .map(|vector| {
-                    if let Some(quantized_storage) = vector_storage.quantized_storage() {
-                        quantized_storage
-                            .raw_scorer(
-                                vector,
-                                id_tracker.deleted_point_bitslice(),
-                                vector_storage.deleted_vector_bitslice(),
-                                is_stopped,
-                            )
-                            .peek_top_iter(&mut filtered_points.iter().copied(), top)
-                    } else {
-                        new_stoppable_raw_scorer(
-                            vector.to_vec(),
-                            &vector_storage,
-                            id_tracker.deleted_point_bitslice(),
-                            is_stopped,
-                        )
-                        .peek_top_iter(&mut filtered_points.iter().copied(), top)
-                    }
-                })
-                .collect()
-        }
-    }
-}
-
-impl HNSWIndex<GraphLinksMmap> {
-    pub fn prefault_mmap_pages(&self) -> Option<mmap_ops::PrefaultMmapPages> {
-        self.graph.as_ref()?.prefault_mmap_pages(&self.path)
-    }
-}
-
-impl<TGraphLinks: GraphLinks> VectorIndex for HNSWIndex<TGraphLinks> {
-    fn search(
-        &self,
-        vectors: &[&[VectorElementType]],
-        filter: Option<&Filter>,
-        top: usize,
-        params: Option<&SearchParams>,
-        is_stopped: &AtomicBool,
-    ) -> Vec<Vec<ScoredPointOffset>> {
-        let exact = params.map(|params| params.exact).unwrap_or(false);
-        match filter {
-            None => {
-                let id_tracker = self.id_tracker.borrow();
-                let vector_storage = self.vector_storage.borrow();
-
-                // Determine whether to do a plain or graph search, and pick search timer aggregator
-                // Because an HNSW graph is built, we'd normally always assume to search the graph.
-                // But because a lot of points may be deleted in this graph, it may just be faster
-                // to do a plain search instead.
-                let plain_search = exact
-                    || vector_storage.available_vector_count() < self.config.full_scan_threshold;
-
-                // Do plain or graph search
-                if plain_search {
-                    let _timer = ScopeDurationMeasurer::new(if exact {
-                        &self.searches_telemetry.exact_unfiltered
-                    } else {
-                        &self.searches_telemetry.unfiltered_plain
-                    });
-                    vectors
-                        .iter()
-                        .map(|vector| {
-                            new_stoppable_raw_scorer(
-                                vector.to_vec(),
-                                &vector_storage,
-                                id_tracker.deleted_point_bitslice(),
-                                is_stopped,
-                            )
-                            .peek_top_all(top)
-                        })
-                        .collect()
-                } else {
-                    let _timer =
-                        ScopeDurationMeasurer::new(&self.searches_telemetry.unfiltered_hnsw);
-                    self.search_vectors_with_graph(vectors, None, top, params, is_stopped)
-                }
-            }
-            Some(query_filter) => {
-                // depending on the amount of filtered-out points the optimal strategy could be
-                // - to retrieve possible points and score them after
-                // - to use HNSW index with filtering condition
-
-                // if exact search is requested, we should not use HNSW index
-                if exact {
-                    let exact_params = params.map(|params| {
-                        let mut params = *params;
-                        params.quantization = Some(QuantizationSearchParams {
-                            ignore: true,
-                            rescore: false,
-                            oversampling: None,
-                        }); // disable quantization for exact search
-                        params
-                    });
-                    let _timer =
-                        ScopeDurationMeasurer::new(&self.searches_telemetry.exact_filtered);
-                    return self.search_vectors_plain(
-                        vectors,
-                        query_filter,
-                        top,
-                        exact_params.as_ref(),
-                        is_stopped,
-                    );
-                }
-
-                let payload_index = self.payload_index.borrow();
-                let vector_storage = self.vector_storage.borrow();
-                let id_tracker = self.id_tracker.borrow();
-                let available_vector_count = vector_storage.available_vector_count();
-                let query_point_cardinality = payload_index.estimate_cardinality(query_filter);
-                let query_cardinality = adjust_to_available_vectors(
-                    query_point_cardinality,
-                    available_vector_count,
-                    id_tracker.available_point_count(),
-                );
-
-                if query_cardinality.max < self.config.full_scan_threshold {
-                    // if cardinality is small - use plain index
-                    let _timer =
-                        ScopeDurationMeasurer::new(&self.searches_telemetry.small_cardinality);
-                    return self.search_vectors_plain(
-                        vectors,
-                        query_filter,
-                        top,
-                        params,
-                        is_stopped,
-                    );
-                }
-
-                if query_cardinality.min > self.config.full_scan_threshold {
-                    // if cardinality is high enough - use HNSW index
-                    let _timer =
-                        ScopeDurationMeasurer::new(&self.searches_telemetry.large_cardinality);
-                    return self
-                        .search_vectors_with_graph(vectors, filter, top, params, is_stopped);
-                }
-
-                let filter_context = payload_index.filter_context(query_filter);
-
-                // Fast cardinality estimation is not enough, do sample estimation of cardinality
-                let id_tracker = self.id_tracker.borrow();
-                if sample_check_cardinality(
-                    id_tracker.sample_ids(Some(vector_storage.deleted_vector_bitslice())),
-                    |idx| filter_context.check(idx),
-                    self.config.full_scan_threshold,
-                    available_vector_count, // Check cardinality among available vectors
-                ) {
-                    // if cardinality is high enough - use HNSW index
-                    let _timer =
-                        ScopeDurationMeasurer::new(&self.searches_telemetry.large_cardinality);
-                    self.search_vectors_with_graph(vectors, filter, top, params, is_stopped)
-                } else {
-                    // if cardinality is small - use plain index
-                    let _timer =
-                        ScopeDurationMeasurer::new(&self.searches_telemetry.small_cardinality);
-                    self.search_vectors_plain(vectors, query_filter, top, params, is_stopped)
-                }
-            }
-        }
-    }
-
-    fn build_index(&mut self, stopped: &AtomicBool) -> OperationResult<()> {
-        // Build main index graph
-        let id_tracker = self.id_tracker.borrow();
-        let vector_storage = self.vector_storage.borrow();
-        let mut rng = thread_rng();
-
-        let total_vector_count = vector_storage.total_vector_count();
-        let deleted_bitslice = vector_storage.deleted_vector_bitslice();
-
-        debug!("building HNSW for {} vectors", total_vector_count);
-        let indexing_threshold = self.config.full_scan_threshold;
-        let mut graph_layers_builder = GraphLayersBuilder::new(
-            total_vector_count,
-            self.config.m,
-            self.config.m0,
-            self.config.ef_construct,
-            (total_vector_count
-                .checked_div(indexing_threshold)
-                .unwrap_or(0)
-                * 10)
-                .max(1),
-            HNSW_USE_HEURISTIC,
-        );
-
-        let pool = rayon::ThreadPoolBuilder::new()
-            .thread_name(|idx| format!("hnsw-build-{idx}"))
-            .num_threads(max_rayon_threads(self.config.max_indexing_threads))
-            .build()?;
-
-        for vector_id in id_tracker.iter_ids_excluding(deleted_bitslice) {
-            check_process_stopped(stopped)?;
-            let level = graph_layers_builder.get_random_layer(&mut rng);
-            graph_layers_builder.set_levels(vector_id, level);
-        }
-
-        let mut indexed_vectors = 0;
-
-        if self.config.m > 0 {
-            let ids: Vec<_> = id_tracker.iter_ids_excluding(deleted_bitslice).collect();
-
-            indexed_vectors = ids.len();
-
-            pool.install(|| {
-                ids.into_par_iter().try_for_each(|vector_id| {
-                    check_process_stopped(stopped)?;
-                    let vector = vector_storage.get_vector(vector_id).to_vec();
-                    let raw_scorer =
-                        if let Some(quantized_storage) = vector_storage.quantized_storage() {
-                            quantized_storage.raw_scorer(
-                                &vector,
-                                id_tracker.deleted_point_bitslice(),
-                                vector_storage.deleted_vector_bitslice(),
-                                stopped,
-                            )
-                        } else {
-                            new_raw_scorer(
-                                vector.to_owned(),
-                                &vector_storage,
-                                id_tracker.deleted_point_bitslice(),
-                            )
-                        };
-                    let points_scorer = FilteredScorer::new(raw_scorer.as_ref(), None);
-
-                    graph_layers_builder.link_new_point(vector_id, points_scorer);
-                    Ok::<_, OperationError>(())
-                })
-            })?;
-
-            debug!("finish main graph");
-        } else {
-            debug!("skip building main HNSW graph");
-        }
-
-        let mut block_filter_list = VisitedList::new(total_vector_count);
-        let visits_iteration = block_filter_list.get_current_iteration_id();
-
-        let payload_index = self.payload_index.borrow();
-        let payload_m = self.config.payload_m.unwrap_or(self.config.m);
-
-        if payload_m > 0 {
-            for (field, _) in payload_index.indexed_fields() {
-                debug!("building additional index for field {}", &field);
-
-                // It is expected, that graph will become disconnected less than
-                // $1/m$ points left.
-                // So blocks larger than $1/m$ are not needed.
-                // We add multiplier for the extra safety.
-                let percolation_multiplier = 2;
-                let max_block_size = if self.config.m > 0 {
-                    total_vector_count / self.config.m * percolation_multiplier
-                } else {
-                    usize::MAX
-                };
-                let min_block_size = indexing_threshold;
-
-                for payload_block in payload_index.payload_blocks(&field, min_block_size) {
-                    check_process_stopped(stopped)?;
-                    if payload_block.cardinality > max_block_size {
-                        continue;
-                    }
-                    // ToDo: re-use graph layer for same payload
-                    let mut additional_graph = GraphLayersBuilder::new_with_params(
-                        total_vector_count,
-                        payload_m,
-                        self.config.payload_m0.unwrap_or(self.config.m0),
-                        self.config.ef_construct,
-                        1,
-                        HNSW_USE_HEURISTIC,
-                        false,
-                    );
-                    self.build_filtered_graph(
-                        &pool,
-                        stopped,
-                        &mut additional_graph,
-                        payload_block.condition,
-                        &mut block_filter_list,
-                    )?;
-                    graph_layers_builder.merge_from_other(additional_graph);
-                }
-            }
-
-            let indexed_payload_vectors = block_filter_list.count_visits_since(visits_iteration);
-
-            debug_assert!(indexed_vectors >= indexed_payload_vectors || self.config.m == 0);
-            indexed_vectors = indexed_vectors.max(indexed_payload_vectors);
-            debug_assert!(indexed_payload_vectors <= total_vector_count);
-        } else {
-            debug!("skip building additional HNSW links");
-        }
-
-        self.config.indexed_vector_count.replace(indexed_vectors);
-
-        let graph_links_path = GraphLayers::<TGraphLinks>::get_links_path(&self.path);
-        self.graph = Some(graph_layers_builder.into_graph_layers(Some(&graph_links_path))?);
-
-        #[cfg(debug_assertions)]
-        {
-            let graph = self.graph.as_ref().unwrap();
-            for (idx, deleted) in deleted_bitslice.iter().enumerate() {
-                if *deleted {
-                    debug_assert!(graph.links.links(idx as PointOffsetType, 0).is_empty());
-                }
-            }
-        }
-
-        debug!("finish additional payload field indexing");
-        self.save()
-    }
-
-    fn get_telemetry_data(&self) -> VectorIndexSearchesTelemetry {
-        let tm = &self.searches_telemetry;
-
-        VectorIndexSearchesTelemetry {
-            index_name: None,
-            unfiltered_plain: tm.unfiltered_plain.lock().get_statistics(),
-            filtered_plain: Default::default(),
-            unfiltered_hnsw: tm.unfiltered_hnsw.lock().get_statistics(),
-            filtered_small_cardinality: tm.small_cardinality.lock().get_statistics(),
-            filtered_large_cardinality: tm.large_cardinality.lock().get_statistics(),
-            filtered_exact: tm.exact_filtered.lock().get_statistics(),
-            unfiltered_exact: tm.exact_unfiltered.lock().get_statistics(),
-        }
-    }
-
-    fn files(&self) -> Vec<PathBuf> {
-        if self.graph.is_some() {
-            vec![
-                GraphLayers::<TGraphLinks>::get_path(&self.path),
-                GraphLayers::<TGraphLinks>::get_links_path(&self.path),
-            ]
-        } else {
-            vec![]
-        }
-    }
-
-    fn indexed_vector_count(&self) -> usize {
-        self.config
-            .indexed_vector_count
-            // If indexed vector count is unknown, fall back to number of points
-            .or_else(|| self.graph.as_ref().map(|graph| graph.num_points()))
-            .unwrap_or(0)
-    }
-
-    fn is_appendable(&self) -> bool {
-        false
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/index/hnsw_index/mod.rs b/crates/qdrant/lib/segment/src/index/hnsw_index/mod.rs
deleted file mode 100644
index a3d81bb..0000000
--- a/crates/qdrant/lib/segment/src/index/hnsw_index/mod.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-mod build_cache;
-pub mod build_condition_checker;
-mod config;
-mod entry_points;
-pub mod graph_layers;
-pub mod graph_layers_builder;
-pub mod graph_links;
-pub mod hnsw;
-pub mod point_scorer;
-mod search_context;
-
-#[cfg(test)]
-mod tests;
-
-pub fn max_rayon_threads(max_indexing_threads: usize) -> usize {
-    if max_indexing_threads == 0 {
-        let num_cpu = crate::common::cpu::get_num_cpus();
-        std::cmp::max(1, num_cpu - 1)
-    } else {
-        max_indexing_threads
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/index/hnsw_index/point_scorer.rs b/crates/qdrant/lib/segment/src/index/hnsw_index/point_scorer.rs
deleted file mode 100644
index 5177fe1..0000000
--- a/crates/qdrant/lib/segment/src/index/hnsw_index/point_scorer.rs
+++ /dev/null
@@ -1,81 +0,0 @@
-use crate::payload_storage::FilterContext;
-use crate::types::{PointOffsetType, ScoreType};
-use crate::vector_storage::{RawScorer, ScoredPointOffset};
-
-pub struct FilteredScorer<'a> {
-    pub raw_scorer: &'a dyn RawScorer,
-    pub filter_context: Option<&'a dyn FilterContext>,
-    points_buffer: Vec<ScoredPointOffset>,
-}
-
-impl<'a> FilteredScorer<'a> {
-    pub fn new(
-        raw_scorer: &'a dyn RawScorer,
-        filter_context: Option<&'a dyn FilterContext>,
-    ) -> Self {
-        FilteredScorer {
-            raw_scorer,
-            filter_context,
-            points_buffer: Vec::new(),
-        }
-    }
-
-    pub fn check_vector(&self, point_id: PointOffsetType) -> bool {
-        match self.filter_context {
-            None => self.raw_scorer.check_vector(point_id),
-            Some(f) => f.check(point_id) && self.raw_scorer.check_vector(point_id),
-        }
-    }
-
-    /// Method filters and calculates scores for the given slice of points IDs
-    ///
-    /// For performance reasons this function mutates input values.
-    /// For result slice allocation this function mutates self.
-    ///
-    /// # Arguments
-    ///
-    /// * `point_ids` - list of points to score. *Warn*: This input will be wrecked during the execution.
-    /// * `limit` - limits the number of points to process after filtering.
-    ///
-    pub fn score_points(
-        &mut self,
-        point_ids: &mut [PointOffsetType],
-        limit: usize,
-    ) -> &[ScoredPointOffset] {
-        // apply filter and store filtered ids to source slice memory
-        let filtered_point_ids = match self.filter_context {
-            None => point_ids,
-            Some(f) => {
-                let len = point_ids.len();
-                let mut filtered_len = 0;
-                for i in 0..len {
-                    let point_id = point_ids[i];
-                    if f.check(point_id) {
-                        point_ids[filtered_len] = point_id;
-                        filtered_len += 1;
-                    }
-                }
-                &point_ids[0..filtered_len]
-            }
-        };
-        if limit == 0 {
-            self.points_buffer
-                .resize(filtered_point_ids.len(), ScoredPointOffset::default());
-        } else {
-            self.points_buffer
-                .resize(limit, ScoredPointOffset::default());
-        }
-        let count = self
-            .raw_scorer
-            .score_points(filtered_point_ids, &mut self.points_buffer);
-        &self.points_buffer[0..count]
-    }
-
-    pub fn score_point(&self, point_id: PointOffsetType) -> ScoreType {
-        self.raw_scorer.score_point(point_id)
-    }
-
-    pub fn score_internal(&self, point_a: PointOffsetType, point_b: PointOffsetType) -> ScoreType {
-        self.raw_scorer.score_internal(point_a, point_b)
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/index/hnsw_index/search_context.rs b/crates/qdrant/lib/segment/src/index/hnsw_index/search_context.rs
deleted file mode 100644
index 9c82a9d..0000000
--- a/crates/qdrant/lib/segment/src/index/hnsw_index/search_context.rs
+++ /dev/null
@@ -1,46 +0,0 @@
-use std::collections::BinaryHeap;
-use std::iter::FromIterator;
-
-use common::fixed_length_priority_queue::FixedLengthPriorityQueue;
-use num_traits::float::FloatCore;
-
-use crate::types::ScoreType;
-use crate::vector_storage::ScoredPointOffset;
-
-/// Structure that holds context of the search
-pub struct SearchContext {
-    /// Overall nearest points found so far
-    pub nearest: FixedLengthPriorityQueue<ScoredPointOffset>,
-    /// Current candidates to process
-    pub candidates: BinaryHeap<ScoredPointOffset>,
-}
-
-impl SearchContext {
-    pub fn new(entry_point: ScoredPointOffset, ef: usize) -> Self {
-        let mut nearest = FixedLengthPriorityQueue::new(ef);
-        nearest.push(entry_point);
-        SearchContext {
-            nearest,
-            candidates: BinaryHeap::from_iter([entry_point]),
-        }
-    }
-
-    pub fn lower_bound(&self) -> ScoreType {
-        match self.nearest.top() {
-            None => ScoreType::min_value(),
-            Some(worst_of_the_best) => worst_of_the_best.score,
-        }
-    }
-
-    /// Updates search context with new scored point.
-    /// If it is closer than existing - also add it to candidates for further search
-    pub fn process_candidate(&mut self, score_point: ScoredPointOffset) {
-        let was_added = match self.nearest.push(score_point) {
-            None => true,
-            Some(removed) => removed.idx != score_point.idx,
-        };
-        if was_added {
-            self.candidates.push(score_point);
-        }
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/index/hnsw_index/tests/mod.rs b/crates/qdrant/lib/segment/src/index/hnsw_index/tests/mod.rs
deleted file mode 100644
index ad64977..0000000
--- a/crates/qdrant/lib/segment/src/index/hnsw_index/tests/mod.rs
+++ /dev/null
@@ -1,69 +0,0 @@
-mod test_compact_graph_layer;
-
-use std::path::Path;
-
-use rand::Rng;
-
-use super::graph_links::GraphLinksRam;
-use crate::fixtures::index_fixtures::{FakeFilterContext, TestRawScorerProducer};
-use crate::index::hnsw_index::graph_layers::GraphLayers;
-use crate::index::hnsw_index::graph_layers_builder::GraphLayersBuilder;
-use crate::index::hnsw_index::point_scorer::FilteredScorer;
-use crate::spaces::metric::Metric;
-use crate::types::PointOffsetType;
-
-pub(crate) fn create_graph_layer_builder_fixture<TMetric: Metric, R>(
-    num_vectors: usize,
-    m: usize,
-    dim: usize,
-    use_heuristic: bool,
-    rng: &mut R,
-) -> (TestRawScorerProducer<TMetric>, GraphLayersBuilder)
-where
-    R: Rng + ?Sized,
-{
-    let ef_construct = 16;
-    let entry_points_num = 10;
-
-    let vector_holder = TestRawScorerProducer::<TMetric>::new(dim, num_vectors, rng);
-
-    let mut graph_layers_builder = GraphLayersBuilder::new(
-        num_vectors,
-        m,
-        m * 2,
-        ef_construct,
-        entry_points_num,
-        use_heuristic,
-    );
-
-    for idx in 0..(num_vectors as PointOffsetType) {
-        let fake_filter_context = FakeFilterContext {};
-        let added_vector = vector_holder.vectors.get(idx).to_vec();
-        let raw_scorer = vector_holder.get_raw_scorer(added_vector.clone());
-        let scorer = FilteredScorer::new(raw_scorer.as_ref(), Some(&fake_filter_context));
-        let level = graph_layers_builder.get_random_layer(rng);
-        graph_layers_builder.set_levels(idx, level);
-        graph_layers_builder.link_new_point(idx, scorer);
-    }
-    (vector_holder, graph_layers_builder)
-}
-
-pub(crate) fn create_graph_layer_fixture<TMetric: Metric, R>(
-    num_vectors: usize,
-    m: usize,
-    dim: usize,
-    use_heuristic: bool,
-    rng: &mut R,
-    links_path: Option<&Path>,
-) -> (TestRawScorerProducer<TMetric>, GraphLayers<GraphLinksRam>)
-where
-    R: Rng + ?Sized,
-{
-    let (vector_holder, graph_layers_builder) =
-        create_graph_layer_builder_fixture(num_vectors, m, dim, use_heuristic, rng);
-
-    (
-        vector_holder,
-        graph_layers_builder.into_graph_layers(links_path).unwrap(),
-    )
-}
diff --git a/crates/qdrant/lib/segment/src/index/hnsw_index/tests/test_compact_graph_layer.rs b/crates/qdrant/lib/segment/src/index/hnsw_index/tests/test_compact_graph_layer.rs
deleted file mode 100644
index 45f3e80..0000000
--- a/crates/qdrant/lib/segment/src/index/hnsw_index/tests/test_compact_graph_layer.rs
+++ /dev/null
@@ -1,83 +0,0 @@
-use std::cmp::max;
-
-use itertools::Itertools;
-use rand::prelude::StdRng;
-use rand::SeedableRng;
-
-use crate::fixtures::index_fixtures::random_vector;
-use crate::index::hnsw_index::graph_layers::GraphLayersBase;
-use crate::index::hnsw_index::graph_layers_builder::GraphLayersBuilder;
-use crate::index::hnsw_index::graph_links::GraphLinksRam;
-use crate::index::hnsw_index::point_scorer::FilteredScorer;
-use crate::index::hnsw_index::tests::create_graph_layer_builder_fixture;
-use crate::spaces::simple::CosineMetric;
-use crate::vector_storage::ScoredPointOffset;
-
-fn search_in_builder(
-    builder: &GraphLayersBuilder,
-    top: usize,
-    ef: usize,
-    mut points_scorer: FilteredScorer,
-) -> Vec<ScoredPointOffset> {
-    let entry_point = match builder
-        .get_entry_points()
-        .get_entry_point(|point_id| points_scorer.check_vector(point_id))
-    {
-        None => return vec![],
-        Some(ep) => ep,
-    };
-
-    let zero_level_entry = builder.search_entry(
-        entry_point.point_id,
-        entry_point.level,
-        0,
-        &mut points_scorer,
-    );
-
-    let nearest = builder.search_on_level(zero_level_entry, 0, max(top, ef), &mut points_scorer);
-    nearest.into_iter().take(top).collect_vec()
-}
-
-#[test]
-/// Check that HNSW index with raw and compacted links gives the same results
-fn test_compact_graph_layers() {
-    let num_vectors = 1000;
-    let num_queries = 100;
-    let m = 16;
-    let dim = 8;
-    let top = 5;
-    let ef = 100;
-
-    let mut rng = StdRng::seed_from_u64(42);
-
-    let (vector_holder, graph_layers_builder) =
-        create_graph_layer_builder_fixture::<CosineMetric, _>(num_vectors, m, dim, false, &mut rng);
-
-    let queries = (0..num_queries)
-        .map(|_| random_vector(&mut rng, dim))
-        .collect_vec();
-
-    let reference_results = queries
-        .iter()
-        .map(|query| {
-            let raw_scorer = vector_holder.get_raw_scorer(query.clone());
-            let scorer = FilteredScorer::new(raw_scorer.as_ref(), None);
-            search_in_builder(&graph_layers_builder, top, ef, scorer)
-        })
-        .collect_vec();
-
-    let graph_layers = graph_layers_builder
-        .into_graph_layers::<GraphLinksRam>(None)
-        .unwrap();
-
-    let results = queries
-        .iter()
-        .map(|query| {
-            let raw_scorer = vector_holder.get_raw_scorer(query.clone());
-            let scorer = FilteredScorer::new(raw_scorer.as_ref(), None);
-            graph_layers.search(top, ef, scorer)
-        })
-        .collect_vec();
-
-    assert_eq!(reference_results, results);
-}
diff --git a/crates/qdrant/lib/segment/src/index/key_encoding.rs b/crates/qdrant/lib/segment/src/index/key_encoding.rs
deleted file mode 100644
index 747195b..0000000
--- a/crates/qdrant/lib/segment/src/index/key_encoding.rs
+++ /dev/null
@@ -1,231 +0,0 @@
-const FLOAT_NAN: u8 = 0x00;
-const FLOAT_NEG: u8 = 0x01;
-const FLOAT_ZERO: u8 = 0x02;
-const FLOAT_POS: u8 = 0x03;
-
-const F64_KEY_LEN: usize = 13;
-const I64_KEY_LEN: usize = 12;
-
-/// Encode a f64 into `buf`
-///
-/// The encoded format for a f64 is :
-///
-/// **for positives:** the f64 bits ( in IEEE 754 format ) are re-interpreted as an int64 and
-/// encoded using big-endian order.
-///
-/// **for negative** f64 : invert all the bits and encode it using bit-endian order.
-///
-/// A single-byte prefix tag is appended to the front of the encoding slice to ensures that
-/// NaNs are always sorted first.
-///
-/// This approach was inspired by <https://github.com/cockroachdb/cockroach/blob/master/pkg/util/encoding/float.go>
-///
-///
-/// #f64 encoding format
-///
-///```text
-/// 0                    1                9
-/// ┌───────────────────┬─────────────────┐
-/// │     Float Type    │  NEG:  !key_val │
-/// │  NAN/NEG/ZERO/POS |  POS:   key_val │
-/// │    (big-endian)   │   (big-endian)  │
-/// └───────────────────┴─────────────────┘
-/// ```
-///
-pub fn encode_f64_ascending(val: f64, buf: &mut Vec<u8>) {
-    if val.is_nan() {
-        buf.push(FLOAT_NAN);
-        buf.extend([0_u8; std::mem::size_of::<f64>()]);
-        return;
-    }
-
-    if val == 0f64 {
-        buf.push(FLOAT_ZERO);
-        buf.extend([0_u8; std::mem::size_of::<f64>()]);
-        return;
-    }
-
-    let f_as_u64 = val.to_bits();
-
-    if f_as_u64 & (1 << 63) != 0 {
-        let f = !f_as_u64;
-        buf.push(FLOAT_NEG);
-        buf.extend(f.to_be_bytes());
-    } else {
-        buf.push(FLOAT_POS);
-        buf.extend(f_as_u64.to_be_bytes());
-    }
-}
-
-/// Decode a f64 from a slice.
-pub fn decode_f64_ascending(buf: &[u8]) -> f64 {
-    match buf[0] {
-        FLOAT_NAN => f64::NAN,
-        FLOAT_NEG => {
-            let u = u64::from_be_bytes(buf[1..9].try_into().expect("cannot decode f64"));
-            let f = !u;
-            f64::from_bits(f)
-        }
-        FLOAT_ZERO => 0f64,
-        FLOAT_POS => {
-            let u = u64::from_be_bytes(buf[1..9].try_into().expect("cannot decode f64"));
-            f64::from_bits(u)
-        }
-        _ => panic!("invalid f64 prefix"),
-    }
-}
-
-/// Encode a i64 into `buf` so that is sorts ascending.
-pub fn encode_i64_ascending(val: i64, buf: &mut Vec<u8>) {
-    let i = val ^ i64::MIN;
-    buf.extend(i.to_be_bytes());
-}
-
-/// Decode a i64 from a slice
-pub fn decode_i64_ascending(buf: &[u8]) -> i64 {
-    let i = i64::from_be_bytes(buf[0..8].try_into().expect("cannot decode i64"));
-    i ^ i64::MIN
-}
-
-/// Encodes a f64 key so that it sort in ascending order.
-///
-/// The key is compound by the numeric value of the key plus a u32 representing
-/// the payload offset within the payload store.
-///
-/// # float key encoding format
-///
-///```text
-///
-/// 0                    1                9             13
-/// ┌───────────────────┬─────────────────┬──────────────┐
-/// │     Float Type    │  NEG:  !key_val │              │
-/// │  NAN/NEG/ZERO/POS |  POS:   key_val │ point_offset │
-/// │    (big-endian)   │   (big-endian)  │              │
-/// └───────────────────┴─────────────────┴──────────────┘
-/// ```
-///
-pub fn encode_f64_key_ascending(key_val: f64, point_offset: u32) -> Vec<u8> {
-    let mut buf = Vec::with_capacity(F64_KEY_LEN);
-    encode_f64_ascending(key_val, &mut buf);
-    buf.extend(point_offset.to_be_bytes());
-    buf
-}
-
-pub fn decode_f64_key_ascending(buf: &[u8]) -> (u32, f64) {
-    (
-        u32::from_be_bytes(
-            (&buf[F64_KEY_LEN - std::mem::size_of::<u32>()..])
-                .try_into()
-                .unwrap(),
-        ),
-        decode_f64_ascending(buf),
-    )
-}
-
-/// Encodes a i64 key so that it sort in ascending order.
-///
-/// The key is compound by the numeric value of the key plus a u32 representing
-/// the payload offset within the payload store.
-///
-/// # int key encoding format
-///
-///```text
-///
-/// 0                    8             12
-/// ┌────────────────────┬──────────────┐
-/// │ key_val ^ i64::MIN │ point_offset │
-/// │    (big-endian)    │ (big-endian) │
-/// └────────────────────┴──────────────┘
-///```
-pub fn encode_i64_key_ascending(key_val: i64, point_offset: u32) -> Vec<u8> {
-    let mut buf = Vec::with_capacity(I64_KEY_LEN);
-    encode_i64_ascending(key_val, &mut buf);
-    buf.extend(point_offset.to_be_bytes());
-    buf
-}
-
-pub fn decode_i64_key_ascending(buf: &[u8]) -> (u32, i64) {
-    (
-        u32::from_be_bytes(
-            (&buf[I64_KEY_LEN - std::mem::size_of::<u32>()..])
-                .try_into()
-                .unwrap(),
-        ),
-        decode_i64_ascending(buf),
-    )
-}
-
-#[cfg(test)]
-mod tests {
-    use std::cmp::Ordering;
-
-    use crate::index::key_encoding::{
-        decode_f64_ascending, decode_i64_ascending, encode_f64_ascending, encode_i64_ascending,
-    };
-
-    #[test]
-    fn test_encode_f64() {
-        test_f64_encoding_roundtrip(0.42342);
-        test_f64_encoding_roundtrip(0f64);
-        test_f64_encoding_roundtrip(f64::NAN);
-        test_f64_encoding_roundtrip(-0.423423983);
-    }
-
-    #[test]
-    fn test_encode_i64() {
-        test_i64_encoding_roundtrip(i64::MIN);
-        test_i64_encoding_roundtrip(i64::MAX);
-        test_i64_encoding_roundtrip(0);
-        test_i64_encoding_roundtrip(41262);
-        test_i64_encoding_roundtrip(-98793);
-    }
-
-    #[test]
-    fn test_f64_lex_order() {
-        let mut nan_buf = Vec::new();
-        let mut zero_buf = Vec::new();
-        let mut pos_buf = Vec::new();
-        let mut neg_buf = Vec::new();
-
-        encode_f64_ascending(f64::NAN, &mut nan_buf);
-        encode_f64_ascending(0f64, &mut zero_buf);
-        encode_f64_ascending(0.2435224412, &mut pos_buf);
-        encode_f64_ascending(-0.82976347, &mut neg_buf);
-
-        assert_eq!(nan_buf.cmp(&neg_buf), Ordering::Less);
-        assert_eq!(neg_buf.cmp(&zero_buf), Ordering::Less);
-        assert_eq!(zero_buf.cmp(&pos_buf), Ordering::Less);
-    }
-
-    #[test]
-    fn test_i64_lex_order() {
-        let mut zero_buf = Vec::new();
-        let mut pos_buf = Vec::new();
-        let mut neg_buf = Vec::new();
-
-        encode_i64_ascending(0, &mut zero_buf);
-        encode_i64_ascending(123, &mut pos_buf);
-        encode_i64_ascending(-4324, &mut neg_buf);
-
-        assert_eq!(neg_buf.cmp(&zero_buf), Ordering::Less);
-        assert_eq!(zero_buf.cmp(&pos_buf), Ordering::Less);
-    }
-
-    fn test_f64_encoding_roundtrip(val: f64) {
-        let mut buf = Vec::new();
-        encode_f64_ascending(val, &mut buf);
-        let dec_val = decode_f64_ascending(buf.as_slice());
-        if val.is_nan() {
-            assert!(dec_val.is_nan());
-            return;
-        }
-        assert_eq!(val, dec_val);
-    }
-
-    fn test_i64_encoding_roundtrip(val: i64) {
-        let mut buf = Vec::new();
-        encode_i64_ascending(val, &mut buf);
-        let res = decode_i64_ascending(buf.as_slice());
-        assert_eq!(val, res);
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/index/mod.rs b/crates/qdrant/lib/segment/src/index/mod.rs
deleted file mode 100644
index d6bc579..0000000
--- a/crates/qdrant/lib/segment/src/index/mod.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-pub mod field_index;
-pub mod hnsw_index;
-mod key_encoding;
-mod payload_config;
-mod payload_index_base;
-pub mod plain_payload_index;
-pub mod query_estimator;
-mod query_optimization;
-mod sample_estimation;
-mod struct_filter_context;
-pub mod struct_payload_index;
-mod vector_index_base;
-mod visited_pool;
-pub use payload_index_base::*;
-pub use vector_index_base::*;
diff --git a/crates/qdrant/lib/segment/src/index/payload_config.rs b/crates/qdrant/lib/segment/src/index/payload_config.rs
deleted file mode 100644
index f5886ae..0000000
--- a/crates/qdrant/lib/segment/src/index/payload_config.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-use std::collections::HashMap;
-use std::path::{Path, PathBuf};
-
-use serde::{Deserialize, Serialize};
-
-use crate::common::file_operations::{atomic_save_json, read_json};
-use crate::entry::entry_point::OperationResult;
-use crate::types::{PayloadFieldSchema, PayloadKeyType};
-
-pub const PAYLOAD_INDEX_CONFIG_FILE: &str = "config.json";
-
-/// Keeps information of which field should be index
-#[derive(Debug, Default, Deserialize, Serialize, Clone)]
-pub struct PayloadConfig {
-    pub indexed_fields: HashMap<PayloadKeyType, PayloadFieldSchema>,
-}
-
-impl PayloadConfig {
-    pub fn get_config_path(path: &Path) -> PathBuf {
-        path.join(PAYLOAD_INDEX_CONFIG_FILE)
-    }
-
-    pub fn load(path: &Path) -> OperationResult<Self> {
-        Ok(read_json(path)?)
-    }
-
-    pub fn save(&self, path: &Path) -> OperationResult<()> {
-        Ok(atomic_save_json(path, self)?)
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/index/payload_index_base.rs b/crates/qdrant/lib/segment/src/index/payload_index_base.rs
deleted file mode 100644
index 88fa529..0000000
--- a/crates/qdrant/lib/segment/src/index/payload_index_base.rs
+++ /dev/null
@@ -1,98 +0,0 @@
-use std::collections::HashMap;
-use std::path::{Path, PathBuf};
-
-use serde_json::Value;
-
-use crate::common::utils::JsonPathPayload;
-use crate::common::Flusher;
-use crate::entry::entry_point::OperationResult;
-use crate::index::field_index::{CardinalityEstimation, PayloadBlockCondition};
-use crate::payload_storage::FilterContext;
-use crate::types::{
-    Filter, Payload, PayloadFieldSchema, PayloadKeyType, PayloadKeyTypeRef, PayloadSchemaType,
-    PointOffsetType,
-};
-
-pub trait PayloadIndex {
-    /// Get indexed fields
-    fn indexed_fields(&self) -> HashMap<PayloadKeyType, PayloadFieldSchema>;
-
-    /// Mark field as one which should be indexed
-    fn set_indexed(
-        &mut self,
-        field: PayloadKeyTypeRef,
-        payload_schema: PayloadFieldSchema,
-    ) -> OperationResult<()>;
-
-    /// Remove index
-    fn drop_index(&mut self, field: PayloadKeyTypeRef) -> OperationResult<()>;
-
-    /// Estimate amount of points (min, max) which satisfies filtering condition.
-    ///
-    /// A best estimation of the number of available points should be given.
-    fn estimate_cardinality(&self, query: &Filter) -> CardinalityEstimation;
-
-    /// Estimate amount of points (min, max) which satisfies filtering of a nested condition.
-    fn estimate_nested_cardinality(
-        &self,
-        query: &Filter,
-        nested_path: &JsonPathPayload,
-    ) -> CardinalityEstimation;
-
-    /// Return list of all point ids, which satisfy filtering criteria
-    ///
-    /// A best estimation of the number of available points should be given.
-    fn query_points(&self, query: &Filter) -> Vec<PointOffsetType>;
-
-    /// Return number of points, indexed by this field
-    fn indexed_points(&self, field: PayloadKeyTypeRef) -> usize;
-
-    fn filter_context<'a>(&'a self, filter: &'a Filter) -> Box<dyn FilterContext + 'a>;
-
-    /// Iterate conditions for payload blocks with minimum size of `threshold`
-    /// Required for building HNSW index
-    fn payload_blocks(
-        &self,
-        field: PayloadKeyTypeRef,
-        threshold: usize,
-    ) -> Box<dyn Iterator<Item = PayloadBlockCondition> + '_>;
-
-    /// Assign same payload to each given point
-    fn assign_all(&mut self, point_id: PointOffsetType, payload: &Payload) -> OperationResult<()> {
-        self.drop(point_id)?;
-        self.assign(point_id, payload)?;
-        Ok(())
-    }
-
-    /// Assign payload to a concrete point with a concrete payload value
-    fn assign(&mut self, point_id: PointOffsetType, payload: &Payload) -> OperationResult<()>;
-
-    /// Get payload for point
-    fn payload(&self, point_id: PointOffsetType) -> OperationResult<Payload>;
-
-    /// Delete payload by key
-    fn delete(
-        &mut self,
-        point_id: PointOffsetType,
-        key: PayloadKeyTypeRef,
-    ) -> OperationResult<Vec<Value>>;
-
-    /// Drop all payload of the point
-    fn drop(&mut self, point_id: PointOffsetType) -> OperationResult<Option<Payload>>;
-
-    /// Completely drop payload. Pufff!
-    fn wipe(&mut self) -> OperationResult<()>;
-
-    /// Return function that forces persistence of current storage state.
-    fn flusher(&self) -> Flusher;
-
-    /// Infer payload type from existing payload data.
-    fn infer_payload_type(
-        &self,
-        key: PayloadKeyTypeRef,
-    ) -> OperationResult<Option<PayloadSchemaType>>;
-
-    fn take_database_snapshot(&self, path: &Path) -> OperationResult<()>;
-
-    fn files(&self) -> Vec<PathBuf>;
-}
diff --git a/crates/qdrant/lib/segment/src/index/plain_payload_index.rs b/crates/qdrant/lib/segment/src/index/plain_payload_index.rs
deleted file mode 100644
index 882e068..0000000
--- a/crates/qdrant/lib/segment/src/index/plain_payload_index.rs
+++ /dev/null
@@ -1,314 +0,0 @@
-use std::collections::HashMap;
-use std::fs::create_dir_all;
-use std::path::{Path, PathBuf};
-use std::sync::atomic::AtomicBool;
-use std::sync::Arc;
-
-use atomic_refcell::AtomicRefCell;
-use parking_lot::Mutex;
-use schemars::_serde_json::Value;
-
-use crate::common::operation_time_statistics::{
-    OperationDurationStatistics, OperationDurationsAggregator, ScopeDurationMeasurer,
-};
-use crate::common::utils::JsonPathPayload;
-use crate::common::Flusher;
-use crate::data_types::vectors::VectorElementType;
-use crate::entry::entry_point::OperationResult;
-use crate::id_tracker::IdTrackerSS;
-use crate::index::field_index::{CardinalityEstimation, PayloadBlockCondition};
-use crate::index::payload_config::PayloadConfig;
-use crate::index::struct_payload_index::StructPayloadIndex;
-use crate::index::{PayloadIndex, VectorIndex};
-use crate::payload_storage::{ConditionCheckerSS, FilterContext};
-use crate::telemetry::VectorIndexSearchesTelemetry;
-use crate::types::{
-    Filter, Payload, PayloadFieldSchema, PayloadKeyType, PayloadKeyTypeRef, PayloadSchemaType,
-    PointOffsetType, SearchParams,
-};
-use crate::vector_storage::{new_stoppable_raw_scorer, ScoredPointOffset, VectorStorageEnum};
-
-/// Implementation of `PayloadIndex` which does not really indexes anything.
-///
-/// Used for small segments, which are easier to keep simple for faster updates,
-/// rather than spend time for index re-building
-pub struct PlainPayloadIndex {
-    condition_checker: Arc<ConditionCheckerSS>,
-    id_tracker: Arc<AtomicRefCell<IdTrackerSS>>,
-    config: PayloadConfig,
-    path: PathBuf,
-}
-
-impl PlainPayloadIndex {
-    fn config_path(&self) -> PathBuf {
-        PayloadConfig::get_config_path(&self.path)
-    }
-
-    fn save_config(&self) -> OperationResult<()> {
-        let config_path = self.config_path();
-        self.config.save(&config_path)
-    }
-
-    pub fn open(
-        condition_checker: Arc<ConditionCheckerSS>,
-        id_tracker: Arc<AtomicRefCell<IdTrackerSS>>,
-        path: &Path,
-    ) -> OperationResult<Self> {
-        create_dir_all(path)?;
-        let config_path = PayloadConfig::get_config_path(path);
-        let config = if config_path.exists() {
-            PayloadConfig::load(&config_path)?
-        } else {
-            PayloadConfig::default()
-        };
-
-        let index = PlainPayloadIndex {
-            condition_checker,
-            id_tracker,
-            config,
-            path: path.to_owned(),
-        };
-
-        if !index.config_path().exists() {
-            index.save_config()?;
-        }
-
-        Ok(index)
-    }
-}
-
-impl PayloadIndex for PlainPayloadIndex {
-    fn indexed_fields(&self) -> HashMap<PayloadKeyType, PayloadFieldSchema> {
-        self.config.indexed_fields.clone()
-    }
-
-    fn set_indexed(
-        &mut self,
-        field: PayloadKeyTypeRef,
-        payload_schema: PayloadFieldSchema,
-    ) -> OperationResult<()> {
-        if let Some(prev_schema) = self
-            .config
-            .indexed_fields
-            .insert(field.to_owned(), payload_schema.clone())
-        {
-            // the field is already present with the same schema, no need to save the config
-            if prev_schema == payload_schema {
-                return Ok(());
-            }
-        }
-        self.save_config()?;
-
-        Ok(())
-    }
-
-    fn drop_index(&mut self, field: PayloadKeyTypeRef) -> OperationResult<()> {
-        self.config.indexed_fields.remove(field);
-        self.save_config()
-    }
-
-    fn estimate_cardinality(&self, _query: &Filter) -> CardinalityEstimation {
-        let available_points = self.id_tracker.borrow().available_point_count();
-        CardinalityEstimation {
-            primary_clauses: vec![],
-            min: 0,
-            exp: available_points / 2,
-            max: available_points,
-        }
-    }
-
-    /// Forward to non nested implementation.
-    fn estimate_nested_cardinality(
-        &self,
-        query: &Filter,
-        _nested_path: &JsonPathPayload,
-    ) -> CardinalityEstimation {
-        self.estimate_cardinality(query)
-    }
-
-    fn query_points(&self, query: &Filter) -> Vec<PointOffsetType> {
-        let filter_context = self.filter_context(query);
-        self.id_tracker
-            .borrow()
-            .iter_ids()
-            .filter(|id| filter_context.check(*id))
-            .collect()
-    }
-
-    fn indexed_points(&self, _field: PayloadKeyTypeRef) -> usize {
-        0 // No points are indexed in the plain index
-    }
-
-    fn filter_context<'a>(&'a self, filter: &'a Filter) -> Box<dyn FilterContext + 'a> {
-        Box::new(PlainFilterContext {
-            filter,
-            condition_checker: self.condition_checker.clone(),
-        })
-    }
-
-    fn payload_blocks(
-        &self,
-        _field: PayloadKeyTypeRef,
-        _threshold: usize,
-    ) -> Box<dyn Iterator<Item = PayloadBlockCondition> + '_> {
-        // No blocks for un-indexed payload
-        Box::new(vec![].into_iter())
-    }
-
-    fn assign(&mut self, _point_id: PointOffsetType, _payload: &Payload) -> OperationResult<()> {
-        unreachable!()
-    }
-
-    fn payload(&self, _point_id: PointOffsetType) -> OperationResult<Payload> {
-        unreachable!()
-    }
-
-    fn delete(
-        &mut self,
-        _point_id: PointOffsetType,
-        _key: PayloadKeyTypeRef,
-    ) -> OperationResult<Vec<Value>> {
-        unreachable!()
-    }
-
-    fn drop(&mut self, _point_id: PointOffsetType) -> OperationResult<Option<Payload>> {
-        unreachable!()
-    }
-
-    fn wipe(&mut self) -> OperationResult<()> {
-        unreachable!()
-    }
-
-    fn flusher(&self) -> Flusher {
-        unreachable!()
-    }
-
-    fn infer_payload_type(
-        &self,
-        _key: PayloadKeyTypeRef,
-    ) -> OperationResult<Option<PayloadSchemaType>> {
-        unreachable!()
-    }
-
-    fn take_database_snapshot(&self, _: &Path) -> OperationResult<()> {
-        unreachable!()
-    }
-
-    fn files(&self) -> Vec<PathBuf> {
-        vec![self.config_path()]
-    }
-}
-
-pub struct PlainIndex {
-    id_tracker: Arc<AtomicRefCell<IdTrackerSS>>,
-    vector_storage: Arc<AtomicRefCell<VectorStorageEnum>>,
-    payload_index: Arc<AtomicRefCell<StructPayloadIndex>>,
-    filtered_searches_telemetry: Arc<Mutex<OperationDurationsAggregator>>,
-    unfiltered_searches_telemetry: Arc<Mutex<OperationDurationsAggregator>>,
-}
-
-impl PlainIndex {
-    pub fn new(
-        id_tracker: Arc<AtomicRefCell<IdTrackerSS>>,
-        vector_storage: Arc<AtomicRefCell<VectorStorageEnum>>,
-        payload_index: Arc<AtomicRefCell<StructPayloadIndex>>,
-    ) -> PlainIndex {
-        PlainIndex {
-            id_tracker,
-            vector_storage,
-            payload_index,
-            filtered_searches_telemetry: OperationDurationsAggregator::new(),
-            unfiltered_searches_telemetry: OperationDurationsAggregator::new(),
-        }
-    }
-}
-
-impl VectorIndex for PlainIndex {
-    fn search(
-        &self,
-        vectors: &[&[VectorElementType]],
-        filter: Option<&Filter>,
-        top: usize,
-        _params: Option<&SearchParams>,
-        is_stopped: &AtomicBool,
-    ) -> Vec<Vec<ScoredPointOffset>> {
-        match filter {
-            Some(filter) => {
-                let _timer = ScopeDurationMeasurer::new(&self.filtered_searches_telemetry);
-                let id_tracker = self.id_tracker.borrow();
-                let payload_index = self.payload_index.borrow();
-                let vector_storage = self.vector_storage.borrow();
-                let filtered_ids_vec = payload_index.query_points(filter);
-                vectors
-                    .iter()
-                    .map(|vector| {
-                        new_stoppable_raw_scorer(
-                            vector.to_vec(),
-                            &vector_storage,
-                            id_tracker.deleted_point_bitslice(),
-                            is_stopped,
-                        )
-                        .peek_top_iter(&mut filtered_ids_vec.iter().copied(), top)
-                    })
-                    .collect()
-            }
-            None => {
-                let _timer = ScopeDurationMeasurer::new(&self.unfiltered_searches_telemetry);
-                let vector_storage = self.vector_storage.borrow();
-                let id_tracker = self.id_tracker.borrow();
-                vectors
-                    .iter()
-                    .map(|vector| {
-                        new_stoppable_raw_scorer(
-                            vector.to_vec(),
-                            &vector_storage,
-                            id_tracker.deleted_point_bitslice(),
-                            is_stopped,
-                        )
-                        .peek_top_all(top)
-                    })
-                    .collect()
-            }
-        }
-    }
-
-    fn build_index(&mut self, _stopped: &AtomicBool) -> OperationResult<()> {
-        Ok(())
-    }
-
-    fn get_telemetry_data(&self) -> VectorIndexSearchesTelemetry {
-        VectorIndexSearchesTelemetry {
-            index_name: None,
-            unfiltered_plain: self.unfiltered_searches_telemetry.lock().get_statistics(),
-            filtered_plain: self.filtered_searches_telemetry.lock().get_statistics(),
-            unfiltered_hnsw: OperationDurationStatistics::default(),
-            filtered_small_cardinality: OperationDurationStatistics::default(),
-            filtered_large_cardinality: OperationDurationStatistics::default(),
-            filtered_exact: OperationDurationStatistics::default(),
-            unfiltered_exact: OperationDurationStatistics::default(),
-        }
-    }
-
-    fn files(&self) -> Vec<PathBuf> {
-        vec![]
-    }
-
-    fn indexed_vector_count(&self) -> usize {
-        0
-    }
-
-    fn is_appendable(&self) -> bool {
-        true
-    }
-}
-
-pub struct PlainFilterContext<'a> {
-    condition_checker: Arc<ConditionCheckerSS>,
-    filter: &'a Filter,
-}
-
-impl<'a> FilterContext for PlainFilterContext<'a> {
-    fn check(&self, point_id: PointOffsetType) -> bool {
-        self.condition_checker.check(point_id, self.filter)
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/index/query_estimator.rs b/crates/qdrant/lib/segment/src/index/query_estimator.rs
deleted file mode 100644
index 849c2ab..0000000
--- a/crates/qdrant/lib/segment/src/index/query_estimator.rs
+++ /dev/null
@@ -1,488 +0,0 @@
-//! Contains functions for estimating of how many points should be processed for a given filter query
-//!
-//! Filter query is used e.g. for determining how would be faster to process the query:
-//! - use vector index or payload index first
-
-use std::cmp::{max, min};
-
-use itertools::Itertools;
-
-use crate::index::field_index::{CardinalityEstimation, PrimaryCondition};
-use crate::types::{Condition, Filter};
-
-/// Re-estimate cardinality based on number of available vectors
-/// Assuming that deleted vectors are not correlated with the filter
-///
-/// # Arguments
-///
-/// * `estimation` - cardinality estimations of number of points selected by payload filter
-/// * `available_vectors` - number of available vectors for the named vector storage
-/// * `total_vectors` - total number of points in the segment
-///
-/// # Result
-///
-/// * `CardinalityEstimation` - new cardinality estimation
-///
-/// # Example
-///
-/// ```
-/// use segment::index::field_index::CardinalityEstimation;
-/// let estimation = CardinalityEstimation {
-///    primary_clauses: vec![],
-///   min: 0,
-///   exp: 64,
-///   max: 100
-/// };
-///
-/// let new_estimation = segment::index::query_estimator::adjust_to_available_vectors(
-///     estimation,
-///     50,
-///     200
-/// );
-///
-/// assert_eq!(new_estimation.min, 0);
-/// assert_eq!(new_estimation.exp, 16);
-/// assert_eq!(new_estimation.max, 50);
-///
-/// ```
-pub fn adjust_to_available_vectors(
-    estimation: CardinalityEstimation,
-    available_vectors: usize,
-    available_points: usize,
-) -> CardinalityEstimation {
-    if available_points == 0 || available_vectors == 0 {
-        return CardinalityEstimation {
-            primary_clauses: estimation.primary_clauses,
-            min: 0,
-            exp: 0,
-            max: 0,
-        };
-    }
-
-    let number_of_deleted_vectors = available_points.saturating_sub(available_vectors);
-
-    // It is possible, all deleted vectors are selected in worst case
-    let min = estimation.min.saturating_sub(number_of_deleted_vectors);
-    // Another extreme case - all deleted vectors are not selected
-    let max = estimation.max.min(available_vectors).min(available_points);
-
-    let availability_prob = (available_vectors as f64 / available_points as f64).min(1.0);
-
-    let exp = (estimation.exp as f64 * availability_prob).round() as usize;
-
-    debug_assert!(
-        min <= exp,
-        "estimation: {:?}, available_vectors: {}, available_points: {}, min: {}, exp: {}",
-        estimation,
-        available_vectors,
-        available_points,
-        min,
-        exp
-    );
-    debug_assert!(
-        exp <= max,
-        "estimation: {:?}, available_vectors: {}, available_points: {}, exp: {}, max: {}",
-        estimation,
-        available_vectors,
-        available_points,
-        exp,
-        max
-    );
-
-    CardinalityEstimation {
-        primary_clauses: estimation.primary_clauses,
-        min,
-        exp,
-        max,
-    }
-}
-
-pub fn combine_should_estimations(
-    estimations: &[CardinalityEstimation],
-    total: usize,
-) -> CardinalityEstimation {
-    let mut clauses: Vec<PrimaryCondition> = vec![];
-    for estimation in estimations {
-        if estimation.primary_clauses.is_empty() {
-            // If some branch is un-indexed - we can't make
-            // any assumptions about the whole `should` clause
-            clauses = vec![];
-            break;
-        }
-        clauses.append(&mut estimation.primary_clauses.clone());
-    }
-    let element_not_hit_prob: f64 = estimations
-        .iter()
-        .map(|x| (total - x.exp) as f64 / (total as f64))
-        .product();
-    let element_hit_prob = 1.0 - element_not_hit_prob;
-    let expected_count = (element_hit_prob * (total as f64)).round() as usize;
-    CardinalityEstimation {
-        primary_clauses: clauses,
-        min: estimations.iter().map(|x| x.min).max().unwrap_or(0),
-        exp: expected_count,
-        max: min(estimations.iter().map(|x| x.max).sum(), total),
-    }
-}
-
-pub fn combine_must_estimations(
-    estimations: &[CardinalityEstimation],
-    total: usize,
-) -> CardinalityEstimation {
-    let min_estimation = estimations
-        .iter()
-        .map(|x| x.min)
-        .fold(total as i64, |acc, x| {
-            max(0, acc + (x as i64) - (total as i64))
-        }) as usize;
-
-    let max_estimation = estimations.iter().map(|x| x.max).min().unwrap_or(total);
-
-    let exp_estimation_prob: f64 = estimations
-        .iter()
-        .map(|x| (x.exp as f64) / (total as f64))
-        .product();
-
-    let exp_estimation = (exp_estimation_prob * (total as f64)).round() as usize;
-
-    let clauses = estimations
-        .iter()
-        .filter(|x| !x.primary_clauses.is_empty())
-        .min_by_key(|x| x.exp)
-        .map(|x| x.primary_clauses.clone())
-        .unwrap_or_default();
-
-    CardinalityEstimation {
-        primary_clauses: clauses,
-        min: min_estimation,
-        exp: exp_estimation,
-        max: max_estimation,
-    }
-}
-
-fn estimate_condition<F>(
-    estimator: &F,
-    condition: &Condition,
-    total: usize,
-) -> CardinalityEstimation
-where
-    F: Fn(&Condition) -> CardinalityEstimation,
-{
-    match condition {
-        Condition::Filter(filter) => estimate_filter(estimator, filter, total),
-        _ => estimator(condition),
-    }
-}
-
-pub fn estimate_filter<F>(estimator: &F, filter: &Filter, total: usize) -> CardinalityEstimation
-where
-    F: Fn(&Condition) -> CardinalityEstimation,
-{
-    let mut filter_estimations: Vec<CardinalityEstimation> = vec![];
-
-    match &filter.must {
-        None => {}
-        Some(conditions) => {
-            if !conditions.is_empty() {
-                filter_estimations.push(estimate_must(estimator, conditions, total));
-            }
-        }
-    }
-    match &filter.should {
-        None => {}
-        Some(conditions) => {
-            if !conditions.is_empty() {
-                filter_estimations.push(estimate_should(estimator, conditions, total));
-            }
-        }
-    }
-    match &filter.must_not {
-        None => {}
-        Some(conditions) => {
-            if !conditions.is_empty() {
-                filter_estimations.push(estimate_must_not(estimator, conditions, total))
-            }
-        }
-    }
-
-    combine_must_estimations(&filter_estimations, total)
-}
-
-fn estimate_should<F>(
-    estimator: &F,
-    conditions: &[Condition],
-    total: usize,
-) -> CardinalityEstimation
-where
-    F: Fn(&Condition) -> CardinalityEstimation,
-{
-    let estimate = |x| estimate_condition(estimator, x, total);
-    let should_estimations = conditions.iter().map(estimate).collect_vec();
-    combine_should_estimations(&should_estimations, total)
-}
-
-fn estimate_must<F>(estimator: &F, conditions: &[Condition], total: usize) -> CardinalityEstimation
-where
-    F: Fn(&Condition) -> CardinalityEstimation,
-{
-    let estimate = |x| estimate_condition(estimator, x, total);
-    let must_estimations = conditions.iter().map(estimate).collect_vec();
-
-    combine_must_estimations(&must_estimations, total)
-}
-
-pub fn invert_estimation(
-    estimation: &CardinalityEstimation,
-    total: usize,
-) -> CardinalityEstimation {
-    CardinalityEstimation {
-        primary_clauses: vec![],
-        min: total - estimation.max,
-        exp: total - estimation.exp,
-        max: total - estimation.min,
-    }
-}
-
-fn estimate_must_not<F>(
-    estimator: &F,
-    conditions: &[Condition],
-    total: usize,
-) -> CardinalityEstimation
-where
-    F: Fn(&Condition) -> CardinalityEstimation,
-{
-    let estimate = |x| invert_estimation(&estimate_condition(estimator, x, total), total);
-    let must_not_estimations = conditions.iter().map(estimate).collect_vec();
-    combine_must_estimations(&must_not_estimations, total)
-}
-
-#[cfg(test)]
-mod tests {
-    use std::collections::HashSet;
-    use std::iter::FromIterator;
-
-    use super::*;
-    use crate::types::{FieldCondition, HasIdCondition};
-
-    const TOTAL: usize = 1000;
-
-    fn test_condition(key: String) -> Condition {
-        Condition::Field(FieldCondition {
-            key,
-            r#match: None,
-            range: None,
-            geo_bounding_box: None,
-            geo_radius: None,
-            values_count: None,
-            geo_polygon: None,
-        })
-    }
-
-    fn test_estimator(condition: &Condition) -> CardinalityEstimation {
-        match condition {
-            Condition::Filter(_) => panic!("unexpected Filter"),
-            Condition::Nested(_) => panic!("unexpected Nested"),
-            Condition::Field(field) => match field.key.as_str() {
-                "color" => CardinalityEstimation {
-                    primary_clauses: vec![PrimaryCondition::Condition(field.clone())],
-                    min: 100,
-                    exp: 200,
-                    max: 300,
-                },
-                "size" => CardinalityEstimation {
-                    primary_clauses: vec![PrimaryCondition::Condition(field.clone())],
-                    min: 100,
-                    exp: 100,
-                    max: 100,
-                },
-                "price" => CardinalityEstimation {
-                    primary_clauses: vec![PrimaryCondition::Condition(field.clone())],
-                    min: 10,
-                    exp: 15,
-                    max: 20,
-                },
-                _ => CardinalityEstimation::unknown(TOTAL),
-            },
-            Condition::HasId(has_id) => CardinalityEstimation {
-                primary_clauses: vec![PrimaryCondition::Ids(
-                    has_id
-                        .has_id
-                        .iter()
-                        .map(|&x| format!("{x}").parse().unwrap()) // hack to convert ID as "number"
-                        .collect(),
-                )],
-                min: has_id.has_id.len(),
-                exp: has_id.has_id.len(),
-                max: has_id.has_id.len(),
-            },
-            Condition::IsEmpty(condition) => CardinalityEstimation {
-                primary_clauses: vec![PrimaryCondition::IsEmpty(condition.to_owned())],
-                min: 0,
-                exp: TOTAL / 2,
-                max: TOTAL,
-            },
-            Condition::IsNull(condition) => CardinalityEstimation {
-                primary_clauses: vec![PrimaryCondition::IsNull(condition.to_owned())],
-                min: 0,
-                exp: TOTAL / 2,
-                max: TOTAL,
-            },
-        }
-    }
-
-    #[test]
-    fn simple_query_estimation_test() {
-        let query = Filter::new_must(test_condition("color".to_owned()));
-        let estimation = estimate_filter(&test_estimator, &query, TOTAL);
-        assert_eq!(estimation.exp, 200);
-        assert!(!estimation.primary_clauses.is_empty());
-    }
-
-    #[test]
-    fn must_estimation_query_test() {
-        let query = Filter {
-            should: None,
-            must: Some(vec![
-                test_condition("color".to_owned()),
-                test_condition("size".to_owned()),
-                test_condition("un-indexed".to_owned()),
-            ]),
-            must_not: None,
-        };
-
-        let estimation = estimate_filter(&test_estimator, &query, TOTAL);
-        assert_eq!(estimation.primary_clauses.len(), 1);
-        match &estimation.primary_clauses[0] {
-            PrimaryCondition::Condition(field) => assert_eq!(&field.key, "size"),
-            _ => panic!(),
-        }
-        assert!(estimation.max <= TOTAL);
-        assert!(estimation.exp <= estimation.max);
-        assert!(estimation.min <= estimation.exp);
-    }
-
-    #[test]
-    fn should_estimation_query_test() {
-        let query = Filter {
-            should: Some(vec![
-                test_condition("color".to_owned()),
-                test_condition("size".to_owned()),
-            ]),
-            must: None,
-            must_not: None,
-        };
-
-        let estimation = estimate_filter(&test_estimator, &query, TOTAL);
-        assert_eq!(estimation.primary_clauses.len(), 2);
-        assert!(estimation.max <= TOTAL);
-        assert!(estimation.exp <= estimation.max);
-        assert!(estimation.min <= estimation.exp);
-    }
-
-    #[test]
-    fn another_should_estimation_query_test() {
-        let query = Filter {
-            should: Some(vec![
-                test_condition("color".to_owned()),
-                test_condition("size".to_owned()),
-                test_condition("un-indexed".to_owned()),
-            ]),
-            must: None,
-            must_not: None,
-        };
-
-        let estimation = estimate_filter(&test_estimator, &query, TOTAL);
-        assert_eq!(estimation.primary_clauses.len(), 0);
-        eprintln!("estimation = {estimation:#?}");
-        assert!(estimation.max <= TOTAL);
-        assert!(estimation.exp <= estimation.max);
-        assert!(estimation.min <= estimation.exp);
-    }
-
-    #[test]
-    fn complex_estimation_query_test() {
-        let query = Filter {
-            should: Some(vec![
-                Condition::Filter(Filter {
-                    should: None,
-                    must: Some(vec![
-                        test_condition("color".to_owned()),
-                        test_condition("size".to_owned()),
-                    ]),
-                    must_not: None,
-                }),
-                Condition::Filter(Filter {
-                    should: None,
-                    must: Some(vec![
-                        test_condition("price".to_owned()),
-                        test_condition("size".to_owned()),
-                    ]),
-                    must_not: None,
-                }),
-            ]),
-            must: None,
-            must_not: Some(vec![Condition::HasId(HasIdCondition {
-                has_id: HashSet::from_iter([1, 2, 3, 4, 5].into_iter().map(|x| x.into())),
-            })]),
-        };
-
-        let estimation = estimate_filter(&test_estimator, &query, TOTAL);
-        assert_eq!(estimation.primary_clauses.len(), 2);
-        assert!(estimation.max <= TOTAL);
-        assert!(estimation.exp <= estimation.max);
-        assert!(estimation.min <= estimation.exp);
-    }
-
-    #[test]
-    fn another_complex_estimation_query_test() {
-        let query = Filter {
-            should: None,
-            must: Some(vec![
-                Condition::Filter(Filter {
-                    must: None,
-                    should: Some(vec![
-                        test_condition("color".to_owned()),
-                        test_condition("size".to_owned()),
-                    ]),
-                    must_not: None,
-                }),
-                Condition::Filter(Filter {
-                    must: None,
-                    should: Some(vec![
-                        test_condition("price".to_owned()),
-                        test_condition("size".to_owned()),
-                    ]),
-                    must_not: None,
-                }),
-            ]),
-            must_not: Some(vec![Condition::HasId(HasIdCondition {
-                has_id: HashSet::from_iter([1, 2, 3, 4, 5].into_iter().map(|x| x.into())),
-            })]),
-        };
-
-        let estimation = estimate_filter(&test_estimator, &query, TOTAL);
-        assert_eq!(estimation.primary_clauses.len(), 2);
-        estimation.primary_clauses.iter().for_each(|x| match x {
-            PrimaryCondition::Condition(field) => {
-                assert!(vec!["price".to_owned(), "size".to_owned(),].contains(&field.key))
-            }
-            _ => panic!("Should not go here"),
-        });
-        assert!(estimation.max <= TOTAL);
-        assert!(estimation.exp <= estimation.max);
-        assert!(estimation.min <= estimation.exp);
-    }
-
-    #[test]
-    fn test_combine_must_estimations() {
-        let estimations = vec![CardinalityEstimation {
-            primary_clauses: vec![],
-            min: 12,
-            exp: 12,
-            max: 12,
-        }];
-
-        let res = combine_must_estimations(&estimations, 10_000);
-        eprintln!("res = {res:#?}");
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/index/query_optimization/condition_converter.rs b/crates/qdrant/lib/segment/src/index/query_optimization/condition_converter.rs
deleted file mode 100644
index 1dc7db0..0000000
--- a/crates/qdrant/lib/segment/src/index/query_optimization/condition_converter.rs
+++ /dev/null
@@ -1,307 +0,0 @@
-use std::collections::HashSet;
-
-use serde_json::Value;
-
-use crate::common::utils::IndexesMap;
-use crate::id_tracker::IdTrackerSS;
-use crate::index::field_index::FieldIndex;
-use crate::index::query_optimization::optimized_filter::ConditionCheckerFn;
-use crate::index::query_optimization::payload_provider::PayloadProvider;
-use crate::payload_storage::query_checker::{
-    check_field_condition, check_is_empty_condition, check_is_null_condition, check_payload,
-    select_nested_indexes,
-};
-use crate::types::{
-    AnyVariants, Condition, FieldCondition, FloatPayloadType, GeoBoundingBox, GeoRadius, Match,
-    MatchAny, MatchExcept, MatchText, MatchValue, OwnedPayloadRef, PayloadContainer,
-    PointOffsetType, Range, ValueVariants,
-};
-
-pub fn condition_converter<'a>(
-    condition: &'a Condition,
-    field_indexes: &'a IndexesMap,
-    payload_provider: PayloadProvider,
-    id_tracker: &IdTrackerSS,
-) -> ConditionCheckerFn<'a> {
-    match condition {
-        Condition::Field(field_condition) => field_indexes
-            .get(&field_condition.key)
-            .and_then(|indexes| {
-                indexes
-                    .iter()
-                    .find_map(|index| field_condition_index(index, field_condition))
-            })
-            .unwrap_or_else(|| {
-                Box::new(move |point_id| {
-                    payload_provider.with_payload(point_id, |payload| {
-                        check_field_condition(field_condition, &payload, field_indexes)
-                    })
-                })
-            }),
-        // We can use index for `is_empty` condition effectively only when it is not empty.
-        // If the index says it is "empty", we still need to check the payload.
-        Condition::IsEmpty(is_empty) => {
-            let first_field_index = field_indexes
-                .get(&is_empty.is_empty.key)
-                .and_then(|indexes| indexes.first());
-
-            let fallback = Box::new(move |point_id| {
-                payload_provider.with_payload(point_id, |payload| {
-                    check_is_empty_condition(is_empty, &payload)
-                })
-            });
-
-            match first_field_index {
-                Some(index) => get_is_empty_checker(index, fallback),
-                None => fallback,
-            }
-        }
-
-        Condition::IsNull(is_null) => Box::new(move |point_id| {
-            payload_provider.with_payload(point_id, |payload| {
-                check_is_null_condition(is_null, &payload)
-            })
-        }),
-        // ToDo: It might be possible to make this condition faster by using `VisitedPool` instead of HashSet
-        Condition::HasId(has_id) => {
-            let segment_ids: HashSet<_> = has_id
-                .has_id
-                .iter()
-                .filter_map(|external_id| id_tracker.internal_id(*external_id))
-                .collect();
-            Box::new(move |point_id| segment_ids.contains(&point_id))
-        }
-        Condition::Nested(nested) => {
-            // Select indexes for nested fields. Trim nested part from key, so
-            // that nested condition can address fields without nested part.
-
-            // Example:
-            // Index for field `nested.field` will be stored under key `nested.field`
-            // And we have a query:
-            // {
-            //   "nested": {
-            //     "path": "nested",
-            //     "filter": {
-            //         ...
-            //         "match": {"key": "field", "value": "value"}
-            //     }
-            //   }
-
-            // In this case we want to use `nested.field`, but we only have `field` in query.
-            // Therefore we need to trim `nested` part from key. So that query executor
-            // can address proper index for nested field.
-            let nested_path = nested.array_key();
-
-            let nested_indexes = select_nested_indexes(&nested_path, field_indexes);
-
-            Box::new(move |point_id| {
-                payload_provider.with_payload(point_id, |payload| {
-                    let field_values = payload.get_value(&nested_path).values();
-
-                    for value in field_values {
-                        if let Value::Object(object) = value {
-                            let get_payload = || OwnedPayloadRef::from(object);
-                            if check_payload(
-                                Box::new(get_payload),
-                                // None because has_id in nested is not supported. So retrieving
-                                // IDs through the tracker would always return None.
-                                None,
-                                &nested.nested.filter,
-                                point_id,
-                                &nested_indexes,
-                            ) {
-                                // If at least one nested object matches, return true
-                                return true;
-                            }
-                        }
-                    }
-                    false
-                })
-            })
-        }
-        Condition::Filter(_) => unreachable!(),
-    }
-}
-
-pub fn field_condition_index<'a>(
-    index: &'a FieldIndex,
-    field_condition: &FieldCondition,
-) -> Option<ConditionCheckerFn<'a>> {
-    if let Some(checker) = field_condition
-        .r#match
-        .clone()
-        .and_then(|cond| get_match_checkers(index, cond))
-    {
-        return Some(checker);
-    }
-
-    if let Some(checker) = field_condition
-        .range
-        .clone()
-        .and_then(|cond| get_range_checkers(index, cond))
-    {
-        return Some(checker);
-    }
-
-    if let Some(checker) = field_condition
-        .geo_radius
-        .clone()
-        .and_then(|cond| get_geo_radius_checkers(index, cond))
-    {
-        return Some(checker);
-    }
-
-    if let Some(checker) = field_condition
-        .geo_bounding_box
-        .clone()
-        .and_then(|cond| get_geo_bounding_box_checkers(index, cond))
-    {
-        return Some(checker);
-    }
-
-    None
-}
-
-pub fn get_geo_radius_checkers(
-    index: &FieldIndex,
-    geo_radius: GeoRadius,
-) -> Option<ConditionCheckerFn> {
-    match index {
-        FieldIndex::GeoIndex(geo_index) => Some(Box::new(move |point_id: PointOffsetType| {
-            geo_index.get_values(point_id).map_or(false, |values| {
-                values
-                    .iter()
-                    .any(|geo_point| geo_radius.check_point(geo_point.lon, geo_point.lat))
-            })
-        })),
-        _ => None,
-    }
-}
-
-pub fn get_geo_bounding_box_checkers(
-    index: &FieldIndex,
-    geo_bounding_box: GeoBoundingBox,
-) -> Option<ConditionCheckerFn> {
-    match index {
-        FieldIndex::GeoIndex(geo_index) => Some(Box::new(move |point_id: PointOffsetType| {
-            match geo_index.get_values(point_id) {
-                None => false,
-                Some(values) => values
-                    .iter()
-                    .any(|geo_point| geo_bounding_box.check_point(geo_point.lon, geo_point.lat)),
-            }
-        })),
-        _ => None,
-    }
-}
-
-pub fn get_range_checkers(index: &FieldIndex, range: Range) -> Option<ConditionCheckerFn> {
-    match index {
-        FieldIndex::IntIndex(num_index) => Some(Box::new(move |point_id: PointOffsetType| {
-            num_index.get_values(point_id).map_or(false, |values| {
-                values
-                    .iter()
-                    .copied()
-                    .any(|i| range.check_range(i as FloatPayloadType))
-            })
-        })),
-        FieldIndex::FloatIndex(num_index) => Some(Box::new(move |point_id: PointOffsetType| {
-            num_index.get_values(point_id).map_or(false, |values| {
-                values.iter().copied().any(|i| range.check_range(i))
-            })
-        })),
-        _ => None,
-    }
-}
-
-pub fn get_match_checkers(index: &FieldIndex, cond_match: Match) -> Option<ConditionCheckerFn> {
-    match cond_match {
-        Match::Value(MatchValue {
-            value: value_variant,
-        }) => match (value_variant, index) {
-            (ValueVariants::Keyword(keyword), FieldIndex::KeywordIndex(index)) => {
-                Some(Box::new(move |point_id: PointOffsetType| {
-                    index
-                        .get_values(point_id)
-                        .map_or(false, |values| values.iter().any(|k| k == &keyword))
-                }))
-            }
-            (ValueVariants::Integer(value), FieldIndex::IntMapIndex(index)) => {
-                Some(Box::new(move |point_id: PointOffsetType| {
-                    index
-                        .get_values(point_id)
-                        .map_or(false, |values| values.iter().any(|i| i == &value))
-                }))
-            }
-            _ => None,
-        },
-        Match::Text(MatchText { text }) => match index {
-            FieldIndex::FullTextIndex(full_text_index) => {
-                let parsed_query = full_text_index.parse_query(&text);
-                Some(Box::new(move |point_id: PointOffsetType| {
-                    full_text_index
-                        .get_doc(point_id)
-                        .map_or(false, |doc| parsed_query.check_match(doc))
-                }))
-            }
-            _ => None,
-        },
-        Match::Any(MatchAny { any }) => match (any, index) {
-            (AnyVariants::Keywords(list), FieldIndex::KeywordIndex(index)) => {
-                Some(Box::new(move |point_id: PointOffsetType| {
-                    index.get_values(point_id).map_or(false, |values| {
-                        values
-                            .iter()
-                            .any(|k| list.iter().any(|s| s.as_str() == k.as_ref()))
-                    })
-                }))
-            }
-            (AnyVariants::Integers(list), FieldIndex::IntMapIndex(index)) => {
-                Some(Box::new(move |point_id: PointOffsetType| {
-                    index
-                        .get_values(point_id)
-                        .map_or(false, |values| values.iter().any(|i| list.contains(i)))
-                }))
-            }
-            _ => None,
-        },
-        Match::Except(MatchExcept { except }) => match (except, index) {
-            (AnyVariants::Keywords(list), FieldIndex::KeywordIndex(index)) => {
-                Some(Box::new(move |point_id: PointOffsetType| {
-                    index.get_values(point_id).map_or(false, |values| {
-                        values
-                            .iter()
-                            .any(|k| !list.iter().any(|s| s.as_str() == k.as_ref()))
-                    })
-                }))
-            }
-            (AnyVariants::Integers(list), FieldIndex::IntMapIndex(index)) => {
-                Some(Box::new(move |point_id: PointOffsetType| {
-                    index
-                        .get_values(point_id)
-                        .map_or(false, |values| values.iter().any(|i| !list.contains(i)))
-                }))
-            }
-            (_, index) => Some(Box::new(|point_id: PointOffsetType| {
-                // If there is any other value of any other index, then it's a match
-                index.values_count(point_id) > 0
-            })),
-        },
-    }
-}
-
-/// Get a checker that checks if the field is empty
-///
-/// * `index` - index to check first
-/// * `fallback` - Check if it is empty using plain payload
-#[inline]
-fn get_is_empty_checker<'a>(
-    index: &'a FieldIndex,
-    fallback: ConditionCheckerFn<'a>,
-) -> ConditionCheckerFn<'a> {
-    Box::new(move |point_id: PointOffsetType| {
-        // Counting on the short-circuit of the `&&` operator
-        // Only check the fallback if the index seems to be empty
-        index.values_is_empty(point_id) && fallback(point_id)
-    })
-}
diff --git a/crates/qdrant/lib/segment/src/index/query_optimization/mod.rs b/crates/qdrant/lib/segment/src/index/query_optimization/mod.rs
deleted file mode 100644
index be5fc09..0000000
--- a/crates/qdrant/lib/segment/src/index/query_optimization/mod.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-pub mod condition_converter;
-pub mod optimized_filter;
-pub mod optimizer;
-pub mod payload_provider;
diff --git a/crates/qdrant/lib/segment/src/index/query_optimization/optimized_filter.rs b/crates/qdrant/lib/segment/src/index/query_optimization/optimized_filter.rs
deleted file mode 100644
index 67cd126..0000000
--- a/crates/qdrant/lib/segment/src/index/query_optimization/optimized_filter.rs
+++ /dev/null
@@ -1,55 +0,0 @@
-use crate::types::PointOffsetType;
-
-pub type ConditionCheckerFn<'a> = Box<dyn Fn(PointOffsetType) -> bool + 'a>;
-
-pub enum OptimizedCondition<'a> {
-    Checker(ConditionCheckerFn<'a>),
-    /// Nested filter
-    Filter(OptimizedFilter<'a>),
-}
-
-pub struct OptimizedFilter<'a> {
-    /// At least one of those conditions should match
-    pub should: Option<Vec<OptimizedCondition<'a>>>,
-    /// All conditions must match
-    pub must: Option<Vec<OptimizedCondition<'a>>>,
-    /// All conditions must NOT match
-    pub must_not: Option<Vec<OptimizedCondition<'a>>>,
-}
-
-pub fn check_optimized_filter(filter: &OptimizedFilter, point_id: PointOffsetType) -> bool {
-    check_should(&filter.should, point_id)
-        && check_must(&filter.must, point_id)
-        && check_must_not(&filter.must_not, point_id)
-}
-
-fn check_condition(condition: &OptimizedCondition, point_id: PointOffsetType) -> bool {
-    match condition {
-        OptimizedCondition::Filter(filter) => check_optimized_filter(filter, point_id),
-        OptimizedCondition::Checker(checker) => checker(point_id),
-    }
-}
-
-fn check_should(should: &Option<Vec<OptimizedCondition>>, point_id: PointOffsetType) -> bool {
-    let check = |condition| check_condition(condition, point_id);
-    match should {
-        None => true,
-        Some(conditions) => conditions.iter().any(check),
-    }
-}
-
-fn check_must(must: &Option<Vec<OptimizedCondition>>, point_id: PointOffsetType) -> bool {
-    let check = |condition| check_condition(condition, point_id);
-    match must {
-        None => true,
-        Some(conditions) => conditions.iter().all(check),
-    }
-}
-
-fn check_must_not(must: &Option<Vec<OptimizedCondition>>, point_id: PointOffsetType) -> bool {
-    let check = |condition| !check_condition(condition, point_id);
-    match must {
-        None => true,
-        Some(conditions) => conditions.iter().all(check),
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/index/query_optimization/optimizer.rs b/crates/qdrant/lib/segment/src/index/query_optimization/optimizer.rs
deleted file mode 100644
index c3eaafd..0000000
--- a/crates/qdrant/lib/segment/src/index/query_optimization/optimizer.rs
+++ /dev/null
@@ -1,230 +0,0 @@
-use std::cmp::Reverse;
-
-use itertools::Itertools;
-
-use crate::common::utils::IndexesMap;
-use crate::id_tracker::IdTrackerSS;
-use crate::index::field_index::CardinalityEstimation;
-use crate::index::query_estimator::{
-    combine_must_estimations, combine_should_estimations, invert_estimation,
-};
-use crate::index::query_optimization::condition_converter::condition_converter;
-use crate::index::query_optimization::optimized_filter::{OptimizedCondition, OptimizedFilter};
-use crate::index::query_optimization::payload_provider::PayloadProvider;
-use crate::types::{Condition, Filter};
-
-/// Converts user-provided filtering condition into optimized representation
-///
-/// Optimizations:
-///
-/// * Convert each condition into a checker function
-/// * Use column index, avoid reading Payload, if possible
-/// * Re-order operations using estimated cardinalities
-///
-/// ToDo: Add optimizations between clauses
-///
-/// # Arguments
-///
-/// * `filter` - original filter
-/// * `id_tracker` - used for converting collection-level ids into segment-level offsets of HasId condition
-/// * `estimator` - function to estimate cardinality of individual conditions
-/// * `total` - total number of points in segment (used for cardinality estimation)
-///
-/// # Result
-///
-/// Optimized query + Cardinality estimation
-pub fn optimize_filter<'a, F>(
-    filter: &'a Filter,
-    id_tracker: &IdTrackerSS,
-    field_indexes: &'a IndexesMap,
-    payload_provider: PayloadProvider,
-    estimator: &F,
-    total: usize,
-) -> (OptimizedFilter<'a>, CardinalityEstimation)
-where
-    F: Fn(&Condition) -> CardinalityEstimation,
-{
-    let mut filter_estimations: Vec<CardinalityEstimation> = vec![];
-
-    let optimized_filter = OptimizedFilter {
-        should: filter.should.as_ref().and_then(|conditions| {
-            if !conditions.is_empty() {
-                let (optimized_conditions, estimation) = optimize_should(
-                    conditions,
-                    id_tracker,
-                    field_indexes,
-                    payload_provider.clone(),
-                    estimator,
-                    total,
-                );
-                filter_estimations.push(estimation);
-                Some(optimized_conditions)
-            } else {
-                None
-            }
-        }),
-        must: filter.must.as_ref().and_then(|conditions| {
-            if !conditions.is_empty() {
-                let (optimized_conditions, estimation) = optimize_must(
-                    conditions,
-                    id_tracker,
-                    field_indexes,
-                    payload_provider.clone(),
-                    estimator,
-                    total,
-                );
-                filter_estimations.push(estimation);
-                Some(optimized_conditions)
-            } else {
-                None
-            }
-        }),
-        must_not: filter.must_not.as_ref().and_then(|conditions| {
-            if !conditions.is_empty() {
-                let (optimized_conditions, estimation) = optimize_must_not(
-                    conditions,
-                    id_tracker,
-                    field_indexes,
-                    payload_provider.clone(),
-                    estimator,
-                    total,
-                );
-                filter_estimations.push(estimation);
-                Some(optimized_conditions)
-            } else {
-                None
-            }
-        }),
-    };
-
-    (
-        optimized_filter,
-        combine_must_estimations(&filter_estimations, total),
-    )
-}
-
-fn convert_conditions<'a, F>(
-    conditions: &'a [Condition],
-    id_tracker: &IdTrackerSS,
-    field_indexes: &'a IndexesMap,
-    payload_provider: PayloadProvider,
-    estimator: &F,
-    total: usize,
-) -> Vec<(OptimizedCondition<'a>, CardinalityEstimation)>
-where
-    F: Fn(&Condition) -> CardinalityEstimation,
-{
-    conditions
-        .iter()
-        .map(|condition| match condition {
-            Condition::Filter(filter) => {
-                let (optimized_filter, estimation) = optimize_filter(
-                    filter,
-                    id_tracker,
-                    field_indexes,
-                    payload_provider.clone(),
-                    estimator,
-                    total,
-                );
-                (OptimizedCondition::Filter(optimized_filter), estimation)
-            }
-            _ => {
-                let estimation = estimator(condition);
-                let condition_checker = condition_converter(
-                    condition,
-                    field_indexes,
-                    payload_provider.clone(),
-                    id_tracker,
-                );
-                (OptimizedCondition::Checker(condition_checker), estimation)
-            }
-        })
-        .collect()
-}
-
-fn optimize_should<'a, F>(
-    conditions: &'a [Condition],
-    id_tracker: &IdTrackerSS,
-    field_indexes: &'a IndexesMap,
-    payload_provider: PayloadProvider,
-    estimator: &F,
-    total: usize,
-) -> (Vec<OptimizedCondition<'a>>, CardinalityEstimation)
-where
-    F: Fn(&Condition) -> CardinalityEstimation,
-{
-    let mut converted = convert_conditions(
-        conditions,
-        id_tracker,
-        field_indexes,
-        payload_provider,
-        estimator,
-        total,
-    );
-    // More probable conditions first
-    converted.sort_by_key(|(_, estimation)| Reverse(estimation.exp));
-    let (conditions, estimations): (Vec<_>, Vec<_>) = converted.into_iter().unzip();
-
-    (conditions, combine_should_estimations(&estimations, total))
-}
-
-fn optimize_must<'a, F>(
-    conditions: &'a [Condition],
-    id_tracker: &IdTrackerSS,
-    field_indexes: &'a IndexesMap,
-    payload_provider: PayloadProvider,
-    estimator: &F,
-    total: usize,
-) -> (Vec<OptimizedCondition<'a>>, CardinalityEstimation)
-where
-    F: Fn(&Condition) -> CardinalityEstimation,
-{
-    let mut converted = convert_conditions(
-        conditions,
-        id_tracker,
-        field_indexes,
-        payload_provider,
-        estimator,
-        total,
-    );
-    // Less probable conditions first
-    converted.sort_by_key(|(_, estimation)| estimation.exp);
-    let (conditions, estimations): (Vec<_>, Vec<_>) = converted.into_iter().unzip();
-
-    (conditions, combine_must_estimations(&estimations, total))
-}
-
-fn optimize_must_not<'a, F>(
-    conditions: &'a [Condition],
-    id_tracker: &IdTrackerSS,
-    field_indexes: &'a IndexesMap,
-    payload_provider: PayloadProvider,
-    estimator: &F,
-    total: usize,
-) -> (Vec<OptimizedCondition<'a>>, CardinalityEstimation)
-where
-    F: Fn(&Condition) -> CardinalityEstimation,
-{
-    let mut converted = convert_conditions(
-        conditions,
-        id_tracker,
-        field_indexes,
-        payload_provider,
-        estimator,
-        total,
-    );
-    // More probable conditions first, as it will be reverted
-    converted.sort_by_key(|(_, estimation)| estimation.exp);
-    let (conditions, estimations): (Vec<_>, Vec<_>) = converted.into_iter().unzip();
-
-    (
-        conditions,
-        combine_must_estimations(
-            &estimations
-                .into_iter()
-                .map(|estimation| invert_estimation(&estimation, total))
-                .collect_vec(),
-            total,
-        ),
-    )
-}
diff --git a/crates/qdrant/lib/segment/src/index/query_optimization/payload_provider.rs b/crates/qdrant/lib/segment/src/index/query_optimization/payload_provider.rs
deleted file mode 100644
index 62747ef..0000000
--- a/crates/qdrant/lib/segment/src/index/query_optimization/payload_provider.rs
+++ /dev/null
@@ -1,62 +0,0 @@
-use std::ops::Deref;
-use std::sync::Arc;
-
-use atomic_refcell::AtomicRefCell;
-
-use crate::payload_storage::payload_storage_enum::PayloadStorageEnum;
-use crate::types::{OwnedPayloadRef, Payload, PointOffsetType};
-
-#[derive(Clone)]
-pub struct PayloadProvider {
-    payload_storage: Arc<AtomicRefCell<PayloadStorageEnum>>,
-    empty_payload: Payload,
-}
-
-impl PayloadProvider {
-    pub fn new(payload_storage: Arc<AtomicRefCell<PayloadStorageEnum>>) -> Self {
-        Self {
-            payload_storage,
-            empty_payload: Default::default(),
-        }
-    }
-
-    pub fn with_payload<F, G>(&self, point_id: PointOffsetType, callback: F) -> G
-    where
-        F: FnOnce(OwnedPayloadRef) -> G,
-    {
-        let payload_storage_guard = self.payload_storage.borrow();
-        let payload_ptr_opt = match payload_storage_guard.deref() {
-            PayloadStorageEnum::InMemoryPayloadStorage(s) => {
-                s.payload_ptr(point_id).map(|x| x.into())
-            }
-            PayloadStorageEnum::SimplePayloadStorage(s) => {
-                s.payload_ptr(point_id).map(|x| x.into())
-            }
-            // Warn: Possible panic here
-            // Currently, it is possible that `read_payload` fails with Err,
-            // but it seems like a very rare possibility which might only happen
-            // if something is wrong with disk or storage is corrupted.
-            //
-            // In both cases it means that service can't be of use any longer.
-            // It is as good as dead. Therefore it is tolerable to just panic here.
-            // Downside is - API user won't be notified of the failure.
-            // It will just timeout.
-            //
-            // The alternative:
-            // Rewrite condition checking code to support error reporting.
-            // Which may lead to slowdown and assumes a lot of changes.
-            PayloadStorageEnum::OnDiskPayloadStorage(s) => s
-                .read_payload(point_id)
-                .unwrap_or_else(|err| panic!("Payload storage is corrupted: {err}"))
-                .map(|x| x.into()),
-        };
-
-        let payload = if let Some(payload_ptr) = payload_ptr_opt {
-            payload_ptr
-        } else {
-            (&self.empty_payload).into()
-        };
-
-        callback(payload)
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/index/sample_estimation.rs b/crates/qdrant/lib/segment/src/index/sample_estimation.rs
deleted file mode 100644
index cd97b6c..0000000
--- a/crates/qdrant/lib/segment/src/index/sample_estimation.rs
+++ /dev/null
@@ -1,105 +0,0 @@
-use std::cmp::{max, min};
-
-use crate::types::PointOffsetType;
-
-const MAX_ESTIMATED_POINTS: usize = 1000;
-
-/// How many points do we need to check in order to estimate expected query cardinality.
-/// Based on <https://en.wikipedia.org/wiki/Binomial_proportion_confidence_interval>
-#[allow(dead_code)]
-fn estimate_required_sample_size(total: usize, confidence_interval: usize) -> usize {
-    let confidence_interval = min(confidence_interval, total);
-    let z = 1.96; // percentile 0.95 of normal distribution
-    let index_fraction = confidence_interval as f64 / total as f64 / 2.0;
-    let h = 0.5; // success rate which requires most number of estimations
-    let estimated_size = h * (1. - h) / (index_fraction / z).powi(2);
-    max(estimated_size as usize, 10)
-}
-
-/// Returns (expected cardinality ± confidence interval at 0.99)
-/// Based on <https://en.wikipedia.org/wiki/Binomial_proportion_confidence_interval#Agresti%E2%80%93Coull_interval>
-fn confidence_agresti_coull_interval(trials: usize, positive: usize, total: usize) -> (i64, i64) {
-    let z = 2.; // heuristics
-    let n_hat = trials as f64 + z * z;
-    let phat = (positive as f64 + z * z / 2.) / n_hat;
-    let interval = z * ((phat / n_hat) * (1. - phat)).sqrt();
-
-    let expected = (phat * total as f64) as i64;
-    let delta = (interval * total as f64) as i64;
-    (expected, delta)
-}
-
-/// Tests if given `query` have cardinality higher than the `threshold`
-/// Iteratively samples points until the decision could be made with confidence
-pub fn sample_check_cardinality(
-    sample_points: impl Iterator<Item = PointOffsetType>,
-    checker: impl Fn(PointOffsetType) -> bool,
-    threshold: usize,
-    total_points: usize,
-) -> bool {
-    let mut matched_points = 0;
-    let mut total_checked = 0;
-
-    let mut exp = 0;
-    let mut interval;
-    for idx in sample_points.take(MAX_ESTIMATED_POINTS) {
-        matched_points += checker(idx) as usize;
-        total_checked += 1;
-
-        let estimation =
-            confidence_agresti_coull_interval(total_checked, matched_points, total_points);
-        exp = estimation.0;
-        interval = estimation.1;
-
-        if exp - interval > threshold as i64 {
-            return true;
-        }
-
-        if exp + interval < threshold as i64 {
-            return false;
-        }
-    }
-
-    exp > threshold as i64
-}
-
-#[cfg(test)]
-mod tests {
-    use rand::rngs::StdRng;
-    use rand::{Rng, SeedableRng};
-
-    use super::*;
-
-    #[test]
-    fn test_confidence_interval() {
-        let mut rng = StdRng::seed_from_u64(42);
-        let total = 100_000;
-        let true_p = 0.25;
-
-        let mut delta = 100_000;
-        let mut positive = 0;
-        for i in 1..=101 {
-            positive += rng.gen_bool(true_p) as usize;
-            if i % 20 == 1 {
-                let interval = confidence_agresti_coull_interval(i, positive, total);
-                assert!(interval.1 < delta);
-                delta = interval.1;
-                eprintln!(
-                    "confidence_agresti_coull_interval({i}, {positive}, {total}) = {interval:#?}"
-                );
-            }
-        }
-    }
-
-    #[test]
-    fn test_sample_check_cardinality() {
-        let res = sample_check_cardinality(
-            vec![1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12].into_iter(),
-            |idx| idx % 2 == 0,
-            10_000,
-            100_000,
-        );
-
-        assert!(res)
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/index/struct_filter_context.rs b/crates/qdrant/lib/segment/src/index/struct_filter_context.rs
deleted file mode 100644
index a404e35..0000000
--- a/crates/qdrant/lib/segment/src/index/struct_filter_context.rs
+++ /dev/null
@@ -1,43 +0,0 @@
-use crate::common::utils::IndexesMap;
-use crate::id_tracker::IdTrackerSS;
-use crate::index::field_index::CardinalityEstimation;
-use crate::index::query_optimization::optimized_filter::{check_optimized_filter, OptimizedFilter};
-use crate::index::query_optimization::optimizer::optimize_filter;
-use crate::index::query_optimization::payload_provider::PayloadProvider;
-use crate::payload_storage::FilterContext;
-use crate::types::{Condition, Filter, PointOffsetType};
-
-pub struct StructFilterContext<'a> {
-    optimized_filter: OptimizedFilter<'a>,
-}
-
-impl<'a> StructFilterContext<'a> {
-    pub fn new<F>(
-        filter: &'a Filter,
-        id_tracker: &IdTrackerSS,
-        payload_provider: PayloadProvider,
-        field_indexes: &'a IndexesMap,
-        estimator: &F,
-        total: usize,
-    ) -> Self
-    where
-        F: Fn(&Condition) -> CardinalityEstimation,
-    {
-        let (optimized_filter, _) = optimize_filter(
-            filter,
-            id_tracker,
-            field_indexes,
-            payload_provider,
-            estimator,
-            total,
-        );
-
-        Self { optimized_filter }
-    }
-}
-
-impl<'a> FilterContext for StructFilterContext<'a> {
-    fn check(&self, point_id: PointOffsetType) -> bool {
-        check_optimized_filter(&self.optimized_filter, point_id)
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/index/struct_payload_index.rs b/crates/qdrant/lib/segment/src/index/struct_payload_index.rs
deleted file mode 100644
index e3cb90b..0000000
--- a/crates/qdrant/lib/segment/src/index/struct_payload_index.rs
+++ /dev/null
@@ -1,567 +0,0 @@
-use std::collections::{HashMap, HashSet};
-use std::fs::create_dir_all;
-use std::ops::Deref;
-use std::path::{Path, PathBuf};
-use std::sync::Arc;
-
-use atomic_refcell::AtomicRefCell;
-use log::debug;
-use parking_lot::RwLock;
-use rocksdb::DB;
-use schemars::_serde_json::Value;
-
-use crate::common::arc_atomic_ref_cell_iterator::ArcAtomicRefCellIterator;
-use crate::common::rocksdb_wrapper::open_db_with_existing_cf;
-use crate::common::utils::{IndexesMap, JsonPathPayload, MultiValue};
-use crate::common::Flusher;
-use crate::entry::entry_point::{OperationError, OperationResult};
-use crate::id_tracker::IdTrackerSS;
-use crate::index::field_index::index_selector::index_selector;
-use crate::index::field_index::{
-    CardinalityEstimation, FieldIndex, PayloadBlockCondition, PrimaryCondition,
-};
-use crate::index::payload_config::PayloadConfig;
-use crate::index::query_estimator::estimate_filter;
-use crate::index::query_optimization::payload_provider::PayloadProvider;
-use crate::index::struct_filter_context::StructFilterContext;
-use crate::index::visited_pool::VisitedPool;
-use crate::index::PayloadIndex;
-use crate::payload_storage::payload_storage_enum::PayloadStorageEnum;
-use crate::payload_storage::{FilterContext, PayloadStorage};
-use crate::telemetry::PayloadIndexTelemetry;
-use crate::types::{
-    infer_collection_value_type, infer_value_type, Condition, FieldCondition, Filter,
-    IsEmptyCondition, IsNullCondition, Payload, PayloadContainer, PayloadField, PayloadFieldSchema,
-    PayloadKeyType, PayloadKeyTypeRef, PayloadSchemaType, PointOffsetType,
-};
-
-pub const PAYLOAD_FIELD_INDEX_PATH: &str = "fields";
-
-/// `PayloadIndex` implementation, which actually uses index structures for providing faster search
-pub struct StructPayloadIndex {
-    /// Payload storage
-    payload: Arc<AtomicRefCell<PayloadStorageEnum>>,
-    /// Used for `has_id` condition and estimating cardinality
-    id_tracker: Arc<AtomicRefCell<IdTrackerSS>>,
-    /// Indexes, associated with fields
-    pub field_indexes: IndexesMap,
-    config: PayloadConfig,
-    /// Root of index persistence dir
-    path: PathBuf,
-    /// Used to select unique point ids
-    visited_pool: VisitedPool,
-    db: Arc<RwLock<DB>>,
-}
-
-impl StructPayloadIndex {
-    pub fn estimate_field_condition(
-        &self,
-        condition: &FieldCondition,
-        nested_path: Option<&JsonPathPayload>,
-    ) -> Option<CardinalityEstimation> {
-        let full_path = JsonPathPayload::extend_or_new(nested_path, &condition.key);
-        self.field_indexes.get(&full_path.path).and_then(|indexes| {
-            // rewrite condition with fullpath to enable cardinality estimation
-            let full_path_condition = FieldCondition {
-                key: full_path.path,
-                ..condition.clone()
-            };
-            let mut result_estimation: Option<CardinalityEstimation> = None;
-            for index in indexes {
-                result_estimation = index.estimate_cardinality(&full_path_condition);
-                if result_estimation.is_some() {
-                    break;
-                }
-            }
-            result_estimation
-        })
-    }
-
-    fn query_field<'a>(
-        &'a self,
-        field_condition: &'a FieldCondition,
-    ) -> Option<Box<dyn Iterator<Item = PointOffsetType> + 'a>> {
-        let indexes = self
-            .field_indexes
-            .get(&field_condition.key)
-            .and_then(|indexes| {
-                indexes
-                    .iter()
-                    .map(|field_index| field_index.filter(field_condition))
-                    .find_map(|filter_iter| filter_iter)
-            });
-        indexes
-    }
-
-    fn config_path(&self) -> PathBuf {
-        PayloadConfig::get_config_path(&self.path)
-    }
-
-    fn save_config(&self) -> OperationResult<()> {
-        let config_path = self.config_path();
-        self.config.save(&config_path)
-    }
-
-    fn load_all_fields(&mut self) -> OperationResult<()> {
-        let mut field_indexes: IndexesMap = Default::default();
-
-        for (field, payload_schema) in &self.config.indexed_fields {
-            let field_index = self.load_from_db(field, payload_schema.to_owned())?;
-            field_indexes.insert(field.clone(), field_index);
-        }
-        self.field_indexes = field_indexes;
-        Ok(())
-    }
-
-    fn load_from_db(
-        &self,
-        field: PayloadKeyTypeRef,
-        payload_schema: PayloadFieldSchema,
-    ) -> OperationResult<Vec<FieldIndex>> {
-        let mut indexes = index_selector(field, &payload_schema, self.db.clone());
-
-        let mut is_loaded = true;
-        for ref mut index in indexes.iter_mut() {
-            if !index.load()? {
-                is_loaded = false;
-                break;
-            }
-        }
-        if !is_loaded {
-            debug!("Index for `{field}` was not loaded. Building...");
-            indexes = self.build_field_indexes(field, payload_schema)?;
-        }
-
-        Ok(indexes)
-    }
-
-    pub fn open(
-        payload: Arc<AtomicRefCell<PayloadStorageEnum>>,
-        id_tracker: Arc<AtomicRefCell<IdTrackerSS>>,
-        path: &Path,
-    ) -> OperationResult<Self> {
-        create_dir_all(path)?;
-        let config_path = PayloadConfig::get_config_path(path);
-        let config = if config_path.exists() {
-            PayloadConfig::load(&config_path)?
-        } else {
-            PayloadConfig::default()
-        };
-
-        let db = open_db_with_existing_cf(path)
-            .map_err(|err| OperationError::service_error(format!("RocksDB open error: {err}")))?;
-
-        let mut index = StructPayloadIndex {
-            payload,
-            id_tracker,
-            field_indexes: Default::default(),
-            config,
-            path: path.to_owned(),
-            visited_pool: Default::default(),
-            db,
-        };
-
-        if !index.config_path().exists() {
-            // Save default config
-            index.save_config()?;
-        }
-
-        index.load_all_fields()?;
-
-        Ok(index)
-    }
-
-    pub fn build_field_indexes(
-        &self,
-        field: PayloadKeyTypeRef,
-        payload_schema: PayloadFieldSchema,
-    ) -> OperationResult<Vec<FieldIndex>> {
-        let payload_storage = self.payload.borrow();
-        let mut field_indexes = index_selector(field, &payload_schema, self.db.clone());
-        for index in &field_indexes {
-            index.recreate()?;
-        }
-
-        payload_storage.iter(|point_id, point_payload| {
-            let field_value = &point_payload.get_value(field);
-            for field_index in field_indexes.iter_mut() {
-                field_index.add_point(point_id, field_value)?;
-            }
-            Ok(true)
-        })?;
-        Ok(field_indexes)
-    }
-
-    fn build_and_save(
-        &mut self,
-        field: PayloadKeyTypeRef,
-        payload_schema: PayloadFieldSchema,
-    ) -> OperationResult<()> {
-        let field_indexes = self.build_field_indexes(field, payload_schema)?;
-        self.field_indexes.insert(field.into(), field_indexes);
-        Ok(())
-    }
-
-    /// Number of available points
-    ///
-    /// - excludes soft deleted points
-    pub fn available_point_count(&self) -> usize {
-        self.id_tracker.borrow().available_point_count()
-    }
-
-    fn struct_filtered_context<'a>(&'a self, filter: &'a Filter) -> StructFilterContext<'a> {
-        let estimator = |condition: &Condition| self.condition_cardinality(condition, None);
-        let id_tracker = self.id_tracker.borrow();
-        let payload_provider = PayloadProvider::new(self.payload.clone());
-        StructFilterContext::new(
-            filter,
-            id_tracker.deref(),
-            payload_provider,
-            &self.field_indexes,
-            &estimator,
-            self.available_point_count(),
-        )
-    }
-
-    fn condition_cardinality(
-        &self,
-        condition: &Condition,
-        nested_path: Option<&JsonPathPayload>,
-    ) -> CardinalityEstimation {
-        match condition {
-            Condition::Filter(_) => panic!("Unexpected branching"),
-            Condition::Nested(nested) => {
-                // propagate complete nested path in case of multiple nested layers
-                let full_path = JsonPathPayload::extend_or_new(nested_path, &nested.array_key());
-                self.estimate_nested_cardinality(nested.filter(), &full_path)
-            }
-            Condition::IsEmpty(IsEmptyCondition { is_empty: field }) => {
-                let available_points = self.available_point_count();
-                let full_path = JsonPathPayload::extend_or_new(nested_path, &field.key);
-                let full_path = full_path.path;
-
-                let mut indexed_points = 0;
-                if let Some(field_indexes) = self.field_indexes.get(&full_path) {
-                    for index in field_indexes {
-                        indexed_points = indexed_points.max(index.count_indexed_points())
-                    }
-                    CardinalityEstimation {
-                        primary_clauses: vec![PrimaryCondition::IsEmpty(IsEmptyCondition {
-                            is_empty: PayloadField { key: full_path },
-                        })],
-                        min: 0, // It is possible, that some non-empty payloads are not indexed
-                        exp: available_points.saturating_sub(indexed_points), // Expect field type consistency
-                        max: available_points.saturating_sub(indexed_points),
-                    }
-                } else {
-                    CardinalityEstimation {
-                        primary_clauses: vec![PrimaryCondition::IsEmpty(IsEmptyCondition {
-                            is_empty: PayloadField { key: full_path },
-                        })],
-                        min: 0,
-                        exp: available_points / 2,
-                        max: available_points,
-                    }
-                }
-            }
-            Condition::IsNull(IsNullCondition { is_null: field }) => {
-                let available_points = self.available_point_count();
-                let full_path = JsonPathPayload::extend_or_new(nested_path, &field.key);
-                let full_path = full_path.path;
-
-                let mut indexed_points = 0;
-                if let Some(field_indexes) = self.field_indexes.get(&full_path) {
-                    for index in field_indexes {
-                        indexed_points = indexed_points.max(index.count_indexed_points())
-                    }
-                    CardinalityEstimation {
-                        primary_clauses: vec![PrimaryCondition::IsNull(IsNullCondition {
-                            is_null: PayloadField { key: full_path },
-                        })],
-                        min: 0,
-                        exp: available_points.saturating_sub(indexed_points),
-                        max: available_points.saturating_sub(indexed_points),
-                    }
-                } else {
-                    CardinalityEstimation {
-                        primary_clauses: vec![PrimaryCondition::IsNull(IsNullCondition {
-                            is_null: PayloadField { key: full_path },
-                        })],
-                        min: 0,
-                        exp: available_points / 2,
-                        max: available_points,
-                    }
-                }
-            }
-            Condition::HasId(has_id) => {
-                let id_tracker_ref = self.id_tracker.borrow();
-                let mapped_ids: HashSet<PointOffsetType> = has_id
-                    .has_id
-                    .iter()
-                    .filter_map(|external_id| id_tracker_ref.internal_id(*external_id))
-                    .collect();
-                let num_ids = mapped_ids.len();
-                CardinalityEstimation {
-                    primary_clauses: vec![PrimaryCondition::Ids(mapped_ids)],
-                    min: num_ids,
-                    exp: num_ids,
-                    max: num_ids,
-                }
-            }
-            Condition::Field(field_condition) => self
-                .estimate_field_condition(field_condition, nested_path)
-                .unwrap_or_else(|| CardinalityEstimation::unknown(self.available_point_count())),
-        }
-    }
-
-    pub fn get_telemetry_data(&self) -> Vec<PayloadIndexTelemetry> {
-        self.field_indexes
-            .iter()
-            .flat_map(|(name, field)| -> Vec<PayloadIndexTelemetry> {
-                field
-                    .iter()
-                    .map(|field| field.get_telemetry_data().set_name(name.to_string()))
-                    .collect()
-            })
-            .collect()
-    }
-
-    pub fn restore_database_snapshot(
-        snapshot_path: &Path,
-        segment_path: &Path,
-    ) -> OperationResult<()> {
-        crate::rocksdb_backup::restore(snapshot_path, &segment_path.join("payload_index"))
-    }
-}
-
-impl PayloadIndex for StructPayloadIndex {
-    fn indexed_fields(&self) -> HashMap<PayloadKeyType, PayloadFieldSchema> {
-        self.config.indexed_fields.clone()
-    }
-
-    fn set_indexed(
-        &mut self,
-        field: PayloadKeyTypeRef,
-        payload_schema: PayloadFieldSchema,
-    ) -> OperationResult<()> {
-        if let Some(prev_schema) = self
-            .config
-            .indexed_fields
-            .insert(field.to_owned(), payload_schema.clone())
-        {
-            // the field is already indexed with the same schema
-            // no need to rebuild index and to save the config
-            if prev_schema == payload_schema {
-                return Ok(());
-            }
-        }
-        self.build_and_save(field, payload_schema)?;
-        self.save_config()?;
-
-        Ok(())
-    }
-
-    fn drop_index(&mut self, field: PayloadKeyTypeRef) -> OperationResult<()> {
-        self.config.indexed_fields.remove(field);
-        let removed_indexes = self.field_indexes.remove(field);
-
-        if let Some(indexes) = removed_indexes {
-            for index in indexes {
-                index.clear()?;
-            }
-        }
-
-        self.save_config()?;
-        Ok(())
-    }
-
-    fn estimate_cardinality(&self, query: &Filter) -> CardinalityEstimation {
-        let available_points = self.available_point_count();
-        let estimator = |condition: &Condition| self.condition_cardinality(condition, None);
-        estimate_filter(&estimator, query, available_points)
-    }
-
-    fn estimate_nested_cardinality(
-        &self,
-        query: &Filter,
-        nested_path: &JsonPathPayload,
-    ) -> CardinalityEstimation {
-        let available_points = self.available_point_count();
-        let estimator =
-            |condition: &Condition| self.condition_cardinality(condition, Some(nested_path));
-        estimate_filter(&estimator, query, available_points)
-    }
-
-    fn query_points(&self, query: &Filter) -> Vec<PointOffsetType> {
-        // Assume query is already estimated to be small enough so we can iterate over all matched ids
-
-        let query_cardinality = self.estimate_cardinality(query);
-
-        if query_cardinality.primary_clauses.is_empty() {
-            let full_scan_iterator =
-                ArcAtomicRefCellIterator::new(self.id_tracker.clone(), |points_iterator| {
-                    points_iterator.iter_ids()
-                });
-
-            let struct_filtered_context = self.struct_filtered_context(query);
-            // Worst case: query expected to return few matches, but index can't be used
-            let matched_points =
-                full_scan_iterator.filter(move |i| struct_filtered_context.check(*i));
-
-            matched_points.collect()
-        } else {
-            let points_iterator_ref = self.id_tracker.borrow();
-            let struct_filtered_context = self.struct_filtered_context(query);
-
-            // CPU-optimized strategy here: points are made unique before applying other filters.
-            // TODO: Implement iterator which holds the `visited_pool` and borrowed `vector_storage_ref` to prevent `preselected` array creation
-            let mut visited_list = self
-                .visited_pool
-                .get(points_iterator_ref.total_point_count());
-
-            let preselected: Vec<PointOffsetType> = query_cardinality
-                .primary_clauses
-                .iter()
-                .flat_map(|clause| {
-                    match clause {
-                        PrimaryCondition::Condition(field_condition) => {
-                            self.query_field(field_condition).unwrap_or_else(
-                                || points_iterator_ref.iter_ids(), /* index is not built */
-                            )
-                        }
-                        PrimaryCondition::Ids(ids) => Box::new(ids.iter().copied()),
-                        PrimaryCondition::IsEmpty(_) => points_iterator_ref.iter_ids(), /* there are no fast index for IsEmpty */
-                        PrimaryCondition::IsNull(_) => points_iterator_ref.iter_ids(),  /* no fast index for IsNull too */
-                    }
-                })
-                .filter(|&id| !visited_list.check_and_update_visited(id))
-                .filter(move |&i| struct_filtered_context.check(i))
-                .collect();
-
-            self.visited_pool.return_back(visited_list);
-
-            preselected
-        }
-    }
-
-    fn indexed_points(&self, field: PayloadKeyTypeRef) -> usize {
-        self.field_indexes.get(field).map_or(0, |indexes| {
-            // Assume that multiple field indexes are applied to the same data type,
-            // so the points indexed with those indexes are the same.
-            // We will return minimal number as a worst case, to highlight possible errors in the index early.
-            indexes
-                .iter()
-                .map(|index| index.count_indexed_points())
-                .min()
-                .unwrap_or(0)
-        })
-    }
-
-    fn filter_context<'a>(&'a self, filter: &'a Filter) -> Box<dyn FilterContext + 'a> {
-        Box::new(self.struct_filtered_context(filter))
-    }
-
-    fn payload_blocks(
-        &self,
-        field: PayloadKeyTypeRef,
-        threshold: usize,
-    ) -> Box<dyn Iterator<Item = PayloadBlockCondition> + '_> {
-        match self.field_indexes.get(field) {
-            None => Box::new(vec![].into_iter()),
-            Some(indexes) => {
-                let field_clone = field.to_owned();
-                Box::new(indexes.iter().flat_map(move |field_index| {
-                    field_index.payload_blocks(threshold, field_clone.clone())
-                }))
-            }
-        }
-    }
-
-    fn assign(&mut self, point_id: PointOffsetType, payload: &Payload) -> OperationResult<()> {
-        for (field, field_index) in &mut self.field_indexes {
-            let field_value = &payload.get_value(field);
-            for index in field_index {
-                index.add_point(point_id, field_value)?;
-            }
-        }
-        self.payload.borrow_mut().assign(point_id, payload)
-    }
-
-    fn payload(&self, point_id: PointOffsetType) -> OperationResult<Payload> {
-        self.payload.borrow().payload(point_id)
-    }
-
-    fn delete(
-        &mut self,
-        point_id: PointOffsetType,
-        key: PayloadKeyTypeRef,
-    ) -> OperationResult<Vec<Value>> {
-        if let Some(indexes) = self.field_indexes.get_mut(key) {
-            for index in indexes {
-                index.remove_point(point_id)?;
-            }
-        }
-        self.payload.borrow_mut().delete(point_id, key)
-    }
-
-    fn drop(&mut self, point_id: PointOffsetType) -> OperationResult<Option<Payload>> {
-        for (_, field_indexes) in self.field_indexes.iter_mut() {
-            for index in field_indexes {
-                index.remove_point(point_id)?;
-            }
-        }
-        self.payload.borrow_mut().drop(point_id)
-    }
-
-    fn wipe(&mut self) -> OperationResult<()> {
-        self.payload.borrow_mut().wipe()?;
-        for (_, field_indexes) in self.field_indexes.iter_mut() {
-            for index in field_indexes.drain(..) {
-                index.clear()?;
-            }
-        }
-        self.load_all_fields()
-    }
-
-    fn flusher(&self) -> Flusher {
-        let mut flushers = Vec::new();
-        for field_indexes in self.field_indexes.values() {
-            for index in field_indexes {
-                flushers.push(index.flusher());
-            }
-        }
-        flushers.push(self.payload.borrow().flusher());
-        Box::new(move || {
-            for flusher in flushers {
-                flusher()?
-            }
-            Ok(())
-        })
-    }
-
-    fn infer_payload_type(
-        &self,
-        key: PayloadKeyTypeRef,
-    ) -> OperationResult<Option<PayloadSchemaType>> {
-        let mut schema = None;
-        self.payload.borrow().iter(|_id, payload: &Payload| {
-            let field_value = payload.get_value(key);
-            match field_value {
-                MultiValue::Single(field_value) => schema = field_value.and_then(infer_value_type),
-                MultiValue::Multiple(fields_values) => {
-                    schema = infer_collection_value_type(fields_values)
-                }
-            }
-            Ok(false)
-        })?;
-        Ok(schema)
-    }
-
-    fn take_database_snapshot(&self, path: &Path) -> OperationResult<()> {
-        crate::rocksdb_backup::create(&self.db.read(), path)
-    }
-
-    fn files(&self) -> Vec<PathBuf> {
-        vec![self.config_path()]
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/index/vector_index_base.rs b/crates/qdrant/lib/segment/src/index/vector_index_base.rs
deleted file mode 100644
index 4eb628f..0000000
--- a/crates/qdrant/lib/segment/src/index/vector_index_base.rs
+++ /dev/null
@@ -1,114 +0,0 @@
-use std::path::PathBuf;
-use std::sync::atomic::AtomicBool;
-
-use super::hnsw_index::graph_links::{GraphLinksMmap, GraphLinksRam};
-use super::hnsw_index::hnsw::HNSWIndex;
-use super::plain_payload_index::PlainIndex;
-use crate::data_types::vectors::VectorElementType;
-use crate::entry::entry_point::OperationResult;
-use crate::telemetry::VectorIndexSearchesTelemetry;
-use crate::types::{Filter, SearchParams};
-use crate::vector_storage::ScoredPointOffset;
-
-/// Trait for vector searching
-pub trait VectorIndex {
-    /// Return list of Ids with fitting
-    fn search(
-        &self,
-        vectors: &[&[VectorElementType]],
-        filter: Option<&Filter>,
-        top: usize,
-        params: Option<&SearchParams>,
-        is_stopped: &AtomicBool,
-    ) -> Vec<Vec<ScoredPointOffset>>;
-
-    /// Force internal index rebuild.
-    fn build_index(&mut self, stopped: &AtomicBool) -> OperationResult<()>;
-
-    fn get_telemetry_data(&self) -> VectorIndexSearchesTelemetry;
-
-    fn files(&self) -> Vec<PathBuf>;
-
-    /// The number of indexed vectors, currently accessible
-    fn indexed_vector_count(&self) -> usize;
-
-    /// Whether this vector index type support appending.
-    fn is_appendable(&self) -> bool;
-}
-
-pub enum VectorIndexEnum {
-    Plain(PlainIndex),
-    HnswRam(HNSWIndex<GraphLinksRam>),
-    HnswMmap(HNSWIndex<GraphLinksMmap>),
-}
-
-impl VectorIndexEnum {
-    pub fn is_index(&self) -> bool {
-        match self {
-            Self::Plain(_) => false,
-            Self::HnswRam(_) => true,
-            Self::HnswMmap(_) => true,
-        }
-    }
-}
-
-impl VectorIndex for VectorIndexEnum {
-    fn search(
-        &self,
-        vectors: &[&[VectorElementType]],
-        filter: Option<&Filter>,
-        top: usize,
-        params: Option<&SearchParams>,
-        is_stopped: &AtomicBool,
-    ) -> Vec<Vec<ScoredPointOffset>> {
-        match self {
-            VectorIndexEnum::Plain(index) => index.search(vectors, filter, top, params, is_stopped),
-            VectorIndexEnum::HnswRam(index) => {
-                index.search(vectors, filter, top, params, is_stopped)
-            }
-            VectorIndexEnum::HnswMmap(index) => {
-                index.search(vectors, filter, top, params, is_stopped)
-            }
-        }
-    }
-
-    fn build_index(&mut self, stopped: &AtomicBool) -> OperationResult<()> {
-        match self {
-            VectorIndexEnum::Plain(index) => index.build_index(stopped),
-            VectorIndexEnum::HnswRam(index) => index.build_index(stopped),
-            VectorIndexEnum::HnswMmap(index) => index.build_index(stopped),
-        }
-    }
-
-    fn get_telemetry_data(&self) -> VectorIndexSearchesTelemetry {
-        match self {
-            VectorIndexEnum::Plain(index) => index.get_telemetry_data(),
-            VectorIndexEnum::HnswRam(index) => index.get_telemetry_data(),
-            VectorIndexEnum::HnswMmap(index) => index.get_telemetry_data(),
-        }
-    }
-
-    fn files(&self) -> Vec<PathBuf> {
-        match self {
-            VectorIndexEnum::Plain(index) => index.files(),
-            VectorIndexEnum::HnswRam(index) => index.files(),
-            VectorIndexEnum::HnswMmap(index) => index.files(),
-        }
-    }
-
-    fn indexed_vector_count(&self) -> usize {
-        match self {
-            Self::Plain(index) => index.indexed_vector_count(),
-            Self::HnswRam(index) => index.indexed_vector_count(),
-            Self::HnswMmap(index) => index.indexed_vector_count(),
-        }
-    }
-
-    fn is_appendable(&self) -> bool {
-        match self {
-            Self::Plain(index) => index.is_appendable(),
-            Self::HnswRam(index) => index.is_appendable(),
-            Self::HnswMmap(index) => index.is_appendable(),
-        }
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/index/visited_pool.rs b/crates/qdrant/lib/segment/src/index/visited_pool.rs
deleted file mode 100644
index 98b26ce..0000000
--- a/crates/qdrant/lib/segment/src/index/visited_pool.rs
+++ /dev/null
@@ -1,104 +0,0 @@
-//! Structures for fast and tread-safe way to check if some points were visited or not
-
-use parking_lot::RwLock;
-
-use crate::types::PointOffsetType;
-
-/// Max number of visited lists to preserve in memory
-/// If more than this number of concurrent requests occurred - new list will be created dynamically,
-/// but will be deleted right after query finishes.
-/// Implemented in order to limit memory leak
-const POOL_KEEP_LIMIT: usize = 16;
-
-/// Visited list reuses same memory to keep track of visited points ids among multiple consequent queries
-///
-/// It stores the sequence number of last processed operation next to the point ID, which allows to avoid memory allocation
-/// and re-use same counter for multiple queries.
-#[derive(Debug)]
-pub struct VisitedList {
-    current_iter: usize,
-    visit_counters: Vec<usize>,
-}
-
-impl VisitedList {
-    pub fn new(num_points: usize) -> Self {
-        VisitedList {
-            current_iter: 1,
-            visit_counters: vec![0; num_points],
-        }
-    }
-
-    pub fn get_current_iteration_id(&self) -> usize {
-        self.current_iter
-    }
-
-    // Count how many points were visited since the given iteration
-    pub fn count_visits_since(&self, iteration_id: usize) -> usize {
-        self.visit_counters
-            .iter()
-            .filter(|x| **x >= iteration_id)
-            .count()
-    }
-
-    /// Return `true` if visited
-    pub fn check(&self, point_id: PointOffsetType) -> bool {
-        self.visit_counters
-            .get(point_id as usize)
-            .map_or(false, |x| *x >= self.current_iter)
-    }
-
-    /// Updates visited list
-    /// return `true` if point was visited before
-    pub fn check_and_update_visited(&mut self, point_id: PointOffsetType) -> bool {
-        let idx = point_id as usize;
-        if idx >= self.visit_counters.len() {
-            self.visit_counters.resize(idx + 1, 0);
-        }
-        let prev_value = self.visit_counters[idx];
-        self.visit_counters[idx] = self.current_iter;
-        prev_value >= self.current_iter
-    }
-
-    pub fn next_iteration(&mut self) {
-        self.current_iter += 1;
-    }
-}
-
-/// Keeps a list of `VisitedList` which could be requested and released from multiple threads
-///
-/// If there are more requests than lists - creates a new list, but only keeps max defined amount.
-#[derive(Debug)]
-pub struct VisitedPool {
-    pool: RwLock<Vec<VisitedList>>,
-}
-
-impl VisitedPool {
-    pub fn new() -> Self {
-        VisitedPool {
-            pool: RwLock::new(vec![]),
-        }
-    }
-
-    pub fn get(&self, num_points: usize) -> VisitedList {
-        match self.pool.write().pop() {
-            None => VisitedList::new(num_points),
-            Some(mut vl) => {
-                vl.next_iteration();
-                vl
-            }
-        }
-    }
-
-    pub fn return_back(&self, visited_list: VisitedList) {
-        let mut pool = self.pool.write();
-        if pool.len() < POOL_KEEP_LIMIT {
-            pool.push(visited_list);
-        }
-    }
-}
-
-impl Default for VisitedPool {
-    fn default() -> Self {
-        VisitedPool::new()
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/lib.rs b/crates/qdrant/lib/segment/src/lib.rs
deleted file mode 100644
index 6c5fa1d..0000000
--- a/crates/qdrant/lib/segment/src/lib.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-pub mod common;
-pub mod entry;
-pub mod fixtures;
-pub mod id_tracker;
-pub mod index;
-pub mod madvise;
-pub mod payload_storage;
-pub mod rocksdb_backup;
-pub mod segment;
-pub mod segment_constructor;
-pub mod spaces;
-pub mod telemetry;
-
-mod compat;
-pub mod data_types;
-pub mod types;
-pub mod utils;
-pub mod vector_storage;
-
-#[macro_use]
-extern crate num_derive;
-extern crate core;
-
-#[cfg(test)]
-mod tests {
-    #[test]
-    fn it_works() {
-        assert_eq!(2 + 2, 4);
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/madvise.rs b/crates/qdrant/lib/segment/src/madvise.rs
deleted file mode 100644
index 6afd3c9..0000000
--- a/crates/qdrant/lib/segment/src/madvise.rs
+++ /dev/null
@@ -1,94 +0,0 @@
-//! Platform-independent abstractions over [`memmap2::Mmap::advise`]/[`memmap2::MmapMut::advise`]
-//! and [`memmap2::Advice`].
-
-use std::io;
-
-use serde::Deserialize;
-
-/// Global [`Advice`] value, to trivially set [`Advice`] value
-/// used by all memmaps created by the `segment` crate.
-///
-/// See [`set_global`] and [`get_global`].
-static ADVICE: parking_lot::RwLock<Advice> = parking_lot::RwLock::new(Advice::Random);
-
-/// Set global [`Advice`] value.
-///
-/// When the `segment` crate creates [`memmap2::Mmap`] or [`memmap2::MmapMut`]
-/// _for a memory-mapped, on-disk HNSW index or vector storage access_
-/// it will "advise" the created memmap with the current global [`Advice`] value
-/// (obtained with [`get_global`]).
-///
-/// It is recommended to set the desired [`Advice`] value before calling any other function
-/// from the `segment` crate and not to change it afterwards.
-///
-/// The `segment` crate itself does not modify the global [`Advice`] value.
-///
-/// The default global [`Advice`] value is [`Advice::Random`].
-pub fn set_global(advice: Advice) {
-    *ADVICE.write() = advice;
-}
-
-/// Get current global [`Advice`] value.
-pub fn get_global() -> Advice {
-    *ADVICE.read()
-}
-
-/// Platform-independent version of [`memmap2::Advice`].
-/// See [`memmap2::Advice`] and [`madvise(2)`] man page.
-///
-/// [`madvise(2)`]: https://man7.org/linux/man-pages/man2/madvise.2.html
-#[derive(Copy, Clone, Debug, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum Advice {
-    /// See [`memmap2::Advice::Normal`].
-    Normal,
-
-    /// See [`memmap2::Advice::Random`].
-    Random,
-
-    /// See [`memmap2::Advice::Sequential`].
-    Sequential,
-}
-
-#[cfg(unix)]
-impl From<Advice> for memmap2::Advice {
-    fn from(advice: Advice) -> Self {
-        match advice {
-            Advice::Normal => memmap2::Advice::Normal,
-            Advice::Random => memmap2::Advice::Random,
-            Advice::Sequential => memmap2::Advice::Sequential,
-        }
-    }
-}
-
-/// Advise OS how given memory map will be accessed. On non-Unix platforms this is a no-op.
-pub fn madvise(madviseable: &impl Madviseable, advice: Advice) -> io::Result<()> {
-    madviseable.madvise(advice)
-}
-
-/// Generic, platform-independent abstraction
-/// over [`memmap2::Mmap::advise`] and [`memmap2::MmapMut::advise`].
-pub trait Madviseable {
-    /// Advise OS how given memory map will be accessed. On non-Unix platforms this is a no-op.
-    fn madvise(&self, advice: Advice) -> io::Result<()>;
-}
-
-impl Madviseable for memmap2::Mmap {
-    fn madvise(&self, advice: Advice) -> io::Result<()> {
-        #[cfg(unix)]
-        self.advise(advice.into())?;
-        #[cfg(not(unix))]
-        log::debug!("Ignore {advice:?} on this platform");
-        Ok(())
-    }
-}
-
-impl Madviseable for memmap2::MmapMut {
-    fn madvise(&self, advice: Advice) -> io::Result<()> {
-        #[cfg(unix)]
-        self.advise(advice.into())?;
-        #[cfg(not(unix))]
-        log::debug!("Ignore {advice:?} on this platform");
-        Ok(())
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/payload_storage/condition_checker.rs b/crates/qdrant/lib/segment/src/payload_storage/condition_checker.rs
deleted file mode 100644
index 5e1e5e3..0000000
--- a/crates/qdrant/lib/segment/src/payload_storage/condition_checker.rs
+++ /dev/null
@@ -1,237 +0,0 @@
-//! Contains functions for interpreting filter queries and defining if given points pass the conditions
-
-use serde_json::Value;
-
-use crate::types::{
-    AnyVariants, FieldCondition, GeoBoundingBox, GeoRadius, Match, MatchAny, MatchExcept,
-    MatchText, MatchValue, Range, ValueVariants, ValuesCount,
-};
-
-pub trait ValueChecker {
-    fn check_match(&self, payload: &Value) -> bool;
-
-    #[inline]
-    fn _check(&self, payload: &Value) -> bool {
-        match payload {
-            Value::Array(values) => values.iter().any(|x| self.check_match(x)),
-            _ => self.check_match(payload),
-        }
-    }
-
-    fn check(&self, payload: &Value) -> bool {
-        self._check(payload)
-    }
-}
-
-impl ValueChecker for FieldCondition {
-    fn check_match(&self, payload: &Value) -> bool {
-        let mut res = false;
-        // ToDo: Convert onto iterator over checkers, so it would be impossible to forget a condition
-        res = res
-            || self
-                .r#match
-                .as_ref()
-                .map_or(false, |condition| condition.check_match(payload));
-        res = res
-            || self
-                .range
-                .as_ref()
-                .map_or(false, |condition| condition.check_match(payload));
-        res = res
-            || self
-                .geo_radius
-                .as_ref()
-                .map_or(false, |condition| condition.check_match(payload));
-        res = res
-            || self
-                .geo_bounding_box
-                .as_ref()
-                .map_or(false, |condition| condition.check_match(payload));
-        res = res
-            || self
-                .values_count
-                .as_ref()
-                .map_or(false, |condition| condition.check_match(payload));
-        res
-    }
-
-    fn check(&self, payload: &Value) -> bool {
-        if self.values_count.is_some() {
-            self.values_count.as_ref().unwrap().check_count(payload)
-        } else {
-            self._check(payload)
-        }
-    }
-}
-
-impl ValueChecker for Match {
-    fn check_match(&self, payload: &Value) -> bool {
-        match self {
-            Match::Value(MatchValue { value }) => match (payload, value) {
-                (Value::Bool(stored), ValueVariants::Bool(val)) => stored == val,
-                (Value::String(stored), ValueVariants::Keyword(val)) => stored == val,
-                (Value::Number(stored), ValueVariants::Integer(val)) => {
-                    stored.as_i64().map(|num| num == *val).unwrap_or(false)
-                }
-                _ => false,
-            },
-            Match::Text(MatchText { text }) => match payload {
-                Value::String(stored) => stored.contains(text),
-                _ => false,
-            },
-            Match::Any(MatchAny { any }) => match (payload, any) {
-                (Value::String(stored), AnyVariants::Keywords(list)) => list.contains(stored),
-                (Value::Number(stored), AnyVariants::Integers(list)) => stored
-                    .as_i64()
-                    .map(|num| list.contains(&num))
-                    .unwrap_or(false),
-                _ => false,
-            },
-            Match::Except(MatchExcept { except }) => match (payload, except) {
-                (Value::String(stored), AnyVariants::Keywords(list)) => !list.contains(stored),
-                (Value::Number(stored), AnyVariants::Integers(list)) => stored
-                    .as_i64()
-                    .map(|num| !list.contains(&num))
-                    .unwrap_or(true),
-                (Value::Null, _) => false,
-                (Value::Bool(_), _) => true,
-                (Value::Array(_), _) => true, // Array inside array is not flattened
-                (Value::Object(_), _) => true,
-                (Value::Number(_), _) => true,
-                (Value::String(_), _) => true,
-            },
-        }
-    }
-}
-
-impl ValueChecker for Range {
-    fn check_match(&self, payload: &Value) -> bool {
-        match payload {
-            Value::Number(num) => num
-                .as_f64()
-                .map(|number| self.check_range(number))
-                .unwrap_or(false),
-            _ => false,
-        }
-    }
-}
-
-impl ValueChecker for GeoBoundingBox {
-    fn check_match(&self, payload: &Value) -> bool {
-        match payload {
-            Value::Object(obj) => {
-                let lon_op = obj.get("lon").and_then(|x| x.as_f64());
-                let lat_op = obj.get("lat").and_then(|x| x.as_f64());
-
-                if let (Some(lon), Some(lat)) = (lon_op, lat_op) {
-                    return self.check_point(lon, lat);
-                }
-                false
-            }
-            _ => false,
-        }
-    }
-}
-
-impl ValueChecker for GeoRadius {
-    fn check_match(&self, payload: &Value) -> bool {
-        match payload {
-            Value::Object(obj) => {
-                let lon_op = obj.get("lon").and_then(|x| x.as_f64());
-                let lat_op = obj.get("lat").and_then(|x| x.as_f64());
-
-                if let (Some(lon), Some(lat)) = (lon_op, lat_op) {
-                    return self.check_point(lon, lat);
-                }
-                false
-            }
-            _ => false,
-        }
-    }
-}
-
-impl ValueChecker for ValuesCount {
-    fn check_match(&self, payload: &Value) -> bool {
-        self.check_count(payload)
-    }
-
-    fn check(&self, payload: &Value) -> bool {
-        self.check_count(payload)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use serde_json::json;
-
-    use super::*;
-    use crate::types::GeoPoint;
-
-    #[test]
-    fn test_geo_matching() {
-        let berlin_and_moscow = json!([
-            {
-                "lat": 52.52197645,
-                "lon": 13.413637435864272
-            },
-            {
-                "lat": 55.7536283,
-                "lon": 37.62137960067377,
-            }
-        ]);
-
-        let near_berlin_query = GeoRadius {
-            center: GeoPoint {
-                lat: 52.511,
-                lon: 13.423637,
-            },
-            radius: 2000.0,
-        };
-        let miss_geo_query = GeoRadius {
-            center: GeoPoint {
-                lat: 52.511,
-                lon: 20.423637,
-            },
-            radius: 2000.0,
-        };
-
-        assert!(near_berlin_query.check(&berlin_and_moscow));
-        assert!(!miss_geo_query.check(&berlin_and_moscow));
-    }
-
-    #[test]
-    fn test_value_count() {
-        let countries = json!([
-            {
-                "country": "Germany",
-            },
-            {
-                "country": "France",
-            }
-        ]);
-
-        let gt_one_country_query = ValuesCount {
-            lt: None,
-            gt: Some(1),
-            gte: None,
-            lte: None,
-        };
-        assert!(gt_one_country_query.check(&countries));
-
-        let gt_two_countries_query = ValuesCount {
-            lt: None,
-            gt: Some(2),
-            gte: None,
-            lte: None,
-        };
-        assert!(!gt_two_countries_query.check(&countries));
-
-        let gte_two_countries_query = ValuesCount {
-            lt: None,
-            gt: None,
-            gte: Some(2),
-            lte: None,
-        };
-        assert!(gte_two_countries_query.check(&countries));
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/payload_storage/in_memory_payload_storage.rs b/crates/qdrant/lib/segment/src/payload_storage/in_memory_payload_storage.rs
deleted file mode 100644
index f069984..0000000
--- a/crates/qdrant/lib/segment/src/payload_storage/in_memory_payload_storage.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-use std::collections::HashMap;
-
-use crate::entry::entry_point::OperationResult;
-use crate::types::{Payload, PointOffsetType};
-
-/// Same as `SimplePayloadStorage` but without persistence
-/// Warn: for tests only
-#[derive(Default)]
-pub struct InMemoryPayloadStorage {
-    pub(crate) payload: HashMap<PointOffsetType, Payload>,
-}
-
-impl InMemoryPayloadStorage {
-    pub fn payload_ptr(&self, point_id: PointOffsetType) -> Option<&Payload> {
-        self.payload.get(&point_id)
-    }
-
-    pub fn iter<F>(&self, mut callback: F) -> OperationResult<()>
-    where
-        F: FnMut(PointOffsetType, &Payload) -> OperationResult<bool>,
-    {
-        for (key, val) in self.payload.iter() {
-            let do_continue = callback(*key, val)?;
-            if !do_continue {
-                return Ok(());
-            }
-        }
-        Ok(())
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/payload_storage/in_memory_payload_storage_impl.rs b/crates/qdrant/lib/segment/src/payload_storage/in_memory_payload_storage_impl.rs
deleted file mode 100644
index 4cb3897..0000000
--- a/crates/qdrant/lib/segment/src/payload_storage/in_memory_payload_storage_impl.rs
+++ /dev/null
@@ -1,164 +0,0 @@
-use std::collections::HashMap;
-
-use serde_json::Value;
-
-use crate::common::Flusher;
-use crate::entry::entry_point::OperationResult;
-use crate::payload_storage::in_memory_payload_storage::InMemoryPayloadStorage;
-use crate::payload_storage::PayloadStorage;
-use crate::types::{Payload, PayloadKeyTypeRef, PointOffsetType};
-
-impl PayloadStorage for InMemoryPayloadStorage {
-    fn assign(&mut self, point_id: PointOffsetType, payload: &Payload) -> OperationResult<()> {
-        match self.payload.get_mut(&point_id) {
-            Some(point_payload) => point_payload.merge(payload),
-            None => {
-                self.payload.insert(point_id, payload.to_owned());
-            }
-        }
-        Ok(())
-    }
-
-    fn payload(&self, point_id: PointOffsetType) -> OperationResult<Payload> {
-        match self.payload.get(&point_id) {
-            Some(payload) => Ok(payload.to_owned()),
-            None => Ok(Default::default()),
-        }
-    }
-
-    fn delete(
-        &mut self,
-        point_id: PointOffsetType,
-        key: PayloadKeyTypeRef,
-    ) -> OperationResult<Vec<Value>> {
-        match self.payload.get_mut(&point_id) {
-            Some(payload) => {
-                let res = payload.remove(key);
-                Ok(res)
-            }
-            None => Ok(vec![]),
-        }
-    }
-
-    fn drop(&mut self, point_id: PointOffsetType) -> OperationResult<Option<Payload>> {
-        let res = self.payload.remove(&point_id);
-        Ok(res)
-    }
-
-    fn wipe(&mut self) -> OperationResult<()> {
-        self.payload = HashMap::new();
-        Ok(())
-    }
-
-    fn flusher(&self) -> Flusher {
-        Box::new(|| Ok(()))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::cell::RefCell;
-
-    use serde_json::json;
-
-    use super::*;
-    use crate::common::utils::IndexesMap;
-    use crate::fixtures::payload_context_fixture::FixtureIdTracker;
-    use crate::payload_storage::query_checker::check_payload;
-    use crate::types::{Condition, FieldCondition, Filter, OwnedPayloadRef};
-
-    #[test]
-    fn test_condition_checking() {
-        let id_tracker = FixtureIdTracker::new(1);
-        let get_payload = || {
-            let payload: Payload = serde_json::from_value(json!({
-                "name": "John Doe",
-                "age": 43,
-                "boolean": "true",
-                "floating": 30.5,
-                "string_array": ["hello", "world"],
-                "boolean_array": ["true", "false"],
-                "float_array": [1.0, 2.0],
-            }))
-            .unwrap();
-            eprintln!("assigning payload"); // should occur only once
-            payload
-        };
-
-        let query = Filter {
-            should: None,
-            must: Some(vec![
-                Condition::Field(FieldCondition::new_match("age".to_string(), 43.into())),
-                Condition::Field(FieldCondition::new_match(
-                    "name".to_string(),
-                    "John Doe".to_string().into(),
-                )),
-            ]),
-            must_not: None,
-        };
-
-        // Example:
-        // How to check for payload in case if Payload is stored on disk
-        // and it is preferred to only load the Payload once and if it is strictly required.
-
-        let payload: RefCell<Option<OwnedPayloadRef>> = RefCell::new(None);
-        check_payload(
-            Box::new(|| {
-                eprintln!("request payload");
-                if payload.borrow().is_none() {
-                    payload.replace(Some(get_payload().into()));
-                }
-                payload.borrow().as_ref().cloned().unwrap()
-            }),
-            Some(&id_tracker),
-            &query,
-            0,
-            &IndexesMap::new(),
-        );
-    }
-
-    #[test]
-    fn test_wipe() {
-        let mut storage = InMemoryPayloadStorage::default();
-        let payload: Payload = serde_json::from_str(r#"{"name": "John Doe"}"#).unwrap();
-        storage.assign(100, &payload).unwrap();
-        storage.wipe().unwrap();
-        storage.assign(100, &payload).unwrap();
-        storage.wipe().unwrap();
-        storage.assign(100, &payload).unwrap();
-        assert!(!storage.payload(100).unwrap().is_empty());
-        storage.wipe().unwrap();
-        assert_eq!(storage.payload(100).unwrap(), Default::default());
-    }
-
-    #[test]
-    fn test_assign_payload_from_serde_json() {
-        let data = r#"
-        {
-            "name": "John Doe",
-            "age": 43,
-            "boolean": "true",
-            "floating": 30.5,
-            "string_array": ["hello", "world"],
-            "boolean_array": ["true", "false"],
-            "float_array": [1.0, 2.0],
-            "integer_array": [1, 2],
-            "geo_data": {"type": "geo", "value": {"lon": 1.0, "lat": 1.0}},
-            "metadata": {
-                "height": 50,
-                "width": 60,
-                "temperature": 60.5,
-                "nested": {
-                    "feature": 30.5
-                },
-                "integer_array": [1, 2]
-            }
-        }"#;
-
-        let payload: Payload = serde_json::from_str(data).unwrap();
-        let mut storage = InMemoryPayloadStorage::default();
-        storage.assign(100, &payload).unwrap();
-        let pload = storage.payload(100).unwrap();
-        assert_eq!(pload, payload);
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/payload_storage/mod.rs b/crates/qdrant/lib/segment/src/payload_storage/mod.rs
deleted file mode 100644
index 3247bc2..0000000
--- a/crates/qdrant/lib/segment/src/payload_storage/mod.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-pub mod condition_checker;
-pub mod in_memory_payload_storage;
-pub mod in_memory_payload_storage_impl;
-pub mod on_disk_payload_storage;
-mod payload_storage_base;
-pub mod payload_storage_enum;
-pub mod query_checker;
-pub mod simple_payload_storage;
-pub mod simple_payload_storage_impl;
-
-pub use payload_storage_base::*;
diff --git a/crates/qdrant/lib/segment/src/payload_storage/on_disk_payload_storage.rs b/crates/qdrant/lib/segment/src/payload_storage/on_disk_payload_storage.rs
deleted file mode 100644
index 2a2d431..0000000
--- a/crates/qdrant/lib/segment/src/payload_storage/on_disk_payload_storage.rs
+++ /dev/null
@@ -1,123 +0,0 @@
-use std::sync::Arc;
-
-use parking_lot::RwLock;
-use rocksdb::DB;
-use serde_json::Value;
-
-use crate::common::rocksdb_wrapper::{DatabaseColumnWrapper, DB_PAYLOAD_CF};
-use crate::common::Flusher;
-use crate::entry::entry_point::{OperationError, OperationResult};
-use crate::payload_storage::PayloadStorage;
-use crate::types::{Payload, PayloadKeyTypeRef, PointOffsetType};
-
-/// On-disk implementation of `PayloadStorage`.
-/// Persists all changes to disk using `store`, does not keep payload in memory
-pub struct OnDiskPayloadStorage {
-    db_wrapper: DatabaseColumnWrapper,
-}
-
-impl OnDiskPayloadStorage {
-    pub fn open(database: Arc<RwLock<DB>>) -> OperationResult<Self> {
-        let db_wrapper = DatabaseColumnWrapper::new(database, DB_PAYLOAD_CF);
-        Ok(OnDiskPayloadStorage { db_wrapper })
-    }
-
-    pub fn remove_from_storage(&self, point_id: PointOffsetType) -> OperationResult<()> {
-        self.db_wrapper
-            .remove(serde_cbor::to_vec(&point_id).unwrap())
-    }
-
-    pub fn update_storage(
-        &self,
-        point_id: PointOffsetType,
-        payload: &Payload,
-    ) -> OperationResult<()> {
-        self.db_wrapper.put(
-            serde_cbor::to_vec(&point_id).unwrap(),
-            serde_cbor::to_vec(payload).unwrap(),
-        )
-    }
-
-    pub fn read_payload(&self, point_id: PointOffsetType) -> OperationResult<Option<Payload>> {
-        let key = serde_cbor::to_vec(&point_id).unwrap();
-        self.db_wrapper
-            .get_pinned(&key, |raw| serde_cbor::from_slice(raw))?
-            .transpose()
-            .map_err(OperationError::from)
-    }
-
-    pub fn iter<F>(&self, mut callback: F) -> OperationResult<()>
-    where
-        F: FnMut(PointOffsetType, &Payload) -> OperationResult<bool>,
-    {
-        for (key, val) in self.db_wrapper.lock_db().iter()? {
-            let do_continue = callback(
-                serde_cbor::from_slice(&key)?,
-                &serde_cbor::from_slice(&val)?,
-            )?;
-            if !do_continue {
-                return Ok(());
-            }
-        }
-        Ok(())
-    }
-}
-
-impl PayloadStorage for OnDiskPayloadStorage {
-    fn assign_all(&mut self, point_id: PointOffsetType, payload: &Payload) -> OperationResult<()> {
-        self.update_storage(point_id, payload)
-    }
-
-    fn assign(&mut self, point_id: PointOffsetType, payload: &Payload) -> OperationResult<()> {
-        let stored_payload = self.read_payload(point_id)?;
-        match stored_payload {
-            Some(mut point_payload) => {
-                point_payload.merge(payload);
-                self.update_storage(point_id, &point_payload)?
-            }
-            None => self.update_storage(point_id, payload)?,
-        }
-        Ok(())
-    }
-
-    fn payload(&self, point_id: PointOffsetType) -> OperationResult<Payload> {
-        let payload = self.read_payload(point_id)?;
-        match payload {
-            Some(payload) => Ok(payload),
-            None => Ok(Default::default()),
-        }
-    }
-
-    fn delete(
-        &mut self,
-        point_id: PointOffsetType,
-        key: PayloadKeyTypeRef,
-    ) -> OperationResult<Vec<Value>> {
-        let stored_payload = self.read_payload(point_id)?;
-
-        match stored_payload {
-            Some(mut payload) => {
-                let res = payload.remove(key);
-                if !res.is_empty() {
-                    self.update_storage(point_id, &payload)?;
-                }
-                Ok(res)
-            }
-            None => Ok(vec![]),
-        }
-    }
-
-    fn drop(&mut self, point_id: PointOffsetType) -> OperationResult<Option<Payload>> {
-        let payload = self.read_payload(point_id)?;
-        self.remove_from_storage(point_id)?;
-        Ok(payload)
-    }
-
-    fn wipe(&mut self) -> OperationResult<()> {
-        self.db_wrapper.recreate_column_family()
-    }
-
-    fn flusher(&self) -> Flusher {
-        self.db_wrapper.flusher()
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/payload_storage/payload_storage_base.rs b/crates/qdrant/lib/segment/src/payload_storage/payload_storage_base.rs
deleted file mode 100644
index 3751749..0000000
--- a/crates/qdrant/lib/segment/src/payload_storage/payload_storage_base.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-use serde_json::Value;
-
-use crate::common::Flusher;
-use crate::entry::entry_point::OperationResult;
-use crate::types::{Filter, Payload, PayloadKeyTypeRef, PointOffsetType};
-
-/// Trait for payload data storage. Should allow filter checks
-pub trait PayloadStorage {
-    /// Assign same payload to each given point
-    fn assign_all(&mut self, point_id: PointOffsetType, payload: &Payload) -> OperationResult<()> {
-        self.drop(point_id)?;
-        self.assign(point_id, payload)?;
-        Ok(())
-    }
-
-    /// Assign payload to a concrete point with a concrete payload value
-    fn assign(&mut self, point_id: PointOffsetType, payload: &Payload) -> OperationResult<()>;
-
-    /// Get payload for point
-    fn payload(&self, point_id: PointOffsetType) -> OperationResult<Payload>;
-
-    /// Delete payload by key
-    fn delete(
-        &mut self,
-        point_id: PointOffsetType,
-        key: PayloadKeyTypeRef,
-    ) -> OperationResult<Vec<Value>>;
-
-    /// Drop all payload of the point
-    fn drop(&mut self, point_id: PointOffsetType) -> OperationResult<Option<Payload>>;
-
-    /// Completely drop payload. Pufff!
-    fn wipe(&mut self) -> OperationResult<()>;
-
-    /// Return function that forces persistence of current storage state.
-    fn flusher(&self) -> Flusher;
-}
-
-pub trait ConditionChecker {
-    /// Check if point satisfies filter condition. Return true if satisfies
-    fn check(&self, point_id: PointOffsetType, query: &Filter) -> bool;
-}
-
-pub trait FilterContext {
-    /// Check if point satisfies filter condition. Return true if satisfies
-    fn check(&self, point_id: PointOffsetType) -> bool;
-}
-
-pub type PayloadStorageSS = dyn PayloadStorage + Sync + Send;
-pub type ConditionCheckerSS = dyn ConditionChecker + Sync + Send;
diff --git a/crates/qdrant/lib/segment/src/payload_storage/payload_storage_enum.rs b/crates/qdrant/lib/segment/src/payload_storage/payload_storage_enum.rs
deleted file mode 100644
index 59250c8..0000000
--- a/crates/qdrant/lib/segment/src/payload_storage/payload_storage_enum.rs
+++ /dev/null
@@ -1,191 +0,0 @@
-use serde_json::Value;
-
-use crate::common::Flusher;
-use crate::entry::entry_point::OperationResult;
-use crate::payload_storage::in_memory_payload_storage::InMemoryPayloadStorage;
-use crate::payload_storage::on_disk_payload_storage::OnDiskPayloadStorage;
-use crate::payload_storage::simple_payload_storage::SimplePayloadStorage;
-use crate::payload_storage::PayloadStorage;
-use crate::types::{Payload, PayloadKeyTypeRef, PointOffsetType};
-
-pub enum PayloadStorageEnum {
-    InMemoryPayloadStorage(InMemoryPayloadStorage),
-    SimplePayloadStorage(SimplePayloadStorage),
-    OnDiskPayloadStorage(OnDiskPayloadStorage),
-}
-
-impl From<InMemoryPayloadStorage> for PayloadStorageEnum {
-    fn from(a: InMemoryPayloadStorage) -> Self {
-        PayloadStorageEnum::InMemoryPayloadStorage(a)
-    }
-}
-
-impl From<SimplePayloadStorage> for PayloadStorageEnum {
-    fn from(a: SimplePayloadStorage) -> Self {
-        PayloadStorageEnum::SimplePayloadStorage(a)
-    }
-}
-
-impl From<OnDiskPayloadStorage> for PayloadStorageEnum {
-    fn from(a: OnDiskPayloadStorage) -> Self {
-        PayloadStorageEnum::OnDiskPayloadStorage(a)
-    }
-}
-
-impl PayloadStorageEnum {
-    pub fn iter<F>(&self, callback: F) -> OperationResult<()>
-    where
-        F: FnMut(PointOffsetType, &Payload) -> OperationResult<bool>,
-    {
-        match self {
-            PayloadStorageEnum::InMemoryPayloadStorage(s) => s.iter(callback),
-            PayloadStorageEnum::SimplePayloadStorage(s) => s.iter(callback),
-            PayloadStorageEnum::OnDiskPayloadStorage(s) => s.iter(callback),
-        }
-    }
-}
-
-impl PayloadStorage for PayloadStorageEnum {
-    fn assign(&mut self, point_id: PointOffsetType, payload: &Payload) -> OperationResult<()> {
-        match self {
-            PayloadStorageEnum::InMemoryPayloadStorage(s) => s.assign(point_id, payload),
-            PayloadStorageEnum::SimplePayloadStorage(s) => s.assign(point_id, payload),
-            PayloadStorageEnum::OnDiskPayloadStorage(s) => s.assign(point_id, payload),
-        }
-    }
-
-    fn payload(&self, point_id: PointOffsetType) -> OperationResult<Payload> {
-        match self {
-            PayloadStorageEnum::InMemoryPayloadStorage(s) => s.payload(point_id),
-            PayloadStorageEnum::SimplePayloadStorage(s) => s.payload(point_id),
-            PayloadStorageEnum::OnDiskPayloadStorage(s) => s.payload(point_id),
-        }
-    }
-
-    fn delete(
-        &mut self,
-        point_id: PointOffsetType,
-        key: PayloadKeyTypeRef,
-    ) -> OperationResult<Vec<Value>> {
-        match self {
-            PayloadStorageEnum::InMemoryPayloadStorage(s) => s.delete(point_id, key),
-            PayloadStorageEnum::SimplePayloadStorage(s) => s.delete(point_id, key),
-            PayloadStorageEnum::OnDiskPayloadStorage(s) => s.delete(point_id, key),
-        }
-    }
-
-    fn drop(&mut self, point_id: PointOffsetType) -> OperationResult<Option<Payload>> {
-        match self {
-            PayloadStorageEnum::InMemoryPayloadStorage(s) => s.drop(point_id),
-            PayloadStorageEnum::SimplePayloadStorage(s) => s.drop(point_id),
-            PayloadStorageEnum::OnDiskPayloadStorage(s) => s.drop(point_id),
-        }
-    }
-
-    fn wipe(&mut self) -> OperationResult<()> {
-        match self {
-            PayloadStorageEnum::InMemoryPayloadStorage(s) => s.wipe(),
-            PayloadStorageEnum::SimplePayloadStorage(s) => s.wipe(),
-            PayloadStorageEnum::OnDiskPayloadStorage(s) => s.wipe(),
-        }
-    }
-
-    fn flusher(&self) -> Flusher {
-        match self {
-            PayloadStorageEnum::InMemoryPayloadStorage(s) => s.flusher(),
-            PayloadStorageEnum::SimplePayloadStorage(s) => s.flusher(),
-            PayloadStorageEnum::OnDiskPayloadStorage(s) => s.flusher(),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use tempfile::Builder;
-
-    use super::*;
-    use crate::common::rocksdb_wrapper::{open_db, DB_VECTOR_CF};
-    use crate::types::Payload;
-
-    #[test]
-    fn test_storage() {
-        let dir = Builder::new().prefix("storage_dir").tempdir().unwrap();
-        let db = open_db(dir.path(), &[DB_VECTOR_CF]).unwrap();
-
-        let mut storage: PayloadStorageEnum = SimplePayloadStorage::open(db).unwrap().into();
-        let payload: Payload = serde_json::from_str(r#"{"name": "John Doe"}"#).unwrap();
-        storage.assign(100, &payload).unwrap();
-        storage.wipe().unwrap();
-        storage.assign(100, &payload).unwrap();
-        storage.wipe().unwrap();
-        storage.assign(100, &payload).unwrap();
-        assert!(!storage.payload(100).unwrap().is_empty());
-        storage.wipe().unwrap();
-        assert_eq!(storage.payload(100).unwrap(), Default::default());
-    }
-
-    #[test]
-    fn test_on_disk_storage() {
-        let dir = Builder::new().prefix("storage_dir").tempdir().unwrap();
-        let db = open_db(dir.path(), &[DB_VECTOR_CF]).unwrap();
-
-        {
-            let mut storage: PayloadStorageEnum =
-                SimplePayloadStorage::open(db.clone()).unwrap().into();
-            let payload: Payload = serde_json::from_str(
-                r#"{
-                "name": "John Doe",
-                "age": 52,
-                "location": {
-                    "city": "Melbourne",
-                    "geo": {
-                        "lon": 144.9631,
-                        "lat": 37.8136
-                    }
-                }
-            }"#,
-            )
-            .unwrap();
-
-            storage.assign_all(100, &payload).unwrap();
-
-            let partial_payload: Payload = serde_json::from_str(r#"{ "age": 53 }"#).unwrap();
-            storage.assign(100, &partial_payload).unwrap();
-
-            storage.delete(100, "location.geo").unwrap();
-
-            let res = storage.payload(100).unwrap();
-
-            assert!(res.0.contains_key("age"));
-            assert!(res.0.contains_key("location"));
-            assert!(res.0.contains_key("name"));
-        }
-
-        {
-            let mut storage: PayloadStorageEnum = OnDiskPayloadStorage::open(db).unwrap().into();
-
-            let res = storage.payload(100).unwrap();
-
-            assert!(res.0.contains_key("age"));
-            assert!(res.0.contains_key("location"));
-            assert!(res.0.contains_key("name"));
-
-            eprintln!("res = {res:#?}");
-
-            let partial_payload: Payload =
-                serde_json::from_str(r#"{ "hobby": "vector search" }"#).unwrap();
-            storage.assign(100, &partial_payload).unwrap();
-
-            storage.delete(100, "location.city").unwrap();
-            storage.delete(100, "location").unwrap();
-
-            let res = storage.payload(100).unwrap();
-
-            assert!(res.0.contains_key("age"));
-            assert!(res.0.contains_key("hobby"));
-            assert!(res.0.contains_key("name"));
-
-            eprintln!("res = {res:#?}");
-        }
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/payload_storage/query_checker.rs b/crates/qdrant/lib/segment/src/payload_storage/query_checker.rs
deleted file mode 100644
index 2ecec4b..0000000
--- a/crates/qdrant/lib/segment/src/payload_storage/query_checker.rs
+++ /dev/null
@@ -1,559 +0,0 @@
-use std::cell::RefCell;
-use std::collections::HashMap;
-use std::ops::Deref;
-use std::sync::Arc;
-
-use atomic_refcell::AtomicRefCell;
-
-use crate::common::utils::IndexesMap;
-use crate::id_tracker::IdTrackerSS;
-use crate::index::field_index::FieldIndex;
-use crate::payload_storage::condition_checker::ValueChecker;
-use crate::payload_storage::payload_storage_enum::PayloadStorageEnum;
-use crate::payload_storage::ConditionChecker;
-use crate::types::{
-    Condition, FieldCondition, Filter, IsEmptyCondition, IsNullCondition, OwnedPayloadRef, Payload,
-    PayloadContainer, PayloadKeyType, PointOffsetType,
-};
-
-fn check_condition<F>(checker: &F, condition: &Condition) -> bool
-where
-    F: Fn(&Condition) -> bool,
-{
-    match condition {
-        Condition::Filter(filter) => check_filter(checker, filter),
-        _ => checker(condition),
-    }
-}
-
-pub fn check_filter<F>(checker: &F, filter: &Filter) -> bool
-where
-    F: Fn(&Condition) -> bool,
-{
-    check_should(checker, &filter.should)
-        && check_must(checker, &filter.must)
-        && check_must_not(checker, &filter.must_not)
-}
-
-fn check_should<F>(checker: &F, should: &Option<Vec<Condition>>) -> bool
-where
-    F: Fn(&Condition) -> bool,
-{
-    let check = |x| check_condition(checker, x);
-    match should {
-        None => true,
-        Some(conditions) => conditions.iter().any(check),
-    }
-}
-
-fn check_must<F>(checker: &F, must: &Option<Vec<Condition>>) -> bool
-where
-    F: Fn(&Condition) -> bool,
-{
-    let check = |x| check_condition(checker, x);
-    match must {
-        None => true,
-        Some(conditions) => conditions.iter().all(check),
-    }
-}
-
-fn check_must_not<F>(checker: &F, must: &Option<Vec<Condition>>) -> bool
-where
-    F: Fn(&Condition) -> bool,
-{
-    let check = |x| !check_condition(checker, x);
-    match must {
-        None => true,
-        Some(conditions) => conditions.iter().all(check),
-    }
-}
-
-pub fn select_nested_indexes<'a, R>(
-    nested_path: &str,
-    field_indexes: &'a HashMap<PayloadKeyType, R>,
-) -> HashMap<PayloadKeyType, &'a Vec<FieldIndex>>
-where
-    R: AsRef<Vec<FieldIndex>>,
-{
-    let nested_prefix = format!("{}.", nested_path);
-    let nested_indexes: HashMap<_, _> = field_indexes
-        .iter()
-        .filter_map(|(key, indexes)| {
-            key.strip_prefix(&nested_prefix)
-                .map(|key| (key.into(), indexes.as_ref()))
-        })
-        .collect();
-    nested_indexes
-}
-
-pub fn check_payload<'a, R>(
-    get_payload: Box<dyn Fn() -> OwnedPayloadRef<'a> + 'a>,
-    id_tracker: Option<&IdTrackerSS>,
-    query: &Filter,
-    point_id: PointOffsetType,
-    field_indexes: &HashMap<PayloadKeyType, R>,
-) -> bool
-where
-    R: AsRef<Vec<FieldIndex>>,
-{
-    let checker = |condition: &Condition| match condition {
-        Condition::Field(field_condition) => {
-            check_field_condition(field_condition, get_payload().deref(), field_indexes)
-        }
-        Condition::IsEmpty(is_empty) => check_is_empty_condition(is_empty, get_payload().deref()),
-        Condition::IsNull(is_null) => check_is_null_condition(is_null, get_payload().deref()),
-        Condition::HasId(has_id) => id_tracker
-            .and_then(|id_tracker| id_tracker.external_id(point_id))
-            .map_or(false, |id| has_id.has_id.contains(&id)),
-        Condition::Nested(nested) => {
-            let nested_path = nested.array_key();
-            let nested_indexes = select_nested_indexes(&nested_path, field_indexes);
-            get_payload()
-                .get_value(&nested_path)
-                .values()
-                .iter()
-                .filter_map(|value| value.as_object())
-                .any(|object| {
-                    check_payload(
-                        Box::new(|| OwnedPayloadRef::from(object)),
-                        None,
-                        &nested.nested.filter,
-                        point_id,
-                        &nested_indexes,
-                    )
-                })
-        }
-        Condition::Filter(_) => unreachable!(),
-    };
-
-    check_filter(&checker, query)
-}
-
-pub fn check_is_empty_condition(
-    is_empty: &IsEmptyCondition,
-    payload: &impl PayloadContainer,
-) -> bool {
-    payload.get_value(&is_empty.is_empty.key).check_is_empty()
-}
-
-pub fn check_is_null_condition(is_null: &IsNullCondition, payload: &impl PayloadContainer) -> bool {
-    payload.get_value(&is_null.is_null.key).check_is_null()
-}
-
-pub fn check_field_condition<R>(
-    field_condition: &FieldCondition,
-    payload: &impl PayloadContainer,
-    field_indexes: &HashMap<PayloadKeyType, R>,
-) -> bool
-where
-    R: AsRef<Vec<FieldIndex>>,
-{
-    let field_values = payload.get_value(&field_condition.key);
-    let field_indexes = field_indexes.get(&field_condition.key);
-
-    // This covers a case, when a field index affects the result of the condition.
-    if let Some(field_indexes) = field_indexes {
-        for p in field_values {
-            let mut index_checked = false;
-            for index in field_indexes.as_ref() {
-                if let Some(index_check_res) = index.check_condition(field_condition, p) {
-                    if index_check_res {
-                        // If at least one object matches the condition, we can return true
-                        return true;
-                    }
-                    index_checked = true;
-                    // If index check of the condition returned something, we don't need to check
-                    // other indexes
-                    break;
-                }
-            }
-            if !index_checked {
-                // If none of the indexes returned anything, we need to check the condition
-                // against the payload
-                if field_condition.check(p) {
-                    return true;
-                }
-            }
-        }
-        false
-    } else {
-        // Fallback to regular condition check if there are no indexes for the field
-        field_values.into_iter().any(|p| field_condition.check(p))
-    }
-}
-
-/// Only used for testing
-pub struct SimpleConditionChecker {
-    payload_storage: Arc<AtomicRefCell<PayloadStorageEnum>>,
-    id_tracker: Arc<AtomicRefCell<IdTrackerSS>>,
-    empty_payload: Payload,
-}
-
-impl SimpleConditionChecker {
-    pub fn new(
-        payload_storage: Arc<AtomicRefCell<PayloadStorageEnum>>,
-        id_tracker: Arc<AtomicRefCell<IdTrackerSS>>,
-    ) -> Self {
-        SimpleConditionChecker {
-            payload_storage,
-            id_tracker,
-            empty_payload: Default::default(),
-        }
-    }
-}
-
-impl ConditionChecker for SimpleConditionChecker {
-    fn check(&self, point_id: PointOffsetType, query: &Filter) -> bool {
-        let payload_storage_guard = self.payload_storage.borrow();
-
-        let payload_ref_cell: RefCell<Option<OwnedPayloadRef>> = RefCell::new(None);
-        let id_tracker = self.id_tracker.borrow();
-
-        check_payload(
-            Box::new(|| {
-                if payload_ref_cell.borrow().is_none() {
-                    let payload_ptr = match payload_storage_guard.deref() {
-                        PayloadStorageEnum::InMemoryPayloadStorage(s) => {
-                            s.payload_ptr(point_id).map(|x| x.into())
-                        }
-                        PayloadStorageEnum::SimplePayloadStorage(s) => {
-                            s.payload_ptr(point_id).map(|x| x.into())
-                        }
-                        PayloadStorageEnum::OnDiskPayloadStorage(s) => {
-                            // Warn: Possible panic here
-                            // Currently, it is possible that `read_payload` fails with Err,
-                            // but it seems like a very rare possibility which might only happen
-                            // if something is wrong with disk or storage is corrupted.
-                            //
-                            // In both cases it means that service can't be of use any longer.
-                            // It is as good as dead. Therefore it is tolerable to just panic here.
-                            // Downside is - API user won't be notified of the failure.
-                            // It will just timeout.
-                            //
-                            // The alternative:
-                            // Rewrite condition checking code to support error reporting.
-                            // Which may lead to slowdown and assumes a lot of changes.
-                            s.read_payload(point_id)
-                                .unwrap_or_else(|err| panic!("Payload storage is corrupted: {err}"))
-                                .map(|x| x.into())
-                        }
-                    };
-
-                    payload_ref_cell
-                        .replace(payload_ptr.or_else(|| Some((&self.empty_payload).into())));
-                }
-                payload_ref_cell.borrow().as_ref().cloned().unwrap()
-            }),
-            Some(id_tracker.deref()),
-            query,
-            point_id,
-            &IndexesMap::new(),
-        )
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::collections::HashSet;
-
-    use serde_json::json;
-    use tempfile::Builder;
-
-    use super::*;
-    use crate::common::rocksdb_wrapper::{open_db, DB_VECTOR_CF};
-    use crate::id_tracker::simple_id_tracker::SimpleIdTracker;
-    use crate::id_tracker::IdTracker;
-    use crate::payload_storage::simple_payload_storage::SimplePayloadStorage;
-    use crate::payload_storage::PayloadStorage;
-    use crate::types::{
-        FieldCondition, GeoBoundingBox, GeoPoint, PayloadField, Range, ValuesCount,
-    };
-
-    #[test]
-    fn test_condition_checker() {
-        let dir = Builder::new().prefix("db_dir").tempdir().unwrap();
-        let db = open_db(dir.path(), &[DB_VECTOR_CF]).unwrap();
-
-        let payload: Payload = json!(
-            {
-                "location":{
-                    "lon": 13.404954,
-                    "lat": 52.520008,
-            },
-            "price": 499.90,
-            "amount": 10,
-            "rating": vec![3, 7, 9, 9],
-            "color": "red",
-            "has_delivery": true,
-            "parts": [],
-            "packaging": null,
-            "not_null": [null]
-        })
-        .into();
-
-        let mut payload_storage: PayloadStorageEnum =
-            SimplePayloadStorage::open(db.clone()).unwrap().into();
-        let mut id_tracker = SimpleIdTracker::open(db).unwrap();
-
-        id_tracker.set_link(0.into(), 0).unwrap();
-        id_tracker.set_link(1.into(), 1).unwrap();
-        id_tracker.set_link(2.into(), 2).unwrap();
-        id_tracker.set_link(10.into(), 10).unwrap();
-        payload_storage.assign_all(0, &payload).unwrap();
-
-        let payload_checker = SimpleConditionChecker::new(
-            Arc::new(AtomicRefCell::new(payload_storage)),
-            Arc::new(AtomicRefCell::new(id_tracker)),
-        );
-
-        let is_empty_condition = Filter::new_must(Condition::IsEmpty(IsEmptyCondition {
-            is_empty: PayloadField {
-                key: "price".to_string(),
-            },
-        }));
-        assert!(!payload_checker.check(0, &is_empty_condition));
-
-        let is_empty_condition = Filter::new_must(Condition::IsEmpty(IsEmptyCondition {
-            is_empty: PayloadField {
-                key: "something_new".to_string(),
-            },
-        }));
-        assert!(payload_checker.check(0, &is_empty_condition));
-
-        let is_empty_condition = Filter::new_must(Condition::IsEmpty(IsEmptyCondition {
-            is_empty: PayloadField {
-                key: "parts".to_string(),
-            },
-        }));
-        assert!(payload_checker.check(0, &is_empty_condition));
-
-        let is_empty_condition = Filter::new_must(Condition::IsEmpty(IsEmptyCondition {
-            is_empty: PayloadField {
-                key: "not_null".to_string(),
-            },
-        }));
-        assert!(!payload_checker.check(0, &is_empty_condition));
-
-        let is_null_condition = Filter::new_must(Condition::IsNull(IsNullCondition {
-            is_null: PayloadField {
-                key: "amount".to_string(),
-            },
-        }));
-        assert!(!payload_checker.check(0, &is_null_condition));
-
-        let is_null_condition = Filter::new_must(Condition::IsNull(IsNullCondition {
-            is_null: PayloadField {
-                key: "parts".to_string(),
-            },
-        }));
-        assert!(!payload_checker.check(0, &is_null_condition));
-
-        let is_null_condition = Filter::new_must(Condition::IsNull(IsNullCondition {
-            is_null: PayloadField {
-                key: "something_else".to_string(),
-            },
-        }));
-        assert!(!payload_checker.check(0, &is_null_condition));
-
-        let is_null_condition = Filter::new_must(Condition::IsNull(IsNullCondition {
-            is_null: PayloadField {
-                key: "packaging".to_string(),
-            },
-        }));
-        assert!(payload_checker.check(0, &is_null_condition));
-
-        let is_null_condition = Filter::new_must(Condition::IsNull(IsNullCondition {
-            is_null: PayloadField {
-                key: "not_null".to_string(),
-            },
-        }));
-        assert!(!payload_checker.check(0, &is_null_condition));
-
-        let match_red = Condition::Field(FieldCondition::new_match(
-            "color".to_string(),
-            "red".to_owned().into(),
-        ));
-        let match_blue = Condition::Field(FieldCondition::new_match(
-            "color".to_string(),
-            "blue".to_owned().into(),
-        ));
-        let with_delivery = Condition::Field(FieldCondition::new_match(
-            "has_delivery".to_string(),
-            true.into(),
-        ));
-
-        let many_value_count_condition =
-            Filter::new_must(Condition::Field(FieldCondition::new_values_count(
-                "rating".to_string(),
-                ValuesCount {
-                    lt: None,
-                    gt: None,
-                    gte: Some(10),
-                    lte: None,
-                },
-            )));
-        assert!(!payload_checker.check(0, &many_value_count_condition));
-
-        let few_value_count_condition =
-            Filter::new_must(Condition::Field(FieldCondition::new_values_count(
-                "rating".to_string(),
-                ValuesCount {
-                    lt: Some(5),
-                    gt: None,
-                    gte: None,
-                    lte: None,
-                },
-            )));
-        assert!(payload_checker.check(0, &few_value_count_condition));
-
-        let in_berlin = Condition::Field(FieldCondition::new_geo_bounding_box(
-            "location".to_string(),
-            GeoBoundingBox {
-                top_left: GeoPoint {
-                    lon: 13.08835,
-                    lat: 52.67551,
-                },
-                bottom_right: GeoPoint {
-                    lon: 13.76116,
-                    lat: 52.33826,
-                },
-            },
-        ));
-
-        let in_moscow = Condition::Field(FieldCondition::new_geo_bounding_box(
-            "location".to_string(),
-            GeoBoundingBox {
-                top_left: GeoPoint {
-                    lon: 37.0366,
-                    lat: 56.1859,
-                },
-                bottom_right: GeoPoint {
-                    lon: 38.2532,
-                    lat: 55.317,
-                },
-            },
-        ));
-
-        let with_bad_rating = Condition::Field(FieldCondition::new_range(
-            "rating".to_string(),
-            Range {
-                lt: None,
-                gt: None,
-                gte: None,
-                lte: Some(5.),
-            },
-        ));
-
-        let query = Filter {
-            should: None,
-            must: Some(vec![match_red.clone()]),
-            must_not: None,
-        };
-        assert!(payload_checker.check(0, &query));
-
-        let query = Filter {
-            should: None,
-            must: Some(vec![match_blue.clone()]),
-            must_not: None,
-        };
-        assert!(!payload_checker.check(0, &query));
-
-        let query = Filter {
-            should: None,
-            must: None,
-            must_not: Some(vec![match_blue.clone()]),
-        };
-        assert!(payload_checker.check(0, &query));
-
-        let query = Filter {
-            should: None,
-            must: None,
-            must_not: Some(vec![match_red.clone()]),
-        };
-        assert!(!payload_checker.check(0, &query));
-
-        let query = Filter {
-            should: Some(vec![match_red.clone(), match_blue.clone()]),
-            must: Some(vec![with_delivery.clone(), in_berlin.clone()]),
-            must_not: None,
-        };
-        assert!(payload_checker.check(0, &query));
-
-        let query = Filter {
-            should: Some(vec![match_red.clone(), match_blue.clone()]),
-            must: Some(vec![with_delivery, in_moscow.clone()]),
-            must_not: None,
-        };
-        assert!(!payload_checker.check(0, &query));
-
-        let query = Filter {
-            should: Some(vec![
-                Condition::Filter(Filter {
-                    should: None,
-                    must: Some(vec![match_red.clone(), in_moscow.clone()]),
-                    must_not: None,
-                }),
-                Condition::Filter(Filter {
-                    should: None,
-                    must: Some(vec![match_blue.clone(), in_berlin.clone()]),
-                    must_not: None,
-                }),
-            ]),
-            must: None,
-            must_not: None,
-        };
-        assert!(!payload_checker.check(0, &query));
-
-        let query = Filter {
-            should: Some(vec![
-                Condition::Filter(Filter {
-                    should: None,
-                    must: Some(vec![match_blue, in_moscow]),
-                    must_not: None,
-                }),
-                Condition::Filter(Filter {
-                    should: None,
-                    must: Some(vec![match_red, in_berlin]),
-                    must_not: None,
-                }),
-            ]),
-            must: None,
-            must_not: None,
-        };
-        assert!(payload_checker.check(0, &query));
-
-        let query = Filter {
-            should: None,
-            must: None,
-            must_not: Some(vec![with_bad_rating]),
-        };
-        assert!(!payload_checker.check(0, &query));
-
-        let ids: HashSet<_> = vec![1, 2, 3].into_iter().map(|x| x.into()).collect();
-
-        let query = Filter {
-            should: None,
-            must: None,
-            must_not: Some(vec![Condition::HasId(ids.into())]),
-        };
-        assert!(!payload_checker.check(2, &query));
-
-        let ids: HashSet<_> = vec![1, 2, 3].into_iter().map(|x| x.into()).collect();
-
-        let query = Filter {
-            should: None,
-            must: None,
-            must_not: Some(vec![Condition::HasId(ids.into())]),
-        };
-        assert!(payload_checker.check(10, &query));
-
-        let ids: HashSet<_> = vec![1, 2, 3].into_iter().map(|x| x.into()).collect();
-
-        let query = Filter {
-            should: None,
-            must: Some(vec![Condition::HasId(ids.into())]),
-            must_not: None,
-        };
-        assert!(payload_checker.check(2, &query));
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/payload_storage/simple_payload_storage.rs b/crates/qdrant/lib/segment/src/payload_storage/simple_payload_storage.rs
deleted file mode 100644
index b3c72ac..0000000
--- a/crates/qdrant/lib/segment/src/payload_storage/simple_payload_storage.rs
+++ /dev/null
@@ -1,66 +0,0 @@
-use std::collections::HashMap;
-use std::sync::Arc;
-
-use parking_lot::RwLock;
-use rocksdb::DB;
-
-use crate::common::rocksdb_wrapper::{DatabaseColumnWrapper, DB_PAYLOAD_CF};
-use crate::entry::entry_point::{OperationError, OperationResult};
-use crate::types::{Payload, PointOffsetType};
-
-/// In-memory implementation of `PayloadStorage`.
-/// Persists all changes to disk using `store`, but only uses this storage during the initial load
-pub struct SimplePayloadStorage {
-    pub(crate) payload: HashMap<PointOffsetType, Payload>,
-    pub(crate) db_wrapper: DatabaseColumnWrapper,
-}
-
-impl SimplePayloadStorage {
-    pub fn open(database: Arc<RwLock<DB>>) -> OperationResult<Self> {
-        let mut payload_map: HashMap<PointOffsetType, Payload> = Default::default();
-
-        let db_wrapper = DatabaseColumnWrapper::new(database, DB_PAYLOAD_CF);
-
-        for (key, val) in db_wrapper.lock_db().iter()? {
-            let point_id: PointOffsetType = serde_cbor::from_slice(&key)
-                .map_err(|_| OperationError::service_error("cannot deserialize point id"))?;
-            let payload: Payload = serde_cbor::from_slice(&val)
-                .map_err(|_| OperationError::service_error("cannot deserialize payload"))?;
-            payload_map.insert(point_id, payload);
-        }
-
-        Ok(SimplePayloadStorage {
-            payload: payload_map,
-            db_wrapper,
-        })
-    }
-
-    pub(crate) fn update_storage(&self, point_id: &PointOffsetType) -> OperationResult<()> {
-        match self.payload.get(point_id) {
-            None => self
-                .db_wrapper
-                .remove(serde_cbor::to_vec(&point_id).unwrap()),
-            Some(payload) => self.db_wrapper.put(
-                serde_cbor::to_vec(&point_id).unwrap(),
-                serde_cbor::to_vec(payload).unwrap(),
-            ),
-        }
-    }
-
-    pub fn payload_ptr(&self, point_id: PointOffsetType) -> Option<&Payload> {
-        self.payload.get(&point_id)
-    }
-
-    pub fn iter<F>(&self, mut callback: F) -> OperationResult<()>
-    where
-        F: FnMut(PointOffsetType, &Payload) -> OperationResult<bool>,
-    {
-        for (key, val) in self.payload.iter() {
-            let do_continue = callback(*key, val)?;
-            if !do_continue {
-                return Ok(());
-            }
-        }
-        Ok(())
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/payload_storage/simple_payload_storage_impl.rs b/crates/qdrant/lib/segment/src/payload_storage/simple_payload_storage_impl.rs
deleted file mode 100644
index 1000bd4..0000000
--- a/crates/qdrant/lib/segment/src/payload_storage/simple_payload_storage_impl.rs
+++ /dev/null
@@ -1,121 +0,0 @@
-use std::collections::HashMap;
-
-use serde_json::Value;
-
-use crate::common::Flusher;
-use crate::entry::entry_point::OperationResult;
-use crate::payload_storage::simple_payload_storage::SimplePayloadStorage;
-use crate::payload_storage::PayloadStorage;
-use crate::types::{Payload, PayloadKeyTypeRef, PointOffsetType};
-
-impl PayloadStorage for SimplePayloadStorage {
-    fn assign(&mut self, point_id: PointOffsetType, payload: &Payload) -> OperationResult<()> {
-        match self.payload.get_mut(&point_id) {
-            Some(point_payload) => point_payload.merge(payload),
-            None => {
-                self.payload.insert(point_id, payload.to_owned());
-            }
-        }
-
-        self.update_storage(&point_id)?;
-
-        Ok(())
-    }
-
-    fn payload(&self, point_id: PointOffsetType) -> OperationResult<Payload> {
-        match self.payload.get(&point_id) {
-            Some(payload) => Ok(payload.to_owned()),
-            None => Ok(Default::default()),
-        }
-    }
-
-    fn delete(
-        &mut self,
-        point_id: PointOffsetType,
-        key: PayloadKeyTypeRef,
-    ) -> OperationResult<Vec<Value>> {
-        match self.payload.get_mut(&point_id) {
-            Some(payload) => {
-                let res = payload.remove(key);
-                if !res.is_empty() {
-                    self.update_storage(&point_id)?;
-                }
-                Ok(res)
-            }
-            None => Ok(vec![]),
-        }
-    }
-
-    fn drop(&mut self, point_id: PointOffsetType) -> OperationResult<Option<Payload>> {
-        let res = self.payload.remove(&point_id);
-        self.update_storage(&point_id)?;
-        Ok(res)
-    }
-
-    fn wipe(&mut self) -> OperationResult<()> {
-        self.payload = HashMap::new();
-        self.db_wrapper.recreate_column_family()
-    }
-
-    fn flusher(&self) -> Flusher {
-        self.db_wrapper.flusher()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use tempfile::Builder;
-
-    use super::*;
-    use crate::common::rocksdb_wrapper::{open_db, DB_VECTOR_CF};
-
-    #[test]
-    fn test_wipe() {
-        let dir = Builder::new().prefix("db_dir").tempdir().unwrap();
-        let db = open_db(dir.path(), &[DB_VECTOR_CF]).unwrap();
-
-        let mut storage = SimplePayloadStorage::open(db).unwrap();
-        let payload: Payload = serde_json::from_str(r#"{"name": "John Doe"}"#).unwrap();
-        storage.assign(100, &payload).unwrap();
-        storage.wipe().unwrap();
-        storage.assign(100, &payload).unwrap();
-        storage.wipe().unwrap();
-        storage.assign(100, &payload).unwrap();
-        assert!(!storage.payload(100).unwrap().is_empty());
-        storage.wipe().unwrap();
-        assert_eq!(storage.payload(100).unwrap(), Default::default());
-    }
-
-    #[test]
-    fn test_assign_payload_from_serde_json() {
-        let data = r#"
-        {
-            "name": "John Doe",
-            "age": 43,
-            "boolean": "true",
-            "floating": 30.5,
-            "string_array": ["hello", "world"],
-            "boolean_array": ["true", "false"],
-            "float_array": [1.0, 2.0],
-            "integer_array": [1, 2],
-            "geo_data": {"type": "geo", "value": {"lon": 1.0, "lat": 1.0}},
-            "metadata": {
-                "height": 50,
-                "width": 60,
-                "temperature": 60.5,
-                "nested": {
-                    "feature": 30.5
-                },
-                "integer_array": [1, 2]
-            }
-        }"#;
-
-        let payload: Payload = serde_json::from_str(data).unwrap();
-        let dir = Builder::new().prefix("storage_dir").tempdir().unwrap();
-        let db = open_db(dir.path(), &[DB_VECTOR_CF]).unwrap();
-        let mut storage = SimplePayloadStorage::open(db).unwrap();
-        storage.assign(100, &payload).unwrap();
-        let pload = storage.payload(100).unwrap();
-        assert_eq!(pload, payload);
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/rocksdb_backup.rs b/crates/qdrant/lib/segment/src/rocksdb_backup.rs
deleted file mode 100644
index d4c9c1e..0000000
--- a/crates/qdrant/lib/segment/src/rocksdb_backup.rs
+++ /dev/null
@@ -1,64 +0,0 @@
-use std::fs;
-use std::path::Path;
-
-use crate::entry::entry_point::{OperationError, OperationResult};
-
-pub fn create(db: &rocksdb::DB, backup_path: &Path) -> OperationResult<()> {
-    if !backup_path.exists() {
-        create_dir_all(backup_path)?;
-    } else if !backup_path.is_dir() {
-        return Err(not_a_directory_error(backup_path));
-    } else if backup_path.read_dir().unwrap().next().is_some() {
-        return Err(directory_not_empty_error(backup_path));
-    }
-
-    backup_engine(backup_path)?
-        .create_new_backup(db)
-        .map_err(|err| {
-            OperationError::service_error(format!("failed to create RocksDB backup: {err}"))
-        })
-}
-
-pub fn restore(backup_path: &Path, restore_path: &Path) -> OperationResult<()> {
-    backup_engine(backup_path)?
-        .restore_from_latest_backup(restore_path, restore_path, &Default::default())
-        .map_err(|err| {
-            OperationError::service_error(format!("failed to restore RocksDB backup: {err}"))
-        })
-}
-
-fn backup_engine(path: &Path) -> OperationResult<rocksdb::backup::BackupEngine> {
-    let options = rocksdb::backup::BackupEngineOptions::new(path).map_err(|err| {
-        OperationError::service_error(format!(
-            "failed to create RocksDB backup engine options: {err}"
-        ))
-    })?;
-    let env = rocksdb::Env::new().map_err(|err| {
-        OperationError::service_error(format!(
-            "failed to create RocksDB backup engine environment: {err}"
-        ))
-    })?;
-    rocksdb::backup::BackupEngine::open(&options, &env).map_err(|err| {
-        OperationError::service_error(format!(
-            "failed to open RocksDB backup engine {path:?}: {err}"
-        ))
-    })
-}
-
-fn create_dir_all(path: &Path) -> OperationResult<()> {
-    fs::create_dir_all(path).map_err(|err| {
-        OperationError::service_error(format!(
-            "failed to create RocksDB backup directory {path:?}: {err}"
-        ))
-    })
-}
-
-fn not_a_directory_error(path: &Path) -> OperationError {
-    OperationError::service_error(format!("RocksDB backup path {path:?} is not a directory"))
-}
-
-fn directory_not_empty_error(path: &Path) -> OperationError {
-    OperationError::service_error(format!(
-        "RockDB backup directory {path:?} already exists and is not empty"
-    ))
-}
diff --git a/crates/qdrant/lib/segment/src/segment.rs b/crates/qdrant/lib/segment/src/segment.rs
deleted file mode 100644
index 62ecdba..0000000
--- a/crates/qdrant/lib/segment/src/segment.rs
+++ /dev/null
@@ -1,2240 +0,0 @@
-use std::cmp::max;
-use std::collections::{HashMap, HashSet};
-use std::fs::{self, File};
-use std::path::{Path, PathBuf};
-use std::sync::atomic::AtomicBool;
-use std::sync::Arc;
-use std::thread::{self, JoinHandle};
-
-use atomic_refcell::AtomicRefCell;
-use parking_lot::{Mutex, RwLock};
-use rocksdb::DB;
-use tar::Builder;
-use uuid::Uuid;
-
-use crate::common::file_operations::{atomic_save_json, read_json};
-use crate::common::version::{StorageVersion, VERSION_FILE};
-use crate::common::{
-    check_named_vectors, check_stopped, check_vector, check_vector_name, check_vectors, mmap_ops,
-};
-use crate::data_types::named_vectors::NamedVectors;
-use crate::data_types::vectors::VectorElementType;
-use crate::entry::entry_point::OperationError::TypeInferenceError;
-use crate::entry::entry_point::{
-    get_service_error, OperationError, OperationResult, SegmentEntry, SegmentFailedState,
-};
-use crate::id_tracker::IdTrackerSS;
-use crate::index::field_index::CardinalityEstimation;
-use crate::index::struct_payload_index::StructPayloadIndex;
-use crate::index::{PayloadIndex, VectorIndex, VectorIndexEnum};
-use crate::spaces::tools::peek_top_smallest_iterable;
-use crate::telemetry::SegmentTelemetry;
-use crate::types::{
-    Filter, Payload, PayloadFieldSchema, PayloadIndexInfo, PayloadKeyType, PayloadKeyTypeRef,
-    PayloadSchemaType, PointIdType, PointOffsetType, ScoredPoint, SearchParams, SegmentConfig,
-    SegmentInfo, SegmentState, SegmentType, SeqNumberType, WithPayload, WithVector,
-};
-use crate::utils;
-use crate::utils::fs::find_symlink;
-use crate::vector_storage::{ScoredPointOffset, VectorStorage, VectorStorageEnum};
-
-pub const SEGMENT_STATE_FILE: &str = "segment.json";
-
-const SNAPSHOT_PATH: &str = "snapshot";
-
-// Sub-directories of `SNAPSHOT_PATH`:
-const DB_BACKUP_PATH: &str = "db_backup";
-const PAYLOAD_DB_BACKUP_PATH: &str = "payload_index_db_backup";
-const SNAPSHOT_FILES_PATH: &str = "files";
-
-pub struct SegmentVersion;
-
-impl StorageVersion for SegmentVersion {
-    fn current() -> String {
-        env!("CARGO_PKG_VERSION").to_string()
-    }
-}
-
-/// Segment - an object which manages an independent group of points.
-///
-/// - Provides storage, indexing and managing operations for points (vectors + payload)
-/// - Keeps track of point versions
-/// - Persists data
-/// - Keeps track of occurred errors
-pub struct Segment {
-    /// Latest update operation number, applied to this segment
-    /// If None, there were no updates and segment is empty
-    pub version: Option<SeqNumberType>,
-    /// Latest persisted version
-    pub persisted_version: Arc<Mutex<Option<SeqNumberType>>>,
-    /// Path of the storage root
-    pub current_path: PathBuf,
-    /// Component for mapping external ids to internal and also keeping track of point versions
-    pub id_tracker: Arc<AtomicRefCell<IdTrackerSS>>,
-    pub vector_data: HashMap<String, VectorData>,
-    pub payload_index: Arc<AtomicRefCell<StructPayloadIndex>>,
-    /// Shows if it is possible to insert more points into this segment
-    pub appendable_flag: bool,
-    /// Shows what kind of indexes and storages are used in this segment
-    pub segment_type: SegmentType,
-    pub segment_config: SegmentConfig,
-    /// Last unhandled error
-    /// If not None, all update operations will be aborted until original operation is performed properly
-    pub error_status: Option<SegmentFailedState>,
-    pub database: Arc<RwLock<DB>>,
-    pub flush_thread: Mutex<Option<JoinHandle<OperationResult<SeqNumberType>>>>,
-}
-
-pub struct VectorData {
-    pub vector_index: Arc<AtomicRefCell<VectorIndexEnum>>,
-    pub vector_storage: Arc<AtomicRefCell<VectorStorageEnum>>,
-}
-
-impl VectorData {
-    /// Whether this vector data can be appended to
-    ///
-    /// This requires an index and storage type that both support appending.
-    pub fn is_appendable(&self) -> bool {
-        self.vector_index.borrow().is_appendable() && self.vector_storage.borrow().is_appendable()
-    }
-
-    pub fn prefault_mmap_pages(&self) -> impl Iterator<Item = mmap_ops::PrefaultMmapPages> {
-        let index_task = match &*self.vector_index.borrow() {
-            VectorIndexEnum::HnswMmap(index) => index.prefault_mmap_pages(),
-            _ => None,
-        };
-
-        let storage_task = match &*self.vector_storage.borrow() {
-            VectorStorageEnum::Memmap(storage) => storage.prefault_mmap_pages(),
-            _ => None,
-        };
-
-        index_task.into_iter().chain(storage_task)
-    }
-}
-
-impl Segment {
-    /// Replace vectors in-place
-    ///
-    /// This replaces all named vectors for this point with the given set of named vectors.
-    ///
-    /// - new named vectors are inserted
-    /// - existing named vectors are replaced
-    /// - existing named vectors not specified are deleted
-    ///
-    /// This differs with [`Segment::update_vectors`], because this deletes unspecified vectors.
-    ///
-    /// # Warning
-    ///
-    /// Available for appendable segments only.
-    fn replace_all_vectors(
-        &mut self,
-        internal_id: PointOffsetType,
-        vectors: NamedVectors,
-    ) -> OperationResult<()> {
-        debug_assert!(self.is_appendable());
-        check_named_vectors(&vectors, &self.segment_config)?;
-        for (vector_name, vector_data) in self.vector_data.iter_mut() {
-            let vector = vectors.get(vector_name);
-            match vector {
-                Some(vector) => {
-                    let mut vector_storage = vector_data.vector_storage.borrow_mut();
-                    vector_storage.insert_vector(internal_id, vector)?;
-                }
-                None => {
-                    // No vector provided, so we remove it
-                    let mut vector_storage = vector_data.vector_storage.borrow_mut();
-                    vector_storage.delete_vector(internal_id)?;
-                }
-            }
-        }
-        Ok(())
-    }
-
-    /// Update vectors in-place
-    ///
-    /// This updates all specified named vectors for this point with the given set of named vectors, leaving unspecified vectors untouched.
-    ///
-    /// - new named vectors are inserted
-    /// - existing named vectors are replaced
-    /// - existing named vectors not specified are untouched and kept as-is
-    ///
-    /// This differs with [`Segment::replace_all_vectors`], because this keeps unspecified vectors as-is.
-    ///
-    /// # Warning
-    ///
-    /// Available for appendable segments only.
-    fn update_vectors(
-        &mut self,
-        internal_id: PointOffsetType,
-        vectors: NamedVectors,
-    ) -> OperationResult<()> {
-        debug_assert!(self.is_appendable());
-        check_named_vectors(&vectors, &self.segment_config)?;
-        for (vector_name, new_vector) in vectors {
-            let vector_data = &self.vector_data[vector_name.as_ref()];
-            vector_data
-                .vector_storage
-                .borrow_mut()
-                .insert_vector(internal_id, new_vector.as_ref())?;
-        }
-        Ok(())
-    }
-
-    /// Insert new vectors into the segment
-    ///
-    /// # Warning
-    ///
-    /// Available for appendable segments only.
-    fn insert_new_vectors(
-        &mut self,
-        point_id: PointIdType,
-        vectors: NamedVectors,
-    ) -> OperationResult<PointOffsetType> {
-        debug_assert!(self.is_appendable());
-        check_named_vectors(&vectors, &self.segment_config)?;
-        let new_index = self.id_tracker.borrow().total_point_count() as PointOffsetType;
-        for (vector_name, vector_data) in self.vector_data.iter_mut() {
-            let vector_opt = vectors.get(vector_name);
-            let mut vector_storage = vector_data.vector_storage.borrow_mut();
-            match vector_opt {
-                None => {
-                    let dim = vector_storage.vector_dim();
-                    vector_storage.insert_vector(new_index, &vec![1.0; dim])?;
-                    vector_storage.delete_vector(new_index)?;
-                }
-                Some(vec) => {
-                    vector_storage.insert_vector(new_index, vec)?;
-                }
-            }
-        }
-        self.id_tracker.borrow_mut().set_link(point_id, new_index)?;
-        Ok(new_index)
-    }
-
-    /// Operation wrapped, which handles previous and new errors in the segment,
-    /// automatically updates versions and skips operations if version is too old
-    ///
-    /// # Arguments
-    ///
-    /// * `op_num` - sequential operation of the current operation
-    /// * `op_point_offset` - if operation is point-related, specify this point offset.
-    ///     If point offset is specified, handler will use point version for comparison.
-    ///     Otherwise, it will use global storage version
-    /// * `op` - operation to be wrapped. Should return `OperationResult` of bool (which is returned outside)
-    ///     and optionally new offset of the changed point.
-    ///
-    /// # Result
-    ///
-    /// Propagates `OperationResult` of bool (which is returned in the `op` closure)
-    ///
-    fn handle_version_and_failure<F>(
-        &mut self,
-        op_num: SeqNumberType,
-        op_point_offset: Option<PointOffsetType>,
-        operation: F,
-    ) -> OperationResult<bool>
-    where
-        F: FnOnce(&mut Segment) -> OperationResult<(bool, Option<PointOffsetType>)>,
-    {
-        if let Some(SegmentFailedState {
-            version: failed_version,
-            point_id: _failed_point_id,
-            error,
-        }) = &self.error_status
-        {
-            // Failed operations should not be skipped,
-            // fail if newer operation is attempted before proper recovery
-            if *failed_version < op_num {
-                return Err(OperationError::service_error(format!(
-                    "Not recovered from previous error: {error}"
-                )));
-            } // else: Re-try operation
-        }
-
-        let res = self.handle_version(op_num, op_point_offset, operation);
-
-        match get_service_error(&res) {
-            None => {
-                // Recover error state
-                match &self.error_status {
-                    None => {} // all good
-                    Some(error) => {
-                        let point_id = op_point_offset.and_then(|point_offset| {
-                            self.id_tracker.borrow().external_id(point_offset)
-                        });
-                        if error.point_id == point_id {
-                            // Fixed
-                            log::info!("Recovered from error: {}", error.error);
-                            self.error_status = None;
-                        }
-                    }
-                }
-            }
-            Some(error) => {
-                // ToDo: Recover previous segment state
-                log::error!(
-                    "Segment {:?} operation error: {}",
-                    self.current_path.as_path(),
-                    error
-                );
-                let point_id = op_point_offset
-                    .and_then(|point_offset| self.id_tracker.borrow().external_id(point_offset));
-                self.error_status = Some(SegmentFailedState {
-                    version: op_num,
-                    point_id,
-                    error,
-                });
-            }
-        }
-        res
-    }
-
-    /// Manage segment version checking
-    /// If current version if higher than operation version - do not perform the operation
-    /// Update current version if operation successfully executed
-    fn handle_version<F>(
-        &mut self,
-        op_num: SeqNumberType,
-        op_point_offset: Option<PointOffsetType>,
-        operation: F,
-    ) -> OperationResult<bool>
-    where
-        F: FnOnce(&mut Segment) -> OperationResult<(bool, Option<PointOffsetType>)>,
-    {
-        match op_point_offset {
-            None => {
-                // Not a point operation *or* point does not exist.
-                // Use global version to check if operation has been already applied.
-                if self.version.unwrap_or(0) > op_num {
-                    return Ok(false); // Skip without execution
-                }
-            }
-            Some(point_offset) => {
-                // Check if point not exists or have lower version
-                if self
-                    .id_tracker
-                    .borrow()
-                    .internal_version(point_offset)
-                    .map_or(false, |current_version| current_version > op_num)
-                {
-                    return Ok(false);
-                }
-            }
-        }
-
-        let (applied, point_id) = operation(self)?;
-
-        self.version = Some(max(op_num, self.version.unwrap_or(0)));
-
-        if let Some(point_id) = point_id {
-            self.id_tracker
-                .borrow_mut()
-                .set_internal_version(point_id, op_num)?;
-        }
-
-        Ok(applied)
-    }
-
-    fn lookup_internal_id(&self, point_id: PointIdType) -> OperationResult<PointOffsetType> {
-        let internal_id_opt = self.id_tracker.borrow().internal_id(point_id);
-        match internal_id_opt {
-            Some(internal_id) => Ok(internal_id),
-            None => Err(OperationError::PointIdError {
-                missed_point_id: point_id,
-            }),
-        }
-    }
-
-    fn get_state(&self) -> SegmentState {
-        SegmentState {
-            version: self.version,
-            config: self.segment_config.clone(),
-        }
-    }
-
-    pub fn save_state(state: &SegmentState, current_path: &Path) -> OperationResult<()> {
-        let state_path = current_path.join(SEGMENT_STATE_FILE);
-        Ok(atomic_save_json(&state_path, state)?)
-    }
-
-    pub fn load_state(current_path: &Path) -> OperationResult<SegmentState> {
-        let state_path = current_path.join(SEGMENT_STATE_FILE);
-        read_json(&state_path).map_err(|err| {
-            OperationError::service_error(format!(
-                "Failed to read segment state {} error: {}",
-                current_path.display(),
-                err
-            ))
-        })
-    }
-
-    /// Retrieve vector by internal ID
-    ///
-    /// Returns None if the vector does not exists or deleted
-    #[inline]
-    fn vector_by_offset(
-        &self,
-        vector_name: &str,
-        point_offset: PointOffsetType,
-    ) -> OperationResult<Option<Vec<VectorElementType>>> {
-        check_vector_name(vector_name, &self.segment_config)?;
-        let vector_data = &self.vector_data[vector_name];
-        let is_vector_deleted = vector_data
-            .vector_storage
-            .borrow()
-            .is_deleted_vector(point_offset);
-        if !is_vector_deleted && !self.id_tracker.borrow().is_deleted_point(point_offset) {
-            let vector_storage = vector_data.vector_storage.borrow();
-
-            if vector_storage.total_vector_count() <= point_offset as usize {
-                // Storage does not have vector with such offset.
-                // This is possible if the storage is inconsistent due to interrupted flush.
-                // Assume consistency will be restored with WAL replay.
-
-                // Without this check, the service will panic on the `get_vector` call.
-                Err(OperationError::InconsistentStorage {
-                    description: format!(
-                        "Vector storage is inconsistent, total_vector_count: {}, point_offset: {}",
-                        vector_storage.total_vector_count(),
-                        point_offset
-                    ),
-                })
-            } else {
-                Ok(Some(vector_storage.get_vector(point_offset).to_vec()))
-            }
-        } else {
-            Ok(None)
-        }
-    }
-
-    fn all_vectors_by_offset(
-        &self,
-        point_offset: PointOffsetType,
-    ) -> OperationResult<NamedVectors> {
-        let mut vectors = NamedVectors::default();
-        for (vector_name, vector_data) in &self.vector_data {
-            let is_vector_deleted = vector_data
-                .vector_storage
-                .borrow()
-                .is_deleted_vector(point_offset);
-            if !is_vector_deleted {
-                vectors.insert(
-                    vector_name.clone(),
-                    vector_data
-                        .vector_storage
-                        .borrow()
-                        .get_vector(point_offset)
-                        .to_vec(),
-                );
-            }
-        }
-        Ok(vectors)
-    }
-
-    /// Retrieve payload by internal ID
-    #[inline]
-    fn payload_by_offset(&self, point_offset: PointOffsetType) -> OperationResult<Payload> {
-        self.payload_index.borrow().payload(point_offset)
-    }
-
-    pub fn save_current_state(&self) -> OperationResult<()> {
-        Self::save_state(&self.get_state(), &self.current_path)
-    }
-
-    fn infer_from_payload_data(
-        &self,
-        key: PayloadKeyTypeRef,
-    ) -> OperationResult<Option<PayloadSchemaType>> {
-        let payload_index = self.payload_index.borrow();
-        payload_index.infer_payload_type(key)
-    }
-
-    pub fn restore_snapshot(snapshot_path: &Path, segment_id: &str) -> OperationResult<()> {
-        let segment_path = snapshot_path.parent().unwrap().join(segment_id);
-
-        let archive_file = File::open(snapshot_path).map_err(|err| {
-            OperationError::service_error(format!(
-                "failed to open segment snapshot archive {snapshot_path:?}: {err}"
-            ))
-        })?;
-
-        tar::Archive::new(archive_file)
-            .unpack(&segment_path)
-            .map_err(|err| {
-                OperationError::service_error(format!(
-                    "failed to unpack segment snapshot archive {snapshot_path:?}: {err}"
-                ))
-            })?;
-
-        let snapshot_path = segment_path.join(SNAPSHOT_PATH);
-
-        if snapshot_path.exists() {
-            let db_backup_path = snapshot_path.join(DB_BACKUP_PATH);
-            let payload_index_db_backup = snapshot_path.join(PAYLOAD_DB_BACKUP_PATH);
-
-            crate::rocksdb_backup::restore(&db_backup_path, &segment_path)?;
-
-            if payload_index_db_backup.is_dir() {
-                StructPayloadIndex::restore_database_snapshot(
-                    &payload_index_db_backup,
-                    &segment_path,
-                )?;
-            }
-
-            let files_path = snapshot_path.join(SNAPSHOT_FILES_PATH);
-
-            if let Some(symlink) = find_symlink(&files_path) {
-                return Err(OperationError::service_error(format!(
-                    "Snapshot is corrupted, can't read file: {:?}",
-                    symlink
-                )));
-            }
-
-            utils::fs::move_all(&files_path, &segment_path)?;
-
-            fs::remove_dir_all(&snapshot_path).map_err(|err| {
-                OperationError::service_error(format!(
-                    "failed to remove {snapshot_path:?} directory: {err}"
-                ))
-            })?;
-        } else {
-            log::info!("Attempt to restore legacy snapshot format");
-            // Do nothing, legacy format is just plain archive
-        }
-
-        Ok(())
-    }
-
-    // Joins flush thread if exists
-    // Returns lock to guarantee that there will be no other flush in a different thread
-    fn lock_flushing(
-        &self,
-    ) -> OperationResult<parking_lot::MutexGuard<Option<JoinHandle<OperationResult<SeqNumberType>>>>>
-    {
-        let mut lock = self.flush_thread.lock();
-        let mut join_handle: Option<JoinHandle<OperationResult<SeqNumberType>>> = None;
-        std::mem::swap(&mut join_handle, &mut lock);
-        if let Some(join_handle) = join_handle {
-            // Flush result was reported to segment, so we don't need this value anymore
-            let _background_flush_result = join_handle
-                .join()
-                .map_err(|_err| OperationError::service_error("failed to join flush thread"))??;
-        }
-        Ok(lock)
-    }
-
-    fn is_background_flushing(&self) -> bool {
-        let lock = self.flush_thread.lock();
-        if let Some(join_handle) = lock.as_ref() {
-            !join_handle.is_finished()
-        } else {
-            false
-        }
-    }
-
-    /// Converts raw ScoredPointOffset search result into ScoredPoint result
-    fn process_search_result(
-        &self,
-        internal_result: &[ScoredPointOffset],
-        with_payload: &WithPayload,
-        with_vector: &WithVector,
-    ) -> OperationResult<Vec<ScoredPoint>> {
-        let id_tracker = self.id_tracker.borrow();
-        internal_result
-            .iter()
-            .filter_map(|&scored_point_offset| {
-                let point_offset = scored_point_offset.idx;
-                let external_id = id_tracker.external_id(point_offset);
-                match external_id {
-                    Some(point_id) => Some((point_id, scored_point_offset)),
-                    None => {
-                        log::warn!(
-                            "Point with internal ID {} not found in id tracker, skipping",
-                            point_offset
-                        );
-                        None
-                    }
-                }
-            })
-            .map(|(point_id, scored_point_offset)| {
-                let point_offset = scored_point_offset.idx;
-                let point_version = id_tracker.internal_version(point_offset).ok_or_else(|| {
-                    OperationError::service_error(format!(
-                        "Corrupter id_tracker, no version for point {point_id}"
-                    ))
-                })?;
-                let payload = if with_payload.enable {
-                    let initial_payload = self.payload_by_offset(point_offset)?;
-                    let processed_payload = if let Some(i) = &with_payload.payload_selector {
-                        i.process(initial_payload)
-                    } else {
-                        initial_payload
-                    };
-                    Some(processed_payload)
-                } else {
-                    None
-                };
-                let vector = match with_vector {
-                    WithVector::Bool(false) => None,
-                    WithVector::Bool(true) => {
-                        Some(self.all_vectors_by_offset(point_offset)?.into())
-                    }
-                    WithVector::Selector(vectors) => {
-                        let mut result = NamedVectors::default();
-                        for vector_name in vectors {
-                            if let Some(vector) =
-                                self.vector_by_offset(vector_name, point_offset)?
-                            {
-                                result.insert(vector_name.clone(), vector);
-                            }
-                        }
-                        Some(result.into())
-                    }
-                };
-
-                Ok(ScoredPoint {
-                    id: point_id,
-                    version: point_version,
-                    score: scored_point_offset.score,
-                    payload,
-                    vector,
-                })
-            })
-            .collect()
-    }
-
-    pub fn filtered_read_by_index(
-        &self,
-        offset: Option<PointIdType>,
-        limit: Option<usize>,
-        condition: &Filter,
-    ) -> Vec<PointIdType> {
-        let payload_index = self.payload_index.borrow();
-        let id_tracker = self.id_tracker.borrow();
-
-        let ids_iterator = payload_index
-            .query_points(condition)
-            .into_iter()
-            .filter_map(|internal_id| {
-                let external_id = id_tracker.external_id(internal_id);
-                match external_id {
-                    Some(external_id) => match offset {
-                        Some(offset) if external_id < offset => None,
-                        _ => Some(external_id),
-                    },
-                    None => None,
-                }
-            });
-
-        let mut page = match limit {
-            Some(limit) => peek_top_smallest_iterable(ids_iterator, limit),
-            None => ids_iterator.collect(),
-        };
-        page.sort_unstable();
-        page
-    }
-
-    pub fn filtered_read_by_id_stream(
-        &self,
-        offset: Option<PointIdType>,
-        limit: Option<usize>,
-        condition: &Filter,
-    ) -> Vec<PointIdType> {
-        let payload_index = self.payload_index.borrow();
-        let filter_context = payload_index.filter_context(condition);
-        self.id_tracker
-            .borrow()
-            .iter_from(offset)
-            .filter(move |(_, internal_id)| filter_context.check(*internal_id))
-            .map(|(external_id, _)| external_id)
-            .take(limit.unwrap_or(usize::MAX))
-            .collect()
-    }
-
-    /// Check consistency of the segment's data and repair it if possible.
-    pub fn check_consistency_and_repair(&mut self) -> OperationResult<()> {
-        let mut internal_ids_to_delete = HashSet::new();
-        let id_tracker = self.id_tracker.borrow();
-        for internal_id in id_tracker.iter_ids() {
-            if id_tracker.external_id(internal_id).is_none() {
-                internal_ids_to_delete.insert(internal_id);
-            }
-        }
-
-        if !internal_ids_to_delete.is_empty() {
-            log::info!(
-                "Found {} points in vector storage without external id - those will be deleted",
-                internal_ids_to_delete.len(),
-            );
-
-            for internal_id in &internal_ids_to_delete {
-                // Drop removed points from payload index
-                self.payload_index.borrow_mut().drop(*internal_id)?;
-
-                // Drop removed points from vector storage
-                for vector_data in self.vector_data.values() {
-                    let mut vector_storage = vector_data.vector_storage.borrow_mut();
-                    vector_storage.delete_vector(*internal_id)?;
-                }
-            }
-
-            // We do not drop version here, because it is already not loaded into memory.
-            // There are no explicit mapping between internal ID and version, so all dangling
-            // versions will be ignored automatically.
-            // Those versions could be overwritten by new points, but it is not a problem.
-            // They will also be deleted by the next optimization.
-        }
-
-        // Flush entire segment if needed
-        if !internal_ids_to_delete.is_empty() {
-            self.flush(true)?;
-        }
-        Ok(())
-    }
-
-    pub fn available_vector_count(&self, vector_name: &str) -> OperationResult<usize> {
-        check_vector_name(vector_name, &self.segment_config)?;
-        Ok(self.vector_data[vector_name]
-            .vector_storage
-            .borrow()
-            .available_vector_count())
-    }
-
-    pub fn total_point_count(&self) -> usize {
-        self.id_tracker.borrow().total_point_count()
-    }
-
-    pub fn prefault_mmap_pages(&self) {
-        let tasks: Vec<_> = self
-            .vector_data
-            .values()
-            .flat_map(|data| data.prefault_mmap_pages())
-            .collect();
-
-        let _ = thread::Builder::new()
-            .name(format!(
-                "segment-{:?}-prefault-mmap-pages",
-                self.current_path,
-            ))
-            .spawn(move || tasks.iter().for_each(mmap_ops::PrefaultMmapPages::exec));
-    }
-}
-
-/// This is a basic implementation of `SegmentEntry`,
-/// meaning that it implements the _actual_ operations with data and not any kind of proxy or wrapping
-impl SegmentEntry for Segment {
-    fn version(&self) -> SeqNumberType {
-        self.version.unwrap_or(0)
-    }
-
-    fn point_version(&self, point_id: PointIdType) -> Option<SeqNumberType> {
-        let id_tracker = self.id_tracker.borrow();
-        id_tracker
-            .internal_id(point_id)
-            .and_then(|internal_id| id_tracker.internal_version(internal_id))
-    }
-
-    fn search(
-        &self,
-        vector_name: &str,
-        vector: &[VectorElementType],
-        with_payload: &WithPayload,
-        with_vector: &WithVector,
-        filter: Option<&Filter>,
-        top: usize,
-        params: Option<&SearchParams>,
-        is_stopped: &AtomicBool,
-    ) -> OperationResult<Vec<ScoredPoint>> {
-        check_vector(vector_name, vector, &self.segment_config)?;
-        let vector_data = &self.vector_data[vector_name];
-        let internal_result =
-            &vector_data
-                .vector_index
-                .borrow()
-                .search(&[vector], filter, top, params, is_stopped)[0];
-
-        check_stopped(is_stopped)?;
-        self.process_search_result(internal_result, with_payload, with_vector)
-    }
-
-    fn search_batch(
-        &self,
-        vector_name: &str,
-        vectors: &[&[VectorElementType]],
-        with_payload: &WithPayload,
-        with_vector: &WithVector,
-        filter: Option<&Filter>,
-        top: usize,
-        params: Option<&SearchParams>,
-        is_stopped: &AtomicBool,
-    ) -> OperationResult<Vec<Vec<ScoredPoint>>> {
-        check_vectors(vector_name, vectors, &self.segment_config)?;
-        let vector_data = &self.vector_data[vector_name];
-        let internal_results = vector_data
-            .vector_index
-            .borrow()
-            .search(vectors, filter, top, params, is_stopped);
-
-        check_stopped(is_stopped)?;
-
-        let res = internal_results
-            .iter()
-            .map(|internal_result| {
-                self.process_search_result(internal_result, with_payload, with_vector)
-            })
-            .collect();
-
-        res
-    }
-
-    fn upsert_point(
-        &mut self,
-        op_num: SeqNumberType,
-        point_id: PointIdType,
-        mut vectors: NamedVectors,
-    ) -> OperationResult<bool> {
-        debug_assert!(self.is_appendable());
-        check_named_vectors(&vectors, &self.segment_config)?;
-        vectors.preprocess(|name| self.segment_config.vector_data[name].distance);
-        let stored_internal_point = self.id_tracker.borrow().internal_id(point_id);
-        self.handle_version_and_failure(op_num, stored_internal_point, |segment| {
-            if let Some(existing_internal_id) = stored_internal_point {
-                segment.replace_all_vectors(existing_internal_id, vectors)?;
-                Ok((true, Some(existing_internal_id)))
-            } else {
-                let new_index = segment.insert_new_vectors(point_id, vectors)?;
-                Ok((false, Some(new_index)))
-            }
-        })
-    }
-
-    fn delete_point(
-        &mut self,
-        op_num: SeqNumberType,
-        point_id: PointIdType,
-    ) -> OperationResult<bool> {
-        let internal_id = self.id_tracker.borrow().internal_id(point_id);
-        match internal_id {
-            // Point does already not exist anymore
-            None => Ok(false),
-            Some(internal_id) => {
-                self.handle_version_and_failure(op_num, Some(internal_id), |segment| {
-                    // Mark point as deleted, drop mapping
-                    segment.payload_index.borrow_mut().drop(internal_id)?;
-                    segment.id_tracker.borrow_mut().drop(point_id)?;
-
-                    // Propagate point deletion to all its vectors
-                    for vector_data in segment.vector_data.values() {
-                        let mut vector_storage = vector_data.vector_storage.borrow_mut();
-                        vector_storage.delete_vector(internal_id)?;
-                    }
-
-                    Ok((true, Some(internal_id)))
-                })
-            }
-        }
-    }
-
-    fn update_vectors(
-        &mut self,
-        op_num: SeqNumberType,
-        point_id: PointIdType,
-        mut vectors: NamedVectors,
-    ) -> OperationResult<bool> {
-        check_named_vectors(&vectors, &self.segment_config)?;
-        vectors.preprocess(|name| self.segment_config.vector_data[name].distance);
-        let internal_id = self.id_tracker.borrow().internal_id(point_id);
-        match internal_id {
-            None => Err(OperationError::PointIdError {
-                missed_point_id: point_id,
-            }),
-            Some(internal_id) => {
-                self.handle_version_and_failure(op_num, Some(internal_id), |segment| {
-                    segment.update_vectors(internal_id, vectors)?;
-                    Ok((true, Some(internal_id)))
-                })
-            }
-        }
-    }
-
-    fn delete_vector(
-        &mut self,
-        op_num: SeqNumberType,
-        point_id: PointIdType,
-        vector_name: &str,
-    ) -> OperationResult<bool> {
-        check_vector_name(vector_name, &self.segment_config)?;
-        let internal_id = self.id_tracker.borrow().internal_id(point_id);
-        match internal_id {
-            None => Err(OperationError::PointIdError {
-                missed_point_id: point_id,
-            }),
-            Some(internal_id) => {
-                self.handle_version_and_failure(op_num, Some(internal_id), |segment| {
-                    let vector_data = segment.vector_data.get(vector_name).ok_or(
-                        OperationError::VectorNameNotExists {
-                            received_name: vector_name.to_string(),
-                        },
-                    )?;
-                    let mut vector_storage = vector_data.vector_storage.borrow_mut();
-                    let is_deleted = vector_storage.delete_vector(internal_id)?;
-                    Ok((is_deleted, Some(internal_id)))
-                })
-            }
-        }
-    }
-
-    fn set_full_payload(
-        &mut self,
-        op_num: SeqNumberType,
-        point_id: PointIdType,
-        full_payload: &Payload,
-    ) -> OperationResult<bool> {
-        let internal_id = self.id_tracker.borrow().internal_id(point_id);
-        self.handle_version_and_failure(op_num, internal_id, |segment| match internal_id {
-            Some(internal_id) => {
-                segment
-                    .payload_index
-                    .borrow_mut()
-                    .assign_all(internal_id, full_payload)?;
-                Ok((true, Some(internal_id)))
-            }
-            None => Err(OperationError::PointIdError {
-                missed_point_id: point_id,
-            }),
-        })
-    }
-
-    fn set_payload(
-        &mut self,
-        op_num: SeqNumberType,
-        point_id: PointIdType,
-        payload: &Payload,
-    ) -> OperationResult<bool> {
-        let internal_id = self.id_tracker.borrow().internal_id(point_id);
-        self.handle_version_and_failure(op_num, internal_id, |segment| match internal_id {
-            Some(internal_id) => {
-                segment
-                    .payload_index
-                    .borrow_mut()
-                    .assign(internal_id, payload)?;
-                Ok((true, Some(internal_id)))
-            }
-            None => Err(OperationError::PointIdError {
-                missed_point_id: point_id,
-            }),
-        })
-    }
-
-    fn delete_payload(
-        &mut self,
-        op_num: SeqNumberType,
-        point_id: PointIdType,
-        key: PayloadKeyTypeRef,
-    ) -> OperationResult<bool> {
-        let internal_id = self.id_tracker.borrow().internal_id(point_id);
-        self.handle_version_and_failure(op_num, internal_id, |segment| match internal_id {
-            Some(internal_id) => {
-                segment
-                    .payload_index
-                    .borrow_mut()
-                    .delete(internal_id, key)?;
-                Ok((true, Some(internal_id)))
-            }
-            None => Err(OperationError::PointIdError {
-                missed_point_id: point_id,
-            }),
-        })
-    }
-
-    fn clear_payload(
-        &mut self,
-        op_num: SeqNumberType,
-        point_id: PointIdType,
-    ) -> OperationResult<bool> {
-        let internal_id = self.id_tracker.borrow().internal_id(point_id);
-        self.handle_version_and_failure(op_num, internal_id, |segment| match internal_id {
-            Some(internal_id) => {
-                segment.payload_index.borrow_mut().drop(internal_id)?;
-                Ok((true, Some(internal_id)))
-            }
-            None => Err(OperationError::PointIdError {
-                missed_point_id: point_id,
-            }),
-        })
-    }
-
-    fn vector(
-        &self,
-        vector_name: &str,
-        point_id: PointIdType,
-    ) -> OperationResult<Option<Vec<VectorElementType>>> {
-        check_vector_name(vector_name, &self.segment_config)?;
-        let internal_id = self.lookup_internal_id(point_id)?;
-        let vector_opt = self.vector_by_offset(vector_name, internal_id)?;
-        Ok(vector_opt)
-    }
-
-    fn all_vectors(&self, point_id: PointIdType) -> OperationResult<NamedVectors> {
-        let mut result = NamedVectors::default();
-        for vector_name in self.vector_data.keys() {
-            if let Some(vec) = self.vector(vector_name, point_id)? {
-                result.insert(vector_name.clone(), vec);
-            }
-        }
-        Ok(result)
-    }
-
-    fn payload(&self, point_id: PointIdType) -> OperationResult<Payload> {
-        let internal_id = self.lookup_internal_id(point_id)?;
-        self.payload_by_offset(internal_id)
-    }
-
-    fn iter_points(&self) -> Box<dyn Iterator<Item = PointIdType> + '_> {
-        // Sorry for that, but I didn't find any way easier.
-        // If you try simply return iterator - it won't work because AtomicRef should exist
-        // If you try to make callback instead - you won't be able to create <dyn SegmentEntry>
-        // Attempt to create return borrowed value along with iterator failed because of insane lifetimes
-        unsafe { self.id_tracker.as_ptr().as_ref().unwrap().iter_external() }
-    }
-
-    fn read_filtered<'a>(
-        &'a self,
-        offset: Option<PointIdType>,
-        limit: Option<usize>,
-        filter: Option<&'a Filter>,
-    ) -> Vec<PointIdType> {
-        match filter {
-            None => self
-                .id_tracker
-                .borrow()
-                .iter_from(offset)
-                .map(|x| x.0)
-                .take(limit.unwrap_or(usize::MAX))
-                .collect(),
-            Some(condition) => {
-                let query_cardinality = {
-                    let payload_index = self.payload_index.borrow();
-                    payload_index.estimate_cardinality(condition)
-                };
-
-                // ToDo: Add telemetry for this heuristics
-
-                // Calculate expected number of condition checks required for
-                // this scroll request with is stream strategy.
-                // Example:
-                //  - cardinality = 1000
-                //  - limit = 10
-                //  - total = 10000
-                //  - point filter prob = 1000 / 10000 = 0.1
-                //  - expected_checks = 10 / 0.1  = 100
-                //  -------------------------------
-                //  - cardinality = 10
-                //  - limit = 10
-                //  - total = 10000
-                //  - point filter prob = 10 / 10000 = 0.001
-                //  - expected_checks = 10 / 0.001  = 10000
-
-                let available_points = self.available_point_count() + 1 /* + 1 for division-by-zero */;
-                // Expected number of successful checks per point
-                let check_probability = (query_cardinality.exp as f64 + 1.0/* protect from zero */)
-                    / available_points as f64;
-                let exp_stream_checks =
-                    (limit.unwrap_or(available_points) as f64 / check_probability) as usize;
-
-                // Assume it would require about `query cardinality` checks.
-                // We are interested in approximate number of checks, so we can
-                // use `query cardinality` as a starting point.
-                let exp_index_checks = query_cardinality.max;
-
-                if exp_stream_checks > exp_index_checks {
-                    self.filtered_read_by_index(offset, limit, condition)
-                } else {
-                    self.filtered_read_by_id_stream(offset, limit, condition)
-                }
-            }
-        }
-    }
-
-    fn read_range(&self, from: Option<PointIdType>, to: Option<PointIdType>) -> Vec<PointIdType> {
-        let id_tracker = self.id_tracker.borrow();
-        let iterator = id_tracker.iter_from(from).map(|x| x.0);
-        match to {
-            None => iterator.collect(),
-            Some(to_id) => iterator.take_while(|x| *x < to_id).collect(),
-        }
-    }
-
-    fn has_point(&self, point_id: PointIdType) -> bool {
-        self.id_tracker.borrow().internal_id(point_id).is_some()
-    }
-
-    fn available_point_count(&self) -> usize {
-        self.id_tracker.borrow().available_point_count()
-    }
-
-    fn deleted_point_count(&self) -> usize {
-        self.id_tracker.borrow().deleted_point_count()
-    }
-
-    fn estimate_point_count<'a>(&'a self, filter: Option<&'a Filter>) -> CardinalityEstimation {
-        match filter {
-            None => {
-                let available = self.available_point_count();
-                CardinalityEstimation {
-                    primary_clauses: vec![],
-                    min: available,
-                    exp: available,
-                    max: available,
-                }
-            }
-            Some(filter) => {
-                let payload_index = self.payload_index.borrow();
-                payload_index.estimate_cardinality(filter)
-            }
-        }
-    }
-
-    fn segment_type(&self) -> SegmentType {
-        self.segment_type
-    }
-
-    fn info(&self) -> SegmentInfo {
-        let payload_index = self.payload_index.borrow();
-        let schema = payload_index
-            .indexed_fields()
-            .into_iter()
-            .map(|(key, index_schema)| {
-                let points_count = payload_index.indexed_points(&key);
-                (key, PayloadIndexInfo::new(index_schema, points_count))
-            })
-            .collect();
-        let num_vectors = self
-            .vector_data
-            .values()
-            .map(|data| data.vector_storage.borrow().available_vector_count())
-            .sum();
-
-        SegmentInfo {
-            segment_type: self.segment_type,
-            num_vectors,
-            num_points: self.available_point_count(),
-            num_deleted_vectors: self.deleted_point_count(),
-            ram_usage_bytes: 0,  // ToDo: Implement
-            disk_usage_bytes: 0, // ToDo: Implement
-            is_appendable: self.appendable_flag,
-            index_schema: schema,
-        }
-    }
-
-    fn config(&self) -> SegmentConfig {
-        self.segment_config.clone()
-    }
-
-    fn is_appendable(&self) -> bool {
-        self.appendable_flag
-    }
-
-    fn flush(&self, sync: bool) -> OperationResult<SeqNumberType> {
-        let current_persisted_version: Option<SeqNumberType> = *self.persisted_version.lock();
-        if !sync && self.is_background_flushing() {
-            return Ok(current_persisted_version.unwrap_or(0));
-        }
-
-        let mut background_flush_lock = self.lock_flushing()?;
-        match (self.version, current_persisted_version) {
-            (None, _) => {
-                // Segment is empty, nothing to flush
-                return Ok(current_persisted_version.unwrap_or(0));
-            }
-            (Some(version), Some(persisted_version)) => {
-                if version == persisted_version {
-                    // Segment is already flushed
-                    return Ok(persisted_version);
-                }
-            }
-            (_, _) => {}
-        }
-
-        let vector_storage_flushers: Vec<_> = self
-            .vector_data
-            .values()
-            .map(|v| v.vector_storage.borrow().flusher())
-            .collect();
-        let state = self.get_state();
-        let current_path = self.current_path.clone();
-        let id_tracker_mapping_flusher = self.id_tracker.borrow().mapping_flusher();
-        let payload_index_flusher = self.payload_index.borrow().flusher();
-        let id_tracker_versions_flusher = self.id_tracker.borrow().versions_flusher();
-        let persisted_version = self.persisted_version.clone();
-
-        // Flush order is important:
-        //
-        // 1. Flush id mapping. So during recovery the point will be recovered er in proper segment.
-        // 2. Flush vectors and payloads.
-        // 3. Flush id versions last. So presence of version indicates that all other data is up-to-date.
-        //
-        // Example of recovery from WAL in case of partial flush:
-        //
-        // In-memory state:
-        //
-        //     Segment 1                  Segment 2
-        //
-        //    ID-mapping     vst.1       ID-mapping     vst.2
-        //   ext     int
-        //  ┌───┐   ┌───┐   ┌───┐       ┌───┐   ┌───┐   ┌───┐
-        //  │100├───┤1  │   │1  │       │300├───┤1  │   │1  │
-        //  └───┘   └───┘   │2  │       └───┘   └───┘   │2  │
-        //                  │   │                       │   │
-        //  ┌───┐   ┌───┐   │   │       ┌───┐   ┌───┐   │   │
-        //  │200├───┤2  │   │   │       │400├───┤2  │   │   │
-        //  └───┘   └───┘   └───┘       └───┘   └───┘   └───┘
-        //
-        //
-        //  ext - external id
-        //  int - internal id
-        //  vst - vector storage
-        //
-        //  ─────────────────────────────────────────────────
-        //   After flush, segments could be partially preserved:
-        //
-        //  ┌───┐   ┌───┐   ┌───┐       ┌───┐   ┌───┐   ┌───┐
-        //  │100├───┤1  │   │ 1 │       │300├───┤1  │   │ * │
-        //  └───┘   └───┘   │   │       └───┘   └───┘   │ * │
-        //                  │   │                       │ 3 │
-        //                  │   │       ┌───┐   ┌───┐   │   │
-        //                  │   │       │400├───┤2  │   │   │
-        //                  └───┘       └───┘   └───┘   └───┘
-        //  WAL:      ▲
-        //            │                 ┌───┐   ┌───┐
-        //  100───────┘      ┌────────► │200├───┤3  │
-        //                   |          └───┘   └───┘
-        //  200──────────────┘
-        //
-        //  300
-        //
-        //  400
-
-        let flush_op = move || {
-            // Flush mapping first to prevent having orphan internal ids.
-            id_tracker_mapping_flusher().map_err(|err| {
-                OperationError::service_error(format!("Failed to flush id_tracker mapping: {err}"))
-            })?;
-            for vector_storage_flusher in vector_storage_flushers {
-                vector_storage_flusher().map_err(|err| {
-                    OperationError::service_error(format!("Failed to flush vector_storage: {err}"))
-                })?;
-            }
-            payload_index_flusher().map_err(|err| {
-                OperationError::service_error(format!("Failed to flush payload_index: {err}"))
-            })?;
-            // Id Tracker contains versions of points. We need to flush it after vector_storage and payload_index flush.
-            // This is because vector_storage and payload_index flush are not atomic.
-            // If payload or vector flush fails, we will be able to recover data from WAL.
-            // If Id Tracker flush fails, we are also able to recover data from WAL
-            //  by simply overriding data in vector and payload storages.
-            // Once versions are saved - points are considered persisted.
-            id_tracker_versions_flusher().map_err(|err| {
-                OperationError::service_error(format!("Failed to flush id_tracker versions: {err}"))
-            })?;
-            Self::save_state(&state, &current_path).map_err(|err| {
-                OperationError::service_error(format!("Failed to flush segment state: {err}"))
-            })?;
-            *persisted_version.lock() = state.version;
-
-            debug_assert!(state.version.is_some());
-            Ok(state.version.unwrap_or(0))
-        };
-
-        if sync {
-            flush_op()
-        } else {
-            *background_flush_lock = Some(
-                std::thread::Builder::new()
-                    .name("background_flush".to_string())
-                    .spawn(flush_op)
-                    .unwrap(),
-            );
-            Ok(current_persisted_version.unwrap_or(0))
-        }
-    }
-
-    fn drop_data(self) -> OperationResult<()> {
-        let current_path = self.current_path.clone();
-        drop(self);
-        let mut deleted_path = current_path.clone();
-        deleted_path.set_extension("deleted");
-        fs::rename(&current_path, &deleted_path)?;
-        fs::remove_dir_all(&deleted_path).map_err(|err| {
-            OperationError::service_error(format!(
-                "Can't remove segment data at {}, error: {}",
-                deleted_path.to_str().unwrap_or_default(),
-                err
-            ))
-        })
-    }
-
-    fn data_path(&self) -> PathBuf {
-        self.current_path.clone()
-    }
-
-    fn delete_field_index(&mut self, op_num: u64, key: PayloadKeyTypeRef) -> OperationResult<bool> {
-        self.handle_version_and_failure(op_num, None, |segment| {
-            segment.payload_index.borrow_mut().drop_index(key)?;
-            Ok((true, None))
-        })
-    }
-
-    fn create_field_index(
-        &mut self,
-        op_num: u64,
-        key: PayloadKeyTypeRef,
-        field_type: Option<&PayloadFieldSchema>,
-    ) -> OperationResult<bool> {
-        self.handle_version_and_failure(op_num, None, |segment| match field_type {
-            Some(schema) => {
-                segment
-                    .payload_index
-                    .borrow_mut()
-                    .set_indexed(key, schema.clone())?;
-                Ok((true, None))
-            }
-            None => match segment.infer_from_payload_data(key)? {
-                None => Err(TypeInferenceError {
-                    field_name: key.to_string(),
-                }),
-                Some(schema_type) => {
-                    segment
-                        .payload_index
-                        .borrow_mut()
-                        .set_indexed(key, schema_type.into())?;
-                    Ok((true, None))
-                }
-            },
-        })
-    }
-
-    fn get_indexed_fields(&self) -> HashMap<PayloadKeyType, PayloadFieldSchema> {
-        self.payload_index.borrow().indexed_fields()
-    }
-
-    fn check_error(&self) -> Option<SegmentFailedState> {
-        self.error_status.clone()
-    }
-
-    fn delete_filtered<'a>(
-        &'a mut self,
-        op_num: SeqNumberType,
-        filter: &'a Filter,
-    ) -> OperationResult<usize> {
-        let mut deleted_points = 0;
-        for point_id in self.read_filtered(None, None, Some(filter)) {
-            deleted_points += self.delete_point(op_num, point_id)? as usize;
-        }
-
-        Ok(deleted_points)
-    }
-
-    fn vector_dim(&self, vector_name: &str) -> OperationResult<usize> {
-        check_vector_name(vector_name, &self.segment_config)?;
-        let vector_data_config = &self.segment_config.vector_data[vector_name];
-        Ok(vector_data_config.size)
-    }
-
-    fn vector_dims(&self) -> HashMap<String, usize> {
-        self.segment_config
-            .vector_data
-            .iter()
-            .map(|(vector_name, vector_config)| (vector_name.clone(), vector_config.size))
-            .collect()
-    }
-
-    fn take_snapshot(
-        &self,
-        temp_path: &Path,
-        snapshot_dir_path: &Path,
-    ) -> OperationResult<PathBuf> {
-        log::debug!(
-            "Taking snapshot of segment {:?} into {:?}",
-            self.current_path,
-            snapshot_dir_path,
-        );
-
-        if !snapshot_dir_path.exists() {
-            return Err(OperationError::service_error(format!(
-                "the snapshot path {snapshot_dir_path:?} does not exist"
-            )));
-        }
-
-        if !snapshot_dir_path.is_dir() {
-            return Err(OperationError::service_error(format!(
-                "the snapshot path {snapshot_dir_path:?} is not a directory",
-            )));
-        }
-
-        // flush segment to capture latest state
-        self.flush(true)?;
-
-        let temp_path = temp_path.join(format!("snapshot-{}", Uuid::new_v4()));
-        let db_backup_path = temp_path.join(DB_BACKUP_PATH);
-        let payload_index_db_backup_path = temp_path.join(PAYLOAD_DB_BACKUP_PATH);
-
-        {
-            let db = self.database.read();
-            crate::rocksdb_backup::create(&db, &db_backup_path)?;
-        }
-
-        self.payload_index
-            .borrow()
-            .take_database_snapshot(&payload_index_db_backup_path)?;
-
-        let segment_id = self
-            .current_path
-            .file_stem()
-            .and_then(|f| f.to_str())
-            .unwrap();
-
-        let archive_path = snapshot_dir_path.join(format!("{segment_id}.tar"));
-
-        // If `archive_path` exists, we still want to overwrite it
-        let file = File::create(&archive_path).map_err(|err| {
-            OperationError::service_error(format!(
-                "failed to create segment snapshot archive {archive_path:?}: {err}"
-            ))
-        })?;
-
-        let mut builder = Builder::new(file);
-
-        builder
-            .append_dir_all(SNAPSHOT_PATH, &temp_path)
-            .map_err(|err| utils::tar::failed_to_append_error(&temp_path, err))?;
-
-        let files = Path::new(SNAPSHOT_PATH).join(SNAPSHOT_FILES_PATH);
-
-        for vector_data in self.vector_data.values() {
-            for file in vector_data.vector_index.borrow().files() {
-                utils::tar::append_file_relative_to_base(
-                    &mut builder,
-                    &self.current_path,
-                    &file,
-                    &files,
-                )?;
-            }
-
-            for file in vector_data.vector_storage.borrow().files() {
-                utils::tar::append_file_relative_to_base(
-                    &mut builder,
-                    &self.current_path,
-                    &file,
-                    &files,
-                )?;
-            }
-        }
-
-        for file in self.payload_index.borrow().files() {
-            utils::tar::append_file_relative_to_base(
-                &mut builder,
-                &self.current_path,
-                &file,
-                &files,
-            )?;
-        }
-
-        utils::tar::append_file(
-            &mut builder,
-            &self.current_path.join(SEGMENT_STATE_FILE),
-            &files.join(SEGMENT_STATE_FILE),
-        )?;
-
-        utils::tar::append_file(
-            &mut builder,
-            &self.current_path.join(VERSION_FILE),
-            &files.join(VERSION_FILE),
-        )?;
-
-        builder.finish()?;
-
-        // remove tmp directory in background
-        let _ = std::thread::spawn(move || {
-            let res = std::fs::remove_dir_all(&temp_path);
-            if let Err(err) = res {
-                log::error!(
-                    "Failed to remove tmp directory at {}: {:?}",
-                    temp_path.display(),
-                    err
-                );
-            }
-        });
-
-        Ok(archive_path)
-    }
-
-    fn get_telemetry_data(&self) -> SegmentTelemetry {
-        let vector_index_searches: Vec<_> = self
-            .vector_data
-            .iter()
-            .map(|(k, v)| {
-                let mut telemetry = v.vector_index.borrow().get_telemetry_data();
-                telemetry.index_name = Some(k.clone());
-                telemetry
-            })
-            .collect();
-
-        SegmentTelemetry {
-            info: self.info(),
-            config: self.config(),
-            vector_index_searches,
-            payload_field_indices: self.payload_index.borrow().get_telemetry_data(),
-        }
-    }
-}
-
-impl Drop for Segment {
-    fn drop(&mut self) {
-        let _lock = self.lock_flushing();
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use tempfile::Builder;
-
-    use super::*;
-    use crate::data_types::vectors::{only_default_vector, DEFAULT_VECTOR_NAME};
-    use crate::entry::entry_point::OperationError::PointIdError;
-    use crate::segment_constructor::{build_segment, load_segment};
-    use crate::types::{Distance, Indexes, SegmentConfig, VectorDataConfig, VectorStorageType};
-
-    // no longer valid since users are now allowed to store arbitrary json objects.
-    // TODO(gvelo): add tests for invalid payload types on indexed fields.
-    // #[test]
-    // fn test_set_invalid_payload_from_json() {
-    //     let data1 = r#"
-    //     {
-    //         "invalid_data"
-    //     }"#;
-    //     let data2 = r#"
-    //     {
-    //         "array": [1, "hello"],
-    //     }"#;
-    //
-    //     let dir = Builder::new().prefix("payload_dir").tempdir().unwrap();
-    //     let dim = 2;
-    //     let config = SegmentConfig {
-    //         vector_size: dim,
-    //         index: Indexes::Plain {},
-    //         payload_index: Some(PayloadIndexType::Plain),
-    //         storage_type: StorageType::InMemory,
-    //         distance: Distance::Dot,
-    //     };
-    //
-    //     let mut segment =
-    //         build_segment(dir.path(), &config, Arc::new(SchemaStorage::new())).unwrap();
-    //     segment.upsert_point(0, 0.into(), &[1.0, 1.0]).unwrap();
-    //
-    //     let result1 = segment.set_full_payload_with_json(0, 0.into(), &data1.to_string());
-    //     assert!(result1.is_err());
-    //
-    //     let result2 = segment.set_full_payload_with_json(0, 0.into(), &data2.to_string());
-    //     assert!(result2.is_err());
-    // }
-
-    #[test]
-    fn test_search_batch_equivalence_single() {
-        let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-        let dim = 4;
-        let config = SegmentConfig {
-            vector_data: HashMap::from([(
-                DEFAULT_VECTOR_NAME.to_owned(),
-                VectorDataConfig {
-                    size: dim,
-                    distance: Distance::Dot,
-                    storage_type: VectorStorageType::Memory,
-                    index: Indexes::Plain {},
-                    quantization_config: None,
-                },
-            )]),
-            payload_storage_type: Default::default(),
-        };
-        let mut segment = build_segment(dir.path(), &config, true).unwrap();
-
-        let vec4 = vec![1.1, 1.0, 0.0, 1.0];
-        segment
-            .upsert_point(100, 4.into(), only_default_vector(&vec4))
-            .unwrap();
-        let vec6 = vec![1.0, 1.0, 0.5, 1.0];
-        segment
-            .upsert_point(101, 6.into(), only_default_vector(&vec6))
-            .unwrap();
-        segment.delete_point(102, 1.into()).unwrap();
-
-        let query_vector = vec![1.0, 1.0, 1.0, 1.0];
-        let search_result = segment
-            .search(
-                DEFAULT_VECTOR_NAME,
-                &query_vector,
-                &WithPayload::default(),
-                &false.into(),
-                None,
-                10,
-                None,
-                &false.into(),
-            )
-            .unwrap();
-        eprintln!("search_result = {search_result:#?}");
-
-        let search_batch_result = segment
-            .search_batch(
-                DEFAULT_VECTOR_NAME,
-                &[&query_vector],
-                &WithPayload::default(),
-                &false.into(),
-                None,
-                10,
-                None,
-                &false.into(),
-            )
-            .unwrap();
-        eprintln!("search_batch_result = {search_batch_result:#?}");
-
-        assert!(!search_result.is_empty());
-        assert_eq!(search_result, search_batch_result[0].clone())
-    }
-
-    #[test]
-    fn test_from_filter_attributes() {
-        let data = r#"
-        {
-            "name": "John Doe",
-            "age": 43,
-            "metadata": {
-                "height": 50,
-                "width": 60
-            }
-        }"#;
-
-        let dir = Builder::new().prefix("payload_dir").tempdir().unwrap();
-        let dim = 2;
-        let config = SegmentConfig {
-            vector_data: HashMap::from([(
-                DEFAULT_VECTOR_NAME.to_owned(),
-                VectorDataConfig {
-                    size: dim,
-                    distance: Distance::Dot,
-                    storage_type: VectorStorageType::Memory,
-                    index: Indexes::Plain {},
-                    quantization_config: None,
-                },
-            )]),
-            payload_storage_type: Default::default(),
-        };
-
-        let mut segment = build_segment(dir.path(), &config, true).unwrap();
-        segment
-            .upsert_point(0, 0.into(), only_default_vector(&[1.0, 1.0]))
-            .unwrap();
-
-        let payload: Payload = serde_json::from_str(data).unwrap();
-
-        segment.set_full_payload(0, 0.into(), &payload).unwrap();
-
-        let filter_valid_str = r#"
-        {
-            "must": [
-                {
-                    "key": "metadata.height",
-                    "match": {
-                        "value": 50
-                    }
-                }
-            ]
-        }"#;
-
-        let filter_valid: Filter = serde_json::from_str(filter_valid_str).unwrap();
-        let filter_invalid_str = r#"
-        {
-            "must": [
-                {
-                    "key": "metadata.height",
-                    "match": {
-                        "value": 60
-                    }
-                }
-            ]
-        }"#;
-
-        let filter_invalid: Filter = serde_json::from_str(filter_invalid_str).unwrap();
-        let results_with_valid_filter = segment
-            .search(
-                DEFAULT_VECTOR_NAME,
-                &[1.0, 1.0],
-                &WithPayload::default(),
-                &false.into(),
-                Some(&filter_valid),
-                1,
-                None,
-                &false.into(),
-            )
-            .unwrap();
-        assert_eq!(results_with_valid_filter.len(), 1);
-        assert_eq!(results_with_valid_filter.first().unwrap().id, 0.into());
-        let results_with_invalid_filter = segment
-            .search(
-                DEFAULT_VECTOR_NAME,
-                &[1.0, 1.0],
-                &WithPayload::default(),
-                &false.into(),
-                Some(&filter_invalid),
-                1,
-                None,
-                &false.into(),
-            )
-            .unwrap();
-        assert!(results_with_invalid_filter.is_empty());
-    }
-
-    #[test]
-    fn test_snapshot() {
-        let data = r#"
-        {
-            "name": "John Doe",
-            "age": 43,
-            "metadata": {
-                "height": 50,
-                "width": 60
-            }
-        }"#;
-
-        let segment_base_dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-        let config = SegmentConfig {
-            vector_data: HashMap::from([(
-                DEFAULT_VECTOR_NAME.to_owned(),
-                VectorDataConfig {
-                    size: 2,
-                    distance: Distance::Dot,
-                    storage_type: VectorStorageType::Memory,
-                    index: Indexes::Plain {},
-                    quantization_config: None,
-                },
-            )]),
-            payload_storage_type: Default::default(),
-        };
-
-        let mut segment = build_segment(segment_base_dir.path(), &config, true).unwrap();
-
-        segment
-            .upsert_point(0, 0.into(), only_default_vector(&[1.0, 1.0]))
-            .unwrap();
-
-        segment
-            .set_full_payload(1, 0.into(), &serde_json::from_str(data).unwrap())
-            .unwrap();
-
-        let snapshot_dir = Builder::new().prefix("snapshot_dir").tempdir().unwrap();
-        let temp_dir = Builder::new().prefix("temp_dir").tempdir().unwrap();
-
-        // snapshotting!
-        let archive = segment
-            .take_snapshot(temp_dir.path(), snapshot_dir.path())
-            .unwrap();
-        let archive_extension = archive.extension().unwrap();
-        let archive_name = archive.file_name().unwrap().to_str().unwrap().to_string();
-
-        // correct file extension
-        assert_eq!(archive_extension, "tar");
-
-        // archive name contains segment id
-        let segment_id = segment
-            .current_path
-            .file_stem()
-            .and_then(|f| f.to_str())
-            .unwrap();
-        assert!(archive_name.starts_with(segment_id));
-
-        // restore snapshot
-        Segment::restore_snapshot(&archive, segment_id).unwrap();
-
-        let restored_segment = load_segment(&snapshot_dir.path().join(segment_id))
-            .unwrap()
-            .unwrap();
-
-        // validate restored snapshot is the same as original segment
-        assert_eq!(segment.vector_dims(), restored_segment.vector_dims());
-        assert_eq!(
-            segment.total_point_count(),
-            restored_segment.total_point_count(),
-        );
-        assert_eq!(
-            segment.available_point_count(),
-            restored_segment.available_point_count(),
-        );
-        assert_eq!(
-            segment.deleted_point_count(),
-            restored_segment.deleted_point_count(),
-        );
-
-        for id in segment.iter_points() {
-            let vectors = segment.all_vectors(id).unwrap();
-            let restored_vectors = restored_segment.all_vectors(id).unwrap();
-            assert_eq!(vectors, restored_vectors);
-
-            let payload = segment.payload(id).unwrap();
-            let restored_payload = restored_segment.payload(id).unwrap();
-            assert_eq!(payload, restored_payload);
-        }
-    }
-
-    #[test]
-    fn test_background_flush() {
-        let data = r#"
-        {
-            "name": "John Doe",
-            "age": 43,
-            "metadata": {
-                "height": 50,
-                "width": 60
-            }
-        }"#;
-
-        let segment_base_dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-        let config = SegmentConfig {
-            vector_data: HashMap::from([(
-                DEFAULT_VECTOR_NAME.to_owned(),
-                VectorDataConfig {
-                    size: 2,
-                    distance: Distance::Dot,
-                    storage_type: VectorStorageType::Memory,
-                    index: Indexes::Plain {},
-                    quantization_config: None,
-                },
-            )]),
-            payload_storage_type: Default::default(),
-        };
-
-        let mut segment = build_segment(segment_base_dir.path(), &config, true).unwrap();
-        segment
-            .upsert_point(0, 0.into(), only_default_vector(&[1.0, 1.0]))
-            .unwrap();
-
-        let payload: Payload = serde_json::from_str(data).unwrap();
-        segment.set_full_payload(0, 0.into(), &payload).unwrap();
-        segment.flush(false).unwrap();
-
-        // call flush second time to check that background flush finished successful
-        segment.flush(true).unwrap();
-    }
-
-    #[test]
-    fn test_check_consistency() {
-        let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-        let dim = 4;
-        let config = SegmentConfig {
-            vector_data: HashMap::from([(
-                DEFAULT_VECTOR_NAME.to_owned(),
-                VectorDataConfig {
-                    size: dim,
-                    distance: Distance::Dot,
-                    storage_type: VectorStorageType::Memory,
-                    index: Indexes::Plain {},
-                    quantization_config: None,
-                },
-            )]),
-            payload_storage_type: Default::default(),
-        };
-        let mut segment = build_segment(dir.path(), &config, true).unwrap();
-
-        let vec4 = vec![1.1, 1.0, 0.0, 1.0];
-        segment
-            .upsert_point(100, 4.into(), only_default_vector(&vec4))
-            .unwrap();
-        let vec6 = vec![1.0, 1.0, 0.5, 1.0];
-        segment
-            .upsert_point(101, 6.into(), only_default_vector(&vec6))
-            .unwrap();
-
-        // first pass on consistent data
-        segment.check_consistency_and_repair().unwrap();
-
-        let query_vector = vec![1.0, 1.0, 1.0, 1.0];
-        let search_result = segment
-            .search(
-                DEFAULT_VECTOR_NAME,
-                &query_vector,
-                &WithPayload::default(),
-                &false.into(),
-                None,
-                10,
-                None,
-                &false.into(),
-            )
-            .unwrap();
-
-        assert_eq!(search_result.len(), 2);
-        assert_eq!(search_result[0].id, 6.into());
-        assert_eq!(search_result[1].id, 4.into());
-
-        assert!(matches!(
-            segment.vector(DEFAULT_VECTOR_NAME, 6.into()),
-            Ok(_)
-        ));
-
-        let internal_id = segment.lookup_internal_id(6.into()).unwrap();
-
-        // make id_tracker inconsistent
-        segment.id_tracker.borrow_mut().drop(6.into()).unwrap();
-
-        let search_result = segment
-            .search(
-                DEFAULT_VECTOR_NAME,
-                &query_vector,
-                &WithPayload::default(),
-                &false.into(),
-                None,
-                10,
-                None,
-                &false.into(),
-            )
-            .unwrap();
-
-        // only one result because of inconsistent id_tracker
-        assert_eq!(search_result.len(), 1);
-        assert_eq!(search_result[0].id, 4.into());
-
-        // querying by external id is broken
-        assert!(
-            matches!(segment.vector(DEFAULT_VECTOR_NAME, 6.into()), Err(PointIdError {missed_point_id }) if missed_point_id == 6.into())
-        );
-
-        // but querying by internal id still works
-        matches!(
-            segment.vector_by_offset(DEFAULT_VECTOR_NAME, internal_id),
-            Ok(Some(_))
-        );
-
-        // fix segment's data
-        segment.check_consistency_and_repair().unwrap();
-
-        // querying by internal id now consistent
-        matches!(
-            segment.vector_by_offset(DEFAULT_VECTOR_NAME, internal_id),
-            Ok(None)
-        );
-    }
-
-    #[test]
-    fn test_point_vector_count() {
-        let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-        let dim = 1;
-        let config = SegmentConfig {
-            vector_data: HashMap::from([(
-                DEFAULT_VECTOR_NAME.to_owned(),
-                VectorDataConfig {
-                    size: dim,
-                    distance: Distance::Dot,
-                    storage_type: VectorStorageType::Memory,
-                    index: Indexes::Plain {},
-                    quantization_config: None,
-                },
-            )]),
-            payload_storage_type: Default::default(),
-        };
-        let mut segment = build_segment(dir.path(), &config, true).unwrap();
-
-        // Insert point ID 4 and 6, assert counts
-        segment
-            .upsert_point(100, 4.into(), only_default_vector(&[0.4]))
-            .unwrap();
-        segment
-            .upsert_point(101, 6.into(), only_default_vector(&[0.6]))
-            .unwrap();
-        let segment_info = segment.info();
-        assert_eq!(segment_info.num_points, 2);
-        assert_eq!(segment_info.num_vectors, 2);
-
-        // Delete non-existent point, counts should remain the same
-        segment.delete_point(102, 1.into()).unwrap();
-        let segment_info = segment.info();
-        assert_eq!(segment_info.num_points, 2);
-        assert_eq!(segment_info.num_vectors, 2);
-
-        // Delete point 4, counts should derease by 1
-        segment.delete_point(103, 4.into()).unwrap();
-        let segment_info = segment.info();
-        assert_eq!(segment_info.num_points, 1);
-        assert_eq!(segment_info.num_vectors, 1);
-
-        // Delete vector of point 6, vector count should now be zero
-        segment
-            .delete_vector(104, 6.into(), DEFAULT_VECTOR_NAME)
-            .unwrap();
-        let segment_info = segment.info();
-        assert_eq!(segment_info.num_points, 1);
-        assert_eq!(segment_info.num_vectors, 0);
-    }
-
-    #[test]
-    fn test_point_vector_count_multivec() {
-        let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-        let dim = 1;
-        let config = SegmentConfig {
-            vector_data: HashMap::from([
-                (
-                    "a".into(),
-                    VectorDataConfig {
-                        size: dim,
-                        distance: Distance::Dot,
-                        storage_type: VectorStorageType::Memory,
-                        index: Indexes::Plain {},
-                        quantization_config: None,
-                    },
-                ),
-                (
-                    "b".into(),
-                    VectorDataConfig {
-                        size: dim,
-                        distance: Distance::Dot,
-                        storage_type: VectorStorageType::Memory,
-                        index: Indexes::Plain {},
-                        quantization_config: None,
-                    },
-                ),
-            ]),
-            payload_storage_type: Default::default(),
-        };
-        let mut segment = build_segment(dir.path(), &config, true).unwrap();
-
-        // Insert point ID 4 and 6 fully, 8 and 10 partially, assert counts
-        segment
-            .upsert_point(
-                100,
-                4.into(),
-                NamedVectors::from([("a".into(), vec![0.4]), ("b".into(), vec![0.5])]),
-            )
-            .unwrap();
-        segment
-            .upsert_point(
-                101,
-                6.into(),
-                NamedVectors::from([("a".into(), vec![0.6]), ("b".into(), vec![0.7])]),
-            )
-            .unwrap();
-        segment
-            .upsert_point(102, 8.into(), NamedVectors::from([("a".into(), vec![0.0])]))
-            .unwrap();
-        segment
-            .upsert_point(
-                103,
-                10.into(),
-                NamedVectors::from([("b".into(), vec![1.0])]),
-            )
-            .unwrap();
-        let segment_info = segment.info();
-        assert_eq!(segment_info.num_points, 4);
-        assert_eq!(segment_info.num_vectors, 6);
-
-        // Delete non-existent point, counts should remain the same
-        segment.delete_point(104, 1.into()).unwrap();
-        let segment_info = segment.info();
-        assert_eq!(segment_info.num_points, 4);
-        assert_eq!(segment_info.num_vectors, 6);
-
-        // Delete point 4, counts should derease by 1
-        segment.delete_point(105, 4.into()).unwrap();
-        let segment_info = segment.info();
-        assert_eq!(segment_info.num_points, 3);
-        assert_eq!(segment_info.num_vectors, 4);
-
-        // Delete vector 'a' of point 6, vector count should decrease by 1
-        segment.delete_vector(106, 6.into(), "a").unwrap();
-        let segment_info = segment.info();
-        assert_eq!(segment_info.num_points, 3);
-        assert_eq!(segment_info.num_vectors, 3);
-
-        // Deleting it again shouldn't chain anything
-        segment.delete_vector(107, 6.into(), "a").unwrap();
-        let segment_info = segment.info();
-        assert_eq!(segment_info.num_points, 3);
-        assert_eq!(segment_info.num_vectors, 3);
-
-        // Replace vector 'a' for point 8, counts should remain the same
-        let internal_8 = segment.lookup_internal_id(8.into()).unwrap();
-        segment
-            .replace_all_vectors(internal_8, NamedVectors::from([("a".into(), vec![0.1])]))
-            .unwrap();
-        let segment_info = segment.info();
-        assert_eq!(segment_info.num_points, 3);
-        assert_eq!(segment_info.num_vectors, 3);
-
-        // Replace both vectors for point 8, adding a new vector
-        segment
-            .replace_all_vectors(
-                internal_8,
-                NamedVectors::from([("a".into(), vec![0.1]), ("b".into(), vec![0.1])]),
-            )
-            .unwrap();
-        let segment_info = segment.info();
-        assert_eq!(segment_info.num_points, 3);
-        assert_eq!(segment_info.num_vectors, 4);
-    }
-
-    /// Tests segment functions to ensure invalid requests do error
-    #[test]
-    fn test_vector_compatibility_checks() {
-        let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-        let config = SegmentConfig {
-            vector_data: HashMap::from([
-                (
-                    "a".into(),
-                    VectorDataConfig {
-                        size: 4,
-                        distance: Distance::Dot,
-                        storage_type: VectorStorageType::Memory,
-                        index: Indexes::Plain {},
-                        quantization_config: None,
-                    },
-                ),
-                (
-                    "b".into(),
-                    VectorDataConfig {
-                        size: 2,
-                        distance: Distance::Dot,
-                        storage_type: VectorStorageType::Memory,
-                        index: Indexes::Plain {},
-                        quantization_config: None,
-                    },
-                ),
-            ]),
-            payload_storage_type: Default::default(),
-        };
-        let mut segment = build_segment(dir.path(), &config, true).unwrap();
-
-        // Insert one point for a reference internal ID
-        let point_id = 4.into();
-        segment
-            .upsert_point(
-                100,
-                point_id,
-                NamedVectors::from([
-                    ("a".into(), vec![0.1, 0.2, 0.3, 0.4]),
-                    ("b".into(), vec![1.0, 0.9]),
-                ]),
-            )
-            .unwrap();
-        let internal_id = segment.lookup_internal_id(point_id).unwrap();
-
-        // A set of broken vectors
-        let wrong_vectors_single = vec![
-            // Incorrect dimensionality
-            ("a", vec![]),
-            ("a", vec![0.0, 1.0, 0.0]),
-            ("a", vec![0.0, 1.0, 0.0, 1.0, 0.0]),
-            ("b", vec![]),
-            ("b", vec![0.5]),
-            ("b", vec![0.0, 0.1, 0.2, 0.3]),
-            // Incorrect names
-            ("aa", vec![0.0, 0.1, 0.2, 0.3]),
-            ("bb", vec![0.0, 0.1]),
-        ];
-        let wrong_vectors_multi = vec![
-            // Incorrect dimensionality
-            NamedVectors::from_ref("a", &[]),
-            NamedVectors::from_ref("a", &[0.0, 1.0, 0.0]),
-            NamedVectors::from_ref("a", &[0.0, 1.0, 0.0, 1.0, 0.0]),
-            NamedVectors::from_ref("b", &[]),
-            NamedVectors::from_ref("b", &[0.5]),
-            NamedVectors::from_ref("b", &[0.0, 0.1, 0.2, 0.3]),
-            NamedVectors::from([
-                ("a".into(), vec![0.1, 0.2, 0.3]),
-                ("b".into(), vec![1.0, 0.9]),
-            ]),
-            NamedVectors::from([
-                ("a".into(), vec![0.1, 0.2, 0.3, 0.4]),
-                ("b".into(), vec![1.0, 0.9, 0.0]),
-            ]),
-            // Incorrect names
-            NamedVectors::from_ref("aa", &[0.0, 0.1, 0.2, 0.3]),
-            NamedVectors::from_ref("bb", &[0.0, 0.1]),
-            NamedVectors::from([
-                ("aa".into(), vec![0.1, 0.2, 0.3, 0.4]),
-                ("b".into(), vec![1.0, 0.9]),
-            ]),
-            NamedVectors::from([
-                ("a".into(), vec![0.1, 0.2, 0.3, 0.4]),
-                ("bb".into(), vec![1.0, 0.9]),
-            ]),
-        ];
-        let wrong_names = vec!["aa", "bb", ""];
-
-        for (vector_name, vector) in wrong_vectors_single.iter() {
-            check_vector(vector_name, vector, &config).err().unwrap();
-            segment
-                .search(
-                    vector_name,
-                    vector,
-                    &WithPayload {
-                        enable: false,
-                        payload_selector: None,
-                    },
-                    &WithVector::Bool(true),
-                    None,
-                    1,
-                    None,
-                    &false.into(),
-                )
-                .err()
-                .unwrap();
-            segment
-                .search_batch(
-                    vector_name,
-                    &[vector, vector],
-                    &WithPayload {
-                        enable: false,
-                        payload_selector: None,
-                    },
-                    &WithVector::Bool(true),
-                    None,
-                    1,
-                    None,
-                    &false.into(),
-                )
-                .err()
-                .unwrap();
-        }
-
-        for vectors in wrong_vectors_multi {
-            check_named_vectors(&vectors, &config).err().unwrap();
-            segment
-                .upsert_point(101, point_id, vectors.clone())
-                .err()
-                .unwrap();
-            segment
-                .update_vectors(internal_id, vectors.clone())
-                .err()
-                .unwrap();
-            segment
-                .insert_new_vectors(point_id, vectors.clone())
-                .err()
-                .unwrap();
-            segment
-                .replace_all_vectors(internal_id, vectors.clone())
-                .err()
-                .unwrap();
-        }
-
-        for wrong_name in wrong_names {
-            check_vector_name(wrong_name, &config).err().unwrap();
-            segment.vector(wrong_name, point_id).err().unwrap();
-            segment.vector_dim(wrong_name).err().unwrap();
-            segment
-                .delete_vector(101, point_id, wrong_name)
-                .err()
-                .unwrap();
-            segment.available_vector_count(wrong_name).err().unwrap();
-            segment
-                .vector_by_offset(wrong_name, internal_id)
-                .err()
-                .unwrap();
-        }
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/segment_constructor/mod.rs b/crates/qdrant/lib/segment/src/segment_constructor/mod.rs
deleted file mode 100644
index 8430f6f..0000000
--- a/crates/qdrant/lib/segment/src/segment_constructor/mod.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-pub mod segment_builder;
-mod segment_constructor_base;
-pub mod simple_segment_constructor;
-
-pub use segment_constructor_base::*;
diff --git a/crates/qdrant/lib/segment/src/segment_constructor/segment_builder.rs b/crates/qdrant/lib/segment/src/segment_constructor/segment_builder.rs
deleted file mode 100644
index a2b096d..0000000
--- a/crates/qdrant/lib/segment/src/segment_constructor/segment_builder.rs
+++ /dev/null
@@ -1,246 +0,0 @@
-use std::cmp;
-use std::collections::HashMap;
-use std::path::{Path, PathBuf};
-use std::sync::atomic::AtomicBool;
-
-use super::get_vector_storage_path;
-use crate::common::error_logging::LogError;
-use crate::entry::entry_point::{
-    check_process_stopped, OperationError, OperationResult, SegmentEntry,
-};
-use crate::index::hnsw_index::max_rayon_threads;
-use crate::index::{PayloadIndex, VectorIndex};
-use crate::segment::Segment;
-use crate::segment_constructor::{build_segment, load_segment};
-use crate::types::{Indexes, PayloadFieldSchema, PayloadKeyType, SegmentConfig};
-use crate::vector_storage::VectorStorage;
-
-/// Structure for constructing segment out of several other segments
-pub struct SegmentBuilder {
-    pub segment: Option<Segment>,
-    pub destination_path: PathBuf,
-    pub temp_path: PathBuf,
-    pub indexed_fields: HashMap<PayloadKeyType, PayloadFieldSchema>,
-}
-
-impl SegmentBuilder {
-    pub fn new(
-        segment_path: &Path,
-        temp_dir: &Path,
-        segment_config: &SegmentConfig,
-    ) -> OperationResult<Self> {
-        let segment = build_segment(temp_dir, segment_config, true)?;
-        let temp_path = segment.current_path.clone();
-
-        let destination_path = segment_path.join(temp_path.file_name().unwrap());
-
-        Ok(SegmentBuilder {
-            segment: Some(segment),
-            destination_path,
-            temp_path,
-            indexed_fields: Default::default(),
-        })
-    }
-
-    /// Update current segment builder with all (not deleted) vectors and payload form `other` segment
-    /// Perform index building at the end of update
-    ///
-    /// # Arguments
-    ///
-    /// * `other` - segment to add into construction
-    ///
-    /// # Result
-    ///
-    /// * `bool` - if `true` - data successfully added, if `false` - process was interrupted
-    ///
-    pub fn update_from(&mut self, other: &Segment, stopped: &AtomicBool) -> OperationResult<bool> {
-        let self_segment = match &mut self.segment {
-            Some(segment) => segment,
-            None => {
-                return Err(OperationError::service_error(
-                    "Segment building error: created segment not found",
-                ))
-            }
-        };
-        self_segment.version = Some(cmp::max(self_segment.version(), other.version()));
-
-        let other_id_tracker = other.id_tracker.borrow();
-        let other_vector_storages: HashMap<_, _> = other
-            .vector_data
-            .iter()
-            .map(|(vector_name, vector_data)| {
-                (vector_name.to_owned(), vector_data.vector_storage.borrow())
-            })
-            .collect();
-        let other_payload_index = other.payload_index.borrow();
-
-        let mut id_tracker = self_segment.id_tracker.borrow_mut();
-        let mut vector_storages: HashMap<_, _> = self_segment
-            .vector_data
-            .iter()
-            .map(|(vector_name, vector_data)| {
-                (
-                    vector_name.to_owned(),
-                    vector_data.vector_storage.borrow_mut(),
-                )
-            })
-            .collect();
-        let mut payload_index = self_segment.payload_index.borrow_mut();
-
-        if vector_storages.len() != other_vector_storages.len() {
-            return Err(OperationError::service_error(
-                format!("Self and other segments have different vector names count. Self count: {}, other count: {}", vector_storages.len(), other_vector_storages.len()),
-            ));
-        }
-
-        let mut new_internal_range = None;
-        for (vector_name, vector_storage) in &mut vector_storages {
-            check_process_stopped(stopped)?;
-            let other_vector_storage = other_vector_storages.get(vector_name).ok_or_else(|| {
-                OperationError::service_error(format!(
-                    "Cannot update from other segment because if missing vector name {vector_name}"
-                ))
-            })?;
-            let internal_range = vector_storage.update_from(
-                other_vector_storage,
-                &mut other_id_tracker.iter_ids(),
-                stopped,
-            )?;
-            match new_internal_range.clone() {
-                Some(new_internal_range) => {
-                    if new_internal_range != internal_range {
-                        return Err(OperationError::service_error(
-                            "Internal ids range mismatch between self segment vectors and other segment vectors",
-                        ));
-                    }
-                }
-                None => new_internal_range = Some(internal_range.clone()),
-            }
-        }
-
-        if let Some(new_internal_range) = new_internal_range {
-            let internal_id_iter = new_internal_range.zip(other_id_tracker.iter_ids());
-
-            for (new_internal_id, old_internal_id) in internal_id_iter {
-                check_process_stopped(stopped)?;
-
-                let external_id =
-                    if let Some(external_id) = other_id_tracker.external_id(old_internal_id) {
-                        external_id
-                    } else {
-                        log::warn!(
-                            "Cannot find external id for internal id {old_internal_id}, skipping"
-                        );
-                        continue;
-                    };
-                let other_version = other_id_tracker.internal_version(old_internal_id).unwrap();
-
-                match id_tracker.internal_id(external_id) {
-                    None => {
-                        // New point, just insert
-                        id_tracker.set_link(external_id, new_internal_id)?;
-                        id_tracker.set_internal_version(new_internal_id, other_version)?;
-                        payload_index.assign(
-                            new_internal_id,
-                            &other_payload_index.payload(old_internal_id)?,
-                        )?;
-                    }
-                    Some(existing_internal_id) => {
-                        // Point exists in both: newly constructed and old segments, so we need to merge them
-                        // Based on version
-                        let existing_version =
-                            id_tracker.internal_version(existing_internal_id).unwrap();
-                        let remove_id = if existing_version < other_version {
-                            // Other version is the newest, remove the existing one and replace
-                            id_tracker.drop(external_id)?;
-                            id_tracker.set_link(external_id, new_internal_id)?;
-                            id_tracker.set_internal_version(new_internal_id, other_version)?;
-                            payload_index.drop(existing_internal_id)?;
-                            payload_index.assign(
-                                new_internal_id,
-                                &other_payload_index.payload(old_internal_id)?,
-                            )?;
-                            existing_internal_id
-                        } else {
-                            // Old version is still good, do not move anything else
-                            // Mark newly added vector as removed
-                            new_internal_id
-                        };
-                        for vector_storage in vector_storages.values_mut() {
-                            vector_storage.delete_vector(remove_id)?;
-                        }
-                    }
-                }
-            }
-        }
-
-        for (field, payload_schema) in other.payload_index.borrow().indexed_fields() {
-            self.indexed_fields.insert(field, payload_schema);
-        }
-
-        Ok(true)
-    }
-
-    pub fn build(mut self, stopped: &AtomicBool) -> Result<Segment, OperationError> {
-        {
-            let mut segment = self.segment.take().ok_or(OperationError::service_error(
-                "Segment building error: created segment not found",
-            ))?;
-
-            for (field, payload_schema) in &self.indexed_fields {
-                segment.create_field_index(segment.version(), field, Some(payload_schema))?;
-                check_process_stopped(stopped)?;
-            }
-
-            Self::update_quantization(&segment, stopped)?;
-
-            for vector_data in segment.vector_data.values_mut() {
-                vector_data.vector_index.borrow_mut().build_index(stopped)?;
-            }
-
-            segment.flush(true)?;
-            drop(segment);
-            // Now segment is evicted from RAM
-        }
-
-        // Move fully constructed segment into collection directory and load back to RAM
-        std::fs::rename(&self.temp_path, &self.destination_path)
-            .describe("Moving segment data after optimization")?;
-
-        let loaded_segment = load_segment(&self.destination_path)?.ok_or_else(|| {
-            OperationError::service_error(format!(
-                "Segment loading error: {}",
-                self.destination_path.display()
-            ))
-        })?;
-        Ok(loaded_segment)
-    }
-
-    fn update_quantization(segment: &Segment, stopped: &AtomicBool) -> OperationResult<()> {
-        let config = segment.config();
-        for (vector_name, vector_data) in &segment.vector_data {
-            if let Some(quantization) = config.quantization_config(vector_name) {
-                let segment_path = segment.current_path.as_path();
-                check_process_stopped(stopped)?;
-
-                let vector_storage_path = get_vector_storage_path(segment_path, vector_name);
-                let max_threads = match segment
-                    .config()
-                    .vector_data
-                    .get(vector_name)
-                    .map(|config| &config.index)
-                {
-                    Some(Indexes::Hnsw(hnsw)) => max_rayon_threads(hnsw.max_indexing_threads),
-                    _ => 1,
-                };
-                vector_data.vector_storage.borrow_mut().quantize(
-                    &vector_storage_path,
-                    quantization,
-                    max_threads,
-                    stopped,
-                )?;
-            }
-        }
-        Ok(())
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/segment_constructor/segment_constructor_base.rs b/crates/qdrant/lib/segment/src/segment_constructor/segment_constructor_base.rs
deleted file mode 100644
index fc526ee..0000000
--- a/crates/qdrant/lib/segment/src/segment_constructor/segment_constructor_base.rs
+++ /dev/null
@@ -1,376 +0,0 @@
-use std::collections::HashMap;
-use std::fs::File;
-use std::io::Read;
-use std::path::{Path, PathBuf};
-use std::sync::Arc;
-
-use atomic_refcell::AtomicRefCell;
-use log::info;
-use parking_lot::Mutex;
-use semver::Version;
-use serde::Deserialize;
-use uuid::Uuid;
-
-use crate::common::rocksdb_wrapper::{open_db, DB_VECTOR_CF};
-use crate::common::version::StorageVersion;
-use crate::data_types::vectors::DEFAULT_VECTOR_NAME;
-use crate::entry::entry_point::{OperationError, OperationResult};
-use crate::id_tracker::simple_id_tracker::SimpleIdTracker;
-use crate::id_tracker::IdTracker;
-use crate::index::hnsw_index::graph_links::{GraphLinksMmap, GraphLinksRam};
-use crate::index::hnsw_index::hnsw::HNSWIndex;
-use crate::index::plain_payload_index::PlainIndex;
-use crate::index::struct_payload_index::StructPayloadIndex;
-use crate::index::VectorIndexEnum;
-use crate::payload_storage::on_disk_payload_storage::OnDiskPayloadStorage;
-use crate::payload_storage::simple_payload_storage::SimplePayloadStorage;
-use crate::segment::{Segment, SegmentVersion, VectorData, SEGMENT_STATE_FILE};
-use crate::types::{
-    Distance, Indexes, PayloadStorageType, SegmentConfig, SegmentState, SegmentType, SeqNumberType,
-    VectorStorageType,
-};
-use crate::vector_storage::appendable_mmap_vector_storage::open_appendable_memmap_vector_storage;
-use crate::vector_storage::memmap_vector_storage::open_memmap_vector_storage;
-use crate::vector_storage::simple_vector_storage::open_simple_vector_storage;
-use crate::vector_storage::VectorStorage;
-
-pub const PAYLOAD_INDEX_PATH: &str = "payload_index";
-pub const VECTOR_STORAGE_PATH: &str = "vector_storage";
-pub const VECTOR_INDEX_PATH: &str = "vector_index";
-
-fn sp<T>(t: T) -> Arc<AtomicRefCell<T>> {
-    Arc::new(AtomicRefCell::new(t))
-}
-
-fn get_vector_name_with_prefix(prefix: &str, vector_name: &str) -> String {
-    if !vector_name.is_empty() {
-        format!("{prefix}-{vector_name}")
-    } else {
-        prefix.to_owned()
-    }
-}
-
-pub fn get_vector_storage_path(segment_path: &Path, vector_name: &str) -> PathBuf {
-    segment_path.join(get_vector_name_with_prefix(
-        VECTOR_STORAGE_PATH,
-        vector_name,
-    ))
-}
-
-pub fn get_vector_index_path(segment_path: &Path, vector_name: &str) -> PathBuf {
-    segment_path.join(get_vector_name_with_prefix(VECTOR_INDEX_PATH, vector_name))
-}
-
-fn create_segment(
-    version: Option<SeqNumberType>,
-    segment_path: &Path,
-    config: &SegmentConfig,
-) -> OperationResult<Segment> {
-    let vector_db_names: Vec<String> = config
-        .vector_data
-        .keys()
-        .map(|vector_name| get_vector_name_with_prefix(DB_VECTOR_CF, vector_name))
-        .collect();
-    let database = open_db(segment_path, &vector_db_names)
-        .map_err(|err| OperationError::service_error(format!("RocksDB open error: {err}")))?;
-
-    let payload_storage = match config.payload_storage_type {
-        PayloadStorageType::InMemory => sp(SimplePayloadStorage::open(database.clone())?.into()),
-        PayloadStorageType::OnDisk => sp(OnDiskPayloadStorage::open(database.clone())?.into()),
-    };
-
-    let id_tracker = sp(SimpleIdTracker::open(database.clone())?);
-
-    let payload_index_path = segment_path.join(PAYLOAD_INDEX_PATH);
-    let payload_index: Arc<AtomicRefCell<StructPayloadIndex>> = sp(StructPayloadIndex::open(
-        payload_storage,
-        id_tracker.clone(),
-        &payload_index_path,
-    )?);
-
-    let mut vector_data = HashMap::new();
-    for (vector_name, vector_config) in &config.vector_data {
-        let vector_storage_path = get_vector_storage_path(segment_path, vector_name);
-        let vector_index_path = get_vector_index_path(segment_path, vector_name);
-
-        // Select suitable vector storage type based on configuration
-        let vector_storage = match vector_config.storage_type {
-            // In memory
-            VectorStorageType::Memory => {
-                let db_column_name = get_vector_name_with_prefix(DB_VECTOR_CF, vector_name);
-                open_simple_vector_storage(
-                    database.clone(),
-                    &db_column_name,
-                    vector_config.size,
-                    vector_config.distance,
-                )?
-            }
-            // Mmap on disk, not appendable
-            VectorStorageType::Mmap => open_memmap_vector_storage(
-                &vector_storage_path,
-                vector_config.size,
-                vector_config.distance,
-            )?,
-            // Chunked mmap on disk, appendable
-            VectorStorageType::ChunkedMmap => open_appendable_memmap_vector_storage(
-                &vector_storage_path,
-                vector_config.size,
-                vector_config.distance,
-            )?,
-        };
-
-        // Warn when number of points between ID tracker and storage differs
-        let point_count = id_tracker.borrow().total_point_count();
-        let vector_count = vector_storage.borrow().total_vector_count();
-        if vector_count != point_count {
-            log::debug!(
-                "Mismatch of point and vector counts ({point_count} != {vector_count}, storage: {})",
-                vector_storage_path.display(),
-            );
-        }
-
-        if config.quantization_config(vector_name).is_some() {
-            let quantized_data_path = vector_storage_path;
-            // Try to load quantization data from disk, if exists
-            // If not exists or it's a new segment, just ignore it
-            vector_storage
-                .borrow_mut()
-                .load_quantization(&quantized_data_path)?;
-        }
-
-        let vector_index: Arc<AtomicRefCell<VectorIndexEnum>> = match &vector_config.index {
-            Indexes::Plain {} => sp(VectorIndexEnum::Plain(PlainIndex::new(
-                id_tracker.clone(),
-                vector_storage.clone(),
-                payload_index.clone(),
-            ))),
-            Indexes::Hnsw(vector_hnsw_config) => sp(if vector_hnsw_config.on_disk == Some(true) {
-                VectorIndexEnum::HnswMmap(HNSWIndex::<GraphLinksMmap>::open(
-                    &vector_index_path,
-                    id_tracker.clone(),
-                    vector_storage.clone(),
-                    payload_index.clone(),
-                    vector_hnsw_config.clone(),
-                )?)
-            } else {
-                VectorIndexEnum::HnswRam(HNSWIndex::<GraphLinksRam>::open(
-                    &vector_index_path,
-                    id_tracker.clone(),
-                    vector_storage.clone(),
-                    payload_index.clone(),
-                    vector_hnsw_config.clone(),
-                )?)
-            }),
-        };
-
-        vector_data.insert(
-            vector_name.to_owned(),
-            VectorData {
-                vector_storage,
-                vector_index,
-            },
-        );
-    }
-
-    let segment_type = if config.is_any_vector_indexed() {
-        SegmentType::Indexed
-    } else {
-        SegmentType::Plain
-    };
-    let appendable_flag = vector_data.values().all(VectorData::is_appendable);
-
-    Ok(Segment {
-        version,
-        persisted_version: Arc::new(Mutex::new(version)),
-        current_path: segment_path.to_owned(),
-        id_tracker,
-        vector_data,
-        segment_type,
-        appendable_flag,
-        payload_index,
-        segment_config: config.clone(),
-        error_status: None,
-        database,
-        flush_thread: Mutex::new(None),
-    })
-}
-
-pub fn load_segment(path: &Path) -> OperationResult<Option<Segment>> {
-    if path
-        .extension()
-        .and_then(|ext| ext.to_str())
-        .map(|ext| ext == "deleted")
-        .unwrap_or(false)
-    {
-        log::warn!("Segment is marked as deleted, skipping: {}", path.display());
-        // Skip deleted segments
-        return Ok(None);
-    }
-
-    if !SegmentVersion::check_exists(path) {
-        // Assume segment was not properly saved.
-        // Server might have crashed before saving the segment fully.
-        log::warn!(
-            "Segment version file not found, skipping: {}",
-            path.display()
-        );
-        return Ok(None);
-    }
-
-    let stored_version: Version = SegmentVersion::load(path)?.parse()?;
-    let app_version: Version = SegmentVersion::current().parse()?;
-
-    if stored_version != app_version {
-        info!("Migrating segment {} -> {}", stored_version, app_version,);
-
-        if stored_version > app_version {
-            return Err(OperationError::service_error(format!(
-                "Data version {stored_version} is newer than application version {app_version}. \
-                Please upgrade the application. Compatibility is not guaranteed."
-            )));
-        }
-
-        if stored_version.major == 0 && stored_version.minor < 3 {
-            return Err(OperationError::service_error(format!(
-                "Segment version({stored_version}) is not compatible with current version({app_version})"
-            )));
-        }
-
-        if stored_version.major == 0 && stored_version.minor == 3 {
-            let segment_state = load_segment_state_v3(path)?;
-            Segment::save_state(&segment_state, path)?;
-        } else if stored_version.major == 0 && stored_version.minor <= 5 {
-            let segment_state = load_segment_state_v5(path)?;
-            Segment::save_state(&segment_state, path)?;
-        }
-
-        SegmentVersion::save(path)?
-    }
-
-    let segment_state = Segment::load_state(path)?;
-
-    let segment = create_segment(segment_state.version, path, &segment_state.config)?;
-
-    Ok(Some(segment))
-}
-
-/// Build segment instance using given configuration.
-/// Builder will generate folder for the segment and store all segment information inside it.
-///
-/// # Arguments
-///
-/// * `path` - A path to collection. Segment folder will be created in this directory
-/// * `config` - Segment configuration
-/// * `ready` - Whether the segment is ready after building; will save segment version
-///
-/// To load a segment, saving the segment version is required. If `ready` is false, the version
-/// will not be stored. Then the segment is skipped on restart when trying to load it again. In
-/// that case, the segment version must be stored manually to make it ready.
-pub fn build_segment(path: &Path, config: &SegmentConfig, ready: bool) -> OperationResult<Segment> {
-    let segment_path = path.join(Uuid::new_v4().to_string());
-
-    std::fs::create_dir_all(&segment_path)?;
-
-    let segment = create_segment(None, &segment_path, config)?;
-    segment.save_current_state()?;
-
-    // Version is the last file to save, as it will be used to check if segment was built correctly.
-    // If it is not saved, segment will be skipped.
-    if ready {
-        SegmentVersion::save(&segment_path)?;
-    }
-
-    Ok(segment)
-}
-
-/// Load v0.3.* segment data and migrate to current version
-#[allow(deprecated)]
-fn load_segment_state_v3(segment_path: &Path) -> OperationResult<SegmentState> {
-    use crate::compat::{SegmentConfigV5, StorageTypeV5, VectorDataConfigV5};
-
-    #[derive(Deserialize)]
-    #[serde(rename_all = "snake_case")]
-    #[deprecated]
-    pub struct SegmentStateV3 {
-        pub version: SeqNumberType,
-        pub config: SegmentConfigV3,
-    }
-
-    #[derive(Deserialize)]
-    #[serde(rename_all = "snake_case")]
-    #[deprecated]
-    pub struct SegmentConfigV3 {
-        /// Size of a vectors used
-        pub vector_size: usize,
-        /// Type of distance function used for measuring distance between vectors
-        pub distance: Distance,
-        /// Type of index used for search
-        pub index: Indexes,
-        /// Type of vector storage
-        pub storage_type: StorageTypeV5,
-        /// Defines payload storage type
-        #[serde(default)]
-        pub payload_storage_type: PayloadStorageType,
-    }
-
-    let path = segment_path.join(SEGMENT_STATE_FILE);
-
-    let mut contents = String::new();
-
-    let mut file = File::open(&path)?;
-    file.read_to_string(&mut contents)?;
-
-    serde_json::from_str::<SegmentStateV3>(&contents)
-        .map(|state| {
-            // Construct V5 version, then convert into current
-            let vector_data = VectorDataConfigV5 {
-                size: state.config.vector_size,
-                distance: state.config.distance,
-                hnsw_config: None,
-                quantization_config: None,
-                on_disk: None,
-            };
-            let segment_config = SegmentConfigV5 {
-                vector_data: HashMap::from([(DEFAULT_VECTOR_NAME.to_owned(), vector_data)]),
-                index: state.config.index,
-                storage_type: state.config.storage_type,
-                payload_storage_type: state.config.payload_storage_type,
-                quantization_config: None,
-            };
-
-            SegmentState {
-                version: Some(state.version),
-                config: segment_config.into(),
-            }
-        })
-        .map_err(|err| {
-            OperationError::service_error(format!(
-                "Failed to read segment {}. Error: {}",
-                path.to_str().unwrap(),
-                err
-            ))
-        })
-}
-
-/// Load v0.5.0 segment data and migrate to current version
-#[allow(deprecated)]
-fn load_segment_state_v5(segment_path: &Path) -> OperationResult<SegmentState> {
-    use crate::compat::SegmentStateV5;
-
-    let path = segment_path.join(SEGMENT_STATE_FILE);
-
-    let mut contents = String::new();
-
-    let mut file = File::open(&path)?;
-    file.read_to_string(&mut contents)?;
-
-    serde_json::from_str::<SegmentStateV5>(&contents)
-        .map(Into::into)
-        .map_err(|err| {
-            OperationError::service_error(format!(
-                "Failed to read segment {}. Error: {}",
-                path.to_str().unwrap(),
-                err
-            ))
-        })
-}
diff --git a/crates/qdrant/lib/segment/src/segment_constructor/simple_segment_constructor.rs b/crates/qdrant/lib/segment/src/segment_constructor/simple_segment_constructor.rs
deleted file mode 100644
index ebe210e..0000000
--- a/crates/qdrant/lib/segment/src/segment_constructor/simple_segment_constructor.rs
+++ /dev/null
@@ -1,189 +0,0 @@
-use std::collections::HashMap;
-use std::path::Path;
-
-use crate::data_types::vectors::DEFAULT_VECTOR_NAME;
-use crate::entry::entry_point::OperationResult;
-use crate::segment::Segment;
-use crate::segment_constructor::build_segment;
-use crate::types::{Distance, Indexes, SegmentConfig, VectorDataConfig, VectorStorageType};
-
-/// Build new segment with plain index in given directory
-///
-/// # Arguments
-///
-/// * `path` - path to collection\`s segment directory
-///
-pub fn build_simple_segment(
-    path: &Path,
-    dim: usize,
-    distance: Distance,
-) -> OperationResult<Segment> {
-    build_segment(
-        path,
-        &SegmentConfig {
-            vector_data: HashMap::from([(
-                DEFAULT_VECTOR_NAME.to_owned(),
-                VectorDataConfig {
-                    size: dim,
-                    distance,
-                    storage_type: VectorStorageType::Memory,
-                    index: Indexes::Plain {},
-                    quantization_config: None,
-                },
-            )]),
-            payload_storage_type: Default::default(),
-        },
-        true,
-    )
-}
-
-pub fn build_multivec_segment(
-    path: &Path,
-    dim1: usize,
-    dim2: usize,
-    distance: Distance,
-) -> OperationResult<Segment> {
-    let mut vectors_config = HashMap::new();
-    vectors_config.insert(
-        "vector1".to_owned(),
-        VectorDataConfig {
-            size: dim1,
-            distance,
-            storage_type: VectorStorageType::Memory,
-            index: Indexes::Plain {},
-            quantization_config: None,
-        },
-    );
-    vectors_config.insert(
-        "vector2".to_owned(),
-        VectorDataConfig {
-            size: dim2,
-            distance,
-            storage_type: VectorStorageType::Memory,
-            index: Indexes::Plain {},
-            quantization_config: None,
-        },
-    );
-
-    build_segment(
-        path,
-        &SegmentConfig {
-            vector_data: vectors_config,
-            payload_storage_type: Default::default(),
-        },
-        true,
-    )
-}
-
-#[cfg(test)]
-mod tests {
-    use serde_json::json;
-    use tempfile::Builder;
-
-    use super::*;
-    use crate::data_types::vectors::only_default_vector;
-    use crate::entry::entry_point::{OperationError, SegmentEntry};
-
-    #[test]
-    fn test_create_simple_segment() {
-        let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-        let segment = build_simple_segment(dir.path(), 100, Distance::Dot).unwrap();
-        eprintln!(" = {:?}", segment.version());
-    }
-
-    #[test]
-    fn test_add_and_search() {
-        let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-        let mut segment = build_simple_segment(dir.path(), 4, Distance::Dot).unwrap();
-
-        let wrong_vec = vec![1.0, 1.0, 1.0];
-
-        let vec1 = vec![1.0, 0.0, 1.0, 1.0];
-        let vec2 = vec![1.0, 0.0, 1.0, 0.0];
-        let vec3 = vec![1.0, 1.0, 1.0, 1.0];
-        let vec4 = vec![1.0, 1.0, 0.0, 1.0];
-        let vec5 = vec![1.0, 0.0, 0.0, 0.0];
-
-        match segment.upsert_point(1, 120.into(), only_default_vector(&wrong_vec)) {
-            Err(OperationError::WrongVector { .. }) => (),
-            Err(_) => panic!("Wrong error"),
-            Ok(_) => panic!("Operation with wrong vector should fail"),
-        };
-
-        segment
-            .upsert_point(2, 1.into(), only_default_vector(&vec1))
-            .unwrap();
-        segment
-            .upsert_point(2, 2.into(), only_default_vector(&vec2))
-            .unwrap();
-        segment
-            .upsert_point(2, 3.into(), only_default_vector(&vec3))
-            .unwrap();
-        segment
-            .upsert_point(2, 4.into(), only_default_vector(&vec4))
-            .unwrap();
-        segment
-            .upsert_point(2, 5.into(), only_default_vector(&vec5))
-            .unwrap();
-
-        segment
-            .set_payload(
-                3,
-                1.into(),
-                &json!({ "color": vec!["red".to_owned(), "green".to_owned()] }).into(),
-            )
-            .unwrap();
-
-        segment
-            .set_payload(
-                3,
-                2.into(),
-                &json!({ "color": vec!["red".to_owned(), "blue".to_owned()] }).into(),
-            )
-            .unwrap();
-
-        segment
-            .set_payload(
-                3,
-                3.into(),
-                &json!({ "color": vec!["red".to_owned(), "yellow".to_owned()] }).into(),
-            )
-            .unwrap();
-
-        segment
-            .set_payload(
-                3,
-                4.into(),
-                &json!({ "color": vec!["red".to_owned(), "green".to_owned()] }).into(),
-            )
-            .unwrap();
-
-        // Replace vectors
-        segment
-            .upsert_point(4, 1.into(), only_default_vector(&vec1))
-            .unwrap();
-        segment
-            .upsert_point(5, 2.into(), only_default_vector(&vec2))
-            .unwrap();
-        segment
-            .upsert_point(6, 3.into(), only_default_vector(&vec3))
-            .unwrap();
-        segment
-            .upsert_point(7, 4.into(), only_default_vector(&vec4))
-            .unwrap();
-        segment
-            .upsert_point(8, 5.into(), only_default_vector(&vec5))
-            .unwrap();
-
-        assert_eq!(segment.version(), 8);
-
-        let declined = segment
-            .upsert_point(3, 5.into(), only_default_vector(&vec5))
-            .unwrap();
-
-        // Should not be processed due to operation number
-        assert!(!declined);
-    }
-
-    // ToDo: More tests
-}
diff --git a/crates/qdrant/lib/segment/src/spaces/metric.rs b/crates/qdrant/lib/segment/src/spaces/metric.rs
deleted file mode 100644
index 2518f89..0000000
--- a/crates/qdrant/lib/segment/src/spaces/metric.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-use crate::data_types::vectors::VectorElementType;
-use crate::types::{Distance, ScoreType};
-
-/// Defines how to compare vectors
-pub trait Metric {
-    fn distance() -> Distance;
-
-    /// Greater the value - closer the vectors
-    fn similarity(v1: &[VectorElementType], v2: &[VectorElementType]) -> ScoreType;
-
-    /// Necessary vector transformations performed before adding it to the collection (like normalization)
-    /// Return None if metric does not required preprocessing
-    fn preprocess(vector: &[VectorElementType]) -> Option<Vec<VectorElementType>>;
-
-    /// correct metric score for displaying
-    fn postprocess(score: ScoreType) -> ScoreType;
-}
diff --git a/crates/qdrant/lib/segment/src/spaces/mod.rs b/crates/qdrant/lib/segment/src/spaces/mod.rs
deleted file mode 100644
index 85e0a21..0000000
--- a/crates/qdrant/lib/segment/src/spaces/mod.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-pub mod metric;
-pub mod simple;
-pub mod tools;
-
-#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-pub mod simple_sse;
-
-#[cfg(target_arch = "x86_64")]
-pub mod simple_avx;
-
-#[cfg(target_arch = "aarch64")]
-pub mod simple_neon;
diff --git a/crates/qdrant/lib/segment/src/spaces/simple.rs b/crates/qdrant/lib/segment/src/spaces/simple.rs
deleted file mode 100644
index 578bb1c..0000000
--- a/crates/qdrant/lib/segment/src/spaces/simple.rs
+++ /dev/null
@@ -1,213 +0,0 @@
-use super::metric::Metric;
-#[cfg(target_arch = "x86_64")]
-use super::simple_avx::*;
-#[cfg(all(target_arch = "aarch64", target_feature = "neon"))]
-use super::simple_neon::*;
-#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-use super::simple_sse::*;
-use crate::data_types::vectors::VectorElementType;
-use crate::types::{Distance, ScoreType};
-
-#[cfg(target_arch = "x86_64")]
-const MIN_DIM_SIZE_AVX: usize = 32;
-
-#[cfg(any(
-    target_arch = "x86",
-    target_arch = "x86_64",
-    all(target_arch = "aarch64", target_feature = "neon")
-))]
-const MIN_DIM_SIZE_SIMD: usize = 16;
-
-#[derive(Clone)]
-pub struct DotProductMetric {}
-
-#[derive(Clone)]
-pub struct CosineMetric {}
-
-#[derive(Clone)]
-pub struct EuclidMetric {}
-
-impl Metric for EuclidMetric {
-    fn distance() -> Distance {
-        Distance::Euclid
-    }
-
-    fn similarity(v1: &[VectorElementType], v2: &[VectorElementType]) -> ScoreType {
-        #[cfg(target_arch = "x86_64")]
-        {
-            if is_x86_feature_detected!("avx")
-                && is_x86_feature_detected!("fma")
-                && v1.len() >= MIN_DIM_SIZE_AVX
-            {
-                return unsafe { euclid_similarity_avx(v1, v2) };
-            }
-        }
-
-        #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-        {
-            if is_x86_feature_detected!("sse") && v1.len() >= MIN_DIM_SIZE_SIMD {
-                return unsafe { euclid_similarity_sse(v1, v2) };
-            }
-        }
-
-        #[cfg(all(target_arch = "aarch64", target_feature = "neon"))]
-        {
-            if std::arch::is_aarch64_feature_detected!("neon") && v1.len() >= MIN_DIM_SIZE_SIMD {
-                return unsafe { euclid_similarity_neon(v1, v2) };
-            }
-        }
-
-        euclid_similarity(v1, v2)
-    }
-
-    fn preprocess(_vector: &[VectorElementType]) -> Option<Vec<VectorElementType>> {
-        None
-    }
-
-    fn postprocess(score: ScoreType) -> ScoreType {
-        score.abs().sqrt()
-    }
-}
-
-impl Metric for DotProductMetric {
-    fn distance() -> Distance {
-        Distance::Dot
-    }
-
-    fn similarity(v1: &[VectorElementType], v2: &[VectorElementType]) -> ScoreType {
-        #[cfg(target_arch = "x86_64")]
-        {
-            if is_x86_feature_detected!("avx")
-                && is_x86_feature_detected!("fma")
-                && v1.len() >= MIN_DIM_SIZE_AVX
-            {
-                return unsafe { dot_similarity_avx(v1, v2) };
-            }
-        }
-
-        #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-        {
-            if is_x86_feature_detected!("sse") && v1.len() >= MIN_DIM_SIZE_SIMD {
-                return unsafe { dot_similarity_sse(v1, v2) };
-            }
-        }
-
-        #[cfg(all(target_arch = "aarch64", target_feature = "neon"))]
-        {
-            if std::arch::is_aarch64_feature_detected!("neon") && v1.len() >= MIN_DIM_SIZE_SIMD {
-                return unsafe { dot_similarity_neon(v1, v2) };
-            }
-        }
-
-        dot_similarity(v1, v2)
-    }
-
-    fn preprocess(_vector: &[VectorElementType]) -> Option<Vec<VectorElementType>> {
-        None
-    }
-
-    fn postprocess(score: ScoreType) -> ScoreType {
-        score
-    }
-}
-
-impl Metric for CosineMetric {
-    fn distance() -> Distance {
-        Distance::Cosine
-    }
-
-    fn similarity(v1: &[VectorElementType], v2: &[VectorElementType]) -> ScoreType {
-        #[cfg(target_arch = "x86_64")]
-        {
-            if is_x86_feature_detected!("avx")
-                && is_x86_feature_detected!("fma")
-                && v1.len() >= MIN_DIM_SIZE_AVX
-            {
-                return unsafe { dot_similarity_avx(v1, v2) };
-            }
-        }
-
-        #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-        {
-            if is_x86_feature_detected!("sse") && v1.len() >= MIN_DIM_SIZE_SIMD {
-                return unsafe { dot_similarity_sse(v1, v2) };
-            }
-        }
-
-        #[cfg(all(target_arch = "aarch64", target_feature = "neon"))]
-        {
-            if std::arch::is_aarch64_feature_detected!("neon") && v1.len() >= MIN_DIM_SIZE_SIMD {
-                return unsafe { dot_similarity_neon(v1, v2) };
-            }
-        }
-
-        dot_similarity(v1, v2)
-    }
-
-    fn preprocess(vector: &[VectorElementType]) -> Option<Vec<VectorElementType>> {
-        #[cfg(target_arch = "x86_64")]
-        {
-            if is_x86_feature_detected!("avx")
-                && is_x86_feature_detected!("fma")
-                && vector.len() >= MIN_DIM_SIZE_AVX
-            {
-                return unsafe { cosine_preprocess_avx(vector) };
-            }
-        }
-
-        #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-        {
-            if is_x86_feature_detected!("sse") && vector.len() >= MIN_DIM_SIZE_SIMD {
-                return unsafe { cosine_preprocess_sse(vector) };
-            }
-        }
-
-        #[cfg(all(target_arch = "aarch64", target_feature = "neon"))]
-        {
-            if std::arch::is_aarch64_feature_detected!("neon") && vector.len() >= MIN_DIM_SIZE_SIMD
-            {
-                return unsafe { cosine_preprocess_neon(vector) };
-            }
-        }
-
-        cosine_preprocess(vector)
-    }
-
-    fn postprocess(score: ScoreType) -> ScoreType {
-        score
-    }
-}
-
-pub fn euclid_similarity(v1: &[VectorElementType], v2: &[VectorElementType]) -> ScoreType {
-    let s: ScoreType = v1
-        .iter()
-        .copied()
-        .zip(v2.iter().copied())
-        .map(|(a, b)| (a - b).powi(2))
-        .sum();
-    -s
-}
-
-pub fn cosine_preprocess(vector: &[VectorElementType]) -> Option<Vec<VectorElementType>> {
-    let mut length: f32 = vector.iter().map(|x| x * x).sum();
-    if length < f32::EPSILON {
-        return None;
-    }
-    length = length.sqrt();
-    Some(vector.iter().map(|x| x / length).collect())
-}
-
-pub fn dot_similarity(v1: &[VectorElementType], v2: &[VectorElementType]) -> ScoreType {
-    v1.iter().zip(v2).map(|(a, b)| a * b).sum()
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_cosine_preprocessing() {
-        let res = CosineMetric::preprocess(&[0.0, 0.0, 0.0, 0.0]);
-        assert!(res.is_none());
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/spaces/simple_avx.rs b/crates/qdrant/lib/segment/src/spaces/simple_avx.rs
deleted file mode 100644
index 6c18047..0000000
--- a/crates/qdrant/lib/segment/src/spaces/simple_avx.rs
+++ /dev/null
@@ -1,193 +0,0 @@
-use std::arch::x86_64::*;
-
-use crate::data_types::vectors::VectorElementType;
-use crate::types::ScoreType;
-
-#[target_feature(enable = "avx")]
-#[target_feature(enable = "fma")]
-unsafe fn hsum256_ps_avx(x: __m256) -> f32 {
-    let x128: __m128 = _mm_add_ps(_mm256_extractf128_ps(x, 1), _mm256_castps256_ps128(x));
-    let x64: __m128 = _mm_add_ps(x128, _mm_movehl_ps(x128, x128));
-    let x32: __m128 = _mm_add_ss(x64, _mm_shuffle_ps(x64, x64, 0x55));
-    _mm_cvtss_f32(x32)
-}
-
-#[target_feature(enable = "avx")]
-#[target_feature(enable = "fma")]
-pub(crate) unsafe fn euclid_similarity_avx(
-    v1: &[VectorElementType],
-    v2: &[VectorElementType],
-) -> ScoreType {
-    let n = v1.len();
-    let m = n - (n % 32);
-    let mut ptr1: *const f32 = v1.as_ptr();
-    let mut ptr2: *const f32 = v2.as_ptr();
-    let mut sum256_1: __m256 = _mm256_setzero_ps();
-    let mut sum256_2: __m256 = _mm256_setzero_ps();
-    let mut sum256_3: __m256 = _mm256_setzero_ps();
-    let mut sum256_4: __m256 = _mm256_setzero_ps();
-    let mut i: usize = 0;
-    while i < m {
-        let sub256_1: __m256 =
-            _mm256_sub_ps(_mm256_loadu_ps(ptr1.add(0)), _mm256_loadu_ps(ptr2.add(0)));
-        sum256_1 = _mm256_fmadd_ps(sub256_1, sub256_1, sum256_1);
-
-        let sub256_2: __m256 =
-            _mm256_sub_ps(_mm256_loadu_ps(ptr1.add(8)), _mm256_loadu_ps(ptr2.add(8)));
-        sum256_2 = _mm256_fmadd_ps(sub256_2, sub256_2, sum256_2);
-
-        let sub256_3: __m256 =
-            _mm256_sub_ps(_mm256_loadu_ps(ptr1.add(16)), _mm256_loadu_ps(ptr2.add(16)));
-        sum256_3 = _mm256_fmadd_ps(sub256_3, sub256_3, sum256_3);
-
-        let sub256_4: __m256 =
-            _mm256_sub_ps(_mm256_loadu_ps(ptr1.add(24)), _mm256_loadu_ps(ptr2.add(24)));
-        sum256_4 = _mm256_fmadd_ps(sub256_4, sub256_4, sum256_4);
-
-        ptr1 = ptr1.add(32);
-        ptr2 = ptr2.add(32);
-        i += 32;
-    }
-
-    let mut result = hsum256_ps_avx(sum256_1)
-        + hsum256_ps_avx(sum256_2)
-        + hsum256_ps_avx(sum256_3)
-        + hsum256_ps_avx(sum256_4);
-    for i in 0..n - m {
-        result += (*ptr1.add(i) - *ptr2.add(i)).powi(2);
-    }
-    -result
-}
-
-#[target_feature(enable = "avx")]
-#[target_feature(enable = "fma")]
-pub(crate) unsafe fn cosine_preprocess_avx(
-    vector: &[VectorElementType],
-) -> Option<Vec<VectorElementType>> {
-    let n = vector.len();
-    let m = n - (n % 32);
-    let mut ptr: *const f32 = vector.as_ptr();
-    let mut sum256_1: __m256 = _mm256_setzero_ps();
-    let mut sum256_2: __m256 = _mm256_setzero_ps();
-    let mut sum256_3: __m256 = _mm256_setzero_ps();
-    let mut sum256_4: __m256 = _mm256_setzero_ps();
-    let mut i: usize = 0;
-    while i < m {
-        let m256_1 = _mm256_loadu_ps(ptr);
-        sum256_1 = _mm256_fmadd_ps(m256_1, m256_1, sum256_1);
-
-        let m256_2 = _mm256_loadu_ps(ptr.add(8));
-        sum256_2 = _mm256_fmadd_ps(m256_2, m256_2, sum256_2);
-
-        let m256_3 = _mm256_loadu_ps(ptr.add(16));
-        sum256_3 = _mm256_fmadd_ps(m256_3, m256_3, sum256_3);
-
-        let m256_4 = _mm256_loadu_ps(ptr.add(24));
-        sum256_4 = _mm256_fmadd_ps(m256_4, m256_4, sum256_4);
-
-        ptr = ptr.add(32);
-        i += 32;
-    }
-
-    let mut length = hsum256_ps_avx(sum256_1)
-        + hsum256_ps_avx(sum256_2)
-        + hsum256_ps_avx(sum256_3)
-        + hsum256_ps_avx(sum256_4);
-    for i in 0..n - m {
-        length += (*ptr.add(i)).powi(2);
-    }
-    if length < f32::EPSILON {
-        return None;
-    }
-    length = length.sqrt();
-    Some(vector.iter().map(|x| x / length).collect())
-}
-
-#[target_feature(enable = "avx")]
-#[target_feature(enable = "fma")]
-pub(crate) unsafe fn dot_similarity_avx(
-    v1: &[VectorElementType],
-    v2: &[VectorElementType],
-) -> ScoreType {
-    let n = v1.len();
-    let m = n - (n % 32);
-    let mut ptr1: *const f32 = v1.as_ptr();
-    let mut ptr2: *const f32 = v2.as_ptr();
-    let mut sum256_1: __m256 = _mm256_setzero_ps();
-    let mut sum256_2: __m256 = _mm256_setzero_ps();
-    let mut sum256_3: __m256 = _mm256_setzero_ps();
-    let mut sum256_4: __m256 = _mm256_setzero_ps();
-    let mut i: usize = 0;
-    while i < m {
-        sum256_1 = _mm256_fmadd_ps(_mm256_loadu_ps(ptr1), _mm256_loadu_ps(ptr2), sum256_1);
-        sum256_2 = _mm256_fmadd_ps(
-            _mm256_loadu_ps(ptr1.add(8)),
-            _mm256_loadu_ps(ptr2.add(8)),
-            sum256_2,
-        );
-        sum256_3 = _mm256_fmadd_ps(
-            _mm256_loadu_ps(ptr1.add(16)),
-            _mm256_loadu_ps(ptr2.add(16)),
-            sum256_3,
-        );
-        sum256_4 = _mm256_fmadd_ps(
-            _mm256_loadu_ps(ptr1.add(24)),
-            _mm256_loadu_ps(ptr2.add(24)),
-            sum256_4,
-        );
-
-        ptr1 = ptr1.add(32);
-        ptr2 = ptr2.add(32);
-        i += 32;
-    }
-
-    let mut result = hsum256_ps_avx(sum256_1)
-        + hsum256_ps_avx(sum256_2)
-        + hsum256_ps_avx(sum256_3)
-        + hsum256_ps_avx(sum256_4);
-
-    for i in 0..n - m {
-        result += (*ptr1.add(i)) * (*ptr2.add(i));
-    }
-    result
-}
-
-#[cfg(test)]
-mod tests {
-    #[test]
-    fn test_spaces_avx() {
-        use super::*;
-        use crate::spaces::simple::*;
-
-        if is_x86_feature_detected!("avx") && is_x86_feature_detected!("fma") {
-            let v1: Vec<f32> = vec![
-                10., 11., 12., 13., 14., 15., 16., 17., 18., 19., 20., 21., 22., 23., 24., 25.,
-                10., 11., 12., 13., 14., 15., 16., 17., 18., 19., 20., 21., 22., 23., 24., 25.,
-                10., 11., 12., 13., 14., 15., 16., 17., 18., 19., 20., 21., 22., 23., 24., 25.,
-                10., 11., 12., 13., 14., 15., 16., 17., 18., 19., 20., 21., 22., 23., 24., 25.,
-                26., 27., 28., 29., 30., 31.,
-            ];
-            let v2: Vec<f32> = vec![
-                40., 41., 42., 43., 44., 45., 46., 47., 48., 49., 50., 51., 52., 53., 54., 55.,
-                10., 11., 12., 13., 14., 15., 16., 17., 18., 19., 20., 21., 22., 23., 24., 25.,
-                10., 11., 12., 13., 14., 15., 16., 17., 18., 19., 20., 21., 22., 23., 24., 25.,
-                10., 11., 12., 13., 14., 15., 16., 17., 18., 19., 20., 21., 22., 23., 24., 25.,
-                56., 57., 58., 59., 60., 61.,
-            ];
-
-            let euclid_simd = unsafe { euclid_similarity_avx(&v1, &v2) };
-            let euclid = euclid_similarity(&v1, &v2);
-            assert_eq!(euclid_simd, euclid);
-
-            let dot_simd = unsafe { dot_similarity_avx(&v1, &v2) };
-            let dot = dot_similarity(&v1, &v2);
-            assert_eq!(dot_simd, dot);
-
-            let cosine_simd = unsafe { cosine_preprocess_avx(&v1) };
-            let cosine = cosine_preprocess(&v1);
-            assert_eq!(cosine_simd, cosine);
-        } else {
-            println!("avx test skipped");
-        }
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/spaces/simple_neon.rs b/crates/qdrant/lib/segment/src/spaces/simple_neon.rs
deleted file mode 100644
index 5871d08..0000000
--- a/crates/qdrant/lib/segment/src/spaces/simple_neon.rs
+++ /dev/null
@@ -1,152 +0,0 @@
-#[cfg(target_feature = "neon")]
-use std::arch::aarch64::*;
-
-#[cfg(target_feature = "neon")]
-use crate::data_types::vectors::VectorElementType;
-#[cfg(target_feature = "neon")]
-use crate::types::ScoreType;
-
-#[cfg(target_feature = "neon")]
-pub(crate) unsafe fn euclid_similarity_neon(
-    v1: &[VectorElementType],
-    v2: &[VectorElementType],
-) -> ScoreType {
-    let n = v1.len();
-    let m = n - (n % 16);
-    let mut ptr1: *const f32 = v1.as_ptr();
-    let mut ptr2: *const f32 = v2.as_ptr();
-    let mut sum1 = vdupq_n_f32(0.);
-    let mut sum2 = vdupq_n_f32(0.);
-    let mut sum3 = vdupq_n_f32(0.);
-    let mut sum4 = vdupq_n_f32(0.);
-
-    let mut i: usize = 0;
-    while i < m {
-        let sub1 = vsubq_f32(vld1q_f32(ptr1), vld1q_f32(ptr2));
-        sum1 = vfmaq_f32(sum1, sub1, sub1);
-
-        let sub2 = vsubq_f32(vld1q_f32(ptr1.add(4)), vld1q_f32(ptr2.add(4)));
-        sum2 = vfmaq_f32(sum2, sub2, sub2);
-
-        let sub3 = vsubq_f32(vld1q_f32(ptr1.add(8)), vld1q_f32(ptr2.add(8)));
-        sum3 = vfmaq_f32(sum3, sub3, sub3);
-
-        let sub4 = vsubq_f32(vld1q_f32(ptr1.add(12)), vld1q_f32(ptr2.add(12)));
-        sum4 = vfmaq_f32(sum4, sub4, sub4);
-
-        ptr1 = ptr1.add(16);
-        ptr2 = ptr2.add(16);
-        i += 16;
-    }
-    let mut result = vaddvq_f32(sum1) + vaddvq_f32(sum2) + vaddvq_f32(sum3) + vaddvq_f32(sum4);
-    for i in 0..n - m {
-        result += (*ptr1.add(i) - *ptr2.add(i)).powi(2);
-    }
-    -result
-}
-
-#[cfg(target_feature = "neon")]
-pub(crate) unsafe fn cosine_preprocess_neon(
-    vector: &[VectorElementType],
-) -> Option<Vec<VectorElementType>> {
-    let n = vector.len();
-    let m = n - (n % 16);
-    let mut ptr: *const f32 = vector.as_ptr();
-    let mut sum1 = vdupq_n_f32(0.);
-    let mut sum2 = vdupq_n_f32(0.);
-    let mut sum3 = vdupq_n_f32(0.);
-    let mut sum4 = vdupq_n_f32(0.);
-
-    let mut i: usize = 0;
-    while i < m {
-        let d1 = vld1q_f32(ptr);
-        sum1 = vfmaq_f32(sum1, d1, d1);
-
-        let d2 = vld1q_f32(ptr.add(4));
-        sum2 = vfmaq_f32(sum2, d2, d2);
-
-        let d3 = vld1q_f32(ptr.add(8));
-        sum3 = vfmaq_f32(sum3, d3, d3);
-
-        let d4 = vld1q_f32(ptr.add(12));
-        sum4 = vfmaq_f32(sum4, d4, d4);
-
-        ptr = ptr.add(16);
-        i += 16;
-    }
-    let mut length = vaddvq_f32(sum1) + vaddvq_f32(sum2) + vaddvq_f32(sum3) + vaddvq_f32(sum4);
-    for v in vector.iter().take(n).skip(m) {
-        length += v.powi(2);
-    }
-    if length < f32::EPSILON {
-        return None;
-    }
-    let length = length.sqrt();
-    Some(vector.iter().map(|x| x / length).collect())
-}
-
-#[cfg(target_feature = "neon")]
-pub(crate) unsafe fn dot_similarity_neon(
-    v1: &[VectorElementType],
-    v2: &[VectorElementType],
-) -> ScoreType {
-    let n = v1.len();
-    let m = n - (n % 16);
-    let mut ptr1: *const f32 = v1.as_ptr();
-    let mut ptr2: *const f32 = v2.as_ptr();
-    let mut sum1 = vdupq_n_f32(0.);
-    let mut sum2 = vdupq_n_f32(0.);
-    let mut sum3 = vdupq_n_f32(0.);
-    let mut sum4 = vdupq_n_f32(0.);
-
-    let mut i: usize = 0;
-    while i < m {
-        sum1 = vfmaq_f32(sum1, vld1q_f32(ptr1), vld1q_f32(ptr2));
-        sum2 = vfmaq_f32(sum2, vld1q_f32(ptr1.add(4)), vld1q_f32(ptr2.add(4)));
-        sum3 = vfmaq_f32(sum3, vld1q_f32(ptr1.add(8)), vld1q_f32(ptr2.add(8)));
-        sum4 = vfmaq_f32(sum4, vld1q_f32(ptr1.add(12)), vld1q_f32(ptr2.add(12)));
-        ptr1 = ptr1.add(16);
-        ptr2 = ptr2.add(16);
-        i += 16;
-    }
-    let mut result = vaddvq_f32(sum1) + vaddvq_f32(sum2) + vaddvq_f32(sum3) + vaddvq_f32(sum4);
-    for i in 0..n - m {
-        result += (*ptr1.add(i)) * (*ptr2.add(i));
-    }
-    result
-}
-
-#[cfg(test)]
-mod tests {
-    #[cfg(target_feature = "neon")]
-    #[test]
-    fn test_spaces_neon() {
-        use super::*;
-        use crate::spaces::simple::*;
-
-        if std::arch::is_aarch64_feature_detected!("neon") {
-            let v1: Vec<f32> = vec![
-                10., 11., 12., 13., 14., 15., 16., 17., 18., 19., 20., 21., 22., 23., 24., 25.,
-                26., 27., 28., 29., 30., 31.,
-            ];
-            let v2: Vec<f32> = vec![
-                40., 41., 42., 43., 44., 45., 46., 47., 48., 49., 50., 51., 52., 53., 54., 55.,
-                56., 57., 58., 59., 60., 61.,
-            ];
-
-            let euclid_simd = unsafe { euclid_similarity_neon(&v1, &v2) };
-            let euclid = euclid_similarity(&v1, &v2);
-            assert_eq!(euclid_simd, euclid);
-
-            let dot_simd = unsafe { dot_similarity_neon(&v1, &v2) };
-            let dot = dot_similarity(&v1, &v2);
-            assert_eq!(dot_simd, dot);
-
-            let cosine_simd = unsafe { cosine_preprocess_neon(&v1) };
-            let cosine = cosine_preprocess(&v1);
-            assert_eq!(cosine_simd, cosine);
-        } else {
-            println!("neon test skipped");
-        }
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/spaces/simple_sse.rs b/crates/qdrant/lib/segment/src/spaces/simple_sse.rs
deleted file mode 100644
index 8404ba6..0000000
--- a/crates/qdrant/lib/segment/src/spaces/simple_sse.rs
+++ /dev/null
@@ -1,186 +0,0 @@
-#[cfg(target_arch = "x86")]
-use std::arch::x86::*;
-#[cfg(target_arch = "x86_64")]
-use std::arch::x86_64::*;
-
-use crate::data_types::vectors::VectorElementType;
-use crate::types::ScoreType;
-
-#[target_feature(enable = "sse")]
-unsafe fn hsum128_ps_sse(x: __m128) -> f32 {
-    let x64: __m128 = _mm_add_ps(x, _mm_movehl_ps(x, x));
-    let x32: __m128 = _mm_add_ss(x64, _mm_shuffle_ps(x64, x64, 0x55));
-    _mm_cvtss_f32(x32)
-}
-
-#[target_feature(enable = "sse")]
-pub(crate) unsafe fn euclid_similarity_sse(
-    v1: &[VectorElementType],
-    v2: &[VectorElementType],
-) -> ScoreType {
-    let n = v1.len();
-    let m = n - (n % 16);
-    let mut ptr1: *const f32 = v1.as_ptr();
-    let mut ptr2: *const f32 = v2.as_ptr();
-    let mut sum128_1: __m128 = _mm_setzero_ps();
-    let mut sum128_2: __m128 = _mm_setzero_ps();
-    let mut sum128_3: __m128 = _mm_setzero_ps();
-    let mut sum128_4: __m128 = _mm_setzero_ps();
-    let mut i: usize = 0;
-    while i < m {
-        let sub128_1 = _mm_sub_ps(_mm_loadu_ps(ptr1), _mm_loadu_ps(ptr2));
-        sum128_1 = _mm_add_ps(_mm_mul_ps(sub128_1, sub128_1), sum128_1);
-
-        let sub128_2 = _mm_sub_ps(_mm_loadu_ps(ptr1.add(4)), _mm_loadu_ps(ptr2.add(4)));
-        sum128_2 = _mm_add_ps(_mm_mul_ps(sub128_2, sub128_2), sum128_2);
-
-        let sub128_3 = _mm_sub_ps(_mm_loadu_ps(ptr1.add(8)), _mm_loadu_ps(ptr2.add(8)));
-        sum128_3 = _mm_add_ps(_mm_mul_ps(sub128_3, sub128_3), sum128_3);
-
-        let sub128_4 = _mm_sub_ps(_mm_loadu_ps(ptr1.add(12)), _mm_loadu_ps(ptr2.add(12)));
-        sum128_4 = _mm_add_ps(_mm_mul_ps(sub128_4, sub128_4), sum128_4);
-
-        ptr1 = ptr1.add(16);
-        ptr2 = ptr2.add(16);
-        i += 16;
-    }
-
-    let mut result = hsum128_ps_sse(sum128_1)
-        + hsum128_ps_sse(sum128_2)
-        + hsum128_ps_sse(sum128_3)
-        + hsum128_ps_sse(sum128_4);
-    for i in 0..n - m {
-        result += (*ptr1.add(i) - *ptr2.add(i)).powi(2);
-    }
-    -result
-}
-
-#[target_feature(enable = "sse")]
-pub(crate) unsafe fn cosine_preprocess_sse(
-    vector: &[VectorElementType],
-) -> Option<Vec<VectorElementType>> {
-    let n = vector.len();
-    let m = n - (n % 16);
-    let mut ptr: *const f32 = vector.as_ptr();
-    let mut sum128_1: __m128 = _mm_setzero_ps();
-    let mut sum128_2: __m128 = _mm_setzero_ps();
-    let mut sum128_3: __m128 = _mm_setzero_ps();
-    let mut sum128_4: __m128 = _mm_setzero_ps();
-
-    let mut i: usize = 0;
-    while i < m {
-        let m128_1 = _mm_loadu_ps(ptr);
-        sum128_1 = _mm_add_ps(_mm_mul_ps(m128_1, m128_1), sum128_1);
-
-        let m128_2 = _mm_loadu_ps(ptr.add(4));
-        sum128_2 = _mm_add_ps(_mm_mul_ps(m128_2, m128_2), sum128_2);
-
-        let m128_3 = _mm_loadu_ps(ptr.add(8));
-        sum128_3 = _mm_add_ps(_mm_mul_ps(m128_3, m128_3), sum128_3);
-
-        let m128_4 = _mm_loadu_ps(ptr.add(12));
-        sum128_4 = _mm_add_ps(_mm_mul_ps(m128_4, m128_4), sum128_4);
-
-        ptr = ptr.add(16);
-        i += 16;
-    }
-
-    let mut length = hsum128_ps_sse(sum128_1)
-        + hsum128_ps_sse(sum128_2)
-        + hsum128_ps_sse(sum128_3)
-        + hsum128_ps_sse(sum128_4);
-    for i in 0..n - m {
-        length += (*ptr.add(i)).powi(2);
-    }
-    if length < f32::EPSILON {
-        return None;
-    }
-    length = length.sqrt();
-    Some(vector.iter().map(|x| x / length).collect())
-}
-
-#[target_feature(enable = "sse")]
-pub(crate) unsafe fn dot_similarity_sse(
-    v1: &[VectorElementType],
-    v2: &[VectorElementType],
-) -> ScoreType {
-    let n = v1.len();
-    let m = n - (n % 16);
-    let mut ptr1: *const f32 = v1.as_ptr();
-    let mut ptr2: *const f32 = v2.as_ptr();
-    let mut sum128_1: __m128 = _mm_setzero_ps();
-    let mut sum128_2: __m128 = _mm_setzero_ps();
-    let mut sum128_3: __m128 = _mm_setzero_ps();
-    let mut sum128_4: __m128 = _mm_setzero_ps();
-
-    let mut i: usize = 0;
-    while i < m {
-        sum128_1 = _mm_add_ps(_mm_mul_ps(_mm_loadu_ps(ptr1), _mm_loadu_ps(ptr2)), sum128_1);
-
-        sum128_2 = _mm_add_ps(
-            _mm_mul_ps(_mm_loadu_ps(ptr1.add(4)), _mm_loadu_ps(ptr2.add(4))),
-            sum128_2,
-        );
-
-        sum128_3 = _mm_add_ps(
-            _mm_mul_ps(_mm_loadu_ps(ptr1.add(8)), _mm_loadu_ps(ptr2.add(8))),
-            sum128_3,
-        );
-
-        sum128_4 = _mm_add_ps(
-            _mm_mul_ps(_mm_loadu_ps(ptr1.add(12)), _mm_loadu_ps(ptr2.add(12))),
-            sum128_4,
-        );
-
-        ptr1 = ptr1.add(16);
-        ptr2 = ptr2.add(16);
-        i += 16;
-    }
-
-    let mut result = hsum128_ps_sse(sum128_1)
-        + hsum128_ps_sse(sum128_2)
-        + hsum128_ps_sse(sum128_3)
-        + hsum128_ps_sse(sum128_4);
-    for i in 0..n - m {
-        result += (*ptr1.add(i)) * (*ptr2.add(i));
-    }
-    result
-}
-
-#[cfg(test)]
-mod tests {
-    #[test]
-    fn test_spaces_sse() {
-        use super::*;
-        use crate::spaces::simple::*;
-
-        if is_x86_feature_detected!("sse") {
-            let v1: Vec<f32> = vec![
-                10., 11., 12., 13., 14., 15., 16., 17., 18., 19., 20., 21., 22., 23., 24., 25.,
-                10., 11., 12., 13., 14., 15., 16., 17., 18., 19., 20., 21., 22., 23., 24., 25.,
-                10., 11., 12., 13., 14., 15., 16., 17., 18., 19., 20., 21., 22., 23., 24., 25.,
-                26., 27., 28., 29., 30., 31.,
-            ];
-            let v2: Vec<f32> = vec![
-                40., 41., 42., 43., 44., 45., 46., 47., 48., 49., 50., 51., 52., 53., 54., 55.,
-                10., 11., 12., 13., 14., 15., 16., 17., 18., 19., 20., 21., 22., 23., 24., 25.,
-                10., 11., 12., 13., 14., 15., 16., 17., 18., 19., 20., 21., 22., 23., 24., 25.,
-                56., 57., 58., 59., 60., 61.,
-            ];
-
-            let euclid_simd = unsafe { euclid_similarity_sse(&v1, &v2) };
-            let euclid = euclid_similarity(&v1, &v2);
-            assert_eq!(euclid_simd, euclid);
-
-            let dot_simd = unsafe { dot_similarity_sse(&v1, &v2) };
-            let dot = dot_similarity(&v1, &v2);
-            assert_eq!(dot_simd, dot);
-
-            let cosine_simd = unsafe { cosine_preprocess_sse(&v1) };
-            let cosine = cosine_preprocess(&v1);
-            assert_eq!(cosine_simd, cosine);
-        } else {
-            println!("sse test skipped");
-        }
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/spaces/tools.rs b/crates/qdrant/lib/segment/src/spaces/tools.rs
deleted file mode 100644
index 3c60756..0000000
--- a/crates/qdrant/lib/segment/src/spaces/tools.rs
+++ /dev/null
@@ -1,60 +0,0 @@
-use std::cmp::Reverse;
-
-use common::fixed_length_priority_queue::FixedLengthPriorityQueue;
-
-pub fn peek_top_smallest_iterable<I, E: Ord>(elements: I, top: usize) -> Vec<E>
-where
-    I: IntoIterator<Item = E>,
-{
-    if top == 0 {
-        return vec![];
-    }
-
-    // If small values is better - PQ should pop-out big values first.
-    // Hence is should be min-heap
-    let mut pq = FixedLengthPriorityQueue::new(top);
-    for element in elements {
-        pq.push(Reverse(element));
-    }
-    pq.into_vec().into_iter().map(|Reverse(x)| x).collect()
-}
-
-pub fn peek_top_largest_iterable<I, E: Ord>(elements: I, top: usize) -> Vec<E>
-where
-    I: IntoIterator<Item = E>,
-{
-    if top == 0 {
-        return vec![];
-    }
-
-    // If big values is better - PQ should pop-out small values first.
-    // Hence is should be min-heap
-    let mut pq = FixedLengthPriorityQueue::new(top);
-    for element in elements {
-        pq.push(element);
-    }
-    pq.into_vec()
-}
-
-pub fn peek_top_scores<E: Ord + Clone>(scores: &[E], top: usize) -> Vec<E> {
-    peek_top_largest_iterable(scores.iter().cloned(), top)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_peek_top() {
-        let data = vec![10, 20, 40, 5, 100, 33, 84, 65, 20, 43, 44, 42];
-        let res = peek_top_scores(&data, 3);
-        assert_eq!(res, vec![100, 84, 65]);
-    }
-
-    #[test]
-    fn test_peek_top_rev() {
-        let data = vec![10, 20, 40, 5, 100, 33, 84, 65, 20, 43, 44, 42];
-        let res = peek_top_smallest_iterable(data.into_iter(), 3);
-        assert_eq!(res, vec![5, 10, 20]);
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/telemetry.rs b/crates/qdrant/lib/segment/src/telemetry.rs
deleted file mode 100644
index 39c5a4f..0000000
--- a/crates/qdrant/lib/segment/src/telemetry.rs
+++ /dev/null
@@ -1,151 +0,0 @@
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-
-use crate::common::anonymize::Anonymize;
-use crate::common::operation_time_statistics::OperationDurationStatistics;
-use crate::types::{PayloadIndexInfo, SegmentConfig, SegmentInfo, VectorDataConfig};
-
-#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema)]
-pub struct VectorIndexesTelemetry {
-    vector_index_searches: Vec<VectorIndexSearchesTelemetry>,
-}
-
-#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema)]
-pub struct SegmentTelemetry {
-    pub info: SegmentInfo,
-    pub config: SegmentConfig,
-    pub vector_index_searches: Vec<VectorIndexSearchesTelemetry>,
-    pub payload_field_indices: Vec<PayloadIndexTelemetry>,
-}
-
-#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema)]
-pub struct PayloadIndexTelemetry {
-    pub field_name: Option<String>,
-    pub points_values_count: usize,
-    pub points_count: usize,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    #[serde(default)]
-    pub histogram_bucket_size: Option<usize>,
-}
-
-impl PayloadIndexTelemetry {
-    pub fn set_name(mut self, name: String) -> Self {
-        self.field_name = Some(name);
-        self
-    }
-}
-
-#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default)]
-pub struct VectorIndexSearchesTelemetry {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub index_name: Option<String>,
-
-    #[serde(skip_serializing_if = "OperationDurationStatistics::is_empty")]
-    pub unfiltered_plain: OperationDurationStatistics,
-
-    #[serde(skip_serializing_if = "OperationDurationStatistics::is_empty")]
-    pub unfiltered_hnsw: OperationDurationStatistics,
-
-    #[serde(skip_serializing_if = "OperationDurationStatistics::is_empty")]
-    pub filtered_plain: OperationDurationStatistics,
-
-    #[serde(skip_serializing_if = "OperationDurationStatistics::is_empty")]
-    pub filtered_small_cardinality: OperationDurationStatistics,
-
-    #[serde(skip_serializing_if = "OperationDurationStatistics::is_empty")]
-    pub filtered_large_cardinality: OperationDurationStatistics,
-
-    #[serde(skip_serializing_if = "OperationDurationStatistics::is_empty")]
-    pub filtered_exact: OperationDurationStatistics,
-
-    #[serde(skip_serializing_if = "OperationDurationStatistics::is_empty")]
-    pub unfiltered_exact: OperationDurationStatistics,
-}
-
-impl Anonymize for SegmentTelemetry {
-    fn anonymize(&self) -> Self {
-        Self {
-            info: self.info.anonymize(),
-            config: self.config.anonymize(),
-            vector_index_searches: self.vector_index_searches.anonymize(),
-            payload_field_indices: self.payload_field_indices.anonymize(),
-        }
-    }
-}
-
-impl Anonymize for SegmentInfo {
-    fn anonymize(&self) -> Self {
-        SegmentInfo {
-            segment_type: self.segment_type,
-            num_vectors: self.num_vectors.anonymize(),
-            num_points: self.num_points.anonymize(),
-            num_deleted_vectors: self.num_deleted_vectors.anonymize(),
-            ram_usage_bytes: self.ram_usage_bytes.anonymize(),
-            disk_usage_bytes: self.disk_usage_bytes.anonymize(),
-            is_appendable: self.is_appendable,
-            index_schema: self
-                .index_schema
-                .iter()
-                .map(|(k, v)| (k.anonymize(), v.anonymize()))
-                .collect(),
-        }
-    }
-}
-
-impl Anonymize for PayloadIndexInfo {
-    fn anonymize(&self) -> Self {
-        PayloadIndexInfo {
-            data_type: self.data_type,
-            params: self.params.clone(),
-            points: self.points.anonymize(),
-        }
-    }
-}
-
-impl Anonymize for SegmentConfig {
-    fn anonymize(&self) -> Self {
-        SegmentConfig {
-            vector_data: self.vector_data.anonymize(),
-            payload_storage_type: self.payload_storage_type,
-        }
-    }
-}
-
-impl Anonymize for VectorDataConfig {
-    fn anonymize(&self) -> Self {
-        VectorDataConfig {
-            size: self.size.anonymize(),
-            distance: self.distance,
-            storage_type: self.storage_type,
-            index: self.index.clone(),
-            quantization_config: None,
-        }
-    }
-}
-
-impl Anonymize for VectorIndexSearchesTelemetry {
-    fn anonymize(&self) -> Self {
-        VectorIndexSearchesTelemetry {
-            index_name: None,
-            unfiltered_plain: self.unfiltered_plain.anonymize(),
-            unfiltered_hnsw: self.unfiltered_hnsw.anonymize(),
-            filtered_plain: self.filtered_plain.anonymize(),
-            filtered_small_cardinality: self.filtered_small_cardinality.anonymize(),
-            filtered_large_cardinality: self.filtered_large_cardinality.anonymize(),
-            filtered_exact: self.filtered_exact.anonymize(),
-            unfiltered_exact: self.filtered_exact.anonymize(),
-        }
-    }
-}
-
-impl Anonymize for PayloadIndexTelemetry {
-    fn anonymize(&self) -> Self {
-        PayloadIndexTelemetry {
-            field_name: None,
-            points_count: self.points_count.anonymize(),
-            points_values_count: self.points_values_count.anonymize(),
-            histogram_bucket_size: self.histogram_bucket_size,
-        }
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/types.rs b/crates/qdrant/lib/segment/src/types.rs
deleted file mode 100644
index 4e21425..0000000
--- a/crates/qdrant/lib/segment/src/types.rs
+++ /dev/null
@@ -1,2398 +0,0 @@
-use std::cmp::Ordering;
-use std::collections::{BTreeMap, HashMap, HashSet};
-use std::fmt::Formatter;
-use std::hash::Hash;
-use std::mem::size_of;
-use std::ops::Deref;
-use std::rc::Rc;
-use std::str::FromStr;
-
-use geo::prelude::HaversineDistance;
-use geo::{Contains, Coord, Point, Polygon};
-use itertools::Itertools;
-use ordered_float::OrderedFloat;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use serde_json::{Map, Value};
-use smol_str::SmolStr;
-use uuid::Uuid;
-use validator::{Validate, ValidationErrors};
-
-use crate::common::utils;
-use crate::common::utils::MultiValue;
-use crate::data_types::text_index::TextIndexParams;
-use crate::data_types::vectors::{VectorElementType, VectorStruct};
-use crate::spaces::metric::Metric;
-use crate::spaces::simple::{CosineMetric, DotProductMetric, EuclidMetric};
-
-/// Type of point index inside a segment
-pub type PointOffsetType = u32;
-pub type PayloadKeyType = String;
-pub type PayloadKeyTypeRef<'a> = &'a str;
-pub type SeqNumberType = u64;
-/// Sequential number of modification, applied to segment
-pub type ScoreType = f32;
-/// Type of vector matching score
-pub type TagType = u64;
-/// Type of float point payload
-pub type FloatPayloadType = f64;
-/// Type of integer point payload
-pub type IntPayloadType = i64;
-
-pub const VECTOR_ELEMENT_SIZE: usize = size_of::<VectorElementType>();
-
-/// Type, used for specifying point ID in user interface
-#[derive(Debug, Serialize, Copy, Clone, PartialEq, Eq, Hash, Ord, PartialOrd, JsonSchema)]
-#[serde(untagged)]
-pub enum ExtendedPointId {
-    NumId(u64),
-    Uuid(Uuid),
-}
-
-impl std::fmt::Display for ExtendedPointId {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        match self {
-            ExtendedPointId::NumId(idx) => write!(f, "{idx}"),
-            ExtendedPointId::Uuid(uuid) => write!(f, "{uuid}"),
-        }
-    }
-}
-
-impl From<u64> for ExtendedPointId {
-    fn from(idx: u64) -> Self {
-        ExtendedPointId::NumId(idx)
-    }
-}
-
-impl FromStr for ExtendedPointId {
-    type Err = ();
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let try_num: Result<u64, _> = s.parse();
-        if let Ok(num) = try_num {
-            return Ok(Self::NumId(num));
-        }
-        let try_uuid = Uuid::from_str(s);
-        if let Ok(uuid) = try_uuid {
-            return Ok(Self::Uuid(uuid));
-        }
-        Err(())
-    }
-}
-
-impl<'de> serde::Deserialize<'de> for ExtendedPointId {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        let value = match serde_value::Value::deserialize(deserializer) {
-            Ok(val) => val,
-            Err(err) => return Err(err),
-        };
-
-        if let Ok(num) = value.clone().deserialize_into() {
-            return Ok(ExtendedPointId::NumId(num));
-        }
-
-        if let Ok(uuid) = value.clone().deserialize_into() {
-            return Ok(ExtendedPointId::Uuid(uuid));
-        }
-
-        Err(serde::de::Error::custom(format!(
-            "value {} is not a valid point ID, \
-             valid values are either an unsigned integer or a UUID",
-            crate::utils::fmt::SerdeValue(&value),
-        )))
-    }
-}
-
-/// Type of point index across all segments
-pub type PointIdType = ExtendedPointId;
-
-/// Type of internal tags, build from payload
-#[derive(
-    Debug, Deserialize, Serialize, JsonSchema, Clone, Copy, FromPrimitive, PartialEq, Eq, Hash,
-)]
-/// Distance function types used to compare vectors
-pub enum Distance {
-    // <https://en.wikipedia.org/wiki/Cosine_similarity>
-    Cosine,
-    // <https://en.wikipedia.org/wiki/Euclidean_distance>
-    Euclid,
-    // <https://en.wikipedia.org/wiki/Dot_product>
-    Dot,
-}
-
-impl Distance {
-    pub fn preprocess_vector(
-        &self,
-        vector: &[VectorElementType],
-    ) -> Option<Vec<VectorElementType>> {
-        match self {
-            Distance::Cosine => CosineMetric::preprocess(vector),
-            Distance::Euclid => EuclidMetric::preprocess(vector),
-            Distance::Dot => DotProductMetric::preprocess(vector),
-        }
-    }
-
-    pub fn postprocess_score(&self, score: ScoreType) -> ScoreType {
-        match self {
-            Distance::Cosine => CosineMetric::postprocess(score),
-            Distance::Euclid => EuclidMetric::postprocess(score),
-            Distance::Dot => DotProductMetric::postprocess(score),
-        }
-    }
-
-    pub fn distance_order(&self) -> Order {
-        match self {
-            Distance::Cosine | Distance::Dot => Order::LargeBetter,
-            Distance::Euclid => Order::SmallBetter,
-        }
-    }
-
-    /// Checks if score satisfies threshold condition
-    pub fn check_threshold(&self, score: ScoreType, threshold: ScoreType) -> bool {
-        match self.distance_order() {
-            Order::LargeBetter => score > threshold,
-            Order::SmallBetter => score < threshold,
-        }
-    }
-}
-
-pub enum Order {
-    LargeBetter,
-    SmallBetter,
-}
-
-/// Search result
-#[derive(Deserialize, Serialize, JsonSchema, Clone, Debug)]
-pub struct ScoredPoint {
-    /// Point id
-    pub id: PointIdType,
-    /// Point version
-    pub version: SeqNumberType,
-    /// Points vector distance to the query vector
-    pub score: ScoreType,
-    /// Payload - values assigned to the point
-    pub payload: Option<Payload>,
-    /// Vector of the point
-    pub vector: Option<VectorStruct>,
-}
-
-impl Eq for ScoredPoint {}
-
-impl Ord for ScoredPoint {
-    fn cmp(&self, other: &Self) -> Ordering {
-        OrderedFloat(self.score).cmp(&OrderedFloat(other.score))
-    }
-}
-
-impl PartialOrd for ScoredPoint {
-    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-impl PartialEq for ScoredPoint {
-    fn eq(&self, other: &Self) -> bool {
-        (self.id, &self.score) == (other.id, &other.score)
-    }
-}
-
-/// Type of segment
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone, Copy, PartialEq, Eq)]
-#[serde(rename_all = "snake_case")]
-pub enum SegmentType {
-    // There are no index built for the segment, all operations are available
-    Plain,
-    // Segment with some sort of index built. Optimized for search, appending new points will require reindexing
-    Indexed,
-    // Some index which you better don't touch
-    Special,
-}
-
-/// Display payload field type & index information
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone, PartialEq, Eq)]
-#[serde(rename_all = "snake_case")]
-pub struct PayloadIndexInfo {
-    pub data_type: PayloadSchemaType,
-    #[serde(default)]
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub params: Option<PayloadSchemaParams>,
-    /// Number of points indexed with this index
-    pub points: usize,
-}
-
-impl PayloadIndexInfo {
-    pub fn new(field_type: PayloadFieldSchema, points_count: usize) -> Self {
-        match field_type {
-            PayloadFieldSchema::FieldType(data_type) => PayloadIndexInfo {
-                data_type,
-                params: None,
-                points: points_count,
-            },
-            PayloadFieldSchema::FieldParams(schema_params) => match schema_params {
-                PayloadSchemaParams::Text(_) => PayloadIndexInfo {
-                    data_type: PayloadSchemaType::Text,
-                    params: Some(schema_params),
-                    points: points_count,
-                },
-            },
-        }
-    }
-}
-
-/// Aggregated information about segment
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone, PartialEq, Eq)]
-#[serde(rename_all = "snake_case")]
-pub struct SegmentInfo {
-    pub segment_type: SegmentType,
-    pub num_vectors: usize,
-    pub num_points: usize,
-    pub num_deleted_vectors: usize,
-    pub ram_usage_bytes: usize,
-    pub disk_usage_bytes: usize,
-    pub is_appendable: bool,
-    pub index_schema: HashMap<PayloadKeyType, PayloadIndexInfo>,
-}
-
-/// Additional parameters of the search
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Validate, Clone, Copy, PartialEq, Default)]
-#[serde(rename_all = "snake_case")]
-pub struct QuantizationSearchParams {
-    /// If true, quantized vectors are ignored. Default is false.
-    #[serde(default = "default_quantization_ignore_value")]
-    pub ignore: bool,
-
-    /// If true, use original vectors to re-score top-k results.
-    /// Might require more time in case if original vectors are stored on disk.
-    /// Default is false.
-    #[serde(default = "default_quantization_rescore_value")]
-    pub rescore: bool,
-
-    /// Oversampling factor for quantization. Default is 1.0.
-    ///
-    /// Defines how many extra vectors should be pre-selected using quantized index,
-    /// and then re-scored using original vectors.
-    ///
-    /// For example, if `oversampling` is 2.4 and `limit` is 100, then 240 vectors will be pre-selected using quantized index,
-    /// and then top-100 will be returned after re-scoring.
-    #[serde(default = "default_quantization_oversampling_value")]
-    #[validate(range(min = 1.0))]
-    pub oversampling: Option<f64>,
-}
-
-pub const fn default_quantization_ignore_value() -> bool {
-    false
-}
-
-pub const fn default_quantization_rescore_value() -> bool {
-    false
-}
-
-pub const fn default_quantization_oversampling_value() -> Option<f64> {
-    None
-}
-
-/// Additional parameters of the search
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Validate, Clone, Copy, PartialEq, Default)]
-#[serde(rename_all = "snake_case")]
-pub struct SearchParams {
-    /// Params relevant to HNSW index
-    /// Size of the beam in a beam-search. Larger the value - more accurate the result, more time required for search.
-    pub hnsw_ef: Option<usize>,
-
-    /// Search without approximation. If set to true, search may run long but with exact results.
-    #[serde(default)]
-    pub exact: bool,
-
-    /// Quantization params
-    #[serde(default)]
-    #[validate]
-    pub quantization: Option<QuantizationSearchParams>,
-}
-
-/// Vector index configuration
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone, PartialEq, Eq)]
-#[serde(rename_all = "snake_case")]
-#[serde(tag = "type", content = "options")]
-pub enum Indexes {
-    /// Do not use any index, scan whole vector collection during search.
-    /// Guarantee 100% precision, but may be time consuming on large collections.
-    Plain {},
-    /// Use filterable HNSW index for approximate search. Is very fast even on a very huge collections,
-    /// but require additional space to store index and additional time to build it.
-    Hnsw(HnswConfig),
-}
-
-impl Indexes {
-    pub fn is_indexed(&self) -> bool {
-        match self {
-            Indexes::Plain {} => false,
-            Indexes::Hnsw(_) => true,
-        }
-    }
-}
-
-/// Config of HNSW index
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Validate, Clone, PartialEq, Eq)]
-#[serde(rename_all = "snake_case")]
-pub struct HnswConfig {
-    /// Number of edges per node in the index graph. Larger the value - more accurate the search, more space required.
-    pub m: usize,
-    /// Number of neighbours to consider during the index building. Larger the value - more accurate the search, more time required to build index.
-    #[validate(range(min = 4))]
-    pub ef_construct: usize,
-    /// Minimal size (in KiloBytes) of vectors for additional payload-based indexing.
-    /// If payload chunk is smaller than `full_scan_threshold_kb` additional indexing won't be used -
-    /// in this case full-scan search should be preferred by query planner and additional indexing is not required.
-    /// Note: 1Kb = 1 vector of size 256
-    #[serde(alias = "full_scan_threshold_kb")]
-    pub full_scan_threshold: usize,
-    /// Number of parallel threads used for background index building. If 0 - auto selection.
-    #[serde(default = "default_max_indexing_threads")]
-    pub max_indexing_threads: usize,
-    /// Store HNSW index on disk. If set to false, index will be stored in RAM. Default: false
-    #[serde(default)]
-    #[serde(skip_serializing_if = "Option::is_none")] // Better backward compatibility
-    pub on_disk: Option<bool>,
-    /// Custom M param for hnsw graph built for payload index. If not set, default M will be used.
-    #[serde(default)]
-    #[serde(skip_serializing_if = "Option::is_none")] // Better backward compatibility
-    pub payload_m: Option<usize>,
-}
-
-impl HnswConfig {
-    /// Detect configuration mismatch against `other` that requires rebuilding
-    ///
-    /// Returns true only if both conditions are met:
-    /// - this configuration does not match `other`
-    /// - to effectively change the configuration, a HNSW rebuild is required
-    ///
-    /// For example, a change in `max_indexing_threads` will not require rebuilding because it
-    /// doesn't affect the final index, and thus this would return false.
-    pub fn mismatch_requires_rebuild(&self, other: &Self) -> bool {
-        self.m != other.m
-            || self.ef_construct != other.ef_construct
-            || self.full_scan_threshold != other.full_scan_threshold
-            || self.payload_m != other.payload_m
-            // Data on disk is the same, we have a unit test for that. We can eventually optimize
-            // this to just reload the collection rather than optimizing it again as a whole just
-            // to flip this flag
-            || self.on_disk != other.on_disk
-    }
-}
-
-const fn default_max_indexing_threads() -> usize {
-    0
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone, Copy, PartialEq, Eq, Hash)]
-#[serde(rename_all = "lowercase")]
-pub enum CompressionRatio {
-    X4,
-    X8,
-    X16,
-    X32,
-    X64,
-}
-
-#[derive(Default, Debug, Deserialize, Serialize, JsonSchema, Clone, PartialEq, Eq, Hash)]
-#[serde(rename_all = "lowercase")]
-pub enum ScalarType {
-    #[default]
-    Int8,
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Validate, Clone, PartialEq)]
-#[serde(rename_all = "snake_case")]
-pub struct ScalarQuantizationConfig {
-    /// Type of quantization to use
-    /// If `int8` - 8 bit quantization will be used
-    pub r#type: ScalarType,
-    /// Quantile for quantization. Expected value range in [0.5, 1.0]. If not set - use the whole range of values
-    #[serde(skip_serializing_if = "Option::is_none")]
-    #[validate(range(min = 0.5, max = 1.0))]
-    pub quantile: Option<f32>,
-    /// If true - quantized vectors always will be stored in RAM, ignoring the config of main storage
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub always_ram: Option<bool>,
-}
-
-impl ScalarQuantizationConfig {
-    /// Detect configuration mismatch against `other` that requires rebuilding
-    ///
-    /// Returns true only if both conditions are met:
-    /// - this configuration does not match `other`
-    /// - to effectively change the configuration, a quantization rebuild is required
-    pub fn mismatch_requires_rebuild(&self, other: &Self) -> bool {
-        self != other
-    }
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Validate, Clone, PartialEq, Eq, Hash)]
-pub struct ScalarQuantization {
-    #[validate]
-    pub scalar: ScalarQuantizationConfig,
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Validate, Clone, PartialEq, Eq, Hash)]
-#[serde(rename_all = "snake_case")]
-pub struct ProductQuantizationConfig {
-    pub compression: CompressionRatio,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub always_ram: Option<bool>,
-}
-
-impl ProductQuantizationConfig {
-    /// Detect configuration mismatch against `other` that requires rebuilding
-    ///
-    /// Returns true only if both conditions are met:
-    /// - this configuration does not match `other`
-    /// - to effectively change the configuration, a quantization rebuild is required
-    pub fn mismatch_requires_rebuild(&self, other: &Self) -> bool {
-        self != other
-    }
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Validate, Clone, PartialEq, Eq, Hash)]
-pub struct ProductQuantization {
-    #[validate]
-    pub product: ProductQuantizationConfig,
-}
-
-impl std::hash::Hash for ScalarQuantizationConfig {
-    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
-        self.always_ram.hash(state);
-        self.r#type.hash(state);
-    }
-}
-
-impl Eq for ScalarQuantizationConfig {}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone, PartialEq, Eq, Hash)]
-#[serde(rename_all = "snake_case")]
-#[serde(untagged)]
-pub enum QuantizationConfig {
-    Scalar(ScalarQuantization),
-    Product(ProductQuantization),
-}
-
-impl QuantizationConfig {
-    /// Detect configuration mismatch against `other` that requires rebuilding
-    ///
-    /// Returns true only if both conditions are met:
-    /// - this configuration does not match `other`
-    /// - to effectively change the configuration, a quantization rebuild is required
-    pub fn mismatch_requires_rebuild(&self, other: &Self) -> bool {
-        self != other
-    }
-}
-
-impl Validate for QuantizationConfig {
-    fn validate(&self) -> Result<(), ValidationErrors> {
-        match self {
-            QuantizationConfig::Scalar(scalar) => scalar.validate(),
-            QuantizationConfig::Product(product) => product.validate(),
-        }
-    }
-}
-
-impl From<ScalarQuantizationConfig> for QuantizationConfig {
-    fn from(config: ScalarQuantizationConfig) -> Self {
-        QuantizationConfig::Scalar(ScalarQuantization { scalar: config })
-    }
-}
-
-impl From<ProductQuantizationConfig> for QuantizationConfig {
-    fn from(config: ProductQuantizationConfig) -> Self {
-        QuantizationConfig::Product(ProductQuantization { product: config })
-    }
-}
-
-pub const DEFAULT_HNSW_EF_CONSTRUCT: usize = 100;
-
-impl Default for HnswConfig {
-    fn default() -> Self {
-        HnswConfig {
-            m: 16,
-            ef_construct: DEFAULT_HNSW_EF_CONSTRUCT,
-            full_scan_threshold: DEFAULT_FULL_SCAN_THRESHOLD,
-            max_indexing_threads: 0,
-            on_disk: Some(false),
-            payload_m: None,
-        }
-    }
-}
-
-impl Indexes {
-    pub fn default_hnsw() -> Self {
-        Indexes::Hnsw(Default::default())
-    }
-}
-
-impl Default for Indexes {
-    fn default() -> Self {
-        Indexes::Plain {}
-    }
-}
-
-/// Type of payload index
-#[derive(Default, Debug, Deserialize, Serialize, JsonSchema, Copy, Clone, PartialEq, Eq)]
-#[serde(rename_all = "snake_case")]
-#[serde(tag = "type", content = "options")]
-pub enum PayloadIndexType {
-    // Do not index anything, just keep of what should be indexed later
-    #[default]
-    Plain,
-    // Build payload index. Index is saved on disc, but index itself is in RAM
-    Struct,
-}
-
-/// Type of payload storage
-#[derive(Default, Debug, Deserialize, Serialize, JsonSchema, Copy, Clone, PartialEq, Eq)]
-#[serde(rename_all = "snake_case")]
-#[serde(tag = "type", content = "options")]
-pub enum PayloadStorageType {
-    // Store payload in memory and use persistence storage only if vectors are changed
-    #[default]
-    InMemory,
-    // Store payload on disk only, read each time it is requested
-    OnDisk,
-}
-
-impl PayloadStorageType {
-    pub fn is_on_disk(&self) -> bool {
-        matches!(self, PayloadStorageType::OnDisk)
-    }
-}
-
-#[derive(Default, Debug, Deserialize, Serialize, JsonSchema, Clone)]
-#[serde(rename_all = "snake_case")]
-pub struct SegmentConfig {
-    pub vector_data: HashMap<String, VectorDataConfig>,
-    /// Defines payload storage type
-    pub payload_storage_type: PayloadStorageType,
-}
-
-impl SegmentConfig {
-    /// Helper to get vector specific quantization config.
-    ///
-    /// This grabs the quantization config for the given vector name if it exists.
-    ///
-    /// If no quantization is configured, `None` is returned.
-    pub fn quantization_config(&self, vector_name: &str) -> Option<&QuantizationConfig> {
-        self.vector_data
-            .get(vector_name)
-            .and_then(|v| v.quantization_config.as_ref())
-    }
-
-    pub fn is_any_vector_indexed(&self) -> bool {
-        self.vector_data
-            .values()
-            .any(|config| config.index.is_indexed())
-    }
-
-    pub fn are_all_vectors_indexed(&self) -> bool {
-        self.vector_data
-            .values()
-            .all(|config| config.index.is_indexed())
-    }
-
-    /// Check if any vector storage is on-disk
-    pub fn is_any_on_disk(&self) -> bool {
-        self.vector_data
-            .values()
-            .any(|config| config.storage_type.is_on_disk())
-    }
-}
-
-/// Storage types for vectors
-#[derive(Default, Debug, Deserialize, Serialize, JsonSchema, Eq, PartialEq, Copy, Clone)]
-pub enum VectorStorageType {
-    /// Storage in memory (RAM)
-    ///
-    /// Will be very fast at the cost of consuming a lot of memory.
-    #[default]
-    Memory,
-    /// Storage in mmap file, not appendable
-    ///
-    /// Search performance is defined by disk speed and the fraction of vectors that fit in memory.
-    Mmap,
-    /// Storage in chunked mmap files, appendable
-    ///
-    /// Search performance is defined by disk speed and the fraction of vectors that fit in memory.
-    ChunkedMmap,
-}
-
-impl VectorStorageType {
-    /// Whether this storage type is a mmap on disk
-    pub fn is_on_disk(&self) -> bool {
-        match self {
-            Self::Memory => false,
-            Self::Mmap | Self::ChunkedMmap => true,
-        }
-    }
-}
-
-/// Config of single vector data storage
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone)]
-#[serde(rename_all = "snake_case")]
-pub struct VectorDataConfig {
-    /// Size/dimensionality of the vectors used
-    pub size: usize,
-    /// Type of distance function used for measuring distance between vectors
-    pub distance: Distance,
-    /// Type of storage this vector uses
-    pub storage_type: VectorStorageType,
-    /// Type of index used for search
-    pub index: Indexes,
-    /// Vector specific quantization config that overrides collection config
-    pub quantization_config: Option<QuantizationConfig>,
-}
-
-/// Default value based on <https://github.com/google-research/google-research/blob/master/scann/docs/algorithms.md>
-pub const DEFAULT_FULL_SCAN_THRESHOLD: usize = 20_000;
-
-/// Persistable state of segment configuration
-#[derive(Debug, Deserialize, Serialize, Clone)]
-#[serde(rename_all = "snake_case")]
-pub struct SegmentState {
-    pub version: Option<SeqNumberType>,
-    pub config: SegmentConfig,
-}
-
-/// Geo point payload schema
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone, PartialEq)]
-#[serde(try_from = "GeoPointShadow")]
-pub struct GeoPoint {
-    pub lon: f64,
-    pub lat: f64,
-}
-
-#[derive(Deserialize)]
-struct GeoPointShadow {
-    pub lon: f64,
-    pub lat: f64,
-}
-
-pub struct GeoPointValidationError {
-    pub lon: f64,
-    pub lat: f64,
-}
-
-// The error type has to implement Display
-impl std::fmt::Display for GeoPointValidationError {
-    fn fmt(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(formatter, "Wrong format of GeoPoint payload: expected `lat` = {} within [-90;90] and `lon` = {} within [-180;180]", self.lat, self.lon)
-    }
-}
-
-impl GeoPoint {
-    pub fn validate(lon: f64, lat: f64) -> Result<(), GeoPointValidationError> {
-        let max_lon = 180f64;
-        let min_lon = -180f64;
-        let max_lat = 90f64;
-        let min_lat = -90f64;
-
-        if !(min_lon..=max_lon).contains(&lon) || !(min_lat..=max_lat).contains(&lat) {
-            return Err(GeoPointValidationError { lon, lat });
-        }
-        Ok(())
-    }
-
-    pub fn new(lon: f64, lat: f64) -> Result<Self, GeoPointValidationError> {
-        Self::validate(lon, lat)?;
-        Ok(GeoPoint { lon, lat })
-    }
-}
-
-impl TryFrom<GeoPointShadow> for GeoPoint {
-    type Error = GeoPointValidationError;
-
-    fn try_from(value: GeoPointShadow) -> Result<Self, Self::Error> {
-        GeoPoint::validate(value.lon, value.lat)?;
-
-        Ok(Self {
-            lon: value.lon,
-            lat: value.lat,
-        })
-    }
-}
-
-pub trait PayloadContainer {
-    fn get_value(&self, path: &str) -> MultiValue<&Value>;
-}
-
-#[derive(Clone, Debug, Eq, PartialEq, Deserialize, Serialize, JsonSchema)]
-pub struct Payload(pub Map<String, Value>);
-
-impl Payload {
-    pub fn merge(&mut self, value: &Payload) {
-        for (key, value) in &value.0 {
-            match value {
-                Value::Null => self.0.remove(key),
-                _ => self.0.insert(key.to_owned(), value.to_owned()),
-            };
-        }
-    }
-
-    pub fn remove(&mut self, path: &str) -> Vec<Value> {
-        utils::remove_value_from_json_map(path, &mut self.0).values()
-    }
-
-    pub fn len(&self) -> usize {
-        self.0.len()
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.0.is_empty()
-    }
-
-    pub fn contains_key(&self, key: &str) -> bool {
-        self.0.contains_key(key)
-    }
-
-    pub fn iter(&self) -> serde_json::map::Iter {
-        self.0.iter()
-    }
-}
-
-impl PayloadContainer for Map<String, Value> {
-    fn get_value(&self, path: &str) -> MultiValue<&Value> {
-        utils::get_value_from_json_map(path, self)
-    }
-}
-
-impl PayloadContainer for Payload {
-    fn get_value(&self, path: &str) -> MultiValue<&Value> {
-        utils::get_value_from_json_map(path, &self.0)
-    }
-}
-
-impl<'a> PayloadContainer for OwnedPayloadRef<'a> {
-    fn get_value(&self, path: &str) -> MultiValue<&Value> {
-        utils::get_value_from_json_map(path, self.deref())
-    }
-}
-
-impl Default for Payload {
-    fn default() -> Self {
-        Payload(Map::new())
-    }
-}
-
-impl IntoIterator for Payload {
-    type Item = (String, Value);
-    type IntoIter = serde_json::map::IntoIter;
-
-    fn into_iter(self) -> serde_json::map::IntoIter {
-        self.0.into_iter()
-    }
-}
-
-impl From<Value> for Payload {
-    fn from(value: Value) -> Self {
-        match value {
-            Value::Object(map) => Payload(map),
-            _ => panic!("cannot convert from {value:?}"),
-        }
-    }
-}
-
-impl From<Map<String, Value>> for Payload {
-    fn from(value: serde_json::Map<String, Value>) -> Self {
-        Payload(value)
-    }
-}
-
-#[derive(Clone)]
-pub enum OwnedPayloadRef<'a> {
-    Ref(&'a Map<String, Value>),
-    Owned(Rc<Map<String, Value>>),
-}
-
-impl<'a> Deref for OwnedPayloadRef<'a> {
-    type Target = Map<String, Value>;
-
-    fn deref(&self) -> &Self::Target {
-        match self {
-            OwnedPayloadRef::Ref(reference) => reference,
-            OwnedPayloadRef::Owned(owned) => owned.deref(),
-        }
-    }
-}
-
-impl<'a> AsRef<Map<String, Value>> for OwnedPayloadRef<'a> {
-    fn as_ref(&self) -> &Map<String, Value> {
-        match self {
-            OwnedPayloadRef::Ref(reference) => reference,
-            OwnedPayloadRef::Owned(owned) => owned.deref(),
-        }
-    }
-}
-
-impl<'a> From<Payload> for OwnedPayloadRef<'a> {
-    fn from(payload: Payload) -> Self {
-        OwnedPayloadRef::Owned(Rc::new(payload.0))
-    }
-}
-
-impl<'a> From<Map<String, Value>> for OwnedPayloadRef<'a> {
-    fn from(payload: Map<String, Value>) -> Self {
-        OwnedPayloadRef::Owned(Rc::new(payload))
-    }
-}
-
-impl<'a> From<&'a Payload> for OwnedPayloadRef<'a> {
-    fn from(payload: &'a Payload) -> Self {
-        OwnedPayloadRef::Ref(&payload.0)
-    }
-}
-
-impl<'a> From<&'a Map<String, Value>> for OwnedPayloadRef<'a> {
-    fn from(payload: &'a Map<String, Value>) -> Self {
-        OwnedPayloadRef::Ref(payload)
-    }
-}
-
-/// Payload interface structure which ensures that user is allowed to pass payload in
-/// both - array and single element forms.
-///
-/// Example:
-///
-/// Both versions should work:
-/// ```json
-/// {..., "payload": {"city": {"type": "keyword", "value": ["Berlin", "London"] }}},
-/// {..., "payload": {"city": {"type": "keyword", "value": "Moscow" }}},
-/// ```
-#[derive(Debug, Deserialize, Serialize, JsonSchema, PartialEq, Eq, Clone)]
-#[serde(rename_all = "snake_case")]
-#[serde(untagged)]
-pub enum PayloadVariant<T> {
-    List(Vec<T>),
-    Value(T),
-}
-
-impl<T: Clone> PayloadVariant<T> {
-    pub fn to_list(&self) -> Vec<T> {
-        match self {
-            PayloadVariant::Value(x) => vec![x.clone()],
-            PayloadVariant::List(vec) => vec.clone(),
-        }
-    }
-}
-
-/// Json representation of a payload
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone, PartialEq)]
-#[serde(rename_all = "snake_case")]
-#[serde(untagged)]
-pub enum JsonPayload {
-    Keyword(PayloadVariant<String>),
-    Integer(PayloadVariant<IntPayloadType>),
-    Float(PayloadVariant<FloatPayloadType>),
-    Geo(PayloadVariant<GeoPoint>),
-}
-
-/// All possible names of payload types
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone, Copy, PartialEq, Hash, Eq)]
-#[serde(rename_all = "snake_case")]
-pub enum PayloadSchemaType {
-    Keyword,
-    Integer,
-    Float,
-    Geo,
-    Text,
-    Bool,
-}
-
-/// Payload type with parameters
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone, PartialEq, Hash, Eq)]
-#[serde(rename_all = "snake_case")]
-#[serde(untagged)]
-pub enum PayloadSchemaParams {
-    Text(TextIndexParams),
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone, PartialEq, Hash, Eq)]
-#[serde(rename_all = "snake_case")]
-#[serde(untagged)]
-pub enum PayloadFieldSchema {
-    FieldType(PayloadSchemaType),
-    FieldParams(PayloadSchemaParams),
-}
-
-impl From<PayloadSchemaType> for PayloadFieldSchema {
-    fn from(payload_schema_type: PayloadSchemaType) -> Self {
-        PayloadFieldSchema::FieldType(payload_schema_type)
-    }
-}
-
-impl TryFrom<PayloadIndexInfo> for PayloadFieldSchema {
-    type Error = String;
-
-    fn try_from(index_info: PayloadIndexInfo) -> Result<Self, Self::Error> {
-        match (index_info.data_type, index_info.params) {
-            (PayloadSchemaType::Text, Some(PayloadSchemaParams::Text(params))) => Ok(
-                PayloadFieldSchema::FieldParams(PayloadSchemaParams::Text(params)),
-            ),
-            (data_type, Some(_)) => Err(format!(
-                "Payload field with type {data_type:?} has unexpected params"
-            )),
-            (data_type, None) => Ok(PayloadFieldSchema::FieldType(data_type)),
-        }
-    }
-}
-
-pub fn value_type(value: &Value) -> Option<PayloadSchemaType> {
-    match value {
-        Value::Null => None,
-        Value::Bool(_) => None,
-        Value::Number(num) => {
-            if num.is_i64() {
-                Some(PayloadSchemaType::Integer)
-            } else if num.is_f64() {
-                Some(PayloadSchemaType::Float)
-            } else {
-                None
-            }
-        }
-        Value::String(_) => Some(PayloadSchemaType::Keyword),
-        Value::Array(_) => None,
-        Value::Object(obj) => {
-            let lon_op = obj.get("lon").and_then(|x| x.as_f64());
-            let lat_op = obj.get("lat").and_then(|x| x.as_f64());
-
-            if let (Some(_), Some(_)) = (lon_op, lat_op) {
-                return Some(PayloadSchemaType::Geo);
-            }
-            None
-        }
-    }
-}
-
-pub fn infer_value_type(value: &Value) -> Option<PayloadSchemaType> {
-    match value {
-        Value::Array(array) => infer_collection_value_type(array),
-        _ => value_type(value),
-    }
-}
-
-pub fn infer_collection_value_type<'a, I>(values: I) -> Option<PayloadSchemaType>
-where
-    I: IntoIterator<Item = &'a Value>,
-{
-    let possible_types = values.into_iter().map(value_type).unique().collect_vec();
-    if possible_types.len() != 1 {
-        None // There is an ambiguity or empty array
-    } else {
-        possible_types.into_iter().next().unwrap()
-    }
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone, PartialEq, Eq)]
-#[serde(untagged)]
-pub enum ValueVariants {
-    Keyword(String),
-    Integer(IntPayloadType),
-    Bool(bool),
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone, PartialEq, Eq)]
-#[serde(untagged)]
-pub enum AnyVariants {
-    Keywords(Vec<String>),
-    Integers(Vec<IntPayloadType>),
-}
-
-/// Exact match of the given value
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone, PartialEq, Eq)]
-#[serde(rename_all = "snake_case")]
-pub struct MatchValue {
-    pub value: ValueVariants,
-}
-
-/// Full-text match of the strings.
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone, PartialEq, Eq)]
-#[serde(rename_all = "snake_case")]
-pub struct MatchText {
-    pub text: String,
-}
-
-impl From<String> for MatchText {
-    fn from(text: String) -> Self {
-        MatchText { text }
-    }
-}
-
-/// Exact match on any of the given values
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone, PartialEq, Eq)]
-#[serde(rename_all = "snake_case")]
-pub struct MatchAny {
-    pub any: AnyVariants,
-}
-
-/// Should have at least one value not matching the any given values
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone, PartialEq, Eq)]
-#[serde(rename_all = "snake_case")]
-pub struct MatchExcept {
-    pub except: AnyVariants,
-}
-
-/// Match filter request
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone, PartialEq, Eq)]
-#[serde(rename_all = "snake_case")]
-#[serde(untagged)]
-pub enum MatchInterface {
-    Value(MatchValue),
-    Text(MatchText),
-    Any(MatchAny),
-    Except(MatchExcept),
-}
-
-/// Match filter request
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone, PartialEq, Eq)]
-#[serde(from = "MatchInterface")]
-#[serde(untagged)]
-pub enum Match {
-    Value(MatchValue),
-    Text(MatchText),
-    Any(MatchAny),
-    Except(MatchExcept),
-}
-
-impl Match {
-    pub fn new_value(value: ValueVariants) -> Self {
-        Self::Value(MatchValue { value })
-    }
-
-    #[cfg(test)]
-    fn new_text(text: &str) -> Self {
-        Self::Text(MatchText { text: text.into() })
-    }
-
-    pub fn new_any(any: AnyVariants) -> Self {
-        Self::Any(MatchAny { any })
-    }
-
-    pub fn new_except(except: AnyVariants) -> Self {
-        Self::Except(MatchExcept { except })
-    }
-}
-
-impl From<AnyVariants> for Match {
-    fn from(any: AnyVariants) -> Self {
-        Self::Any(MatchAny { any })
-    }
-}
-
-impl From<MatchInterface> for Match {
-    fn from(value: MatchInterface) -> Self {
-        match value {
-            MatchInterface::Value(value) => Self::Value(MatchValue { value: value.value }),
-            MatchInterface::Text(text) => Self::Text(MatchText { text: text.text }),
-            MatchInterface::Any(any) => Self::Any(MatchAny { any: any.any }),
-            MatchInterface::Except(except) => Self::Except(MatchExcept {
-                except: except.except,
-            }),
-        }
-    }
-}
-
-impl From<bool> for Match {
-    fn from(flag: bool) -> Self {
-        Self::Value(MatchValue {
-            value: ValueVariants::Bool(flag),
-        })
-    }
-}
-
-impl From<String> for Match {
-    fn from(keyword: String) -> Self {
-        Self::Value(MatchValue {
-            value: ValueVariants::Keyword(keyword),
-        })
-    }
-}
-
-impl From<SmolStr> for Match {
-    fn from(keyword: SmolStr) -> Self {
-        Self::Value(MatchValue {
-            value: ValueVariants::Keyword(keyword.into()),
-        })
-    }
-}
-
-impl From<IntPayloadType> for Match {
-    fn from(integer: IntPayloadType) -> Self {
-        Self::Value(MatchValue {
-            value: ValueVariants::Integer(integer),
-        })
-    }
-}
-
-impl From<Vec<String>> for Match {
-    fn from(keywords: Vec<String>) -> Self {
-        Self::Any(MatchAny {
-            any: AnyVariants::Keywords(keywords),
-        })
-    }
-}
-
-impl From<Vec<String>> for MatchExcept {
-    fn from(keywords: Vec<String>) -> Self {
-        MatchExcept {
-            except: AnyVariants::Keywords(keywords),
-        }
-    }
-}
-
-impl From<Vec<IntPayloadType>> for Match {
-    fn from(integers: Vec<IntPayloadType>) -> Self {
-        Self::Any(MatchAny {
-            any: AnyVariants::Integers(integers),
-        })
-    }
-}
-
-impl From<Vec<IntPayloadType>> for MatchExcept {
-    fn from(integers: Vec<IntPayloadType>) -> Self {
-        MatchExcept {
-            except: AnyVariants::Integers(integers),
-        }
-    }
-}
-
-/// Range filter request
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Default, Clone, PartialEq)]
-#[serde(rename_all = "snake_case")]
-pub struct Range {
-    /// point.key < range.lt
-    pub lt: Option<FloatPayloadType>,
-    /// point.key > range.gt
-    pub gt: Option<FloatPayloadType>,
-    /// point.key >= range.gte
-    pub gte: Option<FloatPayloadType>,
-    /// point.key <= range.lte
-    pub lte: Option<FloatPayloadType>,
-}
-
-impl Range {
-    pub fn check_range(&self, number: FloatPayloadType) -> bool {
-        self.lt.map_or(true, |x| number < x)
-            && self.gt.map_or(true, |x| number > x)
-            && self.lte.map_or(true, |x| number <= x)
-            && self.gte.map_or(true, |x| number >= x)
-    }
-}
-
-/// Values count filter request
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Copy, Clone, PartialEq, Eq)]
-#[serde(rename_all = "snake_case")]
-pub struct ValuesCount {
-    /// point.key.length() < values_count.lt
-    pub lt: Option<usize>,
-    /// point.key.length() > values_count.gt
-    pub gt: Option<usize>,
-    /// point.key.length() >= values_count.gte
-    pub gte: Option<usize>,
-    /// point.key.length() <= values_count.lte
-    pub lte: Option<usize>,
-}
-
-impl ValuesCount {
-    pub fn check_count(&self, value: &Value) -> bool {
-        let count = match value {
-            Value::Null => 0,
-            Value::Array(array) => array.len(),
-            _ => 1,
-        };
-
-        self.lt.map_or(true, |x| count < x)
-            && self.gt.map_or(true, |x| count > x)
-            && self.lte.map_or(true, |x| count <= x)
-            && self.gte.map_or(true, |x| count >= x)
-    }
-}
-
-/// Geo filter request
-///
-/// Matches coordinates inside the rectangle, described by coordinates of lop-left and bottom-right edges
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone, PartialEq)]
-#[serde(rename_all = "snake_case")]
-pub struct GeoBoundingBox {
-    /// Coordinates of the top left point of the area rectangle
-    pub top_left: GeoPoint,
-    /// Coordinates of the bottom right point of the area rectangle
-    pub bottom_right: GeoPoint,
-}
-
-impl GeoBoundingBox {
-    pub fn check_point(&self, lon: f64, lat: f64) -> bool {
-        (self.top_left.lon < lon)
-            && (lon < self.bottom_right.lon)
-            && (self.bottom_right.lat < lat)
-            && (lat < self.top_left.lat)
-    }
-}
-
-/// Geo filter request
-///
-/// Matches coordinates inside the circle of `radius` and center with coordinates `center`
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone, PartialEq)]
-#[serde(rename_all = "snake_case")]
-pub struct GeoRadius {
-    /// Coordinates of the top left point of the area rectangle
-    pub center: GeoPoint,
-    /// Radius of the area in meters
-    pub radius: f64,
-}
-
-impl GeoRadius {
-    pub fn check_point(&self, lon: f64, lat: f64) -> bool {
-        let query_center = Point::new(self.center.lon, self.center.lat);
-        query_center.haversine_distance(&Point::new(lon, lat)) < self.radius
-    }
-}
-
-/// Geo filter request
-///
-/// Matches coordinates inside the polygon, defined by the given coordinates in order.
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone, PartialEq)]
-#[serde(rename_all = "snake_case")]
-pub struct GeoPolygon {
-    /// Ordered list of coordinates representing the vertices of a polygon.
-    pub points: Vec<GeoPoint>,
-}
-
-impl GeoPolygon {
-    pub fn check_point(&self, lon: f64, lat: f64) -> bool {
-        let polygon_points: Vec<Coord<f64>> = self
-            .points
-            .iter()
-            .map(|p| Coord { x: p.lon, y: p.lat })
-            .collect();
-
-        let polygon = Polygon::new(polygon_points.into(), vec![]);
-
-        let point = Coord { x: lon, y: lat };
-
-        polygon.contains(&point)
-    }
-}
-
-/// All possible payload filtering conditions
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone, PartialEq)]
-#[serde(rename_all = "snake_case")]
-pub struct FieldCondition {
-    /// Payload key
-    pub key: PayloadKeyType,
-    /// Check if point has field with a given value
-    pub r#match: Option<Match>,
-    /// Check if points value lies in a given range
-    pub range: Option<Range>,
-    /// Check if points geo location lies in a given area
-    pub geo_bounding_box: Option<GeoBoundingBox>,
-    /// Check if geo point is within a given radius
-    pub geo_radius: Option<GeoRadius>,
-    /// Check if geo point is within a given polygon
-    #[serde(skip)] // TODO: uncomment when geo_polygon is implemented
-    pub geo_polygon: Option<GeoPolygon>,
-    /// Check number of values of the field
-    pub values_count: Option<ValuesCount>,
-}
-
-impl FieldCondition {
-    pub fn new_match(key: impl Into<PayloadKeyType>, r#match: Match) -> Self {
-        Self {
-            key: key.into(),
-            r#match: Some(r#match),
-            range: None,
-            geo_bounding_box: None,
-            geo_radius: None,
-            geo_polygon: None,
-            values_count: None,
-        }
-    }
-
-    pub fn new_range(key: impl Into<PayloadKeyType>, range: Range) -> Self {
-        Self {
-            key: key.into(),
-            r#match: None,
-            range: Some(range),
-            geo_bounding_box: None,
-            geo_radius: None,
-            geo_polygon: None,
-            values_count: None,
-        }
-    }
-
-    pub fn new_geo_bounding_box(
-        key: impl Into<PayloadKeyType>,
-        geo_bounding_box: GeoBoundingBox,
-    ) -> Self {
-        Self {
-            key: key.into(),
-            r#match: None,
-            range: None,
-            geo_bounding_box: Some(geo_bounding_box),
-            geo_radius: None,
-            geo_polygon: None,
-            values_count: None,
-        }
-    }
-
-    pub fn new_geo_radius(key: impl Into<PayloadKeyType>, geo_radius: GeoRadius) -> Self {
-        Self {
-            key: key.into(),
-            r#match: None,
-            range: None,
-            geo_bounding_box: None,
-            geo_radius: Some(geo_radius),
-            geo_polygon: None,
-            values_count: None,
-        }
-    }
-
-    pub fn new_geo_polygon(key: impl Into<PayloadKeyType>, geo_polygon: GeoPolygon) -> Self {
-        Self {
-            key: key.into(),
-            r#match: None,
-            range: None,
-            geo_bounding_box: None,
-            geo_radius: None,
-            geo_polygon: Some(geo_polygon),
-            values_count: None,
-        }
-    }
-
-    pub fn new_values_count(key: impl Into<PayloadKeyType>, values_count: ValuesCount) -> Self {
-        Self {
-            key: key.into(),
-            r#match: None,
-            range: None,
-            geo_bounding_box: None,
-            geo_radius: None,
-            geo_polygon: None,
-            values_count: Some(values_count),
-        }
-    }
-}
-
-/// Payload field
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone, PartialEq, Eq)]
-pub struct PayloadField {
-    /// Payload field name
-    pub key: PayloadKeyType,
-}
-
-/// Select points with empty payload for a specified field
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone, PartialEq, Eq)]
-pub struct IsEmptyCondition {
-    pub is_empty: PayloadField,
-}
-
-/// Select points with null payload for a specified field
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone, PartialEq, Eq)]
-pub struct IsNullCondition {
-    pub is_null: PayloadField,
-}
-
-impl From<String> for IsNullCondition {
-    fn from(key: String) -> Self {
-        IsNullCondition {
-            is_null: PayloadField { key },
-        }
-    }
-}
-
-impl From<String> for IsEmptyCondition {
-    fn from(key: String) -> Self {
-        IsEmptyCondition {
-            is_empty: PayloadField { key },
-        }
-    }
-}
-
-/// ID-based filtering condition
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone, PartialEq, Eq)]
-pub struct HasIdCondition {
-    pub has_id: HashSet<PointIdType>,
-}
-
-impl From<HashSet<PointIdType>> for HasIdCondition {
-    fn from(set: HashSet<PointIdType>) -> Self {
-        HasIdCondition { has_id: set }
-    }
-}
-
-/// Select points with payload for a specified nested field
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone, PartialEq)]
-pub struct Nested {
-    pub key: PayloadKeyType,
-    pub filter: Filter,
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone, PartialEq)]
-pub struct NestedCondition {
-    pub nested: Nested,
-}
-
-/// Container to workaround the untagged enum limitation for condition
-impl NestedCondition {
-    pub fn new(nested: Nested) -> Self {
-        Self { nested }
-    }
-
-    /// Get the raw key without any modifications
-    pub fn raw_key(&self) -> &str {
-        &self.nested.key
-    }
-
-    /// Nested is made to be used with arrays, so we add `[]` to the key if it is not present for convenience
-    pub fn array_key(&self) -> String {
-        let raw = self.raw_key();
-        if raw.ends_with("[]") {
-            raw.to_string()
-        } else {
-            format!("{}[]", raw)
-        }
-    }
-
-    pub fn filter(&self) -> &Filter {
-        &self.nested.filter
-    }
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone, PartialEq)]
-#[serde(untagged)]
-#[allow(clippy::large_enum_variant)]
-pub enum Condition {
-    /// Check if field satisfies provided condition
-    Field(FieldCondition),
-    /// Check if payload field is empty: equals to empty array, or does not exists
-    IsEmpty(IsEmptyCondition),
-    /// Check if payload field equals `NULL`
-    IsNull(IsNullCondition),
-    /// Check if points id is in a given set
-    HasId(HasIdCondition),
-    /// Nested filters
-    Nested(NestedCondition),
-    /// Nested filter
-    Filter(Filter),
-}
-
-impl Condition {
-    pub fn new_nested(key: impl Into<String>, filter: Filter) -> Self {
-        Self::Nested(NestedCondition {
-            nested: Nested {
-                key: key.into(),
-                filter,
-            },
-        })
-    }
-}
-
-/// Options for specifying which payload to include or not
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone)]
-#[serde(rename_all = "snake_case")]
-#[serde(untagged)]
-pub enum WithPayloadInterface {
-    /// If `true` - return all payload,
-    /// If `false` - do not return payload
-    Bool(bool),
-    /// Specify which fields to return
-    Fields(Vec<String>),
-    /// Specify included or excluded fields
-    Selector(PayloadSelector),
-}
-
-impl From<bool> for WithPayloadInterface {
-    fn from(b: bool) -> Self {
-        WithPayloadInterface::Bool(b)
-    }
-}
-
-/// Options for specifying which vector to include
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone, PartialEq, Eq)]
-#[serde(rename_all = "snake_case")]
-#[serde(untagged)]
-pub enum WithVector {
-    /// If `true` - return all vector,
-    /// If `false` - do not return vector
-    Bool(bool),
-    /// Specify which vector to return
-    Selector(Vec<String>),
-}
-
-impl WithVector {
-    pub fn is_some(&self) -> bool {
-        match self {
-            WithVector::Bool(b) => *b,
-            WithVector::Selector(_) => true,
-        }
-    }
-}
-
-impl From<bool> for WithVector {
-    fn from(b: bool) -> Self {
-        WithVector::Bool(b)
-    }
-}
-
-impl Default for WithVector {
-    fn default() -> Self {
-        WithVector::Bool(false)
-    }
-}
-
-impl WithPayloadInterface {
-    pub fn is_required(&self) -> bool {
-        match self {
-            WithPayloadInterface::Bool(b) => *b,
-            _ => true,
-        }
-    }
-}
-
-impl From<bool> for WithPayload {
-    fn from(x: bool) -> Self {
-        WithPayload {
-            enable: x,
-            payload_selector: None,
-        }
-    }
-}
-
-impl From<&WithPayloadInterface> for WithPayload {
-    fn from(interface: &WithPayloadInterface) -> Self {
-        match interface {
-            WithPayloadInterface::Bool(x) => WithPayload {
-                enable: *x,
-                payload_selector: None,
-            },
-            WithPayloadInterface::Fields(x) => WithPayload {
-                enable: true,
-                payload_selector: Some(PayloadSelector::new_include(x.clone())),
-            },
-            WithPayloadInterface::Selector(x) => WithPayload {
-                enable: true,
-                payload_selector: Some(x.clone()),
-            },
-        }
-    }
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone, PartialEq, Eq)]
-#[serde(deny_unknown_fields)]
-#[serde(rename_all = "snake_case")]
-pub struct PayloadSelectorInclude {
-    /// Only include this payload keys
-    pub include: Vec<PayloadKeyType>,
-}
-
-impl PayloadSelectorInclude {
-    pub fn new(include: Vec<PayloadKeyType>) -> Self {
-        Self { include }
-    }
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone, PartialEq, Eq)]
-#[serde(deny_unknown_fields)]
-#[serde(rename_all = "snake_case")]
-pub struct PayloadSelectorExclude {
-    /// Exclude this fields from returning payload
-    pub exclude: Vec<PayloadKeyType>,
-}
-
-impl PayloadSelectorExclude {
-    pub fn new(exclude: Vec<PayloadKeyType>) -> Self {
-        Self { exclude }
-    }
-}
-
-/// Specifies how to treat payload selector
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone, PartialEq, Eq)]
-#[serde(untagged)]
-#[serde(rename_all = "snake_case")]
-pub enum PayloadSelector {
-    /// Include only this fields into response payload
-    Include(PayloadSelectorInclude),
-    /// Exclude this fields from result payload. Keep all other fields.
-    Exclude(PayloadSelectorExclude),
-}
-
-impl From<PayloadSelectorExclude> for WithPayloadInterface {
-    fn from(selector: PayloadSelectorExclude) -> Self {
-        WithPayloadInterface::Selector(PayloadSelector::Exclude(selector))
-    }
-}
-
-impl From<PayloadSelectorInclude> for WithPayloadInterface {
-    fn from(selector: PayloadSelectorInclude) -> Self {
-        WithPayloadInterface::Selector(PayloadSelector::Include(selector))
-    }
-}
-
-impl PayloadSelector {
-    pub fn new_include(vecs_payload_key_type: Vec<PayloadKeyType>) -> Self {
-        PayloadSelector::Include(PayloadSelectorInclude {
-            include: vecs_payload_key_type,
-        })
-    }
-
-    #[allow(clippy::ptr_arg)]
-    pub fn check(&self, key: &PayloadKeyType) -> bool {
-        match self {
-            PayloadSelector::Include(selector) => selector.include.contains(key),
-            PayloadSelector::Exclude(selector) => !selector.exclude.contains(key),
-        }
-    }
-
-    pub fn process(&self, x: Payload) -> Payload {
-        let map: serde_json::Map<String, Value> =
-            x.into_iter().filter(|(key, _)| self.check(key)).collect();
-        map.into()
-    }
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone, Default, PartialEq, Eq)]
-#[serde(deny_unknown_fields)]
-#[serde(rename_all = "snake_case")]
-pub struct WithPayload {
-    /// Enable return payloads or not
-    pub enable: bool,
-    /// Filter include and exclude payloads
-    pub payload_selector: Option<PayloadSelector>,
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone, PartialEq, Default)]
-#[serde(deny_unknown_fields)]
-#[serde(rename_all = "snake_case")]
-pub struct Filter {
-    /// At least one of those conditions should match
-    pub should: Option<Vec<Condition>>,
-    /// All conditions must match
-    pub must: Option<Vec<Condition>>,
-    /// All conditions must NOT match
-    pub must_not: Option<Vec<Condition>>,
-}
-
-impl Filter {
-    pub fn new_should(condition: Condition) -> Self {
-        Filter {
-            should: Some(vec![condition]),
-            must: None,
-            must_not: None,
-        }
-    }
-
-    pub fn new_must(condition: Condition) -> Self {
-        Filter {
-            should: None,
-            must: Some(vec![condition]),
-            must_not: None,
-        }
-    }
-
-    pub fn new_must_not(condition: Condition) -> Self {
-        Filter {
-            should: None,
-            must: None,
-            must_not: Some(vec![condition]),
-        }
-    }
-
-    pub fn merge(&self, other: &Filter) -> Filter {
-        let merge_component = |this, other| -> Option<Vec<Condition>> {
-            match (this, other) {
-                (None, None) => None,
-                (Some(this), None) => Some(this),
-                (None, Some(other)) => Some(other),
-                (Some(mut this), Some(other)) => {
-                    this.extend(other);
-                    Some(this)
-                }
-            }
-        };
-        Filter {
-            should: merge_component(self.should.clone(), other.should.clone()),
-            must: merge_component(self.must.clone(), other.must.clone()),
-            must_not: merge_component(self.must_not.clone(), other.must_not.clone()),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use serde::de::DeserializeOwned;
-    use serde_json;
-    use serde_json::json;
-
-    use super::*;
-    use crate::common::utils::remove_value_from_json_map;
-
-    #[allow(dead_code)]
-    fn check_rms_serialization<T: Serialize + DeserializeOwned + PartialEq + std::fmt::Debug>(
-        record: T,
-    ) {
-        let binary_entity = rmp_serde::to_vec(&record).expect("serialization ok");
-        let de_record: T = rmp_serde::from_slice(&binary_entity).expect("deserialization ok");
-
-        assert_eq!(record, de_record);
-    }
-
-    #[test]
-    #[ignore]
-    fn test_rmp_vs_cbor_deserialize() {
-        let payload: Payload = json!({"payload_key":"payload_value"}).into();
-        let raw = rmp_serde::to_vec(&payload).unwrap();
-        let de_record: Payload = serde_cbor::from_slice(&raw).unwrap();
-        eprintln!("payload = {payload:#?}");
-        eprintln!("de_record = {de_record:#?}");
-    }
-
-    #[test]
-    fn test_geo_radius_check_point() {
-        let radius = GeoRadius {
-            center: GeoPoint { lon: 0.0, lat: 0.0 },
-            radius: 80000.0,
-        };
-
-        let inside_result = radius.check_point(0.5, 0.5);
-        assert!(inside_result);
-
-        let outside_result = radius.check_point(1.5, 1.5);
-        assert!(!outside_result);
-    }
-
-    #[test]
-    fn test_geo_boundingbox_check_point() {
-        let bounding_box = GeoBoundingBox {
-            top_left: GeoPoint {
-                lon: -1.0,
-                lat: 1.0,
-            },
-            bottom_right: GeoPoint {
-                lon: 1.0,
-                lat: -1.0,
-            },
-        };
-
-        // haversine distance between (0, 0) and (0.5, 0.5) is 78626.29627999048
-        let inside_result = bounding_box.check_point(-0.5, 0.5);
-        assert!(inside_result);
-
-        // haversine distance between (0, 0) and (0.5, 0.5) is 235866.91169814655
-        let outside_result = bounding_box.check_point(1.5, 1.5);
-        assert!(!outside_result);
-    }
-
-    #[test]
-    fn test_geo_polygon_check_point() {
-        // Create a GeoPolygon with a square shape
-        let polygon_1 = GeoPolygon {
-            points: vec![
-                GeoPoint {
-                    lon: -1.0,
-                    lat: -1.0,
-                },
-                GeoPoint {
-                    lon: 1.0,
-                    lat: -1.0,
-                },
-                GeoPoint { lon: 1.0, lat: 1.0 },
-                GeoPoint {
-                    lon: -1.0,
-                    lat: 1.0,
-                },
-            ],
-        };
-
-        let inside_result = polygon_1.check_point(0.5, 0.5);
-        assert!(inside_result);
-
-        let outside_result = polygon_1.check_point(1.5, 1.5);
-        assert!(!outside_result);
-
-        let on_edge_result = polygon_1.check_point(1.0, 0.0);
-        assert!(!on_edge_result);
-
-        // Create a GeoPolygon as a `twisted square`
-        let polygon_2 = GeoPolygon {
-            points: vec![
-                GeoPoint {
-                    lon: -1.0,
-                    lat: -1.0,
-                },
-                GeoPoint { lon: 1.0, lat: 1.0 },
-                GeoPoint {
-                    lon: 1.0,
-                    lat: -1.0,
-                },
-                GeoPoint {
-                    lon: -1.0,
-                    lat: 1.0,
-                },
-            ],
-        };
-
-        let inside_result_2 = polygon_2.check_point(0.5, 0.0);
-        assert!(inside_result_2);
-
-        let outside_result_2 = polygon_2.check_point(0.0, 0.5);
-        assert!(!outside_result_2);
-
-        let on_edge_result_2 = polygon_2.check_point(0.0, 0.0);
-        assert!(!on_edge_result_2);
-    }
-
-    #[test]
-    fn test_serialize_query() {
-        let filter = Filter {
-            must: Some(vec![Condition::Field(FieldCondition::new_match(
-                "hello".to_owned(),
-                "world".to_owned().into(),
-            ))]),
-            must_not: None,
-            should: None,
-        };
-        let json = serde_json::to_string_pretty(&filter).unwrap();
-        eprintln!("{json}")
-    }
-
-    #[test]
-    fn test_deny_unknown_fields() {
-        let query1 = r#"
-         {
-            "wrong": "query"
-         }
-         "#;
-        let filter: Result<Filter, _> = serde_json::from_str(query1);
-
-        assert!(filter.is_err())
-    }
-
-    #[test]
-    fn test_parse_match_query() {
-        let query = r#"
-        {
-            "key": "hello",
-            "match": { "value": 42 }
-        }
-        "#;
-        let condition: FieldCondition = serde_json::from_str(query).unwrap();
-        assert_eq!(
-            condition.r#match.unwrap(),
-            Match::Value(MatchValue {
-                value: ValueVariants::Integer(42)
-            })
-        );
-
-        let query = r#"
-        {
-            "key": "hello",
-            "match": { "value": true }
-        }
-        "#;
-        let condition: FieldCondition = serde_json::from_str(query).unwrap();
-        assert_eq!(
-            condition.r#match.unwrap(),
-            Match::Value(MatchValue {
-                value: ValueVariants::Bool(true)
-            })
-        );
-
-        let query = r#"
-        {
-            "key": "hello",
-            "match": { "value": "world" }
-        }
-        "#;
-
-        let condition: FieldCondition = serde_json::from_str(query).unwrap();
-        assert_eq!(
-            condition.r#match.unwrap(),
-            Match::Value(MatchValue {
-                value: ValueVariants::Keyword("world".to_owned())
-            })
-        );
-    }
-
-    #[test]
-    fn test_parse_match_any() {
-        let query = r#"
-        {
-            "should": [
-                {
-                    "key": "Jason",
-                    "match": {
-                        "any": [
-                            "Bourne",
-                            "Momoa",
-                            "Statham"
-                        ]
-                    }
-                }
-            ]
-        }
-        "#;
-
-        let filter: Filter = serde_json::from_str(query).unwrap();
-        let should = filter.should.unwrap();
-
-        assert_eq!(should.len(), 1);
-        let c = match should.get(0) {
-            Some(Condition::Field(c)) => c,
-            _ => panic!("Condition::Field expected"),
-        };
-
-        assert_eq!(c.key.as_str(), "Jason");
-
-        let m = match c.r#match.as_ref().unwrap() {
-            Match::Any(m) => m,
-            _ => panic!("Match::Any expected"),
-        };
-        if let AnyVariants::Keywords(kws) = &m.any {
-            assert_eq!(kws.len(), 3);
-            assert_eq!(kws.to_owned(), vec!["Bourne", "Momoa", "Statham"]);
-        } else {
-            panic!("AnyVariants::Keywords expected");
-        }
-    }
-
-    #[test]
-    fn test_parse_match_any_mixed_types() {
-        let query = r#"
-        {
-            "should": [
-                {
-                    "key": "Jason",
-                    "match": {
-                        "any": [
-                            "Bourne",
-                            42
-                        ]
-                    }
-                }
-            ]
-        }
-        "#;
-
-        let result: Result<Filter, _> = serde_json::from_str(query);
-        assert!(result.is_err());
-    }
-
-    #[test]
-    fn test_parse_nested_match_query() {
-        let query = r#"
-        {
-            "key": "hello.nested",
-            "match": { "value": 42 }
-        }
-        "#;
-        let condition: FieldCondition = serde_json::from_str(query).unwrap();
-        assert_eq!(
-            condition.r#match.unwrap(),
-            Match::Value(MatchValue {
-                value: ValueVariants::Integer(42)
-            })
-        );
-
-        let query = r#"
-        {
-            "key": "hello.nested",
-            "match": { "value": true }
-        }
-        "#;
-        let condition: FieldCondition = serde_json::from_str(query).unwrap();
-        assert_eq!(
-            condition.r#match.unwrap(),
-            Match::Value(MatchValue {
-                value: ValueVariants::Bool(true)
-            })
-        );
-
-        let query = r#"
-        {
-            "key": "hello.nested",
-            "match": { "value": "world" }
-        }
-        "#;
-
-        let condition: FieldCondition = serde_json::from_str(query).unwrap();
-        assert_eq!(
-            condition.r#match.unwrap(),
-            Match::Value(MatchValue {
-                value: ValueVariants::Keyword("world".to_owned())
-            })
-        );
-    }
-
-    #[test]
-    fn test_parse_empty_query() {
-        let query = r#"
-        {
-            "should": [
-                {
-                    "is_empty" : {
-                        "key" : "Jason"
-                    }
-                }
-            ]
-        }
-        "#;
-
-        let filter: Filter = serde_json::from_str(query).unwrap();
-        let should = filter.should.unwrap();
-
-        assert_eq!(should.len(), 1);
-        let c = match should.get(0) {
-            Some(Condition::IsEmpty(c)) => c,
-            _ => panic!("Condition::IsEmpty expected"),
-        };
-
-        assert_eq!(c.is_empty.key.as_str(), "Jason");
-    }
-
-    #[test]
-    fn test_parse_null_query() {
-        let query = r#"
-        {
-            "should": [
-                {
-                    "is_null" : {
-                        "key" : "Jason"
-                    }
-                }
-            ]
-        }
-        "#;
-
-        let filter: Filter = serde_json::from_str(query).unwrap();
-        let should = filter.should.unwrap();
-
-        assert_eq!(should.len(), 1);
-        let c = match should.get(0) {
-            Some(Condition::IsNull(c)) => c,
-            _ => panic!("Condition::IsNull expected"),
-        };
-
-        assert_eq!(c.is_null.key.as_str(), "Jason");
-    }
-
-    #[test]
-    fn test_parse_nested_filter_query() {
-        let query = r#"
-        {
-          "must": [
-            {
-              "nested": {
-                "key": "country.cities",
-                "filter": {
-                  "must": [
-                    {
-                      "key": "population",
-                      "range": {
-                        "gte": 8
-                      }
-                    },
-                    {
-                      "key": "sightseeing",
-                      "values_count": {
-                        "lt": 3
-                      }
-                    }
-                  ]
-                }
-              }
-            }
-          ]
-        }
-        "#;
-        let filter: Filter = serde_json::from_str(query).unwrap();
-        let musts = filter.must.unwrap();
-        assert_eq!(musts.len(), 1);
-        match musts.get(0) {
-            Some(Condition::Nested(nested_condition)) => {
-                assert_eq!(nested_condition.raw_key(), "country.cities");
-                assert_eq!(nested_condition.array_key(), "country.cities[]");
-                let nested_musts = nested_condition.filter().must.as_ref().unwrap();
-                assert_eq!(nested_musts.len(), 2);
-                let first_must = nested_musts.get(0).unwrap();
-                match first_must {
-                    Condition::Field(c) => {
-                        assert_eq!(c.key, "population");
-                        assert!(c.range.is_some());
-                    }
-                    _ => panic!("Condition::Field expected"),
-                }
-
-                let second_must = nested_musts.get(1).unwrap();
-                match second_must {
-                    Condition::Field(c) => {
-                        assert_eq!(c.key, "sightseeing");
-                        assert!(c.values_count.is_some());
-                    }
-                    _ => panic!("Condition::Field expected"),
-                }
-            }
-            o => panic!("Condition::Nested expected but got {:?}", o),
-        };
-    }
-
-    #[test]
-    fn test_payload_query_parse() {
-        let query1 = r#"
-        {
-            "must": [
-                {
-                    "key": "hello",
-                    "match": {
-                        "value": 42
-                    }
-                },
-                {
-                    "must_not": [
-                        {
-                            "has_id": [1, 2, 3, 4]
-                        },
-                        {
-                            "key": "geo_field",
-                            "geo_bounding_box": {
-                                "top_left": {
-                                    "lon": 13.410146,
-                                    "lat": 52.519289
-                                },
-                                "bottom_right": {
-                                    "lon": 13.432683,
-                                    "lat": 52.505582
-                                }
-                            }
-                        }
-                    ]
-                }
-            ]
-        }
-        "#;
-
-        let filter: Filter = serde_json::from_str(query1).unwrap();
-        eprintln!("{filter:?}");
-        let must = filter.must.unwrap();
-        let _must_not = filter.must_not;
-        assert_eq!(must.len(), 2);
-        match must.get(1) {
-            Some(Condition::Filter(f)) => {
-                let must_not = &f.must_not;
-                match must_not {
-                    Some(v) => assert_eq!(v.len(), 2),
-                    None => panic!("Filter expected"),
-                }
-            }
-            _ => panic!("Condition expected"),
-        }
-    }
-
-    #[test]
-    fn test_nested_payload_query_parse() {
-        let query1 = r#"
-        {
-            "must": [
-                {
-                    "key": "hello.nested.world",
-                    "match": {
-                        "value": 42
-                    }
-                },
-                {
-                    "key": "foo.nested.bar",
-                    "match": {
-                        "value": 1
-                    }
-                }
-            ]
-        }
-        "#;
-
-        let filter: Filter = serde_json::from_str(query1).unwrap();
-        let must = filter.must.unwrap();
-        assert_eq!(must.len(), 2);
-    }
-
-    #[test]
-    fn test_geo_validation() {
-        let query1 = r#"
-        {
-            "must": [
-                {
-                    "key": "geo_field",
-                    "geo_bounding_box": {
-                        "top_left": {
-                            "lon": 1113.410146,
-                            "lat": 52.519289
-                        },
-                        "bottom_right": {
-                            "lon": 13.432683,
-                            "lat": 52.505582
-                        }
-                    }
-                }
-            ]
-        }
-        "#;
-
-        let filter: Result<Filter, _> = serde_json::from_str(query1);
-
-        assert!(filter.is_err());
-    }
-
-    #[test]
-    fn test_remove_key() {
-        let mut payload: Payload = serde_json::from_str(
-            r#"
-        {
-            "a": 1,
-            "b": {
-                "c": 123,
-                "e": {
-                    "f": [1,2,3],
-                    "g": 7,
-                    "h": "text",
-                    "i": [
-                        {
-                            "j": 1,
-                            "k": 2
-
-                        },
-                        {
-                            "j": 3,
-                            "k": 4
-                        }
-                    ]
-                }
-            }
-        }
-        "#,
-        )
-        .unwrap();
-        let removed = remove_value_from_json_map("b.c", &mut payload.0).values();
-        assert_eq!(removed, vec![Value::Number(123.into())]);
-        assert_ne!(payload, Default::default());
-
-        let removed = remove_value_from_json_map("b.e.f[1]", &mut payload.0).values();
-        assert_eq!(removed, vec![Value::Number(2.into())]);
-        assert_ne!(payload, Default::default());
-
-        let removed = remove_value_from_json_map("b.e.i[0].j", &mut payload.0).values();
-        assert_eq!(removed, vec![Value::Number(1.into())]);
-        assert_ne!(payload, Default::default());
-
-        let removed = remove_value_from_json_map("b.e.i[].k", &mut payload.0).values();
-        assert_eq!(
-            removed,
-            vec![Value::Number(2.into()), Value::Number(4.into())]
-        );
-        assert_ne!(payload, Default::default());
-
-        let removed = remove_value_from_json_map("b.e.i[]", &mut payload.0).values();
-        assert_eq!(
-            removed,
-            vec![Value::Array(vec![
-                Value::Object(serde_json::Map::from_iter(vec![])),
-                Value::Object(serde_json::Map::from_iter(vec![(
-                    "j".to_string(),
-                    Value::Number(3.into())
-                ),])),
-            ])]
-        );
-        assert_ne!(payload, Default::default());
-
-        let removed = remove_value_from_json_map("b.e.i", &mut payload.0).values();
-        assert_eq!(removed, vec![Value::Array(vec![])]);
-        assert_ne!(payload, Default::default());
-
-        let removed = remove_value_from_json_map("b.e.f", &mut payload.0).values();
-        assert_eq!(removed, vec![Value::Array(vec![1.into(), 3.into()])]);
-        assert_ne!(payload, Default::default());
-
-        let removed = remove_value_from_json_map("k", &mut payload.0);
-        assert!(removed.as_ref().check_is_empty());
-        assert_ne!(payload, Default::default());
-
-        let removed = remove_value_from_json_map("", &mut payload.0);
-        assert!(removed.as_ref().check_is_empty());
-        assert_ne!(payload, Default::default());
-
-        let removed = remove_value_from_json_map("b.e.l", &mut payload.0);
-        assert!(removed.as_ref().check_is_empty());
-        assert_ne!(payload, Default::default());
-
-        let removed = remove_value_from_json_map("a", &mut payload.0).values();
-        assert_eq!(removed, vec![Value::Number(1.into())]);
-        assert_ne!(payload, Default::default());
-
-        let removed = remove_value_from_json_map("b.e", &mut payload.0).values();
-        assert_eq!(
-            removed,
-            vec![Value::Object(serde_json::Map::from_iter(vec![
-                // ("f".to_string(), Value::Array(vec![1.into(), 2.into(), 3.into()])), has been removed
-                ("g".to_string(), Value::Number(7.into())),
-                ("h".to_string(), Value::String("text".to_owned())),
-            ]))]
-        );
-        assert_ne!(payload, Default::default());
-
-        let removed = remove_value_from_json_map("b", &mut payload.0).values();
-        assert_eq!(
-            removed,
-            vec![Value::Object(serde_json::Map::from_iter(vec![]))]
-        ); // empty object left
-        assert_eq!(payload, Default::default());
-    }
-
-    #[test]
-    fn test_payload_parsing() {
-        let ft = PayloadFieldSchema::FieldType(PayloadSchemaType::Keyword);
-        let ft_json = serde_json::to_string(&ft).unwrap();
-        eprintln!("ft_json = {ft_json:?}");
-
-        let ft = PayloadFieldSchema::FieldParams(PayloadSchemaParams::Text(Default::default()));
-        let ft_json = serde_json::to_string(&ft).unwrap();
-        eprintln!("ft_json = {ft_json:?}");
-
-        let query = r#""keyword""#;
-        let field_type: PayloadSchemaType = serde_json::from_str(query).unwrap();
-        eprintln!("field_type = {field_type:?}");
-    }
-
-    #[test]
-    fn merge_filters() {
-        let condition1 = Condition::Field(FieldCondition::new_match(
-            "summary",
-            Match::new_text("Berlin"),
-        ));
-        let mut this = Filter::new_must(condition1.clone());
-        this.should = Some(vec![condition1.clone()]);
-
-        let condition2 = Condition::Field(FieldCondition::new_match(
-            "city",
-            Match::new_value(ValueVariants::Keyword("Osaka".into())),
-        ));
-        let other = Filter::new_must(condition2.clone());
-
-        let merged = this.merge(&other);
-
-        assert!(merged.must.is_some());
-        assert!(merged.must.as_ref().unwrap().len() == 2);
-        assert!(merged.must_not.is_none());
-        assert!(merged.should.is_some());
-        assert!(merged.should.as_ref().unwrap().len() == 1);
-
-        assert!(merged.must.as_ref().unwrap().contains(&condition1));
-        assert!(merged.must.as_ref().unwrap().contains(&condition2));
-        assert!(merged.should.as_ref().unwrap().contains(&condition1));
-    }
-}
-
-pub type TheMap<K, V> = BTreeMap<K, V>;
diff --git a/crates/qdrant/lib/segment/src/utils/fmt.rs b/crates/qdrant/lib/segment/src/utils/fmt.rs
deleted file mode 100644
index 591dba3..0000000
--- a/crates/qdrant/lib/segment/src/utils/fmt.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-use std::fmt;
-
-#[derive(Copy, Clone, Debug)]
-pub struct SerdeValue<'a>(pub &'a serde_value::Value);
-
-impl<'a> fmt::Display for SerdeValue<'a> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        let val: &dyn fmt::Display = match &self.0 {
-            serde_value::Value::Bool(val) => val,
-            serde_value::Value::U8(val) => val,
-            serde_value::Value::U16(val) => val,
-            serde_value::Value::U32(val) => val,
-            serde_value::Value::U64(val) => val,
-            serde_value::Value::I8(val) => val,
-            serde_value::Value::I16(val) => val,
-            serde_value::Value::I32(val) => val,
-            serde_value::Value::I64(val) => val,
-            serde_value::Value::F32(val) => val,
-            serde_value::Value::F64(val) => val,
-            serde_value::Value::Char(val) => val,
-            serde_value::Value::String(val) => val,
-            serde_value::Value::Unit => &"Unit",
-            serde_value::Value::Option(val) => return write!(f, "{val:?}"),
-            serde_value::Value::Newtype(val) => return write!(f, "{val:?}"),
-            serde_value::Value::Seq(val) => return write!(f, "{val:?}"),
-            serde_value::Value::Map(val) => return write!(f, "{val:?}"),
-            serde_value::Value::Bytes(val) => return write!(f, "{val:?}"),
-        };
-
-        val.fmt(f)
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/utils/fs.rs b/crates/qdrant/lib/segment/src/utils/fs.rs
deleted file mode 100644
index fb7ddd4..0000000
--- a/crates/qdrant/lib/segment/src/utils/fs.rs
+++ /dev/null
@@ -1,113 +0,0 @@
-use std::path::{Path, PathBuf};
-use std::{fmt, fs};
-
-use crate::entry::entry_point::{OperationError, OperationResult};
-
-/// Move all files and directories from the `dir` directory to the `dest_dir` directory.
-///
-/// - `<dir>/child/directory` will be merged with `<dest-dir>/child/directory` if one already exists
-/// - `<dir>/some/file` will overwrite `<dest-dir>/some/file` if one already exists
-pub fn move_all(dir: &Path, dest_dir: &Path) -> OperationResult<()> {
-    assert_is_dir(dir)?;
-    assert_is_dir(dest_dir)?;
-
-    move_all_impl(dir, dir, dest_dir).map_err(|err| failed_to_move_error(dir, dest_dir, err))
-}
-
-fn move_all_impl(base: &Path, dir: &Path, dest_dir: &Path) -> OperationResult<()> {
-    let entries = dir.read_dir().map_err(|err| {
-        if base != dir {
-            failed_to_read_dir_error(dir, err)
-        } else {
-            err.into()
-        }
-    })?;
-
-    for entry in entries {
-        let entry = entry.map_err(|err| {
-            if base != dir {
-                failed_to_read_dir_error(dir, err)
-            } else {
-                err.into()
-            }
-        })?;
-
-        let path = entry.path();
-
-        let name = path
-            .file_name()
-            .ok_or_else(|| failed_to_move_error(&path, dest_dir, "source path ends with .."))?;
-
-        let dest_path = dest_dir.join(name);
-
-        if path.is_dir() && dest_path.exists() {
-            move_all_impl(base, &path, &dest_path)?;
-        } else {
-            if let Some(dir) = dest_path.parent() {
-                if !dir.exists() {
-                    fs::create_dir_all(dir).map_err(|err| {
-                        failed_to_move_error(
-                            &path,
-                            &dest_path,
-                            format!("failed to create {dir:?} directory: {err}"),
-                        )
-                    })?;
-                }
-            }
-
-            fs::rename(&path, &dest_path)
-                .map_err(|err| failed_to_move_error(&path, &dest_path, err))?;
-        }
-    }
-
-    Ok(())
-}
-
-fn assert_is_dir(dir: &Path) -> OperationResult<()> {
-    if dir.is_dir() {
-        Ok(())
-    } else {
-        Err(not_a_dir_error(dir))
-    }
-}
-
-fn not_a_dir_error(dir: &Path) -> OperationError {
-    OperationError::service_error(format!(
-        "path {dir:?} is not a directory (or does not exist)"
-    ))
-}
-
-fn failed_to_read_dir_error(dir: &Path, err: impl fmt::Display) -> OperationError {
-    OperationError::service_error(format!("failed to read {dir:?} directory: {err}"))
-}
-
-fn failed_to_move_error(path: &Path, dest: &Path, err: impl fmt::Display) -> OperationError {
-    OperationError::service_error(format!("failed to move {path:?} to {dest:?}: {err}"))
-}
-
-/// Finds the first symlink in the directory tree and returns its path.
-pub fn find_symlink(directory: &Path) -> Option<PathBuf> {
-    let entries = match fs::read_dir(directory) {
-        Ok(entries) => entries,
-        Err(_) => return None,
-    };
-
-    for entry in entries {
-        let entry = match entry {
-            Ok(entry) => entry,
-            Err(_) => continue,
-        };
-
-        let path = entry.path();
-
-        if path.is_dir() {
-            if let Some(path) = find_symlink(&path) {
-                return Some(path);
-            }
-        } else if path.is_symlink() {
-            return Some(path);
-        }
-    }
-
-    None
-}
diff --git a/crates/qdrant/lib/segment/src/utils/mem.rs b/crates/qdrant/lib/segment/src/utils/mem.rs
deleted file mode 100644
index 716cba8..0000000
--- a/crates/qdrant/lib/segment/src/utils/mem.rs
+++ /dev/null
@@ -1,162 +0,0 @@
-#[derive(Debug)]
-pub struct Mem {
-    #[cfg(target_os = "linux")]
-    cgroups: Option<cgroups_mem::CgroupsMem>,
-    sysinfo: sysinfo_mem::SysinfoMem,
-}
-
-impl Mem {
-    #[allow(clippy::new_without_default)]
-    pub fn new() -> Self {
-        Self {
-            #[cfg(target_os = "linux")]
-            cgroups: cgroups_mem::CgroupsMem::new(),
-            sysinfo: sysinfo_mem::SysinfoMem::new(),
-        }
-    }
-
-    #[allow(dead_code)]
-    pub fn refresh(&mut self) {
-        #[cfg(target_os = "linux")]
-        if let Some(cgroups) = &mut self.cgroups {
-            cgroups.refresh();
-        }
-
-        self.sysinfo.refresh();
-    }
-
-    pub fn total_memory_bytes(&self) -> u64 {
-        #[cfg(target_os = "linux")]
-        if let Some(cgroups) = &self.cgroups {
-            if let Some(memory_limit_bytes) = cgroups.memory_limit_bytes() {
-                return memory_limit_bytes;
-            }
-        }
-
-        self.sysinfo.total_memory_bytes()
-    }
-
-    pub fn available_memory_bytes(&self) -> u64 {
-        #[cfg(target_os = "linux")]
-        if let Some(cgroups) = &self.cgroups {
-            if let Some(memory_limit_bytes) = cgroups.memory_limit_bytes() {
-                return memory_limit_bytes.saturating_sub(cgroups.used_memory_bytes());
-            }
-        }
-
-        self.sysinfo.available_memory_bytes()
-    }
-}
-
-#[cfg(target_os = "linux")]
-mod cgroups_mem {
-    use cgroups_rs::{hierarchies, memory, Cgroup};
-    use procfs::process::Process;
-
-    #[derive(Clone, Debug)]
-    pub struct CgroupsMem {
-        mem_controller: memory::MemController,
-        memory_limit_bytes: Option<u64>,
-        used_memory_bytes: u64,
-    }
-
-    impl CgroupsMem {
-        pub fn new() -> Option<Self> {
-            let memory_cgroup_path = match get_current_process_memory_cgroup_path() {
-                Ok(memory_cgroup_path) => memory_cgroup_path?,
-                Err(err) => {
-                    log::error!(
-                        "Failed to query current process info \
-                         while initializing CgroupsMem: {err}"
-                    );
-
-                    return None;
-                }
-            };
-
-            let cgroup = Cgroup::load(
-                hierarchies::auto(),
-                memory_cgroup_path.trim_start_matches('/'),
-            );
-
-            let mut mem = Self {
-                mem_controller: cgroup.controller_of::<memory::MemController>()?.clone(),
-                memory_limit_bytes: None,
-                used_memory_bytes: 0,
-            };
-
-            mem.refresh();
-
-            Some(mem)
-        }
-
-        pub fn refresh(&mut self) {
-            let stat = self.mem_controller.memory_stat();
-            self.memory_limit_bytes = stat.limit_in_bytes.try_into().ok();
-            self.used_memory_bytes = stat.usage_in_bytes;
-        }
-
-        pub fn memory_limit_bytes(&self) -> Option<u64> {
-            self.memory_limit_bytes
-        }
-
-        pub fn used_memory_bytes(&self) -> u64 {
-            self.used_memory_bytes
-        }
-    }
-
-    fn get_current_process_memory_cgroup_path() -> procfs::ProcResult<Option<String>> {
-        let process = Process::myself()?;
-        let cgroups = process.cgroups()?;
-
-        for cgroup in cgroups {
-            // TODO: Can a process belong to multiple v2 cgroups!?
-            let is_v2_cgroup = cgroup.controllers.is_empty()
-                || cgroup
-                    .controllers
-                    .iter()
-                    .all(|controller| controller.is_empty());
-
-            // TODO: Can a process belong to multiple v1 cgroups, with some of these cgroups having the same controllers (e.g., memory)!?
-            let is_v1_memory_cgroup = cgroup
-                .controllers
-                .iter()
-                .any(|controller| controller == "memory");
-
-            if is_v2_cgroup || is_v1_memory_cgroup {
-                return Ok(Some(cgroup.pathname));
-            }
-        }
-
-        Ok(None)
-    }
-}
-
-mod sysinfo_mem {
-    use sysinfo::{RefreshKind, System, SystemExt as _};
-
-    #[derive(Debug)]
-    pub struct SysinfoMem {
-        system: System,
-    }
-
-    impl SysinfoMem {
-        pub fn new() -> Self {
-            let mut system = System::new_with_specifics(RefreshKind::new().with_memory());
-            system.refresh_memory();
-            Self { system }
-        }
-
-        pub fn refresh(&mut self) {
-            self.system.refresh_memory();
-        }
-
-        pub fn total_memory_bytes(&self) -> u64 {
-            self.system.total_memory()
-        }
-
-        pub fn available_memory_bytes(&self) -> u64 {
-            self.system.available_memory()
-        }
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/utils/mod.rs b/crates/qdrant/lib/segment/src/utils/mod.rs
deleted file mode 100644
index 9763a69..0000000
--- a/crates/qdrant/lib/segment/src/utils/mod.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-pub mod fmt;
-pub mod fs;
-pub mod mem;
-pub mod path;
-pub mod tar;
diff --git a/crates/qdrant/lib/segment/src/utils/path.rs b/crates/qdrant/lib/segment/src/utils/path.rs
deleted file mode 100644
index 65b6fd1..0000000
--- a/crates/qdrant/lib/segment/src/utils/path.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-use std::path::Path;
-
-use crate::entry::entry_point::{OperationError, OperationResult};
-
-pub fn strip_prefix<'a>(path: &'a Path, prefix: &Path) -> OperationResult<&'a Path> {
-    path.strip_prefix(prefix).map_err(|err| {
-        OperationError::service_error(format!(
-            "failed to strip {prefix:?} prefix from {path:?}: {err}"
-        ))
-    })
-}
diff --git a/crates/qdrant/lib/segment/src/utils/tar.rs b/crates/qdrant/lib/segment/src/utils/tar.rs
deleted file mode 100644
index 7525746..0000000
--- a/crates/qdrant/lib/segment/src/utils/tar.rs
+++ /dev/null
@@ -1,41 +0,0 @@
-use std::path::Path;
-use std::{fmt, io};
-
-use crate::entry::entry_point::{OperationError, OperationResult};
-use crate::utils;
-
-/// Append `file` to the archive under `dest_dir` directory at `file`'s path relative to `base`.
-///
-/// E.g.:
-/// - if `base` is `/some/directory/`
-/// - `file` is `/some/directory/file/path`
-/// - and `dest_dir` is `/inside/the/archive/`
-/// - then the `file` will be added to the archive at path `/inside/the/archive/file/path`
-pub fn append_file_relative_to_base(
-    builder: &mut tar::Builder<impl io::Write>,
-    base: &Path,
-    file: &Path,
-    dest_dir: &Path,
-) -> OperationResult<()> {
-    let name =
-        utils::path::strip_prefix(file, base).map_err(|err| failed_to_append_error(file, err))?;
-
-    append_file(builder, file, &dest_dir.join(name))
-}
-
-pub fn append_file(
-    builder: &mut tar::Builder<impl io::Write>,
-    file: &Path,
-    dest: &Path,
-) -> OperationResult<()> {
-    builder
-        .append_path_with_name(file, dest)
-        .map_err(|err| failed_to_append_error(file, err))
-}
-
-/// Create "failed to append `<path>` to the archive" error.
-pub fn failed_to_append_error(path: &Path, err: impl fmt::Display) -> OperationError {
-    OperationError::service_error(format!(
-        "failed to append {path:?} path to the archive: {err}"
-    ))
-}
diff --git a/crates/qdrant/lib/segment/src/vector_storage/appendable_mmap_vector_storage.rs b/crates/qdrant/lib/segment/src/vector_storage/appendable_mmap_vector_storage.rs
deleted file mode 100644
index 56b699f..0000000
--- a/crates/qdrant/lib/segment/src/vector_storage/appendable_mmap_vector_storage.rs
+++ /dev/null
@@ -1,207 +0,0 @@
-use std::fs::create_dir_all;
-use std::ops::Range;
-use std::path::{Path, PathBuf};
-use std::sync::atomic::AtomicBool;
-use std::sync::Arc;
-
-use atomic_refcell::AtomicRefCell;
-use bitvec::prelude::BitSlice;
-
-use crate::common::Flusher;
-use crate::data_types::vectors::VectorElementType;
-use crate::entry::entry_point::{check_process_stopped, OperationResult};
-use crate::types::{Distance, PointOffsetType, QuantizationConfig};
-use crate::vector_storage::chunked_mmap_vectors::ChunkedMmapVectors;
-use crate::vector_storage::dynamic_mmap_flags::DynamicMmapFlags;
-use crate::vector_storage::quantized::quantized_vectors::QuantizedVectors;
-use crate::vector_storage::{VectorStorage, VectorStorageEnum};
-
-const VECTORS_DIR_PATH: &str = "vectors";
-const DELETED_DIR_PATH: &str = "deleted";
-
-pub struct AppendableMmapVectorStorage {
-    vectors: ChunkedMmapVectors,
-    deleted: DynamicMmapFlags,
-    distance: Distance,
-    deleted_count: usize,
-    quantized_vectors: Option<QuantizedVectors>,
-}
-
-pub fn open_appendable_memmap_vector_storage(
-    path: &Path,
-    dim: usize,
-    distance: Distance,
-) -> OperationResult<Arc<AtomicRefCell<VectorStorageEnum>>> {
-    create_dir_all(path)?;
-
-    let vectors_path = path.join(VECTORS_DIR_PATH);
-    let deleted_path = path.join(DELETED_DIR_PATH);
-
-    let vectors: ChunkedMmapVectors = ChunkedMmapVectors::open(&vectors_path, dim)?;
-
-    let num_vectors = vectors.len();
-
-    let deleted: DynamicMmapFlags = DynamicMmapFlags::open(&deleted_path)?;
-
-    let mut deleted_count = 0;
-
-    for i in 0..num_vectors {
-        if deleted.get(i) {
-            deleted_count += 1;
-        }
-    }
-
-    let storage = AppendableMmapVectorStorage {
-        vectors,
-        deleted,
-        distance,
-        deleted_count,
-        quantized_vectors: None,
-    };
-
-    Ok(Arc::new(AtomicRefCell::new(
-        VectorStorageEnum::AppendableMemmap(Box::new(storage)),
-    )))
-}
-
-impl AppendableMmapVectorStorage {
-    /// Set deleted flag for given key. Returns previous deleted state.
-    #[inline]
-    fn set_deleted(&mut self, key: PointOffsetType, deleted: bool) -> OperationResult<bool> {
-        if self.vectors.len() <= key as usize {
-            return Ok(false);
-        }
-
-        if self.deleted.len() <= key as usize {
-            self.deleted.set_len(key as usize + 1)?;
-        }
-        let previous = self.deleted.set(key, deleted);
-        if !previous && deleted {
-            self.deleted_count += 1;
-        } else if previous && !deleted {
-            self.deleted_count -= 1;
-        }
-        Ok(previous)
-    }
-}
-
-impl VectorStorage for AppendableMmapVectorStorage {
-    fn vector_dim(&self) -> usize {
-        self.vectors.dim()
-    }
-
-    fn distance(&self) -> Distance {
-        self.distance
-    }
-
-    fn total_vector_count(&self) -> usize {
-        self.vectors.len()
-    }
-
-    fn get_vector(&self, key: PointOffsetType) -> &[VectorElementType] {
-        self.vectors.get(key)
-    }
-
-    fn insert_vector(
-        &mut self,
-        key: PointOffsetType,
-        vector: &[VectorElementType],
-    ) -> OperationResult<()> {
-        self.vectors.insert(key, vector)?;
-        self.set_deleted(key, false)?;
-        Ok(())
-    }
-
-    fn update_from(
-        &mut self,
-        other: &VectorStorageEnum,
-        other_ids: &mut dyn Iterator<Item = PointOffsetType>,
-        stopped: &AtomicBool,
-    ) -> OperationResult<Range<PointOffsetType>> {
-        let start_index = self.vectors.len() as PointOffsetType;
-        for point_id in other_ids {
-            check_process_stopped(stopped)?;
-            // Do not perform preprocessing - vectors should be already processed
-            let other_deleted = other.is_deleted_vector(point_id);
-            let other_vector = other.get_vector(point_id);
-            let new_id = self.vectors.push(other_vector)?;
-            self.set_deleted(new_id, other_deleted)?;
-        }
-        let end_index = self.vectors.len() as PointOffsetType;
-        Ok(start_index..end_index)
-    }
-
-    fn flusher(&self) -> Flusher {
-        Box::new({
-            let vectors_flusher = self.vectors.flusher();
-            let deleted_flusher = self.deleted.flusher();
-            move || {
-                vectors_flusher()?;
-                deleted_flusher()?;
-                Ok(())
-            }
-        })
-    }
-
-    fn quantize(
-        &mut self,
-        path: &Path,
-        quantization_config: &QuantizationConfig,
-        max_threads: usize,
-        stopped: &AtomicBool,
-    ) -> OperationResult<()> {
-        let vector_data_iterator = (0..self.vectors.len() as u32).map(|i| self.vectors.get(i));
-        self.quantized_vectors = Some(QuantizedVectors::create(
-            vector_data_iterator,
-            quantization_config,
-            self.distance,
-            self.vectors.dim(),
-            self.vectors.len(),
-            path,
-            true,
-            max_threads,
-            stopped,
-        )?);
-        Ok(())
-    }
-
-    fn load_quantization(&mut self, path: &Path) -> OperationResult<()> {
-        if QuantizedVectors::config_exists(path) {
-            self.quantized_vectors = Some(QuantizedVectors::load(path, true, self.distance)?);
-        }
-        Ok(())
-    }
-
-    fn quantized_storage(&self) -> Option<&QuantizedVectors> {
-        self.quantized_vectors.as_ref()
-    }
-
-    fn files(&self) -> Vec<PathBuf> {
-        let mut files = self.vectors.files();
-        files.extend(self.deleted.files());
-        if let Some(quantized_vectors) = &self.quantized_vectors {
-            files.extend(quantized_vectors.files())
-        }
-        files
-    }
-
-    fn delete_vector(&mut self, key: PointOffsetType) -> OperationResult<bool> {
-        self.set_deleted(key, true)
-    }
-
-    fn is_deleted_vector(&self, key: PointOffsetType) -> bool {
-        self.deleted.get(key)
-    }
-
-    fn deleted_vector_count(&self) -> usize {
-        self.deleted_count
-    }
-
-    fn deleted_vector_bitslice(&self) -> &BitSlice {
-        self.deleted.get_bitslice()
-    }
-
-    fn is_appendable(&self) -> bool {
-        true
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/vector_storage/async_io.rs b/crates/qdrant/lib/segment/src/vector_storage/async_io.rs
deleted file mode 100644
index 3422d00..0000000
--- a/crates/qdrant/lib/segment/src/vector_storage/async_io.rs
+++ /dev/null
@@ -1,189 +0,0 @@
-use std::fs::File;
-use std::os::fd::AsRawFd;
-
-use io_uring::{opcode, types, IoUring};
-
-use crate::common::mmap_ops::transmute_from_u8_to_slice;
-use crate::data_types::vectors::VectorElementType;
-use crate::entry::entry_point::{OperationError, OperationResult};
-use crate::types::PointOffsetType;
-
-const DISK_PARALLELISM: usize = 16; // TODO: benchmark it better, or make it configurable
-
-struct BufferMeta {
-    /// Sequential index of the processing point
-    pub index: usize,
-    /// Id of the point that is currently being processed
-    pub point_id: PointOffsetType,
-}
-
-struct Buffer {
-    /// Stores the buffer for the point vectors
-    pub buffer: Vec<u8>,
-    /// Stores the point ids that are currently being processed in each buffer.
-    pub meta: Option<BufferMeta>,
-}
-
-struct BufferStore {
-    /// Stores the buffer for the point vectors
-    pub buffers: Vec<Buffer>,
-}
-
-impl BufferStore {
-    pub fn new(num_buffers: usize, buffer_raw_size: usize) -> Self {
-        Self {
-            buffers: (0..num_buffers)
-                .map(|_| Buffer {
-                    buffer: vec![0; buffer_raw_size],
-                    meta: None,
-                })
-                .collect(),
-        }
-    }
-
-    #[allow(dead_code)]
-    pub fn new_empty() -> Self {
-        Self { buffers: vec![] }
-    }
-}
-
-pub struct UringReader {
-    file: File,
-    buffers: BufferStore,
-    io_uring: Option<IoUring>,
-    raw_size: usize,
-    header_size: usize,
-}
-
-impl UringReader {
-    pub fn new(file: File, raw_size: usize, header_size: usize) -> OperationResult<Self> {
-        let buffers = BufferStore::new(DISK_PARALLELISM, raw_size);
-        let io_uring = IoUring::new(DISK_PARALLELISM as _)?;
-
-        Ok(Self {
-            file,
-            buffers,
-            io_uring: Some(io_uring),
-            raw_size,
-            header_size,
-        })
-    }
-
-    /// Takes in iterator of point offsets, reads it, and yields a callback with the read data.
-    pub fn read_stream(
-        &mut self,
-        points: impl IntoIterator<Item = PointOffsetType>,
-        mut callback: impl FnMut(usize, PointOffsetType, &[VectorElementType]),
-    ) -> OperationResult<()> {
-        // Take `UringReader::io_uring`, so that if we return an error or panic during `read_stream`,
-        // `IoUring` would be transparently dropped.
-        let mut io_uring = match self.io_uring.take() {
-            // Use existing `IoUring` if there's one...
-            Some(io_uring) => io_uring,
-            // ...or create a new one if not
-            None => IoUring::new(DISK_PARALLELISM as _)?,
-        };
-
-        let buffers_count = self.buffers.buffers.len();
-        let mut unused_buffer_ids = (0..buffers_count).collect::<Vec<_>>();
-
-        for item in points.into_iter().enumerate() {
-            let (idx, point): (usize, PointOffsetType) = item;
-
-            if unused_buffer_ids.is_empty() {
-                submit_and_read(
-                    &mut io_uring,
-                    &mut self.buffers,
-                    &mut unused_buffer_ids,
-                    &mut callback,
-                    self.raw_size,
-                )?;
-            }
-            // Assume there is at least one buffer available at this point
-            let buffer_id = unused_buffer_ids.pop().unwrap();
-
-            self.buffers.buffers[buffer_id].meta = Some(BufferMeta {
-                index: idx,
-                point_id: point,
-            });
-
-            let buffer = &mut self.buffers.buffers[buffer_id].buffer;
-            let offset = self.header_size + self.raw_size * point as usize;
-
-            let user_data = buffer_id;
-
-            let read_e = opcode::Read::new(
-                types::Fd(self.file.as_raw_fd()),
-                buffer.as_mut_ptr(),
-                buffer.len() as _,
-            )
-            .offset(offset as _)
-            .build()
-            .user_data(user_data as _);
-
-            unsafe {
-                // self.io_uring.submission().push(&read_e).unwrap();
-                io_uring.submission().push(&read_e).map_err(|err| {
-                    OperationError::service_error(format!("Failed using io-uring: {}", err))
-                })?;
-            }
-        }
-
-        let mut operations_to_wait_for = self.buffers.buffers.len() - unused_buffer_ids.len();
-
-        while operations_to_wait_for > 0 {
-            submit_and_read(
-                &mut io_uring,
-                &mut self.buffers,
-                &mut unused_buffer_ids,
-                &mut callback,
-                self.raw_size,
-            )?;
-
-            operations_to_wait_for = self.buffers.buffers.len() - unused_buffer_ids.len();
-        }
-
-        self.io_uring = Some(io_uring);
-
-        Ok(())
-    }
-}
-
-fn submit_and_read(
-    io_uring: &mut IoUring,
-    buffers: &mut BufferStore,
-    unused_buffer_ids: &mut Vec<usize>,
-    mut callback: impl FnMut(usize, PointOffsetType, &[VectorElementType]),
-    raw_size: usize,
-) -> OperationResult<()> {
-    let buffers_count = buffers.buffers.len();
-    let used_buffers_count = buffers_count - unused_buffer_ids.len();
-
-    // Wait for at least one buffer to become available
-    io_uring.submit_and_wait(used_buffers_count)?;
-
-    let cqe = io_uring.completion();
-    for entry in cqe {
-        let result = entry.result();
-        if result < 0 {
-            return Err(OperationError::service_error(format!(
-                "io_uring operation failed with {} error",
-                result
-            )));
-        } else if (result as usize) != raw_size {
-            return Err(OperationError::service_error(format!(
-                "io_uring operation returned {} bytes instead of {}",
-                result, raw_size
-            )));
-        }
-
-        let buffer_id = entry.user_data() as usize;
-        let meta = buffers.buffers[buffer_id].meta.take().unwrap();
-        let buffer = &buffers.buffers[buffer_id].buffer;
-        let vector = transmute_from_u8_to_slice(buffer);
-        callback(meta.index, meta.point_id, vector);
-        unused_buffer_ids.push(buffer_id);
-    }
-
-    Ok(())
-}
diff --git a/crates/qdrant/lib/segment/src/vector_storage/async_io_mock.rs b/crates/qdrant/lib/segment/src/vector_storage/async_io_mock.rs
deleted file mode 100644
index 2a99354..0000000
--- a/crates/qdrant/lib/segment/src/vector_storage/async_io_mock.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-use std::fs::File;
-
-use crate::entry::entry_point::OperationResult;
-
-// This is a mock implementation of the async_io module for those platforms that don't support io_uring.
-#[allow(dead_code)]
-pub struct UringReader;
-
-#[allow(dead_code)]
-impl UringReader {
-    pub fn new(_file: File, _raw_size: usize, _header_size: usize) -> OperationResult<Self> {
-        Ok(Self {})
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/vector_storage/async_raw_scorer.rs b/crates/qdrant/lib/segment/src/vector_storage/async_raw_scorer.rs
deleted file mode 100644
index 3413312..0000000
--- a/crates/qdrant/lib/segment/src/vector_storage/async_raw_scorer.rs
+++ /dev/null
@@ -1,265 +0,0 @@
-use std::marker::PhantomData;
-use std::sync::atomic::{AtomicBool, Ordering};
-
-use bitvec::prelude::BitSlice;
-use common::fixed_length_priority_queue::FixedLengthPriorityQueue;
-
-use crate::data_types::vectors::VectorElementType;
-use crate::entry::entry_point::OperationResult;
-use crate::spaces::metric::Metric;
-use crate::spaces::simple::{CosineMetric, DotProductMetric, EuclidMetric};
-use crate::types::{Distance, PointOffsetType, ScoreType};
-use crate::vector_storage::memmap_vector_storage::MemmapVectorStorage;
-use crate::vector_storage::mmap_vectors::MmapVectors;
-use crate::vector_storage::{RawScorer, ScoredPointOffset, VectorStorage as _, DEFAULT_STOPPED};
-
-pub fn new<'a>(
-    vector: Vec<VectorElementType>,
-    storage: &'a MemmapVectorStorage,
-    point_deleted: &'a BitSlice,
-    is_stopped: &'a AtomicBool,
-) -> OperationResult<Box<dyn RawScorer + 'a>> {
-    Ok(AsyncRawScorerBuilder::new(vector, storage, point_deleted)?
-        .with_is_stopped(is_stopped)
-        .build())
-}
-
-pub struct AsyncRawScorerImpl<'a, TMetric: Metric> {
-    points_count: PointOffsetType,
-    query: Vec<VectorElementType>,
-    storage: &'a MmapVectors,
-    point_deleted: &'a BitSlice,
-    vec_deleted: &'a BitSlice,
-    metric: PhantomData<TMetric>,
-    /// This flag indicates that the search process is stopped externally,
-    /// the search result is no longer needed and the search process should be stopped as soon as possible.
-    pub is_stopped: &'a AtomicBool,
-}
-
-impl<'a, TMetric> AsyncRawScorerImpl<'a, TMetric>
-where
-    TMetric: Metric,
-{
-    fn new(
-        points_count: PointOffsetType,
-        vector: Vec<VectorElementType>,
-        storage: &'a MmapVectors,
-        point_deleted: &'a BitSlice,
-        vec_deleted: &'a BitSlice,
-        is_stopped: &'a AtomicBool,
-    ) -> Self {
-        Self {
-            points_count,
-            query: TMetric::preprocess(&vector).unwrap_or(vector),
-            storage,
-            point_deleted,
-            vec_deleted,
-            metric: PhantomData,
-            is_stopped,
-        }
-    }
-}
-
-impl<'a, TMetric> RawScorer for AsyncRawScorerImpl<'a, TMetric>
-where
-    TMetric: Metric,
-{
-    fn score_points(&self, points: &[PointOffsetType], scores: &mut [ScoredPointOffset]) -> usize {
-        if self.is_stopped.load(Ordering::Relaxed) {
-            return 0;
-        }
-        let points_stream = points
-            .iter()
-            .copied()
-            .filter(|point_id| self.check_vector(*point_id));
-
-        let mut processed = 0;
-        self.storage
-            .read_vectors_async(points_stream, |idx, point_id, other_vector| {
-                scores[idx] = ScoredPointOffset {
-                    idx: point_id,
-                    score: TMetric::similarity(&self.query, other_vector),
-                };
-                processed += 1;
-            })
-            .unwrap();
-
-        // ToDo: io_uring is experimental, it can fail if it is not supported.
-        // Instead of silently falling back to the sync implementation, we prefer to panic
-        // and notify the user that they better use the default IO implementation.
-
-        processed
-    }
-
-    fn score_points_unfiltered(
-        &self,
-        points: &mut dyn Iterator<Item = PointOffsetType>,
-    ) -> Vec<ScoredPointOffset> {
-        if self.is_stopped.load(Ordering::Relaxed) {
-            return vec![];
-        }
-        let mut scores = vec![];
-
-        self.storage
-            .read_vectors_async(points, |_idx, point_id, other_vector| {
-                scores.push(ScoredPointOffset {
-                    idx: point_id,
-                    score: TMetric::similarity(&self.query, other_vector),
-                });
-            })
-            .unwrap();
-
-        // ToDo: io_uring is experimental, it can fail if it is not supported.
-        // Instead of silently falling back to the sync implementation, we prefer to panic
-        // and notify the user that they better use the default IO implementation.
-
-        scores
-    }
-
-    fn check_vector(&self, point: PointOffsetType) -> bool {
-        point < self.points_count
-            // Deleted points propagate to vectors; check vector deletion for possible early return
-            && !self
-                .vec_deleted
-                .get(point as usize)
-                .map(|x| *x)
-                // Default to not deleted if our deleted flags failed grow
-                .unwrap_or(false)
-            // Additionally check point deletion for integrity if delete propagation to vector failed
-            && !self
-                .point_deleted
-                .get(point as usize)
-                .map(|x| *x)
-                // Default to deleted if the point mapping was removed from the ID tracker
-                .unwrap_or(true)
-    }
-
-    fn score_point(&self, point: PointOffsetType) -> ScoreType {
-        let other_vector = self.storage.get_vector(point);
-        TMetric::similarity(&self.query, other_vector)
-    }
-
-    fn score_internal(&self, point_a: PointOffsetType, point_b: PointOffsetType) -> ScoreType {
-        let vector_a = self.storage.get_vector(point_a);
-        let vector_b = self.storage.get_vector(point_b);
-        TMetric::similarity(vector_a, vector_b)
-    }
-
-    fn peek_top_iter(
-        &self,
-        points: &mut dyn Iterator<Item = PointOffsetType>,
-        top: usize,
-    ) -> Vec<ScoredPointOffset> {
-        if top == 0 {
-            return vec![];
-        }
-
-        let mut pq = FixedLengthPriorityQueue::new(top);
-        let points_stream = points
-            .take_while(|_| !self.is_stopped.load(Ordering::Relaxed))
-            .filter(|point_id| self.check_vector(*point_id));
-
-        self.storage
-            .read_vectors_async(points_stream, |_, point_id, other_vector| {
-                let scored_point_offset = ScoredPointOffset {
-                    idx: point_id,
-                    score: TMetric::similarity(&self.query, other_vector),
-                };
-                pq.push(scored_point_offset);
-            })
-            .unwrap();
-
-        // ToDo: io_uring is experimental, it can fail if it is not supported.
-        // Instead of silently falling back to the sync implementation, we prefer to panic
-        // and notify the user that they better use the default IO implementation.
-
-        pq.into_vec()
-    }
-
-    fn peek_top_all(&self, top: usize) -> Vec<ScoredPointOffset> {
-        if top == 0 {
-            return vec![];
-        }
-
-        let points_stream = (0..self.points_count)
-            .take_while(|_| !self.is_stopped.load(Ordering::Relaxed))
-            .filter(|point_id| self.check_vector(*point_id));
-
-        let mut pq = FixedLengthPriorityQueue::new(top);
-        self.storage
-            .read_vectors_async(points_stream, |_, point_id, other_vector| {
-                let scored_point_offset = ScoredPointOffset {
-                    idx: point_id,
-                    score: TMetric::similarity(&self.query, other_vector),
-                };
-                pq.push(scored_point_offset);
-            })
-            .unwrap();
-
-        // ToDo: io_uring is experimental, it can fail if it is not supported.
-        // Instead of silently falling back to the sync implementation, we prefer to panic
-        // and notify the user that they better use the default IO implementation.
-
-        pq.into_vec()
-    }
-}
-
-struct AsyncRawScorerBuilder<'a> {
-    points_count: PointOffsetType,
-    vector: Vec<VectorElementType>,
-    storage: &'a MmapVectors,
-    point_deleted: &'a BitSlice,
-    vec_deleted: &'a BitSlice,
-    distance: Distance,
-    is_stopped: Option<&'a AtomicBool>,
-}
-
-impl<'a> AsyncRawScorerBuilder<'a> {
-    pub fn new(
-        vector: Vec<VectorElementType>,
-        storage: &'a MemmapVectorStorage,
-        point_deleted: &'a BitSlice,
-    ) -> OperationResult<Self> {
-        let points_count = storage.total_vector_count() as _;
-        let vec_deleted = storage.deleted_vector_bitslice();
-
-        let distance = storage.distance();
-        let storage = storage.get_mmap_vectors();
-
-        let builder = Self {
-            points_count,
-            vector,
-            point_deleted,
-            vec_deleted,
-            storage,
-            distance,
-            is_stopped: None,
-        };
-
-        Ok(builder)
-    }
-
-    pub fn build(self) -> Box<dyn RawScorer + 'a> {
-        match self.distance {
-            Distance::Cosine => Box::new(self.with_metric::<CosineMetric>()),
-            Distance::Euclid => Box::new(self.with_metric::<EuclidMetric>()),
-            Distance::Dot => Box::new(self.with_metric::<DotProductMetric>()),
-        }
-    }
-
-    pub fn with_is_stopped(mut self, is_stopped: &'a AtomicBool) -> Self {
-        self.is_stopped = Some(is_stopped);
-        self
-    }
-
-    fn with_metric<TMetric: Metric>(self) -> AsyncRawScorerImpl<'a, TMetric> {
-        AsyncRawScorerImpl::new(
-            self.points_count,
-            self.vector,
-            self.storage,
-            self.point_deleted,
-            self.vec_deleted,
-            self.is_stopped.unwrap_or(&DEFAULT_STOPPED),
-        )
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/vector_storage/chunked_mmap_vectors.rs b/crates/qdrant/lib/segment/src/vector_storage/chunked_mmap_vectors.rs
deleted file mode 100644
index 05e553f..0000000
--- a/crates/qdrant/lib/segment/src/vector_storage/chunked_mmap_vectors.rs
+++ /dev/null
@@ -1,285 +0,0 @@
-use std::cmp::max;
-use std::fs::{create_dir_all, OpenOptions};
-use std::io::Write;
-use std::path::{Path, PathBuf};
-
-use memmap2::MmapMut;
-use serde::{Deserialize, Serialize};
-
-use crate::common::mmap_ops::{create_and_ensure_length, open_write_mmap};
-use crate::common::mmap_type::MmapType;
-use crate::common::Flusher;
-use crate::data_types::vectors::VectorElementType;
-use crate::entry::entry_point::{OperationError, OperationResult};
-use crate::types::PointOffsetType;
-use crate::vector_storage::chunked_utils::{chunk_name, create_chunk, read_mmaps, MmapChunk};
-
-#[cfg(debug_assertions)]
-const DEFAULT_CHUNK_SIZE: usize = 512 * 1024; // 512Kb
-#[cfg(not(debug_assertions))]
-const DEFAULT_CHUNK_SIZE: usize = 32 * 1024 * 1024; // 32Mb
-
-const CONFIG_FILE_NAME: &str = "config.json";
-const STATUS_FILE_NAME: &str = "status.dat";
-
-#[repr(C)]
-pub struct Status {
-    pub len: usize,
-}
-
-#[derive(Serialize, Deserialize)]
-struct ChunkedMmapConfig {
-    chunk_size_bytes: usize,
-    chunk_size_vectors: usize,
-    dim: usize,
-}
-
-pub struct ChunkedMmapVectors {
-    config: ChunkedMmapConfig,
-    status: MmapType<Status>,
-    chunks: Vec<MmapChunk>,
-    directory: PathBuf,
-}
-
-impl ChunkedMmapVectors {
-    fn config_file(directory: &Path) -> PathBuf {
-        directory.join(CONFIG_FILE_NAME)
-    }
-
-    pub fn status_file(directory: &Path) -> PathBuf {
-        directory.join(STATUS_FILE_NAME)
-    }
-
-    pub fn ensure_status_file(directory: &Path) -> OperationResult<MmapMut> {
-        let status_file = Self::status_file(directory);
-        if !status_file.exists() {
-            {
-                let length = std::mem::size_of::<usize>() as u64;
-                create_and_ensure_length(&status_file, length as usize)?;
-            }
-            let mmap = open_write_mmap(&status_file)?;
-            Ok(mmap)
-        } else {
-            open_write_mmap(&status_file)
-        }
-    }
-
-    fn ensure_config(directory: &Path, dim: usize) -> OperationResult<ChunkedMmapConfig> {
-        let config_file = Self::config_file(directory);
-        if !config_file.exists() {
-            let chunk_size_bytes = DEFAULT_CHUNK_SIZE;
-            let vector_size_bytes = dim * std::mem::size_of::<VectorElementType>();
-            let chunk_size_vectors = chunk_size_bytes / vector_size_bytes;
-            let corrected_chunk_size_bytes = chunk_size_vectors * vector_size_bytes;
-
-            let config = ChunkedMmapConfig {
-                chunk_size_bytes: corrected_chunk_size_bytes,
-                chunk_size_vectors,
-                dim,
-            };
-            let mut file = OpenOptions::new()
-                .create(true)
-                .write(true)
-                .open(&config_file)?;
-            serde_json::to_writer(&mut file, &config)?;
-            file.flush()?;
-            Ok(config)
-        } else {
-            let file = std::fs::File::open(&config_file)?;
-            let config: ChunkedMmapConfig = serde_json::from_reader(file)?;
-
-            if config.dim != dim {
-                return Err(OperationError::service_error(format!(
-                    "Wrong configuration in {}: expected {}, found {dim}",
-                    config_file.display(),
-                    config.dim,
-                )));
-            }
-
-            Ok(config)
-        }
-    }
-
-    pub fn open(directory: &Path, dim: usize) -> OperationResult<Self> {
-        create_dir_all(directory)?;
-        let status_mmap = Self::ensure_status_file(directory)?;
-        let status = unsafe { MmapType::from(status_mmap) };
-
-        let config = Self::ensure_config(directory, dim)?;
-        let chunks = read_mmaps(directory)?;
-
-        let vectors = Self {
-            status,
-            config,
-            chunks,
-            directory: directory.to_owned(),
-        };
-        Ok(vectors)
-    }
-
-    #[inline]
-    fn get_chunk_index(&self, key: usize) -> usize {
-        key / self.config.chunk_size_vectors
-    }
-
-    /// Returns the byte offset of the vector in the chunk
-    #[inline]
-    fn get_chunk_offset(&self, key: usize) -> usize {
-        let chunk_vector_idx = key % self.config.chunk_size_vectors;
-        chunk_vector_idx * self.config.dim
-    }
-
-    pub fn len(&self) -> usize {
-        self.status.len
-    }
-
-    pub fn dim(&self) -> usize {
-        self.config.dim
-    }
-
-    fn add_chunk(&mut self) -> OperationResult<()> {
-        let chunk = create_chunk(
-            &self.directory,
-            self.chunks.len(),
-            self.config.chunk_size_bytes,
-        )?;
-
-        self.chunks.push(chunk);
-        Ok(())
-    }
-
-    pub fn insert(
-        &mut self,
-        key: PointOffsetType,
-        vector: &[VectorElementType],
-    ) -> OperationResult<()> {
-        let key = key as usize;
-        let chunk_idx = self.get_chunk_index(key);
-        let chunk_offset = self.get_chunk_offset(key);
-
-        // Ensure capacity
-        while chunk_idx >= self.chunks.len() {
-            self.add_chunk()?;
-        }
-
-        let chunk = &mut self.chunks[chunk_idx];
-
-        chunk[chunk_offset..chunk_offset + vector.len()].copy_from_slice(vector);
-
-        let new_len = max(self.status.len, key + 1);
-
-        if new_len > self.status.len {
-            self.status.len = new_len;
-        }
-        Ok(())
-    }
-
-    pub fn push(&mut self, vector: &[VectorElementType]) -> OperationResult<PointOffsetType> {
-        let new_id = self.status.len as PointOffsetType;
-        self.insert(new_id, vector)?;
-        Ok(new_id)
-    }
-
-    pub fn get<TKey>(&self, key: TKey) -> &[VectorElementType]
-    where
-        TKey: num_traits::cast::AsPrimitive<usize>,
-    {
-        let key: usize = key.as_();
-        let chunk_idx = self.get_chunk_index(key);
-        let chunk_offset = self.get_chunk_offset(key);
-        let chunk = &self.chunks[chunk_idx];
-        &chunk[chunk_offset..chunk_offset + self.config.dim]
-    }
-
-    pub fn flusher(&self) -> Flusher {
-        Box::new({
-            let status_flusher = self.status.flusher();
-            let chunks_flushers: Vec<_> = self.chunks.iter().map(|chunk| chunk.flusher()).collect();
-            move || {
-                for flusher in chunks_flushers {
-                    flusher()?;
-                }
-                status_flusher()?;
-                Ok(())
-            }
-        })
-    }
-
-    pub fn files(&self) -> Vec<PathBuf> {
-        let mut files = Vec::new();
-        files.push(Self::config_file(&self.directory));
-        files.push(Self::status_file(&self.directory));
-        for chunk_idx in 0..self.chunks.len() {
-            files.push(chunk_name(&self.directory, chunk_idx));
-        }
-        files
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use rand::prelude::StdRng;
-    use rand::SeedableRng;
-    use tempfile::Builder;
-
-    use super::*;
-    use crate::fixtures::index_fixtures::random_vector;
-
-    #[test]
-    fn test_chunked_mmap() {
-        let dir = Builder::new().prefix("storage_dir").tempdir().unwrap();
-        let dim = 500;
-        let num_vectors = 1000;
-        let mut rng = StdRng::seed_from_u64(42);
-
-        let mut vectors: Vec<_> = (0..num_vectors)
-            .map(|_| random_vector(&mut rng, dim))
-            .collect();
-
-        {
-            let mut chunked_mmap: ChunkedMmapVectors =
-                ChunkedMmapVectors::open(dir.path(), dim).unwrap();
-
-            for vec in &vectors {
-                chunked_mmap.push(vec).unwrap();
-            }
-
-            vectors[0] = random_vector(&mut rng, dim);
-            vectors[150] = random_vector(&mut rng, dim);
-            vectors[44] = random_vector(&mut rng, dim);
-            vectors[999] = random_vector(&mut rng, dim);
-
-            chunked_mmap.insert(0, &vectors[0]).unwrap();
-            chunked_mmap.insert(150, &vectors[150]).unwrap();
-            chunked_mmap.insert(44, &vectors[44]).unwrap();
-            chunked_mmap.insert(999, &vectors[999]).unwrap();
-
-            assert!(
-                chunked_mmap.chunks.len() > 1,
-                "must have multiple chunks to test",
-            );
-
-            chunked_mmap.flusher()().unwrap();
-        }
-
-        {
-            let chunked_mmap: ChunkedMmapVectors =
-                ChunkedMmapVectors::open(dir.path(), dim).unwrap();
-
-            assert!(
-                chunked_mmap.chunks.len() > 1,
-                "must have multiple chunks to test",
-            );
-            assert_eq!(chunked_mmap.len(), vectors.len());
-
-            for (i, vec) in vectors.iter().enumerate() {
-                assert_eq!(
-                    chunked_mmap.get(i),
-                    vec,
-                    "Vectors at index {} are not equal",
-                    i
-                );
-            }
-        }
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/vector_storage/chunked_utils.rs b/crates/qdrant/lib/segment/src/vector_storage/chunked_utils.rs
deleted file mode 100644
index fd01235..0000000
--- a/crates/qdrant/lib/segment/src/vector_storage/chunked_utils.rs
+++ /dev/null
@@ -1,73 +0,0 @@
-use std::collections::HashMap;
-use std::path::{Path, PathBuf};
-
-use crate::common::mmap_ops::{create_and_ensure_length, open_write_mmap};
-use crate::common::mmap_type::MmapSlice;
-use crate::data_types::vectors::VectorElementType;
-use crate::entry::entry_point::{OperationError, OperationResult};
-
-const MMAP_CHUNKS_PATTERN_START: &str = "chunk_";
-const MMAP_CHUNKS_PATTERN_END: &str = ".mmap";
-
-/// Memory mapped chunk data.
-pub type MmapChunk = MmapSlice<VectorElementType>;
-
-/// Checks if the file name matches the pattern for mmap chunks
-/// Return ID from the file name if it matches, None otherwise
-fn check_mmap_file_name_pattern(file_name: &str) -> Option<usize> {
-    file_name
-        .strip_prefix(MMAP_CHUNKS_PATTERN_START)
-        .and_then(|file_name| file_name.strip_suffix(MMAP_CHUNKS_PATTERN_END))
-        .and_then(|file_name| file_name.parse::<usize>().ok())
-}
-
-pub fn read_mmaps(directory: &Path) -> OperationResult<Vec<MmapChunk>> {
-    let mut mmap_files: HashMap<usize, _> = HashMap::new();
-    for entry in directory.read_dir()? {
-        let entry = entry?;
-        let path = entry.path();
-        if path.is_file() {
-            let chunk_id = path
-                .file_name()
-                .and_then(|file_name| file_name.to_str())
-                .and_then(check_mmap_file_name_pattern);
-
-            if let Some(chunk_id) = chunk_id {
-                mmap_files.insert(chunk_id, path);
-            }
-        }
-    }
-
-    let num_chunks = mmap_files.len();
-    let mut result = Vec::with_capacity(num_chunks);
-    for chunk_id in 0..num_chunks {
-        let mmap_file = mmap_files.remove(&chunk_id).ok_or_else(|| {
-            OperationError::service_error(format!(
-                "Missing mmap chunk {chunk_id} in {}",
-                directory.display(),
-            ))
-        })?;
-        let mmap = open_write_mmap(&mmap_file)?;
-        let chunk = unsafe { MmapChunk::try_from(mmap)? };
-        result.push(chunk);
-    }
-    Ok(result)
-}
-
-pub fn chunk_name(directory: &Path, chunk_id: usize) -> PathBuf {
-    directory.join(format!(
-        "{MMAP_CHUNKS_PATTERN_START}{chunk_id}{MMAP_CHUNKS_PATTERN_END}",
-    ))
-}
-
-pub fn create_chunk(
-    directory: &Path,
-    chunk_id: usize,
-    chunk_length_bytes: usize,
-) -> OperationResult<MmapChunk> {
-    let chunk_file_path = chunk_name(directory, chunk_id);
-    create_and_ensure_length(&chunk_file_path, chunk_length_bytes)?;
-    let mmap = open_write_mmap(&chunk_file_path)?;
-    let chunk = unsafe { MmapChunk::try_from(mmap)? };
-    Ok(chunk)
-}
diff --git a/crates/qdrant/lib/segment/src/vector_storage/chunked_vectors.rs b/crates/qdrant/lib/segment/src/vector_storage/chunked_vectors.rs
deleted file mode 100644
index ea50f49..0000000
--- a/crates/qdrant/lib/segment/src/vector_storage/chunked_vectors.rs
+++ /dev/null
@@ -1,172 +0,0 @@
-use std::cmp::max;
-use std::collections::TryReserveError;
-use std::fs::File;
-use std::io::{Read, Write};
-use std::mem;
-use std::path::Path;
-
-use super::div_ceil;
-use crate::common::vector_utils::{TrySetCapacity, TrySetCapacityExact};
-use crate::types::PointOffsetType;
-
-// chunk size in bytes
-const CHUNK_SIZE: usize = 32 * 1024 * 1024;
-
-// if dimension is too high, use this capacity
-const MIN_CHUNK_CAPACITY: usize = 16;
-
-pub struct ChunkedVectors<T> {
-    dim: usize,
-    len: usize,            // amount of stored vectors
-    chunk_capacity: usize, // max amount of vectors in each chunk
-    chunks: Vec<Vec<T>>,
-}
-
-impl<T: Copy + Clone + Default> ChunkedVectors<T> {
-    pub fn new(dim: usize) -> Self {
-        assert_ne!(dim, 0, "The vector's dimension cannot be 0");
-        let vector_size = dim * mem::size_of::<T>();
-        let chunk_capacity = max(MIN_CHUNK_CAPACITY, CHUNK_SIZE / vector_size);
-        Self {
-            dim,
-            len: 0,
-            chunk_capacity,
-            chunks: Vec::new(),
-        }
-    }
-
-    pub fn len(&self) -> usize {
-        self.len
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.len == 0
-    }
-
-    pub fn get<TKey>(&self, key: TKey) -> &[T]
-    where
-        TKey: num_traits::cast::AsPrimitive<usize>,
-    {
-        let key: usize = key.as_();
-        let chunk_data = &self.chunks[key / self.chunk_capacity];
-        let idx = (key % self.chunk_capacity) * self.dim;
-        &chunk_data[idx..idx + self.dim]
-    }
-
-    pub fn push(&mut self, vector: &[T]) -> Result<PointOffsetType, TryReserveError> {
-        let new_id = self.len as PointOffsetType;
-        self.insert(new_id, vector)?;
-        Ok(new_id)
-    }
-
-    pub fn insert(&mut self, key: PointOffsetType, vector: &[T]) -> Result<(), TryReserveError> {
-        let key = key as usize;
-        self.len = max(self.len, key + 1);
-        self.chunks
-            .resize(div_ceil(self.len, self.chunk_capacity), vec![]);
-
-        let chunk_idx = key / self.chunk_capacity;
-        let chunk_data = &mut self.chunks[chunk_idx];
-        let idx = (key % self.chunk_capacity) * self.dim;
-        if chunk_data.len() < idx + self.dim {
-            if chunk_idx == 0 {
-                // Do not overallocate the first chunk, because it is likely to be small
-                // and we don't want to waste memory.
-                let desired_capacity = idx + self.dim;
-                chunk_data.try_set_capacity(desired_capacity)?;
-            } else {
-                // Once we have more than one chunk, we don't want to overallocate
-                // and we keep the exact capacity of each chunk.
-                let desired_capacity = self.chunk_capacity * self.dim;
-                chunk_data.try_set_capacity_exact(desired_capacity)?;
-            }
-            chunk_data.resize(idx + self.dim, T::default());
-        }
-        let data = &mut chunk_data[idx..idx + self.dim];
-        data.copy_from_slice(vector);
-        Ok(())
-    }
-}
-
-impl quantization::EncodedStorage for ChunkedVectors<u8> {
-    fn get_vector_data(&self, index: usize, _vector_size: usize) -> &[u8] {
-        self.get(index)
-    }
-
-    fn from_file(
-        path: &Path,
-        quantized_vector_size: usize,
-        vectors_count: usize,
-    ) -> std::io::Result<Self> {
-        let mut vectors = Self::new(quantized_vector_size);
-        vectors
-            .try_set_capacity_exact(vectors_count)
-            .map_err(|err| {
-                std::io::Error::new(
-                    std::io::ErrorKind::OutOfMemory,
-                    format!("Failed to load quantized vectors from file: {err}"),
-                )
-            })?;
-        let mut file = File::open(path)?;
-        let mut buffer = vec![0u8; quantized_vector_size];
-        while file.read_exact(&mut buffer).is_ok() {
-            vectors.push(&buffer).map_err(|err| {
-                std::io::Error::new(
-                    std::io::ErrorKind::OutOfMemory,
-                    format!("Failed to load quantized vectors from file: {err}"),
-                )
-            })?;
-        }
-        if vectors.len() == vectors_count {
-            Ok(vectors)
-        } else {
-            Err(std::io::Error::new(
-                std::io::ErrorKind::Other,
-                format!(
-                    "Loaded vectors count {} is not equal to expected count {vectors_count}",
-                    vectors.len(),
-                ),
-            ))
-        }
-    }
-
-    fn save_to_file(&self, path: &Path) -> std::io::Result<()> {
-        let mut buffer = File::create(path)?;
-        for i in 0..self.len() {
-            buffer.write_all(self.get(i))?;
-        }
-        buffer.flush()?;
-        Ok(())
-    }
-}
-
-impl<T: Clone> TrySetCapacityExact for ChunkedVectors<T> {
-    fn try_set_capacity_exact(&mut self, capacity: usize) -> Result<(), TryReserveError> {
-        let num_chunks = div_ceil(capacity, self.chunk_capacity);
-        let last_chunk_idx = capacity / self.chunk_capacity;
-        self.chunks.try_set_capacity_exact(num_chunks)?;
-        self.chunks.resize(num_chunks, vec![]);
-        for chunk_idx in 0..num_chunks {
-            if chunk_idx == last_chunk_idx {
-                let desired_capacity = (capacity % self.chunk_capacity) * self.dim;
-                self.chunks[chunk_idx].try_set_capacity_exact(desired_capacity)?;
-            } else {
-                let desired_capacity = self.chunk_capacity * self.dim;
-                self.chunks[chunk_idx].try_set_capacity_exact(desired_capacity)?;
-            }
-        }
-        Ok(())
-    }
-}
-
-impl quantization::EncodedStorageBuilder<ChunkedVectors<u8>> for ChunkedVectors<u8> {
-    fn build(self) -> ChunkedVectors<u8> {
-        self
-    }
-
-    fn push_vector_data(&mut self, other: &[u8]) {
-        // Memory for ChunkedVectors are already pre-allocated,
-        // so we do not expect any errors here.
-        self.push(other).unwrap();
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/vector_storage/common.rs b/crates/qdrant/lib/segment/src/vector_storage/common.rs
deleted file mode 100644
index d4dd77e..0000000
--- a/crates/qdrant/lib/segment/src/vector_storage/common.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-use std::sync::atomic::{AtomicBool, Ordering};
-
-static ASYNC_SCORER: AtomicBool = AtomicBool::new(false);
-
-pub fn set_async_scorer(async_scorer: bool) {
-    ASYNC_SCORER.store(async_scorer, Ordering::Relaxed);
-}
-
-pub fn get_async_scorer() -> bool {
-    ASYNC_SCORER.load(Ordering::Relaxed)
-}
diff --git a/crates/qdrant/lib/segment/src/vector_storage/dynamic_mmap_flags.rs b/crates/qdrant/lib/segment/src/vector_storage/dynamic_mmap_flags.rs
deleted file mode 100644
index 1dcb95e..0000000
--- a/crates/qdrant/lib/segment/src/vector_storage/dynamic_mmap_flags.rs
+++ /dev/null
@@ -1,329 +0,0 @@
-use std::cmp::max;
-use std::fs;
-use std::path::{Path, PathBuf};
-use std::sync::Arc;
-
-use bitvec::prelude::BitSlice;
-use memmap2::MmapMut;
-use parking_lot::Mutex;
-
-use crate::common::error_logging::LogError;
-use crate::common::mmap_ops::{create_and_ensure_length, open_write_mmap};
-use crate::common::mmap_type::{MmapBitSlice, MmapType};
-use crate::common::Flusher;
-use crate::entry::entry_point::{OperationError, OperationResult};
-use crate::vector_storage::div_ceil;
-
-#[cfg(debug_assertions)]
-const MINIMAL_MMAP_SIZE: usize = 128; // 128 bytes -> 1024 flags
-#[cfg(not(debug_assertions))]
-const MINIMAL_MMAP_SIZE: usize = 1024 * 1024; // 1Mb
-
-// We need to switch between files to prevent loss of mmap in case of a error.
-const FLAGS_FILE_A: &str = "flags_a.dat";
-const FLAGS_FILE_B: &str = "flags_b.dat";
-
-const STATUS_FILE_NAME: &str = "status.dat";
-
-pub fn status_file(directory: &Path) -> PathBuf {
-    directory.join(STATUS_FILE_NAME)
-}
-
-/// Identifies A/B variant of file being used.
-#[derive(Clone, Copy, Eq, PartialEq, Default, Debug)]
-#[repr(usize)]
-pub enum FileId {
-    // Must be 0usize because default value of mmap file on disk is all zeroes.
-    #[default]
-    A = 0,
-    B = 1,
-}
-
-impl FileId {
-    /// Rotate to the next file variant.
-    #[must_use = "rotated FileID is returned, not mutated in-place"]
-    pub fn rotate(self) -> Self {
-        match self {
-            Self::A => Self::B,
-            Self::B => Self::A,
-        }
-    }
-
-    /// Get filename for this FileId.
-    pub fn file_name(self) -> &'static str {
-        match self {
-            Self::A => FLAGS_FILE_A,
-            Self::B => FLAGS_FILE_B,
-        }
-    }
-}
-
-#[repr(C)]
-pub struct DynamicMmapStatus {
-    pub len: usize,
-    pub current_file_id: FileId,
-}
-
-fn ensure_status_file(directory: &Path) -> OperationResult<MmapMut> {
-    let status_file = status_file(directory);
-    if !status_file.exists() {
-        let length = std::mem::size_of::<DynamicMmapStatus>();
-        create_and_ensure_length(&status_file, length)?;
-        let mmap = open_write_mmap(&status_file)?;
-        Ok(mmap)
-    } else {
-        open_write_mmap(&status_file)
-    }
-}
-
-pub struct DynamicMmapFlags {
-    /// Current mmap'ed BitSlice for flags
-    flags: MmapBitSlice,
-    /// Flusher to flush current flags mmap
-    flags_flusher: Arc<Mutex<Option<Flusher>>>,
-    status: MmapType<DynamicMmapStatus>,
-    directory: PathBuf,
-}
-
-/// Based on the number of flags determines the size of the mmap file.
-fn mmap_capacity_bytes(num_flags: usize) -> usize {
-    let number_of_bytes = div_ceil(num_flags, 8);
-
-    max(MINIMAL_MMAP_SIZE, number_of_bytes.next_power_of_two())
-}
-
-/// Based on the current length determines how many flags can fit into the mmap file without resizing it.
-fn mmap_max_current_size(len: usize) -> usize {
-    let mmap_capacity_bytes = mmap_capacity_bytes(len);
-    mmap_capacity_bytes * 8
-}
-
-impl DynamicMmapFlags {
-    fn file_id_to_file(directory: &Path, file_id: FileId) -> PathBuf {
-        directory.join(file_id.file_name())
-    }
-
-    pub fn len(&self) -> usize {
-        self.status.len
-    }
-
-    pub fn open(directory: &Path) -> OperationResult<Self> {
-        fs::create_dir_all(directory)?;
-        let status_mmap = ensure_status_file(directory)?;
-        let status: MmapType<DynamicMmapStatus> = unsafe { MmapType::try_from(status_mmap)? };
-
-        // Open first mmap
-        let (flags, flags_flusher) =
-            Self::open_mmap(status.len, directory, status.current_file_id)?;
-        Ok(Self {
-            flags,
-            flags_flusher: Arc::new(Mutex::new(Some(flags_flusher))),
-            status,
-            directory: directory.to_owned(),
-        })
-    }
-
-    fn open_mmap(
-        num_flags: usize,
-        directory: &Path,
-        new_file_id: FileId,
-    ) -> OperationResult<(MmapBitSlice, Flusher)> {
-        let capacity_bytes = mmap_capacity_bytes(num_flags);
-        let mmap_path = Self::file_id_to_file(directory, new_file_id);
-        create_and_ensure_length(&mmap_path, capacity_bytes)?;
-        let flags_mmap = open_write_mmap(&mmap_path).describe("Open mmap flags for writing")?;
-        #[cfg(unix)]
-        if let Err(err) = flags_mmap.advise(memmap2::Advice::WillNeed) {
-            log::error!("Failed to advise MADV_WILLNEED for deleted flags: {}", err,);
-        }
-
-        let flags = MmapBitSlice::try_from(flags_mmap, 0)?;
-        let flusher = flags.flusher();
-        Ok((flags, flusher))
-    }
-
-    pub fn reopen_mmap(&mut self, num_flags: usize, new_file_id: FileId) -> OperationResult<()> {
-        // We can only open file which is not currently used
-        debug_assert_ne!(
-            new_file_id, self.status.current_file_id,
-            "reopen cannot open same file as current",
-        );
-
-        // Open new mmap
-        let (flags, flusher) = Self::open_mmap(num_flags, &self.directory, new_file_id)?;
-
-        // Swap operation. It is important this section is not interrupted by errors.
-        {
-            let mut flags_flusher_lock = self.flags_flusher.lock();
-            self.flags = flags;
-            flags_flusher_lock.replace(flusher);
-        }
-
-        Ok(())
-    }
-
-    /// Set the length of the vector to the given value.
-    /// If the vector is grown, the new elements will be set to `false`.
-    /// Errors if the vector is shrunk.
-    pub fn set_len(&mut self, new_len: usize) -> OperationResult<()> {
-        debug_assert!(new_len >= self.status.len);
-        if new_len == self.status.len {
-            return Ok(());
-        }
-
-        if new_len < self.status.len {
-            return Err(OperationError::service_error(format!(
-                "Cannot shrink the mmap flags from {} to {new_len}",
-                self.status.len,
-            )));
-        }
-
-        let current_capacity = mmap_max_current_size(self.status.len);
-
-        if new_len > current_capacity {
-            let old_file_id = self.status.current_file_id;
-            let new_file_id = old_file_id.rotate();
-
-            let old_mmap_file = Self::file_id_to_file(&self.directory, old_file_id);
-            let new_mmap_file = Self::file_id_to_file(&self.directory, new_file_id);
-
-            // Flush old mmap, then copy it to new one
-            self.flags.flusher()()?;
-            fs::copy(old_mmap_file, new_mmap_file)?;
-
-            self.reopen_mmap(new_len, new_file_id)?;
-            self.status.current_file_id = new_file_id;
-        }
-
-        self.status.len = new_len;
-        Ok(())
-    }
-
-    pub fn get<TKey>(&self, key: TKey) -> bool
-    where
-        TKey: num_traits::cast::AsPrimitive<usize>,
-    {
-        let key: usize = key.as_();
-        if key >= self.status.len {
-            return false;
-        }
-        self.flags[key]
-    }
-
-    /// Set the `true` value of the flag at the given index.
-    /// Ignore the call if the index is out of bounds.
-    ///
-    /// Returns previous value of the flag.
-    pub fn set<TKey>(&mut self, key: TKey, value: bool) -> bool
-    where
-        TKey: num_traits::cast::AsPrimitive<usize>,
-    {
-        let key: usize = key.as_();
-        debug_assert!(key < self.status.len);
-        if key >= self.status.len {
-            return false;
-        }
-        self.flags.replace(key, value)
-    }
-
-    pub fn flusher(&self) -> Flusher {
-        Box::new({
-            let flags_flusher = self.flags_flusher.clone();
-            let status_flusher = self.status.flusher();
-            move || {
-                // Maybe we shouldn't take flusher here: FnOnce() -> Fn()
-                if let Some(flags_flusher) = flags_flusher.lock().take() {
-                    flags_flusher()?;
-                }
-                status_flusher()?;
-                Ok(())
-            }
-        })
-    }
-
-    pub fn get_bitslice(&self) -> &BitSlice {
-        &self.flags
-    }
-
-    pub fn files(&self) -> Vec<PathBuf> {
-        vec![
-            status_file(&self.directory),
-            Self::file_id_to_file(&self.directory, self.status.current_file_id),
-        ]
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::iter;
-
-    use rand::prelude::StdRng;
-    use rand::{Rng, SeedableRng};
-    use tempfile::Builder;
-
-    use super::*;
-
-    #[test]
-    fn test_bitflags_saving() {
-        let dir = Builder::new().prefix("storage_dir").tempdir().unwrap();
-        let num_flags = 5000;
-        let mut rng = StdRng::seed_from_u64(42);
-
-        let random_flags: Vec<bool> = iter::repeat_with(|| rng.gen()).take(num_flags).collect();
-
-        {
-            let mut dynamic_flags = DynamicMmapFlags::open(dir.path()).unwrap();
-            dynamic_flags.set_len(num_flags).unwrap();
-            random_flags
-                .iter()
-                .enumerate()
-                .filter(|(_, flag)| **flag)
-                .for_each(|(i, _)| assert!(!dynamic_flags.set(i, true)));
-            // File swapping happens every 1024 (MINIMAL_MMAP_SIZE) flags
-            // < 1024 -> A
-            // < 2048 -> B
-            // < 4096 -> A
-            // < 8192 -> B
-            // < 16384 -> A
-            let expected_current_file_id = FileId::B;
-            assert_eq!(
-                dynamic_flags.status.current_file_id,
-                expected_current_file_id,
-            );
-
-            dynamic_flags.set_len(num_flags * 2).unwrap();
-            random_flags
-                .iter()
-                .enumerate()
-                .filter(|(_, flag)| !*flag)
-                .for_each(|(i, _)| assert!(!dynamic_flags.set(num_flags + i, true)));
-
-            let expected_current_file_id = FileId::A;
-            assert_eq!(
-                dynamic_flags.status.current_file_id,
-                expected_current_file_id,
-            );
-
-            dynamic_flags.flusher()().unwrap();
-        }
-
-        {
-            let dynamic_flags = DynamicMmapFlags::open(dir.path()).unwrap();
-            assert_eq!(dynamic_flags.status.len, num_flags * 2);
-            for (i, flag) in random_flags.iter().enumerate() {
-                assert_eq!(dynamic_flags.get(i), *flag);
-                assert_eq!(dynamic_flags.get(num_flags + i), !*flag);
-            }
-        }
-    }
-
-    #[test]
-    fn test_capacity() {
-        assert_eq!(mmap_capacity_bytes(0), 128);
-        assert_eq!(mmap_capacity_bytes(1), 128);
-        assert_eq!(mmap_capacity_bytes(1023), 128);
-        assert_eq!(mmap_capacity_bytes(1024), 128);
-        assert_eq!(mmap_capacity_bytes(1025), 256);
-        assert_eq!(mmap_capacity_bytes(10000), 2048);
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/vector_storage/memmap_vector_storage.rs b/crates/qdrant/lib/segment/src/vector_storage/memmap_vector_storage.rs
deleted file mode 100644
index 8590fe0..0000000
--- a/crates/qdrant/lib/segment/src/vector_storage/memmap_vector_storage.rs
+++ /dev/null
@@ -1,714 +0,0 @@
-use std::fs::{create_dir_all, File, OpenOptions};
-use std::io::{self, Write};
-use std::ops::Range;
-use std::path::{Path, PathBuf};
-use std::sync::atomic::AtomicBool;
-use std::sync::Arc;
-
-use atomic_refcell::AtomicRefCell;
-use bitvec::prelude::BitSlice;
-
-use super::quantized::quantized_vectors::QuantizedVectors;
-use super::VectorStorageEnum;
-use crate::common::{mmap_ops, Flusher};
-use crate::data_types::vectors::VectorElementType;
-use crate::entry::entry_point::{check_process_stopped, OperationResult};
-use crate::types::{Distance, PointOffsetType, QuantizationConfig};
-use crate::vector_storage::common::get_async_scorer;
-use crate::vector_storage::mmap_vectors::MmapVectors;
-use crate::vector_storage::VectorStorage;
-
-const VECTORS_PATH: &str = "matrix.dat";
-const DELETED_PATH: &str = "deleted.dat";
-
-/// Stores all vectors in mem-mapped file
-///
-/// It is not possible to insert new vectors into mem-mapped storage,
-/// but possible to mark some vectors as removed
-///
-/// Mem-mapped storage can only be constructed from another storage
-pub struct MemmapVectorStorage {
-    vectors_path: PathBuf,
-    deleted_path: PathBuf,
-    mmap_store: Option<MmapVectors>,
-    distance: Distance,
-}
-
-pub fn open_memmap_vector_storage(
-    path: &Path,
-    dim: usize,
-    distance: Distance,
-) -> OperationResult<Arc<AtomicRefCell<VectorStorageEnum>>> {
-    open_memmap_vector_storage_with_async_io(path, dim, distance, get_async_scorer())
-}
-
-pub fn open_memmap_vector_storage_with_async_io(
-    path: &Path,
-    dim: usize,
-    distance: Distance,
-    with_async_io: bool,
-) -> OperationResult<Arc<AtomicRefCell<VectorStorageEnum>>> {
-    create_dir_all(path)?;
-
-    let vectors_path = path.join(VECTORS_PATH);
-    let deleted_path = path.join(DELETED_PATH);
-    let mmap_store = MmapVectors::open(&vectors_path, &deleted_path, dim, with_async_io)?;
-
-    Ok(Arc::new(AtomicRefCell::new(VectorStorageEnum::Memmap(
-        Box::new(MemmapVectorStorage {
-            vectors_path,
-            deleted_path,
-            mmap_store: Some(mmap_store),
-            distance,
-        }),
-    ))))
-}
-
-impl MemmapVectorStorage {
-    pub fn prefault_mmap_pages(&self) -> Option<mmap_ops::PrefaultMmapPages> {
-        Some(
-            self.mmap_store
-                .as_ref()?
-                .prefault_mmap_pages(&self.vectors_path),
-        )
-    }
-
-    pub fn get_mmap_vectors(&self) -> &MmapVectors {
-        self.mmap_store.as_ref().unwrap()
-    }
-
-    pub fn has_async_reader(&self) -> bool {
-        self.mmap_store
-            .as_ref()
-            .map(|x| x.has_async_reader())
-            .unwrap_or(false)
-    }
-}
-
-impl VectorStorage for MemmapVectorStorage {
-    fn vector_dim(&self) -> usize {
-        self.mmap_store.as_ref().unwrap().dim
-    }
-
-    fn distance(&self) -> Distance {
-        self.distance
-    }
-
-    fn total_vector_count(&self) -> usize {
-        self.mmap_store.as_ref().unwrap().num_vectors
-    }
-
-    fn get_vector(&self, key: PointOffsetType) -> &[VectorElementType] {
-        self.mmap_store.as_ref().unwrap().get_vector(key)
-    }
-
-    fn insert_vector(
-        &mut self,
-        _key: PointOffsetType,
-        _vector: &[VectorElementType],
-    ) -> OperationResult<()> {
-        panic!("Can't directly update vector in mmap storage")
-    }
-
-    fn update_from(
-        &mut self,
-        other: &VectorStorageEnum,
-        other_ids: &mut dyn Iterator<Item = PointOffsetType>,
-        stopped: &AtomicBool,
-    ) -> OperationResult<Range<PointOffsetType>> {
-        let dim = self.vector_dim();
-        let start_index = self.mmap_store.as_ref().unwrap().num_vectors as PointOffsetType;
-        let mut end_index = start_index;
-
-        let with_async_io = self
-            .mmap_store
-            .take()
-            .map(|x| x.has_async_reader())
-            .unwrap_or(get_async_scorer());
-
-        // Extend vectors file, write other vectors into it
-        let mut vectors_file = open_append(&self.vectors_path)?;
-        let mut deleted_ids = vec![];
-        for id in other_ids {
-            check_process_stopped(stopped)?;
-            let vector = other.get_vector(id);
-            let raw_bites = mmap_ops::transmute_to_u8_slice(vector);
-            vectors_file.write_all(raw_bites)?;
-            end_index += 1;
-
-            // Remember deleted IDs so we can propagate deletions later
-            if other.is_deleted_vector(id) {
-                deleted_ids.push((start_index + id) as PointOffsetType);
-            }
-        }
-        vectors_file.flush()?;
-        drop(vectors_file);
-
-        // Load store with updated files
-        self.mmap_store.replace(MmapVectors::open(
-            &self.vectors_path,
-            &self.deleted_path,
-            dim,
-            with_async_io,
-        )?);
-
-        // Flush deleted flags into store
-        // We must do that in the updated store, and cannot do it in the previous loop. That is
-        // because the file backing delete storage must be resized, and for that we'd need to know
-        // the exact number of vectors beforehand. When opening the store it is done automatically.
-        let store = self.mmap_store.as_mut().unwrap();
-        for id in deleted_ids {
-            check_process_stopped(stopped)?;
-            store.delete(id);
-        }
-
-        Ok(start_index..end_index)
-    }
-
-    fn flusher(&self) -> Flusher {
-        match &self.mmap_store {
-            Some(mmap_store) => mmap_store.flusher(),
-            None => Box::new(|| Ok(())),
-        }
-    }
-
-    fn quantize(
-        &mut self,
-        data_path: &Path,
-        quantization_config: &QuantizationConfig,
-        max_threads: usize,
-        stopped: &AtomicBool,
-    ) -> OperationResult<()> {
-        let mmap_store = self.mmap_store.as_mut().unwrap();
-        mmap_store.quantize(
-            self.distance,
-            data_path,
-            quantization_config,
-            max_threads,
-            stopped,
-        )
-    }
-
-    fn load_quantization(&mut self, data_path: &Path) -> OperationResult<()> {
-        let mmap_store = self.mmap_store.as_mut().unwrap();
-        mmap_store.load_quantization(data_path, self.distance)
-    }
-
-    fn quantized_storage(&self) -> Option<&QuantizedVectors> {
-        let mmap_store = self.mmap_store.as_ref().unwrap();
-        mmap_store.quantized_vectors.as_ref()
-    }
-
-    fn files(&self) -> Vec<PathBuf> {
-        let mut files = vec![self.vectors_path.clone(), self.deleted_path.clone()];
-        if let Some(Some(quantized_vectors)) =
-            &self.mmap_store.as_ref().map(|x| &x.quantized_vectors)
-        {
-            files.extend(quantized_vectors.files())
-        }
-        files
-    }
-
-    fn delete_vector(&mut self, key: PointOffsetType) -> OperationResult<bool> {
-        Ok(self.mmap_store.as_mut().unwrap().delete(key))
-    }
-
-    fn is_deleted_vector(&self, key: PointOffsetType) -> bool {
-        self.mmap_store.as_ref().unwrap().is_deleted_vector(key)
-    }
-
-    fn deleted_vector_count(&self) -> usize {
-        self.mmap_store.as_ref().unwrap().deleted_count
-    }
-
-    fn deleted_vector_bitslice(&self) -> &BitSlice {
-        self.mmap_store.as_ref().unwrap().deleted_vector_bitslice()
-    }
-
-    fn is_appendable(&self) -> bool {
-        false
-    }
-}
-
-/// Open a file shortly for appending
-fn open_append<P: AsRef<Path>>(path: P) -> io::Result<File> {
-    OpenOptions::new()
-        .read(false)
-        .write(false)
-        .append(true)
-        .create(false)
-        .open(path)
-}
-
-#[cfg(test)]
-mod tests {
-    use std::mem::transmute;
-
-    use tempfile::Builder;
-
-    use super::*;
-    use crate::common::mmap_ops::transmute_to_u8_slice;
-    use crate::common::rocksdb_wrapper::{open_db, DB_VECTOR_CF};
-    use crate::fixtures::payload_context_fixture::FixtureIdTracker;
-    use crate::id_tracker::IdTracker;
-    use crate::types::{PointIdType, ScalarQuantizationConfig};
-    use crate::vector_storage::simple_vector_storage::open_simple_vector_storage;
-    use crate::vector_storage::{new_raw_scorer, ScoredPointOffset};
-
-    #[test]
-    fn test_basic_persistence() {
-        let dir = Builder::new().prefix("storage_dir").tempdir().unwrap();
-
-        let points = vec![
-            vec![1.0, 0.0, 1.0, 1.0],
-            vec![1.0, 0.0, 1.0, 0.0],
-            vec![1.0, 1.0, 1.0, 1.0],
-            vec![1.0, 1.0, 0.0, 1.0],
-            vec![1.0, 0.0, 0.0, 0.0],
-        ];
-        let id_tracker = Arc::new(AtomicRefCell::new(FixtureIdTracker::new(points.len())));
-        let storage = open_memmap_vector_storage(dir.path(), 4, Distance::Dot).unwrap();
-        let mut borrowed_id_tracker = id_tracker.borrow_mut();
-        let mut borrowed_storage = storage.borrow_mut();
-
-        // Assert this storage lists both the vector and deleted file
-        let files = borrowed_storage.files();
-        for file_name in [VECTORS_PATH, DELETED_PATH] {
-            files
-                .iter()
-                .find(|p| p.file_name().unwrap() == file_name)
-                .expect("storage is missing required file");
-        }
-
-        {
-            let dir2 = Builder::new().prefix("db_dir").tempdir().unwrap();
-            let db = open_db(dir2.path(), &[DB_VECTOR_CF]).unwrap();
-            let storage2 = open_simple_vector_storage(db, DB_VECTOR_CF, 4, Distance::Dot).unwrap();
-            {
-                let mut borrowed_storage2 = storage2.borrow_mut();
-                borrowed_storage2.insert_vector(0, &points[0]).unwrap();
-                borrowed_storage2.insert_vector(1, &points[1]).unwrap();
-                borrowed_storage2.insert_vector(2, &points[2]).unwrap();
-            }
-            borrowed_storage
-                .update_from(&storage2.borrow(), &mut Box::new(0..3), &Default::default())
-                .unwrap();
-        }
-
-        assert_eq!(borrowed_storage.total_vector_count(), 3);
-
-        let vector = borrowed_storage.get_vector(1).to_vec();
-
-        assert_eq!(points[1], vector);
-
-        borrowed_id_tracker.drop(PointIdType::NumId(2)).unwrap();
-
-        {
-            let dir2 = Builder::new().prefix("db_dir").tempdir().unwrap();
-            let db = open_db(dir2.path(), &[DB_VECTOR_CF]).unwrap();
-            let storage2 = open_simple_vector_storage(db, DB_VECTOR_CF, 4, Distance::Dot).unwrap();
-            {
-                let mut borrowed_storage2 = storage2.borrow_mut();
-                borrowed_storage2.insert_vector(3, &points[3]).unwrap();
-                borrowed_storage2.insert_vector(4, &points[4]).unwrap();
-            }
-            borrowed_storage
-                .update_from(&storage2.borrow(), &mut Box::new(0..2), &Default::default())
-                .unwrap();
-        }
-
-        assert_eq!(borrowed_storage.total_vector_count(), 5);
-
-        let stored_ids: Vec<PointOffsetType> = borrowed_id_tracker.iter_ids().collect();
-
-        assert_eq!(stored_ids, [0, 1, 3, 4]);
-
-        let raw_scorer = new_raw_scorer(
-            points[2].clone(),
-            &borrowed_storage,
-            borrowed_id_tracker.deleted_point_bitslice(),
-        );
-        let res = raw_scorer.peek_top_all(2);
-
-        assert_eq!(res.len(), 2);
-
-        assert_ne!(res[0].idx, 2);
-
-        let res = raw_scorer.peek_top_iter(&mut vec![0, 1, 2, 3, 4].iter().cloned(), 2);
-
-        assert_eq!(res.len(), 2);
-        assert_ne!(res[0].idx, 2);
-    }
-
-    #[test]
-    fn test_delete_points() {
-        let dir = Builder::new().prefix("storage_dir").tempdir().unwrap();
-
-        let points = vec![
-            vec![1.0, 0.0, 1.0, 1.0],
-            vec![1.0, 0.0, 1.0, 0.0],
-            vec![1.0, 1.0, 1.0, 1.0],
-            vec![1.0, 1.0, 0.0, 1.0],
-            vec![1.0, 0.0, 0.0, 0.0],
-        ];
-        let delete_mask = [false, false, true, true, false];
-        let id_tracker = Arc::new(AtomicRefCell::new(FixtureIdTracker::new(points.len())));
-        let storage = open_memmap_vector_storage(dir.path(), 4, Distance::Dot).unwrap();
-        let borrowed_id_tracker = id_tracker.borrow_mut();
-        let mut borrowed_storage = storage.borrow_mut();
-
-        {
-            let dir2 = Builder::new().prefix("db_dir").tempdir().unwrap();
-            let db = open_db(dir2.path(), &[DB_VECTOR_CF]).unwrap();
-            let storage2 = open_simple_vector_storage(db, DB_VECTOR_CF, 4, Distance::Dot).unwrap();
-            {
-                let mut borrowed_storage2 = storage2.borrow_mut();
-                points.iter().enumerate().for_each(|(i, vec)| {
-                    borrowed_storage2
-                        .insert_vector(i as PointOffsetType, vec)
-                        .unwrap();
-                });
-            }
-            borrowed_storage
-                .update_from(
-                    &storage2.borrow(),
-                    &mut Box::new(0..points.len() as u32),
-                    &Default::default(),
-                )
-                .unwrap();
-        }
-
-        assert_eq!(borrowed_storage.total_vector_count(), 5);
-        assert_eq!(borrowed_storage.deleted_vector_count(), 0);
-
-        // Delete select number of points
-        delete_mask
-            .into_iter()
-            .enumerate()
-            .filter(|(_, d)| *d)
-            .for_each(|(i, _)| {
-                borrowed_storage
-                    .delete_vector(i as PointOffsetType)
-                    .unwrap();
-            });
-        assert_eq!(
-            borrowed_storage.deleted_vector_count(),
-            2,
-            "2 vectors must be deleted"
-        );
-
-        let query: Vec<VectorElementType> = vec![0.0, 1.0, 1.1, 1.0];
-        let closest = new_raw_scorer(
-            query,
-            &borrowed_storage,
-            borrowed_id_tracker.deleted_point_bitslice(),
-        )
-        .peek_top_iter(&mut [0, 1, 2, 3, 4].iter().cloned(), 5);
-        assert_eq!(closest.len(), 3, "must have 3 vectors, 2 are deleted");
-        assert_eq!(closest[0].idx, 0);
-        assert_eq!(closest[1].idx, 1);
-        assert_eq!(closest[2].idx, 4);
-
-        // Delete 1, redelete 2
-        borrowed_storage
-            .delete_vector(1 as PointOffsetType)
-            .unwrap();
-        borrowed_storage
-            .delete_vector(2 as PointOffsetType)
-            .unwrap();
-        assert_eq!(
-            borrowed_storage.deleted_vector_count(),
-            3,
-            "3 vectors must be deleted"
-        );
-
-        let query: Vec<VectorElementType> = vec![1.0, 0.0, 0.0, 0.0];
-        let closest = new_raw_scorer(
-            query,
-            &borrowed_storage,
-            borrowed_id_tracker.deleted_point_bitslice(),
-        )
-        .peek_top_iter(&mut [0, 1, 2, 3, 4].iter().cloned(), 5);
-        assert_eq!(closest.len(), 2, "must have 2 vectors, 3 are deleted");
-        assert_eq!(closest[0].idx, 4);
-        assert_eq!(closest[1].idx, 0);
-
-        // Delete all
-        borrowed_storage
-            .delete_vector(0 as PointOffsetType)
-            .unwrap();
-        borrowed_storage
-            .delete_vector(4 as PointOffsetType)
-            .unwrap();
-        assert_eq!(
-            borrowed_storage.deleted_vector_count(),
-            5,
-            "all vectors must be deleted"
-        );
-
-        let query: Vec<VectorElementType> = vec![1.0, 0.0, 0.0, 0.0];
-        let closest = new_raw_scorer(
-            query,
-            &borrowed_storage,
-            borrowed_id_tracker.deleted_point_bitslice(),
-        )
-        .peek_top_all(5);
-        assert!(closest.is_empty(), "must have no results, all deleted");
-    }
-
-    /// Test that deleted points are properly transferred when updating from other storage.
-    #[test]
-    fn test_update_from_delete_points() {
-        let dir = Builder::new().prefix("storage_dir").tempdir().unwrap();
-
-        let points = vec![
-            vec![1.0, 0.0, 1.0, 1.0],
-            vec![1.0, 0.0, 1.0, 0.0],
-            vec![1.0, 1.0, 1.0, 1.0],
-            vec![1.0, 1.0, 0.0, 1.0],
-            vec![1.0, 0.0, 0.0, 0.0],
-        ];
-        let delete_mask = [false, false, true, true, false];
-        let id_tracker = Arc::new(AtomicRefCell::new(FixtureIdTracker::new(points.len())));
-        let storage = open_memmap_vector_storage(dir.path(), 4, Distance::Dot).unwrap();
-        let borrowed_id_tracker = id_tracker.borrow_mut();
-        let mut borrowed_storage = storage.borrow_mut();
-
-        {
-            let dir2 = Builder::new().prefix("db_dir").tempdir().unwrap();
-            let db = open_db(dir2.path(), &[DB_VECTOR_CF]).unwrap();
-            let storage2 = open_simple_vector_storage(db, DB_VECTOR_CF, 4, Distance::Dot).unwrap();
-            {
-                let mut borrowed_storage2 = storage2.borrow_mut();
-                points.iter().enumerate().for_each(|(i, vec)| {
-                    borrowed_storage2
-                        .insert_vector(i as PointOffsetType, vec)
-                        .unwrap();
-                    if delete_mask[i] {
-                        borrowed_storage2
-                            .delete_vector(i as PointOffsetType)
-                            .unwrap();
-                    }
-                });
-            }
-            borrowed_storage
-                .update_from(
-                    &storage2.borrow(),
-                    &mut Box::new(0..points.len() as u32),
-                    &Default::default(),
-                )
-                .unwrap();
-        }
-
-        assert_eq!(
-            borrowed_storage.deleted_vector_count(),
-            2,
-            "2 vectors must be deleted from other storage"
-        );
-
-        let query: Vec<VectorElementType> = vec![0.0, 1.0, 1.1, 1.0];
-        let closest = new_raw_scorer(
-            query,
-            &borrowed_storage,
-            borrowed_id_tracker.deleted_point_bitslice(),
-        )
-        .peek_top_iter(&mut [0, 1, 2, 3, 4].iter().cloned(), 5);
-        assert_eq!(closest.len(), 3, "must have 3 vectors, 2 are deleted");
-        assert_eq!(closest[0].idx, 0);
-        assert_eq!(closest[1].idx, 1);
-        assert_eq!(closest[2].idx, 4);
-
-        // Delete all
-        borrowed_storage
-            .delete_vector(0 as PointOffsetType)
-            .unwrap();
-        borrowed_storage
-            .delete_vector(1 as PointOffsetType)
-            .unwrap();
-        borrowed_storage
-            .delete_vector(4 as PointOffsetType)
-            .unwrap();
-        assert_eq!(
-            borrowed_storage.deleted_vector_count(),
-            5,
-            "all vectors must be deleted"
-        );
-    }
-
-    #[test]
-    fn test_mmap_raw_scorer() {
-        let dir = Builder::new().prefix("storage_dir").tempdir().unwrap();
-
-        let points = vec![
-            vec![1.0, 0.0, 1.0, 1.0],
-            vec![1.0, 0.0, 1.0, 0.0],
-            vec![1.0, 1.0, 1.0, 1.0],
-            vec![1.0, 1.0, 0.0, 1.0],
-            vec![1.0, 0.0, 0.0, 0.0],
-        ];
-        let id_tracker = Arc::new(AtomicRefCell::new(FixtureIdTracker::new(points.len())));
-        let storage = open_memmap_vector_storage(dir.path(), 4, Distance::Dot).unwrap();
-        let borrowed_id_tracker = id_tracker.borrow_mut();
-        let mut borrowed_storage = storage.borrow_mut();
-
-        {
-            let dir2 = Builder::new().prefix("db_dir").tempdir().unwrap();
-            let db = open_db(dir2.path(), &[DB_VECTOR_CF]).unwrap();
-            let storage2 = open_simple_vector_storage(db, DB_VECTOR_CF, 4, Distance::Dot).unwrap();
-            {
-                let mut borrowed_storage2 = storage2.borrow_mut();
-                for (i, vec) in points.iter().enumerate() {
-                    borrowed_storage2
-                        .insert_vector(i as PointOffsetType, vec)
-                        .unwrap();
-                }
-            }
-            borrowed_storage
-                .update_from(
-                    &storage2.borrow(),
-                    &mut Box::new(0..points.len() as PointOffsetType),
-                    &Default::default(),
-                )
-                .unwrap();
-        }
-
-        let query = vec![-1.0, -1.0, -1.0, -1.0];
-        let query_points: Vec<PointOffsetType> = vec![0, 2, 4];
-
-        let scorer = new_raw_scorer(
-            query,
-            &borrowed_storage,
-            borrowed_id_tracker.deleted_point_bitslice(),
-        );
-
-        let mut res = vec![ScoredPointOffset { idx: 0, score: 0. }; query_points.len()];
-        let res_count = scorer.score_points(&query_points, &mut res);
-        res.resize(res_count, ScoredPointOffset { idx: 0, score: 0. });
-
-        assert_eq!(res.len(), 3);
-        assert_eq!(res[0].idx, 0);
-        assert_eq!(res[1].idx, 2);
-        assert_eq!(res[2].idx, 4);
-
-        assert_eq!(res[2].score, -1.0);
-    }
-
-    #[test]
-    fn test_casts() {
-        let data: Vec<VectorElementType> = vec![0.42, 0.069, 333.1, 100500.];
-
-        let raw_data = transmute_to_u8_slice(&data);
-
-        eprintln!("raw_data.len() = {:#?}", raw_data.len());
-
-        let arr: &[VectorElementType] = unsafe { transmute(raw_data) };
-
-        let slice = &arr[0..data.len()];
-
-        eprintln!("slice.len() = {:#?}", slice.len());
-
-        for (idx, element) in slice.iter().enumerate() {
-            println!("slice[{idx}]  = {element:?}");
-        }
-    }
-
-    #[test]
-    fn test_mmap_quantization() {
-        let dir = Builder::new().prefix("storage_dir").tempdir().unwrap();
-
-        let points = vec![
-            vec![1.0, 0.0, 1.0, 1.0],
-            vec![1.0, 0.0, 1.0, 0.0],
-            vec![1.0, 1.0, 1.0, 1.0],
-            vec![1.0, 1.0, 0.0, 1.0],
-            vec![1.0, 0.0, 0.0, 0.0],
-        ];
-        let id_tracker = Arc::new(AtomicRefCell::new(FixtureIdTracker::new(points.len())));
-        let storage = open_memmap_vector_storage(dir.path(), 4, Distance::Dot).unwrap();
-        let borrowed_id_tracker = id_tracker.borrow_mut();
-        let mut borrowed_storage = storage.borrow_mut();
-
-        {
-            let dir2 = Builder::new().prefix("db_dir").tempdir().unwrap();
-            let db = open_db(dir2.path(), &[DB_VECTOR_CF]).unwrap();
-            let storage2 = open_simple_vector_storage(db, DB_VECTOR_CF, 4, Distance::Dot).unwrap();
-            {
-                let mut borrowed_storage2 = storage2.borrow_mut();
-                for (i, vec) in points.iter().enumerate() {
-                    borrowed_storage2
-                        .insert_vector(i as PointOffsetType, vec)
-                        .unwrap();
-                }
-            }
-            borrowed_storage
-                .update_from(
-                    &storage2.borrow(),
-                    &mut Box::new(0..points.len() as PointOffsetType),
-                    &Default::default(),
-                )
-                .unwrap();
-        }
-
-        let config: QuantizationConfig = ScalarQuantizationConfig {
-            r#type: Default::default(),
-            quantile: None,
-            always_ram: None,
-        }
-        .into();
-
-        let stopped = Arc::new(AtomicBool::new(false));
-        borrowed_storage
-            .quantize(dir.path(), &config, 1, &stopped)
-            .unwrap();
-
-        let query = vec![0.5, 0.5, 0.5, 0.5];
-
-        {
-            let scorer_quant = borrowed_storage.quantized_storage().unwrap().raw_scorer(
-                &query,
-                borrowed_id_tracker.deleted_point_bitslice(),
-                borrowed_storage.deleted_vector_bitslice(),
-                &stopped,
-            );
-            let scorer_orig = new_raw_scorer(
-                query.clone(),
-                &borrowed_storage,
-                borrowed_id_tracker.deleted_point_bitslice(),
-            );
-            for i in 0..5 {
-                let quant = scorer_quant.score_point(i);
-                let orig = scorer_orig.score_point(i);
-                assert!((orig - quant).abs() < 0.15);
-
-                let quant = scorer_quant.score_internal(0, i);
-                let orig = scorer_orig.score_internal(0, i);
-                assert!((orig - quant).abs() < 0.15);
-            }
-        }
-
-        // test save-load
-        borrowed_storage.load_quantization(dir.path()).unwrap();
-
-        let scorer_quant = borrowed_storage.quantized_storage().unwrap().raw_scorer(
-            &query,
-            borrowed_id_tracker.deleted_point_bitslice(),
-            borrowed_storage.deleted_vector_bitslice(),
-            &stopped,
-        );
-        let scorer_orig = new_raw_scorer(
-            query,
-            &borrowed_storage,
-            borrowed_id_tracker.deleted_point_bitslice(),
-        );
-
-        for i in 0..5 {
-            let quant = scorer_quant.score_point(i);
-            let orig = scorer_orig.score_point(i);
-            assert!((orig - quant).abs() < 0.15);
-
-            let quant = scorer_quant.score_internal(0, i);
-            let orig = scorer_orig.score_internal(0, i);
-            assert!((orig - quant).abs() < 0.15);
-        }
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/vector_storage/mmap_vectors.rs b/crates/qdrant/lib/segment/src/vector_storage/mmap_vectors.rs
deleted file mode 100644
index 57f0113..0000000
--- a/crates/qdrant/lib/segment/src/vector_storage/mmap_vectors.rs
+++ /dev/null
@@ -1,298 +0,0 @@
-use std::fs::{File, OpenOptions};
-use std::io::Write;
-use std::mem::{self, size_of, transmute};
-use std::path::Path;
-use std::sync::atomic::AtomicBool;
-use std::sync::Arc;
-
-use bitvec::prelude::BitSlice;
-use memmap2::Mmap;
-use parking_lot::Mutex;
-
-use super::div_ceil;
-use crate::common::error_logging::LogError;
-use crate::common::mmap_type::MmapBitSlice;
-use crate::common::{mmap_ops, Flusher};
-use crate::data_types::vectors::VectorElementType;
-use crate::entry::entry_point::OperationResult;
-use crate::types::{Distance, PointOffsetType, QuantizationConfig};
-#[cfg(target_os = "linux")]
-use crate::vector_storage::async_io::UringReader;
-#[cfg(not(target_os = "linux"))]
-use crate::vector_storage::async_io_mock::UringReader;
-use crate::vector_storage::quantized::quantized_vectors::QuantizedVectors;
-
-const HEADER_SIZE: usize = 4;
-const VECTORS_HEADER: &[u8; HEADER_SIZE] = b"data";
-const DELETED_HEADER: &[u8; HEADER_SIZE] = b"drop";
-
-/// Mem-mapped file
-pub struct MmapVectors {
-    pub dim: usize,
-    pub num_vectors: usize,
-    /// Memory mapped file for vector data
-    ///
-    /// Has an exact size to fit a header and `num_vectors` of vectors.
-    mmap: Arc<Mmap>,
-    /// Context for io_uring-base async IO
-    #[cfg_attr(not(target_os = "linux"), allow(dead_code))]
-    uring_reader: Mutex<Option<UringReader>>,
-    /// Memory mapped deletion flags
-    deleted: MmapBitSlice,
-    /// Current number of deleted vectors.
-    pub deleted_count: usize,
-    pub quantized_vectors: Option<QuantizedVectors>,
-}
-
-impl MmapVectors {
-    pub fn open(
-        vectors_path: &Path,
-        deleted_path: &Path,
-        dim: usize,
-        with_async_io: bool,
-    ) -> OperationResult<Self> {
-        // Allocate/open vectors mmap
-        ensure_mmap_file_size(vectors_path, VECTORS_HEADER, None)
-            .describe("Create mmap data file")?;
-        let mmap = mmap_ops::open_read_mmap(vectors_path).describe("Open mmap for reading")?;
-        let num_vectors = (mmap.len() - HEADER_SIZE) / dim / size_of::<VectorElementType>();
-
-        // Allocate/open deleted mmap
-        let deleted_mmap_size = deleted_mmap_size(num_vectors);
-        ensure_mmap_file_size(deleted_path, DELETED_HEADER, Some(deleted_mmap_size as u64))
-            .describe("Create mmap deleted file")?;
-        let deleted_mmap =
-            mmap_ops::open_write_mmap(deleted_path).describe("Open mmap deleted for writing")?;
-
-        // Advise kernel that we'll need this page soon so the kernel can prepare
-        #[cfg(unix)]
-        if let Err(err) = deleted_mmap.advise(memmap2::Advice::WillNeed) {
-            log::error!("Failed to advise MADV_WILLNEED for deleted flags: {}", err,);
-        }
-
-        // Transform into mmap BitSlice
-        let deleted = MmapBitSlice::try_from(deleted_mmap, deleted_mmap_data_start())?;
-        let deleted_count = deleted.count_ones();
-
-        let uring_reader = if with_async_io {
-            // Keep file handle open for async IO
-            let vectors_file = File::open(vectors_path)?;
-            let raw_size = dim * size_of::<VectorElementType>();
-            Some(UringReader::new(vectors_file, raw_size, HEADER_SIZE)?)
-        } else {
-            None
-        };
-
-        Ok(MmapVectors {
-            dim,
-            num_vectors,
-            mmap: mmap.into(),
-            uring_reader: Mutex::new(uring_reader),
-            deleted,
-            deleted_count,
-            quantized_vectors: None,
-        })
-    }
-
-    pub fn has_async_reader(&self) -> bool {
-        self.uring_reader.lock().is_some()
-    }
-
-    pub fn flusher(&self) -> Flusher {
-        self.deleted.flusher()
-    }
-
-    pub fn quantize(
-        &mut self,
-        distance: Distance,
-        data_path: &Path,
-        quantization_config: &QuantizationConfig,
-        max_threads: usize,
-        stopped: &AtomicBool,
-    ) -> OperationResult<()> {
-        // In theory, we can lock deleted flags here, as we assume that it is the hottest data. We
-        // can use mlock to achieve that. Docker (and some other systems) has a very low default
-        // limit for lockable memory however, which is causing lock errors. Since this is the
-        // default configuration it is hard to make practical use of this. Additionally, the
-        // speedup is not measured explicitly.
-        // See <https://github.com/qdrant/qdrant/pull/1885#issuecomment-1547408116>
-
-        let vector_data_iterator = (0..self.num_vectors as u32).map(|i| {
-            let offset = self.data_offset(i as PointOffsetType).unwrap_or_default();
-            self.raw_vector_offset(offset)
-        });
-        self.quantized_vectors = Some(QuantizedVectors::create(
-            vector_data_iterator,
-            quantization_config,
-            distance,
-            self.dim,
-            self.num_vectors,
-            data_path,
-            true,
-            max_threads,
-            stopped,
-        )?);
-        Ok(())
-    }
-
-    pub fn load_quantization(
-        &mut self,
-        data_path: &Path,
-        distance: Distance,
-    ) -> OperationResult<()> {
-        if QuantizedVectors::config_exists(data_path) {
-            // In theory, we can lock deleted flags here, as we assume that it is the hottest data. We
-            // can use mlock to achieve that. Docker (and some other systems) has a very low default
-            // limit for lockable memory however, which is causing lock errors. Since this is the
-            // default configuration it is hard to make practical use of this. Additionally, the
-            // speedup is not measured explicitly.
-            // See <https://github.com/qdrant/qdrant/pull/1885#issuecomment-1547408116>
-
-            self.quantized_vectors = Some(QuantizedVectors::load(data_path, true, distance)?);
-        }
-        Ok(())
-    }
-
-    pub fn data_offset(&self, key: PointOffsetType) -> Option<usize> {
-        let vector_data_length = self.dim * size_of::<VectorElementType>();
-        let offset = (key as usize) * vector_data_length + HEADER_SIZE;
-        if key >= (self.num_vectors as PointOffsetType) {
-            return None;
-        }
-        Some(offset)
-    }
-
-    pub fn raw_size(&self) -> usize {
-        self.dim * size_of::<VectorElementType>()
-    }
-
-    pub fn raw_vector_offset(&self, offset: usize) -> &[VectorElementType] {
-        let byte_slice = &self.mmap[offset..(offset + self.raw_size())];
-        let arr: &[VectorElementType] = unsafe { transmute(byte_slice) };
-        &arr[0..self.dim]
-    }
-
-    /// Returns reference to vector data by key
-    pub fn get_vector(&self, key: PointOffsetType) -> &[VectorElementType] {
-        let offset = self.data_offset(key).unwrap();
-        self.raw_vector_offset(offset)
-    }
-
-    pub fn delete(&mut self, key: PointOffsetType) -> bool {
-        if self.num_vectors <= key as usize {
-            return false;
-        }
-
-        let is_deleted = !self.deleted.replace(key as usize, true);
-        if is_deleted {
-            self.deleted_count += 1;
-        }
-        is_deleted
-    }
-
-    pub fn is_deleted_vector(&self, key: PointOffsetType) -> bool {
-        self.deleted[key as usize]
-    }
-
-    /// Get [`BitSlice`] representation for deleted vectors with deletion flags
-    ///
-    /// The size of this slice is not guaranteed. It may be smaller/larger than the number of
-    /// vectors in this segment.
-    pub fn deleted_vector_bitslice(&self) -> &BitSlice {
-        &self.deleted
-    }
-
-    pub fn prefault_mmap_pages(&self, path: &Path) -> mmap_ops::PrefaultMmapPages {
-        mmap_ops::PrefaultMmapPages::new(self.mmap.clone(), Some(path))
-    }
-
-    #[cfg(target_os = "linux")]
-    fn process_points_uring(
-        &self,
-        points: impl Iterator<Item = PointOffsetType>,
-        callback: impl FnMut(usize, PointOffsetType, &[VectorElementType]),
-    ) -> OperationResult<()> {
-        self.uring_reader
-            .lock()
-            .as_mut()
-            .expect("io_uring reader should be initialized")
-            .read_stream(points, callback)
-    }
-
-    #[cfg(not(target_os = "linux"))]
-    fn process_points_simple(
-        &self,
-        points: impl Iterator<Item = PointOffsetType>,
-        mut callback: impl FnMut(usize, PointOffsetType, &[VectorElementType]),
-    ) -> OperationResult<()> {
-        for (idx, point) in points.enumerate() {
-            let vector = self.get_vector(point);
-            callback(idx, point, vector);
-        }
-        Ok(())
-    }
-
-    /// Reads vectors for the given ids and calls the callback for each vector.
-    /// Tries to utilize asynchronous IO if possible.
-    /// In particular, uses io_uring on Linux and simple synchronous IO otherwise.
-    pub fn read_vectors_async(
-        &self,
-        points: impl Iterator<Item = PointOffsetType>,
-        callback: impl FnMut(usize, PointOffsetType, &[VectorElementType]),
-    ) -> OperationResult<()> {
-        #[cfg(target_os = "linux")]
-        {
-            self.process_points_uring(points, callback)
-        }
-
-        #[cfg(not(target_os = "linux"))]
-        {
-            self.process_points_simple(points, callback)
-        }
-    }
-}
-
-/// Ensure the given mmap file exists and is the given size
-///
-/// # Arguments
-/// * `path`: path of the file.
-/// * `header`: header to set when the file is newly created.
-/// * `size`: set the file size in bytes, filled with zeroes.
-fn ensure_mmap_file_size(path: &Path, header: &[u8], size: Option<u64>) -> OperationResult<()> {
-    // If it exists, only set the length
-    if path.exists() {
-        if let Some(size) = size {
-            let file = OpenOptions::new().write(true).open(path)?;
-            file.set_len(size)?;
-        }
-        return Ok(());
-    }
-
-    // Create file, and make it the correct size
-    let mut file = File::create(path)?;
-    file.write_all(header)?;
-    if let Some(size) = size {
-        if size > header.len() as u64 {
-            file.set_len(size)?;
-        }
-    }
-    Ok(())
-}
-
-/// Get start position of flags `BitSlice` in deleted mmap.
-#[inline]
-const fn deleted_mmap_data_start() -> usize {
-    let align = mem::align_of::<usize>();
-    div_ceil(HEADER_SIZE, align) * align
-}
-
-/// Calculate size for deleted mmap to hold the given number of vectors.
-///
-/// The mmap will hold a file header and an aligned `BitSlice`.
-fn deleted_mmap_size(num: usize) -> usize {
-    let unit_size = mem::size_of::<usize>();
-    let num_bytes = div_ceil(num, 8);
-    let num_usizes = div_ceil(num_bytes, unit_size);
-    let data_size = num_usizes * unit_size;
-    deleted_mmap_data_start() + data_size
-}
diff --git a/crates/qdrant/lib/segment/src/vector_storage/mod.rs b/crates/qdrant/lib/segment/src/vector_storage/mod.rs
deleted file mode 100644
index 6916edf..0000000
--- a/crates/qdrant/lib/segment/src/vector_storage/mod.rs
+++ /dev/null
@@ -1,42 +0,0 @@
-pub mod appendable_mmap_vector_storage;
-#[cfg(target_os = "linux")]
-pub mod async_raw_scorer;
-mod chunked_mmap_vectors;
-mod chunked_utils;
-pub mod chunked_vectors;
-mod dynamic_mmap_flags;
-pub mod memmap_vector_storage;
-mod mmap_vectors;
-pub mod quantized;
-pub mod raw_scorer;
-pub mod simple_vector_storage;
-mod vector_storage_base;
-
-#[cfg(test)]
-mod tests;
-
-#[cfg(target_os = "linux")]
-mod async_io;
-mod async_io_mock;
-pub mod common;
-
-pub use raw_scorer::*;
-pub use vector_storage_base::*;
-
-/// Calculates the quotient of self and rhs, rounding the result towards positive infinity.
-///
-/// # Panics
-///
-/// This function will panic if rhs is zero.
-///
-/// # Overflow behavior
-///
-/// On overflow, this function will panic if overflow checks are enabled (default in debug mode)
-/// and wrap if overflow checks are disabled (default in release mode).
-// Can be replaced with stdlib once it stabilizes:
-// - <https://github.com/rust-lang/rust/issues/88581>
-// - <https://doc.rust-lang.org/std/primitive.usize.html#method.div_ceil>
-#[inline]
-pub(crate) const fn div_ceil(a: usize, b: usize) -> usize {
-    (a + b - 1) / b
-}
diff --git a/crates/qdrant/lib/segment/src/vector_storage/quantized/mod.rs b/crates/qdrant/lib/segment/src/vector_storage/quantized/mod.rs
deleted file mode 100644
index 71e1808..0000000
--- a/crates/qdrant/lib/segment/src/vector_storage/quantized/mod.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-mod quantized_mmap_storage;
-mod quantized_raw_scorer;
-pub mod quantized_vectors;
diff --git a/crates/qdrant/lib/segment/src/vector_storage/quantized/quantized_mmap_storage.rs b/crates/qdrant/lib/segment/src/vector_storage/quantized/quantized_mmap_storage.rs
deleted file mode 100644
index 2a1fd4d..0000000
--- a/crates/qdrant/lib/segment/src/vector_storage/quantized/quantized_mmap_storage.rs
+++ /dev/null
@@ -1,88 +0,0 @@
-use std::path::Path;
-
-use memmap2::{Mmap, MmapMut};
-
-use crate::madvise;
-
-pub struct QuantizedMmapStorage {
-    mmap: Mmap,
-}
-
-pub struct QuantizedMmapStorageBuilder {
-    mmap: MmapMut,
-    cursor_pos: usize,
-}
-
-impl quantization::EncodedStorage for QuantizedMmapStorage {
-    fn get_vector_data(&self, index: usize, vector_size: usize) -> &[u8] {
-        &self.mmap[vector_size * index..vector_size * (index + 1)]
-    }
-
-    fn from_file(
-        path: &Path,
-        quantized_vector_size: usize,
-        vectors_count: usize,
-    ) -> std::io::Result<QuantizedMmapStorage> {
-        let file = std::fs::OpenOptions::new()
-            .read(true)
-            .write(false)
-            .create(false)
-            .open(path)?;
-        let mmap = unsafe { Mmap::map(&file)? };
-        madvise::madvise(&mmap, madvise::get_global())?;
-
-        let expected_size = quantized_vector_size * vectors_count;
-        if mmap.len() == expected_size {
-            Ok(Self { mmap })
-        } else {
-            Err(std::io::Error::new(
-                std::io::ErrorKind::Other,
-                format!(
-                    "Loaded storage size {} is not equal to expected size {expected_size}",
-                    mmap.len()
-                ),
-            ))
-        }
-    }
-
-    fn save_to_file(&self, _path: &Path) -> std::io::Result<()> {
-        // do nothing because mmap is already saved
-        Ok(())
-    }
-}
-
-impl quantization::EncodedStorageBuilder<QuantizedMmapStorage> for QuantizedMmapStorageBuilder {
-    fn build(self) -> QuantizedMmapStorage {
-        self.mmap.flush().unwrap();
-        let mmap = self.mmap.make_read_only().unwrap(); // TODO: remove unwrap
-        QuantizedMmapStorage { mmap }
-    }
-
-    fn push_vector_data(&mut self, other: &[u8]) {
-        self.mmap[self.cursor_pos..self.cursor_pos + other.len()].copy_from_slice(other);
-        self.cursor_pos += other.len();
-    }
-}
-
-impl QuantizedMmapStorageBuilder {
-    pub fn new(
-        path: &Path,
-        vectors_count: usize,
-        quantized_vector_size: usize,
-    ) -> std::io::Result<Self> {
-        let encoded_storage_size = quantized_vector_size * vectors_count;
-        path.parent().map(std::fs::create_dir_all);
-        let file = std::fs::OpenOptions::new()
-            .read(true)
-            .write(true)
-            .create(true)
-            .open(path)?;
-        file.set_len(encoded_storage_size as u64)?;
-        let mmap = unsafe { MmapMut::map_mut(&file) }?;
-        madvise::madvise(&mmap, madvise::get_global())?;
-        Ok(Self {
-            mmap,
-            cursor_pos: 0,
-        })
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/vector_storage/quantized/quantized_raw_scorer.rs b/crates/qdrant/lib/segment/src/vector_storage/quantized/quantized_raw_scorer.rs
deleted file mode 100644
index c8b1cdb..0000000
--- a/crates/qdrant/lib/segment/src/vector_storage/quantized/quantized_raw_scorer.rs
+++ /dev/null
@@ -1,119 +0,0 @@
-use std::sync::atomic::{AtomicBool, Ordering};
-
-use bitvec::prelude::BitSlice;
-
-use crate::spaces::tools::peek_top_largest_iterable;
-use crate::types::{PointOffsetType, ScoreType};
-use crate::vector_storage::{RawScorer, ScoredPointOffset};
-
-pub struct QuantizedRawScorer<'a, TEncodedQuery, TEncodedVectors>
-where
-    TEncodedVectors: quantization::EncodedVectors<TEncodedQuery>,
-{
-    pub(super) query: TEncodedQuery,
-    /// [`BitSlice`] defining flags for deleted points (and thus these vectors).
-    pub(super) point_deleted: &'a BitSlice,
-    /// [`BitSlice`] defining flags for deleted vectors in this segment.
-    pub(super) vec_deleted: &'a BitSlice,
-    pub quantized_data: &'a TEncodedVectors,
-    /// This flag indicates that the search process is stopped externally,
-    /// the search result is no longer needed and the search process should be stopped as soon as possible.
-    pub is_stopped: &'a AtomicBool,
-}
-
-impl<TEncodedQuery, TEncodedVectors> RawScorer
-    for QuantizedRawScorer<'_, TEncodedQuery, TEncodedVectors>
-where
-    TEncodedVectors: quantization::EncodedVectors<TEncodedQuery>,
-{
-    fn score_points(&self, points: &[PointOffsetType], scores: &mut [ScoredPointOffset]) -> usize {
-        if self.is_stopped.load(Ordering::Relaxed) {
-            return 0;
-        }
-        let mut size: usize = 0;
-        for point_id in points.iter().copied() {
-            if !self.check_vector(point_id) {
-                continue;
-            }
-            scores[size] = ScoredPointOffset {
-                idx: point_id,
-                score: self.quantized_data.score_point(&self.query, point_id),
-            };
-            size += 1;
-            if size == scores.len() {
-                return size;
-            }
-        }
-        size
-    }
-
-    fn score_points_unfiltered(
-        &self,
-        points: &mut dyn Iterator<Item = PointOffsetType>,
-    ) -> Vec<ScoredPointOffset> {
-        if self.is_stopped.load(Ordering::Relaxed) {
-            return vec![];
-        }
-        let mut scores = vec![];
-        for point in points {
-            scores.push(ScoredPointOffset {
-                idx: point,
-                score: self.quantized_data.score_point(&self.query, point),
-            });
-        }
-        scores
-    }
-
-    fn check_vector(&self, point: PointOffsetType) -> bool {
-        // Deleted points propagate to vectors; check vector deletion for possible early return
-        !self
-            .vec_deleted
-            .get(point as usize)
-            .as_deref()
-            .copied()
-            // Default to not deleted if our deleted flags failed grow
-            .unwrap_or(false)
-        // Additionally check point deletion for integrity if delete propagation to vector failed
-        && !self
-            .point_deleted
-            .get(point as usize)
-            .as_deref()
-            .copied()
-            // Default to deleted if the point mapping was removed from the ID tracker
-            .unwrap_or(true)
-    }
-
-    fn score_point(&self, point: PointOffsetType) -> ScoreType {
-        self.quantized_data.score_point(&self.query, point)
-    }
-
-    fn score_internal(&self, point_a: PointOffsetType, point_b: PointOffsetType) -> ScoreType {
-        self.quantized_data.score_internal(point_a, point_b)
-    }
-
-    fn peek_top_iter(
-        &self,
-        points: &mut dyn Iterator<Item = PointOffsetType>,
-        top: usize,
-    ) -> Vec<ScoredPointOffset> {
-        let scores = points
-            .take_while(|_| !self.is_stopped.load(Ordering::Relaxed))
-            .filter(|idx| self.check_vector(*idx))
-            .map(|idx| {
-                let score = self.score_point(idx);
-                ScoredPointOffset { idx, score }
-            });
-        peek_top_largest_iterable(scores, top)
-    }
-
-    fn peek_top_all(&self, top: usize) -> Vec<ScoredPointOffset> {
-        let scores = (0..self.point_deleted.len() as PointOffsetType)
-            .take_while(|_| !self.is_stopped.load(Ordering::Relaxed))
-            .filter(|idx| self.check_vector(*idx))
-            .map(|idx| {
-                let score = self.score_point(idx);
-                ScoredPointOffset { idx, score }
-            });
-        peek_top_largest_iterable(scores, top)
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/vector_storage/quantized/quantized_vectors.rs b/crates/qdrant/lib/segment/src/vector_storage/quantized/quantized_vectors.rs
deleted file mode 100644
index 81adad5..0000000
--- a/crates/qdrant/lib/segment/src/vector_storage/quantized/quantized_vectors.rs
+++ /dev/null
@@ -1,351 +0,0 @@
-use std::path::{Path, PathBuf};
-use std::sync::atomic::{AtomicBool, Ordering};
-
-use bitvec::slice::BitSlice;
-use quantization::{EncodedVectors, EncodedVectorsPQ, EncodedVectorsU8};
-use serde::{Deserialize, Serialize};
-
-use super::quantized_raw_scorer::QuantizedRawScorer;
-use crate::common::file_operations::{atomic_save_json, read_json};
-use crate::common::vector_utils::TrySetCapacityExact;
-use crate::data_types::vectors::VectorElementType;
-use crate::entry::entry_point::OperationResult;
-use crate::types::{
-    CompressionRatio, Distance, ProductQuantization, QuantizationConfig, ScalarQuantization,
-};
-use crate::vector_storage::chunked_vectors::ChunkedVectors;
-use crate::vector_storage::quantized::quantized_mmap_storage::{
-    QuantizedMmapStorage, QuantizedMmapStorageBuilder,
-};
-use crate::vector_storage::RawScorer;
-
-pub const QUANTIZED_CONFIG_PATH: &str = "quantized.config.json";
-pub const QUANTIZED_DATA_PATH: &str = "quantized.data";
-pub const QUANTIZED_META_PATH: &str = "quantized.meta.json";
-
-#[derive(Deserialize, Serialize, Clone)]
-pub struct QuantizedVectorsConfig {
-    pub quantization_config: QuantizationConfig,
-    pub vector_parameters: quantization::VectorParameters,
-}
-
-pub enum QuantizedVectorStorage {
-    ScalarRam(EncodedVectorsU8<ChunkedVectors<u8>>),
-    ScalarMmap(EncodedVectorsU8<QuantizedMmapStorage>),
-    PQRam(EncodedVectorsPQ<ChunkedVectors<u8>>),
-    PQMmap(EncodedVectorsPQ<QuantizedMmapStorage>),
-}
-
-pub struct QuantizedVectors {
-    storage_impl: QuantizedVectorStorage,
-    config: QuantizedVectorsConfig,
-    path: PathBuf,
-    distance: Distance,
-}
-
-impl QuantizedVectors {
-    pub fn raw_scorer<'a>(
-        &'a self,
-        query: &[VectorElementType],
-        point_deleted: &'a BitSlice,
-        vec_deleted: &'a BitSlice,
-        is_stopped: &'a AtomicBool,
-    ) -> Box<dyn RawScorer + 'a> {
-        let query = self
-            .distance
-            .preprocess_vector(query)
-            .unwrap_or_else(|| query.to_vec());
-        match &self.storage_impl {
-            QuantizedVectorStorage::ScalarRam(storage) => {
-                let query = storage.encode_query(&query);
-                Box::new(QuantizedRawScorer {
-                    query,
-                    point_deleted,
-                    vec_deleted,
-                    quantized_data: storage,
-                    is_stopped,
-                })
-            }
-            QuantizedVectorStorage::ScalarMmap(storage) => {
-                let query = storage.encode_query(&query);
-                Box::new(QuantizedRawScorer {
-                    query,
-                    point_deleted,
-                    vec_deleted,
-                    quantized_data: storage,
-                    is_stopped,
-                })
-            }
-            QuantizedVectorStorage::PQRam(storage) => {
-                let query = storage.encode_query(&query);
-                Box::new(QuantizedRawScorer {
-                    query,
-                    point_deleted,
-                    vec_deleted,
-                    quantized_data: storage,
-                    is_stopped,
-                })
-            }
-            QuantizedVectorStorage::PQMmap(storage) => {
-                let query = storage.encode_query(&query);
-                Box::new(QuantizedRawScorer {
-                    query,
-                    point_deleted,
-                    vec_deleted,
-                    quantized_data: storage,
-                    is_stopped,
-                })
-            }
-        }
-    }
-
-    pub fn save_to(&self, path: &Path) -> OperationResult<()> {
-        let data_path = path.join(QUANTIZED_DATA_PATH);
-        let meta_path = path.join(QUANTIZED_META_PATH);
-        match &self.storage_impl {
-            QuantizedVectorStorage::ScalarRam(storage) => storage.save(&data_path, &meta_path)?,
-            QuantizedVectorStorage::ScalarMmap(storage) => storage.save(&data_path, &meta_path)?,
-            QuantizedVectorStorage::PQRam(storage) => storage.save(&data_path, &meta_path)?,
-            QuantizedVectorStorage::PQMmap(storage) => storage.save(&data_path, &meta_path)?,
-        };
-        Ok(())
-    }
-
-    pub fn files(&self) -> Vec<PathBuf> {
-        vec![
-            // Config files
-            self.path.join(QUANTIZED_CONFIG_PATH),
-            // Storage file
-            self.path.join(QUANTIZED_DATA_PATH),
-            // Meta file
-            self.path.join(QUANTIZED_META_PATH),
-        ]
-    }
-
-    #[allow(clippy::too_many_arguments)]
-    pub fn create<'a>(
-        vectors: impl Iterator<Item = &'a [f32]> + Clone + Send,
-        quantization_config: &QuantizationConfig,
-        distance: Distance,
-        dim: usize,
-        count: usize,
-        path: &Path,
-        on_disk_vector_storage: bool,
-        max_threads: usize,
-        stopped: &AtomicBool,
-    ) -> OperationResult<Self> {
-        let vector_parameters = Self::construct_vector_parameters(distance, dim, count);
-
-        let quantized_storage = match quantization_config {
-            QuantizationConfig::Scalar(ScalarQuantization {
-                scalar: scalar_config,
-            }) => Self::crate_scalar(
-                vectors,
-                &vector_parameters,
-                scalar_config,
-                path,
-                on_disk_vector_storage,
-                stopped,
-            )?,
-            QuantizationConfig::Product(ProductQuantization { product: pq_config }) => {
-                Self::crate_pq(
-                    vectors,
-                    &vector_parameters,
-                    pq_config,
-                    path,
-                    on_disk_vector_storage,
-                    max_threads,
-                    stopped,
-                )?
-            }
-        };
-
-        let quantized_vectors_config = QuantizedVectorsConfig {
-            quantization_config: quantization_config.clone(),
-            vector_parameters,
-        };
-
-        let quantized_vectors = QuantizedVectors {
-            storage_impl: quantized_storage,
-            config: quantized_vectors_config,
-            path: path.to_path_buf(),
-            distance,
-        };
-
-        quantized_vectors.save_to(path)?;
-        atomic_save_json(&path.join(QUANTIZED_CONFIG_PATH), &quantized_vectors.config)?;
-        Ok(quantized_vectors)
-    }
-
-    pub fn config_exists(path: &Path) -> bool {
-        path.join(QUANTIZED_CONFIG_PATH).exists()
-    }
-
-    pub fn load(
-        path: &Path,
-        on_disk_vector_storage: bool,
-        distance: Distance,
-    ) -> OperationResult<Self> {
-        let data_path = path.join(QUANTIZED_DATA_PATH);
-        let meta_path = path.join(QUANTIZED_META_PATH);
-        let config_path = path.join(QUANTIZED_CONFIG_PATH);
-        let config: QuantizedVectorsConfig = read_json(&config_path)?;
-        let quantized_store = match &config.quantization_config {
-            QuantizationConfig::Scalar(ScalarQuantization { scalar }) => {
-                if Self::is_ram(scalar.always_ram, on_disk_vector_storage) {
-                    QuantizedVectorStorage::ScalarRam(EncodedVectorsU8::<ChunkedVectors<u8>>::load(
-                        &data_path,
-                        &meta_path,
-                        &config.vector_parameters,
-                    )?)
-                } else {
-                    QuantizedVectorStorage::ScalarMmap(
-                        EncodedVectorsU8::<QuantizedMmapStorage>::load(
-                            &data_path,
-                            &meta_path,
-                            &config.vector_parameters,
-                        )?,
-                    )
-                }
-            }
-            QuantizationConfig::Product(ProductQuantization { product: pq }) => {
-                if Self::is_ram(pq.always_ram, on_disk_vector_storage) {
-                    QuantizedVectorStorage::PQRam(EncodedVectorsPQ::<ChunkedVectors<u8>>::load(
-                        &data_path,
-                        &meta_path,
-                        &config.vector_parameters,
-                    )?)
-                } else {
-                    QuantizedVectorStorage::PQMmap(EncodedVectorsPQ::<QuantizedMmapStorage>::load(
-                        &data_path,
-                        &meta_path,
-                        &config.vector_parameters,
-                    )?)
-                }
-            }
-        };
-
-        Ok(QuantizedVectors {
-            storage_impl: quantized_store,
-            config,
-            path: path.to_path_buf(),
-            distance,
-        })
-    }
-
-    fn crate_scalar<'a>(
-        vectors: impl Iterator<Item = &'a [f32]> + Clone,
-        vector_parameters: &quantization::VectorParameters,
-        scalar_config: &crate::types::ScalarQuantizationConfig,
-        path: &Path,
-        on_disk_vector_storage: bool,
-        stopped: &AtomicBool,
-    ) -> OperationResult<QuantizedVectorStorage> {
-        let quantized_vector_size =
-            EncodedVectorsU8::<QuantizedMmapStorage>::get_quantized_vector_size(vector_parameters);
-        let in_ram = Self::is_ram(scalar_config.always_ram, on_disk_vector_storage);
-        if in_ram {
-            let mut storage_builder = ChunkedVectors::<u8>::new(quantized_vector_size);
-            storage_builder.try_set_capacity_exact(vector_parameters.count)?;
-            Ok(QuantizedVectorStorage::ScalarRam(EncodedVectorsU8::encode(
-                vectors,
-                storage_builder,
-                vector_parameters,
-                scalar_config.quantile,
-                || stopped.load(Ordering::Relaxed),
-            )?))
-        } else {
-            let mmap_data_path = path.join(QUANTIZED_DATA_PATH);
-            let storage_builder = QuantizedMmapStorageBuilder::new(
-                mmap_data_path.as_path(),
-                vector_parameters.count,
-                quantized_vector_size,
-            )?;
-            Ok(QuantizedVectorStorage::ScalarMmap(
-                EncodedVectorsU8::encode(
-                    vectors,
-                    storage_builder,
-                    vector_parameters,
-                    scalar_config.quantile,
-                    || stopped.load(Ordering::Relaxed),
-                )?,
-            ))
-        }
-    }
-
-    fn crate_pq<'a>(
-        vectors: impl Iterator<Item = &'a [f32]> + Clone + Send,
-        vector_parameters: &quantization::VectorParameters,
-        pq_config: &crate::types::ProductQuantizationConfig,
-        path: &Path,
-        on_disk_vector_storage: bool,
-        max_threads: usize,
-        stopped: &AtomicBool,
-    ) -> OperationResult<QuantizedVectorStorage> {
-        let bucket_size = Self::get_bucket_size(pq_config.compression);
-        let quantized_vector_size =
-            EncodedVectorsPQ::<QuantizedMmapStorage>::get_quantized_vector_size(
-                vector_parameters,
-                bucket_size,
-            );
-        let in_ram = Self::is_ram(pq_config.always_ram, on_disk_vector_storage);
-        if in_ram {
-            let mut storage_builder = ChunkedVectors::<u8>::new(quantized_vector_size);
-            storage_builder.try_set_capacity_exact(vector_parameters.count)?;
-            Ok(QuantizedVectorStorage::PQRam(EncodedVectorsPQ::encode(
-                vectors,
-                storage_builder,
-                vector_parameters,
-                bucket_size,
-                max_threads,
-                || stopped.load(Ordering::Relaxed),
-            )?))
-        } else {
-            let mmap_data_path = path.join(QUANTIZED_DATA_PATH);
-            let storage_builder = QuantizedMmapStorageBuilder::new(
-                mmap_data_path.as_path(),
-                vector_parameters.count,
-                quantized_vector_size,
-            )?;
-            Ok(QuantizedVectorStorage::PQMmap(EncodedVectorsPQ::encode(
-                vectors,
-                storage_builder,
-                vector_parameters,
-                bucket_size,
-                max_threads,
-                || stopped.load(Ordering::Relaxed),
-            )?))
-        }
-    }
-
-    fn is_ram(always_ram: Option<bool>, on_disk_vector_storage: bool) -> bool {
-        !on_disk_vector_storage || always_ram == Some(true)
-    }
-
-    fn construct_vector_parameters(
-        distance: Distance,
-        dim: usize,
-        count: usize,
-    ) -> quantization::VectorParameters {
-        quantization::VectorParameters {
-            dim,
-            count,
-            distance_type: match distance {
-                Distance::Cosine => quantization::DistanceType::Dot,
-                Distance::Euclid => quantization::DistanceType::L2,
-                Distance::Dot => quantization::DistanceType::Dot,
-            },
-            invert: distance == Distance::Euclid,
-        }
-    }
-
-    fn get_bucket_size(compression: CompressionRatio) -> usize {
-        match compression {
-            CompressionRatio::X4 => 1,
-            CompressionRatio::X8 => 2,
-            CompressionRatio::X16 => 4,
-            CompressionRatio::X32 => 8,
-            CompressionRatio::X64 => 16,
-        }
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/vector_storage/raw_scorer.rs b/crates/qdrant/lib/segment/src/vector_storage/raw_scorer.rs
deleted file mode 100644
index c4d5851..0000000
--- a/crates/qdrant/lib/segment/src/vector_storage/raw_scorer.rs
+++ /dev/null
@@ -1,254 +0,0 @@
-use std::marker::PhantomData;
-use std::sync::atomic::{AtomicBool, Ordering};
-
-use bitvec::prelude::BitSlice;
-
-use super::{ScoredPointOffset, VectorStorage, VectorStorageEnum};
-use crate::data_types::vectors::VectorElementType;
-use crate::spaces::metric::Metric;
-use crate::spaces::simple::{CosineMetric, DotProductMetric, EuclidMetric};
-use crate::spaces::tools::peek_top_largest_iterable;
-use crate::types::{Distance, PointOffsetType, ScoreType};
-
-/// Optimized scorer for multiple scoring requests comparing with a single query
-/// Holds current query and params, receives only subset of points to score
-pub trait RawScorer {
-    fn score_points(&self, points: &[PointOffsetType], scores: &mut [ScoredPointOffset]) -> usize;
-
-    /// Score points without excluding deleted and filtered points
-    ///
-    /// # Arguments
-    ///
-    /// * `points` - points to score
-    ///
-    /// # Returns
-    ///
-    /// Vector of scored points
-    fn score_points_unfiltered(
-        &self,
-        points: &mut dyn Iterator<Item = PointOffsetType>,
-    ) -> Vec<ScoredPointOffset>;
-
-    /// Return true if vector satisfies current search context for given point (exists and not deleted)
-    fn check_vector(&self, point: PointOffsetType) -> bool;
-
-    /// Score stored vector with vector under the given index
-    fn score_point(&self, point: PointOffsetType) -> ScoreType;
-
-    /// Return distance between stored points selected by IDs
-    ///
-    /// # Panics
-    ///
-    /// Panics if any id is out of range
-    fn score_internal(&self, point_a: PointOffsetType, point_b: PointOffsetType) -> ScoreType;
-
-    fn peek_top_iter(
-        &self,
-        points: &mut dyn Iterator<Item = PointOffsetType>,
-        top: usize,
-    ) -> Vec<ScoredPointOffset>;
-
-    fn peek_top_all(&self, top: usize) -> Vec<ScoredPointOffset>;
-}
-
-pub struct RawScorerImpl<'a, TMetric: Metric, TVectorStorage: VectorStorage> {
-    pub points_count: PointOffsetType,
-    pub query: Vec<VectorElementType>,
-    pub vector_storage: &'a TVectorStorage,
-    /// [`BitSlice`] defining flags for deleted points (and thus these vectors).
-    pub point_deleted: &'a BitSlice,
-    /// [`BitSlice`] defining flags for deleted vectors in this segment.
-    pub vec_deleted: &'a BitSlice,
-    pub metric: PhantomData<TMetric>,
-    /// This flag indicates that the search process is stopped externally,
-    /// the search result is no longer needed and the search process should be stopped as soon as possible.
-    pub is_stopped: &'a AtomicBool,
-}
-
-pub fn new_stoppable_raw_scorer<'a>(
-    vector: Vec<VectorElementType>,
-    vector_storage: &'a VectorStorageEnum,
-    point_deleted: &'a BitSlice,
-    is_stopped: &'a AtomicBool,
-) -> Box<dyn RawScorer + 'a> {
-    match vector_storage {
-        VectorStorageEnum::Simple(vs) => raw_scorer_impl(vector, vs, point_deleted, is_stopped),
-
-        VectorStorageEnum::Memmap(vs) => {
-            if vs.has_async_reader() {
-                #[cfg(target_os = "linux")]
-                match super::async_raw_scorer::new(vector.clone(), vs, point_deleted, is_stopped) {
-                    Ok(raw_scorer) => return raw_scorer,
-                    Err(err) => log::error!("failed to initialize async raw scorer: {err}"),
-                }
-
-                #[cfg(not(target_os = "linux"))]
-                log::warn!("async raw scorer is only supported on Linux");
-            }
-
-            raw_scorer_impl(vector, vs.as_ref(), point_deleted, is_stopped)
-        }
-
-        VectorStorageEnum::AppendableMemmap(vs) => {
-            raw_scorer_impl(vector, vs.as_ref(), point_deleted, is_stopped)
-        }
-    }
-}
-
-pub static DEFAULT_STOPPED: AtomicBool = AtomicBool::new(false);
-
-pub fn new_raw_scorer<'a>(
-    vector: Vec<VectorElementType>,
-    vector_storage: &'a VectorStorageEnum,
-    point_deleted: &'a BitSlice,
-) -> Box<dyn RawScorer + 'a> {
-    new_stoppable_raw_scorer(vector, vector_storage, point_deleted, &DEFAULT_STOPPED)
-}
-
-pub fn raw_scorer_impl<'a, TVectorStorage: VectorStorage>(
-    vector: Vec<VectorElementType>,
-    vector_storage: &'a TVectorStorage,
-    point_deleted: &'a BitSlice,
-    is_stopped: &'a AtomicBool,
-) -> Box<dyn RawScorer + 'a> {
-    let points_count = vector_storage.total_vector_count() as PointOffsetType;
-    let vec_deleted = vector_storage.deleted_vector_bitslice();
-    match vector_storage.distance() {
-        Distance::Cosine => Box::new(RawScorerImpl::<'a, CosineMetric, TVectorStorage> {
-            points_count,
-            query: CosineMetric::preprocess(&vector).unwrap_or(vector),
-            vector_storage,
-            point_deleted,
-            vec_deleted,
-            metric: PhantomData,
-            is_stopped,
-        }),
-        Distance::Euclid => Box::new(RawScorerImpl::<'a, EuclidMetric, TVectorStorage> {
-            points_count,
-            query: EuclidMetric::preprocess(&vector).unwrap_or(vector),
-            vector_storage,
-            point_deleted,
-            vec_deleted,
-            metric: PhantomData,
-            is_stopped,
-        }),
-        Distance::Dot => Box::new(RawScorerImpl::<'a, DotProductMetric, TVectorStorage> {
-            points_count,
-            query: DotProductMetric::preprocess(&vector).unwrap_or(vector),
-            vector_storage,
-            point_deleted,
-            vec_deleted,
-            metric: PhantomData,
-            is_stopped,
-        }),
-    }
-}
-
-impl<'a, TMetric, TVectorStorage> RawScorer for RawScorerImpl<'a, TMetric, TVectorStorage>
-where
-    TMetric: Metric,
-    TVectorStorage: VectorStorage,
-{
-    fn score_points(&self, points: &[PointOffsetType], scores: &mut [ScoredPointOffset]) -> usize {
-        if self.is_stopped.load(Ordering::Relaxed) {
-            return 0;
-        }
-        let mut size: usize = 0;
-        for point_id in points.iter().copied() {
-            if !self.check_vector(point_id) {
-                continue;
-            }
-            let other_vector = self.vector_storage.get_vector(point_id);
-            scores[size] = ScoredPointOffset {
-                idx: point_id,
-                score: TMetric::similarity(&self.query, other_vector),
-            };
-
-            size += 1;
-            if size == scores.len() {
-                return size;
-            }
-        }
-        size
-    }
-
-    fn score_points_unfiltered(
-        &self,
-        points: &mut dyn Iterator<Item = PointOffsetType>,
-    ) -> Vec<ScoredPointOffset> {
-        if self.is_stopped.load(Ordering::Relaxed) {
-            return vec![];
-        }
-        let mut scores = vec![];
-        for point_id in points {
-            let other_vector = self.vector_storage.get_vector(point_id);
-            scores.push(ScoredPointOffset {
-                idx: point_id,
-                score: TMetric::similarity(&self.query, other_vector),
-            });
-        }
-        scores
-    }
-
-    fn check_vector(&self, point: PointOffsetType) -> bool {
-        point < self.points_count
-            // Deleted points propagate to vectors; check vector deletion for possible early return
-            && !self
-                .vec_deleted
-                .get(point as usize)
-                .map(|x| *x)
-                // Default to not deleted if our deleted flags failed grow
-                .unwrap_or(false)
-            // Additionally check point deletion for integrity if delete propagation to vector failed
-            && !self
-                .point_deleted
-                .get(point as usize)
-                .map(|x| *x)
-                // Default to deleted if the point mapping was removed from the ID tracker
-                .unwrap_or(true)
-    }
-
-    fn score_point(&self, point: PointOffsetType) -> ScoreType {
-        let other_vector = self.vector_storage.get_vector(point);
-        TMetric::similarity(&self.query, other_vector)
-    }
-
-    fn score_internal(&self, point_a: PointOffsetType, point_b: PointOffsetType) -> ScoreType {
-        let vector_a = self.vector_storage.get_vector(point_a);
-        let vector_b = self.vector_storage.get_vector(point_b);
-        TMetric::similarity(vector_a, vector_b)
-    }
-
-    fn peek_top_iter(
-        &self,
-        points: &mut dyn Iterator<Item = PointOffsetType>,
-        top: usize,
-    ) -> Vec<ScoredPointOffset> {
-        let scores = points
-            .take_while(|_| !self.is_stopped.load(Ordering::Relaxed))
-            .filter(|point_id| self.check_vector(*point_id))
-            .map(|point_id| {
-                let other_vector = self.vector_storage.get_vector(point_id);
-                ScoredPointOffset {
-                    idx: point_id,
-                    score: TMetric::similarity(&self.query, other_vector),
-                }
-            });
-        peek_top_largest_iterable(scores, top)
-    }
-
-    fn peek_top_all(&self, top: usize) -> Vec<ScoredPointOffset> {
-        let scores = (0..self.points_count)
-            .take_while(|_| !self.is_stopped.load(Ordering::Relaxed))
-            .filter(|point_id| self.check_vector(*point_id))
-            .map(|point_id| {
-                let point_id = point_id as PointOffsetType;
-                let other_vector = &self.vector_storage.get_vector(point_id);
-                ScoredPointOffset {
-                    idx: point_id,
-                    score: TMetric::similarity(&self.query, other_vector),
-                }
-            });
-        peek_top_largest_iterable(scores, top)
-    }
-}
diff --git a/crates/qdrant/lib/segment/src/vector_storage/simple_vector_storage.rs b/crates/qdrant/lib/segment/src/vector_storage/simple_vector_storage.rs
deleted file mode 100644
index b7926c4..0000000
--- a/crates/qdrant/lib/segment/src/vector_storage/simple_vector_storage.rs
+++ /dev/null
@@ -1,269 +0,0 @@
-use std::mem::size_of;
-use std::ops::Range;
-use std::path::Path;
-use std::sync::atomic::AtomicBool;
-use std::sync::Arc;
-
-use atomic_refcell::AtomicRefCell;
-use bitvec::prelude::{BitSlice, BitVec};
-use log::debug;
-use parking_lot::RwLock;
-use rocksdb::DB;
-use serde::{Deserialize, Serialize};
-
-use super::chunked_vectors::ChunkedVectors;
-use super::vector_storage_base::VectorStorage;
-use super::VectorStorageEnum;
-use crate::common::rocksdb_wrapper::DatabaseColumnWrapper;
-use crate::common::Flusher;
-use crate::data_types::vectors::VectorElementType;
-use crate::entry::entry_point::{check_process_stopped, OperationError, OperationResult};
-use crate::types::{Distance, PointOffsetType, QuantizationConfig};
-use crate::vector_storage::quantized::quantized_vectors::QuantizedVectors;
-
-/// In-memory vector storage with on-update persistence using `store`
-pub struct SimpleVectorStorage {
-    dim: usize,
-    distance: Distance,
-    vectors: ChunkedVectors<VectorElementType>,
-    quantized_vectors: Option<QuantizedVectors>,
-    db_wrapper: DatabaseColumnWrapper,
-    update_buffer: StoredRecord,
-    /// BitVec for deleted flags. Grows dynamically upto last set flag.
-    deleted: BitVec,
-    /// Current number of deleted vectors.
-    deleted_count: usize,
-}
-
-#[derive(Debug, Deserialize, Serialize, Clone)]
-struct StoredRecord {
-    pub deleted: bool,
-    pub vector: Vec<VectorElementType>,
-}
-
-pub fn open_simple_vector_storage(
-    database: Arc<RwLock<DB>>,
-    database_column_name: &str,
-    dim: usize,
-    distance: Distance,
-) -> OperationResult<Arc<AtomicRefCell<VectorStorageEnum>>> {
-    let mut vectors = ChunkedVectors::new(dim);
-    let (mut deleted, mut deleted_count) = (BitVec::new(), 0);
-
-    let db_wrapper = DatabaseColumnWrapper::new(database, database_column_name);
-
-    for (key, value) in db_wrapper.lock_db().iter()? {
-        let point_id: PointOffsetType = bincode::deserialize(&key)
-            .map_err(|_| OperationError::service_error("cannot deserialize point id from db"))?;
-        let stored_record: StoredRecord = bincode::deserialize(&value)
-            .map_err(|_| OperationError::service_error("cannot deserialize record from db"))?;
-
-        // Propagate deleted flag
-        if stored_record.deleted {
-            bitvec_set_deleted(&mut deleted, point_id, true);
-            deleted_count += 1;
-        }
-        vectors.insert(point_id, &stored_record.vector)?;
-    }
-
-    debug!("Segment vectors: {}", vectors.len());
-    debug!(
-        "Estimated segment size {} MB",
-        vectors.len() * dim * size_of::<VectorElementType>() / 1024 / 1024
-    );
-
-    Ok(Arc::new(AtomicRefCell::new(VectorStorageEnum::Simple(
-        SimpleVectorStorage {
-            dim,
-            distance,
-            vectors,
-            quantized_vectors: None,
-            db_wrapper,
-            update_buffer: StoredRecord {
-                deleted: false,
-                vector: vec![0.; dim],
-            },
-            deleted,
-            deleted_count,
-        },
-    ))))
-}
-
-impl SimpleVectorStorage {
-    /// Set deleted flag for given key. Returns previous deleted state.
-    #[inline]
-    fn set_deleted(&mut self, key: PointOffsetType, deleted: bool) -> bool {
-        if key as usize >= self.vectors.len() {
-            return false;
-        }
-        let was_deleted = bitvec_set_deleted(&mut self.deleted, key, deleted);
-        if was_deleted != deleted {
-            if !was_deleted {
-                self.deleted_count += 1;
-            } else {
-                self.deleted_count -= 1;
-            }
-        }
-        was_deleted
-    }
-
-    fn update_stored(
-        &mut self,
-        key: PointOffsetType,
-        deleted: bool,
-        vector: Option<&[VectorElementType]>,
-    ) -> OperationResult<()> {
-        // Write vector state to buffer record
-        let record = &mut self.update_buffer;
-        record.deleted = deleted;
-        if let Some(vector) = vector {
-            record.vector.copy_from_slice(vector);
-        }
-
-        // Store updated record
-        self.db_wrapper.put(
-            bincode::serialize(&key).unwrap(),
-            bincode::serialize(&record).unwrap(),
-        )?;
-
-        Ok(())
-    }
-}
-
-impl VectorStorage for SimpleVectorStorage {
-    fn vector_dim(&self) -> usize {
-        self.dim
-    }
-
-    fn distance(&self) -> Distance {
-        self.distance
-    }
-
-    fn total_vector_count(&self) -> usize {
-        self.vectors.len()
-    }
-
-    fn get_vector(&self, key: PointOffsetType) -> &[VectorElementType] {
-        self.vectors.get(key)
-    }
-
-    fn insert_vector(
-        &mut self,
-        key: PointOffsetType,
-        vector: &[VectorElementType],
-    ) -> OperationResult<()> {
-        self.vectors.insert(key, vector)?;
-        self.set_deleted(key, false);
-        self.update_stored(key, false, Some(vector))?;
-        Ok(())
-    }
-
-    fn update_from(
-        &mut self,
-        other: &VectorStorageEnum,
-        other_ids: &mut dyn Iterator<Item = PointOffsetType>,
-        stopped: &AtomicBool,
-    ) -> OperationResult<Range<PointOffsetType>> {
-        let start_index = self.vectors.len() as PointOffsetType;
-        for point_id in other_ids {
-            check_process_stopped(stopped)?;
-            // Do not perform preprocessing - vectors should be already processed
-            let other_vector = other.get_vector(point_id);
-            let other_deleted = other.is_deleted_vector(point_id);
-            let new_id = self.vectors.push(other_vector)?;
-            self.set_deleted(new_id, other_deleted);
-            self.update_stored(new_id, other_deleted, Some(other_vector))?;
-        }
-        let end_index = self.vectors.len() as PointOffsetType;
-        Ok(start_index..end_index)
-    }
-
-    fn flusher(&self) -> Flusher {
-        self.db_wrapper.flusher()
-    }
-
-    fn quantize(
-        &mut self,
-        path: &Path,
-        quantization_config: &QuantizationConfig,
-        max_threads: usize,
-        stopped: &AtomicBool,
-    ) -> OperationResult<()> {
-        let vector_data_iterator = (0..self.vectors.len() as u32).map(|i| self.vectors.get(i));
-        self.quantized_vectors = Some(QuantizedVectors::create(
-            vector_data_iterator,
-            quantization_config,
-            self.distance,
-            self.dim,
-            self.vectors.len(),
-            path,
-            false,
-            max_threads,
-            stopped,
-        )?);
-        Ok(())
-    }
-
-    fn load_quantization(&mut self, path: &Path) -> OperationResult<()> {
-        if QuantizedVectors::config_exists(path) {
-            self.quantized_vectors = Some(QuantizedVectors::load(path, false, self.distance)?);
-        }
-        Ok(())
-    }
-
-    fn quantized_storage(&self) -> Option<&QuantizedVectors> {
-        self.quantized_vectors.as_ref()
-    }
-
-    fn files(&self) -> Vec<std::path::PathBuf> {
-        if let Some(quantized_vectors) = &self.quantized_vectors {
-            quantized_vectors.files()
-        } else {
-            vec![]
-        }
-    }
-
-    fn delete_vector(&mut self, key: PointOffsetType) -> OperationResult<bool> {
-        let is_deleted = !self.set_deleted(key, true);
-        if is_deleted {
-            self.update_stored(key, true, None)?;
-        }
-        Ok(is_deleted)
-    }
-
-    fn is_deleted_vector(&self, key: PointOffsetType) -> bool {
-        self.deleted.get(key as usize).map(|b| *b).unwrap_or(false)
-    }
-
-    fn deleted_vector_count(&self) -> usize {
-        self.deleted_count
-    }
-
-    fn deleted_vector_bitslice(&self) -> &BitSlice {
-        self.deleted.as_bitslice()
-    }
-
-    fn is_appendable(&self) -> bool {
-        true
-    }
-}
-
-/// Set deleted state in given bitvec.
-///
-/// Grows bitvec automatically if it is not big enough.
-///
-/// Returns previous deleted state of the given point.
-#[inline]
-fn bitvec_set_deleted(bitvec: &mut BitVec, point_id: PointOffsetType, deleted: bool) -> bool {
-    // Set deleted flag if bitvec is large enough, no need to check bounds
-    if (point_id as usize) < bitvec.len() {
-        return unsafe { bitvec.replace_unchecked(point_id as usize, deleted) };
-    }
-
-    // Bitvec is too small; grow and set the deletion flag, no need to check bounds
-    if deleted {
-        bitvec.resize(point_id as usize + 1, false);
-        unsafe { bitvec.set_unchecked(point_id as usize, true) };
-    }
-    false
-}
diff --git a/crates/qdrant/lib/segment/src/vector_storage/tests/async_raw_scorer.rs b/crates/qdrant/lib/segment/src/vector_storage/tests/async_raw_scorer.rs
deleted file mode 100644
index 44a044d..0000000
--- a/crates/qdrant/lib/segment/src/vector_storage/tests/async_raw_scorer.rs
+++ /dev/null
@@ -1,159 +0,0 @@
-use std::sync::atomic::AtomicBool;
-use std::{error, result};
-
-use bitvec::slice::BitSlice;
-use rand::seq::IteratorRandom as _;
-use rand::SeedableRng as _;
-
-use crate::common::rocksdb_wrapper;
-use crate::fixtures::payload_context_fixture::FixtureIdTracker;
-use crate::id_tracker::IdTracker;
-use crate::types::{Distance, PointOffsetType};
-use crate::vector_storage::memmap_vector_storage::open_memmap_vector_storage_with_async_io;
-use crate::vector_storage::simple_vector_storage::open_simple_vector_storage;
-use crate::vector_storage::vector_storage_base::VectorStorage;
-use crate::vector_storage::{
-    async_raw_scorer, new_raw_scorer, RawScorer, ScoredPointOffset, VectorStorageEnum,
-};
-
-#[test]
-fn async_raw_scorer_cosine() -> Result<()> {
-    test_async_raw_scorer_defaults(Distance::Cosine)
-}
-
-#[test]
-fn async_raw_scorer_euclid() -> Result<()> {
-    test_async_raw_scorer_defaults(Distance::Euclid)
-}
-
-#[test]
-fn async_raw_scorer_dot() -> Result<()> {
-    test_async_raw_scorer_defaults(Distance::Dot)
-}
-
-fn test_async_raw_scorer_defaults(distance: Distance) -> Result<()> {
-    test_async_raw_scorer(6942, 128, distance, 1024, 128, 256)
-}
-
-fn test_async_raw_scorer(
-    seed: u64,
-    dim: usize,
-    distance: Distance,
-    points: usize,
-    delete: usize,
-    score: usize,
-) -> Result<()> {
-    let mut rng = rand::rngs::StdRng::seed_from_u64(seed);
-
-    let dir = tempfile::Builder::new()
-        .prefix("immutable-storage")
-        .tempdir()?;
-
-    let storage = open_memmap_vector_storage_with_async_io(dir.path(), dim, distance, true)?;
-    let mut storage = storage.borrow_mut();
-
-    let mut id_tracker = FixtureIdTracker::new(points);
-
-    {
-        let dir = tempfile::Builder::new()
-            .prefix("mutable-storage")
-            .tempdir()?;
-
-        let db = rocksdb_wrapper::open_db(dir.path(), &[rocksdb_wrapper::DB_VECTOR_CF])?;
-
-        let mutable_storage =
-            open_simple_vector_storage(db, rocksdb_wrapper::DB_VECTOR_CF, 4, distance)?;
-
-        let mut mutable_storage = mutable_storage.borrow_mut();
-
-        insert_random_vectors(&mut rng, &mut *mutable_storage, points)?;
-        delete_random_vectors(&mut rng, &mut *mutable_storage, &mut id_tracker, delete)?;
-
-        storage.update_from(&mutable_storage, &mut (0..points as _), &Default::default())?;
-    }
-
-    for _ in 0..score {
-        test_random_score(&mut rng, &storage, id_tracker.deleted_point_bitslice())?;
-    }
-
-    Ok(())
-}
-
-fn insert_random_vectors(
-    rng: &mut impl rand::Rng,
-    storage: &mut impl VectorStorage,
-    vectors: usize,
-) -> Result<()> {
-    let start = storage.total_vector_count() as u32;
-    let end = start + vectors as u32;
-
-    let mut vector = vec![0.; storage.vector_dim()];
-    let mut sampler = sampler(rng);
-
-    for offset in start..end {
-        for (item, value) in vector.iter_mut().zip(&mut sampler) {
-            *item = value;
-        }
-
-        storage.insert_vector(offset, &vector)?;
-    }
-
-    Ok(())
-}
-
-fn delete_random_vectors(
-    rng: &mut impl rand::Rng,
-    storage: &mut impl VectorStorage,
-    id_tracker: &mut impl IdTracker,
-    vectors: usize,
-) -> Result<()> {
-    let offsets = (0..storage.total_vector_count() as _).choose_multiple(rng, vectors);
-
-    for offset in offsets {
-        storage.delete_vector(offset)?;
-        id_tracker.drop(crate::types::ExtendedPointId::NumId(offset.into()))?;
-    }
-
-    Ok(())
-}
-
-fn test_random_score(
-    mut rng: impl rand::Rng,
-    storage: &VectorStorageEnum,
-    deleted_points: &BitSlice,
-) -> Result<()> {
-    let query: Vec<_> = sampler(&mut rng).take(storage.vector_dim()).collect();
-
-    let raw_scorer = new_raw_scorer(query.clone(), storage, deleted_points);
-
-    let is_stopped = AtomicBool::new(false);
-    let async_raw_scorer = if let VectorStorageEnum::Memmap(storage) = storage {
-        async_raw_scorer::new(query, storage, deleted_points, &is_stopped)?
-    } else {
-        unreachable!();
-    };
-
-    let points = rng.gen_range(1..storage.total_vector_count());
-    let points = (0..storage.total_vector_count() as _).choose_multiple(&mut rng, points);
-
-    let res = score(&*raw_scorer, &points);
-    let async_res = score(&*async_raw_scorer, &points);
-
-    assert_eq!(res, async_res);
-
-    Ok(())
-}
-
-fn score(scorer: &dyn RawScorer, points: &[PointOffsetType]) -> Vec<ScoredPointOffset> {
-    let mut scores = vec![Default::default(); points.len()];
-    let scored = scorer.score_points(points, &mut scores);
-    scores.resize_with(scored, Default::default);
-    scores
-}
-
-fn sampler(rng: impl rand::Rng) -> impl Iterator<Item = f32> {
-    rng.sample_iter(rand::distributions::Uniform::new_inclusive(-1., 1.))
-}
-
-type Result<T, E = Error> = result::Result<T, E>;
-type Error = Box<dyn error::Error>;
diff --git a/crates/qdrant/lib/segment/src/vector_storage/tests/mod.rs b/crates/qdrant/lib/segment/src/vector_storage/tests/mod.rs
deleted file mode 100644
index 4ddc176..0000000
--- a/crates/qdrant/lib/segment/src/vector_storage/tests/mod.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-#[cfg(target_os = "linux")]
-mod async_raw_scorer;
-mod test_appendable_vector_storage;
diff --git a/crates/qdrant/lib/segment/src/vector_storage/tests/test_appendable_vector_storage.rs b/crates/qdrant/lib/segment/src/vector_storage/tests/test_appendable_vector_storage.rs
deleted file mode 100644
index 8fa74ef..0000000
--- a/crates/qdrant/lib/segment/src/vector_storage/tests/test_appendable_vector_storage.rs
+++ /dev/null
@@ -1,456 +0,0 @@
-use std::sync::atomic::AtomicBool;
-use std::sync::Arc;
-
-use atomic_refcell::AtomicRefCell;
-use tempfile::Builder;
-
-use crate::common::rocksdb_wrapper::{open_db, DB_VECTOR_CF};
-use crate::data_types::vectors::VectorElementType;
-use crate::fixtures::payload_context_fixture::FixtureIdTracker;
-use crate::id_tracker::{IdTracker, IdTrackerSS};
-use crate::types::{
-    Distance, PointIdType, PointOffsetType, QuantizationConfig, ScalarQuantizationConfig,
-};
-use crate::vector_storage::appendable_mmap_vector_storage::open_appendable_memmap_vector_storage;
-use crate::vector_storage::simple_vector_storage::open_simple_vector_storage;
-use crate::vector_storage::{new_raw_scorer, ScoredPointOffset, VectorStorage, VectorStorageEnum};
-
-fn do_test_delete_points(storage: Arc<AtomicRefCell<VectorStorageEnum>>) {
-    let points = vec![
-        vec![1.0, 0.0, 1.0, 1.0],
-        vec![1.0, 0.0, 1.0, 0.0],
-        vec![1.0, 1.0, 1.0, 1.0],
-        vec![1.0, 1.0, 0.0, 1.0],
-        vec![1.0, 0.0, 0.0, 0.0],
-    ];
-    let delete_mask = [false, false, true, true, false];
-    let id_tracker: Arc<AtomicRefCell<IdTrackerSS>> =
-        Arc::new(AtomicRefCell::new(FixtureIdTracker::new(points.len())));
-
-    let borrowed_id_tracker = id_tracker.borrow_mut();
-    let mut borrowed_storage = storage.borrow_mut();
-
-    for (i, vec) in points.iter().enumerate() {
-        borrowed_storage
-            .insert_vector(i as PointOffsetType, vec)
-            .unwrap();
-    }
-
-    // Delete select number of points
-    delete_mask
-        .into_iter()
-        .enumerate()
-        .filter(|(_, d)| *d)
-        .for_each(|(i, _)| {
-            borrowed_storage
-                .delete_vector(i as PointOffsetType)
-                .unwrap();
-        });
-    assert_eq!(
-        borrowed_storage.deleted_vector_count(),
-        2,
-        "2 vectors must be deleted"
-    );
-
-    let query: Vec<VectorElementType> = vec![0.0, 1.0, 1.1, 1.0];
-    let closest = new_raw_scorer(
-        query,
-        &borrowed_storage,
-        borrowed_id_tracker.deleted_point_bitslice(),
-    )
-    .peek_top_iter(&mut [0, 1, 2, 3, 4].iter().cloned(), 5);
-    assert_eq!(closest.len(), 3, "must have 3 vectors, 2 are deleted");
-    assert_eq!(closest[0].idx, 0);
-    assert_eq!(closest[1].idx, 1);
-    assert_eq!(closest[2].idx, 4);
-
-    // Delete 1, redelete 2
-    borrowed_storage
-        .delete_vector(1 as PointOffsetType)
-        .unwrap();
-    borrowed_storage
-        .delete_vector(2 as PointOffsetType)
-        .unwrap();
-    assert_eq!(
-        borrowed_storage.deleted_vector_count(),
-        3,
-        "3 vectors must be deleted"
-    );
-
-    let query: Vec<VectorElementType> = vec![1.0, 0.0, 0.0, 0.0];
-    let closest = new_raw_scorer(
-        query,
-        &borrowed_storage,
-        borrowed_id_tracker.deleted_point_bitslice(),
-    )
-    .peek_top_iter(&mut [0, 1, 2, 3, 4].iter().cloned(), 5);
-    assert_eq!(closest.len(), 2, "must have 2 vectors, 3 are deleted");
-    assert_eq!(closest[0].idx, 4);
-    assert_eq!(closest[1].idx, 0);
-
-    // Delete all
-    borrowed_storage
-        .delete_vector(0 as PointOffsetType)
-        .unwrap();
-    borrowed_storage
-        .delete_vector(4 as PointOffsetType)
-        .unwrap();
-    assert_eq!(
-        borrowed_storage.deleted_vector_count(),
-        5,
-        "all vectors must be deleted"
-    );
-
-    let query: Vec<VectorElementType> = vec![1.0, 0.0, 0.0, 0.0];
-    let closest = new_raw_scorer(
-        query,
-        &borrowed_storage,
-        borrowed_id_tracker.deleted_point_bitslice(),
-    )
-    .peek_top_all(5);
-    assert!(closest.is_empty(), "must have no results, all deleted");
-}
-
-fn do_test_update_from_delete_points(storage: Arc<AtomicRefCell<VectorStorageEnum>>) {
-    let points = vec![
-        vec![1.0, 0.0, 1.0, 1.0],
-        vec![1.0, 0.0, 1.0, 0.0],
-        vec![1.0, 1.0, 1.0, 1.0],
-        vec![1.0, 1.0, 0.0, 1.0],
-        vec![1.0, 0.0, 0.0, 0.0],
-    ];
-    let delete_mask = [false, false, true, true, false];
-    let id_tracker: Arc<AtomicRefCell<IdTrackerSS>> =
-        Arc::new(AtomicRefCell::new(FixtureIdTracker::new(points.len())));
-    let borrowed_id_tracker = id_tracker.borrow_mut();
-    let mut borrowed_storage = storage.borrow_mut();
-
-    {
-        let dir2 = Builder::new().prefix("db_dir").tempdir().unwrap();
-        let db = open_db(dir2.path(), &[DB_VECTOR_CF]).unwrap();
-        let storage2 = open_simple_vector_storage(db, DB_VECTOR_CF, 4, Distance::Dot).unwrap();
-        {
-            let mut borrowed_storage2 = storage2.borrow_mut();
-            points.iter().enumerate().for_each(|(i, vec)| {
-                borrowed_storage2
-                    .insert_vector(i as PointOffsetType, vec)
-                    .unwrap();
-                if delete_mask[i] {
-                    borrowed_storage2
-                        .delete_vector(i as PointOffsetType)
-                        .unwrap();
-                }
-            });
-        }
-        borrowed_storage
-            .update_from(
-                &storage2.borrow(),
-                &mut Box::new(0..points.len() as u32),
-                &Default::default(),
-            )
-            .unwrap();
-    }
-
-    assert_eq!(
-        borrowed_storage.deleted_vector_count(),
-        2,
-        "2 vectors must be deleted from other storage"
-    );
-
-    let query: Vec<VectorElementType> = vec![0.0, 1.0, 1.1, 1.0];
-    let closest = new_raw_scorer(
-        query,
-        &borrowed_storage,
-        borrowed_id_tracker.deleted_point_bitslice(),
-    )
-    .peek_top_iter(&mut [0, 1, 2, 3, 4].iter().cloned(), 5);
-    assert_eq!(closest.len(), 3, "must have 3 vectors, 2 are deleted");
-    assert_eq!(closest[0].idx, 0);
-    assert_eq!(closest[1].idx, 1);
-    assert_eq!(closest[2].idx, 4);
-
-    // Delete all
-    borrowed_storage
-        .delete_vector(0 as PointOffsetType)
-        .unwrap();
-    borrowed_storage
-        .delete_vector(1 as PointOffsetType)
-        .unwrap();
-    borrowed_storage
-        .delete_vector(4 as PointOffsetType)
-        .unwrap();
-    assert_eq!(
-        borrowed_storage.deleted_vector_count(),
-        5,
-        "all vectors must be deleted"
-    );
-}
-
-fn do_test_score_points(storage: Arc<AtomicRefCell<VectorStorageEnum>>) {
-    let points = vec![
-        vec![1.0, 0.0, 1.0, 1.0],
-        vec![1.0, 0.0, 1.0, 0.0],
-        vec![1.0, 1.0, 1.0, 1.0],
-        vec![1.0, 1.0, 0.0, 1.0],
-        vec![1.0, 0.0, 0.0, 0.0],
-    ];
-    let id_tracker: Arc<AtomicRefCell<IdTrackerSS>> =
-        Arc::new(AtomicRefCell::new(FixtureIdTracker::new(points.len())));
-    let mut borrowed_id_tracker = id_tracker.borrow_mut();
-    let mut borrowed_storage = storage.borrow_mut();
-
-    for (i, vec) in points.iter().enumerate() {
-        borrowed_storage
-            .insert_vector(i as PointOffsetType, vec)
-            .unwrap();
-    }
-
-    let query: Vec<VectorElementType> = vec![0.0, 1.0, 1.1, 1.0];
-
-    let closest = new_raw_scorer(
-        query.clone(),
-        &borrowed_storage,
-        borrowed_id_tracker.deleted_point_bitslice(),
-    )
-    .peek_top_iter(&mut [0, 1, 2, 3, 4].iter().cloned(), 2);
-
-    let top_idx = match closest.get(0) {
-        Some(scored_point) => {
-            assert_eq!(scored_point.idx, 2);
-            scored_point.idx
-        }
-        None => panic!("No close vector found!"),
-    };
-
-    borrowed_id_tracker
-        .drop(PointIdType::NumId(top_idx as u64))
-        .unwrap();
-
-    let raw_scorer = new_raw_scorer(
-        query,
-        &borrowed_storage,
-        borrowed_id_tracker.deleted_point_bitslice(),
-    );
-    let closest = raw_scorer.peek_top_iter(&mut [0, 1, 2, 3, 4].iter().cloned(), 2);
-
-    let query_points = vec![0, 1, 2, 3, 4];
-
-    let mut raw_res1 = vec![ScoredPointOffset { idx: 0, score: 0. }; query_points.len()];
-    let raw_res1_count = raw_scorer.score_points(&query_points, &mut raw_res1);
-    raw_res1.resize(raw_res1_count, ScoredPointOffset { idx: 0, score: 0. });
-
-    let mut raw_res2 = vec![ScoredPointOffset { idx: 0, score: 0. }; query_points.len()];
-    let raw_res2_count = raw_scorer.score_points(&query_points, &mut raw_res2);
-    raw_res2.resize(raw_res2_count, ScoredPointOffset { idx: 0, score: 0. });
-
-    assert_eq!(raw_res1, raw_res2);
-
-    match closest.get(0) {
-        Some(scored_point) => {
-            assert_ne!(scored_point.idx, 2);
-            assert_eq!(&raw_res1[scored_point.idx as usize], scored_point);
-        }
-        None => panic!("No close vector found!"),
-    };
-
-    let all_ids1: Vec<_> = borrowed_id_tracker.iter_ids().collect();
-    let all_ids2: Vec<_> = borrowed_id_tracker.iter_ids().collect();
-
-    assert_eq!(all_ids1, all_ids2);
-
-    assert!(!all_ids1.contains(&top_idx))
-}
-
-fn test_score_quantized_points(storage: Arc<AtomicRefCell<VectorStorageEnum>>) {
-    let points = vec![
-        vec![1.0, 0.0, 1.0, 1.0],
-        vec![1.0, 0.0, 1.0, 0.0],
-        vec![1.0, 1.0, 1.0, 1.0],
-        vec![1.0, 1.0, 0.0, 1.0],
-        vec![1.0, 0.0, 0.0, 0.0],
-    ];
-    let id_tracker = Arc::new(AtomicRefCell::new(FixtureIdTracker::new(points.len())));
-    let mut borrowed_storage = storage.borrow_mut();
-    let borrowed_id_tracker = id_tracker.borrow_mut();
-
-    for (i, vec) in points.iter().enumerate() {
-        borrowed_storage
-            .insert_vector(i as PointOffsetType, vec)
-            .unwrap();
-    }
-
-    let config: QuantizationConfig = ScalarQuantizationConfig {
-        r#type: Default::default(),
-        quantile: None,
-        always_ram: None,
-    }
-    .into();
-
-    let dir = Builder::new()
-        .prefix("quantization_path")
-        .tempdir()
-        .unwrap();
-
-    let stopped = AtomicBool::new(false);
-    borrowed_storage
-        .quantize(dir.path(), &config, 1, &stopped)
-        .unwrap();
-
-    let query = vec![0.5, 0.5, 0.5, 0.5];
-
-    {
-        let scorer_quant = borrowed_storage.quantized_storage().unwrap().raw_scorer(
-            &query,
-            borrowed_id_tracker.deleted_point_bitslice(),
-            borrowed_storage.deleted_vector_bitslice(),
-            &stopped,
-        );
-        let scorer_orig = new_raw_scorer(
-            query.clone(),
-            &borrowed_storage,
-            borrowed_id_tracker.deleted_point_bitslice(),
-        );
-        for i in 0..5 {
-            let quant = scorer_quant.score_point(i);
-            let orig = scorer_orig.score_point(i);
-            assert!((orig - quant).abs() < 0.15);
-
-            let quant = scorer_quant.score_internal(0, i);
-            let orig = scorer_orig.score_internal(0, i);
-            assert!((orig - quant).abs() < 0.15);
-        }
-    }
-    let files = borrowed_storage.files();
-
-    // test save-load
-    borrowed_storage.load_quantization(dir.path()).unwrap();
-    assert_eq!(files, borrowed_storage.files());
-
-    let scorer_quant = borrowed_storage.quantized_storage().unwrap().raw_scorer(
-        &query,
-        borrowed_id_tracker.deleted_point_bitslice(),
-        borrowed_storage.deleted_vector_bitslice(),
-        &stopped,
-    );
-    let scorer_orig = new_raw_scorer(
-        query.clone(),
-        &borrowed_storage,
-        borrowed_id_tracker.deleted_point_bitslice(),
-    );
-    for i in 0..5 {
-        let quant = scorer_quant.score_point(i);
-        let orig = scorer_orig.score_point(i);
-        assert!((orig - quant).abs() < 0.15);
-
-        let quant = scorer_quant.score_internal(0, i);
-        let orig = scorer_orig.score_internal(0, i);
-        assert!((orig - quant).abs() < 0.15);
-    }
-}
-
-#[test]
-fn test_delete_points_in_simple_vector_storages() {
-    let dir = Builder::new().prefix("storage_dir").tempdir().unwrap();
-
-    {
-        let db = open_db(dir.path(), &[DB_VECTOR_CF]).unwrap();
-        let storage = open_simple_vector_storage(db, DB_VECTOR_CF, 4, Distance::Dot).unwrap();
-        do_test_delete_points(storage.clone());
-        storage.borrow().flusher()().unwrap();
-    }
-    let db = open_db(dir.path(), &[DB_VECTOR_CF]).unwrap();
-    let _storage = open_simple_vector_storage(db, DB_VECTOR_CF, 4, Distance::Dot).unwrap();
-}
-
-#[test]
-fn test_update_from_delete_points_simple_vector_storages() {
-    let dir = Builder::new().prefix("storage_dir").tempdir().unwrap();
-    {
-        let db = open_db(dir.path(), &[DB_VECTOR_CF]).unwrap();
-        let storage = open_simple_vector_storage(db, DB_VECTOR_CF, 4, Distance::Dot).unwrap();
-        do_test_update_from_delete_points(storage.clone());
-        storage.borrow().flusher()().unwrap();
-    }
-
-    let db = open_db(dir.path(), &[DB_VECTOR_CF]).unwrap();
-    let _storage = open_simple_vector_storage(db, DB_VECTOR_CF, 4, Distance::Dot).unwrap();
-}
-
-#[test]
-fn test_score_points_in_simple_vector_storages() {
-    let dir = Builder::new().prefix("storage_dir").tempdir().unwrap();
-    {
-        let db = open_db(dir.path(), &[DB_VECTOR_CF]).unwrap();
-        let storage = open_simple_vector_storage(db, DB_VECTOR_CF, 4, Distance::Dot).unwrap();
-        do_test_score_points(storage.clone());
-        storage.borrow().flusher()().unwrap();
-    }
-
-    let db = open_db(dir.path(), &[DB_VECTOR_CF]).unwrap();
-    let _storage = open_simple_vector_storage(db, DB_VECTOR_CF, 4, Distance::Dot).unwrap();
-}
-
-#[test]
-fn test_score_quantized_points_simple_vector_storages() {
-    let dir = Builder::new().prefix("storage_dir").tempdir().unwrap();
-    {
-        let db = open_db(dir.path(), &[DB_VECTOR_CF]).unwrap();
-        let storage = open_simple_vector_storage(db, DB_VECTOR_CF, 4, Distance::Dot).unwrap();
-        test_score_quantized_points(storage.clone());
-        storage.borrow().flusher()().unwrap();
-    }
-
-    let db = open_db(dir.path(), &[DB_VECTOR_CF]).unwrap();
-    let _storage = open_simple_vector_storage(db, DB_VECTOR_CF, 4, Distance::Dot).unwrap();
-}
-
-// ----------------------------------------------
-
-#[test]
-fn test_delete_points_in_appendable_memmap_vector_storages() {
-    let dir = Builder::new().prefix("storage_dir").tempdir().unwrap();
-    {
-        let storage = open_appendable_memmap_vector_storage(dir.path(), 4, Distance::Dot).unwrap();
-        do_test_delete_points(storage.clone());
-        storage.borrow().flusher()().unwrap();
-    }
-
-    let _storage = open_appendable_memmap_vector_storage(dir.path(), 4, Distance::Dot).unwrap();
-}
-
-#[test]
-fn test_update_from_delete_points_appendable_memmap_vector_storages() {
-    let dir = Builder::new().prefix("storage_dir").tempdir().unwrap();
-    {
-        let storage = open_appendable_memmap_vector_storage(dir.path(), 4, Distance::Dot).unwrap();
-
-        do_test_update_from_delete_points(storage.clone());
-        storage.borrow().flusher()().unwrap();
-    }
-
-    let _storage = open_appendable_memmap_vector_storage(dir.path(), 4, Distance::Dot).unwrap();
-}
-
-#[test]
-fn test_score_points_in_appendable_memmap_vector_storages() {
-    let dir = Builder::new().prefix("storage_dir").tempdir().unwrap();
-    {
-        let storage = open_appendable_memmap_vector_storage(dir.path(), 4, Distance::Dot).unwrap();
-        do_test_score_points(storage.clone());
-        storage.borrow().flusher()().unwrap();
-    }
-
-    let _storage = open_appendable_memmap_vector_storage(dir.path(), 4, Distance::Dot).unwrap();
-}
-
-#[test]
-fn test_score_quantized_points_appendable_memmap_vector_storages() {
-    let dir = Builder::new().prefix("storage_dir").tempdir().unwrap();
-    {
-        let storage = open_appendable_memmap_vector_storage(dir.path(), 4, Distance::Dot).unwrap();
-        test_score_quantized_points(storage.clone());
-        storage.borrow().flusher()().unwrap();
-    }
-
-    let _storage = open_appendable_memmap_vector_storage(dir.path(), 4, Distance::Dot).unwrap();
-}
diff --git a/crates/qdrant/lib/segment/src/vector_storage/vector_storage_base.rs b/crates/qdrant/lib/segment/src/vector_storage/vector_storage_base.rs
deleted file mode 100644
index e42470f..0000000
--- a/crates/qdrant/lib/segment/src/vector_storage/vector_storage_base.rs
+++ /dev/null
@@ -1,286 +0,0 @@
-use std::cmp::Ordering;
-use std::ops::Range;
-use std::path::{Path, PathBuf};
-use std::sync::atomic::AtomicBool;
-
-use bitvec::prelude::BitSlice;
-use ordered_float::OrderedFloat;
-
-use super::memmap_vector_storage::MemmapVectorStorage;
-use super::quantized::quantized_vectors::QuantizedVectors;
-use super::simple_vector_storage::SimpleVectorStorage;
-use crate::common::Flusher;
-use crate::data_types::vectors::VectorElementType;
-use crate::entry::entry_point::OperationResult;
-use crate::types::{Distance, PointOffsetType, QuantizationConfig, ScoreType};
-use crate::vector_storage::appendable_mmap_vector_storage::AppendableMmapVectorStorage;
-
-#[derive(Copy, Clone, PartialEq, Debug, Default)]
-pub struct ScoredPointOffset {
-    pub idx: PointOffsetType,
-    pub score: ScoreType,
-}
-
-impl Eq for ScoredPointOffset {}
-
-impl Ord for ScoredPointOffset {
-    fn cmp(&self, other: &Self) -> Ordering {
-        OrderedFloat(self.score).cmp(&OrderedFloat(other.score))
-    }
-}
-
-impl PartialOrd for ScoredPointOffset {
-    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-/// Trait for vector storage
-/// El - type of vector element, expected numerical type
-/// Storage operates with internal IDs (`PointOffsetType`), which always starts with zero and have no skips
-pub trait VectorStorage {
-    fn vector_dim(&self) -> usize;
-
-    fn distance(&self) -> Distance;
-
-    /// Number of vectors
-    ///
-    /// - includes soft deleted vectors, as they are still stored
-    fn total_vector_count(&self) -> usize;
-
-    /// Get the number of available vectors, considering deleted points and vectors
-    ///
-    /// This uses [`VectorStorage::total_vector_count`] and [`VectorStorage::deleted_vector_count`] internally.
-    ///
-    /// # Warning
-    ///
-    /// This number may not always be accurate. See warning in [`VectorStorage::deleted_vector_count`] documentation.
-    fn available_vector_count(&self) -> usize {
-        self.total_vector_count()
-            .saturating_sub(self.deleted_vector_count())
-    }
-
-    /// Number of all stored vectors including deleted
-    fn get_vector(&self, key: PointOffsetType) -> &[VectorElementType];
-
-    fn insert_vector(
-        &mut self,
-        key: PointOffsetType,
-        vector: &[VectorElementType],
-    ) -> OperationResult<()>;
-
-    fn update_from(
-        &mut self,
-        other: &VectorStorageEnum,
-        other_ids: &mut dyn Iterator<Item = PointOffsetType>,
-        stopped: &AtomicBool,
-    ) -> OperationResult<Range<PointOffsetType>>;
-
-    fn flusher(&self) -> Flusher;
-
-    // Generate quantized vectors and store them on disk
-    fn quantize(
-        &mut self,
-        data_path: &Path,
-        quantization_config: &QuantizationConfig,
-        max_threads: usize,
-        stopped: &AtomicBool,
-    ) -> OperationResult<()>;
-
-    // Load quantized vectors from disk
-    fn load_quantization(&mut self, data_path: &Path) -> OperationResult<()>;
-
-    fn quantized_storage(&self) -> Option<&QuantizedVectors>;
-
-    fn files(&self) -> Vec<PathBuf>;
-
-    /// Flag the vector by the given key as deleted
-    ///
-    /// Returns true if the vector was not deleted before and is now deleted
-    fn delete_vector(&mut self, key: PointOffsetType) -> OperationResult<bool>;
-
-    /// Check whether the vector at the given key is flagged as deleted
-    fn is_deleted_vector(&self, key: PointOffsetType) -> bool;
-
-    /// Get the number of deleted vectors, considering deleted points and vectors
-    ///
-    /// Vectors may be deleted at two levels, as point or as vector. Deleted points should
-    /// propagate to deleting the vectors. That means that the deleted vector count includes the
-    /// number of deleted points as well.
-    ///
-    /// This includes any vectors that were deleted at creation.
-    ///
-    /// # Warning
-    ///
-    /// In some very exceptional cases it is possible for this count not to include some deleted
-    /// points. That may happen when flushing a segment to disk fails. This should be recovered
-    /// when loading/recovering the segment, but that isn't guaranteed. You should therefore use
-    /// the deleted count with care.
-    fn deleted_vector_count(&self) -> usize;
-
-    /// Get [`BitSlice`] representation for deleted vectors with deletion flags
-    ///
-    /// The size of this slice is not guaranteed. It may be smaller/larger than the number of
-    /// vectors in this segment.
-    fn deleted_vector_bitslice(&self) -> &BitSlice;
-
-    /// Whether this vector storage type support appending.
-    fn is_appendable(&self) -> bool;
-}
-
-pub enum VectorStorageEnum {
-    Simple(SimpleVectorStorage),
-    Memmap(Box<MemmapVectorStorage>),
-    AppendableMemmap(Box<AppendableMmapVectorStorage>),
-}
-
-impl VectorStorage for VectorStorageEnum {
-    fn vector_dim(&self) -> usize {
-        match self {
-            VectorStorageEnum::Simple(v) => v.vector_dim(),
-            VectorStorageEnum::Memmap(v) => v.vector_dim(),
-            VectorStorageEnum::AppendableMemmap(v) => v.vector_dim(),
-        }
-    }
-
-    fn distance(&self) -> Distance {
-        match self {
-            VectorStorageEnum::Simple(v) => v.distance(),
-            VectorStorageEnum::Memmap(v) => v.distance(),
-            VectorStorageEnum::AppendableMemmap(v) => v.distance(),
-        }
-    }
-
-    fn total_vector_count(&self) -> usize {
-        match self {
-            VectorStorageEnum::Simple(v) => v.total_vector_count(),
-            VectorStorageEnum::Memmap(v) => v.total_vector_count(),
-            VectorStorageEnum::AppendableMemmap(v) => v.total_vector_count(),
-        }
-    }
-
-    fn get_vector(&self, key: PointOffsetType) -> &[VectorElementType] {
-        match self {
-            VectorStorageEnum::Simple(v) => v.get_vector(key),
-            VectorStorageEnum::Memmap(v) => v.get_vector(key),
-            VectorStorageEnum::AppendableMemmap(v) => v.get_vector(key),
-        }
-    }
-
-    fn insert_vector(
-        &mut self,
-        key: PointOffsetType,
-        vector: &[VectorElementType],
-    ) -> OperationResult<()> {
-        match self {
-            VectorStorageEnum::Simple(v) => v.insert_vector(key, vector),
-            VectorStorageEnum::Memmap(v) => v.insert_vector(key, vector),
-            VectorStorageEnum::AppendableMemmap(v) => v.insert_vector(key, vector),
-        }
-    }
-
-    fn update_from(
-        &mut self,
-        other: &VectorStorageEnum,
-        other_ids: &mut dyn Iterator<Item = PointOffsetType>,
-        stopped: &AtomicBool,
-    ) -> OperationResult<Range<PointOffsetType>> {
-        match self {
-            VectorStorageEnum::Simple(v) => v.update_from(other, other_ids, stopped),
-            VectorStorageEnum::Memmap(v) => v.update_from(other, other_ids, stopped),
-            VectorStorageEnum::AppendableMemmap(v) => v.update_from(other, other_ids, stopped),
-        }
-    }
-
-    fn flusher(&self) -> Flusher {
-        match self {
-            VectorStorageEnum::Simple(v) => v.flusher(),
-            VectorStorageEnum::Memmap(v) => v.flusher(),
-            VectorStorageEnum::AppendableMemmap(v) => v.flusher(),
-        }
-    }
-
-    fn quantize(
-        &mut self,
-        data_path: &Path,
-        quantization_config: &QuantizationConfig,
-        max_threads: usize,
-        stopped: &AtomicBool,
-    ) -> OperationResult<()> {
-        match self {
-            VectorStorageEnum::Simple(v) => {
-                v.quantize(data_path, quantization_config, max_threads, stopped)
-            }
-            VectorStorageEnum::Memmap(v) => {
-                v.quantize(data_path, quantization_config, max_threads, stopped)
-            }
-            VectorStorageEnum::AppendableMemmap(v) => {
-                v.quantize(data_path, quantization_config, max_threads, stopped)
-            }
-        }
-    }
-
-    fn load_quantization(&mut self, data_path: &Path) -> OperationResult<()> {
-        match self {
-            VectorStorageEnum::Simple(v) => v.load_quantization(data_path),
-            VectorStorageEnum::Memmap(v) => v.load_quantization(data_path),
-            VectorStorageEnum::AppendableMemmap(v) => v.load_quantization(data_path),
-        }
-    }
-
-    fn quantized_storage(&self) -> Option<&QuantizedVectors> {
-        match self {
-            VectorStorageEnum::Simple(v) => v.quantized_storage(),
-            VectorStorageEnum::Memmap(v) => v.quantized_storage(),
-            VectorStorageEnum::AppendableMemmap(v) => v.quantized_storage(),
-        }
-    }
-
-    fn files(&self) -> Vec<PathBuf> {
-        match self {
-            VectorStorageEnum::Simple(v) => v.files(),
-            VectorStorageEnum::Memmap(v) => v.files(),
-            VectorStorageEnum::AppendableMemmap(v) => v.files(),
-        }
-    }
-
-    fn delete_vector(&mut self, key: PointOffsetType) -> OperationResult<bool> {
-        match self {
-            VectorStorageEnum::Simple(v) => v.delete_vector(key),
-            VectorStorageEnum::Memmap(v) => v.delete_vector(key),
-            VectorStorageEnum::AppendableMemmap(v) => v.delete_vector(key),
-        }
-    }
-
-    fn is_deleted_vector(&self, key: PointOffsetType) -> bool {
-        match self {
-            VectorStorageEnum::Simple(v) => v.is_deleted_vector(key),
-            VectorStorageEnum::Memmap(v) => v.is_deleted_vector(key),
-            VectorStorageEnum::AppendableMemmap(v) => v.is_deleted_vector(key),
-        }
-    }
-
-    fn deleted_vector_count(&self) -> usize {
-        match self {
-            VectorStorageEnum::Simple(v) => v.deleted_vector_count(),
-            VectorStorageEnum::Memmap(v) => v.deleted_vector_count(),
-            VectorStorageEnum::AppendableMemmap(v) => v.deleted_vector_count(),
-        }
-    }
-
-    fn deleted_vector_bitslice(&self) -> &BitSlice {
-        match self {
-            VectorStorageEnum::Simple(v) => v.deleted_vector_bitslice(),
-            VectorStorageEnum::Memmap(v) => v.deleted_vector_bitslice(),
-            VectorStorageEnum::AppendableMemmap(v) => v.deleted_vector_bitslice(),
-        }
-    }
-
-    fn is_appendable(&self) -> bool {
-        match self {
-            VectorStorageEnum::Simple(v) => v.is_appendable(),
-            VectorStorageEnum::Memmap(v) => v.is_appendable(),
-            VectorStorageEnum::AppendableMemmap(v) => v.is_appendable(),
-        }
-    }
-}
diff --git a/crates/qdrant/lib/segment/tests/integration/batch_search_test.rs b/crates/qdrant/lib/segment/tests/integration/batch_search_test.rs
deleted file mode 100644
index 8a7cd23..0000000
--- a/crates/qdrant/lib/segment/tests/integration/batch_search_test.rs
+++ /dev/null
@@ -1,182 +0,0 @@
-use std::collections::HashMap;
-use std::sync::atomic::AtomicBool;
-
-use rand::prelude::StdRng;
-use rand::SeedableRng;
-use segment::data_types::vectors::{only_default_vector, DEFAULT_VECTOR_NAME};
-use segment::entry::entry_point::SegmentEntry;
-use segment::fixtures::index_fixtures::random_vector;
-use segment::fixtures::payload_fixtures::random_int_payload;
-use segment::index::hnsw_index::graph_links::GraphLinksRam;
-use segment::index::hnsw_index::hnsw::HNSWIndex;
-use segment::index::VectorIndex;
-use segment::segment_constructor::build_segment;
-use segment::types::{
-    Condition, Distance, FieldCondition, Filter, HnswConfig, Indexes, Payload, PayloadSchemaType,
-    SegmentConfig, SeqNumberType, VectorDataConfig, VectorStorageType, WithPayload,
-};
-use serde_json::json;
-use tempfile::Builder;
-
-#[test]
-fn test_batch_and_single_request_equivalency() {
-    let num_vectors: u64 = 1_000;
-    let distance = Distance::Cosine;
-    let num_payload_values = 2;
-    let dim = 8;
-
-    let mut rnd = StdRng::seed_from_u64(42);
-
-    let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-
-    let config = SegmentConfig {
-        vector_data: HashMap::from([(
-            DEFAULT_VECTOR_NAME.to_owned(),
-            VectorDataConfig {
-                size: dim,
-                distance,
-                storage_type: VectorStorageType::Memory,
-                index: Indexes::Plain {},
-                quantization_config: None,
-            },
-        )]),
-        payload_storage_type: Default::default(),
-    };
-
-    let int_key = "int";
-
-    let mut segment = build_segment(dir.path(), &config, true).unwrap();
-
-    segment
-        .create_field_index(0, int_key, Some(&PayloadSchemaType::Integer.into()))
-        .unwrap();
-
-    for n in 0..num_vectors {
-        let idx = n.into();
-        let vector = random_vector(&mut rnd, dim);
-
-        let int_payload = random_int_payload(&mut rnd, num_payload_values..=num_payload_values);
-        let payload: Payload = json!({int_key:int_payload,}).into();
-
-        segment
-            .upsert_point(n as SeqNumberType, idx, only_default_vector(&vector))
-            .unwrap();
-        segment
-            .set_full_payload(n as SeqNumberType, idx, &payload)
-            .unwrap();
-    }
-
-    for _ in 0..10 {
-        let query_vector_1 = random_vector(&mut rnd, dim);
-        let query_vector_2 = random_vector(&mut rnd, dim);
-
-        let payload_value = random_int_payload(&mut rnd, 1..=1).pop().unwrap();
-
-        let filter = Filter::new_must(Condition::Field(FieldCondition::new_match(
-            int_key,
-            payload_value.into(),
-        )));
-
-        let search_res_1 = segment
-            .search(
-                DEFAULT_VECTOR_NAME,
-                &query_vector_1,
-                &WithPayload::default(),
-                &false.into(),
-                Some(&filter),
-                10,
-                None,
-                &false.into(),
-            )
-            .unwrap();
-
-        let search_res_2 = segment
-            .search(
-                DEFAULT_VECTOR_NAME,
-                &query_vector_2,
-                &WithPayload::default(),
-                &false.into(),
-                Some(&filter),
-                10,
-                None,
-                &false.into(),
-            )
-            .unwrap();
-
-        let batch_res = segment
-            .search_batch(
-                DEFAULT_VECTOR_NAME,
-                &[&query_vector_1, &query_vector_2],
-                &WithPayload::default(),
-                &false.into(),
-                Some(&filter),
-                10,
-                None,
-                &false.into(),
-            )
-            .unwrap();
-
-        assert_eq!(search_res_1, batch_res[0]);
-        assert_eq!(search_res_2, batch_res[1]);
-    }
-
-    let hnsw_dir = Builder::new().prefix("hnsw_dir").tempdir().unwrap();
-
-    let stopped = AtomicBool::new(false);
-
-    let payload_index_ptr = segment.payload_index.clone();
-
-    let m = 8;
-    let ef_construct = 100;
-    let full_scan_threshold = 10000;
-
-    let hnsw_config = HnswConfig {
-        m,
-        ef_construct,
-        full_scan_threshold,
-        max_indexing_threads: 2,
-        on_disk: Some(false),
-        payload_m: None,
-    };
-
-    let vector_storage = &segment.vector_data[DEFAULT_VECTOR_NAME].vector_storage;
-    let mut hnsw_index = HNSWIndex::<GraphLinksRam>::open(
-        hnsw_dir.path(),
-        segment.id_tracker.clone(),
-        vector_storage.clone(),
-        payload_index_ptr,
-        hnsw_config,
-    )
-    .unwrap();
-
-    hnsw_index.build_index(&stopped).unwrap();
-
-    for _ in 0..10 {
-        let query_vector_1 = random_vector(&mut rnd, dim);
-        let query_vector_2 = random_vector(&mut rnd, dim);
-
-        let payload_value = random_int_payload(&mut rnd, 1..=1).pop().unwrap();
-
-        let filter = Filter::new_must(Condition::Field(FieldCondition::new_match(
-            int_key,
-            payload_value.into(),
-        )));
-
-        let search_res_1 =
-            hnsw_index.search(&[&query_vector_1], Some(&filter), 10, None, &false.into());
-
-        let search_res_2 =
-            hnsw_index.search(&[&query_vector_2], Some(&filter), 10, None, &false.into());
-
-        let batch_res = hnsw_index.search(
-            &[&query_vector_1, &query_vector_2],
-            Some(&filter),
-            10,
-            None,
-            &false.into(),
-        );
-
-        assert_eq!(search_res_1[0], batch_res[0]);
-        assert_eq!(search_res_2[0], batch_res[1]);
-    }
-}
diff --git a/crates/qdrant/lib/segment/tests/integration/disbalanced_vectors_test.rs b/crates/qdrant/lib/segment/tests/integration/disbalanced_vectors_test.rs
deleted file mode 100644
index 7e4f599..0000000
--- a/crates/qdrant/lib/segment/tests/integration/disbalanced_vectors_test.rs
+++ /dev/null
@@ -1,136 +0,0 @@
-const NUM_VECTORS_1: u64 = 300;
-const NUM_VECTORS_2: u64 = 500;
-
-use std::sync::atomic::AtomicBool;
-
-use segment::data_types::named_vectors::NamedVectors;
-use segment::entry::entry_point::SegmentEntry;
-use segment::segment::Segment;
-use segment::segment_constructor::segment_builder::SegmentBuilder;
-use segment::segment_constructor::simple_segment_constructor::build_multivec_segment;
-use segment::types::Distance;
-use segment::vector_storage::VectorStorage;
-use tempfile::Builder;
-
-#[test]
-fn test_rebuild_with_removed_vectors() {
-    let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-    let temp_dir = Builder::new().prefix("segment_temp_dir").tempdir().unwrap();
-
-    let stopped = AtomicBool::new(false);
-
-    let mut segment1 = build_multivec_segment(dir.path(), 4, 6, Distance::Dot).unwrap();
-    let mut segment2 = build_multivec_segment(dir.path(), 4, 6, Distance::Dot).unwrap();
-
-    for i in 0..NUM_VECTORS_1 {
-        segment1
-            .upsert_point(
-                1,
-                i.into(),
-                NamedVectors::from([
-                    ("vector1".to_string(), vec![i as f32, 0., 0., 0.]),
-                    ("vector2".to_string(), vec![0., i as f32, 0., 0., 0., 0.]),
-                ]),
-            )
-            .unwrap();
-    }
-
-    for i in 0..NUM_VECTORS_2 {
-        let vectors = if i % 5 == 0 {
-            NamedVectors::from([("vector1".to_string(), vec![0., 0., i as f32, 0.])])
-        } else {
-            NamedVectors::from([
-                ("vector1".to_string(), vec![0., 0., i as f32, 0.]),
-                ("vector2".to_string(), vec![0., 0., 0., i as f32, 0., 0.]),
-            ])
-        };
-
-        segment2
-            .upsert_point(1, (NUM_VECTORS_1 + i).into(), vectors)
-            .unwrap();
-    }
-
-    for i in 0..NUM_VECTORS_2 {
-        if i % 3 == 0 {
-            segment2
-                .delete_vector(2, (NUM_VECTORS_1 + i).into(), "vector1")
-                .unwrap();
-            segment2
-                .delete_vector(2, (NUM_VECTORS_1 + i).into(), "vector2")
-                .unwrap();
-        }
-        if i % 3 == 1 {
-            segment2
-                .delete_vector(2, (NUM_VECTORS_1 + i).into(), "vector2")
-                .unwrap();
-        }
-        if i % 2 == 0 {
-            segment2
-                .delete_point(2, (NUM_VECTORS_1 + i).into())
-                .unwrap();
-        }
-    }
-
-    let mut reference = vec![];
-
-    for i in 0..20 {
-        if i % 2 == 0 {
-            continue;
-        }
-        let idx = NUM_VECTORS_1 + i;
-        let vec = segment2.all_vectors(idx.into()).unwrap();
-        reference.push(vec);
-    }
-
-    let mut builder =
-        SegmentBuilder::new(dir.path(), temp_dir.path(), &segment1.segment_config).unwrap();
-
-    builder.update_from(&segment1, &stopped).unwrap();
-    builder.update_from(&segment2, &stopped).unwrap();
-
-    let merged_segment: Segment = builder.build(&stopped).unwrap();
-
-    let merged_points_count = merged_segment.available_point_count();
-
-    assert_eq!(
-        merged_points_count,
-        (NUM_VECTORS_1 + NUM_VECTORS_2 / 2) as usize
-    );
-
-    let vec1_count = merged_segment
-        .vector_data
-        .get("vector1")
-        .unwrap()
-        .vector_storage
-        .borrow()
-        .available_vector_count();
-    let vec2_count = merged_segment
-        .vector_data
-        .get("vector2")
-        .unwrap()
-        .vector_storage
-        .borrow()
-        .available_vector_count();
-
-    assert_ne!(vec1_count, vec2_count);
-
-    assert!(vec1_count > NUM_VECTORS_1 as usize);
-    assert!(vec2_count > NUM_VECTORS_1 as usize);
-    assert!(vec1_count < NUM_VECTORS_1 as usize + NUM_VECTORS_2 as usize);
-    assert!(vec2_count < NUM_VECTORS_1 as usize + NUM_VECTORS_2 as usize);
-
-    let mut merged_reference = vec![];
-
-    for i in 0..20 {
-        if i % 2 == 0 {
-            continue;
-        }
-        let idx = NUM_VECTORS_1 + i;
-        let vec = merged_segment.all_vectors(idx.into()).unwrap();
-        merged_reference.push(vec);
-    }
-
-    for i in 0..merged_reference.len() {
-        assert_eq!(merged_reference[i], reference[i]);
-    }
-}
diff --git a/crates/qdrant/lib/segment/tests/integration/exact_search_test.rs b/crates/qdrant/lib/segment/tests/integration/exact_search_test.rs
deleted file mode 100644
index 4478c31..0000000
--- a/crates/qdrant/lib/segment/tests/integration/exact_search_test.rs
+++ /dev/null
@@ -1,199 +0,0 @@
-use std::collections::HashMap;
-use std::sync::atomic::AtomicBool;
-
-use itertools::Itertools;
-use rand::{thread_rng, Rng};
-use segment::data_types::vectors::{only_default_vector, DEFAULT_VECTOR_NAME};
-use segment::entry::entry_point::SegmentEntry;
-use segment::fixtures::payload_fixtures::{random_int_payload, random_vector};
-use segment::index::hnsw_index::graph_links::GraphLinksRam;
-use segment::index::hnsw_index::hnsw::HNSWIndex;
-use segment::index::{PayloadIndex, VectorIndex};
-use segment::segment_constructor::build_segment;
-use segment::types::{
-    Condition, Distance, FieldCondition, Filter, HnswConfig, Indexes, Payload, PayloadSchemaType,
-    PointOffsetType, Range, SearchParams, SegmentConfig, SeqNumberType, VectorDataConfig,
-    VectorStorageType,
-};
-use serde_json::json;
-use tempfile::Builder;
-
-#[test]
-fn exact_search_test() {
-    let stopped = AtomicBool::new(false);
-
-    let dim = 8;
-    let m = 8;
-    let num_vectors: u64 = 5_000;
-    let ef = 32;
-    let ef_construct = 16;
-    let distance = Distance::Cosine;
-    let full_scan_threshold = 16; // KB
-    let indexing_threshold = 500; // num vectors
-    let num_payload_values = 2;
-
-    let mut rnd = thread_rng();
-
-    let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-    let hnsw_dir = Builder::new().prefix("hnsw_dir").tempdir().unwrap();
-
-    let config = SegmentConfig {
-        vector_data: HashMap::from([(
-            DEFAULT_VECTOR_NAME.to_owned(),
-            VectorDataConfig {
-                size: dim,
-                distance,
-                storage_type: VectorStorageType::Memory,
-                index: Indexes::Plain {},
-                quantization_config: None,
-            },
-        )]),
-        payload_storage_type: Default::default(),
-    };
-
-    let int_key = "int";
-
-    let mut segment = build_segment(dir.path(), &config, true).unwrap();
-    for n in 0..num_vectors {
-        let idx = n.into();
-        let vector = random_vector(&mut rnd, dim);
-
-        let int_payload = random_int_payload(&mut rnd, num_payload_values..=num_payload_values);
-        let payload: Payload = json!({int_key:int_payload,}).into();
-
-        segment
-            .upsert_point(n as SeqNumberType, idx, only_default_vector(&vector))
-            .unwrap();
-        segment
-            .set_full_payload(n as SeqNumberType, idx, &payload)
-            .unwrap();
-    }
-    // let opnum = num_vectors + 1;
-
-    let payload_index_ptr = segment.payload_index.clone();
-
-    let hnsw_config = HnswConfig {
-        m,
-        ef_construct,
-        full_scan_threshold,
-        max_indexing_threads: 2,
-        on_disk: Some(false),
-        payload_m: None,
-    };
-
-    let mut hnsw_index = HNSWIndex::<GraphLinksRam>::open(
-        hnsw_dir.path(),
-        segment.id_tracker.clone(),
-        segment.vector_data[DEFAULT_VECTOR_NAME]
-            .vector_storage
-            .clone(),
-        payload_index_ptr.clone(),
-        hnsw_config,
-    )
-    .unwrap();
-
-    hnsw_index.build_index(&stopped).unwrap();
-
-    payload_index_ptr
-        .borrow_mut()
-        .set_indexed(int_key, PayloadSchemaType::Integer.into())
-        .unwrap();
-    let borrowed_payload_index = payload_index_ptr.borrow();
-    let blocks = borrowed_payload_index
-        .payload_blocks(int_key, indexing_threshold)
-        .collect_vec();
-    for block in blocks.iter() {
-        assert!(
-            block.condition.range.is_some(),
-            "only range conditions should be generated for this type of payload"
-        );
-    }
-
-    let mut coverage: HashMap<PointOffsetType, usize> = Default::default();
-    for block in &blocks {
-        let px = payload_index_ptr.borrow();
-        let filter = Filter::new_must(Condition::Field(block.condition.clone()));
-        let points = px.query_points(&filter);
-        for point in points {
-            coverage.insert(point, coverage.get(&point).unwrap_or(&0) + 1);
-        }
-    }
-    let expected_blocks = num_vectors as usize / indexing_threshold * 2;
-
-    eprintln!("blocks.len() = {:#?}", blocks.len());
-    assert!(
-        (blocks.len() as i64 - expected_blocks as i64).abs() <= 3,
-        "real number of payload blocks is too far from expected"
-    );
-
-    assert_eq!(
-        coverage.len(),
-        num_vectors as usize,
-        "not all points are covered by payload blocks"
-    );
-
-    hnsw_index.build_index(&stopped).unwrap();
-
-    let top = 3;
-    let attempts = 50;
-    for _i in 0..attempts {
-        let query = random_vector(&mut rnd, dim);
-
-        let index_result = hnsw_index.search(
-            &[&query],
-            None,
-            top,
-            Some(&SearchParams {
-                hnsw_ef: Some(ef),
-                exact: true,
-                ..Default::default()
-            }),
-            &false.into(),
-        );
-        let plain_result = segment.vector_data[DEFAULT_VECTOR_NAME]
-            .vector_index
-            .borrow()
-            .search(&[&query], None, top, None, &false.into());
-
-        assert_eq!(
-            index_result, plain_result,
-            "Exact search is not equal to plain search"
-        );
-
-        let range_size = 40;
-        let left_range = rnd.gen_range(0..400);
-        let right_range = left_range + range_size;
-
-        let filter = Filter::new_must(Condition::Field(FieldCondition::new_range(
-            int_key.to_owned(),
-            Range {
-                lt: None,
-                gt: None,
-                gte: Some(left_range as f64),
-                lte: Some(right_range as f64),
-            },
-        )));
-
-        let filter_query = Some(&filter);
-        let index_result = hnsw_index.search(
-            &[&query],
-            filter_query,
-            top,
-            Some(&SearchParams {
-                hnsw_ef: Some(ef),
-                exact: true,
-                ..Default::default()
-            }),
-            &false.into(),
-        );
-        let plain_result = segment.vector_data[DEFAULT_VECTOR_NAME]
-            .vector_index
-            .borrow()
-            .search(&[&query], filter_query, top, None, &false.into());
-
-        assert_eq!(
-            index_result, plain_result,
-            "Exact search is not equal to plain search"
-        );
-    }
-}
diff --git a/crates/qdrant/lib/segment/tests/integration/fail_recovery_test.rs b/crates/qdrant/lib/segment/tests/integration/fail_recovery_test.rs
deleted file mode 100644
index bde802d..0000000
--- a/crates/qdrant/lib/segment/tests/integration/fail_recovery_test.rs
+++ /dev/null
@@ -1,63 +0,0 @@
-use segment::data_types::vectors::only_default_vector;
-use segment::entry::entry_point::{OperationError, SegmentEntry, SegmentFailedState};
-use serde_json::json;
-use tempfile::Builder;
-
-use crate::fixtures::segment::empty_segment;
-
-#[test]
-fn test_insert_fail_recovery() {
-    let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-
-    let vec1 = vec![1.0, 0.0, 1.0, 1.0];
-
-    let mut segment = empty_segment(dir.path());
-
-    segment
-        .upsert_point(1, 1.into(), only_default_vector(&vec1))
-        .unwrap();
-    segment
-        .upsert_point(1, 2.into(), only_default_vector(&vec1))
-        .unwrap();
-
-    segment.error_status = Some(SegmentFailedState {
-        version: 2,
-        point_id: Some(1.into()),
-        error: OperationError::service_error("test error"),
-    });
-
-    // op_num is greater than errored. Skip because not recovered yet
-    let fail_res = segment.set_payload(
-        3,
-        1.into(),
-        &json!({ "color": vec!["red".to_string()] }).into(),
-    );
-    assert!(fail_res.is_err());
-
-    // Also skip even with another point operation
-    let fail_res = segment.set_payload(
-        3,
-        2.into(),
-        &json!({ "color": vec!["red".to_string()] }).into(),
-    );
-    assert!(fail_res.is_err());
-
-    // Perform operation, but keep error status: operation is not fully recovered yet
-    let ok_res = segment.set_payload(
-        2,
-        2.into(),
-        &json!({ "color": vec!["red".to_string()] }).into(),
-    );
-    assert!(ok_res.is_ok());
-    assert!(segment.error_status.is_some());
-
-    // Perform operation anf recover the error - operation is fixed now
-    let recover_res = segment.set_payload(
-        2,
-        1.into(),
-        &json!({ "color": vec!["red".to_string()] }).into(),
-    );
-
-    assert!(recover_res.is_ok());
-    assert!(segment.error_status.is_none());
-}
diff --git a/crates/qdrant/lib/segment/tests/integration/filtering_context_check.rs b/crates/qdrant/lib/segment/tests/integration/filtering_context_check.rs
deleted file mode 100644
index 1c83ed4..0000000
--- a/crates/qdrant/lib/segment/tests/integration/filtering_context_check.rs
+++ /dev/null
@@ -1,38 +0,0 @@
-use itertools::Itertools;
-use rand::prelude::StdRng;
-use rand::SeedableRng;
-use segment::fixtures::payload_context_fixture::{
-    create_plain_payload_index, create_struct_payload_index,
-};
-use segment::fixtures::payload_fixtures::random_filter;
-use segment::index::PayloadIndex;
-use segment::types::PointOffsetType;
-use tempfile::Builder;
-
-const NUM_POINTS: usize = 2000;
-const ATTEMPTS: usize = 100;
-
-#[test]
-fn test_filtering_context_consistency() {
-    let seed = 42;
-    let mut rng = StdRng::seed_from_u64(seed);
-
-    let dir = Builder::new().prefix("storage_dir").tempdir().unwrap();
-    let plain_index = create_plain_payload_index(dir.path(), NUM_POINTS, seed);
-    let struct_index = create_struct_payload_index(dir.path(), NUM_POINTS, seed);
-
-    for _ in 0..ATTEMPTS {
-        let filter = random_filter(&mut rng, 3);
-
-        let plain_filter_context = plain_index.filter_context(&filter);
-        let struct_filter_context = struct_index.filter_context(&filter);
-
-        let plain_result = (0..NUM_POINTS)
-            .filter(|point_id| plain_filter_context.check(*point_id as PointOffsetType))
-            .collect_vec();
-        let struct_result = (0..NUM_POINTS)
-            .filter(|point_id| struct_filter_context.check(*point_id as PointOffsetType))
-            .collect_vec();
-        assert_eq!(plain_result, struct_result, "filter: {filter:#?}");
-    }
-}
diff --git a/crates/qdrant/lib/segment/tests/integration/filtrable_hnsw_test.rs b/crates/qdrant/lib/segment/tests/integration/filtrable_hnsw_test.rs
deleted file mode 100644
index 7994cb9..0000000
--- a/crates/qdrant/lib/segment/tests/integration/filtrable_hnsw_test.rs
+++ /dev/null
@@ -1,182 +0,0 @@
-use std::collections::HashMap;
-use std::sync::atomic::AtomicBool;
-
-use itertools::Itertools;
-use rand::prelude::StdRng;
-use rand::{Rng, SeedableRng};
-use segment::data_types::vectors::{only_default_vector, DEFAULT_VECTOR_NAME};
-use segment::entry::entry_point::SegmentEntry;
-use segment::fixtures::payload_fixtures::{random_int_payload, random_vector};
-use segment::index::hnsw_index::graph_links::GraphLinksRam;
-use segment::index::hnsw_index::hnsw::HNSWIndex;
-use segment::index::{PayloadIndex, VectorIndex};
-use segment::segment_constructor::build_segment;
-use segment::types::{
-    Condition, Distance, FieldCondition, Filter, HnswConfig, Indexes, Payload, PayloadSchemaType,
-    PointOffsetType, Range, SearchParams, SegmentConfig, SeqNumberType, VectorDataConfig,
-    VectorStorageType,
-};
-use serde_json::json;
-use tempfile::Builder;
-
-#[test]
-fn test_filterable_hnsw() {
-    let stopped = AtomicBool::new(false);
-
-    let dim = 8;
-    let m = 8;
-    let num_vectors: u64 = 5_000;
-    let ef = 32;
-    let ef_construct = 16;
-    let distance = Distance::Cosine;
-    let full_scan_threshold = 16; // KB
-    let indexing_threshold = 500; // num vectors
-    let num_payload_values = 2;
-
-    let mut rnd = StdRng::seed_from_u64(42);
-
-    let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-    let hnsw_dir = Builder::new().prefix("hnsw_dir").tempdir().unwrap();
-
-    let config = SegmentConfig {
-        vector_data: HashMap::from([(
-            DEFAULT_VECTOR_NAME.to_owned(),
-            VectorDataConfig {
-                size: dim,
-                distance,
-                storage_type: VectorStorageType::Memory,
-                index: Indexes::Plain {},
-                quantization_config: None,
-            },
-        )]),
-        payload_storage_type: Default::default(),
-    };
-
-    let int_key = "int";
-
-    let mut segment = build_segment(dir.path(), &config, true).unwrap();
-    for n in 0..num_vectors {
-        let idx = n.into();
-        let vector = random_vector(&mut rnd, dim);
-
-        let int_payload = random_int_payload(&mut rnd, num_payload_values..=num_payload_values);
-        let payload: Payload = json!({int_key:int_payload,}).into();
-
-        segment
-            .upsert_point(n as SeqNumberType, idx, only_default_vector(&vector))
-            .unwrap();
-        segment
-            .set_full_payload(n as SeqNumberType, idx, &payload)
-            .unwrap();
-    }
-    // let opnum = num_vectors + 1;
-
-    let payload_index_ptr = segment.payload_index.clone();
-
-    let hnsw_config = HnswConfig {
-        m,
-        ef_construct,
-        full_scan_threshold,
-        max_indexing_threads: 2,
-        on_disk: Some(false),
-        payload_m: None,
-    };
-
-    let vector_storage = &segment.vector_data[DEFAULT_VECTOR_NAME].vector_storage;
-    let mut hnsw_index = HNSWIndex::<GraphLinksRam>::open(
-        hnsw_dir.path(),
-        segment.id_tracker.clone(),
-        vector_storage.clone(),
-        payload_index_ptr.clone(),
-        hnsw_config,
-    )
-    .unwrap();
-
-    hnsw_index.build_index(&stopped).unwrap();
-
-    payload_index_ptr
-        .borrow_mut()
-        .set_indexed(int_key, PayloadSchemaType::Integer.into())
-        .unwrap();
-    let borrowed_payload_index = payload_index_ptr.borrow();
-    let blocks = borrowed_payload_index
-        .payload_blocks(int_key, indexing_threshold)
-        .collect_vec();
-    for block in blocks.iter() {
-        assert!(
-            block.condition.range.is_some(),
-            "only range conditions should be generated for this type of payload"
-        );
-    }
-
-    let mut coverage: HashMap<PointOffsetType, usize> = Default::default();
-    let px = payload_index_ptr.borrow();
-    for block in &blocks {
-        let filter = Filter::new_must(Condition::Field(block.condition.clone()));
-        let points = px.query_points(&filter);
-        for point in points {
-            coverage.insert(point, coverage.get(&point).unwrap_or(&0) + 1);
-        }
-    }
-    let expected_blocks = num_vectors as usize / indexing_threshold * 2;
-
-    eprintln!("blocks.len() = {:#?}", blocks.len());
-    assert!(
-        (blocks.len() as i64 - expected_blocks as i64).abs() <= 3,
-        "real number of payload blocks is too far from expected"
-    );
-
-    assert_eq!(
-        coverage.len(),
-        num_vectors as usize,
-        "not all points are covered by payload blocks"
-    );
-
-    hnsw_index.build_index(&stopped).unwrap();
-
-    let top = 3;
-    let mut hits = 0;
-    let attempts = 100;
-    for _i in 0..attempts {
-        let query = random_vector(&mut rnd, dim);
-
-        let range_size = 40;
-        let left_range = rnd.gen_range(0..400);
-        let right_range = left_range + range_size;
-
-        let filter = Filter::new_must(Condition::Field(FieldCondition::new_range(
-            int_key.to_owned(),
-            Range {
-                lt: None,
-                gt: None,
-                gte: Some(left_range as f64),
-                lte: Some(right_range as f64),
-            },
-        )));
-
-        let filter_query = Some(&filter);
-        // let filter_query = None;
-
-        let index_result = hnsw_index.search_with_graph(
-            &query,
-            filter_query,
-            top,
-            Some(&SearchParams {
-                hnsw_ef: Some(ef),
-                ..Default::default()
-            }),
-            &false.into(),
-        );
-
-        let plain_result = segment.vector_data[DEFAULT_VECTOR_NAME]
-            .vector_index
-            .borrow()
-            .search(&[&query], filter_query, top, None, &false.into());
-
-        if plain_result.get(0).unwrap() == &index_result {
-            hits += 1;
-        }
-    }
-    assert!(attempts - hits < 5, "hits: {hits} of {attempts}"); // Not more than 5% failures
-    eprintln!("hits = {hits:#?} out of {attempts}");
-}
diff --git a/crates/qdrant/lib/segment/tests/integration/fixtures/mod.rs b/crates/qdrant/lib/segment/tests/integration/fixtures/mod.rs
deleted file mode 100644
index c5780e0..0000000
--- a/crates/qdrant/lib/segment/tests/integration/fixtures/mod.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub mod segment;
diff --git a/crates/qdrant/lib/segment/tests/integration/fixtures/segment.rs b/crates/qdrant/lib/segment/tests/integration/fixtures/segment.rs
deleted file mode 100644
index 479a217..0000000
--- a/crates/qdrant/lib/segment/tests/integration/fixtures/segment.rs
+++ /dev/null
@@ -1,215 +0,0 @@
-use std::collections::HashMap;
-use std::path::Path;
-
-use segment::data_types::named_vectors::NamedVectors;
-use segment::data_types::vectors::{only_default_vector, VectorElementType};
-use segment::entry::entry_point::SegmentEntry;
-use segment::segment::Segment;
-use segment::segment_constructor::build_segment;
-use segment::segment_constructor::simple_segment_constructor::build_simple_segment;
-use segment::types::{Distance, Indexes, SegmentConfig, VectorDataConfig, VectorStorageType};
-use serde_json::json;
-
-pub fn empty_segment(path: &Path) -> Segment {
-    build_simple_segment(path, 4, Distance::Dot).unwrap()
-}
-
-#[allow(dead_code)]
-pub fn build_segment_1(path: &Path) -> Segment {
-    let mut segment1 = empty_segment(path);
-
-    let vec1 = vec![1.0, 0.0, 1.0, 1.0];
-    let vec2 = vec![1.0, 0.0, 1.0, 0.0];
-    let vec3 = vec![1.0, 1.0, 1.0, 1.0];
-    let vec4 = vec![1.0, 1.0, 0.0, 1.0];
-    let vec5 = vec![1.0, 0.0, 0.0, 0.0];
-
-    segment1
-        .upsert_point(1, 1.into(), only_default_vector(&vec1))
-        .unwrap();
-    segment1
-        .upsert_point(2, 2.into(), only_default_vector(&vec2))
-        .unwrap();
-    segment1
-        .upsert_point(3, 3.into(), only_default_vector(&vec3))
-        .unwrap();
-    segment1
-        .upsert_point(4, 4.into(), only_default_vector(&vec4))
-        .unwrap();
-    segment1
-        .upsert_point(5, 5.into(), only_default_vector(&vec5))
-        .unwrap();
-
-    let payload_key = "color";
-
-    let payload_option1 = json!({ payload_key: vec!["red".to_owned()] }).into();
-    let payload_option2 = json!({ payload_key: vec!["red".to_owned(), "blue".to_owned()] }).into();
-    let payload_option3 = json!({ payload_key: vec!["blue".to_owned()] }).into();
-
-    segment1.set_payload(6, 1.into(), &payload_option1).unwrap();
-    segment1.set_payload(6, 2.into(), &payload_option1).unwrap();
-    segment1.set_payload(6, 3.into(), &payload_option3).unwrap();
-    segment1.set_payload(6, 4.into(), &payload_option2).unwrap();
-    segment1.set_payload(6, 5.into(), &payload_option2).unwrap();
-
-    segment1
-}
-
-#[allow(dead_code)]
-pub fn build_segment_2(path: &Path) -> Segment {
-    let mut segment2 = empty_segment(path);
-
-    let vec1 = vec![-1.0, 0.0, 1.0, 1.0];
-    let vec2 = vec![-1.0, 0.0, 1.0, 0.0];
-    let vec3 = vec![-1.0, 1.0, 1.0, 1.0];
-    let vec4 = vec![-1.0, 1.0, 0.0, 1.0];
-    let vec5 = vec![-1.0, 0.0, 0.0, 0.0];
-
-    segment2
-        .upsert_point(11, 11.into(), only_default_vector(&vec1))
-        .unwrap();
-    segment2
-        .upsert_point(12, 12.into(), only_default_vector(&vec2))
-        .unwrap();
-    segment2
-        .upsert_point(13, 13.into(), only_default_vector(&vec3))
-        .unwrap();
-    segment2
-        .upsert_point(14, 14.into(), only_default_vector(&vec4))
-        .unwrap();
-    segment2
-        .upsert_point(15, 15.into(), only_default_vector(&vec5))
-        .unwrap();
-
-    let payload_key = "color";
-
-    let payload_option1 = json!({ payload_key: vec!["red".to_owned()] }).into();
-    let payload_option2 = json!({ payload_key: vec!["red".to_owned(), "blue".to_owned()] }).into();
-    let payload_option3 = json!({ payload_key: vec!["blue".to_owned()] }).into();
-
-    segment2
-        .set_payload(16, 11.into(), &payload_option1)
-        .unwrap();
-    segment2
-        .set_payload(16, 12.into(), &payload_option1)
-        .unwrap();
-    segment2
-        .set_payload(16, 13.into(), &payload_option3)
-        .unwrap();
-    segment2
-        .set_payload(16, 14.into(), &payload_option2)
-        .unwrap();
-    segment2
-        .set_payload(16, 15.into(), &payload_option2)
-        .unwrap();
-
-    segment2
-}
-
-#[allow(dead_code)]
-pub fn build_segment_3(path: &Path) -> Segment {
-    let mut segment3 = build_segment(
-        path,
-        &SegmentConfig {
-            vector_data: HashMap::from([
-                (
-                    "vector1".to_owned(),
-                    VectorDataConfig {
-                        size: 4,
-                        distance: Distance::Dot,
-                        storage_type: VectorStorageType::Memory,
-                        index: Indexes::Plain {},
-                        quantization_config: None,
-                    },
-                ),
-                (
-                    "vector2".to_owned(),
-                    VectorDataConfig {
-                        size: 1,
-                        distance: Distance::Dot,
-                        storage_type: VectorStorageType::Memory,
-                        index: Indexes::Plain {},
-                        quantization_config: None,
-                    },
-                ),
-                (
-                    "vector3".to_owned(),
-                    VectorDataConfig {
-                        size: 4,
-                        distance: Distance::Euclid,
-                        storage_type: VectorStorageType::Memory,
-                        index: Indexes::Plain {},
-                        quantization_config: None,
-                    },
-                ),
-            ]),
-            payload_storage_type: Default::default(),
-        },
-        true,
-    )
-    .unwrap();
-
-    let collect_points_data = |vectors: &[Vec<VectorElementType>]| {
-        NamedVectors::from([
-            ("vector1".to_owned(), vectors[0].clone()),
-            ("vector2".to_owned(), vectors[1].clone()),
-            ("vector3".to_owned(), vectors[2].clone()),
-        ])
-    };
-
-    let vec1 = [
-        vec![1.0, 0.0, 1.0, 1.0],
-        vec![0.0],
-        vec![-1.0, 0.0, 1.0, 1.0],
-    ];
-    let vec2 = [
-        vec![1.0, 0.0, 1.0, 0.0],
-        vec![1.0],
-        vec![-1.0, 0.0, 1.0, 1.0],
-    ];
-    let vec3 = [
-        vec![1.0, 1.0, 1.0, 1.0],
-        vec![2.0],
-        vec![-1.0, 0.0, 1.0, 1.0],
-    ];
-    let vec4 = [
-        vec![1.0, 1.0, 0.0, 1.0],
-        vec![3.0],
-        vec![-1.0, 0.0, 1.0, 1.0],
-    ];
-    let vec5 = [
-        vec![1.0, 0.0, 0.0, 0.0],
-        vec![4.0],
-        vec![-1.0, 0.0, 1.0, 1.0],
-    ];
-
-    segment3
-        .upsert_point(1, 1.into(), collect_points_data(&vec1))
-        .unwrap();
-    segment3
-        .upsert_point(2, 2.into(), collect_points_data(&vec2))
-        .unwrap();
-    segment3
-        .upsert_point(3, 3.into(), collect_points_data(&vec3))
-        .unwrap();
-    segment3
-        .upsert_point(4, 4.into(), collect_points_data(&vec4))
-        .unwrap();
-    segment3
-        .upsert_point(5, 5.into(), collect_points_data(&vec5))
-        .unwrap();
-
-    let payload_key = "color";
-
-    let payload_option1 = json!({ payload_key: vec!["red".to_owned()] }).into();
-    let payload_option2 = json!({ payload_key: vec!["red".to_owned(), "blue".to_owned()] }).into();
-    let payload_option3 = json!({ payload_key: vec!["blue".to_owned()] }).into();
-
-    segment3.set_payload(6, 1.into(), &payload_option1).unwrap();
-    segment3.set_payload(6, 2.into(), &payload_option1).unwrap();
-    segment3.set_payload(6, 3.into(), &payload_option3).unwrap();
-    segment3.set_payload(6, 4.into(), &payload_option2).unwrap();
-    segment3.set_payload(6, 5.into(), &payload_option2).unwrap();
-
-    segment3
-}
diff --git a/crates/qdrant/lib/segment/tests/integration/hnsw_quantized_search_test.rs b/crates/qdrant/lib/segment/tests/integration/hnsw_quantized_search_test.rs
deleted file mode 100644
index 95a1c76..0000000
--- a/crates/qdrant/lib/segment/tests/integration/hnsw_quantized_search_test.rs
+++ /dev/null
@@ -1,178 +0,0 @@
-use std::collections::{BTreeSet, HashMap};
-use std::sync::atomic::AtomicBool;
-
-use rand::thread_rng;
-use segment::data_types::vectors::{only_default_vector, DEFAULT_VECTOR_NAME};
-use segment::entry::entry_point::SegmentEntry;
-use segment::fixtures::payload_fixtures::random_vector;
-use segment::index::hnsw_index::graph_links::GraphLinksRam;
-use segment::index::hnsw_index::hnsw::HNSWIndex;
-use segment::index::VectorIndex;
-use segment::segment_constructor::build_segment;
-use segment::types::{
-    CompressionRatio, Distance, HnswConfig, Indexes, ProductQuantizationConfig, QuantizationConfig,
-    ScalarQuantizationConfig, SearchParams, SegmentConfig, SeqNumberType, VectorDataConfig,
-    VectorStorageType,
-};
-use segment::vector_storage::{ScoredPointOffset, VectorStorage};
-use tempfile::Builder;
-
-fn sames_count(a: &[Vec<ScoredPointOffset>], b: &[Vec<ScoredPointOffset>]) -> usize {
-    a[0].iter()
-        .map(|x| x.idx)
-        .collect::<BTreeSet<_>>()
-        .intersection(&b[0].iter().map(|x| x.idx).collect())
-        .count()
-}
-
-fn hnsw_quantized_search_test(
-    distance: Distance,
-    num_vectors: u64,
-    quantization_config: QuantizationConfig,
-) {
-    let stopped = AtomicBool::new(false);
-    let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-    let quantized_data_path = dir.path();
-
-    let dim = 131;
-    let m = 16;
-    let ef = 64;
-    let ef_construct = 64;
-
-    let mut rnd = thread_rng();
-
-    let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-    let hnsw_dir = Builder::new().prefix("hnsw_dir").tempdir().unwrap();
-
-    let config = SegmentConfig {
-        vector_data: HashMap::from([(
-            DEFAULT_VECTOR_NAME.to_owned(),
-            VectorDataConfig {
-                size: dim,
-                distance,
-                storage_type: VectorStorageType::Memory,
-                index: Indexes::Plain {},
-                quantization_config: None,
-            },
-        )]),
-        payload_storage_type: Default::default(),
-    };
-
-    let mut segment = build_segment(dir.path(), &config, true).unwrap();
-    for n in 0..num_vectors {
-        let idx = n.into();
-        let vector = random_vector(&mut rnd, dim);
-        segment
-            .upsert_point(n as SeqNumberType, idx, only_default_vector(&vector))
-            .unwrap();
-    }
-    segment.vector_data.values_mut().for_each(|vector_storage| {
-        vector_storage
-            .vector_storage
-            .borrow_mut()
-            .quantize(quantized_data_path, &quantization_config, 3, &stopped)
-            .unwrap();
-    });
-
-    let hnsw_config = HnswConfig {
-        m,
-        ef_construct,
-        full_scan_threshold: usize::MAX,
-        max_indexing_threads: 2,
-        on_disk: Some(false),
-        payload_m: None,
-    };
-
-    let mut hnsw_index = HNSWIndex::<GraphLinksRam>::open(
-        hnsw_dir.path(),
-        segment.id_tracker.clone(),
-        segment.vector_data[DEFAULT_VECTOR_NAME]
-            .vector_storage
-            .clone(),
-        segment.payload_index.clone(),
-        hnsw_config,
-    )
-    .unwrap();
-
-    hnsw_index.build_index(&stopped).unwrap();
-
-    let top = 10;
-    let attempts = 10;
-    let mut sames: usize = 0;
-    for _i in 0..attempts {
-        let query = random_vector(&mut rnd, dim);
-
-        let index_result = hnsw_index.search(
-            &[&query],
-            None,
-            top,
-            Some(&SearchParams {
-                hnsw_ef: Some(ef),
-                ..Default::default()
-            }),
-            &false.into(),
-        );
-        let plain_result = segment.vector_data[DEFAULT_VECTOR_NAME]
-            .vector_index
-            .borrow()
-            .search(&[&query], None, top, None, &false.into());
-        sames += sames_count(&index_result, &plain_result);
-    }
-    let acc = 100.0 * sames as f64 / (attempts * top) as f64;
-    println!("sames = {sames}, attempts = {attempts}, top = {top}, acc = {acc}");
-    assert!(acc > 40.0);
-}
-
-#[test]
-fn hnsw_quantized_search_cosine_test() {
-    hnsw_quantized_search_test(
-        Distance::Cosine,
-        5003,
-        ScalarQuantizationConfig {
-            r#type: Default::default(),
-            quantile: None,
-            always_ram: None,
-        }
-        .into(),
-    );
-}
-
-#[test]
-fn hnsw_quantized_search_euclid_test() {
-    hnsw_quantized_search_test(
-        Distance::Euclid,
-        5003,
-        ScalarQuantizationConfig {
-            r#type: Default::default(),
-            quantile: None,
-            always_ram: None,
-        }
-        .into(),
-    );
-}
-
-#[test]
-fn hnsw_product_quantization_cosine_test() {
-    hnsw_quantized_search_test(
-        Distance::Cosine,
-        1003,
-        ProductQuantizationConfig {
-            compression: CompressionRatio::X4,
-            always_ram: Some(true),
-        }
-        .into(),
-    );
-}
-
-#[test]
-fn hnsw_product_quantization_euclid_test() {
-    hnsw_quantized_search_test(
-        Distance::Euclid,
-        1003,
-        ProductQuantizationConfig {
-            compression: CompressionRatio::X4,
-            always_ram: Some(true),
-        }
-        .into(),
-    );
-}
diff --git a/crates/qdrant/lib/segment/tests/integration/main.rs b/crates/qdrant/lib/segment/tests/integration/main.rs
deleted file mode 100644
index fbaa271..0000000
--- a/crates/qdrant/lib/segment/tests/integration/main.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-#[cfg(test)]
-pub mod batch_search_test;
-#[cfg(test)]
-pub mod disbalanced_vectors_test;
-#[cfg(test)]
-pub mod exact_search_test;
-#[cfg(test)]
-pub mod fail_recovery_test;
-#[cfg(test)]
-pub mod filtering_context_check;
-#[cfg(test)]
-pub mod filtrable_hnsw_test;
-#[cfg(test)]
-pub mod fixtures;
-#[cfg(test)]
-pub mod hnsw_quantized_search_test;
-#[cfg(test)]
-pub mod nested_filtering_test;
-#[cfg(test)]
-pub mod payload_index_test;
-#[cfg(test)]
-pub mod scroll_filtering_test;
-#[cfg(test)]
-pub mod segment_builder_test;
-#[cfg(test)]
-pub mod segment_tests;
-#[cfg(test)]
-pub mod utils;
diff --git a/crates/qdrant/lib/segment/tests/integration/nested_filtering_test.rs b/crates/qdrant/lib/segment/tests/integration/nested_filtering_test.rs
deleted file mode 100644
index 7c1515c..0000000
--- a/crates/qdrant/lib/segment/tests/integration/nested_filtering_test.rs
+++ /dev/null
@@ -1,250 +0,0 @@
-use std::collections::HashMap;
-use std::sync::Arc;
-
-use atomic_refcell::AtomicRefCell;
-use segment::fixtures::payload_context_fixture::FixtureIdTracker;
-use segment::index::struct_payload_index::StructPayloadIndex;
-use segment::index::PayloadIndex;
-use segment::payload_storage::in_memory_payload_storage::InMemoryPayloadStorage;
-use segment::payload_storage::PayloadStorage;
-use segment::types::{
-    Condition, FieldCondition, Filter, Match, Payload, PayloadSchemaType, PointOffsetType, Range,
-};
-use serde_json::json;
-use tempfile::Builder;
-
-const NUM_POINTS: usize = 200;
-
-fn nested_payloads() -> Vec<Payload> {
-    let mut res = Vec::new();
-    for i in 0..NUM_POINTS {
-        let payload: Payload = json!(
-                {
-                    "arr1": [
-                        {"a": 1, "b": i % 10 + 1, "c": i % 2 + 1, "d": i % 3, "text": format!("a1 b{} c{} d{}", i, i % 10 + 1,  i % 3) },
-                        {"a": 2, "b": i % 10 + 2, "c": i % 2 + 1, "d": i % 3, "text": format!("a2 b{} c{} d{}", i, i % 10 + 2,  i % 3) },
-                        {"a": 3, "b": i % 10 + 3, "c": i % 2 + 2, "d": i % 3, "text": format!("a3 b{} c{} d{}", i, i % 10 + 3,  i % 3) },
-                        {"a": 4, "b": i % 10 + 4, "c": i % 2 + 2, "d": i % 3, "text": format!("a4 b{} c{} d{}", i, i % 10 + 4,  i % 3) },
-                        {"a": [5, 6], "b": i % 10 + 5, "c": i % 2 + 2, "d": i % 3, "text": format!("a5 b{} c{} d{}", i, i % 10 + 5,  i % 3) },
-                    ],
-                    "f": i % 10,
-                    "arr2": [
-                        {
-                            "arr3": [
-                                { "a": 1, "b": i % 7 + 1 },
-                                { "a": 2, "b": i % 7 + 2 },
-                            ]
-                        },
-                        {
-                            "arr3": [
-                                { "a": 3, "b": i % 7 + 3 },
-                                { "a": 4, "b": i % 7 + 4 },
-                            ]
-                        }
-                    ],
-                }
-            )
-            .into();
-        res.push(payload);
-    }
-    res
-}
-
-#[test]
-fn test_filtering_context_consistency() {
-    // let seed = 42;
-    // let mut rng = StdRng::seed_from_u64(seed);
-
-    let dir = Builder::new().prefix("storage_dir").tempdir().unwrap();
-
-    let mut payload_storage = InMemoryPayloadStorage::default();
-
-    let mut points = HashMap::new();
-
-    for (idx, payload) in nested_payloads().into_iter().enumerate() {
-        points.insert(idx, payload.clone());
-        payload_storage
-            .assign(idx as PointOffsetType, &payload)
-            .unwrap();
-    }
-
-    let wrapped_payload_storage = Arc::new(AtomicRefCell::new(payload_storage.into()));
-    let id_tracker = Arc::new(AtomicRefCell::new(FixtureIdTracker::new(NUM_POINTS)));
-
-    let mut index =
-        StructPayloadIndex::open(wrapped_payload_storage, id_tracker, dir.path()).unwrap();
-
-    index
-        .set_indexed("f", PayloadSchemaType::Integer.into())
-        .unwrap();
-    index
-        .set_indexed("arr1[].a", PayloadSchemaType::Integer.into())
-        .unwrap();
-    index
-        .set_indexed("arr1[].b", PayloadSchemaType::Integer.into())
-        .unwrap();
-    index
-        .set_indexed("arr1[].c", PayloadSchemaType::Integer.into())
-        .unwrap();
-    index
-        .set_indexed("arr1[].d", PayloadSchemaType::Integer.into())
-        .unwrap();
-    index
-        .set_indexed("arr1[].text", PayloadSchemaType::Text.into())
-        .unwrap();
-
-    {
-        let nested_condition_0 = Condition::new_nested(
-            "arr1",
-            Filter {
-                must: Some(vec![
-                    // E.g. idx = 6 => { "a" = 1, "b" = 7, "c" = 1, "d" = 0 }
-                    Condition::Field(FieldCondition::new_match("a", 1.into())),
-                    Condition::Field(FieldCondition::new_match("c", 1.into())),
-                ]),
-                should: None,
-                must_not: Some(vec![Condition::Field(FieldCondition::new_range(
-                    "d",
-                    Range {
-                        lte: Some(1.into()),
-                        ..Default::default()
-                    },
-                ))]),
-            },
-        );
-
-        let nested_filter_0 = Filter::new_must(nested_condition_0);
-        let res0 = index.query_points(&nested_filter_0);
-
-        let filter_context = index.filter_context(&nested_filter_0);
-
-        let check_res0: Vec<_> = (0..NUM_POINTS as PointOffsetType)
-            .filter(|point_id| filter_context.check(*point_id as PointOffsetType))
-            .collect();
-
-        assert_eq!(res0, check_res0);
-        assert!(!res0.is_empty());
-
-        // i % 2 + 1 == 1
-        // i % 3 == 2
-
-        // result = 2, 8, 14, ...
-        assert!(res0.contains(&2));
-        assert!(res0.contains(&8));
-        assert!(res0.contains(&14));
-    }
-
-    {
-        let nested_condition_1 = Condition::new_nested(
-            "arr1",
-            Filter {
-                must: Some(vec![
-                    // E.g. idx = 6 => { "a" = 1, "b" = 7, "c" = 1, "d" = 0 }
-                    Condition::Field(FieldCondition::new_match("a", 1.into())),
-                    Condition::Field(FieldCondition::new_match("c", 1.into())),
-                    Condition::Field(FieldCondition::new_match("d", 0.into())),
-                ]),
-                should: None,
-                must_not: None,
-            },
-        );
-
-        let nested_filter_1 = Filter::new_must(nested_condition_1);
-
-        let res1 = index.query_points(&nested_filter_1);
-
-        let filter_context = index.filter_context(&nested_filter_1);
-
-        let check_res1: Vec<_> = (0..NUM_POINTS as PointOffsetType)
-            .filter(|point_id| filter_context.check(*point_id as PointOffsetType))
-            .collect();
-
-        assert_eq!(res1, check_res1);
-
-        assert!(!res1.is_empty());
-        assert!(res1.contains(&6));
-    }
-
-    {
-        let nested_condition_2 = Condition::new_nested(
-            "arr1",
-            Filter {
-                must: Some(vec![
-                    // E.g. idx = 6 => { "a" = 1, "b" = 7, "c" = 1, "d" = 0 }
-                    Condition::Field(FieldCondition::new_match("a", 1.into())),
-                    Condition::Field(FieldCondition::new_match(
-                        "text",
-                        Match::Text("c1".to_string().into()),
-                    )),
-                    Condition::Field(FieldCondition::new_match("d", 0.into())),
-                ]),
-                should: None,
-                must_not: None,
-            },
-        );
-
-        let nested_filter_2 = Filter::new_must(nested_condition_2);
-
-        let res2 = index.query_points(&nested_filter_2);
-
-        let filter_context = index.filter_context(&nested_filter_2);
-
-        let check_res2: Vec<_> = (0..NUM_POINTS as PointOffsetType)
-            .filter(|point_id| filter_context.check(*point_id as PointOffsetType))
-            .collect();
-
-        assert_eq!(res2, check_res2);
-
-        assert!(!res2.is_empty());
-    }
-
-    {
-        let nested_condition_3 = Condition::new_nested(
-            "arr1",
-            Filter {
-                must: Some(vec![Condition::Field(FieldCondition::new_match(
-                    "b",
-                    1.into(),
-                ))]),
-                should: None,
-                must_not: None,
-            },
-        );
-
-        let nester_condition_3_1 = Condition::new_nested(
-            "arr2",
-            Filter {
-                must: Some(vec![Condition::new_nested(
-                    "arr3",
-                    Filter {
-                        must: Some(vec![Condition::Field(FieldCondition::new_match(
-                            "b",
-                            10.into(),
-                        ))]),
-                        should: None,
-                        must_not: None,
-                    },
-                )]),
-                should: None,
-                must_not: None,
-            },
-        );
-
-        let nested_filter_3 = Filter {
-            must: Some(vec![nested_condition_3, nester_condition_3_1]),
-            should: None,
-            must_not: None,
-        };
-
-        let res3 = index.query_points(&nested_filter_3);
-
-        let filter_context = index.filter_context(&nested_filter_3);
-
-        let check_res3: Vec<_> = (0..NUM_POINTS as PointOffsetType)
-            .filter(|point_id| filter_context.check(*point_id as PointOffsetType))
-            .collect();
-
-        assert_eq!(res3, check_res3);
-        assert!(!res3.is_empty());
-    }
-}
diff --git a/crates/qdrant/lib/segment/tests/integration/payload_index_test.rs b/crates/qdrant/lib/segment/tests/integration/payload_index_test.rs
deleted file mode 100644
index 9a0393f..0000000
--- a/crates/qdrant/lib/segment/tests/integration/payload_index_test.rs
+++ /dev/null
@@ -1,797 +0,0 @@
-use std::collections::HashMap;
-use std::path::Path;
-use std::sync::Arc;
-
-use atomic_refcell::AtomicRefCell;
-use itertools::Itertools;
-use rand::prelude::StdRng;
-use rand::{Rng, SeedableRng};
-use segment::data_types::vectors::{only_default_vector, DEFAULT_VECTOR_NAME};
-use segment::entry::entry_point::SegmentEntry;
-use segment::fixtures::payload_context_fixture::FixtureIdTracker;
-use segment::fixtures::payload_fixtures::{
-    generate_diverse_nested_payload, generate_diverse_payload, random_filter, random_nested_filter,
-    random_vector, FLICKING_KEY, GEO_KEY, INT_KEY, INT_KEY_2, LAT_RANGE, LON_RANGE, STR_KEY,
-    STR_PROJ_KEY, STR_ROOT_PROJ_KEY, TEXT_KEY,
-};
-use segment::index::field_index::PrimaryCondition;
-use segment::index::struct_payload_index::StructPayloadIndex;
-use segment::index::PayloadIndex;
-use segment::payload_storage::in_memory_payload_storage::InMemoryPayloadStorage;
-use segment::payload_storage::PayloadStorage;
-use segment::segment::Segment;
-use segment::segment_constructor::build_segment;
-use segment::types::PayloadFieldSchema::FieldType;
-use segment::types::PayloadSchemaType::{Integer, Keyword};
-use segment::types::{
-    Condition, Distance, FieldCondition, Filter, GeoBoundingBox, GeoPoint, GeoPolygon, GeoRadius,
-    Indexes, IsEmptyCondition, Payload, PayloadField, PayloadSchemaType, PointOffsetType, Range,
-    SegmentConfig, VectorDataConfig, VectorStorageType, WithPayload,
-};
-use serde_json::json;
-use tempfile::Builder;
-
-use crate::utils::scored_point_ties::ScoredPointTies;
-
-const DIM: usize = 5;
-const ATTEMPTS: usize = 100;
-
-fn build_test_segments(path_struct: &Path, path_plain: &Path) -> (Segment, Segment) {
-    let mut rnd = StdRng::seed_from_u64(42);
-
-    let config = SegmentConfig {
-        vector_data: HashMap::from([(
-            DEFAULT_VECTOR_NAME.to_owned(),
-            VectorDataConfig {
-                size: DIM,
-                distance: Distance::Dot,
-                storage_type: VectorStorageType::Memory,
-                index: Indexes::Plain {},
-                quantization_config: None,
-            },
-        )]),
-        payload_storage_type: Default::default(),
-    };
-
-    let mut plain_segment = build_segment(path_plain, &config, true).unwrap();
-    let mut struct_segment = build_segment(path_struct, &config, true).unwrap();
-
-    let num_points = 3000;
-    let points_to_delete = 500;
-    let points_to_clear = 500;
-
-    let mut opnum = 0;
-    struct_segment
-        .create_field_index(opnum, INT_KEY_2, Some(&PayloadSchemaType::Integer.into()))
-        .unwrap();
-
-    opnum += 1;
-    for n in 0..num_points {
-        let idx = n.into();
-        let vector = random_vector(&mut rnd, DIM);
-        let payload: Payload = generate_diverse_payload(&mut rnd);
-
-        plain_segment
-            .upsert_point(opnum, idx, only_default_vector(&vector))
-            .unwrap();
-        struct_segment
-            .upsert_point(opnum, idx, only_default_vector(&vector))
-            .unwrap();
-        plain_segment
-            .set_full_payload(opnum, idx, &payload)
-            .unwrap();
-        struct_segment
-            .set_full_payload(opnum, idx, &payload)
-            .unwrap();
-
-        opnum += 1;
-    }
-
-    struct_segment
-        .create_field_index(opnum, STR_KEY, Some(&PayloadSchemaType::Keyword.into()))
-        .unwrap();
-    struct_segment
-        .create_field_index(opnum, INT_KEY, None)
-        .unwrap();
-    struct_segment
-        .create_field_index(opnum, GEO_KEY, Some(&PayloadSchemaType::Geo.into()))
-        .unwrap();
-    struct_segment
-        .create_field_index(opnum, TEXT_KEY, Some(&PayloadSchemaType::Text.into()))
-        .unwrap();
-    struct_segment
-        .create_field_index(
-            opnum,
-            FLICKING_KEY,
-            Some(&PayloadSchemaType::Integer.into()),
-        )
-        .unwrap();
-
-    for _ in 0..points_to_clear {
-        opnum += 1;
-        let idx_to_remove = rnd.gen_range(0..num_points);
-        plain_segment
-            .clear_payload(opnum, idx_to_remove.into())
-            .unwrap();
-        struct_segment
-            .clear_payload(opnum, idx_to_remove.into())
-            .unwrap();
-    }
-
-    for _ in 0..points_to_delete {
-        opnum += 1;
-        let idx_to_remove = rnd.gen_range(0..num_points);
-        plain_segment
-            .delete_point(opnum, idx_to_remove.into())
-            .unwrap();
-        struct_segment
-            .delete_point(opnum, idx_to_remove.into())
-            .unwrap();
-    }
-
-    for (field, indexes) in struct_segment.payload_index.borrow().field_indexes.iter() {
-        for index in indexes {
-            assert!(index.count_indexed_points() < num_points as usize);
-            if field != FLICKING_KEY {
-                assert!(
-                    index.count_indexed_points()
-                        > (num_points as usize - points_to_delete - points_to_clear)
-                );
-            }
-        }
-    }
-
-    (struct_segment, plain_segment)
-}
-
-fn build_test_segments_nested_payload(path_struct: &Path, path_plain: &Path) -> (Segment, Segment) {
-    let mut rnd = StdRng::seed_from_u64(42);
-
-    let config = SegmentConfig {
-        vector_data: HashMap::from([(
-            DEFAULT_VECTOR_NAME.to_owned(),
-            VectorDataConfig {
-                size: DIM,
-                distance: Distance::Dot,
-                storage_type: VectorStorageType::Memory,
-                index: Indexes::Plain {},
-                quantization_config: None,
-            },
-        )]),
-        payload_storage_type: Default::default(),
-    };
-
-    let mut plain_segment = build_segment(path_plain, &config, true).unwrap();
-    let mut struct_segment = build_segment(path_struct, &config, true).unwrap();
-
-    let num_points = 3000;
-    let points_to_delete = 500;
-    let points_to_clear = 500;
-
-    // Nested payload keys
-    let nested_str_key = format!("{}.{}.{}", STR_KEY, "nested_1", "nested_2");
-    let nested_str_proj_key = format!("{}.{}[].{}", STR_PROJ_KEY, "nested_1", "nested_2");
-    let deep_nested_str_proj_key =
-        format!("{}[].{}[].{}", STR_ROOT_PROJ_KEY, "nested_1", "nested_2");
-
-    let mut opnum = 0;
-    struct_segment
-        .create_field_index(
-            opnum,
-            &nested_str_key,
-            Some(&PayloadSchemaType::Keyword.into()),
-        )
-        .unwrap();
-
-    struct_segment
-        .create_field_index(
-            opnum,
-            &nested_str_proj_key,
-            Some(&PayloadSchemaType::Keyword.into()),
-        )
-        .unwrap();
-
-    struct_segment
-        .create_field_index(
-            opnum,
-            &deep_nested_str_proj_key,
-            Some(&PayloadSchemaType::Keyword.into()),
-        )
-        .unwrap();
-
-    eprintln!("{}", deep_nested_str_proj_key);
-
-    opnum += 1;
-    for n in 0..num_points {
-        let idx = n.into();
-        let vector = random_vector(&mut rnd, DIM);
-        let payload: Payload = generate_diverse_nested_payload(&mut rnd);
-
-        plain_segment
-            .upsert_point(opnum, idx, only_default_vector(&vector))
-            .unwrap();
-        struct_segment
-            .upsert_point(opnum, idx, only_default_vector(&vector))
-            .unwrap();
-        plain_segment
-            .set_full_payload(opnum, idx, &payload)
-            .unwrap();
-        struct_segment
-            .set_full_payload(opnum, idx, &payload)
-            .unwrap();
-
-        opnum += 1;
-    }
-
-    for _ in 0..points_to_clear {
-        opnum += 1;
-        let idx_to_remove = rnd.gen_range(0..num_points);
-        plain_segment
-            .clear_payload(opnum, idx_to_remove.into())
-            .unwrap();
-        struct_segment
-            .clear_payload(opnum, idx_to_remove.into())
-            .unwrap();
-    }
-
-    for _ in 0..points_to_delete {
-        opnum += 1;
-        let idx_to_remove = rnd.gen_range(0..num_points);
-        plain_segment
-            .delete_point(opnum, idx_to_remove.into())
-            .unwrap();
-        struct_segment
-            .delete_point(opnum, idx_to_remove.into())
-            .unwrap();
-    }
-
-    for (_field, indexes) in struct_segment.payload_index.borrow().field_indexes.iter() {
-        for index in indexes {
-            assert!(index.count_indexed_points() < num_points as usize);
-            assert!(
-                index.count_indexed_points()
-                    > (num_points as usize - points_to_delete - points_to_clear)
-            );
-        }
-    }
-
-    (struct_segment, plain_segment)
-}
-
-fn validate_geo_filter(query_filter: Filter) {
-    let mut rnd = rand::thread_rng();
-    let query_vector = random_vector(&mut rnd, DIM);
-    let dir1 = Builder::new().prefix("segment1_dir").tempdir().unwrap();
-    let dir2 = Builder::new().prefix("segment2_dir").tempdir().unwrap();
-    let (struct_segment, plain_segment) = build_test_segments(dir1.path(), dir2.path());
-
-    for _i in 0..ATTEMPTS {
-        let plain_result = plain_segment
-            .search(
-                DEFAULT_VECTOR_NAME,
-                &query_vector,
-                &WithPayload::default(),
-                &false.into(),
-                Some(&query_filter),
-                5,
-                None,
-                &false.into(),
-            )
-            .unwrap();
-
-        let estimation = plain_segment
-            .payload_index
-            .borrow()
-            .estimate_cardinality(&query_filter);
-
-        assert!(estimation.min <= estimation.exp, "{estimation:#?}");
-        assert!(estimation.exp <= estimation.max, "{estimation:#?}");
-        assert!(
-            estimation.max <= struct_segment.id_tracker.borrow().available_point_count(),
-            "{estimation:#?}",
-        );
-
-        let struct_result = struct_segment
-            .search(
-                DEFAULT_VECTOR_NAME,
-                &query_vector,
-                &WithPayload::default(),
-                &false.into(),
-                Some(&query_filter),
-                5,
-                None,
-                &false.into(),
-            )
-            .unwrap();
-
-        let estimation = struct_segment
-            .payload_index
-            .borrow()
-            .estimate_cardinality(&query_filter);
-
-        assert!(estimation.min <= estimation.exp, "{estimation:#?}");
-        assert!(estimation.exp <= estimation.max, "{estimation:#?}");
-        assert!(
-            estimation.max <= struct_segment.id_tracker.borrow().available_point_count(),
-            "{estimation:#?}",
-        );
-
-        plain_result
-            .iter()
-            .zip(struct_result.iter())
-            .for_each(|(r1, r2)| {
-                assert_eq!(r1.id, r2.id);
-                assert!((r1.score - r2.score) < 0.0001)
-            });
-    }
-}
-
-#[test]
-fn test_is_empty_conditions() {
-    let dir1 = Builder::new().prefix("segment1_dir").tempdir().unwrap();
-    let dir2 = Builder::new().prefix("segment2_dir").tempdir().unwrap();
-
-    let (struct_segment, plain_segment) = build_test_segments(dir1.path(), dir2.path());
-
-    let filter = Filter::new_must(Condition::IsEmpty(IsEmptyCondition {
-        is_empty: PayloadField {
-            key: FLICKING_KEY.to_string(),
-        },
-    }));
-
-    let estimation_struct = struct_segment
-        .payload_index
-        .borrow()
-        .estimate_cardinality(&filter);
-
-    let estimation_plain = plain_segment
-        .payload_index
-        .borrow()
-        .estimate_cardinality(&filter);
-
-    let plain_result = plain_segment.payload_index.borrow().query_points(&filter);
-
-    let real_number = plain_result.len();
-
-    let struct_result = struct_segment.payload_index.borrow().query_points(&filter);
-
-    assert_eq!(plain_result, struct_result);
-
-    eprintln!("estimation_plain = {estimation_plain:#?}");
-    eprintln!("estimation_struct = {estimation_struct:#?}");
-    eprintln!("real_number = {real_number:#?}");
-
-    assert!(estimation_plain.max >= real_number);
-    assert!(estimation_plain.min <= real_number);
-
-    assert!(estimation_struct.max >= real_number);
-    assert!(estimation_struct.min <= real_number);
-
-    assert!(
-        (estimation_struct.exp as f64 - real_number as f64).abs()
-            <= (estimation_plain.exp as f64 - real_number as f64).abs()
-    );
-}
-
-#[test]
-fn test_cardinality_estimation() {
-    let dir1 = Builder::new().prefix("segment1_dir").tempdir().unwrap();
-    let dir2 = Builder::new().prefix("segment2_dir").tempdir().unwrap();
-
-    let (struct_segment, _) = build_test_segments(dir1.path(), dir2.path());
-
-    let filter = Filter::new_must(Condition::Field(FieldCondition::new_range(
-        INT_KEY.to_owned(),
-        Range {
-            lt: None,
-            gt: None,
-            gte: Some(50.),
-            lte: Some(100.),
-        },
-    )));
-
-    let estimation = struct_segment
-        .payload_index
-        .borrow()
-        .estimate_cardinality(&filter);
-
-    let payload_index = struct_segment.payload_index.borrow();
-    let filter_context = payload_index.filter_context(&filter);
-    let exact = struct_segment
-        .id_tracker
-        .borrow()
-        .iter_ids()
-        .filter(|x| filter_context.check(*x))
-        .collect_vec()
-        .len();
-
-    eprintln!("exact = {exact:#?}");
-    eprintln!("estimation = {estimation:#?}");
-
-    assert!(exact <= estimation.max);
-    assert!(exact >= estimation.min);
-}
-
-#[test]
-fn test_root_nested_array_filter_cardinality_estimation() {
-    let dir1 = Builder::new().prefix("segment1_dir").tempdir().unwrap();
-    let dir2 = Builder::new().prefix("segment2_dir").tempdir().unwrap();
-
-    let (struct_segment, _) = build_test_segments_nested_payload(dir1.path(), dir2.path());
-
-    // rely on test data from `build_test_segments_nested_payload`
-    let nested_key = "nested_1[].nested_2";
-    let nested_match =
-        FieldCondition::new_match(nested_key.to_owned(), "some value".to_owned().into());
-    let filter = Filter::new_must(Condition::new_nested(
-        STR_ROOT_PROJ_KEY.to_string(),
-        Filter::new_must(Condition::Field(nested_match)),
-    ));
-
-    let estimation = struct_segment
-        .payload_index
-        .borrow()
-        .estimate_cardinality(&filter);
-
-    // not empty primary clauses
-    assert_eq!(estimation.primary_clauses.len(), 1);
-    eprintln!("primary_clauses = {:#?}", estimation.primary_clauses);
-    let primary_clause = estimation.primary_clauses.first().unwrap();
-
-    let expected_primary_clause = FieldCondition::new_match(
-        format!("{}[].{}", STR_ROOT_PROJ_KEY, nested_key), // full key expected
-        "some value".to_owned().into(),
-    );
-
-    match primary_clause {
-        PrimaryCondition::Condition(field_condition) => {
-            assert_eq!(field_condition, &expected_primary_clause);
-        }
-        o => panic!("unexpected primary clause: {:?}", o),
-    }
-
-    let payload_index = struct_segment.payload_index.borrow();
-    let filter_context = payload_index.filter_context(&filter);
-    let exact = struct_segment
-        .id_tracker
-        .borrow()
-        .iter_ids()
-        .filter(|x| filter_context.check(*x))
-        .collect_vec()
-        .len();
-
-    eprintln!("exact = {exact:#?}");
-    eprintln!("estimation = {estimation:#?}");
-
-    assert!(exact <= estimation.max);
-    assert!(exact >= estimation.min);
-}
-
-#[test]
-fn test_nesting_nested_array_filter_cardinality_estimation() {
-    let dir1 = Builder::new().prefix("segment1_dir").tempdir().unwrap();
-    let dir2 = Builder::new().prefix("segment2_dir").tempdir().unwrap();
-
-    let (struct_segment, _) = build_test_segments_nested_payload(dir1.path(), dir2.path());
-
-    // rely on test data from `build_test_segments_nested_payload`
-    let nested_match_key = "nested_2";
-    let nested_match =
-        FieldCondition::new_match(nested_match_key.to_owned(), "some value".to_owned().into());
-    let filter = Filter::new_must(Condition::new_nested(
-        STR_ROOT_PROJ_KEY.to_string(),
-        Filter::new_must(Condition::new_nested(
-            "nested_1".to_string(),
-            Filter::new_must(Condition::Field(nested_match)),
-        )),
-    ));
-
-    let estimation = struct_segment
-        .payload_index
-        .borrow()
-        .estimate_cardinality(&filter);
-
-    // not empty primary clauses
-    assert_eq!(estimation.primary_clauses.len(), 1);
-    eprintln!("primary_clauses = {:#?}", estimation.primary_clauses);
-    let primary_clause = estimation.primary_clauses.first().unwrap();
-
-    let expected_primary_clause = FieldCondition::new_match(
-        format!("{}[].nested_1[].{}", STR_ROOT_PROJ_KEY, nested_match_key), // full key expected
-        "some value".to_owned().into(),
-    );
-
-    match primary_clause {
-        PrimaryCondition::Condition(field_condition) => {
-            assert_eq!(field_condition, &expected_primary_clause);
-        }
-        o => panic!("unexpected primary clause: {:?}", o),
-    }
-
-    let payload_index = struct_segment.payload_index.borrow();
-    let filter_context = payload_index.filter_context(&filter);
-    let exact = struct_segment
-        .id_tracker
-        .borrow()
-        .iter_ids()
-        .filter(|x| filter_context.check(*x))
-        .collect_vec()
-        .len();
-
-    eprintln!("exact = {exact:#?}");
-    eprintln!("estimation = {estimation:#?}");
-
-    assert!(exact <= estimation.max);
-    assert!(exact >= estimation.min);
-}
-
-#[test]
-fn test_struct_payload_index() {
-    // Compare search with plain and struct indexes
-    let dir1 = Builder::new().prefix("segment1_dir").tempdir().unwrap();
-    let dir2 = Builder::new().prefix("segment2_dir").tempdir().unwrap();
-
-    let mut rnd = rand::thread_rng();
-
-    let (struct_segment, plain_segment) = build_test_segments(dir1.path(), dir2.path());
-
-    for _i in 0..ATTEMPTS {
-        let query_vector = random_vector(&mut rnd, DIM);
-        let query_filter = random_filter(&mut rnd, 3);
-
-        let plain_result = plain_segment
-            .search(
-                DEFAULT_VECTOR_NAME,
-                &query_vector,
-                &WithPayload::default(),
-                &false.into(),
-                Some(&query_filter),
-                5,
-                None,
-                &false.into(),
-            )
-            .unwrap();
-        let struct_result = struct_segment
-            .search(
-                DEFAULT_VECTOR_NAME,
-                &query_vector,
-                &WithPayload::default(),
-                &false.into(),
-                Some(&query_filter),
-                5,
-                None,
-                &false.into(),
-            )
-            .unwrap();
-
-        let estimation = struct_segment
-            .payload_index
-            .borrow()
-            .estimate_cardinality(&query_filter);
-
-        assert!(estimation.min <= estimation.exp, "{estimation:#?}");
-        assert!(estimation.exp <= estimation.max, "{estimation:#?}");
-        assert!(
-            estimation.max <= struct_segment.id_tracker.borrow().available_point_count(),
-            "{estimation:#?}",
-        );
-
-        // Perform additional sort to break ties by score
-        let mut plain_result_sorted_ties: Vec<ScoredPointTies> =
-            plain_result.iter().map(|x| x.clone().into()).collect_vec();
-        plain_result_sorted_ties.sort();
-
-        let mut struct_result_sorted_ties: Vec<ScoredPointTies> =
-            struct_result.iter().map(|x| x.clone().into()).collect_vec();
-        struct_result_sorted_ties.sort();
-
-        plain_result_sorted_ties
-                .into_iter()
-                .zip(struct_result_sorted_ties.into_iter())
-                .map(|(r1, r2)| (r1.scored_point, r2.scored_point))
-                .for_each(|(r1, r2)| {
-                    assert_eq!(r1.id, r2.id, "got different ScoredPoint {r1:?} and {r2:?} for\nquery vector {query_vector:?}\nquery filter {query_filter:?}\nplain result {plain_result:?}\nstruct result{struct_result:?}");
-                    assert!((r1.score - r2.score) < 0.0001)
-                });
-    }
-}
-
-#[test]
-fn test_struct_payload_geo_boundingbox_index() {
-    let mut rnd = rand::thread_rng();
-
-    let geo_bbox = GeoBoundingBox {
-        top_left: GeoPoint {
-            lon: rnd.gen_range(LON_RANGE),
-            lat: rnd.gen_range(LAT_RANGE),
-        },
-        bottom_right: GeoPoint {
-            lon: rnd.gen_range(LON_RANGE),
-            lat: rnd.gen_range(LAT_RANGE),
-        },
-    };
-
-    let condition = Condition::Field(FieldCondition::new_geo_bounding_box(
-        "geo_key".to_string(),
-        geo_bbox,
-    ));
-
-    let query_filter = Filter::new_must(condition);
-
-    validate_geo_filter(query_filter)
-}
-
-#[test]
-fn test_struct_payload_geo_radius_index() {
-    let mut rnd = rand::thread_rng();
-
-    let r_meters = rnd.gen_range(1.0..10000.0);
-    let geo_radius = GeoRadius {
-        center: GeoPoint {
-            lon: rnd.gen_range(LON_RANGE),
-            lat: rnd.gen_range(LAT_RANGE),
-        },
-        radius: r_meters,
-    };
-
-    let condition = Condition::Field(FieldCondition::new_geo_radius(
-        "geo_key".to_string(),
-        geo_radius,
-    ));
-
-    let query_filter = Filter::new_must(condition);
-
-    validate_geo_filter(query_filter)
-}
-
-#[test]
-fn test_struct_payload_geo_polygon_index() {
-    let mut rnd = rand::thread_rng();
-
-    let polygon_edge = 5;
-
-    let points: Vec<GeoPoint> = (0..polygon_edge)
-        .map(|_| GeoPoint {
-            lon: rnd.gen_range(LON_RANGE),
-            lat: rnd.gen_range(LAT_RANGE),
-        })
-        .collect();
-    let geo_polygon = GeoPolygon { points };
-
-    let condition = Condition::Field(FieldCondition::new_geo_polygon(
-        "geo_key".to_string(),
-        geo_polygon,
-    ));
-
-    let query_filter = Filter::new_must(condition);
-
-    validate_geo_filter(query_filter)
-}
-
-#[test]
-fn test_struct_payload_index_nested_fields() {
-    // Compare search with plain and struct indexes
-    let dir1 = Builder::new().prefix("segment1_dir").tempdir().unwrap();
-    let dir2 = Builder::new().prefix("segment2_dir").tempdir().unwrap();
-
-    let mut rnd = rand::thread_rng();
-
-    let (struct_segment, plain_segment) =
-        build_test_segments_nested_payload(dir1.path(), dir2.path());
-
-    let attempts = 100;
-    for _i in 0..attempts {
-        let query_vector = random_vector(&mut rnd, DIM);
-        let query_filter = random_nested_filter(&mut rnd);
-        let plain_result = plain_segment
-            .search(
-                DEFAULT_VECTOR_NAME,
-                &query_vector,
-                &WithPayload {
-                    enable: true,
-                    payload_selector: None,
-                },
-                &false.into(),
-                Some(&query_filter),
-                5,
-                None,
-                &false.into(),
-            )
-            .unwrap();
-        let struct_result = struct_segment
-            .search(
-                DEFAULT_VECTOR_NAME,
-                &query_vector,
-                &WithPayload {
-                    enable: true,
-                    payload_selector: None,
-                },
-                &false.into(),
-                Some(&query_filter),
-                5,
-                None,
-                &false.into(),
-            )
-            .unwrap();
-
-        let estimation = struct_segment
-            .payload_index
-            .borrow()
-            .estimate_cardinality(&query_filter);
-
-        assert!(estimation.min <= estimation.exp, "{estimation:#?}");
-        assert!(estimation.exp <= estimation.max, "{estimation:#?}");
-        assert!(
-            estimation.max <= struct_segment.id_tracker.borrow().available_point_count(),
-            "{estimation:#?}",
-        );
-
-        // warning: report flakiness at https://github.com/qdrant/qdrant/issues/534
-        plain_result
-                .iter()
-                .zip(struct_result.iter())
-                .for_each(|(r1, r2)| {
-                    assert_eq!(r1.id, r2.id, "got different ScoredPoint {r1:?} and {r2:?} for\nquery vector {query_vector:?}\nquery filter {query_filter:?}\nplain result {plain_result:?}\nstruct result{struct_result:?}");
-                    assert!((r1.score - r2.score) < 0.0001)
-                });
-    }
-}
-
-#[test]
-fn test_update_payload_index_type() {
-    let dir = Builder::new().prefix("storage_dir").tempdir().unwrap();
-    let mut payload_storage = InMemoryPayloadStorage::default();
-
-    let point_num = 10;
-    let mut points = HashMap::new();
-
-    let mut payloads: Vec<Payload> = vec![];
-    for i in 0..point_num {
-        let payload = json!({
-            "field": i,
-        });
-        payloads.push(payload.into());
-    }
-
-    for (idx, payload) in payloads.into_iter().enumerate() {
-        points.insert(idx, payload.clone());
-        payload_storage
-            .assign(idx as PointOffsetType, &payload)
-            .unwrap();
-    }
-
-    let wrapped_payload_storage = Arc::new(AtomicRefCell::new(payload_storage.into()));
-    let id_tracker = Arc::new(AtomicRefCell::new(FixtureIdTracker::new(point_num)));
-
-    let mut index =
-        StructPayloadIndex::open(wrapped_payload_storage, id_tracker, dir.path()).unwrap();
-
-    // set field to Integer type
-    index.set_indexed("field", Integer.into()).unwrap();
-    assert_eq!(
-        *index.indexed_fields().get("field").unwrap(),
-        FieldType(Integer)
-    );
-    let field_index = index.field_indexes.get("field").unwrap();
-    assert_eq!(field_index[0].count_indexed_points(), point_num);
-    assert_eq!(field_index[1].count_indexed_points(), point_num);
-
-    // update field to Keyword type
-    index.set_indexed("field", Keyword.into()).unwrap();
-    assert_eq!(
-        *index.indexed_fields().get("field").unwrap(),
-        FieldType(Keyword)
-    );
-    let field_index = index.field_indexes.get("field").unwrap();
-    assert_eq!(field_index[0].count_indexed_points(), 0); // only one field index for Keyword
-
-    // set field to Integer type (again)
-    index.set_indexed("field", Integer.into()).unwrap();
-    assert_eq!(
-        *index.indexed_fields().get("field").unwrap(),
-        FieldType(Integer)
-    );
-    let field_index = index.field_indexes.get("field").unwrap();
-    assert_eq!(field_index[0].count_indexed_points(), point_num);
-    assert_eq!(field_index[1].count_indexed_points(), point_num);
-}
diff --git a/crates/qdrant/lib/segment/tests/integration/scroll_filtering_test.rs b/crates/qdrant/lib/segment/tests/integration/scroll_filtering_test.rs
deleted file mode 100644
index 60eef0d..0000000
--- a/crates/qdrant/lib/segment/tests/integration/scroll_filtering_test.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-use rand::prelude::StdRng;
-use rand::{Rng, SeedableRng};
-use segment::fixtures::payload_fixtures::random_filter;
-use segment::fixtures::segment_fixtures::random_segment;
-use tempfile::Builder;
-
-const NUM_POINTS: usize = 2000;
-const ATTEMPTS: usize = 100;
-
-#[test]
-fn test_filtering_context_consistency() {
-    let seed = 42;
-    let mut rng = StdRng::seed_from_u64(seed);
-
-    let dir = Builder::new().prefix("storage_dir").tempdir().unwrap();
-
-    let segment = random_segment(dir.path(), NUM_POINTS);
-
-    for _ in 0..ATTEMPTS {
-        let filter = random_filter(&mut rng, 3);
-
-        let random_offset = rng.gen_range(0..10);
-
-        let read_by_index_res =
-            segment.filtered_read_by_index(Some(random_offset.into()), Some(10), &filter);
-        let read_by_stream_res =
-            segment.filtered_read_by_id_stream(Some(random_offset.into()), Some(10), &filter);
-
-        assert_eq!(read_by_index_res, read_by_stream_res, "filter: {filter:#?}");
-    }
-}
diff --git a/crates/qdrant/lib/segment/tests/integration/segment_builder_test.rs b/crates/qdrant/lib/segment/tests/integration/segment_builder_test.rs
deleted file mode 100644
index f321c25..0000000
--- a/crates/qdrant/lib/segment/tests/integration/segment_builder_test.rs
+++ /dev/null
@@ -1,153 +0,0 @@
-use std::collections::HashMap;
-use std::sync::atomic::{AtomicBool, Ordering};
-use std::sync::Arc;
-use std::time::{Duration, Instant};
-
-use itertools::Itertools;
-use segment::data_types::vectors::{only_default_vector, DEFAULT_VECTOR_NAME};
-use segment::entry::entry_point::{OperationError, SegmentEntry};
-use segment::segment::Segment;
-use segment::segment_constructor::segment_builder::SegmentBuilder;
-use segment::types::{Indexes, SegmentConfig, VectorDataConfig, VectorStorageType};
-use tempfile::Builder;
-
-use crate::fixtures::segment::{build_segment_1, build_segment_2, empty_segment};
-
-#[test]
-fn test_building_new_segment() {
-    let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-    let temp_dir = Builder::new().prefix("segment_temp_dir").tempdir().unwrap();
-
-    let stopped = AtomicBool::new(false);
-
-    // let segment1_dir = dir.path().join("segment_1");
-    // let segment2_dir = dir.path().join("segment_2");
-
-    let segment1 = build_segment_1(dir.path());
-    let mut segment2 = build_segment_2(dir.path());
-
-    let mut builder =
-        SegmentBuilder::new(dir.path(), temp_dir.path(), &segment1.segment_config).unwrap();
-
-    // Include overlapping with segment1 to check the
-    segment2
-        .upsert_point(100, 3.into(), only_default_vector(&[0., 0., 0., 0.]))
-        .unwrap();
-
-    builder.update_from(&segment1, &stopped).unwrap();
-    builder.update_from(&segment2, &stopped).unwrap();
-    builder.update_from(&segment2, &stopped).unwrap();
-
-    // Check what happens if segment building fails here
-
-    let segment_count = dir.path().read_dir().unwrap().count();
-
-    assert_eq!(segment_count, 2);
-
-    let temp_segment_count = temp_dir.path().read_dir().unwrap().count();
-
-    assert_eq!(temp_segment_count, 1);
-
-    // Now we finalize building
-
-    let merged_segment: Segment = builder.build(&stopped).unwrap();
-
-    let new_segment_count = dir.path().read_dir().unwrap().count();
-
-    assert_eq!(new_segment_count, 3);
-
-    assert_eq!(
-        merged_segment.iter_points().count(),
-        merged_segment.available_point_count(),
-    );
-    assert_eq!(
-        merged_segment.available_point_count(),
-        segment1
-            .iter_points()
-            .chain(segment2.iter_points())
-            .unique()
-            .count(),
-    );
-
-    assert_eq!(merged_segment.point_version(3.into()), Some(100));
-}
-
-fn estimate_build_time(segment: &Segment, stop_timeout_millis: u64) -> (u64, bool) {
-    let stopped = Arc::new(AtomicBool::new(false));
-
-    let dir = Builder::new().prefix("segment_dir1").tempdir().unwrap();
-    let temp_dir = Builder::new().prefix("segment_temp_dir").tempdir().unwrap();
-
-    let segment_config = SegmentConfig {
-        vector_data: HashMap::from([(
-            DEFAULT_VECTOR_NAME.to_owned(),
-            VectorDataConfig {
-                size: segment.segment_config.vector_data[DEFAULT_VECTOR_NAME].size,
-                distance: segment.segment_config.vector_data[DEFAULT_VECTOR_NAME].distance,
-                storage_type: VectorStorageType::Memory,
-                index: Indexes::Hnsw(Default::default()),
-                quantization_config: None,
-            },
-        )]),
-        payload_storage_type: Default::default(),
-    };
-
-    let mut builder = SegmentBuilder::new(dir.path(), temp_dir.path(), &segment_config).unwrap();
-
-    builder.update_from(segment, &stopped).unwrap();
-
-    let now = Instant::now();
-
-    let stopped_t = stopped.clone();
-
-    std::thread::Builder::new()
-        .name("build_estimator_timeout".to_string())
-        .spawn(move || {
-            std::thread::sleep(Duration::from_millis(stop_timeout_millis));
-            stopped_t.store(true, Ordering::Release);
-        })
-        .unwrap();
-
-    let res = builder.build(&stopped);
-
-    let is_cancelled = match res {
-        Ok(_) => false,
-        Err(OperationError::Cancelled { .. }) => true,
-        Err(err) => {
-            eprintln!(
-                "Was expecting cancellation signal but got unexpected error: {:?}",
-                err
-            );
-            false
-        }
-    };
-
-    (now.elapsed().as_millis() as u64, is_cancelled)
-}
-
-#[test]
-fn test_building_cancellation() {
-    let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-
-    let mut segment = empty_segment(dir.path());
-
-    for idx in 0..1000 {
-        segment
-            .upsert_point(1, idx.into(), only_default_vector(&[0., 0., 0., 0.]))
-            .unwrap();
-    }
-
-    // Checks that optimization with longed cancellation timeout will also finishes fast
-    let (time_fast, is_stopped_fast) = estimate_build_time(&segment, 20);
-    let (time_long, is_stopped_long) = estimate_build_time(&segment, 200);
-
-    assert!(is_stopped_fast);
-
-    assert!(
-        time_fast < time_long,
-        "time_fast: {}, time_long: {}, is_stopped_long: {}",
-        time_fast,
-        time_long,
-        is_stopped_long
-    );
-}
diff --git a/crates/qdrant/lib/segment/tests/integration/segment_tests.rs b/crates/qdrant/lib/segment/tests/integration/segment_tests.rs
deleted file mode 100644
index 035aa0e..0000000
--- a/crates/qdrant/lib/segment/tests/integration/segment_tests.rs
+++ /dev/null
@@ -1,328 +0,0 @@
-use std::collections::HashSet;
-use std::iter::FromIterator;
-
-use itertools::Itertools;
-use segment::data_types::named_vectors::NamedVectors;
-use segment::data_types::vectors::{only_default_vector, VectorStruct, DEFAULT_VECTOR_NAME};
-use segment::entry::entry_point::{OperationError, SegmentEntry};
-use segment::fixtures::index_fixtures::random_vector;
-use segment::segment_constructor::load_segment;
-use segment::segment_constructor::simple_segment_constructor::build_simple_segment;
-use segment::types::{Condition, Distance, Filter, SearchParams, WithPayload};
-use tempfile::Builder;
-
-use crate::fixtures::segment::{build_segment_1, build_segment_3};
-
-#[test]
-fn test_point_exclusion() {
-    let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-
-    let segment = build_segment_1(dir.path());
-
-    assert!(segment.has_point(3.into()));
-
-    let query_vector = vec![1.0, 1.0, 1.0, 1.0];
-
-    let res = segment
-        .search(
-            DEFAULT_VECTOR_NAME,
-            &query_vector,
-            &WithPayload::default(),
-            &false.into(),
-            None,
-            1,
-            None,
-            &false.into(),
-        )
-        .unwrap();
-
-    let best_match = res.get(0).expect("Non-empty result");
-    assert_eq!(best_match.id, 3.into());
-
-    let ids: HashSet<_> = HashSet::from_iter([3.into()]);
-
-    let frt = Filter {
-        should: None,
-        must: None,
-        must_not: Some(vec![Condition::HasId(ids.into())]),
-    };
-
-    let res = segment
-        .search(
-            DEFAULT_VECTOR_NAME,
-            &query_vector,
-            &WithPayload::default(),
-            &false.into(),
-            Some(&frt),
-            1,
-            None,
-            &false.into(),
-        )
-        .unwrap();
-
-    let best_match = res.get(0).expect("Non-empty result");
-    assert_ne!(best_match.id, 3.into());
-
-    let point_ids1: Vec<_> = segment.iter_points().collect();
-    let point_ids2: Vec<_> = segment.iter_points().collect();
-
-    assert!(!point_ids1.is_empty());
-    assert!(!point_ids2.is_empty());
-
-    assert_eq!(&point_ids1, &point_ids2)
-}
-
-#[test]
-fn test_named_vector_search() {
-    let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-
-    let segment = build_segment_3(dir.path());
-
-    assert!(segment.has_point(3.into()));
-
-    let query_vector = vec![1.0, 1.0, 1.0, 1.0];
-
-    let res = segment
-        .search(
-            "vector1",
-            &query_vector,
-            &WithPayload::default(),
-            &false.into(),
-            None,
-            1,
-            None,
-            &false.into(),
-        )
-        .unwrap();
-
-    let best_match = res.get(0).expect("Non-empty result");
-    assert_eq!(best_match.id, 3.into());
-
-    let ids: HashSet<_> = HashSet::from_iter([3.into()]);
-
-    let frt = Filter {
-        should: None,
-        must: None,
-        must_not: Some(vec![Condition::HasId(ids.into())]),
-    };
-
-    let res = segment
-        .search(
-            "vector1",
-            &query_vector,
-            &WithPayload::default(),
-            &false.into(),
-            Some(&frt),
-            1,
-            None,
-            &false.into(),
-        )
-        .unwrap();
-
-    let best_match = res.get(0).expect("Non-empty result");
-    assert_ne!(best_match.id, 3.into());
-
-    let point_ids1: Vec<_> = segment.iter_points().collect();
-    let point_ids2: Vec<_> = segment.iter_points().collect();
-
-    assert!(!point_ids1.is_empty());
-    assert!(!point_ids2.is_empty());
-
-    assert_eq!(&point_ids1, &point_ids2)
-}
-
-#[test]
-fn test_missed_vector_name() {
-    let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-    let mut segment = build_segment_3(dir.path());
-
-    let exists = segment
-        .upsert_point(
-            7,
-            1.into(),
-            NamedVectors::from([
-                ("vector2".to_owned(), vec![10.]),
-                ("vector3".to_owned(), vec![5., 6., 7., 8.]),
-            ]),
-        )
-        .unwrap();
-    assert!(exists, "this partial vector should overwrite existing");
-
-    let exists = segment
-        .upsert_point(
-            8,
-            6.into(),
-            NamedVectors::from([
-                ("vector2".to_owned(), vec![10.]),
-                ("vector3".to_owned(), vec![5., 6., 7., 8.]),
-            ]),
-        )
-        .unwrap();
-    assert!(!exists, "this partial vector should not existing");
-}
-
-#[test]
-fn test_vector_name_not_exists() {
-    let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-    let mut segment = build_segment_3(dir.path());
-
-    let result = segment.upsert_point(
-        6,
-        6.into(),
-        NamedVectors::from([
-            ("vector1".to_owned(), vec![5., 6., 7., 8.]),
-            ("vector2".to_owned(), vec![10.]),
-            ("vector3".to_owned(), vec![5., 6., 7., 8.]),
-            ("vector4".to_owned(), vec![5., 6., 7., 8.]),
-        ]),
-    );
-
-    if let Err(OperationError::VectorNameNotExists { received_name }) = result {
-        assert!(received_name == "vector4");
-    } else {
-        panic!("wrong upsert result")
-    }
-}
-
-#[test]
-fn ordered_deletion_test() {
-    let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-
-    let path = {
-        let mut segment = build_segment_1(dir.path());
-        segment.delete_point(6, 5.into()).unwrap();
-        segment.delete_point(6, 4.into()).unwrap();
-        segment.flush(true).unwrap();
-        segment.current_path.clone()
-    };
-
-    let segment = load_segment(&path).unwrap().unwrap();
-    let query_vector = vec![1.0, 1.0, 1.0, 1.0];
-    let res = segment
-        .search(
-            DEFAULT_VECTOR_NAME,
-            &query_vector,
-            &WithPayload::default(),
-            &false.into(),
-            None,
-            1,
-            None,
-            &false.into(),
-        )
-        .unwrap();
-    let best_match = res.get(0).expect("Non-empty result");
-    assert_eq!(best_match.id, 3.into());
-}
-
-#[test]
-fn skip_deleted_segment() {
-    let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-
-    let path = {
-        let mut segment = build_segment_1(dir.path());
-        segment.delete_point(6, 5.into()).unwrap();
-        segment.delete_point(6, 4.into()).unwrap();
-        segment.flush(true).unwrap();
-        segment.current_path.clone()
-    };
-
-    let new_path = path.with_extension("deleted");
-    std::fs::rename(&path, new_path).unwrap();
-
-    let segment = load_segment(&path).unwrap();
-
-    assert!(segment.is_none());
-}
-
-#[test]
-fn test_update_named_vector() {
-    let num_points = 25;
-    let dim = 4;
-    let mut rng = rand::thread_rng();
-    let distance = Distance::Cosine;
-    let vectors = (0..num_points)
-        .map(|_| random_vector(&mut rng, dim))
-        .collect_vec();
-
-    let dir = Builder::new().prefix("segment_dir").tempdir().unwrap();
-    let mut segment = build_simple_segment(dir.path(), dim, distance).unwrap();
-
-    for (i, vec) in vectors.iter().enumerate() {
-        let i = i as u64;
-        segment
-            .upsert_point(i, i.into(), only_default_vector(vec))
-            .unwrap();
-    }
-
-    let query_vector = random_vector(&mut rng, dim);
-
-    // do exact search
-    let search_params = SearchParams {
-        hnsw_ef: None,
-        exact: true,
-        quantization: None,
-    };
-    let nearest_upsert = segment
-        .search(
-            DEFAULT_VECTOR_NAME,
-            &query_vector,
-            &false.into(),
-            &true.into(),
-            None,
-            1,
-            Some(&search_params),
-            &false.into(),
-        )
-        .unwrap();
-    let nearest_upsert = nearest_upsert.get(0).unwrap();
-
-    let sqrt_distance = |v: &[f32]| -> f32 { v.iter().map(|x| x * x).sum::<f32>().sqrt() };
-
-    // check if nearest_upsert is normalized
-    match &nearest_upsert.vector {
-        Some(VectorStruct::Single(v)) => {
-            assert!((sqrt_distance(v) - 1.).abs() < 1e-5);
-        }
-        Some(VectorStruct::Multi(v)) => {
-            assert!((sqrt_distance(&v[DEFAULT_VECTOR_NAME]) - 1.).abs() < 1e-5);
-        }
-        _ => panic!("unexpected vector type"),
-    }
-
-    // update vector using the same values
-    for (i, vec) in vectors.iter().enumerate() {
-        let i = i as u64;
-        segment
-            .update_vectors(i + num_points as u64, i.into(), only_default_vector(vec))
-            .unwrap();
-    }
-
-    // do search after update
-    let nearest_update = segment
-        .search(
-            DEFAULT_VECTOR_NAME,
-            &query_vector,
-            &false.into(),
-            &true.into(),
-            None,
-            1,
-            Some(&search_params),
-            &false.into(),
-        )
-        .unwrap();
-    let nearest_update = nearest_update.get(0).unwrap();
-
-    // check that nearest_upsert is normalized
-    match &nearest_update.vector {
-        Some(VectorStruct::Single(v)) => {
-            assert!((sqrt_distance(v) - 1.).abs() < 1e-5);
-        }
-        Some(VectorStruct::Multi(v)) => {
-            assert!((sqrt_distance(&v[DEFAULT_VECTOR_NAME]) - 1.).abs() < 1e-5);
-        }
-        _ => panic!("unexpected vector type"),
-    }
-
-    // check that nearests are the same
-    assert_eq!(nearest_upsert.id, nearest_update.id);
-}
diff --git a/crates/qdrant/lib/segment/tests/integration/utils/mod.rs b/crates/qdrant/lib/segment/tests/integration/utils/mod.rs
deleted file mode 100644
index a566c35..0000000
--- a/crates/qdrant/lib/segment/tests/integration/utils/mod.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub mod scored_point_ties;
diff --git a/crates/qdrant/lib/segment/tests/integration/utils/scored_point_ties.rs b/crates/qdrant/lib/segment/tests/integration/utils/scored_point_ties.rs
deleted file mode 100644
index 163e479..0000000
--- a/crates/qdrant/lib/segment/tests/integration/utils/scored_point_ties.rs
+++ /dev/null
@@ -1,42 +0,0 @@
-use std::cmp::Ordering;
-
-use ordered_float::OrderedFloat;
-use segment::types::ScoredPoint;
-
-// Newtype to provide alternative comparator for ScoredPoint which breaks ties by id
-pub struct ScoredPointTies {
-    pub scored_point: ScoredPoint,
-}
-
-impl From<ScoredPoint> for ScoredPointTies {
-    fn from(scored_point: ScoredPoint) -> Self {
-        ScoredPointTies { scored_point }
-    }
-}
-
-impl Ord for ScoredPointTies {
-    fn cmp(&self, other: &Self) -> Ordering {
-        let res =
-            OrderedFloat(self.scored_point.score).cmp(&OrderedFloat(other.scored_point.score));
-        // for identical scores, we fallback to sorting by ids to have a stable output
-        if res == Ordering::Equal {
-            self.scored_point.id.cmp(&other.scored_point.id)
-        } else {
-            res
-        }
-    }
-}
-
-impl PartialOrd for ScoredPointTies {
-    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-impl Eq for ScoredPointTies {}
-
-impl PartialEq for ScoredPointTies {
-    fn eq(&self, other: &Self) -> bool {
-        self.scored_point == other.scored_point
-    }
-}
diff --git a/crates/qdrant/lib/storage/Cargo.toml b/crates/qdrant/lib/storage/Cargo.toml
deleted file mode 100644
index 3675215..0000000
--- a/crates/qdrant/lib/storage/Cargo.toml
+++ /dev/null
@@ -1,50 +0,0 @@
-[package]
-name = "storage"
-version = "0.2.0"
-authors = [
-    "Andrey Vasnetsov <vasnetsov93@gmail.com>",
-    "Qdrant Team <info@qdrant.tech>",
-]
-license = "Apache-2.0"
-edition = "2021"
-
-[dev-dependencies]
-tempfile = "3.7.1"
-proptest = "1.2.0"
-env_logger = "0.10.0"
-
-[dependencies]
-num_cpus = "1.16"
-thiserror = "1.0"
-rand = "0.8.5"
-wal = { git = "https://github.com/qdrant/wal.git", rev = "a32f6a38acf7ffd761df83b0790eaefeb107cd60" }
-tokio = { version = "~1.29", features = ["rt-multi-thread"] }
-serde = { version = "~1.0", features = ["derive"] }
-serde_json = "~1.0"
-schemars = { version = "0.8.12", features = ["uuid1", "preserve_order", "chrono"] }
-itertools = "0.11"
-async-trait = "0.1.72"
-log = "0.4"
-tonic = { version = "0.9.2", features = ["gzip", "tls"] }
-http = "0.2"
-parking_lot = { version = "0.12.1", features = ["deadlock_detection", "serde"] }
-tar = "0.4.40"
-chrono = { version = "~0.4", features = ["serde"] }
-validator = { version = "0.16", features = ["derive"] }
-
-# Consensus related
-atomicwrites = { version = "0.4.1" }
-raft = { version = "0.7.0", features = ["prost-codec"], default-features = false }
-prost = { version = "0.11.9" } # version of prost used by raft
-protobuf = "2.28.0" # version of protobuf used by raft
-serde_cbor = { version = "0.11.2" }
-
-segment = { path = "../segment" }
-collection = { path = "../collection" }
-api = { path = "../api" }
-futures = "0.3.28"
-anyhow = "1.0.72"
-uuid = "1.4.1"
-url = "2.4.0"
-reqwest = { version = "0.11", default-features = false, features = ["stream", "rustls-tls"] }
-tempfile = "3.7.1"
diff --git a/crates/qdrant/lib/storage/src/content_manager/alias_mapping.rs b/crates/qdrant/lib/storage/src/content_manager/alias_mapping.rs
deleted file mode 100644
index 72f6a09..0000000
--- a/crates/qdrant/lib/storage/src/content_manager/alias_mapping.rs
+++ /dev/null
@@ -1,140 +0,0 @@
-use std::collections::HashMap;
-use std::fs;
-use std::io::Write;
-use std::path::{Path, PathBuf};
-
-use collection::shards::CollectionId;
-use segment::common::file_operations::{atomic_save_json, read_json};
-use serde::{Deserialize, Serialize};
-
-use crate::content_manager::errors::StorageError;
-
-pub const ALIAS_MAPPING_CONFIG_FILE: &str = "data.json";
-
-type Alias = String;
-
-#[derive(Debug, Deserialize, Serialize, Clone, PartialEq, Eq, Default)]
-pub struct AliasMapping(HashMap<Alias, CollectionId>);
-
-impl AliasMapping {
-    pub fn load(path: &Path) -> Result<Self, StorageError> {
-        Ok(read_json(path)?)
-    }
-
-    pub fn save(&self, path: &Path) -> Result<(), StorageError> {
-        Ok(atomic_save_json(path, self)?)
-    }
-}
-
-/// Persists mapping between alias and collection name. The data is assumed to be relatively small.
-/// - Reads are served from memory.
-/// - Writes are durably saved.
-#[derive(Debug)]
-pub struct AliasPersistence {
-    data_path: PathBuf,
-    alias_mapping: AliasMapping,
-}
-
-impl AliasPersistence {
-    pub fn get_config_path(path: &Path) -> PathBuf {
-        path.join(ALIAS_MAPPING_CONFIG_FILE)
-    }
-
-    fn init_file(dir_path: &Path) -> Result<PathBuf, StorageError> {
-        let data_path = Self::get_config_path(dir_path);
-        if !data_path.exists() {
-            let mut file = fs::File::create(&data_path)?;
-            let empty_json = "{}";
-            file.write_all(empty_json.as_bytes())?;
-        }
-        Ok(data_path)
-    }
-
-    pub fn open(dir_path: PathBuf) -> Result<Self, StorageError> {
-        if !dir_path.exists() {
-            fs::create_dir_all(&dir_path)?;
-        }
-        let data_path = Self::init_file(&dir_path)?;
-        let alias_mapping = AliasMapping::load(&data_path)?;
-        Ok(AliasPersistence {
-            data_path,
-            alias_mapping,
-        })
-    }
-
-    pub fn get(&self, alias: &str) -> Option<String> {
-        self.alias_mapping.0.get(alias).cloned()
-    }
-
-    pub fn insert(&mut self, alias: String, collection_name: String) -> Result<(), StorageError> {
-        self.alias_mapping.0.insert(alias, collection_name);
-        self.alias_mapping.save(&self.data_path)?;
-        Ok(())
-    }
-
-    pub fn remove(&mut self, alias: &str) -> Result<Option<String>, StorageError> {
-        let output = self.alias_mapping.0.remove(alias);
-
-        if output.is_some() {
-            self.alias_mapping.save(&self.data_path)?;
-        }
-
-        Ok(output)
-    }
-
-    /// Removes all aliases for a given collection.
-    pub fn remove_collection(&mut self, collection_name: &str) -> Result<(), StorageError> {
-        let prev_len = self.alias_mapping.0.len();
-
-        self.alias_mapping.0.retain(|_, v| v != collection_name);
-
-        if prev_len != self.alias_mapping.0.len() {
-            self.alias_mapping.save(&self.data_path)?;
-        }
-
-        Ok(())
-    }
-
-    pub fn rename_alias(
-        &mut self,
-        old_alias_name: &str,
-        new_alias_name: String,
-    ) -> Result<(), StorageError> {
-        match self.get(old_alias_name) {
-            None => Err(StorageError::NotFound {
-                description: format!("Alias {old_alias_name} does not exists!"),
-            }),
-            Some(collection_name) => {
-                self.alias_mapping.0.remove(old_alias_name);
-                self.alias_mapping.0.insert(new_alias_name, collection_name);
-                // 'remove' & 'insert' saved atomically
-                self.alias_mapping.save(&self.data_path)?;
-                Ok(())
-            }
-        }
-    }
-
-    pub fn collection_aliases(&self, collection_name: &str) -> Vec<String> {
-        let mut result = vec![];
-        for (alias, target_collection) in self.alias_mapping.0.iter() {
-            if collection_name == target_collection {
-                result.push(alias.clone());
-            }
-        }
-        result
-    }
-
-    pub fn state(&self) -> &AliasMapping {
-        &self.alias_mapping
-    }
-
-    pub fn apply_state(&mut self, alias_mapping: AliasMapping) -> Result<(), StorageError> {
-        self.alias_mapping = alias_mapping;
-        self.alias_mapping.save(&self.data_path)?;
-        Ok(())
-    }
-
-    pub fn check_alias_exists(&self, alias: &str) -> bool {
-        self.alias_mapping.0.contains_key(alias)
-    }
-}
diff --git a/crates/qdrant/lib/storage/src/content_manager/collection_meta_ops.rs b/crates/qdrant/lib/storage/src/content_manager/collection_meta_ops.rs
deleted file mode 100644
index fb78d7d..0000000
--- a/crates/qdrant/lib/storage/src/content_manager/collection_meta_ops.rs
+++ /dev/null
@@ -1,326 +0,0 @@
-use collection::config::CollectionConfig;
-use collection::operations::config_diff::{
-    CollectionParamsDiff, HnswConfigDiff, OptimizersConfigDiff, QuantizationConfigDiff,
-    WalConfigDiff,
-};
-use collection::operations::types::{VectorsConfig, VectorsConfigDiff};
-use collection::shards::replica_set::ReplicaState;
-use collection::shards::shard::{PeerId, ShardId};
-use collection::shards::transfer::shard_transfer::{ShardTransfer, ShardTransferKey};
-use collection::shards::{replica_set, CollectionId};
-use schemars::JsonSchema;
-use segment::types::QuantizationConfig;
-use serde::{Deserialize, Serialize};
-use validator::Validate;
-
-use crate::content_manager::shard_distribution::ShardDistributionProposal;
-
-// *Operation wrapper structure is only required for better OpenAPI generation
-
-/// Create alternative name for a collection.
-/// Collection will be available under both names for search, retrieve,
-#[derive(Debug, Deserialize, Serialize, JsonSchema, PartialEq, Eq, Hash, Clone)]
-#[serde(rename_all = "snake_case")]
-pub struct CreateAlias {
-    pub collection_name: String,
-    pub alias_name: String,
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, PartialEq, Eq, Hash, Clone)]
-#[serde(rename_all = "snake_case")]
-pub struct CreateAliasOperation {
-    pub create_alias: CreateAlias,
-}
-
-/// Delete alias if exists
-#[derive(Debug, Deserialize, Serialize, JsonSchema, PartialEq, Eq, Hash, Clone)]
-#[serde(rename_all = "snake_case")]
-pub struct DeleteAlias {
-    pub alias_name: String,
-}
-
-/// Delete alias if exists
-#[derive(Debug, Deserialize, Serialize, JsonSchema, PartialEq, Eq, Hash, Clone)]
-#[serde(rename_all = "snake_case")]
-pub struct DeleteAliasOperation {
-    pub delete_alias: DeleteAlias,
-}
-
-/// Change alias to a new one
-#[derive(Debug, Deserialize, Serialize, JsonSchema, PartialEq, Eq, Hash, Clone)]
-#[serde(rename_all = "snake_case")]
-pub struct RenameAlias {
-    pub old_alias_name: String,
-    pub new_alias_name: String,
-}
-
-/// Change alias to a new one
-#[derive(Debug, Deserialize, Serialize, JsonSchema, PartialEq, Eq, Hash, Clone)]
-#[serde(rename_all = "snake_case")]
-pub struct RenameAliasOperation {
-    pub rename_alias: RenameAlias,
-}
-
-/// Group of all the possible operations related to collection aliases
-#[derive(Debug, Deserialize, Serialize, JsonSchema, PartialEq, Eq, Hash, Clone)]
-#[serde(rename_all = "snake_case")]
-#[serde(untagged)]
-pub enum AliasOperations {
-    CreateAlias(CreateAliasOperation),
-    DeleteAlias(DeleteAliasOperation),
-    RenameAlias(RenameAliasOperation),
-}
-
-impl From<CreateAlias> for AliasOperations {
-    fn from(create_alias: CreateAlias) -> Self {
-        AliasOperations::CreateAlias(CreateAliasOperation { create_alias })
-    }
-}
-
-impl From<DeleteAlias> for AliasOperations {
-    fn from(delete_alias: DeleteAlias) -> Self {
-        AliasOperations::DeleteAlias(DeleteAliasOperation { delete_alias })
-    }
-}
-
-impl From<RenameAlias> for AliasOperations {
-    fn from(rename_alias: RenameAlias) -> Self {
-        AliasOperations::RenameAlias(RenameAliasOperation { rename_alias })
-    }
-}
-
-/// Operation for creating new collection and (optionally) specify index params
-#[derive(Debug, Deserialize, Serialize, JsonSchema, PartialEq, Eq, Hash, Clone)]
-#[serde(rename_all = "snake_case")]
-pub struct InitFrom {
-    pub collection: CollectionId,
-}
-
-/// Operation for creating new collection and (optionally) specify index params
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Validate, PartialEq, Eq, Hash, Clone)]
-#[serde(rename_all = "snake_case")]
-pub struct CreateCollection {
-    /// Vector data config.
-    /// It is possible to provide one config for single vector mode and list of configs for multiple vectors mode.
-    #[validate]
-    pub vectors: VectorsConfig,
-    /// Number of shards in collection.
-    /// Default is 1 for standalone, otherwise equal to the number of nodes
-    /// Minimum is 1
-    #[serde(default)]
-    pub shard_number: Option<u32>,
-    /// Number of shards replicas.
-    /// Default is 1
-    /// Minimum is 1
-    #[serde(default)]
-    pub replication_factor: Option<u32>,
-    /// Defines how many replicas should apply the operation for us to consider it successful.
-    /// Increasing this number will make the collection more resilient to inconsistencies, but will
-    /// also make it fail if not enough replicas are available.
-    /// Does not have any performance impact.
-    #[serde(default)]
-    pub write_consistency_factor: Option<u32>,
-    /// If true - point's payload will not be stored in memory.
-    /// It will be read from the disk every time it is requested.
-    /// This setting saves RAM by (slightly) increasing the response time.
-    /// Note: those payload values that are involved in filtering and are indexed - remain in RAM.
-    #[serde(default)]
-    pub on_disk_payload: Option<bool>,
-    /// Custom params for HNSW index. If none - values from service configuration file are used.
-    #[validate]
-    pub hnsw_config: Option<HnswConfigDiff>,
-    /// Custom params for WAL. If none - values from service configuration file are used.
-    #[validate]
-    pub wal_config: Option<WalConfigDiff>,
-    /// Custom params for Optimizers.  If none - values from service configuration file are used.
-    #[serde(alias = "optimizer_config")]
-    #[validate]
-    pub optimizers_config: Option<OptimizersConfigDiff>,
-    /// Specify other collection to copy data from.
-    #[serde(default)]
-    pub init_from: Option<InitFrom>,
-    /// Quantization parameters. If none - quantization is disabled.
-    #[serde(default, alias = "quantization")]
-    #[validate]
-    pub quantization_config: Option<QuantizationConfig>,
-}
-
-/// Operation for creating new collection and (optionally) specify index params
-#[derive(Debug, Deserialize, Serialize, PartialEq, Eq, Hash, Clone)]
-#[serde(rename_all = "snake_case")]
-pub struct CreateCollectionOperation {
-    pub collection_name: String,
-    pub create_collection: CreateCollection,
-    distribution: Option<ShardDistributionProposal>,
-}
-
-impl CreateCollectionOperation {
-    pub fn new(collection_name: String, create_collection: CreateCollection) -> Self {
-        Self {
-            collection_name,
-            create_collection,
-            distribution: None,
-        }
-    }
-
-    pub fn is_distribution_set(&self) -> bool {
-        self.distribution.is_some()
-    }
-
-    pub fn take_distribution(&mut self) -> Option<ShardDistributionProposal> {
-        self.distribution.take()
-    }
-
-    pub fn set_distribution(&mut self, distribution: ShardDistributionProposal) {
-        self.distribution = Some(distribution);
-    }
-}
-
-/// Operation for updating parameters of the existing collection
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Validate, PartialEq, Eq, Hash, Clone)]
-#[serde(rename_all = "snake_case")]
-pub struct UpdateCollection {
-    /// Vector data parameters to update.
-    /// It is possible to provide one config for single vector mode and list of configs for multiple vectors mode.
-    #[validate]
-    pub vectors: Option<VectorsConfigDiff>,
-    /// Custom params for Optimizers.  If none - it is left unchanged.
-    /// This operation is blocking, it will only proceed once all current optimizations are complete
-    #[serde(alias = "optimizer_config")]
-    pub optimizers_config: Option<OptimizersConfigDiff>, // TODO: Allow updates for other configuration params as well
-    /// Collection base params. If none - it is left unchanged.
-    pub params: Option<CollectionParamsDiff>,
-    /// HNSW parameters to update for the collection index. If none - it is left unchanged.
-    #[validate]
-    pub hnsw_config: Option<HnswConfigDiff>,
-    /// Quantization parameters to update. If none - it is left unchanged.
-    #[serde(default, alias = "quantization")]
-    #[validate]
-    pub quantization_config: Option<QuantizationConfigDiff>,
-}
-
-/// Operation for updating parameters of the existing collection
-#[derive(Debug, Deserialize, Serialize, PartialEq, Eq, Hash, Clone)]
-#[serde(rename_all = "snake_case")]
-pub struct UpdateCollectionOperation {
-    pub collection_name: String,
-    pub update_collection: UpdateCollection,
-    shard_replica_changes: Option<Vec<replica_set::Change>>,
-}
-
-impl UpdateCollectionOperation {
-    pub fn new_empty(collection_name: String) -> Self {
-        Self {
-            collection_name,
-            update_collection: UpdateCollection {
-                vectors: None,
-                hnsw_config: None,
-                params: None,
-                optimizers_config: None,
-                quantization_config: None,
-            },
-            shard_replica_changes: None,
-        }
-    }
-
-    pub fn new(collection_name: String, update_collection: UpdateCollection) -> Self {
-        Self {
-            collection_name,
-            update_collection,
-            shard_replica_changes: None,
-        }
-    }
-
-    // Returns `true` if there are replica changes associated with this operation
-    pub fn have_replica_changes(&self) -> bool {
-        self.shard_replica_changes
-            .as_ref()
-            .map(|changes| !changes.is_empty())
-            .unwrap_or(false)
-    }
-
-    pub fn take_shard_replica_changes(&mut self) -> Option<Vec<replica_set::Change>> {
-        self.shard_replica_changes.take()
-    }
-
-    pub fn set_shard_replica_changes(&mut self, changes: Vec<replica_set::Change>) {
-        if changes.is_empty() {
-            self.shard_replica_changes = None;
-        } else {
-            self.shard_replica_changes = Some(changes);
-        }
-    }
-}
-
-/// Operation for performing changes of collection aliases.
-/// Alias changes are atomic, meaning that no collection modifications can happen between
-/// alias operations.
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Validate, PartialEq, Eq, Hash, Clone)]
-#[serde(rename_all = "snake_case")]
-pub struct ChangeAliasesOperation {
-    pub actions: Vec<AliasOperations>,
-}
-
-/// Operation for deleting collection with given name
-#[derive(Debug, Deserialize, Serialize, PartialEq, Eq, Hash, Clone)]
-#[serde(rename_all = "snake_case")]
-pub struct DeleteCollectionOperation(pub String);
-
-#[derive(Debug, Deserialize, Serialize, PartialEq, Eq, Hash, Clone)]
-pub enum ShardTransferOperations {
-    Start(ShardTransfer),
-    Finish(ShardTransfer),
-    Abort {
-        transfer: ShardTransferKey,
-        reason: String,
-    },
-}
-
-/// Sets the state of shard replica
-#[derive(Debug, Deserialize, Serialize, PartialEq, Eq, Hash, Clone)]
-pub struct SetShardReplicaState {
-    pub collection_name: String,
-    pub shard_id: ShardId,
-    pub peer_id: PeerId,
-    /// If `Active` then the replica is up to date and can receive updates and answer requests
-    pub state: ReplicaState,
-    /// If `Some` then check that the replica is in this state before changing it
-    /// If `None` then the replica can be in any state
-    /// This is useful for example when we want to make sure
-    /// we only make transition from `Initializing` to `Active`, and not from `Dead` to `Active`.
-    /// If `from_state` does not match the current state of the replica, then the operation will be dismissed.
-    #[serde(default)]
-    pub from_state: Option<ReplicaState>,
-}
-
-/// Enumeration of all possible collection update operations
-#[derive(Debug, Deserialize, Serialize, PartialEq, Eq, Hash, Clone)]
-#[serde(rename_all = "snake_case")]
-pub enum CollectionMetaOperations {
-    CreateCollection(CreateCollectionOperation),
-    UpdateCollection(UpdateCollectionOperation),
-    DeleteCollection(DeleteCollectionOperation),
-    ChangeAliases(ChangeAliasesOperation),
-    TransferShard(CollectionId, ShardTransferOperations),
-    SetShardReplicaState(SetShardReplicaState),
-    Nop { token: usize }, // Empty operation
-}
-
-/// Use config of the existing collection to generate a create collection operation
-/// for the new collection
-impl From<CollectionConfig> for CreateCollection {
-    fn from(value: CollectionConfig) -> Self {
-        Self {
-            vectors: value.params.vectors,
-            shard_number: Some(value.params.shard_number.get()),
-            replication_factor: Some(value.params.replication_factor.get()),
-            write_consistency_factor: Some(value.params.write_consistency_factor.get()),
-            on_disk_payload: Some(value.params.on_disk_payload),
-            hnsw_config: Some(value.hnsw_config.into()),
-            wal_config: Some(value.wal_config.into()),
-            optimizers_config: Some(value.optimizer_config.into()),
-            init_from: None,
-            quantization_config: value.quantization_config,
-        }
-    }
-}
diff --git a/crates/qdrant/lib/storage/src/content_manager/collections_ops.rs b/crates/qdrant/lib/storage/src/content_manager/collections_ops.rs
deleted file mode 100644
index cca74ea..0000000
--- a/crates/qdrant/lib/storage/src/content_manager/collections_ops.rs
+++ /dev/null
@@ -1,41 +0,0 @@
-use std::collections::HashMap;
-
-use async_trait::async_trait;
-use collection::collection::Collection;
-use collection::shards::CollectionId;
-
-use crate::content_manager::errors::StorageError;
-
-pub type Collections = HashMap<CollectionId, Collection>;
-
-#[async_trait]
-pub trait Checker {
-    fn is_collection_exists(&self, collection_name: &str) -> bool;
-
-    async fn validate_collection_not_exists(
-        &self,
-        collection_name: &str,
-    ) -> Result<(), StorageError> {
-        if self.is_collection_exists(collection_name) {
-            return Err(StorageError::BadInput {
-                description: format!("Collection `{collection_name}` already exists!"),
-            });
-        }
-        Ok(())
-    }
-
-    async fn validate_collection_exists(&self, collection_name: &str) -> Result<(), StorageError> {
-        if !self.is_collection_exists(collection_name) {
-            return Err(StorageError::NotFound {
-                description: format!("Collection `{collection_name}` doesn't exist!"),
-            });
-        }
-        Ok(())
-    }
-}
-
-impl Checker for Collections {
-    fn is_collection_exists(&self, collection_name: &str) -> bool {
-        self.contains_key(collection_name)
-    }
-}
diff --git a/crates/qdrant/lib/storage/src/content_manager/consensus/consensus_wal.rs b/crates/qdrant/lib/storage/src/content_manager/consensus/consensus_wal.rs
deleted file mode 100644
index aab248b..0000000
--- a/crates/qdrant/lib/storage/src/content_manager/consensus/consensus_wal.rs
+++ /dev/null
@@ -1,399 +0,0 @@
-use std::fs::create_dir_all;
-use std::path::Path;
-
-use itertools::Itertools;
-use prost::Message;
-use protobuf::Message as _;
-use raft::eraftpb::Entry as RaftEntry;
-use wal::Wal;
-
-use crate::content_manager::consensus_manager;
-use crate::{ConsensusOperations, StorageError};
-
-const COLLECTIONS_META_WAL_DIR: &str = "collections_meta_wal";
-
-pub struct ConsensusOpWal(Wal);
-
-impl ConsensusOpWal {
-    pub fn new(storage_path: &str) -> Self {
-        let collections_meta_wal_path = Path::new(storage_path).join(COLLECTIONS_META_WAL_DIR);
-        create_dir_all(&collections_meta_wal_path)
-            .expect("Can't create Collections meta Wal directory");
-        let wal = Wal::open(collections_meta_wal_path).expect("Can't open Collections meta Wal");
-        ConsensusOpWal(wal)
-    }
-
-    pub fn clear(&mut self) -> Result<(), StorageError> {
-        Ok(self.0.clear()?)
-    }
-
-    pub fn entry(&self, id: u64) -> raft::Result<RaftEntry> {
-        // Raft entries are expected to have index starting from 1
-        if id < 1 {
-            return Err(raft::Error::Store(raft::StorageError::Unavailable));
-        }
-        let first_entry = self
-            .first_entry()
-            .map_err(consensus_manager::raft_error_other)?
-            .ok_or(raft::Error::Store(raft::StorageError::Unavailable))?;
-        if id < first_entry.index {
-            return Err(raft::Error::Store(raft::StorageError::Compacted));
-        }
-        // Due to snapshots there might be different offsets between wal index and raft entry index
-        let offset = first_entry.index - self.0.first_index();
-        <RaftEntry as prost::Message>::decode(
-            self.0
-                .entry(id - offset)
-                .ok_or(raft::Error::Store(raft::StorageError::Unavailable))?
-                .as_ref(),
-        )
-        .map_err(consensus_manager::raft_error_other)
-    }
-
-    pub fn entries(
-        &self,
-        low: u64,
-        high: u64,
-        max_size: Option<u64>,
-    ) -> raft::Result<Vec<RaftEntry>> {
-        let mut size = 0;
-
-        let entries = (low..high)
-            .map(|id| self.entry(id))
-            .take_while(|entry| {
-                let entry = match entry {
-                    Ok(entry) => entry,
-                    Err(_) => return true,
-                };
-
-                // It's somewhat unclear how `max_size == Some(0)` should be treated.
-                //
-                // `raft::storage::Storage::entries` documentation and `raft::util::limit_size` implementation
-                // suggest that it means "return only a single entry", but why not request a single entry
-                // using `low`/`high` arguments in that case? 🤔
-                //
-                // Another reasonable interpretation might be "unlimited" (e.g., same as `None` and `u64::MAX`).
-                //
-                // `raft::RawNode` would request ridiculous range (e.g., 1 mil entries) with `max_size == Some(0)`,
-                // which, IMO, does not make much sense. 😕
-                //
-                // The current implementation follows `raft::storage::Storage::entries` spec,
-                // but further research/experimentation might be needed.
-                //
-                // See:
-                // - https://docs.rs/raft/latest/raft/storage/trait.Storage.html#tymethod.entries
-                // - https://github.com/tikv/raft-rs/blob/v0.7.0/src/util.rs#L56-L71
-                let max_size = match max_size {
-                    Some(max_size) if max_size < u64::MAX => max_size,
-
-                    // It might also be reasonable to add a hard limit on the total size of returned entries here.
-                    //
-                    // For the same reason, that if `raft::RawNode` request some ginormous range without reasonable
-                    // `max_size` the current `entries` implementation will block consensus thread until the whole
-                    // range is collected.
-                    _ => return true,
-                };
-
-                let first_entry = size == 0;
-                size += u64::from(entry.compute_size());
-
-                size <= max_size || first_entry
-            })
-            .try_collect()?;
-
-        Ok(entries)
-    }
-
-    pub fn first_entry(&self) -> Result<Option<RaftEntry>, StorageError> {
-        let first_index = self.0.first_index();
-        let entry = self
-            .0
-            .entry(first_index)
-            .map(|entry| <RaftEntry as prost::Message>::decode(entry.as_ref()));
-        Ok(entry.transpose()?)
-    }
-
-    pub fn last_entry(&self) -> Result<Option<RaftEntry>, StorageError> {
-        let last_index = self.0.last_index();
-        let entry = self
-            .0
-            .entry(last_index)
-            .map(|entry| <RaftEntry as prost::Message>::decode(entry.as_ref()));
-        Ok(entry.transpose()?)
-    }
-
-    /// Difference between raft index and WAL record number.
-    /// Difference might be different because of consensus snapshot.
-    fn index_offset(&self) -> Result<Option<u64>, StorageError> {
-        let last_known_index = self.0.first_index();
-        let first_entry = self.first_entry()?;
-        let offset = first_entry.map(|entry| entry.index - last_known_index);
-        Ok(offset)
-    }
-
-    pub fn append_entries(&mut self, entries: Vec<RaftEntry>) -> Result<(), StorageError> {
-        for entry in entries {
-            let operation_opt = ConsensusOperations::try_from(&entry).ok();
-
-            let index = entry.index;
-            let current_index = self.0.last_index();
-            let index_offset = self.index_offset()?;
-
-            if let Some(offset) = index_offset {
-                // Assume we can't skip index numbers in WAL except for snapshot
-                // Example: 2 <= 0 + 1 + 1
-                debug_assert!(
-                    index <= current_index + offset + 1,
-                    "Expected no index skip: {index} <= {current_index} + {offset}"
-                );
-
-                if index < current_index + offset {
-                    // If there is a conflict, example:
-                    // Offset = 1
-                    // raft index = 10
-                    // wal index = 11
-                    // expected_wal_index = 10 - 1 = 9
-                    // 10 < 11 + 1
-                    if index < offset {
-                        return Err(StorageError::service_error(format!(
-                            "Wal index conflict, raft index: {index}, wal index: {current_index}, offset: {offset}"
-                        )));
-                    }
-                    log::debug!(
-                        "Truncate conflicting WAL entries from index {}, raft: {index}",
-                        index - offset,
-                    );
-                    self.0.truncate(index - offset)?;
-                } // else:
-                  // Offset = 1
-                  // raft index = 11
-                  // wal index = 10
-                  // expected_wal_index = 11 - 1 = 10
-                  // 11 < 10 + 1
-            } else {
-                // There is no offset => there are no records in WAL
-                // If there are no records, conflict is impossible
-                // So we do nothing
-            }
-
-            if let Some(operation) = operation_opt {
-                let term = entry.term;
-                log::debug!(
-                    "Appending operation: term: {term}, index: {index} entry: {operation:?}"
-                );
-            } else {
-                log::debug!("Appending entry: {entry:?}");
-            }
-
-            let mut buf = vec![];
-            entry.encode(&mut buf)?;
-            #[allow(unused_variables)]
-            let wal_index = self.0.append(&buf)?;
-            #[cfg(debug_assertions)]
-            if let Some(offset) = index_offset {
-                debug_assert!(wal_index == index - offset);
-            } else {
-                debug_assert!(wal_index == 0)
-            }
-        }
-        // flush consensus WAL to disk
-        self.0.flush_open_segment()?;
-        Ok(())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use raft::eraftpb::Entry;
-
-    use super::*;
-
-    fn init_logger() {
-        let _ = env_logger::builder().is_test(true).try_init();
-    }
-
-    #[test]
-    fn test_log_compaction_rewrite() {
-        init_logger();
-        let entries_orig = vec![
-            Entry {
-                entry_type: 0,
-                term: 1,
-                index: 1,
-                data: vec![1, 2, 3],
-                context: vec![],
-                sync_log: false,
-            },
-            Entry {
-                entry_type: 0,
-                term: 1,
-                index: 2,
-                data: vec![1, 2, 3],
-                context: vec![],
-                sync_log: false,
-            },
-            Entry {
-                entry_type: 0,
-                term: 1,
-                index: 3,
-                data: vec![1, 2, 3],
-                context: vec![],
-                sync_log: false,
-            },
-        ];
-
-        let entries_new = vec![
-            Entry {
-                entry_type: 0,
-                term: 1,
-                index: 2,
-                data: vec![2, 2, 2],
-                context: vec![],
-                sync_log: false,
-            },
-            Entry {
-                entry_type: 0,
-                term: 1,
-                index: 3,
-                data: vec![3, 3, 3],
-                context: vec![],
-                sync_log: false,
-            },
-        ];
-
-        let temp_dir = tempfile::tempdir().unwrap();
-
-        let mut wal = ConsensusOpWal::new(temp_dir.path().to_str().unwrap());
-        wal.append_entries(entries_orig).unwrap();
-        wal.append_entries(entries_new.clone()).unwrap();
-
-        let result_entries = wal.entries(1, 4, None).unwrap();
-        assert_eq!(result_entries.len(), 3);
-
-        assert_eq!(result_entries[0].data, vec![1, 2, 3]);
-        assert_eq!(result_entries[1].data, vec![2, 2, 2]);
-        assert_eq!(result_entries[2].data, vec![3, 3, 3]);
-
-        wal.clear().unwrap();
-        wal.append_entries(entries_new).unwrap();
-        assert_eq!(wal.index_offset().unwrap(), Some(2));
-
-        let broken_entry = vec![Entry {
-            entry_type: 0,
-            term: 1,
-            index: 1, // Index 1 can't be overwritten, because it is already compacted
-            data: vec![5, 5, 5],
-            context: vec![],
-            sync_log: false,
-        }];
-
-        // Some errors can't be corrected
-        assert!(matches!(
-            wal.append_entries(broken_entry),
-            Err(StorageError::ServiceError { .. })
-        ));
-    }
-
-    #[test]
-    fn test_log_rewrite() {
-        init_logger();
-        let entries_orig = vec![
-            Entry {
-                entry_type: 0,
-                term: 1,
-                index: 1,
-                data: vec![1, 1, 1],
-                context: vec![],
-                sync_log: false,
-            },
-            Entry {
-                entry_type: 0,
-                term: 1,
-                index: 2,
-                data: vec![1, 1, 1],
-                context: vec![],
-                sync_log: false,
-            },
-            Entry {
-                entry_type: 0,
-                term: 1,
-                index: 3,
-                data: vec![1, 1, 1],
-                context: vec![],
-                sync_log: false,
-            },
-        ];
-
-        let entries_new = vec![
-            Entry {
-                entry_type: 0,
-                term: 1,
-                index: 2,
-                data: vec![2, 2, 2],
-                context: vec![],
-                sync_log: false,
-            },
-            Entry {
-                entry_type: 0,
-                term: 1,
-                index: 3,
-                data: vec![2, 2, 2],
-                context: vec![],
-                sync_log: false,
-            },
-            Entry {
-                entry_type: 0,
-                term: 1,
-                index: 4,
-                data: vec![2, 2, 2],
-                context: vec![],
-                sync_log: false,
-            },
-        ];
-
-        let temp_dir = tempfile::tempdir().unwrap();
-        let mut wal = ConsensusOpWal::new(temp_dir.path().to_str().unwrap());
-
-        // append original entries
-        wal.append_entries(entries_orig).unwrap();
-        assert_eq!(wal.0.num_segments(), 1);
-        assert_eq!(wal.0.num_entries(), 3);
-        assert_eq!(wal.index_offset().unwrap(), Some(1));
-        assert_eq!(wal.first_entry().unwrap().unwrap().index, 1);
-        assert_eq!(wal.last_entry().unwrap().unwrap().index, 3);
-
-        let result_entries = wal.entries(1, 4, None).unwrap();
-        assert_eq!(result_entries.len(), 3);
-        assert_eq!(result_entries[0].data, vec![1, 1, 1]);
-        assert_eq!(result_entries[1].data, vec![1, 1, 1]);
-        assert_eq!(result_entries[2].data, vec![1, 1, 1]);
-
-        // drop wal to check persistence
-        drop(wal);
-        let mut wal = ConsensusOpWal::new(temp_dir.path().to_str().unwrap());
-
-        // append overlapping entries
-        wal.append_entries(entries_new).unwrap();
-        assert_eq!(wal.0.num_segments(), 1);
-        assert_eq!(wal.0.num_entries(), 4);
-        assert_eq!(wal.index_offset().unwrap(), Some(1));
-        assert_eq!(wal.first_entry().unwrap().unwrap().index, 1);
-        assert_eq!(wal.last_entry().unwrap().unwrap().index, 4);
-
-        let result_entries = wal.entries(1, 5, None).unwrap();
-        assert_eq!(result_entries.len(), 4);
-        assert_eq!(result_entries[0].data, vec![1, 1, 1]); // survived the truncation
-        assert_eq!(result_entries[1].data, vec![2, 2, 2]);
-        assert_eq!(result_entries[2].data, vec![2, 2, 2]);
-        assert_eq!(result_entries[3].data, vec![2, 2, 2]);
-
-        // drop wal to check persistence
-        drop(wal);
-        let wal = ConsensusOpWal::new(temp_dir.path().to_str().unwrap());
-        assert_eq!(wal.0.num_segments(), 1);
-        assert_eq!(wal.0.num_entries(), 4); // fails here because we lost data!
-        assert_eq!(wal.index_offset().unwrap(), Some(1));
-        assert_eq!(wal.first_entry().unwrap().unwrap().index, 1);
-        assert_eq!(wal.last_entry().unwrap().unwrap().index, 4);
-    }
-}
diff --git a/crates/qdrant/lib/storage/src/content_manager/consensus/entry_queue.rs b/crates/qdrant/lib/storage/src/content_manager/consensus/entry_queue.rs
deleted file mode 100644
index 4cc4ca6..0000000
--- a/crates/qdrant/lib/storage/src/content_manager/consensus/entry_queue.rs
+++ /dev/null
@@ -1,58 +0,0 @@
-use serde::{Deserialize, Serialize};
-
-pub type EntryId = u64;
-
-#[derive(Debug, Clone, Copy, Serialize, Deserialize, Default)]
-pub struct EntryApplyProgressQueue(Option<(EntryId, EntryId)>);
-
-impl EntryApplyProgressQueue {
-    pub fn new(first: EntryId, last: EntryId) -> Self {
-        Self(Some((first, last)))
-    }
-
-    /// Return oldest un-applied entry id if any
-    pub fn current(&self) -> Option<EntryId> {
-        match self.0 {
-            Some((current_index, last_index)) => {
-                if current_index > last_index {
-                    None
-                } else {
-                    Some(current_index)
-                }
-            }
-            None => None,
-        }
-    }
-
-    pub fn applied(&mut self) {
-        match &mut self.0 {
-            Some((current_index, _)) => {
-                *current_index += 1;
-            }
-            None => (),
-        }
-    }
-
-    pub fn get_last_applied(&self) -> Option<EntryId> {
-        match &self.0 {
-            Some((0, _)) => None,
-            Some((current, _)) => Some(current - 1),
-            None => None,
-        }
-    }
-
-    pub fn set_from_snapshot(&mut self, snapshot_at_commit: EntryId) {
-        self.0 = Some((snapshot_at_commit + 1, snapshot_at_commit))
-    }
-
-    pub fn len(&self) -> usize {
-        match self.0 {
-            None => 0,
-            Some((current, last)) => (last as isize - current as isize + 1) as usize,
-        }
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.len() == 0
-    }
-}
diff --git a/crates/qdrant/lib/storage/src/content_manager/consensus/mod.rs b/crates/qdrant/lib/storage/src/content_manager/consensus/mod.rs
deleted file mode 100644
index ea05ca8..0000000
--- a/crates/qdrant/lib/storage/src/content_manager/consensus/mod.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-pub mod consensus_wal;
-pub mod entry_queue;
-pub mod operation_sender;
-pub mod persistent;
diff --git a/crates/qdrant/lib/storage/src/content_manager/consensus/operation_sender.rs b/crates/qdrant/lib/storage/src/content_manager/consensus/operation_sender.rs
deleted file mode 100644
index db7979b..0000000
--- a/crates/qdrant/lib/storage/src/content_manager/consensus/operation_sender.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-use std::sync::mpsc::Sender;
-
-use parking_lot::Mutex;
-
-use crate::{ConsensusOperations, StorageError};
-
-/// Structure used to notify consensus about operation
-pub struct OperationSender(Mutex<Sender<ConsensusOperations>>);
-
-impl OperationSender {
-    pub fn new(sender: Sender<ConsensusOperations>) -> Self {
-        OperationSender(Mutex::new(sender))
-    }
-
-    pub fn send(&self, operation: ConsensusOperations) -> Result<(), StorageError> {
-        self.0.lock().send(operation)?;
-        Ok(())
-    }
-}
-
-impl Clone for OperationSender {
-    fn clone(&self) -> Self {
-        OperationSender::new(self.0.lock().clone())
-    }
-}
diff --git a/crates/qdrant/lib/storage/src/content_manager/consensus/persistent.rs b/crates/qdrant/lib/storage/src/content_manager/consensus/persistent.rs
deleted file mode 100644
index 5b991f3..0000000
--- a/crates/qdrant/lib/storage/src/content_manager/consensus/persistent.rs
+++ /dev/null
@@ -1,309 +0,0 @@
-use std::cmp;
-use std::fs::{create_dir_all, File};
-use std::io::BufWriter;
-use std::path::{Path, PathBuf};
-use std::sync::atomic::{AtomicBool, Ordering};
-use std::sync::Arc;
-
-use atomicwrites::{AllowOverwrite, AtomicFile};
-use collection::shards::shard::PeerId;
-use http::Uri;
-use parking_lot::RwLock;
-use raft::eraftpb::{ConfState, HardState, SnapshotMetadata};
-use raft::RaftState;
-use serde::{Deserialize, Serialize};
-
-use crate::content_manager::consensus::entry_queue::{EntryApplyProgressQueue, EntryId};
-use crate::types::PeerAddressById;
-use crate::StorageError;
-
-// Deprecated, use `STATE_FILE_NAME` instead
-const STATE_FILE_NAME_CBOR: &str = "raft_state";
-
-const STATE_FILE_NAME: &str = "raft_state.json";
-
-/// State of the Raft consensus, which should be saved between restarts.
-/// State of the collections, aliases and transfers are stored as regular storage.
-#[derive(Debug, Serialize, Deserialize, Default)]
-pub struct Persistent {
-    /// last known state of the Raft consensus
-    #[serde(with = "RaftStateDef")]
-    pub state: RaftState,
-    /// Store last applied snapshot index, required in case if there are no raft change log except
-    /// for this last snapshot ID (term + commit)
-    #[serde(default)] // TODO quick fix to avoid breaking the compat. with 0.8.1
-    pub latest_snapshot_meta: SnapshotMetadataSer,
-    /// Operations to applied, consensus consider them committed, but this peer didn't apply them yet
-    #[serde(default)]
-    pub apply_progress_queue: EntryApplyProgressQueue,
-    /// Last known cluster topology
-    #[serde(with = "serialize_peer_addresses")]
-    pub peer_address_by_id: Arc<RwLock<PeerAddressById>>,
-    pub this_peer_id: PeerId,
-    #[serde(skip)]
-    pub path: PathBuf,
-    /// Tracks if there are some unsaved changes due to the failure on save
-    #[serde(skip)]
-    pub dirty: AtomicBool,
-}
-
-impl Persistent {
-    pub fn state(&self) -> &RaftState {
-        &self.state
-    }
-
-    pub fn latest_snapshot_meta(&self) -> &SnapshotMetadataSer {
-        &self.latest_snapshot_meta
-    }
-
-    pub fn update_from_snapshot(
-        &mut self,
-        meta: &SnapshotMetadata,
-        address_by_id: PeerAddressById,
-    ) -> Result<(), StorageError> {
-        *self.peer_address_by_id.write() = address_by_id;
-        self.state.conf_state = meta.get_conf_state().clone();
-        self.state.hard_state.term = cmp::max(self.state.hard_state.term, meta.term);
-        self.state.hard_state.commit = meta.index;
-        self.apply_progress_queue.set_from_snapshot(meta.index);
-        self.latest_snapshot_meta = meta.into();
-        self.save()
-    }
-
-    /// Returns state and if it was initialized for the first time
-    pub fn load_or_init(
-        storage_path: impl AsRef<Path>,
-        first_peer: bool,
-    ) -> Result<Self, StorageError> {
-        create_dir_all(storage_path.as_ref())?;
-        let path_legacy = storage_path.as_ref().join(STATE_FILE_NAME_CBOR);
-        let path_json = storage_path.as_ref().join(STATE_FILE_NAME);
-        let state = if path_json.exists() {
-            log::info!("Loading raft state from {}", path_json.display());
-            Self::load_json(path_json)?
-        } else if path_legacy.exists() {
-            log::info!("Loading raft state from {}", path_legacy.display());
-            let mut state = Self::load(path_legacy)?;
-            // migrate to json
-            state.path = path_json;
-            state.save()?;
-            state
-        } else {
-            log::info!("Initializing new raft state at {}", path_json.display());
-            Self::init(path_json, first_peer)?
-        };
-
-        log::debug!("State: {:?}", state);
-        Ok(state)
-    }
-
-    pub fn unapplied_entities_count(&self) -> usize {
-        self.apply_progress_queue.len()
-    }
-
-    pub fn apply_state_update(
-        &mut self,
-        update: impl FnOnce(&mut RaftState),
-    ) -> Result<(), StorageError> {
-        let mut state = self.state.clone();
-        update(&mut state);
-        self.state = state;
-        self.save()
-    }
-
-    pub fn current_unapplied_entry(&self) -> Option<EntryId> {
-        self.apply_progress_queue.current()
-    }
-
-    pub fn entry_applied(&mut self) -> Result<(), StorageError> {
-        self.apply_progress_queue.applied();
-        self.save()
-    }
-
-    pub fn set_unapplied_entries(
-        &mut self,
-        first_index: EntryId,
-        last_index: EntryId,
-    ) -> Result<(), StorageError> {
-        self.apply_progress_queue = EntryApplyProgressQueue::new(first_index, last_index);
-        self.save()
-    }
-
-    pub fn set_peer_address_by_id(
-        &mut self,
-        peer_address_by_id: PeerAddressById,
-    ) -> Result<(), StorageError> {
-        *self.peer_address_by_id.write() = peer_address_by_id;
-        self.save()
-    }
-
-    pub fn insert_peer(&mut self, peer_id: PeerId, address: Uri) -> Result<(), StorageError> {
-        if let Some(prev_peer_address) = self
-            .peer_address_by_id
-            .write()
-            .insert(peer_id, address.clone())
-        {
-            log::warn!("Replaced address of peer {peer_id} from {prev_peer_address} to {address}");
-        } else {
-            log::debug!("Added peer with id {peer_id} and address {address}")
-        }
-        self.save()
-    }
-
-    pub fn last_applied_entry(&self) -> Option<u64> {
-        self.apply_progress_queue.get_last_applied()
-    }
-
-    pub fn peer_address_by_id(&self) -> PeerAddressById {
-        self.peer_address_by_id.read().clone()
-    }
-
-    pub fn this_peer_id(&self) -> PeerId {
-        self.this_peer_id
-    }
-
-    /// ## Arguments
-    /// `path` - full name of the file where state will be saved
-    ///
-    /// `first_peer` - if this is a first peer in a new deployment (e.g. it does not bootstrap from anyone)
-    /// It is `None` if distributed deployment is disabled
-    fn init(path: PathBuf, first_peer: bool) -> Result<Self, StorageError> {
-        // Do not generate too big peer ID, to avoid problems with serialization
-        // (especially in json format)
-        let this_peer_id = rand::random::<PeerId>() % (1 << 53);
-        let voters = if first_peer {
-            vec![this_peer_id]
-        } else {
-            // `Some(false)` - Leave empty the network topology for the peer, if it is not starting a network itself.
-            // This way it will not be able to become a leader and commit data
-            // until it joins an existing network.
-            vec![]
-        };
-        let state = Self {
-            state: RaftState {
-                hard_state: HardState::default(),
-                // For network with 1 node, set it as voter.
-                // First vec is voters, second is learners.
-                conf_state: ConfState::from((voters, vec![])),
-            },
-            apply_progress_queue: Default::default(),
-            peer_address_by_id: Default::default(),
-            this_peer_id,
-            path,
-            latest_snapshot_meta: Default::default(),
-            dirty: AtomicBool::new(false),
-        };
-        state.save()?;
-        Ok(state)
-    }
-
-    fn load(path: PathBuf) -> Result<Self, StorageError> {
-        let file = File::open(&path)?;
-        let mut state: Self = serde_cbor::from_reader(&file)?;
-        state.path = path;
-        Ok(state)
-    }
-
-    fn load_json(path: PathBuf) -> Result<Self, StorageError> {
-        let file = File::open(&path)?;
-        let mut state: Self = serde_json::from_reader(&file)?;
-        state.path = path;
-        Ok(state)
-    }
-
-    pub fn save(&self) -> Result<(), StorageError> {
-        let result = AtomicFile::new(&self.path, AllowOverwrite).write(|file| {
-            let writer = BufWriter::new(file);
-            serde_json::to_writer(writer, self)
-        });
-        log::trace!("Saved state: {:?}", self);
-        self.dirty.store(result.is_err(), Ordering::Relaxed);
-        Ok(result?)
-    }
-
-    pub fn save_if_dirty(&mut self) -> Result<(), StorageError> {
-        if self.dirty.load(Ordering::Relaxed) {
-            self.save()?;
-        }
-        Ok(())
-    }
-}
-
-#[derive(Serialize, Deserialize, Default, Debug)]
-pub struct SnapshotMetadataSer {
-    pub term: u64,
-    /// Aka: commit
-    pub index: u64,
-}
-
-impl From<&SnapshotMetadata> for SnapshotMetadataSer {
-    fn from(meta: &SnapshotMetadata) -> Self {
-        Self {
-            term: meta.term,
-            index: meta.index,
-        }
-    }
-}
-
-mod serialize_peer_addresses {
-    use std::collections::HashMap;
-    use std::sync::Arc;
-
-    use http::Uri;
-    use parking_lot::RwLock;
-    use serde::{self, Deserializer, Serializer};
-
-    use crate::serialize_peer_addresses;
-    use crate::types::PeerAddressById;
-
-    pub fn serialize<S>(
-        addresses: &Arc<RwLock<PeerAddressById>>,
-        serializer: S,
-    ) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        serialize_peer_addresses::serialize(&addresses.read(), serializer)
-    }
-
-    pub fn deserialize<'de, D>(deserializer: D) -> Result<Arc<RwLock<PeerAddressById>>, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        let addresses: HashMap<u64, Uri> = serialize_peer_addresses::deserialize(deserializer)?;
-        Ok(Arc::new(RwLock::new(addresses)))
-    }
-}
-
-/// Definition of struct to help with serde serialization.
-/// Should be used only in `[serde(with=...)]`
-#[derive(Serialize, Deserialize)]
-#[serde(remote = "RaftState")]
-struct RaftStateDef {
-    #[serde(with = "HardStateDef")]
-    hard_state: HardState,
-    #[serde(with = "ConfStateDef")]
-    conf_state: ConfState,
-}
-
-/// Definition of struct to help with serde serialization.
-/// Should be used only in `[serde(with=...)]`
-#[derive(Serialize, Deserialize)]
-#[serde(remote = "HardState")]
-struct HardStateDef {
-    term: u64,
-    vote: u64,
-    commit: u64,
-}
-
-/// Definition of struct to help with serde serialization.
-/// Should be used only in `[serde(with=...)]`
-#[derive(Serialize, Deserialize)]
-#[serde(remote = "ConfState")]
-struct ConfStateDef {
-    voters: Vec<u64>,
-    learners: Vec<u64>,
-    voters_outgoing: Vec<u64>,
-    learners_next: Vec<u64>,
-    auto_leave: bool,
-}
diff --git a/crates/qdrant/lib/storage/src/content_manager/consensus_manager.rs b/crates/qdrant/lib/storage/src/content_manager/consensus_manager.rs
deleted file mode 100644
index 9a061aa..0000000
--- a/crates/qdrant/lib/storage/src/content_manager/consensus_manager.rs
+++ /dev/null
@@ -1,1010 +0,0 @@
-use std::collections::HashMap;
-use std::error::Error;
-use std::fmt::Display;
-use std::future::Future;
-use std::ops::Deref;
-use std::sync::Arc;
-use std::time::Duration;
-
-use anyhow::{anyhow, Context};
-use chrono::Utc;
-use collection::collection_state;
-use collection::common::is_ready::IsReady;
-use collection::shards::shard::PeerId;
-use collection::shards::CollectionId;
-use futures::future::join_all;
-use parking_lot::{Mutex, RwLock};
-use raft::eraftpb::{ConfChangeType, ConfChangeV2, Entry as RaftEntry};
-use raft::{GetEntriesContext, RaftState, RawNode, SoftState, Storage};
-use serde::{Deserialize, Serialize};
-use tokio::sync::broadcast;
-use tokio::sync::broadcast::Receiver;
-use tokio::time::error::Elapsed;
-use tonic::transport::Uri;
-
-use super::alias_mapping::AliasMapping;
-use super::consensus_ops::{ConsensusOperations, SnapshotStatus};
-use super::errors::StorageError;
-use super::CollectionContainer;
-use crate::content_manager::consensus::consensus_wal::ConsensusOpWal;
-use crate::content_manager::consensus::entry_queue::EntryId;
-use crate::content_manager::consensus::operation_sender::OperationSender;
-use crate::content_manager::consensus::persistent::Persistent;
-use crate::types::{
-    ClusterInfo, ClusterStatus, ConsensusThreadStatus, MessageSendErrors, PeerAddressById,
-    PeerInfo, RaftInfo,
-};
-
-pub const DEFAULT_META_OP_WAIT: Duration = Duration::from_secs(10);
-
-pub mod prelude {
-    use crate::content_manager::toc::TableOfContent;
-
-    pub type ConsensusState = super::ConsensusManager<TableOfContent>;
-}
-
-#[derive(Debug, Serialize, Deserialize, Clone)]
-pub struct SnapshotData {
-    pub collections_data: CollectionsSnapshot,
-    #[serde(with = "crate::serialize_peer_addresses")]
-    pub address_by_id: PeerAddressById,
-}
-
-#[derive(Debug, Serialize, Deserialize, Clone, Default)]
-pub struct CollectionsSnapshot {
-    pub collections: HashMap<CollectionId, collection_state::State>,
-    pub aliases: AliasMapping,
-}
-
-impl TryFrom<&[u8]> for SnapshotData {
-    type Error = serde_cbor::Error;
-
-    fn try_from(bytes: &[u8]) -> Result<SnapshotData, Self::Error> {
-        serde_cbor::from_slice(bytes)
-    }
-}
-
-pub struct ConsensusManager<C: CollectionContainer> {
-    pub persistent: RwLock<Persistent>,
-    /// Notifies if the current node knows who the leader and is not in the process of election
-    /// Otherwise the proposals are not accepted
-    pub is_leader_established: Arc<IsReady>,
-    wal: Mutex<ConsensusOpWal>,
-    /// Raft consensus state, which is not saved on disk.
-    /// They will change on restart anyway (role + leader id)
-    soft_state: RwLock<Option<SoftState>>,
-    /// Storage-related container. Should apply and persist changes not related to consensus
-    /// (user changes)
-    toc: Arc<C>,
-    /// Operation apply notifier.
-    /// Fires a signal if some specific operation is applied to the state machine.
-    /// Signal is changed on change proposal and triggered if the change was applied by consensus on this peer.
-    /// Also sends the result of the operation.
-    on_consensus_op_apply:
-        Mutex<HashMap<ConsensusOperations, broadcast::Sender<Result<bool, StorageError>>>>,
-    /// Propose operation to the consensus.
-    /// Sends messages to the consensus thread, which is defined externally, outside of the state.
-    /// (e.g. in the `src/consensus.rs`)
-    propose_sender: OperationSender,
-    /// Defines if this peer is a first peer of the consensus,
-    /// which might affect the init logic
-    first_voter: RwLock<Option<PeerId>>,
-    /// Status of the consensus thread, changed by the consensus thread
-    consensus_thread_status: RwLock<ConsensusThreadStatus>,
-    /// Consensus thread errors, changed by the consensus thread
-    message_send_failures: RwLock<HashMap<String, MessageSendErrors>>,
-}
-
-impl<C: CollectionContainer> ConsensusManager<C> {
-    pub fn new(
-        persistent_state: Persistent,
-        toc: Arc<C>,
-        propose_sender: OperationSender,
-        storage_path: &str,
-    ) -> Self {
-        Self {
-            persistent: RwLock::new(persistent_state),
-            is_leader_established: Arc::new(IsReady::default()),
-            wal: Mutex::new(ConsensusOpWal::new(storage_path)),
-            soft_state: RwLock::new(None),
-            toc,
-            on_consensus_op_apply: Default::default(),
-            propose_sender,
-            first_voter: Default::default(),
-            consensus_thread_status: RwLock::new(ConsensusThreadStatus::Working {
-                last_update: Utc::now(),
-            }),
-            message_send_failures: Default::default(),
-        }
-    }
-
-    pub fn report_snapshot(
-        &self,
-        peer_id: u64,
-        status: impl Into<SnapshotStatus>,
-    ) -> Result<(), StorageError> {
-        self.propose_sender
-            .send(ConsensusOperations::report_snapshot(peer_id, status))
-            .map_err(|_err| {
-                StorageError::service_error(
-                    "failed to send ReportSnapshot message to consensus thread",
-                )
-            })
-    }
-
-    pub fn record_message_send_failure<E: Error>(&self, peer_address: &Uri, error: E) {
-        let mut message_send_failures = self.message_send_failures.write();
-        let entry = message_send_failures
-            .entry(peer_address.to_string())
-            .or_insert_with(Default::default);
-        // Log only first error
-        if entry.count == 0 {
-            log::warn!("Failed to send message to {peer_address} with error: {error}")
-        }
-        entry.count += 1;
-        entry.latest_error = Some(error.to_string());
-    }
-
-    pub fn record_message_send_success(&self, peer_address: &Uri) {
-        self.message_send_failures
-            .write()
-            .remove(&peer_address.to_string());
-    }
-
-    pub fn record_consensus_working(&self) {
-        *self.consensus_thread_status.write() = ConsensusThreadStatus::Working {
-            last_update: Utc::now(),
-        }
-    }
-
-    pub fn on_consensus_stopped(&self) {
-        *self.consensus_thread_status.write() = ConsensusThreadStatus::Stopped
-    }
-
-    pub fn on_consensus_thread_err<E: Display>(&self, err: E) {
-        *self.consensus_thread_status.write() = ConsensusThreadStatus::StoppedWithErr {
-            err: err.to_string(),
-        }
-    }
-
-    pub fn set_raft_soft_state(&self, state: &SoftState) {
-        *self.soft_state.write() = Some(SoftState { ..*state });
-    }
-
-    pub fn this_peer_id(&self) -> PeerId {
-        self.persistent.read().this_peer_id
-    }
-
-    pub fn first_voter(&self) -> PeerId {
-        match self.first_voter.read().as_ref() {
-            Some(id) => *id,
-            None => self.this_peer_id(),
-        }
-    }
-
-    pub fn set_first_voter(&self, id: PeerId) {
-        *self.first_voter.write() = Some(id);
-    }
-
-    /// Report aggregated information about the cluster.
-    /// Useful for API reporting.
-    pub fn cluster_status(&self) -> ClusterStatus {
-        let persistent = self.persistent.read();
-        let hard_state = &persistent.state.hard_state;
-        let peers = persistent
-            .peer_address_by_id()
-            .into_iter()
-            .map(|(peer_id, uri)| {
-                (
-                    peer_id,
-                    PeerInfo {
-                        uri: uri.to_string(),
-                    },
-                )
-            })
-            .collect();
-        let pending_operations = persistent.unapplied_entities_count();
-        let soft_state = self.soft_state.read();
-        let leader = soft_state.as_ref().map(|state| state.leader_id);
-        let role = soft_state.as_ref().map(|state| state.raft_state.into());
-        let peer_id = persistent.this_peer_id;
-        let is_voter = persistent.state.conf_state.get_voters().contains(&peer_id);
-        ClusterStatus::Enabled(ClusterInfo {
-            peer_id,
-            peers,
-            raft_info: RaftInfo {
-                term: hard_state.term,
-                commit: hard_state.commit,
-                pending_operations,
-                leader,
-                role,
-                is_voter,
-            },
-            consensus_thread_status: self.consensus_thread_status.read().clone(),
-            message_send_failures: self.message_send_failures.read().clone(),
-        })
-    }
-
-    /// Handle peer removal operation.
-    ///
-    /// 1. Try to remove peer
-    /// 2. Handle peer removal error
-    /// 3. Report to the listeners
-    ///
-    /// Return if consensus should be stopped.
-    pub fn on_peer_remove(&self, peer_id: PeerId) -> Result<bool, StorageError> {
-        let mut stop_consensus: bool = false;
-
-        let report = match self.remove_peer(peer_id) {
-            Ok(()) => {
-                if self.this_peer_id() == peer_id {
-                    stop_consensus = true;
-                }
-                Ok(true)
-            }
-            Err(err) => match err {
-                err @ StorageError::ServiceError { .. } => {
-                    return Err(err);
-                }
-                _ => Err(err),
-            },
-        };
-        let operation = ConsensusOperations::RemovePeer(peer_id);
-        let on_apply = self.on_consensus_op_apply.lock().remove(&operation);
-        if let Some(on_apply) = on_apply {
-            if on_apply.send(report).is_err() {
-                log::warn!("Failed to notify on consensus operation completion: channel receiver is dropped")
-            }
-        }
-        Ok(stop_consensus)
-    }
-
-    pub fn set_unapplied_entries(
-        &self,
-        first_index: EntryId,
-        last_index: EntryId,
-    ) -> Result<(), raft::Error> {
-        self.persistent
-            .write()
-            .set_unapplied_entries(first_index, last_index)
-            .map_err(raft_error_other)
-    }
-
-    /// Process the consensus operation, which are already committed.
-    /// If return Error - consensus should be stopped with error.
-    /// Return `true` if consensus should be stopped (peer removed)
-    /// Return `false` if everything is ok.
-    pub fn apply_entries<T: Storage>(&self, raw_node: &mut RawNode<T>) -> anyhow::Result<bool> {
-        use raft::eraftpb::EntryType;
-
-        self.persistent
-            .write()
-            .save_if_dirty()
-            .context("Failed to save new state of applied entries queue")?;
-
-        loop {
-            let unapplied_index = self.persistent.read().current_unapplied_entry();
-            let entry_index = match unapplied_index {
-                Some(index) => index,
-                None => break,
-            };
-            log::debug!("Applying committed entry with index {entry_index}");
-            let entry = self
-                .wal
-                .lock()
-                .entry(entry_index)
-                .context(format!("Failed to get entry at index {entry_index}"))?;
-            let stop_consensus: bool = if entry.data.is_empty() {
-                // Empty entry, when the peer becomes Leader it will send an empty entry.
-                false
-            } else {
-                match entry.get_entry_type() {
-                    EntryType::EntryNormal => {
-                        let operation_result = self.apply_normal_entry(&entry);
-                        match operation_result {
-                            Ok(result) => {
-                                log::debug!(
-                                    "Successfully applied consensus operation entry. Index: {}. Result: {result}",
-                                    entry.index);
-                                false
-                            }
-                            Err(err @ StorageError::ServiceError { .. }) => {
-                                // This is a service error - stop consensus. Peer can be restarted when the problem is fixed.
-                                return Err(err)
-                                    .context("Failed to apply collection meta operation entry");
-                            }
-                            Err(err) => {
-                                log::warn!("Failed to apply collection meta operation entry with user error: {err}");
-                                // This is a user error so we can safely consider it applied but with error as it was incorrect.
-                                false
-                            }
-                        }
-                    }
-                    EntryType::EntryConfChangeV2 => {
-                        let stop_consensus = self
-                            .apply_conf_change_entry(&entry, raw_node)
-                            .context("Failed to apply configuration change entry")?;
-                        log::debug!(
-                            "Successfully applied configuration change entry. Index: {}. Stop consensus: {}",
-                            entry.index,
-                            stop_consensus
-                        );
-                        stop_consensus
-                    }
-                    ty => {
-                        return Err(anyhow!("Unexpected entry type: {:?}", ty));
-                    }
-                }
-            };
-            if stop_consensus {
-                return Ok(stop_consensus);
-            }
-            self.persistent
-                .write()
-                .entry_applied()
-                .context("Failed to save new state of applied entries queue")?;
-        }
-        Ok(false) // do not stop consensus
-    }
-
-    /// Process the consensus operation, which are already committed.
-    /// In this particular function - operations related to the cluster topology change:
-    ///
-    /// - AddPeer (different states)
-    /// - RemovePeer
-    pub fn apply_conf_change_entry<T: Storage>(
-        &self,
-        entry: &RaftEntry,
-        raw_node: &mut RawNode<T>,
-    ) -> Result<bool, StorageError> {
-        let change: ConfChangeV2 = prost::Message::decode(entry.get_data())?;
-
-        let conf_state = raw_node.apply_conf_change(&change)?;
-        log::debug!("Applied conf state {:?}", conf_state);
-        self.persistent
-            .write()
-            .apply_state_update(|state| state.conf_state = conf_state)?;
-
-        let mut stop_consensus: bool = false;
-        for single_change in &change.changes {
-            match single_change.change_type() {
-                ConfChangeType::AddNode => {
-                    debug_assert!(
-                        self.peer_address_by_id()
-                            .get(&single_change.node_id)
-                            .is_some(),
-                        "Peer should be already known"
-                    )
-                }
-                ConfChangeType::RemoveNode => {
-                    log::debug!("Removing node {}", single_change.node_id);
-                    stop_consensus |= self.on_peer_remove(single_change.node_id)?;
-                }
-                ConfChangeType::AddLearnerNode => {
-                    log::debug!("Adding learner node {}", single_change.node_id);
-                    if let Ok(peer_uri) = String::from_utf8_lossy(entry.get_context())
-                        .deref()
-                        .try_into()
-                    {
-                        let peer_uri: Uri = peer_uri;
-                        // Add peer to state
-                        self.add_peer(single_change.node_id, peer_uri.clone())?;
-
-                        // Notify the submitter, that operation was performed
-                        {
-                            let operation = ConsensusOperations::AddPeer {
-                                peer_id: single_change.node_id,
-                                uri: peer_uri.to_string(),
-                            };
-                            let on_apply = self.on_consensus_op_apply.lock().remove(&operation);
-                            if let Some(on_apply) = on_apply {
-                                if on_apply.send(Ok(true)).is_err() {
-                                    log::warn!("Failed to notify on consensus operation completion: channel receiver is dropped")
-                                }
-                            }
-                        }
-                    } else if entry.get_context().is_empty() {
-                        // Allow empty context for compatibility
-                        log::warn!(
-                            "Outdated peer addition entry found with index: {}",
-                            entry.get_index()
-                        )
-                    } else {
-                        // Should not be reachable as it is checked in API
-                        return Err(StorageError::service_error("Failed to parse peer uri"));
-                    }
-                }
-            }
-        }
-        Ok(stop_consensus)
-    }
-
-    /// Process the consensus operation, which are already committed.
-    /// In this particular function - operations related to user data:
-    ///
-    /// - CreateCollection
-    /// - DropCollection
-    /// - Update collection params
-    /// - Update collection aliases
-    /// - Shards operations (transfer, remove, sync)
-    /// - e.t.c
-    ///
-    pub fn apply_normal_entry(&self, entry: &RaftEntry) -> Result<bool, StorageError> {
-        let operation: ConsensusOperations = entry.try_into()?;
-        let on_apply = self.on_consensus_op_apply.lock().remove(&operation);
-        let result = match operation {
-            ConsensusOperations::CollectionMeta(operation) => {
-                self.toc.perform_collection_meta_op(*operation)
-            }
-
-            ConsensusOperations::AddPeer { .. } | ConsensusOperations::RemovePeer(_) => {
-                // RemovePeer or AddPeer should be converted into native ConfChangeV2 message before sending to the Raft.
-                // So we do not expect to receive these operations as a normal entry.
-                // This is a debug assert so production migrations should be ok.
-                // TODO: parse into CollectionMetaOperation as we will not handle other cases here, but this removes compatibility with previous entry storage
-                debug_assert!(
-                    false,
-                    "Do not expect RemovePeer or AddPeer to be directly proposed"
-                );
-                Ok(false)
-            }
-
-            ConsensusOperations::RequestSnapshot | ConsensusOperations::ReportSnapshot { .. } => {
-                unreachable!()
-            }
-        };
-
-        if let Some(on_apply) = on_apply {
-            if on_apply.send(result.clone()).is_err() {
-                log::warn!("Failed to notify on consensus operation completion: channel receiver is dropped")
-            }
-        }
-        result
-    }
-
-    // Outer `Result` is "fatal" error, inner `Result` is "transient"/"local" error.
-    pub fn apply_snapshot(
-        &self,
-        snapshot: &raft::eraftpb::Snapshot,
-    ) -> Result<Result<(), StorageError>, StorageError> {
-        let meta = snapshot.get_metadata();
-
-        let data: SnapshotData = snapshot.get_data().try_into()?;
-        self.toc.apply_collections_snapshot(data.collections_data)?;
-        self.wal.lock().clear()?;
-        self.persistent
-            .write()
-            .update_from_snapshot(meta, data.address_by_id)?;
-
-        Ok(Ok(()))
-    }
-
-    pub fn set_hard_state(&self, hard_state: raft::eraftpb::HardState) -> Result<(), StorageError> {
-        self.persistent
-            .write()
-            .apply_state_update(move |state| state.hard_state = hard_state)
-    }
-
-    pub fn set_conf_state(&self, conf_state: raft::eraftpb::ConfState) -> Result<(), StorageError> {
-        self.persistent
-            .write()
-            .apply_state_update(move |state| state.conf_state = conf_state)
-    }
-
-    /// Check if the consensus have empty operations log
-    pub fn is_new_deployment(&self) -> bool {
-        self.hard_state().term == 0
-    }
-
-    pub fn hard_state(&self) -> raft::eraftpb::HardState {
-        self.persistent.read().state().hard_state.clone()
-    }
-
-    pub fn conf_state(&self) -> raft::eraftpb::ConfState {
-        self.persistent.read().state().conf_state.clone()
-    }
-
-    pub fn set_commit_index(&self, index: u64) -> Result<(), StorageError> {
-        self.persistent
-            .write()
-            .apply_state_update(|state| state.hard_state.commit = index)
-    }
-
-    pub fn add_peer(&self, peer_id: PeerId, uri: Uri) -> Result<(), StorageError> {
-        self.persistent.write().insert_peer(peer_id, uri)
-    }
-
-    pub fn remove_peer(&self, peer_id: PeerId) -> Result<(), StorageError> {
-        // We sincerely apologize for this piece of code.
-        // The `id_to_address` is shared between `channel_pool` and `persistent`,
-        // plus we need to make additional removing in the `channel_pool`.
-        // So we handle `remove_peer` inside the `toc` and persist changes in the `persistent` after that.
-        self.toc.remove_peer(peer_id)?;
-        self.persistent.read().save()
-    }
-
-    async fn await_receiver(
-        mut receiver: Receiver<Result<bool, StorageError>>,
-        wait_timeout: Duration,
-    ) -> Result<bool, StorageError> {
-        let timeout_res = tokio::time::timeout(wait_timeout, receiver.recv())
-            .await
-            .map_err(|_: Elapsed| {
-                StorageError::service_error(format!(
-                    "Waiting for consensus operation commit failed. Timeout set at: {} seconds",
-                    wait_timeout.as_secs_f64()
-                ))
-            })?;
-        // 2 possible errors to forward: channel sender dropped OR operation failed
-        timeout_res.map_err(|err| {
-            StorageError::service_error(format!(
-                "Error occurred while waiting for consensus operation. Channel sender dropped ({})",
-                err
-            ))
-        })?
-    }
-
-    pub fn await_for_multiple_operations(
-        &self,
-        operations: Vec<ConsensusOperations>,
-        wait_timeout: Option<Duration>,
-    ) -> impl Future<Output = Result<Result<(), StorageError>, Elapsed>> {
-        let mut receivers = vec![];
-        for operation in operations {
-            // one-shot broadcast channel
-            let (sender, mut receiver) = broadcast::channel(1);
-            let mut on_apply_lock = self.on_consensus_op_apply.lock();
-            // check that the exact same operation is not already in-flight
-            match on_apply_lock.get(&operation) {
-                Some(existing_sender) => {
-                    // subscribe to existing sender for faster feedback
-                    receiver = existing_sender.subscribe()
-                }
-                None => {
-                    // insert new sender
-                    on_apply_lock.insert(operation, sender);
-                }
-            };
-            receivers.push(receiver);
-        }
-
-        async move {
-            let await_for_all = join_all(receivers.iter_mut().map(|receiver| receiver.recv()));
-            let results =
-                tokio::time::timeout(wait_timeout.unwrap_or(DEFAULT_META_OP_WAIT), await_for_all)
-                    .await?;
-            for result in results {
-                match result {
-                    Ok(response_res) => match response_res {
-                        Ok(_) => {}
-                        Err(err) => return Ok(Err(err)),
-                    },
-                    Err(recv_error) => return Ok(Err(recv_error.into())),
-                }
-            }
-            Ok(Ok(()))
-        }
-    }
-
-    /// Send operation to the consensus thread and listen for the result.
-    ///
-    /// # Arguments
-    ///
-    /// * `operation` - operation to propose
-    /// * `wait_timeout` - How long do we need to wait for the confirmation
-    /// * `with_confirmation` - If `true` - additional empty operation will be sent to the consensus thread.
-    ///   This is needed to ensure that the operation is committed and applied on majority of the nodes.
-    ///   We can not wait for all nodes confirmation, because it is not guaranteed that all nodes will be online.
-    ///
-    pub async fn propose_consensus_op_with_await(
-        &self,
-        operation: ConsensusOperations,
-        wait_timeout: Option<Duration>,
-    ) -> Result<bool, StorageError> {
-        let wait_timeout = wait_timeout.unwrap_or(DEFAULT_META_OP_WAIT);
-
-        let is_leader_established = self.is_leader_established.clone();
-
-        let await_ready_for_timeout_future = tokio::task::spawn_blocking(move || {
-            is_leader_established.await_ready_for_timeout(wait_timeout)
-        });
-
-        let is_leader_established = await_ready_for_timeout_future
-            .await
-            .map_err(|err| StorageError::service_error(err.to_string()))?;
-
-        if !is_leader_established {
-            return Err(StorageError::service_error(format!(
-                "Failed to propose operation: leader is not established within {} secs",
-                wait_timeout.as_secs()
-            )));
-        }
-
-        // one-shot broadcast channel
-        let (sender, mut receiver) = broadcast::channel(1);
-        {
-            // acquire lock to insert new operation to apply
-            let mut on_apply_lock = self.on_consensus_op_apply.lock();
-            // check that the exact same operation is not already in-flight
-            match on_apply_lock.get(&operation) {
-                Some(existing_sender) => {
-                    // subscribe to existing sender for faster feedback
-                    receiver = existing_sender.subscribe()
-                }
-                None => {
-                    // propose operation to consensus thread
-                    self.propose_sender.send(operation.clone())?;
-                    // insert new sender
-                    on_apply_lock.insert(operation, sender);
-                }
-            };
-        }
-
-        let res = Self::await_receiver(receiver, wait_timeout).await?;
-        Ok(res)
-    }
-
-    pub fn peer_address_by_id(&self) -> PeerAddressById {
-        self.persistent.read().peer_address_by_id()
-    }
-
-    pub fn peer_count(&self) -> usize {
-        self.persistent.read().peer_address_by_id.read().len()
-    }
-
-    pub fn append_entries(&self, entries: Vec<RaftEntry>) -> Result<(), StorageError> {
-        self.wal.lock().append_entries(entries)
-    }
-
-    pub fn last_applied_entry(&self) -> Option<u64> {
-        self.persistent.read().last_applied_entry()
-    }
-
-    pub fn sync_local_state(&self) -> Result<(), StorageError> {
-        self.toc.sync_local_state()
-    }
-}
-
-/// Implementation of the methods for Raft library to get information from
-/// our implementation of the storage.
-/// Well tested magic
-impl<C: CollectionContainer> Storage for ConsensusManager<C> {
-    fn initial_state(&self) -> raft::Result<RaftState> {
-        Ok(self.persistent.read().state.clone())
-    }
-
-    fn entries(
-        &self,
-        low: u64,
-        high: u64,
-        max_size: impl Into<Option<u64>>,
-        _context: GetEntriesContext,
-    ) -> raft::Result<Vec<RaftEntry>> {
-        let max_size: Option<_> = max_size.into();
-        if low < self.first_index()? {
-            return Err(raft::Error::Store(raft::StorageError::Compacted));
-        }
-
-        if high > self.last_index()? + 1 {
-            panic!(
-                "index out of bound (last: {}, high: {})",
-                self.last_index()? + 1,
-                high
-            );
-        }
-        self.wal.lock().entries(low, high, max_size)
-    }
-
-    fn term(&self, idx: u64) -> raft::Result<u64> {
-        let wal_guard = self.wal.lock();
-        let persistent = self.persistent.read();
-        let snapshot_meta = persistent.latest_snapshot_meta();
-        if idx == snapshot_meta.index {
-            return Ok(snapshot_meta.term);
-        }
-        Ok(wal_guard.entry(idx)?.term)
-    }
-
-    fn first_index(&self) -> raft::Result<u64> {
-        let index = match self.wal.lock().first_entry().map_err(raft_error_other)? {
-            Some(entry) => entry.index,
-            None => self.persistent.read().latest_snapshot_meta().index + 1,
-        };
-        Ok(index)
-    }
-
-    fn last_index(&self) -> raft::Result<u64> {
-        let index = match self.wal.lock().last_entry().map_err(raft_error_other)? {
-            Some(entry) => entry.index,
-            None => self.persistent.read().latest_snapshot_meta().index,
-        };
-        Ok(index)
-    }
-
-    fn snapshot(&self, request_index: u64, _to: u64) -> raft::Result<raft::eraftpb::Snapshot> {
-        let collections_data = self.toc.collections_snapshot();
-        let persistent = self.persistent.read();
-        let raft_state = persistent.state().clone();
-        if raft_state.hard_state.commit >= request_index {
-            let snapshot = SnapshotData {
-                collections_data,
-                address_by_id: persistent.peer_address_by_id(),
-            };
-            Ok(raft::eraftpb::Snapshot {
-                data: serde_cbor::to_vec(&snapshot).map_err(raft_error_other)?,
-                metadata: Some(raft::eraftpb::SnapshotMetadata {
-                    conf_state: Some(raft_state.conf_state),
-                    index: raft_state.hard_state.commit,
-                    term: raft_state.hard_state.term,
-                }),
-            })
-        } else {
-            Err(raft::Error::Store(
-                raft::StorageError::SnapshotTemporarilyUnavailable,
-            ))
-        }
-    }
-}
-
-#[derive(Clone)]
-pub struct ConsensusStateRef(pub Arc<prelude::ConsensusState>);
-
-impl Deref for ConsensusStateRef {
-    type Target = prelude::ConsensusState;
-
-    fn deref(&self) -> &Self::Target {
-        self.0.deref()
-    }
-}
-
-impl From<prelude::ConsensusState> for ConsensusStateRef {
-    fn from(state: prelude::ConsensusState) -> Self {
-        Self(Arc::new(state))
-    }
-}
-
-impl Storage for ConsensusStateRef {
-    fn initial_state(&self) -> raft::Result<RaftState> {
-        self.0.initial_state()
-    }
-
-    fn entries(
-        &self,
-        low: u64,
-        high: u64,
-        max_size: impl Into<Option<u64>>,
-        context: GetEntriesContext,
-    ) -> raft::Result<Vec<RaftEntry>> {
-        self.0.entries(low, high, max_size, context)
-    }
-
-    fn term(&self, idx: u64) -> raft::Result<u64> {
-        self.0.term(idx)
-    }
-
-    fn first_index(&self) -> raft::Result<EntryId> {
-        self.0.first_index()
-    }
-
-    fn last_index(&self) -> raft::Result<EntryId> {
-        self.0.last_index()
-    }
-
-    fn snapshot(&self, request_index: u64, to: u64) -> raft::Result<raft::eraftpb::Snapshot> {
-        self.0.snapshot(request_index, to)
-    }
-}
-
-pub fn raft_error_other(e: impl std::error::Error) -> raft::Error {
-    #[derive(thiserror::Error, Debug)]
-    #[error("{0}")]
-    struct StrError(String);
-
-    raft::Error::Store(raft::StorageError::Other(Box::new(StrError(e.to_string()))))
-}
-
-#[cfg(test)]
-mod tests {
-    use std::sync::{mpsc, Arc};
-
-    use collection::shards::shard::PeerId;
-    use proptest::prelude::*;
-    use raft::eraftpb::Entry;
-    use raft::storage::{MemStorage, Storage};
-    use tempfile::Builder;
-
-    use super::ConsensusManager;
-    use crate::content_manager::consensus::consensus_wal::ConsensusOpWal;
-    use crate::content_manager::consensus::entry_queue::EntryApplyProgressQueue;
-    use crate::content_manager::consensus::operation_sender::OperationSender;
-    use crate::content_manager::consensus::persistent::Persistent;
-    use crate::content_manager::CollectionContainer;
-
-    #[test]
-    fn update_is_applied() {
-        let dir = Builder::new().prefix("raft_state_test").tempdir().unwrap();
-        let mut state = Persistent::load_or_init(dir.path(), false).unwrap();
-        assert_eq!(state.state().hard_state.commit, 0);
-        state
-            .apply_state_update(|state| state.hard_state.commit = 1)
-            .unwrap();
-        assert_eq!(state.state().hard_state.commit, 1);
-    }
-
-    #[test]
-    fn save_failure() {
-        let mut state = Persistent {
-            path: "./unexistent_dir/file".into(),
-            ..Default::default()
-        };
-        assert!(state
-            .apply_state_update(|state| { state.hard_state.commit = 1 })
-            .is_err());
-    }
-
-    #[test]
-    fn state_is_loaded() {
-        let dir = Builder::new().prefix("raft_state_test").tempdir().unwrap();
-        let mut state = Persistent::load_or_init(dir.path(), false).unwrap();
-        state
-            .apply_state_update(|state| state.hard_state.commit = 1)
-            .unwrap();
-        assert_eq!(state.state().hard_state.commit, 1);
-
-        let state_loaded = Persistent::load_or_init(dir.path(), false).unwrap();
-        assert_eq!(state_loaded.state().hard_state.commit, 1);
-    }
-
-    #[test]
-    fn unapplied_entries() {
-        let mut entries = EntryApplyProgressQueue::new(0, 2);
-        assert_eq!(entries.current(), Some(0));
-        assert_eq!(entries.len(), 3);
-        entries.applied();
-        assert_eq!(entries.current(), Some(1));
-        assert_eq!(entries.len(), 2);
-        entries.applied();
-        assert_eq!(entries.current(), Some(2));
-        assert_eq!(entries.len(), 1);
-        entries.applied();
-        assert_eq!(entries.current(), None);
-        assert_eq!(entries.len(), 0);
-    }
-
-    #[test]
-    fn correct_entry_with_offset() {
-        let dir = Builder::new().prefix("raft_state_test").tempdir().unwrap();
-        let mut wal = ConsensusOpWal::new(dir.path().to_str().unwrap());
-        wal.append_entries(vec![Entry {
-            index: 4,
-            ..Default::default()
-        }])
-        .unwrap();
-        wal.append_entries(vec![Entry {
-            index: 5,
-            ..Default::default()
-        }])
-        .unwrap();
-        wal.append_entries(vec![Entry {
-            index: 6,
-            ..Default::default()
-        }])
-        .unwrap();
-        assert_eq!(wal.entry(5).unwrap().index, 5)
-    }
-
-    #[test]
-    fn at_least_1_entry() {
-        let dir = Builder::new().prefix("raft_state_test").tempdir().unwrap();
-        let mut wal = ConsensusOpWal::new(dir.path().to_str().unwrap());
-        wal.append_entries(vec![
-            Entry {
-                index: 4,
-                ..Default::default()
-            },
-            Entry {
-                index: 5,
-                ..Default::default()
-            },
-        ])
-        .unwrap();
-        // Even when `max_size` is `0` this fn should return at least 1 entry
-        assert_eq!(wal.entries(4, 5, Some(0)).unwrap().len(), 1)
-    }
-
-    struct NoCollections;
-
-    impl CollectionContainer for NoCollections {
-        fn perform_collection_meta_op(
-            &self,
-            _operation: crate::content_manager::collection_meta_ops::CollectionMetaOperations,
-        ) -> Result<bool, crate::content_manager::errors::StorageError> {
-            Ok(true)
-        }
-
-        fn collections_snapshot(&self) -> super::CollectionsSnapshot {
-            super::CollectionsSnapshot::default()
-        }
-
-        fn apply_collections_snapshot(
-            &self,
-            _data: super::CollectionsSnapshot,
-        ) -> Result<(), crate::content_manager::errors::StorageError> {
-            Ok(())
-        }
-
-        fn remove_peer(
-            &self,
-            _peer_id: PeerId,
-        ) -> Result<(), crate::content_manager::errors::StorageError> {
-            Ok(())
-        }
-
-        fn sync_local_state(&self) -> Result<(), crate::content_manager::errors::StorageError> {
-            Ok(())
-        }
-    }
-
-    fn setup_storages(
-        entries: Vec<Entry>,
-        path: &std::path::Path,
-    ) -> (ConsensusManager<NoCollections>, MemStorage) {
-        let persistent = Persistent::load_or_init(path, true).unwrap();
-        let (sender, _) = mpsc::channel();
-        let consensus_state = ConsensusManager::new(
-            persistent,
-            Arc::new(NoCollections),
-            OperationSender::new(sender),
-            path.to_str().unwrap(),
-        );
-        let mem_storage = MemStorage::new();
-        mem_storage.wl().append(entries.as_ref()).unwrap();
-        consensus_state.append_entries(entries).unwrap();
-        (consensus_state, mem_storage)
-    }
-
-    prop_compose! {
-        fn gen_entries(min_entries: u64, max_entries: u64)(n in min_entries..max_entries, inc_term_every in 1u64..max_entries) -> Vec<Entry> {
-            (1..=n).map(|index| Entry {index, term: 1 + index/inc_term_every, ..Default::default()}).collect::<Vec<Entry>>()
-        }
-    }
-
-    proptest! {
-        #[test]
-        fn check_first_and_last_indexes(entries in gen_entries(0, 100)) {
-            let dir = Builder::new().prefix("raft_state_test").tempdir().unwrap();
-            let (consensus_state, mem_storage) = setup_storages(entries, dir.path());
-            prop_assert_eq!(mem_storage.last_index(), consensus_state.last_index());
-            prop_assert_eq!(mem_storage.first_index(), consensus_state.first_index());
-        }
-
-        #[test]
-        fn check_term(entries in gen_entries(0, 100), id in 0u64..100) {
-            let dir = Builder::new().prefix("raft_state_test").tempdir().unwrap();
-            let (consensus_state, mem_storage) = setup_storages(entries, dir.path());
-            prop_assert_eq!(mem_storage.term(id), consensus_state.term(id))
-        }
-
-        #[test]
-        fn check_entries(entries in gen_entries(1, 100),
-                low in 0u64..100,
-                len in 1u64..100,
-                max_size in proptest::option::of(proptest::num::u64::ANY)
-            ) {
-            let dir = Builder::new().prefix("raft_state_test").tempdir().unwrap();
-            let (consensus_state, mem_storage) = setup_storages(entries, dir.path());
-            let mut high = low + len;
-            let last_index = mem_storage.last_index().unwrap();
-            if high > last_index + 1 {
-                high = last_index + 1;
-            }
-            let mut low = low;
-            if low > last_index {
-                low = last_index;
-            }
-            let context_1 = raft::storage::GetEntriesContext::empty(false);
-            let context_2 = raft::storage::GetEntriesContext::empty(false);
-            prop_assert_eq!(mem_storage.entries(low, high, max_size, context_1), consensus_state.entries(low, high, max_size, context_2));
-        }
-    }
-}
diff --git a/crates/qdrant/lib/storage/src/content_manager/conversions.rs b/crates/qdrant/lib/storage/src/content_manager/conversions.rs
deleted file mode 100644
index 2768604..0000000
--- a/crates/qdrant/lib/storage/src/content_manager/conversions.rs
+++ /dev/null
@@ -1,149 +0,0 @@
-use tonic::Status;
-
-use crate::content_manager::collection_meta_ops::{
-    AliasOperations, ChangeAliasesOperation, CollectionMetaOperations, CreateAlias,
-    CreateAliasOperation, CreateCollection, CreateCollectionOperation, DeleteAlias,
-    DeleteAliasOperation, DeleteCollectionOperation, InitFrom, RenameAlias, RenameAliasOperation,
-    UpdateCollection, UpdateCollectionOperation,
-};
-use crate::content_manager::errors::StorageError;
-
-pub fn error_to_status(error: StorageError) -> tonic::Status {
-    let error_code = match &error {
-        StorageError::BadInput { .. } => tonic::Code::InvalidArgument,
-        StorageError::NotFound { .. } => tonic::Code::NotFound,
-        StorageError::ServiceError { .. } => tonic::Code::Internal,
-        StorageError::BadRequest { .. } => tonic::Code::InvalidArgument,
-        StorageError::Locked { .. } => tonic::Code::FailedPrecondition,
-        StorageError::Timeout { .. } => tonic::Code::DeadlineExceeded,
-    };
-    tonic::Status::new(error_code, format!("{error}"))
-}
-
-impl TryFrom<api::grpc::qdrant::CreateCollection> for CollectionMetaOperations {
-    type Error = Status;
-
-    fn try_from(value: api::grpc::qdrant::CreateCollection) -> Result<Self, Self::Error> {
-        Ok(Self::CreateCollection(CreateCollectionOperation::new(
-            value.collection_name,
-            CreateCollection {
-                vectors: match value.vectors_config.and_then(|config| config.config) {
-                    Some(vector_config) => vector_config.try_into()?,
-                    None => return Err(Status::invalid_argument("vectors config is required")),
-                },
-                hnsw_config: value.hnsw_config.map(|v| v.into()),
-                wal_config: value.wal_config.map(|v| v.into()),
-                optimizers_config: value.optimizers_config.map(|v| v.into()),
-                shard_number: value.shard_number,
-                on_disk_payload: value.on_disk_payload,
-                replication_factor: value.replication_factor,
-                write_consistency_factor: value.write_consistency_factor,
-                init_from: value
-                    .init_from_collection
-                    .map(|v| InitFrom { collection: v }),
-                quantization_config: value
-                    .quantization_config
-                    .map(TryInto::try_into)
-                    .transpose()?,
-            },
-        )))
-    }
-}
-
-impl TryFrom<api::grpc::qdrant::UpdateCollection> for CollectionMetaOperations {
-    type Error = Status;
-
-    fn try_from(value: api::grpc::qdrant::UpdateCollection) -> Result<Self, Self::Error> {
-        Ok(Self::UpdateCollection(UpdateCollectionOperation::new(
-            value.collection_name,
-            UpdateCollection {
-                vectors: value
-                    .vectors_config
-                    .and_then(|config| config.config)
-                    .map(TryInto::try_into)
-                    .transpose()?,
-                hnsw_config: value.hnsw_config.map(Into::into),
-                params: value.params.map(TryInto::try_into).transpose()?,
-                optimizers_config: value.optimizers_config.map(Into::into),
-                quantization_config: value
-                    .quantization_config
-                    .map(TryInto::try_into)
-                    .transpose()?,
-            },
-        )))
-    }
-}
-
-impl TryFrom<api::grpc::qdrant::DeleteCollection> for CollectionMetaOperations {
-    type Error = Status;
-
-    fn try_from(value: api::grpc::qdrant::DeleteCollection) -> Result<Self, Self::Error> {
-        Ok(Self::DeleteCollection(DeleteCollectionOperation(
-            value.collection_name,
-        )))
-    }
-}
-
-impl From<api::grpc::qdrant::CreateAlias> for AliasOperations {
-    fn from(value: api::grpc::qdrant::CreateAlias) -> Self {
-        Self::CreateAlias(CreateAliasOperation {
-            create_alias: CreateAlias {
-                collection_name: value.collection_name,
-                alias_name: value.alias_name,
-            },
-        })
-    }
-}
-
-impl From<api::grpc::qdrant::DeleteAlias> for AliasOperations {
-    fn from(value: api::grpc::qdrant::DeleteAlias) -> Self {
-        Self::DeleteAlias(DeleteAliasOperation {
-            delete_alias: DeleteAlias {
-                alias_name: value.alias_name,
-            },
-        })
-    }
-}
-
-impl From<api::grpc::qdrant::RenameAlias> for AliasOperations {
-    fn from(value: api::grpc::qdrant::RenameAlias) -> Self {
-        Self::RenameAlias(RenameAliasOperation {
-            rename_alias: RenameAlias {
-                old_alias_name: value.old_alias_name,
-                new_alias_name: value.new_alias_name,
-            },
-        })
-    }
-}
-
-impl TryFrom<api::grpc::qdrant::AliasOperations> for AliasOperations {
-    type Error = Status;
-
-    fn try_from(value: api::grpc::qdrant::AliasOperations) -> Result<Self, Self::Error> {
-        match value.action {
-            Some(api::grpc::qdrant::alias_operations::Action::CreateAlias(create)) => {
-                Ok(create.into())
-            }
-            Some(api::grpc::qdrant::alias_operations::Action::DeleteAlias(delete)) => {
-                Ok(delete.into())
-            }
-            Some(api::grpc::qdrant::alias_operations::Action::RenameAlias(rename)) => {
-                Ok(rename.into())
-            }
-            _ => Err(Status::invalid_argument("Malformed AliasOperation type")),
-        }
-    }
-}
-
-impl TryFrom<api::grpc::qdrant::ChangeAliases> for CollectionMetaOperations {
-    type Error = Status;
-
-    fn try_from(value: api::grpc::qdrant::ChangeAliases) -> Result<Self, Self::Error> {
-        let actions: Vec<AliasOperations> = value
-            .actions
-            .into_iter()
-            .map(|a| a.try_into())
-            .collect::<Result<_, _>>()?;
-        Ok(Self::ChangeAliases(ChangeAliasesOperation { actions }))
-    }
-}
diff --git a/crates/qdrant/lib/storage/src/content_manager/data_transfer.rs b/crates/qdrant/lib/storage/src/content_manager/data_transfer.rs
deleted file mode 100644
index 9c8b8a0..0000000
--- a/crates/qdrant/lib/storage/src/content_manager/data_transfer.rs
+++ /dev/null
@@ -1,228 +0,0 @@
-use std::sync::Arc;
-use std::time::Duration;
-
-use collection::collection::Collection;
-use collection::operations::point_ops::{
-    PointInsertOperations, PointOperations, PointStruct, WriteOrdering,
-};
-use collection::operations::types::{CollectionError, CollectionResult, ScrollRequest};
-use collection::operations::{CollectionUpdateOperations, CreateIndex, FieldIndexOperations};
-use collection::shards::replica_set::ReplicaState;
-use collection::shards::shard::{PeerId, ShardId};
-use collection::shards::CollectionId;
-use segment::types::{WithPayloadInterface, WithVector};
-use tokio::sync::RwLock;
-
-use crate::content_manager::collections_ops::Collections;
-
-const MIGRATION_BATCH_SIZE: usize = 1000;
-const COLLECTION_INITIATION_TIMEOUT: Duration = Duration::from_secs(60);
-
-/// Handlers for transferring data from one collection into another within single cluster
-
-/// Get a list of local shards, which can be used for migration
-///
-/// For each shard, it should present on local peer, it should be active, it should have maximal peer id.
-/// Selection of max peer id guarantees that only one shard will be migrated from one peer.
-async fn get_local_source_shards(
-    source: &Collection,
-    this_peer_id: PeerId,
-) -> CollectionResult<Vec<ShardId>> {
-    let collection_state = source.state().await;
-
-    let mut local_responsible_shards = Vec::new();
-
-    // Find max replica peer id for each shard
-    for (shard_id, shard_info) in collection_state.shards.iter() {
-        let responsible_shard_opt = shard_info
-            .replicas
-            .iter()
-            .filter(|(_, replica_state)| **replica_state == ReplicaState::Active)
-            .max_by_key(|(peer_id, _)| *peer_id)
-            .map(|(peer_id, _)| *peer_id);
-
-        let responsible_shard = match responsible_shard_opt {
-            None => {
-                return Err(CollectionError::service_error(format!(
-                    "No active replica for shard {shard_id}, collection initialization is cancelled"
-                )));
-            }
-            Some(responsible_shard) => responsible_shard,
-        };
-
-        if responsible_shard == this_peer_id {
-            local_responsible_shards.push(*shard_id);
-        }
-    }
-
-    Ok(local_responsible_shards)
-}
-
-fn handle_get_collection(collection: Option<&Collection>) -> CollectionResult<&Collection> {
-    match collection {
-        Some(collection) => Ok(collection),
-        None => Err(CollectionError::service_error(
-            "Collection is not found".to_string(),
-        )),
-    }
-}
-
-async fn replicate_shard_data(
-    collections: Arc<RwLock<Collections>>,
-    source_collection_name: &CollectionId,
-    target_collection_name: &CollectionId,
-    shard_id: ShardId,
-) -> CollectionResult<()> {
-    let mut offset = None;
-    let limit = MIGRATION_BATCH_SIZE;
-
-    loop {
-        let request = ScrollRequest {
-            offset,
-            limit: Some(limit),
-            filter: None,
-            with_payload: Some(WithPayloadInterface::Bool(true)),
-            with_vector: WithVector::Bool(true),
-        };
-
-        let collections_read = collections.read().await;
-
-        let source_collection =
-            handle_get_collection(collections_read.get(source_collection_name))?;
-        let _updates_guard = source_collection.lock_updates().await;
-        let scroll_result = source_collection
-            .scroll_by(request, None, Some(shard_id))
-            .await?;
-
-        offset = scroll_result.next_page_offset;
-
-        if scroll_result.points.is_empty() {
-            break;
-        }
-
-        let records = scroll_result
-            .points
-            .into_iter()
-            .map(|point| PointStruct {
-                id: point.id,
-                vector: point.vector.unwrap(),
-                payload: point.payload,
-            })
-            .collect();
-
-        let upsert_request = CollectionUpdateOperations::PointOperation(
-            PointOperations::UpsertPoints(PointInsertOperations::PointsList(records)),
-        );
-
-        let target_collection =
-            handle_get_collection(collections_read.get(target_collection_name))?;
-
-        target_collection
-            .update_from_client(upsert_request, false, WriteOrdering::default())
-            .await?;
-
-        if offset.is_none() {
-            break;
-        }
-    }
-    Ok(())
-}
-
-async fn wait_all_shards_active(
-    collections: Arc<RwLock<Collections>>,
-    collection_name: &CollectionId,
-) -> CollectionResult<()> {
-    let collections_read = collections.read().await;
-    let collection = handle_get_collection(collections_read.get(collection_name))?;
-    let is_initialized = collection.wait_collection_initiated(COLLECTION_INITIATION_TIMEOUT);
-    if !is_initialized {
-        return Err(CollectionError::service_error(format!(
-            "Collection {} was not initialized within {} sec timeout",
-            collection_name,
-            COLLECTION_INITIATION_TIMEOUT.as_secs()
-        )));
-    }
-    Ok(())
-}
-
-/// Spawns a task which will retrieve data from appropriate local shards of the `source` collection
-/// into target collection.
-pub async fn populate_collection(
-    collections: Arc<RwLock<Collections>>,
-    source_collection: &CollectionId,
-    target_collection: &CollectionId,
-    this_peer_id: PeerId,
-) -> CollectionResult<()> {
-    let collections_read = collections.read().await;
-    let collection = handle_get_collection(collections_read.get(source_collection))?;
-    let local_responsible_shards = get_local_source_shards(collection, this_peer_id).await?;
-
-    log::debug!(
-        "Transferring shards {:?} from collection {} to collection {}",
-        local_responsible_shards,
-        source_collection,
-        target_collection
-    );
-
-    // Wait for all shards to be active
-    wait_all_shards_active(collections.clone(), target_collection).await?;
-
-    for shard_id in local_responsible_shards {
-        replicate_shard_data(
-            collections.clone(),
-            source_collection,
-            target_collection,
-            shard_id,
-        )
-        .await?;
-    }
-
-    Ok(())
-}
-
-pub async fn transfer_indexes(
-    collections: Arc<RwLock<Collections>>,
-    source_collection: &CollectionId,
-    target_collection: &CollectionId,
-    this_peer_id: PeerId,
-) -> CollectionResult<()> {
-    // Do this action on the "main" peer only
-    let collections_read = collections.read().await;
-    let collection = handle_get_collection(collections_read.get(source_collection))?;
-    let state = collection.state().await;
-    let max_peer = state
-        .shards
-        .iter()
-        .filter_map(|(_, shard_info)| {
-            shard_info
-                .replicas
-                .iter()
-                .max_by_key(|(peer_id, _)| *peer_id)
-        })
-        .map(|(peer_id, _)| *peer_id)
-        .max()
-        .unwrap_or_default();
-
-    if max_peer != this_peer_id {
-        return Ok(());
-    }
-
-    wait_all_shards_active(collections.clone(), target_collection).await?;
-
-    let collection_info = collection.info(None).await?;
-
-    let target_collection = handle_get_collection(collections_read.get(target_collection))?;
-    for (payload_name, schema) in collection_info.payload_schema {
-        let request = CollectionUpdateOperations::FieldIndexOperation(
-            FieldIndexOperations::CreateIndex(CreateIndex {
-                field_name: payload_name,
-                field_schema: Some(schema.try_into()?),
-            }),
-        );
-        target_collection
-            .update_from_client(request, false, WriteOrdering::default())
-            .await?;
-    }
-
-    Ok(())
-}
diff --git a/crates/qdrant/lib/storage/src/content_manager/errors.rs b/crates/qdrant/lib/storage/src/content_manager/errors.rs
deleted file mode 100644
index af19f90..0000000
--- a/crates/qdrant/lib/storage/src/content_manager/errors.rs
+++ /dev/null
@@ -1,275 +0,0 @@
-use std::backtrace::Backtrace;
-use std::io::Error as IoError;
-
-use collection::operations::types::CollectionError;
-use segment::common::file_operations::FileStorageError;
-use tempfile::PersistError;
-use thiserror::Error;
-
-#[derive(Error, Debug, Clone)]
-#[error("{0}")]
-pub enum StorageError {
-    #[error("Wrong input: {description}")]
-    BadInput { description: String },
-    #[error("Not found: {description}")]
-    NotFound { description: String },
-    #[error("Service internal error: {description}")]
-    ServiceError {
-        description: String,
-        backtrace: Option<String>,
-    },
-    #[error("Bad request: {description}")]
-    BadRequest { description: String },
-    #[error("Storage locked: {description}")]
-    Locked { description: String },
-    #[error("Timeout: {description}")]
-    Timeout { description: String },
-}
-
-impl StorageError {
-    pub fn service_error(description: impl Into<String>) -> StorageError {
-        StorageError::ServiceError {
-            description: description.into(),
-            backtrace: Some(Backtrace::force_capture().to_string()),
-        }
-    }
-
-    pub fn bad_request(description: &str) -> StorageError {
-        StorageError::BadRequest {
-            description: description.to_string(),
-        }
-    }
-
-    pub fn bad_input(description: &str) -> StorageError {
-        StorageError::BadInput {
-            description: description.to_string(),
-        }
-    }
-
-    /// Used to override the `description` field of the resulting `StorageError`
-    pub fn from_inconsistent_shard_failure(
-        err: CollectionError,
-        overriding_description: String,
-    ) -> StorageError {
-        match err {
-            CollectionError::BadInput { .. } => StorageError::BadInput {
-                description: overriding_description,
-            },
-            CollectionError::NotFound { .. } => StorageError::NotFound {
-                description: overriding_description,
-            },
-            CollectionError::PointNotFound { .. } => StorageError::NotFound {
-                description: overriding_description,
-            },
-            CollectionError::ServiceError { backtrace, .. } => StorageError::ServiceError {
-                description: overriding_description,
-                backtrace,
-            },
-            CollectionError::BadRequest { .. } => StorageError::BadRequest {
-                description: overriding_description,
-            },
-            CollectionError::Cancelled { .. } => StorageError::ServiceError {
-                description: format!("Operation cancelled: {overriding_description}"),
-                backtrace: None,
-            },
-            CollectionError::InconsistentShardFailure { ref first_err, .. } => {
-                StorageError::from_inconsistent_shard_failure(
-                    *first_err.clone(),
-                    overriding_description,
-                )
-            }
-            CollectionError::BadShardSelection { .. } => StorageError::BadRequest {
-                description: overriding_description,
-            },
-            CollectionError::ForwardProxyError { error, .. } => {
-                Self::from_inconsistent_shard_failure(*error, overriding_description)
-            }
-            CollectionError::OutOfMemory { .. } => StorageError::ServiceError {
-                description: overriding_description,
-                backtrace: None,
-            },
-            CollectionError::Timeout { .. } => StorageError::Timeout {
-                description: overriding_description,
-            },
-        }
-    }
-}
-
-impl From<CollectionError> for StorageError {
-    fn from(err: CollectionError) -> Self {
-        match err {
-            CollectionError::BadInput { description } => StorageError::BadInput { description },
-            CollectionError::NotFound { .. } => StorageError::NotFound {
-                description: format!("{err}"),
-            },
-            CollectionError::PointNotFound { .. } => StorageError::NotFound {
-                description: format!("{err}"),
-            },
-            CollectionError::ServiceError { error, backtrace } => StorageError::ServiceError {
-                description: error,
-                backtrace,
-            },
-            CollectionError::BadRequest { description } => StorageError::BadRequest { description },
-            CollectionError::Cancelled { description } => StorageError::ServiceError {
-                description: format!("Operation cancelled: {description}"),
-                backtrace: None,
-            },
-            CollectionError::InconsistentShardFailure { ref first_err, .. } => {
-                let full_description = format!("{}", &err);
-                StorageError::from_inconsistent_shard_failure(*first_err.clone(), full_description)
-            }
-            CollectionError::BadShardSelection { description } => {
-                StorageError::BadRequest { description }
-            }
-            CollectionError::ForwardProxyError { error, .. } => {
-                let full_description = format!("{error}");
-                StorageError::from_inconsistent_shard_failure(*error, full_description)
-            }
-            CollectionError::OutOfMemory { .. } => StorageError::ServiceError {
-                description: format!("{err}"),
-                backtrace: None,
-            },
-            CollectionError::Timeout { .. } => StorageError::Timeout {
-                description: format!("{err}"),
-            },
-        }
-    }
-}
-
-impl From<IoError> for StorageError {
-    fn from(err: IoError) -> Self {
-        StorageError::service_error(format!("{err}"))
-    }
-}
-
-impl From<FileStorageError> for StorageError {
-    fn from(err: FileStorageError) -> Self {
-        Self::service_error(err.to_string())
-    }
-}
-
-impl<Guard> From<std::sync::PoisonError<Guard>> for StorageError {
-    fn from(err: std::sync::PoisonError<Guard>) -> Self {
-        StorageError::ServiceError {
-            description: format!("Mutex lock poisoned: {err}"),
-            backtrace: Some(Backtrace::force_capture().to_string()),
-        }
-    }
-}
-
-impl<T> From<std::sync::mpsc::SendError<T>> for StorageError {
-    fn from(err: std::sync::mpsc::SendError<T>) -> Self {
-        StorageError::ServiceError {
-            description: format!("Channel closed: {err}"),
-            backtrace: Some(Backtrace::force_capture().to_string()),
-        }
-    }
-}
-
-impl From<tokio::sync::oneshot::error::RecvError> for StorageError {
-    fn from(err: tokio::sync::oneshot::error::RecvError) -> Self {
-        StorageError::ServiceError {
-            description: format!("Oneshot channel sender dropped: {err}"),
-            backtrace: Some(Backtrace::force_capture().to_string()),
-        }
-    }
-}
-
-impl From<tokio::sync::broadcast::error::RecvError> for StorageError {
-    fn from(err: tokio::sync::broadcast::error::RecvError) -> Self {
-        StorageError::ServiceError {
-            description: format!("Broadcast channel sender dropped: {err}"),
-            backtrace: Some(Backtrace::force_capture().to_string()),
-        }
-    }
-}
-
-impl From<serde_cbor::Error> for StorageError {
-    fn from(err: serde_cbor::Error) -> Self {
-        StorageError::ServiceError {
-            description: format!("cbor (de)serialization error: {err}"),
-            backtrace: Some(Backtrace::force_capture().to_string()),
-        }
-    }
-}
-
-impl From<serde_json::Error> for StorageError {
-    fn from(err: serde_json::Error) -> Self {
-        StorageError::ServiceError {
-            description: format!("json (de)serialization error: {err}"),
-            backtrace: Some(Backtrace::force_capture().to_string()),
-        }
-    }
-}
-
-impl From<prost::EncodeError> for StorageError {
-    fn from(err: prost::EncodeError) -> Self {
-        StorageError::ServiceError {
-            description: format!("prost encode error: {err}"),
-            backtrace: Some(Backtrace::force_capture().to_string()),
-        }
-    }
-}
-
-impl From<prost::DecodeError> for StorageError {
-    fn from(err: prost::DecodeError) -> Self {
-        StorageError::ServiceError {
-            description: format!("prost decode error: {err}"),
-            backtrace: Some(Backtrace::force_capture().to_string()),
-        }
-    }
-}
-
-impl From<raft::Error> for StorageError {
-    fn from(err: raft::Error) -> Self {
-        StorageError::ServiceError {
-            description: format!("Error in Raft consensus: {err}"),
-            backtrace: Some(Backtrace::force_capture().to_string()),
-        }
-    }
-}
-
-impl<E: std::fmt::Display> From<atomicwrites::Error<E>> for StorageError {
-    fn from(err: atomicwrites::Error<E>) -> Self {
-        StorageError::ServiceError {
-            description: format!("Failed to write file: {err}"),
-            backtrace: Some(Backtrace::force_capture().to_string()),
-        }
-    }
-}
-
-impl From<tonic::transport::Error> for StorageError {
-    fn from(err: tonic::transport::Error) -> Self {
-        StorageError::ServiceError {
-            description: format!("Tonic transport error: {err}"),
-            backtrace: Some(Backtrace::force_capture().to_string()),
-        }
-    }
-}
-
-impl From<reqwest::Error> for StorageError {
-    fn from(err: reqwest::Error) -> Self {
-        StorageError::ServiceError {
-            description: format!("Http request error: {err}"),
-            backtrace: Some(Backtrace::force_capture().to_string()),
-        }
-    }
-}
-
-impl From<tokio::task::JoinError> for StorageError {
-    fn from(err: tokio::task::JoinError) -> Self {
-        StorageError::ServiceError {
-            description: format!("Tokio task join error: {err}"),
-            backtrace: Some(Backtrace::force_capture().to_string()),
-        }
-    }
-}
-
-impl From<PersistError> for StorageError {
-    fn from(err: PersistError) -> Self {
-        StorageError::ServiceError {
-            description: format!("Persist error: {err}"),
-            backtrace: Some(Backtrace::force_capture().to_string()),
-        }
-    }
-}
diff --git a/crates/qdrant/lib/storage/src/content_manager/mod.rs b/crates/qdrant/lib/storage/src/content_manager/mod.rs
deleted file mode 100644
index 8133f89..0000000
--- a/crates/qdrant/lib/storage/src/content_manager/mod.rs
+++ /dev/null
@@ -1,203 +0,0 @@
-use collection::shards::shard::PeerId;
-
-use self::collection_meta_ops::CollectionMetaOperations;
-use self::consensus_manager::CollectionsSnapshot;
-use self::errors::StorageError;
-
-pub mod alias_mapping;
-pub mod collection_meta_ops;
-mod collections_ops;
-pub mod consensus;
-pub mod consensus_manager;
-pub mod conversions;
-mod data_transfer;
-pub mod errors;
-pub mod shard_distribution;
-pub mod snapshots;
-pub mod toc;
-
-pub mod consensus_ops {
-    use collection::shards::replica_set::ReplicaState;
-    use collection::shards::replica_set::ReplicaState::Initializing;
-    use collection::shards::shard::PeerId;
-    use collection::shards::transfer::shard_transfer::ShardTransfer;
-    use collection::shards::{replica_set, CollectionId};
-    use raft::eraftpb::Entry as RaftEntry;
-    use serde::{Deserialize, Serialize};
-
-    use crate::content_manager::collection_meta_ops::{
-        CollectionMetaOperations, SetShardReplicaState, ShardTransferOperations, UpdateCollection,
-        UpdateCollectionOperation,
-    };
-
-    /// Operation that should pass consensus
-    #[derive(Debug, Deserialize, Serialize, PartialEq, Eq, Hash, Clone)]
-    pub enum ConsensusOperations {
-        CollectionMeta(Box<CollectionMetaOperations>),
-        AddPeer {
-            peer_id: PeerId,
-            uri: String,
-        },
-        RemovePeer(PeerId),
-        RequestSnapshot,
-        ReportSnapshot {
-            peer_id: PeerId,
-            status: SnapshotStatus,
-        },
-    }
-
-    impl TryFrom<&RaftEntry> for ConsensusOperations {
-        type Error = serde_cbor::Error;
-
-        fn try_from(entry: &RaftEntry) -> Result<Self, Self::Error> {
-            serde_cbor::from_slice(entry.get_data())
-        }
-    }
-
-    impl ConsensusOperations {
-        pub fn abort_transfer(
-            collection_id: CollectionId,
-            transfer: ShardTransfer,
-            reason: &str,
-        ) -> Self {
-            ConsensusOperations::CollectionMeta(Box::new(CollectionMetaOperations::TransferShard(
-                collection_id,
-                ShardTransferOperations::Abort {
-                    transfer: transfer.key(),
-                    reason: reason.to_string(),
-                },
-            )))
-        }
-
-        pub fn finish_transfer(collection_id: CollectionId, transfer: ShardTransfer) -> Self {
-            ConsensusOperations::CollectionMeta(Box::new(CollectionMetaOperations::TransferShard(
-                collection_id,
-                ShardTransferOperations::Finish(transfer),
-            )))
-        }
-
-        pub fn set_replica_state(
-            collection_name: CollectionId,
-            shard_id: u32,
-            peer_id: PeerId,
-            state: ReplicaState,
-            from_state: Option<ReplicaState>,
-        ) -> Self {
-            ConsensusOperations::CollectionMeta(
-                CollectionMetaOperations::SetShardReplicaState(SetShardReplicaState {
-                    collection_name,
-                    shard_id,
-                    peer_id,
-                    state,
-                    from_state,
-                })
-                .into(),
-            )
-        }
-
-        pub fn remove_replica(
-            collection_name: CollectionId,
-            shard_id: u32,
-            peer_id: PeerId,
-        ) -> Self {
-            let mut operation = UpdateCollectionOperation::new(
-                collection_name,
-                UpdateCollection {
-                    vectors: None,
-                    optimizers_config: None,
-                    params: None,
-                    hnsw_config: None,
-                    quantization_config: None,
-                },
-            );
-            operation
-                .set_shard_replica_changes(vec![replica_set::Change::Remove(shard_id, peer_id)]);
-
-            ConsensusOperations::CollectionMeta(
-                CollectionMetaOperations::UpdateCollection(operation).into(),
-            )
-        }
-
-        /// Report that a replica was initialized
-        pub fn initialize_replica(
-            collection_name: CollectionId,
-            shard_id: u32,
-            peer_id: PeerId,
-        ) -> Self {
-            Self::set_replica_state(
-                collection_name,
-                shard_id,
-                peer_id,
-                ReplicaState::Active,
-                Some(Initializing),
-            )
-        }
-
-        pub fn deactivate_replica(
-            collection_name: CollectionId,
-            shard_id: u32,
-            peer_id: PeerId,
-        ) -> Self {
-            Self::set_replica_state(collection_name, shard_id, peer_id, ReplicaState::Dead, None)
-        }
-
-        pub fn start_transfer(collection_id: CollectionId, transfer: ShardTransfer) -> Self {
-            ConsensusOperations::CollectionMeta(Box::new(CollectionMetaOperations::TransferShard(
-                collection_id,
-                ShardTransferOperations::Start(transfer),
-            )))
-        }
-
-        pub fn request_snapshot() -> Self {
-            Self::RequestSnapshot
-        }
-
-        pub fn report_snapshot(peer_id: PeerId, status: impl Into<SnapshotStatus>) -> Self {
-            Self::ReportSnapshot {
-                peer_id,
-                status: status.into(),
-            }
-        }
-    }
-
-    #[derive(Copy, Clone, Debug, Eq, PartialEq, Hash, Deserialize, Serialize)]
-    pub enum SnapshotStatus {
-        Finish,
-        Failure,
-    }
-
-    impl From<raft::SnapshotStatus> for SnapshotStatus {
-        fn from(status: raft::SnapshotStatus) -> Self {
-            match status {
-                raft::SnapshotStatus::Finish => Self::Finish,
-                raft::SnapshotStatus::Failure => Self::Failure,
-            }
-        }
-    }
-
-    impl From<SnapshotStatus> for raft::SnapshotStatus {
-        fn from(status: SnapshotStatus) -> Self {
-            match status {
-                SnapshotStatus::Finish => Self::Finish,
-                SnapshotStatus::Failure => Self::Failure,
-            }
-        }
-    }
-}
-
-/// Collection container abstraction for consensus
-/// Used to mock ToC in consensus state tests
-pub trait CollectionContainer {
-    fn perform_collection_meta_op(
-        &self,
-        operation: CollectionMetaOperations,
-    ) -> Result<bool, StorageError>;
-
-    fn collections_snapshot(&self) -> CollectionsSnapshot;
-
-    fn apply_collections_snapshot(&self, data: CollectionsSnapshot) -> Result<(), StorageError>;
-
-    fn remove_peer(&self, peer_id: PeerId) -> Result<(), StorageError>;
-
-    fn sync_local_state(&self) -> Result<(), StorageError>;
-}
diff --git a/crates/qdrant/lib/storage/src/content_manager/shard_distribution.rs b/crates/qdrant/lib/storage/src/content_manager/shard_distribution.rs
deleted file mode 100644
index c612169..0000000
--- a/crates/qdrant/lib/storage/src/content_manager/shard_distribution.rs
+++ /dev/null
@@ -1,134 +0,0 @@
-use std::cmp::{self, Reverse};
-use std::collections::BinaryHeap;
-use std::num::NonZeroU32;
-
-use collection::shards::collection_shard_distribution::CollectionShardDistribution;
-use collection::shards::shard::{PeerId, ShardId};
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-
-#[derive(PartialEq, Eq, PartialOrd, Ord)]
-struct PeerShardCount {
-    shard_count: usize, // self.shard_count and other.shard_count are compared first to determine eq & ord
-    peer_id: PeerId,
-}
-
-impl PeerShardCount {
-    fn new(peer_id: PeerId) -> Self {
-        Self {
-            shard_count: 0,
-            peer_id,
-        }
-    }
-
-    fn inc_shard_count(&mut self) {
-        self.shard_count += 1;
-    }
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, PartialEq, Eq, Hash, Clone)]
-pub struct ShardDistributionProposal {
-    /// A shard can be located on several peers if it has replicas
-    pub distribution: Vec<(ShardId, Vec<PeerId>)>,
-}
-
-impl ShardDistributionProposal {
-    /// Builds a proposal for the distribution of shards.
-    /// It will propose to allocate shards so that all peers have the same number of shards of this collection  at the end.
-    pub fn new(
-        shard_number: NonZeroU32,
-        replication_factor: NonZeroU32,
-        known_peers: &[PeerId],
-    ) -> Self {
-        // min number of shard_count on top to make this a min-heap
-        let mut min_heap: BinaryHeap<Reverse<PeerShardCount>> =
-            BinaryHeap::with_capacity(known_peers.len());
-        for peer in known_peers {
-            min_heap.push(Reverse(PeerShardCount::new(*peer)));
-        }
-
-        let mut distribution = Vec::with_capacity(shard_number.get() as usize);
-        // There should not be more than 1 replica per peer
-        let n_replicas = cmp::min(replication_factor.get() as usize, known_peers.len());
-
-        for shard_id in 0..shard_number.get() {
-            let mut replicas = Vec::new();
-            for _replica in 0..n_replicas {
-                let mut least_loaded_peer = min_heap.peek_mut().unwrap();
-                let selected_peer = least_loaded_peer.0.peer_id;
-                least_loaded_peer.0.inc_shard_count();
-                replicas.push(selected_peer);
-            }
-            distribution.push((shard_id, replicas))
-        }
-
-        Self { distribution }
-    }
-
-    pub fn local_shards_for(&self, peer_id: PeerId) -> Vec<ShardId> {
-        self.distribution
-            .iter()
-            .filter_map(|(shard, peers)| {
-                if peers.contains(&peer_id) {
-                    Some(shard)
-                } else {
-                    None
-                }
-            })
-            .copied()
-            .collect()
-    }
-
-    pub fn remote_shards_for(&self, peer_id: PeerId) -> Vec<(ShardId, Vec<PeerId>)> {
-        self.distribution
-            .iter()
-            .filter(|(_shard, peers)| !peers.contains(&peer_id))
-            .cloned()
-            .collect()
-    }
-}
-
-impl From<ShardDistributionProposal> for CollectionShardDistribution {
-    fn from(proposal: ShardDistributionProposal) -> Self {
-        CollectionShardDistribution {
-            shards: proposal
-                .distribution
-                .into_iter()
-                .map(|(shard_id, peers)| (shard_id, peers.into_iter().collect()))
-                .collect(),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_distribution() {
-        let known_peers = vec![1, 2, 3, 4];
-        let distribution = ShardDistributionProposal::new(
-            NonZeroU32::new(6).unwrap(),
-            NonZeroU32::new(1).unwrap(),
-            &known_peers,
-        );
-
-        // Check it distribution is as even as possible
-        let mut shard_counts: Vec<usize> = vec![0; known_peers.len()];
-        for (_shard_id, peers) in &distribution.distribution {
-            for peer_id in peers {
-                let peer_offset = known_peers
-                    .iter()
-                    .enumerate()
-                    .find(|(_, x)| *x == peer_id)
-                    .unwrap()
-                    .0;
-                shard_counts[peer_offset] += 1;
-            }
-        }
-
-        assert_eq!(shard_counts.iter().sum::<usize>(), 6);
-        assert_eq!(shard_counts.iter().min(), Some(&1));
-        assert_eq!(shard_counts.iter().max(), Some(&2));
-    }
-}
diff --git a/crates/qdrant/lib/storage/src/content_manager/snapshots/download.rs b/crates/qdrant/lib/storage/src/content_manager/snapshots/download.rs
deleted file mode 100644
index 749ed25..0000000
--- a/crates/qdrant/lib/storage/src/content_manager/snapshots/download.rs
+++ /dev/null
@@ -1,81 +0,0 @@
-use std::path::{Path, PathBuf};
-
-use futures::StreamExt;
-use reqwest;
-use tokio::fs::File;
-use tokio::io::AsyncWriteExt;
-use url::Url;
-use uuid::Uuid;
-
-use crate::StorageError;
-
-pub fn downloaded_snapshots_dir(snapshots_dir: &str) -> PathBuf {
-    Path::new(snapshots_dir).join("downloaded-snapshots")
-}
-
-fn random_name() -> String {
-    format!("{}.snapshot", Uuid::new_v4())
-}
-
-fn snapshot_name(url: &Url) -> String {
-    let path = Path::new(url.path());
-
-    path.file_name()
-        .and_then(|x| x.to_str())
-        .map(|x| x.to_string())
-        .unwrap_or_else(random_name)
-}
-
-async fn download_file(url: &Url, path: &Path) -> Result<(), StorageError> {
-    let mut file = File::create(path).await?;
-
-    let response = reqwest::get(url.clone()).await?;
-
-    if !response.status().is_success() {
-        return Err(StorageError::bad_input(&format!(
-            "Failed to download snapshot from {}: status - {}",
-            url,
-            response.status()
-        )));
-    }
-
-    let mut stream = response.bytes_stream();
-
-    while let Some(chunk_result) = stream.next().await {
-        let chunk = chunk_result?;
-        file.write_all(&chunk).await?;
-    }
-
-    file.flush().await?;
-
-    Ok(())
-}
-
-pub async fn download_snapshot(url: Url, snapshots_dir: &Path) -> Result<PathBuf, StorageError> {
-    match url.scheme() {
-        "file" => {
-            let local_path = url.to_file_path().map_err(|_| {
-                StorageError::bad_request(
-                    "Invalid snapshot URI, file path must be absolute or on localhost",
-                )
-            })?;
-            if !local_path.exists() {
-                return Err(StorageError::bad_request(&format!(
-                    "Snapshot file {local_path:?} does not exist"
-                )));
-            }
-            Ok(local_path.to_path_buf())
-        }
-        "http" | "https" => {
-            let download_to = snapshots_dir.join(snapshot_name(&url));
-
-            download_file(&url, &download_to).await?;
-            Ok(download_to)
-        }
-        _ => Err(StorageError::bad_request(&format!(
-            "URL {} with schema {} is not supported",
-            url,
-            url.scheme()
-        ))),
-    }
-}
diff --git a/crates/qdrant/lib/storage/src/content_manager/snapshots/mod.rs b/crates/qdrant/lib/storage/src/content_manager/snapshots/mod.rs
deleted file mode 100644
index 8a41737..0000000
--- a/crates/qdrant/lib/storage/src/content_manager/snapshots/mod.rs
+++ /dev/null
@@ -1,196 +0,0 @@
-pub mod download;
-pub mod recover;
-
-use std::collections::HashMap;
-use std::path::{Path, PathBuf};
-
-use collection::operations::snapshot_ops::{
-    get_snapshot_description, list_snapshots_in_directory, SnapshotDescription,
-};
-use serde::{Deserialize, Serialize};
-use tar::Builder as TarBuilder;
-use tokio::io::AsyncWriteExt;
-
-use crate::content_manager::toc::FULL_SNAPSHOT_FILE_NAME;
-use crate::dispatcher::Dispatcher;
-use crate::{StorageError, TableOfContent};
-
-#[derive(Debug, Serialize, Deserialize, Clone)]
-pub struct SnapshotConfig {
-    /// Map collection name to snapshot file name
-    pub collections_mapping: HashMap<String, String>,
-    /// Aliases for collections `<alias>:<collection_name>`
-    #[serde(default)]
-    pub collections_aliases: HashMap<String, String>,
-}
-
-pub async fn get_full_snapshot_path(
-    toc: &TableOfContent,
-    snapshot_name: &str,
-) -> Result<PathBuf, StorageError> {
-    let snapshot_path = Path::new(toc.snapshots_path()).join(snapshot_name);
-    if !snapshot_path.exists() {
-        return Err(StorageError::NotFound {
-            description: format!("Full storage snapshot {snapshot_name} not found"),
-        });
-    }
-    Ok(snapshot_path)
-}
-
-pub async fn do_delete_full_snapshot(
-    dispatcher: &Dispatcher,
-    snapshot_name: &str,
-    wait: bool,
-) -> Result<bool, StorageError> {
-    let dispatcher = dispatcher.clone();
-    let snapshot_name = snapshot_name.to_string();
-    let task =
-        tokio::spawn(async move { _do_delete_full_snapshot(&dispatcher, &snapshot_name).await });
-
-    if wait {
-        task.await??;
-    }
-
-    Ok(true)
-}
-
-async fn _do_delete_full_snapshot(
-    dispatcher: &Dispatcher,
-    snapshot_name: &str,
-) -> Result<bool, StorageError> {
-    let snapshot_dir = get_full_snapshot_path(dispatcher.toc(), snapshot_name).await?;
-    log::info!("Deleting full storage snapshot {:?}", snapshot_dir);
-    tokio::fs::remove_file(snapshot_dir).await?;
-    Ok(true)
-}
-
-pub async fn do_delete_collection_snapshot(
-    dispatcher: &Dispatcher,
-    collection_name: &str,
-    snapshot_name: &str,
-    wait: bool,
-) -> Result<bool, StorageError> {
-    let dispatcher = dispatcher.clone();
-    let collection_name = collection_name.to_string();
-    let snapshot_name = snapshot_name.to_string();
-
-    let task = tokio::spawn(async move {
-        _do_delete_collection_snapshot(&dispatcher, &collection_name, &snapshot_name).await
-    });
-
-    if wait {
-        task.await??;
-    }
-
-    Ok(true)
-}
-
-async fn _do_delete_collection_snapshot(
-    dispatcher: &Dispatcher,
-    collection_name: &str,
-    snapshot_name: &str,
-) -> Result<bool, StorageError> {
-    let collection = dispatcher.get_collection(collection_name).await?;
-    let file_name = collection.get_snapshot_path(snapshot_name).await?;
-    log::info!("Deleting collection snapshot {:?}", file_name);
-    tokio::fs::remove_file(file_name).await?;
-    Ok(true)
-}
-
-pub async fn do_list_full_snapshots(
-    toc: &TableOfContent,
-) -> Result<Vec<SnapshotDescription>, StorageError> {
-    let snapshots_path = Path::new(toc.snapshots_path());
-    Ok(list_snapshots_in_directory(snapshots_path).await?)
-}
-
-pub async fn do_create_full_snapshot(
-    dispatcher: &Dispatcher,
-    wait: bool,
-) -> Result<Option<SnapshotDescription>, StorageError> {
-    let dispatcher = dispatcher.clone();
-    let task = tokio::spawn(async move { _do_create_full_snapshot(&dispatcher).await });
-    if wait {
-        Ok(Some(task.await??))
-    } else {
-        Ok(None)
-    }
-}
-
-async fn _do_create_full_snapshot(
-    dispatcher: &Dispatcher,
-) -> Result<SnapshotDescription, StorageError> {
-    let dispatcher = dispatcher.clone();
-
-    let snapshot_dir = Path::new(dispatcher.snapshots_path()).to_path_buf();
-
-    let all_collections = dispatcher.all_collections().await;
-    let mut created_snapshots: Vec<(&str, SnapshotDescription)> = vec![];
-    for collection_name in &all_collections {
-        let snapshot_details = dispatcher.create_snapshot(collection_name).await?;
-        created_snapshots.push((collection_name, snapshot_details));
-    }
-    let current_time = chrono::Utc::now().format("%Y-%m-%d-%H-%M-%S").to_string();
-
-    let snapshot_name = format!("{}-{}.snapshot", FULL_SNAPSHOT_FILE_NAME, &current_time);
-
-    let collection_name_to_snapshot_path: HashMap<_, _> = created_snapshots
-        .iter()
-        .map(|(collection_name, snapshot_details)| {
-            (collection_name.to_string(), snapshot_details.name.clone())
-        })
-        .collect();
-
-    let mut alias_mapping: HashMap<String, String> = Default::default();
-    for collection_name in &all_collections {
-        for alias in dispatcher.collection_aliases(collection_name).await? {
-            alias_mapping.insert(alias.to_string(), collection_name.to_string());
-        }
-    }
-
-    let config_path = snapshot_dir.join(format!("config-{current_time}.json"));
-
-    {
-        let snapshot_config = SnapshotConfig {
-            collections_mapping: collection_name_to_snapshot_path,
-            collections_aliases: alias_mapping,
-        };
-        let mut config_file = tokio::fs::File::create(&config_path).await?;
-        config_file
-            .write_all(
-                serde_json::to_string_pretty(&snapshot_config)
-                    .unwrap()
-                    .as_bytes(),
-            )
-            .await?;
-    }
-
-    let full_snapshot_path = snapshot_dir.join(&snapshot_name);
-
-    let config_path_clone = config_path.clone();
-    let full_snapshot_path_clone = full_snapshot_path.clone();
-    let created_snapshots_clone: Vec<_> = created_snapshots
-        .iter()
-        .map(|(x, y)| (x.to_string(), y.to_owned()))
-        .collect();
-    let archiving = tokio::task::spawn_blocking(move || {
-        // have to use std here, cause TarBuilder is not async
-        let file = std::fs::File::create(&full_snapshot_path_clone)?;
-        let mut builder = TarBuilder::new(file);
-        for (collection_name, snapshot_details) in created_snapshots_clone {
-            let snapshot_path = snapshot_dir
-                .join(collection_name)
-                .join(&snapshot_details.name);
-            builder.append_path_with_name(&snapshot_path, &snapshot_details.name)?;
-            std::fs::remove_file(snapshot_path)?;
-        }
-        builder.append_path_with_name(&config_path_clone, "config.json")?;
-
-        builder.finish()?;
-        Ok::<(), StorageError>(())
-    });
-    archiving.await??;
-    tokio::fs::remove_file(&config_path).await?;
-
-    Ok(get_snapshot_description(&full_snapshot_path).await?)
-}
diff --git a/crates/qdrant/lib/storage/src/content_manager/snapshots/recover.rs b/crates/qdrant/lib/storage/src/content_manager/snapshots/recover.rs
deleted file mode 100644
index 57dfd61..0000000
--- a/crates/qdrant/lib/storage/src/content_manager/snapshots/recover.rs
+++ /dev/null
@@ -1,288 +0,0 @@
-use collection::collection::Collection;
-use collection::config::CollectionConfig;
-use collection::operations::snapshot_ops::{SnapshotPriority, SnapshotRecover};
-use collection::shards::replica_set::ReplicaState;
-use collection::shards::shard::{PeerId, ShardId};
-use collection::shards::shard_config::ShardType;
-use collection::shards::shard_versioning::latest_shard_paths;
-
-use crate::content_manager::collection_meta_ops::{
-    CollectionMetaOperations, CreateCollectionOperation,
-};
-use crate::content_manager::snapshots::download::{download_snapshot, downloaded_snapshots_dir};
-use crate::dispatcher::Dispatcher;
-use crate::{StorageError, TableOfContent};
-
-async fn activate_shard(
-    toc: &TableOfContent,
-    collection: &Collection,
-    peer_id: PeerId,
-    shard_id: &ShardId,
-) -> Result<(), StorageError> {
-    if toc.is_distributed() {
-        log::debug!(
-            "Activating shard {} of collection {} with consensus",
-            shard_id,
-            &collection.name()
-        );
-        toc.send_set_replica_state_proposal(
-            collection.name(),
-            peer_id,
-            *shard_id,
-            ReplicaState::Active,
-            None,
-        )?;
-    } else {
-        log::debug!(
-            "Activating shard {} of collection {} locally",
-            shard_id,
-            &collection.name()
-        );
-        collection
-            .set_shard_replica_state(*shard_id, peer_id, ReplicaState::Active, None)
-            .await?;
-    }
-    Ok(())
-}
-
-pub async fn do_recover_from_snapshot(
-    dispatcher: &Dispatcher,
-    collection_name: &str,
-    source: SnapshotRecover,
-    wait: bool,
-) -> Result<bool, StorageError> {
-    let dispatch = dispatcher.clone();
-    let collection_name = collection_name.to_string();
-    let recovery =
-        tokio::spawn(
-            async move { _do_recover_from_snapshot(dispatch, &collection_name, source).await },
-        );
-    if wait {
-        Ok(recovery.await??)
-    } else {
-        Ok(true)
-    }
-}
-
-async fn _do_recover_from_snapshot(
-    dispatcher: Dispatcher,
-    collection_name: &str,
-    source: SnapshotRecover,
-) -> Result<bool, StorageError> {
-    let SnapshotRecover { location, priority } = source;
-    let toc = dispatcher.toc();
-
-    let this_peer_id = toc.this_peer_id;
-
-    let is_distributed = toc.is_distributed();
-
-    let snapshot_download_path = downloaded_snapshots_dir(toc.snapshots_path());
-    tokio::fs::create_dir_all(&snapshot_download_path).await?;
-
-    log::debug!(
-        "Downloading snapshot from {} to {}",
-        location,
-        snapshot_download_path.display()
-    );
-
-    let snapshot_path = download_snapshot(location, &snapshot_download_path).await?;
-
-    log::debug!("Snapshot downloaded to {}", snapshot_path.display());
-
-    let tmp_collection_dir = toc
-        .temp_storage_path()
-        .join("tmp_collections")
-        .join(collection_name);
-
-    log::debug!(
-        "Recovering collection {} from snapshot {}",
-        collection_name,
-        snapshot_path.display()
-    );
-
-    if tmp_collection_dir.exists() {
-        tokio::fs::remove_dir_all(&tmp_collection_dir).await?;
-    }
-    tokio::fs::create_dir_all(&tmp_collection_dir).await?;
-
-    log::debug!("Unpacking snapshot to {}", tmp_collection_dir.display());
-
-    let tmp_collection_dir_clone = tmp_collection_dir.clone();
-    let restoring = tokio::task::spawn_blocking(move || {
-        // Unpack snapshot collection to the target folder
-        Collection::restore_snapshot(
-            &snapshot_path,
-            &tmp_collection_dir_clone,
-            this_peer_id,
-            is_distributed,
-        )
-    });
-    restoring.await??;
-
-    let snapshot_config = CollectionConfig::load(&tmp_collection_dir)?;
-    snapshot_config.validate_and_warn();
-
-    let collection = match toc.get_collection(collection_name).await.ok() {
-        Some(collection) => collection,
-        None => {
-            log::debug!("Collection {} does not exist, creating it", collection_name);
-            let operation =
-                CollectionMetaOperations::CreateCollection(CreateCollectionOperation::new(
-                    collection_name.to_string(),
-                    snapshot_config.clone().into(),
-                ));
-            dispatcher
-                .submit_collection_meta_op(operation, None)
-                .await?;
-            toc.get_collection(collection_name).await?
-        }
-    };
-
-    let state = collection.state().await;
-
-    // Check config compatibility
-    // Check vectors config
-    if snapshot_config.params.vectors != state.config.params.vectors {
-        return Err(StorageError::bad_input(&format!(
-            "Snapshot is not compatible with existing collection: Collection vectors: {:?} Snapshot Vectors: {:?}",
-            state.config.params.vectors, snapshot_config.params.vectors
-        )));
-    }
-    // Check shard number
-    if snapshot_config.params.shard_number != state.config.params.shard_number {
-        return Err(StorageError::bad_input(&format!(
-            "Snapshot is not compatible with existing collection: Collection shard number: {:?} Snapshot shard number: {:?}",
-            state.config.params.shard_number, snapshot_config.params.shard_number
-        )));
-    }
-
-    // Deactivate collection local shards during recovery
-    for (shard_id, shard_info) in &state.shards {
-        let local_shard_state = shard_info.replicas.get(&this_peer_id);
-        match local_shard_state {
-            None => {} // Shard is not on this node, skip
-            Some(state) => {
-                if state != &ReplicaState::Partial {
-                    toc.send_set_replica_state_proposal(
-                        collection_name.to_string(),
-                        this_peer_id,
-                        *shard_id,
-                        ReplicaState::Partial,
-                        None,
-                    )?;
-                }
-            }
-        }
-    }
-
-    let priority = priority.unwrap_or_default();
-
-    // Recover shards from the snapshot
-    for (shard_id, shard_info) in &state.shards {
-        let shards = latest_shard_paths(&tmp_collection_dir, *shard_id).await?;
-
-        let snapshot_shard_path = shards
-            .into_iter()
-            .filter_map(
-                |(snapshot_shard_path, _version, shard_type)| match shard_type {
-                    ShardType::Local => Some(snapshot_shard_path),
-                    ShardType::ReplicaSet => Some(snapshot_shard_path),
-                    ShardType::Remote { .. } => None,
-                    ShardType::Temporary => None,
-                },
-            )
-            .next();
-
-        if let Some(snapshot_shard_path) = snapshot_shard_path {
-            log::debug!(
-                "Recovering shard {} from {}",
-                shard_id,
-                snapshot_shard_path.display()
-            );
-
-            let recovered = collection
-                .recover_local_shard_from(&snapshot_shard_path, *shard_id)
-                .await?;
-
-            if !recovered {
-                log::debug!("Shard {} if not in snapshot", shard_id);
-                continue;
-            }
-
-            // If this is the only replica, we can activate it
-            // If not - de-sync is possible, so we need to run synchronization
-            let other_active_replicas: Vec<_> = shard_info
-                .replicas
-                .iter()
-                .filter(|(peer_id, state)| {
-                    *state == &ReplicaState::Active && **peer_id != this_peer_id
-                })
-                .collect();
-
-            if other_active_replicas.is_empty() {
-                // No other active replicas, we can activate this shard
-                // as there is no de-sync possible
-                activate_shard(toc, &collection, this_peer_id, shard_id).await?;
-            } else {
-                match priority {
-                    SnapshotPriority::Snapshot => {
-                        // Snapshot is the source of truth, we need to remove all other replicas
-                        activate_shard(toc, &collection, this_peer_id, shard_id).await?;
-
-                        let replicas_to_keep = state.config.params.replication_factor.get() - 1;
-                        let mut replicas_to_remove = other_active_replicas
-                            .len()
-                            .saturating_sub(replicas_to_keep as usize);
-
-                        for (peer_id, _) in other_active_replicas {
-                            if replicas_to_remove > 0 {
-                                // Keep this replica
-                                replicas_to_remove -= 1;
-
-                                // Don't need more replicas, remove this one
-                                toc.request_remove_replica(
-                                    collection_name.to_string(),
-                                    *shard_id,
-                                    *peer_id,
-                                )?;
-                            } else {
-                                toc.send_set_replica_state_proposal(
-                                    collection_name.to_string(),
-                                    *peer_id,
-                                    *shard_id,
-                                    ReplicaState::Dead,
-                                    None,
-                                )?;
-                            }
-                        }
-                    }
-                    SnapshotPriority::Replica => {
-                        // Replica is the source of truth, we need to sync recovered data with this replica
-                        let (replica_peer_id, _state) =
-                            other_active_replicas.into_iter().next().unwrap();
-                        log::debug!(
-                            "Running synchronization for shard {} of collection {} from {}",
-                            shard_id,
-                            collection_name,
-                            replica_peer_id
-                        );
-
-                        // assume that if there is another peers, the server is distributed
-                        toc.request_shard_transfer(
-                            collection_name.to_string(),
-                            *shard_id,
-                            *replica_peer_id,
-                            this_peer_id,
-                            true,
-                        )?;
-                    }
-                }
-            }
-        }
-    }
-
-    // Remove tmp collection dir
-    tokio::fs::remove_dir_all(&tmp_collection_dir).await?;
-
-    Ok(true)
-}
diff --git a/crates/qdrant/lib/storage/src/content_manager/toc.rs b/crates/qdrant/lib/storage/src/content_manager/toc.rs
deleted file mode 100644
index 38cbbf6..0000000
--- a/crates/qdrant/lib/storage/src/content_manager/toc.rs
+++ /dev/null
@@ -1,1750 +0,0 @@
-use std::cmp::max;
-use std::collections::{HashMap, HashSet};
-use std::fs::{create_dir_all, read_dir};
-use std::num::NonZeroU32;
-use std::path::{Path, PathBuf};
-use std::sync::atomic::{AtomicBool, Ordering};
-use std::sync::Arc;
-
-use collection::collection::{Collection, RequestShardTransfer};
-use collection::collection_state;
-use collection::config::{
-    default_replication_factor, default_write_consistency_factor, CollectionConfig,
-    CollectionParams,
-};
-use collection::grouping::group_by::GroupRequest;
-use collection::grouping::GroupBy;
-use collection::operations::config_diff::DiffConfig;
-use collection::operations::consistency_params::ReadConsistency;
-use collection::operations::point_ops::WriteOrdering;
-use collection::operations::snapshot_ops::SnapshotDescription;
-use collection::operations::types::{
-    AliasDescription, CollectionResult, CountRequest, CountResult, GroupsResult, PointRequest,
-    RecommendRequest, RecommendRequestBatch, Record, ScrollRequest, ScrollResult, SearchRequest,
-    SearchRequestBatch, UpdateResult, VectorsConfig,
-};
-use collection::operations::CollectionUpdateOperations;
-use collection::recommendations::{recommend_batch_by, recommend_by};
-use collection::shards::channel_service::ChannelService;
-use collection::shards::collection_shard_distribution::CollectionShardDistribution;
-use collection::shards::replica_set::ReplicaState;
-use collection::shards::shard::{PeerId, ShardId};
-use collection::shards::transfer::shard_transfer::{
-    validate_transfer, validate_transfer_exists, ShardTransfer,
-};
-use collection::shards::{replica_set, CollectionId};
-use collection::telemetry::CollectionTelemetry;
-use segment::common::cpu::get_num_cpus;
-use segment::types::ScoredPoint;
-use tokio::runtime::Runtime;
-use tokio::sync::{Mutex, RwLock, RwLockReadGuard, Semaphore};
-use uuid::Uuid;
-
-use super::collection_meta_ops::{
-    CreateCollectionOperation, SetShardReplicaState, ShardTransferOperations,
-    UpdateCollectionOperation,
-};
-use super::{consensus_manager, CollectionContainer};
-use crate::content_manager::alias_mapping::AliasPersistence;
-use crate::content_manager::collection_meta_ops::{
-    AliasOperations, ChangeAliasesOperation, CollectionMetaOperations, CreateAlias,
-    CreateAliasOperation, CreateCollection, DeleteAlias, DeleteAliasOperation, RenameAlias,
-    RenameAliasOperation, UpdateCollection,
-};
-use crate::content_manager::collections_ops::{Checker, Collections};
-use crate::content_manager::consensus::operation_sender::OperationSender;
-use crate::content_manager::data_transfer::{populate_collection, transfer_indexes};
-use crate::content_manager::errors::StorageError;
-use crate::content_manager::shard_distribution::ShardDistributionProposal;
-use crate::types::{PeerAddressById, StorageConfig};
-use crate::ConsensusOperations;
-
-pub const ALIASES_PATH: &str = "aliases";
-pub const COLLECTIONS_DIR: &str = "collections";
-pub const SNAPSHOTS_TEMP_DIR: &str = "snapshots_temp";
-pub const FULL_SNAPSHOT_FILE_NAME: &str = "full-snapshot";
-pub const DEFAULT_WRITE_LOCK_ERROR_MESSAGE: &str = "Write operations are forbidden";
-
-/// The main object of the service. It holds all objects, required for proper functioning.
-/// In most cases only one `TableOfContent` is enough for service. It is created only once during
-/// the launch of the service.
-pub struct TableOfContent {
-    collections: Arc<RwLock<Collections>>,
-    storage_config: Arc<StorageConfig>,
-    search_runtime: Runtime,
-    update_runtime: Runtime,
-    general_runtime: Runtime,
-    alias_persistence: RwLock<AliasPersistence>,
-    pub this_peer_id: PeerId,
-    channel_service: ChannelService,
-    /// Backlink to the consensus, if none - single node mode
-    consensus_proposal_sender: Option<OperationSender>,
-    is_write_locked: AtomicBool,
-    lock_error_message: parking_lot::Mutex<Option<String>>,
-    /// Prevent DDoS of too many concurrent updates in distributed mode.
-    /// One external update usually triggers multiple internal updates, which breaks internal
-    /// timings. For example, the health check timing and consensus timing.
-    ///
-    /// If not defined - no rate limiting is applied.
-    update_rate_limiter: Option<Semaphore>,
-    /// A lock to prevent concurrent collection creation.
-    /// Effectively, this lock ensures that `create_collection` is called sequentially.
-    collection_create_lock: Mutex<()>,
-}
-
-impl TableOfContent {
-    /// PeerId does not change during execution so it is ok to copy it here.
-    pub fn new(
-        storage_config: &StorageConfig,
-        search_runtime: Runtime,
-        update_runtime: Runtime,
-        general_runtime: Runtime,
-        channel_service: ChannelService,
-        this_peer_id: PeerId,
-        consensus_proposal_sender: Option<OperationSender>,
-    ) -> Self {
-        let snapshots_path = Path::new(&storage_config.snapshots_path.clone()).to_owned();
-        create_dir_all(&snapshots_path).expect("Can't create Snapshots directory");
-        let collections_path = Path::new(&storage_config.storage_path).join(COLLECTIONS_DIR);
-        create_dir_all(&collections_path).expect("Can't create Collections directory");
-        if let Some(path) = storage_config.temp_path.as_deref() {
-            let temp_path = Path::new(path);
-            create_dir_all(temp_path).expect("Can't create temporary files directory");
-        }
-        let collection_paths =
-            read_dir(&collections_path).expect("Can't read Collections directory");
-        let mut collections: HashMap<String, Collection> = Default::default();
-        for entry in collection_paths {
-            let collection_path = entry
-                .expect("Can't access of one of the collection files")
-                .path();
-
-            if !CollectionConfig::check(&collection_path) {
-                log::warn!(
-                    "Collection config is not found in the collection directory: {:?}, skipping",
-                    collection_path
-                );
-                continue;
-            }
-
-            let collection_name = collection_path
-                .file_name()
-                .expect("Can't resolve a filename of one of the collection files")
-                .to_str()
-                .expect("A filename of one of the collection files is not a valid UTF-8")
-                .to_string();
-            let collection_snapshots_path =
-                Self::collection_snapshots_path(&snapshots_path, &collection_name);
-            create_dir_all(&collection_snapshots_path).unwrap_or_else(|e| {
-                panic!("Can't create a directory for snapshot of {collection_name}: {e}")
-            });
-            log::info!("Loading collection: {}", collection_name);
-            let collection = general_runtime.block_on(Collection::load(
-                collection_name.clone(),
-                this_peer_id,
-                &collection_path,
-                &collection_snapshots_path,
-                storage_config.to_shared_storage_config().into(),
-                channel_service.clone(),
-                Self::change_peer_state_callback(
-                    consensus_proposal_sender.clone(),
-                    collection_name.clone(),
-                    ReplicaState::Dead,
-                    None,
-                ),
-                Self::request_shard_transfer_callback(
-                    consensus_proposal_sender.clone(),
-                    collection_name.clone(),
-                ),
-                Some(search_runtime.handle().clone()),
-                Some(update_runtime.handle().clone()),
-            ));
-
-            collections.insert(collection_name, collection);
-        }
-        let alias_path = Path::new(&storage_config.storage_path).join(ALIASES_PATH);
-        let alias_persistence =
-            AliasPersistence::open(alias_path).expect("Can't open database by the provided config");
-
-        let rate_limiter = match storage_config.performance.update_rate_limit {
-            Some(limit) => Some(Semaphore::new(limit)),
-            None => {
-                if consensus_proposal_sender.is_some() {
-                    // Auto adjust the rate limit in distributed mode.
-                    // Select number of working threads as a guess.
-                    let limit = max(get_num_cpus(), 2);
-                    log::debug!(
-                        "Auto adjusting update rate limit to {} parallel update requests",
-                        limit
-                    );
-                    Some(Semaphore::new(limit))
-                } else {
-                    None
-                }
-            }
-        };
-
-        TableOfContent {
-            collections: Arc::new(RwLock::new(collections)),
-            storage_config: Arc::new(storage_config.clone()),
-            search_runtime,
-            update_runtime,
-            general_runtime,
-            alias_persistence: RwLock::new(alias_persistence),
-            this_peer_id,
-            channel_service,
-            consensus_proposal_sender,
-            is_write_locked: AtomicBool::new(false),
-            lock_error_message: parking_lot::Mutex::new(None),
-            update_rate_limiter: rate_limiter,
-            collection_create_lock: Default::default(),
-        }
-    }
-
-    /// Return `true` if service is working in distributed mode.
-    pub fn is_distributed(&self) -> bool {
-        self.consensus_proposal_sender.is_some()
-    }
-
-    fn get_collection_path(&self, collection_name: &str) -> PathBuf {
-        Path::new(&self.storage_config.storage_path)
-            .join(COLLECTIONS_DIR)
-            .join(collection_name)
-    }
-
-    pub fn storage_path(&self) -> &str {
-        &self.storage_config.storage_path
-    }
-
-    pub fn snapshots_path(&self) -> &str {
-        &self.storage_config.snapshots_path
-    }
-
-    /// Get path for temporary snapshot files.
-    ///
-    /// Defaults to `snapshot_path()`.
-    /// A user may specify `storage.temp_path` to override this.
-    pub fn temp_snapshots_path(&self) -> &Path {
-        Path::new(self.temp_path().unwrap_or_else(|| self.snapshots_path()))
-    }
-
-    pub fn temp_path(&self) -> Option<&str> {
-        self.storage_config.temp_path.as_deref()
-    }
-
-    /// Get path for temporary storage files.
-    ///
-    /// Defaults to `storage_path()`.
-    /// A user may specify `storage.temp_path` to override this.
-    pub fn temp_storage_path(&self) -> &Path {
-        Path::new(self.temp_path().unwrap_or_else(|| self.storage_path()))
-    }
-
-    fn collection_snapshots_path(snapshots_path: &Path, collection_name: &str) -> PathBuf {
-        snapshots_path.join(collection_name)
-    }
-
-    pub fn snapshots_path_for_collection(&self, collection_name: &str) -> PathBuf {
-        Self::collection_snapshots_path(
-            Path::new(&self.storage_config.snapshots_path),
-            collection_name,
-        )
-    }
-
-    pub async fn create_snapshots_path(
-        &self,
-        collection_name: &str,
-    ) -> Result<PathBuf, StorageError> {
-        let snapshots_path = self.snapshots_path_for_collection(collection_name);
-        tokio::fs::create_dir_all(&snapshots_path)
-            .await
-            .map_err(|err| {
-                StorageError::service_error(format!(
-                    "Can't create directory for snapshots {collection_name}. Error: {err}"
-                ))
-            })?;
-
-        Ok(snapshots_path)
-    }
-
-    async fn create_collection_path(&self, collection_name: &str) -> Result<PathBuf, StorageError> {
-        let path = self.get_collection_path(collection_name);
-
-        if path.exists() {
-            if CollectionConfig::check(&path) {
-                return Err(StorageError::bad_input(&format!(
-                    "Can't create collection with name {collection_name}. Collection data already exists at {path}",
-                    collection_name = collection_name,
-                    path = path.display(),
-                )));
-            } else {
-                // Collection doesn't have a valid config, remove it
-                log::debug!(
-                    "Removing invalid collection path {path} from storage",
-                    path = path.display(),
-                );
-                tokio::fs::remove_dir_all(&path).await.map_err(|err| {
-                    StorageError::service_error(format!(
-                        "Can't clear directory for collection {collection_name}. Error: {err}"
-                    ))
-                })?;
-            }
-        }
-
-        tokio::fs::create_dir_all(&path).await.map_err(|err| {
-            StorageError::service_error(format!(
-                "Can't create directory for collection {collection_name}. Error: {err}"
-            ))
-        })?;
-
-        Ok(path)
-    }
-
-    /// Finds the original name of the collection
-    ///
-    /// # Arguments
-    ///
-    /// * `collection_name` - Name of the collection or alias to resolve
-    /// * `collections` - A reference to the collections map
-    /// * `aliases` - A reference to the aliases storage
-    ///
-    /// # Result
-    ///
-    /// If the collection exists - return its name
-    /// If alias exists - returns the original collection name
-    /// If neither exists - returns [`StorageError`]
-    async fn resolve_name(
-        collection_name: &str,
-        collections: &Collections,
-        aliases: &AliasPersistence,
-    ) -> Result<String, StorageError> {
-        let alias_collection_name = aliases.get(collection_name);
-
-        let resolved_name = match alias_collection_name {
-            None => collection_name.to_string(),
-            Some(resolved_alias) => resolved_alias,
-        };
-        collections
-            .validate_collection_exists(&resolved_name)
-            .await?;
-        Ok(resolved_name)
-    }
-
-    async fn create_collection(
-        &self,
-        collection_name: &str,
-        operation: CreateCollection,
-        collection_shard_distribution: CollectionShardDistribution,
-    ) -> Result<bool, StorageError> {
-        // Collection operations require multiple file operations,
-        // before collection can actually be registered in the service.
-        // To prevent parallel writing of the files, we use this lock.
-        let collection_create_guard = self.collection_create_lock.lock().await;
-
-        let CreateCollection {
-            vectors,
-            shard_number,
-            on_disk_payload,
-            hnsw_config: hnsw_config_diff,
-            wal_config: wal_config_diff,
-            optimizers_config: optimizers_config_diff,
-            replication_factor,
-            write_consistency_factor,
-            init_from,
-            quantization_config,
-        } = operation;
-
-        self.collections
-            .read()
-            .await
-            .validate_collection_not_exists(collection_name)
-            .await?;
-
-        if self
-            .alias_persistence
-            .read()
-            .await
-            .check_alias_exists(collection_name)
-        {
-            return Err(StorageError::bad_input(&format!(
-                "Can't create collection with name {collection_name}. Alias with the same name already exists",
-            )));
-        }
-
-        if let Some(init_from) = &init_from {
-            self.check_collections_compatibility(&vectors, &init_from.collection)
-                .await?;
-        }
-
-        let collection_path = self.create_collection_path(collection_name).await?;
-        let snapshots_path = self.create_snapshots_path(collection_name).await?;
-
-        if let Some(shard_number) = shard_number {
-            debug_assert_eq!(
-                shard_number as usize,
-                collection_shard_distribution.shard_count(),
-                "If shard number was supplied then this exact number should be used in a distribution"
-            )
-        }
-        let replication_factor =
-            replication_factor.unwrap_or_else(|| default_replication_factor().get());
-
-        let write_consistency_factor =
-            write_consistency_factor.unwrap_or_else(|| default_write_consistency_factor().get());
-
-        let collection_params = CollectionParams {
-            vectors,
-            shard_number: NonZeroU32::new(collection_shard_distribution.shard_count() as u32)
-                .ok_or(StorageError::BadInput {
-                    description: "`shard_number` cannot be 0".to_string(),
-                })?,
-            on_disk_payload: on_disk_payload.unwrap_or(self.storage_config.on_disk_payload),
-            replication_factor: NonZeroU32::new(replication_factor).ok_or(
-                StorageError::BadInput {
-                    description: "`replication_factor` cannot be 0".to_string(),
-                },
-            )?,
-            write_consistency_factor: NonZeroU32::new(write_consistency_factor).ok_or(
-                StorageError::BadInput {
-                    description: "`write_consistency_factor` cannot be 0".to_string(),
-                },
-            )?,
-        };
-        let wal_config = match wal_config_diff {
-            None => self.storage_config.wal.clone(),
-            Some(diff) => diff.update(&self.storage_config.wal)?,
-        };
-
-        let optimizers_config = match optimizers_config_diff {
-            None => self.storage_config.optimizers.clone(),
-            Some(diff) => diff.update(&self.storage_config.optimizers)?,
-        };
-
-        let hnsw_config = match hnsw_config_diff {
-            None => self.storage_config.hnsw_index.clone(),
-            Some(diff) => diff.update(&self.storage_config.hnsw_index)?,
-        };
-
-        let quantization_config = match quantization_config {
-            None => self.storage_config.quantization.clone(),
-            Some(diff) => Some(diff),
-        };
-
-        let collection_config = CollectionConfig {
-            wal_config,
-            params: collection_params,
-            optimizer_config: optimizers_config,
-            hnsw_config,
-            quantization_config,
-        };
-        let collection = Collection::new(
-            collection_name.to_string(),
-            self.this_peer_id,
-            &collection_path,
-            &snapshots_path,
-            &collection_config,
-            self.storage_config.to_shared_storage_config().into(),
-            collection_shard_distribution,
-            self.channel_service.clone(),
-            Self::change_peer_state_callback(
-                self.consensus_proposal_sender.clone(),
-                collection_name.to_string(),
-                ReplicaState::Dead,
-                None,
-            ),
-            Self::request_shard_transfer_callback(
-                self.consensus_proposal_sender.clone(),
-                collection_name.to_string(),
-            ),
-            Some(self.search_runtime.handle().clone()),
-            Some(self.update_runtime.handle().clone()),
-        )
-        .await?;
-
-        let local_shards = collection.get_local_shards().await;
-
-        {
-            let mut write_collections = self.collections.write().await;
-            write_collections
-                .validate_collection_not_exists(collection_name)
-                .await?;
-            write_collections.insert(collection_name.to_string(), collection);
-        }
-
-        drop(collection_create_guard);
-
-        // Notify the collection is created and ready to use
-        for shard_id in local_shards {
-            self.on_peer_created(collection_name.to_string(), self.this_peer_id, shard_id)
-                .await?;
-        }
-
-        if let Some(init_from) = init_from {
-            self.run_data_initialization(init_from.collection, collection_name.to_string())
-                .await;
-        }
-
-        Ok(true)
-    }
-
-    async fn check_collections_compatibility(
-        &self,
-        vectors: &VectorsConfig,
-        source_collection: &CollectionId,
-    ) -> Result<(), StorageError> {
-        let collection = self.get_collection(source_collection).await?;
-        let collection_vectors_schema = collection.state().await.config.params.vectors;
-        collection_vectors_schema.check_compatible(vectors)?;
-        Ok(())
-    }
-
-    pub async fn run_data_initialization(
-        &self,
-        from_collection: CollectionId,
-        to_collection: CollectionId,
-    ) {
-        let collections = self.collections.clone();
-        let this_peer_id = self.this_peer_id;
-        self.general_runtime.spawn(async move {
-            // Create indexes
-            match transfer_indexes(
-                collections.clone(),
-                &from_collection,
-                &to_collection,
-                this_peer_id,
-            )
-            .await
-            {
-                Ok(_) => {}
-                Err(err) => {
-                    log::error!("Initialization failed: {}", err)
-                }
-            }
-
-            // Transfer data
-            match populate_collection(collections, &from_collection, &to_collection, this_peer_id)
-                .await
-            {
-                Ok(_) => log::info!(
-                    "Collection {} initialized with data from {}",
-                    to_collection,
-                    from_collection
-                ),
-                Err(err) => log::error!("Initialization failed: {}", err),
-            }
-        });
-    }
-
-    async fn on_peer_created(
-        &self,
-        collection_name: String,
-        peer_id: PeerId,
-        shard_id: ShardId,
-    ) -> CollectionResult<()> {
-        if let Some(proposal_sender) = &self.consensus_proposal_sender {
-            let operation =
-                ConsensusOperations::initialize_replica(collection_name.clone(), shard_id, peer_id);
-            if let Err(send_error) = proposal_sender.send(operation) {
-                log::error!(
-                        "Can't send proposal to deactivate replica on peer {} of shard {} of collection {}. Error: {}",
-                        peer_id,
-                        shard_id,
-                        collection_name,
-                        send_error
-                    );
-            }
-        } else {
-            // Just activate the shard
-            let collections = self.collections.read().await;
-            if let Some(collection) = collections.get(&collection_name) {
-                collection
-                    .set_shard_replica_state(
-                        shard_id,
-                        peer_id,
-                        ReplicaState::Active,
-                        Some(ReplicaState::Initializing),
-                    )
-                    .await?;
-            }
-        }
-        Ok(())
-    }
-
-    fn send_set_replica_state_proposal_op(
-        proposal_sender: &OperationSender,
-        collection_name: String,
-        peer_id: PeerId,
-        shard_id: ShardId,
-        state: ReplicaState,
-        from_state: Option<ReplicaState>,
-    ) -> Result<(), StorageError> {
-        let operation = ConsensusOperations::set_replica_state(
-            collection_name,
-            shard_id,
-            peer_id,
-            state,
-            from_state,
-        );
-        proposal_sender.send(operation)
-    }
-
-    fn send_remove_replica_proposal_op(
-        proposal_sender: &OperationSender,
-        collection_name: String,
-        peer_id: PeerId,
-        shard_id: ShardId,
-    ) -> Result<(), StorageError> {
-        let operation = ConsensusOperations::remove_replica(collection_name, shard_id, peer_id);
-        proposal_sender.send(operation)
-    }
-
-    fn on_transfer_failure_callback(
-        proposal_sender: Option<OperationSender>,
-    ) -> collection::collection::OnTransferFailure {
-        Arc::new(move |transfer, collection_name, reason| {
-            if let Some(proposal_sender) = &proposal_sender {
-                let operation = ConsensusOperations::abort_transfer(
-                    collection_name.clone(),
-                    transfer.clone(),
-                    reason,
-                );
-                if let Err(send_error) = proposal_sender.send(operation) {
-                    log::error!(
-                        "Can't send proposal to abort transfer of shard {} of collection {}. Error: {}",
-                        transfer.shard_id,
-                        collection_name,
-                        send_error
-                    );
-                }
-            }
-        })
-    }
-
-    fn on_transfer_success_callback(
-        proposal_sender: Option<OperationSender>,
-    ) -> collection::collection::OnTransferSuccess {
-        Arc::new(move |transfer, collection_name| {
-            if let Some(proposal_sender) = &proposal_sender {
-                let operation =
-                    ConsensusOperations::finish_transfer(collection_name.clone(), transfer.clone());
-                if let Err(send_error) = proposal_sender.send(operation) {
-                    log::error!(
-                        "Can't send proposal to complete transfer of shard {} of collection {}. Error: {}",
-                        transfer.shard_id,
-                        collection_name,
-                        send_error
-                    );
-                }
-            }
-        })
-    }
-
-    fn change_peer_state_callback(
-        proposal_sender: Option<OperationSender>,
-        collection_name: String,
-        state: ReplicaState,
-        from_state: Option<ReplicaState>,
-    ) -> replica_set::ChangePeerState {
-        Arc::new(move |peer_id, shard_id| {
-            if let Some(proposal_sender) = &proposal_sender {
-                if let Err(send_error) = Self::send_set_replica_state_proposal_op(
-                    proposal_sender,
-                    collection_name.clone(),
-                    peer_id,
-                    shard_id,
-                    state,
-                    from_state,
-                ) {
-                    log::error!(
-                        "Can't send proposal to deactivate replica on peer {} of shard {} of collection {}. Error: {}",
-                        peer_id,
-                        shard_id,
-                        collection_name,
-                        send_error
-                    );
-                }
-            } else {
-                log::error!("Can't send proposal to deactivate replica. Error: this is a single node deployment");
-            }
-        })
-    }
-
-    pub fn request_snapshot(&self) -> Result<(), StorageError> {
-        let sender = match &self.consensus_proposal_sender {
-            Some(sender) => sender,
-            None => {
-                return Err(StorageError::service_error(
-                    "Qdrant is running in standalone mode",
-                ))
-            }
-        };
-
-        sender.send(ConsensusOperations::request_snapshot())?;
-
-        Ok(())
-    }
-
-    pub fn send_set_replica_state_proposal(
-        &self,
-        collection_name: String,
-        peer_id: PeerId,
-        shard_id: ShardId,
-        state: ReplicaState,
-        from_state: Option<ReplicaState>,
-    ) -> Result<(), StorageError> {
-        if let Some(operation_sender) = &self.consensus_proposal_sender {
-            Self::send_set_replica_state_proposal_op(
-                operation_sender,
-                collection_name,
-                peer_id,
-                shard_id,
-                state,
-                from_state,
-            )?;
-        }
-        Ok(())
-    }
-
-    fn request_shard_transfer_callback(
-        proposal_sender: Option<OperationSender>,
-        collection_name: String,
-    ) -> RequestShardTransfer {
-        Arc::new(move |shard_transfer| {
-            if let Some(proposal_sender) = &proposal_sender {
-                let collection_name = collection_name.clone();
-                let to_peer = shard_transfer.to;
-                let operation =
-                    ConsensusOperations::start_transfer(collection_name.clone(), shard_transfer);
-                if let Err(send_error) = proposal_sender.send(operation) {
-                    log::error!(
-                        "Can't send proposal to request shard transfer to peer {} of collection {}. Error: {}",
-                        to_peer,
-                        collection_name,
-                        send_error
-                    );
-                }
-            } else {
-                log::error!("Can't send proposal to request shard transfer. Error: this is a single node deployment");
-            }
-        })
-    }
-
-    pub fn request_shard_transfer(
-        &self,
-        collection_name: String,
-        shard_id: ShardId,
-        from_peer: PeerId,
-        to_peer: PeerId,
-        sync: bool,
-    ) -> Result<(), StorageError> {
-        if let Some(proposal_sender) = &self.consensus_proposal_sender {
-            let transfer_request = ShardTransfer {
-                shard_id,
-                from: from_peer,
-                to: to_peer,
-                sync,
-            };
-            let operation = ConsensusOperations::start_transfer(collection_name, transfer_request);
-            proposal_sender.send(operation)?;
-        }
-        Ok(())
-    }
-
-    pub fn request_remove_replica(
-        &self,
-        collection_name: String,
-        shard_id: ShardId,
-        peer_id: PeerId,
-    ) -> Result<(), StorageError> {
-        if let Some(proposal_sender) = &self.consensus_proposal_sender {
-            Self::send_remove_replica_proposal_op(
-                proposal_sender,
-                collection_name,
-                peer_id,
-                shard_id,
-            )?;
-        }
-        Ok(())
-    }
-
-    async fn update_collection(
-        &self,
-        mut operation: UpdateCollectionOperation,
-    ) -> Result<bool, StorageError> {
-        let replica_changes = operation.take_shard_replica_changes();
-        let UpdateCollection {
-            vectors,
-            hnsw_config,
-            params,
-            optimizers_config,
-            quantization_config,
-        } = operation.update_collection;
-        let collection = self.get_collection(&operation.collection_name).await?;
-        let mut recreate_optimizers = false;
-
-        if let Some(diff) = optimizers_config {
-            collection.update_optimizer_params_from_diff(diff).await?;
-            recreate_optimizers = true;
-        }
-        if let Some(diff) = params {
-            collection.update_params_from_diff(diff).await?;
-            recreate_optimizers = true;
-        }
-        if let Some(diff) = hnsw_config {
-            collection.update_hnsw_config_from_diff(diff).await?;
-            recreate_optimizers = true;
-        }
-        if let Some(diff) = vectors {
-            collection.update_vectors_from_diff(&diff).await?;
-            recreate_optimizers = true;
-        }
-        if let Some(diff) = quantization_config {
-            collection
-                .update_quantization_config_from_diff(diff)
-                .await?;
-            recreate_optimizers = true;
-        }
-        if let Some(changes) = replica_changes {
-            collection.handle_replica_changes(changes).await?;
-        }
-
-        // Recreate optimizers
-        if recreate_optimizers {
-            collection.recreate_optimizers_blocking().await?;
-        }
-        Ok(true)
-    }
-
-    async fn delete_collection(&self, collection_name: &str) -> Result<bool, StorageError> {
-        if let Some(removed) = self.collections.write().await.remove(collection_name) {
-            self.alias_persistence
-                .write()
-                .await
-                .remove_collection(collection_name)?;
-
-            let path = self.get_collection_path(collection_name);
-            drop(removed);
-
-            // Move collection to ".deleted" folder to prevent accidental reuse
-            let uuid = Uuid::new_v4().to_string();
-            let removed_collections_path =
-                Path::new(&self.storage_config.storage_path).join(".deleted");
-            tokio::fs::create_dir_all(&removed_collections_path).await?;
-            let deleted_path = removed_collections_path
-                .join(collection_name)
-                .with_extension(uuid);
-            tokio::fs::rename(path, &deleted_path).await?;
-
-            // At this point collection is removed from memory and moved to ".deleted" folder.
-            // Next time we load service the collection will not appear in the list of collections.
-            // We can take our time to delete the collection from disk.
-            tokio::spawn(async move {
-                if let Err(error) = tokio::fs::remove_dir_all(&deleted_path).await {
-                    log::error!(
-                        "Can't delete collection {} from disk. Error: {}",
-                        deleted_path.display(),
-                        error
-                    );
-                }
-            });
-            Ok(true)
-        } else {
-            Ok(false)
-        }
-    }
-
-    /// performs several alias changes in an atomic fashion
-    async fn update_aliases(
-        &self,
-        operation: ChangeAliasesOperation,
-    ) -> Result<bool, StorageError> {
-        // Lock all collections for alias changes
-        // Prevent search on partially switched collections
-        let collection_lock = self.collections.write().await;
-        let mut alias_lock = self.alias_persistence.write().await;
-        for action in operation.actions {
-            match action {
-                AliasOperations::CreateAlias(CreateAliasOperation {
-                    create_alias:
-                        CreateAlias {
-                            collection_name,
-                            alias_name,
-                        },
-                }) => {
-                    collection_lock
-                        .validate_collection_exists(&collection_name)
-                        .await?;
-                    collection_lock
-                        .validate_collection_not_exists(&alias_name)
-                        .await?;
-
-                    alias_lock.insert(alias_name, collection_name)?;
-                }
-                AliasOperations::DeleteAlias(DeleteAliasOperation {
-                    delete_alias: DeleteAlias { alias_name },
-                }) => {
-                    alias_lock.remove(&alias_name)?;
-                }
-                AliasOperations::RenameAlias(RenameAliasOperation {
-                    rename_alias:
-                        RenameAlias {
-                            old_alias_name,
-                            new_alias_name,
-                        },
-                }) => {
-                    alias_lock.rename_alias(&old_alias_name, new_alias_name)?;
-                }
-            };
-        }
-        Ok(true)
-    }
-
-    pub fn perform_collection_meta_op_sync(
-        &self,
-        operation: CollectionMetaOperations,
-    ) -> Result<bool, StorageError> {
-        self.general_runtime
-            .block_on(self.perform_collection_meta_op(operation))
-    }
-
-    pub async fn perform_collection_meta_op(
-        &self,
-        operation: CollectionMetaOperations,
-    ) -> Result<bool, StorageError> {
-        match operation {
-            CollectionMetaOperations::CreateCollection(mut operation) => {
-                log::debug!("Creating collection {}", operation.collection_name);
-                let distribution = match operation.take_distribution() {
-                    None => CollectionShardDistribution::all_local(
-                        operation.create_collection.shard_number,
-                        self.this_peer_id,
-                    ),
-                    Some(distribution) => distribution.into(),
-                };
-                self.create_collection(
-                    &operation.collection_name,
-                    operation.create_collection,
-                    distribution,
-                )
-                .await
-            }
-            CollectionMetaOperations::UpdateCollection(operation) => {
-                log::debug!("Updating collection {}", operation.collection_name);
-                self.update_collection(operation).await
-            }
-            CollectionMetaOperations::DeleteCollection(operation) => {
-                log::debug!("Deleting collection {}", operation.0);
-                self.delete_collection(&operation.0).await
-            }
-            CollectionMetaOperations::ChangeAliases(operation) => {
-                log::debug!("Changing aliases");
-                self.update_aliases(operation).await
-            }
-            CollectionMetaOperations::TransferShard(collection, operation) => {
-                log::debug!("Transfer shard {:?} of {}", operation, collection);
-
-                self.handle_transfer(collection, operation)
-                    .await
-                    .map(|()| true)
-            }
-            CollectionMetaOperations::SetShardReplicaState(operation) => {
-                log::debug!("Set shard replica state {:?}", operation);
-                self.set_shard_replica_state(operation).await.map(|()| true)
-            }
-            CollectionMetaOperations::Nop { .. } => Ok(true),
-        }
-    }
-
-    pub async fn set_shard_replica_state(
-        &self,
-        operation: SetShardReplicaState,
-    ) -> Result<(), StorageError> {
-        self.get_collection(&operation.collection_name)
-            .await?
-            .set_shard_replica_state(
-                operation.shard_id,
-                operation.peer_id,
-                operation.state,
-                operation.from_state,
-            )
-            .await?;
-        Ok(())
-    }
-
-    /// Cancels all transfers where the source peer is the current peer.
-    pub async fn cancel_outgoing_all_transfers(&self, reason: &str) -> Result<(), StorageError> {
-        let collections = self.collections.read().await;
-        if let Some(proposal_sender) = &self.consensus_proposal_sender {
-            for collection in collections.values() {
-                for transfer in collection.get_outgoing_transfers(&self.this_peer_id).await {
-                    let cancel_transfer =
-                        ConsensusOperations::abort_transfer(collection.name(), transfer, reason);
-                    proposal_sender.send(cancel_transfer)?;
-                }
-            }
-        } else {
-            log::error!("Can't cancel outgoing transfers, this is a single node deployment");
-        }
-        Ok(())
-    }
-
-    pub async fn handle_transfer(
-        &self,
-        collection_id: CollectionId,
-        transfer_operation: ShardTransferOperations,
-    ) -> Result<(), StorageError> {
-        let collection = self.get_collection(&collection_id).await?;
-        let proposal_sender = if let Some(proposal_sender) = self.consensus_proposal_sender.clone()
-        {
-            proposal_sender
-        } else {
-            return Err(StorageError::service_error(
-                "Can't handle transfer, this is a single node deployment",
-            ));
-        };
-
-        match transfer_operation {
-            ShardTransferOperations::Start(transfer) => {
-                let collection_state::State {
-                    config: _,
-                    shards,
-                    transfers,
-                } = collection.state().await;
-                let all_peers: HashSet<_> = self
-                    .channel_service
-                    .id_to_address
-                    .read()
-                    .keys()
-                    .cloned()
-                    .collect();
-                let shard_state = shards.get(&transfer.shard_id).map(|info| &info.replicas);
-
-                // Valid transfer:
-                // All peers: 123, 321, 111, 222, 333
-                // Peers: shard_id=1 - [{123: Active}]
-                // Transfer: {123 -> 321}, shard_id=1
-
-                // Invalid transfer:
-                // All peers: 123, 321, 111, 222, 333
-                // Peers: shard_id=1 - [{123: Active}]
-                // Transfer: {321 -> 123}, shard_id=1
-
-                validate_transfer(&transfer, &all_peers, shard_state, &transfers)?;
-
-                let collection_id_clone = collection_id.clone();
-                let transfer_clone = transfer.clone();
-
-                let on_finish_sender = proposal_sender.clone();
-                let on_finish = async move {
-                    let operation =
-                        ConsensusOperations::finish_transfer(collection_id_clone, transfer_clone);
-
-                    if let Err(error) = on_finish_sender.send(operation) {
-                        log::error!("Can't report transfer progress to consensus: {}", error)
-                    };
-                };
-
-                let collection_id_clone = collection_id.clone();
-                let transfer_clone = transfer.clone();
-
-                let on_failure = async move {
-                    if let Err(error) = proposal_sender.send(ConsensusOperations::abort_transfer(
-                        collection_id_clone,
-                        transfer_clone,
-                        "transmission failed",
-                    )) {
-                        log::error!("Can't report transfer progress to consensus: {}", error)
-                    };
-                };
-
-                collection
-                    .start_shard_transfer(transfer, on_finish, on_failure)
-                    .await?;
-            }
-            ShardTransferOperations::Finish(transfer) => {
-                // Validate transfer exists to prevent double handling
-                validate_transfer_exists(&transfer.key(), &collection.state().await.transfers)?;
-                collection.finish_shard_transfer(transfer).await?;
-            }
-            ShardTransferOperations::Abort { transfer, reason } => {
-                // Validate transfer exists to prevent double handling
-                validate_transfer_exists(&transfer, &collection.state().await.transfers)?;
-                log::warn!("Aborting shard transfer: {reason}");
-                collection.abort_shard_transfer(transfer).await?;
-            }
-        };
-        Ok(())
-    }
-
-    async fn get_collection_opt(
-        &self,
-        collection_name: String,
-    ) -> Option<RwLockReadGuard<Collection>> {
-        self.get_collection(&collection_name).await.ok()
-    }
-
-    pub async fn get_collection(
-        &self,
-        collection_name: &str,
-    ) -> Result<RwLockReadGuard<Collection>, StorageError> {
-        let read_collection = self.collections.read().await;
-
-        let real_collection_name = {
-            let alias_persistence = self.alias_persistence.read().await;
-            Self::resolve_name(collection_name, &read_collection, &alias_persistence).await?
-        };
-        // resolve_name already checked collection existence, unwrap is safe here
-        Ok(RwLockReadGuard::map(read_collection, |collection| {
-            collection.get(&real_collection_name).unwrap()
-        }))
-    }
-
-    /// Initiate receiving shard.
-    ///
-    /// Fails if the collection does not exist
-    pub async fn initiate_receiving_shard(
-        &self,
-        collection_name: String,
-        shard_id: ShardId,
-    ) -> Result<(), StorageError> {
-        log::info!(
-            "Initiating receiving shard {}:{}",
-            collection_name,
-            shard_id
-        );
-        let initiate_shard_transfer_future = self
-            .get_collection(&collection_name)
-            .await?
-            .initiate_shard_transfer(shard_id);
-        initiate_shard_transfer_future.await?;
-        Ok(())
-    }
-
-    /// Recommend points using positive and negative example from the request
-    ///
-    /// # Arguments
-    ///
-    /// * `collection_name` - for what collection do we recommend
-    /// * `request` - [`RecommendRequest`]
-    ///
-    /// # Result
-    ///
-    /// Points with recommendation score
-    pub async fn recommend(
-        &self,
-        collection_name: &str,
-        request: RecommendRequest,
-        read_consistency: Option<ReadConsistency>,
-    ) -> Result<Vec<ScoredPoint>, StorageError> {
-        let collection = self.get_collection(collection_name).await?;
-        recommend_by(
-            request,
-            &collection,
-            |name| self.get_collection_opt(name),
-            read_consistency,
-        )
-        .await
-        .map_err(|err| err.into())
-    }
-
-    /// Recommend points in a batchig fashion using positive and negative example from the request
-    ///
-    /// # Arguments
-    ///
-    /// * `collection_name` - for what collection do we recommend
-    /// * `request` - [`RecommendRequestBatch`]
-    ///
-    /// # Result
-    ///
-    /// Points with recommendation score
-    pub async fn recommend_batch(
-        &self,
-        collection_name: &str,
-        request: RecommendRequestBatch,
-        read_consistency: Option<ReadConsistency>,
-    ) -> Result<Vec<Vec<ScoredPoint>>, StorageError> {
-        let collection = self.get_collection(collection_name).await?;
-        recommend_batch_by(
-            request,
-            &collection,
-            |name| self.get_collection_opt(name),
-            read_consistency,
-        )
-        .await
-        .map_err(|err| err.into())
-    }
-
-    /// Search for the closest points using vector similarity with given restrictions defined
-    /// in the request
-    ///
-    /// # Arguments
-    ///
-    /// * `collection_name` - in what collection do we search
-    /// * `request` - [`SearchRequest`]
-    /// * `shard_selection` - which local shard to use
-    /// # Result
-    ///
-    /// Points with search score
-    pub async fn search(
-        &self,
-        collection_name: &str,
-        request: SearchRequest,
-        read_consistency: Option<ReadConsistency>,
-        shard_selection: Option<ShardId>,
-    ) -> Result<Vec<ScoredPoint>, StorageError> {
-        let collection = self.get_collection(collection_name).await?;
-        collection
-            .search(request, read_consistency, shard_selection)
-            .await
-            .map_err(|err| err.into())
-    }
-
-    /// Search in a batching fashion for the closest points using vector similarity with given restrictions defined
-    /// in the request
-    ///
-    /// # Arguments
-    ///
-    /// * `collection_name` - in what collection do we search
-    /// * `request` - [`SearchRequestBatch`]
-    /// * `shard_selection` - which local shard to use
-    /// # Result
-    ///
-    /// Points with search score
-    pub async fn search_batch(
-        &self,
-        collection_name: &str,
-        request: SearchRequestBatch,
-        read_consistency: Option<ReadConsistency>,
-        shard_selection: Option<ShardId>,
-    ) -> Result<Vec<Vec<ScoredPoint>>, StorageError> {
-        let collection = self.get_collection(collection_name).await?;
-        collection
-            .search_batch(request, read_consistency, shard_selection)
-            .await
-            .map_err(|err| err.into())
-    }
-
-    /// Count points in the collection.
-    ///
-    /// # Arguments
-    ///
-    /// * `collection_name` - in what collection do we count
-    /// * `request` - [`CountRequest`]
-    /// * `shard_selection` - which local shard to use
-    ///
-    /// # Result
-    ///
-    /// Number of points in the collection.
-    ///
-    pub async fn count(
-        &self,
-        collection_name: &str,
-        request: CountRequest,
-        shard_selection: Option<ShardId>,
-    ) -> Result<CountResult, StorageError> {
-        let collection = self.get_collection(collection_name).await?;
-        collection
-            .count(request, shard_selection)
-            .await
-            .map_err(|err| err.into())
-    }
-
-    /// Return specific points by IDs
-    ///
-    /// # Arguments
-    ///
-    /// * `collection_name` - select from this collection
-    /// * `request` - [`PointRequest`]
-    /// * `shard_selection` - which local shard to use
-    ///
-    /// # Result
-    ///
-    /// List of points with specified information included
-    pub async fn retrieve(
-        &self,
-        collection_name: &str,
-        request: PointRequest,
-        read_consistency: Option<ReadConsistency>,
-        shard_selection: Option<ShardId>,
-    ) -> Result<Vec<Record>, StorageError> {
-        let collection = self.get_collection(collection_name).await?;
-        collection
-            .retrieve(request, read_consistency, shard_selection)
-            .await
-            .map_err(|err| err.into())
-    }
-
-    pub async fn group(
-        &self,
-        collection_name: &str,
-        request: GroupRequest,
-        read_consistency: Option<ReadConsistency>,
-        shard_selection: Option<ShardId>,
-    ) -> Result<GroupsResult, StorageError> {
-        let collection = self.get_collection(collection_name).await?;
-
-        let collection_by_name = |name| self.get_collection_opt(name);
-
-        let mut group_by = GroupBy::new(request, &collection, collection_by_name);
-
-        if let Some(read_consistency) = read_consistency {
-            group_by = group_by.with_read_consistency(read_consistency);
-        }
-
-        if let Some(shard_selection) = shard_selection {
-            group_by = group_by.with_shard_selection(shard_selection);
-        }
-
-        group_by
-            .execute()
-            .await
-            .map(|groups| GroupsResult { groups })
-            .map_err(|err| err.into())
-    }
-
-    /// List of all collections
-    pub async fn all_collections(&self) -> Vec<String> {
-        self.collections.read().await.keys().cloned().collect()
-    }
-
-    /// List of all collections
-    pub fn all_collections_sync(&self) -> Vec<String> {
-        self.general_runtime
-            .block_on(self.collections.read())
-            .keys()
-            .cloned()
-            .collect()
-    }
-
-    /// List of all aliases for a given collection
-    pub async fn collection_aliases(
-        &self,
-        collection_name: &str,
-    ) -> Result<Vec<String>, StorageError> {
-        let result = self
-            .alias_persistence
-            .read()
-            .await
-            .collection_aliases(collection_name);
-        Ok(result)
-    }
-
-    /// List of all aliases across all collections
-    pub async fn list_aliases(&self) -> Result<Vec<AliasDescription>, StorageError> {
-        let all_collections = self.all_collections().await;
-        let mut aliases: Vec<AliasDescription> = Default::default();
-        for collection_name in &all_collections {
-            for alias in self.collection_aliases(collection_name).await? {
-                aliases.push(AliasDescription {
-                    alias_name: alias.to_string(),
-                    collection_name: collection_name.to_string(),
-                });
-            }
-        }
-
-        Ok(aliases)
-    }
-
-    /// Paginate over all stored points with given filtering conditions
-    ///
-    /// # Arguments
-    ///
-    /// * `collection_name` - which collection to use
-    /// * `request` - [`ScrollRequest`]
-    /// * `shard_selection` - which local shard to use
-    ///
-    /// # Result
-    ///
-    /// List of points with specified information included
-    pub async fn scroll(
-        &self,
-        collection_name: &str,
-        request: ScrollRequest,
-        read_consistency: Option<ReadConsistency>,
-        shard_selection: Option<ShardId>,
-    ) -> Result<ScrollResult, StorageError> {
-        let collection = self.get_collection(collection_name).await?;
-        collection
-            .scroll_by(request, read_consistency, shard_selection)
-            .await
-            .map_err(|err| err.into())
-    }
-
-    pub async fn update(
-        &self,
-        collection_name: &str,
-        operation: CollectionUpdateOperations,
-        shard_selection: Option<ShardId>,
-        wait: bool,
-        ordering: WriteOrdering,
-    ) -> Result<UpdateResult, StorageError> {
-        let collection = self.get_collection(collection_name).await?;
-        let result = match shard_selection {
-            Some(shard_selection) => {
-                collection
-                    .update_from_peer(operation, shard_selection, wait)
-                    .await
-            }
-            None => {
-                let _rate_limit = match &self.update_rate_limiter {
-                    None => None,
-                    Some(rate_limiter) => Some(rate_limiter.acquire().await),
-                };
-                if operation.is_write_operation() {
-                    self.check_write_lock()?;
-                }
-                collection
-                    .update_from_client(operation, wait, ordering)
-                    .await
-            }
-        };
-        result.map_err(|err| err.into())
-    }
-
-    fn this_peer_id(&self) -> PeerId {
-        self.this_peer_id
-    }
-
-    pub fn peer_address_by_id(&self) -> PeerAddressById {
-        self.channel_service.id_to_address.read().clone()
-    }
-
-    pub fn collections_snapshot_sync(&self) -> consensus_manager::CollectionsSnapshot {
-        self.general_runtime.block_on(self.collections_snapshot())
-    }
-
-    pub async fn collections_snapshot(&self) -> consensus_manager::CollectionsSnapshot {
-        let mut collections: HashMap<CollectionId, collection_state::State> = HashMap::new();
-        for (id, collection) in self.collections.read().await.iter() {
-            collections.insert(id.clone(), collection.state().await);
-        }
-        consensus_manager::CollectionsSnapshot {
-            collections,
-            aliases: self.alias_persistence.read().await.state().clone(),
-        }
-    }
-
-    pub fn apply_collections_snapshot(
-        &self,
-        data: consensus_manager::CollectionsSnapshot,
-    ) -> Result<(), StorageError> {
-        self.general_runtime.block_on(async {
-            let mut collections = self.collections.write().await;
-
-            for (id, state) in &data.collections {
-                let collection_exists = collections.contains_key(id);
-
-                // Create collection if not present locally
-                if !collection_exists {
-                    let collection_path = self.create_collection_path(id).await?;
-                    let snapshots_path = self.create_snapshots_path(id).await?;
-                    let shard_distribution =
-                        CollectionShardDistribution::from_shards_info(state.shards.clone());
-                    let collection = Collection::new(
-                        id.to_string(),
-                        self.this_peer_id,
-                        &collection_path,
-                        &snapshots_path,
-                        &state.config,
-                        self.storage_config.to_shared_storage_config().into(),
-                        shard_distribution,
-                        self.channel_service.clone(),
-                        Self::change_peer_state_callback(
-                            self.consensus_proposal_sender.clone(),
-                            id.to_string(),
-                            ReplicaState::Dead,
-                            None,
-                        ),
-                        Self::request_shard_transfer_callback(
-                            self.consensus_proposal_sender.clone(),
-                            id.to_string(),
-                        ),
-                        Some(self.search_runtime.handle().clone()),
-                        Some(self.update_runtime.handle().clone()),
-                    )
-                    .await?;
-                    collections.validate_collection_not_exists(id).await?;
-                    collections.insert(id.to_string(), collection);
-                }
-
-                let collection = match collections.get(id) {
-                    Some(collection) => collection,
-                    None => unreachable!(),
-                };
-
-                // Update collection state
-                if &collection.state().await != state {
-                    if let Some(proposal_sender) = self.consensus_proposal_sender.clone() {
-                        // In some cases on state application it might be needed to abort the transfer
-                        let abort_transfer = |transfer| {
-                            if let Err(error) =
-                                proposal_sender.send(ConsensusOperations::abort_transfer(
-                                    id.clone(),
-                                    transfer,
-                                    "sender was not up to date",
-                                ))
-                            {
-                                log::error!(
-                                    "Can't report transfer progress to consensus: {}",
-                                    error
-                                )
-                            };
-                        };
-                        collection
-                            .apply_state(state.clone(), self.this_peer_id(), abort_transfer)
-                            .await?;
-                    } else {
-                        log::error!("Can't apply state: single node mode");
-                    }
-                }
-
-                // Mark local shards as dead (to initiate shard transfer),
-                // if collection has been created during snapshot application
-                if !collection_exists {
-                    for shard_id in collection.get_local_shards().await {
-                        collection
-                            .set_shard_replica_state(
-                                shard_id,
-                                self.this_peer_id,
-                                ReplicaState::Dead,
-                                None,
-                            )
-                            .await?;
-                    }
-                }
-            }
-
-            // Remove collections that are present locally but are not in the snapshot state
-            for collection_name in collections.keys() {
-                if !data.collections.contains_key(collection_name) {
-                    log::debug!(
-                        "Deleting collection {collection_name} \
-                         because it is not part of the consensus snapshot",
-                    );
-
-                    self.delete_collection(collection_name).await?;
-                }
-            }
-
-            // Apply alias mapping
-            self.alias_persistence
-                .write()
-                .await
-                .apply_state(data.aliases)?;
-
-            Ok(())
-        })
-    }
-
-    pub async fn create_snapshot(
-        &self,
-        collection_name: &str,
-    ) -> Result<SnapshotDescription, StorageError> {
-        let collection = self.get_collection(collection_name).await?;
-        // We want to use temp dir inside the temp_path (storage if not specified), because it is possible, that
-        // snapshot directory is mounted as network share and multiple writes to it could be slow
-        let temp_dir = self.temp_storage_path().join(SNAPSHOTS_TEMP_DIR);
-        tokio::fs::create_dir_all(&temp_dir).await?;
-        Ok(collection
-            .create_snapshot(&temp_dir, self.this_peer_id)
-            .await?)
-    }
-
-    pub async fn suggest_shard_distribution(
-        &self,
-        op: &CreateCollectionOperation,
-        suggested_shard_number: NonZeroU32,
-    ) -> ShardDistributionProposal {
-        let shard_number = op
-            .create_collection
-            .shard_number
-            .and_then(NonZeroU32::new)
-            .unwrap_or(suggested_shard_number);
-        let mut known_peers_set: HashSet<_> = self
-            .channel_service
-            .id_to_address
-            .read()
-            .keys()
-            .copied()
-            .collect();
-        known_peers_set.insert(self.this_peer_id());
-        let known_peers: Vec<_> = known_peers_set.into_iter().collect();
-        let replication_factor = op
-            .create_collection
-            .replication_factor
-            .and_then(NonZeroU32::new)
-            .unwrap_or_else(default_replication_factor);
-
-        let shard_distribution =
-            ShardDistributionProposal::new(shard_number, replication_factor, &known_peers);
-
-        log::debug!(
-            "Suggesting distribution for {} shards for collection '{}' among {} peers {:?}",
-            shard_number,
-            op.collection_name,
-            known_peers.len(),
-            shard_distribution.distribution
-        );
-        shard_distribution
-    }
-
-    pub async fn get_telemetry_data(&self) -> Vec<CollectionTelemetry> {
-        let mut result = Vec::new();
-        let all_collections = self.all_collections().await;
-        for collection_name in &all_collections {
-            if let Ok(collection) = self.get_collection(collection_name).await {
-                result.push(collection.get_telemetry_data().await);
-            }
-        }
-        result
-    }
-
-    pub async fn peer_has_shards(&self, peer_id: PeerId) -> bool {
-        for collection in self.collections.read().await.values() {
-            let state = collection.state().await;
-            if state
-                .shards
-                .into_values()
-                .flat_map(|shard_info| shard_info.replicas.into_keys())
-                .any(|x| x == peer_id)
-            {
-                return true;
-            }
-        }
-        false
-    }
-
-    pub fn set_locks(&self, is_write_locked: bool, error_message: Option<String>) {
-        self.is_write_locked
-            .store(is_write_locked, Ordering::Relaxed);
-        *self.lock_error_message.lock() = error_message;
-    }
-
-    pub fn is_write_locked(&self) -> bool {
-        self.is_write_locked.load(Ordering::Relaxed)
-    }
-
-    pub fn get_lock_error_message(&self) -> Option<String> {
-        self.lock_error_message.lock().clone()
-    }
-
-    /// Returns an error if the write lock is set
-    pub fn check_write_lock(&self) -> Result<(), StorageError> {
-        if self.is_write_locked.load(Ordering::Relaxed) {
-            return Err(StorageError::Locked {
-                description: self
-                    .lock_error_message
-                    .lock()
-                    .clone()
-                    .unwrap_or_else(|| DEFAULT_WRITE_LOCK_ERROR_MESSAGE.to_string()),
-            });
-        }
-        Ok(())
-    }
-
-    pub async fn remove_shards_at_peer(&self, peer_id: PeerId) -> Result<(), StorageError> {
-        let collections = self.collections.read().await;
-        for collection in collections.values() {
-            collection.remove_shards_at_peer(peer_id).await?;
-        }
-        Ok(())
-    }
-
-    pub fn remove_shards_at_peer_sync(&self, peer_id: PeerId) -> Result<(), StorageError> {
-        self.general_runtime
-            .block_on(self.remove_shards_at_peer(peer_id))
-    }
-}
-
-impl CollectionContainer for TableOfContent {
-    fn perform_collection_meta_op(
-        &self,
-        operation: CollectionMetaOperations,
-    ) -> Result<bool, StorageError> {
-        self.perform_collection_meta_op_sync(operation)
-    }
-
-    fn collections_snapshot(&self) -> consensus_manager::CollectionsSnapshot {
-        self.collections_snapshot_sync()
-    }
-
-    fn apply_collections_snapshot(
-        &self,
-        data: consensus_manager::CollectionsSnapshot,
-    ) -> Result<(), StorageError> {
-        self.apply_collections_snapshot(data)
-    }
-
-    fn remove_peer(&self, peer_id: PeerId) -> Result<(), StorageError> {
-        self.general_runtime.block_on(async {
-            // Validation:
-            // 1. Check that we are not removing some unique shards (removed)
-
-            // Validation passed
-
-            self.remove_shards_at_peer(peer_id).await?;
-
-            if self.this_peer_id == peer_id {
-                // We are detaching the current peer, so we need to remove all connections
-                // Remove all peers from the channel service
-
-                let ids_to_drop: Vec<_> = self
-                    .channel_service
-                    .id_to_address
-                    .read()
-                    .keys()
-                    .filter(|id| **id != self.this_peer_id)
-                    .copied()
-                    .collect();
-                for id in ids_to_drop {
-                    self.channel_service.remove_peer(id).await;
-                }
-            } else {
-                self.channel_service.remove_peer(peer_id).await;
-            }
-            Ok(())
-        })
-    }
-
-    fn sync_local_state(&self) -> Result<(), StorageError> {
-        self.general_runtime.block_on(async {
-            let collections = self.collections.read().await;
-            let transfer_failure_callback =
-                Self::on_transfer_failure_callback(self.consensus_proposal_sender.clone());
-            let transfer_success_callback =
-                Self::on_transfer_success_callback(self.consensus_proposal_sender.clone());
-
-            for collection in collections.values() {
-                let finish_shard_initialize = Self::change_peer_state_callback(
-                    self.consensus_proposal_sender.clone(),
-                    collection.name(),
-                    ReplicaState::Active,
-                    Some(ReplicaState::Initializing),
-                );
-                let convert_to_listener_callback = Self::change_peer_state_callback(
-                    self.consensus_proposal_sender.clone(),
-                    collection.name(),
-                    ReplicaState::Listener,
-                    Some(ReplicaState::Active),
-                );
-                let convert_from_listener_to_active_callback = Self::change_peer_state_callback(
-                    self.consensus_proposal_sender.clone(),
-                    collection.name(),
-                    ReplicaState::Active,
-                    Some(ReplicaState::Listener),
-                );
-
-                collection
-                    .sync_local_state(
-                        transfer_failure_callback.clone(),
-                        transfer_success_callback.clone(),
-                        finish_shard_initialize,
-                        convert_to_listener_callback,
-                        convert_from_listener_to_active_callback,
-                    )
-                    .await?;
-            }
-            Ok(())
-        })
-    }
-}
diff --git a/crates/qdrant/lib/storage/src/dispatcher.rs b/crates/qdrant/lib/storage/src/dispatcher.rs
deleted file mode 100644
index 2fc37d0..0000000
--- a/crates/qdrant/lib/storage/src/dispatcher.rs
+++ /dev/null
@@ -1,144 +0,0 @@
-use std::num::NonZeroU32;
-use std::ops::Deref;
-use std::sync::Arc;
-use std::time::Duration;
-
-use crate::{
-    ClusterStatus, CollectionMetaOperations, ConsensusOperations, ConsensusStateRef, StorageError,
-    TableOfContent,
-};
-
-pub struct Dispatcher {
-    toc: Arc<TableOfContent>,
-    consensus_state: Option<ConsensusStateRef>,
-}
-
-impl Dispatcher {
-    pub fn new(toc: Arc<TableOfContent>) -> Self {
-        Self {
-            toc,
-            consensus_state: None,
-        }
-    }
-
-    pub fn with_consensus(self, state_ref: ConsensusStateRef) -> Self {
-        Self {
-            consensus_state: Some(state_ref),
-            ..self
-        }
-    }
-
-    pub fn toc(&self) -> &Arc<TableOfContent> {
-        &self.toc
-    }
-
-    pub fn consensus_state(&self) -> Option<&ConsensusStateRef> {
-        self.consensus_state.as_ref()
-    }
-
-    /// If `wait_timeout` is not supplied - then default duration will be used.
-    /// This function needs to be called from a runtime with timers enabled.
-    pub async fn submit_collection_meta_op(
-        &self,
-        operation: CollectionMetaOperations,
-        wait_timeout: Option<Duration>,
-    ) -> Result<bool, StorageError> {
-        // if distributed deployment is enabled
-        if let Some(state) = self.consensus_state.as_ref() {
-            // List of operations to await for collection to be operational
-            let mut expect_operations: Vec<ConsensusOperations> = vec![];
-
-            let op = match operation {
-                CollectionMetaOperations::CreateCollection(mut op) => {
-                    self.toc.check_write_lock()?;
-                    if !op.is_distribution_set() {
-                        // Suggest even distribution of shards across nodes
-                        let number_of_peers = state.0.peer_count();
-                        let shard_distribution = self
-                            .toc
-                            .suggest_shard_distribution(
-                                &op,
-                                NonZeroU32::new(number_of_peers as u32)
-                                    .expect("Peer count should be always >= 1"),
-                            )
-                            .await;
-
-                        // Expect all replicas to become active eventually
-                        for (shard_id, peer_ids) in &shard_distribution.distribution {
-                            for peer_id in peer_ids {
-                                expect_operations.push(ConsensusOperations::initialize_replica(
-                                    op.collection_name.clone(),
-                                    *shard_id,
-                                    *peer_id,
-                                ));
-                            }
-                        }
-
-                        op.set_distribution(shard_distribution);
-                    }
-                    CollectionMetaOperations::CreateCollection(op)
-                }
-                op => op,
-            };
-
-            let operation_awaiter =
-                // If explicit timeout is set - then we need to wait for all expected operations.
-                // E.g. in case of `CreateCollection` we will explicitly wait for all replicas to be activated.
-                // We need to register receivers(by calling the function) before submitting the operation.
-                if !expect_operations.is_empty() {
-                    Some(state.await_for_multiple_operations(expect_operations, wait_timeout))
-                } else {
-                    None
-                };
-
-            let res = state
-                .propose_consensus_op_with_await(
-                    ConsensusOperations::CollectionMeta(Box::new(op)),
-                    wait_timeout,
-                )
-                .await?;
-
-            if let Some(operation_awaiter) = operation_awaiter {
-                // Actually await for expected operations to complete on the consensus
-                match operation_awaiter.await {
-                    Ok(Ok(())) => {} // all good
-                    Ok(Err(err)) => {
-                        log::warn!("Not all expected operations were completed: {}", err)
-                    }
-                    Err(err) => log::warn!("Awaiting for expected operations timed out: {}", err),
-                }
-            }
-
-            Ok(res)
-        } else {
-            if let CollectionMetaOperations::CreateCollection(_) = &operation {
-                self.toc.check_write_lock()?;
-            }
-            self.toc.perform_collection_meta_op(operation).await
-        }
-    }
-
-    pub fn cluster_status(&self) -> ClusterStatus {
-        match self.consensus_state.as_ref() {
-            Some(state) => state.cluster_status(),
-            None => ClusterStatus::Disabled,
-        }
-    }
-}
-
-impl Deref for Dispatcher {
-    type Target = TableOfContent;
-
-    fn deref(&self) -> &Self::Target {
-        self.toc.deref()
-    }
-}
-
-impl Clone for Dispatcher {
-    fn clone(&self) -> Self {
-        Self {
-            toc: self.toc.clone(),
-            consensus_state: self.consensus_state.clone(),
-        }
-    }
-}
diff --git a/crates/qdrant/lib/storage/src/lib.rs b/crates/qdrant/lib/storage/src/lib.rs
deleted file mode 100644
index a684b23..0000000
--- a/crates/qdrant/lib/storage/src/lib.rs
+++ /dev/null
@@ -1,48 +0,0 @@
-//! Storage - is a crate which contains all service functions, abstracted from the external interface
-//!
-//! It provides all functions, which could be used from REST (or any other interface), but do not
-//! implement any concrete interface.
-
-use content_manager::collection_meta_ops::CollectionMetaOperations;
-use content_manager::consensus_manager::ConsensusStateRef;
-use content_manager::consensus_ops::ConsensusOperations;
-use content_manager::errors::StorageError;
-use content_manager::toc::TableOfContent;
-use types::ClusterStatus;
-
-pub mod content_manager;
-pub mod dispatcher;
-pub mod types;
-
-pub mod serialize_peer_addresses {
-    use std::collections::HashMap;
-
-    use itertools::Itertools;
-    use serde::{self, de, Deserialize, Deserializer, Serialize, Serializer};
-
-    use crate::types::PeerAddressById;
-
-    pub fn serialize<S>(addresses: &PeerAddressById, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        let addresses: HashMap<u64, String> = addresses
-            .clone()
-            .into_iter()
-            .map(|(id, address)| (id, format!("{address}")))
-            .collect();
-        addresses.serialize(serializer)
-    }
-
-    pub fn deserialize<'de, D>(deserializer: D) -> Result<PeerAddressById, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        let addresses: HashMap<u64, String> = HashMap::deserialize(deserializer)?;
-        addresses
-            .into_iter()
-            .map(|(id, address)| address.parse().map(|address| (id, address)))
-            .try_collect()
-            .map_err(|err| de::Error::custom(format!("Failed to parse uri: {err}")))
-    }
-}
diff --git a/crates/qdrant/lib/storage/src/types.rs b/crates/qdrant/lib/storage/src/types.rs
deleted file mode 100644
index bf983ee..0000000
--- a/crates/qdrant/lib/storage/src/types.rs
+++ /dev/null
@@ -1,240 +0,0 @@
-use std::collections::HashMap;
-use std::time::Duration;
-
-use chrono::{DateTime, Utc};
-use collection::config::WalConfig;
-use collection::operations::shared_storage_config::SharedStorageConfig;
-use collection::operations::types::NodeType;
-use collection::optimizers_builder::OptimizersConfig;
-use collection::shards::shard::PeerId;
-use schemars::JsonSchema;
-use segment::common::anonymize::Anonymize;
-use segment::madvise;
-use segment::types::{HnswConfig, QuantizationConfig};
-use serde::{Deserialize, Serialize};
-use tonic::transport::Uri;
-use validator::Validate;
-
-pub type PeerAddressById = HashMap<PeerId, Uri>;
-
-#[derive(Debug, Deserialize, Serialize, Clone)]
-pub struct PerformanceConfig {
-    pub max_search_threads: usize,
-    #[serde(default = "default_max_optimization_threads")]
-    pub max_optimization_threads: usize,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub update_rate_limit: Option<usize>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub search_timeout_sec: Option<usize>,
-}
-
-const fn default_max_optimization_threads() -> usize {
-    1
-}
-
-/// Global configuration of the storage, loaded on the service launch, default stored in ./config
-#[derive(Clone, Debug, Deserialize, Validate)]
-pub struct StorageConfig {
-    #[validate(length(min = 1))]
-    pub storage_path: String,
-    #[serde(default = "default_snapshots_path")]
-    #[validate(length(min = 1))]
-    pub snapshots_path: String,
-    #[validate(length(min = 1))]
-    #[serde(default)]
-    pub temp_path: Option<String>,
-    #[serde(default = "default_on_disk_payload")]
-    pub on_disk_payload: bool,
-    #[validate]
-    pub optimizers: OptimizersConfig,
-    #[validate]
-    pub wal: WalConfig,
-    pub performance: PerformanceConfig,
-    #[validate]
-    pub hnsw_index: HnswConfig,
-    #[validate]
-    pub quantization: Option<QuantizationConfig>,
-    #[serde(default = "default_mmap_advice")]
-    pub mmap_advice: madvise::Advice,
-    #[serde(default)]
-    pub node_type: NodeType,
-    #[serde(default)]
-    pub update_queue_size: Option<usize>,
-    #[serde(default)]
-    pub handle_collection_load_errors: bool,
-    #[serde(default)]
-    pub async_scorer: bool,
-    /// If provided - qdrant will start in recovery mode, which means that it will not accept any new data.
-    /// Only collection metadata will be available, and it will only process collection delete requests.
-    /// Provided value will be used error message for unavailable requests.
-    #[serde(default)]
-    pub recovery_mode: Option<String>,
-}
-
-impl StorageConfig {
-    pub fn to_shared_storage_config(&self) -> SharedStorageConfig {
-        SharedStorageConfig::new(
-            self.update_queue_size,
-            self.node_type,
-            self.handle_collection_load_errors,
-            self.recovery_mode.clone(),
-            self.performance
-                .search_timeout_sec
-                .map(|x| Duration::from_secs(x as u64)),
-        )
-    }
-}
-
-fn default_snapshots_path() -> String {
-    "./snapshots".to_string()
-}
-
-const fn default_on_disk_payload() -> bool {
-    false
-}
-
-const fn default_mmap_advice() -> madvise::Advice {
-    madvise::Advice::Random
-}
-
-/// Information of a peer in the cluster
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone)]
-pub struct PeerInfo {
-    pub uri: String,
-    // ToDo: How long ago was the last communication? In milliseconds
-    // pub last_responded_millis: usize
-}
-
-/// Summary information about the current raft state
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone)]
-pub struct RaftInfo {
-    /// Raft divides time into terms of arbitrary length, each beginning with an election.
-    /// If a candidate wins the election, it remains the leader for the rest of the term.
-    /// The term number increases monotonically.
-    /// Each server stores the current term number which is also exchanged in every communication.
-    pub term: u64,
-    /// The index of the latest committed (finalized) operation that this peer is aware of.
-    pub commit: u64,
-    /// Number of consensus operations pending to be applied on this peer
-    pub pending_operations: usize,
-    /// Leader of the current term
-    pub leader: Option<u64>,
-    /// Role of this peer in the current term
-    pub role: Option<StateRole>,
-    /// Is this peer a voter or a learner
-    pub is_voter: bool,
-}
-
-/// Role of the peer in the consensus
-#[derive(Debug, PartialEq, Eq, Clone, Copy, Serialize, JsonSchema, Deserialize)]
-pub enum StateRole {
-    // The node is a follower of the leader.
-    Follower,
-    // The node could become a leader.
-    Candidate,
-    // The node is a leader.
-    Leader,
-    // The node could become a candidate, if `prevote` is enabled.
-    PreCandidate,
-}
-
-impl From<raft::StateRole> for StateRole {
-    fn from(role: raft::StateRole) -> Self {
-        match role {
-            raft::StateRole::Follower => Self::Follower,
-            raft::StateRole::Candidate => Self::Candidate,
-            raft::StateRole::Leader => Self::Leader,
-            raft::StateRole::PreCandidate => Self::PreCandidate,
-        }
-    }
-}
-
-/// Message send failures for a particular peer
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone, Default)]
-pub struct MessageSendErrors {
-    pub count: usize,
-    pub latest_error: Option<String>,
-}
-
-/// Description of enabled cluster
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone)]
-pub struct ClusterInfo {
-    /// ID of this peer
-    pub peer_id: PeerId,
-    /// Peers composition of the cluster with main information
-    pub peers: HashMap<PeerId, PeerInfo>,
-    /// Status of the Raft consensus
-    pub raft_info: RaftInfo,
-    /// Status of the thread that executes raft consensus
-    pub consensus_thread_status: ConsensusThreadStatus,
-    /// Consequent failures of message send operations in consensus by peer address.
-    /// On the first success to send to that peer - entry is removed from this hashmap.
-    pub message_send_failures: HashMap<String, MessageSendErrors>,
-}
-
-/// Information about current cluster status and structure
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone)]
-#[serde(tag = "status")]
-#[serde(rename_all = "snake_case")]
-pub enum ClusterStatus {
-    Disabled,
-    Enabled(ClusterInfo),
-}
-
-/// Information about current consensus thread status
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone)]
-#[serde(tag = "consensus_thread_status")]
-#[serde(rename_all = "snake_case")]
-pub enum ConsensusThreadStatus {
-    Working { last_update: DateTime<Utc> },
-    Stopped,
-    StoppedWithErr { err: String },
-}
-
-impl Anonymize for PeerInfo {
-    fn anonymize(&self) -> Self {
-        PeerInfo {
-            uri: self.uri.anonymize(),
-        }
-    }
-}
-
-impl Anonymize for RaftInfo {
-    fn anonymize(&self) -> Self {
-        RaftInfo {
-            term: self.term,
-            commit: self.commit,
-            pending_operations: self.pending_operations,
-            leader: self.leader,
-            role: self.role,
-            is_voter: self.is_voter,
-        }
-    }
-}
-
-impl Anonymize for ClusterInfo {
-    fn anonymize(&self) -> Self {
-        ClusterInfo {
-            peer_id: self.peer_id,
-            peers: self
-                .peers
-                .iter()
-                .map(|(key, value)| (*key, value.anonymize()))
-                .collect(),
-            raft_info: self.raft_info.anonymize(),
-            consensus_thread_status: self.consensus_thread_status.clone(),
-            message_send_failures: self.message_send_failures.clone(),
-        }
-    }
-}
-
-impl Anonymize for ClusterStatus {
-    fn anonymize(&self) -> Self {
-        match self {
-            ClusterStatus::Disabled => ClusterStatus::Disabled,
-            ClusterStatus::Enabled(cluster_info) => {
-                ClusterStatus::Enabled(cluster_info.anonymize())
-            }
-        }
-    }
-}
diff --git a/crates/qdrant/lib/storage/tests/integration/alias_tests.rs b/crates/qdrant/lib/storage/tests/integration/alias_tests.rs
deleted file mode 100644
index 3f50d53..0000000
--- a/crates/qdrant/lib/storage/tests/integration/alias_tests.rs
+++ /dev/null
@@ -1,151 +0,0 @@
-use std::num::NonZeroU64;
-use std::sync::Arc;
-
-use collection::operations::types::VectorParams;
-use collection::optimizers_builder::OptimizersConfig;
-use segment::madvise;
-use segment::types::Distance;
-use storage::content_manager::collection_meta_ops::{
-    ChangeAliasesOperation, CollectionMetaOperations, CreateAlias, CreateCollection,
-    CreateCollectionOperation, DeleteAlias, RenameAlias,
-};
-use storage::content_manager::consensus::operation_sender::OperationSender;
-use storage::content_manager::toc::TableOfContent;
-use storage::dispatcher::Dispatcher;
-use storage::types::{PerformanceConfig, StorageConfig};
-use tempfile::Builder;
-use tokio::runtime::Runtime;
-
-#[test]
-fn test_alias_operation() {
-    let storage_dir = Builder::new().prefix("storage").tempdir().unwrap();
-
-    let config = StorageConfig {
-        storage_path: storage_dir.path().to_str().unwrap().to_string(),
-        snapshots_path: storage_dir
-            .path()
-            .join("snapshots")
-            .to_str()
-            .unwrap()
-            .to_string(),
-        temp_path: None,
-        on_disk_payload: false,
-        optimizers: OptimizersConfig {
-            deleted_threshold: 0.5,
-            vacuum_min_vector_number: 100,
-            default_segment_number: 2,
-            max_segment_size: None,
-            memmap_threshold: Some(100),
-            indexing_threshold: Some(100),
-            flush_interval_sec: 2,
-            max_optimization_threads: 2,
-        },
-        wal: Default::default(),
-        performance: PerformanceConfig {
-            max_search_threads: 1,
-            max_optimization_threads: 1,
-            update_rate_limit: None,
-            search_timeout_sec: None,
-        },
-        hnsw_index: Default::default(),
-        quantization: None,
-        mmap_advice: madvise::Advice::Random,
-        node_type: Default::default(),
-        update_queue_size: Default::default(),
-        handle_collection_load_errors: false,
-        recovery_mode: None,
-        async_scorer: false,
-    };
-
-    let search_runtime = Runtime::new().unwrap();
-    let handle = search_runtime.handle().clone();
-
-    let update_runtime = Runtime::new().unwrap();
-
-    let general_runtime = Runtime::new().unwrap();
-
-    let (propose_sender, _propose_receiver) = std::sync::mpsc::channel();
-    let propose_operation_sender = OperationSender::new(propose_sender);
-
-    let toc = Arc::new(TableOfContent::new(
-        &config,
-        search_runtime,
-        update_runtime,
-        general_runtime,
-        Default::default(),
-        0,
-        Some(propose_operation_sender),
-    ));
-    let dispatcher = Dispatcher::new(toc);
-
-    handle
-        .block_on(
-            dispatcher.submit_collection_meta_op(
-                CollectionMetaOperations::CreateCollection(CreateCollectionOperation::new(
-                    "test".to_string(),
-                    CreateCollection {
-                        vectors: VectorParams {
-                            size: NonZeroU64::new(10).unwrap(),
-                            distance: Distance::Cosine,
-                            hnsw_config: None,
-                            quantization_config: None,
-                            on_disk: None,
-                        }
-                        .into(),
-                        hnsw_config: None,
-                        wal_config: None,
-                        optimizers_config: None,
-                        shard_number: Some(1),
-                        on_disk_payload: None,
-                        replication_factor: None,
-                        write_consistency_factor: None,
-                        init_from: None,
-                        quantization_config: None,
-                    },
-                )),
-                None,
-            ),
-        )
-        .unwrap();
-
-    handle
-        .block_on(dispatcher.submit_collection_meta_op(
-            CollectionMetaOperations::ChangeAliases(ChangeAliasesOperation {
-                actions: vec![CreateAlias {
-                        collection_name: "test".to_string(),
-                        alias_name: "test_alias".to_string(),
-                    }
-                    .into()],
-            }),
-            None,
-        ))
-        .unwrap();
-
-    handle
-        .block_on(dispatcher.submit_collection_meta_op(
-            CollectionMetaOperations::ChangeAliases(ChangeAliasesOperation {
-                actions: vec![
-                        CreateAlias {
-                            collection_name: "test".to_string(),
-                            alias_name: "test_alias2".to_string(),
-                        }
-                        .into(),
-                        DeleteAlias {
-                            alias_name: "test_alias".to_string(),
-                        }
-                        .into(),
-                        RenameAlias {
-                            old_alias_name: "test_alias2".to_string(),
-                            new_alias_name: "test_alias3".to_string(),
-                        }
-                        .into(),
-                    ],
-            }),
-            None,
-        ))
-        .unwrap();
-
-    let _ = handle
-        .block_on(dispatcher.get_collection("test_alias3"))
-        .unwrap();
-}
diff --git a/crates/qdrant/lib/storage/tests/integration/main.rs b/crates/qdrant/lib/storage/tests/integration/main.rs
deleted file mode 100644
index 47e36d9..0000000
--- a/crates/qdrant/lib/storage/tests/integration/main.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-#[cfg(test)]
-pub mod alias_tests;
diff --git a/crates/qdrant/src/actix/actix_telemetry.rs b/crates/qdrant/src/actix/actix_telemetry.rs
deleted file mode 100644
index 8c8bcf0..0000000
--- a/crates/qdrant/src/actix/actix_telemetry.rs
+++ /dev/null
@@ -1,90 +0,0 @@
-use std::future::{ready, Ready};
-use std::sync::Arc;
-
-use actix_web::dev::{Service, ServiceRequest, ServiceResponse, Transform};
-use actix_web::Error;
-use futures_util::future::LocalBoxFuture;
-use parking_lot::Mutex;
-
-use crate::common::telemetry_ops::requests_telemetry::{
-    ActixTelemetryCollector, ActixWorkerTelemetryCollector,
-};
-
-pub struct ActixTelemetryService<S> {
-    service: S,
-    telemetry_data: Arc<Mutex<ActixWorkerTelemetryCollector>>,
-}
-
-pub struct ActixTelemetryTransform {
-    telemetry_collector: Arc<Mutex<ActixTelemetryCollector>>,
-}
-
-/// Actix telemetry service. It hooks every request and looks into response status code.
-///
-/// More about actix service with similar example
-/// <https://actix.rs/docs/middleware/>
-impl<S, B> Service<ServiceRequest> for ActixTelemetryService<S>
-where
-    S: Service<ServiceRequest, Response = ServiceResponse<B>, Error = Error>,
-    S::Future: 'static,
-    B: 'static,
-{
-    type Response = ServiceResponse<B>;
-    type Error = Error;
-    type Future = LocalBoxFuture<'static, Result<Self::Response, Self::Error>>;
-
-    actix_web::dev::forward_ready!(service);
-
-    fn call(&self, request: ServiceRequest) -> Self::Future {
-        let match_pattern = request
-            .match_pattern()
-            .unwrap_or_else(|| "unknown".to_owned());
-        let request_key = format!("{} {}", request.method(), match_pattern);
-        let future = self.service.call(request);
-        let telemetry_data = self.telemetry_data.clone();
-        Box::pin(async move {
-            let instant = std::time::Instant::now();
-            let response = future.await?;
-            let status = response.response().status().as_u16();
-            telemetry_data
-                .lock()
-                .add_response(request_key, status, instant);
-            Ok(response)
-        })
-    }
-}
-
-impl ActixTelemetryTransform {
-    pub fn new(telemetry_collector: Arc<Mutex<ActixTelemetryCollector>>) -> Self {
-        Self {
-            telemetry_collector,
-        }
-    }
-}
-
-/// Actix telemetry transform. It's a builder for an actix service
-///
-/// More about actix transform with similar example
-/// <https://actix.rs/docs/middleware/>
-impl<S, B> Transform<S, ServiceRequest> for ActixTelemetryTransform
-where
-    S: Service<ServiceRequest, Response = ServiceResponse<B>, Error = Error> + 'static,
-    S::Future: 'static,
-    B: 'static,
-{
-    type Response = ServiceResponse<B>;
-    type Error = Error;
-    type Transform = ActixTelemetryService<S>;
-    type InitError = ();
-    type Future = Ready<Result<Self::Transform, Self::InitError>>;
-
-    fn new_transform(&self, service: S) -> Self::Future {
-        ready(Ok(ActixTelemetryService {
-            service,
-            telemetry_data: self
-                .telemetry_collector
-                .lock()
-                .create_web_worker_telemetry(),
-        }))
-    }
-}
diff --git a/crates/qdrant/src/actix/api/cluster_api.rs b/crates/qdrant/src/actix/api/cluster_api.rs
deleted file mode 100644
index 6eeea3a..0000000
--- a/crates/qdrant/src/actix/api/cluster_api.rs
+++ /dev/null
@@ -1,76 +0,0 @@
-use actix_web::rt::time::Instant;
-use actix_web::{delete, get, post, web, Responder};
-use actix_web_validator::Query;
-use serde::Deserialize;
-use storage::content_manager::consensus_ops::ConsensusOperations;
-use storage::content_manager::errors::StorageError;
-use storage::content_manager::toc::TableOfContent;
-use storage::dispatcher::Dispatcher;
-use validator::Validate;
-
-use crate::actix::helpers::process_response;
-
-#[derive(Debug, Deserialize, Validate)]
-struct QueryParams {
-    #[serde(default)]
-    force: bool,
-    #[serde(default)]
-    #[validate(range(min = 1))]
-    timeout: Option<u64>,
-}
-
-#[get("/cluster")]
-async fn cluster_status(dispatcher: web::Data<Dispatcher>) -> impl Responder {
-    let timing = Instant::now();
-    let response = dispatcher.cluster_status();
-    process_response(Ok(response), timing)
-}
-
-#[post("/cluster/recover")]
-async fn recover_current_peer(toc: web::Data<TableOfContent>) -> impl Responder {
-    let timing = Instant::now();
-    process_response(toc.request_snapshot().map(|_| true), timing)
-}
-
-#[delete("/cluster/peer/{peer_id}")]
-async fn remove_peer(
-    dispatcher: web::Data<Dispatcher>,
-    peer_id: web::Path<u64>,
-    Query(params): Query<QueryParams>,
-) -> impl Responder {
-    let timing = Instant::now();
-    let dispatcher = dispatcher.into_inner();
-    let peer_id = peer_id.into_inner();
-
-    let has_shards = dispatcher.peer_has_shards(peer_id).await;
-    if !params.force && has_shards {
-        return process_response::<()>(
-            Err(StorageError::BadRequest {
-                description: format!("Cannot remove peer {peer_id} as there are shards on it"),
-            }),
-            timing,
-        );
-    }
-
-    let response = match dispatcher.consensus_state() {
-        Some(consensus_state) => {
-            consensus_state
-                .propose_consensus_op_with_await(
-                    ConsensusOperations::RemovePeer(peer_id),
-                    params.timeout.map(std::time::Duration::from_secs),
-                )
-                .await
-        }
-        None => Err(StorageError::BadRequest {
-            description: "Distributed mode disabled.".to_string(),
-        }),
-    };
-    process_response(response, timing)
-}
-
-// Configure services
-pub fn config_cluster_api(cfg: &mut web::ServiceConfig) {
-    cfg.service(cluster_status)
-        .service(remove_peer)
-        .service(recover_current_peer);
-}
diff --git a/crates/qdrant/src/actix/api/collections_api.rs b/crates/qdrant/src/actix/api/collections_api.rs
deleted file mode 100644
index fe703a0..0000000
--- a/crates/qdrant/src/actix/api/collections_api.rs
+++ /dev/null
@@ -1,200 +0,0 @@
-use std::time::Duration;
-
-use actix_web::rt::time::Instant;
-use actix_web::{delete, get, patch, post, put, web, Responder};
-use actix_web_validator::{Json, Path, Query};
-use collection::operations::cluster_ops::ClusterOperations;
-use serde::Deserialize;
-use storage::content_manager::collection_meta_ops::{
-    ChangeAliasesOperation, CollectionMetaOperations, CreateCollection, CreateCollectionOperation,
-    DeleteCollectionOperation, UpdateCollection, UpdateCollectionOperation,
-};
-use storage::content_manager::toc::TableOfContent;
-use storage::dispatcher::Dispatcher;
-use validator::Validate;
-
-use super::CollectionPath;
-use crate::actix::api::StrictCollectionPath;
-use crate::actix::helpers::process_response;
-use crate::common::collections::*;
-
-#[derive(Debug, Deserialize, Validate)]
-struct WaitTimeout {
-    #[validate(range(min = 1))]
-    timeout: Option<u64>,
-}
-
-impl WaitTimeout {
-    pub fn timeout(&self) -> Option<Duration> {
-        self.timeout.map(Duration::from_secs)
-    }
-}
-
-#[get("/collections")]
-async fn get_collections(toc: web::Data<TableOfContent>) -> impl Responder {
-    let timing = Instant::now();
-    let response = Ok(do_list_collections(toc.get_ref()).await);
-    process_response(response, timing)
-}
-
-#[get("/aliases")]
-async fn get_aliases(toc: web::Data<TableOfContent>) -> impl Responder {
-    let timing = Instant::now();
-    let response = do_list_aliases(toc.get_ref()).await;
-    process_response(response, timing)
-}
-
-#[get("/collections/{name}")]
-async fn get_collection(
-    toc: web::Data<TableOfContent>,
-    collection: Path<CollectionPath>,
-) -> impl Responder {
-    let timing = Instant::now();
-    let response = do_get_collection(toc.get_ref(), &collection.name, None).await;
-    process_response(response, timing)
-}
-
-#[get("/collections/{name}/aliases")]
-async fn get_collection_aliases(
-    toc: web::Data<TableOfContent>,
-    collection: Path<CollectionPath>,
-) -> impl Responder {
-    let timing = Instant::now();
-    let response = do_list_collection_aliases(toc.get_ref(), &collection.name).await;
-    process_response(response, timing)
-}
-
-#[put("/collections/{name}")]
-async fn create_collection(
-    dispatcher: web::Data<Dispatcher>,
-    collection: Path<StrictCollectionPath>,
-    operation: Json<CreateCollection>,
-    Query(query): Query<WaitTimeout>,
-) -> impl Responder {
-    let timing = Instant::now();
-    let response = dispatcher
-        .submit_collection_meta_op(
-            CollectionMetaOperations::CreateCollection(CreateCollectionOperation::new(
-                collection.name.clone(),
-                operation.into_inner(),
-            )),
-            query.timeout(),
-        )
-        .await;
-    process_response(response, timing)
-}
-
-#[patch("/collections/{name}")]
-async fn update_collection(
-    dispatcher: web::Data<Dispatcher>,
-    collection: Path<CollectionPath>,
-    operation: Json<UpdateCollection>,
-    Query(query): Query<WaitTimeout>,
-) -> impl Responder {
-    let timing = Instant::now();
-    let name = collection.name.clone();
-    let response = dispatcher
-        .submit_collection_meta_op(
-            CollectionMetaOperations::UpdateCollection(UpdateCollectionOperation::new(
-                name,
-                operation.into_inner(),
-            )),
-            query.timeout(),
-        )
-        .await;
-    process_response(response, timing)
-}
-
-#[delete("/collections/{name}")]
-async fn delete_collection(
-    dispatcher: web::Data<Dispatcher>,
-    collection: Path<CollectionPath>,
-    Query(query): Query<WaitTimeout>,
-) -> impl Responder {
-    let timing = Instant::now();
-    let response = dispatcher
-        .submit_collection_meta_op(
-            CollectionMetaOperations::DeleteCollection(DeleteCollectionOperation(
-                collection.name.clone(),
-            )),
-            query.timeout(),
-        )
-        .await;
-    process_response(response, timing)
-}
-
-#[post("/collections/aliases")]
-async fn update_aliases(
-    dispatcher: web::Data<Dispatcher>,
-    operation: Json<ChangeAliasesOperation>,
-    Query(query): Query<WaitTimeout>,
-) -> impl Responder {
-    let timing = Instant::now();
-    let response = dispatcher
-        .submit_collection_meta_op(
-            CollectionMetaOperations::ChangeAliases(operation.0),
-            query.timeout(),
-        )
-        .await;
-    process_response(response, timing)
-}
-
-#[get("/collections/{name}/cluster")]
-async fn get_cluster_info(
-    toc: web::Data<TableOfContent>,
-    collection: Path<CollectionPath>,
-) -> impl Responder {
-    let timing = Instant::now();
-    let response = do_get_collection_cluster(toc.get_ref(), &collection.name).await;
-    process_response(response, timing)
-}
-
-#[post("/collections/{name}/cluster")]
-async fn update_collection_cluster(
-    toc: web::Data<TableOfContent>,
-    dispatcher: web::Data<Dispatcher>,
-    collection: Path<CollectionPath>,
-    operation: Json<ClusterOperations>,
-    Query(query): Query<WaitTimeout>,
-) -> impl Responder {
-    let timing = Instant::now();
-    let wait_timeout = query.timeout();
-    let response = do_update_collection_cluster(
-        toc.get_ref(),
-        collection.name.clone(),
-        operation.0,
-        &dispatcher.into_inner(),
-        wait_timeout,
-    )
-    .await;
-    process_response(response, timing)
-}
-
-// Configure services
-pub fn config_collections_api(cfg: &mut web::ServiceConfig) {
-    cfg.service(get_collections)
-        .service(get_collection)
-        .service(create_collection)
-        .service(update_collection)
-        .service(delete_collection)
-        .service(get_aliases)
-        .service(get_collection_aliases)
-        .service(update_aliases)
-        .service(get_cluster_info)
-        .service(update_collection_cluster);
-}
-
-#[cfg(test)]
-mod tests {
-    use actix_web::web::Query;
-
-    use super::WaitTimeout;
-
-    #[test]
-    fn timeout_is_deserialized() {
-        let timeout: WaitTimeout = Query::from_query("").unwrap().0;
-        assert!(timeout.timeout.is_none());
-        let timeout: WaitTimeout = Query::from_query("timeout=10").unwrap().0;
-        assert_eq!(timeout.timeout, Some(10))
-    }
-}
diff --git a/crates/qdrant/src/actix/api/count_api.rs b/crates/qdrant/src/actix/api/count_api.rs
deleted file mode 100644
index 4125b32..0000000
--- a/crates/qdrant/src/actix/api/count_api.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-use actix_web::rt::time::Instant;
-use actix_web::{post, web, Responder};
-use actix_web_validator::{Json, Path};
-use collection::operations::types::CountRequest;
-use storage::content_manager::toc::TableOfContent;
-
-use super::CollectionPath;
-use crate::actix::helpers::process_response;
-use crate::common::points::do_count_points;
-
-#[post("/collections/{name}/points/count")]
-async fn count_points(
-    toc: web::Data<TableOfContent>,
-    collection: Path<CollectionPath>,
-    request: Json<CountRequest>,
-) -> impl Responder {
-    let timing = Instant::now();
-
-    let response =
-        do_count_points(toc.get_ref(), &collection.name, request.into_inner(), None).await;
-
-    process_response(response, timing)
-}
diff --git a/crates/qdrant/src/actix/api/mod.rs b/crates/qdrant/src/actix/api/mod.rs
deleted file mode 100644
index 4cf1dc0..0000000
--- a/crates/qdrant/src/actix/api/mod.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-pub mod cluster_api;
-pub mod collections_api;
-pub mod count_api;
-pub mod read_params;
-pub mod recommend_api;
-pub mod retrieve_api;
-pub mod search_api;
-pub mod service_api;
-pub mod snapshot_api;
-pub mod update_api;
-
-use api::grpc::validate::validate_collection_name;
-use serde::Deserialize;
-use validator::Validate;
-
-/// A collection path with stricter validation
-///
-/// Validation for collection paths has been made more strict over time.
-/// To prevent breaking changes on existing collections, this is only enforced for newly created
-/// collections. Basic validation is enforced everywhere else.
-#[derive(Deserialize, Validate)]
-struct StrictCollectionPath {
-    #[validate(length(min = 1, max = 255), custom = "validate_collection_name")]
-    name: String,
-}
-
-/// A collection path with basic validation
-///
-/// Validation for collection paths has been made more strict over time.
-/// To prevent breaking changes on existing collections, this is only enforced for newly created
-/// collections. Basic validation is enforced everywhere else.
-#[derive(Deserialize, Validate)]
-struct CollectionPath {
-    #[validate(length(min = 1, max = 255))]
-    name: String,
-}
diff --git a/crates/qdrant/src/actix/api/read_params.rs b/crates/qdrant/src/actix/api/read_params.rs
deleted file mode 100644
index ae43b9d..0000000
--- a/crates/qdrant/src/actix/api/read_params.rs
+++ /dev/null
@@ -1,101 +0,0 @@
-use collection::operations::consistency_params::ReadConsistency;
-use schemars::JsonSchema;
-use serde::Deserialize;
-use validator::Validate;
-
-#[derive(Copy, Clone, Debug, Default, Eq, PartialEq, Deserialize, JsonSchema, Validate)]
-pub struct ReadParams {
-    #[serde(default, deserialize_with = "deserialize_read_consistency")]
-    #[validate]
-    pub consistency: Option<ReadConsistency>,
-}
-
-fn deserialize_read_consistency<'de, D>(
-    deserializer: D,
-) -> Result<Option<ReadConsistency>, D::Error>
-where
-    D: serde::Deserializer<'de>,
-{
-    #[derive(Deserialize)]
-    #[serde(untagged)]
-    enum Helper<'a> {
-        ReadConsistency(ReadConsistency),
-        Str(&'a str),
-    }
-
-    match Helper::deserialize(deserializer)? {
-        Helper::ReadConsistency(read_consistency) => Ok(Some(read_consistency)),
-        Helper::Str("") => Ok(None),
-        _ => Err(serde::de::Error::custom(
-            "failed to deserialize read consistency query parameter value",
-        )),
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use collection::operations::consistency_params::ReadConsistencyType;
-
-    use super::*;
-
-    #[test]
-    fn deserialize_empty_string() {
-        test_str("", ReadParams::default());
-    }
-
-    #[test]
-    fn deserialize_empty_value() {
-        test("", ReadParams::default());
-    }
-
-    #[test]
-    fn deserialize_type() {
-        test("all", from_type(ReadConsistencyType::All));
-        test("majority", from_type(ReadConsistencyType::Majority));
-        test("quorum", from_type(ReadConsistencyType::Quorum));
-    }
-
-    #[test]
-    fn deserialize_factor() {
-        for factor in 1..42 {
-            test(&factor.to_string(), from_factor(factor));
-        }
-    }
-
-    #[test]
-    fn try_deserialize_factor_0() {
-        assert!(try_deserialize(&str("0")).is_err());
-    }
-
-    fn test(value: &str, params: ReadParams) {
-        test_str(&str(value), params);
-    }
-
-    fn test_str(str: &str, params: ReadParams) {
-        assert_eq!(deserialize(str), params);
-    }
-
-    fn deserialize(str: &str) -> ReadParams {
-        try_deserialize(str).unwrap()
-    }
-
-    fn try_deserialize(str: &str) -> Result<ReadParams, serde_urlencoded::de::Error> {
-        serde_urlencoded::from_str(str)
-    }
-
-    fn str(value: &str) -> String {
-        format!("consistency={value}")
-    }
-
-    fn from_type(r#type: ReadConsistencyType) -> ReadParams {
-        ReadParams {
-            consistency: Some(ReadConsistency::Type(r#type)),
-        }
-    }
-
-    fn from_factor(factor: usize) -> ReadParams {
-        ReadParams {
-            consistency: Some(ReadConsistency::Factor(factor)),
-        }
-    }
-}
diff --git a/crates/qdrant/src/actix/api/recommend_api.rs b/crates/qdrant/src/actix/api/recommend_api.rs
deleted file mode 100644
index d8507ed..0000000
--- a/crates/qdrant/src/actix/api/recommend_api.rs
+++ /dev/null
@@ -1,100 +0,0 @@
-use actix_web::rt::time::Instant;
-use actix_web::{post, web, Responder};
-use actix_web_validator::{Json, Path, Query};
-use collection::operations::consistency_params::ReadConsistency;
-use collection::operations::types::{
-    RecommendGroupsRequest, RecommendRequest, RecommendRequestBatch,
-};
-use segment::types::ScoredPoint;
-use storage::content_manager::errors::StorageError;
-use storage::content_manager::toc::TableOfContent;
-
-use super::read_params::ReadParams;
-use super::CollectionPath;
-use crate::actix::helpers::process_response;
-
-async fn do_recommend_points(
-    toc: &TableOfContent,
-    collection_name: &str,
-    request: RecommendRequest,
-    read_consistency: Option<ReadConsistency>,
-) -> Result<Vec<ScoredPoint>, StorageError> {
-    toc.recommend(collection_name, request, read_consistency)
-        .await
-}
-
-#[post("/collections/{name}/points/recommend")]
-async fn recommend_points(
-    toc: web::Data<TableOfContent>,
-    collection: Path<CollectionPath>,
-    request: Json<RecommendRequest>,
-    params: Query<ReadParams>,
-) -> impl Responder {
-    let timing = Instant::now();
-
-    let response = do_recommend_points(
-        toc.get_ref(),
-        &collection.name,
-        request.into_inner(),
-        params.consistency,
-    )
-    .await;
-
-    process_response(response, timing)
-}
-
-async fn do_recommend_batch_points(
-    toc: &TableOfContent,
-    collection_name: &str,
-    request: RecommendRequestBatch,
-    read_consistency: Option<ReadConsistency>,
-) -> Result<Vec<Vec<ScoredPoint>>, StorageError> {
-    toc.recommend_batch(collection_name, request, read_consistency)
-        .await
-}
-
-#[post("/collections/{name}/points/recommend/batch")]
-async fn recommend_batch_points(
-    toc: web::Data<TableOfContent>,
-    collection: Path<CollectionPath>,
-    request: Json<RecommendRequestBatch>,
-    params: Query<ReadParams>,
-) -> impl Responder {
-    let timing = Instant::now();
-
-    let response = do_recommend_batch_points(
-        toc.get_ref(),
-        &collection.name,
-        request.into_inner(),
-        params.consistency,
-    )
-    .await;
-
-    process_response(response, timing)
-}
-
-#[post("/collections/{name}/points/recommend/groups")]
-async fn recommend_point_groups(
-    toc: web::Data<TableOfContent>,
-    collection: Path<CollectionPath>,
-    request: Json<RecommendGroupsRequest>,
-    params: Query<ReadParams>,
-) -> impl Responder {
-    let timing = Instant::now();
-
-    let response = crate::common::points::do_recommend_point_groups(
-        toc.get_ref(),
-        &collection.name,
-        request.into_inner(),
-        params.consistency,
-    )
-    .await;
-
-    process_response(response, timing)
-}
-// Configure services
-pub fn config_recommend_api(cfg: &mut web::ServiceConfig) {
-    cfg.service(recommend_points)
-        .service(recommend_batch_points)
-        .service(recommend_point_groups);
-}
diff --git a/crates/qdrant/src/actix/api/retrieve_api.rs b/crates/qdrant/src/actix/api/retrieve_api.rs
deleted file mode 100644
index b6f48a6..0000000
--- a/crates/qdrant/src/actix/api/retrieve_api.rs
+++ /dev/null
@@ -1,130 +0,0 @@
-use actix_web::rt::time::Instant;
-use actix_web::{get, post, web, Responder};
-use actix_web_validator::{Json, Path, Query};
-use collection::operations::consistency_params::ReadConsistency;
-use collection::operations::types::{PointRequest, Record, ScrollRequest, ScrollResult};
-use segment::types::{PointIdType, WithPayloadInterface};
-use serde::Deserialize;
-use storage::content_manager::errors::StorageError;
-use storage::content_manager::toc::TableOfContent;
-use validator::Validate;
-
-use super::read_params::ReadParams;
-use super::CollectionPath;
-use crate::actix::helpers::process_response;
-use crate::common::points::do_get_points;
-
-#[derive(Deserialize, Validate)]
-struct PointPath {
-    #[validate(length(min = 1))]
-    // TODO: validate this is a valid ID type (usize or UUID)? Does currently error on deserialize.
-    id: String,
-}
-
-async fn do_get_point(
-    toc: &TableOfContent,
-    collection_name: &str,
-    point_id: PointIdType,
-    read_consistency: Option<ReadConsistency>,
-) -> Result<Option<Record>, StorageError> {
-    let request = PointRequest {
-        ids: vec![point_id],
-        with_payload: Some(WithPayloadInterface::Bool(true)),
-        with_vector: true.into(),
-    };
-
-    toc.retrieve(collection_name, request, read_consistency, None)
-        .await
-        .map(|points| points.into_iter().next())
-}
-
-async fn scroll_get_points(
-    toc: &TableOfContent,
-    collection_name: &str,
-    request: ScrollRequest,
-    read_consistency: Option<ReadConsistency>,
-) -> Result<ScrollResult, StorageError> {
-    toc.scroll(collection_name, request, read_consistency, None)
-        .await
-}
-
-#[get("/collections/{name}/points/{id}")]
-async fn get_point(
-    toc: web::Data<TableOfContent>,
-    collection: Path<CollectionPath>,
-    point: Path<PointPath>,
-    params: Query<ReadParams>,
-) -> impl Responder {
-    let timing = Instant::now();
-
-    let point_id: PointIdType = {
-        let parse_res = point.id.parse();
-        match parse_res {
-            Ok(x) => x,
-            Err(_) => {
-                let error = Err(StorageError::BadInput {
-                    description: format!("Can not recognize \"{}\" as point id", point.id),
-                });
-                return process_response::<()>(error, timing);
-            }
-        }
-    };
-
-    let response = do_get_point(
-        toc.get_ref(),
-        &collection.name,
-        point_id,
-        params.consistency,
-    )
-    .await;
-
-    let response = match response {
-        Ok(record) => match record {
-            None => Err(StorageError::NotFound {
-                description: format!("Point with id {point_id} does not exists!"),
-            }),
-            Some(record) => Ok(record),
-        },
-        Err(e) => Err(e),
-    };
-    process_response(response, timing)
-}
-
-#[post("/collections/{name}/points")]
-async fn get_points(
-    toc: web::Data<TableOfContent>,
-    collection: Path<CollectionPath>,
-    request: Json<PointRequest>,
-    params: Query<ReadParams>,
-) -> impl Responder {
-    let timing = Instant::now();
-
-    let response = do_get_points(
-        toc.get_ref(),
-        &collection.name,
-        request.into_inner(),
-        params.consistency,
-        None,
-    )
-    .await;
-    process_response(response, timing)
-}
-
-#[post("/collections/{name}/points/scroll")]
-async fn scroll_points(
-    toc: web::Data<TableOfContent>,
-    collection: Path<CollectionPath>,
-    request: Json<ScrollRequest>,
-    params: Query<ReadParams>,
-) -> impl Responder {
-    let timing = Instant::now();
-
-    let response = scroll_get_points(
-        toc.get_ref(),
-        &collection.name,
-        request.into_inner(),
-        params.consistency,
-    )
-    .await;
-    process_response(response, timing)
-}
diff --git a/crates/qdrant/src/actix/api/search_api.rs b/crates/qdrant/src/actix/api/search_api.rs
deleted file mode 100644
index b70e286..0000000
--- a/crates/qdrant/src/actix/api/search_api.rs
+++ /dev/null
@@ -1,80 +0,0 @@
-use actix_web::rt::time::Instant;
-use actix_web::{post, web, Responder};
-use actix_web_validator::{Json, Path, Query};
-use collection::operations::types::{SearchGroupsRequest, SearchRequest, SearchRequestBatch};
-use storage::content_manager::toc::TableOfContent;
-
-use super::read_params::ReadParams;
-use super::CollectionPath;
-use crate::actix::helpers::process_response;
-use crate::common::points::{do_search_batch_points, do_search_point_groups, do_search_points};
-
-#[post("/collections/{name}/points/search")]
-async fn search_points(
-    toc: web::Data<TableOfContent>,
-    collection: Path<CollectionPath>,
-    request: Json<SearchRequest>,
-    params: Query<ReadParams>,
-) -> impl Responder {
-    let timing = Instant::now();
-
-    let response = do_search_points(
-        toc.get_ref(),
-        &collection.name,
-        request.into_inner(),
-        params.consistency,
-        None,
-    )
-    .await;
-
-    process_response(response, timing)
-}
-
-#[post("/collections/{name}/points/search/batch")]
-async fn batch_search_points(
-    toc: web::Data<TableOfContent>,
-    collection: Path<CollectionPath>,
-    request: Json<SearchRequestBatch>,
-    params: Query<ReadParams>,
-) -> impl Responder {
-    let timing = Instant::now();
-
-    let response = do_search_batch_points(
-        toc.get_ref(),
-        &collection.name,
-        request.into_inner(),
-        params.consistency,
-        None,
-    )
-    .await;
-
-    process_response(response, timing)
-}
-
-#[post("/collections/{name}/points/search/groups")]
-async fn search_point_groups(
-    toc: web::Data<TableOfContent>,
-    collection: Path<CollectionPath>,
-    request: Json<SearchGroupsRequest>,
-    params: Query<ReadParams>,
-) -> impl Responder {
-    let timing = Instant::now();
-
-    let response = do_search_point_groups(
-        toc.get_ref(),
-        &collection.name,
-        request.into_inner(),
-        params.consistency,
-        None,
-    )
-    .await;
-
-    process_response(response, timing)
-}
-
-// Configure services
-pub fn config_search_api(cfg: &mut web::ServiceConfig) {
-    cfg.service(search_points)
-        .service(batch_search_points)
-        .service(search_point_groups);
-}
diff --git a/crates/qdrant/src/actix/api/service_api.rs b/crates/qdrant/src/actix/api/service_api.rs
deleted file mode 100644
index 770fbc4..0000000
--- a/crates/qdrant/src/actix/api/service_api.rs
+++ /dev/null
@@ -1,96 +0,0 @@
-use actix_web::http::header::ContentType;
-use actix_web::rt::time::Instant;
-use actix_web::web::Query;
-use actix_web::{get, post, web, HttpResponse, Responder};
-use actix_web_validator::Json;
-use schemars::JsonSchema;
-use segment::common::anonymize::Anonymize;
-use serde::{Deserialize, Serialize};
-use storage::content_manager::toc::TableOfContent;
-use tokio::sync::Mutex;
-
-use crate::actix::helpers::process_response;
-use crate::common::helpers::LocksOption;
-use crate::common::metrics::MetricsData;
-use crate::common::telemetry::TelemetryCollector;
-
-#[derive(Deserialize, Serialize, JsonSchema)]
-pub struct TelemetryParam {
-    pub anonymize: Option<bool>,
-    pub details_level: Option<usize>,
-}
-
-#[get("/telemetry")]
-async fn telemetry(
-    telemetry_collector: web::Data<Mutex<TelemetryCollector>>,
-    params: Query<TelemetryParam>,
-) -> impl Responder {
-    let timing = Instant::now();
-    let anonymize = params.anonymize.unwrap_or(false);
-    let details_level = params.details_level.unwrap_or(0);
-    let telemetry_collector = telemetry_collector.lock().await;
-    let telemetry_data = telemetry_collector.prepare_data(details_level).await;
-    let telemetry_data = if anonymize {
-        telemetry_data.anonymize()
-    } else {
-        telemetry_data
-    };
-    process_response(Ok(telemetry_data), timing)
-}
-
-#[derive(Deserialize, Serialize, JsonSchema)]
-pub struct MetricsParam {
-    pub anonymize: Option<bool>,
-}
-
-#[get("/metrics")]
-async fn metrics(
-    telemetry_collector: web::Data<Mutex<TelemetryCollector>>,
-    params: Query<MetricsParam>,
-) -> impl Responder {
-    let anonymize = params.anonymize.unwrap_or(false);
-    let telemetry_collector = telemetry_collector.lock().await;
-    let telemetry_data = telemetry_collector.prepare_data(1).await;
-    let telemetry_data = if anonymize {
-        telemetry_data.anonymize()
-    } else {
-        telemetry_data
-    };
-
-    HttpResponse::Ok()
-        .content_type(ContentType::plaintext())
-        .body(MetricsData::from(telemetry_data).format_metrics())
-}
-
-#[post("/locks")]
-async fn put_locks(
-    toc: web::Data<TableOfContent>,
-    locks_option: Json<LocksOption>,
-) -> impl Responder {
-    let timing = Instant::now();
-    let result = LocksOption {
-        write: toc.get_ref().is_write_locked(),
-        error_message: toc.get_ref().get_lock_error_message(),
-    };
-    toc.get_ref()
-        .set_locks(locks_option.write, locks_option.error_message.clone());
-    process_response(Ok(result), timing)
-}
-
-#[get("/locks")]
-async fn get_locks(toc: web::Data<TableOfContent>) -> impl Responder {
-    let timing = Instant::now();
-    let result = LocksOption {
-        write: toc.get_ref().is_write_locked(),
-        error_message: toc.get_ref().get_lock_error_message(),
-    };
-    process_response(Ok(result), timing)
-}
-
-// Configure services
-pub fn config_service_api(cfg: &mut web::ServiceConfig) {
-    cfg.service(telemetry)
-        .service(metrics)
-        .service(put_locks)
-        .service(get_locks);
-}
diff --git a/crates/qdrant/src/actix/api/snapshot_api.rs b/crates/qdrant/src/actix/api/snapshot_api.rs
deleted file mode 100644
index 0f8e580..0000000
--- a/crates/qdrant/src/actix/api/snapshot_api.rs
+++ /dev/null
@@ -1,287 +0,0 @@
-use actix_files::NamedFile;
-use actix_multipart::form::tempfile::TempFile;
-use actix_multipart::form::MultipartForm;
-use actix_web::rt::time::Instant;
-use actix_web::{delete, get, post, put, web, Responder, Result};
-use actix_web_validator::{Json, Path, Query};
-use collection::operations::snapshot_ops::{SnapshotPriority, SnapshotRecover};
-use reqwest::Url;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use storage::content_manager::errors::StorageError;
-use storage::content_manager::snapshots::recover::do_recover_from_snapshot;
-use storage::content_manager::snapshots::{
-    do_create_full_snapshot, do_delete_collection_snapshot, do_delete_full_snapshot,
-    do_list_full_snapshots, get_full_snapshot_path,
-};
-use storage::content_manager::toc::TableOfContent;
-use storage::dispatcher::Dispatcher;
-use uuid::Uuid;
-use validator::Validate;
-
-use super::CollectionPath;
-use crate::actix::helpers::{
-    accepted_response, collection_into_actix_error, process_response, storage_into_actix_error,
-};
-use crate::common::collections::*;
-
-#[derive(Deserialize, Validate)]
-struct SnapshotPath {
-    #[serde(rename = "snapshot_name")]
-    #[validate(length(min = 1))]
-    name: String,
-}
-
-#[derive(Deserialize, Serialize, JsonSchema, Validate)]
-pub struct SnapshotUploadingParam {
-    pub wait: Option<bool>,
-    pub priority: Option<SnapshotPriority>,
-}
-
-#[derive(Deserialize, Serialize, JsonSchema, Validate)]
-pub struct SnapshottingParam {
-    pub wait: Option<bool>,
-}
-
-#[derive(MultipartForm)]
-pub struct SnapshottingForm {
-    snapshot: TempFile,
-}
-
-// Actix specific code
-pub async fn do_get_full_snapshot(toc: &TableOfContent, snapshot_name: &str) -> Result<NamedFile> {
-    let file_name = get_full_snapshot_path(toc, snapshot_name)
-        .await
-        .map_err(storage_into_actix_error)?;
-
-    Ok(NamedFile::open(file_name)?)
-}
-
-pub async fn do_save_uploaded_snapshot(
-    toc: &TableOfContent,
-    collection_name: &str,
-    snapshot: TempFile,
-) -> std::result::Result<Url, StorageError> {
-    let filename = snapshot
-        .file_name
-        .unwrap_or_else(|| Uuid::new_v4().to_string());
-    let collection_snapshot_path = toc.snapshots_path_for_collection(collection_name);
-    if !collection_snapshot_path.exists() {
-        log::debug!(
-            "Creating missing collection snapshots directory for {}",
-            collection_name
-        );
-        toc.create_snapshots_path(collection_name).await?;
-    }
-
-    let path = collection_snapshot_path.join(filename);
-
-    snapshot.file.persist(&path)?;
-
-    let absolute_path = path.canonicalize()?;
-
-    let snapshot_location = Url::from_file_path(&absolute_path).map_err(|_| {
-        StorageError::service_error(format!(
-            "Failed to convert path to URL: {}",
-            absolute_path.display()
-        ))
-    })?;
-
-    Ok(snapshot_location)
-}
-
-// Actix specific code
-pub async fn do_get_snapshot(
-    toc: &TableOfContent,
-    collection_name: &str,
-    snapshot_name: &str,
-) -> Result<NamedFile> {
-    let collection = toc
-        .get_collection(collection_name)
-        .await
-        .map_err(storage_into_actix_error)?;
-
-    let file_name = collection
-        .get_snapshot_path(snapshot_name)
-        .await
-        .map_err(collection_into_actix_error)?;
-
-    Ok(NamedFile::open(file_name)?)
-}
-
-#[get("/collections/{name}/snapshots")]
-async fn list_snapshots(toc: web::Data<TableOfContent>, path: web::Path<String>) -> impl Responder {
-    let collection_name = path.into_inner();
-    let timing = Instant::now();
-
-    let response = do_list_snapshots(&toc, &collection_name).await;
-    process_response(response, timing)
-}
-
-#[post("/collections/{name}/snapshots")]
-async fn create_snapshot(
-    dispatcher: web::Data<Dispatcher>,
-    path: web::Path<String>,
-    params: Query<SnapshottingParam>,
-) -> impl Responder {
-    let collection_name = path.into_inner();
-    let wait = params.wait.unwrap_or(true);
-
-    let timing = Instant::now();
-    let response = do_create_snapshot(dispatcher.get_ref(), &collection_name, wait).await;
-    match response {
-        Err(_) => process_response(response, timing),
-        Ok(_) if wait => process_response(response, timing),
-        Ok(_) => accepted_response(timing),
-    }
-}
-
-#[post("/collections/{name}/snapshots/upload")]
-async fn upload_snapshot(
-    dispatcher: web::Data<Dispatcher>,
-    collection: Path<CollectionPath>,
-    MultipartForm(form): MultipartForm<SnapshottingForm>,
-    params: Query<SnapshotUploadingParam>,
-) -> impl Responder {
-    let timing = Instant::now();
-    let snapshot = form.snapshot;
-    let wait = params.wait.unwrap_or(true);
-
-    let snapshot_location =
-        match do_save_uploaded_snapshot(dispatcher.get_ref(), &collection.name, snapshot).await {
-            Ok(location) => location,
-            Err(err) => return process_response::<()>(Err(err), timing),
-        };
-
-    let snapshot_recover = SnapshotRecover {
-        location: snapshot_location,
-        priority: params.priority,
-    };
-
-    let response = do_recover_from_snapshot(
-        dispatcher.get_ref(),
-        &collection.name,
-        snapshot_recover,
-        wait,
-    )
-    .await;
-    match response {
-        Err(_) => process_response(response, timing),
-        Ok(_) if wait => process_response(response, timing),
-        Ok(_) => accepted_response(timing),
-    }
-}
-
-#[put("/collections/{name}/snapshots/recover")]
-async fn recover_from_snapshot(
-    dispatcher: web::Data<Dispatcher>,
-    collection: Path<CollectionPath>,
-    request: Json<SnapshotRecover>,
-    params: Query<SnapshottingParam>,
-) -> impl Responder {
-    let timing = Instant::now();
-    let snapshot_recover = request.into_inner();
-    let wait = params.wait.unwrap_or(true);
-
-    let response = do_recover_from_snapshot(
-        dispatcher.get_ref(),
-        &collection.name,
-        snapshot_recover,
-        wait,
-    )
-    .await;
-    match response {
-        Err(_) => process_response(response, timing),
-        Ok(_) if wait => process_response(response, timing),
-        Ok(_) => accepted_response(timing),
-    }
-}
-
-#[get("/collections/{name}/snapshots/{snapshot_name}")]
-async fn get_snapshot(
-    toc: web::Data<TableOfContent>,
-    path: web::Path<(String, String)>,
-) -> impl Responder {
-    let (collection_name, snapshot_name) = path.into_inner();
-    do_get_snapshot(&toc, &collection_name, &snapshot_name).await
-}
-#[get("/snapshots")]
-async fn list_full_snapshots(toc: web::Data<TableOfContent>) -> impl Responder {
-    let timing = Instant::now();
-    let response = do_list_full_snapshots(toc.get_ref()).await;
-    process_response(response, timing)
-}
-
-#[post("/snapshots")]
-async fn create_full_snapshot(
-    dispatcher: web::Data<Dispatcher>,
-    params: Query<SnapshottingParam>,
-) -> impl Responder {
-    let timing = Instant::now();
-    let wait = params.wait.unwrap_or(true);
-    let response = do_create_full_snapshot(dispatcher.get_ref(), wait).await;
-    match response {
-        Err(_) => process_response(response, timing),
-        Ok(_) if wait => process_response(response, timing),
-        Ok(_) => accepted_response(timing),
-    }
-}
-
-#[get("/snapshots/{snapshot_name}")]
-async fn get_full_snapshot(
-    toc: web::Data<TableOfContent>,
-    path: web::Path<String>,
-) -> impl Responder {
-    let snapshot_name = path.into_inner();
-    do_get_full_snapshot(&toc, &snapshot_name).await
-}
-
-#[delete("/snapshots/{snapshot_name}")]
-async fn delete_full_snapshot(
-    dispatcher: web::Data<Dispatcher>,
-    path: web::Path<String>,
-    params: Query<SnapshottingParam>,
-) -> impl Responder {
-    let snapshot_name = path.into_inner();
-    let timing = Instant::now();
-    let wait = params.wait.unwrap_or(true);
-    let response = do_delete_full_snapshot(dispatcher.get_ref(), &snapshot_name, wait).await;
-    match response {
-        Err(_) => process_response(response, timing),
-        Ok(_) if wait => process_response(response, timing),
-        Ok(_) => accepted_response(timing),
-    }
-}
-
-#[delete("/collections/{name}/snapshots/{snapshot_name}")]
-async fn delete_collection_snapshot(
-    dispatcher: web::Data<Dispatcher>,
-    path: web::Path<(String, String)>,
-    params: Query<SnapshottingParam>,
-) -> impl Responder {
-    let (collection_name, snapshot_name) = path.into_inner();
-    let timing = Instant::now();
-    let wait = params.wait.unwrap_or(true);
-    let response =
-        do_delete_collection_snapshot(dispatcher.get_ref(), &collection_name, &snapshot_name, wait)
-            .await;
-    match response {
-        Err(_) => process_response(response, timing),
-        Ok(_) if wait => process_response(response, timing),
-        Ok(_) => accepted_response(timing),
-    }
-}
-
-// Configure services
-pub fn config_snapshots_api(cfg: &mut web::ServiceConfig) {
-    cfg.service(list_snapshots)
-        .service(create_snapshot)
-        .service(upload_snapshot)
-        .service(recover_from_snapshot)
-        .service(get_snapshot)
-        .service(list_full_snapshots)
-        .service(create_full_snapshot)
-        .service(get_full_snapshot)
-        .service(delete_full_snapshot)
-        .service(delete_collection_snapshot);
-}
diff --git a/crates/qdrant/src/actix/api/update_api.rs b/crates/qdrant/src/actix/api/update_api.rs
deleted file mode 100644
index 71e4408..0000000
--- a/crates/qdrant/src/actix/api/update_api.rs
+++ /dev/null
@@ -1,308 +0,0 @@
-use actix_web::rt::time::Instant;
-use actix_web::{delete, post, put, web, Responder};
-use actix_web_validator::{Json, Path, Query};
-use collection::operations::payload_ops::{DeletePayload, SetPayload};
-use collection::operations::point_ops::{PointInsertOperations, PointsSelector, WriteOrdering};
-use collection::operations::vector_ops::{DeleteVectors, UpdateVectors};
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use storage::content_manager::toc::TableOfContent;
-use validator::Validate;
-
-use super::CollectionPath;
-use crate::actix::helpers::process_response;
-use crate::common::points::{
-    do_batch_update_points, do_clear_payload, do_create_index, do_delete_index, do_delete_payload,
-    do_delete_points, do_delete_vectors, do_overwrite_payload, do_set_payload, do_update_vectors,
-    do_upsert_points, CreateFieldIndex, UpdateOperations,
-};
-
-#[derive(Deserialize, Validate)]
-struct FieldPath {
-    #[serde(rename = "field_name")]
-    #[validate(length(min = 1))]
-    name: String,
-}
-
-#[derive(Deserialize, Serialize, JsonSchema, Validate)]
-pub struct UpdateParam {
-    pub wait: Option<bool>,
-    pub ordering: Option<WriteOrdering>,
-}
-
-#[put("/collections/{name}/points")]
-async fn upsert_points(
-    toc: web::Data<TableOfContent>,
-    collection: Path<CollectionPath>,
-    operation: Json<PointInsertOperations>,
-    params: Query<UpdateParam>,
-) -> impl Responder {
-    let timing = Instant::now();
-    let operation = operation.into_inner();
-    let wait = params.wait.unwrap_or(false);
-    let ordering = params.ordering.unwrap_or_default();
-
-    let response = do_upsert_points(
-        toc.get_ref(),
-        &collection.name,
-        operation,
-        None,
-        wait,
-        ordering,
-    )
-    .await;
-    process_response(response, timing)
-}
-
-#[post("/collections/{name}/points/delete")]
-async fn delete_points(
-    toc: web::Data<TableOfContent>,
-    collection: Path<CollectionPath>,
-    operation: Json<PointsSelector>,
-    params: Query<UpdateParam>,
-) -> impl Responder {
-    let timing = Instant::now();
-    let operation = operation.into_inner();
-    let wait = params.wait.unwrap_or(false);
-    let ordering = params.ordering.unwrap_or_default();
-
-    let response = do_delete_points(
-        toc.get_ref(),
-        &collection.name,
-        operation,
-        None,
-        wait,
-        ordering,
-    )
-    .await;
-    process_response(response, timing)
-}
-
-#[put("/collections/{name}/points/vectors")]
-async fn update_vectors(
-    toc: web::Data<TableOfContent>,
-    collection: Path<CollectionPath>,
-    operation: Json<UpdateVectors>,
-    params: Query<UpdateParam>,
-) -> impl Responder {
-    let timing = Instant::now();
-    let operation = operation.into_inner();
-    let wait = params.wait.unwrap_or(false);
-    let ordering = params.ordering.unwrap_or_default();
-
-    let response = do_update_vectors(
-        toc.get_ref(),
-        &collection.name,
-        operation,
-        None,
-        wait,
-        ordering,
-    )
-    .await;
-    process_response(response, timing)
-}
-
-#[post("/collections/{name}/points/vectors/delete")]
-async fn delete_vectors(
-    toc: web::Data<TableOfContent>,
-    collection: Path<CollectionPath>,
-    operation: Json<DeleteVectors>,
-    params: Query<UpdateParam>,
-) -> impl Responder {
-    let timing = Instant::now();
-    let operation = operation.into_inner();
-    let wait = params.wait.unwrap_or(false);
-    let ordering = params.ordering.unwrap_or_default();
-
-    let response = do_delete_vectors(
-        toc.get_ref(),
-        &collection.name,
-        operation,
-        None,
-        wait,
-        ordering,
-    )
-    .await;
-    process_response(response, timing)
-}
-
-#[post("/collections/{name}/points/payload")]
-async fn set_payload(
-    toc: web::Data<TableOfContent>,
-    collection: Path<CollectionPath>,
-    operation: Json<SetPayload>,
-    params: Query<UpdateParam>,
-) -> impl Responder {
-    let timing = Instant::now();
-    let operation = operation.into_inner();
-    let wait = params.wait.unwrap_or(false);
-    let ordering = params.ordering.unwrap_or_default();
-
-    let response = do_set_payload(
-        toc.get_ref(),
-        &collection.name,
-        operation,
-        None,
-        wait,
-        ordering,
-    )
-    .await;
-    process_response(response, timing)
-}
-
-#[put("/collections/{name}/points/payload")]
-async fn overwrite_payload(
-    toc: web::Data<TableOfContent>,
-    collection: Path<CollectionPath>,
-    operation: Json<SetPayload>,
-    params: Query<UpdateParam>,
-) -> impl Responder {
-    let timing = Instant::now();
-    let operation = operation.into_inner();
-    let wait = params.wait.unwrap_or(false);
-    let ordering = params.ordering.unwrap_or_default();
-
-    let response = do_overwrite_payload(
-        toc.get_ref(),
-        &collection.name,
-        operation,
-        None,
-        wait,
-        ordering,
-    )
-    .await;
-    process_response(response, timing)
-}
-
-#[post("/collections/{name}/points/payload/delete")]
-async fn delete_payload(
-    toc: web::Data<TableOfContent>,
-    collection: Path<CollectionPath>,
-    operation: Json<DeletePayload>,
-    params: Query<UpdateParam>,
-) -> impl Responder {
-    let timing = Instant::now();
-    let operation = operation.into_inner();
-    let wait = params.wait.unwrap_or(false);
-    let ordering = params.ordering.unwrap_or_default();
-
-    let response = do_delete_payload(
-        toc.get_ref(),
-        &collection.name,
-        operation,
-        None,
-        wait,
-        ordering,
-    )
-    .await;
-    process_response(response, timing)
-}
-
-#[post("/collections/{name}/points/payload/clear")]
-async fn clear_payload(
-    toc: web::Data<TableOfContent>,
-    collection: Path<CollectionPath>,
-    operation: Json<PointsSelector>,
-    params: Query<UpdateParam>,
-) -> impl Responder {
-    let timing = Instant::now();
-    let operation = operation.into_inner();
-    let wait = params.wait.unwrap_or(false);
-    let ordering = params.ordering.unwrap_or_default();
-
-    let response = do_clear_payload(
-        toc.get_ref(),
-        &collection.name,
-        operation,
-        None,
-        wait,
-        ordering,
-    )
-    .await;
-    process_response(response, timing)
-}
-
-#[post("/collections/{name}/points/batch")]
-async fn update_batch(
-    toc: web::Data<TableOfContent>,
-    collection: Path<CollectionPath>,
-    operations: Json<UpdateOperations>,
-    params: Query<UpdateParam>,
-) -> impl Responder {
-    let timing = Instant::now();
-    let operations = operations.into_inner();
-    let wait = params.wait.unwrap_or(false);
-    let ordering = params.ordering.unwrap_or_default();
-
-    let response = do_batch_update_points(
-        &toc,
-        &collection.name,
-        operations.operations,
-        None,
-        wait,
-        ordering,
-    )
-    .await;
-    process_response(response, timing)
-}
-#[put("/collections/{name}/index")]
-async fn create_field_index(
-    toc: web::Data<TableOfContent>,
-    collection: Path<CollectionPath>,
-    operation: Json<CreateFieldIndex>,
-    params: Query<UpdateParam>,
-) -> impl Responder {
-    let timing = Instant::now();
-    let operation = operation.into_inner();
-    let wait = params.wait.unwrap_or(false);
-    let ordering = params.ordering.unwrap_or_default();
-
-    let response = do_create_index(
-        toc.get_ref(),
-        &collection.name,
-        operation,
-        None,
-        wait,
-        ordering,
-    )
-    .await;
-    process_response(response, timing)
-}
-
-#[delete("/collections/{name}/index/{field_name}")]
-async fn delete_field_index(
-    toc: web::Data<TableOfContent>,
-    collection: Path<CollectionPath>,
-    field: Path<FieldPath>,
-    params: Query<UpdateParam>,
-) -> impl Responder {
-    let timing = Instant::now();
-    let wait = params.wait.unwrap_or(false);
-    let ordering = params.ordering.unwrap_or_default();
-
-    let response = do_delete_index(
-        toc.get_ref(),
-        &collection.name,
-        field.name.clone(),
-        None,
-        wait,
-        ordering,
-    )
-    .await;
-    process_response(response, timing)
-}
-
-// Configure services
-pub fn config_update_api(cfg: &mut web::ServiceConfig) {
-    cfg.service(upsert_points)
-        .service(delete_points)
-        .service(update_vectors)
-        .service(delete_vectors)
-        .service(set_payload)
-        .service(overwrite_payload)
-        .service(delete_payload)
-        .service(clear_payload)
-        .service(create_field_index)
-        .service(delete_field_index)
-        .service(update_batch);
-}
diff --git a/crates/qdrant/src/actix/api_key.rs b/crates/qdrant/src/actix/api_key.rs
deleted file mode 100644
index eadd45a..0000000
--- a/crates/qdrant/src/actix/api_key.rs
+++ /dev/null
@@ -1,124 +0,0 @@
-use std::future::{ready, Ready};
-
-use actix_web::body::{BoxBody, EitherBody};
-use actix_web::dev::{forward_ready, Service, ServiceRequest, ServiceResponse, Transform};
-use actix_web::{Error, HttpResponse};
-use constant_time_eq::constant_time_eq;
-use futures_util::future::LocalBoxFuture;
-
-pub struct ApiKey {
-    api_key: String,
-    whitelist: Vec<WhitelistItem>,
-}
-
-impl ApiKey {
-    pub fn new(api_key: &str, whitelist: Vec<WhitelistItem>) -> Self {
-        Self {
-            api_key: api_key.to_string(),
-            whitelist,
-        }
-    }
-}
-
-impl<S, B> Transform<S, ServiceRequest> for ApiKey
-where
-    S: Service<ServiceRequest, Response = ServiceResponse<EitherBody<B, BoxBody>>, Error = Error>,
-    S::Future: 'static,
-    B: 'static,
-{
-    type Response = ServiceResponse<EitherBody<B, BoxBody>>;
-    type Error = Error;
-    type InitError = ();
-    type Transform = ApiKeyMiddleware<S>;
-    type Future = Ready<Result<Self::Transform, Self::InitError>>;
-
-    fn new_transform(&self, service: S) -> Self::Future {
-        ready(Ok(ApiKeyMiddleware {
-            api_key: self.api_key.clone(),
-            whitelist: self.whitelist.clone(),
-            service,
-        }))
-    }
-}
-
-#[derive(Clone, Eq, PartialEq, Hash)]
-pub struct WhitelistItem(pub String, pub PathMode);
-
-impl WhitelistItem {
-    pub fn exact<S: Into<String>>(path: S) -> Self {
-        Self(path.into(), PathMode::Exact)
-    }
-
-    pub fn prefix<S: Into<String>>(path: S) -> Self {
-        Self(path.into(), PathMode::Prefix)
-    }
-
-    pub fn matches(&self, other: &str) -> bool {
-        self.1.check(&self.0, other)
-    }
-}
-
-#[derive(Copy, Clone, Eq, PartialEq, Hash)]
-pub enum PathMode {
-    /// Path must match exactly
-    Exact,
-    /// Path must have given prefix
-    Prefix,
-}
-
-impl PathMode {
-    fn check(&self, key: &str, other: &str) -> bool {
-        match self {
-            Self::Exact => key == other,
-            Self::Prefix => other.starts_with(key),
-        }
-    }
-}
-
-pub struct ApiKeyMiddleware<S> {
-    api_key: String,
-    /// List of items whitelisted from authentication.
-    whitelist: Vec<WhitelistItem>,
-    service: S,
-}
-
-impl<S> ApiKeyMiddleware<S> {
-    pub fn is_path_whitelisted(&self, path: &str) -> bool {
-        self.whitelist.iter().any(|item| item.matches(path))
-    }
-}
-
-impl<S, B> Service<ServiceRequest> for ApiKeyMiddleware<S>
-where
-    S: Service<ServiceRequest, Response = ServiceResponse<EitherBody<B, BoxBody>>, Error = Error>,
-    S::Future: 'static,
-    B: 'static,
-{
-    type Response = ServiceResponse<EitherBody<B, BoxBody>>;
-    type Error = Error;
-    type Future = LocalBoxFuture<'static, Result<Self::Response, Self::Error>>;
-
-    forward_ready!(service);
-
-    fn call(&self, req: ServiceRequest) -> Self::Future {
-        let path = req.path();
-
-        if self.is_path_whitelisted(path) {
-            return Box::pin(self.service.call(req));
-        }
-
-        if let Some(key) = req.headers().get("api-key") {
-            if let Ok(key) = key.to_str() {
-                if constant_time_eq(self.api_key.as_bytes(), key.as_bytes()) {
-                    return Box::pin(self.service.call(req));
-                }
-            }
-        }
-
-        Box::pin(async {
-            Ok(req
-                .into_response(HttpResponse::Forbidden().body("Invalid api-key"))
-                .map_into_right_body())
-        })
-    }
-}
diff --git a/crates/qdrant/src/actix/certificate_helpers.rs b/crates/qdrant/src/actix/certificate_helpers.rs
deleted file mode 100644
index a961e50..0000000
--- a/crates/qdrant/src/actix/certificate_helpers.rs
+++ /dev/null
@@ -1,187 +0,0 @@
-use std::fs::File;
-use std::io::{self, BufRead, BufReader};
-use std::sync::Arc;
-use std::time::{Duration, Instant};
-
-use parking_lot::RwLock;
-use rustls::server::{AllowAnyAuthenticatedClient, ClientHello, ResolvesServerCert};
-use rustls::sign::CertifiedKey;
-use rustls::{Certificate, RootCertStore, ServerConfig};
-use rustls_pemfile::Item;
-
-use crate::settings::{Settings, TlsConfig};
-
-type Result<T> = std::result::Result<T, Error>;
-
-/// A TTL based rotating server certificate resolver
-struct RotatingCertificateResolver {
-    /// TLS configuration used for loading/refreshing certified key
-    tls_config: TlsConfig,
-
-    /// TTL for each rotation
-    ttl: Option<Duration>,
-
-    /// Current certified key
-    key: RwLock<CertifiedKeyWithAge>,
-}
-
-impl RotatingCertificateResolver {
-    pub fn new(tls_config: TlsConfig, ttl: Option<Duration>) -> Result<Self> {
-        let certified_key = load_certified_key(&tls_config)?;
-
-        Ok(Self {
-            tls_config,
-            ttl,
-            key: RwLock::new(CertifiedKeyWithAge::from(certified_key)),
-        })
-    }
-
-    /// Get certificate key or refresh
-    ///
-    /// The key is automatically refreshed when the TTL is reached.
-    /// If refreshing fails, an error is logged and the old key is persisted.
-    fn get_key_or_refresh(&self) -> Arc<CertifiedKey> {
-        // Get read-only lock to the key. If TTL is not configured or is not expired, return key.
-        let key = self.key.read();
-        let ttl = match self.ttl {
-            Some(ttl) if key.is_expired(ttl) => ttl,
-            _ => return key.key.clone(),
-        };
-        drop(key);
-
-        // If TTL is expired:
-        // - get read-write lock to the key
-        // - *re-check that TTL is expired* (to avoid refreshing the key multiple times from concurrent threads)
-        // - refresh and return the key
-        let mut key = self.key.write();
-        if key.is_expired(ttl) {
-            if let Err(err) = key.refresh(&self.tls_config) {
-                log::error!("Failed to refresh TLS certificate, keeping current: {err}");
-            }
-        }
-
-        key.key.clone()
-    }
-}
-
-impl ResolvesServerCert for RotatingCertificateResolver {
-    fn resolve(&self, _client_hello: ClientHello<'_>) -> Option<Arc<CertifiedKey>> {
-        Some(self.get_key_or_refresh())
-    }
-}
-
-struct CertifiedKeyWithAge {
-    /// Last time the certificate was updated/replaced
-    last_update: Instant,
-
-    /// Current certified key
-    key: Arc<CertifiedKey>,
-}
-
-impl CertifiedKeyWithAge {
-    pub fn from(key: Arc<CertifiedKey>) -> Self {
-        Self {
-            last_update: Instant::now(),
-            key,
-        }
-    }
-
-    pub fn refresh(&mut self, tls_config: &TlsConfig) -> Result<()> {
-        *self = Self::from(load_certified_key(tls_config)?);
-        Ok(())
-    }
-
-    pub fn age(&self) -> Duration {
-        self.last_update.elapsed()
-    }
-
-    pub fn is_expired(&self, ttl: Duration) -> bool {
-        self.age() >= ttl
-    }
-}
-
-/// Load TLS configuration and construct certified key.
-fn load_certified_key(tls_config: &TlsConfig) -> Result<Arc<CertifiedKey>> {
-    // Load certificates
-    let certs: Vec<Certificate> = with_buf_read(&tls_config.cert, rustls_pemfile::read_all)?
-        .into_iter()
-        .filter_map(|item| match item {
-            Item::X509Certificate(data) => Some(Certificate(data)),
-            _ => None,
-        })
-        .collect();
-    if certs.is_empty() {
-        return Err(Error::NoServerCert);
-    }
-
-    // Load private key
-    let private_key_item =
-        with_buf_read(&tls_config.key, rustls_pemfile::read_one)?.ok_or(Error::NoPrivateKey)?;
-    let (Item::RSAKey(pkey) | Item::PKCS8Key(pkey) | Item::ECKey(pkey)) = private_key_item else {
-        return Err(Error::InvalidPrivateKey);
-    };
-    let private_key = rustls::PrivateKey(pkey);
-    let signing_key = rustls::sign::any_supported_type(&private_key).map_err(Error::Sign)?;
-
-    // Construct certified key
-    let certified_key = CertifiedKey::new(certs, signing_key);
-    Ok(Arc::new(certified_key))
-}
-
-/// Generate an actix server configuration with TLS
-///
-/// Uses TLS settings as configured in configuration by user.
-pub fn actix_tls_server_config(settings: &Settings) -> Result<ServerConfig> {
-    let config = ServerConfig::builder().with_safe_defaults();
-    let tls_config = settings
-        .tls
-        .clone()
-        .ok_or_else(Settings::tls_config_is_undefined_error)
-        .map_err(Error::Io)?;
-
-    // Verify client CA or not
-    let config = if settings.service.verify_https_client_certificate {
-        let mut root_cert_store = RootCertStore::empty();
-        let ca_certs: Vec<Vec<u8>> = with_buf_read(&tls_config.ca_cert, rustls_pemfile::certs)?;
-        root_cert_store.add_parsable_certificates(&ca_certs[..]);
-        config.with_client_cert_verifier(AllowAnyAuthenticatedClient::new(root_cert_store))
-    } else {
-        config.with_no_client_auth()
-    };
-
-    // Configure rotating certificate resolver
-    let ttl = match tls_config.cert_ttl {
-        None | Some(0) => None,
-        Some(seconds) => Some(Duration::from_secs(seconds)),
-    };
-    let cert_resolver = RotatingCertificateResolver::new(tls_config, ttl)?;
-    let config = config.with_cert_resolver(Arc::new(cert_resolver));
-
-    Ok(config)
-}
-
-fn with_buf_read<T>(path: &str, f: impl FnOnce(&mut dyn BufRead) -> io::Result<T>) -> Result<T> {
-    let file = File::open(path).map_err(|err| Error::OpenFile(err, path.into()))?;
-    let mut reader = BufReader::new(file);
-    let dyn_reader: &mut dyn BufRead = &mut reader;
-    f(dyn_reader).map_err(|err| Error::ReadFile(err, path.into()))
-}
-
-/// Actix TLS errors.
-#[derive(thiserror::Error, Debug)]
-pub enum Error {
-    #[error("TLS file could not be opened: {1}")]
-    OpenFile(#[source] io::Error, String),
-    #[error("TLS file could not be read: {1}")]
-    ReadFile(#[source] io::Error, String),
-    #[error("general TLS IO error")]
-    Io(#[source] io::Error),
-    #[error("no server certificate found")]
-    NoServerCert,
-    #[error("no private key found")]
-    NoPrivateKey,
-    #[error("invalid private key")]
-    InvalidPrivateKey,
-    #[error("TLS signing error")]
-    Sign(#[source] rustls::sign::SignError),
-}
diff --git a/crates/qdrant/src/actix/helpers.rs b/crates/qdrant/src/actix/helpers.rs
deleted file mode 100644
index 9272f6c..0000000
--- a/crates/qdrant/src/actix/helpers.rs
+++ /dev/null
@@ -1,72 +0,0 @@
-use std::fmt::Debug;
-
-use actix_web::rt::time::Instant;
-use actix_web::{error, Error, HttpResponse};
-use api::grpc::models::{ApiResponse, ApiStatus};
-use collection::operations::types::CollectionError;
-use serde::Serialize;
-use storage::content_manager::errors::StorageError;
-
-pub fn collection_into_actix_error(err: CollectionError) -> Error {
-    let storage_error: StorageError = err.into();
-    storage_into_actix_error(storage_error)
-}
-
-pub fn storage_into_actix_error(err: StorageError) -> Error {
-    match err {
-        StorageError::BadInput { .. } => error::ErrorBadRequest(format!("{err}")),
-        StorageError::NotFound { .. } => error::ErrorNotFound(format!("{err}")),
-        StorageError::ServiceError { .. } => error::ErrorInternalServerError(format!("{err}")),
-        StorageError::BadRequest { .. } => error::ErrorBadRequest(format!("{err}")),
-        StorageError::Locked { .. } => error::ErrorForbidden(format!("{err}")),
-        StorageError::Timeout { .. } => error::ErrorRequestTimeout(format!("{err}")),
-    }
-}
-
-pub fn accepted_response(timing: Instant) -> HttpResponse {
-    HttpResponse::Accepted().json(ApiResponse::<()> {
-        result: None,
-        status: ApiStatus::Accepted,
-        time: timing.elapsed().as_secs_f64(),
-    })
-}
-
-pub fn process_response<D>(response: Result<D, StorageError>, timing: Instant) -> HttpResponse
-where
-    D: Serialize + Debug,
-{
-    match response {
-        Ok(res) => HttpResponse::Ok().json(ApiResponse {
-            result: Some(res),
-            status: ApiStatus::Ok,
-            time: timing.elapsed().as_secs_f64(),
-        }),
-        Err(err) => {
-            let error_description = format!("{err}");
-
-            let mut resp = match err {
-                StorageError::BadInput { .. } => HttpResponse::BadRequest(),
-                StorageError::NotFound { .. } => HttpResponse::NotFound(),
-                StorageError::ServiceError {
-                    description,
-                    backtrace,
-                } => {
-                    log::warn!("error processing request: {}", description);
-                    if let Some(backtrace) = backtrace {
-                        log::trace!("backtrace: {}", backtrace);
-                    }
-                    HttpResponse::InternalServerError()
-                }
-                StorageError::BadRequest { .. } => HttpResponse::BadRequest(),
-                StorageError::Locked { .. } => HttpResponse::Forbidden(),
-                StorageError::Timeout { .. } => HttpResponse::RequestTimeout(),
-            };
-
-            resp.json(ApiResponse::<()> {
-                result: None,
-                status: ApiStatus::Error(error_description),
-                time: timing.elapsed().as_secs_f64(),
-            })
-        }
-    }
-}
diff --git a/crates/qdrant/src/actix/mod.rs b/crates/qdrant/src/actix/mod.rs
deleted file mode 100644
index fbb5f8c..0000000
--- a/crates/qdrant/src/actix/mod.rs
+++ /dev/null
@@ -1,235 +0,0 @@
-#[allow(dead_code)] // May contain functions used in different binaries. Not actually dead
-pub mod actix_telemetry;
-pub mod api;
-mod api_key;
-mod certificate_helpers;
-#[allow(dead_code)] // May contain functions used in different binaries. Not actually dead
-pub mod helpers;
-
-use std::io;
-use std::path::Path;
-use std::sync::Arc;
-
-use ::api::grpc::models::{ApiResponse, ApiStatus, VersionInfo};
-use actix_cors::Cors;
-use actix_multipart::form::tempfile::TempFileConfig;
-use actix_multipart::form::MultipartFormConfig;
-use actix_web::middleware::{Compress, Condition, Logger};
-use actix_web::{error, get, web, App, HttpRequest, HttpResponse, HttpServer, Responder};
-use collection::operations::validation;
-use storage::dispatcher::Dispatcher;
-
-use crate::actix::api::cluster_api::config_cluster_api;
-use crate::actix::api::collections_api::config_collections_api;
-use crate::actix::api::count_api::count_points;
-use crate::actix::api::recommend_api::config_recommend_api;
-use crate::actix::api::retrieve_api::{get_point, get_points, scroll_points};
-use crate::actix::api::search_api::config_search_api;
-use crate::actix::api::service_api::config_service_api;
-use crate::actix::api::snapshot_api::config_snapshots_api;
-use crate::actix::api::update_api::config_update_api;
-use crate::actix::api_key::{ApiKey, WhitelistItem};
-use crate::common::telemetry::TelemetryCollector;
-use crate::settings::{max_web_workers, Settings};
-
-const DEFAULT_STATIC_DIR: &str = "./static";
-const WEB_UI_PATH: &str = "/dashboard";
-
-#[get("/")]
-pub async fn index() -> impl Responder {
-    HttpResponse::Ok().json(VersionInfo::default())
-}
-
-#[allow(dead_code)]
-pub fn init(
-    dispatcher: Arc<Dispatcher>,
-    telemetry_collector: Arc<tokio::sync::Mutex<TelemetryCollector>>,
-    settings: Settings,
-) -> io::Result<()> {
-    actix_web::rt::System::new().block_on(async {
-        let toc_data = web::Data::from(dispatcher.toc().clone());
-        let dispatcher_data = web::Data::from(dispatcher);
-        let actix_telemetry_collector = telemetry_collector
-            .lock()
-            .await
-            .actix_telemetry_collector
-            .clone();
-        let telemetry_collector_data = web::Data::from(telemetry_collector);
-        let api_key = settings.service.api_key.clone();
-        let static_folder = settings
-            .service
-            .static_content_dir
-            .clone()
-            .unwrap_or(DEFAULT_STATIC_DIR.to_string());
-
-        let web_ui_enabled = settings.service.enable_static_content.unwrap_or(true);
-        // validate that the static folder exists IF the web UI is enabled
-        let web_ui_available = if web_ui_enabled {
-            let static_folder = Path::new(&static_folder);
-            if !static_folder.exists() || !static_folder.is_dir() {
-                // enabled BUT folder does not exist
-                // log::warn!(
-                //     "Static content folder for Web UI '{}' does not exist",
-                //     static_folder.display(),
-                // );
-                false
-            } else {
-                // enabled AND folder exists
-                true
-            }
-        } else {
-            // not enabled
-            false
-        };
-
-        let mut api_key_whitelist = vec![WhitelistItem::exact("/")];
-        if web_ui_available {
-            api_key_whitelist.push(WhitelistItem::prefix(WEB_UI_PATH));
-        }
-
-        let mut server = HttpServer::new(move || {
-            let cors = Cors::default()
-                .allow_any_origin()
-                .allow_any_method()
-                .allow_any_header();
-            let validate_path_config = actix_web_validator::PathConfig::default()
-                .error_handler(|err, rec| validation_error_handler("path parameters", err, rec));
-            let validate_query_config = actix_web_validator::QueryConfig::default()
-                .error_handler(|err, rec| validation_error_handler("query parameters", err, rec));
-            let validate_json_config = actix_web_validator::JsonConfig::default()
-                .limit(settings.service.max_request_size_mb * 1024 * 1024)
-                .error_handler(|err, rec| validation_error_handler("JSON body", err, rec));
-
-            let mut app = App::new()
-                .wrap(Compress::default()) // Reads the `Accept-Encoding` header to negotiate which compression codec to use.
-                // api_key middleware
-                // note: the last call to `wrap()` or `wrap_fn()` is executed first
-                .wrap(Condition::new(
-                    api_key.is_some(),
-                    ApiKey::new(
-                        &api_key.clone().unwrap_or_default(),
-                        api_key_whitelist.clone(),
-                    ),
-                ))
-                .wrap(Condition::new(settings.service.enable_cors, cors))
-                .wrap(Logger::default().exclude("/")) // Avoid logging healthcheck requests
-                .wrap(actix_telemetry::ActixTelemetryTransform::new(
-                    actix_telemetry_collector.clone(),
-                ))
-                .app_data(dispatcher_data.clone())
-                .app_data(toc_data.clone())
-                .app_data(telemetry_collector_data.clone())
-                .app_data(validate_path_config)
-                .app_data(validate_query_config)
-                .app_data(validate_json_config)
-                .app_data(
-                    TempFileConfig::default().directory(dispatcher_data.temp_snapshots_path()),
-                )
-                .app_data(MultipartFormConfig::default().total_limit(usize::MAX))
-                .service(index)
-                .configure(config_collections_api)
-                .configure(config_snapshots_api)
-                .configure(config_update_api)
-                .configure(config_cluster_api)
-                .configure(config_service_api)
-                .configure(config_search_api)
-                .configure(config_recommend_api)
-                .service(get_point)
-                .service(get_points)
-                .service(scroll_points)
-                .service(count_points);
-
-            if web_ui_available {
-                app = app.service(
-                    actix_files::Files::new(WEB_UI_PATH, &static_folder).index_file("index.html"),
-                )
-            }
-            app
-        })
-        .workers(max_web_workers(&settings));
-
-        let port = settings.service.http_port;
-        let bind_addr = format!("{}:{}", settings.service.host, port);
-
-        // With TLS enabled, bind with certificate helper and Rustls, or bind regularly
-        server = if settings.service.enable_tls {
-            log::info!(
-                "TLS enabled for REST API (TTL: {})",
-                settings
-                    .tls
-                    .as_ref()
-                    .and_then(|tls| tls.cert_ttl)
-                    .map(|ttl| ttl.to_string())
-                    .unwrap_or_else(|| "none".into()),
-            );
-
-            let config = certificate_helpers::actix_tls_server_config(&settings)
-                .map_err(|err| io::Error::new(io::ErrorKind::Other, err))?;
-            server.bind_rustls(bind_addr, config)?
-        } else {
-            log::info!("TLS disabled for REST API");
-
-            server.bind(bind_addr)?
-        };
-
-        log::info!("Qdrant HTTP listening on {}", port);
-        server.run().await
-    })
-}
-
-fn validation_error_handler(
-    name: &str,
-    err: actix_web_validator::Error,
-    _req: &HttpRequest,
-) -> error::Error {
-    use actix_web_validator::error::DeserializeErrors;
-
-    // Nicely describe deserialization and validation errors
-    let msg = match &err {
-        actix_web_validator::Error::Validate(errs) => {
-            validation::label_errors(format!("Validation error in {name}"), errs)
-        }
-        actix_web_validator::Error::Deserialize(err) => {
-            format!(
-                "Deserialize error in {name}: {}",
-                match err {
-                    DeserializeErrors::DeserializeQuery(err) => err.to_string(),
-                    DeserializeErrors::DeserializeJson(err) => err.to_string(),
-                    DeserializeErrors::DeserializePath(err) => err.to_string(),
-                }
-            )
-        }
-        actix_web_validator::Error::JsonPayloadError(
-            actix_web::error::JsonPayloadError::Deserialize(err),
-        ) => {
-            format!("Format error in {name}: {}", err,)
-        }
-        err => err.to_string(),
-    };
-
-    // Build fitting response
-    let response = match &err {
-        actix_web_validator::Error::Validate(_) => HttpResponse::UnprocessableEntity(),
-        _ => HttpResponse::BadRequest(),
-    }
-    .json(ApiResponse::<()> {
-        result: None,
-        status: ApiStatus::Error(msg),
-        time: 0.0,
-    });
-    error::InternalError::from_response(err, response).into()
-}
-
-#[cfg(test)]
-mod tests {
-    use ::api::grpc::api_crate_version;
-
-    #[test]
-    fn test_version() {
-        assert_eq!(
-            api_crate_version(),
-            env!("CARGO_PKG_VERSION"),
-            "Qdrant and lib/api crate versions are not same"
-        );
-    }
-}
diff --git a/crates/qdrant/src/common/collections.rs b/crates/qdrant/src/common/collections.rs
deleted file mode 100644
index 8e734df..0000000
--- a/crates/qdrant/src/common/collections.rs
+++ /dev/null
@@ -1,257 +0,0 @@
-use std::time::Duration;
-
-use api::grpc::models::{CollectionDescription, CollectionsResponse};
-use collection::operations::cluster_ops::{
-    AbortTransferOperation, ClusterOperations, DropReplicaOperation, MoveShardOperation,
-    ReplicateShardOperation,
-};
-use collection::operations::snapshot_ops::SnapshotDescription;
-use collection::operations::types::{
-    AliasDescription, CollectionClusterInfo, CollectionInfo, CollectionsAliasesResponse,
-};
-use collection::shards::replica_set;
-use collection::shards::shard::ShardId;
-use collection::shards::transfer::shard_transfer::{ShardTransfer, ShardTransferKey};
-use itertools::Itertools;
-use storage::content_manager::collection_meta_ops::ShardTransferOperations::{Abort, Start};
-use storage::content_manager::collection_meta_ops::{
-    CollectionMetaOperations, UpdateCollectionOperation,
-};
-use storage::content_manager::errors::StorageError;
-use storage::content_manager::toc::TableOfContent;
-use storage::dispatcher::Dispatcher;
-
-pub async fn do_get_collection(
-    toc: &TableOfContent,
-    name: &str,
-    shard_selection: Option<ShardId>,
-) -> Result<CollectionInfo, StorageError> {
-    let collection = toc.get_collection(name).await?;
-    Ok(collection.info(shard_selection).await?)
-}
-
-pub async fn do_list_collections(toc: &TableOfContent) -> CollectionsResponse {
-    let collections = toc
-        .all_collections()
-        .await
-        .into_iter()
-        .map(|name| CollectionDescription { name })
-        .collect_vec();
-
-    CollectionsResponse { collections }
-}
-
-pub async fn do_list_collection_aliases(
-    toc: &TableOfContent,
-    collection_name: &str,
-) -> Result<CollectionsAliasesResponse, StorageError> {
-    let mut aliases: Vec<AliasDescription> = Default::default();
-    for alias in toc.collection_aliases(collection_name).await? {
-        aliases.push(AliasDescription {
-            alias_name: alias.to_string(),
-            collection_name: collection_name.to_string(),
-        });
-    }
-    Ok(CollectionsAliasesResponse { aliases })
-}
-
-pub async fn do_list_aliases(
-    toc: &TableOfContent,
-) -> Result<CollectionsAliasesResponse, StorageError> {
-    let aliases = toc.list_aliases().await?;
-    Ok(CollectionsAliasesResponse { aliases })
-}
-
-pub async fn do_list_snapshots(
-    toc: &TableOfContent,
-    collection_name: &str,
-) -> Result<Vec<SnapshotDescription>, StorageError> {
-    Ok(toc
-        .get_collection(collection_name)
-        .await?
-        .list_snapshots()
-        .await?)
-}
-
-pub async fn do_create_snapshot(
-    dispatcher: &Dispatcher,
-    collection_name: &str,
-    wait: bool,
-) -> Result<SnapshotDescription, StorageError> {
-    let collection = collection_name.to_string();
-    let dispatcher = dispatcher.clone();
-    let snapshot = tokio::spawn(async move { dispatcher.create_snapshot(&collection).await });
-    if wait {
-        Ok(snapshot.await??)
-    } else {
-        Ok(SnapshotDescription {
-            name: "".to_string(),
-            creation_time: None,
-            size: 0,
-        })
-    }
-}
-
-pub async fn do_get_collection_cluster(
-    toc: &TableOfContent,
-    name: &str,
-) -> Result<CollectionClusterInfo, StorageError> {
-    let collection = toc.get_collection(name).await?;
-    Ok(collection.cluster_info(toc.this_peer_id).await?)
-}
-
-pub async fn do_update_collection_cluster(
-    toc: &TableOfContent,
-    collection_name: String,
-    operation: ClusterOperations,
-    dispatcher: &Dispatcher,
-    wait_timeout: Option<Duration>,
-) -> Result<bool, StorageError> {
-    if dispatcher.consensus_state().is_none() {
-        return Err(StorageError::BadRequest {
-            description: "Distributed mode disabled".to_string(),
-        });
-    }
-    let consensus_state = dispatcher.consensus_state().unwrap();
-
-    let validate_peer_exists = |peer_id| {
-        let target_peer_exist = consensus_state
-            .persistent
-            .read()
-            .peer_address_by_id
-            .read()
-            .contains_key(&peer_id);
-        if !target_peer_exist {
-            return Err(StorageError::BadRequest {
-                description: format!("Peer {peer_id} does not exist"),
-            });
-        }
-        Ok(())
-    };
-
-    let collection = toc.get_collection(&collection_name).await?;
-
-    match operation {
-        ClusterOperations::MoveShard(MoveShardOperation { move_shard }) => {
-            // validate shard to move
-            if !collection.contains_shard(move_shard.shard_id).await {
-                return Err(StorageError::BadRequest {
-                    description: format!(
-                        "Shard {} of {} does not exist",
-                        move_shard.shard_id, collection_name
-                    ),
-                });
-            };
-
-            // validate target peer exists
-            validate_peer_exists(move_shard.to_peer_id)?;
-
-            // validate source peer exists
-            validate_peer_exists(move_shard.from_peer_id)?;
-
-            // submit operation to consensus
-            dispatcher
-                .submit_collection_meta_op(
-                    CollectionMetaOperations::TransferShard(
-                        collection_name,
-                        Start(ShardTransfer {
-                            shard_id: move_shard.shard_id,
-                            to: move_shard.to_peer_id,
-                            from: move_shard.from_peer_id,
-                            sync: false,
-                        }),
-                    ),
-                    wait_timeout,
-                )
-                .await
-        }
-        ClusterOperations::ReplicateShard(ReplicateShardOperation { replicate_shard }) => {
-            // validate shard to move
-            if !collection.contains_shard(replicate_shard.shard_id).await {
-                return Err(StorageError::BadRequest {
-                    description: format!(
-                        "Shard {} of {} does not exist",
-                        replicate_shard.shard_id, collection_name
-                    ),
-                });
-            };
-
-            // validate target peer exists
-            validate_peer_exists(replicate_shard.to_peer_id)?;
-
-            // validate source peer exists
-            validate_peer_exists(replicate_shard.from_peer_id)?;
-
-            // submit operation to consensus
-            dispatcher
-                .submit_collection_meta_op(
-                    CollectionMetaOperations::TransferShard(
-                        collection_name,
-                        Start(ShardTransfer {
-                            shard_id: replicate_shard.shard_id,
-                            to: replicate_shard.to_peer_id,
-                            from: replicate_shard.from_peer_id,
-                            sync: true,
-                        }),
-                    ),
-                    wait_timeout,
-                )
-                .await
-        }
-        ClusterOperations::AbortTransfer(AbortTransferOperation { abort_transfer }) => {
-            let transfer = ShardTransferKey {
-                shard_id: abort_transfer.shard_id,
-                to: abort_transfer.to_peer_id,
-                from: abort_transfer.from_peer_id,
-            };
-
-            if !collection.check_transfer_exists(&transfer).await {
-                return Err(StorageError::NotFound {
-                    description: format!(
-                        "Shard transfer {} -> {} for collection {}:{} does not exist",
-                        transfer.from, transfer.to, collection_name, transfer.shard_id
-                    ),
-                });
-            }
-
-            dispatcher
-                .submit_collection_meta_op(
-                    CollectionMetaOperations::TransferShard(
-                        collection_name,
-                        Abort {
-                            transfer,
-                            reason: "user request".to_string(),
-                        },
-                    ),
-                    wait_timeout,
-                )
-                .await
-        }
-        ClusterOperations::DropReplica(DropReplicaOperation { drop_replica }) => {
-            if !collection.contains_shard(drop_replica.shard_id).await {
-                return Err(StorageError::BadRequest {
-                    description: format!(
-                        "Shard {} of {} does not exist",
-                        drop_replica.shard_id, collection_name
-                    ),
-                });
-            };
-
-            validate_peer_exists(drop_replica.peer_id)?;
-
-            let mut update_operation = UpdateCollectionOperation::new_empty(collection_name);
-
-            update_operation.set_shard_replica_changes(vec![replica_set::Change::Remove(
-                drop_replica.shard_id,
-                drop_replica.peer_id,
-            )]);
-
-            dispatcher
-                .submit_collection_meta_op(
-                    CollectionMetaOperations::UpdateCollection(update_operation),
-                    wait_timeout,
-                )
-                .await
-        }
-    }
-}
diff --git a/crates/qdrant/src/common/error_reporting.rs b/crates/qdrant/src/common/error_reporting.rs
deleted file mode 100644
index c49c6e1..0000000
--- a/crates/qdrant/src/common/error_reporting.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-use std::time::Duration;
-
-pub struct ErrorReporter;
-
-impl ErrorReporter {
-    fn get_url() -> String {
-        if cfg!(debug_assertions) {
-            "https://staging-telemetry.qdrant.io".to_string()
-        } else {
-            "https://telemetry.qdrant.io".to_string()
-        }
-    }
-
-    pub fn report(error: &str, reporting_id: &str, backtrace: Option<&str>) {
-        let client = reqwest::blocking::Client::new();
-
-        let report = serde_json::json!({
-            "id": reporting_id,
-            "error": error,
-            "backtrace": backtrace.unwrap_or(""),
-        });
-
-        let data = serde_json::to_string(&report).unwrap();
-        let _resp = client
-            .post(Self::get_url())
-            .body(data)
-            .header("Content-Type", "application/json")
-            .timeout(Duration::from_secs(1))
-            .send();
-    }
-}
diff --git a/crates/qdrant/src/common/helpers.rs b/crates/qdrant/src/common/helpers.rs
deleted file mode 100644
index a9ca988..0000000
--- a/crates/qdrant/src/common/helpers.rs
+++ /dev/null
@@ -1,152 +0,0 @@
-use std::cmp::max;
-use std::sync::atomic::{AtomicUsize, Ordering};
-use std::{fs, io};
-
-use schemars::JsonSchema;
-use segment::common::cpu::get_num_cpus;
-use serde::{Deserialize, Serialize};
-use tokio::runtime;
-use tokio::runtime::Runtime;
-use tonic::transport::{Certificate, ClientTlsConfig, Identity, ServerTlsConfig};
-use validator::Validate;
-
-use crate::settings::{Settings, TlsConfig};
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Validate)]
-pub struct LocksOption {
-    pub error_message: Option<String>,
-    pub write: bool,
-}
-
-pub fn create_search_runtime(max_search_threads: usize) -> io::Result<Runtime> {
-    let mut search_threads = max_search_threads;
-
-    if search_threads == 0 {
-        let num_cpu = get_num_cpus();
-        // At least one thread, but not more than number of CPUs - 1 if there are more than 2 CPU
-        // Example:
-        // Num CPU = 1 -> 1 thread
-        // Num CPU = 2 -> 2 thread - if we use one thread with 2 cpus, its too much un-utilized resources
-        // Num CPU = 3 -> 2 thread
-        // Num CPU = 4 -> 3 thread
-        // Num CPU = 5 -> 4 thread
-        search_threads = match num_cpu {
-            0 => 1,
-            1 => 1,
-            2 => 2,
-            _ => num_cpu - 1,
-        };
-    }
-
-    runtime::Builder::new_multi_thread()
-        .worker_threads(search_threads)
-        .max_blocking_threads(search_threads)
-        .enable_all()
-        .thread_name_fn(|| {
-            static ATOMIC_ID: AtomicUsize = AtomicUsize::new(0);
-            let id = ATOMIC_ID.fetch_add(1, Ordering::SeqCst);
-            format!("search-{id}")
-        })
-        .build()
-}
-
-pub fn create_update_runtime(max_optimization_threads: usize) -> io::Result<Runtime> {
-    let mut update_runtime_builder = runtime::Builder::new_multi_thread();
-
-    update_runtime_builder
-        .enable_time()
-        .thread_name_fn(move || {
-            static ATOMIC_ID: AtomicUsize = AtomicUsize::new(0);
-            let update_id = ATOMIC_ID.fetch_add(1, Ordering::SeqCst);
-            format!("update-{update_id}")
-        });
-
-    if max_optimization_threads > 0 {
-        // panics if val is not larger than 0.
-        update_runtime_builder.max_blocking_threads(max_optimization_threads);
-    }
-    update_runtime_builder.build()
-}
-
-pub fn create_general_purpose_runtime() -> io::Result<Runtime> {
-    runtime::Builder::new_multi_thread()
-        .enable_time()
-        .enable_io()
-        .worker_threads(max(get_num_cpus(), 2))
-        .thread_name_fn(|| {
-            static ATOMIC_ID: AtomicUsize = AtomicUsize::new(0);
-            let general_id = ATOMIC_ID.fetch_add(1, Ordering::SeqCst);
-            format!("general-{general_id}")
-        })
-        .build()
-}
-
-/// Load client TLS configuration.
-pub fn load_tls_client_config(settings: &Settings) -> io::Result<Option<ClientTlsConfig>> {
-    if settings.cluster.p2p.enable_tls {
-        let tls_config = &settings.tls()?;
-        Ok(Some(
-            ClientTlsConfig::new()
-                .identity(load_identity(tls_config)?)
-                .ca_certificate(load_ca_certificate(tls_config)?),
-        ))
-    } else {
-        Ok(None)
-    }
-}
-
-/// Load server TLS configuration for external gRPC
-pub fn load_tls_external_server_config(tls_config: &TlsConfig) -> io::Result<ServerTlsConfig> {
-    Ok(ServerTlsConfig::new().identity(load_identity(tls_config)?))
-}
-
-/// Load server TLS configuration for internal gRPC, check client certificate against CA
-pub fn load_tls_internal_server_config(tls_config: &TlsConfig) -> io::Result<ServerTlsConfig> {
-    Ok(ServerTlsConfig::new()
-        .identity(load_identity(tls_config)?)
-        .client_ca_root(load_ca_certificate(tls_config)?))
-}
-
-fn load_identity(tls_config: &TlsConfig) -> io::Result<Identity> {
-    let cert = fs::read_to_string(&tls_config.cert)?;
-    let key = fs::read_to_string(&tls_config.key)?;
-    Ok(Identity::from_pem(cert, key))
-}
-
-fn load_ca_certificate(tls_config: &TlsConfig) -> io::Result<Certificate> {
-    let pem = fs::read_to_string(&tls_config.ca_cert)?;
-    Ok(Certificate::from_pem(pem))
-}
-
-pub fn tonic_error_to_io_error(err: tonic::transport::Error) -> io::Error {
-    io::Error::new(io::ErrorKind::Other, err)
-}
-
-#[cfg(test)]
-mod tests {
-    use std::sync::Arc;
-    use std::thread;
-    use std::thread::sleep;
-    use std::time::Duration;
-
-    use collection::common::is_ready::IsReady;
-
-    #[test]
-    fn test_is_ready() {
-        let is_ready = Arc::new(IsReady::default());
-        let is_ready_clone = is_ready.clone();
-        let join = thread::spawn(move || {
-            is_ready_clone.await_ready();
-            eprintln!(
-                "is_ready_clone.check_ready() = {:#?}",
-                is_ready_clone.check_ready()
-            );
-        });
-
-        sleep(Duration::from_millis(500));
-        eprintln!("Making ready");
-        is_ready.make_ready();
-        sleep(Duration::from_millis(500));
-        join.join().unwrap()
-    }
-}
diff --git a/crates/qdrant/src/common/metrics.rs b/crates/qdrant/src/common/metrics.rs
deleted file mode 100644
index 483e178..0000000
--- a/crates/qdrant/src/common/metrics.rs
+++ /dev/null
@@ -1,387 +0,0 @@
-use prometheus::proto::{Counter, Gauge, LabelPair, Metric, MetricFamily, MetricType};
-use prometheus::TextEncoder;
-
-use crate::common::telemetry::TelemetryData;
-use crate::common::telemetry_ops::app_telemetry::AppBuildTelemetry;
-use crate::common::telemetry_ops::cluster_telemetry::{ClusterStatusTelemetry, ClusterTelemetry};
-use crate::common::telemetry_ops::collections_telemetry::{
-    CollectionTelemetryEnum, CollectionsTelemetry,
-};
-use crate::common::telemetry_ops::requests_telemetry::{
-    GrpcTelemetry, RequestsTelemetry, WebApiTelemetry,
-};
-
-/// Whitelist for REST endpoints in metrics output.
-///
-/// Contains selection of search, recommend and upsert endpoints.
-///
-/// This array *must* be sorted.
-const REST_ENDPOINT_WHITELIST: &[&str] = &[
-    "/collections/{name}/index",
-    "/collections/{name}/points",
-    "/collections/{name}/points/payload",
-    "/collections/{name}/points/recommend",
-    "/collections/{name}/points/recommend/batch",
-    "/collections/{name}/points/search",
-    "/collections/{name}/points/search/batch",
-];
-
-/// Whitelist for GRPC endpoints in metrics output.
-///
-/// Contains selection of search, recommend and upsert endpoints.
-///
-/// This array *must* be sorted.
-const GRPC_ENDPOINT_WHITELIST: &[&str] = &[
-    "/qdrant.Points/OverwritePayload",
-    "/qdrant.Points/Recommend",
-    "/qdrant.Points/RecommendBatch",
-    "/qdrant.Points/Search",
-    "/qdrant.Points/SearchBatch",
-    "/qdrant.Points/SetPayload",
-    "/qdrant.Points/Upsert",
-];
-
-/// For REST requests, only report timings when having this HTTP response status.
-const REST_TIMINGS_FOR_STATUS: u16 = 200;
-
-/// Encapsulates metrics data in Prometheus format.
-pub struct MetricsData {
-    metrics: Vec<MetricFamily>,
-}
-
-impl MetricsData {
-    pub fn format_metrics(&self) -> String {
-        TextEncoder::new().encode_to_string(&self.metrics).unwrap()
-    }
-}
-
-impl From<TelemetryData> for MetricsData {
-    fn from(telemetry_data: TelemetryData) -> Self {
-        let mut metrics = vec![];
-        telemetry_data.add_metrics(&mut metrics);
-        Self { metrics }
-    }
-}
-
-trait MetricsProvider {
-    /// Add metrics definitions for this.
-    fn add_metrics(&self, metrics: &mut Vec<MetricFamily>);
-}
-
-impl MetricsProvider for TelemetryData {
-    fn add_metrics(&self, metrics: &mut Vec<MetricFamily>) {
-        self.app.add_metrics(metrics);
-        self.collections.add_metrics(metrics);
-        self.cluster.add_metrics(metrics);
-        self.requests.add_metrics(metrics);
-    }
-}
-
-impl MetricsProvider for AppBuildTelemetry {
-    fn add_metrics(&self, metrics: &mut Vec<MetricFamily>) {
-        metrics.push(metric_family(
-            "app_info",
-            "information about qdrant server",
-            MetricType::COUNTER,
-            vec![counter(
-                1.0,
-                &[("name", &self.name), ("version", &self.version)],
-            )],
-        ));
-    }
-}
-
-impl MetricsProvider for CollectionsTelemetry {
-    fn add_metrics(&self, metrics: &mut Vec<MetricFamily>) {
-        let vector_count = self
-            .collections
-            .iter()
-            .flatten()
-            .map(|p| match p {
-                CollectionTelemetryEnum::Aggregated(a) => a.vectors,
-                CollectionTelemetryEnum::Full(c) => c.count_vectors(),
-            })
-            .sum::<usize>();
-        metrics.push(metric_family(
-            "collections_total",
-            "number of collections",
-            MetricType::GAUGE,
-            vec![gauge(self.number_of_collections as f64, &[])],
-        ));
-        metrics.push(metric_family(
-            "collections_vector_total",
-            "total number of vectors in all collections",
-            MetricType::GAUGE,
-            vec![gauge(vector_count as f64, &[])],
-        ));
-    }
-}
-
-impl MetricsProvider for ClusterTelemetry {
-    fn add_metrics(&self, metrics: &mut Vec<MetricFamily>) {
-        metrics.push(metric_family(
-            "cluster_enabled",
-            "is cluster support enabled",
-            MetricType::COUNTER,
-            vec![counter(if self.enabled { 1.0 } else { 0.0 }, &[])],
-        ));
-
-        if let Some(ref status) = self.status {
-            status.add_metrics(metrics);
-        }
-    }
-}
-
-impl MetricsProvider for ClusterStatusTelemetry {
-    fn add_metrics(&self, metrics: &mut Vec<MetricFamily>) {
-        metrics.push(metric_family(
-            "cluster_peers_total",
-            "total number of cluster peers",
-            MetricType::GAUGE,
-            vec![gauge(self.number_of_peers as f64, &[])],
-        ));
-        metrics.push(metric_family(
-            "cluster_term",
-            "current cluster term",
-            MetricType::COUNTER,
-            vec![counter(self.term as f64, &[])],
-        ));
-
-        if let Some(ref peer_id) = self.peer_id.map(|p| p.to_string()) {
-            metrics.push(metric_family(
-                "cluster_commit",
-                "index of last committed (finalized) operation cluster peer is aware of",
-                MetricType::COUNTER,
-                vec![counter(self.commit as f64, &[("peer_id", peer_id)])],
-            ));
-            metrics.push(metric_family(
-                "cluster_pending_operations_total",
-                "total number of pending operations for cluster peer",
-                MetricType::GAUGE,
-                vec![gauge(self.pending_operations as f64, &[])],
-            ));
-            metrics.push(metric_family(
-                "cluster_voter",
-                "is cluster peer a voter or learner",
-                MetricType::GAUGE,
-                vec![gauge(if self.is_voter { 1.0 } else { 0.0 }, &[])],
-            ));
-        }
-    }
-}
-
-impl MetricsProvider for RequestsTelemetry {
-    fn add_metrics(&self, metrics: &mut Vec<MetricFamily>) {
-        self.rest.add_metrics(metrics);
-        self.grpc.add_metrics(metrics);
-    }
-}
-
-impl MetricsProvider for WebApiTelemetry {
-    fn add_metrics(&self, metrics: &mut Vec<MetricFamily>) {
-        let (mut total, mut fail_total, mut avg_secs, mut min_secs, mut max_secs) =
-            (vec![], vec![], vec![], vec![], vec![]);
-        for (endpoint, responses) in &self.responses {
-            let (method, endpoint) = endpoint.split_once(' ').unwrap();
-
-            // Endpoint must be whitelisted
-            if REST_ENDPOINT_WHITELIST.binary_search(&endpoint).is_err() {
-                continue;
-            }
-
-            for (status, stats) in responses {
-                let labels = [
-                    ("method", method),
-                    ("endpoint", endpoint),
-                    ("status", &status.to_string()),
-                ];
-                total.push(counter(stats.count as f64, &labels));
-                fail_total.push(counter(stats.fail_count as f64, &labels));
-
-                if *status == REST_TIMINGS_FOR_STATUS {
-                    avg_secs.push(gauge(
-                        stats.avg_duration_micros.unwrap_or(0.0) as f64 / 1_000_000.0,
-                        &labels,
-                    ));
-                    min_secs.push(gauge(
-                        stats.min_duration_micros.unwrap_or(0.0) as f64 / 1_000_000.0,
-                        &labels,
-                    ));
-                    max_secs.push(gauge(
-                        stats.max_duration_micros.unwrap_or(0.0) as f64 / 1_000_000.0,
-                        &labels,
-                    ));
-                }
-            }
-        }
-
-        if !total.is_empty() {
-            metrics.push(metric_family(
-                "rest_responses_total",
-                "total number of responses",
-                MetricType::COUNTER,
-                total,
-            ));
-        }
-        if !fail_total.is_empty() {
-            metrics.push(metric_family(
-                "rest_responses_fail_total",
-                "total number of failed responses",
-                MetricType::COUNTER,
-                fail_total,
-            ));
-        }
-        if !avg_secs.is_empty() {
-            metrics.push(metric_family(
-                "rest_responses_avg_duration_seconds",
-                "average response duration",
-                MetricType::GAUGE,
-                avg_secs,
-            ));
-        }
-        if !min_secs.is_empty() {
-            metrics.push(metric_family(
-                "rest_responses_min_duration_seconds",
-                "minimum response duration",
-                MetricType::GAUGE,
-                min_secs,
-            ));
-        }
-        if !max_secs.is_empty() {
-            metrics.push(metric_family(
-                "rest_responses_max_duration_seconds",
-                "maximum response duration",
-                MetricType::GAUGE,
-                max_secs,
-            ));
-        }
-    }
-}
-
-impl MetricsProvider for GrpcTelemetry {
-    fn add_metrics(&self, metrics: &mut Vec<MetricFamily>) {
-        let (mut total, mut fail_total, mut avg_secs, mut min_secs, mut max_secs) =
-            (vec![], vec![], vec![], vec![], vec![]);
-        for (endpoint, stats) in &self.responses {
-            // Endpoint must be whitelisted
-            if GRPC_ENDPOINT_WHITELIST
-                .binary_search(&endpoint.as_str())
-                .is_err()
-            {
-                continue;
-            }
-
-            let labels = [("endpoint", endpoint.as_str())];
-            total.push(counter(stats.count as f64, &labels));
-            fail_total.push(counter(stats.fail_count as f64, &labels));
-            avg_secs.push(gauge(
-                stats.avg_duration_micros.unwrap_or(0.0) as f64 / 1_000_000.0,
-                &labels,
-            ));
-            min_secs.push(gauge(
-                stats.min_duration_micros.unwrap_or(0.0) as f64 / 1_000_000.0,
-                &labels,
-            ));
-            max_secs.push(gauge(
-                stats.max_duration_micros.unwrap_or(0.0) as f64 / 1_000_000.0,
-                &labels,
-            ));
-        }
-
-        if !total.is_empty() {
-            metrics.push(metric_family(
-                "grpc_responses_total",
-                "total number of responses",
-                MetricType::COUNTER,
-                total,
-            ));
-        }
-        if !fail_total.is_empty() {
-            metrics.push(metric_family(
-                "grpc_responses_fail_total",
-                "total number of failed responses",
-                MetricType::COUNTER,
-                fail_total,
-            ));
-        }
-        if !avg_secs.is_empty() {
-            metrics.push(metric_family(
-                "grpc_responses_avg_duration_seconds",
-                "average response duration",
-                MetricType::GAUGE,
-                avg_secs,
-            ));
-        }
-        if !min_secs.is_empty() {
-            metrics.push(metric_family(
-                "grpc_responses_min_duration_seconds",
-                "minimum response duration",
-                MetricType::GAUGE,
-                min_secs,
-            ));
-        }
-        if !max_secs.is_empty() {
-            metrics.push(metric_family(
-                "grpc_responses_max_duration_seconds",
-                "maximum response duration",
-                MetricType::GAUGE,
-                max_secs,
-            ));
-        }
-    }
-}
-
-fn metric_family(name: &str, help: &str, r#type: MetricType, metrics: Vec<Metric>) -> MetricFamily {
-    let mut metric_family = MetricFamily::default();
-    metric_family.set_name(name.into());
-    metric_family.set_help(help.into());
-    metric_family.set_field_type(r#type);
-    metric_family.set_metric(metrics);
-    metric_family
-}
-
-fn counter(value: f64, labels: &[(&str, &str)]) -> Metric {
-    let mut metric = Metric::default();
-    metric.set_label(labels.iter().map(|(n, v)| label_pair(n, v)).collect());
-    metric.set_counter({
-        let mut counter = Counter::default();
-        counter.set_value(value);
-        counter
-    });
-    metric
-}
-
-fn gauge(value: f64, labels: &[(&str, &str)]) -> Metric {
-    let mut metric = Metric::default();
-    metric.set_label(labels.iter().map(|(n, v)| label_pair(n, v)).collect());
-    metric.set_gauge({
-        let mut gauge = Gauge::default();
-        gauge.set_value(value);
-        gauge
-    });
-    metric
-}
-
-fn label_pair(name: &str, value: &str) -> LabelPair {
-    let mut label = LabelPair::default();
-    label.set_name(name.into());
-    label.set_value(value.into());
-    label
-}
-
-#[cfg(test)]
-mod tests {
-    #[test]
-    fn test_endpoint_whitelists_sorted() {
-        use super::{GRPC_ENDPOINT_WHITELIST, REST_ENDPOINT_WHITELIST};
-
-        assert!(
-            REST_ENDPOINT_WHITELIST.windows(2).all(|n| n[0] <= n[1]),
-            "REST_ENDPOINT_WHITELIST must be sorted in code to allow binary search"
-        );
-        assert!(
-            GRPC_ENDPOINT_WHITELIST.windows(2).all(|n| n[0] <= n[1]),
-            "GRPC_ENDPOINT_WHITELIST must be sorted in code to allow binary search"
-        );
-    }
-}
diff --git a/crates/qdrant/src/common/mod.rs b/crates/qdrant/src/common/mod.rs
deleted file mode 100644
index 98cbcb4..0000000
--- a/crates/qdrant/src/common/mod.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-#[allow(dead_code)] // May contain functions used in different binaries. Not actually dead
-pub mod collections;
-#[allow(dead_code)] // May contain functions used in different binaries. Not actually dead
-pub mod error_reporting;
-#[allow(dead_code)] // May contain functions used in different binaries. Not actually dead
-pub mod helpers;
-pub mod metrics;
-#[allow(dead_code)] // May contain functions used in different binaries. Not actually dead
-pub mod points;
-#[allow(dead_code)] // May contain functions used in different binaries. Not actually dead
-pub mod telemetry;
-pub mod telemetry_ops;
-#[allow(dead_code)] // May contain functions used in different binaries. Not actually dead
-pub mod telemetry_reporting;
diff --git a/crates/qdrant/src/common/points.rs b/crates/qdrant/src/common/points.rs
deleted file mode 100644
index 3c876fc..0000000
--- a/crates/qdrant/src/common/points.rs
+++ /dev/null
@@ -1,490 +0,0 @@
-use collection::operations::consistency_params::ReadConsistency;
-use collection::operations::payload_ops::{DeletePayload, PayloadOps, SetPayload};
-use collection::operations::point_ops::{
-    PointInsertOperations, PointOperations, PointsSelector, WriteOrdering,
-};
-use collection::operations::types::{
-    CountRequest, CountResult, GroupsResult, PointRequest, RecommendGroupsRequest, Record,
-    ScrollRequest, ScrollResult, SearchGroupsRequest, SearchRequest, SearchRequestBatch,
-    UpdateResult,
-};
-use collection::operations::vector_ops::{DeleteVectors, UpdateVectors, VectorOperations};
-use collection::operations::{CollectionUpdateOperations, CreateIndex, FieldIndexOperations};
-use collection::shards::shard::ShardId;
-use schemars::JsonSchema;
-use segment::types::{PayloadFieldSchema, ScoredPoint};
-use serde::{Deserialize, Serialize};
-use storage::content_manager::errors::StorageError;
-use storage::content_manager::toc::TableOfContent;
-use validator::Validate;
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Validate)]
-pub struct CreateFieldIndex {
-    pub field_name: String,
-    #[serde(alias = "field_type")]
-    pub field_schema: Option<PayloadFieldSchema>,
-}
-
-#[derive(Deserialize, Serialize, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum UpdateOperation {
-    Upsert(PointInsertOperations),
-    Delete(PointsSelector),
-    SetPayload(SetPayload),
-    OverwritePayload(SetPayload),
-    DeletePayload(DeletePayload),
-    ClearPayload(PointsSelector),
-    UpdateVectors(UpdateVectors),
-    DeleteVectors(DeleteVectors),
-}
-
-#[derive(Deserialize, Serialize, JsonSchema, Validate)]
-#[serde(transparent)]
-pub struct UpdateOperations {
-    pub operations: Vec<UpdateOperation>,
-}
-
-impl Validate for UpdateOperation {
-    fn validate(&self) -> Result<(), validator::ValidationErrors> {
-        match self {
-            UpdateOperation::Upsert(op) => op.validate(),
-            UpdateOperation::Delete(op) => op.validate(),
-            UpdateOperation::SetPayload(op) => op.validate(),
-            UpdateOperation::OverwritePayload(op) => op.validate(),
-            UpdateOperation::DeletePayload(op) => op.validate(),
-            UpdateOperation::ClearPayload(op) => op.validate(),
-            UpdateOperation::UpdateVectors(op) => op.validate(),
-            UpdateOperation::DeleteVectors(op) => op.validate(),
-        }
-    }
-}
-
-pub async fn do_upsert_points(
-    toc: &TableOfContent,
-    collection_name: &str,
-    operation: PointInsertOperations,
-    shard_selection: Option<ShardId>,
-    wait: bool,
-    ordering: WriteOrdering,
-) -> Result<UpdateResult, StorageError> {
-    let collection_operation =
-        CollectionUpdateOperations::PointOperation(PointOperations::UpsertPoints(operation));
-    toc.update(
-        collection_name,
-        collection_operation,
-        shard_selection,
-        wait,
-        ordering,
-    )
-    .await
-}
-
-pub async fn do_delete_points(
-    toc: &TableOfContent,
-    collection_name: &str,
-    points: PointsSelector,
-    shard_selection: Option<ShardId>,
-    wait: bool,
-    ordering: WriteOrdering,
-) -> Result<UpdateResult, StorageError> {
-    let point_operation = match points {
-        PointsSelector::PointIdsSelector(points) => {
-            PointOperations::DeletePoints { ids: points.points }
-        }
-        PointsSelector::FilterSelector(filter_selector) => {
-            PointOperations::DeletePointsByFilter(filter_selector.filter)
-        }
-    };
-    let collection_operation = CollectionUpdateOperations::PointOperation(point_operation);
-    toc.update(
-        collection_name,
-        collection_operation,
-        shard_selection,
-        wait,
-        ordering,
-    )
-    .await
-}
-
-pub async fn do_update_vectors(
-    toc: &TableOfContent,
-    collection_name: &str,
-    operation: UpdateVectors,
-    shard_selection: Option<ShardId>,
-    wait: bool,
-    ordering: WriteOrdering,
-) -> Result<UpdateResult, StorageError> {
-    let collection_operation =
-        CollectionUpdateOperations::VectorOperation(VectorOperations::UpdateVectors(operation));
-    toc.update(
-        collection_name,
-        collection_operation,
-        shard_selection,
-        wait,
-        ordering,
-    )
-    .await
-}
-
-pub async fn do_delete_vectors(
-    toc: &TableOfContent,
-    collection_name: &str,
-    operation: DeleteVectors,
-    shard_selection: Option<ShardId>,
-    wait: bool,
-    ordering: WriteOrdering,
-) -> Result<UpdateResult, StorageError> {
-    let vector_names: Vec<_> = operation.vector.into_iter().collect();
-
-    let mut result = None;
-
-    if let Some(filter) = operation.filter {
-        let vectors_operation =
-            VectorOperations::DeleteVectorsByFilter(filter, vector_names.clone());
-        let collection_operation = CollectionUpdateOperations::VectorOperation(vectors_operation);
-        result = Some(
-            toc.update(
-                collection_name,
-                collection_operation,
-                shard_selection,
-                wait,
-                ordering,
-            )
-            .await?,
-        );
-    }
-
-    if let Some(points) = operation.points {
-        let vectors_operation = VectorOperations::DeleteVectors(points.into(), vector_names);
-        let collection_operation = CollectionUpdateOperations::VectorOperation(vectors_operation);
-        result = Some(
-            toc.update(
-                collection_name,
-                collection_operation,
-                shard_selection,
-                wait,
-                ordering,
-            )
-            .await?,
-        );
-    }
-
-    result.ok_or_else(|| StorageError::bad_request("No filter or points provided"))
-}
-
-pub async fn do_set_payload(
-    toc: &TableOfContent,
-    collection_name: &str,
-    operation: SetPayload,
-    shard_selection: Option<ShardId>,
-    wait: bool,
-    ordering: WriteOrdering,
-) -> Result<UpdateResult, StorageError> {
-    let collection_operation =
-        CollectionUpdateOperations::PayloadOperation(PayloadOps::SetPayload(operation));
-    toc.update(
-        collection_name,
-        collection_operation,
-        shard_selection,
-        wait,
-        ordering,
-    )
-    .await
-}
-
-pub async fn do_overwrite_payload(
-    toc: &TableOfContent,
-    collection_name: &str,
-    operation: SetPayload,
-    shard_selection: Option<ShardId>,
-    wait: bool,
-    ordering: WriteOrdering,
-) -> Result<UpdateResult, StorageError> {
-    let collection_operation =
-        CollectionUpdateOperations::PayloadOperation(PayloadOps::OverwritePayload(operation));
-    toc.update(
-        collection_name,
-        collection_operation,
-        shard_selection,
-        wait,
-        ordering,
-    )
-    .await
-}
-
-pub async fn do_delete_payload(
-    toc: &TableOfContent,
-    collection_name: &str,
-    operation: DeletePayload,
-    shard_selection: Option<ShardId>,
-    wait: bool,
-    ordering: WriteOrdering,
-) -> Result<UpdateResult, StorageError> {
-    let collection_operation =
-        CollectionUpdateOperations::PayloadOperation(PayloadOps::DeletePayload(operation));
-    toc.update(
-        collection_name,
-        collection_operation,
-        shard_selection,
-        wait,
-        ordering,
-    )
-    .await
-}
-
-pub async fn do_clear_payload(
-    toc: &TableOfContent,
-    collection_name: &str,
-    points: PointsSelector,
-    shard_selection: Option<ShardId>,
-    wait: bool,
-    ordering: WriteOrdering,
-) -> Result<UpdateResult, StorageError> {
-    let points_operation = match points {
-        PointsSelector::PointIdsSelector(points) => PayloadOps::ClearPayload {
-            points: points.points,
-        },
-        PointsSelector::FilterSelector(filter_selector) => {
-            PayloadOps::ClearPayloadByFilter(filter_selector.filter)
-        }
-    };
-
-    let collection_operation = CollectionUpdateOperations::PayloadOperation(points_operation);
-    toc.update(
-        collection_name,
-        collection_operation,
-        shard_selection,
-        wait,
-        ordering,
-    )
-    .await
-}
-
-pub async fn do_batch_update_points(
-    toc: &TableOfContent,
-    collection_name: &str,
-    operations: Vec<UpdateOperation>,
-    shard_selection: Option<ShardId>,
-    wait: bool,
-    ordering: WriteOrdering,
-) -> Result<Vec<UpdateResult>, StorageError> {
-    let mut results = Vec::with_capacity(operations.len());
-    for operation in operations {
-        let result = match operation {
-            UpdateOperation::Upsert(operation) => {
-                do_upsert_points(
-                    toc,
-                    collection_name,
-                    operation,
-                    shard_selection,
-                    wait,
-                    ordering,
-                )
-                .await
-            }
-            UpdateOperation::Delete(operation) => {
-                do_delete_points(
-                    toc,
-                    collection_name,
-                    operation,
-                    shard_selection,
-                    wait,
-                    ordering,
-                )
-                .await
-            }
-            UpdateOperation::SetPayload(operation) => {
-                do_set_payload(
-                    toc,
-                    collection_name,
-                    operation,
-                    shard_selection,
-                    wait,
-                    ordering,
-                )
-                .await
-            }
-            UpdateOperation::OverwritePayload(operation) => {
-                do_overwrite_payload(
-                    toc,
-                    collection_name,
-                    operation,
-                    shard_selection,
-                    wait,
-                    ordering,
-                )
-                .await
-            }
-            UpdateOperation::DeletePayload(operation) => {
-                do_delete_payload(
-                    toc,
-                    collection_name,
-                    operation,
-                    shard_selection,
-                    wait,
-                    ordering,
-                )
-                .await
-            }
-            UpdateOperation::ClearPayload(operation) => {
-                do_clear_payload(
-                    toc,
-                    collection_name,
-                    operation,
-                    shard_selection,
-                    wait,
-                    ordering,
-                )
-                .await
-            }
-            UpdateOperation::UpdateVectors(operation) => {
-                do_update_vectors(
-                    toc,
-                    collection_name,
-                    operation,
-                    shard_selection,
-                    wait,
-                    ordering,
-                )
-                .await
-            }
-            UpdateOperation::DeleteVectors(operation) => {
-                do_delete_vectors(
-                    toc,
-                    collection_name,
-                    operation,
-                    shard_selection,
-                    wait,
-                    ordering,
-                )
-                .await
-            }
-        }?;
-        results.push(result);
-    }
-    Ok(results)
-}
-
-pub async fn do_create_index(
-    toc: &TableOfContent,
-    collection_name: &str,
-    operation: CreateFieldIndex,
-    shard_selection: Option<ShardId>,
-    wait: bool,
-    ordering: WriteOrdering,
-) -> Result<UpdateResult, StorageError> {
-    let collection_operation = CollectionUpdateOperations::FieldIndexOperation(
-        FieldIndexOperations::CreateIndex(CreateIndex {
-            field_name: operation.field_name,
-            field_schema: operation.field_schema,
-        }),
-    );
-    toc.update(
-        collection_name,
-        collection_operation,
-        shard_selection,
-        wait,
-        ordering,
-    )
-    .await
-}
-
-pub async fn do_delete_index(
-    toc: &TableOfContent,
-    collection_name: &str,
-    index_name: String,
-    shard_selection: Option<ShardId>,
-    wait: bool,
-    ordering: WriteOrdering,
-) -> Result<UpdateResult, StorageError> {
-    let collection_operation = CollectionUpdateOperations::FieldIndexOperation(
-        FieldIndexOperations::DeleteIndex(index_name),
-    );
-    toc.update(
-        collection_name,
-        collection_operation,
-        shard_selection,
-        wait,
-        ordering,
-    )
-    .await
-}
-
-pub async fn do_search_points(
-    toc: &TableOfContent,
-    collection_name: &str,
-    request: SearchRequest,
-    read_consistency: Option<ReadConsistency>,
-    shard_selection: Option<ShardId>,
-) -> Result<Vec<ScoredPoint>, StorageError> {
-    toc.search(collection_name, request, read_consistency, shard_selection)
-        .await
-}
-
-pub async fn do_search_batch_points(
-    toc: &TableOfContent,
-    collection_name: &str,
-    request: SearchRequestBatch,
-    read_consistency: Option<ReadConsistency>,
-    shard_selection: Option<ShardId>,
-) -> Result<Vec<Vec<ScoredPoint>>, StorageError> {
-    toc.search_batch(collection_name, request, read_consistency, shard_selection)
-        .await
-}
-
-pub async fn do_search_point_groups(
-    toc: &TableOfContent,
-    collection_name: &str,
-    request: SearchGroupsRequest,
-    read_consistency: Option<ReadConsistency>,
-    shard_selection: Option<ShardId>,
-) -> Result<GroupsResult, StorageError> {
-    toc.group(
-        collection_name,
-        request.into(),
-        read_consistency,
-        shard_selection,
-    )
-    .await
-}
-
-pub async fn do_recommend_point_groups(
-    toc: &TableOfContent,
-    collection_name: &str,
-    request: RecommendGroupsRequest,
-    read_consistency: Option<ReadConsistency>,
-) -> Result<GroupsResult, StorageError> {
-    toc.group(collection_name, request.into(), read_consistency, None)
-        .await
-}
-
-pub async fn do_count_points(
-    toc: &TableOfContent,
-    collection_name: &str,
-    request: CountRequest,
-    shard_selection: Option<ShardId>,
-) -> Result<CountResult, StorageError> {
-    toc.count(collection_name, request, shard_selection).await
-}
-
-pub async fn do_get_points(
-    toc: &TableOfContent,
-    collection_name: &str,
-    request: PointRequest,
-    read_consistency: Option<ReadConsistency>,
-    shard_selection: Option<ShardId>,
-) -> Result<Vec<Record>, StorageError> {
-    toc.retrieve(collection_name, request, read_consistency, shard_selection)
-        .await
-}
-
-pub async fn do_scroll_points(
-    toc: &TableOfContent,
-    collection_name: &str,
-    request: ScrollRequest,
-    read_consistency: Option<ReadConsistency>,
-    shard_selection: Option<ShardId>,
-) -> Result<ScrollResult, StorageError> {
-    toc.scroll(collection_name, request, read_consistency, shard_selection)
-        .await
-}
diff --git a/crates/qdrant/src/common/telemetry.rs b/crates/qdrant/src/common/telemetry.rs
deleted file mode 100644
index a9fcd4f..0000000
--- a/crates/qdrant/src/common/telemetry.rs
+++ /dev/null
@@ -1,85 +0,0 @@
-use std::sync::Arc;
-
-use parking_lot::Mutex;
-use schemars::JsonSchema;
-use segment::common::anonymize::Anonymize;
-use serde::{Deserialize, Serialize};
-use storage::dispatcher::Dispatcher;
-use uuid::Uuid;
-
-use crate::common::telemetry_ops::app_telemetry::{AppBuildTelemetry, AppBuildTelemetryCollector};
-use crate::common::telemetry_ops::cluster_telemetry::ClusterTelemetry;
-use crate::common::telemetry_ops::collections_telemetry::CollectionsTelemetry;
-use crate::common::telemetry_ops::requests_telemetry::{
-    ActixTelemetryCollector, RequestsTelemetry, TonicTelemetryCollector,
-};
-use crate::settings::Settings;
-
-pub struct TelemetryCollector {
-    process_id: Uuid,
-    settings: Settings,
-    dispatcher: Arc<Dispatcher>,
-    pub app_telemetry_collector: AppBuildTelemetryCollector,
-    pub actix_telemetry_collector: Arc<Mutex<ActixTelemetryCollector>>,
-    pub tonic_telemetry_collector: Arc<Mutex<TonicTelemetryCollector>>,
-}
-
-// Whole telemetry data
-#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema)]
-pub struct TelemetryData {
-    id: String,
-    pub(crate) app: AppBuildTelemetry,
-    pub(crate) collections: CollectionsTelemetry,
-    pub(crate) cluster: ClusterTelemetry,
-    pub(crate) requests: RequestsTelemetry,
-}
-
-impl Anonymize for TelemetryData {
-    fn anonymize(&self) -> Self {
-        TelemetryData {
-            id: self.id.clone(),
-            app: self.app.anonymize(),
-            collections: self.collections.anonymize(),
-            cluster: self.cluster.anonymize(),
-            requests: self.requests.anonymize(),
-        }
-    }
-}
-
-impl TelemetryCollector {
-    pub fn reporting_id(&self) -> String {
-        self.process_id.to_string()
-    }
-
-    pub fn generate_id() -> Uuid {
-        Uuid::new_v4()
-    }
-
-    pub fn new(settings: Settings, dispatcher: Arc<Dispatcher>, id: Uuid) -> Self {
-        Self {
-            process_id: id,
-            settings,
-            dispatcher,
-            app_telemetry_collector: AppBuildTelemetryCollector::new(),
-            actix_telemetry_collector: Arc::new(Mutex::new(ActixTelemetryCollector {
-                workers: Vec::new(),
-            })),
-            tonic_telemetry_collector: Arc::new(Mutex::new(TonicTelemetryCollector {
-                workers: Vec::new(),
-            })),
-        }
-    }
-
-    pub async fn prepare_data(&self, level: usize) -> TelemetryData {
-        TelemetryData {
-            id: self.process_id.to_string(),
-            collections: CollectionsTelemetry::collect(level, self.dispatcher.toc()).await,
-            app: AppBuildTelemetry::collect(level, &self.app_telemetry_collector, &self.settings),
-            cluster: ClusterTelemetry::collect(level, &self.dispatcher, &self.settings),
-            requests: RequestsTelemetry::collect(
-                &self.actix_telemetry_collector.lock(),
-                &self.tonic_telemetry_collector.lock(),
-            ),
-        }
-    }
-}
diff --git a/crates/qdrant/src/common/telemetry_ops/app_telemetry.rs b/crates/qdrant/src/common/telemetry_ops/app_telemetry.rs
deleted file mode 100644
index ae9126e..0000000
--- a/crates/qdrant/src/common/telemetry_ops/app_telemetry.rs
+++ /dev/null
@@ -1,165 +0,0 @@
-use std::path::Path;
-
-use chrono::{DateTime, SubsecRound, Utc};
-use schemars::JsonSchema;
-use segment::common::anonymize::Anonymize;
-use serde::{Deserialize, Serialize};
-
-use crate::settings::Settings;
-
-pub struct AppBuildTelemetryCollector {
-    pub startup: DateTime<Utc>,
-}
-
-impl AppBuildTelemetryCollector {
-    pub fn new() -> Self {
-        AppBuildTelemetryCollector {
-            startup: Utc::now().round_subsecs(2),
-        }
-    }
-}
-
-#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema)]
-pub struct AppFeaturesTelemetry {
-    debug: bool,
-    web_feature: bool,
-    service_debug_feature: bool,
-    recovery_mode: bool,
-}
-
-#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema)]
-pub struct RunningEnvironmentTelemetry {
-    distribution: Option<String>,
-    distribution_version: Option<String>,
-    is_docker: bool,
-    cores: Option<usize>,
-    ram_size: Option<usize>,
-    disk_size: Option<usize>,
-    cpu_flags: String,
-}
-
-#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema)]
-pub struct AppBuildTelemetry {
-    pub name: String,
-    pub version: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    #[serde(default)]
-    pub features: Option<AppFeaturesTelemetry>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    #[serde(default)]
-    pub system: Option<RunningEnvironmentTelemetry>,
-    pub startup: DateTime<Utc>,
-}
-
-impl AppBuildTelemetry {
-    pub fn collect(
-        level: usize,
-        collector: &AppBuildTelemetryCollector,
-        settings: &Settings,
-    ) -> Self {
-        AppBuildTelemetry {
-            name: env!("CARGO_PKG_NAME").to_string(),
-            version: env!("CARGO_PKG_VERSION").to_string(),
-            features: if level > 0 {
-                Some(AppFeaturesTelemetry {
-                    debug: cfg!(debug_assertions),
-                    web_feature: cfg!(feature = "web"),
-                    service_debug_feature: cfg!(feature = "service_debug"),
-                    recovery_mode: settings.storage.recovery_mode.is_some(),
-                })
-            } else {
-                None
-            },
-            system: if level > 0 {
-                Some(get_system_data())
-            } else {
-                None
-            },
-            startup: collector.startup,
-        }
-    }
-}
-
-fn get_system_data() -> RunningEnvironmentTelemetry {
-    let distribution = if let Ok(release) = sys_info::linux_os_release() {
-        release.id
-    } else {
-        sys_info::os_type().ok()
-    };
-    let distribution_version = if let Ok(release) = sys_info::linux_os_release() {
-        release.version_id
-    } else {
-        sys_info::os_release().ok()
-    };
-    let mut cpu_flags = vec![];
-    #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-    {
-        if std::arch::is_x86_feature_detected!("sse") {
-            cpu_flags.push("sse");
-        }
-        if std::arch::is_x86_feature_detected!("avx") {
-            cpu_flags.push("avx");
-        }
-        if std::arch::is_x86_feature_detected!("avx2") {
-            cpu_flags.push("avx2");
-        }
-        if std::arch::is_x86_feature_detected!("fma") {
-            cpu_flags.push("fma");
-        }
-        if std::arch::is_x86_feature_detected!("avx512f") {
-            cpu_flags.push("avx512f");
-        }
-    }
-    #[cfg(all(target_arch = "aarch64", target_feature = "neon"))]
-    {
-        if std::arch::is_aarch64_feature_detected!("neon") {
-            cpu_flags.push("neon");
-        }
-    }
-    RunningEnvironmentTelemetry {
-        distribution,
-        distribution_version,
-        is_docker: cfg!(unix) && Path::new("/.dockerenv").exists(),
-        cores: sys_info::cpu_num().ok().map(|x| x as usize),
-        ram_size: sys_info::mem_info().ok().map(|x| x.total as usize),
-        disk_size: sys_info::disk_info().ok().map(|x| x.total as usize),
-        cpu_flags: cpu_flags.join(","),
-    }
-}
-
-impl Anonymize for AppFeaturesTelemetry {
-    fn anonymize(&self) -> Self {
-        AppFeaturesTelemetry {
-            debug: self.debug,
-            web_feature: self.web_feature,
-            service_debug_feature: self.service_debug_feature,
-            recovery_mode: self.recovery_mode,
-        }
-    }
-}
-
-impl Anonymize for AppBuildTelemetry {
-    fn anonymize(&self) -> Self {
-        AppBuildTelemetry {
-            name: self.name.clone(),
-            version: self.version.clone(),
-            features: self.features.anonymize(),
-            system: self.system.anonymize(),
-            startup: self.startup.anonymize(),
-        }
-    }
-}
-
-impl Anonymize for RunningEnvironmentTelemetry {
-    fn anonymize(&self) -> Self {
-        RunningEnvironmentTelemetry {
-            distribution: self.distribution.clone(),
-            distribution_version: self.distribution_version.clone(),
-            is_docker: self.is_docker,
-            cores: self.cores,
-            ram_size: self.ram_size.anonymize(),
-            disk_size: self.disk_size.anonymize(),
-            cpu_flags: self.cpu_flags.clone(),
-        }
-    }
-}
diff --git a/crates/qdrant/src/common/telemetry_ops/cluster_telemetry.rs b/crates/qdrant/src/common/telemetry_ops/cluster_telemetry.rs
deleted file mode 100644
index f6fab3c..0000000
--- a/crates/qdrant/src/common/telemetry_ops/cluster_telemetry.rs
+++ /dev/null
@@ -1,129 +0,0 @@
-use collection::shards::shard::PeerId;
-use schemars::JsonSchema;
-use segment::common::anonymize::Anonymize;
-use serde::{Deserialize, Serialize};
-use storage::dispatcher::Dispatcher;
-use storage::types::{ClusterStatus, ConsensusThreadStatus, StateRole};
-
-use crate::settings::Settings;
-
-#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema)]
-pub struct P2pConfigTelemetry {
-    connection_pool_size: usize,
-}
-
-#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema)]
-pub struct ConsensusConfigTelemetry {
-    max_message_queue_size: usize,
-    tick_period_ms: u64,
-    bootstrap_timeout_sec: u64,
-}
-
-#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema)]
-pub struct ClusterConfigTelemetry {
-    grpc_timeout_ms: u64,
-    p2p: P2pConfigTelemetry,
-    consensus: ConsensusConfigTelemetry,
-}
-
-impl From<&Settings> for ClusterConfigTelemetry {
-    fn from(settings: &Settings) -> Self {
-        ClusterConfigTelemetry {
-            grpc_timeout_ms: settings.cluster.grpc_timeout_ms,
-            p2p: P2pConfigTelemetry {
-                connection_pool_size: settings.cluster.p2p.connection_pool_size,
-            },
-            consensus: ConsensusConfigTelemetry {
-                max_message_queue_size: settings.cluster.consensus.max_message_queue_size,
-                tick_period_ms: settings.cluster.consensus.tick_period_ms,
-                bootstrap_timeout_sec: settings.cluster.consensus.bootstrap_timeout_sec,
-            },
-        }
-    }
-}
-
-#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema)]
-pub struct ClusterStatusTelemetry {
-    pub number_of_peers: usize,
-    pub term: u64,
-    pub commit: u64,
-    pub pending_operations: usize,
-    pub role: Option<StateRole>,
-    pub is_voter: bool,
-    pub peer_id: Option<PeerId>,
-    pub consensus_thread_status: ConsensusThreadStatus,
-}
-
-#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema)]
-pub struct ClusterTelemetry {
-    pub enabled: bool,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub status: Option<ClusterStatusTelemetry>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub config: Option<ClusterConfigTelemetry>,
-}
-
-impl ClusterTelemetry {
-    pub fn collect(level: usize, dispatcher: &Dispatcher, settings: &Settings) -> ClusterTelemetry {
-        let status = if level > 0 {
-            match dispatcher.cluster_status() {
-                ClusterStatus::Disabled => None,
-                ClusterStatus::Enabled(cluster_info) => Some(ClusterStatusTelemetry {
-                    number_of_peers: cluster_info.peers.len(),
-                    term: cluster_info.raft_info.term,
-                    commit: cluster_info.raft_info.commit,
-                    pending_operations: cluster_info.raft_info.pending_operations,
-                    role: cluster_info.raft_info.role,
-                    is_voter: cluster_info.raft_info.is_voter,
-                    peer_id: Some(cluster_info.peer_id),
-                    consensus_thread_status: cluster_info.consensus_thread_status,
-                }),
-            }
-        } else {
-            None
-        };
-
-        let config = if level > 1 {
-            Some(ClusterConfigTelemetry::from(settings))
-        } else {
-            None
-        };
-
-        ClusterTelemetry {
-            enabled: settings.cluster.enabled,
-            status,
-            config,
-        }
-    }
-}
-
-impl Anonymize for ClusterTelemetry {
-    fn anonymize(&self) -> Self {
-        ClusterTelemetry {
-            enabled: self.enabled,
-            status: self.status.clone().map(|x| x.anonymize()),
-            config: self.config.clone().map(|x| x.anonymize()),
-        }
-    }
-}
-
-impl Anonymize for ClusterStatusTelemetry {
-    fn anonymize(&self) -> Self {
-        ClusterStatusTelemetry {
-            number_of_peers: self.number_of_peers,
-            term: self.term,
-            commit: self.commit,
-            pending_operations: self.pending_operations,
-            role: self.role,
-            is_voter: self.is_voter,
-            peer_id: None,
-            consensus_thread_status: self.consensus_thread_status.clone(),
-        }
-    }
-}
-
-impl Anonymize for ClusterConfigTelemetry {
-    fn anonymize(&self) -> Self {
-        self.clone()
-    }
-}
diff --git a/crates/qdrant/src/common/telemetry_ops/collections_telemetry.rs b/crates/qdrant/src/common/telemetry_ops/collections_telemetry.rs
deleted file mode 100644
index 6c5b58f..0000000
--- a/crates/qdrant/src/common/telemetry_ops/collections_telemetry.rs
+++ /dev/null
@@ -1,106 +0,0 @@
-use collection::config::CollectionParams;
-use collection::operations::types::OptimizersStatus;
-use collection::telemetry::CollectionTelemetry;
-use schemars::JsonSchema;
-use segment::common::anonymize::Anonymize;
-use serde::{Deserialize, Serialize};
-use storage::content_manager::toc::TableOfContent;
-
-#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema)]
-pub struct CollectionsAggregatedTelemetry {
-    pub vectors: usize,
-    pub optimizers_status: OptimizersStatus,
-    pub params: CollectionParams,
-}
-
-#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema)]
-#[serde(untagged)]
-pub enum CollectionTelemetryEnum {
-    Full(CollectionTelemetry),
-    Aggregated(CollectionsAggregatedTelemetry),
-}
-
-#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema)]
-pub struct CollectionsTelemetry {
-    pub number_of_collections: usize,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub collections: Option<Vec<CollectionTelemetryEnum>>,
-}
-
-impl From<CollectionTelemetry> for CollectionsAggregatedTelemetry {
-    fn from(telemetry: CollectionTelemetry) -> Self {
-        let optimizers_status = telemetry
-            .shards
-            .iter()
-            .flat_map(|shard| shard.local.as_ref().map(|x| x.optimizations.status.clone()))
-            .max()
-            .unwrap_or(OptimizersStatus::Ok);
-
-        CollectionsAggregatedTelemetry {
-            vectors: telemetry.count_vectors(),
-            optimizers_status,
-            params: telemetry.config.params,
-        }
-    }
-}
-
-impl CollectionsTelemetry {
-    pub async fn collect(level: usize, toc: &TableOfContent) -> Self {
-        let number_of_collections = toc.all_collections().await.len();
-        let collections = if level > 0 {
-            let telemetry_data = toc
-                .get_telemetry_data()
-                .await
-                .into_iter()
-                .map(|telemetry| {
-                    if level > 1 {
-                        CollectionTelemetryEnum::Full(telemetry)
-                    } else {
-                        CollectionTelemetryEnum::Aggregated(telemetry.into())
-                    }
-                })
-                .collect();
-
-            Some(telemetry_data)
-        } else {
-            None
-        };
-
-        CollectionsTelemetry {
-            number_of_collections,
-            collections,
-        }
-    }
-}
-
-impl Anonymize for CollectionsTelemetry {
-    fn anonymize(&self) -> Self {
-        CollectionsTelemetry {
-            number_of_collections: self.number_of_collections,
-            collections: self.collections.anonymize(),
-        }
-    }
-}
-
-impl Anonymize for CollectionTelemetryEnum {
-    fn anonymize(&self) -> Self {
-        match self {
-            CollectionTelemetryEnum::Full(telemetry) => {
-                CollectionTelemetryEnum::Full(telemetry.anonymize())
-            }
-            CollectionTelemetryEnum::Aggregated(telemetry) => {
-                CollectionTelemetryEnum::Aggregated(telemetry.anonymize())
-            }
-        }
-    }
-}
-
-impl Anonymize for CollectionsAggregatedTelemetry {
-    fn anonymize(&self) -> Self {
-        CollectionsAggregatedTelemetry {
-            optimizers_status: self.optimizers_status.clone(),
-            vectors: self.vectors.anonymize(),
-            params: self.params.anonymize(),
-        }
-    }
-}
diff --git a/crates/qdrant/src/common/telemetry_ops/mod.rs b/crates/qdrant/src/common/telemetry_ops/mod.rs
deleted file mode 100644
index 4fc1871..0000000
--- a/crates/qdrant/src/common/telemetry_ops/mod.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-pub mod app_telemetry;
-pub mod cluster_telemetry;
-pub mod collections_telemetry;
-pub mod requests_telemetry;
diff --git a/crates/qdrant/src/common/telemetry_ops/requests_telemetry.rs b/crates/qdrant/src/common/telemetry_ops/requests_telemetry.rs
deleted file mode 100644
index b1f94f5..0000000
--- a/crates/qdrant/src/common/telemetry_ops/requests_telemetry.rs
+++ /dev/null
@@ -1,201 +0,0 @@
-use std::collections::HashMap;
-use std::sync::Arc;
-
-use parking_lot::Mutex;
-use schemars::JsonSchema;
-use segment::common::anonymize::Anonymize;
-use segment::common::operation_time_statistics::{
-    OperationDurationStatistics, OperationDurationsAggregator, ScopeDurationMeasurer,
-};
-use serde::{Deserialize, Serialize};
-
-pub type HttpStatusCode = u16;
-
-#[derive(Serialize, Deserialize, Clone, Default, Debug, JsonSchema)]
-pub struct WebApiTelemetry {
-    pub responses: HashMap<String, HashMap<HttpStatusCode, OperationDurationStatistics>>,
-}
-
-#[derive(Serialize, Deserialize, Clone, Default, Debug, JsonSchema)]
-pub struct GrpcTelemetry {
-    pub responses: HashMap<String, OperationDurationStatistics>,
-}
-
-pub struct ActixTelemetryCollector {
-    pub workers: Vec<Arc<Mutex<ActixWorkerTelemetryCollector>>>,
-}
-
-#[derive(Default)]
-pub struct ActixWorkerTelemetryCollector {
-    methods: HashMap<String, HashMap<HttpStatusCode, Arc<Mutex<OperationDurationsAggregator>>>>,
-}
-
-pub struct TonicTelemetryCollector {
-    pub workers: Vec<Arc<Mutex<TonicWorkerTelemetryCollector>>>,
-}
-
-#[derive(Default)]
-pub struct TonicWorkerTelemetryCollector {
-    methods: HashMap<String, Arc<Mutex<OperationDurationsAggregator>>>,
-}
-
-impl ActixTelemetryCollector {
-    pub fn create_web_worker_telemetry(&mut self) -> Arc<Mutex<ActixWorkerTelemetryCollector>> {
-        let worker: Arc<Mutex<_>> = Default::default();
-        self.workers.push(worker.clone());
-        worker
-    }
-
-    pub fn get_telemetry_data(&self) -> WebApiTelemetry {
-        let mut result = WebApiTelemetry::default();
-        for web_data in &self.workers {
-            let lock = web_data.lock().get_telemetry_data();
-            result.merge(&lock);
-        }
-        result
-    }
-}
-
-impl TonicTelemetryCollector {
-    #[allow(dead_code)]
-    pub fn create_grpc_telemetry_collector(&mut self) -> Arc<Mutex<TonicWorkerTelemetryCollector>> {
-        let worker: Arc<Mutex<_>> = Default::default();
-        self.workers.push(worker.clone());
-        worker
-    }
-
-    pub fn get_telemetry_data(&self) -> GrpcTelemetry {
-        let mut result = GrpcTelemetry::default();
-        for grpc_data in &self.workers {
-            let lock = grpc_data.lock().get_telemetry_data();
-            result.merge(&lock);
-        }
-        result
-    }
-}
-
-impl TonicWorkerTelemetryCollector {
-    #[allow(dead_code)]
-    pub fn add_response(&mut self, method: String, instant: std::time::Instant) {
-        let aggregator = self
-            .methods
-            .entry(method)
-            .or_insert_with(OperationDurationsAggregator::new);
-        ScopeDurationMeasurer::new_with_instant(aggregator, instant);
-    }
-
-    pub fn get_telemetry_data(&self) -> GrpcTelemetry {
-        let mut responses = HashMap::new();
-        for (method, aggregator) in self.methods.iter() {
-            responses.insert(method.clone(), aggregator.lock().get_statistics());
-        }
-        GrpcTelemetry { responses }
-    }
-}
-
-impl ActixWorkerTelemetryCollector {
-    pub fn add_response(
-        &mut self,
-        method: String,
-        status_code: HttpStatusCode,
-        instant: std::time::Instant,
-    ) {
-        let aggregator = self
-            .methods
-            .entry(method)
-            .or_default()
-            .entry(status_code)
-            .or_insert_with(OperationDurationsAggregator::new);
-        ScopeDurationMeasurer::new_with_instant(aggregator, instant);
-    }
-
-    pub fn get_telemetry_data(&self) -> WebApiTelemetry {
-        let mut responses = HashMap::new();
-        for (method, status_codes) in &self.methods {
-            let mut status_codes_map = HashMap::new();
-            for (status_code, aggregator) in status_codes {
-                status_codes_map.insert(*status_code, aggregator.lock().get_statistics());
-            }
-            responses.insert(method.clone(), status_codes_map);
-        }
-        WebApiTelemetry { responses }
-    }
-}
-
-impl GrpcTelemetry {
-    pub fn merge(&mut self, other: &GrpcTelemetry) {
-        for (method, other_statistics) in &other.responses {
-            let entry = self.responses.entry(method.clone()).or_default();
-            *entry = entry.clone() + other_statistics.clone();
-        }
-    }
-}
-
-impl WebApiTelemetry {
-    pub fn merge(&mut self, other: &WebApiTelemetry) {
-        for (method, status_codes) in &other.responses {
-            let status_codes_map = self.responses.entry(method.clone()).or_default();
-            for (status_code, statistics) in status_codes {
-                let entry = status_codes_map
-                    .entry(*status_code)
-                    .or_insert_with(OperationDurationStatistics::default);
-                *entry = entry.clone() + statistics.clone();
-            }
-        }
-    }
-}
-
-#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema)]
-pub struct RequestsTelemetry {
-    pub rest: WebApiTelemetry,
-    pub grpc: GrpcTelemetry,
-}
-
-impl RequestsTelemetry {
-    pub fn collect(
-        actix_collector: &ActixTelemetryCollector,
-        tonic_collector: &TonicTelemetryCollector,
-    ) -> Self {
-        let rest = actix_collector.get_telemetry_data();
-        let grpc = tonic_collector.get_telemetry_data();
-        Self { rest, grpc }
-    }
-}
-
-impl Anonymize for RequestsTelemetry {
-    fn anonymize(&self) -> Self {
-        let rest = self.rest.anonymize();
-        let grpc = self.grpc.anonymize();
-        Self { rest, grpc }
-    }
-}
-
-impl Anonymize for WebApiTelemetry {
-    fn anonymize(&self) -> Self {
-        let responses = self
-            .responses
-            .iter()
-            .map(|(key, value)| {
-                let value: HashMap<_, _> = value
-                    .iter()
-                    .map(|(key, value)| (*key, value.anonymize()))
-                    .collect();
-                (key.clone(), value)
-            })
-            .collect();
-
-        WebApiTelemetry { responses }
-    }
-}
-
-impl Anonymize for GrpcTelemetry {
-    fn anonymize(&self) -> Self {
-        let responses = self
-            .responses
-            .iter()
-            .map(|(key, value)| (key.clone(), value.anonymize()))
-            .collect();
-
-        GrpcTelemetry { responses }
-    }
-}
diff --git a/crates/qdrant/src/common/telemetry_reporting.rs b/crates/qdrant/src/common/telemetry_reporting.rs
deleted file mode 100644
index e3bff86..0000000
--- a/crates/qdrant/src/common/telemetry_reporting.rs
+++ /dev/null
@@ -1,56 +0,0 @@
-use std::sync::Arc;
-use std::time::Duration;
-
-use segment::common::anonymize::Anonymize;
-use tokio::sync::Mutex;
-
-use crate::common::telemetry::TelemetryCollector;
-
-const DETAIL_LEVEL: usize = 5;
-const REPORTING_INTERVAL: Duration = Duration::from_secs(60 * 60); // One hour
-
-pub struct TelemetryReporter {
-    telemetry_url: String,
-    telemetry: Arc<Mutex<TelemetryCollector>>,
-}
-
-impl TelemetryReporter {
-    fn new(telemetry: Arc<Mutex<TelemetryCollector>>) -> Self {
-        let telemetry_url = if cfg!(debug_assertions) {
-            "https://staging-telemetry.qdrant.io".to_string()
-        } else {
-            "https://telemetry.qdrant.io".to_string()
-        };
-
-        Self {
-            telemetry_url,
-            telemetry,
-        }
-    }
-
-    async fn report(&self) {
-        let data = self
-            .telemetry
-            .lock()
-            .await
-            .prepare_data(DETAIL_LEVEL)
-            .await
-            .anonymize();
-        let client = reqwest::Client::new();
-        let data = serde_json::to_string(&data).unwrap();
-        let _resp = client
-            .post(&self.telemetry_url)
-            .body(data)
-            .header("Content-Type", "application/json")
-            .send()
-            .await;
-    }
-
-    pub async fn run(telemetry: Arc<Mutex<TelemetryCollector>>) {
-        let reporter = Self::new(telemetry);
-        loop {
-            reporter.report().await;
-            tokio::time::sleep(REPORTING_INTERVAL).await;
-        }
-    }
-}
diff --git a/crates/qdrant/src/consensus.rs b/crates/qdrant/src/consensus.rs
deleted file mode 100644
index 3ee8aa4..0000000
--- a/crates/qdrant/src/consensus.rs
+++ /dev/null
@@ -1,1246 +0,0 @@
-use std::collections::{HashMap, HashSet};
-use std::str::FromStr;
-use std::sync::{mpsc, Arc};
-use std::thread::JoinHandle;
-use std::time::{Duration, Instant};
-use std::{fmt, thread};
-
-use anyhow::{anyhow, Context};
-use api::grpc::dynamic_channel_pool::make_grpc_channel;
-use api::grpc::qdrant::raft_client::RaftClient;
-use api::grpc::qdrant::{AllPeers, PeerId as GrpcPeerId, RaftMessage as GrpcRaftMessage};
-use api::grpc::transport_channel_pool::TransportChannelPool;
-use collection::shards::channel_service::ChannelService;
-use collection::shards::shard::PeerId;
-use prost::Message as _;
-use raft::eraftpb::Message as RaftMessage;
-use raft::prelude::*;
-use raft::{SoftState, StateRole, INVALID_ID};
-use storage::content_manager::consensus_manager::ConsensusStateRef;
-use storage::content_manager::consensus_ops::{ConsensusOperations, SnapshotStatus};
-use storage::content_manager::toc::TableOfContent;
-use tokio::runtime::Handle;
-use tokio::sync::mpsc::{Receiver, Sender};
-use tokio::sync::watch;
-use tokio::time::sleep;
-use tonic::transport::{ClientTlsConfig, Uri};
-
-use crate::common::helpers;
-use crate::common::telemetry_ops::requests_telemetry::TonicTelemetryCollector;
-use crate::settings::{ConsensusConfig, Settings};
-use crate::tonic::init_internal;
-
-type Node = RawNode<ConsensusStateRef>;
-
-const RECOVERY_RETRY_TIMEOUT: Duration = Duration::from_secs(1);
-const RECOVERY_MAX_RETRY_COUNT: usize = 3;
-
-pub enum Message {
-    FromClient(ConsensusOperations),
-    FromPeer(Box<RaftMessage>),
-}
-
-/// Aka Consensus Thread
-/// Manages proposed changes to consensus state, ensures that everything is ordered properly
-pub struct Consensus {
-    /// Raft structure which handles raft-related state
-    node: Node,
-    /// Receives proposals from peers and client for applying in consensus
-    receiver: Receiver<Message>,
-    /// Runtime for async message sending
-    runtime: Handle,
-    /// Uri to some other known peer, used to join the consensus
-    /// ToDo: Make if many
-    config: ConsensusConfig,
-    broker: RaftMessageBroker,
-}
-
-impl Consensus {
-    /// Create and run consensus node
-    #[allow(clippy::too_many_arguments)]
-    pub fn run(
-        logger: &slog::Logger,
-        state_ref: ConsensusStateRef,
-        bootstrap_peer: Option<Uri>,
-        uri: Option<String>,
-        settings: Settings,
-        channel_service: ChannelService,
-        propose_receiver: mpsc::Receiver<ConsensusOperations>,
-        telemetry_collector: Arc<parking_lot::Mutex<TonicTelemetryCollector>>,
-        toc: Arc<TableOfContent>,
-        runtime: Handle,
-    ) -> anyhow::Result<JoinHandle<std::io::Result<()>>> {
-        let tls_client_config = helpers::load_tls_client_config(&settings)?;
-
-        let p2p_host = settings.service.host;
-        let p2p_port = settings.cluster.p2p.port.expect("P2P port is not set");
-        let config = settings.cluster.consensus;
-
-        let (mut consensus, message_sender) = Self::new(
-            logger,
-            state_ref.clone(),
-            bootstrap_peer,
-            uri,
-            p2p_port,
-            config,
-            tls_client_config,
-            channel_service,
-            runtime.clone(),
-        )?;
-
-        let state_ref_clone = state_ref.clone();
-        thread::Builder::new()
-            .name("consensus".to_string())
-            .spawn(move || {
-                if let Err(err) = consensus.start() {
-                    log::error!("Consensus stopped with error: {err}");
-                    state_ref_clone.on_consensus_thread_err(err);
-                } else {
-                    log::info!("Consensus stopped");
-                    state_ref_clone.on_consensus_stopped();
-                }
-            })?;
-
-        let message_sender_moved = message_sender.clone();
-        thread::Builder::new()
-            .name("forward-proposals".to_string())
-            .spawn(move || {
-                while let Ok(entry) = propose_receiver.recv() {
-                    if message_sender_moved
-                        .blocking_send(Message::FromClient(entry))
-                        .is_err()
-                    {
-                        log::error!("Can not forward new entry to consensus as it was stopped.");
-                        break;
-                    }
-                }
-            })?;
-
-        let server_tls = if settings.cluster.p2p.enable_tls {
-            let tls_config = settings
-                .tls
-                .ok_or_else(Settings::tls_config_is_undefined_error)?;
-
-            Some(helpers::load_tls_internal_server_config(&tls_config)?)
-        } else {
-            None
-        };
-
-        let handle = thread::Builder::new()
-            .name("grpc_internal".to_string())
-            .spawn(move || {
-                init_internal(
-                    toc,
-                    state_ref,
-                    telemetry_collector,
-                    p2p_host,
-                    p2p_port,
-                    server_tls,
-                    message_sender,
-                    runtime,
-                )
-            })
-            .unwrap();
-
-        Ok(handle)
-    }
-
-    /// If `bootstrap_peer` peer is supplied, then either `uri` or `p2p_port` should be also supplied
-    #[allow(clippy::too_many_arguments)]
-    pub fn new(
-        logger: &slog::Logger,
-        state_ref: ConsensusStateRef,
-        bootstrap_peer: Option<Uri>,
-        uri: Option<String>,
-        p2p_port: u16,
-        config: ConsensusConfig,
-        tls_config: Option<ClientTlsConfig>,
-        channel_service: ChannelService,
-        runtime: Handle,
-    ) -> anyhow::Result<(Self, Sender<Message>)> {
-        // raft will not return entries to the application smaller or equal to `applied`
-        let last_applied = state_ref.last_applied_entry().unwrap_or_default();
-        let raft_config = Config {
-            id: state_ref.this_peer_id(),
-            applied: last_applied,
-            ..Default::default()
-        };
-        raft_config.validate()?;
-        let op_wait = storage::content_manager::consensus_manager::DEFAULT_META_OP_WAIT;
-        // Commit might take up to 4 ticks as:
-        // 1 tick - send proposal to leader
-        // 2 tick - leader sends append entries to peers
-        // 3 tick - peer answers leader, that entry is persisted
-        // 4 tick - leader increases commit index and sends it
-        if 4 * Duration::from_millis(config.tick_period_ms) > op_wait {
-            log::warn!("With current tick period of {}ms, operation commit time might exceed default wait timeout: {}ms",
-                 config.tick_period_ms, op_wait.as_millis())
-        }
-        // bounded channel for backpressure
-        let (sender, receiver) = tokio::sync::mpsc::channel(config.max_message_queue_size);
-        // State might be initialized but the node might be shutdown without actually syncing or committing anything.
-        if state_ref.is_new_deployment() {
-            let leader_established_in_ms =
-                config.tick_period_ms * raft_config.max_election_tick() as u64;
-            Self::init(
-                &state_ref,
-                bootstrap_peer.clone(),
-                uri,
-                p2p_port,
-                &config,
-                tls_config.clone(),
-                runtime.clone(),
-                leader_established_in_ms,
-            )
-            .map_err(|err| anyhow!("Failed to initialize Consensus for new Raft state: {}", err))?;
-        } else {
-            runtime
-                .block_on(Self::recover(
-                    &state_ref,
-                    uri.clone(),
-                    p2p_port,
-                    &config,
-                    tls_config.clone(),
-                ))
-                .map_err(|err| {
-                    anyhow!(
-                        "Failed to recover Consensus from existing Raft state: {}",
-                        err
-                    )
-                })?;
-
-            if bootstrap_peer.is_some() || uri.is_some() {
-                log::debug!("Local raft state found - bootstrap and uri cli arguments were ignored")
-            }
-            log::debug!("Local raft state found - skipping initialization");
-        };
-        let mut node = Node::new(&raft_config, state_ref.clone(), logger)?;
-        // Before consensus has started apply any unapplied committed entries
-        // They might have not been applied due to unplanned Qdrant shutdown
-        let _stop_consensus = state_ref.apply_entries(&mut node)?;
-
-        let broker = RaftMessageBroker::new(
-            runtime.clone(),
-            bootstrap_peer,
-            tls_config,
-            config.clone(),
-            node.store().clone(),
-            channel_service.channel_pool,
-        );
-
-        let consensus = Self {
-            node,
-            receiver,
-            runtime,
-            config,
-            broker,
-        };
-
-        Ok((consensus, sender))
-    }
-
-    #[allow(clippy::too_many_arguments)]
-    fn init(
-        state_ref: &ConsensusStateRef,
-        bootstrap_peer: Option<Uri>,
-        uri: Option<String>,
-        p2p_port: u16,
-        config: &ConsensusConfig,
-        tls_config: Option<ClientTlsConfig>,
-        runtime: Handle,
-        leader_established_in_ms: u64,
-    ) -> anyhow::Result<()> {
-        if let Some(bootstrap_peer) = bootstrap_peer {
-            log::debug!("Bootstrapping from peer with address: {bootstrap_peer}");
-            runtime.block_on(Self::bootstrap(
-                state_ref,
-                bootstrap_peer,
-                uri,
-                p2p_port,
-                config,
-                tls_config,
-            ))?;
-            Ok(())
-        } else {
-            log::debug!(
-                "Bootstrapping is disabled. Assuming this peer is the first in the network"
-            );
-            let tick_period = config.tick_period_ms;
-            log::info!("With current tick period of {tick_period}ms, leader will be established in approximately {leader_established_in_ms}ms. To avoid rejected operations - add peers and submit operations only after this period.");
-            // First peer needs to add its own address
-            state_ref.add_peer(
-                state_ref.this_peer_id(),
-                uri.ok_or_else(|| anyhow::anyhow!("First peer should specify its uri."))?
-                    .parse()?,
-            )?;
-            Ok(())
-        }
-    }
-
-    async fn add_peer_to_known_for(
-        this_peer_id: PeerId,
-        cluster_uri: Uri,
-        current_uri: Option<String>,
-        p2p_port: u16,
-        config: &ConsensusConfig,
-        tls_config: Option<ClientTlsConfig>,
-    ) -> anyhow::Result<AllPeers> {
-        // Use dedicated transport channel for bootstrapping because of specific timeout
-        let channel = make_grpc_channel(
-            Duration::from_secs(config.bootstrap_timeout_sec),
-            Duration::from_secs(config.bootstrap_timeout_sec),
-            cluster_uri,
-            tls_config,
-        )
-        .await
-        .map_err(|err| anyhow!("Failed to create timeout channel: {}", err))?;
-        let mut client = RaftClient::new(channel);
-        let all_peers = client
-            .add_peer_to_known(tonic::Request::new(
-                api::grpc::qdrant::AddPeerToKnownMessage {
-                    uri: current_uri,
-                    port: Some(p2p_port as u32),
-                    id: this_peer_id,
-                },
-            ))
-            .await
-            .map_err(|err| anyhow!("Failed to add peer to known: {}", err))?
-            .into_inner();
-        Ok(all_peers)
-    }
-
-    // Re-attach peer to the consensus:
-    // Notifies the cluster(any node) that this node changed its address
-    async fn recover(
-        state_ref: &ConsensusStateRef,
-        uri: Option<String>,
-        p2p_port: u16,
-        config: &ConsensusConfig,
-        tls_config: Option<ClientTlsConfig>,
-    ) -> anyhow::Result<()> {
-        let this_peer_id = state_ref.this_peer_id();
-        let mut peer_to_uri = state_ref
-            .persistent
-            .read()
-            .peer_address_by_id
-            .read()
-            .clone();
-        let this_peer_url = peer_to_uri.remove(&this_peer_id);
-        // Recover url if a different one is provided
-        let do_recover = match (&this_peer_url, &uri) {
-            (Some(this_peer_url), Some(uri)) => this_peer_url != &Uri::from_str(uri)?,
-            _ => false,
-        };
-
-        if do_recover {
-            let mut tries = RECOVERY_MAX_RETRY_COUNT;
-            while tries > 0 {
-                // Try to inform any peer about the change of address
-                for (peer_id, peer_uri) in &peer_to_uri {
-                    let res = Self::add_peer_to_known_for(
-                        this_peer_id,
-                        peer_uri.clone(),
-                        uri.clone(),
-                        p2p_port,
-                        config,
-                        tls_config.clone(),
-                    )
-                    .await;
-                    if res.is_err() {
-                        log::warn!(
-                            "Failed to recover from peer with id {} at {} with error {:?}, trying others",
-                            peer_id,
-                            peer_uri,
-                            res
-                        );
-                    } else {
-                        log::debug!(
-                            "Successfully recovered from peer with id {} at {}",
-                            peer_id,
-                            peer_uri
-                        );
-                        return Ok(());
-                    }
-                }
-                tries -= 1;
-                log::warn!(
-                    "Retrying recovering from known peers (retry {})",
-                    RECOVERY_MAX_RETRY_COUNT - tries
-                );
-                let exp_timeout =
-                    RECOVERY_RETRY_TIMEOUT * (RECOVERY_MAX_RETRY_COUNT - tries) as u32;
-                sleep(exp_timeout).await;
-            }
-            return Err(anyhow::anyhow!("Failed to recover from any known peers"));
-        }
-
-        Ok(())
-    }
-
-    /// Add node sequence:
-    ///
-    /// 1. Add current node as a learner
-    /// 2. Start applying entries from consensus
-    /// 3. Eventually leader submits the promotion proposal
-    /// 4. Learners become voters once they read about the promotion from consensus log
-    async fn bootstrap(
-        state_ref: &ConsensusStateRef,
-        bootstrap_peer: Uri,
-        uri: Option<String>,
-        p2p_port: u16,
-        config: &ConsensusConfig,
-        tls_config: Option<ClientTlsConfig>,
-    ) -> anyhow::Result<()> {
-        let this_peer_id = state_ref.this_peer_id();
-        let all_peers = Self::add_peer_to_known_for(
-            this_peer_id,
-            bootstrap_peer,
-            uri.clone(),
-            p2p_port,
-            config,
-            tls_config,
-        )
-        .await?;
-
-        // Although peer addresses are synchronized with consensus, addresses need to be pre-fetched in the case of a new peer
-        // or it will not know how to answer the Raft leader
-        for peer in all_peers.all_peers {
-            state_ref
-                .add_peer(
-                    peer.id,
-                    peer.uri
-                        .parse()
-                        .context(format!("Failed to parse peer URI: {}", peer.uri))?,
-                )
-                .map_err(|err| anyhow!("Failed to add peer: {}", err))?
-        }
-        // Only first peer has itself as a voter in the initial conf state.
-        // This needs to be propagated manually to other peers as it is not contained in any log entry.
-        // So we skip the learner phase for the first peer.
-        state_ref.set_first_voter(all_peers.first_peer_id);
-        state_ref.set_conf_state(ConfState::from((vec![all_peers.first_peer_id], vec![])))?;
-        Ok(())
-    }
-
-    pub fn start(&mut self) -> anyhow::Result<()> {
-        let mut t = Instant::now();
-        let mut timeout = Duration::from_millis(self.config.tick_period_ms);
-
-        loop {
-            if !self
-                .try_promote_learner()
-                .map_err(|err| anyhow!("Failed to promote learner: {}", err))?
-            {
-                // If learner promotion was proposed - do not add other proposals.
-                let have_changes = self.propose_updates(timeout)?;
-                if !have_changes {
-                    self.try_sync_local_state()?;
-                }
-            }
-            let d = t.elapsed();
-            t = Instant::now();
-            if d >= timeout {
-                timeout = Duration::from_millis(self.config.tick_period_ms);
-                // We drive Raft every `tick_period_ms`.
-                self.node.tick();
-                // Try to reapply entries if some were not applied due to errors.
-                let store = self.node.store().clone();
-                let stop_consensus = store.apply_entries(&mut self.node)?;
-                if stop_consensus {
-                    return Ok(());
-                }
-            } else {
-                timeout -= d;
-            }
-            let stop_consensus = self.on_ready()?;
-            if stop_consensus {
-                return Ok(());
-            }
-        }
-    }
-
-    fn try_sync_local_state(&mut self) -> anyhow::Result<()> {
-        if !self.node.has_ready() {
-            // No updates to process
-            let store = self.node.store();
-            if store.is_leader_established.check_ready() {
-                // If leader is established and there is nothing else to do on this iteration,
-                // then we can check if there are any un-synchronized local state left.
-                store.sync_local_state()?;
-            }
-        }
-        Ok(())
-    }
-
-    /// Listens for the next proposal and sends it to the Raft node.
-    /// Returns `true` if something happened and `false` if timeout was reached.
-    fn propose_updates(&mut self, timeout: Duration) -> anyhow::Result<bool> {
-        // Poll the async. channel on the consensus runtime.
-        // https://docs.rs/tokio/1.22.0/tokio/sync/mpsc/index.html#communicating-between-sync-and-async-code
-        let received = self.runtime.block_on(async {
-            // Wait for the next proposal during `timeout`.
-            tokio::time::timeout(timeout, self.receiver.recv()).await
-        });
-        match received {
-            Ok(Some(Message::FromPeer(message))) => {
-                if message.get_msg_type() == MessageType::MsgHeartbeat
-                    || message.get_msg_type() == MessageType::MsgHeartbeatResponse
-                {
-                    // Do not log heartbeat messages
-                } else {
-                    log::trace!(
-                        "Received a message from peer with progress: {:?}. Message: {:?}",
-                        self.node.raft.prs().get(message.from),
-                        message
-                    );
-                }
-                if let Err(error) = self.node.step(*message) {
-                    log::warn!("Failed to step message: {:?}", error);
-                }
-                Ok(true)
-            }
-            Ok(Some(Message::FromClient(operation))) => {
-                let result = match operation {
-                    ConsensusOperations::RemovePeer(peer_id) => {
-                        let mut change = ConfChangeV2::default();
-                        change.set_changes(vec![raft_proto::new_conf_change_single(
-                            peer_id,
-                            ConfChangeType::RemoveNode,
-                        )]);
-                        log::debug!("Proposing network configuration change: {:?}", change);
-                        self.node.propose_conf_change(vec![], change)
-                    }
-                    ConsensusOperations::AddPeer { peer_id, uri } => {
-                        let mut change = ConfChangeV2::default();
-                        change.set_changes(vec![raft_proto::new_conf_change_single(
-                            peer_id,
-                            ConfChangeType::AddLearnerNode,
-                        )]);
-                        log::debug!("Proposing network configuration change: {:?}", change);
-                        self.node.propose_conf_change(uri.into_bytes(), change)
-                    }
-                    ConsensusOperations::RequestSnapshot => self.node.request_snapshot(),
-                    ConsensusOperations::ReportSnapshot { peer_id, status } => {
-                        self.node.report_snapshot(peer_id, status.into());
-                        Ok(())
-                    }
-                    _ => {
-                        let message = match serde_cbor::to_vec(&operation) {
-                            Ok(message) => message,
-                            Err(err) => {
-                                log::error!("Failed to serialize operation: {}", err);
-                                return Ok(true);
-                            }
-                        };
-                        log::trace!("Proposing entry from client with length: {}", message.len());
-                        self.node.propose(vec![], message)
-                    }
-                };
-
-                match result {
-                    Ok(_) => {}
-                    Err(consensus_err) => {
-                        // Do not stop consensus if client proposal failed.
-                        log::error!("Failed to propose entry: {:?}", consensus_err);
-                    }
-                }
-                Ok(true)
-            }
-            Ok(None) => {
-                log::warn!("Stopping Raft as message sender was dropped");
-                Ok(true)
-            }
-            Err(_timeout_elapsed) => Ok(false), // recv. timeout
-        }
-    }
-
-    /// Returns `true` if learner promotion was proposed, `false` otherwise.
-    /// Learner node does not vote on elections, cause it might not have a big picture yet.
-    /// So consensus should guarantee that learners are promoted one-by-one.
-    /// Promotions are done by leader and only after it has no pending entries,
-    /// that guarantees that learner will start voting only after it applies all the changes in the log
-    fn try_promote_learner(&mut self) -> anyhow::Result<bool> {
-        let learner = if let Some(learner) = self.find_learner_to_promote() {
-            learner
-        } else {
-            return Ok(false);
-        };
-        let store = self.node.store();
-        let commit = store.hard_state().commit;
-        let last_log_entry = store.last_index()?;
-        // Promote only when there are no uncommitted changes.
-        if commit != last_log_entry {
-            return Ok(false);
-        }
-        let status = self.node.status();
-        // Promote only if leader
-        if status.ss.raft_state != StateRole::Leader {
-            return Ok(false);
-        }
-        let mut change = ConfChangeV2::default();
-        change.set_changes(vec![raft_proto::new_conf_change_single(
-            learner,
-            ConfChangeType::AddNode,
-        )]);
-        log::debug!("Proposing promotion for learner {learner} to voter");
-        self.node.propose_conf_change(vec![], change)?;
-        Ok(true)
-    }
-
-    fn find_learner_to_promote(&self) -> Option<u64> {
-        let commit = self.node.store().hard_state().commit;
-        let learners: HashSet<_> = self
-            .node
-            .store()
-            .conf_state()
-            .learners
-            .into_iter()
-            .collect();
-        let status = self.node.status();
-        status
-            .progress?
-            .iter()
-            .find(|(id, progress)| learners.contains(id) && progress.matched == commit)
-            .map(|(id, _)| *id)
-    }
-
-    /// Returns `true` if consensus should be stopped, `false` otherwise.
-    fn on_ready(&mut self) -> anyhow::Result<bool> {
-        if !self.node.has_ready() {
-            // No updates to process
-            return Ok(false);
-        }
-        self.store().record_consensus_working();
-        // Get the `Ready` with `RawNode::ready` interface.
-        let ready = self.node.ready();
-        let (light_rd, role_change) = self.process_ready(ready)?;
-        if let Some(light_ready) = light_rd {
-            let result = self.process_light_ready(light_ready)?;
-            if let Some(role_change) = role_change {
-                self.process_role_change(role_change);
-            }
-            Ok(result)
-        } else {
-            // No light ready, so we need to stop consensus.
-            Ok(true)
-        }
-    }
-
-    fn process_role_change(&self, role_change: StateRole) {
-        // Explicit match here for better readability
-        match role_change {
-            StateRole::Candidate | StateRole::PreCandidate => {
-                self.store().is_leader_established.make_not_ready()
-            }
-            StateRole::Leader | StateRole::Follower => {
-                if self.node.raft.leader_id != INVALID_ID {
-                    self.store().is_leader_established.make_ready()
-                } else {
-                    self.store().is_leader_established.make_not_ready()
-                }
-            }
-        }
-    }
-
-    /// Tries to process raft's ready state. Happens on each tick.
-    ///
-    /// The order of operations in this functions is critical, changing it might lead to bugs.
-    ///
-    /// Returns with err on failure to apply the state.
-    /// If it receives message to stop the consensus - returns None instead of LightReady.
-    fn process_ready(
-        &mut self,
-        mut ready: raft::Ready,
-    ) -> anyhow::Result<(Option<raft::LightReady>, Option<StateRole>)> {
-        let store = self.store();
-
-        if !ready.messages().is_empty() {
-            log::trace!("Handling {} messages", ready.messages().len());
-            self.send_messages(ready.take_messages());
-        }
-        if !ready.snapshot().is_empty() {
-            // This is a snapshot, we need to apply the snapshot at first.
-            log::debug!("Applying snapshot");
-
-            if let Err(err) = store.apply_snapshot(&ready.snapshot().clone())? {
-                log::error!("Failed to apply snapshot: {err}");
-            }
-        }
-        if !ready.entries().is_empty() {
-            // Append entries to the Raft log.
-            log::debug!("Appending {} entries to raft log", ready.entries().len());
-            store
-                .append_entries(ready.take_entries())
-                .map_err(|err| anyhow!("Failed to append entries: {}", err))?
-        }
-        if let Some(hs) = ready.hs() {
-            // Raft HardState changed, and we need to persist it.
-            log::debug!("Changing hard state. New hard state: {hs:?}");
-            store
-                .set_hard_state(hs.clone())
-                .map_err(|err| anyhow!("Failed to set hard state: {}", err))?
-        }
-        let role_change = ready.ss().map(|ss| ss.raft_state);
-        if let Some(ss) = ready.ss() {
-            log::debug!("Changing soft state. New soft state: {ss:?}");
-            self.handle_soft_state(ss);
-        }
-        if !ready.persisted_messages().is_empty() {
-            log::trace!(
-                "Handling {} persisted messages",
-                ready.persisted_messages().len()
-            );
-            self.send_messages(ready.take_persisted_messages());
-        }
-        // Should be done after Hard State is saved, so that `applied` index is never bigger than `commit`.
-        let stop_consensus =
-            handle_committed_entries(ready.take_committed_entries(), &store, &mut self.node)
-                .map_err(|err| anyhow!("Failed to handle committed entries: {}", err))?;
-        if stop_consensus {
-            return Ok((None, None));
-        }
-
-        // Advance the Raft.
-        let light_rd = self.node.advance(ready);
-        Ok((Some(light_rd), role_change))
-    }
-
-    /// Tries to process raft's light ready state.
-    ///
-    /// The order of operations in this functions is critical, changing it might lead to bugs.
-    ///
-    /// Returns with err on failure to apply the state.
-    /// If it receives message to stop the consensus - returns `true`, otherwise `false`.
-    fn process_light_ready(&mut self, mut light_rd: raft::LightReady) -> anyhow::Result<bool> {
-        let store = self.store();
-        // Update commit index.
-        if let Some(commit) = light_rd.commit_index() {
-            log::debug!("Updating commit index to {commit}");
-            store
-                .set_commit_index(commit)
-                .map_err(|err| anyhow!("Failed to set commit index: {}", err))?;
-        }
-        self.send_messages(light_rd.take_messages());
-        // Apply all committed entries.
-        let stop_consensus =
-            handle_committed_entries(light_rd.take_committed_entries(), &store, &mut self.node)
-                .map_err(|err| anyhow!("Failed to apply committed entries: {}", err))?;
-        // Advance the apply index.
-        self.node.advance_apply();
-        Ok(stop_consensus)
-    }
-
-    fn store(&self) -> ConsensusStateRef {
-        self.node.store().clone()
-    }
-
-    fn handle_soft_state(&self, state: &SoftState) {
-        let store = self.node.store();
-        store.set_raft_soft_state(state);
-    }
-
-    fn send_messages(&mut self, messages: Vec<RaftMessage>) {
-        self.broker.send(messages);
-    }
-}
-
-/// This function actually applies the committed entries to the state machine.
-/// Return `true` if consensus should be stopped.
-/// `false` otherwise.
-fn handle_committed_entries(
-    entries: Vec<Entry>,
-    state: &ConsensusStateRef,
-    raw_node: &mut RawNode<ConsensusStateRef>,
-) -> anyhow::Result<bool> {
-    let mut stop_consensus = false;
-    if let (Some(first), Some(last)) = (entries.first(), entries.last()) {
-        state.set_unapplied_entries(first.index, last.index)?;
-        stop_consensus = state.apply_entries(raw_node)?;
-    }
-    Ok(stop_consensus)
-}
-
-struct RaftMessageBroker {
-    senders: HashMap<PeerId, RaftMessageSenderHandle>,
-    runtime: Handle,
-    bootstrap_uri: Option<Uri>,
-    tls_config: Option<ClientTlsConfig>,
-    consensus_config: Arc<ConsensusConfig>,
-    consensus_state: ConsensusStateRef,
-    transport_channel_pool: Arc<TransportChannelPool>,
-}
-
-impl RaftMessageBroker {
-    pub fn new(
-        runtime: Handle,
-        bootstrap_uri: Option<Uri>,
-        tls_config: Option<ClientTlsConfig>,
-        consensus_config: ConsensusConfig,
-        consensus_state: ConsensusStateRef,
-        transport_channel_pool: Arc<TransportChannelPool>,
-    ) -> Self {
-        Self {
-            senders: HashMap::new(),
-            runtime,
-            bootstrap_uri,
-            tls_config,
-            consensus_config: consensus_config.into(),
-            consensus_state,
-            transport_channel_pool,
-        }
-    }
-
-    pub fn send(&mut self, messages: impl IntoIterator<Item = RaftMessage>) {
-        let mut messages = messages.into_iter();
-        let mut retry = None;
-
-        while let Some(message) = retry.take().or_else(|| messages.next()) {
-            let peer_id = message.to;
-
-            let sender = match self.senders.get_mut(&peer_id) {
-                Some(sender) => sender,
-                None => {
-                    log::debug!("Spawning message sender task for peer {peer_id}...");
-
-                    let (task, handle) = self.message_sender();
-                    let future = self.runtime.spawn(task.exec());
-                    drop(future); // drop `JoinFuture` explicitly to make clippy happy
-
-                    self.senders.insert(peer_id, handle);
-
-                    self.senders
-                        .get_mut(&peer_id)
-                        .expect("message sender task spawned")
-                }
-            };
-
-            let failed_to_forward = |message: &RaftMessage, description: &str| {
-                let peer_id = message.to;
-
-                let is_debug = log::max_level() >= log::Level::Debug;
-                let space = if is_debug { " " } else { "" };
-                let message: &dyn fmt::Debug = if is_debug { &message } else { &"" }; // TODO: `fmt::Debug` for `""` prints `""`... 😒
-
-                log::error!(
-                    "Failed to forward message{space}{message:?} to message sender task {peer_id}: \
-                     {description}"
-                );
-            };
-
-            match sender.send(message) {
-                Ok(()) => (),
-
-                Err(tokio::sync::mpsc::error::TrySendError::Full((_, message))) => {
-                    failed_to_forward(
-                        &message,
-                        "message sender task queue is full. Message will be dropped.",
-                    );
-                }
-
-                Err(tokio::sync::mpsc::error::TrySendError::Closed((_, message))) => {
-                    failed_to_forward(
-                        &message,
-                        "message sender task queue is closed. \
-                         Message sender task will be restarted and message will be retried.",
-                    );
-
-                    self.senders.remove(&peer_id);
-                    retry = Some(message);
-                }
-            }
-        }
-    }
-
-    fn message_sender(&self) -> (RaftMessageSender, RaftMessageSenderHandle) {
-        let (messages_tx, messages_rx) = tokio::sync::mpsc::channel(128);
-        let (heartbeat_tx, heartbeat_rx) = tokio::sync::watch::channel(Default::default());
-
-        let task = RaftMessageSender {
-            messages: messages_rx,
-            heartbeat: heartbeat_rx,
-            bootstrap_uri: self.bootstrap_uri.clone(),
-            tls_config: self.tls_config.clone(),
-            consensus_config: self.consensus_config.clone(),
-            consensus_state: self.consensus_state.clone(),
-            transport_channel_pool: self.transport_channel_pool.clone(),
-        };
-
-        let handle = RaftMessageSenderHandle {
-            messages: messages_tx,
-            heartbeat: heartbeat_tx,
-            index: 0,
-        };
-
-        (task, handle)
-    }
-}
-
-#[derive(Debug)]
-struct RaftMessageSenderHandle {
-    messages: Sender<(usize, RaftMessage)>,
-    heartbeat: watch::Sender<(usize, RaftMessage)>,
-    index: usize,
-}
-
-impl RaftMessageSenderHandle {
-    #[allow(clippy::result_large_err)]
-    pub fn send(&mut self, message: RaftMessage) -> RaftMessageSenderResult<()> {
-        if !is_heartbeat(&message) {
-            self.messages.try_send((self.index, message))?;
-        } else {
-            self.heartbeat.send((self.index, message)).map_err(
-                |tokio::sync::watch::error::SendError(message)| {
-                    tokio::sync::mpsc::error::TrySendError::Closed(message)
-                },
-            )?;
-        }
-
-        self.index += 1;
-
-        Ok(())
-    }
-}
-
-type RaftMessageSenderResult<T, E = RaftMessageSenderError> = Result<T, E>;
-type RaftMessageSenderError = tokio::sync::mpsc::error::TrySendError<(usize, RaftMessage)>;
-
-struct RaftMessageSender {
-    messages: Receiver<(usize, RaftMessage)>,
-    heartbeat: watch::Receiver<(usize, RaftMessage)>,
-    bootstrap_uri: Option<Uri>,
-    tls_config: Option<ClientTlsConfig>,
-    consensus_config: Arc<ConsensusConfig>,
-    consensus_state: ConsensusStateRef,
-    transport_channel_pool: Arc<TransportChannelPool>,
-}
-
-impl RaftMessageSender {
-    pub async fn exec(mut self) {
-        // Imagine that `raft` crate put four messages to be sent to some other Raft node into
-        // `RaftMessageSender`'s queue:
-        //
-        // | 4: AppendLog | 3: Heartbeat | 2: Heartbeat | 1: AppendLog |
-        //
-        // Heartbeat is the most basic message type in Raft. It only carries common "metadata"
-        // without any additional "payload". And all other message types in Raft also carry
-        // the same basic metadata as the heartbeat message.
-        //
-        // This way, message `3` instantly "outdates" message `2`: they both carry the same data
-        // fields, but message `3` was produced more recently, and so it might contain newer values
-        // of these data fields.
-        //
-        // And because all messages carry the same basic data as the heartbeat message, message `4`
-        // instantly "outdates" both message `2` and `3`.
-        //
-        // This way, if there are more than one message queued for the `RaftMessageSender`,
-        // we can optimize delivery a bit and skip any heartbeat message if there's a more
-        // recent message scheduled later in the queue.
-        //
-        // `RaftMessageSender` have two separate "queues":
-        // - `messages` queue for non-heartbeat messages
-        // - and `heartbeat` "watch" channel for heartbeat messages
-        //   - "watch" is a special channel in Tokio, that only retains the *last* sent value
-        //   - so any heartbeat received from the `heartbeat` channel is always the *most recent* one
-        //
-        // We are using `tokio::select` to "simultaneously" check both queues for new messages...
-        // but we are using `tokio::select` in a "biased" mode!
-        //
-        // - in this mode select always polls `messages.recv()` future first
-        // - so even if there are new messages in both queues, it will always return a non-heartbeat
-        //   message from `messages` queue first
-        // - and it will only return a heartbeat message from `heartbeat` channel if there's no
-        //   messages left in the `messages` queue
-        //
-        // There's one special case that we should be careful about with our two queues:
-        //
-        // If we return to the diagram above, and imagine four messages were sent in the same order
-        // into our two queues, then `RaftMessageSender` might pull them from the queues in the
-        // `1`, `4`, `3` order.
-        //
-        // E.g., we pull non-heartbeat messages `1` and `4` first, heartbeat `2` was overwritten
-        // by heartbeat `3` (because of the "watch" channel), so once `messages` queue is empty
-        // we receive heartbeat `3`, which is now out-of-order.
-        //
-        // To handle this we explicitly enumerate each message and only send a message if its index
-        // is higher-or-equal than the index of a previous one. (This check can be expressed with
-        // both strict "higher" or "higher-or-equal" conditional, I just like the "or-equal" version
-        // a bit better.)
-        //
-        // If either `messages` queue or `heartbeat` channel is closed (e.g., `messages.recv()`
-        // returns `None` or `heartbeat.changed()` returns an error), we assume that
-        // `RaftMessageSenderHandle` has been dropped, and treat it as a "shutdown"/"cancellation"
-        // signal (and break from the loop).
-
-        let mut prev_index = 0;
-
-        loop {
-            let (index, message) = tokio::select! {
-                biased;
-                Some(message) = self.messages.recv() => message,
-                Ok(()) = self.heartbeat.changed() => self.heartbeat.borrow_and_update().clone(),
-                else => break,
-            };
-
-            if prev_index <= index {
-                self.send(&message).await;
-                prev_index = index;
-            }
-        }
-    }
-
-    async fn send(&mut self, message: &RaftMessage) {
-        if let Err(err) = self.try_send(message).await {
-            let peer_id = message.to;
-
-            if log::max_level() >= log::Level::Debug {
-                log::error!("Failed to send Raft message {message:?} to peer {peer_id}: {err}");
-            } else {
-                log::error!("Failed to send Raft message to peer {peer_id}: {err}");
-            }
-        }
-    }
-
-    async fn try_send(&mut self, message: &RaftMessage) -> anyhow::Result<()> {
-        let peer_id = message.to;
-
-        let uri = self.uri(peer_id).await?;
-
-        let mut bytes = Vec::new();
-        RaftMessage::encode(message, &mut bytes).context("failed to encode Raft message")?;
-        let grpc_message = GrpcRaftMessage { message: bytes };
-
-        let timeout = Duration::from_millis(
-            self.consensus_config.message_timeout_ticks * self.consensus_config.tick_period_ms,
-        );
-
-        let res = self
-            .transport_channel_pool
-            .with_channel_timeout(
-                &uri,
-                |channel| async {
-                    let mut client = RaftClient::new(channel);
-                    let mut request = tonic::Request::new(grpc_message.clone());
-                    request.set_timeout(timeout);
-                    client.send(request).await
-                },
-                Some(timeout),
-                0,
-            )
-            .await;
-
-        if message.msg_type == raft::eraftpb::MessageType::MsgSnapshot as i32 {
-            let res = self.consensus_state.report_snapshot(
-                peer_id,
-                if res.is_ok() {
-                    SnapshotStatus::Finish
-                } else {
-                    SnapshotStatus::Failure
-                },
-            );
-
-            // Should we ignore the error? Seems like it will only produce noise.
-            //
-            // - `send_message` is only called by the sub-task spawned by the consnsus thread.
-            // - `report_snapshot` sends a message back to the consensus thread.
-            // - It can only fail, if the "receiver" end of the channel is closed.
-            // - Which means consensus thread either resolved successfully, or failed.
-            // - So, if the consensus thread is shutting down, no need to log a misleading error...
-            // - ...or, if the consensus thread failed, then we should already have an error,
-            //   and it will only produce more noise.
-
-            if let Err(err) = res {
-                log::error!("{}", err);
-            }
-        }
-
-        match res {
-            Ok(_) => self.consensus_state.record_message_send_success(&uri),
-            Err(err) => self.consensus_state.record_message_send_failure(&uri, err),
-        }
-
-        Ok(())
-    }
-
-    async fn uri(&mut self, peer_id: PeerId) -> anyhow::Result<Uri> {
-        let uri = self
-            .consensus_state
-            .peer_address_by_id()
-            .get(&peer_id)
-            .cloned();
-
-        match uri {
-            Some(uri) => Ok(uri),
-            None => self.who_is(peer_id).await,
-        }
-    }
-
-    async fn who_is(&mut self, peer_id: PeerId) -> anyhow::Result<Uri> {
-        let bootstrap_uri = self
-            .bootstrap_uri
-            .clone()
-            .ok_or_else(|| anyhow::format_err!("No bootstrap URI provided"))?;
-
-        let bootstrap_timeout = Duration::from_secs(self.consensus_config.bootstrap_timeout_sec);
-
-        // Use dedicated transport channel for who_is because of specific timeout
-        let channel = make_grpc_channel(
-            bootstrap_timeout,
-            bootstrap_timeout,
-            bootstrap_uri,
-            self.tls_config.clone(),
-        )
-        .await
-        .map_err(|err| anyhow::format_err!("Failed to create who-is channel: {}", err))?;
-
-        let uri = RaftClient::new(channel)
-            .who_is(tonic::Request::new(GrpcPeerId { id: peer_id }))
-            .await?
-            .into_inner()
-            .uri
-            .parse()?;
-
-        Ok(uri)
-    }
-}
-
-fn is_heartbeat(message: &RaftMessage) -> bool {
-    message.msg_type == raft::eraftpb::MessageType::MsgHeartbeat as i32
-        || message.msg_type == raft::eraftpb::MessageType::MsgHeartbeatResponse as i32
-}
-
-#[cfg(test)]
-mod tests {
-    use std::num::NonZeroU64;
-    use std::sync::Arc;
-    use std::thread;
-
-    use collection::operations::types::VectorParams;
-    use collection::shards::channel_service::ChannelService;
-    use segment::types::Distance;
-    use slog::Drain;
-    use storage::content_manager::collection_meta_ops::{
-        CollectionMetaOperations, CreateCollection, CreateCollectionOperation,
-    };
-    use storage::content_manager::consensus::operation_sender::OperationSender;
-    use storage::content_manager::consensus::persistent::Persistent;
-    use storage::content_manager::consensus_manager::{ConsensusManager, ConsensusStateRef};
-    use storage::content_manager::toc::TableOfContent;
-    use storage::dispatcher::Dispatcher;
-    use tempfile::Builder;
-
-    use super::Consensus;
-    use crate::common::helpers::create_general_purpose_runtime;
-    use crate::settings::ConsensusConfig;
-
-    #[test]
-    fn collection_creation_passes_consensus() {
-        // Given
-        let storage_dir = Builder::new().prefix("storage").tempdir().unwrap();
-        let mut settings = crate::Settings::new(None).expect("Can't read config.");
-        settings.storage.storage_path = storage_dir.path().to_str().unwrap().to_string();
-        std::env::set_var("RUST_LOG", log::Level::Debug.as_str());
-        env_logger::init();
-        let search_runtime =
-            crate::create_search_runtime(settings.storage.performance.max_search_threads)
-                .expect("Can't create search runtime.");
-        let update_runtime =
-            crate::create_update_runtime(settings.storage.performance.max_search_threads)
-                .expect("Can't create update runtime.");
-        let general_runtime =
-            create_general_purpose_runtime().expect("Can't create general purpose runtime.");
-        let handle = general_runtime.handle().clone();
-        let (propose_sender, propose_receiver) = std::sync::mpsc::channel();
-        let persistent_state =
-            Persistent::load_or_init(&settings.storage.storage_path, true).unwrap();
-        let operation_sender = OperationSender::new(propose_sender);
-        let toc = TableOfContent::new(
-            &settings.storage,
-            search_runtime,
-            update_runtime,
-            general_runtime,
-            ChannelService::default(),
-            persistent_state.this_peer_id(),
-            Some(operation_sender.clone()),
-        );
-        let toc_arc = Arc::new(toc);
-        let storage_path = toc_arc.storage_path();
-        let consensus_state: ConsensusStateRef = ConsensusManager::new(
-            persistent_state,
-            toc_arc.clone(),
-            operation_sender,
-            storage_path,
-        )
-        .into();
-        let dispatcher = Dispatcher::new(toc_arc.clone()).with_consensus(consensus_state.clone());
-        let slog_logger = slog::Logger::root(slog_stdlog::StdLog.fuse(), slog::o!());
-        let (mut consensus, message_sender) = Consensus::new(
-            &slog_logger,
-            consensus_state.clone(),
-            None,
-            Some("http://127.0.0.1:6335".parse().unwrap()),
-            6335,
-            ConsensusConfig::default(),
-            None,
-            ChannelService::default(),
-            handle.clone(),
-        )
-        .unwrap();
-
-        let is_leader_established = consensus_state.is_leader_established.clone();
-        thread::spawn(move || consensus.start().unwrap());
-        thread::spawn(move || {
-            while let Ok(entry) = propose_receiver.recv() {
-                if message_sender
-                    .blocking_send(super::Message::FromClient(entry))
-                    .is_err()
-                {
-                    log::error!("Can not forward new entry to consensus as it was stopped.");
-                    break;
-                }
-            }
-        });
-        // Wait for Raft to establish the leader
-        is_leader_established.await_ready();
-        // Leader election produces a raft log entry
-        assert_eq!(consensus_state.hard_state().commit, 1);
-        // Initially there are 0 collections
-        assert_eq!(toc_arc.all_collections_sync().len(), 0);
-
-        // When
-
-        // New runtime is used as timers need to be enabled.
-        handle
-            .block_on(
-                dispatcher.submit_collection_meta_op(
-                    CollectionMetaOperations::CreateCollection(CreateCollectionOperation::new(
-                        "test".to_string(),
-                        CreateCollection {
-                            vectors: VectorParams {
-                                size: NonZeroU64::new(10).unwrap(),
-                                distance: Distance::Cosine,
-                                hnsw_config: None,
-                                quantization_config: None,
-                                on_disk: None,
-                            }
-                            .into(),
-                            hnsw_config: None,
-                            wal_config: None,
-                            optimizers_config: None,
-                            shard_number: Some(2),
-                            on_disk_payload: None,
-                            replication_factor: None,
-                            write_consistency_factor: None,
-                            init_from: None,
-                            quantization_config: None,
-                        },
-                    )),
-                    None,
-                ),
-            )
-            .unwrap();
-
-        // Then
-        assert_eq!(consensus_state.hard_state().commit, 4); // Collection + 2 of shard activations
-        assert_eq!(toc_arc.all_collections_sync(), vec!["test"]);
-    }
-}
diff --git a/crates/qdrant/src/lib.rs b/crates/qdrant/src/lib.rs
deleted file mode 100644
index 4cbd7ed..0000000
--- a/crates/qdrant/src/lib.rs
+++ /dev/null
@@ -1,445 +0,0 @@
-#![allow(deprecated)]
-
-#[cfg(feature = "web")]
-mod actix;
-mod common;
-mod consensus;
-mod migrations;
-mod settings;
-mod snapshots;
-mod startup;
-mod tonic;
-mod tracing;
-
-use std::io::Error;
-use std::sync::Arc;
-use std::thread;
-use std::thread::JoinHandle;
-use std::time::Duration;
-
-use ::tonic::transport::Uri;
-use api::grpc::transport_channel_pool::TransportChannelPool;
-use clap::Parser;
-use collection::shards::channel_service::ChannelService;
-use consensus::Consensus;
-use slog::Drain;
-use startup::setup_panic_hook;
-use storage::content_manager::consensus::operation_sender::OperationSender;
-use storage::content_manager::consensus::persistent::Persistent;
-use storage::content_manager::consensus_manager::{ConsensusManager, ConsensusStateRef};
-use storage::content_manager::toc::TableOfContent;
-use storage::dispatcher::Dispatcher;
-#[cfg(not(target_env = "msvc"))]
-use tikv_jemallocator::Jemalloc;
-
-use crate::common::helpers::{
-    create_general_purpose_runtime, create_search_runtime, create_update_runtime,
-    load_tls_client_config,
-};
-use crate::common::telemetry::TelemetryCollector;
-use crate::common::telemetry_reporting::TelemetryReporter;
-use crate::migrations::single_to_cluster::handle_existing_collections;
-use crate::settings::Settings;
-use crate::snapshots::{recover_full_snapshot, recover_snapshots};
-use crate::startup::{remove_started_file_indicator, setup_logger, touch_started_file_indicator};
-
-#[cfg(not(target_env = "msvc"))]
-#[global_allocator]
-static GLOBAL: Jemalloc = Jemalloc;
-
-/// Qdrant (read: quadrant ) is a vector similarity search engine.
-/// It provides a production-ready service with a convenient API to store, search, and manage points - vectors with an additional payload.
-///
-/// This CLI starts a Qdrant peer/server.
-#[derive(Parser, Debug)]
-#[command(version, about)]
-struct Args {
-    /// Uri of the peer to bootstrap from in case of multi-peer deployment.
-    /// If not specified - this peer will be considered as a first in a new deployment.
-    #[arg(long, value_parser, value_name = "URI")]
-    bootstrap: Option<Uri>,
-    /// Uri of this peer.
-    /// Other peers should be able to reach it by this uri.
-    ///
-    /// This value has to be supplied if this is the first peer in a new deployment.
-    ///
-    /// In case this is not the first peer and it bootstraps the value is optional.
-    /// If not supplied then qdrant will take internal grpc port from config and derive the IP address of this peer on bootstrap peer (receiving side)
-    #[arg(long, value_parser, value_name = "URI")]
-    uri: Option<Uri>,
-
-    /// Force snapshot re-creation
-    /// If provided - existing collections will be replaced with snapshots.
-    /// Default is to not recreate from snapshots.
-    #[arg(short, long, action, default_value_t = false)]
-    force_snapshot: bool,
-
-    /// List of paths to snapshot files.
-    /// Format: <snapshot_file_path>:<target_collection_name>
-    ///
-    /// WARN: Do not use this option if you are recovering collection in existing distributed cluster.
-    /// Use `/collections/<collection-name>/snapshots/recover` API instead.
-    #[arg(long, value_name = "PATH:NAME", alias = "collection-snapshot")]
-    snapshot: Option<Vec<String>>,
-
-    /// Path to snapshot of multiple collections.
-    /// Format: <snapshot_file_path>
-    ///
-    /// WARN: Do not use this option if you are recovering collection in existing distributed cluster.
-    /// Use `/collections/<collection-name>/snapshots/recover` API instead.
-    #[arg(long, value_name = "PATH")]
-    storage_snapshot: Option<String>,
-
-    /// Path to an alternative configuration file.
-    /// Format: <config_file_path>
-    ///
-    /// Default path : config/config.yaml
-    #[arg(long, value_name = "PATH")]
-    config_path: Option<String>,
-
-    /// Disable telemetry sending to developers
-    /// If provided - telemetry collection will be disabled.
-    /// Read more: <https://qdrant.tech/documentation/guides/telemetry>
-    #[arg(long, action, default_value_t = false)]
-    disable_telemetry: bool,
-}
-
-pub fn start_qdrant() -> anyhow::Result<()> {
-    tracing::setup()?;
-
-    remove_started_file_indicator();
-
-    let args = Args::parse();
-    let settings = Settings::new(args.config_path)?;
-
-    let reporting_enabled = !settings.telemetry_disabled && !args.disable_telemetry;
-
-    let reporting_id = TelemetryCollector::generate_id();
-
-    setup_logger(&settings.log_level);
-    setup_panic_hook(reporting_enabled, reporting_id.to_string());
-
-    segment::madvise::set_global(settings.storage.mmap_advice);
-    segment::vector_storage::common::set_async_scorer(settings.storage.async_scorer);
-
-    if let Some(recovery_warning) = &settings.storage.recovery_mode {
-        log::warn!("Qdrant is loaded in recovery mode: {}", recovery_warning);
-        log::warn!(
-            "Read more: https://qdrant.tech/documentation/guides/administration/#recovery-mode"
-        );
-    }
-
-    // Validate as soon as possible, but we must initialize logging first
-    settings.validate_and_warn();
-
-    // Saved state of the consensus.
-    let persistent_consensus_state =
-        Persistent::load_or_init(&settings.storage.storage_path, args.bootstrap.is_none())?;
-
-    let is_distributed_deployment = settings.cluster.enabled;
-
-    let temp_path = settings.storage.temp_path.as_deref();
-
-    let restored_collections = if let Some(full_snapshot) = args.storage_snapshot {
-        recover_full_snapshot(
-            temp_path,
-            &full_snapshot,
-            &settings.storage.storage_path,
-            args.force_snapshot,
-            persistent_consensus_state.this_peer_id(),
-            is_distributed_deployment,
-        )
-    } else if let Some(snapshots) = args.snapshot {
-        // recover from snapshots
-        recover_snapshots(
-            &snapshots,
-            args.force_snapshot,
-            temp_path,
-            &settings.storage.storage_path,
-            persistent_consensus_state.this_peer_id(),
-            is_distributed_deployment,
-        )
-    } else {
-        vec![]
-    };
-
-    // Create and own search runtime out of the scope of async context to ensure correct
-    // destruction of it
-    let search_runtime = create_search_runtime(settings.storage.performance.max_search_threads)
-        .expect("Can't search create runtime.");
-
-    let update_runtime =
-        create_update_runtime(settings.storage.performance.max_optimization_threads)
-            .expect("Can't optimizer create runtime.");
-
-    let general_runtime =
-        create_general_purpose_runtime().expect("Can't optimizer general purpose runtime.");
-    let runtime_handle = general_runtime.handle().clone();
-
-    // Create a signal sender and receiver. It is used to communicate with the consensus thread.
-    let (propose_sender, propose_receiver) = std::sync::mpsc::channel();
-
-    let propose_operation_sender = if settings.cluster.enabled {
-        // High-level channel which could be used to send User-space consensus operations
-        Some(OperationSender::new(propose_sender))
-    } else {
-        // We don't need sender for the single-node mode
-        None
-    };
-
-    // Channel service is used to manage connections between peers.
-    // It allocates required number of channels and manages proper reconnection handling
-    let mut channel_service = ChannelService::default();
-
-    if settings.cluster.enabled {
-        // We only need channel_service in case if cluster is enabled.
-        // So we initialize it with real values here
-        let p2p_grpc_timeout = Duration::from_millis(settings.cluster.grpc_timeout_ms);
-        let connection_timeout = Duration::from_millis(settings.cluster.connection_timeout_ms);
-
-        let tls_config = load_tls_client_config(&settings)?;
-
-        channel_service.channel_pool = Arc::new(TransportChannelPool::new(
-            p2p_grpc_timeout,
-            connection_timeout,
-            settings.cluster.p2p.connection_pool_size,
-            tls_config,
-        ));
-        channel_service.id_to_address = persistent_consensus_state.peer_address_by_id.clone();
-    }
-
-    // Table of content manages the list of collections.
-    // It is a main entry point for the storage.
-    let toc = TableOfContent::new(
-        &settings.storage,
-        search_runtime,
-        update_runtime,
-        general_runtime,
-        channel_service.clone(),
-        persistent_consensus_state.this_peer_id(),
-        propose_operation_sender.clone(),
-    );
-
-    // Here we load all stored collections.
-    runtime_handle.block_on(async {
-        for collection in toc.all_collections().await {
-            log::debug!("Loaded collection: {}", collection);
-        }
-    });
-
-    let toc_arc = Arc::new(toc);
-    let storage_path = toc_arc.storage_path();
-
-    // Holder for all actively running threads of the service: web, gPRC, consensus, etc.
-    let mut handles: Vec<JoinHandle<Result<(), Error>>> = vec![];
-
-    // Router for external queries.
-    // It decides if query should go directly to the ToC or through the consensus.
-    let mut dispatcher = Dispatcher::new(toc_arc.clone());
-
-    let (telemetry_collector, dispatcher_arc) = if settings.cluster.enabled {
-        let consensus_state: ConsensusStateRef = ConsensusManager::new(
-            persistent_consensus_state,
-            toc_arc.clone(),
-            propose_operation_sender.unwrap(),
-            storage_path,
-        )
-        .into();
-        let is_new_deployment = consensus_state.is_new_deployment();
-
-        dispatcher = dispatcher.with_consensus(consensus_state.clone());
-
-        let dispatcher_arc = Arc::new(dispatcher);
-
-        // Monitoring and telemetry.
-        let telemetry_collector =
-            TelemetryCollector::new(settings.clone(), dispatcher_arc.clone(), reporting_id);
-        let tonic_telemetry_collector = telemetry_collector.tonic_telemetry_collector.clone();
-
-        // `raft` crate uses `slog` crate so it is needed to use `slog_stdlog::StdLog` to forward
-        // logs from it to `log` crate
-        let slog_logger = slog::Logger::root(slog_stdlog::StdLog.fuse(), slog::o!());
-
-        // Runs raft consensus in a separate thread.
-        // Create a pipe `message_sender` to communicate with the consensus
-        let handle = Consensus::run(
-            &slog_logger,
-            consensus_state.clone(),
-            args.bootstrap,
-            args.uri.map(|uri| uri.to_string()),
-            settings.clone(),
-            channel_service,
-            propose_receiver,
-            tonic_telemetry_collector,
-            toc_arc.clone(),
-            runtime_handle.clone(),
-        )
-        .expect("Can't initialize consensus");
-
-        handles.push(handle);
-
-        let toc_arc_clone = toc_arc.clone();
-        let consensus_state_clone = consensus_state.clone();
-        let _cancel_transfer_handle = runtime_handle.spawn(async move {
-            consensus_state_clone.is_leader_established.await_ready();
-            match toc_arc_clone
-                .cancel_outgoing_all_transfers("Source peer restarted")
-                .await
-            {
-                Ok(_) => {
-                    log::debug!("All transfers if any cancelled");
-                }
-                Err(err) => {
-                    log::error!("Can't cancel outgoing transfers: {}", err);
-                }
-            }
-        });
-
-        let collections_to_recover_in_consensus = if is_new_deployment {
-            let existing_collections = runtime_handle.block_on(toc_arc.all_collections());
-            existing_collections
-        } else {
-            restored_collections
-        };
-
-        if !collections_to_recover_in_consensus.is_empty() {
-            runtime_handle.spawn(handle_existing_collections(
-                toc_arc.clone(),
-                consensus_state.clone(),
-                dispatcher_arc.clone(),
-                consensus_state.this_peer_id(),
-                collections_to_recover_in_consensus,
-            ));
-        }
-
-        (telemetry_collector, dispatcher_arc)
-    } else {
-        log::info!("Distributed mode disabled");
-        let dispatcher_arc = Arc::new(dispatcher);
-
-        // Monitoring and telemetry.
-        let telemetry_collector =
-            TelemetryCollector::new(settings.clone(), dispatcher_arc.clone(), reporting_id);
-        (telemetry_collector, dispatcher_arc)
-    };
-
-    let tonic_telemetry_collector = telemetry_collector.tonic_telemetry_collector.clone();
-
-    //
-    // Telemetry reporting
-    //
-
-    let reporting_id = telemetry_collector.reporting_id();
-    let telemetry_collector = Arc::new(tokio::sync::Mutex::new(telemetry_collector));
-
-    if reporting_enabled {
-        log::info!("Telemetry reporting enabled, id: {}", reporting_id);
-
-        runtime_handle.spawn(TelemetryReporter::run(telemetry_collector.clone()));
-    } else {
-        log::info!("Telemetry reporting disabled");
-    }
-
-    // Helper to better log start errors
-    let log_err_if_any = |server_name, result| match result {
-        Err(err) => {
-            log::error!("Error while starting {} server: {}", server_name, err);
-            Err(err)
-        }
-        ok => ok,
-    };
-
-    //
-    // REST API server
-    //
-
-    #[cfg(feature = "web")]
-    {
-        let dispatcher_arc = dispatcher_arc.clone();
-        let settings = settings.clone();
-        let handle = thread::Builder::new()
-            .name("web".to_string())
-            .spawn(move || {
-                log_err_if_any(
-                    "REST",
-                    actix::init(dispatcher_arc.clone(), telemetry_collector, settings),
-                )
-            })
-            .unwrap();
-        handles.push(handle);
-    }
-
-    //
-    // gRPC server
-    //
-
-    if let Some(grpc_port) = settings.service.grpc_port {
-        let settings = settings.clone();
-        let handle = thread::Builder::new()
-            .name("grpc".to_string())
-            .spawn(move || {
-                log_err_if_any(
-                    "gRPC",
-                    tonic::init(
-                        dispatcher_arc,
-                        tonic_telemetry_collector,
-                        settings,
-                        grpc_port,
-                        runtime_handle,
-                    ),
-                )
-            })
-            .unwrap();
-        handles.push(handle);
-    } else {
-        log::info!("gRPC endpoint disabled");
-    }
-
-    #[cfg(feature = "service_debug")]
-    {
-        use std::fmt::Write;
-
-        use parking_lot::deadlock;
-
-        const DEADLOCK_CHECK_PERIOD: Duration = Duration::from_secs(10);
-
-        thread::Builder::new()
-            .name("deadlock_checker".to_string())
-            .spawn(move || loop {
-                thread::sleep(DEADLOCK_CHECK_PERIOD);
-                let deadlocks = deadlock::check_deadlock();
-                if deadlocks.is_empty() {
-                    continue;
-                }
-
-                let mut error = format!("{} deadlocks detected\n", deadlocks.len());
-                for (i, threads) in deadlocks.iter().enumerate() {
-                    writeln!(error, "Deadlock #{i}").expect("fail to writeln!");
-                    for t in threads {
-                        writeln!(
-                            error,
-                            "Thread Id {:#?}\n{:#?}",
-                            t.thread_id(),
-                            t.backtrace()
-                        )
-                        .expect("fail to writeln!");
-                    }
-                }
-                log::error!("{}", error);
-            })
-            .unwrap();
-    }
-
-    touch_started_file_indicator();
-
-    for handle in handles.into_iter() {
-        log::debug!(
-            "Waiting for thread {} to finish",
-            handle.thread().name().unwrap()
-        );
-        handle.join().expect("thread is not panicking")?;
-    }
-    drop(toc_arc);
-    drop(settings);
-    Ok(())
-}
diff --git a/crates/qdrant/src/migrations/mod.rs b/crates/qdrant/src/migrations/mod.rs
deleted file mode 100644
index 2c40529..0000000
--- a/crates/qdrant/src/migrations/mod.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub mod single_to_cluster;
diff --git a/crates/qdrant/src/migrations/single_to_cluster.rs b/crates/qdrant/src/migrations/single_to_cluster.rs
deleted file mode 100644
index a775b4e..0000000
--- a/crates/qdrant/src/migrations/single_to_cluster.rs
+++ /dev/null
@@ -1,92 +0,0 @@
-use std::sync::Arc;
-
-use collection::shards::replica_set::ReplicaState;
-use collection::shards::shard::PeerId;
-use storage::content_manager::collection_meta_ops::{
-    CollectionMetaOperations, CreateCollection, CreateCollectionOperation, SetShardReplicaState,
-};
-use storage::content_manager::consensus_manager::ConsensusStateRef;
-use storage::content_manager::shard_distribution::ShardDistributionProposal;
-use storage::content_manager::toc::TableOfContent;
-use storage::dispatcher::Dispatcher;
-
-/// Processes the existing collections, which were created outside the consensus:
-/// - during the migration from single to cluster
-/// - during restoring from a backup
-pub async fn handle_existing_collections(
-    toc_arc: Arc<TableOfContent>,
-    consensus_state: ConsensusStateRef,
-    dispatcher_arc: Arc<Dispatcher>,
-    this_peer_id: PeerId,
-    collections: Vec<String>,
-) {
-    consensus_state.is_leader_established.await_ready();
-    for collection in collections {
-        let collection_obj = match toc_arc.get_collection(&collection).await {
-            Ok(collection_obj) => collection_obj,
-            Err(_) => break,
-        };
-
-        let collection_state = collection_obj.state().await;
-        let shards_number = collection_state.config.params.shard_number.get();
-
-        let mut collection_create_operation = CreateCollectionOperation::new(
-            collection.to_string(),
-            CreateCollection {
-                vectors: collection_state.config.params.vectors,
-                shard_number: Some(shards_number),
-                replication_factor: Some(collection_state.config.params.replication_factor.get()),
-                write_consistency_factor: Some(
-                    collection_state
-                        .config
-                        .params
-                        .write_consistency_factor
-                        .get(),
-                ),
-                on_disk_payload: Some(collection_state.config.params.on_disk_payload),
-                hnsw_config: Some(collection_state.config.hnsw_config.into()),
-                wal_config: Some(collection_state.config.wal_config.into()),
-                optimizers_config: Some(collection_state.config.optimizer_config.into()),
-                init_from: None,
-                quantization_config: collection_state.config.quantization_config,
-            },
-        );
-
-        collection_create_operation.set_distribution(ShardDistributionProposal {
-            distribution: collection_state
-                .shards
-                .iter()
-                .filter_map(|(shard_id, shard_info)| {
-                    if shard_info.replicas.contains_key(&this_peer_id) {
-                        Some((*shard_id, vec![this_peer_id]))
-                    } else {
-                        None
-                    }
-                })
-                .collect(),
-        });
-
-        let _res = dispatcher_arc
-            .submit_collection_meta_op(
-                CollectionMetaOperations::CreateCollection(collection_create_operation),
-                None,
-            )
-            .await;
-        for (shard_id, shard_info) in collection_state.shards {
-            if shard_info.replicas.contains_key(&this_peer_id) {
-                let _res = dispatcher_arc
-                    .submit_collection_meta_op(
-                        CollectionMetaOperations::SetShardReplicaState(SetShardReplicaState {
-                            collection_name: collection.to_string(),
-                            shard_id,
-                            peer_id: this_peer_id,
-                            state: ReplicaState::Active,
-                            from_state: None,
-                        }),
-                        None,
-                    )
-                    .await;
-            }
-        }
-    }
-}
diff --git a/crates/qdrant/src/schema_generator.rs b/crates/qdrant/src/schema_generator.rs
deleted file mode 100644
index ceb984f..0000000
--- a/crates/qdrant/src/schema_generator.rs
+++ /dev/null
@@ -1,87 +0,0 @@
-use api::grpc::models::CollectionsResponse;
-use collection::operations::cluster_ops::ClusterOperations;
-use collection::operations::consistency_params::ReadConsistency;
-use collection::operations::payload_ops::{DeletePayload, SetPayload};
-use collection::operations::point_ops::{PointInsertOperations, PointsSelector, WriteOrdering};
-use collection::operations::snapshot_ops::{SnapshotDescription, SnapshotRecover};
-use collection::operations::types::{
-    AliasDescription, CollectionClusterInfo, CollectionInfo, CollectionsAliasesResponse,
-    CountRequest, CountResult, GroupsResult, PointGroup, PointRequest, RecommendGroupsRequest,
-    RecommendRequest, RecommendRequestBatch, Record, ScrollRequest, ScrollResult,
-    SearchGroupsRequest, SearchRequest, SearchRequestBatch, UpdateResult,
-};
-use collection::operations::vector_ops::{DeleteVectors, UpdateVectors};
-use schemars::gen::SchemaSettings;
-use schemars::JsonSchema;
-use segment::types::ScoredPoint;
-use serde::{Deserialize, Serialize};
-use storage::content_manager::collection_meta_ops::{
-    ChangeAliasesOperation, CreateCollection, UpdateCollection,
-};
-use storage::types::ClusterStatus;
-
-use crate::common::helpers::LocksOption;
-use crate::common::points::{CreateFieldIndex, UpdateOperations};
-use crate::common::telemetry::TelemetryData;
-
-mod actix;
-mod common;
-mod settings;
-
-#[derive(Deserialize, Serialize, JsonSchema)]
-struct AllDefinitions {
-    a1: CollectionsResponse,
-    a2: CollectionInfo,
-    // a3: CollectionMetaOperations,
-    a4: PointRequest,
-    a5: Record,
-    a6: SearchRequest,
-    a7: ScoredPoint,
-    a8: UpdateResult,
-    // a9: CollectionUpdateOperations,
-    aa: RecommendRequest,
-    ab: ScrollRequest,
-    ac: ScrollResult,
-    ad: CreateCollection,
-    ae: UpdateCollection,
-    af: ChangeAliasesOperation,
-    ag: CreateFieldIndex,
-    ah: PointsSelector,
-    ai: PointInsertOperations,
-    aj: SetPayload,
-    ak: DeletePayload,
-    al: ClusterStatus,
-    am: SnapshotDescription,
-    an: CountRequest,
-    ao: CountResult,
-    ap: CollectionClusterInfo,
-    aq: TelemetryData,
-    ar: ClusterOperations,
-    at: SearchRequestBatch,
-    au: RecommendRequestBatch,
-    av: LocksOption,
-    aw: SnapshotRecover,
-    ax: CollectionsAliasesResponse,
-    ay: AliasDescription,
-    az: WriteOrdering,
-    b1: ReadConsistency,
-    b2: UpdateVectors,
-    b3: DeleteVectors,
-    b4: PointGroup,
-    b5: SearchGroupsRequest,
-    b6: RecommendGroupsRequest,
-    b7: GroupsResult,
-    b8: UpdateOperations,
-}
-
-fn save_schema<T: JsonSchema>() {
-    let settings = SchemaSettings::draft07();
-    let gen = settings.into_generator();
-    let schema = gen.into_root_schema_for::<T>();
-    let schema_str = serde_json::to_string_pretty(&schema).unwrap();
-    println!("{schema_str}")
-}
-
-fn main() {
-    save_schema::<AllDefinitions>();
-}
diff --git a/crates/qdrant/src/settings.rs b/crates/qdrant/src/settings.rs
deleted file mode 100644
index 89271eb..0000000
--- a/crates/qdrant/src/settings.rs
+++ /dev/null
@@ -1,375 +0,0 @@
-use std::{env, io};
-
-use api::grpc::transport_channel_pool::{
-    DEFAULT_CONNECT_TIMEOUT, DEFAULT_GRPC_TIMEOUT, DEFAULT_POOL_SIZE,
-};
-use collection::operations::validation;
-use config::{Config, ConfigError, Environment, File, FileFormat, Source};
-use segment::common::cpu::get_num_cpus;
-use serde::Deserialize;
-use storage::types::StorageConfig;
-use validator::Validate;
-
-const DEFAULT_CONFIG: &str = include_str!("../config/config.yaml");
-
-#[derive(Debug, Deserialize, Validate, Clone)]
-pub struct ServiceConfig {
-    #[validate(length(min = 1))]
-    pub host: String,
-    pub http_port: u16,
-    pub grpc_port: Option<u16>, // None means that gRPC is disabled
-    pub max_request_size_mb: usize,
-    pub max_workers: Option<usize>,
-    #[serde(default = "default_cors")]
-    pub enable_cors: bool,
-    #[serde(default)]
-    pub enable_tls: bool,
-    #[serde(default)]
-    pub verify_https_client_certificate: bool,
-    pub api_key: Option<String>,
-    /// Directory where static files are served from.
-    /// For example, the Web-UI should be placed here.
-    #[serde(default)]
-    pub static_content_dir: Option<String>,
-
-    /// If serving of the static content is enabled.
-    /// This includes the Web-UI. True by default.
-    #[serde(default)]
-    pub enable_static_content: Option<bool>,
-}
-
-#[derive(Debug, Deserialize, Clone, Default, Validate)]
-pub struct ClusterConfig {
-    pub enabled: bool, // disabled by default
-    #[serde(default = "default_timeout_ms")]
-    #[validate(range(min = 1))]
-    pub grpc_timeout_ms: u64,
-    #[serde(default = "default_connection_timeout_ms")]
-    #[validate(range(min = 1))]
-    pub connection_timeout_ms: u64,
-    #[serde(default)]
-    #[validate]
-    pub p2p: P2pConfig,
-    #[serde(default)]
-    #[validate]
-    pub consensus: ConsensusConfig,
-}
-
-#[derive(Debug, Deserialize, Clone, Validate)]
-pub struct P2pConfig {
-    #[serde(default)]
-    pub port: Option<u16>,
-    #[serde(default = "default_connection_pool_size")]
-    #[validate(range(min = 1))]
-    pub connection_pool_size: usize,
-    #[serde(default)]
-    pub enable_tls: bool,
-}
-
-impl Default for P2pConfig {
-    fn default() -> Self {
-        P2pConfig {
-            port: None,
-            connection_pool_size: default_connection_pool_size(),
-            enable_tls: false,
-        }
-    }
-}
-
-#[derive(Debug, Deserialize, Clone, Validate)]
-pub struct ConsensusConfig {
-    #[serde(default = "default_max_message_queue_size")]
-    pub max_message_queue_size: usize, // controls the back-pressure at the Raft level
-    #[serde(default = "default_tick_period_ms")]
-    #[validate(range(min = 1))]
-    pub tick_period_ms: u64,
-    #[serde(default = "default_bootstrap_timeout_sec")]
-    #[validate(range(min = 1))]
-    pub bootstrap_timeout_sec: u64,
-    #[validate(range(min = 1))]
-    #[serde(default = "default_message_timeout_tics")]
-    pub message_timeout_ticks: u64,
-}
-
-impl Default for ConsensusConfig {
-    fn default() -> Self {
-        ConsensusConfig {
-            max_message_queue_size: default_max_message_queue_size(),
-            tick_period_ms: default_tick_period_ms(),
-            bootstrap_timeout_sec: default_bootstrap_timeout_sec(),
-            message_timeout_ticks: default_message_timeout_tics(),
-        }
-    }
-}
-
-#[derive(Debug, Deserialize, Clone, Validate)]
-pub struct TlsConfig {
-    pub cert: String,
-    pub key: String,
-    pub ca_cert: String,
-    #[serde(default = "default_tls_cert_ttl")]
-    #[validate(range(min = 1))]
-    pub cert_ttl: Option<u64>,
-}
-
-#[derive(Debug, Deserialize, Clone, Validate)]
-pub struct Settings {
-    #[serde(default = "default_debug")]
-    pub debug: bool,
-    #[serde(default = "default_log_level")]
-    pub log_level: String,
-    #[validate]
-    pub storage: StorageConfig,
-    #[validate]
-    pub service: ServiceConfig,
-    #[serde(default)]
-    #[validate]
-    pub cluster: ClusterConfig,
-    #[serde(default = "default_telemetry_disabled")]
-    pub telemetry_disabled: bool,
-    #[validate]
-    pub tls: Option<TlsConfig>,
-    /// A list of messages for errors that happened during loading the configuration. We collect
-    /// them and store them here while loading because then our logger is not configured yet.
-    /// We therefore need to log these messages later, after the logger is ready.
-    #[serde(default, skip)]
-    pub load_errors: Vec<LogMsg>,
-}
-
-#[derive(Clone, Debug)]
-pub enum LogMsg {
-    Warn(String),
-    Error(String),
-}
-
-impl LogMsg {
-    fn log(&self) {
-        match self {
-            Self::Warn(msg) => log::warn!("{msg}"),
-            Self::Error(msg) => log::error!("{msg}"),
-        }
-    }
-}
-
-impl Settings {
-    pub fn tls(&self) -> io::Result<&TlsConfig> {
-        self.tls
-            .as_ref()
-            .ok_or_else(Self::tls_config_is_undefined_error)
-    }
-
-    pub fn tls_config_is_undefined_error() -> io::Error {
-        io::Error::new(
-            io::ErrorKind::Other,
-            "TLS config is not defined in the Qdrant config file",
-        )
-    }
-
-    #[allow(dead_code)]
-    pub fn validate_and_warn(&self) {
-        // Print any load error messages we had
-        self.load_errors.iter().for_each(LogMsg::log);
-
-        if let Err(ref errs) = self.validate() {
-            validation::warn_validation_errors("Settings configuration file", errs);
-        }
-    }
-}
-
-const fn default_telemetry_disabled() -> bool {
-    false
-}
-
-const fn default_cors() -> bool {
-    true
-}
-
-const fn default_debug() -> bool {
-    false
-}
-
-fn default_log_level() -> String {
-    "INFO".to_string()
-}
-
-const fn default_timeout_ms() -> u64 {
-    DEFAULT_GRPC_TIMEOUT.as_millis() as u64
-}
-
-const fn default_connection_timeout_ms() -> u64 {
-    DEFAULT_CONNECT_TIMEOUT.as_millis() as u64
-}
-
-const fn default_tick_period_ms() -> u64 {
-    100
-}
-
-// Should not be less than `DEFAULT_META_OP_WAIT` as bootstrapping perform sync. consensus meta operations.
-const fn default_bootstrap_timeout_sec() -> u64 {
-    15
-}
-
-const fn default_max_message_queue_size() -> usize {
-    100
-}
-
-const fn default_connection_pool_size() -> usize {
-    DEFAULT_POOL_SIZE
-}
-
-const fn default_message_timeout_tics() -> u64 {
-    10
-}
-
-const fn default_tls_cert_ttl() -> Option<u64> {
-    // Default one hour
-    Some(3600)
-}
-
-impl Settings {
-    #[allow(dead_code)]
-    pub fn new(custom_config_path: Option<String>) -> Result<Self, ConfigError> {
-        let mut load_errors = vec![];
-        let config_exists = |path| File::with_name(path).collect().is_ok();
-
-        // Check if custom config file exists, report error if not
-        if let Some(ref path) = custom_config_path {
-            if !config_exists(path) {
-                load_errors.push(LogMsg::Error(format!(
-                    "Config file via --config-path is not found: {path}"
-                )));
-            }
-        }
-
-        let env = env::var("RUN_MODE").unwrap_or_else(|_| "development".into());
-        let config_path_env = format!("crates/qdrant/config/{env}");
-
-        // Report error if main or env config files exist, report warning if not
-        // Check if main and env configuration file
-        load_errors.extend(
-            ["crates/qdrant/config/config", &config_path_env]
-                .into_iter()
-                .filter(|path| !config_exists(path))
-                .map(|path| LogMsg::Warn(format!("Config file not found: {path}"))),
-        );
-
-        // Configuration builder: define different levels of configuration files
-        let mut config = Config::builder()
-            // Start with compile-time base config
-            .add_source(File::from_str(DEFAULT_CONFIG, FileFormat::Yaml))
-            // Merge main config: config/config
-            .add_source(File::with_name("config/config").required(false))
-            // Merge env config: config/{env}
-            // Uses RUN_MODE, defaults to 'development'
-            .add_source(File::with_name(&config_path_env).required(false))
-            // Merge local config, not tracked in git: config/local
-            .add_source(File::with_name("config/local").required(false));
-
-        // Merge user provided config with --config-path
-        if let Some(path) = custom_config_path {
-            config = config.add_source(File::with_name(&path).required(false));
-        }
-
-        // Merge environment settings
-        // E.g.: `QDRANT_DEBUG=1 ./target/app` would set `debug=true`
-        config = config.add_source(Environment::with_prefix("QDRANT").separator("__"));
-
-        // Build and merge config and deserialize into Settings, attach any load errors we had
-        let mut settings: Settings = config.build()?.try_deserialize()?;
-        settings.load_errors.extend(load_errors);
-        Ok(settings)
-    }
-}
-
-/// Returns the number of maximum actix workers.
-#[allow(dead_code)]
-pub fn max_web_workers(settings: &Settings) -> usize {
-    let max_workers = settings.service.max_workers;
-
-    if max_workers == Some(0) {
-        let num_cpu = get_num_cpus();
-        std::cmp::max(1, num_cpu - 1)
-    } else if max_workers.is_none() {
-        settings.storage.performance.max_search_threads
-    } else {
-        max_workers.unwrap()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::fs;
-    use std::io::Write;
-
-    use sealed_test::prelude::*;
-
-    use super::*;
-
-    /// Ensure we can successfully deserialize into [`Settings`] with just the default configuration.
-    #[test]
-    fn test_default_config() {
-        Config::builder()
-            .add_source(File::from_str(DEFAULT_CONFIG, FileFormat::Yaml))
-            .build()
-            .expect("failed to build default config")
-            .try_deserialize::<Settings>()
-            .expect("failed to deserialize default config")
-            .validate()
-            .expect("failed to validate default config");
-    }
-
-    #[sealed_test(files = ["config/config.yaml", "config/development.yaml"])]
-    fn test_runtime_development_config() {
-        env::set_var("RUN_MODE", "development");
-
-        // `sealed_test` copies files into the same directory as the test runs in.
-        // We need them in a subdirectory.
-        std::fs::create_dir("config").expect("failed to create `config` subdirectory.");
-        std::fs::copy("config.yaml", "config/config.yaml").expect("failed to copy `config.yaml`.");
-        std::fs::copy("development.yaml", "config/development.yaml")
-            .expect("failed to copy `development.yaml`.");
-
-        // Read config
-        let config = Settings::new(None).expect("failed to load development config at runtime");
-
-        // Validate
-        config
-            .validate()
-            .expect("failed to validate development config at runtime");
-        assert!(config.load_errors.is_empty(), "must not have load errors")
-    }
-
-    #[sealed_test]
-    fn test_no_config_files() {
-        let non_existing_config_path = "config/non_existing_config".to_string();
-
-        // Read config
-        let config = Settings::new(Some(non_existing_config_path))
-            .expect("failed to load with non-existing runtime config");
-
-        // Validate
-        config
-            .validate()
-            .expect("failed to validate with non-existing runtime config");
-        assert!(!config.load_errors.is_empty(), "must have load errors")
-    }
-
-    #[sealed_test]
-    fn test_custom_config() {
-        let path = "config/custom.yaml";
-
-        // Create custom config file
-        {
-            fs::create_dir("config").unwrap();
-            let mut custom = fs::File::create(path).unwrap();
-            write!(&mut custom, "service:\n    http_port: 9999").unwrap();
-            custom.flush().unwrap();
-        }
-
-        // Load settings with custom config
-        let config = Settings::new(Some(path.into())).unwrap();
-
-        // Ensure our custom config is the most important
-        assert_eq!(config.service.http_port, 9999);
-    }
-}
diff --git a/crates/qdrant/src/snapshots.rs b/crates/qdrant/src/snapshots.rs
deleted file mode 100644
index 645385d..0000000
--- a/crates/qdrant/src/snapshots.rs
+++ /dev/null
@@ -1,141 +0,0 @@
-use std::fs::{self, remove_dir_all, rename};
-use std::path::{Path, PathBuf};
-
-use collection::collection::Collection;
-use collection::shards::shard::PeerId;
-use log::info;
-use storage::content_manager::alias_mapping::AliasPersistence;
-use storage::content_manager::snapshots::SnapshotConfig;
-use storage::content_manager::toc::{ALIASES_PATH, COLLECTIONS_DIR};
-
-/// Recover snapshots from the given arguments
-///
-/// # Arguments
-///
-/// * `mapping` - `[ <path>:<collection_name> ]`
-/// * `force` - if true, allow to overwrite collections from snapshots
-///
-/// # Returns
-///
-/// * `Vec<String>` - list of collections that were recovered
-pub fn recover_snapshots(
-    mapping: &[String],
-    force: bool,
-    temp_dir: Option<&str>,
-    storage_dir: &str,
-    this_peer_id: PeerId,
-    is_distributed: bool,
-) -> Vec<String> {
-    let collection_dir_path = Path::new(storage_dir).join(COLLECTIONS_DIR);
-    let mut recovered_collections: Vec<String> = vec![];
-
-    for snapshot_params in mapping {
-        let mut split = snapshot_params.split(':');
-        let path = split
-            .next()
-            .unwrap_or_else(|| panic!("Snapshot path is missing: {snapshot_params}"));
-
-        let snapshot_path = Path::new(path);
-        let collection_name = split
-            .next()
-            .unwrap_or_else(|| panic!("Collection name is missing: {snapshot_params}"));
-        recovered_collections.push(collection_name.to_string());
-        assert!(
-            split.next().is_none(),
-            "Too many parts in snapshot mapping: {snapshot_params}"
-        );
-        info!("Recovering snapshot {} from {}", collection_name, path);
-        // check if collection already exists
-        // if it does, we need to check if we want to overwrite it
-        // if not, we need to abort
-        let collection_path = collection_dir_path.join(collection_name);
-        info!("Collection path: {}", collection_path.display());
-        if collection_path.exists() {
-            if !force {
-                panic!(
-                    "Collection {collection_name} already exists. Use --force-snapshot to overwrite it."
-                );
-            }
-            info!("Overwriting collection {}", collection_name);
-        }
-        let collection_temp_path = temp_dir
-            .map(PathBuf::from)
-            .unwrap_or_else(|| collection_path.with_extension("tmp"));
-        if let Err(err) = Collection::restore_snapshot(
-            snapshot_path,
-            &collection_temp_path,
-            this_peer_id,
-            is_distributed,
-        ) {
-            panic!("Failed to recover snapshot {collection_name}: {err}");
-        }
-        // Remove collection_path directory if exists
-        if collection_path.exists() {
-            if let Err(err) = remove_dir_all(&collection_path) {
-                panic!("Failed to remove collection {collection_name}: {err}");
-            }
-        }
-        rename(&collection_temp_path, &collection_path).unwrap();
-    }
-    recovered_collections
-}
-
-pub fn recover_full_snapshot(
-    temp_dir: Option<&str>,
-    snapshot_path: &str,
-    storage_dir: &str,
-    force: bool,
-    this_peer_id: PeerId,
-    is_distributed: bool,
-) -> Vec<String> {
-    let snapshot_temp_path = temp_dir
-        .map(PathBuf::from)
-        .unwrap_or_else(|| Path::new(storage_dir).join("snapshots_recovery_tmp"));
-    fs::create_dir_all(&snapshot_temp_path).unwrap();
-
-    // Un-tar snapshot into temporary directory
-    let archive_file = fs::File::open(snapshot_path).unwrap();
-    let mut ar = tar::Archive::new(archive_file);
-    ar.unpack(&snapshot_temp_path).unwrap();
-
-    // Read configuration file with snapshot-to-collection mapping
-    let config_path = snapshot_temp_path.join("config.json");
-    let config_file = fs::File::open(config_path).unwrap();
-    let config_json: SnapshotConfig = serde_json::from_reader(config_file).unwrap();
-
-    // Create mapping from the configuration file
-    let mapping: Vec<String> = config_json
-        .collections_mapping
-        .iter()
-        .map(|(collection_name, snapshot_file)| {
-            format!(
-                "{}:{collection_name}",
-                snapshot_temp_path.join(snapshot_file).to_str().unwrap(),
-            )
-        })
-        .collect();
-
-    // Launch regular recovery of snapshots
-    let recovered_collection = recover_snapshots(
-        &mapping,
-        force,
-        temp_dir,
-        storage_dir,
-        this_peer_id,
-        is_distributed,
-    );
-
-    let alias_path = Path::new(storage_dir).join(ALIASES_PATH);
-    let mut alias_persistence =
-        AliasPersistence::open(alias_path).expect("Can't open database by the provided config");
-    for (alias, collection_name) in config_json.collections_aliases {
-        if alias_persistence.get(&alias).is_some() && !force {
-            panic!("Alias {alias} already exists. Use --force-snapshot to overwrite it.");
-        }
-        alias_persistence.insert(alias, collection_name).unwrap();
-    }
-
-    // Remove temporary directory
-    remove_dir_all(&snapshot_temp_path).unwrap();
-    recovered_collection
-}
diff --git a/crates/qdrant/src/startup.rs b/crates/qdrant/src/startup.rs
deleted file mode 100644
index 32a9037..0000000
--- a/crates/qdrant/src/startup.rs
+++ /dev/null
@@ -1,85 +0,0 @@
-//! Contains a collection of functions that are called at the start of the program.
-
-use std::backtrace::Backtrace;
-use std::panic;
-use std::path::PathBuf;
-
-use log::LevelFilter;
-
-use crate::common::error_reporting::ErrorReporter;
-
-const DEFAULT_INITIALIZED_FILE: &str = ".qdrant-initialized";
-
-fn get_init_file_path() -> PathBuf {
-    std::env::var("QDRANT_INIT_FILE_PATH")
-        .map(PathBuf::from)
-        .unwrap_or_else(|_| DEFAULT_INITIALIZED_FILE.into())
-}
-
-pub fn setup_logger(log_level: &str) {
-    let is_info = log_level.to_ascii_uppercase() == "INFO";
-    let mut log_builder = env_logger::Builder::new();
-
-    log_builder
-        // Timestamp in millis
-        .format_timestamp_millis()
-        // Parse user defined log level configuration
-        .parse_filters(log_level)
-        // h2 is very verbose and we have many network operations,
-        // so it is limited to only errors
-        .filter_module("h2", LevelFilter::Error)
-        .filter_module("tower", LevelFilter::Warn);
-
-    if is_info {
-        // Additionally filter verbose modules if no extended logging configuration is provided
-        log_builder
-            .filter_module("wal", LevelFilter::Warn)
-            .filter_module("raft::raft", LevelFilter::Warn);
-    };
-
-    log_builder.init();
-}
-
-pub fn setup_panic_hook(reporting_enabled: bool, reporting_id: String) {
-    panic::set_hook(Box::new(move |panic_info| {
-        let backtrace = Backtrace::force_capture().to_string();
-        let loc = if let Some(loc) = panic_info.location() {
-            format!(" in file {} at line {}", loc.file(), loc.line())
-        } else {
-            String::new()
-        };
-        let message = if let Some(s) = panic_info.payload().downcast_ref::<&str>() {
-            s
-        } else if let Some(s) = panic_info.payload().downcast_ref::<String>() {
-            s
-        } else {
-            "Payload not captured as it is not a string."
-        };
-
-        log::error!("Panic backtrace: \n{}", backtrace);
-        log::error!("Panic occurred{loc}: {message}");
-
-        if reporting_enabled {
-            ErrorReporter::report(message, &reporting_id, Some(&loc));
-        }
-    }));
-}
-
-/// Creates a file that indicates that the server has been started.
-/// This file is used to check if the server has been been successfully started before potential kill.
-pub fn touch_started_file_indicator() {
-    if let Err(err) = std::fs::write(get_init_file_path(), "") {
-        log::warn!("Failed to create init file indicator: {}", err);
-    }
-}
-
-/// Removes a file that indicates that the server has been started.
-/// Use before server initialization to avoid false positives.
-pub fn remove_started_file_indicator() {
-    let path = get_init_file_path();
-    if path.exists() {
-        if let Err(err) = std::fs::remove_file(path) {
-            log::warn!("Failed to remove init file indicator: {}", err);
-        }
-    }
-}
diff --git a/crates/qdrant/src/tonic/api/collections_api.rs b/crates/qdrant/src/tonic/api/collections_api.rs
deleted file mode 100644
index 654ad8f..0000000
--- a/crates/qdrant/src/tonic/api/collections_api.rs
+++ /dev/null
@@ -1,233 +0,0 @@
-use std::sync::Arc;
-use std::time::{Duration, Instant};
-
-use api::grpc::qdrant::collections_server::Collections;
-use api::grpc::qdrant::{
-    AliasDescription, ChangeAliases, CollectionClusterInfoRequest, CollectionClusterInfoResponse,
-    CollectionOperationResponse, CreateCollection, DeleteCollection, GetCollectionInfoRequest,
-    GetCollectionInfoResponse, ListAliasesRequest, ListAliasesResponse,
-    ListCollectionAliasesRequest, ListCollectionsRequest, ListCollectionsResponse,
-    UpdateCollection, UpdateCollectionClusterSetupRequest, UpdateCollectionClusterSetupResponse,
-};
-use storage::content_manager::conversions::error_to_status;
-use storage::dispatcher::Dispatcher;
-use tonic::{Request, Response, Status};
-
-use super::validate;
-use crate::common::collections::*;
-use crate::tonic::api::collections_common::get;
-
-pub struct CollectionsService {
-    dispatcher: Arc<Dispatcher>,
-}
-
-impl CollectionsService {
-    pub fn new(dispatcher: Arc<Dispatcher>) -> Self {
-        Self { dispatcher }
-    }
-
-    async fn perform_operation<O>(
-        &self,
-        request: Request<O>,
-    ) -> Result<Response<CollectionOperationResponse>, Status>
-    where
-        O: WithTimeout
-            + TryInto<
-                storage::content_manager::collection_meta_ops::CollectionMetaOperations,
-                Error = Status,
-            >,
-    {
-        let timing = Instant::now();
-        let operation = request.into_inner();
-        let wait_timeout = operation.wait_timeout();
-        let result = self
-            .dispatcher
-            .submit_collection_meta_op(operation.try_into()?, wait_timeout)
-            .await
-            .map_err(error_to_status)?;
-
-        let response = CollectionOperationResponse::from((timing, result));
-        Ok(Response::new(response))
-    }
-
-    async fn list_aliases(
-        &self,
-        _request: Request<ListAliasesRequest>,
-    ) -> Result<Response<ListAliasesResponse>, Status> {
-        let timing = Instant::now();
-        let aliases = self
-            .dispatcher
-            .toc()
-            .list_aliases()
-            .await
-            .map(|aliases| aliases.into_iter().map(|alias| alias.into()).collect())
-            .map_err(error_to_status)?;
-        let response = ListAliasesResponse {
-            aliases,
-            time: timing.elapsed().as_secs_f64(),
-        };
-        Ok(Response::new(response))
-    }
-
-    async fn list_collection_aliases(
-        &self,
-        request: Request<ListCollectionAliasesRequest>,
-    ) -> Result<Response<ListAliasesResponse>, Status> {
-        let timing = Instant::now();
-        let ListCollectionAliasesRequest { collection_name } = request.into_inner();
-        let aliases = self
-            .dispatcher
-            .toc()
-            .collection_aliases(&collection_name)
-            .await
-            .map(|aliases| {
-                aliases
-                    .into_iter()
-                    .map(|alias| AliasDescription {
-                        alias_name: alias,
-                        collection_name: collection_name.clone(),
-                    })
-                    .collect()
-            })
-            .map_err(error_to_status)?;
-        let response = ListAliasesResponse {
-            aliases,
-            time: timing.elapsed().as_secs_f64(),
-        };
-        Ok(Response::new(response))
-    }
-}
-
-#[tonic::async_trait]
-impl Collections for CollectionsService {
-    async fn get(
-        &self,
-        request: Request<GetCollectionInfoRequest>,
-    ) -> Result<Response<GetCollectionInfoResponse>, Status> {
-        validate(request.get_ref())?;
-        get(self.dispatcher.as_ref(), request.into_inner(), None).await
-    }
-
-    async fn list(
-        &self,
-        request: Request<ListCollectionsRequest>,
-    ) -> Result<Response<ListCollectionsResponse>, Status> {
-        validate(request.get_ref())?;
-        let timing = Instant::now();
-        let result = do_list_collections(&self.dispatcher).await;
-
-        let response = ListCollectionsResponse::from((timing, result));
-        Ok(Response::new(response))
-    }
-
-    async fn create(
-        &self,
-        request: Request<CreateCollection>,
-    ) -> Result<Response<CollectionOperationResponse>, Status> {
-        validate(request.get_ref())?;
-        self.perform_operation(request).await
-    }
-
-    async fn update(
-        &self,
-        request: Request<UpdateCollection>,
-    ) -> Result<Response<CollectionOperationResponse>, Status> {
-        validate(request.get_ref())?;
-        self.perform_operation(request).await
-    }
-
-    async fn delete(
-        &self,
-        request: Request<DeleteCollection>,
-    ) -> Result<Response<CollectionOperationResponse>, Status> {
-        validate(request.get_ref())?;
-        self.perform_operation(request).await
-    }
-
-    async fn update_aliases(
-        &self,
-        request: Request<ChangeAliases>,
-    ) -> Result<Response<CollectionOperationResponse>, Status> {
-        validate(request.get_ref())?;
-        self.perform_operation(request).await
-    }
-
-    async fn list_collection_aliases(
-        &self,
-        request: Request<ListCollectionAliasesRequest>,
-    ) -> Result<Response<ListAliasesResponse>, Status> {
-        validate(request.get_ref())?;
-        self.list_collection_aliases(request).await
-    }
-
-    async fn list_aliases(
-        &self,
-        request: Request<ListAliasesRequest>,
-    ) -> Result<Response<ListAliasesResponse>, Status> {
-        validate(request.get_ref())?;
-        self.list_aliases(request).await
-    }
-
-    async fn collection_cluster_info(
-        &self,
-        request: Request<CollectionClusterInfoRequest>,
-    ) -> Result<Response<CollectionClusterInfoResponse>, Status> {
-        validate(request.get_ref())?;
-        let response = do_get_collection_cluster(
-            self.dispatcher.toc(),
-            request.into_inner().collection_name.as_str(),
-        )
-        .await
-        .map_err(error_to_status)?
-        .into();
-
-        Ok(Response::new(response))
-    }
-
-    async fn update_collection_cluster_setup(
-        &self,
-        request: Request<UpdateCollectionClusterSetupRequest>,
-    ) -> Result<Response<UpdateCollectionClusterSetupResponse>, Status> {
-        validate(request.get_ref())?;
-        let UpdateCollectionClusterSetupRequest {
-            collection_name,
-            operation,
-            timeout,
-            ..
-        } = request.into_inner();
-        let result = do_update_collection_cluster(
-            self.dispatcher.toc(),
-            collection_name,
-            operation
-                .ok_or(Status::new(tonic::Code::InvalidArgument, "empty operation"))?
-                .into(),
-            self.dispatcher.as_ref(),
-            timeout.map(std::time::Duration::from_secs),
-        )
-        .await
-        .map_err(error_to_status)?;
-        Ok(Response::new(UpdateCollectionClusterSetupResponse {
-            result,
-        }))
-    }
-}
-
-trait WithTimeout {
-    fn wait_timeout(&self) -> Option<Duration>;
-}
-
-macro_rules! impl_with_timeout {
-    ($operation:ty) => {
-        impl WithTimeout for $operation {
-            fn wait_timeout(&self) -> Option<Duration> {
-                self.timeout.map(Duration::from_secs)
-            }
-        }
-    };
-}
-
-impl_with_timeout!(CreateCollection);
-impl_with_timeout!(UpdateCollection);
-impl_with_timeout!(DeleteCollection);
-impl_with_timeout!(ChangeAliases);
-impl_with_timeout!(UpdateCollectionClusterSetupRequest);
diff --git a/crates/qdrant/src/tonic/api/collections_common.rs b/crates/qdrant/src/tonic/api/collections_common.rs
deleted file mode 100644
index 4ab689d..0000000
--- a/crates/qdrant/src/tonic/api/collections_common.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-use std::time::Instant;
-
-use api::grpc::qdrant::{GetCollectionInfoRequest, GetCollectionInfoResponse};
-use collection::shards::shard::ShardId;
-use storage::content_manager::conversions::error_to_status;
-use storage::content_manager::toc::TableOfContent;
-use tonic::{Response, Status};
-
-use crate::common::collections::do_get_collection;
-
-pub async fn get(
-    toc: &TableOfContent,
-    get_collection_info_request: GetCollectionInfoRequest,
-    shard_selection: Option<ShardId>,
-) -> Result<Response<GetCollectionInfoResponse>, Status> {
-    let timing = Instant::now();
-    let collection_name = get_collection_info_request.collection_name;
-    let result = do_get_collection(toc, &collection_name, shard_selection)
-        .await
-        .map_err(error_to_status)?;
-    let response = GetCollectionInfoResponse {
-        result: Some(result.into()),
-        time: timing.elapsed().as_secs_f64(),
-    };
-
-    Ok(Response::new(response))
-}
diff --git a/crates/qdrant/src/tonic/api/collections_internal_api.rs b/crates/qdrant/src/tonic/api/collections_internal_api.rs
deleted file mode 100644
index 0244a47..0000000
--- a/crates/qdrant/src/tonic/api/collections_internal_api.rs
+++ /dev/null
@@ -1,71 +0,0 @@
-use std::sync::Arc;
-use std::time::Instant;
-
-use api::grpc::qdrant::collections_internal_server::CollectionsInternal;
-use api::grpc::qdrant::{
-    CollectionOperationResponse, GetCollectionInfoRequestInternal, GetCollectionInfoResponse,
-    InitiateShardTransferRequest,
-};
-use storage::content_manager::conversions::error_to_status;
-use storage::content_manager::toc::TableOfContent;
-use tonic::{Request, Response, Status};
-
-use super::validate_and_log;
-use crate::tonic::api::collections_common::get;
-
-pub struct CollectionsInternalService {
-    toc: Arc<TableOfContent>,
-}
-
-impl CollectionsInternalService {
-    pub fn new(toc: Arc<TableOfContent>) -> Self {
-        Self { toc }
-    }
-}
-
-#[tonic::async_trait]
-impl CollectionsInternal for CollectionsInternalService {
-    async fn get(
-        &self,
-        request: Request<GetCollectionInfoRequestInternal>,
-    ) -> Result<Response<GetCollectionInfoResponse>, Status> {
-        validate_and_log(request.get_ref());
-        let GetCollectionInfoRequestInternal {
-            get_collection_info_request,
-            shard_id,
-        } = request.into_inner();
-
-        let get_collection_info_request = get_collection_info_request
-            .ok_or_else(|| Status::invalid_argument("GetCollectionInfoRequest is missing"))?;
-
-        get(
-            self.toc.as_ref(),
-            get_collection_info_request,
-            Some(shard_id),
-        )
-        .await
-    }
-
-    async fn initiate(
-        &self,
-        request: Request<InitiateShardTransferRequest>,
-    ) -> Result<Response<CollectionOperationResponse>, Status> {
-        validate_and_log(request.get_ref());
-        let timing = Instant::now();
-        let InitiateShardTransferRequest {
-            collection_name,
-            shard_id,
-        } = request.into_inner();
-
-        self.toc
-            .initiate_receiving_shard(collection_name, shard_id)
-            .await
-            .map_err(error_to_status)?;
-
-        let response = CollectionOperationResponse {
-            result: true,
-            time: timing.elapsed().as_secs_f64(),
-        };
-        Ok(Response::new(response))
-    }
-}
diff --git a/crates/qdrant/src/tonic/api/mod.rs b/crates/qdrant/src/tonic/api/mod.rs
deleted file mode 100644
index 6f72986..0000000
--- a/crates/qdrant/src/tonic/api/mod.rs
+++ /dev/null
@@ -1,64 +0,0 @@
-pub mod collections_api;
-mod collections_common;
-pub mod collections_internal_api;
-pub mod points_api;
-mod points_common;
-pub mod points_internal_api;
-pub mod raft_api;
-pub mod snapshots_api;
-
-use collection::operations::validation;
-use tonic::Status;
-use validator::Validate;
-
-/// Validate the given request and fail on error.
-///
-/// Returns validation error on failure.
-fn validate(request: &dyn Validate) -> Result<(), Status> {
-    request.validate().map_err(|ref err| {
-        Status::invalid_argument(validation::label_errors("Validation error in body", err))
-    })
-}
-
-/// Validate the given request. Returns validation error on failure.
-fn validate_and_log(request: &dyn Validate) {
-    if let Err(ref err) = request.validate() {
-        validation::warn_validation_errors("Internal gRPC", err);
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use validator::Validate;
-
-    use super::*;
-
-    #[derive(Validate, Debug)]
-    struct SomeThing {
-        #[validate(range(min = 1))]
-        pub idx: usize,
-    }
-
-    #[derive(Validate, Debug)]
-    struct OtherThing {
-        #[validate]
-        pub things: Vec<SomeThing>,
-    }
-
-    #[test]
-    fn test_validation() {
-        use tonic::Code;
-
-        let bad_config = OtherThing {
-            things: vec![SomeThing { idx: 0 }],
-        };
-
-        let validation =
-            validate(&bad_config).expect_err("validation of bad request payload should fail");
-        assert_eq!(validation.code(), Code::InvalidArgument);
-        assert_eq!(
-            validation.message(),
-            "Validation error in body: [things[0].idx: value 0 invalid, must be 1.0 or larger]"
-        )
-    }
-}
diff --git a/crates/qdrant/src/tonic/api/points_api.rs b/crates/qdrant/src/tonic/api/points_api.rs
deleted file mode 100644
index 70f658a..0000000
--- a/crates/qdrant/src/tonic/api/points_api.rs
+++ /dev/null
@@ -1,217 +0,0 @@
-use std::sync::Arc;
-
-use api::grpc::qdrant::points_server::Points;
-use api::grpc::qdrant::{
-    ClearPayloadPoints, CountPoints, CountResponse, CreateFieldIndexCollection,
-    DeleteFieldIndexCollection, DeletePayloadPoints, DeletePointVectors, DeletePoints, GetPoints,
-    GetResponse, PointsOperationResponse, RecommendBatchPoints, RecommendBatchResponse,
-    RecommendGroupsResponse, RecommendPointGroups, RecommendPoints, RecommendResponse,
-    ScrollPoints, ScrollResponse, SearchBatchPoints, SearchBatchResponse, SearchGroupsResponse,
-    SearchPointGroups, SearchPoints, SearchResponse, SetPayloadPoints, UpdateBatchPoints,
-    UpdateBatchResponse, UpdatePointVectors, UpsertPoints,
-};
-use storage::content_manager::toc::TableOfContent;
-use tonic::{Request, Response, Status};
-
-use super::points_common::{
-    delete_vectors, recommend_groups, search_groups, update_batch, update_vectors,
-};
-use super::validate;
-use crate::tonic::api::points_common::{
-    clear_payload, count, create_field_index, delete, delete_field_index, delete_payload, get,
-    overwrite_payload, recommend, recommend_batch, scroll, search, search_batch, set_payload,
-    upsert,
-};
-
-pub struct PointsService {
-    toc: Arc<TableOfContent>,
-}
-
-impl PointsService {
-    pub fn new(toc: Arc<TableOfContent>) -> Self {
-        Self { toc }
-    }
-}
-
-#[tonic::async_trait]
-impl Points for PointsService {
-    async fn upsert(
-        &self,
-        request: Request<UpsertPoints>,
-    ) -> Result<Response<PointsOperationResponse>, Status> {
-        validate(request.get_ref())?;
-        upsert(self.toc.as_ref(), request.into_inner(), None).await
-    }
-
-    async fn delete(
-        &self,
-        request: Request<DeletePoints>,
-    ) -> Result<Response<PointsOperationResponse>, Status> {
-        validate(request.get_ref())?;
-        delete(self.toc.as_ref(), request.into_inner(), None).await
-    }
-
-    async fn get(&self, request: Request<GetPoints>) -> Result<Response<GetResponse>, Status> {
-        validate(request.get_ref())?;
-        get(self.toc.as_ref(), request.into_inner(), None).await
-    }
-
-    async fn update_vectors(
-        &self,
-        request: Request<UpdatePointVectors>,
-    ) -> Result<Response<PointsOperationResponse>, Status> {
-        validate(request.get_ref())?;
-        update_vectors(self.toc.as_ref(), request.into_inner(), None).await
-    }
-
-    async fn delete_vectors(
-        &self,
-        request: Request<DeletePointVectors>,
-    ) -> Result<Response<PointsOperationResponse>, Status> {
-        validate(request.get_ref())?;
-        delete_vectors(self.toc.as_ref(), request.into_inner(), None).await
-    }
-
-    async fn set_payload(
-        &self,
-        request: Request<SetPayloadPoints>,
-    ) -> Result<Response<PointsOperationResponse>, Status> {
-        validate(request.get_ref())?;
-        set_payload(self.toc.as_ref(), request.into_inner(), None).await
-    }
-
-    async fn overwrite_payload(
-        &self,
-        request: Request<SetPayloadPoints>,
-    ) -> Result<Response<PointsOperationResponse>, Status> {
-        validate(request.get_ref())?;
-        overwrite_payload(self.toc.as_ref(), request.into_inner(), None).await
-    }
-
-    async fn delete_payload(
-        &self,
-        request: Request<DeletePayloadPoints>,
-    ) -> Result<Response<PointsOperationResponse>, Status> {
-        validate(request.get_ref())?;
-        delete_payload(self.toc.as_ref(), request.into_inner(), None).await
-    }
-
-    async fn clear_payload(
-        &self,
-        request: Request<ClearPayloadPoints>,
-    ) -> Result<Response<PointsOperationResponse>, Status> {
-        validate(request.get_ref())?;
-        clear_payload(self.toc.as_ref(), request.into_inner(), None).await
-    }
-
-    async fn update_batch(
-        &self,
-        request: Request<UpdateBatchPoints>,
-    ) -> Result<Response<UpdateBatchResponse>, Status> {
-        validate(request.get_ref())?;
-        update_batch(self.toc.as_ref(), request.into_inner(), None).await
-    }
-
-    async fn create_field_index(
-        &self,
-        request: Request<CreateFieldIndexCollection>,
-    ) -> Result<Response<PointsOperationResponse>, Status> {
-        validate(request.get_ref())?;
-        create_field_index(self.toc.as_ref(), request.into_inner(), None).await
-    }
-
-    async fn delete_field_index(
-        &self,
-        request: Request<DeleteFieldIndexCollection>,
-    ) -> Result<Response<PointsOperationResponse>, Status> {
-        validate(request.get_ref())?;
-        delete_field_index(self.toc.as_ref(), request.into_inner(), None).await
-    }
-
-    async fn search(
-        &self,
-        request: Request<SearchPoints>,
-    ) -> Result<Response<SearchResponse>, Status> {
-        validate(request.get_ref())?;
-        search(self.toc.as_ref(), request.into_inner(), None).await
-    }
-
-    async fn search_batch(
-        &self,
-        request: Request<SearchBatchPoints>,
-    ) -> Result<Response<SearchBatchResponse>, Status> {
-        validate(request.get_ref())?;
-        let SearchBatchPoints {
-            collection_name,
-            search_points,
-            read_consistency,
-        } = request.into_inner();
-        search_batch(
-            self.toc.as_ref(),
-            collection_name,
-            search_points,
-            read_consistency,
-            None,
-        )
-        .await
-    }
-
-    async fn search_groups(
-        &self,
-        request: Request<SearchPointGroups>,
-    ) -> Result<Response<SearchGroupsResponse>, Status> {
-        validate(request.get_ref())?;
-        search_groups(self.toc.as_ref(), request.into_inner(), None).await
-    }
-
-    async fn scroll(
-        &self,
-        request: Request<ScrollPoints>,
-    ) -> Result<Response<ScrollResponse>, Status> {
-        validate(request.get_ref())?;
-        scroll(self.toc.as_ref(), request.into_inner(), None).await
-    }
-
-    async fn recommend(
-        &self,
-        request: Request<RecommendPoints>,
-    ) -> Result<Response<RecommendResponse>, Status> {
-        validate(request.get_ref())?;
-        recommend(self.toc.as_ref(), request.into_inner()).await
-    }
-
-    async fn recommend_batch(
-        &self,
-        request: Request<RecommendBatchPoints>,
-    ) -> Result<Response<RecommendBatchResponse>, Status> {
-        validate(request.get_ref())?;
-        let RecommendBatchPoints {
-            collection_name,
-            recommend_points,
-            read_consistency,
-        } = request.into_inner();
-        recommend_batch(
-            self.toc.as_ref(),
-            collection_name,
-            recommend_points,
-            read_consistency,
-        )
-        .await
-    }
-
-    async fn recommend_groups(
-        &self,
-        request: Request<RecommendPointGroups>,
-    ) -> Result<Response<RecommendGroupsResponse>, Status> {
-        validate(request.get_ref())?;
-        recommend_groups(self.toc.as_ref(), request.into_inner()).await
-    }
-
-    async fn count(
-        &self,
-        request: Request<CountPoints>,
-    ) -> Result<Response<CountResponse>, Status> {
-        validate(request.get_ref())?;
-        count(self.toc.as_ref(), request.into_inner(), None).await
-    }
-}
diff --git a/crates/qdrant/src/tonic/api/points_common.rs b/crates/qdrant/src/tonic/api/points_common.rs
deleted file mode 100644
index 9ad6491..0000000
--- a/crates/qdrant/src/tonic/api/points_common.rs
+++ /dev/null
@@ -1,1050 +0,0 @@
-use std::time::Instant;
-
-use api::grpc::conversions::proto_to_payloads;
-use api::grpc::qdrant::payload_index_params::IndexParams;
-use api::grpc::qdrant::{
-    points_update_operation, BatchResult, ClearPayloadPoints, CountPoints, CountResponse,
-    CreateFieldIndexCollection, DeleteFieldIndexCollection, DeletePayloadPoints,
-    DeletePointVectors, DeletePoints, FieldType, GetPoints, GetResponse, PayloadIndexParams,
-    PointsOperationResponse, PointsSelector, ReadConsistency as ReadConsistencyGrpc,
-    RecommendBatchResponse, RecommendGroupsResponse, RecommendPointGroups, RecommendPoints,
-    RecommendResponse, ScrollPoints, ScrollResponse, SearchBatchResponse, SearchGroupsResponse,
-    SearchPointGroups, SearchPoints, SearchResponse, SetPayloadPoints, SyncPoints,
-    UpdateBatchPoints, UpdateBatchResponse, UpdatePointVectors, UpsertPoints,
-};
-use collection::operations::consistency_params::ReadConsistency;
-use collection::operations::conversions::write_ordering_from_proto;
-use collection::operations::payload_ops::DeletePayload;
-use collection::operations::point_ops::{
-    self, PointInsertOperations, PointOperations, PointSyncOperation,
-};
-use collection::operations::types::{
-    default_exact_count, PointRequest, RecommendRequestBatch, ScrollRequest, SearchRequest,
-    SearchRequestBatch,
-};
-use collection::operations::vector_ops::{DeleteVectors, PointVectors, UpdateVectors};
-use collection::operations::CollectionUpdateOperations;
-use collection::shards::shard::ShardId;
-use segment::data_types::vectors::NamedVector;
-use segment::types::{
-    ExtendedPointId, Filter, PayloadFieldSchema, PayloadSchemaParams, PayloadSchemaType,
-};
-use storage::content_manager::conversions::error_to_status;
-use storage::content_manager::toc::TableOfContent;
-use tonic::{Response, Status};
-
-use crate::common::points::{
-    do_clear_payload, do_count_points, do_create_index, do_delete_index, do_delete_payload,
-    do_delete_points, do_delete_vectors, do_get_points, do_overwrite_payload, do_scroll_points,
-    do_search_batch_points, do_search_points, do_set_payload, do_update_vectors, do_upsert_points,
-    CreateFieldIndex,
-};
-
-fn extract_points_selector(
-    points_selector: Option<PointsSelector>,
-) -> Result<(Option<Vec<ExtendedPointId>>, Option<Filter>), Status> {
-    let (points, filter) = if let Some(points_selector) = points_selector {
-        let points_selector = points_selector.try_into()?;
-        match points_selector {
-            point_ops::PointsSelector::PointIdsSelector(points) => (Some(points.points), None),
-            point_ops::PointsSelector::FilterSelector(filter) => (None, Some(filter.filter)),
-        }
-    } else {
-        return Err(Status::invalid_argument("points_selector is expected"));
-    };
-    Ok((points, filter))
-}
-
-pub fn points_operation_response(
-    timing: Instant,
-    update_result: collection::operations::types::UpdateResult,
-) -> PointsOperationResponse {
-    PointsOperationResponse {
-        result: Some(update_result.into()),
-        time: timing.elapsed().as_secs_f64(),
-    }
-}
-
-pub async fn upsert(
-    toc: &TableOfContent,
-    upsert_points: UpsertPoints,
-    shard_selection: Option<ShardId>,
-) -> Result<Response<PointsOperationResponse>, Status> {
-    let UpsertPoints {
-        collection_name,
-        wait,
-        points,
-        ordering,
-    } = upsert_points;
-    let points = points
-        .into_iter()
-        .map(|point| point.try_into())
-        .collect::<Result<_, _>>()?;
-    let operation = PointInsertOperations::PointsList(points);
-    let timing = Instant::now();
-    let result = do_upsert_points(
-        toc,
-        &collection_name,
-        operation,
-        shard_selection,
-        wait.unwrap_or(false),
-        write_ordering_from_proto(ordering)?,
-    )
-    .await
-    .map_err(error_to_status)?;
-
-    let response = points_operation_response(timing, result);
-    Ok(Response::new(response))
-}
-
-pub async fn sync(
-    toc: &TableOfContent,
-    sync_points: SyncPoints,
-    shard_selection: Option<ShardId>,
-) -> Result<Response<PointsOperationResponse>, Status> {
-    let SyncPoints {
-        collection_name,
-        wait,
-        points,
-        from_id,
-        to_id,
-        ordering,
-    } = sync_points;
-
-    let points = points
-        .into_iter()
-        .map(|point| point.try_into())
-        .collect::<Result<_, _>>()?;
-
-    let timing = Instant::now();
-
-    let operation = PointSyncOperation {
-        points,
-        from_id: from_id.map(|x| x.try_into()).transpose()?,
-        to_id: to_id.map(|x| x.try_into()).transpose()?,
-    };
-    let collection_operation =
-        CollectionUpdateOperations::PointOperation(PointOperations::SyncPoints(operation));
-    let result = toc
-        .update(
-            &collection_name,
-            collection_operation,
-            shard_selection,
-            wait.unwrap_or(false),
-            write_ordering_from_proto(ordering)?,
-        )
-        .await
-        .map_err(error_to_status)?;
-
-    let response = points_operation_response(timing, result);
-    Ok(Response::new(response))
-}
-
-pub async fn delete(
-    toc: &TableOfContent,
-    delete_points: DeletePoints,
-    shard_selection: Option<ShardId>,
-) -> Result<Response<PointsOperationResponse>, Status> {
-    let DeletePoints {
-        collection_name,
-        wait,
-        points,
-        ordering,
-    } = delete_points;
-
-    let points_selector = match points {
-        None => return Err(Status::invalid_argument("PointSelector is missing")),
-        Some(p) => p.try_into()?,
-    };
-
-    let timing = Instant::now();
-    let result = do_delete_points(
-        toc,
-        &collection_name,
-        points_selector,
-        shard_selection,
-        wait.unwrap_or(false),
-        write_ordering_from_proto(ordering)?,
-    )
-    .await
-    .map_err(error_to_status)?;
-
-    let response = points_operation_response(timing, result);
-    Ok(Response::new(response))
-}
-
-pub async fn update_vectors(
-    toc: &TableOfContent,
-    update_point_vectors: UpdatePointVectors,
-    shard_selection: Option<ShardId>,
-) -> Result<Response<PointsOperationResponse>, Status> {
-    let UpdatePointVectors {
-        collection_name,
-        wait,
-        points,
-        ordering,
-    } = update_point_vectors;
-
-    // Build list of operation points
-    let mut op_points = Vec::with_capacity(points.len());
-    for point in points {
-        let id = match point.id {
-            Some(id) => id.try_into()?,
-            None => return Err(Status::invalid_argument("id is expected")),
-        };
-        let vector = match point.vectors {
-            Some(vectors) => vectors.try_into()?,
-            None => return Err(Status::invalid_argument("vectors is expected")),
-        };
-        op_points.push(PointVectors { id, vector });
-    }
-
-    let operation = UpdateVectors { points: op_points };
-
-    let timing = Instant::now();
-    let result = do_update_vectors(
-        toc,
-        &collection_name,
-        operation,
-        shard_selection,
-        wait.unwrap_or(false),
-        write_ordering_from_proto(ordering)?,
-    )
-    .await
-    .map_err(error_to_status)?;
-
-    let response = points_operation_response(timing, result);
-    Ok(Response::new(response))
-}
-
-pub async fn delete_vectors(
-    toc: &TableOfContent,
-    delete_point_vectors: DeletePointVectors,
-    shard_selection: Option<ShardId>,
-) -> Result<Response<PointsOperationResponse>, Status> {
-    let DeletePointVectors {
-        collection_name,
-        wait,
-        points_selector,
-        vectors,
-        ordering,
-    } = delete_point_vectors;
-
-    let (points, filter) = extract_points_selector(points_selector)?;
-    let vector_names = match vectors {
-        Some(vectors) => vectors.names,
-        None => return Err(Status::invalid_argument("vectors is expected")),
-    };
-
-    let operation = DeleteVectors {
-        points,
-        filter,
-        vector: vector_names.into_iter().collect(),
-    };
-
-    let timing = Instant::now();
-    let result = do_delete_vectors(
-        toc,
-        &collection_name,
-        operation,
-        shard_selection,
-        wait.unwrap_or(false),
-        write_ordering_from_proto(ordering)?,
-    )
-    .await
-    .map_err(error_to_status)?;
-
-    let response = points_operation_response(timing, result);
-    Ok(Response::new(response))
-}
-
-pub async fn set_payload(
-    toc: &TableOfContent,
-    set_payload_points: SetPayloadPoints,
-    shard_selection: Option<ShardId>,
-) -> Result<Response<PointsOperationResponse>, Status> {
-    let SetPayloadPoints {
-        collection_name,
-        wait,
-        payload,
-        points_selector,
-        ordering,
-    } = set_payload_points;
-
-    let (points, filter) = extract_points_selector(points_selector)?;
-    let operation = collection::operations::payload_ops::SetPayload {
-        payload: proto_to_payloads(payload)?,
-        points,
-        filter,
-    };
-
-    let timing = Instant::now();
-    let result = do_set_payload(
-        toc,
-        &collection_name,
-        operation,
-        shard_selection,
-        wait.unwrap_or(false),
-        write_ordering_from_proto(ordering)?,
-    )
-    .await
-    .map_err(error_to_status)?;
-
-    let response = points_operation_response(timing, result);
-    Ok(Response::new(response))
-}
-
-pub async fn overwrite_payload(
-    toc: &TableOfContent,
-    set_payload_points: SetPayloadPoints,
-    shard_selection: Option<ShardId>,
-) -> Result<Response<PointsOperationResponse>, Status> {
-    let SetPayloadPoints {
-        collection_name,
-        wait,
-        payload,
-        points_selector,
-        ordering,
-    } = set_payload_points;
-
-    let (points, filter) = extract_points_selector(points_selector)?;
-    let operation = collection::operations::payload_ops::SetPayload {
-        payload: proto_to_payloads(payload)?,
-        points,
-        filter,
-    };
-
-    let timing = Instant::now();
-    let result = do_overwrite_payload(
-        toc,
-        &collection_name,
-        operation,
-        shard_selection,
-        wait.unwrap_or(false),
-        write_ordering_from_proto(ordering)?,
-    )
-    .await
-    .map_err(error_to_status)?;
-
-    let response = points_operation_response(timing, result);
-    Ok(Response::new(response))
-}
-
-pub async fn delete_payload(
-    toc: &TableOfContent,
-    delete_payload_points: DeletePayloadPoints,
-    shard_selection: Option<ShardId>,
-) -> Result<Response<PointsOperationResponse>, Status> {
-    let DeletePayloadPoints {
-        collection_name,
-        wait,
-        keys,
-        points_selector,
-        ordering,
-    } = delete_payload_points;
-
-    let (points, filter) = extract_points_selector(points_selector)?;
-    let operation = DeletePayload {
-        keys,
-        points,
-        filter,
-    };
-
-    let timing = Instant::now();
-    let result = do_delete_payload(
-        toc,
-        &collection_name,
-        operation,
-        shard_selection,
-        wait.unwrap_or(false),
-        write_ordering_from_proto(ordering)?,
-    )
-    .await
-    .map_err(error_to_status)?;
-
-    let response = points_operation_response(timing, result);
-    Ok(Response::new(response))
-}
-
-pub async fn clear_payload(
-    toc: &TableOfContent,
-    clear_payload_points: ClearPayloadPoints,
-    shard_selection: Option<ShardId>,
-) -> Result<Response<PointsOperationResponse>, Status> {
-    let ClearPayloadPoints {
-        collection_name,
-        wait,
-        points,
-        ordering,
-    } = clear_payload_points;
-
-    let points_selector = match points {
-        None => return Err(Status::invalid_argument("PointSelector is missing")),
-        Some(p) => p.try_into()?,
-    };
-
-    let timing = Instant::now();
-    let result = do_clear_payload(
-        toc,
-        &collection_name,
-        points_selector,
-        shard_selection,
-        wait.unwrap_or(false),
-        write_ordering_from_proto(ordering)?,
-    )
-    .await
-    .map_err(error_to_status)?;
-
-    let response = points_operation_response(timing, result);
-    Ok(Response::new(response))
-}
-
-pub async fn update_batch(
-    toc: &TableOfContent,
-    update_batch_points: UpdateBatchPoints,
-    shard_selection: Option<ShardId>,
-) -> Result<Response<UpdateBatchResponse>, Status> {
-    let UpdateBatchPoints {
-        collection_name,
-        wait,
-        operations,
-        ordering,
-    } = update_batch_points;
-
-    let timing = Instant::now();
-    let mut results = Vec::with_capacity(operations.len());
-    for op in operations {
-        let operation = op
-            .operation
-            .ok_or(Status::invalid_argument("Operation is missing"))?;
-        let collection_name = collection_name.clone();
-        let ordering = ordering.clone();
-        let result = match operation {
-            points_update_operation::Operation::Upsert(points) => {
-                upsert(
-                    toc,
-                    UpsertPoints {
-                        collection_name,
-                        points: points.points,
-                        wait,
-                        ordering,
-                    },
-                    shard_selection,
-                )
-                .await
-            }
-            points_update_operation::Operation::Delete(points) => {
-                delete(
-                    toc,
-                    DeletePoints {
-                        collection_name,
-                        wait,
-                        points: Some(points),
-                        ordering,
-                    },
-                    shard_selection,
-                )
-                .await
-            }
-            points_update_operation::Operation::SetPayload(
-                points_update_operation::SetPayload {
-                    payload,
-                    points_selector,
-                },
-            ) => {
-                set_payload(
-                    toc,
-                    SetPayloadPoints {
-                        collection_name,
-                        wait,
-                        payload,
-                        points_selector,
-                        ordering,
-                    },
-                    shard_selection,
-                )
-                .await
-            }
-            points_update_operation::Operation::OverwritePayload(
-                points_update_operation::SetPayload {
-                    payload,
-                    points_selector,
-                },
-            ) => {
-                overwrite_payload(
-                    toc,
-                    SetPayloadPoints {
-                        collection_name,
-                        wait,
-                        payload,
-                        points_selector,
-                        ordering,
-                    },
-                    shard_selection,
-                )
-                .await
-            }
-            points_update_operation::Operation::DeletePayload(
-                points_update_operation::DeletePayload {
-                    keys,
-                    points_selector,
-                },
-            ) => {
-                delete_payload(
-                    toc,
-                    DeletePayloadPoints {
-                        collection_name,
-                        wait,
-                        keys,
-                        points_selector,
-                        ordering,
-                    },
-                    shard_selection,
-                )
-                .await
-            }
-            points_update_operation::Operation::ClearPayload(points) => {
-                clear_payload(
-                    toc,
-                    ClearPayloadPoints {
-                        collection_name,
-                        wait,
-                        points: Some(points),
-                        ordering,
-                    },
-                    shard_selection,
-                )
-                .await
-            }
-            points_update_operation::Operation::UpdateVectors(
-                points_update_operation::UpdateVectors { points },
-            ) => {
-                update_vectors(
-                    toc,
-                    UpdatePointVectors {
-                        collection_name,
-                        wait,
-                        points,
-                        ordering,
-                    },
-                    shard_selection,
-                )
-                .await
-            }
-            points_update_operation::Operation::DeleteVectors(
-                points_update_operation::DeleteVectors {
-                    points_selector,
-                    vectors,
-                },
-            ) => {
-                delete_vectors(
-                    toc,
-                    DeletePointVectors {
-                        collection_name,
-                        wait,
-                        points_selector,
-                        vectors,
-                        ordering,
-                    },
-                    shard_selection,
-                )
-                .await
-            }
-        }?;
-        results.push(result);
-    }
-    Ok(Response::new(UpdateBatchResponse {
-        result: results
-            .into_iter()
-            .map(|response| response.into_inner().result.unwrap())
-            .collect(),
-        time: timing.elapsed().as_secs_f64(),
-    }))
-}
-
-pub async fn create_field_index(
-    toc: &TableOfContent,
-    create_field_index_collection: CreateFieldIndexCollection,
-    shard_selection: Option<ShardId>,
-) -> Result<Response<PointsOperationResponse>, Status> {
-    let CreateFieldIndexCollection {
-        collection_name,
-        wait,
-        field_name,
-        field_type,
-        field_index_params,
-        ordering,
-    } = create_field_index_collection;
-
-    let field_type_parsed = field_type
-        .map(FieldType::from_i32)
-        .ok_or_else(|| Status::invalid_argument("cannot convert field_type"))?;
-
-    let field_schema = match (field_type_parsed, field_index_params) {
-        (
-            Some(v),
-            Some(PayloadIndexParams {
-                index_params: Some(IndexParams::TextIndexParams(text_index_params)),
-            }),
-        ) => match v {
-            FieldType::Text => Some(PayloadFieldSchema::FieldParams(PayloadSchemaParams::Text(
-                text_index_params.try_into()?,
-            ))),
-            _ => {
-                return Err(Status::invalid_argument(
-                    "field_type and field_index_params do not match",
-                ))
-            }
-        },
-        (Some(v), None | Some(PayloadIndexParams { index_params: None })) => match v {
-            FieldType::Keyword => Some(PayloadSchemaType::Keyword.into()),
-            FieldType::Integer => Some(PayloadSchemaType::Integer.into()),
-            FieldType::Float => Some(PayloadSchemaType::Float.into()),
-            FieldType::Geo => Some(PayloadSchemaType::Geo.into()),
-            FieldType::Text => Some(PayloadSchemaType::Text.into()),
-            FieldType::Bool => Some(PayloadSchemaType::Bool.into()),
-        },
-        (None, Some(_)) => return Err(Status::invalid_argument("field type is missing")),
-        (None, None) => None,
-    };
-
-    let operation = CreateFieldIndex {
-        field_name,
-        field_schema,
-    };
-
-    let timing = Instant::now();
-    let result = do_create_index(
-        toc,
-        &collection_name,
-        operation,
-        shard_selection,
-        wait.unwrap_or(false),
-        write_ordering_from_proto(ordering)?,
-    )
-    .await
-    .map_err(error_to_status)?;
-
-    let response = points_operation_response(timing, result);
-    Ok(Response::new(response))
-}
-
-pub async fn delete_field_index(
-    toc: &TableOfContent,
-    delete_field_index_collection: DeleteFieldIndexCollection,
-    shard_selection: Option<ShardId>,
-) -> Result<Response<PointsOperationResponse>, Status> {
-    let DeleteFieldIndexCollection {
-        collection_name,
-        wait,
-        field_name,
-        ordering,
-    } = delete_field_index_collection;
-
-    let timing = Instant::now();
-    let result = do_delete_index(
-        toc,
-        &collection_name,
-        field_name,
-        shard_selection,
-        wait.unwrap_or(false),
-        write_ordering_from_proto(ordering)?,
-    )
-    .await
-    .map_err(error_to_status)?;
-
-    let response = points_operation_response(timing, result);
-    Ok(Response::new(response))
-}
-
-pub async fn search(
-    toc: &TableOfContent,
-    search_points: SearchPoints,
-    shard_selection: Option<ShardId>,
-) -> Result<Response<SearchResponse>, Status> {
-    let SearchPoints {
-        collection_name,
-        vector,
-        filter,
-        limit,
-        offset,
-        with_payload,
-        params,
-        score_threshold,
-        vector_name,
-        with_vectors,
-        read_consistency,
-    } = search_points;
-
-    let search_request = SearchRequest {
-        vector: match vector_name {
-            None => vector.into(),
-            Some(name) => NamedVector { name, vector }.into(),
-        },
-        filter: filter.map(|f| f.try_into()).transpose()?,
-        params: params.map(|p| p.into()),
-        limit: limit as usize,
-        offset: offset.unwrap_or_default() as usize,
-        with_payload: with_payload.map(|wp| wp.try_into()).transpose()?,
-        with_vector: Some(
-            with_vectors
-                .map(|selector| selector.into())
-                .unwrap_or_default(),
-        ),
-        score_threshold,
-    };
-
-    let read_consistency = ReadConsistency::try_from_optional(read_consistency)?;
-
-    let timing = Instant::now();
-    let scored_points = do_search_points(
-        toc,
-        &collection_name,
-        search_request,
-        read_consistency,
-        shard_selection,
-    )
-    .await
-    .map_err(error_to_status)?;
-
-    let response = SearchResponse {
-        result: scored_points
-            .into_iter()
-            .map(|point| point.into())
-            .collect(),
-        time: timing.elapsed().as_secs_f64(),
-    };
-
-    Ok(Response::new(response))
-}
-
-pub async fn search_batch(
-    toc: &TableOfContent,
-    collection_name: String,
-    search_points: Vec<SearchPoints>,
-    read_consistency: Option<ReadConsistencyGrpc>,
-    shard_selection: Option<ShardId>,
-) -> Result<Response<SearchBatchResponse>, Status> {
-    let searches: Result<Vec<_>, Status> = search_points
-        .into_iter()
-        .map(|search_point| search_point.try_into())
-        .collect();
-
-    let search_requests = SearchRequestBatch {
-        searches: searches?,
-    };
-
-    let read_consistency = ReadConsistency::try_from_optional(read_consistency)?;
-
-    let timing = Instant::now();
-    let scored_points = do_search_batch_points(
-        toc,
-        &collection_name,
-        search_requests,
-        read_consistency,
-        shard_selection,
-    )
-    .await
-    .map_err(error_to_status)?;
-
-    let response = SearchBatchResponse {
-        result: scored_points
-            .into_iter()
-            .map(|points| BatchResult {
-                result: points.into_iter().map(|p| p.into()).collect(),
-            })
-            .collect(),
-        time: timing.elapsed().as_secs_f64(),
-    };
-
-    Ok(Response::new(response))
-}
-
-pub async fn search_groups(
-    toc: &TableOfContent,
-    search_point_groups: SearchPointGroups,
-    shard_selection: Option<ShardId>,
-) -> Result<Response<SearchGroupsResponse>, Status> {
-    let search_groups_request = search_point_groups.clone().try_into()?;
-
-    let SearchPointGroups {
-        collection_name,
-        read_consistency,
-        ..
-    } = search_point_groups;
-
-    let read_consistency = ReadConsistency::try_from_optional(read_consistency)?;
-
-    let timing = Instant::now();
-    let groups_result = crate::common::points::do_search_point_groups(
-        toc,
-        &collection_name,
-        search_groups_request,
-        read_consistency,
-        shard_selection,
-    )
-    .await
-    .map_err(error_to_status)?;
-
-    let response = SearchGroupsResponse {
-        result: Some(groups_result.into()),
-        time: timing.elapsed().as_secs_f64(),
-    };
-
-    Ok(Response::new(response))
-}
-
-pub async fn recommend(
-    toc: &TableOfContent,
-    recommend_points: RecommendPoints,
-) -> Result<Response<RecommendResponse>, Status> {
-    let RecommendPoints {
-        collection_name,
-        positive,
-        negative,
-        filter,
-        limit,
-        offset,
-        with_payload,
-        params,
-        score_threshold,
-        using,
-        with_vectors,
-        lookup_from,
-        read_consistency,
-    } = recommend_points;
-
-    let request = collection::operations::types::RecommendRequest {
-        positive: positive
-            .into_iter()
-            .map(|p| p.try_into())
-            .collect::<Result<_, _>>()?,
-        negative: negative
-            .into_iter()
-            .map(|p| p.try_into())
-            .collect::<Result<_, _>>()?,
-        filter: filter.map(|f| f.try_into()).transpose()?,
-        params: params.map(|p| p.into()),
-        limit: limit as usize,
-        offset: offset.unwrap_or_default() as usize,
-        with_payload: with_payload.map(|wp| wp.try_into()).transpose()?,
-        with_vector: Some(
-            with_vectors
-                .map(|selector| selector.into())
-                .unwrap_or_default(),
-        ),
-        score_threshold,
-        using: using.map(|u| u.into()),
-        lookup_from: lookup_from.map(|l| l.into()),
-    };
-
-    let read_consistency = ReadConsistency::try_from_optional(read_consistency)?;
-
-    let timing = Instant::now();
-    let recommended_points = toc
-        .recommend(&collection_name, request, read_consistency)
-        .await
-        .map_err(error_to_status)?;
-
-    let response = RecommendResponse {
-        result: recommended_points
-            .into_iter()
-            .map(|point| point.into())
-            .collect(),
-        time: timing.elapsed().as_secs_f64(),
-    };
-
-    Ok(Response::new(response))
-}
-
-pub async fn recommend_batch(
-    toc: &TableOfContent,
-    collection_name: String,
-    recommend_points: Vec<RecommendPoints>,
-    read_consistency: Option<ReadConsistencyGrpc>,
-) -> Result<Response<RecommendBatchResponse>, Status> {
-    let searches: Result<Vec<_>, Status> = recommend_points
-        .into_iter()
-        .map(|recommend_point| recommend_point.try_into())
-        .collect();
-    let recommend_batch = RecommendRequestBatch {
-        searches: searches?,
-    };
-
-    let read_consistency = ReadConsistency::try_from_optional(read_consistency)?;
-
-    let timing = Instant::now();
-    let scored_points = toc
-        .recommend_batch(&collection_name, recommend_batch, read_consistency)
-        .await
-        .map_err(error_to_status)?;
-
-    let response = RecommendBatchResponse {
-        result: scored_points
-            .into_iter()
-            .map(|points| BatchResult {
-                result: points.into_iter().map(|p| p.into()).collect(),
-            })
-            .collect(),
-        time: timing.elapsed().as_secs_f64(),
-    };
-
-    Ok(Response::new(response))
-}
-
-pub async fn recommend_groups(
-    toc: &TableOfContent,
-    recommend_point_groups: RecommendPointGroups,
-) -> Result<Response<RecommendGroupsResponse>, Status> {
-    let recommend_groups_request = recommend_point_groups.clone().try_into()?;
-
-    let RecommendPointGroups {
-        collection_name,
-        read_consistency,
-        ..
-    } = recommend_point_groups;
-
-    let read_consistency = ReadConsistency::try_from_optional(read_consistency)?;
-
-    let timing = Instant::now();
-    let groups_result = crate::common::points::do_recommend_point_groups(
-        toc,
-        &collection_name,
-        recommend_groups_request,
-        read_consistency,
-    )
-    .await
-    .map_err(error_to_status)?;
-
-    let response = RecommendGroupsResponse {
-        result: Some(groups_result.into()),
-        time: timing.elapsed().as_secs_f64(),
-    };
-
-    Ok(Response::new(response))
-}
-pub async fn scroll(
-    toc: &TableOfContent,
-    scroll_points: ScrollPoints,
-    shard_selection: Option<ShardId>,
-) -> Result<Response<ScrollResponse>, Status> {
-    let ScrollPoints {
-        collection_name,
-        filter,
-        offset,
-        limit,
-        with_payload,
-        with_vectors,
-        read_consistency,
-    } = scroll_points;
-
-    let scroll_request = ScrollRequest {
-        offset: offset.map(|o| o.try_into()).transpose()?,
-        limit: limit.map(|l| l as usize),
-        filter: filter.map(|f| f.try_into()).transpose()?,
-        with_payload: with_payload.map(|wp| wp.try_into()).transpose()?,
-        with_vector: with_vectors
-            .map(|selector| selector.into())
-            .unwrap_or_default(),
-    };
-
-    let read_consistency = ReadConsistency::try_from_optional(read_consistency)?;
-
-    let timing = Instant::now();
-    let scrolled_points = do_scroll_points(
-        toc,
-        &collection_name,
-        scroll_request,
-        read_consistency,
-        shard_selection,
-    )
-    .await
-    .map_err(error_to_status)?;
-
-    let response = ScrollResponse {
-        next_page_offset: scrolled_points.next_page_offset.map(|n| n.into()),
-        result: scrolled_points
-            .points
-            .into_iter()
-            .map(|point| point.into())
-            .collect(),
-        time: timing.elapsed().as_secs_f64(),
-    };
-
-    Ok(Response::new(response))
-}
-
-pub async fn count(
-    toc: &TableOfContent,
-    count_points: CountPoints,
-    shard_selection: Option<ShardId>,
-) -> Result<Response<CountResponse>, Status> {
-    let CountPoints {
-        collection_name,
-        filter,
-        exact,
-    } = count_points;
-
-    let count_request = collection::operations::types::CountRequest {
-        filter: filter.map(|f| f.try_into()).transpose()?,
-        exact: exact.unwrap_or_else(default_exact_count),
-    };
-
-    let timing = Instant::now();
-    let count_result = do_count_points(toc, &collection_name, count_request, shard_selection)
-        .await
-        .map_err(error_to_status)?;
-
-    let response = CountResponse {
-        result: Some(count_result.into()),
-        time: timing.elapsed().as_secs_f64(),
-    };
-
-    Ok(Response::new(response))
-}
-
-pub async fn get(
-    toc: &TableOfContent,
-    get_points: GetPoints,
-    shard_selection: Option<ShardId>,
-) -> Result<Response<GetResponse>, Status> {
-    let GetPoints {
-        collection_name,
-        ids,
-        with_payload,
-        with_vectors,
-        read_consistency,
-    } = get_points;
-
-    let point_request = PointRequest {
-        ids: ids
-            .into_iter()
-            .map(|p| p.try_into())
-            .collect::<Result<_, _>>()?,
-        with_payload: with_payload.map(|wp| wp.try_into()).transpose()?,
-        with_vector: with_vectors
-            .map(|selector| selector.into())
-            .unwrap_or_default(),
-    };
-
-    let read_consistency = ReadConsistency::try_from_optional(read_consistency)?;
-
-    let timing = Instant::now();
-
-    let records = do_get_points(
-        toc,
-        &collection_name,
-        point_request,
-        read_consistency,
-        shard_selection,
-    )
-    .await
-    .map_err(error_to_status)?;
-
-    let response = GetResponse {
-        result: records.into_iter().map(|point| point.into()).collect(),
-        time: timing.elapsed().as_secs_f64(),
-    };
-
-    Ok(Response::new(response))
-}
diff --git a/crates/qdrant/src/tonic/api/points_internal_api.rs b/crates/qdrant/src/tonic/api/points_internal_api.rs
deleted file mode 100644
index 5e92634..0000000
--- a/crates/qdrant/src/tonic/api/points_internal_api.rs
+++ /dev/null
@@ -1,322 +0,0 @@
-use std::sync::Arc;
-
-use api::grpc::qdrant::points_internal_server::PointsInternal;
-use api::grpc::qdrant::{
-    ClearPayloadPointsInternal, CountPointsInternal, CountResponse,
-    CreateFieldIndexCollectionInternal, DeleteFieldIndexCollectionInternal,
-    DeletePayloadPointsInternal, DeletePointsInternal, DeleteVectorsInternal, GetPointsInternal,
-    GetResponse, PointsOperationResponse, RecommendPointsInternal, RecommendResponse,
-    ScrollPointsInternal, ScrollResponse, SearchBatchPointsInternal, SearchBatchResponse,
-    SearchPointsInternal, SearchResponse, SetPayloadPointsInternal, SyncPointsInternal,
-    UpdateVectorsInternal, UpsertPointsInternal,
-};
-use storage::content_manager::toc::TableOfContent;
-use tonic::{Request, Response, Status};
-
-use super::validate_and_log;
-use crate::tonic::api::points_common::{
-    clear_payload, count, create_field_index, delete, delete_field_index, delete_payload,
-    delete_vectors, get, overwrite_payload, recommend, scroll, search, search_batch, set_payload,
-    sync, update_vectors, upsert,
-};
-
-/// This API is intended for P2P communication within a distributed deployment.
-pub struct PointsInternalService {
-    toc: Arc<TableOfContent>,
-}
-
-impl PointsInternalService {
-    pub fn new(toc: Arc<TableOfContent>) -> Self {
-        Self { toc }
-    }
-}
-
-#[tonic::async_trait]
-impl PointsInternal for PointsInternalService {
-    async fn upsert(
-        &self,
-        request: Request<UpsertPointsInternal>,
-    ) -> Result<Response<PointsOperationResponse>, Status> {
-        validate_and_log(request.get_ref());
-        let UpsertPointsInternal {
-            upsert_points,
-            shard_id,
-        } = request.into_inner();
-
-        let upsert_points =
-            upsert_points.ok_or_else(|| Status::invalid_argument("UpsertPoints is missing"))?;
-
-        upsert(self.toc.as_ref(), upsert_points, shard_id).await
-    }
-
-    async fn delete(
-        &self,
-        request: Request<DeletePointsInternal>,
-    ) -> Result<Response<PointsOperationResponse>, Status> {
-        validate_and_log(request.get_ref());
-        let DeletePointsInternal {
-            delete_points,
-            shard_id,
-        } = request.into_inner();
-
-        let delete_points =
-            delete_points.ok_or_else(|| Status::invalid_argument("DeletePoints is missing"))?;
-
-        delete(self.toc.as_ref(), delete_points, shard_id).await
-    }
-
-    async fn update_vectors(
-        &self,
-        request: Request<UpdateVectorsInternal>,
-    ) -> Result<Response<PointsOperationResponse>, Status> {
-        validate_and_log(request.get_ref());
-        let request = request.into_inner();
-        let shard_id = request.shard_id;
-        let update_point_vectors = request.update_vectors;
-
-        let update_point_vectors = update_point_vectors
-            .ok_or_else(|| Status::invalid_argument("UpdateVectors is missing"))?;
-
-        update_vectors(self.toc.as_ref(), update_point_vectors, shard_id).await
-    }
-
-    async fn delete_vectors(
-        &self,
-        request: Request<DeleteVectorsInternal>,
-    ) -> Result<Response<PointsOperationResponse>, Status> {
-        validate_and_log(request.get_ref());
-        let request = request.into_inner();
-        let shard_id = request.shard_id;
-        let delete_point_vectors = request.delete_vectors;
-
-        let delete_point_vectors = delete_point_vectors
-            .ok_or_else(|| Status::invalid_argument("DeleteVectors is missing"))?;
-
-        delete_vectors(self.toc.as_ref(), delete_point_vectors, shard_id).await
-    }
-
-    async fn set_payload(
-        &self,
-        request: Request<SetPayloadPointsInternal>,
-    ) -> Result<Response<PointsOperationResponse>, Status> {
-        validate_and_log(request.get_ref());
-        let SetPayloadPointsInternal {
-            set_payload_points,
-            shard_id,
-        } = request.into_inner();
-
-        let set_payload_points = set_payload_points
-            .ok_or_else(|| Status::invalid_argument("SetPayloadPoints is missing"))?;
-
-        set_payload(self.toc.as_ref(), set_payload_points, shard_id).await
-    }
-
-    async fn delete_payload(
-        &self,
-        request: Request<DeletePayloadPointsInternal>,
-    ) -> Result<Response<PointsOperationResponse>, Status> {
-        validate_and_log(request.get_ref());
-        let DeletePayloadPointsInternal {
-            delete_payload_points,
-            shard_id,
-        } = request.into_inner();
-
-        let delete_payload_points = delete_payload_points
-            .ok_or_else(|| Status::invalid_argument("DeletePayloadPoints is missing"))?;
-
-        delete_payload(self.toc.as_ref(), delete_payload_points, shard_id).await
-    }
-
-    async fn clear_payload(
-        &self,
-        request: Request<ClearPayloadPointsInternal>,
-    ) -> Result<Response<PointsOperationResponse>, Status> {
-        validate_and_log(request.get_ref());
-        let ClearPayloadPointsInternal {
-            clear_payload_points,
-            shard_id,
-        } = request.into_inner();
-
-        let clear_payload_points = clear_payload_points
-            .ok_or_else(|| Status::invalid_argument("ClearPayloadPoints is missing"))?;
-
-        clear_payload(self.toc.as_ref(), clear_payload_points, shard_id).await
-    }
-
-    async fn create_field_index(
-        &self,
-        request: Request<CreateFieldIndexCollectionInternal>,
-    ) -> Result<Response<PointsOperationResponse>, Status> {
-        validate_and_log(request.get_ref());
-        let CreateFieldIndexCollectionInternal {
-            create_field_index_collection,
-            shard_id,
-        } = request.into_inner();
-
-        let create_field_index_collection = create_field_index_collection
-            .ok_or_else(|| Status::invalid_argument("CreateFieldIndexCollection is missing"))?;
-
-        create_field_index(self.toc.as_ref(), create_field_index_collection, shard_id).await
-    }
-
-    async fn delete_field_index(
-        &self,
-        request: Request<DeleteFieldIndexCollectionInternal>,
-    ) -> Result<Response<PointsOperationResponse>, Status> {
-        validate_and_log(request.get_ref());
-        let DeleteFieldIndexCollectionInternal {
-            delete_field_index_collection,
-            shard_id,
-        } = request.into_inner();
-
-        let delete_field_index_collection = delete_field_index_collection
-            .ok_or_else(|| Status::invalid_argument("DeleteFieldIndexCollection is missing"))?;
-
-        delete_field_index(self.toc.as_ref(), delete_field_index_collection, shard_id).await
-    }
-
-    async fn search(
-        &self,
-        request: Request<SearchPointsInternal>,
-    ) -> Result<Response<SearchResponse>, Status> {
-        validate_and_log(request.get_ref());
-        let SearchPointsInternal {
-            search_points,
-            shard_id,
-        } = request.into_inner();
-
-        let mut search_points =
-            search_points.ok_or_else(|| Status::invalid_argument("SearchPoints is missing"))?;
-
-        search_points.read_consistency = None; // *Have* to be `None`!
-
-        search(self.toc.as_ref(), search_points, shard_id).await
-    }
-
-    async fn search_batch(
-        &self,
-        request: Request<SearchBatchPointsInternal>,
-    ) -> Result<Response<SearchBatchResponse>, Status> {
-        validate_and_log(request.get_ref());
-        let SearchBatchPointsInternal {
-            collection_name,
-            search_points,
-            shard_id,
-        } = request.into_inner();
-
-        // Individual `read_consistency` values are ignored by `search_batch`...
-        //
-        // search_points
-        //     .iter_mut()
-        //     .for_each(|search_points| search_points.read_consistency = None);
-
-        search_batch(
-            self.toc.as_ref(),
-            collection_name,
-            search_points,
-            None, // *Have* to be `None`!
-            shard_id,
-        )
-        .await
-    }
-
-    async fn recommend(
-        &self,
-        request: Request<RecommendPointsInternal>,
-    ) -> Result<Response<RecommendResponse>, Status> {
-        validate_and_log(request.get_ref());
-        let RecommendPointsInternal {
-            recommend_points,
-            ..  // shard_id - is not used in internal API,
-            // because it is transformed into regular search requests on the first node
-        } = request.into_inner();
-
-        let mut recommend_points = recommend_points
-            .ok_or_else(|| Status::invalid_argument("RecommendPoints is missing"))?;
-
-        recommend_points.read_consistency = None; // *Have* to be `None`!
-
-        recommend(self.toc.as_ref(), recommend_points).await
-    }
-
-    async fn scroll(
-        &self,
-        request: Request<ScrollPointsInternal>,
-    ) -> Result<Response<ScrollResponse>, Status> {
-        validate_and_log(request.get_ref());
-        let ScrollPointsInternal {
-            scroll_points,
-            shard_id,
-        } = request.into_inner();
-
-        let mut scroll_points =
-            scroll_points.ok_or_else(|| Status::invalid_argument("ScrollPoints is missing"))?;
-
-        scroll_points.read_consistency = None; // *Have* to be `None`!
-
-        scroll(self.toc.as_ref(), scroll_points, shard_id).await
-    }
-
-    async fn get(
-        &self,
-        request: Request<GetPointsInternal>,
-    ) -> Result<Response<GetResponse>, Status> {
-        validate_and_log(request.get_ref());
-        let GetPointsInternal {
-            get_points,
-            shard_id,
-        } = request.into_inner();
-
-        let mut get_points =
-            get_points.ok_or_else(|| Status::invalid_argument("GetPoints is missing"))?;
-
-        get_points.read_consistency = None; // *Have* to be `None`!
-
-        get(self.toc.as_ref(), get_points, shard_id).await
-    }
-
-    async fn count(
-        &self,
-        request: Request<CountPointsInternal>,
-    ) -> Result<Response<CountResponse>, Status> {
-        validate_and_log(request.get_ref());
-        let CountPointsInternal {
-            count_points,
-            shard_id,
-        } = request.into_inner();
-
-        let count_points =
-            count_points.ok_or_else(|| Status::invalid_argument("CountPoints is missing"))?;
-        count(self.toc.as_ref(), count_points, shard_id).await
-    }
-
-    async fn sync(
-        &self,
-        request: Request<SyncPointsInternal>,
-    ) -> Result<Response<PointsOperationResponse>, Status> {
-        validate_and_log(request.get_ref());
-        let SyncPointsInternal {
-            sync_points,
-            shard_id,
-        } = request.into_inner();
-        let sync_points =
-            sync_points.ok_or_else(|| Status::invalid_argument("SyncPoints is missing"))?;
-        sync(self.toc.as_ref(), sync_points, shard_id).await
-    }
-
-    async fn overwrite_payload(
-        &self,
-        request: Request<SetPayloadPointsInternal>,
-    ) -> Result<Response<PointsOperationResponse>, Status> {
-        validate_and_log(request.get_ref());
-        let SetPayloadPointsInternal {
-            set_payload_points,
-            shard_id,
-        } = request.into_inner();
-
-        let set_payload_points = set_payload_points
-            .ok_or_else(|| Status::invalid_argument("SetPayloadPoints is missing"))?;
-
-        overwrite_payload(self.toc.as_ref(), set_payload_points, shard_id).await
-    }
-}
diff --git a/crates/qdrant/src/tonic/api/raft_api.rs b/crates/qdrant/src/tonic/api/raft_api.rs
deleted file mode 100644
index 537525a..0000000
--- a/crates/qdrant/src/tonic/api/raft_api.rs
+++ /dev/null
@@ -1,120 +0,0 @@
-use api::grpc::qdrant::raft_server::Raft;
-use api::grpc::qdrant::{
-    AddPeerToKnownMessage, AllPeers, Peer, PeerId, RaftMessage as RaftMessageBytes, Uri as UriStr,
-};
-use itertools::Itertools;
-use raft::eraftpb::Message as RaftMessage;
-use storage::content_manager::consensus_manager::ConsensusStateRef;
-use storage::content_manager::consensus_ops::ConsensusOperations;
-use tokio::sync::mpsc::Sender;
-use tonic::transport::Uri;
-use tonic::{async_trait, Request, Response, Status};
-
-use super::validate;
-use crate::consensus;
-
-pub struct RaftService {
-    message_sender: Sender<consensus::Message>,
-    consensus_state: ConsensusStateRef,
-}
-
-impl RaftService {
-    pub fn new(sender: Sender<consensus::Message>, consensus_state: ConsensusStateRef) -> Self {
-        Self {
-            message_sender: sender,
-            consensus_state,
-        }
-    }
-}
-
-#[async_trait]
-impl Raft for RaftService {
-    async fn send(&self, mut request: Request<RaftMessageBytes>) -> Result<Response<()>, Status> {
-        let message = <RaftMessage as prost::Message>::decode(&request.get_mut().message[..])
-            .map_err(|err| {
-                Status::invalid_argument(format!("Failed to parse raft message: {err}"))
-            })?;
-        self.message_sender
-            .send(consensus::Message::FromPeer(Box::new(message)))
-            .await
-            .map_err(|_| Status::internal("Can't send Raft message over channel"))?;
-        Ok(Response::new(()))
-    }
-
-    async fn who_is(
-        &self,
-        request: tonic::Request<PeerId>,
-    ) -> Result<tonic::Response<UriStr>, tonic::Status> {
-        let addresses = self.consensus_state.peer_address_by_id();
-        let uri = addresses
-            .get(&request.get_ref().id)
-            .ok_or_else(|| Status::internal("Peer not found"))?;
-        Ok(Response::new(UriStr {
-            uri: uri.to_string(),
-        }))
-    }
-
-    async fn add_peer_to_known(
-        &self,
-        request: tonic::Request<AddPeerToKnownMessage>,
-    ) -> Result<tonic::Response<AllPeers>, tonic::Status> {
-        validate(request.get_ref())?;
-        let peer = request.get_ref();
-        let uri_string = if let Some(uri) = &peer.uri {
-            uri.clone()
-        } else {
-            let ip = request
-                .remote_addr()
-                .ok_or_else(|| {
-                    Status::failed_precondition("Remote address unavailable due to the used IO")
-                })?
-                .ip();
-            let port = peer
-                .port
-                .ok_or_else(|| Status::invalid_argument("URI or port should be supplied"))?;
-            format!("http://{ip}:{port}")
-        };
-        let uri: Uri = uri_string
-            .parse()
-            .map_err(|err| Status::internal(format!("Failed to parse uri: {err}")))?;
-        let peer = request.into_inner();
-
-        // the consensus operation can take up to DEFAULT_META_OP_WAIT
-        self.consensus_state
-            .propose_consensus_op_with_await(
-                ConsensusOperations::AddPeer {
-                    peer_id: peer.id,
-                    uri: uri.to_string(),
-                },
-                None,
-            )
-            .await
-            .map_err(|err| Status::internal(format!("Failed to add peer: {err}")))?;
-        let addresses = self.consensus_state.peer_address_by_id();
-        // Make sure that the new peer is now present in the known addresses
-        if !addresses.values().contains(&uri) {
-            return Err(Status::internal(format!(
-                "Failed to add peer after consensus: {uri}"
-            )));
-        }
-        let first_peer_id = self.consensus_state.first_voter();
-        Ok(Response::new(AllPeers {
-            all_peers: addresses
-                .into_iter()
-                .map(|(id, uri)| Peer {
-                    id,
-                    uri: uri.to_string(),
-                })
-                .collect(),
-            first_peer_id,
-        }))
-    }
-
-    // Left for compatibility - does nothing
-    async fn add_peer_as_participant(
-        &self,
-        _request: tonic::Request<PeerId>,
-    ) -> Result<tonic::Response<()>, tonic::Status> {
-        Ok(Response::new(()))
-    }
-}
diff --git a/crates/qdrant/src/tonic/api/snapshots_api.rs b/crates/qdrant/src/tonic/api/snapshots_api.rs
deleted file mode 100644
index f997f15..0000000
--- a/crates/qdrant/src/tonic/api/snapshots_api.rs
+++ /dev/null
@@ -1,130 +0,0 @@
-use std::sync::Arc;
-use std::time::Instant;
-
-use api::grpc::qdrant::snapshots_server::Snapshots;
-use api::grpc::qdrant::{
-    CreateFullSnapshotRequest, CreateSnapshotRequest, CreateSnapshotResponse,
-    DeleteFullSnapshotRequest, DeleteSnapshotRequest, DeleteSnapshotResponse,
-    ListFullSnapshotsRequest, ListSnapshotsRequest, ListSnapshotsResponse,
-};
-use storage::content_manager::conversions::error_to_status;
-use storage::content_manager::snapshots::{
-    do_create_full_snapshot, do_delete_collection_snapshot, do_delete_full_snapshot,
-    do_list_full_snapshots,
-};
-use storage::dispatcher::Dispatcher;
-use tonic::{async_trait, Request, Response, Status};
-
-use super::validate;
-use crate::common::collections::{do_create_snapshot, do_list_snapshots};
-
-pub struct SnapshotsService {
-    dispatcher: Arc<Dispatcher>,
-}
-
-impl SnapshotsService {
-    pub fn new(dispatcher: Arc<Dispatcher>) -> Self {
-        Self { dispatcher }
-    }
-}
-
-#[async_trait]
-impl Snapshots for SnapshotsService {
-    async fn create(
-        &self,
-        request: Request<CreateSnapshotRequest>,
-    ) -> Result<Response<CreateSnapshotResponse>, Status> {
-        validate(request.get_ref())?;
-        let collection_name = request.into_inner().collection_name;
-        let timing = Instant::now();
-        let dispatcher = self.dispatcher.clone();
-        let response = do_create_snapshot(&dispatcher, &collection_name, true)
-            .await
-            .map_err(error_to_status)?;
-        Ok(Response::new(CreateSnapshotResponse {
-            snapshot_description: Some(response.into()),
-            time: timing.elapsed().as_secs_f64(),
-        }))
-    }
-
-    async fn list(
-        &self,
-        request: Request<ListSnapshotsRequest>,
-    ) -> Result<Response<ListSnapshotsResponse>, Status> {
-        validate(request.get_ref())?;
-        let collection_name = request.into_inner().collection_name;
-
-        let timing = Instant::now();
-        let snapshots = do_list_snapshots(&self.dispatcher, &collection_name)
-            .await
-            .map_err(error_to_status)?;
-        Ok(Response::new(ListSnapshotsResponse {
-            snapshot_descriptions: snapshots.into_iter().map(|s| s.into()).collect(),
-            time: timing.elapsed().as_secs_f64(),
-        }))
-    }
-
-    async fn delete(
-        &self,
-        request: Request<DeleteSnapshotRequest>,
-    ) -> Result<Response<DeleteSnapshotResponse>, Status> {
-        validate(request.get_ref())?;
-        let DeleteSnapshotRequest {
-            collection_name,
-            snapshot_name,
-        } = request.into_inner();
-        let timing = Instant::now();
-        let _response =
-            do_delete_collection_snapshot(&self.dispatcher, &collection_name, &snapshot_name, true)
-                .await
-                .map_err(error_to_status)?;
-        Ok(Response::new(DeleteSnapshotResponse {
-            time: timing.elapsed().as_secs_f64(),
-        }))
-    }
-
-    async fn create_full(
-        &self,
-        request: Request<CreateFullSnapshotRequest>,
-    ) -> Result<Response<CreateSnapshotResponse>, Status> {
-        validate(request.get_ref())?;
-        let timing = Instant::now();
-        let response = do_create_full_snapshot(&self.dispatcher, true)
-            .await
-            .map_err(error_to_status)?;
-        Ok(Response::new(CreateSnapshotResponse {
-            snapshot_description: response.map(|x| x.into()),
-            time: timing.elapsed().as_secs_f64(),
-        }))
-    }
-
-    async fn list_full(
-        &self,
-        request: Request<ListFullSnapshotsRequest>,
-    ) -> Result<Response<ListSnapshotsResponse>, Status> {
-        validate(request.get_ref())?;
-        let timing = Instant::now();
-        let snapshots = do_list_full_snapshots(&self.dispatcher)
-            .await
-            .map_err(error_to_status)?;
-        Ok(Response::new(ListSnapshotsResponse {
-            snapshot_descriptions: snapshots.into_iter().map(|s| s.into()).collect(),
-            time: timing.elapsed().as_secs_f64(),
-        }))
-    }
-
-    async fn delete_full(
-        &self,
-        request: Request<DeleteFullSnapshotRequest>,
-    ) -> Result<Response<DeleteSnapshotResponse>, Status> {
-        validate(request.get_ref())?;
-        let snapshot_name = request.into_inner().snapshot_name;
-        let timing = Instant::now();
-        let _response = do_delete_full_snapshot(&self.dispatcher, &snapshot_name, true)
-            .await
-            .map_err(error_to_status)?;
-        Ok(Response::new(DeleteSnapshotResponse {
-            time: timing.elapsed().as_secs_f64(),
-        }))
-    }
-}
diff --git a/crates/qdrant/src/tonic/api_key.rs b/crates/qdrant/src/tonic/api_key.rs
deleted file mode 100644
index 91691d5..0000000
--- a/crates/qdrant/src/tonic/api_key.rs
+++ /dev/null
@@ -1,85 +0,0 @@
-use std::task::{Context, Poll};
-
-use constant_time_eq::constant_time_eq;
-use futures_util::future::BoxFuture;
-use reqwest::header::HeaderValue;
-use reqwest::StatusCode;
-use tonic::body::BoxBody;
-use tonic::Code;
-use tower::Service;
-use tower_layer::Layer;
-
-#[derive(Clone)]
-pub struct ApiKeyMiddleware<T> {
-    service: T,
-    api_key: String,
-}
-
-#[derive(Clone)]
-pub struct ApiKeyMiddlewareLayer {
-    api_key: String,
-}
-
-impl<S> Service<tonic::codegen::http::Request<tonic::transport::Body>> for ApiKeyMiddleware<S>
-where
-    S: Service<
-        tonic::codegen::http::Request<tonic::transport::Body>,
-        Response = tonic::codegen::http::Response<tonic::body::BoxBody>,
-    >,
-    S::Future: Send + 'static,
-{
-    type Response = tonic::codegen::http::Response<tonic::body::BoxBody>;
-    type Error = S::Error;
-    type Future = BoxFuture<'static, Result<Self::Response, S::Error>>;
-
-    fn poll_ready(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
-        self.service.poll_ready(cx)
-    }
-
-    fn call(
-        &mut self,
-        request: tonic::codegen::http::Request<tonic::transport::Body>,
-    ) -> Self::Future {
-        if let Some(key) = request.headers().get("api-key") {
-            if let Ok(key) = key.to_str() {
-                if constant_time_eq(self.api_key.as_bytes(), key.as_bytes()) {
-                    let future = self.service.call(request);
-
-                    return Box::pin(async move {
-                        let response = future.await?;
-                        Ok(response)
-                    });
-                }
-            }
-        }
-
-        let mut response = Self::Response::new(BoxBody::default());
-        *response.status_mut() = StatusCode::FORBIDDEN;
-        response.headers_mut().append(
-            "grpc-status",
-            HeaderValue::from(Code::PermissionDenied as i32),
-        );
-        response
-            .headers_mut()
-            .append("grpc-message", HeaderValue::from_static("Invalid api-key"));
-
-        Box::pin(async move { Ok(response) })
-    }
-}
-
-impl ApiKeyMiddlewareLayer {
-    pub fn new(api_key: String) -> Self {
-        Self { api_key }
-    }
-}
-
-impl<S> Layer<S> for ApiKeyMiddlewareLayer {
-    type Service = ApiKeyMiddleware<S>;
-
-    fn layer(&self, service: S) -> Self::Service {
-        ApiKeyMiddleware {
-            service,
-            api_key: self.api_key.clone(),
-        }
-    }
-}
diff --git a/crates/qdrant/src/tonic/logging.rs b/crates/qdrant/src/tonic/logging.rs
deleted file mode 100644
index c544196..0000000
--- a/crates/qdrant/src/tonic/logging.rs
+++ /dev/null
@@ -1,113 +0,0 @@
-use std::task::{Context, Poll};
-
-use futures_util::future::BoxFuture;
-use tonic::body::BoxBody;
-use tonic::codegen::http::Response;
-use tonic::Code;
-use tower::Service;
-use tower_layer::Layer;
-
-#[derive(Clone)]
-pub struct LoggingMiddleware<T> {
-    inner: T,
-}
-
-#[derive(Clone)]
-pub struct LoggingMiddlewareLayer;
-
-impl LoggingMiddlewareLayer {
-    pub fn new() -> Self {
-        Self {}
-    }
-}
-
-impl<S> Service<tonic::codegen::http::Request<tonic::transport::Body>> for LoggingMiddleware<S>
-where
-    S: Service<tonic::codegen::http::Request<tonic::transport::Body>, Response = Response<BoxBody>>
-        + Clone,
-    S::Future: Send + 'static,
-{
-    type Response = S::Response;
-    type Error = S::Error;
-    type Future = BoxFuture<'static, Result<S::Response, S::Error>>;
-
-    fn poll_ready(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
-        self.inner.poll_ready(cx)
-    }
-
-    fn call(
-        &mut self,
-        request: tonic::codegen::http::Request<tonic::transport::Body>,
-    ) -> Self::Future {
-        let clone = self.inner.clone();
-        let mut inner = std::mem::replace(&mut self.inner, clone);
-
-        let method_name = request.uri().path().to_string();
-        let instant = std::time::Instant::now();
-        let future = inner.call(request);
-        Box::pin(async move {
-            let response = future.await;
-            let elapsed_sec = instant.elapsed().as_secs_f32();
-            match response {
-                Err(error) => {
-                    log::error!("gGRPC request error {}", method_name);
-                    Err(error)
-                }
-                Ok(response_tonic) => {
-                    let grpc_status = tonic::Status::from_header_map(response_tonic.headers());
-                    if let Some(grpc_status) = grpc_status {
-                        match grpc_status.code() {
-                            Code::Ok => {
-                                log::trace!("gRPC {} Ok {:.6}", method_name, elapsed_sec);
-                            }
-                            Code::Cancelled => {
-                                // cluster mode generates a large amount of `stream error received: stream no longer needed`
-                                log::trace!("gRPC {} {:.6}", method_name, elapsed_sec);
-                            }
-                            Code::DeadlineExceeded
-                            | Code::Aborted
-                            | Code::OutOfRange
-                            | Code::ResourceExhausted
-                            | Code::NotFound
-                            | Code::InvalidArgument
-                            | Code::AlreadyExists
-                            | Code::FailedPrecondition
-                            | Code::PermissionDenied
-                            | Code::Unauthenticated => {
-                                log::info!(
-                                    "gRPC {} failed with {} {:?} {:.6}",
-                                    method_name,
-                                    grpc_status.code(),
-                                    grpc_status.message(),
-                                    elapsed_sec,
-                                );
-                            }
-                            Code::Internal
-                            | Code::Unimplemented
-                            | Code::Unavailable
-                            | Code::DataLoss
-                            | Code::Unknown => log::error!(
-                                "gRPC {} unexpectedly failed with {} {:?} {:.6}",
-                                method_name,
-                                grpc_status.code(),
-                                grpc_status.message(),
-                                elapsed_sec,
-                            ),
-                        };
-                    } else {
-                        log::trace!("gRPC {} Ok {:.6}", method_name, elapsed_sec);
-                    }
-                    Ok(response_tonic)
-                }
-            }
-        })
-    }
-}
-
-impl<S> Layer<S> for LoggingMiddlewareLayer {
-    type Service = LoggingMiddleware<S>;
-
-    fn layer(&self, service: S) -> Self::Service {
-        LoggingMiddleware { inner: service }
-    }
-}
diff --git a/crates/qdrant/src/tonic/mod.rs b/crates/qdrant/src/tonic/mod.rs
deleted file mode 100644
index 518dd92..0000000
--- a/crates/qdrant/src/tonic/mod.rs
+++ /dev/null
@@ -1,233 +0,0 @@
-mod api;
-mod api_key;
-mod logging;
-mod tonic_telemetry;
-
-use std::io;
-use std::net::{IpAddr, SocketAddr};
-use std::sync::Arc;
-
-use ::api::grpc::models::VersionInfo;
-use ::api::grpc::qdrant::collections_internal_server::CollectionsInternalServer;
-use ::api::grpc::qdrant::collections_server::CollectionsServer;
-use ::api::grpc::qdrant::points_internal_server::PointsInternalServer;
-use ::api::grpc::qdrant::points_server::PointsServer;
-use ::api::grpc::qdrant::qdrant_server::{Qdrant, QdrantServer};
-use ::api::grpc::qdrant::snapshots_server::SnapshotsServer;
-use ::api::grpc::qdrant::{HealthCheckReply, HealthCheckRequest};
-use storage::content_manager::consensus_manager::ConsensusStateRef;
-use storage::content_manager::toc::TableOfContent;
-use storage::dispatcher::Dispatcher;
-use tokio::runtime::Handle;
-use tokio::signal;
-use tonic::codec::CompressionEncoding;
-use tonic::transport::{Server, ServerTlsConfig};
-use tonic::{Request, Response, Status};
-
-use crate::common::helpers;
-use crate::common::telemetry_ops::requests_telemetry::TonicTelemetryCollector;
-use crate::settings::Settings;
-use crate::tonic::api::collections_api::CollectionsService;
-use crate::tonic::api::collections_internal_api::CollectionsInternalService;
-use crate::tonic::api::points_api::PointsService;
-use crate::tonic::api::points_internal_api::PointsInternalService;
-use crate::tonic::api::snapshots_api::SnapshotsService;
-
-#[derive(Default)]
-pub struct QdrantService {}
-
-#[tonic::async_trait]
-impl Qdrant for QdrantService {
-    async fn health_check(
-        &self,
-        _request: Request<HealthCheckRequest>,
-    ) -> Result<Response<HealthCheckReply>, Status> {
-        Ok(Response::new(VersionInfo::default().into()))
-    }
-}
-
-#[cfg(not(unix))]
-async fn wait_stop_signal(for_what: &str) {
-    signal::ctrl_c().await.unwrap();
-    log::debug!("Stopping {for_what} on SIGINT");
-}
-
-#[cfg(unix)]
-async fn wait_stop_signal(for_what: &str) {
-    let mut term = signal::unix::signal(signal::unix::SignalKind::terminate()).unwrap();
-    let mut inrt = signal::unix::signal(signal::unix::SignalKind::interrupt()).unwrap();
-
-    tokio::select! {
-        _ = term.recv() => log::debug!("Stopping {for_what} on SIGTERM"),
-        _ = inrt.recv() => log::debug!("Stopping {for_what} on SIGINT"),
-    }
-}
-
-pub fn init(
-    dispatcher: Arc<Dispatcher>,
-    telemetry_collector: Arc<parking_lot::Mutex<TonicTelemetryCollector>>,
-    settings: Settings,
-    grpc_port: u16,
-    runtime: Handle,
-) -> io::Result<()> {
-    runtime.block_on(async {
-        let socket =
-            SocketAddr::from((settings.service.host.parse::<IpAddr>().unwrap(), grpc_port));
-
-        let qdrant_service = QdrantService::default();
-        let collections_service = CollectionsService::new(dispatcher.clone());
-        let points_service = PointsService::new(dispatcher.toc().clone());
-        let snapshot_service = SnapshotsService::new(dispatcher.clone());
-
-        log::info!("Qdrant gRPC listening on {}", grpc_port);
-
-        let mut server = Server::builder();
-
-        if settings.service.enable_tls {
-            log::info!("TLS enabled for gRPC API (TTL not supported)");
-
-            let tls_server_config = helpers::load_tls_external_server_config(settings.tls()?)?;
-
-            server = server
-                .tls_config(tls_server_config)
-                .map_err(helpers::tonic_error_to_io_error)?;
-        } else {
-            log::info!("TLS disabled for gRPC API");
-        }
-
-        // The stack of middleware that our service will be wrapped in
-        let middleware_layer = tower::ServiceBuilder::new()
-            .layer(logging::LoggingMiddlewareLayer::new())
-            .layer(tonic_telemetry::TonicTelemetryLayer::new(
-                telemetry_collector,
-            ))
-            .option_layer(
-                settings
-                    .service
-                    .api_key
-                    .map(api_key::ApiKeyMiddlewareLayer::new),
-            )
-            .into_inner();
-
-        server
-            .layer(middleware_layer)
-            .add_service(
-                QdrantServer::new(qdrant_service)
-                    .send_compressed(CompressionEncoding::Gzip)
-                    .accept_compressed(CompressionEncoding::Gzip)
-                    .max_decoding_message_size(usize::MAX),
-            )
-            .add_service(
-                CollectionsServer::new(collections_service)
-                    .send_compressed(CompressionEncoding::Gzip)
-                    .accept_compressed(CompressionEncoding::Gzip)
-                    .max_decoding_message_size(usize::MAX),
-            )
-            .add_service(
-                PointsServer::new(points_service)
-                    .send_compressed(CompressionEncoding::Gzip)
-                    .accept_compressed(CompressionEncoding::Gzip)
-                    .max_decoding_message_size(usize::MAX),
-            )
-            .add_service(
-                SnapshotsServer::new(snapshot_service)
-                    .send_compressed(CompressionEncoding::Gzip)
-                    .accept_compressed(CompressionEncoding::Gzip)
-                    .max_decoding_message_size(usize::MAX),
-            )
-            .serve_with_shutdown(socket, async {
-                wait_stop_signal("gRPC service").await;
-            })
-            .await
-            .map_err(helpers::tonic_error_to_io_error)
-    })?;
-
-    Ok(())
-}
-
-#[allow(clippy::too_many_arguments)]
-pub fn init_internal(
-    toc: Arc<TableOfContent>,
-    consensus_state: ConsensusStateRef,
-    telemetry_collector: Arc<parking_lot::Mutex<TonicTelemetryCollector>>,
-    host: String,
-    internal_grpc_port: u16,
-    tls_config: Option<ServerTlsConfig>,
-    to_consensus: tokio::sync::mpsc::Sender<crate::consensus::Message>,
-    runtime: Handle,
-) -> std::io::Result<()> {
-    use ::api::grpc::qdrant::raft_server::RaftServer;
-
-    use crate::tonic::api::raft_api::RaftService;
-
-    runtime
-        .block_on(async {
-            let socket = SocketAddr::from((host.parse::<IpAddr>().unwrap(), internal_grpc_port));
-
-            let qdrant_service = QdrantService::default();
-            let collections_internal_service = CollectionsInternalService::new(toc.clone());
-            let points_internal_service = PointsInternalService::new(toc.clone());
-            let raft_service = RaftService::new(to_consensus, consensus_state);
-
-            log::debug!("Qdrant internal gRPC listening on {}", internal_grpc_port);
-
-            let mut server = Server::builder()
-                // Internally use a high limit for pending accept streams.
-                // We can have a huge number of reset/dropped HTTP2 streams in our internal
-                // communication when there are a lot of clients dropping connections. This
-                // internally causes an GOAWAY/ENHANCE_YOUR_CALM error breaking cluster consensus.
-                // We prefer to keep more pending reset streams even though this may be expensive,
-                // versus an internal error that is very hard to handle.
-                // More info: <https://github.com/qdrant/qdrant/issues/1907>
-                .http2_max_pending_accept_reset_streams(Some(1024));
-
-            if let Some(config) = tls_config {
-                log::info!("TLS enabled for internal gRPC API (TTL not supported)");
-
-                server = server.tls_config(config)?;
-            } else {
-                log::info!("TLS disabled for internal gRPC API");
-            };
-
-            // The stack of middleware that our service will be wrapped in
-            let middleware_layer = tower::ServiceBuilder::new()
-                .layer(logging::LoggingMiddlewareLayer::new())
-                .layer(tonic_telemetry::TonicTelemetryLayer::new(
-                    telemetry_collector,
-                ))
-                .into_inner();
-
-            server
-                .layer(middleware_layer)
-                .add_service(
-                    QdrantServer::new(qdrant_service)
-                        .send_compressed(CompressionEncoding::Gzip)
-                        .accept_compressed(CompressionEncoding::Gzip)
-                        .max_decoding_message_size(usize::MAX),
-                )
-                .add_service(
-                    CollectionsInternalServer::new(collections_internal_service)
-                        .send_compressed(CompressionEncoding::Gzip)
-                        .accept_compressed(CompressionEncoding::Gzip)
-                        .max_decoding_message_size(usize::MAX),
-                )
-                .add_service(
-                    PointsInternalServer::new(points_internal_service)
-                        .send_compressed(CompressionEncoding::Gzip)
-                        .accept_compressed(CompressionEncoding::Gzip)
-                        .max_decoding_message_size(usize::MAX),
-                )
-                .add_service(
-                    RaftServer::new(raft_service)
-                        .send_compressed(CompressionEncoding::Gzip)
-                        .accept_compressed(CompressionEncoding::Gzip)
-                        .max_decoding_message_size(usize::MAX),
-                )
-                .serve_with_shutdown(socket, async {
-                    wait_stop_signal("internal gRPC").await;
-                })
-                .await
-        })
-        .unwrap();
-    Ok(())
-}
diff --git a/crates/qdrant/src/tonic/tonic_telemetry.rs b/crates/qdrant/src/tonic/tonic_telemetry.rs
deleted file mode 100644
index 239abeb..0000000
--- a/crates/qdrant/src/tonic/tonic_telemetry.rs
+++ /dev/null
@@ -1,74 +0,0 @@
-use std::sync::Arc;
-use std::task::{Context, Poll};
-
-use futures_util::future::BoxFuture;
-use tower::Service;
-use tower_layer::Layer;
-
-use crate::common::telemetry_ops::requests_telemetry::{
-    TonicTelemetryCollector, TonicWorkerTelemetryCollector,
-};
-
-#[derive(Clone)]
-pub struct TonicTelemetryService<T> {
-    service: T,
-    telemetry_data: Arc<parking_lot::Mutex<TonicWorkerTelemetryCollector>>,
-}
-
-#[derive(Clone)]
-pub struct TonicTelemetryLayer {
-    telemetry_collector: Arc<parking_lot::Mutex<TonicTelemetryCollector>>,
-}
-
-impl<S> Service<tonic::codegen::http::Request<tonic::transport::Body>> for TonicTelemetryService<S>
-where
-    S: Service<tonic::codegen::http::Request<tonic::transport::Body>>,
-    S::Future: Send + 'static,
-{
-    type Response = S::Response;
-    type Error = S::Error;
-    type Future = BoxFuture<'static, Result<S::Response, S::Error>>;
-
-    fn poll_ready(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
-        self.service.poll_ready(cx)
-    }
-
-    fn call(
-        &mut self,
-        request: tonic::codegen::http::Request<tonic::transport::Body>,
-    ) -> Self::Future {
-        let method_name = request.uri().path().to_string();
-        let future = self.service.call(request);
-        let telemetry_data = self.telemetry_data.clone();
-        Box::pin(async move {
-            let instant = std::time::Instant::now();
-            let response = future.await?;
-            telemetry_data.lock().add_response(method_name, instant);
-            Ok(response)
-        })
-    }
-}
-
-impl TonicTelemetryLayer {
-    pub fn new(
-        telemetry_collector: Arc<parking_lot::Mutex<TonicTelemetryCollector>>,
-    ) -> TonicTelemetryLayer {
-        Self {
-            telemetry_collector,
-        }
-    }
-}
-
-impl<S> Layer<S> for TonicTelemetryLayer {
-    type Service = TonicTelemetryService<S>;
-
-    fn layer(&self, service: S) -> Self::Service {
-        TonicTelemetryService {
-            service,
-            telemetry_data: self
-                .telemetry_collector
-                .lock()
-                .create_grpc_telemetry_collector(),
-        }
-    }
-}
diff --git a/crates/qdrant/src/tracing.rs b/crates/qdrant/src/tracing.rs
deleted file mode 100644
index 3350fb6..0000000
--- a/crates/qdrant/src/tracing.rs
+++ /dev/null
@@ -1,35 +0,0 @@
-pub fn setup() -> anyhow::Result<()> {
-    // Use `console` and/or `tracy` features to enable both `tracing-subscriber` and the layer(s)
-    #[cfg(feature = "tracing-subscriber")]
-    {
-        use tracing_subscriber::prelude::*;
-
-        let reg = tracing_subscriber::registry();
-
-        // Use `console` feature to enable both `tracing-subscriber` and `console-subscriber`
-        #[cfg(feature = "console-subscriber")]
-        let reg = reg.with(console_subscriber::spawn());
-
-        // Note, that `console-subscriber` requires manually enabling
-        // `--cfg tokio_unstable` rust flags during compilation!
-        //
-        // Otherwise `console_subscriber::spawn` call panics!
-        //
-        // See https://docs.rs/tokio/latest/tokio/#unstable-features
-        #[cfg(all(feature = "console-subscriber", not(tokio_unstable)))]
-        eprintln!(
-            "`console-subscriber` requires manually enabling \
-             `--cfg tokio_unstable` rust flags during compilation!"
-        );
-
-        // Use `tracy` feature to enable both `tracing-subscriber` and `tracing-tracy`
-        #[cfg(feature = "tracing-tracy")]
-        let reg = reg.with(tracing_tracy::TracyLayer::new().with_filter(
-            tracing_subscriber::filter::filter_fn(|metadata| metadata.is_span()),
-        ));
-
-        tracing::subscriber::set_global_default(reg)?;
-    }
-
-    Ok(())
-}
diff --git a/crates/qdrant/src/wal_inspector.rs b/crates/qdrant/src/wal_inspector.rs
deleted file mode 100644
index c656d75..0000000
--- a/crates/qdrant/src/wal_inspector.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-use std::env;
-use std::path::Path;
-
-use collection::operations::CollectionUpdateOperations;
-use collection::wal::SerdeWal;
-use wal::WalOptions;
-
-/// Executable to inspect the content of a write ahead log folder.
-/// e.g `cargo run --bin wal_inspector storage/collections/test-collection/0/wal/`
-fn main() {
-    let args: Vec<String> = env::args().collect();
-    let wal_path = Path::new(&args[1]);
-    let wal: Result<SerdeWal<CollectionUpdateOperations>, _> =
-        SerdeWal::new(wal_path.to_str().unwrap(), WalOptions::default());
-
-    match wal {
-        Err(error) => {
-            eprintln!("Unable to open write ahead log in directory {wal_path:?}: {error}.");
-        }
-        Ok(wal) => {
-            // print all entries
-            let mut count = 0;
-            for (idx, op) in wal.read_all() {
-                println!("==========================");
-                println!("Entry {}", idx);
-                println!("{:?}", op);
-                count += 1;
-            }
-            println!("==========================");
-            println!("End of WAL.");
-            println!("Found {} entries.", count);
-        }
-    }
-}
diff --git a/packages/README.md b/packages/README.md
new file mode 100644
index 0000000..3f02a07
--- /dev/null
+++ b/packages/README.md
@@ -0,0 +1 @@
+The bindings for difference languages.
\ No newline at end of file
diff --git a/packages/codeindex-prebuilt/lib/build.js b/packages/codeindex-prebuilt/lib/build.js
new file mode 100644
index 0000000..018a78a
--- /dev/null
+++ b/packages/codeindex-prebuilt/lib/build.js
@@ -0,0 +1,25 @@
+const os = require('os');
+
+async function getTarget() {
+    const arch = process.env.npm_config_arch || os.arch();
+
+    switch (os.platform()) {
+        case 'darwin':
+            return arch === 'arm64' ? 'aarch64-apple-darwin' :
+                'x86_64-apple-darwin';
+        case 'win32':
+            return arch === 'x64' ? 'x86_64-pc-windows-msvc' :
+                arch === 'arm' ? 'aarch64-pc-windows-msvc' :
+                    'i686-pc-windows-msvc';
+        case 'linux':
+            return arch === 'x64' ? 'x86_64-unknown-linux-musl' :
+                arch === 'arm' ? 'arm-unknown-linux-gnueabihf' :
+                    arch === 'armv7l' ? 'arm-unknown-linux-gnueabihf' :
+                        arch === 'arm64' ? 'aarch64-unknown-linux-musl' :
+                            arch === 'ppc64' ? 'powerpc64le-unknown-linux-gnu' :
+                                arch === 's390x' ? 's390x-unknown-linux-gnu' :
+                                    'i686-unknown-linux-musl'
+        default: throw new Error('Unknown platform: ' + os.platform());
+    }
+}
+console.log(getTarget())
\ No newline at end of file
diff --git a/packages/codeindex-prebuilt/lib/index.d.ts b/packages/codeindex-prebuilt/lib/index.d.ts
new file mode 100644
index 0000000..b847a94
--- /dev/null
+++ b/packages/codeindex-prebuilt/lib/index.d.ts
@@ -0,0 +1 @@
+export declare const codeindexPath: string;
\ No newline at end of file
diff --git a/packages/codeindex-prebuilt/lib/index.js b/packages/codeindex-prebuilt/lib/index.js
new file mode 100644
index 0000000..72fcea7
--- /dev/null
+++ b/packages/codeindex-prebuilt/lib/index.js
@@ -0,0 +1,5 @@
+'use strict';
+
+const path = require('path');
+
+module.exports.codeindexPath = path.join(__dirname, `../bin/rg${process.platform === 'win32' ? '.exe' : ''}`);
\ No newline at end of file
diff --git a/packages/codeindex-prebuilt/package.json b/packages/codeindex-prebuilt/package.json
new file mode 100644
index 0000000..c18c6af
--- /dev/null
+++ b/packages/codeindex-prebuilt/package.json
@@ -0,0 +1,16 @@
+{
+    "name": "@askcodebase/codeindex-prebuilt",
+    "version": "0.1.0",
+    "description": "This package contains binaries of codeindex.",
+    "main": "lib/index.js",
+    "typings": "lib/index.d.ts",
+    "repository": {
+      "type": "git",
+      "url": "https://github.com/jipitiai/codeindex.git"
+    },
+    "author": "Shiqi Mei",
+    "license": "MIT",
+    "devDependencies": {
+      "@types/node": "^20.8.4"
+    }
+  }
\ No newline at end of file
diff --git a/packages/codeindex/lib/index.d.ts b/packages/codeindex/lib/index.d.ts
new file mode 100644
index 0000000..b847a94
--- /dev/null
+++ b/packages/codeindex/lib/index.d.ts
@@ -0,0 +1 @@
+export declare const codeindexPath: string;
\ No newline at end of file
diff --git a/packages/codeindex/lib/index.js b/packages/codeindex/lib/index.js
new file mode 100644
index 0000000..72fcea7
--- /dev/null
+++ b/packages/codeindex/lib/index.js
@@ -0,0 +1,5 @@
+'use strict';
+
+const path = require('path');
+
+module.exports.codeindexPath = path.join(__dirname, `../bin/rg${process.platform === 'win32' ? '.exe' : ''}`);
\ No newline at end of file
diff --git a/packages/codeindex/package.json b/packages/codeindex/package.json
new file mode 100644
index 0000000..feeac9d
--- /dev/null
+++ b/packages/codeindex/package.json
@@ -0,0 +1,19 @@
+{
+    "name": "@askcodebase/codeindex",
+    "version": "0.1.0",
+    "description": "A module for using codeindex in a Node project",
+    "main": "lib/index.js",
+    "typings": "lib/index.d.ts",
+    "repository": {
+      "type": "git",
+      "url": "https://github.com/jipitiai/codeindex.git"
+    },
+    "scripts": {
+      "postinstall": "node ./lib/postinstall.js"
+    },
+    "author": "Shiqi Mei",
+    "license": "MIT",
+    "devDependencies": {
+      "@types/node": "^20.8.4"
+    }
+  }
\ No newline at end of file