[xcode] Fixed xcode build.

1 files changed, 180 insertions, 192 deletions

diff --git a/xcode/search/search.xcodeproj/project.pbxproj b/xcode/search/search.xcodeproj/project.pbxproj
index ba8a38819d..540464f67e 100644
--- a/xcode/search/search.xcodeproj/project.pbxproj
+++ b/xcode/search/search.xcodeproj/project.pbxproj
@@ -7,22 +7,11 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		3400A67D1CA27774003DA0EC /* geometry_cache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3400A67B1CA27774003DA0EC /* geometry_cache.cpp */; };
-		3400A67E1CA27774003DA0EC /* geometry_cache.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3400A67C1CA27774003DA0EC /* geometry_cache.hpp */; };
-		341F6D8B1CCE13C3003F4DB2 /* token_slice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 341F6D871CCE13C2003F4DB2 /* token_slice.cpp */; };
-		341F6D8C1CCE13C3003F4DB2 /* token_slice.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 341F6D881CCE13C2003F4DB2 /* token_slice.hpp */; };
-		3441CE441CFC1D1300CF30D4 /* processor_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3441CE421CFC1D1300CF30D4 /* processor_v2.cpp */; };
-		3441CE451CFC1D1300CF30D4 /* processor_v2.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3441CE431CFC1D1300CF30D4 /* processor_v2.hpp */; };
 		3441CE4F1CFC1D7000CF30D4 /* processor_factory.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3441CE4A1CFC1D7000CF30D4 /* processor_factory.hpp */; };
 		3441CE501CFC1D7000CF30D4 /* processor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3441CE4B1CFC1D7000CF30D4 /* processor.cpp */; };
 		3441CE511CFC1D7000CF30D4 /* processor.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3441CE4C1CFC1D7000CF30D4 /* processor.hpp */; };
 		3441CE521CFC1D7000CF30D4 /* query_params.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3441CE4D1CFC1D7000CF30D4 /* query_params.cpp */; };
 		3441CE531CFC1D7000CF30D4 /* query_params.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3441CE4E1CFC1D7000CF30D4 /* query_params.hpp */; };
-		34527C581C89D6240015050E /* pre_ranking_info.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 34527C541C89D6240015050E /* pre_ranking_info.hpp */; };
-		34527C591C89D6240015050E /* ranking_info.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34527C551C89D6240015050E /* ranking_info.cpp */; };
-		34527C5A1C89D6240015050E /* ranking_info.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 34527C561C89D6240015050E /* ranking_info.hpp */; };
-		345FBECF1C8045EB00831ED6 /* ranking_utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 345FBECD1C8045EB00831ED6 /* ranking_utils.cpp */; };
-		345FBED01C8045EB00831ED6 /* ranking_utils.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 345FBECE1C8045EB00831ED6 /* ranking_utils.hpp */; };
 		347F33161C4540A8009758CC /* cancel_exception.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F32FB1C4540A8009758CC /* cancel_exception.hpp */; };
 		347F33191C4540A8009758CC /* dummy_rank_table.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F32FE1C4540A8009758CC /* dummy_rank_table.cpp */; };
 		347F331A1C4540A8009758CC /* dummy_rank_table.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F32FF1C4540A8009758CC /* dummy_rank_table.hpp */; };
@@ -40,39 +29,8 @@
 		347F332A1C4540A8009758CC /* search_index_values.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F330F1C4540A8009758CC /* search_index_values.hpp */; };
 		347F332F1C4540A8009758CC /* search_trie.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33141C4540A8009758CC /* search_trie.hpp */; };
 		347F33301C4540A8009758CC /* suggest.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33151C4540A8009758CC /* suggest.hpp */; };
-		347F33561C45413C009758CC /* features_filter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F333E1C45413C009758CC /* features_filter.cpp */; };
-		347F33571C45413C009758CC /* features_filter.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F333F1C45413C009758CC /* features_filter.hpp */; };
-		347F33581C45413C009758CC /* features_layer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F33401C45413C009758CC /* features_layer.cpp */; };
-		347F33591C45413C009758CC /* features_layer.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33411C45413C009758CC /* features_layer.hpp */; };
-		347F335A1C45413C009758CC /* features_layer_matcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F33421C45413C009758CC /* features_layer_matcher.cpp */; };
-		347F335B1C45413C009758CC /* features_layer_matcher.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33431C45413C009758CC /* features_layer_matcher.hpp */; };
-		347F335C1C45413C009758CC /* features_layer_path_finder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F33441C45413C009758CC /* features_layer_path_finder.cpp */; };
-		347F335D1C45413C009758CC /* features_layer_path_finder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33451C45413C009758CC /* features_layer_path_finder.hpp */; };
-		347F335E1C45413C009758CC /* geocoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F33461C45413C009758CC /* geocoder.cpp */; };
-		347F335F1C45413C009758CC /* geocoder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33471C45413C009758CC /* geocoder.hpp */; };
-		347F33601C45413C009758CC /* house_numbers_matcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F33481C45413C009758CC /* house_numbers_matcher.cpp */; };
-		347F33611C45413C009758CC /* house_numbers_matcher.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33491C45413C009758CC /* house_numbers_matcher.hpp */; };
-		347F33621C45413C009758CC /* house_to_street_table.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F334A1C45413C009758CC /* house_to_street_table.cpp */; };
-		347F33631C45413C009758CC /* house_to_street_table.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F334B1C45413C009758CC /* house_to_street_table.hpp */; };
-		347F33641C45413C009758CC /* mwm_context.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F334C1C45413C009758CC /* mwm_context.cpp */; };
-		347F33651C45413C009758CC /* mwm_context.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F334D1C45413C009758CC /* mwm_context.hpp */; };
-		347F33661C45413C009758CC /* rank_table_cache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F334E1C45413C009758CC /* rank_table_cache.cpp */; };
-		347F33671C45413C009758CC /* rank_table_cache.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F334F1C45413C009758CC /* rank_table_cache.hpp */; };
-		347F33681C45413C009758CC /* search_model.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F33501C45413C009758CC /* search_model.cpp */; };
-		347F33691C45413C009758CC /* search_model.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33511C45413C009758CC /* search_model.hpp */; };
-		347F336C1C45413C009758CC /* street_vicinity_loader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F33541C45413C009758CC /* street_vicinity_loader.cpp */; };
-		347F336D1C45413C009758CC /* street_vicinity_loader.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33551C45413C009758CC /* street_vicinity_loader.hpp */; };
-		34C0C4171C9AE1FA00FDA0D1 /* nested_rects_cache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34C0C4151C9AE1FA00FDA0D1 /* nested_rects_cache.cpp */; };
-		34C0C4181C9AE1FA00FDA0D1 /* nested_rects_cache.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 34C0C4161C9AE1FA00FDA0D1 /* nested_rects_cache.hpp */; };
-		34E44E701C4922E40057A5C4 /* intersection_result.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34E44E6E1C4922E40057A5C4 /* intersection_result.cpp */; };
-		34E44E711C4922E40057A5C4 /* intersection_result.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 34E44E6F1C4922E40057A5C4 /* intersection_result.hpp */; };
-		34E44E741C4923100057A5C4 /* cbv_ptr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34E44E721C4923100057A5C4 /* cbv_ptr.cpp */; };
-		34E44E751C4923100057A5C4 /* cbv_ptr.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 34E44E731C4923100057A5C4 /* cbv_ptr.hpp */; };
 		56D5456E1C74A48C00E3719C /* mode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56D5456C1C74A48C00E3719C /* mode.cpp */; };
 		56D5456F1C74A48C00E3719C /* mode.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56D5456D1C74A48C00E3719C /* mode.hpp */; };
-		56EB1ED51C6B6E130022D831 /* locality_scorer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56EB1ED21C6B6E130022D831 /* locality_scorer.cpp */; };
-		56EB1ED61C6B6E130022D831 /* locality_scorer.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56EB1ED31C6B6E130022D831 /* locality_scorer.hpp */; };
-		56EB1ED71C6B6E130022D831 /* stats_cache.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56EB1ED41C6B6E130022D831 /* stats_cache.hpp */; };
 		670F88741CE4C032003F68BA /* types_skipper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F88721CE4C032003F68BA /* types_skipper.cpp */; };
 		670F88751CE4C032003F68BA /* types_skipper.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670F88731CE4C032003F68BA /* types_skipper.hpp */; };
 		671C621C1AE9227C00076BD0 /* algos_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671C62131AE9227C00076BD0 /* algos_tests.cpp */; };
@@ -117,13 +75,54 @@
 		675346F01A40560D00A0A8C3 /* params.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675346D21A40560D00A0A8C3 /* params.hpp */; };
 		675346F11A40560D00A0A8C3 /* result.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675346D31A40560D00A0A8C3 /* result.cpp */; };
 		675346F21A40560D00A0A8C3 /* result.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675346D41A40560D00A0A8C3 /* result.hpp */; };
-		675346F31A40560D00A0A8C3 /* search_common.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675346D51A40560D00A0A8C3 /* search_common.hpp */; };
-		675346F41A40560D00A0A8C3 /* search_engine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675346D61A40560D00A0A8C3 /* search_engine.cpp */; };
-		675346F51A40560D00A0A8C3 /* search_engine.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675346D71A40560D00A0A8C3 /* search_engine.hpp */; };
-		675346F81A40560D00A0A8C3 /* search_string_intersection.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675346DA1A40560D00A0A8C3 /* search_string_intersection.hpp */; };
 		A1347D511B8758C3009050FF /* query_saver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A1347D4F1B8758C3009050FF /* query_saver.cpp */; };
 		A1347D521B8758C3009050FF /* query_saver.hpp in Headers */ = {isa = PBXBuildFile; fileRef = A1347D501B8758C3009050FF /* query_saver.hpp */; };
 		A1347D551B8758E9009050FF /* query_saver_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A1347D541B8758E9009050FF /* query_saver_tests.cpp */; };
+		F652D8BE1CFDE1E800FC29A0 /* common.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F652D8BA1CFDE1E800FC29A0 /* common.hpp */; };
+		F652D8BF1CFDE1E800FC29A0 /* engine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F652D8BB1CFDE1E800FC29A0 /* engine.cpp */; };
+		F652D8C01CFDE1E800FC29A0 /* engine.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F652D8BC1CFDE1E800FC29A0 /* engine.hpp */; };
+		F652D8C11CFDE1E800FC29A0 /* features_filter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F652D8BD1CFDE1E800FC29A0 /* features_filter.cpp */; };
+		F652D8E91CFDE21900FC29A0 /* features_filter.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F652D8C21CFDE21900FC29A0 /* features_filter.hpp */; };
+		F652D8EA1CFDE21900FC29A0 /* features_layer_matcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F652D8C31CFDE21900FC29A0 /* features_layer_matcher.cpp */; };
+		F652D8EB1CFDE21900FC29A0 /* features_layer_matcher.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F652D8C41CFDE21900FC29A0 /* features_layer_matcher.hpp */; };
+		F652D8EC1CFDE21900FC29A0 /* features_layer_path_finder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F652D8C51CFDE21900FC29A0 /* features_layer_path_finder.cpp */; };
+		F652D8ED1CFDE21900FC29A0 /* features_layer_path_finder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F652D8C61CFDE21900FC29A0 /* features_layer_path_finder.hpp */; };
+		F652D8EE1CFDE21900FC29A0 /* features_layer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F652D8C71CFDE21900FC29A0 /* features_layer.cpp */; };
+		F652D8EF1CFDE21900FC29A0 /* features_layer.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F652D8C81CFDE21900FC29A0 /* features_layer.hpp */; };
+		F652D8F01CFDE21900FC29A0 /* geocoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F652D8C91CFDE21900FC29A0 /* geocoder.cpp */; };
+		F652D8F11CFDE21900FC29A0 /* geocoder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F652D8CA1CFDE21900FC29A0 /* geocoder.hpp */; };
+		F652D8F21CFDE21900FC29A0 /* geometry_cache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F652D8CB1CFDE21900FC29A0 /* geometry_cache.cpp */; };
+		F652D8F31CFDE21900FC29A0 /* geometry_cache.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F652D8CC1CFDE21900FC29A0 /* geometry_cache.hpp */; };
+		F652D8F41CFDE21900FC29A0 /* house_numbers_matcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F652D8CD1CFDE21900FC29A0 /* house_numbers_matcher.cpp */; };
+		F652D8F51CFDE21900FC29A0 /* house_numbers_matcher.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F652D8CE1CFDE21900FC29A0 /* house_numbers_matcher.hpp */; };
+		F652D8F61CFDE21900FC29A0 /* house_to_street_table.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F652D8CF1CFDE21900FC29A0 /* house_to_street_table.cpp */; };
+		F652D8F71CFDE21900FC29A0 /* house_to_street_table.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F652D8D01CFDE21900FC29A0 /* house_to_street_table.hpp */; };
+		F652D8F81CFDE21900FC29A0 /* intersection_result.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F652D8D11CFDE21900FC29A0 /* intersection_result.cpp */; };
+		F652D8F91CFDE21900FC29A0 /* intersection_result.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F652D8D21CFDE21900FC29A0 /* intersection_result.hpp */; };
+		F652D8FA1CFDE21900FC29A0 /* locality_scorer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F652D8D31CFDE21900FC29A0 /* locality_scorer.cpp */; };
+		F652D8FB1CFDE21900FC29A0 /* locality_scorer.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F652D8D41CFDE21900FC29A0 /* locality_scorer.hpp */; };
+		F652D8FC1CFDE21900FC29A0 /* model.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F652D8D51CFDE21900FC29A0 /* model.cpp */; };
+		F652D8FD1CFDE21900FC29A0 /* model.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F652D8D61CFDE21900FC29A0 /* model.hpp */; };
+		F652D8FE1CFDE21900FC29A0 /* mwm_context.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F652D8D71CFDE21900FC29A0 /* mwm_context.cpp */; };
+		F652D8FF1CFDE21900FC29A0 /* mwm_context.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F652D8D81CFDE21900FC29A0 /* mwm_context.hpp */; };
+		F652D9001CFDE21900FC29A0 /* nested_rects_cache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F652D8D91CFDE21900FC29A0 /* nested_rects_cache.cpp */; };
+		F652D9011CFDE21900FC29A0 /* nested_rects_cache.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F652D8DA1CFDE21900FC29A0 /* nested_rects_cache.hpp */; };
+		F652D9021CFDE21900FC29A0 /* pre_ranking_info.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F652D8DB1CFDE21900FC29A0 /* pre_ranking_info.cpp */; };
+		F652D9031CFDE21900FC29A0 /* pre_ranking_info.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F652D8DC1CFDE21900FC29A0 /* pre_ranking_info.hpp */; };
+		F652D9041CFDE21900FC29A0 /* rank_table_cache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F652D8DD1CFDE21900FC29A0 /* rank_table_cache.cpp */; };
+		F652D9051CFDE21900FC29A0 /* rank_table_cache.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F652D8DE1CFDE21900FC29A0 /* rank_table_cache.hpp */; };
+		F652D9061CFDE21900FC29A0 /* ranking_info.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F652D8DF1CFDE21900FC29A0 /* ranking_info.cpp */; };
+		F652D9071CFDE21900FC29A0 /* ranking_info.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F652D8E01CFDE21900FC29A0 /* ranking_info.hpp */; };
+		F652D9081CFDE21900FC29A0 /* ranking_utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F652D8E11CFDE21900FC29A0 /* ranking_utils.cpp */; };
+		F652D9091CFDE21900FC29A0 /* ranking_utils.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F652D8E21CFDE21900FC29A0 /* ranking_utils.hpp */; };
+		F652D90A1CFDE21900FC29A0 /* stats_cache.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F652D8E31CFDE21900FC29A0 /* stats_cache.hpp */; };
+		F652D90B1CFDE21900FC29A0 /* street_vicinity_loader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F652D8E41CFDE21900FC29A0 /* street_vicinity_loader.cpp */; };
+		F652D90C1CFDE21900FC29A0 /* street_vicinity_loader.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F652D8E51CFDE21900FC29A0 /* street_vicinity_loader.hpp */; };
+		F652D90D1CFDE21900FC29A0 /* string_intersection.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F652D8E61CFDE21900FC29A0 /* string_intersection.hpp */; };
+		F652D90E1CFDE21900FC29A0 /* token_slice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F652D8E71CFDE21900FC29A0 /* token_slice.cpp */; };
+		F652D90F1CFDE21900FC29A0 /* token_slice.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F652D8E81CFDE21900FC29A0 /* token_slice.hpp */; };
+		F652D9121CFDE84200FC29A0 /* cbv_ptr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F652D9101CFDE84200FC29A0 /* cbv_ptr.cpp */; };
+		F652D9131CFDE84200FC29A0 /* cbv_ptr.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F652D9111CFDE84200FC29A0 /* cbv_ptr.hpp */; };
 		F659FC6D1CF4A30B000A06B1 /* pre_ranker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F659FC6B1CF4A30B000A06B1 /* pre_ranker.cpp */; };
 		F659FC6E1CF4A30B000A06B1 /* pre_ranker.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F659FC6C1CF4A30B000A06B1 /* pre_ranker.hpp */; };
 /* End PBXBuildFile section */
@@ -141,22 +140,11 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		3400A67B1CA27774003DA0EC /* geometry_cache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = geometry_cache.cpp; sourceTree = "<group>"; };
-		3400A67C1CA27774003DA0EC /* geometry_cache.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = geometry_cache.hpp; sourceTree = "<group>"; };
-		341F6D871CCE13C2003F4DB2 /* token_slice.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = token_slice.cpp; sourceTree = "<group>"; };
-		341F6D881CCE13C2003F4DB2 /* token_slice.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = token_slice.hpp; sourceTree = "<group>"; };
-		3441CE421CFC1D1300CF30D4 /* processor_v2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = processor_v2.cpp; sourceTree = "<group>"; };
-		3441CE431CFC1D1300CF30D4 /* processor_v2.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = processor_v2.hpp; sourceTree = "<group>"; };
 		3441CE4A1CFC1D7000CF30D4 /* processor_factory.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = processor_factory.hpp; sourceTree = "<group>"; };
 		3441CE4B1CFC1D7000CF30D4 /* processor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = processor.cpp; sourceTree = "<group>"; };
 		3441CE4C1CFC1D7000CF30D4 /* processor.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = processor.hpp; sourceTree = "<group>"; };
 		3441CE4D1CFC1D7000CF30D4 /* query_params.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = query_params.cpp; sourceTree = "<group>"; };
 		3441CE4E1CFC1D7000CF30D4 /* query_params.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = query_params.hpp; sourceTree = "<group>"; };
-		34527C541C89D6240015050E /* pre_ranking_info.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = pre_ranking_info.hpp; sourceTree = "<group>"; };
-		34527C551C89D6240015050E /* ranking_info.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ranking_info.cpp; sourceTree = "<group>"; };
-		34527C561C89D6240015050E /* ranking_info.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ranking_info.hpp; sourceTree = "<group>"; };
-		345FBECD1C8045EB00831ED6 /* ranking_utils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ranking_utils.cpp; sourceTree = "<group>"; };
-		345FBECE1C8045EB00831ED6 /* ranking_utils.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ranking_utils.hpp; sourceTree = "<group>"; };
 		347F32FB1C4540A8009758CC /* cancel_exception.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = cancel_exception.hpp; sourceTree = "<group>"; };
 		347F32FE1C4540A8009758CC /* dummy_rank_table.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dummy_rank_table.cpp; sourceTree = "<group>"; };
 		347F32FF1C4540A8009758CC /* dummy_rank_table.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = dummy_rank_table.hpp; sourceTree = "<group>"; };
@@ -174,39 +162,8 @@
 		347F330F1C4540A8009758CC /* search_index_values.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = search_index_values.hpp; sourceTree = "<group>"; };
 		347F33141C4540A8009758CC /* search_trie.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = search_trie.hpp; sourceTree = "<group>"; };
 		347F33151C4540A8009758CC /* suggest.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = suggest.hpp; sourceTree = "<group>"; };
-		347F333E1C45413C009758CC /* features_filter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = features_filter.cpp; sourceTree = "<group>"; };
-		347F333F1C45413C009758CC /* features_filter.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = features_filter.hpp; sourceTree = "<group>"; };
-		347F33401C45413C009758CC /* features_layer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = features_layer.cpp; sourceTree = "<group>"; };
-		347F33411C45413C009758CC /* features_layer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = features_layer.hpp; sourceTree = "<group>"; };
-		347F33421C45413C009758CC /* features_layer_matcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = features_layer_matcher.cpp; sourceTree = "<group>"; };
-		347F33431C45413C009758CC /* features_layer_matcher.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = features_layer_matcher.hpp; sourceTree = "<group>"; };
-		347F33441C45413C009758CC /* features_layer_path_finder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = features_layer_path_finder.cpp; sourceTree = "<group>"; };
-		347F33451C45413C009758CC /* features_layer_path_finder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = features_layer_path_finder.hpp; sourceTree = "<group>"; };
-		347F33461C45413C009758CC /* geocoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = geocoder.cpp; sourceTree = "<group>"; };
-		347F33471C45413C009758CC /* geocoder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = geocoder.hpp; sourceTree = "<group>"; };
-		347F33481C45413C009758CC /* house_numbers_matcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = house_numbers_matcher.cpp; sourceTree = "<group>"; };
-		347F33491C45413C009758CC /* house_numbers_matcher.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = house_numbers_matcher.hpp; sourceTree = "<group>"; };
-		347F334A1C45413C009758CC /* house_to_street_table.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = house_to_street_table.cpp; sourceTree = "<group>"; };
-		347F334B1C45413C009758CC /* house_to_street_table.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = house_to_street_table.hpp; sourceTree = "<group>"; };
-		347F334C1C45413C009758CC /* mwm_context.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mwm_context.cpp; sourceTree = "<group>"; };
-		347F334D1C45413C009758CC /* mwm_context.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = mwm_context.hpp; sourceTree = "<group>"; };
-		347F334E1C45413C009758CC /* rank_table_cache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rank_table_cache.cpp; sourceTree = "<group>"; };
-		347F334F1C45413C009758CC /* rank_table_cache.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = rank_table_cache.hpp; sourceTree = "<group>"; };
-		347F33501C45413C009758CC /* search_model.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = search_model.cpp; sourceTree = "<group>"; };
-		347F33511C45413C009758CC /* search_model.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = search_model.hpp; sourceTree = "<group>"; };
-		347F33541C45413C009758CC /* street_vicinity_loader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = street_vicinity_loader.cpp; sourceTree = "<group>"; };
-		347F33551C45413C009758CC /* street_vicinity_loader.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = street_vicinity_loader.hpp; sourceTree = "<group>"; };
-		34C0C4151C9AE1FA00FDA0D1 /* nested_rects_cache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = nested_rects_cache.cpp; sourceTree = "<group>"; };
-		34C0C4161C9AE1FA00FDA0D1 /* nested_rects_cache.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = nested_rects_cache.hpp; sourceTree = "<group>"; };
-		34E44E6E1C4922E40057A5C4 /* intersection_result.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = intersection_result.cpp; sourceTree = "<group>"; };
-		34E44E6F1C4922E40057A5C4 /* intersection_result.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = intersection_result.hpp; sourceTree = "<group>"; };
-		34E44E721C4923100057A5C4 /* cbv_ptr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cbv_ptr.cpp; sourceTree = "<group>"; };
-		34E44E731C4923100057A5C4 /* cbv_ptr.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = cbv_ptr.hpp; sourceTree = "<group>"; };
 		56D5456C1C74A48C00E3719C /* mode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mode.cpp; sourceTree = "<group>"; };
 		56D5456D1C74A48C00E3719C /* mode.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = mode.hpp; sourceTree = "<group>"; };
-		56EB1ED21C6B6E130022D831 /* locality_scorer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = locality_scorer.cpp; sourceTree = "<group>"; };
-		56EB1ED31C6B6E130022D831 /* locality_scorer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = locality_scorer.hpp; sourceTree = "<group>"; };
-		56EB1ED41C6B6E130022D831 /* stats_cache.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = stats_cache.hpp; sourceTree = "<group>"; };
 		670D05A31B0DF3C30013A7AC /* defaults.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = defaults.xcconfig; path = ../defaults.xcconfig; sourceTree = "<group>"; };
 		670F88721CE4C032003F68BA /* types_skipper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = types_skipper.cpp; sourceTree = "<group>"; };
 		670F88731CE4C032003F68BA /* types_skipper.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = types_skipper.hpp; sourceTree = "<group>"; };
@@ -254,13 +211,54 @@
 		675346D21A40560D00A0A8C3 /* params.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = params.hpp; sourceTree = "<group>"; };
 		675346D31A40560D00A0A8C3 /* result.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = result.cpp; sourceTree = "<group>"; };
 		675346D41A40560D00A0A8C3 /* result.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = result.hpp; sourceTree = "<group>"; };
-		675346D51A40560D00A0A8C3 /* search_common.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = search_common.hpp; sourceTree = "<group>"; };
-		675346D61A40560D00A0A8C3 /* search_engine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = search_engine.cpp; sourceTree = "<group>"; };
-		675346D71A40560D00A0A8C3 /* search_engine.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = search_engine.hpp; sourceTree = "<group>"; };
-		675346DA1A40560D00A0A8C3 /* search_string_intersection.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = search_string_intersection.hpp; sourceTree = "<group>"; };
 		A1347D4F1B8758C3009050FF /* query_saver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = query_saver.cpp; sourceTree = "<group>"; };
 		A1347D501B8758C3009050FF /* query_saver.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = query_saver.hpp; sourceTree = "<group>"; };
 		A1347D541B8758E9009050FF /* query_saver_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = query_saver_tests.cpp; sourceTree = "<group>"; };
+		F652D8BA1CFDE1E800FC29A0 /* common.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = common.hpp; sourceTree = "<group>"; };
+		F652D8BB1CFDE1E800FC29A0 /* engine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = engine.cpp; sourceTree = "<group>"; };
+		F652D8BC1CFDE1E800FC29A0 /* engine.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = engine.hpp; sourceTree = "<group>"; };
+		F652D8BD1CFDE1E800FC29A0 /* features_filter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = features_filter.cpp; sourceTree = "<group>"; };
+		F652D8C21CFDE21900FC29A0 /* features_filter.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = features_filter.hpp; sourceTree = "<group>"; };
+		F652D8C31CFDE21900FC29A0 /* features_layer_matcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = features_layer_matcher.cpp; sourceTree = "<group>"; };
+		F652D8C41CFDE21900FC29A0 /* features_layer_matcher.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = features_layer_matcher.hpp; sourceTree = "<group>"; };
+		F652D8C51CFDE21900FC29A0 /* features_layer_path_finder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = features_layer_path_finder.cpp; sourceTree = "<group>"; };
+		F652D8C61CFDE21900FC29A0 /* features_layer_path_finder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = features_layer_path_finder.hpp; sourceTree = "<group>"; };
+		F652D8C71CFDE21900FC29A0 /* features_layer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = features_layer.cpp; sourceTree = "<group>"; };
+		F652D8C81CFDE21900FC29A0 /* features_layer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = features_layer.hpp; sourceTree = "<group>"; };
+		F652D8C91CFDE21900FC29A0 /* geocoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = geocoder.cpp; sourceTree = "<group>"; };
+		F652D8CA1CFDE21900FC29A0 /* geocoder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = geocoder.hpp; sourceTree = "<group>"; };
+		F652D8CB1CFDE21900FC29A0 /* geometry_cache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = geometry_cache.cpp; sourceTree = "<group>"; };
+		F652D8CC1CFDE21900FC29A0 /* geometry_cache.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = geometry_cache.hpp; sourceTree = "<group>"; };
+		F652D8CD1CFDE21900FC29A0 /* house_numbers_matcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = house_numbers_matcher.cpp; sourceTree = "<group>"; };
+		F652D8CE1CFDE21900FC29A0 /* house_numbers_matcher.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = house_numbers_matcher.hpp; sourceTree = "<group>"; };
+		F652D8CF1CFDE21900FC29A0 /* house_to_street_table.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = house_to_street_table.cpp; sourceTree = "<group>"; };
+		F652D8D01CFDE21900FC29A0 /* house_to_street_table.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = house_to_street_table.hpp; sourceTree = "<group>"; };
+		F652D8D11CFDE21900FC29A0 /* intersection_result.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = intersection_result.cpp; sourceTree = "<group>"; };
+		F652D8D21CFDE21900FC29A0 /* intersection_result.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = intersection_result.hpp; sourceTree = "<group>"; };
+		F652D8D31CFDE21900FC29A0 /* locality_scorer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = locality_scorer.cpp; sourceTree = "<group>"; };
+		F652D8D41CFDE21900FC29A0 /* locality_scorer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = locality_scorer.hpp; sourceTree = "<group>"; };
+		F652D8D51CFDE21900FC29A0 /* model.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = model.cpp; sourceTree = "<group>"; };
+		F652D8D61CFDE21900FC29A0 /* model.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = model.hpp; sourceTree = "<group>"; };
+		F652D8D71CFDE21900FC29A0 /* mwm_context.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mwm_context.cpp; sourceTree = "<group>"; };
+		F652D8D81CFDE21900FC29A0 /* mwm_context.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = mwm_context.hpp; sourceTree = "<group>"; };
+		F652D8D91CFDE21900FC29A0 /* nested_rects_cache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = nested_rects_cache.cpp; sourceTree = "<group>"; };
+		F652D8DA1CFDE21900FC29A0 /* nested_rects_cache.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = nested_rects_cache.hpp; sourceTree = "<group>"; };
+		F652D8DB1CFDE21900FC29A0 /* pre_ranking_info.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pre_ranking_info.cpp; sourceTree = "<group>"; };
+		F652D8DC1CFDE21900FC29A0 /* pre_ranking_info.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = pre_ranking_info.hpp; sourceTree = "<group>"; };
+		F652D8DD1CFDE21900FC29A0 /* rank_table_cache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rank_table_cache.cpp; sourceTree = "<group>"; };
+		F652D8DE1CFDE21900FC29A0 /* rank_table_cache.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = rank_table_cache.hpp; sourceTree = "<group>"; };
+		F652D8DF1CFDE21900FC29A0 /* ranking_info.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ranking_info.cpp; sourceTree = "<group>"; };
+		F652D8E01CFDE21900FC29A0 /* ranking_info.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ranking_info.hpp; sourceTree = "<group>"; };
+		F652D8E11CFDE21900FC29A0 /* ranking_utils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ranking_utils.cpp; sourceTree = "<group>"; };
+		F652D8E21CFDE21900FC29A0 /* ranking_utils.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ranking_utils.hpp; sourceTree = "<group>"; };
+		F652D8E31CFDE21900FC29A0 /* stats_cache.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = stats_cache.hpp; sourceTree = "<group>"; };
+		F652D8E41CFDE21900FC29A0 /* street_vicinity_loader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = street_vicinity_loader.cpp; sourceTree = "<group>"; };
+		F652D8E51CFDE21900FC29A0 /* street_vicinity_loader.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = street_vicinity_loader.hpp; sourceTree = "<group>"; };
+		F652D8E61CFDE21900FC29A0 /* string_intersection.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = string_intersection.hpp; sourceTree = "<group>"; };
+		F652D8E71CFDE21900FC29A0 /* token_slice.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = token_slice.cpp; sourceTree = "<group>"; };
+		F652D8E81CFDE21900FC29A0 /* token_slice.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = token_slice.hpp; sourceTree = "<group>"; };
+		F652D9101CFDE84200FC29A0 /* cbv_ptr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cbv_ptr.cpp; sourceTree = "<group>"; };
+		F652D9111CFDE84200FC29A0 /* cbv_ptr.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = cbv_ptr.hpp; sourceTree = "<group>"; };
 		F659FC6B1CF4A30B000A06B1 /* pre_ranker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pre_ranker.cpp; sourceTree = "<group>"; };
 		F659FC6C1CF4A30B000A06B1 /* pre_ranker.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = pre_ranker.hpp; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -294,55 +292,6 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		347F333D1C45413C009758CC /* v2 */ = {
-			isa = PBXGroup;
-			children = (
-				3441CE421CFC1D1300CF30D4 /* processor_v2.cpp */,
-				3441CE431CFC1D1300CF30D4 /* processor_v2.hpp */,
-				341F6D871CCE13C2003F4DB2 /* token_slice.cpp */,
-				341F6D881CCE13C2003F4DB2 /* token_slice.hpp */,
-				3400A67B1CA27774003DA0EC /* geometry_cache.cpp */,
-				3400A67C1CA27774003DA0EC /* geometry_cache.hpp */,
-				34C0C4151C9AE1FA00FDA0D1 /* nested_rects_cache.cpp */,
-				34C0C4161C9AE1FA00FDA0D1 /* nested_rects_cache.hpp */,
-				34527C541C89D6240015050E /* pre_ranking_info.hpp */,
-				34527C551C89D6240015050E /* ranking_info.cpp */,
-				34527C561C89D6240015050E /* ranking_info.hpp */,
-				345FBECD1C8045EB00831ED6 /* ranking_utils.cpp */,
-				345FBECE1C8045EB00831ED6 /* ranking_utils.hpp */,
-				56EB1ED21C6B6E130022D831 /* locality_scorer.cpp */,
-				56EB1ED31C6B6E130022D831 /* locality_scorer.hpp */,
-				56EB1ED41C6B6E130022D831 /* stats_cache.hpp */,
-				34E44E721C4923100057A5C4 /* cbv_ptr.cpp */,
-				34E44E731C4923100057A5C4 /* cbv_ptr.hpp */,
-				34E44E6E1C4922E40057A5C4 /* intersection_result.cpp */,
-				34E44E6F1C4922E40057A5C4 /* intersection_result.hpp */,
-				347F333E1C45413C009758CC /* features_filter.cpp */,
-				347F333F1C45413C009758CC /* features_filter.hpp */,
-				347F33401C45413C009758CC /* features_layer.cpp */,
-				347F33411C45413C009758CC /* features_layer.hpp */,
-				347F33421C45413C009758CC /* features_layer_matcher.cpp */,
-				347F33431C45413C009758CC /* features_layer_matcher.hpp */,
-				347F33441C45413C009758CC /* features_layer_path_finder.cpp */,
-				347F33451C45413C009758CC /* features_layer_path_finder.hpp */,
-				347F33461C45413C009758CC /* geocoder.cpp */,
-				347F33471C45413C009758CC /* geocoder.hpp */,
-				347F33481C45413C009758CC /* house_numbers_matcher.cpp */,
-				347F33491C45413C009758CC /* house_numbers_matcher.hpp */,
-				347F334A1C45413C009758CC /* house_to_street_table.cpp */,
-				347F334B1C45413C009758CC /* house_to_street_table.hpp */,
-				347F334C1C45413C009758CC /* mwm_context.cpp */,
-				347F334D1C45413C009758CC /* mwm_context.hpp */,
-				347F334E1C45413C009758CC /* rank_table_cache.cpp */,
-				347F334F1C45413C009758CC /* rank_table_cache.hpp */,
-				347F33501C45413C009758CC /* search_model.cpp */,
-				347F33511C45413C009758CC /* search_model.hpp */,
-				347F33541C45413C009758CC /* street_vicinity_loader.cpp */,
-				347F33551C45413C009758CC /* street_vicinity_loader.hpp */,
-			);
-			path = v2;
-			sourceTree = "<group>";
-		};
 		670D04A61B0B94F90013A7AC /* libs */ = {
 			isa = PBXGroup;
 			children = (
@@ -402,6 +351,51 @@
 		675346B21A4055CF00A0A8C3 /* search */ = {
 			isa = PBXGroup;
 			children = (
+				F652D9101CFDE84200FC29A0 /* cbv_ptr.cpp */,
+				F652D9111CFDE84200FC29A0 /* cbv_ptr.hpp */,
+				F652D8C21CFDE21900FC29A0 /* features_filter.hpp */,
+				F652D8C31CFDE21900FC29A0 /* features_layer_matcher.cpp */,
+				F652D8C41CFDE21900FC29A0 /* features_layer_matcher.hpp */,
+				F652D8C51CFDE21900FC29A0 /* features_layer_path_finder.cpp */,
+				F652D8C61CFDE21900FC29A0 /* features_layer_path_finder.hpp */,
+				F652D8C71CFDE21900FC29A0 /* features_layer.cpp */,
+				F652D8C81CFDE21900FC29A0 /* features_layer.hpp */,
+				F652D8C91CFDE21900FC29A0 /* geocoder.cpp */,
+				F652D8CA1CFDE21900FC29A0 /* geocoder.hpp */,
+				F652D8CB1CFDE21900FC29A0 /* geometry_cache.cpp */,
+				F652D8CC1CFDE21900FC29A0 /* geometry_cache.hpp */,
+				F652D8CD1CFDE21900FC29A0 /* house_numbers_matcher.cpp */,
+				F652D8CE1CFDE21900FC29A0 /* house_numbers_matcher.hpp */,
+				F652D8CF1CFDE21900FC29A0 /* house_to_street_table.cpp */,
+				F652D8D01CFDE21900FC29A0 /* house_to_street_table.hpp */,
+				F652D8D11CFDE21900FC29A0 /* intersection_result.cpp */,
+				F652D8D21CFDE21900FC29A0 /* intersection_result.hpp */,
+				F652D8D31CFDE21900FC29A0 /* locality_scorer.cpp */,
+				F652D8D41CFDE21900FC29A0 /* locality_scorer.hpp */,
+				F652D8D51CFDE21900FC29A0 /* model.cpp */,
+				F652D8D61CFDE21900FC29A0 /* model.hpp */,
+				F652D8D71CFDE21900FC29A0 /* mwm_context.cpp */,
+				F652D8D81CFDE21900FC29A0 /* mwm_context.hpp */,
+				F652D8D91CFDE21900FC29A0 /* nested_rects_cache.cpp */,
+				F652D8DA1CFDE21900FC29A0 /* nested_rects_cache.hpp */,
+				F652D8DB1CFDE21900FC29A0 /* pre_ranking_info.cpp */,
+				F652D8DC1CFDE21900FC29A0 /* pre_ranking_info.hpp */,
+				F652D8DD1CFDE21900FC29A0 /* rank_table_cache.cpp */,
+				F652D8DE1CFDE21900FC29A0 /* rank_table_cache.hpp */,
+				F652D8DF1CFDE21900FC29A0 /* ranking_info.cpp */,
+				F652D8E01CFDE21900FC29A0 /* ranking_info.hpp */,
+				F652D8E11CFDE21900FC29A0 /* ranking_utils.cpp */,
+				F652D8E21CFDE21900FC29A0 /* ranking_utils.hpp */,
+				F652D8E31CFDE21900FC29A0 /* stats_cache.hpp */,
+				F652D8E41CFDE21900FC29A0 /* street_vicinity_loader.cpp */,
+				F652D8E51CFDE21900FC29A0 /* street_vicinity_loader.hpp */,
+				F652D8E61CFDE21900FC29A0 /* string_intersection.hpp */,
+				F652D8E71CFDE21900FC29A0 /* token_slice.cpp */,
+				F652D8E81CFDE21900FC29A0 /* token_slice.hpp */,
+				F652D8BA1CFDE1E800FC29A0 /* common.hpp */,
+				F652D8BB1CFDE1E800FC29A0 /* engine.cpp */,
+				F652D8BC1CFDE1E800FC29A0 /* engine.hpp */,
+				F652D8BD1CFDE1E800FC29A0 /* features_filter.cpp */,
 				3441CE4A1CFC1D7000CF30D4 /* processor_factory.hpp */,
 				3441CE4B1CFC1D7000CF30D4 /* processor.cpp */,
 				3441CE4C1CFC1D7000CF30D4 /* processor.hpp */,
@@ -413,7 +407,6 @@
 				670F88731CE4C032003F68BA /* types_skipper.hpp */,
 				56D5456C1C74A48C00E3719C /* mode.cpp */,
 				56D5456D1C74A48C00E3719C /* mode.hpp */,
-				347F333D1C45413C009758CC /* v2 */,
 				347F32FB1C4540A8009758CC /* cancel_exception.hpp */,
 				347F32FE1C4540A8009758CC /* dummy_rank_table.cpp */,
 				347F32FF1C4540A8009758CC /* dummy_rank_table.hpp */,
@@ -455,10 +448,6 @@
 				675346D21A40560D00A0A8C3 /* params.hpp */,
 				675346D31A40560D00A0A8C3 /* result.cpp */,
 				675346D41A40560D00A0A8C3 /* result.hpp */,
-				675346D51A40560D00A0A8C3 /* search_common.hpp */,
-				675346D61A40560D00A0A8C3 /* search_engine.cpp */,
-				675346D71A40560D00A0A8C3 /* search_engine.hpp */,
-				675346DA1A40560D00A0A8C3 /* search_string_intersection.hpp */,
 			);
 			name = search;
 			path = ../../search;
@@ -471,61 +460,60 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				F652D90C1CFDE21900FC29A0 /* street_vicinity_loader.hpp in Headers */,
+				F652D9011CFDE21900FC29A0 /* nested_rects_cache.hpp in Headers */,
 				675346F01A40560D00A0A8C3 /* params.hpp in Headers */,
 				670F88751CE4C032003F68BA /* types_skipper.hpp in Headers */,
+				F652D8F71CFDE21900FC29A0 /* house_to_street_table.hpp in Headers */,
 				347F331D1C4540A8009758CC /* locality.hpp in Headers */,
-				675346F81A40560D00A0A8C3 /* search_string_intersection.hpp in Headers */,
-				347F33671C45413C009758CC /* rank_table_cache.hpp in Headers */,
 				347F332F1C4540A8009758CC /* search_trie.hpp in Headers */,
+				F652D8FB1CFDE21900FC29A0 /* locality_scorer.hpp in Headers */,
 				F659FC6E1CF4A30B000A06B1 /* pre_ranker.hpp in Headers */,
+				F652D8ED1CFDE21900FC29A0 /* features_layer_path_finder.hpp in Headers */,
+				F652D90A1CFDE21900FC29A0 /* stats_cache.hpp in Headers */,
 				675346E11A40560D00A0A8C3 /* geometry_utils.hpp in Headers */,
 				675346E31A40560D00A0A8C3 /* house_detector.hpp in Headers */,
+				F652D9071CFDE21900FC29A0 /* ranking_info.hpp in Headers */,
+				F652D8BE1CFDE1E800FC29A0 /* common.hpp in Headers */,
+				F652D8E91CFDE21900FC29A0 /* features_filter.hpp in Headers */,
+				F652D90F1CFDE21900FC29A0 /* token_slice.hpp in Headers */,
+				F652D9031CFDE21900FC29A0 /* pre_ranking_info.hpp in Headers */,
 				675346E61A40560D00A0A8C3 /* intermediate_result.hpp in Headers */,
-				347F335D1C45413C009758CC /* features_layer_path_finder.hpp in Headers */,
-				347F33611C45413C009758CC /* house_numbers_matcher.hpp in Headers */,
 				347F33231C4540A8009758CC /* region.hpp in Headers */,
-				347F33691C45413C009758CC /* search_model.hpp in Headers */,
 				347F33301C4540A8009758CC /* suggest.hpp in Headers */,
+				F652D9091CFDE21900FC29A0 /* ranking_utils.hpp in Headers */,
 				56D5456F1C74A48C00E3719C /* mode.hpp in Headers */,
 				347F332A1C4540A8009758CC /* search_index_values.hpp in Headers */,
 				347F33161C4540A8009758CC /* cancel_exception.hpp in Headers */,
-				347F33631C45413C009758CC /* house_to_street_table.hpp in Headers */,
-				347F335B1C45413C009758CC /* features_layer_matcher.hpp in Headers */,
-				34527C581C89D6240015050E /* pre_ranking_info.hpp in Headers */,
+				F652D9131CFDE84200FC29A0 /* cbv_ptr.hpp in Headers */,
 				3441CE4F1CFC1D7000CF30D4 /* processor_factory.hpp in Headers */,
 				675346DE1A40560D00A0A8C3 /* approximate_string_match.hpp in Headers */,
-				56EB1ED61C6B6E130022D831 /* locality_scorer.hpp in Headers */,
-				3400A67E1CA27774003DA0EC /* geometry_cache.hpp in Headers */,
-				675346F31A40560D00A0A8C3 /* search_common.hpp in Headers */,
 				675346EE1A40560D00A0A8C3 /* locality_finder.hpp in Headers */,
 				675346EC1A40560D00A0A8C3 /* latlon_match.hpp in Headers */,
-				347F33591C45413C009758CC /* features_layer.hpp in Headers */,
-				34E44E751C4923100057A5C4 /* cbv_ptr.hpp in Headers */,
-				347F336D1C45413C009758CC /* street_vicinity_loader.hpp in Headers */,
 				A1347D521B8758C3009050FF /* query_saver.hpp in Headers */,
 				675346EA1A40560D00A0A8C3 /* keyword_matcher.hpp in Headers */,
-				34527C5A1C89D6240015050E /* ranking_info.hpp in Headers */,
 				347F33211C4540A8009758CC /* projection_on_street.hpp in Headers */,
+				F652D8EF1CFDE21900FC29A0 /* features_layer.hpp in Headers */,
+				F652D8F91CFDE21900FC29A0 /* intersection_result.hpp in Headers */,
+				F652D8F11CFDE21900FC29A0 /* geocoder.hpp in Headers */,
+				F652D8F31CFDE21900FC29A0 /* geometry_cache.hpp in Headers */,
+				F652D8EB1CFDE21900FC29A0 /* features_layer_matcher.hpp in Headers */,
 				347F331B1C4540A8009758CC /* interval_set.hpp in Headers */,
+				F652D9051CFDE21900FC29A0 /* rank_table_cache.hpp in Headers */,
+				F652D90D1CFDE21900FC29A0 /* string_intersection.hpp in Headers */,
+				F652D8C01CFDE1E800FC29A0 /* engine.hpp in Headers */,
 				675346DF1A40560D00A0A8C3 /* feature_offset_match.hpp in Headers */,
-				675346F51A40560D00A0A8C3 /* search_engine.hpp in Headers */,
 				347F331A1C4540A8009758CC /* dummy_rank_table.hpp in Headers */,
-				347F335F1C45413C009758CC /* geocoder.hpp in Headers */,
-				34E44E711C4922E40057A5C4 /* intersection_result.hpp in Headers */,
-				347F33571C45413C009758CC /* features_filter.hpp in Headers */,
-				345FBED01C8045EB00831ED6 /* ranking_utils.hpp in Headers */,
 				3441CE511CFC1D7000CF30D4 /* processor.hpp in Headers */,
-				341F6D8C1CCE13C3003F4DB2 /* token_slice.hpp in Headers */,
-				347F33651C45413C009758CC /* mwm_context.hpp in Headers */,
 				3441CE531CFC1D7000CF30D4 /* query_params.hpp in Headers */,
 				675346DC1A40560D00A0A8C3 /* algos.hpp in Headers */,
-				3441CE451CFC1D1300CF30D4 /* processor_v2.hpp in Headers */,
-				34C0C4181C9AE1FA00FDA0D1 /* nested_rects_cache.hpp in Headers */,
+				F652D8FD1CFDE21900FC29A0 /* model.hpp in Headers */,
+				F652D8FF1CFDE21900FC29A0 /* mwm_context.hpp in Headers */,
 				675346E81A40560D00A0A8C3 /* keyword_lang_matcher.hpp in Headers */,
 				347F33271C4540A8009758CC /* reverse_geocoder.hpp in Headers */,
-				56EB1ED71C6B6E130022D831 /* stats_cache.hpp in Headers */,
 				675346F21A40560D00A0A8C3 /* result.hpp in Headers */,
 				347F33251C4540A8009758CC /* retrieval.hpp in Headers */,
+				F652D8F51CFDE21900FC29A0 /* house_numbers_matcher.hpp in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -622,48 +610,48 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				F652D8FA1CFDE21900FC29A0 /* locality_scorer.cpp in Sources */,
+				F652D8FE1CFDE21900FC29A0 /* mwm_context.cpp in Sources */,
+				F652D8F01CFDE21900FC29A0 /* geocoder.cpp in Sources */,
 				347F331C1C4540A8009758CC /* locality.cpp in Sources */,
-				345FBECF1C8045EB00831ED6 /* ranking_utils.cpp in Sources */,
+				F652D8F21CFDE21900FC29A0 /* geometry_cache.cpp in Sources */,
+				F652D8BF1CFDE1E800FC29A0 /* engine.cpp in Sources */,
 				675346DD1A40560D00A0A8C3 /* approximate_string_match.cpp in Sources */,
 				675346E51A40560D00A0A8C3 /* intermediate_result.cpp in Sources */,
+				F652D9021CFDE21900FC29A0 /* pre_ranking_info.cpp in Sources */,
 				675346EF1A40560D00A0A8C3 /* params.cpp in Sources */,
-				34C0C4171C9AE1FA00FDA0D1 /* nested_rects_cache.cpp in Sources */,
-				347F335C1C45413C009758CC /* features_layer_path_finder.cpp in Sources */,
 				347F33261C4540A8009758CC /* reverse_geocoder.cpp in Sources */,
 				A1347D511B8758C3009050FF /* query_saver.cpp in Sources */,
-				347F33561C45413C009758CC /* features_filter.cpp in Sources */,
 				675346E01A40560D00A0A8C3 /* geometry_utils.cpp in Sources */,
-				341F6D8B1CCE13C3003F4DB2 /* token_slice.cpp in Sources */,
-				34E44E741C4923100057A5C4 /* cbv_ptr.cpp in Sources */,
-				347F336C1C45413C009758CC /* street_vicinity_loader.cpp in Sources */,
+				F652D90E1CFDE21900FC29A0 /* token_slice.cpp in Sources */,
 				347F33201C4540A8009758CC /* projection_on_street.cpp in Sources */,
-				347F33601C45413C009758CC /* house_numbers_matcher.cpp in Sources */,
 				347F33191C4540A8009758CC /* dummy_rank_table.cpp in Sources */,
+				F652D8F41CFDE21900FC29A0 /* house_numbers_matcher.cpp in Sources */,
+				F652D8F61CFDE21900FC29A0 /* house_to_street_table.cpp in Sources */,
+				F652D8FC1CFDE21900FC29A0 /* model.cpp in Sources */,
 				675346F11A40560D00A0A8C3 /* result.cpp in Sources */,
-				56EB1ED51C6B6E130022D831 /* locality_scorer.cpp in Sources */,
-				347F33581C45413C009758CC /* features_layer.cpp in Sources */,
+				F652D8C11CFDE1E800FC29A0 /* features_filter.cpp in Sources */,
+				F652D8F81CFDE21900FC29A0 /* intersection_result.cpp in Sources */,
 				347F33221C4540A8009758CC /* region.cpp in Sources */,
+				F652D9061CFDE21900FC29A0 /* ranking_info.cpp in Sources */,
+				F652D9121CFDE84200FC29A0 /* cbv_ptr.cpp in Sources */,
+				F652D9001CFDE21900FC29A0 /* nested_rects_cache.cpp in Sources */,
 				3441CE501CFC1D7000CF30D4 /* processor.cpp in Sources */,
-				34527C591C89D6240015050E /* ranking_info.cpp in Sources */,
-				3441CE441CFC1D1300CF30D4 /* processor_v2.cpp in Sources */,
-				347F33641C45413C009758CC /* mwm_context.cpp in Sources */,
-				34E44E701C4922E40057A5C4 /* intersection_result.cpp in Sources */,
-				3400A67D1CA27774003DA0EC /* geometry_cache.cpp in Sources */,
-				347F335A1C45413C009758CC /* features_layer_matcher.cpp in Sources */,
+				F652D9041CFDE21900FC29A0 /* rank_table_cache.cpp in Sources */,
+				F652D8EE1CFDE21900FC29A0 /* features_layer.cpp in Sources */,
 				675346E21A40560D00A0A8C3 /* house_detector.cpp in Sources */,
-				347F33621C45413C009758CC /* house_to_street_table.cpp in Sources */,
 				F659FC6D1CF4A30B000A06B1 /* pre_ranker.cpp in Sources */,
-				347F33661C45413C009758CC /* rank_table_cache.cpp in Sources */,
-				675346F41A40560D00A0A8C3 /* search_engine.cpp in Sources */,
+				F652D9081CFDE21900FC29A0 /* ranking_utils.cpp in Sources */,
 				347F33241C4540A8009758CC /* retrieval.cpp in Sources */,
 				A1347D551B8758E9009050FF /* query_saver_tests.cpp in Sources */,
-				347F335E1C45413C009758CC /* geocoder.cpp in Sources */,
+				F652D90B1CFDE21900FC29A0 /* street_vicinity_loader.cpp in Sources */,
 				675346ED1A40560D00A0A8C3 /* locality_finder.cpp in Sources */,
 				56D5456E1C74A48C00E3719C /* mode.cpp in Sources */,
+				F652D8EC1CFDE21900FC29A0 /* features_layer_path_finder.cpp in Sources */,
 				3441CE521CFC1D7000CF30D4 /* query_params.cpp in Sources */,
-				347F33681C45413C009758CC /* search_model.cpp in Sources */,
 				670F88741CE4C032003F68BA /* types_skipper.cpp in Sources */,
 				675346EB1A40560D00A0A8C3 /* latlon_match.cpp in Sources */,
+				F652D8EA1CFDE21900FC29A0 /* features_layer_matcher.cpp in Sources */,
 				675346E91A40560D00A0A8C3 /* keyword_matcher.cpp in Sources */,
 				675346E71A40560D00A0A8C3 /* keyword_lang_matcher.cpp in Sources */,
 			);