diff --git a/CMakeLists.txt b/CMakeLists.txt index 76126de65..c559bf5c1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -185,7 +185,7 @@ if (NOT PLATFORM_IPHONE AND NOT PLATFORM_ANDROID) endif() # To allow #include "base/file_name.hpp" in all sources. -include_directories(${CMAKE_HOME_DIRECTORY}) +include_directories("${CMAKE_HOME_DIRECTORY}" "${CMAKE_HOME_DIRECTORY}/libs" "${CMAKE_HOME_DIRECTORY}/tools") if (USE_PCH) message(STATUS "Precompiled headers are ON") @@ -227,49 +227,22 @@ endif() # Used in qt/ and shaders/ find_package(Python3 REQUIRED COMPONENTS Interpreter) -add_subdirectory(base) -add_subdirectory(coding) -add_subdirectory(descriptions) -add_subdirectory(drape) -add_subdirectory(drape_frontend) -add_subdirectory(editor) -add_subdirectory(ge0) -add_subdirectory(generator/mwm_diff) -add_subdirectory(geometry) -add_subdirectory(indexer) -add_subdirectory(kml) -add_subdirectory(map) -add_subdirectory(cppjansson) -add_subdirectory(platform) -add_subdirectory(routing) -add_subdirectory(routing_common) -add_subdirectory(search) -add_subdirectory(shaders) -add_subdirectory(storage) -add_subdirectory(tracking) -add_subdirectory(traffic) -add_subdirectory(transit) +add_subdirectory(libs) if (PLATFORM_DESKTOP) - omim_add_tool_subdirectory(feature_list) + add_subdirectory(dev_sandbox) add_subdirectory(generator) - add_subdirectory(openlr) - add_subdirectory(poly_borders) - omim_add_tool_subdirectory(topography_generator) - add_subdirectory(track_analyzing) - omim_add_tool_subdirectory(track_generator) + add_subdirectory(tools) if (NOT SKIP_QT_GUI) add_subdirectory(qt) - omim_add_tool_subdirectory(skin_generator) endif() if (GENERATOR_TOOL) add_compile_options(-march=native -mtune=native) message(STATUS "target CPU optimizations enabled, produced binaries will NOT work on a different CPU") endif() - add_subdirectory(dev_sandbox) endif() -omim_add_test_subdirectory(qt_tstfrm) +omim_add_test_subdirectory(libs/qt_tstfrm) if (PLATFORM_ANDROID) add_subdirectory(android/sdk/src/main/cpp) diff --git a/cmake/OmimTesting.cmake b/cmake/OmimTesting.cmake index 18db1d68a..ea4898d0e 100644 --- a/cmake/OmimTesting.cmake +++ b/cmake/OmimTesting.cmake @@ -51,7 +51,7 @@ endfunction() function(omim_add_test_target name src no_platform_init require_qt boost_test) omim_add_executable(${name} ${src} - $<$>:${OMIM_ROOT}/testing/testingmain.cpp> + $<$>:${OMIM_ROOT}/libs/testing/testingmain.cpp> ) target_compile_options(${name} PRIVATE ${OMIM_WARNING_FLAGS}) target_include_directories(${name} PRIVATE ${OMIM_INCLUDE_DIRS}) diff --git a/dev_sandbox/CMakeLists.txt b/dev_sandbox/CMakeLists.txt index 4e2debc7c..e6a7ea573 100644 --- a/dev_sandbox/CMakeLists.txt +++ b/dev_sandbox/CMakeLists.txt @@ -13,7 +13,7 @@ if (${PLATFORM_MAC}) ../iphone/Maps/Classes/MetalContextFactory.mm ) - file(GLOB_RECURSE SHADER_SOURCES_FILES ${OMIM_ROOT}/shaders/Metal/*.metal) + file(GLOB_RECURSE SHADER_SOURCES_FILES ${OMIM_ROOT}/libs/shaders/Metal/*.metal) add_metal_shader_library(shaders_metal ${SHADER_SOURCES_FILES} ) diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt new file mode 100644 index 000000000..00a05fa9d --- /dev/null +++ b/libs/CMakeLists.txt @@ -0,0 +1,22 @@ +add_subdirectory(base) +add_subdirectory(coding) +add_subdirectory(descriptions) +add_subdirectory(drape) +add_subdirectory(drape_frontend) +add_subdirectory(editor) +add_subdirectory(ge0) +add_subdirectory(mwm_diff) +add_subdirectory(geometry) +add_subdirectory(indexer) +add_subdirectory(kml) +add_subdirectory(map) +add_subdirectory(cppjansson) +add_subdirectory(platform) +add_subdirectory(routing) +add_subdirectory(routing_common) +add_subdirectory(search) +add_subdirectory(shaders) +add_subdirectory(storage) +add_subdirectory(tracking) +add_subdirectory(traffic) +add_subdirectory(transit) diff --git a/base/CMakeLists.txt b/libs/base/CMakeLists.txt similarity index 100% rename from base/CMakeLists.txt rename to libs/base/CMakeLists.txt diff --git a/base/array_adapters.hpp b/libs/base/array_adapters.hpp similarity index 100% rename from base/array_adapters.hpp rename to libs/base/array_adapters.hpp diff --git a/base/assert.hpp b/libs/base/assert.hpp similarity index 100% rename from base/assert.hpp rename to libs/base/assert.hpp diff --git a/base/atomic_shared_ptr.hpp b/libs/base/atomic_shared_ptr.hpp similarity index 100% rename from base/atomic_shared_ptr.hpp rename to libs/base/atomic_shared_ptr.hpp diff --git a/base/base.cpp b/libs/base/base.cpp similarity index 100% rename from base/base.cpp rename to libs/base/base.cpp diff --git a/base/base.hpp b/libs/base/base.hpp similarity index 100% rename from base/base.hpp rename to libs/base/base.hpp diff --git a/base/base_tests/CMakeLists.txt b/libs/base/base_tests/CMakeLists.txt similarity index 100% rename from base/base_tests/CMakeLists.txt rename to libs/base/base_tests/CMakeLists.txt diff --git a/base/base_tests/assert_test.cpp b/libs/base/base_tests/assert_test.cpp similarity index 100% rename from base/base_tests/assert_test.cpp rename to libs/base/base_tests/assert_test.cpp diff --git a/base/base_tests/beam_tests.cpp b/libs/base/base_tests/beam_tests.cpp similarity index 100% rename from base/base_tests/beam_tests.cpp rename to libs/base/base_tests/beam_tests.cpp diff --git a/base/base_tests/bidirectional_map_tests.cpp b/libs/base/base_tests/bidirectional_map_tests.cpp similarity index 100% rename from base/base_tests/bidirectional_map_tests.cpp rename to libs/base/base_tests/bidirectional_map_tests.cpp diff --git a/base/base_tests/bits_test.cpp b/libs/base/base_tests/bits_test.cpp similarity index 100% rename from base/base_tests/bits_test.cpp rename to libs/base/base_tests/bits_test.cpp diff --git a/base/base_tests/buffer_vector_test.cpp b/libs/base/base_tests/buffer_vector_test.cpp similarity index 100% rename from base/base_tests/buffer_vector_test.cpp rename to libs/base/base_tests/buffer_vector_test.cpp diff --git a/base/base_tests/cache_test.cpp b/libs/base/base_tests/cache_test.cpp similarity index 100% rename from base/base_tests/cache_test.cpp rename to libs/base/base_tests/cache_test.cpp diff --git a/base/base_tests/cancellable_tests.cpp b/libs/base/base_tests/cancellable_tests.cpp similarity index 100% rename from base/base_tests/cancellable_tests.cpp rename to libs/base/base_tests/cancellable_tests.cpp diff --git a/base/base_tests/checked_cast_tests.cpp b/libs/base/base_tests/checked_cast_tests.cpp similarity index 100% rename from base/base_tests/checked_cast_tests.cpp rename to libs/base/base_tests/checked_cast_tests.cpp diff --git a/base/base_tests/clustering_map_tests.cpp b/libs/base/base_tests/clustering_map_tests.cpp similarity index 100% rename from base/base_tests/clustering_map_tests.cpp rename to libs/base/base_tests/clustering_map_tests.cpp diff --git a/base/base_tests/collection_cast_test.cpp b/libs/base/base_tests/collection_cast_test.cpp similarity index 100% rename from base/base_tests/collection_cast_test.cpp rename to libs/base/base_tests/collection_cast_test.cpp diff --git a/base/base_tests/containers_test.cpp b/libs/base/base_tests/containers_test.cpp similarity index 100% rename from base/base_tests/containers_test.cpp rename to libs/base/base_tests/containers_test.cpp diff --git a/base/base_tests/control_flow_tests.cpp b/libs/base/base_tests/control_flow_tests.cpp similarity index 100% rename from base/base_tests/control_flow_tests.cpp rename to libs/base/base_tests/control_flow_tests.cpp diff --git a/base/base_tests/exception_tests.cpp b/libs/base/base_tests/exception_tests.cpp similarity index 100% rename from base/base_tests/exception_tests.cpp rename to libs/base/base_tests/exception_tests.cpp diff --git a/base/base_tests/fifo_cache_test.cpp b/libs/base/base_tests/fifo_cache_test.cpp similarity index 100% rename from base/base_tests/fifo_cache_test.cpp rename to libs/base/base_tests/fifo_cache_test.cpp diff --git a/base/base_tests/file_name_utils_tests.cpp b/libs/base/base_tests/file_name_utils_tests.cpp similarity index 100% rename from base/base_tests/file_name_utils_tests.cpp rename to libs/base/base_tests/file_name_utils_tests.cpp diff --git a/base/base_tests/geo_object_id_tests.cpp b/libs/base/base_tests/geo_object_id_tests.cpp similarity index 100% rename from base/base_tests/geo_object_id_tests.cpp rename to libs/base/base_tests/geo_object_id_tests.cpp diff --git a/base/base_tests/levenshtein_dfa_test.cpp b/libs/base/base_tests/levenshtein_dfa_test.cpp similarity index 100% rename from base/base_tests/levenshtein_dfa_test.cpp rename to libs/base/base_tests/levenshtein_dfa_test.cpp diff --git a/base/base_tests/linked_map_tests.cpp b/libs/base/base_tests/linked_map_tests.cpp similarity index 100% rename from base/base_tests/linked_map_tests.cpp rename to libs/base/base_tests/linked_map_tests.cpp diff --git a/base/base_tests/logging_test.cpp b/libs/base/base_tests/logging_test.cpp similarity index 100% rename from base/base_tests/logging_test.cpp rename to libs/base/base_tests/logging_test.cpp diff --git a/base/base_tests/lru_cache_tests.cpp b/libs/base/base_tests/lru_cache_tests.cpp similarity index 100% rename from base/base_tests/lru_cache_tests.cpp rename to libs/base/base_tests/lru_cache_tests.cpp diff --git a/base/base_tests/math_test.cpp b/libs/base/base_tests/math_test.cpp similarity index 100% rename from base/base_tests/math_test.cpp rename to libs/base/base_tests/math_test.cpp diff --git a/base/base_tests/matrix_test.cpp b/libs/base/base_tests/matrix_test.cpp similarity index 100% rename from base/base_tests/matrix_test.cpp rename to libs/base/base_tests/matrix_test.cpp diff --git a/base/base_tests/mem_trie_test.cpp b/libs/base/base_tests/mem_trie_test.cpp similarity index 100% rename from base/base_tests/mem_trie_test.cpp rename to libs/base/base_tests/mem_trie_test.cpp diff --git a/base/base_tests/message_test.cpp b/libs/base/base_tests/message_test.cpp similarity index 100% rename from base/base_tests/message_test.cpp rename to libs/base/base_tests/message_test.cpp diff --git a/base/base_tests/newtype_test.cpp b/libs/base/base_tests/newtype_test.cpp similarity index 100% rename from base/base_tests/newtype_test.cpp rename to libs/base/base_tests/newtype_test.cpp diff --git a/base/base_tests/non_intersecting_intervals_tests.cpp b/libs/base/base_tests/non_intersecting_intervals_tests.cpp similarity index 100% rename from base/base_tests/non_intersecting_intervals_tests.cpp rename to libs/base/base_tests/non_intersecting_intervals_tests.cpp diff --git a/base/base_tests/observer_list_test.cpp b/libs/base/base_tests/observer_list_test.cpp similarity index 100% rename from base/base_tests/observer_list_test.cpp rename to libs/base/base_tests/observer_list_test.cpp diff --git a/base/base_tests/range_iterator_test.cpp b/libs/base/base_tests/range_iterator_test.cpp similarity index 100% rename from base/base_tests/range_iterator_test.cpp rename to libs/base/base_tests/range_iterator_test.cpp diff --git a/base/base_tests/ref_counted_tests.cpp b/libs/base/base_tests/ref_counted_tests.cpp similarity index 100% rename from base/base_tests/ref_counted_tests.cpp rename to libs/base/base_tests/ref_counted_tests.cpp diff --git a/base/base_tests/regexp_test.cpp b/libs/base/base_tests/regexp_test.cpp similarity index 100% rename from base/base_tests/regexp_test.cpp rename to libs/base/base_tests/regexp_test.cpp diff --git a/base/base_tests/rolling_hash_test.cpp b/libs/base/base_tests/rolling_hash_test.cpp similarity index 100% rename from base/base_tests/rolling_hash_test.cpp rename to libs/base/base_tests/rolling_hash_test.cpp diff --git a/base/base_tests/scope_guard_test.cpp b/libs/base/base_tests/scope_guard_test.cpp similarity index 100% rename from base/base_tests/scope_guard_test.cpp rename to libs/base/base_tests/scope_guard_test.cpp diff --git a/base/base_tests/small_set_test.cpp b/libs/base/base_tests/small_set_test.cpp similarity index 100% rename from base/base_tests/small_set_test.cpp rename to libs/base/base_tests/small_set_test.cpp diff --git a/base/base_tests/stl_helpers_tests.cpp b/libs/base/base_tests/stl_helpers_tests.cpp similarity index 100% rename from base/base_tests/stl_helpers_tests.cpp rename to libs/base/base_tests/stl_helpers_tests.cpp diff --git a/base/base_tests/string_utils_test.cpp b/libs/base/base_tests/string_utils_test.cpp similarity index 100% rename from base/base_tests/string_utils_test.cpp rename to libs/base/base_tests/string_utils_test.cpp diff --git a/base/base_tests/suffix_array_tests.cpp b/libs/base/base_tests/suffix_array_tests.cpp similarity index 100% rename from base/base_tests/suffix_array_tests.cpp rename to libs/base/base_tests/suffix_array_tests.cpp diff --git a/base/base_tests/sunrise_sunset_test.cpp b/libs/base/base_tests/sunrise_sunset_test.cpp similarity index 100% rename from base/base_tests/sunrise_sunset_test.cpp rename to libs/base/base_tests/sunrise_sunset_test.cpp diff --git a/base/base_tests/thread_pool_computational_tests.cpp b/libs/base/base_tests/thread_pool_computational_tests.cpp similarity index 100% rename from base/base_tests/thread_pool_computational_tests.cpp rename to libs/base/base_tests/thread_pool_computational_tests.cpp diff --git a/base/base_tests/thread_pool_delayed_tests.cpp b/libs/base/base_tests/thread_pool_delayed_tests.cpp similarity index 100% rename from base/base_tests/thread_pool_delayed_tests.cpp rename to libs/base/base_tests/thread_pool_delayed_tests.cpp diff --git a/base/base_tests/thread_pool_tests.cpp b/libs/base/base_tests/thread_pool_tests.cpp similarity index 100% rename from base/base_tests/thread_pool_tests.cpp rename to libs/base/base_tests/thread_pool_tests.cpp diff --git a/base/base_tests/thread_safe_queue_tests.cpp b/libs/base/base_tests/thread_safe_queue_tests.cpp similarity index 100% rename from base/base_tests/thread_safe_queue_tests.cpp rename to libs/base/base_tests/thread_safe_queue_tests.cpp diff --git a/base/base_tests/threaded_list_test.cpp b/libs/base/base_tests/threaded_list_test.cpp similarity index 100% rename from base/base_tests/threaded_list_test.cpp rename to libs/base/base_tests/threaded_list_test.cpp diff --git a/base/base_tests/threads_test.cpp b/libs/base/base_tests/threads_test.cpp similarity index 100% rename from base/base_tests/threads_test.cpp rename to libs/base/base_tests/threads_test.cpp diff --git a/base/base_tests/timegm_test.cpp b/libs/base/base_tests/timegm_test.cpp similarity index 100% rename from base/base_tests/timegm_test.cpp rename to libs/base/base_tests/timegm_test.cpp diff --git a/base/base_tests/timer_test.cpp b/libs/base/base_tests/timer_test.cpp similarity index 100% rename from base/base_tests/timer_test.cpp rename to libs/base/base_tests/timer_test.cpp diff --git a/base/base_tests/uni_string_dfa_test.cpp b/libs/base/base_tests/uni_string_dfa_test.cpp similarity index 100% rename from base/base_tests/uni_string_dfa_test.cpp rename to libs/base/base_tests/uni_string_dfa_test.cpp diff --git a/base/base_tests/visitor_tests.cpp b/libs/base/base_tests/visitor_tests.cpp similarity index 100% rename from base/base_tests/visitor_tests.cpp rename to libs/base/base_tests/visitor_tests.cpp diff --git a/base/beam.hpp b/libs/base/beam.hpp similarity index 100% rename from base/beam.hpp rename to libs/base/beam.hpp diff --git a/base/bidirectional_map.hpp b/libs/base/bidirectional_map.hpp similarity index 100% rename from base/bidirectional_map.hpp rename to libs/base/bidirectional_map.hpp diff --git a/base/bits.hpp b/libs/base/bits.hpp similarity index 100% rename from base/bits.hpp rename to libs/base/bits.hpp diff --git a/base/buffer_vector.hpp b/libs/base/buffer_vector.hpp similarity index 100% rename from base/buffer_vector.hpp rename to libs/base/buffer_vector.hpp diff --git a/base/cache.hpp b/libs/base/cache.hpp similarity index 100% rename from base/cache.hpp rename to libs/base/cache.hpp diff --git a/base/cancellable.cpp b/libs/base/cancellable.cpp similarity index 100% rename from base/cancellable.cpp rename to libs/base/cancellable.cpp diff --git a/base/cancellable.hpp b/libs/base/cancellable.hpp similarity index 100% rename from base/cancellable.hpp rename to libs/base/cancellable.hpp diff --git a/base/checked_cast.hpp b/libs/base/checked_cast.hpp similarity index 100% rename from base/checked_cast.hpp rename to libs/base/checked_cast.hpp diff --git a/base/clustering_map.hpp b/libs/base/clustering_map.hpp similarity index 100% rename from base/clustering_map.hpp rename to libs/base/clustering_map.hpp diff --git a/base/collection_cast.hpp b/libs/base/collection_cast.hpp similarity index 100% rename from base/collection_cast.hpp rename to libs/base/collection_cast.hpp diff --git a/base/control_flow.hpp b/libs/base/control_flow.hpp similarity index 100% rename from base/control_flow.hpp rename to libs/base/control_flow.hpp diff --git a/base/deferred_task.cpp b/libs/base/deferred_task.cpp similarity index 100% rename from base/deferred_task.cpp rename to libs/base/deferred_task.cpp diff --git a/base/deferred_task.hpp b/libs/base/deferred_task.hpp similarity index 100% rename from base/deferred_task.hpp rename to libs/base/deferred_task.hpp diff --git a/base/dfa_helpers.hpp b/libs/base/dfa_helpers.hpp similarity index 100% rename from base/dfa_helpers.hpp rename to libs/base/dfa_helpers.hpp diff --git a/base/exception.cpp b/libs/base/exception.cpp similarity index 100% rename from base/exception.cpp rename to libs/base/exception.cpp diff --git a/base/exception.hpp b/libs/base/exception.hpp similarity index 100% rename from base/exception.hpp rename to libs/base/exception.hpp diff --git a/base/fast_math.cpp b/libs/base/fast_math.cpp similarity index 100% rename from base/fast_math.cpp rename to libs/base/fast_math.cpp diff --git a/base/fifo_cache.hpp b/libs/base/fifo_cache.hpp similarity index 100% rename from base/fifo_cache.hpp rename to libs/base/fifo_cache.hpp diff --git a/base/file_name_utils.cpp b/libs/base/file_name_utils.cpp similarity index 100% rename from base/file_name_utils.cpp rename to libs/base/file_name_utils.cpp diff --git a/base/file_name_utils.hpp b/libs/base/file_name_utils.hpp similarity index 100% rename from base/file_name_utils.hpp rename to libs/base/file_name_utils.hpp diff --git a/base/geo_object_id.cpp b/libs/base/geo_object_id.cpp similarity index 100% rename from base/geo_object_id.cpp rename to libs/base/geo_object_id.cpp diff --git a/base/geo_object_id.hpp b/libs/base/geo_object_id.hpp similarity index 100% rename from base/geo_object_id.hpp rename to libs/base/geo_object_id.hpp diff --git a/base/gmtime.cpp b/libs/base/gmtime.cpp similarity index 100% rename from base/gmtime.cpp rename to libs/base/gmtime.cpp diff --git a/base/gmtime.hpp b/libs/base/gmtime.hpp similarity index 100% rename from base/gmtime.hpp rename to libs/base/gmtime.hpp diff --git a/base/internal/message.cpp b/libs/base/internal/message.cpp similarity index 100% rename from base/internal/message.cpp rename to libs/base/internal/message.cpp diff --git a/base/internal/message.hpp b/libs/base/internal/message.hpp similarity index 100% rename from base/internal/message.hpp rename to libs/base/internal/message.hpp diff --git a/base/levenshtein_dfa.cpp b/libs/base/levenshtein_dfa.cpp similarity index 100% rename from base/levenshtein_dfa.cpp rename to libs/base/levenshtein_dfa.cpp diff --git a/base/levenshtein_dfa.hpp b/libs/base/levenshtein_dfa.hpp similarity index 100% rename from base/levenshtein_dfa.hpp rename to libs/base/levenshtein_dfa.hpp diff --git a/base/limited_priority_queue.hpp b/libs/base/limited_priority_queue.hpp similarity index 100% rename from base/limited_priority_queue.hpp rename to libs/base/limited_priority_queue.hpp diff --git a/base/linked_map.hpp b/libs/base/linked_map.hpp similarity index 100% rename from base/linked_map.hpp rename to libs/base/linked_map.hpp diff --git a/base/logging.cpp b/libs/base/logging.cpp similarity index 100% rename from base/logging.cpp rename to libs/base/logging.cpp diff --git a/base/logging.hpp b/libs/base/logging.hpp similarity index 100% rename from base/logging.hpp rename to libs/base/logging.hpp diff --git a/base/lower_case.cpp b/libs/base/lower_case.cpp similarity index 100% rename from base/lower_case.cpp rename to libs/base/lower_case.cpp diff --git a/base/lru_cache.hpp b/libs/base/lru_cache.hpp similarity index 100% rename from base/lru_cache.hpp rename to libs/base/lru_cache.hpp diff --git a/base/macros.hpp b/libs/base/macros.hpp similarity index 100% rename from base/macros.hpp rename to libs/base/macros.hpp diff --git a/base/math.cpp b/libs/base/math.cpp similarity index 100% rename from base/math.cpp rename to libs/base/math.cpp diff --git a/base/math.hpp b/libs/base/math.hpp similarity index 100% rename from base/math.hpp rename to libs/base/math.hpp diff --git a/base/matrix.hpp b/libs/base/matrix.hpp similarity index 100% rename from base/matrix.hpp rename to libs/base/matrix.hpp diff --git a/base/mem_trie.hpp b/libs/base/mem_trie.hpp similarity index 100% rename from base/mem_trie.hpp rename to libs/base/mem_trie.hpp diff --git a/base/newtype.hpp b/libs/base/newtype.hpp similarity index 100% rename from base/newtype.hpp rename to libs/base/newtype.hpp diff --git a/base/non_intersecting_intervals.hpp b/libs/base/non_intersecting_intervals.hpp similarity index 100% rename from base/non_intersecting_intervals.hpp rename to libs/base/non_intersecting_intervals.hpp diff --git a/base/normalize_unicode.cpp b/libs/base/normalize_unicode.cpp similarity index 100% rename from base/normalize_unicode.cpp rename to libs/base/normalize_unicode.cpp diff --git a/base/observer_list.hpp b/libs/base/observer_list.hpp similarity index 100% rename from base/observer_list.hpp rename to libs/base/observer_list.hpp diff --git a/base/pprof.cpp b/libs/base/pprof.cpp similarity index 100% rename from base/pprof.cpp rename to libs/base/pprof.cpp diff --git a/base/pprof.hpp b/libs/base/pprof.hpp similarity index 100% rename from base/pprof.hpp rename to libs/base/pprof.hpp diff --git a/base/random.hpp b/libs/base/random.hpp similarity index 100% rename from base/random.hpp rename to libs/base/random.hpp diff --git a/base/range_iterator.hpp b/libs/base/range_iterator.hpp similarity index 100% rename from base/range_iterator.hpp rename to libs/base/range_iterator.hpp diff --git a/base/ref_counted.hpp b/libs/base/ref_counted.hpp similarity index 100% rename from base/ref_counted.hpp rename to libs/base/ref_counted.hpp diff --git a/base/rolling_hash.hpp b/libs/base/rolling_hash.hpp similarity index 100% rename from base/rolling_hash.hpp rename to libs/base/rolling_hash.hpp diff --git a/base/scope_guard.hpp b/libs/base/scope_guard.hpp similarity index 100% rename from base/scope_guard.hpp rename to libs/base/scope_guard.hpp diff --git a/base/set_operations.hpp b/libs/base/set_operations.hpp similarity index 100% rename from base/set_operations.hpp rename to libs/base/set_operations.hpp diff --git a/base/shared_buffer_manager.cpp b/libs/base/shared_buffer_manager.cpp similarity index 100% rename from base/shared_buffer_manager.cpp rename to libs/base/shared_buffer_manager.cpp diff --git a/base/shared_buffer_manager.hpp b/libs/base/shared_buffer_manager.hpp similarity index 100% rename from base/shared_buffer_manager.hpp rename to libs/base/shared_buffer_manager.hpp diff --git a/base/small_map.hpp b/libs/base/small_map.hpp similarity index 100% rename from base/small_map.hpp rename to libs/base/small_map.hpp diff --git a/base/small_set.hpp b/libs/base/small_set.hpp similarity index 100% rename from base/small_set.hpp rename to libs/base/small_set.hpp diff --git a/base/src_point.cpp b/libs/base/src_point.cpp similarity index 100% rename from base/src_point.cpp rename to libs/base/src_point.cpp diff --git a/base/src_point.hpp b/libs/base/src_point.hpp similarity index 100% rename from base/src_point.hpp rename to libs/base/src_point.hpp diff --git a/base/stats.hpp b/libs/base/stats.hpp similarity index 100% rename from base/stats.hpp rename to libs/base/stats.hpp diff --git a/base/std_serialization.hpp b/libs/base/std_serialization.hpp similarity index 100% rename from base/std_serialization.hpp rename to libs/base/std_serialization.hpp diff --git a/base/stl_helpers.hpp b/libs/base/stl_helpers.hpp similarity index 100% rename from base/stl_helpers.hpp rename to libs/base/stl_helpers.hpp diff --git a/base/stl_iterator.hpp b/libs/base/stl_iterator.hpp similarity index 100% rename from base/stl_iterator.hpp rename to libs/base/stl_iterator.hpp diff --git a/base/string_utils.cpp b/libs/base/string_utils.cpp similarity index 100% rename from base/string_utils.cpp rename to libs/base/string_utils.cpp diff --git a/base/string_utils.hpp b/libs/base/string_utils.hpp similarity index 100% rename from base/string_utils.hpp rename to libs/base/string_utils.hpp diff --git a/base/strings_bundle.cpp b/libs/base/strings_bundle.cpp similarity index 100% rename from base/strings_bundle.cpp rename to libs/base/strings_bundle.cpp diff --git a/base/strings_bundle.hpp b/libs/base/strings_bundle.hpp similarity index 100% rename from base/strings_bundle.hpp rename to libs/base/strings_bundle.hpp diff --git a/base/suffix_array.cpp b/libs/base/suffix_array.cpp similarity index 100% rename from base/suffix_array.cpp rename to libs/base/suffix_array.cpp diff --git a/base/suffix_array.hpp b/libs/base/suffix_array.hpp similarity index 100% rename from base/suffix_array.hpp rename to libs/base/suffix_array.hpp diff --git a/base/sunrise_sunset.cpp b/libs/base/sunrise_sunset.cpp similarity index 100% rename from base/sunrise_sunset.cpp rename to libs/base/sunrise_sunset.cpp diff --git a/base/sunrise_sunset.hpp b/libs/base/sunrise_sunset.hpp similarity index 100% rename from base/sunrise_sunset.hpp rename to libs/base/sunrise_sunset.hpp diff --git a/base/task_loop.hpp b/libs/base/task_loop.hpp similarity index 100% rename from base/task_loop.hpp rename to libs/base/task_loop.hpp diff --git a/base/thread.cpp b/libs/base/thread.cpp similarity index 100% rename from base/thread.cpp rename to libs/base/thread.cpp diff --git a/base/thread.hpp b/libs/base/thread.hpp similarity index 100% rename from base/thread.hpp rename to libs/base/thread.hpp diff --git a/base/thread_checker.cpp b/libs/base/thread_checker.cpp similarity index 100% rename from base/thread_checker.cpp rename to libs/base/thread_checker.cpp diff --git a/base/thread_checker.hpp b/libs/base/thread_checker.hpp similarity index 100% rename from base/thread_checker.hpp rename to libs/base/thread_checker.hpp diff --git a/base/thread_pool.cpp b/libs/base/thread_pool.cpp similarity index 100% rename from base/thread_pool.cpp rename to libs/base/thread_pool.cpp diff --git a/base/thread_pool.hpp b/libs/base/thread_pool.hpp similarity index 100% rename from base/thread_pool.hpp rename to libs/base/thread_pool.hpp diff --git a/base/thread_pool_computational.hpp b/libs/base/thread_pool_computational.hpp similarity index 100% rename from base/thread_pool_computational.hpp rename to libs/base/thread_pool_computational.hpp diff --git a/base/thread_pool_delayed.cpp b/libs/base/thread_pool_delayed.cpp similarity index 100% rename from base/thread_pool_delayed.cpp rename to libs/base/thread_pool_delayed.cpp diff --git a/base/thread_pool_delayed.hpp b/libs/base/thread_pool_delayed.hpp similarity index 100% rename from base/thread_pool_delayed.hpp rename to libs/base/thread_pool_delayed.hpp diff --git a/base/thread_safe_queue.hpp b/libs/base/thread_safe_queue.hpp similarity index 100% rename from base/thread_safe_queue.hpp rename to libs/base/thread_safe_queue.hpp diff --git a/base/thread_utils.hpp b/libs/base/thread_utils.hpp similarity index 100% rename from base/thread_utils.hpp rename to libs/base/thread_utils.hpp diff --git a/base/threaded_container.cpp b/libs/base/threaded_container.cpp similarity index 100% rename from base/threaded_container.cpp rename to libs/base/threaded_container.cpp diff --git a/base/threaded_container.hpp b/libs/base/threaded_container.hpp similarity index 100% rename from base/threaded_container.hpp rename to libs/base/threaded_container.hpp diff --git a/base/threaded_list.hpp b/libs/base/threaded_list.hpp similarity index 100% rename from base/threaded_list.hpp rename to libs/base/threaded_list.hpp diff --git a/base/timegm.cpp b/libs/base/timegm.cpp similarity index 100% rename from base/timegm.cpp rename to libs/base/timegm.cpp diff --git a/base/timegm.hpp b/libs/base/timegm.hpp similarity index 100% rename from base/timegm.hpp rename to libs/base/timegm.hpp diff --git a/base/timer.cpp b/libs/base/timer.cpp similarity index 100% rename from base/timer.cpp rename to libs/base/timer.cpp diff --git a/base/timer.hpp b/libs/base/timer.hpp similarity index 100% rename from base/timer.hpp rename to libs/base/timer.hpp diff --git a/base/uni_string_dfa.cpp b/libs/base/uni_string_dfa.cpp similarity index 100% rename from base/uni_string_dfa.cpp rename to libs/base/uni_string_dfa.cpp diff --git a/base/uni_string_dfa.hpp b/libs/base/uni_string_dfa.hpp similarity index 100% rename from base/uni_string_dfa.hpp rename to libs/base/uni_string_dfa.hpp diff --git a/base/visitor.hpp b/libs/base/visitor.hpp similarity index 100% rename from base/visitor.hpp rename to libs/base/visitor.hpp diff --git a/base/waiter.hpp b/libs/base/waiter.hpp similarity index 100% rename from base/waiter.hpp rename to libs/base/waiter.hpp diff --git a/coding/CMakeLists.txt b/libs/coding/CMakeLists.txt similarity index 100% rename from coding/CMakeLists.txt rename to libs/coding/CMakeLists.txt diff --git a/coding/base64.cpp b/libs/coding/base64.cpp similarity index 100% rename from coding/base64.cpp rename to libs/coding/base64.cpp diff --git a/coding/base64.hpp b/libs/coding/base64.hpp similarity index 100% rename from coding/base64.hpp rename to libs/coding/base64.hpp diff --git a/coding/bit_streams.hpp b/libs/coding/bit_streams.hpp similarity index 100% rename from coding/bit_streams.hpp rename to libs/coding/bit_streams.hpp diff --git a/coding/buffer_reader.hpp b/libs/coding/buffer_reader.hpp similarity index 100% rename from coding/buffer_reader.hpp rename to libs/coding/buffer_reader.hpp diff --git a/coding/buffered_file_writer.cpp b/libs/coding/buffered_file_writer.cpp similarity index 100% rename from coding/buffered_file_writer.cpp rename to libs/coding/buffered_file_writer.cpp diff --git a/coding/buffered_file_writer.hpp b/libs/coding/buffered_file_writer.hpp similarity index 100% rename from coding/buffered_file_writer.hpp rename to libs/coding/buffered_file_writer.hpp diff --git a/coding/bwt.cpp b/libs/coding/bwt.cpp similarity index 100% rename from coding/bwt.cpp rename to libs/coding/bwt.cpp diff --git a/coding/bwt.hpp b/libs/coding/bwt.hpp similarity index 100% rename from coding/bwt.hpp rename to libs/coding/bwt.hpp diff --git a/coding/bwt_coder.hpp b/libs/coding/bwt_coder.hpp similarity index 100% rename from coding/bwt_coder.hpp rename to libs/coding/bwt_coder.hpp diff --git a/coding/byte_stream.hpp b/libs/coding/byte_stream.hpp similarity index 100% rename from coding/byte_stream.hpp rename to libs/coding/byte_stream.hpp diff --git a/coding/coding_tests/CMakeLists.txt b/libs/coding/coding_tests/CMakeLists.txt similarity index 100% rename from coding/coding_tests/CMakeLists.txt rename to libs/coding/coding_tests/CMakeLists.txt diff --git a/coding/coding_tests/base64_test.cpp b/libs/coding/coding_tests/base64_test.cpp similarity index 100% rename from coding/coding_tests/base64_test.cpp rename to libs/coding/coding_tests/base64_test.cpp diff --git a/coding/coding_tests/bit_streams_test.cpp b/libs/coding/coding_tests/bit_streams_test.cpp similarity index 100% rename from coding/coding_tests/bit_streams_test.cpp rename to libs/coding/coding_tests/bit_streams_test.cpp diff --git a/coding/coding_tests/bwt_coder_tests.cpp b/libs/coding/coding_tests/bwt_coder_tests.cpp similarity index 100% rename from coding/coding_tests/bwt_coder_tests.cpp rename to libs/coding/coding_tests/bwt_coder_tests.cpp diff --git a/coding/coding_tests/bwt_tests.cpp b/libs/coding/coding_tests/bwt_tests.cpp similarity index 100% rename from coding/coding_tests/bwt_tests.cpp rename to libs/coding/coding_tests/bwt_tests.cpp diff --git a/coding/coding_tests/compressed_bit_vector_test.cpp b/libs/coding/coding_tests/compressed_bit_vector_test.cpp similarity index 100% rename from coding/coding_tests/compressed_bit_vector_test.cpp rename to libs/coding/coding_tests/compressed_bit_vector_test.cpp diff --git a/coding/coding_tests/csv_reader_test.cpp b/libs/coding/coding_tests/csv_reader_test.cpp similarity index 100% rename from coding/coding_tests/csv_reader_test.cpp rename to libs/coding/coding_tests/csv_reader_test.cpp diff --git a/coding/coding_tests/dd_vector_test.cpp b/libs/coding/coding_tests/dd_vector_test.cpp similarity index 100% rename from coding/coding_tests/dd_vector_test.cpp rename to libs/coding/coding_tests/dd_vector_test.cpp diff --git a/coding/coding_tests/diff_test.cpp b/libs/coding/coding_tests/diff_test.cpp similarity index 100% rename from coding/coding_tests/diff_test.cpp rename to libs/coding/coding_tests/diff_test.cpp diff --git a/coding/coding_tests/elias_coder_test.cpp b/libs/coding/coding_tests/elias_coder_test.cpp similarity index 100% rename from coding/coding_tests/elias_coder_test.cpp rename to libs/coding/coding_tests/elias_coder_test.cpp diff --git a/coding/coding_tests/endianness_test.cpp b/libs/coding/coding_tests/endianness_test.cpp similarity index 100% rename from coding/coding_tests/endianness_test.cpp rename to libs/coding/coding_tests/endianness_test.cpp diff --git a/coding/coding_tests/file_data_test.cpp b/libs/coding/coding_tests/file_data_test.cpp similarity index 100% rename from coding/coding_tests/file_data_test.cpp rename to libs/coding/coding_tests/file_data_test.cpp diff --git a/coding/coding_tests/file_sort_test.cpp b/libs/coding/coding_tests/file_sort_test.cpp similarity index 100% rename from coding/coding_tests/file_sort_test.cpp rename to libs/coding/coding_tests/file_sort_test.cpp diff --git a/coding/coding_tests/files_container_tests.cpp b/libs/coding/coding_tests/files_container_tests.cpp similarity index 100% rename from coding/coding_tests/files_container_tests.cpp rename to libs/coding/coding_tests/files_container_tests.cpp diff --git a/coding/coding_tests/fixed_bits_ddvector_test.cpp b/libs/coding/coding_tests/fixed_bits_ddvector_test.cpp similarity index 100% rename from coding/coding_tests/fixed_bits_ddvector_test.cpp rename to libs/coding/coding_tests/fixed_bits_ddvector_test.cpp diff --git a/coding/coding_tests/geometry_coding_test.cpp b/libs/coding/coding_tests/geometry_coding_test.cpp similarity index 100% rename from coding/coding_tests/geometry_coding_test.cpp rename to libs/coding/coding_tests/geometry_coding_test.cpp diff --git a/coding/coding_tests/geometry_serialization_test.cpp b/libs/coding/coding_tests/geometry_serialization_test.cpp similarity index 100% rename from coding/coding_tests/geometry_serialization_test.cpp rename to libs/coding/coding_tests/geometry_serialization_test.cpp diff --git a/coding/coding_tests/hex_test.cpp b/libs/coding/coding_tests/hex_test.cpp similarity index 100% rename from coding/coding_tests/hex_test.cpp rename to libs/coding/coding_tests/hex_test.cpp diff --git a/coding/coding_tests/huffman_test.cpp b/libs/coding/coding_tests/huffman_test.cpp similarity index 100% rename from coding/coding_tests/huffman_test.cpp rename to libs/coding/coding_tests/huffman_test.cpp diff --git a/coding/coding_tests/map_uint32_to_val_tests.cpp b/libs/coding/coding_tests/map_uint32_to_val_tests.cpp similarity index 100% rename from coding/coding_tests/map_uint32_to_val_tests.cpp rename to libs/coding/coding_tests/map_uint32_to_val_tests.cpp diff --git a/coding/coding_tests/mem_file_reader_test.cpp b/libs/coding/coding_tests/mem_file_reader_test.cpp similarity index 100% rename from coding/coding_tests/mem_file_reader_test.cpp rename to libs/coding/coding_tests/mem_file_reader_test.cpp diff --git a/coding/coding_tests/mem_file_writer_test.cpp b/libs/coding/coding_tests/mem_file_writer_test.cpp similarity index 100% rename from coding/coding_tests/mem_file_writer_test.cpp rename to libs/coding/coding_tests/mem_file_writer_test.cpp diff --git a/coding/coding_tests/move_to_front_tests.cpp b/libs/coding/coding_tests/move_to_front_tests.cpp similarity index 100% rename from coding/coding_tests/move_to_front_tests.cpp rename to libs/coding/coding_tests/move_to_front_tests.cpp diff --git a/coding/coding_tests/png_decoder_test.cpp b/libs/coding/coding_tests/png_decoder_test.cpp similarity index 100% rename from coding/coding_tests/png_decoder_test.cpp rename to libs/coding/coding_tests/png_decoder_test.cpp diff --git a/coding/coding_tests/point_coding_tests.cpp b/libs/coding/coding_tests/point_coding_tests.cpp similarity index 100% rename from coding/coding_tests/point_coding_tests.cpp rename to libs/coding/coding_tests/point_coding_tests.cpp diff --git a/coding/coding_tests/reader_cache_test.cpp b/libs/coding/coding_tests/reader_cache_test.cpp similarity index 100% rename from coding/coding_tests/reader_cache_test.cpp rename to libs/coding/coding_tests/reader_cache_test.cpp diff --git a/coding/coding_tests/reader_test.cpp b/libs/coding/coding_tests/reader_test.cpp similarity index 100% rename from coding/coding_tests/reader_test.cpp rename to libs/coding/coding_tests/reader_test.cpp diff --git a/coding/coding_tests/reader_test.hpp b/libs/coding/coding_tests/reader_test.hpp similarity index 100% rename from coding/coding_tests/reader_test.hpp rename to libs/coding/coding_tests/reader_test.hpp diff --git a/coding/coding_tests/reader_writer_ops_test.cpp b/libs/coding/coding_tests/reader_writer_ops_test.cpp similarity index 100% rename from coding/coding_tests/reader_writer_ops_test.cpp rename to libs/coding/coding_tests/reader_writer_ops_test.cpp diff --git a/coding/coding_tests/serdes_json_test.cpp b/libs/coding/coding_tests/serdes_json_test.cpp similarity index 100% rename from coding/coding_tests/serdes_json_test.cpp rename to libs/coding/coding_tests/serdes_json_test.cpp diff --git a/coding/coding_tests/sha1_test.cpp b/libs/coding/coding_tests/sha1_test.cpp similarity index 100% rename from coding/coding_tests/sha1_test.cpp rename to libs/coding/coding_tests/sha1_test.cpp diff --git a/coding/coding_tests/simple_dense_coding_test.cpp b/libs/coding/coding_tests/simple_dense_coding_test.cpp similarity index 100% rename from coding/coding_tests/simple_dense_coding_test.cpp rename to libs/coding/coding_tests/simple_dense_coding_test.cpp diff --git a/coding/coding_tests/sparse_vector_tests.cpp b/libs/coding/coding_tests/sparse_vector_tests.cpp similarity index 100% rename from coding/coding_tests/sparse_vector_tests.cpp rename to libs/coding/coding_tests/sparse_vector_tests.cpp diff --git a/coding/coding_tests/string_utf8_multilang_tests.cpp b/libs/coding/coding_tests/string_utf8_multilang_tests.cpp similarity index 100% rename from coding/coding_tests/string_utf8_multilang_tests.cpp rename to libs/coding/coding_tests/string_utf8_multilang_tests.cpp diff --git a/coding/coding_tests/succinct_ef_test.cpp b/libs/coding/coding_tests/succinct_ef_test.cpp similarity index 100% rename from coding/coding_tests/succinct_ef_test.cpp rename to libs/coding/coding_tests/succinct_ef_test.cpp diff --git a/coding/coding_tests/succinct_mapper_test.cpp b/libs/coding/coding_tests/succinct_mapper_test.cpp similarity index 100% rename from coding/coding_tests/succinct_mapper_test.cpp rename to libs/coding/coding_tests/succinct_mapper_test.cpp diff --git a/coding/coding_tests/test_polylines.cpp b/libs/coding/coding_tests/test_polylines.cpp similarity index 100% rename from coding/coding_tests/test_polylines.cpp rename to libs/coding/coding_tests/test_polylines.cpp diff --git a/coding/coding_tests/test_polylines.hpp b/libs/coding/coding_tests/test_polylines.hpp similarity index 100% rename from coding/coding_tests/test_polylines.hpp rename to libs/coding/coding_tests/test_polylines.hpp diff --git a/coding/coding_tests/text_storage_tests.cpp b/libs/coding/coding_tests/text_storage_tests.cpp similarity index 100% rename from coding/coding_tests/text_storage_tests.cpp rename to libs/coding/coding_tests/text_storage_tests.cpp diff --git a/coding/coding_tests/traffic_test.cpp b/libs/coding/coding_tests/traffic_test.cpp similarity index 100% rename from coding/coding_tests/traffic_test.cpp rename to libs/coding/coding_tests/traffic_test.cpp diff --git a/coding/coding_tests/url_tests.cpp b/libs/coding/coding_tests/url_tests.cpp similarity index 100% rename from coding/coding_tests/url_tests.cpp rename to libs/coding/coding_tests/url_tests.cpp diff --git a/coding/coding_tests/value_opt_string_test.cpp b/libs/coding/coding_tests/value_opt_string_test.cpp similarity index 100% rename from coding/coding_tests/value_opt_string_test.cpp rename to libs/coding/coding_tests/value_opt_string_test.cpp diff --git a/coding/coding_tests/var_record_reader_test.cpp b/libs/coding/coding_tests/var_record_reader_test.cpp similarity index 100% rename from coding/coding_tests/var_record_reader_test.cpp rename to libs/coding/coding_tests/var_record_reader_test.cpp diff --git a/coding/coding_tests/var_serial_vector_test.cpp b/libs/coding/coding_tests/var_serial_vector_test.cpp similarity index 100% rename from coding/coding_tests/var_serial_vector_test.cpp rename to libs/coding/coding_tests/var_serial_vector_test.cpp diff --git a/coding/coding_tests/varint_test.cpp b/libs/coding/coding_tests/varint_test.cpp similarity index 100% rename from coding/coding_tests/varint_test.cpp rename to libs/coding/coding_tests/varint_test.cpp diff --git a/coding/coding_tests/writer_test.cpp b/libs/coding/coding_tests/writer_test.cpp similarity index 100% rename from coding/coding_tests/writer_test.cpp rename to libs/coding/coding_tests/writer_test.cpp diff --git a/coding/coding_tests/xml_parser_tests.cpp b/libs/coding/coding_tests/xml_parser_tests.cpp similarity index 100% rename from coding/coding_tests/xml_parser_tests.cpp rename to libs/coding/coding_tests/xml_parser_tests.cpp diff --git a/coding/coding_tests/zip_creator_test.cpp b/libs/coding/coding_tests/zip_creator_test.cpp similarity index 100% rename from coding/coding_tests/zip_creator_test.cpp rename to libs/coding/coding_tests/zip_creator_test.cpp diff --git a/coding/coding_tests/zip_reader_test.cpp b/libs/coding/coding_tests/zip_reader_test.cpp similarity index 100% rename from coding/coding_tests/zip_reader_test.cpp rename to libs/coding/coding_tests/zip_reader_test.cpp diff --git a/coding/coding_tests/zlib_test.cpp b/libs/coding/coding_tests/zlib_test.cpp similarity index 100% rename from coding/coding_tests/zlib_test.cpp rename to libs/coding/coding_tests/zlib_test.cpp diff --git a/coding/compressed_bit_vector.cpp b/libs/coding/compressed_bit_vector.cpp similarity index 100% rename from coding/compressed_bit_vector.cpp rename to libs/coding/compressed_bit_vector.cpp diff --git a/coding/compressed_bit_vector.hpp b/libs/coding/compressed_bit_vector.hpp similarity index 100% rename from coding/compressed_bit_vector.hpp rename to libs/coding/compressed_bit_vector.hpp diff --git a/coding/constants.hpp b/libs/coding/constants.hpp similarity index 100% rename from coding/constants.hpp rename to libs/coding/constants.hpp diff --git a/coding/csv_reader.cpp b/libs/coding/csv_reader.cpp similarity index 100% rename from coding/csv_reader.cpp rename to libs/coding/csv_reader.cpp diff --git a/coding/csv_reader.hpp b/libs/coding/csv_reader.hpp similarity index 100% rename from coding/csv_reader.hpp rename to libs/coding/csv_reader.hpp diff --git a/coding/dd_vector.hpp b/libs/coding/dd_vector.hpp similarity index 100% rename from coding/dd_vector.hpp rename to libs/coding/dd_vector.hpp diff --git a/coding/diff.hpp b/libs/coding/diff.hpp similarity index 100% rename from coding/diff.hpp rename to libs/coding/diff.hpp diff --git a/coding/elias_coder.hpp b/libs/coding/elias_coder.hpp similarity index 100% rename from coding/elias_coder.hpp rename to libs/coding/elias_coder.hpp diff --git a/coding/endianness.hpp b/libs/coding/endianness.hpp similarity index 100% rename from coding/endianness.hpp rename to libs/coding/endianness.hpp diff --git a/coding/file_reader.cpp b/libs/coding/file_reader.cpp similarity index 100% rename from coding/file_reader.cpp rename to libs/coding/file_reader.cpp diff --git a/coding/file_reader.hpp b/libs/coding/file_reader.hpp similarity index 100% rename from coding/file_reader.hpp rename to libs/coding/file_reader.hpp diff --git a/coding/file_sort.hpp b/libs/coding/file_sort.hpp similarity index 100% rename from coding/file_sort.hpp rename to libs/coding/file_sort.hpp diff --git a/coding/file_writer.cpp b/libs/coding/file_writer.cpp similarity index 100% rename from coding/file_writer.cpp rename to libs/coding/file_writer.cpp diff --git a/coding/file_writer.hpp b/libs/coding/file_writer.hpp similarity index 100% rename from coding/file_writer.hpp rename to libs/coding/file_writer.hpp diff --git a/coding/files_container.cpp b/libs/coding/files_container.cpp similarity index 100% rename from coding/files_container.cpp rename to libs/coding/files_container.cpp diff --git a/coding/files_container.hpp b/libs/coding/files_container.hpp similarity index 100% rename from coding/files_container.hpp rename to libs/coding/files_container.hpp diff --git a/coding/fixed_bits_ddvector.hpp b/libs/coding/fixed_bits_ddvector.hpp similarity index 100% rename from coding/fixed_bits_ddvector.hpp rename to libs/coding/fixed_bits_ddvector.hpp diff --git a/coding/geometry_coding.cpp b/libs/coding/geometry_coding.cpp similarity index 100% rename from coding/geometry_coding.cpp rename to libs/coding/geometry_coding.cpp diff --git a/coding/geometry_coding.hpp b/libs/coding/geometry_coding.hpp similarity index 100% rename from coding/geometry_coding.hpp rename to libs/coding/geometry_coding.hpp diff --git a/coding/hex.cpp b/libs/coding/hex.cpp similarity index 100% rename from coding/hex.cpp rename to libs/coding/hex.cpp diff --git a/coding/hex.hpp b/libs/coding/hex.hpp similarity index 100% rename from coding/hex.hpp rename to libs/coding/hex.hpp diff --git a/coding/huffman.cpp b/libs/coding/huffman.cpp similarity index 100% rename from coding/huffman.cpp rename to libs/coding/huffman.cpp diff --git a/coding/huffman.hpp b/libs/coding/huffman.hpp similarity index 100% rename from coding/huffman.hpp rename to libs/coding/huffman.hpp diff --git a/coding/internal/file64_api.hpp b/libs/coding/internal/file64_api.hpp similarity index 100% rename from coding/internal/file64_api.hpp rename to libs/coding/internal/file64_api.hpp diff --git a/coding/internal/file_data.cpp b/libs/coding/internal/file_data.cpp similarity index 100% rename from coding/internal/file_data.cpp rename to libs/coding/internal/file_data.cpp diff --git a/coding/internal/file_data.hpp b/libs/coding/internal/file_data.hpp similarity index 100% rename from coding/internal/file_data.hpp rename to libs/coding/internal/file_data.hpp diff --git a/coding/internal/xmlparser.hpp b/libs/coding/internal/xmlparser.hpp similarity index 100% rename from coding/internal/xmlparser.hpp rename to libs/coding/internal/xmlparser.hpp diff --git a/coding/map_uint32_to_val.hpp b/libs/coding/map_uint32_to_val.hpp similarity index 100% rename from coding/map_uint32_to_val.hpp rename to libs/coding/map_uint32_to_val.hpp diff --git a/coding/memory_region.hpp b/libs/coding/memory_region.hpp similarity index 100% rename from coding/memory_region.hpp rename to libs/coding/memory_region.hpp diff --git a/coding/mmap_reader.cpp b/libs/coding/mmap_reader.cpp similarity index 100% rename from coding/mmap_reader.cpp rename to libs/coding/mmap_reader.cpp diff --git a/coding/mmap_reader.hpp b/libs/coding/mmap_reader.hpp similarity index 100% rename from coding/mmap_reader.hpp rename to libs/coding/mmap_reader.hpp diff --git a/coding/move_to_front.cpp b/libs/coding/move_to_front.cpp similarity index 100% rename from coding/move_to_front.cpp rename to libs/coding/move_to_front.cpp diff --git a/coding/move_to_front.hpp b/libs/coding/move_to_front.hpp similarity index 100% rename from coding/move_to_front.hpp rename to libs/coding/move_to_front.hpp diff --git a/coding/parse_xml.hpp b/libs/coding/parse_xml.hpp similarity index 100% rename from coding/parse_xml.hpp rename to libs/coding/parse_xml.hpp diff --git a/coding/point_coding.cpp b/libs/coding/point_coding.cpp similarity index 100% rename from coding/point_coding.cpp rename to libs/coding/point_coding.cpp diff --git a/coding/point_coding.hpp b/libs/coding/point_coding.hpp similarity index 100% rename from coding/point_coding.hpp rename to libs/coding/point_coding.hpp diff --git a/coding/read_write_utils.hpp b/libs/coding/read_write_utils.hpp similarity index 100% rename from coding/read_write_utils.hpp rename to libs/coding/read_write_utils.hpp diff --git a/coding/reader.cpp b/libs/coding/reader.cpp similarity index 100% rename from coding/reader.cpp rename to libs/coding/reader.cpp diff --git a/coding/reader.hpp b/libs/coding/reader.hpp similarity index 100% rename from coding/reader.hpp rename to libs/coding/reader.hpp diff --git a/coding/reader_cache.hpp b/libs/coding/reader_cache.hpp similarity index 100% rename from coding/reader_cache.hpp rename to libs/coding/reader_cache.hpp diff --git a/coding/reader_streambuf.cpp b/libs/coding/reader_streambuf.cpp similarity index 100% rename from coding/reader_streambuf.cpp rename to libs/coding/reader_streambuf.cpp diff --git a/coding/reader_streambuf.hpp b/libs/coding/reader_streambuf.hpp similarity index 100% rename from coding/reader_streambuf.hpp rename to libs/coding/reader_streambuf.hpp diff --git a/coding/reader_wrapper.hpp b/libs/coding/reader_wrapper.hpp similarity index 100% rename from coding/reader_wrapper.hpp rename to libs/coding/reader_wrapper.hpp diff --git a/coding/reader_writer_ops.cpp b/libs/coding/reader_writer_ops.cpp similarity index 100% rename from coding/reader_writer_ops.cpp rename to libs/coding/reader_writer_ops.cpp diff --git a/coding/reader_writer_ops.hpp b/libs/coding/reader_writer_ops.hpp similarity index 100% rename from coding/reader_writer_ops.hpp rename to libs/coding/reader_writer_ops.hpp diff --git a/coding/serdes_binary_header.hpp b/libs/coding/serdes_binary_header.hpp similarity index 100% rename from coding/serdes_binary_header.hpp rename to libs/coding/serdes_binary_header.hpp diff --git a/coding/serdes_json.hpp b/libs/coding/serdes_json.hpp similarity index 100% rename from coding/serdes_json.hpp rename to libs/coding/serdes_json.hpp diff --git a/coding/sha1.cpp b/libs/coding/sha1.cpp similarity index 100% rename from coding/sha1.cpp rename to libs/coding/sha1.cpp diff --git a/coding/sha1.hpp b/libs/coding/sha1.hpp similarity index 100% rename from coding/sha1.hpp rename to libs/coding/sha1.hpp diff --git a/coding/simple_dense_coding.cpp b/libs/coding/simple_dense_coding.cpp similarity index 100% rename from coding/simple_dense_coding.cpp rename to libs/coding/simple_dense_coding.cpp diff --git a/coding/simple_dense_coding.hpp b/libs/coding/simple_dense_coding.hpp similarity index 100% rename from coding/simple_dense_coding.hpp rename to libs/coding/simple_dense_coding.hpp diff --git a/coding/sparse_vector.hpp b/libs/coding/sparse_vector.hpp similarity index 100% rename from coding/sparse_vector.hpp rename to libs/coding/sparse_vector.hpp diff --git a/coding/streams.hpp b/libs/coding/streams.hpp similarity index 100% rename from coding/streams.hpp rename to libs/coding/streams.hpp diff --git a/coding/streams_common.hpp b/libs/coding/streams_common.hpp similarity index 100% rename from coding/streams_common.hpp rename to libs/coding/streams_common.hpp diff --git a/coding/streams_sink.hpp b/libs/coding/streams_sink.hpp similarity index 100% rename from coding/streams_sink.hpp rename to libs/coding/streams_sink.hpp diff --git a/coding/string_utf8_multilang.cpp b/libs/coding/string_utf8_multilang.cpp similarity index 100% rename from coding/string_utf8_multilang.cpp rename to libs/coding/string_utf8_multilang.cpp diff --git a/coding/string_utf8_multilang.hpp b/libs/coding/string_utf8_multilang.hpp similarity index 100% rename from coding/string_utf8_multilang.hpp rename to libs/coding/string_utf8_multilang.hpp diff --git a/coding/succinct_mapper.hpp b/libs/coding/succinct_mapper.hpp similarity index 100% rename from coding/succinct_mapper.hpp rename to libs/coding/succinct_mapper.hpp diff --git a/coding/tesselator_decl.hpp b/libs/coding/tesselator_decl.hpp similarity index 100% rename from coding/tesselator_decl.hpp rename to libs/coding/tesselator_decl.hpp diff --git a/coding/text_storage.hpp b/libs/coding/text_storage.hpp similarity index 100% rename from coding/text_storage.hpp rename to libs/coding/text_storage.hpp diff --git a/coding/traffic.cpp b/libs/coding/traffic.cpp similarity index 100% rename from coding/traffic.cpp rename to libs/coding/traffic.cpp diff --git a/coding/traffic.hpp b/libs/coding/traffic.hpp similarity index 100% rename from coding/traffic.hpp rename to libs/coding/traffic.hpp diff --git a/coding/transliteration.cpp b/libs/coding/transliteration.cpp similarity index 100% rename from coding/transliteration.cpp rename to libs/coding/transliteration.cpp diff --git a/coding/transliteration.hpp b/libs/coding/transliteration.hpp similarity index 100% rename from coding/transliteration.hpp rename to libs/coding/transliteration.hpp diff --git a/coding/url.cpp b/libs/coding/url.cpp similarity index 100% rename from coding/url.cpp rename to libs/coding/url.cpp diff --git a/coding/url.hpp b/libs/coding/url.hpp similarity index 100% rename from coding/url.hpp rename to libs/coding/url.hpp diff --git a/coding/value_opt_string.hpp b/libs/coding/value_opt_string.hpp similarity index 100% rename from coding/value_opt_string.hpp rename to libs/coding/value_opt_string.hpp diff --git a/coding/var_record_reader.hpp b/libs/coding/var_record_reader.hpp similarity index 100% rename from coding/var_record_reader.hpp rename to libs/coding/var_record_reader.hpp diff --git a/coding/var_serial_vector.hpp b/libs/coding/var_serial_vector.hpp similarity index 100% rename from coding/var_serial_vector.hpp rename to libs/coding/var_serial_vector.hpp diff --git a/coding/varint.hpp b/libs/coding/varint.hpp similarity index 100% rename from coding/varint.hpp rename to libs/coding/varint.hpp diff --git a/coding/write_to_sink.hpp b/libs/coding/write_to_sink.hpp similarity index 100% rename from coding/write_to_sink.hpp rename to libs/coding/write_to_sink.hpp diff --git a/coding/writer.hpp b/libs/coding/writer.hpp similarity index 100% rename from coding/writer.hpp rename to libs/coding/writer.hpp diff --git a/coding/zip_creator.cpp b/libs/coding/zip_creator.cpp similarity index 100% rename from coding/zip_creator.cpp rename to libs/coding/zip_creator.cpp diff --git a/coding/zip_creator.hpp b/libs/coding/zip_creator.hpp similarity index 100% rename from coding/zip_creator.hpp rename to libs/coding/zip_creator.hpp diff --git a/coding/zip_reader.cpp b/libs/coding/zip_reader.cpp similarity index 100% rename from coding/zip_reader.cpp rename to libs/coding/zip_reader.cpp diff --git a/coding/zip_reader.hpp b/libs/coding/zip_reader.hpp similarity index 100% rename from coding/zip_reader.hpp rename to libs/coding/zip_reader.hpp diff --git a/coding/zlib.cpp b/libs/coding/zlib.cpp similarity index 100% rename from coding/zlib.cpp rename to libs/coding/zlib.cpp diff --git a/coding/zlib.hpp b/libs/coding/zlib.hpp similarity index 100% rename from coding/zlib.hpp rename to libs/coding/zlib.hpp diff --git a/cppjansson/CMakeLists.txt b/libs/cppjansson/CMakeLists.txt similarity index 100% rename from cppjansson/CMakeLists.txt rename to libs/cppjansson/CMakeLists.txt diff --git a/cppjansson/cppjansson.cpp b/libs/cppjansson/cppjansson.cpp similarity index 100% rename from cppjansson/cppjansson.cpp rename to libs/cppjansson/cppjansson.cpp diff --git a/cppjansson/cppjansson.hpp b/libs/cppjansson/cppjansson.hpp similarity index 100% rename from cppjansson/cppjansson.hpp rename to libs/cppjansson/cppjansson.hpp diff --git a/cppjansson/jansson_handle.cpp b/libs/cppjansson/jansson_handle.cpp similarity index 100% rename from cppjansson/jansson_handle.cpp rename to libs/cppjansson/jansson_handle.cpp diff --git a/cppjansson/jansson_handle.hpp b/libs/cppjansson/jansson_handle.hpp similarity index 100% rename from cppjansson/jansson_handle.hpp rename to libs/cppjansson/jansson_handle.hpp diff --git a/descriptions/CMakeLists.txt b/libs/descriptions/CMakeLists.txt similarity index 100% rename from descriptions/CMakeLists.txt rename to libs/descriptions/CMakeLists.txt diff --git a/descriptions/descriptions_tests/CMakeLists.txt b/libs/descriptions/descriptions_tests/CMakeLists.txt similarity index 100% rename from descriptions/descriptions_tests/CMakeLists.txt rename to libs/descriptions/descriptions_tests/CMakeLists.txt diff --git a/descriptions/descriptions_tests/descriptions_tests.cpp b/libs/descriptions/descriptions_tests/descriptions_tests.cpp similarity index 100% rename from descriptions/descriptions_tests/descriptions_tests.cpp rename to libs/descriptions/descriptions_tests/descriptions_tests.cpp diff --git a/descriptions/header.hpp b/libs/descriptions/header.hpp similarity index 100% rename from descriptions/header.hpp rename to libs/descriptions/header.hpp diff --git a/descriptions/loader.cpp b/libs/descriptions/loader.cpp similarity index 100% rename from descriptions/loader.cpp rename to libs/descriptions/loader.cpp diff --git a/descriptions/loader.hpp b/libs/descriptions/loader.hpp similarity index 100% rename from descriptions/loader.hpp rename to libs/descriptions/loader.hpp diff --git a/descriptions/serdes.hpp b/libs/descriptions/serdes.hpp similarity index 100% rename from descriptions/serdes.hpp rename to libs/descriptions/serdes.hpp diff --git a/drape/CMakeLists.txt b/libs/drape/CMakeLists.txt similarity index 100% rename from drape/CMakeLists.txt rename to libs/drape/CMakeLists.txt diff --git a/drape/attribute_buffer_mutator.cpp b/libs/drape/attribute_buffer_mutator.cpp similarity index 100% rename from drape/attribute_buffer_mutator.cpp rename to libs/drape/attribute_buffer_mutator.cpp diff --git a/drape/attribute_buffer_mutator.hpp b/libs/drape/attribute_buffer_mutator.hpp similarity index 100% rename from drape/attribute_buffer_mutator.hpp rename to libs/drape/attribute_buffer_mutator.hpp diff --git a/drape/attribute_provider.cpp b/libs/drape/attribute_provider.cpp similarity index 100% rename from drape/attribute_provider.cpp rename to libs/drape/attribute_provider.cpp diff --git a/drape/attribute_provider.hpp b/libs/drape/attribute_provider.hpp similarity index 100% rename from drape/attribute_provider.hpp rename to libs/drape/attribute_provider.hpp diff --git a/drape/batcher.cpp b/libs/drape/batcher.cpp similarity index 100% rename from drape/batcher.cpp rename to libs/drape/batcher.cpp diff --git a/drape/batcher.hpp b/libs/drape/batcher.hpp similarity index 100% rename from drape/batcher.hpp rename to libs/drape/batcher.hpp diff --git a/drape/batcher_helpers.cpp b/libs/drape/batcher_helpers.cpp similarity index 100% rename from drape/batcher_helpers.cpp rename to libs/drape/batcher_helpers.cpp diff --git a/drape/batcher_helpers.hpp b/libs/drape/batcher_helpers.hpp similarity index 100% rename from drape/batcher_helpers.hpp rename to libs/drape/batcher_helpers.hpp diff --git a/drape/binding_info.cpp b/libs/drape/binding_info.cpp similarity index 100% rename from drape/binding_info.cpp rename to libs/drape/binding_info.cpp diff --git a/drape/binding_info.hpp b/libs/drape/binding_info.hpp similarity index 100% rename from drape/binding_info.hpp rename to libs/drape/binding_info.hpp diff --git a/drape/buffer_base.cpp b/libs/drape/buffer_base.cpp similarity index 100% rename from drape/buffer_base.cpp rename to libs/drape/buffer_base.cpp diff --git a/drape/buffer_base.hpp b/libs/drape/buffer_base.hpp similarity index 100% rename from drape/buffer_base.hpp rename to libs/drape/buffer_base.hpp diff --git a/drape/color.hpp b/libs/drape/color.hpp similarity index 100% rename from drape/color.hpp rename to libs/drape/color.hpp diff --git a/drape/constants.hpp b/libs/drape/constants.hpp similarity index 100% rename from drape/constants.hpp rename to libs/drape/constants.hpp diff --git a/drape/cpu_buffer.cpp b/libs/drape/cpu_buffer.cpp similarity index 100% rename from drape/cpu_buffer.cpp rename to libs/drape/cpu_buffer.cpp diff --git a/drape/cpu_buffer.hpp b/libs/drape/cpu_buffer.hpp similarity index 100% rename from drape/cpu_buffer.hpp rename to libs/drape/cpu_buffer.hpp diff --git a/drape/data_buffer.cpp b/libs/drape/data_buffer.cpp similarity index 100% rename from drape/data_buffer.cpp rename to libs/drape/data_buffer.cpp diff --git a/drape/data_buffer.hpp b/libs/drape/data_buffer.hpp similarity index 100% rename from drape/data_buffer.hpp rename to libs/drape/data_buffer.hpp diff --git a/drape/data_buffer_impl.hpp b/libs/drape/data_buffer_impl.hpp similarity index 100% rename from drape/data_buffer_impl.hpp rename to libs/drape/data_buffer_impl.hpp diff --git a/drape/debug_renderer.hpp b/libs/drape/debug_renderer.hpp similarity index 100% rename from drape/debug_renderer.hpp rename to libs/drape/debug_renderer.hpp diff --git a/drape/drape_diagnostics.hpp b/libs/drape/drape_diagnostics.hpp similarity index 100% rename from drape/drape_diagnostics.hpp rename to libs/drape/drape_diagnostics.hpp diff --git a/drape/drape_global.hpp b/libs/drape/drape_global.hpp similarity index 100% rename from drape/drape_global.hpp rename to libs/drape/drape_global.hpp diff --git a/drape/drape_routine.hpp b/libs/drape/drape_routine.hpp similarity index 100% rename from drape/drape_routine.hpp rename to libs/drape/drape_routine.hpp diff --git a/drape/drape_tests/CMakeLists.txt b/libs/drape/drape_tests/CMakeLists.txt similarity index 90% rename from drape/drape_tests/CMakeLists.txt rename to libs/drape/drape_tests/CMakeLists.txt index 984853479..07acff7d2 100644 --- a/drape/drape_tests/CMakeLists.txt +++ b/libs/drape/drape_tests/CMakeLists.txt @@ -40,7 +40,7 @@ if (WITH_SYSTEM_PROVIDED_3PARTY) find_package(GTest REQUIRED) target_link_libraries(${PROJECT_NAME} GTest::gtest) else() - add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/../../3party/googletest" "${CMAKE_CURRENT_BINARY_DIR}/googletest") + add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/../../../3party/googletest" "${CMAKE_CURRENT_BINARY_DIR}/googletest") target_include_directories(${PROJECT_NAME} PUBLIC ${OMIM_ROOT}/3party/glm) endif() diff --git a/drape/drape_tests/attribute_provides_tests.cpp b/libs/drape/drape_tests/attribute_provides_tests.cpp similarity index 100% rename from drape/drape_tests/attribute_provides_tests.cpp rename to libs/drape/drape_tests/attribute_provides_tests.cpp diff --git a/drape/drape_tests/batcher_tests.cpp b/libs/drape/drape_tests/batcher_tests.cpp similarity index 100% rename from drape/drape_tests/batcher_tests.cpp rename to libs/drape/drape_tests/batcher_tests.cpp diff --git a/drape/drape_tests/bingind_info_tests.cpp b/libs/drape/drape_tests/bingind_info_tests.cpp similarity index 100% rename from drape/drape_tests/bingind_info_tests.cpp rename to libs/drape/drape_tests/bingind_info_tests.cpp diff --git a/drape/drape_tests/buffer_tests.cpp b/libs/drape/drape_tests/buffer_tests.cpp similarity index 100% rename from drape/drape_tests/buffer_tests.cpp rename to libs/drape/drape_tests/buffer_tests.cpp diff --git a/drape/drape_tests/dummy_texture.hpp b/libs/drape/drape_tests/dummy_texture.hpp similarity index 100% rename from drape/drape_tests/dummy_texture.hpp rename to libs/drape/drape_tests/dummy_texture.hpp diff --git a/drape/drape_tests/font_texture_tests.cpp b/libs/drape/drape_tests/font_texture_tests.cpp similarity index 100% rename from drape/drape_tests/font_texture_tests.cpp rename to libs/drape/drape_tests/font_texture_tests.cpp diff --git a/drape/drape_tests/gl_functions.cpp b/libs/drape/drape_tests/gl_functions.cpp similarity index 100% rename from drape/drape_tests/gl_functions.cpp rename to libs/drape/drape_tests/gl_functions.cpp diff --git a/drape/drape_tests/gl_mock_functions.cpp b/libs/drape/drape_tests/gl_mock_functions.cpp similarity index 100% rename from drape/drape_tests/gl_mock_functions.cpp rename to libs/drape/drape_tests/gl_mock_functions.cpp diff --git a/drape/drape_tests/gl_mock_functions.hpp b/libs/drape/drape_tests/gl_mock_functions.hpp similarity index 100% rename from drape/drape_tests/gl_mock_functions.hpp rename to libs/drape/drape_tests/gl_mock_functions.hpp diff --git a/drape/drape_tests/glyph_mng_tests.cpp b/libs/drape/drape_tests/glyph_mng_tests.cpp similarity index 100% rename from drape/drape_tests/glyph_mng_tests.cpp rename to libs/drape/drape_tests/glyph_mng_tests.cpp diff --git a/drape/drape_tests/glyph_packer_test.cpp b/libs/drape/drape_tests/glyph_packer_test.cpp similarity index 100% rename from drape/drape_tests/glyph_packer_test.cpp rename to libs/drape/drape_tests/glyph_packer_test.cpp diff --git a/drape/drape_tests/harfbuzz_shaping_test.cpp b/libs/drape/drape_tests/harfbuzz_shaping_test.cpp similarity index 100% rename from drape/drape_tests/harfbuzz_shaping_test.cpp rename to libs/drape/drape_tests/harfbuzz_shaping_test.cpp diff --git a/drape/drape_tests/img.cpp b/libs/drape/drape_tests/img.cpp similarity index 100% rename from drape/drape_tests/img.cpp rename to libs/drape/drape_tests/img.cpp diff --git a/drape/drape_tests/img.hpp b/libs/drape/drape_tests/img.hpp similarity index 100% rename from drape/drape_tests/img.hpp rename to libs/drape/drape_tests/img.hpp diff --git a/drape/drape_tests/memory_comparer.hpp b/libs/drape/drape_tests/memory_comparer.hpp similarity index 100% rename from drape/drape_tests/memory_comparer.hpp rename to libs/drape/drape_tests/memory_comparer.hpp diff --git a/drape/drape_tests/object_pool_tests.cpp b/libs/drape/drape_tests/object_pool_tests.cpp similarity index 100% rename from drape/drape_tests/object_pool_tests.cpp rename to libs/drape/drape_tests/object_pool_tests.cpp diff --git a/drape/drape_tests/pointers_tests.cpp b/libs/drape/drape_tests/pointers_tests.cpp similarity index 100% rename from drape/drape_tests/pointers_tests.cpp rename to libs/drape/drape_tests/pointers_tests.cpp diff --git a/drape/drape_tests/static_texture_tests.cpp b/libs/drape/drape_tests/static_texture_tests.cpp similarity index 100% rename from drape/drape_tests/static_texture_tests.cpp rename to libs/drape/drape_tests/static_texture_tests.cpp diff --git a/drape/drape_tests/stipple_pen_tests.cpp b/libs/drape/drape_tests/stipple_pen_tests.cpp similarity index 100% rename from drape/drape_tests/stipple_pen_tests.cpp rename to libs/drape/drape_tests/stipple_pen_tests.cpp diff --git a/drape/drape_tests/testing_graphics_context.hpp b/libs/drape/drape_tests/testing_graphics_context.hpp similarity index 100% rename from drape/drape_tests/testing_graphics_context.hpp rename to libs/drape/drape_tests/testing_graphics_context.hpp diff --git a/drape/drape_tests/texture_of_colors_tests.cpp b/libs/drape/drape_tests/texture_of_colors_tests.cpp similarity index 100% rename from drape/drape_tests/texture_of_colors_tests.cpp rename to libs/drape/drape_tests/texture_of_colors_tests.cpp diff --git a/drape/drape_tests/uniform_value_tests.cpp b/libs/drape/drape_tests/uniform_value_tests.cpp similarity index 100% rename from drape/drape_tests/uniform_value_tests.cpp rename to libs/drape/drape_tests/uniform_value_tests.cpp diff --git a/drape/drape_tests/vertex_buffer_tests.cpp b/libs/drape/drape_tests/vertex_buffer_tests.cpp similarity index 100% rename from drape/drape_tests/vertex_buffer_tests.cpp rename to libs/drape/drape_tests/vertex_buffer_tests.cpp diff --git a/drape/dynamic_texture.hpp b/libs/drape/dynamic_texture.hpp similarity index 100% rename from drape/dynamic_texture.hpp rename to libs/drape/dynamic_texture.hpp diff --git a/drape/font_constants.hpp b/libs/drape/font_constants.hpp similarity index 100% rename from drape/font_constants.hpp rename to libs/drape/font_constants.hpp diff --git a/drape/font_texture.cpp b/libs/drape/font_texture.cpp similarity index 100% rename from drape/font_texture.cpp rename to libs/drape/font_texture.cpp diff --git a/drape/font_texture.hpp b/libs/drape/font_texture.hpp similarity index 100% rename from drape/font_texture.hpp rename to libs/drape/font_texture.hpp diff --git a/drape/fonts_tool/CMakeLists.txt b/libs/drape/fonts_tool/CMakeLists.txt similarity index 100% rename from drape/fonts_tool/CMakeLists.txt rename to libs/drape/fonts_tool/CMakeLists.txt diff --git a/drape/fonts_tool/fonts_tool.cpp b/libs/drape/fonts_tool/fonts_tool.cpp similarity index 100% rename from drape/fonts_tool/fonts_tool.cpp rename to libs/drape/fonts_tool/fonts_tool.cpp diff --git a/drape/framebuffer.cpp b/libs/drape/framebuffer.cpp similarity index 100% rename from drape/framebuffer.cpp rename to libs/drape/framebuffer.cpp diff --git a/drape/framebuffer.hpp b/libs/drape/framebuffer.hpp similarity index 100% rename from drape/framebuffer.hpp rename to libs/drape/framebuffer.hpp diff --git a/drape/gl_constants.cpp b/libs/drape/gl_constants.cpp similarity index 100% rename from drape/gl_constants.cpp rename to libs/drape/gl_constants.cpp diff --git a/drape/gl_constants.hpp b/libs/drape/gl_constants.hpp similarity index 100% rename from drape/gl_constants.hpp rename to libs/drape/gl_constants.hpp diff --git a/drape/gl_extensions_list.cpp b/libs/drape/gl_extensions_list.cpp similarity index 100% rename from drape/gl_extensions_list.cpp rename to libs/drape/gl_extensions_list.cpp diff --git a/drape/gl_extensions_list.hpp b/libs/drape/gl_extensions_list.hpp similarity index 100% rename from drape/gl_extensions_list.hpp rename to libs/drape/gl_extensions_list.hpp diff --git a/drape/gl_functions.cpp b/libs/drape/gl_functions.cpp similarity index 100% rename from drape/gl_functions.cpp rename to libs/drape/gl_functions.cpp diff --git a/drape/gl_functions.hpp b/libs/drape/gl_functions.hpp similarity index 100% rename from drape/gl_functions.hpp rename to libs/drape/gl_functions.hpp diff --git a/drape/gl_gpu_program.cpp b/libs/drape/gl_gpu_program.cpp similarity index 100% rename from drape/gl_gpu_program.cpp rename to libs/drape/gl_gpu_program.cpp diff --git a/drape/gl_gpu_program.hpp b/libs/drape/gl_gpu_program.hpp similarity index 100% rename from drape/gl_gpu_program.hpp rename to libs/drape/gl_gpu_program.hpp diff --git a/drape/gl_includes.hpp b/libs/drape/gl_includes.hpp similarity index 100% rename from drape/gl_includes.hpp rename to libs/drape/gl_includes.hpp diff --git a/drape/glsl_func.hpp b/libs/drape/glsl_func.hpp similarity index 100% rename from drape/glsl_func.hpp rename to libs/drape/glsl_func.hpp diff --git a/drape/glsl_types.hpp b/libs/drape/glsl_types.hpp similarity index 100% rename from drape/glsl_types.hpp rename to libs/drape/glsl_types.hpp diff --git a/drape/glyph.hpp b/libs/drape/glyph.hpp similarity index 100% rename from drape/glyph.hpp rename to libs/drape/glyph.hpp diff --git a/drape/glyph_manager.cpp b/libs/drape/glyph_manager.cpp similarity index 100% rename from drape/glyph_manager.cpp rename to libs/drape/glyph_manager.cpp diff --git a/drape/glyph_manager.hpp b/libs/drape/glyph_manager.hpp similarity index 100% rename from drape/glyph_manager.hpp rename to libs/drape/glyph_manager.hpp diff --git a/drape/gpu_buffer.cpp b/libs/drape/gpu_buffer.cpp similarity index 100% rename from drape/gpu_buffer.cpp rename to libs/drape/gpu_buffer.cpp diff --git a/drape/gpu_buffer.hpp b/libs/drape/gpu_buffer.hpp similarity index 100% rename from drape/gpu_buffer.hpp rename to libs/drape/gpu_buffer.hpp diff --git a/drape/gpu_program.hpp b/libs/drape/gpu_program.hpp similarity index 100% rename from drape/gpu_program.hpp rename to libs/drape/gpu_program.hpp diff --git a/drape/graphics_context.hpp b/libs/drape/graphics_context.hpp similarity index 100% rename from drape/graphics_context.hpp rename to libs/drape/graphics_context.hpp diff --git a/drape/graphics_context_factory.cpp b/libs/drape/graphics_context_factory.cpp similarity index 100% rename from drape/graphics_context_factory.cpp rename to libs/drape/graphics_context_factory.cpp diff --git a/drape/graphics_context_factory.hpp b/libs/drape/graphics_context_factory.hpp similarity index 100% rename from drape/graphics_context_factory.hpp rename to libs/drape/graphics_context_factory.hpp diff --git a/drape/harfbuzz_shaping.cpp b/libs/drape/harfbuzz_shaping.cpp similarity index 100% rename from drape/harfbuzz_shaping.cpp rename to libs/drape/harfbuzz_shaping.cpp diff --git a/drape/harfbuzz_shaping.hpp b/libs/drape/harfbuzz_shaping.hpp similarity index 100% rename from drape/harfbuzz_shaping.hpp rename to libs/drape/harfbuzz_shaping.hpp diff --git a/drape/hw_texture.cpp b/libs/drape/hw_texture.cpp similarity index 100% rename from drape/hw_texture.cpp rename to libs/drape/hw_texture.cpp diff --git a/drape/hw_texture.hpp b/libs/drape/hw_texture.hpp similarity index 100% rename from drape/hw_texture.hpp rename to libs/drape/hw_texture.hpp diff --git a/drape/hw_texture_ios.hpp b/libs/drape/hw_texture_ios.hpp similarity index 100% rename from drape/hw_texture_ios.hpp rename to libs/drape/hw_texture_ios.hpp diff --git a/drape/hw_texture_ios.mm b/libs/drape/hw_texture_ios.mm similarity index 100% rename from drape/hw_texture_ios.mm rename to libs/drape/hw_texture_ios.mm diff --git a/drape/index_buffer.cpp b/libs/drape/index_buffer.cpp similarity index 100% rename from drape/index_buffer.cpp rename to libs/drape/index_buffer.cpp diff --git a/drape/index_buffer.hpp b/libs/drape/index_buffer.hpp similarity index 100% rename from drape/index_buffer.hpp rename to libs/drape/index_buffer.hpp diff --git a/drape/index_buffer_mutator.cpp b/libs/drape/index_buffer_mutator.cpp similarity index 100% rename from drape/index_buffer_mutator.cpp rename to libs/drape/index_buffer_mutator.cpp diff --git a/drape/index_buffer_mutator.hpp b/libs/drape/index_buffer_mutator.hpp similarity index 100% rename from drape/index_buffer_mutator.hpp rename to libs/drape/index_buffer_mutator.hpp diff --git a/drape/index_storage.cpp b/libs/drape/index_storage.cpp similarity index 100% rename from drape/index_storage.cpp rename to libs/drape/index_storage.cpp diff --git a/drape/index_storage.hpp b/libs/drape/index_storage.hpp similarity index 100% rename from drape/index_storage.hpp rename to libs/drape/index_storage.hpp diff --git a/drape/mesh_object.cpp b/libs/drape/mesh_object.cpp similarity index 100% rename from drape/mesh_object.cpp rename to libs/drape/mesh_object.cpp diff --git a/drape/mesh_object.hpp b/libs/drape/mesh_object.hpp similarity index 100% rename from drape/mesh_object.hpp rename to libs/drape/mesh_object.hpp diff --git a/drape/metal/metal_base_context.hpp b/libs/drape/metal/metal_base_context.hpp similarity index 100% rename from drape/metal/metal_base_context.hpp rename to libs/drape/metal/metal_base_context.hpp diff --git a/drape/metal/metal_base_context.mm b/libs/drape/metal/metal_base_context.mm similarity index 100% rename from drape/metal/metal_base_context.mm rename to libs/drape/metal/metal_base_context.mm diff --git a/drape/metal/metal_cleaner.hpp b/libs/drape/metal/metal_cleaner.hpp similarity index 100% rename from drape/metal/metal_cleaner.hpp rename to libs/drape/metal/metal_cleaner.hpp diff --git a/drape/metal/metal_cleaner.mm b/libs/drape/metal/metal_cleaner.mm similarity index 100% rename from drape/metal/metal_cleaner.mm rename to libs/drape/metal/metal_cleaner.mm diff --git a/drape/metal/metal_gpu_buffer_impl.hpp b/libs/drape/metal/metal_gpu_buffer_impl.hpp similarity index 100% rename from drape/metal/metal_gpu_buffer_impl.hpp rename to libs/drape/metal/metal_gpu_buffer_impl.hpp diff --git a/drape/metal/metal_gpu_buffer_impl.mm b/libs/drape/metal/metal_gpu_buffer_impl.mm similarity index 100% rename from drape/metal/metal_gpu_buffer_impl.mm rename to libs/drape/metal/metal_gpu_buffer_impl.mm diff --git a/drape/metal/metal_gpu_program.hpp b/libs/drape/metal/metal_gpu_program.hpp similarity index 100% rename from drape/metal/metal_gpu_program.hpp rename to libs/drape/metal/metal_gpu_program.hpp diff --git a/drape/metal/metal_mesh_object_impl.mm b/libs/drape/metal/metal_mesh_object_impl.mm similarity index 100% rename from drape/metal/metal_mesh_object_impl.mm rename to libs/drape/metal/metal_mesh_object_impl.mm diff --git a/drape/metal/metal_states.hpp b/libs/drape/metal/metal_states.hpp similarity index 100% rename from drape/metal/metal_states.hpp rename to libs/drape/metal/metal_states.hpp diff --git a/drape/metal/metal_states.mm b/libs/drape/metal/metal_states.mm similarity index 100% rename from drape/metal/metal_states.mm rename to libs/drape/metal/metal_states.mm diff --git a/drape/metal/metal_texture.hpp b/libs/drape/metal/metal_texture.hpp similarity index 100% rename from drape/metal/metal_texture.hpp rename to libs/drape/metal/metal_texture.hpp diff --git a/drape/metal/metal_texture.mm b/libs/drape/metal/metal_texture.mm similarity index 100% rename from drape/metal/metal_texture.mm rename to libs/drape/metal/metal_texture.mm diff --git a/drape/metal/metal_vertex_array_buffer_impl.mm b/libs/drape/metal/metal_vertex_array_buffer_impl.mm similarity index 100% rename from drape/metal/metal_vertex_array_buffer_impl.mm rename to libs/drape/metal/metal_vertex_array_buffer_impl.mm diff --git a/drape/metal/render_state_metal.mm b/libs/drape/metal/render_state_metal.mm similarity index 100% rename from drape/metal/render_state_metal.mm rename to libs/drape/metal/render_state_metal.mm diff --git a/drape/object_pool.hpp b/libs/drape/object_pool.hpp similarity index 100% rename from drape/object_pool.hpp rename to libs/drape/object_pool.hpp diff --git a/drape/oglcontext.cpp b/libs/drape/oglcontext.cpp similarity index 100% rename from drape/oglcontext.cpp rename to libs/drape/oglcontext.cpp diff --git a/drape/oglcontext.hpp b/libs/drape/oglcontext.hpp similarity index 100% rename from drape/oglcontext.hpp rename to libs/drape/oglcontext.hpp diff --git a/drape/overlay_handle.cpp b/libs/drape/overlay_handle.cpp similarity index 100% rename from drape/overlay_handle.cpp rename to libs/drape/overlay_handle.cpp diff --git a/drape/overlay_handle.hpp b/libs/drape/overlay_handle.hpp similarity index 100% rename from drape/overlay_handle.hpp rename to libs/drape/overlay_handle.hpp diff --git a/drape/overlay_tree.cpp b/libs/drape/overlay_tree.cpp similarity index 100% rename from drape/overlay_tree.cpp rename to libs/drape/overlay_tree.cpp diff --git a/drape/overlay_tree.hpp b/libs/drape/overlay_tree.hpp similarity index 100% rename from drape/overlay_tree.hpp rename to libs/drape/overlay_tree.hpp diff --git a/drape/pointers.cpp b/libs/drape/pointers.cpp similarity index 100% rename from drape/pointers.cpp rename to libs/drape/pointers.cpp diff --git a/drape/pointers.hpp b/libs/drape/pointers.hpp similarity index 100% rename from drape/pointers.hpp rename to libs/drape/pointers.hpp diff --git a/drape/render_bucket.cpp b/libs/drape/render_bucket.cpp similarity index 100% rename from drape/render_bucket.cpp rename to libs/drape/render_bucket.cpp diff --git a/drape/render_bucket.hpp b/libs/drape/render_bucket.hpp similarity index 100% rename from drape/render_bucket.hpp rename to libs/drape/render_bucket.hpp diff --git a/drape/render_state.cpp b/libs/drape/render_state.cpp similarity index 100% rename from drape/render_state.cpp rename to libs/drape/render_state.cpp diff --git a/drape/render_state.hpp b/libs/drape/render_state.hpp similarity index 100% rename from drape/render_state.hpp rename to libs/drape/render_state.hpp diff --git a/drape/shader.cpp b/libs/drape/shader.cpp similarity index 100% rename from drape/shader.cpp rename to libs/drape/shader.cpp diff --git a/drape/shader.hpp b/libs/drape/shader.hpp similarity index 100% rename from drape/shader.hpp rename to libs/drape/shader.hpp diff --git a/drape/static_texture.cpp b/libs/drape/static_texture.cpp similarity index 100% rename from drape/static_texture.cpp rename to libs/drape/static_texture.cpp diff --git a/drape/static_texture.hpp b/libs/drape/static_texture.hpp similarity index 100% rename from drape/static_texture.hpp rename to libs/drape/static_texture.hpp diff --git a/drape/stipple_pen_resource.cpp b/libs/drape/stipple_pen_resource.cpp similarity index 100% rename from drape/stipple_pen_resource.cpp rename to libs/drape/stipple_pen_resource.cpp diff --git a/drape/stipple_pen_resource.hpp b/libs/drape/stipple_pen_resource.hpp similarity index 100% rename from drape/stipple_pen_resource.hpp rename to libs/drape/stipple_pen_resource.hpp diff --git a/drape/support_manager.cpp b/libs/drape/support_manager.cpp similarity index 100% rename from drape/support_manager.cpp rename to libs/drape/support_manager.cpp diff --git a/drape/support_manager.hpp b/libs/drape/support_manager.hpp similarity index 100% rename from drape/support_manager.hpp rename to libs/drape/support_manager.hpp diff --git a/drape/symbols_texture.cpp b/libs/drape/symbols_texture.cpp similarity index 100% rename from drape/symbols_texture.cpp rename to libs/drape/symbols_texture.cpp diff --git a/drape/symbols_texture.hpp b/libs/drape/symbols_texture.hpp similarity index 100% rename from drape/symbols_texture.hpp rename to libs/drape/symbols_texture.hpp diff --git a/drape/texture.cpp b/libs/drape/texture.cpp similarity index 100% rename from drape/texture.cpp rename to libs/drape/texture.cpp diff --git a/drape/texture.hpp b/libs/drape/texture.hpp similarity index 100% rename from drape/texture.hpp rename to libs/drape/texture.hpp diff --git a/drape/texture_manager.cpp b/libs/drape/texture_manager.cpp similarity index 100% rename from drape/texture_manager.cpp rename to libs/drape/texture_manager.cpp diff --git a/drape/texture_manager.hpp b/libs/drape/texture_manager.hpp similarity index 100% rename from drape/texture_manager.hpp rename to libs/drape/texture_manager.hpp diff --git a/drape/texture_of_colors.cpp b/libs/drape/texture_of_colors.cpp similarity index 100% rename from drape/texture_of_colors.cpp rename to libs/drape/texture_of_colors.cpp diff --git a/drape/texture_of_colors.hpp b/libs/drape/texture_of_colors.hpp similarity index 100% rename from drape/texture_of_colors.hpp rename to libs/drape/texture_of_colors.hpp diff --git a/drape/texture_types.hpp b/libs/drape/texture_types.hpp similarity index 100% rename from drape/texture_types.hpp rename to libs/drape/texture_types.hpp diff --git a/drape/tm_read_resources.hpp b/libs/drape/tm_read_resources.hpp similarity index 100% rename from drape/tm_read_resources.hpp rename to libs/drape/tm_read_resources.hpp diff --git a/drape/uniform_value.cpp b/libs/drape/uniform_value.cpp similarity index 100% rename from drape/uniform_value.cpp rename to libs/drape/uniform_value.cpp diff --git a/drape/uniform_value.hpp b/libs/drape/uniform_value.hpp similarity index 100% rename from drape/uniform_value.hpp rename to libs/drape/uniform_value.hpp diff --git a/drape/utils/glyph_usage_tracker.cpp b/libs/drape/utils/glyph_usage_tracker.cpp similarity index 100% rename from drape/utils/glyph_usage_tracker.cpp rename to libs/drape/utils/glyph_usage_tracker.cpp diff --git a/drape/utils/glyph_usage_tracker.hpp b/libs/drape/utils/glyph_usage_tracker.hpp similarity index 100% rename from drape/utils/glyph_usage_tracker.hpp rename to libs/drape/utils/glyph_usage_tracker.hpp diff --git a/drape/utils/gpu_mem_tracker.cpp b/libs/drape/utils/gpu_mem_tracker.cpp similarity index 100% rename from drape/utils/gpu_mem_tracker.cpp rename to libs/drape/utils/gpu_mem_tracker.cpp diff --git a/drape/utils/gpu_mem_tracker.hpp b/libs/drape/utils/gpu_mem_tracker.hpp similarity index 100% rename from drape/utils/gpu_mem_tracker.hpp rename to libs/drape/utils/gpu_mem_tracker.hpp diff --git a/drape/utils/profiler.hpp b/libs/drape/utils/profiler.hpp similarity index 100% rename from drape/utils/profiler.hpp rename to libs/drape/utils/profiler.hpp diff --git a/drape/utils/projection.cpp b/libs/drape/utils/projection.cpp similarity index 100% rename from drape/utils/projection.cpp rename to libs/drape/utils/projection.cpp diff --git a/drape/utils/projection.hpp b/libs/drape/utils/projection.hpp similarity index 100% rename from drape/utils/projection.hpp rename to libs/drape/utils/projection.hpp diff --git a/drape/utils/vertex_decl.cpp b/libs/drape/utils/vertex_decl.cpp similarity index 100% rename from drape/utils/vertex_decl.cpp rename to libs/drape/utils/vertex_decl.cpp diff --git a/drape/utils/vertex_decl.hpp b/libs/drape/utils/vertex_decl.hpp similarity index 100% rename from drape/utils/vertex_decl.hpp rename to libs/drape/utils/vertex_decl.hpp diff --git a/drape/vertex_array_buffer.cpp b/libs/drape/vertex_array_buffer.cpp similarity index 100% rename from drape/vertex_array_buffer.cpp rename to libs/drape/vertex_array_buffer.cpp diff --git a/drape/vertex_array_buffer.hpp b/libs/drape/vertex_array_buffer.hpp similarity index 100% rename from drape/vertex_array_buffer.hpp rename to libs/drape/vertex_array_buffer.hpp diff --git a/drape/viewport.cpp b/libs/drape/viewport.cpp similarity index 100% rename from drape/viewport.cpp rename to libs/drape/viewport.cpp diff --git a/drape/viewport.hpp b/libs/drape/viewport.hpp similarity index 100% rename from drape/viewport.hpp rename to libs/drape/viewport.hpp diff --git a/drape/visual_scale.hpp b/libs/drape/visual_scale.hpp similarity index 100% rename from drape/visual_scale.hpp rename to libs/drape/visual_scale.hpp diff --git a/drape/vulkan/vulkan_base_context.cpp b/libs/drape/vulkan/vulkan_base_context.cpp similarity index 100% rename from drape/vulkan/vulkan_base_context.cpp rename to libs/drape/vulkan/vulkan_base_context.cpp diff --git a/drape/vulkan/vulkan_base_context.hpp b/libs/drape/vulkan/vulkan_base_context.hpp similarity index 100% rename from drape/vulkan/vulkan_base_context.hpp rename to libs/drape/vulkan/vulkan_base_context.hpp diff --git a/drape/vulkan/vulkan_context_factory.cpp b/libs/drape/vulkan/vulkan_context_factory.cpp similarity index 100% rename from drape/vulkan/vulkan_context_factory.cpp rename to libs/drape/vulkan/vulkan_context_factory.cpp diff --git a/drape/vulkan/vulkan_context_factory.hpp b/libs/drape/vulkan/vulkan_context_factory.hpp similarity index 100% rename from drape/vulkan/vulkan_context_factory.hpp rename to libs/drape/vulkan/vulkan_context_factory.hpp diff --git a/drape/vulkan/vulkan_gpu_buffer_impl.cpp b/libs/drape/vulkan/vulkan_gpu_buffer_impl.cpp similarity index 100% rename from drape/vulkan/vulkan_gpu_buffer_impl.cpp rename to libs/drape/vulkan/vulkan_gpu_buffer_impl.cpp diff --git a/drape/vulkan/vulkan_gpu_buffer_impl.hpp b/libs/drape/vulkan/vulkan_gpu_buffer_impl.hpp similarity index 100% rename from drape/vulkan/vulkan_gpu_buffer_impl.hpp rename to libs/drape/vulkan/vulkan_gpu_buffer_impl.hpp diff --git a/drape/vulkan/vulkan_gpu_program.hpp b/libs/drape/vulkan/vulkan_gpu_program.hpp similarity index 100% rename from drape/vulkan/vulkan_gpu_program.hpp rename to libs/drape/vulkan/vulkan_gpu_program.hpp diff --git a/drape/vulkan/vulkan_layers.cpp b/libs/drape/vulkan/vulkan_layers.cpp similarity index 100% rename from drape/vulkan/vulkan_layers.cpp rename to libs/drape/vulkan/vulkan_layers.cpp diff --git a/drape/vulkan/vulkan_layers.hpp b/libs/drape/vulkan/vulkan_layers.hpp similarity index 100% rename from drape/vulkan/vulkan_layers.hpp rename to libs/drape/vulkan/vulkan_layers.hpp diff --git a/drape/vulkan/vulkan_memory_manager.cpp b/libs/drape/vulkan/vulkan_memory_manager.cpp similarity index 100% rename from drape/vulkan/vulkan_memory_manager.cpp rename to libs/drape/vulkan/vulkan_memory_manager.cpp diff --git a/drape/vulkan/vulkan_memory_manager.hpp b/libs/drape/vulkan/vulkan_memory_manager.hpp similarity index 100% rename from drape/vulkan/vulkan_memory_manager.hpp rename to libs/drape/vulkan/vulkan_memory_manager.hpp diff --git a/drape/vulkan/vulkan_mesh_object_impl.cpp b/libs/drape/vulkan/vulkan_mesh_object_impl.cpp similarity index 100% rename from drape/vulkan/vulkan_mesh_object_impl.cpp rename to libs/drape/vulkan/vulkan_mesh_object_impl.cpp diff --git a/drape/vulkan/vulkan_object_manager.cpp b/libs/drape/vulkan/vulkan_object_manager.cpp similarity index 100% rename from drape/vulkan/vulkan_object_manager.cpp rename to libs/drape/vulkan/vulkan_object_manager.cpp diff --git a/drape/vulkan/vulkan_object_manager.hpp b/libs/drape/vulkan/vulkan_object_manager.hpp similarity index 100% rename from drape/vulkan/vulkan_object_manager.hpp rename to libs/drape/vulkan/vulkan_object_manager.hpp diff --git a/drape/vulkan/vulkan_param_descriptor.cpp b/libs/drape/vulkan/vulkan_param_descriptor.cpp similarity index 100% rename from drape/vulkan/vulkan_param_descriptor.cpp rename to libs/drape/vulkan/vulkan_param_descriptor.cpp diff --git a/drape/vulkan/vulkan_param_descriptor.hpp b/libs/drape/vulkan/vulkan_param_descriptor.hpp similarity index 100% rename from drape/vulkan/vulkan_param_descriptor.hpp rename to libs/drape/vulkan/vulkan_param_descriptor.hpp diff --git a/drape/vulkan/vulkan_pipeline.cpp b/libs/drape/vulkan/vulkan_pipeline.cpp similarity index 100% rename from drape/vulkan/vulkan_pipeline.cpp rename to libs/drape/vulkan/vulkan_pipeline.cpp diff --git a/drape/vulkan/vulkan_pipeline.hpp b/libs/drape/vulkan/vulkan_pipeline.hpp similarity index 100% rename from drape/vulkan/vulkan_pipeline.hpp rename to libs/drape/vulkan/vulkan_pipeline.hpp diff --git a/drape/vulkan/vulkan_staging_buffer.cpp b/libs/drape/vulkan/vulkan_staging_buffer.cpp similarity index 100% rename from drape/vulkan/vulkan_staging_buffer.cpp rename to libs/drape/vulkan/vulkan_staging_buffer.cpp diff --git a/drape/vulkan/vulkan_staging_buffer.hpp b/libs/drape/vulkan/vulkan_staging_buffer.hpp similarity index 100% rename from drape/vulkan/vulkan_staging_buffer.hpp rename to libs/drape/vulkan/vulkan_staging_buffer.hpp diff --git a/drape/vulkan/vulkan_texture.cpp b/libs/drape/vulkan/vulkan_texture.cpp similarity index 100% rename from drape/vulkan/vulkan_texture.cpp rename to libs/drape/vulkan/vulkan_texture.cpp diff --git a/drape/vulkan/vulkan_texture.hpp b/libs/drape/vulkan/vulkan_texture.hpp similarity index 100% rename from drape/vulkan/vulkan_texture.hpp rename to libs/drape/vulkan/vulkan_texture.hpp diff --git a/drape/vulkan/vulkan_utils.cpp b/libs/drape/vulkan/vulkan_utils.cpp similarity index 100% rename from drape/vulkan/vulkan_utils.cpp rename to libs/drape/vulkan/vulkan_utils.cpp diff --git a/drape/vulkan/vulkan_utils.hpp b/libs/drape/vulkan/vulkan_utils.hpp similarity index 100% rename from drape/vulkan/vulkan_utils.hpp rename to libs/drape/vulkan/vulkan_utils.hpp diff --git a/drape/vulkan/vulkan_vertex_array_buffer_impl.cpp b/libs/drape/vulkan/vulkan_vertex_array_buffer_impl.cpp similarity index 100% rename from drape/vulkan/vulkan_vertex_array_buffer_impl.cpp rename to libs/drape/vulkan/vulkan_vertex_array_buffer_impl.cpp diff --git a/drape_frontend/CMakeLists.txt b/libs/drape_frontend/CMakeLists.txt similarity index 100% rename from drape_frontend/CMakeLists.txt rename to libs/drape_frontend/CMakeLists.txt diff --git a/drape_frontend/animation/animation.cpp b/libs/drape_frontend/animation/animation.cpp similarity index 100% rename from drape_frontend/animation/animation.cpp rename to libs/drape_frontend/animation/animation.cpp diff --git a/drape_frontend/animation/animation.hpp b/libs/drape_frontend/animation/animation.hpp similarity index 100% rename from drape_frontend/animation/animation.hpp rename to libs/drape_frontend/animation/animation.hpp diff --git a/drape_frontend/animation/arrow_animation.cpp b/libs/drape_frontend/animation/arrow_animation.cpp similarity index 100% rename from drape_frontend/animation/arrow_animation.cpp rename to libs/drape_frontend/animation/arrow_animation.cpp diff --git a/drape_frontend/animation/arrow_animation.hpp b/libs/drape_frontend/animation/arrow_animation.hpp similarity index 100% rename from drape_frontend/animation/arrow_animation.hpp rename to libs/drape_frontend/animation/arrow_animation.hpp diff --git a/drape_frontend/animation/base_interpolator.cpp b/libs/drape_frontend/animation/base_interpolator.cpp similarity index 100% rename from drape_frontend/animation/base_interpolator.cpp rename to libs/drape_frontend/animation/base_interpolator.cpp diff --git a/drape_frontend/animation/base_interpolator.hpp b/libs/drape_frontend/animation/base_interpolator.hpp similarity index 100% rename from drape_frontend/animation/base_interpolator.hpp rename to libs/drape_frontend/animation/base_interpolator.hpp diff --git a/drape_frontend/animation/follow_animation.cpp b/libs/drape_frontend/animation/follow_animation.cpp similarity index 100% rename from drape_frontend/animation/follow_animation.cpp rename to libs/drape_frontend/animation/follow_animation.cpp diff --git a/drape_frontend/animation/follow_animation.hpp b/libs/drape_frontend/animation/follow_animation.hpp similarity index 100% rename from drape_frontend/animation/follow_animation.hpp rename to libs/drape_frontend/animation/follow_animation.hpp diff --git a/drape_frontend/animation/interpolation_holder.cpp b/libs/drape_frontend/animation/interpolation_holder.cpp similarity index 100% rename from drape_frontend/animation/interpolation_holder.cpp rename to libs/drape_frontend/animation/interpolation_holder.cpp diff --git a/drape_frontend/animation/interpolation_holder.hpp b/libs/drape_frontend/animation/interpolation_holder.hpp similarity index 100% rename from drape_frontend/animation/interpolation_holder.hpp rename to libs/drape_frontend/animation/interpolation_holder.hpp diff --git a/drape_frontend/animation/interpolations.cpp b/libs/drape_frontend/animation/interpolations.cpp similarity index 100% rename from drape_frontend/animation/interpolations.cpp rename to libs/drape_frontend/animation/interpolations.cpp diff --git a/drape_frontend/animation/interpolations.hpp b/libs/drape_frontend/animation/interpolations.hpp similarity index 100% rename from drape_frontend/animation/interpolations.hpp rename to libs/drape_frontend/animation/interpolations.hpp diff --git a/drape_frontend/animation/interpolators.cpp b/libs/drape_frontend/animation/interpolators.cpp similarity index 100% rename from drape_frontend/animation/interpolators.cpp rename to libs/drape_frontend/animation/interpolators.cpp diff --git a/drape_frontend/animation/interpolators.hpp b/libs/drape_frontend/animation/interpolators.hpp similarity index 100% rename from drape_frontend/animation/interpolators.hpp rename to libs/drape_frontend/animation/interpolators.hpp diff --git a/drape_frontend/animation/linear_animation.cpp b/libs/drape_frontend/animation/linear_animation.cpp similarity index 100% rename from drape_frontend/animation/linear_animation.cpp rename to libs/drape_frontend/animation/linear_animation.cpp diff --git a/drape_frontend/animation/linear_animation.hpp b/libs/drape_frontend/animation/linear_animation.hpp similarity index 100% rename from drape_frontend/animation/linear_animation.hpp rename to libs/drape_frontend/animation/linear_animation.hpp diff --git a/drape_frontend/animation/opacity_animation.cpp b/libs/drape_frontend/animation/opacity_animation.cpp similarity index 100% rename from drape_frontend/animation/opacity_animation.cpp rename to libs/drape_frontend/animation/opacity_animation.cpp diff --git a/drape_frontend/animation/opacity_animation.hpp b/libs/drape_frontend/animation/opacity_animation.hpp similarity index 100% rename from drape_frontend/animation/opacity_animation.hpp rename to libs/drape_frontend/animation/opacity_animation.hpp diff --git a/drape_frontend/animation/parallel_animation.cpp b/libs/drape_frontend/animation/parallel_animation.cpp similarity index 100% rename from drape_frontend/animation/parallel_animation.cpp rename to libs/drape_frontend/animation/parallel_animation.cpp diff --git a/drape_frontend/animation/parallel_animation.hpp b/libs/drape_frontend/animation/parallel_animation.hpp similarity index 100% rename from drape_frontend/animation/parallel_animation.hpp rename to libs/drape_frontend/animation/parallel_animation.hpp diff --git a/drape_frontend/animation/scale_animation.cpp b/libs/drape_frontend/animation/scale_animation.cpp similarity index 100% rename from drape_frontend/animation/scale_animation.cpp rename to libs/drape_frontend/animation/scale_animation.cpp diff --git a/drape_frontend/animation/scale_animation.hpp b/libs/drape_frontend/animation/scale_animation.hpp similarity index 100% rename from drape_frontend/animation/scale_animation.hpp rename to libs/drape_frontend/animation/scale_animation.hpp diff --git a/drape_frontend/animation/sequence_animation.cpp b/libs/drape_frontend/animation/sequence_animation.cpp similarity index 100% rename from drape_frontend/animation/sequence_animation.cpp rename to libs/drape_frontend/animation/sequence_animation.cpp diff --git a/drape_frontend/animation/sequence_animation.hpp b/libs/drape_frontend/animation/sequence_animation.hpp similarity index 100% rename from drape_frontend/animation/sequence_animation.hpp rename to libs/drape_frontend/animation/sequence_animation.hpp diff --git a/drape_frontend/animation/show_hide_animation.cpp b/libs/drape_frontend/animation/show_hide_animation.cpp similarity index 100% rename from drape_frontend/animation/show_hide_animation.cpp rename to libs/drape_frontend/animation/show_hide_animation.cpp diff --git a/drape_frontend/animation/show_hide_animation.hpp b/libs/drape_frontend/animation/show_hide_animation.hpp similarity index 100% rename from drape_frontend/animation/show_hide_animation.hpp rename to libs/drape_frontend/animation/show_hide_animation.hpp diff --git a/drape_frontend/animation/value_mapping.hpp b/libs/drape_frontend/animation/value_mapping.hpp similarity index 100% rename from drape_frontend/animation/value_mapping.hpp rename to libs/drape_frontend/animation/value_mapping.hpp diff --git a/drape_frontend/animation_constants.hpp b/libs/drape_frontend/animation_constants.hpp similarity index 100% rename from drape_frontend/animation_constants.hpp rename to libs/drape_frontend/animation_constants.hpp diff --git a/drape_frontend/animation_system.cpp b/libs/drape_frontend/animation_system.cpp similarity index 100% rename from drape_frontend/animation_system.cpp rename to libs/drape_frontend/animation_system.cpp diff --git a/drape_frontend/animation_system.hpp b/libs/drape_frontend/animation_system.hpp similarity index 100% rename from drape_frontend/animation_system.hpp rename to libs/drape_frontend/animation_system.hpp diff --git a/drape_frontend/animation_utils.cpp b/libs/drape_frontend/animation_utils.cpp similarity index 100% rename from drape_frontend/animation_utils.cpp rename to libs/drape_frontend/animation_utils.cpp diff --git a/drape_frontend/animation_utils.hpp b/libs/drape_frontend/animation_utils.hpp similarity index 100% rename from drape_frontend/animation_utils.hpp rename to libs/drape_frontend/animation_utils.hpp diff --git a/drape_frontend/apply_feature_functors.cpp b/libs/drape_frontend/apply_feature_functors.cpp similarity index 100% rename from drape_frontend/apply_feature_functors.cpp rename to libs/drape_frontend/apply_feature_functors.cpp diff --git a/drape_frontend/apply_feature_functors.hpp b/libs/drape_frontend/apply_feature_functors.hpp similarity index 100% rename from drape_frontend/apply_feature_functors.hpp rename to libs/drape_frontend/apply_feature_functors.hpp diff --git a/drape_frontend/area_shape.cpp b/libs/drape_frontend/area_shape.cpp similarity index 100% rename from drape_frontend/area_shape.cpp rename to libs/drape_frontend/area_shape.cpp diff --git a/drape_frontend/area_shape.hpp b/libs/drape_frontend/area_shape.hpp similarity index 100% rename from drape_frontend/area_shape.hpp rename to libs/drape_frontend/area_shape.hpp diff --git a/drape_frontend/arrow3d.cpp b/libs/drape_frontend/arrow3d.cpp similarity index 100% rename from drape_frontend/arrow3d.cpp rename to libs/drape_frontend/arrow3d.cpp diff --git a/drape_frontend/arrow3d.hpp b/libs/drape_frontend/arrow3d.hpp similarity index 100% rename from drape_frontend/arrow3d.hpp rename to libs/drape_frontend/arrow3d.hpp diff --git a/drape_frontend/backend_renderer.cpp b/libs/drape_frontend/backend_renderer.cpp similarity index 100% rename from drape_frontend/backend_renderer.cpp rename to libs/drape_frontend/backend_renderer.cpp diff --git a/drape_frontend/backend_renderer.hpp b/libs/drape_frontend/backend_renderer.hpp similarity index 100% rename from drape_frontend/backend_renderer.hpp rename to libs/drape_frontend/backend_renderer.hpp diff --git a/drape_frontend/base_renderer.cpp b/libs/drape_frontend/base_renderer.cpp similarity index 100% rename from drape_frontend/base_renderer.cpp rename to libs/drape_frontend/base_renderer.cpp diff --git a/drape_frontend/base_renderer.hpp b/libs/drape_frontend/base_renderer.hpp similarity index 100% rename from drape_frontend/base_renderer.hpp rename to libs/drape_frontend/base_renderer.hpp diff --git a/drape_frontend/batcher_bucket.hpp b/libs/drape_frontend/batcher_bucket.hpp similarity index 100% rename from drape_frontend/batcher_bucket.hpp rename to libs/drape_frontend/batcher_bucket.hpp diff --git a/drape_frontend/batchers_pool.hpp b/libs/drape_frontend/batchers_pool.hpp similarity index 100% rename from drape_frontend/batchers_pool.hpp rename to libs/drape_frontend/batchers_pool.hpp diff --git a/drape_frontend/circles_pack_shape.cpp b/libs/drape_frontend/circles_pack_shape.cpp similarity index 100% rename from drape_frontend/circles_pack_shape.cpp rename to libs/drape_frontend/circles_pack_shape.cpp diff --git a/drape_frontend/circles_pack_shape.hpp b/libs/drape_frontend/circles_pack_shape.hpp similarity index 100% rename from drape_frontend/circles_pack_shape.hpp rename to libs/drape_frontend/circles_pack_shape.hpp diff --git a/drape_frontend/color_constants.cpp b/libs/drape_frontend/color_constants.cpp similarity index 100% rename from drape_frontend/color_constants.cpp rename to libs/drape_frontend/color_constants.cpp diff --git a/drape_frontend/color_constants.hpp b/libs/drape_frontend/color_constants.hpp similarity index 100% rename from drape_frontend/color_constants.hpp rename to libs/drape_frontend/color_constants.hpp diff --git a/drape_frontend/colored_symbol_shape.cpp b/libs/drape_frontend/colored_symbol_shape.cpp similarity index 100% rename from drape_frontend/colored_symbol_shape.cpp rename to libs/drape_frontend/colored_symbol_shape.cpp diff --git a/drape_frontend/colored_symbol_shape.hpp b/libs/drape_frontend/colored_symbol_shape.hpp similarity index 100% rename from drape_frontend/colored_symbol_shape.hpp rename to libs/drape_frontend/colored_symbol_shape.hpp diff --git a/drape_frontend/custom_features_context.hpp b/libs/drape_frontend/custom_features_context.hpp similarity index 100% rename from drape_frontend/custom_features_context.hpp rename to libs/drape_frontend/custom_features_context.hpp diff --git a/drape_frontend/debug_rect_renderer.cpp b/libs/drape_frontend/debug_rect_renderer.cpp similarity index 100% rename from drape_frontend/debug_rect_renderer.cpp rename to libs/drape_frontend/debug_rect_renderer.cpp diff --git a/drape_frontend/debug_rect_renderer.hpp b/libs/drape_frontend/debug_rect_renderer.hpp similarity index 100% rename from drape_frontend/debug_rect_renderer.hpp rename to libs/drape_frontend/debug_rect_renderer.hpp diff --git a/drape_frontend/drape_api.cpp b/libs/drape_frontend/drape_api.cpp similarity index 100% rename from drape_frontend/drape_api.cpp rename to libs/drape_frontend/drape_api.cpp diff --git a/drape_frontend/drape_api.hpp b/libs/drape_frontend/drape_api.hpp similarity index 100% rename from drape_frontend/drape_api.hpp rename to libs/drape_frontend/drape_api.hpp diff --git a/drape_frontend/drape_api_builder.cpp b/libs/drape_frontend/drape_api_builder.cpp similarity index 100% rename from drape_frontend/drape_api_builder.cpp rename to libs/drape_frontend/drape_api_builder.cpp diff --git a/drape_frontend/drape_api_builder.hpp b/libs/drape_frontend/drape_api_builder.hpp similarity index 100% rename from drape_frontend/drape_api_builder.hpp rename to libs/drape_frontend/drape_api_builder.hpp diff --git a/drape_frontend/drape_api_renderer.cpp b/libs/drape_frontend/drape_api_renderer.cpp similarity index 100% rename from drape_frontend/drape_api_renderer.cpp rename to libs/drape_frontend/drape_api_renderer.cpp diff --git a/drape_frontend/drape_api_renderer.hpp b/libs/drape_frontend/drape_api_renderer.hpp similarity index 100% rename from drape_frontend/drape_api_renderer.hpp rename to libs/drape_frontend/drape_api_renderer.hpp diff --git a/drape_frontend/drape_engine.cpp b/libs/drape_frontend/drape_engine.cpp similarity index 100% rename from drape_frontend/drape_engine.cpp rename to libs/drape_frontend/drape_engine.cpp diff --git a/drape_frontend/drape_engine.hpp b/libs/drape_frontend/drape_engine.hpp similarity index 100% rename from drape_frontend/drape_engine.hpp rename to libs/drape_frontend/drape_engine.hpp diff --git a/drape_frontend/drape_engine_params.hpp b/libs/drape_frontend/drape_engine_params.hpp similarity index 100% rename from drape_frontend/drape_engine_params.hpp rename to libs/drape_frontend/drape_engine_params.hpp diff --git a/drape_frontend/drape_engine_safe_ptr.hpp b/libs/drape_frontend/drape_engine_safe_ptr.hpp similarity index 100% rename from drape_frontend/drape_engine_safe_ptr.hpp rename to libs/drape_frontend/drape_engine_safe_ptr.hpp diff --git a/drape_frontend/drape_frontend_tests/CMakeLists.txt b/libs/drape_frontend/drape_frontend_tests/CMakeLists.txt similarity index 100% rename from drape_frontend/drape_frontend_tests/CMakeLists.txt rename to libs/drape_frontend/drape_frontend_tests/CMakeLists.txt diff --git a/drape_frontend/drape_frontend_tests/frame_values_tests.cpp b/libs/drape_frontend/drape_frontend_tests/frame_values_tests.cpp similarity index 100% rename from drape_frontend/drape_frontend_tests/frame_values_tests.cpp rename to libs/drape_frontend/drape_frontend_tests/frame_values_tests.cpp diff --git a/drape_frontend/drape_frontend_tests/navigator_test.cpp b/libs/drape_frontend/drape_frontend_tests/navigator_test.cpp similarity index 100% rename from drape_frontend/drape_frontend_tests/navigator_test.cpp rename to libs/drape_frontend/drape_frontend_tests/navigator_test.cpp diff --git a/drape_frontend/drape_frontend_tests/path_text_test.cpp b/libs/drape_frontend/drape_frontend_tests/path_text_test.cpp similarity index 100% rename from drape_frontend/drape_frontend_tests/path_text_test.cpp rename to libs/drape_frontend/drape_frontend_tests/path_text_test.cpp diff --git a/drape_frontend/drape_frontend_tests/stylist_tests.cpp b/libs/drape_frontend/drape_frontend_tests/stylist_tests.cpp similarity index 100% rename from drape_frontend/drape_frontend_tests/stylist_tests.cpp rename to libs/drape_frontend/drape_frontend_tests/stylist_tests.cpp diff --git a/drape_frontend/drape_frontend_tests/user_event_stream_tests.cpp b/libs/drape_frontend/drape_frontend_tests/user_event_stream_tests.cpp similarity index 100% rename from drape_frontend/drape_frontend_tests/user_event_stream_tests.cpp rename to libs/drape_frontend/drape_frontend_tests/user_event_stream_tests.cpp diff --git a/drape_frontend/drape_hints.hpp b/libs/drape_frontend/drape_hints.hpp similarity index 100% rename from drape_frontend/drape_hints.hpp rename to libs/drape_frontend/drape_hints.hpp diff --git a/drape_frontend/drape_measurer.cpp b/libs/drape_frontend/drape_measurer.cpp similarity index 100% rename from drape_frontend/drape_measurer.cpp rename to libs/drape_frontend/drape_measurer.cpp diff --git a/drape_frontend/drape_measurer.hpp b/libs/drape_frontend/drape_measurer.hpp similarity index 100% rename from drape_frontend/drape_measurer.hpp rename to libs/drape_frontend/drape_measurer.hpp diff --git a/drape_frontend/drape_notifier.cpp b/libs/drape_frontend/drape_notifier.cpp similarity index 100% rename from drape_frontend/drape_notifier.cpp rename to libs/drape_frontend/drape_notifier.cpp diff --git a/drape_frontend/drape_notifier.hpp b/libs/drape_frontend/drape_notifier.hpp similarity index 100% rename from drape_frontend/drape_notifier.hpp rename to libs/drape_frontend/drape_notifier.hpp diff --git a/drape_frontend/engine_context.cpp b/libs/drape_frontend/engine_context.cpp similarity index 100% rename from drape_frontend/engine_context.cpp rename to libs/drape_frontend/engine_context.cpp diff --git a/drape_frontend/engine_context.hpp b/libs/drape_frontend/engine_context.hpp similarity index 100% rename from drape_frontend/engine_context.hpp rename to libs/drape_frontend/engine_context.hpp diff --git a/drape_frontend/frame_values.hpp b/libs/drape_frontend/frame_values.hpp similarity index 100% rename from drape_frontend/frame_values.hpp rename to libs/drape_frontend/frame_values.hpp diff --git a/drape_frontend/frontend_renderer.cpp b/libs/drape_frontend/frontend_renderer.cpp similarity index 100% rename from drape_frontend/frontend_renderer.cpp rename to libs/drape_frontend/frontend_renderer.cpp diff --git a/drape_frontend/frontend_renderer.hpp b/libs/drape_frontend/frontend_renderer.hpp similarity index 100% rename from drape_frontend/frontend_renderer.hpp rename to libs/drape_frontend/frontend_renderer.hpp diff --git a/drape_frontend/gps_track_point.hpp b/libs/drape_frontend/gps_track_point.hpp similarity index 100% rename from drape_frontend/gps_track_point.hpp rename to libs/drape_frontend/gps_track_point.hpp diff --git a/drape_frontend/gps_track_renderer.cpp b/libs/drape_frontend/gps_track_renderer.cpp similarity index 100% rename from drape_frontend/gps_track_renderer.cpp rename to libs/drape_frontend/gps_track_renderer.cpp diff --git a/drape_frontend/gps_track_renderer.hpp b/libs/drape_frontend/gps_track_renderer.hpp similarity index 100% rename from drape_frontend/gps_track_renderer.hpp rename to libs/drape_frontend/gps_track_renderer.hpp diff --git a/drape_frontend/gui/choose_position_mark.cpp b/libs/drape_frontend/gui/choose_position_mark.cpp similarity index 100% rename from drape_frontend/gui/choose_position_mark.cpp rename to libs/drape_frontend/gui/choose_position_mark.cpp diff --git a/drape_frontend/gui/choose_position_mark.hpp b/libs/drape_frontend/gui/choose_position_mark.hpp similarity index 100% rename from drape_frontend/gui/choose_position_mark.hpp rename to libs/drape_frontend/gui/choose_position_mark.hpp diff --git a/drape_frontend/gui/compass.cpp b/libs/drape_frontend/gui/compass.cpp similarity index 100% rename from drape_frontend/gui/compass.cpp rename to libs/drape_frontend/gui/compass.cpp diff --git a/drape_frontend/gui/compass.hpp b/libs/drape_frontend/gui/compass.hpp similarity index 100% rename from drape_frontend/gui/compass.hpp rename to libs/drape_frontend/gui/compass.hpp diff --git a/drape_frontend/gui/copyright_label.cpp b/libs/drape_frontend/gui/copyright_label.cpp similarity index 100% rename from drape_frontend/gui/copyright_label.cpp rename to libs/drape_frontend/gui/copyright_label.cpp diff --git a/drape_frontend/gui/copyright_label.hpp b/libs/drape_frontend/gui/copyright_label.hpp similarity index 100% rename from drape_frontend/gui/copyright_label.hpp rename to libs/drape_frontend/gui/copyright_label.hpp diff --git a/drape_frontend/gui/debug_label.cpp b/libs/drape_frontend/gui/debug_label.cpp similarity index 100% rename from drape_frontend/gui/debug_label.cpp rename to libs/drape_frontend/gui/debug_label.cpp diff --git a/drape_frontend/gui/debug_label.hpp b/libs/drape_frontend/gui/debug_label.hpp similarity index 100% rename from drape_frontend/gui/debug_label.hpp rename to libs/drape_frontend/gui/debug_label.hpp diff --git a/drape_frontend/gui/drape_gui.cpp b/libs/drape_frontend/gui/drape_gui.cpp similarity index 100% rename from drape_frontend/gui/drape_gui.cpp rename to libs/drape_frontend/gui/drape_gui.cpp diff --git a/drape_frontend/gui/drape_gui.hpp b/libs/drape_frontend/gui/drape_gui.hpp similarity index 100% rename from drape_frontend/gui/drape_gui.hpp rename to libs/drape_frontend/gui/drape_gui.hpp diff --git a/drape_frontend/gui/gui_text.cpp b/libs/drape_frontend/gui/gui_text.cpp similarity index 100% rename from drape_frontend/gui/gui_text.cpp rename to libs/drape_frontend/gui/gui_text.cpp diff --git a/drape_frontend/gui/gui_text.hpp b/libs/drape_frontend/gui/gui_text.hpp similarity index 100% rename from drape_frontend/gui/gui_text.hpp rename to libs/drape_frontend/gui/gui_text.hpp diff --git a/drape_frontend/gui/layer_render.cpp b/libs/drape_frontend/gui/layer_render.cpp similarity index 100% rename from drape_frontend/gui/layer_render.cpp rename to libs/drape_frontend/gui/layer_render.cpp diff --git a/drape_frontend/gui/layer_render.hpp b/libs/drape_frontend/gui/layer_render.hpp similarity index 100% rename from drape_frontend/gui/layer_render.hpp rename to libs/drape_frontend/gui/layer_render.hpp diff --git a/drape_frontend/gui/ruler.cpp b/libs/drape_frontend/gui/ruler.cpp similarity index 100% rename from drape_frontend/gui/ruler.cpp rename to libs/drape_frontend/gui/ruler.cpp diff --git a/drape_frontend/gui/ruler.hpp b/libs/drape_frontend/gui/ruler.hpp similarity index 100% rename from drape_frontend/gui/ruler.hpp rename to libs/drape_frontend/gui/ruler.hpp diff --git a/drape_frontend/gui/ruler_helper.cpp b/libs/drape_frontend/gui/ruler_helper.cpp similarity index 100% rename from drape_frontend/gui/ruler_helper.cpp rename to libs/drape_frontend/gui/ruler_helper.cpp diff --git a/drape_frontend/gui/ruler_helper.hpp b/libs/drape_frontend/gui/ruler_helper.hpp similarity index 100% rename from drape_frontend/gui/ruler_helper.hpp rename to libs/drape_frontend/gui/ruler_helper.hpp diff --git a/drape_frontend/gui/scale_fps_helper.hpp b/libs/drape_frontend/gui/scale_fps_helper.hpp similarity index 100% rename from drape_frontend/gui/scale_fps_helper.hpp rename to libs/drape_frontend/gui/scale_fps_helper.hpp diff --git a/drape_frontend/gui/shape.cpp b/libs/drape_frontend/gui/shape.cpp similarity index 100% rename from drape_frontend/gui/shape.cpp rename to libs/drape_frontend/gui/shape.cpp diff --git a/drape_frontend/gui/shape.hpp b/libs/drape_frontend/gui/shape.hpp similarity index 100% rename from drape_frontend/gui/shape.hpp rename to libs/drape_frontend/gui/shape.hpp diff --git a/drape_frontend/gui/skin.cpp b/libs/drape_frontend/gui/skin.cpp similarity index 100% rename from drape_frontend/gui/skin.cpp rename to libs/drape_frontend/gui/skin.cpp diff --git a/drape_frontend/gui/skin.hpp b/libs/drape_frontend/gui/skin.hpp similarity index 100% rename from drape_frontend/gui/skin.hpp rename to libs/drape_frontend/gui/skin.hpp diff --git a/drape_frontend/kinetic_scroller.cpp b/libs/drape_frontend/kinetic_scroller.cpp similarity index 100% rename from drape_frontend/kinetic_scroller.cpp rename to libs/drape_frontend/kinetic_scroller.cpp diff --git a/drape_frontend/kinetic_scroller.hpp b/libs/drape_frontend/kinetic_scroller.hpp similarity index 100% rename from drape_frontend/kinetic_scroller.hpp rename to libs/drape_frontend/kinetic_scroller.hpp diff --git a/drape_frontend/line_shape.cpp b/libs/drape_frontend/line_shape.cpp similarity index 100% rename from drape_frontend/line_shape.cpp rename to libs/drape_frontend/line_shape.cpp diff --git a/drape_frontend/line_shape.hpp b/libs/drape_frontend/line_shape.hpp similarity index 100% rename from drape_frontend/line_shape.hpp rename to libs/drape_frontend/line_shape.hpp diff --git a/drape_frontend/line_shape_helper.cpp b/libs/drape_frontend/line_shape_helper.cpp similarity index 100% rename from drape_frontend/line_shape_helper.cpp rename to libs/drape_frontend/line_shape_helper.cpp diff --git a/drape_frontend/line_shape_helper.hpp b/libs/drape_frontend/line_shape_helper.hpp similarity index 100% rename from drape_frontend/line_shape_helper.hpp rename to libs/drape_frontend/line_shape_helper.hpp diff --git a/drape_frontend/map_data_provider.cpp b/libs/drape_frontend/map_data_provider.cpp similarity index 100% rename from drape_frontend/map_data_provider.cpp rename to libs/drape_frontend/map_data_provider.cpp diff --git a/drape_frontend/map_data_provider.hpp b/libs/drape_frontend/map_data_provider.hpp similarity index 100% rename from drape_frontend/map_data_provider.hpp rename to libs/drape_frontend/map_data_provider.hpp diff --git a/drape_frontend/map_shape.hpp b/libs/drape_frontend/map_shape.hpp similarity index 100% rename from drape_frontend/map_shape.hpp rename to libs/drape_frontend/map_shape.hpp diff --git a/drape_frontend/message.cpp b/libs/drape_frontend/message.cpp similarity index 100% rename from drape_frontend/message.cpp rename to libs/drape_frontend/message.cpp diff --git a/drape_frontend/message.hpp b/libs/drape_frontend/message.hpp similarity index 100% rename from drape_frontend/message.hpp rename to libs/drape_frontend/message.hpp diff --git a/drape_frontend/message_acceptor.cpp b/libs/drape_frontend/message_acceptor.cpp similarity index 100% rename from drape_frontend/message_acceptor.cpp rename to libs/drape_frontend/message_acceptor.cpp diff --git a/drape_frontend/message_acceptor.hpp b/libs/drape_frontend/message_acceptor.hpp similarity index 100% rename from drape_frontend/message_acceptor.hpp rename to libs/drape_frontend/message_acceptor.hpp diff --git a/drape_frontend/message_queue.cpp b/libs/drape_frontend/message_queue.cpp similarity index 100% rename from drape_frontend/message_queue.cpp rename to libs/drape_frontend/message_queue.cpp diff --git a/drape_frontend/message_queue.hpp b/libs/drape_frontend/message_queue.hpp similarity index 100% rename from drape_frontend/message_queue.hpp rename to libs/drape_frontend/message_queue.hpp diff --git a/drape_frontend/message_subclasses.hpp b/libs/drape_frontend/message_subclasses.hpp similarity index 100% rename from drape_frontend/message_subclasses.hpp rename to libs/drape_frontend/message_subclasses.hpp diff --git a/drape_frontend/metaline_manager.cpp b/libs/drape_frontend/metaline_manager.cpp similarity index 100% rename from drape_frontend/metaline_manager.cpp rename to libs/drape_frontend/metaline_manager.cpp diff --git a/drape_frontend/metaline_manager.hpp b/libs/drape_frontend/metaline_manager.hpp similarity index 100% rename from drape_frontend/metaline_manager.hpp rename to libs/drape_frontend/metaline_manager.hpp diff --git a/drape_frontend/my_position.cpp b/libs/drape_frontend/my_position.cpp similarity index 100% rename from drape_frontend/my_position.cpp rename to libs/drape_frontend/my_position.cpp diff --git a/drape_frontend/my_position.hpp b/libs/drape_frontend/my_position.hpp similarity index 100% rename from drape_frontend/my_position.hpp rename to libs/drape_frontend/my_position.hpp diff --git a/drape_frontend/my_position_controller.cpp b/libs/drape_frontend/my_position_controller.cpp similarity index 100% rename from drape_frontend/my_position_controller.cpp rename to libs/drape_frontend/my_position_controller.cpp diff --git a/drape_frontend/my_position_controller.hpp b/libs/drape_frontend/my_position_controller.hpp similarity index 100% rename from drape_frontend/my_position_controller.hpp rename to libs/drape_frontend/my_position_controller.hpp diff --git a/drape_frontend/navigator.cpp b/libs/drape_frontend/navigator.cpp similarity index 100% rename from drape_frontend/navigator.cpp rename to libs/drape_frontend/navigator.cpp diff --git a/drape_frontend/navigator.hpp b/libs/drape_frontend/navigator.hpp similarity index 100% rename from drape_frontend/navigator.hpp rename to libs/drape_frontend/navigator.hpp diff --git a/drape_frontend/overlay_batcher.cpp b/libs/drape_frontend/overlay_batcher.cpp similarity index 100% rename from drape_frontend/overlay_batcher.cpp rename to libs/drape_frontend/overlay_batcher.cpp diff --git a/drape_frontend/overlay_batcher.hpp b/libs/drape_frontend/overlay_batcher.hpp similarity index 100% rename from drape_frontend/overlay_batcher.hpp rename to libs/drape_frontend/overlay_batcher.hpp diff --git a/drape_frontend/overlays_tracker.cpp b/libs/drape_frontend/overlays_tracker.cpp similarity index 100% rename from drape_frontend/overlays_tracker.cpp rename to libs/drape_frontend/overlays_tracker.cpp diff --git a/drape_frontend/overlays_tracker.hpp b/libs/drape_frontend/overlays_tracker.hpp similarity index 100% rename from drape_frontend/overlays_tracker.hpp rename to libs/drape_frontend/overlays_tracker.hpp diff --git a/drape_frontend/path_symbol_shape.cpp b/libs/drape_frontend/path_symbol_shape.cpp similarity index 100% rename from drape_frontend/path_symbol_shape.cpp rename to libs/drape_frontend/path_symbol_shape.cpp diff --git a/drape_frontend/path_symbol_shape.hpp b/libs/drape_frontend/path_symbol_shape.hpp similarity index 100% rename from drape_frontend/path_symbol_shape.hpp rename to libs/drape_frontend/path_symbol_shape.hpp diff --git a/drape_frontend/path_text_handle.cpp b/libs/drape_frontend/path_text_handle.cpp similarity index 100% rename from drape_frontend/path_text_handle.cpp rename to libs/drape_frontend/path_text_handle.cpp diff --git a/drape_frontend/path_text_handle.hpp b/libs/drape_frontend/path_text_handle.hpp similarity index 100% rename from drape_frontend/path_text_handle.hpp rename to libs/drape_frontend/path_text_handle.hpp diff --git a/drape_frontend/path_text_shape.cpp b/libs/drape_frontend/path_text_shape.cpp similarity index 100% rename from drape_frontend/path_text_shape.cpp rename to libs/drape_frontend/path_text_shape.cpp diff --git a/drape_frontend/path_text_shape.hpp b/libs/drape_frontend/path_text_shape.hpp similarity index 100% rename from drape_frontend/path_text_shape.hpp rename to libs/drape_frontend/path_text_shape.hpp diff --git a/drape_frontend/poi_symbol_shape.cpp b/libs/drape_frontend/poi_symbol_shape.cpp similarity index 100% rename from drape_frontend/poi_symbol_shape.cpp rename to libs/drape_frontend/poi_symbol_shape.cpp diff --git a/drape_frontend/poi_symbol_shape.hpp b/libs/drape_frontend/poi_symbol_shape.hpp similarity index 100% rename from drape_frontend/poi_symbol_shape.hpp rename to libs/drape_frontend/poi_symbol_shape.hpp diff --git a/drape_frontend/postprocess_renderer.cpp b/libs/drape_frontend/postprocess_renderer.cpp similarity index 100% rename from drape_frontend/postprocess_renderer.cpp rename to libs/drape_frontend/postprocess_renderer.cpp diff --git a/drape_frontend/postprocess_renderer.hpp b/libs/drape_frontend/postprocess_renderer.hpp similarity index 100% rename from drape_frontend/postprocess_renderer.hpp rename to libs/drape_frontend/postprocess_renderer.hpp diff --git a/drape_frontend/read_manager.cpp b/libs/drape_frontend/read_manager.cpp similarity index 100% rename from drape_frontend/read_manager.cpp rename to libs/drape_frontend/read_manager.cpp diff --git a/drape_frontend/read_manager.hpp b/libs/drape_frontend/read_manager.hpp similarity index 100% rename from drape_frontend/read_manager.hpp rename to libs/drape_frontend/read_manager.hpp diff --git a/drape_frontend/read_metaline_task.cpp b/libs/drape_frontend/read_metaline_task.cpp similarity index 100% rename from drape_frontend/read_metaline_task.cpp rename to libs/drape_frontend/read_metaline_task.cpp diff --git a/drape_frontend/read_metaline_task.hpp b/libs/drape_frontend/read_metaline_task.hpp similarity index 100% rename from drape_frontend/read_metaline_task.hpp rename to libs/drape_frontend/read_metaline_task.hpp diff --git a/drape_frontend/read_mwm_task.cpp b/libs/drape_frontend/read_mwm_task.cpp similarity index 100% rename from drape_frontend/read_mwm_task.cpp rename to libs/drape_frontend/read_mwm_task.cpp diff --git a/drape_frontend/read_mwm_task.hpp b/libs/drape_frontend/read_mwm_task.hpp similarity index 100% rename from drape_frontend/read_mwm_task.hpp rename to libs/drape_frontend/read_mwm_task.hpp diff --git a/drape_frontend/render_group.cpp b/libs/drape_frontend/render_group.cpp similarity index 100% rename from drape_frontend/render_group.cpp rename to libs/drape_frontend/render_group.cpp diff --git a/drape_frontend/render_group.hpp b/libs/drape_frontend/render_group.hpp similarity index 100% rename from drape_frontend/render_group.hpp rename to libs/drape_frontend/render_group.hpp diff --git a/drape_frontend/render_node.hpp b/libs/drape_frontend/render_node.hpp similarity index 100% rename from drape_frontend/render_node.hpp rename to libs/drape_frontend/render_node.hpp diff --git a/drape_frontend/render_state_extension.cpp b/libs/drape_frontend/render_state_extension.cpp similarity index 100% rename from drape_frontend/render_state_extension.cpp rename to libs/drape_frontend/render_state_extension.cpp diff --git a/drape_frontend/render_state_extension.hpp b/libs/drape_frontend/render_state_extension.hpp similarity index 100% rename from drape_frontend/render_state_extension.hpp rename to libs/drape_frontend/render_state_extension.hpp diff --git a/drape_frontend/requested_tiles.cpp b/libs/drape_frontend/requested_tiles.cpp similarity index 100% rename from drape_frontend/requested_tiles.cpp rename to libs/drape_frontend/requested_tiles.cpp diff --git a/drape_frontend/requested_tiles.hpp b/libs/drape_frontend/requested_tiles.hpp similarity index 100% rename from drape_frontend/requested_tiles.hpp rename to libs/drape_frontend/requested_tiles.hpp diff --git a/drape_frontend/route_builder.cpp b/libs/drape_frontend/route_builder.cpp similarity index 100% rename from drape_frontend/route_builder.cpp rename to libs/drape_frontend/route_builder.cpp diff --git a/drape_frontend/route_builder.hpp b/libs/drape_frontend/route_builder.hpp similarity index 100% rename from drape_frontend/route_builder.hpp rename to libs/drape_frontend/route_builder.hpp diff --git a/drape_frontend/route_renderer.cpp b/libs/drape_frontend/route_renderer.cpp similarity index 100% rename from drape_frontend/route_renderer.cpp rename to libs/drape_frontend/route_renderer.cpp diff --git a/drape_frontend/route_renderer.hpp b/libs/drape_frontend/route_renderer.hpp similarity index 100% rename from drape_frontend/route_renderer.hpp rename to libs/drape_frontend/route_renderer.hpp diff --git a/drape_frontend/route_shape.cpp b/libs/drape_frontend/route_shape.cpp similarity index 100% rename from drape_frontend/route_shape.cpp rename to libs/drape_frontend/route_shape.cpp diff --git a/drape_frontend/route_shape.hpp b/libs/drape_frontend/route_shape.hpp similarity index 100% rename from drape_frontend/route_shape.hpp rename to libs/drape_frontend/route_shape.hpp diff --git a/drape_frontend/rule_drawer.cpp b/libs/drape_frontend/rule_drawer.cpp similarity index 100% rename from drape_frontend/rule_drawer.cpp rename to libs/drape_frontend/rule_drawer.cpp diff --git a/drape_frontend/rule_drawer.hpp b/libs/drape_frontend/rule_drawer.hpp similarity index 100% rename from drape_frontend/rule_drawer.hpp rename to libs/drape_frontend/rule_drawer.hpp diff --git a/drape_frontend/scenario_manager.cpp b/libs/drape_frontend/scenario_manager.cpp similarity index 100% rename from drape_frontend/scenario_manager.cpp rename to libs/drape_frontend/scenario_manager.cpp diff --git a/drape_frontend/scenario_manager.hpp b/libs/drape_frontend/scenario_manager.hpp similarity index 100% rename from drape_frontend/scenario_manager.hpp rename to libs/drape_frontend/scenario_manager.hpp diff --git a/drape_frontend/screen_animations.cpp b/libs/drape_frontend/screen_animations.cpp similarity index 100% rename from drape_frontend/screen_animations.cpp rename to libs/drape_frontend/screen_animations.cpp diff --git a/drape_frontend/screen_animations.hpp b/libs/drape_frontend/screen_animations.hpp similarity index 100% rename from drape_frontend/screen_animations.hpp rename to libs/drape_frontend/screen_animations.hpp diff --git a/drape_frontend/screen_operations.cpp b/libs/drape_frontend/screen_operations.cpp similarity index 100% rename from drape_frontend/screen_operations.cpp rename to libs/drape_frontend/screen_operations.cpp diff --git a/drape_frontend/screen_operations.hpp b/libs/drape_frontend/screen_operations.hpp similarity index 100% rename from drape_frontend/screen_operations.hpp rename to libs/drape_frontend/screen_operations.hpp diff --git a/drape_frontend/screen_quad_renderer.cpp b/libs/drape_frontend/screen_quad_renderer.cpp similarity index 100% rename from drape_frontend/screen_quad_renderer.cpp rename to libs/drape_frontend/screen_quad_renderer.cpp diff --git a/drape_frontend/screen_quad_renderer.hpp b/libs/drape_frontend/screen_quad_renderer.hpp similarity index 100% rename from drape_frontend/screen_quad_renderer.hpp rename to libs/drape_frontend/screen_quad_renderer.hpp diff --git a/drape_frontend/selection_shape.cpp b/libs/drape_frontend/selection_shape.cpp similarity index 100% rename from drape_frontend/selection_shape.cpp rename to libs/drape_frontend/selection_shape.cpp diff --git a/drape_frontend/selection_shape.hpp b/libs/drape_frontend/selection_shape.hpp similarity index 100% rename from drape_frontend/selection_shape.hpp rename to libs/drape_frontend/selection_shape.hpp diff --git a/drape_frontend/selection_shape_generator.cpp b/libs/drape_frontend/selection_shape_generator.cpp similarity index 100% rename from drape_frontend/selection_shape_generator.cpp rename to libs/drape_frontend/selection_shape_generator.cpp diff --git a/drape_frontend/selection_shape_generator.hpp b/libs/drape_frontend/selection_shape_generator.hpp similarity index 100% rename from drape_frontend/selection_shape_generator.hpp rename to libs/drape_frontend/selection_shape_generator.hpp diff --git a/drape_frontend/shape_view_params.hpp b/libs/drape_frontend/shape_view_params.hpp similarity index 100% rename from drape_frontend/shape_view_params.hpp rename to libs/drape_frontend/shape_view_params.hpp diff --git a/drape_frontend/stylist.cpp b/libs/drape_frontend/stylist.cpp similarity index 100% rename from drape_frontend/stylist.cpp rename to libs/drape_frontend/stylist.cpp diff --git a/drape_frontend/stylist.hpp b/libs/drape_frontend/stylist.hpp similarity index 100% rename from drape_frontend/stylist.hpp rename to libs/drape_frontend/stylist.hpp diff --git a/drape_frontend/text_handle.cpp b/libs/drape_frontend/text_handle.cpp similarity index 100% rename from drape_frontend/text_handle.cpp rename to libs/drape_frontend/text_handle.cpp diff --git a/drape_frontend/text_handle.hpp b/libs/drape_frontend/text_handle.hpp similarity index 100% rename from drape_frontend/text_handle.hpp rename to libs/drape_frontend/text_handle.hpp diff --git a/drape_frontend/text_layout.cpp b/libs/drape_frontend/text_layout.cpp similarity index 100% rename from drape_frontend/text_layout.cpp rename to libs/drape_frontend/text_layout.cpp diff --git a/drape_frontend/text_layout.hpp b/libs/drape_frontend/text_layout.hpp similarity index 100% rename from drape_frontend/text_layout.hpp rename to libs/drape_frontend/text_layout.hpp diff --git a/drape_frontend/text_shape.cpp b/libs/drape_frontend/text_shape.cpp similarity index 100% rename from drape_frontend/text_shape.cpp rename to libs/drape_frontend/text_shape.cpp diff --git a/drape_frontend/text_shape.hpp b/libs/drape_frontend/text_shape.hpp similarity index 100% rename from drape_frontend/text_shape.hpp rename to libs/drape_frontend/text_shape.hpp diff --git a/drape_frontend/threads_commutator.cpp b/libs/drape_frontend/threads_commutator.cpp similarity index 100% rename from drape_frontend/threads_commutator.cpp rename to libs/drape_frontend/threads_commutator.cpp diff --git a/drape_frontend/threads_commutator.hpp b/libs/drape_frontend/threads_commutator.hpp similarity index 100% rename from drape_frontend/threads_commutator.hpp rename to libs/drape_frontend/threads_commutator.hpp diff --git a/drape_frontend/tile_info.cpp b/libs/drape_frontend/tile_info.cpp similarity index 100% rename from drape_frontend/tile_info.cpp rename to libs/drape_frontend/tile_info.cpp diff --git a/drape_frontend/tile_info.hpp b/libs/drape_frontend/tile_info.hpp similarity index 100% rename from drape_frontend/tile_info.hpp rename to libs/drape_frontend/tile_info.hpp diff --git a/drape_frontend/tile_key.cpp b/libs/drape_frontend/tile_key.cpp similarity index 100% rename from drape_frontend/tile_key.cpp rename to libs/drape_frontend/tile_key.cpp diff --git a/drape_frontend/tile_key.hpp b/libs/drape_frontend/tile_key.hpp similarity index 100% rename from drape_frontend/tile_key.hpp rename to libs/drape_frontend/tile_key.hpp diff --git a/drape_frontend/tile_utils.cpp b/libs/drape_frontend/tile_utils.cpp similarity index 100% rename from drape_frontend/tile_utils.cpp rename to libs/drape_frontend/tile_utils.cpp diff --git a/drape_frontend/tile_utils.hpp b/libs/drape_frontend/tile_utils.hpp similarity index 100% rename from drape_frontend/tile_utils.hpp rename to libs/drape_frontend/tile_utils.hpp diff --git a/drape_frontend/traffic_generator.cpp b/libs/drape_frontend/traffic_generator.cpp similarity index 100% rename from drape_frontend/traffic_generator.cpp rename to libs/drape_frontend/traffic_generator.cpp diff --git a/drape_frontend/traffic_generator.hpp b/libs/drape_frontend/traffic_generator.hpp similarity index 100% rename from drape_frontend/traffic_generator.hpp rename to libs/drape_frontend/traffic_generator.hpp diff --git a/drape_frontend/traffic_renderer.cpp b/libs/drape_frontend/traffic_renderer.cpp similarity index 100% rename from drape_frontend/traffic_renderer.cpp rename to libs/drape_frontend/traffic_renderer.cpp diff --git a/drape_frontend/traffic_renderer.hpp b/libs/drape_frontend/traffic_renderer.hpp similarity index 100% rename from drape_frontend/traffic_renderer.hpp rename to libs/drape_frontend/traffic_renderer.hpp diff --git a/drape_frontend/transit_scheme_builder.cpp b/libs/drape_frontend/transit_scheme_builder.cpp similarity index 100% rename from drape_frontend/transit_scheme_builder.cpp rename to libs/drape_frontend/transit_scheme_builder.cpp diff --git a/drape_frontend/transit_scheme_builder.hpp b/libs/drape_frontend/transit_scheme_builder.hpp similarity index 100% rename from drape_frontend/transit_scheme_builder.hpp rename to libs/drape_frontend/transit_scheme_builder.hpp diff --git a/drape_frontend/transit_scheme_renderer.cpp b/libs/drape_frontend/transit_scheme_renderer.cpp similarity index 100% rename from drape_frontend/transit_scheme_renderer.cpp rename to libs/drape_frontend/transit_scheme_renderer.cpp diff --git a/drape_frontend/transit_scheme_renderer.hpp b/libs/drape_frontend/transit_scheme_renderer.hpp similarity index 100% rename from drape_frontend/transit_scheme_renderer.hpp rename to libs/drape_frontend/transit_scheme_renderer.hpp diff --git a/drape_frontend/user_event_stream.cpp b/libs/drape_frontend/user_event_stream.cpp similarity index 100% rename from drape_frontend/user_event_stream.cpp rename to libs/drape_frontend/user_event_stream.cpp diff --git a/drape_frontend/user_event_stream.hpp b/libs/drape_frontend/user_event_stream.hpp similarity index 100% rename from drape_frontend/user_event_stream.hpp rename to libs/drape_frontend/user_event_stream.hpp diff --git a/drape_frontend/user_mark_generator.cpp b/libs/drape_frontend/user_mark_generator.cpp similarity index 100% rename from drape_frontend/user_mark_generator.cpp rename to libs/drape_frontend/user_mark_generator.cpp diff --git a/drape_frontend/user_mark_generator.hpp b/libs/drape_frontend/user_mark_generator.hpp similarity index 100% rename from drape_frontend/user_mark_generator.hpp rename to libs/drape_frontend/user_mark_generator.hpp diff --git a/drape_frontend/user_mark_shapes.cpp b/libs/drape_frontend/user_mark_shapes.cpp similarity index 100% rename from drape_frontend/user_mark_shapes.cpp rename to libs/drape_frontend/user_mark_shapes.cpp diff --git a/drape_frontend/user_mark_shapes.hpp b/libs/drape_frontend/user_mark_shapes.hpp similarity index 100% rename from drape_frontend/user_mark_shapes.hpp rename to libs/drape_frontend/user_mark_shapes.hpp diff --git a/drape_frontend/user_marks_provider.cpp b/libs/drape_frontend/user_marks_provider.cpp similarity index 100% rename from drape_frontend/user_marks_provider.cpp rename to libs/drape_frontend/user_marks_provider.cpp diff --git a/drape_frontend/user_marks_provider.hpp b/libs/drape_frontend/user_marks_provider.hpp similarity index 100% rename from drape_frontend/user_marks_provider.hpp rename to libs/drape_frontend/user_marks_provider.hpp diff --git a/drape_frontend/visual_params.cpp b/libs/drape_frontend/visual_params.cpp similarity index 100% rename from drape_frontend/visual_params.cpp rename to libs/drape_frontend/visual_params.cpp diff --git a/drape_frontend/visual_params.hpp b/libs/drape_frontend/visual_params.hpp similarity index 100% rename from drape_frontend/visual_params.hpp rename to libs/drape_frontend/visual_params.hpp diff --git a/editor/CMakeLists.txt b/libs/editor/CMakeLists.txt similarity index 100% rename from editor/CMakeLists.txt rename to libs/editor/CMakeLists.txt diff --git a/editor/changeset_wrapper.cpp b/libs/editor/changeset_wrapper.cpp similarity index 100% rename from editor/changeset_wrapper.cpp rename to libs/editor/changeset_wrapper.cpp diff --git a/editor/changeset_wrapper.hpp b/libs/editor/changeset_wrapper.hpp similarity index 100% rename from editor/changeset_wrapper.hpp rename to libs/editor/changeset_wrapper.hpp diff --git a/editor/config_loader.cpp b/libs/editor/config_loader.cpp similarity index 100% rename from editor/config_loader.cpp rename to libs/editor/config_loader.cpp diff --git a/editor/config_loader.hpp b/libs/editor/config_loader.hpp similarity index 100% rename from editor/config_loader.hpp rename to libs/editor/config_loader.hpp diff --git a/editor/editable_data_source.hpp b/libs/editor/editable_data_source.hpp similarity index 100% rename from editor/editable_data_source.hpp rename to libs/editor/editable_data_source.hpp diff --git a/editor/editable_feature_source.cpp b/libs/editor/editable_feature_source.cpp similarity index 100% rename from editor/editable_feature_source.cpp rename to libs/editor/editable_feature_source.cpp diff --git a/editor/editable_feature_source.hpp b/libs/editor/editable_feature_source.hpp similarity index 100% rename from editor/editable_feature_source.hpp rename to libs/editor/editable_feature_source.hpp diff --git a/editor/editor_config.cpp b/libs/editor/editor_config.cpp similarity index 100% rename from editor/editor_config.cpp rename to libs/editor/editor_config.cpp diff --git a/editor/editor_config.hpp b/libs/editor/editor_config.hpp similarity index 100% rename from editor/editor_config.hpp rename to libs/editor/editor_config.hpp diff --git a/editor/editor_notes.cpp b/libs/editor/editor_notes.cpp similarity index 100% rename from editor/editor_notes.cpp rename to libs/editor/editor_notes.cpp diff --git a/editor/editor_notes.hpp b/libs/editor/editor_notes.hpp similarity index 100% rename from editor/editor_notes.hpp rename to libs/editor/editor_notes.hpp diff --git a/editor/editor_storage.cpp b/libs/editor/editor_storage.cpp similarity index 100% rename from editor/editor_storage.cpp rename to libs/editor/editor_storage.cpp diff --git a/editor/editor_storage.hpp b/libs/editor/editor_storage.hpp similarity index 100% rename from editor/editor_storage.hpp rename to libs/editor/editor_storage.hpp diff --git a/editor/editor_tests/CMakeLists.txt b/libs/editor/editor_tests/CMakeLists.txt similarity index 100% rename from editor/editor_tests/CMakeLists.txt rename to libs/editor/editor_tests/CMakeLists.txt diff --git a/editor/editor_tests/config_loader_test.cpp b/libs/editor/editor_tests/config_loader_test.cpp similarity index 100% rename from editor/editor_tests/config_loader_test.cpp rename to libs/editor/editor_tests/config_loader_test.cpp diff --git a/editor/editor_tests/editor_config_test.cpp b/libs/editor/editor_tests/editor_config_test.cpp similarity index 100% rename from editor/editor_tests/editor_config_test.cpp rename to libs/editor/editor_tests/editor_config_test.cpp diff --git a/editor/editor_tests/editor_notes_test.cpp b/libs/editor/editor_tests/editor_notes_test.cpp similarity index 100% rename from editor/editor_tests/editor_notes_test.cpp rename to libs/editor/editor_tests/editor_notes_test.cpp diff --git a/editor/editor_tests/feature_matcher_test.cpp b/libs/editor/editor_tests/feature_matcher_test.cpp similarity index 100% rename from editor/editor_tests/feature_matcher_test.cpp rename to libs/editor/editor_tests/feature_matcher_test.cpp diff --git a/editor/editor_tests/match_by_geometry_test.cpp b/libs/editor/editor_tests/match_by_geometry_test.cpp similarity index 100% rename from editor/editor_tests/match_by_geometry_test.cpp rename to libs/editor/editor_tests/match_by_geometry_test.cpp diff --git a/editor/editor_tests/new_feature_categories_test.cpp b/libs/editor/editor_tests/new_feature_categories_test.cpp similarity index 100% rename from editor/editor_tests/new_feature_categories_test.cpp rename to libs/editor/editor_tests/new_feature_categories_test.cpp diff --git a/editor/editor_tests/opening_hours_ui_test.cpp b/libs/editor/editor_tests/opening_hours_ui_test.cpp similarity index 100% rename from editor/editor_tests/opening_hours_ui_test.cpp rename to libs/editor/editor_tests/opening_hours_ui_test.cpp diff --git a/editor/editor_tests/osm_editor_test.cpp b/libs/editor/editor_tests/osm_editor_test.cpp similarity index 100% rename from editor/editor_tests/osm_editor_test.cpp rename to libs/editor/editor_tests/osm_editor_test.cpp diff --git a/editor/editor_tests/osm_editor_test.hpp b/libs/editor/editor_tests/osm_editor_test.hpp similarity index 100% rename from editor/editor_tests/osm_editor_test.hpp rename to libs/editor/editor_tests/osm_editor_test.hpp diff --git a/editor/editor_tests/ui2oh_test.cpp b/libs/editor/editor_tests/ui2oh_test.cpp similarity index 100% rename from editor/editor_tests/ui2oh_test.cpp rename to libs/editor/editor_tests/ui2oh_test.cpp diff --git a/editor/editor_tests/xml_feature_test.cpp b/libs/editor/editor_tests/xml_feature_test.cpp similarity index 100% rename from editor/editor_tests/xml_feature_test.cpp rename to libs/editor/editor_tests/xml_feature_test.cpp diff --git a/editor/editor_tests_support/CMakeLists.txt b/libs/editor/editor_tests_support/CMakeLists.txt similarity index 100% rename from editor/editor_tests_support/CMakeLists.txt rename to libs/editor/editor_tests_support/CMakeLists.txt diff --git a/editor/editor_tests_support/helpers.cpp b/libs/editor/editor_tests_support/helpers.cpp similarity index 100% rename from editor/editor_tests_support/helpers.cpp rename to libs/editor/editor_tests_support/helpers.cpp diff --git a/editor/editor_tests_support/helpers.hpp b/libs/editor/editor_tests_support/helpers.hpp similarity index 100% rename from editor/editor_tests_support/helpers.hpp rename to libs/editor/editor_tests_support/helpers.hpp diff --git a/editor/edits_migration.cpp b/libs/editor/edits_migration.cpp similarity index 100% rename from editor/edits_migration.cpp rename to libs/editor/edits_migration.cpp diff --git a/editor/edits_migration.hpp b/libs/editor/edits_migration.hpp similarity index 100% rename from editor/edits_migration.hpp rename to libs/editor/edits_migration.hpp diff --git a/editor/feature_matcher.cpp b/libs/editor/feature_matcher.cpp similarity index 100% rename from editor/feature_matcher.cpp rename to libs/editor/feature_matcher.cpp diff --git a/editor/feature_matcher.hpp b/libs/editor/feature_matcher.hpp similarity index 100% rename from editor/feature_matcher.hpp rename to libs/editor/feature_matcher.hpp diff --git a/editor/module.modulemap b/libs/editor/module.modulemap similarity index 100% rename from editor/module.modulemap rename to libs/editor/module.modulemap diff --git a/editor/new_feature_categories.cpp b/libs/editor/new_feature_categories.cpp similarity index 100% rename from editor/new_feature_categories.cpp rename to libs/editor/new_feature_categories.cpp diff --git a/editor/new_feature_categories.hpp b/libs/editor/new_feature_categories.hpp similarity index 100% rename from editor/new_feature_categories.hpp rename to libs/editor/new_feature_categories.hpp diff --git a/editor/opening_hours_ui.cpp b/libs/editor/opening_hours_ui.cpp similarity index 100% rename from editor/opening_hours_ui.cpp rename to libs/editor/opening_hours_ui.cpp diff --git a/editor/opening_hours_ui.hpp b/libs/editor/opening_hours_ui.hpp similarity index 100% rename from editor/opening_hours_ui.hpp rename to libs/editor/opening_hours_ui.hpp diff --git a/editor/osm_auth.cpp b/libs/editor/osm_auth.cpp similarity index 100% rename from editor/osm_auth.cpp rename to libs/editor/osm_auth.cpp diff --git a/editor/osm_auth.hpp b/libs/editor/osm_auth.hpp similarity index 100% rename from editor/osm_auth.hpp rename to libs/editor/osm_auth.hpp diff --git a/editor/osm_auth_tests/CMakeLists.txt b/libs/editor/osm_auth_tests/CMakeLists.txt similarity index 100% rename from editor/osm_auth_tests/CMakeLists.txt rename to libs/editor/osm_auth_tests/CMakeLists.txt diff --git a/editor/osm_auth_tests/osm_auth_tests.cpp b/libs/editor/osm_auth_tests/osm_auth_tests.cpp similarity index 100% rename from editor/osm_auth_tests/osm_auth_tests.cpp rename to libs/editor/osm_auth_tests/osm_auth_tests.cpp diff --git a/editor/osm_auth_tests/server_api_test.cpp b/libs/editor/osm_auth_tests/server_api_test.cpp similarity index 100% rename from editor/osm_auth_tests/server_api_test.cpp rename to libs/editor/osm_auth_tests/server_api_test.cpp diff --git a/editor/osm_editor.cpp b/libs/editor/osm_editor.cpp similarity index 100% rename from editor/osm_editor.cpp rename to libs/editor/osm_editor.cpp diff --git a/editor/osm_editor.hpp b/libs/editor/osm_editor.hpp similarity index 100% rename from editor/osm_editor.hpp rename to libs/editor/osm_editor.hpp diff --git a/editor/server_api.cpp b/libs/editor/server_api.cpp similarity index 100% rename from editor/server_api.cpp rename to libs/editor/server_api.cpp diff --git a/editor/server_api.hpp b/libs/editor/server_api.hpp similarity index 100% rename from editor/server_api.hpp rename to libs/editor/server_api.hpp diff --git a/editor/ui2oh.cpp b/libs/editor/ui2oh.cpp similarity index 100% rename from editor/ui2oh.cpp rename to libs/editor/ui2oh.cpp diff --git a/editor/ui2oh.hpp b/libs/editor/ui2oh.hpp similarity index 100% rename from editor/ui2oh.hpp rename to libs/editor/ui2oh.hpp diff --git a/editor/xml_feature.cpp b/libs/editor/xml_feature.cpp similarity index 100% rename from editor/xml_feature.cpp rename to libs/editor/xml_feature.cpp diff --git a/editor/xml_feature.hpp b/libs/editor/xml_feature.hpp similarity index 100% rename from editor/xml_feature.hpp rename to libs/editor/xml_feature.hpp diff --git a/editor/yes_no_unknown.hpp b/libs/editor/yes_no_unknown.hpp similarity index 100% rename from editor/yes_no_unknown.hpp rename to libs/editor/yes_no_unknown.hpp diff --git a/ge0/CMakeLists.txt b/libs/ge0/CMakeLists.txt similarity index 100% rename from ge0/CMakeLists.txt rename to libs/ge0/CMakeLists.txt diff --git a/ge0/ge0.php b/libs/ge0/ge0.php similarity index 100% rename from ge0/ge0.php rename to libs/ge0/ge0.php diff --git a/ge0/ge0_tests/CMakeLists.txt b/libs/ge0/ge0_tests/CMakeLists.txt similarity index 100% rename from ge0/ge0_tests/CMakeLists.txt rename to libs/ge0/ge0_tests/CMakeLists.txt diff --git a/ge0/ge0_tests/geo_url_tests.cpp b/libs/ge0/ge0_tests/geo_url_tests.cpp similarity index 100% rename from ge0/ge0_tests/geo_url_tests.cpp rename to libs/ge0/ge0_tests/geo_url_tests.cpp diff --git a/ge0/ge0_tests/parser_tests.cpp b/libs/ge0/ge0_tests/parser_tests.cpp similarity index 100% rename from ge0/ge0_tests/parser_tests.cpp rename to libs/ge0/ge0_tests/parser_tests.cpp diff --git a/ge0/ge0_tests/url_generator_tests.cpp b/libs/ge0/ge0_tests/url_generator_tests.cpp similarity index 100% rename from ge0/ge0_tests/url_generator_tests.cpp rename to libs/ge0/ge0_tests/url_generator_tests.cpp diff --git a/ge0/geo_url_parser.cpp b/libs/ge0/geo_url_parser.cpp similarity index 100% rename from ge0/geo_url_parser.cpp rename to libs/ge0/geo_url_parser.cpp diff --git a/ge0/geo_url_parser.hpp b/libs/ge0/geo_url_parser.hpp similarity index 100% rename from ge0/geo_url_parser.hpp rename to libs/ge0/geo_url_parser.hpp diff --git a/ge0/parser.cpp b/libs/ge0/parser.cpp similarity index 100% rename from ge0/parser.cpp rename to libs/ge0/parser.cpp diff --git a/ge0/parser.hpp b/libs/ge0/parser.hpp similarity index 100% rename from ge0/parser.hpp rename to libs/ge0/parser.hpp diff --git a/ge0/url_generator.cpp b/libs/ge0/url_generator.cpp similarity index 100% rename from ge0/url_generator.cpp rename to libs/ge0/url_generator.cpp diff --git a/ge0/url_generator.hpp b/libs/ge0/url_generator.hpp similarity index 100% rename from ge0/url_generator.hpp rename to libs/ge0/url_generator.hpp diff --git a/geometry/CMakeLists.txt b/libs/geometry/CMakeLists.txt similarity index 100% rename from geometry/CMakeLists.txt rename to libs/geometry/CMakeLists.txt diff --git a/geometry/algorithm.cpp b/libs/geometry/algorithm.cpp similarity index 100% rename from geometry/algorithm.cpp rename to libs/geometry/algorithm.cpp diff --git a/geometry/algorithm.hpp b/libs/geometry/algorithm.hpp similarity index 100% rename from geometry/algorithm.hpp rename to libs/geometry/algorithm.hpp diff --git a/geometry/angles.cpp b/libs/geometry/angles.cpp similarity index 100% rename from geometry/angles.cpp rename to libs/geometry/angles.cpp diff --git a/geometry/angles.hpp b/libs/geometry/angles.hpp similarity index 100% rename from geometry/angles.hpp rename to libs/geometry/angles.hpp diff --git a/geometry/any_rect2d.hpp b/libs/geometry/any_rect2d.hpp similarity index 100% rename from geometry/any_rect2d.hpp rename to libs/geometry/any_rect2d.hpp diff --git a/geometry/area_on_earth.cpp b/libs/geometry/area_on_earth.cpp similarity index 100% rename from geometry/area_on_earth.cpp rename to libs/geometry/area_on_earth.cpp diff --git a/geometry/area_on_earth.hpp b/libs/geometry/area_on_earth.hpp similarity index 100% rename from geometry/area_on_earth.hpp rename to libs/geometry/area_on_earth.hpp diff --git a/geometry/avg_vector.hpp b/libs/geometry/avg_vector.hpp similarity index 100% rename from geometry/avg_vector.hpp rename to libs/geometry/avg_vector.hpp diff --git a/geometry/bounding_box.cpp b/libs/geometry/bounding_box.cpp similarity index 100% rename from geometry/bounding_box.cpp rename to libs/geometry/bounding_box.cpp diff --git a/geometry/bounding_box.hpp b/libs/geometry/bounding_box.hpp similarity index 100% rename from geometry/bounding_box.hpp rename to libs/geometry/bounding_box.hpp diff --git a/geometry/calipers_box.cpp b/libs/geometry/calipers_box.cpp similarity index 100% rename from geometry/calipers_box.cpp rename to libs/geometry/calipers_box.cpp diff --git a/geometry/calipers_box.hpp b/libs/geometry/calipers_box.hpp similarity index 100% rename from geometry/calipers_box.hpp rename to libs/geometry/calipers_box.hpp diff --git a/geometry/cellid.hpp b/libs/geometry/cellid.hpp similarity index 100% rename from geometry/cellid.hpp rename to libs/geometry/cellid.hpp diff --git a/geometry/circle_on_earth.cpp b/libs/geometry/circle_on_earth.cpp similarity index 100% rename from geometry/circle_on_earth.cpp rename to libs/geometry/circle_on_earth.cpp diff --git a/geometry/circle_on_earth.hpp b/libs/geometry/circle_on_earth.hpp similarity index 100% rename from geometry/circle_on_earth.hpp rename to libs/geometry/circle_on_earth.hpp diff --git a/geometry/clipping.cpp b/libs/geometry/clipping.cpp similarity index 100% rename from geometry/clipping.cpp rename to libs/geometry/clipping.cpp diff --git a/geometry/clipping.hpp b/libs/geometry/clipping.hpp similarity index 100% rename from geometry/clipping.hpp rename to libs/geometry/clipping.hpp diff --git a/geometry/convex_hull.cpp b/libs/geometry/convex_hull.cpp similarity index 100% rename from geometry/convex_hull.cpp rename to libs/geometry/convex_hull.cpp diff --git a/geometry/convex_hull.hpp b/libs/geometry/convex_hull.hpp similarity index 100% rename from geometry/convex_hull.hpp rename to libs/geometry/convex_hull.hpp diff --git a/geometry/covering.hpp b/libs/geometry/covering.hpp similarity index 100% rename from geometry/covering.hpp rename to libs/geometry/covering.hpp diff --git a/geometry/covering_utils.hpp b/libs/geometry/covering_utils.hpp similarity index 100% rename from geometry/covering_utils.hpp rename to libs/geometry/covering_utils.hpp diff --git a/geometry/diamond_box.cpp b/libs/geometry/diamond_box.cpp similarity index 100% rename from geometry/diamond_box.cpp rename to libs/geometry/diamond_box.cpp diff --git a/geometry/diamond_box.hpp b/libs/geometry/diamond_box.hpp similarity index 100% rename from geometry/diamond_box.hpp rename to libs/geometry/diamond_box.hpp diff --git a/geometry/distance_on_sphere.cpp b/libs/geometry/distance_on_sphere.cpp similarity index 100% rename from geometry/distance_on_sphere.cpp rename to libs/geometry/distance_on_sphere.cpp diff --git a/geometry/distance_on_sphere.hpp b/libs/geometry/distance_on_sphere.hpp similarity index 100% rename from geometry/distance_on_sphere.hpp rename to libs/geometry/distance_on_sphere.hpp diff --git a/geometry/geometry_tests/CMakeLists.txt b/libs/geometry/geometry_tests/CMakeLists.txt similarity index 100% rename from geometry/geometry_tests/CMakeLists.txt rename to libs/geometry/geometry_tests/CMakeLists.txt diff --git a/geometry/geometry_tests/algorithm_test.cpp b/libs/geometry/geometry_tests/algorithm_test.cpp similarity index 100% rename from geometry/geometry_tests/algorithm_test.cpp rename to libs/geometry/geometry_tests/algorithm_test.cpp diff --git a/geometry/geometry_tests/angle_test.cpp b/libs/geometry/geometry_tests/angle_test.cpp similarity index 100% rename from geometry/geometry_tests/angle_test.cpp rename to libs/geometry/geometry_tests/angle_test.cpp diff --git a/geometry/geometry_tests/anyrect_test.cpp b/libs/geometry/geometry_tests/anyrect_test.cpp similarity index 100% rename from geometry/geometry_tests/anyrect_test.cpp rename to libs/geometry/geometry_tests/anyrect_test.cpp diff --git a/geometry/geometry_tests/area_on_earth_tests.cpp b/libs/geometry/geometry_tests/area_on_earth_tests.cpp similarity index 100% rename from geometry/geometry_tests/area_on_earth_tests.cpp rename to libs/geometry/geometry_tests/area_on_earth_tests.cpp diff --git a/geometry/geometry_tests/bounding_box_tests.cpp b/libs/geometry/geometry_tests/bounding_box_tests.cpp similarity index 100% rename from geometry/geometry_tests/bounding_box_tests.cpp rename to libs/geometry/geometry_tests/bounding_box_tests.cpp diff --git a/geometry/geometry_tests/calipers_box_tests.cpp b/libs/geometry/geometry_tests/calipers_box_tests.cpp similarity index 100% rename from geometry/geometry_tests/calipers_box_tests.cpp rename to libs/geometry/geometry_tests/calipers_box_tests.cpp diff --git a/geometry/geometry_tests/cellid_test.cpp b/libs/geometry/geometry_tests/cellid_test.cpp similarity index 100% rename from geometry/geometry_tests/cellid_test.cpp rename to libs/geometry/geometry_tests/cellid_test.cpp diff --git a/geometry/geometry_tests/circle_on_earth_tests.cpp b/libs/geometry/geometry_tests/circle_on_earth_tests.cpp similarity index 100% rename from geometry/geometry_tests/circle_on_earth_tests.cpp rename to libs/geometry/geometry_tests/circle_on_earth_tests.cpp diff --git a/geometry/geometry_tests/clipping_test.cpp b/libs/geometry/geometry_tests/clipping_test.cpp similarity index 100% rename from geometry/geometry_tests/clipping_test.cpp rename to libs/geometry/geometry_tests/clipping_test.cpp diff --git a/geometry/geometry_tests/common_test.cpp b/libs/geometry/geometry_tests/common_test.cpp similarity index 100% rename from geometry/geometry_tests/common_test.cpp rename to libs/geometry/geometry_tests/common_test.cpp diff --git a/geometry/geometry_tests/convex_hull_tests.cpp b/libs/geometry/geometry_tests/convex_hull_tests.cpp similarity index 100% rename from geometry/geometry_tests/convex_hull_tests.cpp rename to libs/geometry/geometry_tests/convex_hull_tests.cpp diff --git a/geometry/geometry_tests/covering_test.cpp b/libs/geometry/geometry_tests/covering_test.cpp similarity index 100% rename from geometry/geometry_tests/covering_test.cpp rename to libs/geometry/geometry_tests/covering_test.cpp diff --git a/geometry/geometry_tests/diamond_box_tests.cpp b/libs/geometry/geometry_tests/diamond_box_tests.cpp similarity index 100% rename from geometry/geometry_tests/diamond_box_tests.cpp rename to libs/geometry/geometry_tests/diamond_box_tests.cpp diff --git a/geometry/geometry_tests/distance_on_sphere_test.cpp b/libs/geometry/geometry_tests/distance_on_sphere_test.cpp similarity index 100% rename from geometry/geometry_tests/distance_on_sphere_test.cpp rename to libs/geometry/geometry_tests/distance_on_sphere_test.cpp diff --git a/geometry/geometry_tests/equality.hpp b/libs/geometry/geometry_tests/equality.hpp similarity index 100% rename from geometry/geometry_tests/equality.hpp rename to libs/geometry/geometry_tests/equality.hpp diff --git a/geometry/geometry_tests/intersect_test.cpp b/libs/geometry/geometry_tests/intersect_test.cpp similarity index 100% rename from geometry/geometry_tests/intersect_test.cpp rename to libs/geometry/geometry_tests/intersect_test.cpp diff --git a/geometry/geometry_tests/intersection_score_tests.cpp b/libs/geometry/geometry_tests/intersection_score_tests.cpp similarity index 100% rename from geometry/geometry_tests/intersection_score_tests.cpp rename to libs/geometry/geometry_tests/intersection_score_tests.cpp diff --git a/geometry/geometry_tests/large_polygon.hpp b/libs/geometry/geometry_tests/large_polygon.hpp similarity index 100% rename from geometry/geometry_tests/large_polygon.hpp rename to libs/geometry/geometry_tests/large_polygon.hpp diff --git a/geometry/geometry_tests/latlon_test.cpp b/libs/geometry/geometry_tests/latlon_test.cpp similarity index 100% rename from geometry/geometry_tests/latlon_test.cpp rename to libs/geometry/geometry_tests/latlon_test.cpp diff --git a/geometry/geometry_tests/line2d_tests.cpp b/libs/geometry/geometry_tests/line2d_tests.cpp similarity index 100% rename from geometry/geometry_tests/line2d_tests.cpp rename to libs/geometry/geometry_tests/line2d_tests.cpp diff --git a/geometry/geometry_tests/mercator_test.cpp b/libs/geometry/geometry_tests/mercator_test.cpp similarity index 100% rename from geometry/geometry_tests/mercator_test.cpp rename to libs/geometry/geometry_tests/mercator_test.cpp diff --git a/geometry/geometry_tests/nearby_points_sweeper_test.cpp b/libs/geometry/geometry_tests/nearby_points_sweeper_test.cpp similarity index 100% rename from geometry/geometry_tests/nearby_points_sweeper_test.cpp rename to libs/geometry/geometry_tests/nearby_points_sweeper_test.cpp diff --git a/geometry/geometry_tests/oblate_spheroid_tests.cpp b/libs/geometry/geometry_tests/oblate_spheroid_tests.cpp similarity index 100% rename from geometry/geometry_tests/oblate_spheroid_tests.cpp rename to libs/geometry/geometry_tests/oblate_spheroid_tests.cpp diff --git a/geometry/geometry_tests/packer_test.cpp b/libs/geometry/geometry_tests/packer_test.cpp similarity index 100% rename from geometry/geometry_tests/packer_test.cpp rename to libs/geometry/geometry_tests/packer_test.cpp diff --git a/geometry/geometry_tests/parametrized_segment_tests.cpp b/libs/geometry/geometry_tests/parametrized_segment_tests.cpp similarity index 100% rename from geometry/geometry_tests/parametrized_segment_tests.cpp rename to libs/geometry/geometry_tests/parametrized_segment_tests.cpp diff --git a/geometry/geometry_tests/point3d_tests.cpp b/libs/geometry/geometry_tests/point3d_tests.cpp similarity index 100% rename from geometry/geometry_tests/point3d_tests.cpp rename to libs/geometry/geometry_tests/point3d_tests.cpp diff --git a/geometry/geometry_tests/point_test.cpp b/libs/geometry/geometry_tests/point_test.cpp similarity index 100% rename from geometry/geometry_tests/point_test.cpp rename to libs/geometry/geometry_tests/point_test.cpp diff --git a/geometry/geometry_tests/polygon_test.cpp b/libs/geometry/geometry_tests/polygon_test.cpp similarity index 100% rename from geometry/geometry_tests/polygon_test.cpp rename to libs/geometry/geometry_tests/polygon_test.cpp diff --git a/geometry/geometry_tests/polyline_tests.cpp b/libs/geometry/geometry_tests/polyline_tests.cpp similarity index 100% rename from geometry/geometry_tests/polyline_tests.cpp rename to libs/geometry/geometry_tests/polyline_tests.cpp diff --git a/geometry/geometry_tests/rect_test.cpp b/libs/geometry/geometry_tests/rect_test.cpp similarity index 100% rename from geometry/geometry_tests/rect_test.cpp rename to libs/geometry/geometry_tests/rect_test.cpp diff --git a/geometry/geometry_tests/region2d_binary_op_test.cpp b/libs/geometry/geometry_tests/region2d_binary_op_test.cpp similarity index 100% rename from geometry/geometry_tests/region2d_binary_op_test.cpp rename to libs/geometry/geometry_tests/region2d_binary_op_test.cpp diff --git a/geometry/geometry_tests/region_tests.cpp b/libs/geometry/geometry_tests/region_tests.cpp similarity index 100% rename from geometry/geometry_tests/region_tests.cpp rename to libs/geometry/geometry_tests/region_tests.cpp diff --git a/geometry/geometry_tests/robust_test.cpp b/libs/geometry/geometry_tests/robust_test.cpp similarity index 100% rename from geometry/geometry_tests/robust_test.cpp rename to libs/geometry/geometry_tests/robust_test.cpp diff --git a/geometry/geometry_tests/screen_test.cpp b/libs/geometry/geometry_tests/screen_test.cpp similarity index 100% rename from geometry/geometry_tests/screen_test.cpp rename to libs/geometry/geometry_tests/screen_test.cpp diff --git a/geometry/geometry_tests/segment2d_tests.cpp b/libs/geometry/geometry_tests/segment2d_tests.cpp similarity index 100% rename from geometry/geometry_tests/segment2d_tests.cpp rename to libs/geometry/geometry_tests/segment2d_tests.cpp diff --git a/geometry/geometry_tests/simplification_test.cpp b/libs/geometry/geometry_tests/simplification_test.cpp similarity index 100% rename from geometry/geometry_tests/simplification_test.cpp rename to libs/geometry/geometry_tests/simplification_test.cpp diff --git a/geometry/geometry_tests/spline_test.cpp b/libs/geometry/geometry_tests/spline_test.cpp similarity index 100% rename from geometry/geometry_tests/spline_test.cpp rename to libs/geometry/geometry_tests/spline_test.cpp diff --git a/geometry/geometry_tests/test_regions.hpp b/libs/geometry/geometry_tests/test_regions.hpp similarity index 100% rename from geometry/geometry_tests/test_regions.hpp rename to libs/geometry/geometry_tests/test_regions.hpp diff --git a/geometry/geometry_tests/transformations_test.cpp b/libs/geometry/geometry_tests/transformations_test.cpp similarity index 100% rename from geometry/geometry_tests/transformations_test.cpp rename to libs/geometry/geometry_tests/transformations_test.cpp diff --git a/geometry/geometry_tests/tree_test.cpp b/libs/geometry/geometry_tests/tree_test.cpp similarity index 100% rename from geometry/geometry_tests/tree_test.cpp rename to libs/geometry/geometry_tests/tree_test.cpp diff --git a/geometry/geometry_tests/vector_test.cpp b/libs/geometry/geometry_tests/vector_test.cpp similarity index 100% rename from geometry/geometry_tests/vector_test.cpp rename to libs/geometry/geometry_tests/vector_test.cpp diff --git a/geometry/intersection_score.hpp b/libs/geometry/intersection_score.hpp similarity index 100% rename from geometry/intersection_score.hpp rename to libs/geometry/intersection_score.hpp diff --git a/geometry/latlon.cpp b/libs/geometry/latlon.cpp similarity index 100% rename from geometry/latlon.cpp rename to libs/geometry/latlon.cpp diff --git a/geometry/latlon.hpp b/libs/geometry/latlon.hpp similarity index 100% rename from geometry/latlon.hpp rename to libs/geometry/latlon.hpp diff --git a/geometry/line2d.cpp b/libs/geometry/line2d.cpp similarity index 100% rename from geometry/line2d.cpp rename to libs/geometry/line2d.cpp diff --git a/geometry/line2d.hpp b/libs/geometry/line2d.hpp similarity index 100% rename from geometry/line2d.hpp rename to libs/geometry/line2d.hpp diff --git a/geometry/mercator.cpp b/libs/geometry/mercator.cpp similarity index 100% rename from geometry/mercator.cpp rename to libs/geometry/mercator.cpp diff --git a/geometry/mercator.hpp b/libs/geometry/mercator.hpp similarity index 100% rename from geometry/mercator.hpp rename to libs/geometry/mercator.hpp diff --git a/geometry/meter.hpp b/libs/geometry/meter.hpp similarity index 100% rename from geometry/meter.hpp rename to libs/geometry/meter.hpp diff --git a/geometry/nearby_points_sweeper.cpp b/libs/geometry/nearby_points_sweeper.cpp similarity index 100% rename from geometry/nearby_points_sweeper.cpp rename to libs/geometry/nearby_points_sweeper.cpp diff --git a/geometry/nearby_points_sweeper.hpp b/libs/geometry/nearby_points_sweeper.hpp similarity index 100% rename from geometry/nearby_points_sweeper.hpp rename to libs/geometry/nearby_points_sweeper.hpp diff --git a/geometry/oblate_spheroid.cpp b/libs/geometry/oblate_spheroid.cpp similarity index 100% rename from geometry/oblate_spheroid.cpp rename to libs/geometry/oblate_spheroid.cpp diff --git a/geometry/oblate_spheroid.hpp b/libs/geometry/oblate_spheroid.hpp similarity index 100% rename from geometry/oblate_spheroid.hpp rename to libs/geometry/oblate_spheroid.hpp diff --git a/geometry/packer.cpp b/libs/geometry/packer.cpp similarity index 100% rename from geometry/packer.cpp rename to libs/geometry/packer.cpp diff --git a/geometry/packer.hpp b/libs/geometry/packer.hpp similarity index 100% rename from geometry/packer.hpp rename to libs/geometry/packer.hpp diff --git a/geometry/parametrized_segment.hpp b/libs/geometry/parametrized_segment.hpp similarity index 100% rename from geometry/parametrized_segment.hpp rename to libs/geometry/parametrized_segment.hpp diff --git a/geometry/point2d.hpp b/libs/geometry/point2d.hpp similarity index 100% rename from geometry/point2d.hpp rename to libs/geometry/point2d.hpp diff --git a/geometry/point3d.hpp b/libs/geometry/point3d.hpp similarity index 100% rename from geometry/point3d.hpp rename to libs/geometry/point3d.hpp diff --git a/geometry/point_with_altitude.cpp b/libs/geometry/point_with_altitude.cpp similarity index 100% rename from geometry/point_with_altitude.cpp rename to libs/geometry/point_with_altitude.cpp diff --git a/geometry/point_with_altitude.hpp b/libs/geometry/point_with_altitude.hpp similarity index 100% rename from geometry/point_with_altitude.hpp rename to libs/geometry/point_with_altitude.hpp diff --git a/geometry/polygon.hpp b/libs/geometry/polygon.hpp similarity index 100% rename from geometry/polygon.hpp rename to libs/geometry/polygon.hpp diff --git a/geometry/polyline2d.hpp b/libs/geometry/polyline2d.hpp similarity index 100% rename from geometry/polyline2d.hpp rename to libs/geometry/polyline2d.hpp diff --git a/geometry/rect2d.hpp b/libs/geometry/rect2d.hpp similarity index 100% rename from geometry/rect2d.hpp rename to libs/geometry/rect2d.hpp diff --git a/geometry/rect_intersect.hpp b/libs/geometry/rect_intersect.hpp similarity index 100% rename from geometry/rect_intersect.hpp rename to libs/geometry/rect_intersect.hpp diff --git a/geometry/region2d.hpp b/libs/geometry/region2d.hpp similarity index 100% rename from geometry/region2d.hpp rename to libs/geometry/region2d.hpp diff --git a/geometry/region2d/binary_operators.cpp b/libs/geometry/region2d/binary_operators.cpp similarity index 100% rename from geometry/region2d/binary_operators.cpp rename to libs/geometry/region2d/binary_operators.cpp diff --git a/geometry/region2d/binary_operators.hpp b/libs/geometry/region2d/binary_operators.hpp similarity index 100% rename from geometry/region2d/binary_operators.hpp rename to libs/geometry/region2d/binary_operators.hpp diff --git a/geometry/region2d/boost_concept.hpp b/libs/geometry/region2d/boost_concept.hpp similarity index 100% rename from geometry/region2d/boost_concept.hpp rename to libs/geometry/region2d/boost_concept.hpp diff --git a/geometry/robust_orientation.cpp b/libs/geometry/robust_orientation.cpp similarity index 100% rename from geometry/robust_orientation.cpp rename to libs/geometry/robust_orientation.cpp diff --git a/geometry/robust_orientation.hpp b/libs/geometry/robust_orientation.hpp similarity index 100% rename from geometry/robust_orientation.hpp rename to libs/geometry/robust_orientation.hpp diff --git a/geometry/screenbase.cpp b/libs/geometry/screenbase.cpp similarity index 100% rename from geometry/screenbase.cpp rename to libs/geometry/screenbase.cpp diff --git a/geometry/screenbase.hpp b/libs/geometry/screenbase.hpp similarity index 100% rename from geometry/screenbase.hpp rename to libs/geometry/screenbase.hpp diff --git a/geometry/segment2d.cpp b/libs/geometry/segment2d.cpp similarity index 100% rename from geometry/segment2d.cpp rename to libs/geometry/segment2d.cpp diff --git a/geometry/segment2d.hpp b/libs/geometry/segment2d.hpp similarity index 100% rename from geometry/segment2d.hpp rename to libs/geometry/segment2d.hpp diff --git a/geometry/simplification.hpp b/libs/geometry/simplification.hpp similarity index 100% rename from geometry/simplification.hpp rename to libs/geometry/simplification.hpp diff --git a/geometry/smoothing.cpp b/libs/geometry/smoothing.cpp similarity index 100% rename from geometry/smoothing.cpp rename to libs/geometry/smoothing.cpp diff --git a/geometry/smoothing.hpp b/libs/geometry/smoothing.hpp similarity index 100% rename from geometry/smoothing.hpp rename to libs/geometry/smoothing.hpp diff --git a/geometry/spline.cpp b/libs/geometry/spline.cpp similarity index 100% rename from geometry/spline.cpp rename to libs/geometry/spline.cpp diff --git a/geometry/spline.hpp b/libs/geometry/spline.hpp similarity index 100% rename from geometry/spline.hpp rename to libs/geometry/spline.hpp diff --git a/geometry/transformations.hpp b/libs/geometry/transformations.hpp similarity index 100% rename from geometry/transformations.hpp rename to libs/geometry/transformations.hpp diff --git a/geometry/tree4d.hpp b/libs/geometry/tree4d.hpp similarity index 100% rename from geometry/tree4d.hpp rename to libs/geometry/tree4d.hpp diff --git a/geometry/triangle2d.cpp b/libs/geometry/triangle2d.cpp similarity index 100% rename from geometry/triangle2d.cpp rename to libs/geometry/triangle2d.cpp diff --git a/geometry/triangle2d.hpp b/libs/geometry/triangle2d.hpp similarity index 100% rename from geometry/triangle2d.hpp rename to libs/geometry/triangle2d.hpp diff --git a/indexer/CMakeLists.txt b/libs/indexer/CMakeLists.txt similarity index 100% rename from indexer/CMakeLists.txt rename to libs/indexer/CMakeLists.txt diff --git a/indexer/altitude_loader.cpp b/libs/indexer/altitude_loader.cpp similarity index 100% rename from indexer/altitude_loader.cpp rename to libs/indexer/altitude_loader.cpp diff --git a/indexer/altitude_loader.hpp b/libs/indexer/altitude_loader.hpp similarity index 100% rename from indexer/altitude_loader.hpp rename to libs/indexer/altitude_loader.hpp diff --git a/indexer/brands_holder.cpp b/libs/indexer/brands_holder.cpp similarity index 100% rename from indexer/brands_holder.cpp rename to libs/indexer/brands_holder.cpp diff --git a/indexer/brands_holder.hpp b/libs/indexer/brands_holder.hpp similarity index 100% rename from indexer/brands_holder.hpp rename to libs/indexer/brands_holder.hpp diff --git a/indexer/caching_rank_table_loader.cpp b/libs/indexer/caching_rank_table_loader.cpp similarity index 100% rename from indexer/caching_rank_table_loader.cpp rename to libs/indexer/caching_rank_table_loader.cpp diff --git a/indexer/caching_rank_table_loader.hpp b/libs/indexer/caching_rank_table_loader.hpp similarity index 100% rename from indexer/caching_rank_table_loader.hpp rename to libs/indexer/caching_rank_table_loader.hpp diff --git a/indexer/categories_holder.cpp b/libs/indexer/categories_holder.cpp similarity index 100% rename from indexer/categories_holder.cpp rename to libs/indexer/categories_holder.cpp diff --git a/indexer/categories_holder.hpp b/libs/indexer/categories_holder.hpp similarity index 100% rename from indexer/categories_holder.hpp rename to libs/indexer/categories_holder.hpp diff --git a/indexer/categories_holder_loader.cpp b/libs/indexer/categories_holder_loader.cpp similarity index 100% rename from indexer/categories_holder_loader.cpp rename to libs/indexer/categories_holder_loader.cpp diff --git a/indexer/categories_index.cpp b/libs/indexer/categories_index.cpp similarity index 100% rename from indexer/categories_index.cpp rename to libs/indexer/categories_index.cpp diff --git a/indexer/categories_index.hpp b/libs/indexer/categories_index.hpp similarity index 100% rename from indexer/categories_index.hpp rename to libs/indexer/categories_index.hpp diff --git a/indexer/cell_coverer.hpp b/libs/indexer/cell_coverer.hpp similarity index 100% rename from indexer/cell_coverer.hpp rename to libs/indexer/cell_coverer.hpp diff --git a/indexer/cell_id.hpp b/libs/indexer/cell_id.hpp similarity index 100% rename from indexer/cell_id.hpp rename to libs/indexer/cell_id.hpp diff --git a/indexer/cell_value_pair.hpp b/libs/indexer/cell_value_pair.hpp similarity index 100% rename from indexer/cell_value_pair.hpp rename to libs/indexer/cell_value_pair.hpp diff --git a/indexer/centers_table.cpp b/libs/indexer/centers_table.cpp similarity index 100% rename from indexer/centers_table.cpp rename to libs/indexer/centers_table.cpp diff --git a/indexer/centers_table.hpp b/libs/indexer/centers_table.hpp similarity index 100% rename from indexer/centers_table.hpp rename to libs/indexer/centers_table.hpp diff --git a/indexer/cities_boundaries_serdes.hpp b/libs/indexer/cities_boundaries_serdes.hpp similarity index 100% rename from indexer/cities_boundaries_serdes.hpp rename to libs/indexer/cities_boundaries_serdes.hpp diff --git a/indexer/city_boundary.hpp b/libs/indexer/city_boundary.hpp similarity index 100% rename from indexer/city_boundary.hpp rename to libs/indexer/city_boundary.hpp diff --git a/indexer/classificator.cpp b/libs/indexer/classificator.cpp similarity index 100% rename from indexer/classificator.cpp rename to libs/indexer/classificator.cpp diff --git a/indexer/classificator.hpp b/libs/indexer/classificator.hpp similarity index 100% rename from indexer/classificator.hpp rename to libs/indexer/classificator.hpp diff --git a/indexer/classificator_loader.cpp b/libs/indexer/classificator_loader.cpp similarity index 100% rename from indexer/classificator_loader.cpp rename to libs/indexer/classificator_loader.cpp diff --git a/indexer/classificator_loader.hpp b/libs/indexer/classificator_loader.hpp similarity index 100% rename from indexer/classificator_loader.hpp rename to libs/indexer/classificator_loader.hpp diff --git a/indexer/complex/serdes.cpp b/libs/indexer/complex/serdes.cpp similarity index 100% rename from indexer/complex/serdes.cpp rename to libs/indexer/complex/serdes.cpp diff --git a/indexer/complex/serdes.hpp b/libs/indexer/complex/serdes.hpp similarity index 100% rename from indexer/complex/serdes.hpp rename to libs/indexer/complex/serdes.hpp diff --git a/indexer/complex/serdes_utils.hpp b/libs/indexer/complex/serdes_utils.hpp similarity index 100% rename from indexer/complex/serdes_utils.hpp rename to libs/indexer/complex/serdes_utils.hpp diff --git a/indexer/complex/tree_node.hpp b/libs/indexer/complex/tree_node.hpp similarity index 100% rename from indexer/complex/tree_node.hpp rename to libs/indexer/complex/tree_node.hpp diff --git a/indexer/cuisines.cpp b/libs/indexer/cuisines.cpp similarity index 100% rename from indexer/cuisines.cpp rename to libs/indexer/cuisines.cpp diff --git a/indexer/cuisines.hpp b/libs/indexer/cuisines.hpp similarity index 100% rename from indexer/cuisines.hpp rename to libs/indexer/cuisines.hpp diff --git a/indexer/custom_keyvalue.cpp b/libs/indexer/custom_keyvalue.cpp similarity index 100% rename from indexer/custom_keyvalue.cpp rename to libs/indexer/custom_keyvalue.cpp diff --git a/indexer/custom_keyvalue.hpp b/libs/indexer/custom_keyvalue.hpp similarity index 100% rename from indexer/custom_keyvalue.hpp rename to libs/indexer/custom_keyvalue.hpp diff --git a/indexer/dat_section_header.hpp b/libs/indexer/dat_section_header.hpp similarity index 100% rename from indexer/dat_section_header.hpp rename to libs/indexer/dat_section_header.hpp diff --git a/indexer/data_factory.cpp b/libs/indexer/data_factory.cpp similarity index 100% rename from indexer/data_factory.cpp rename to libs/indexer/data_factory.cpp diff --git a/indexer/data_factory.hpp b/libs/indexer/data_factory.hpp similarity index 100% rename from indexer/data_factory.hpp rename to libs/indexer/data_factory.hpp diff --git a/indexer/data_header.cpp b/libs/indexer/data_header.cpp similarity index 100% rename from indexer/data_header.cpp rename to libs/indexer/data_header.cpp diff --git a/indexer/data_header.hpp b/libs/indexer/data_header.hpp similarity index 100% rename from indexer/data_header.hpp rename to libs/indexer/data_header.hpp diff --git a/indexer/data_source.cpp b/libs/indexer/data_source.cpp similarity index 100% rename from indexer/data_source.cpp rename to libs/indexer/data_source.cpp diff --git a/indexer/data_source.hpp b/libs/indexer/data_source.hpp similarity index 100% rename from indexer/data_source.hpp rename to libs/indexer/data_source.hpp diff --git a/indexer/data_source_helpers.cpp b/libs/indexer/data_source_helpers.cpp similarity index 100% rename from indexer/data_source_helpers.cpp rename to libs/indexer/data_source_helpers.cpp diff --git a/indexer/data_source_helpers.hpp b/libs/indexer/data_source_helpers.hpp similarity index 100% rename from indexer/data_source_helpers.hpp rename to libs/indexer/data_source_helpers.hpp diff --git a/indexer/displacement_manager.hpp b/libs/indexer/displacement_manager.hpp similarity index 100% rename from indexer/displacement_manager.hpp rename to libs/indexer/displacement_manager.hpp diff --git a/indexer/drawing_rule_def.cpp b/libs/indexer/drawing_rule_def.cpp similarity index 100% rename from indexer/drawing_rule_def.cpp rename to libs/indexer/drawing_rule_def.cpp diff --git a/indexer/drawing_rule_def.hpp b/libs/indexer/drawing_rule_def.hpp similarity index 100% rename from indexer/drawing_rule_def.hpp rename to libs/indexer/drawing_rule_def.hpp diff --git a/indexer/drawing_rules.cpp b/libs/indexer/drawing_rules.cpp similarity index 100% rename from indexer/drawing_rules.cpp rename to libs/indexer/drawing_rules.cpp diff --git a/indexer/drawing_rules.hpp b/libs/indexer/drawing_rules.hpp similarity index 100% rename from indexer/drawing_rules.hpp rename to libs/indexer/drawing_rules.hpp diff --git a/indexer/drules_include.hpp b/libs/indexer/drules_include.hpp similarity index 100% rename from indexer/drules_include.hpp rename to libs/indexer/drules_include.hpp diff --git a/indexer/drules_selector.cpp b/libs/indexer/drules_selector.cpp similarity index 100% rename from indexer/drules_selector.cpp rename to libs/indexer/drules_selector.cpp diff --git a/indexer/drules_selector.hpp b/libs/indexer/drules_selector.hpp similarity index 100% rename from indexer/drules_selector.hpp rename to libs/indexer/drules_selector.hpp diff --git a/indexer/drules_selector_parser.cpp b/libs/indexer/drules_selector_parser.cpp similarity index 100% rename from indexer/drules_selector_parser.cpp rename to libs/indexer/drules_selector_parser.cpp diff --git a/indexer/drules_selector_parser.hpp b/libs/indexer/drules_selector_parser.hpp similarity index 100% rename from indexer/drules_selector_parser.hpp rename to libs/indexer/drules_selector_parser.hpp diff --git a/indexer/drules_struct.pb.cc b/libs/indexer/drules_struct.pb.cc similarity index 100% rename from indexer/drules_struct.pb.cc rename to libs/indexer/drules_struct.pb.cc diff --git a/indexer/drules_struct.pb.h b/libs/indexer/drules_struct.pb.h similarity index 100% rename from indexer/drules_struct.pb.h rename to libs/indexer/drules_struct.pb.h diff --git a/indexer/drules_struct.proto b/libs/indexer/drules_struct.proto similarity index 100% rename from indexer/drules_struct.proto rename to libs/indexer/drules_struct.proto diff --git a/indexer/edit_journal.cpp b/libs/indexer/edit_journal.cpp similarity index 100% rename from indexer/edit_journal.cpp rename to libs/indexer/edit_journal.cpp diff --git a/indexer/edit_journal.hpp b/libs/indexer/edit_journal.hpp similarity index 100% rename from indexer/edit_journal.hpp rename to libs/indexer/edit_journal.hpp diff --git a/indexer/editable_map_object.cpp b/libs/indexer/editable_map_object.cpp similarity index 100% rename from indexer/editable_map_object.cpp rename to libs/indexer/editable_map_object.cpp diff --git a/indexer/editable_map_object.hpp b/libs/indexer/editable_map_object.hpp similarity index 100% rename from indexer/editable_map_object.hpp rename to libs/indexer/editable_map_object.hpp diff --git a/indexer/fake_feature_ids.cpp b/libs/indexer/fake_feature_ids.cpp similarity index 100% rename from indexer/fake_feature_ids.cpp rename to libs/indexer/fake_feature_ids.cpp diff --git a/indexer/fake_feature_ids.hpp b/libs/indexer/fake_feature_ids.hpp similarity index 100% rename from indexer/fake_feature_ids.hpp rename to libs/indexer/fake_feature_ids.hpp diff --git a/indexer/feature.cpp b/libs/indexer/feature.cpp similarity index 100% rename from indexer/feature.cpp rename to libs/indexer/feature.cpp diff --git a/indexer/feature.hpp b/libs/indexer/feature.hpp similarity index 100% rename from indexer/feature.hpp rename to libs/indexer/feature.hpp diff --git a/indexer/feature_algo.cpp b/libs/indexer/feature_algo.cpp similarity index 100% rename from indexer/feature_algo.cpp rename to libs/indexer/feature_algo.cpp diff --git a/indexer/feature_algo.hpp b/libs/indexer/feature_algo.hpp similarity index 100% rename from indexer/feature_algo.hpp rename to libs/indexer/feature_algo.hpp diff --git a/indexer/feature_altitude.hpp b/libs/indexer/feature_altitude.hpp similarity index 100% rename from indexer/feature_altitude.hpp rename to libs/indexer/feature_altitude.hpp diff --git a/indexer/feature_covering.cpp b/libs/indexer/feature_covering.cpp similarity index 100% rename from indexer/feature_covering.cpp rename to libs/indexer/feature_covering.cpp diff --git a/indexer/feature_covering.hpp b/libs/indexer/feature_covering.hpp similarity index 100% rename from indexer/feature_covering.hpp rename to libs/indexer/feature_covering.hpp diff --git a/indexer/feature_data.cpp b/libs/indexer/feature_data.cpp similarity index 100% rename from indexer/feature_data.cpp rename to libs/indexer/feature_data.cpp diff --git a/indexer/feature_data.hpp b/libs/indexer/feature_data.hpp similarity index 100% rename from indexer/feature_data.hpp rename to libs/indexer/feature_data.hpp diff --git a/indexer/feature_decl.cpp b/libs/indexer/feature_decl.cpp similarity index 100% rename from indexer/feature_decl.cpp rename to libs/indexer/feature_decl.cpp diff --git a/indexer/feature_decl.hpp b/libs/indexer/feature_decl.hpp similarity index 100% rename from indexer/feature_decl.hpp rename to libs/indexer/feature_decl.hpp diff --git a/indexer/feature_impl.cpp b/libs/indexer/feature_impl.cpp similarity index 100% rename from indexer/feature_impl.cpp rename to libs/indexer/feature_impl.cpp diff --git a/indexer/feature_impl.hpp b/libs/indexer/feature_impl.hpp similarity index 100% rename from indexer/feature_impl.hpp rename to libs/indexer/feature_impl.hpp diff --git a/indexer/feature_meta.cpp b/libs/indexer/feature_meta.cpp similarity index 100% rename from indexer/feature_meta.cpp rename to libs/indexer/feature_meta.cpp diff --git a/indexer/feature_meta.hpp b/libs/indexer/feature_meta.hpp similarity index 100% rename from indexer/feature_meta.hpp rename to libs/indexer/feature_meta.hpp diff --git a/indexer/feature_processor.hpp b/libs/indexer/feature_processor.hpp similarity index 100% rename from indexer/feature_processor.hpp rename to libs/indexer/feature_processor.hpp diff --git a/indexer/feature_source.cpp b/libs/indexer/feature_source.cpp similarity index 100% rename from indexer/feature_source.cpp rename to libs/indexer/feature_source.cpp diff --git a/indexer/feature_source.hpp b/libs/indexer/feature_source.hpp similarity index 100% rename from indexer/feature_source.hpp rename to libs/indexer/feature_source.hpp diff --git a/indexer/feature_to_osm.cpp b/libs/indexer/feature_to_osm.cpp similarity index 100% rename from indexer/feature_to_osm.cpp rename to libs/indexer/feature_to_osm.cpp diff --git a/indexer/feature_to_osm.hpp b/libs/indexer/feature_to_osm.hpp similarity index 100% rename from indexer/feature_to_osm.hpp rename to libs/indexer/feature_to_osm.hpp diff --git a/indexer/feature_utils.cpp b/libs/indexer/feature_utils.cpp similarity index 100% rename from indexer/feature_utils.cpp rename to libs/indexer/feature_utils.cpp diff --git a/indexer/feature_utils.hpp b/libs/indexer/feature_utils.hpp similarity index 100% rename from indexer/feature_utils.hpp rename to libs/indexer/feature_utils.hpp diff --git a/indexer/feature_visibility.cpp b/libs/indexer/feature_visibility.cpp similarity index 100% rename from indexer/feature_visibility.cpp rename to libs/indexer/feature_visibility.cpp diff --git a/indexer/feature_visibility.hpp b/libs/indexer/feature_visibility.hpp similarity index 100% rename from indexer/feature_visibility.hpp rename to libs/indexer/feature_visibility.hpp diff --git a/indexer/features_offsets_table.cpp b/libs/indexer/features_offsets_table.cpp similarity index 100% rename from indexer/features_offsets_table.cpp rename to libs/indexer/features_offsets_table.cpp diff --git a/indexer/features_offsets_table.hpp b/libs/indexer/features_offsets_table.hpp similarity index 100% rename from indexer/features_offsets_table.hpp rename to libs/indexer/features_offsets_table.hpp diff --git a/indexer/features_vector.cpp b/libs/indexer/features_vector.cpp similarity index 100% rename from indexer/features_vector.cpp rename to libs/indexer/features_vector.cpp diff --git a/indexer/features_vector.hpp b/libs/indexer/features_vector.hpp similarity index 100% rename from indexer/features_vector.hpp rename to libs/indexer/features_vector.hpp diff --git a/indexer/ftraits.hpp b/libs/indexer/ftraits.hpp similarity index 100% rename from indexer/ftraits.hpp rename to libs/indexer/ftraits.hpp diff --git a/indexer/ftypes_mapping.hpp b/libs/indexer/ftypes_mapping.hpp similarity index 100% rename from indexer/ftypes_mapping.hpp rename to libs/indexer/ftypes_mapping.hpp diff --git a/indexer/ftypes_matcher.cpp b/libs/indexer/ftypes_matcher.cpp similarity index 100% rename from indexer/ftypes_matcher.cpp rename to libs/indexer/ftypes_matcher.cpp diff --git a/indexer/ftypes_matcher.hpp b/libs/indexer/ftypes_matcher.hpp similarity index 100% rename from indexer/ftypes_matcher.hpp rename to libs/indexer/ftypes_matcher.hpp diff --git a/indexer/house_to_street_iface.hpp b/libs/indexer/house_to_street_iface.hpp similarity index 100% rename from indexer/house_to_street_iface.hpp rename to libs/indexer/house_to_street_iface.hpp diff --git a/indexer/index_builder.cpp b/libs/indexer/index_builder.cpp similarity index 100% rename from indexer/index_builder.cpp rename to libs/indexer/index_builder.cpp diff --git a/indexer/index_builder.hpp b/libs/indexer/index_builder.hpp similarity index 100% rename from indexer/index_builder.hpp rename to libs/indexer/index_builder.hpp diff --git a/indexer/indexer_tests/CMakeLists.txt b/libs/indexer/indexer_tests/CMakeLists.txt similarity index 100% rename from indexer/indexer_tests/CMakeLists.txt rename to libs/indexer/indexer_tests/CMakeLists.txt diff --git a/indexer/indexer_tests/bounds.hpp b/libs/indexer/indexer_tests/bounds.hpp similarity index 100% rename from indexer/indexer_tests/bounds.hpp rename to libs/indexer/indexer_tests/bounds.hpp diff --git a/indexer/indexer_tests/brands_tests.cpp b/libs/indexer/indexer_tests/brands_tests.cpp similarity index 100% rename from indexer/indexer_tests/brands_tests.cpp rename to libs/indexer/indexer_tests/brands_tests.cpp diff --git a/indexer/indexer_tests/categories_test.cpp b/libs/indexer/indexer_tests/categories_test.cpp similarity index 100% rename from indexer/indexer_tests/categories_test.cpp rename to libs/indexer/indexer_tests/categories_test.cpp diff --git a/indexer/indexer_tests/cell_coverer_test.cpp b/libs/indexer/indexer_tests/cell_coverer_test.cpp similarity index 100% rename from indexer/indexer_tests/cell_coverer_test.cpp rename to libs/indexer/indexer_tests/cell_coverer_test.cpp diff --git a/indexer/indexer_tests/cell_id_test.cpp b/libs/indexer/indexer_tests/cell_id_test.cpp similarity index 100% rename from indexer/indexer_tests/cell_id_test.cpp rename to libs/indexer/indexer_tests/cell_id_test.cpp diff --git a/indexer/indexer_tests/centers_table_test.cpp b/libs/indexer/indexer_tests/centers_table_test.cpp similarity index 100% rename from indexer/indexer_tests/centers_table_test.cpp rename to libs/indexer/indexer_tests/centers_table_test.cpp diff --git a/indexer/indexer_tests/checker_test.cpp b/libs/indexer/indexer_tests/checker_test.cpp similarity index 100% rename from indexer/indexer_tests/checker_test.cpp rename to libs/indexer/indexer_tests/checker_test.cpp diff --git a/indexer/indexer_tests/cities_boundaries_serdes_tests.cpp b/libs/indexer/indexer_tests/cities_boundaries_serdes_tests.cpp similarity index 100% rename from indexer/indexer_tests/cities_boundaries_serdes_tests.cpp rename to libs/indexer/indexer_tests/cities_boundaries_serdes_tests.cpp diff --git a/indexer/indexer_tests/classificator_tests.cpp b/libs/indexer/indexer_tests/classificator_tests.cpp similarity index 100% rename from indexer/indexer_tests/classificator_tests.cpp rename to libs/indexer/indexer_tests/classificator_tests.cpp diff --git a/indexer/indexer_tests/complex_serdes_tests.cpp b/libs/indexer/indexer_tests/complex_serdes_tests.cpp similarity index 100% rename from indexer/indexer_tests/complex_serdes_tests.cpp rename to libs/indexer/indexer_tests/complex_serdes_tests.cpp diff --git a/indexer/indexer_tests/complex_serdes_utils_tests.cpp b/libs/indexer/indexer_tests/complex_serdes_utils_tests.cpp similarity index 100% rename from indexer/indexer_tests/complex_serdes_utils_tests.cpp rename to libs/indexer/indexer_tests/complex_serdes_utils_tests.cpp diff --git a/indexer/indexer_tests/custom_keyvalue_tests.cpp b/libs/indexer/indexer_tests/custom_keyvalue_tests.cpp similarity index 100% rename from indexer/indexer_tests/custom_keyvalue_tests.cpp rename to libs/indexer/indexer_tests/custom_keyvalue_tests.cpp diff --git a/indexer/indexer_tests/data_source_test.cpp b/libs/indexer/indexer_tests/data_source_test.cpp similarity index 100% rename from indexer/indexer_tests/data_source_test.cpp rename to libs/indexer/indexer_tests/data_source_test.cpp diff --git a/indexer/indexer_tests/drules_selector_parser_test.cpp b/libs/indexer/indexer_tests/drules_selector_parser_test.cpp similarity index 100% rename from indexer/indexer_tests/drules_selector_parser_test.cpp rename to libs/indexer/indexer_tests/drules_selector_parser_test.cpp diff --git a/indexer/indexer_tests/editable_map_object_test.cpp b/libs/indexer/indexer_tests/editable_map_object_test.cpp similarity index 100% rename from indexer/indexer_tests/editable_map_object_test.cpp rename to libs/indexer/indexer_tests/editable_map_object_test.cpp diff --git a/indexer/indexer_tests/feature_metadata_test.cpp b/libs/indexer/indexer_tests/feature_metadata_test.cpp similarity index 100% rename from indexer/indexer_tests/feature_metadata_test.cpp rename to libs/indexer/indexer_tests/feature_metadata_test.cpp diff --git a/indexer/indexer_tests/feature_names_test.cpp b/libs/indexer/indexer_tests/feature_names_test.cpp similarity index 100% rename from indexer/indexer_tests/feature_names_test.cpp rename to libs/indexer/indexer_tests/feature_names_test.cpp diff --git a/indexer/indexer_tests/feature_to_osm_tests.cpp b/libs/indexer/indexer_tests/feature_to_osm_tests.cpp similarity index 100% rename from indexer/indexer_tests/feature_to_osm_tests.cpp rename to libs/indexer/indexer_tests/feature_to_osm_tests.cpp diff --git a/indexer/indexer_tests/feature_types_test.cpp b/libs/indexer/indexer_tests/feature_types_test.cpp similarity index 100% rename from indexer/indexer_tests/feature_types_test.cpp rename to libs/indexer/indexer_tests/feature_types_test.cpp diff --git a/indexer/indexer_tests/features_offsets_table_test.cpp b/libs/indexer/indexer_tests/features_offsets_table_test.cpp similarity index 100% rename from indexer/indexer_tests/features_offsets_table_test.cpp rename to libs/indexer/indexer_tests/features_offsets_table_test.cpp diff --git a/indexer/indexer_tests/features_vector_test.cpp b/libs/indexer/indexer_tests/features_vector_test.cpp similarity index 100% rename from indexer/indexer_tests/features_vector_test.cpp rename to libs/indexer/indexer_tests/features_vector_test.cpp diff --git a/indexer/indexer_tests/index_builder_test.cpp b/libs/indexer/indexer_tests/index_builder_test.cpp similarity index 100% rename from indexer/indexer_tests/index_builder_test.cpp rename to libs/indexer/indexer_tests/index_builder_test.cpp diff --git a/indexer/indexer_tests/interval_index_test.cpp b/libs/indexer/indexer_tests/interval_index_test.cpp similarity index 100% rename from indexer/indexer_tests/interval_index_test.cpp rename to libs/indexer/indexer_tests/interval_index_test.cpp diff --git a/indexer/indexer_tests/metadata_serdes_tests.cpp b/libs/indexer/indexer_tests/metadata_serdes_tests.cpp similarity index 100% rename from indexer/indexer_tests/metadata_serdes_tests.cpp rename to libs/indexer/indexer_tests/metadata_serdes_tests.cpp diff --git a/indexer/indexer_tests/mwm_set_test.cpp b/libs/indexer/indexer_tests/mwm_set_test.cpp similarity index 100% rename from indexer/indexer_tests/mwm_set_test.cpp rename to libs/indexer/indexer_tests/mwm_set_test.cpp diff --git a/indexer/indexer_tests/postcodes_matcher_tests.cpp b/libs/indexer/indexer_tests/postcodes_matcher_tests.cpp similarity index 100% rename from indexer/indexer_tests/postcodes_matcher_tests.cpp rename to libs/indexer/indexer_tests/postcodes_matcher_tests.cpp diff --git a/indexer/indexer_tests/rank_table_test.cpp b/libs/indexer/indexer_tests/rank_table_test.cpp similarity index 100% rename from indexer/indexer_tests/rank_table_test.cpp rename to libs/indexer/indexer_tests/rank_table_test.cpp diff --git a/indexer/indexer_tests/read_features_tests.cpp b/libs/indexer/indexer_tests/read_features_tests.cpp similarity index 100% rename from indexer/indexer_tests/read_features_tests.cpp rename to libs/indexer/indexer_tests/read_features_tests.cpp diff --git a/indexer/indexer_tests/road_shields_parser_tests.cpp b/libs/indexer/indexer_tests/road_shields_parser_tests.cpp similarity index 100% rename from indexer/indexer_tests/road_shields_parser_tests.cpp rename to libs/indexer/indexer_tests/road_shields_parser_tests.cpp diff --git a/indexer/indexer_tests/scale_index_reading_tests.cpp b/libs/indexer/indexer_tests/scale_index_reading_tests.cpp similarity index 100% rename from indexer/indexer_tests/scale_index_reading_tests.cpp rename to libs/indexer/indexer_tests/scale_index_reading_tests.cpp diff --git a/indexer/indexer_tests/search_string_utils_test.cpp b/libs/indexer/indexer_tests/search_string_utils_test.cpp similarity index 100% rename from indexer/indexer_tests/search_string_utils_test.cpp rename to libs/indexer/indexer_tests/search_string_utils_test.cpp diff --git a/indexer/indexer_tests/sort_and_merge_intervals_test.cpp b/libs/indexer/indexer_tests/sort_and_merge_intervals_test.cpp similarity index 100% rename from indexer/indexer_tests/sort_and_merge_intervals_test.cpp rename to libs/indexer/indexer_tests/sort_and_merge_intervals_test.cpp diff --git a/indexer/indexer_tests/string_slice_tests.cpp b/libs/indexer/indexer_tests/string_slice_tests.cpp similarity index 100% rename from indexer/indexer_tests/string_slice_tests.cpp rename to libs/indexer/indexer_tests/string_slice_tests.cpp diff --git a/indexer/indexer_tests/succinct_trie_test.cpp b/libs/indexer/indexer_tests/succinct_trie_test.cpp similarity index 100% rename from indexer/indexer_tests/succinct_trie_test.cpp rename to libs/indexer/indexer_tests/succinct_trie_test.cpp diff --git a/indexer/indexer_tests/test_mwm_set.hpp b/libs/indexer/indexer_tests/test_mwm_set.hpp similarity index 100% rename from indexer/indexer_tests/test_mwm_set.hpp rename to libs/indexer/indexer_tests/test_mwm_set.hpp diff --git a/indexer/indexer_tests/test_type.cpp b/libs/indexer/indexer_tests/test_type.cpp similarity index 100% rename from indexer/indexer_tests/test_type.cpp rename to libs/indexer/indexer_tests/test_type.cpp diff --git a/indexer/indexer_tests/tree_node_tests.cpp b/libs/indexer/indexer_tests/tree_node_tests.cpp similarity index 100% rename from indexer/indexer_tests/tree_node_tests.cpp rename to libs/indexer/indexer_tests/tree_node_tests.cpp diff --git a/indexer/indexer_tests/trie_test.cpp b/libs/indexer/indexer_tests/trie_test.cpp similarity index 100% rename from indexer/indexer_tests/trie_test.cpp rename to libs/indexer/indexer_tests/trie_test.cpp diff --git a/indexer/indexer_tests/validate_and_format_contacts_test.cpp b/libs/indexer/indexer_tests/validate_and_format_contacts_test.cpp similarity index 100% rename from indexer/indexer_tests/validate_and_format_contacts_test.cpp rename to libs/indexer/indexer_tests/validate_and_format_contacts_test.cpp diff --git a/indexer/indexer_tests/visibility_test.cpp b/libs/indexer/indexer_tests/visibility_test.cpp similarity index 100% rename from indexer/indexer_tests/visibility_test.cpp rename to libs/indexer/indexer_tests/visibility_test.cpp diff --git a/indexer/indexer_tests/wheelchair_tests.cpp b/libs/indexer/indexer_tests/wheelchair_tests.cpp similarity index 100% rename from indexer/indexer_tests/wheelchair_tests.cpp rename to libs/indexer/indexer_tests/wheelchair_tests.cpp diff --git a/indexer/interval_index.hpp b/libs/indexer/interval_index.hpp similarity index 100% rename from indexer/interval_index.hpp rename to libs/indexer/interval_index.hpp diff --git a/indexer/interval_index_builder.hpp b/libs/indexer/interval_index_builder.hpp similarity index 100% rename from indexer/interval_index_builder.hpp rename to libs/indexer/interval_index_builder.hpp diff --git a/indexer/isolines_info.cpp b/libs/indexer/isolines_info.cpp similarity index 100% rename from indexer/isolines_info.cpp rename to libs/indexer/isolines_info.cpp diff --git a/indexer/isolines_info.hpp b/libs/indexer/isolines_info.hpp similarity index 100% rename from indexer/isolines_info.hpp rename to libs/indexer/isolines_info.hpp diff --git a/indexer/map_object.cpp b/libs/indexer/map_object.cpp similarity index 100% rename from indexer/map_object.cpp rename to libs/indexer/map_object.cpp diff --git a/indexer/map_object.hpp b/libs/indexer/map_object.hpp similarity index 100% rename from indexer/map_object.hpp rename to libs/indexer/map_object.hpp diff --git a/indexer/map_style.cpp b/libs/indexer/map_style.cpp similarity index 100% rename from indexer/map_style.cpp rename to libs/indexer/map_style.cpp diff --git a/indexer/map_style.hpp b/libs/indexer/map_style.hpp similarity index 100% rename from indexer/map_style.hpp rename to libs/indexer/map_style.hpp diff --git a/indexer/map_style_reader.cpp b/libs/indexer/map_style_reader.cpp similarity index 100% rename from indexer/map_style_reader.cpp rename to libs/indexer/map_style_reader.cpp diff --git a/indexer/map_style_reader.hpp b/libs/indexer/map_style_reader.hpp similarity index 100% rename from indexer/map_style_reader.hpp rename to libs/indexer/map_style_reader.hpp diff --git a/indexer/metadata_serdes.cpp b/libs/indexer/metadata_serdes.cpp similarity index 100% rename from indexer/metadata_serdes.cpp rename to libs/indexer/metadata_serdes.cpp diff --git a/indexer/metadata_serdes.hpp b/libs/indexer/metadata_serdes.hpp similarity index 100% rename from indexer/metadata_serdes.hpp rename to libs/indexer/metadata_serdes.hpp diff --git a/indexer/mwm_set.cpp b/libs/indexer/mwm_set.cpp similarity index 100% rename from indexer/mwm_set.cpp rename to libs/indexer/mwm_set.cpp diff --git a/indexer/mwm_set.hpp b/libs/indexer/mwm_set.hpp similarity index 100% rename from indexer/mwm_set.hpp rename to libs/indexer/mwm_set.hpp diff --git a/indexer/postcodes_matcher.cpp b/libs/indexer/postcodes_matcher.cpp similarity index 100% rename from indexer/postcodes_matcher.cpp rename to libs/indexer/postcodes_matcher.cpp diff --git a/indexer/postcodes_matcher.hpp b/libs/indexer/postcodes_matcher.hpp similarity index 100% rename from indexer/postcodes_matcher.hpp rename to libs/indexer/postcodes_matcher.hpp diff --git a/indexer/rank_table.cpp b/libs/indexer/rank_table.cpp similarity index 100% rename from indexer/rank_table.cpp rename to libs/indexer/rank_table.cpp diff --git a/indexer/rank_table.hpp b/libs/indexer/rank_table.hpp similarity index 100% rename from indexer/rank_table.hpp rename to libs/indexer/rank_table.hpp diff --git a/indexer/road_shields_parser.cpp b/libs/indexer/road_shields_parser.cpp similarity index 100% rename from indexer/road_shields_parser.cpp rename to libs/indexer/road_shields_parser.cpp diff --git a/indexer/road_shields_parser.hpp b/libs/indexer/road_shields_parser.hpp similarity index 100% rename from indexer/road_shields_parser.hpp rename to libs/indexer/road_shields_parser.hpp diff --git a/indexer/scale_index.hpp b/libs/indexer/scale_index.hpp similarity index 100% rename from indexer/scale_index.hpp rename to libs/indexer/scale_index.hpp diff --git a/indexer/scale_index_builder.hpp b/libs/indexer/scale_index_builder.hpp similarity index 100% rename from indexer/scale_index_builder.hpp rename to libs/indexer/scale_index_builder.hpp diff --git a/indexer/scales.cpp b/libs/indexer/scales.cpp similarity index 100% rename from indexer/scales.cpp rename to libs/indexer/scales.cpp diff --git a/indexer/scales.hpp b/libs/indexer/scales.hpp similarity index 100% rename from indexer/scales.hpp rename to libs/indexer/scales.hpp diff --git a/indexer/scales_patch.hpp b/libs/indexer/scales_patch.hpp similarity index 100% rename from indexer/scales_patch.hpp rename to libs/indexer/scales_patch.hpp diff --git a/indexer/search_delimiters.cpp b/libs/indexer/search_delimiters.cpp similarity index 100% rename from indexer/search_delimiters.cpp rename to libs/indexer/search_delimiters.cpp diff --git a/indexer/search_delimiters.hpp b/libs/indexer/search_delimiters.hpp similarity index 100% rename from indexer/search_delimiters.hpp rename to libs/indexer/search_delimiters.hpp diff --git a/indexer/search_string_utils.cpp b/libs/indexer/search_string_utils.cpp similarity index 100% rename from indexer/search_string_utils.cpp rename to libs/indexer/search_string_utils.cpp diff --git a/indexer/search_string_utils.hpp b/libs/indexer/search_string_utils.hpp similarity index 100% rename from indexer/search_string_utils.hpp rename to libs/indexer/search_string_utils.hpp diff --git a/indexer/shared_load_info.cpp b/libs/indexer/shared_load_info.cpp similarity index 100% rename from indexer/shared_load_info.cpp rename to libs/indexer/shared_load_info.cpp diff --git a/indexer/shared_load_info.hpp b/libs/indexer/shared_load_info.hpp similarity index 100% rename from indexer/shared_load_info.hpp rename to libs/indexer/shared_load_info.hpp diff --git a/indexer/string_set.hpp b/libs/indexer/string_set.hpp similarity index 100% rename from indexer/string_set.hpp rename to libs/indexer/string_set.hpp diff --git a/indexer/string_slice.cpp b/libs/indexer/string_slice.cpp similarity index 100% rename from indexer/string_slice.cpp rename to libs/indexer/string_slice.cpp diff --git a/indexer/string_slice.hpp b/libs/indexer/string_slice.hpp similarity index 100% rename from indexer/string_slice.hpp rename to libs/indexer/string_slice.hpp diff --git a/indexer/succinct_trie_builder.hpp b/libs/indexer/succinct_trie_builder.hpp similarity index 100% rename from indexer/succinct_trie_builder.hpp rename to libs/indexer/succinct_trie_builder.hpp diff --git a/indexer/succinct_trie_reader.hpp b/libs/indexer/succinct_trie_reader.hpp similarity index 100% rename from indexer/succinct_trie_reader.hpp rename to libs/indexer/succinct_trie_reader.hpp diff --git a/indexer/transliteration_loader.cpp b/libs/indexer/transliteration_loader.cpp similarity index 100% rename from indexer/transliteration_loader.cpp rename to libs/indexer/transliteration_loader.cpp diff --git a/indexer/transliteration_loader.hpp b/libs/indexer/transliteration_loader.hpp similarity index 100% rename from indexer/transliteration_loader.hpp rename to libs/indexer/transliteration_loader.hpp diff --git a/indexer/tree_structure.hpp b/libs/indexer/tree_structure.hpp similarity index 100% rename from indexer/tree_structure.hpp rename to libs/indexer/tree_structure.hpp diff --git a/indexer/trie.hpp b/libs/indexer/trie.hpp similarity index 100% rename from indexer/trie.hpp rename to libs/indexer/trie.hpp diff --git a/indexer/trie_builder.hpp b/libs/indexer/trie_builder.hpp similarity index 100% rename from indexer/trie_builder.hpp rename to libs/indexer/trie_builder.hpp diff --git a/indexer/trie_reader.hpp b/libs/indexer/trie_reader.hpp similarity index 100% rename from indexer/trie_reader.hpp rename to libs/indexer/trie_reader.hpp diff --git a/indexer/types_mapping.cpp b/libs/indexer/types_mapping.cpp similarity index 100% rename from indexer/types_mapping.cpp rename to libs/indexer/types_mapping.cpp diff --git a/indexer/types_mapping.hpp b/libs/indexer/types_mapping.hpp similarity index 100% rename from indexer/types_mapping.hpp rename to libs/indexer/types_mapping.hpp diff --git a/indexer/unique_index.hpp b/libs/indexer/unique_index.hpp similarity index 100% rename from indexer/unique_index.hpp rename to libs/indexer/unique_index.hpp diff --git a/indexer/utils.cpp b/libs/indexer/utils.cpp similarity index 100% rename from indexer/utils.cpp rename to libs/indexer/utils.cpp diff --git a/indexer/utils.hpp b/libs/indexer/utils.hpp similarity index 100% rename from indexer/utils.hpp rename to libs/indexer/utils.hpp diff --git a/indexer/validate_and_format_contacts.cpp b/libs/indexer/validate_and_format_contacts.cpp similarity index 100% rename from indexer/validate_and_format_contacts.cpp rename to libs/indexer/validate_and_format_contacts.cpp diff --git a/indexer/validate_and_format_contacts.hpp b/libs/indexer/validate_and_format_contacts.hpp similarity index 100% rename from indexer/validate_and_format_contacts.hpp rename to libs/indexer/validate_and_format_contacts.hpp diff --git a/indexer/yes_no_unknown.hpp b/libs/indexer/yes_no_unknown.hpp similarity index 100% rename from indexer/yes_no_unknown.hpp rename to libs/indexer/yes_no_unknown.hpp diff --git a/kml/CMakeLists.txt b/libs/kml/CMakeLists.txt similarity index 100% rename from kml/CMakeLists.txt rename to libs/kml/CMakeLists.txt diff --git a/kml/header_binary.hpp b/libs/kml/header_binary.hpp similarity index 100% rename from kml/header_binary.hpp rename to libs/kml/header_binary.hpp diff --git a/kml/kmb_to_kml/CMakeLists.txt b/libs/kml/kmb_to_kml/CMakeLists.txt similarity index 100% rename from kml/kmb_to_kml/CMakeLists.txt rename to libs/kml/kmb_to_kml/CMakeLists.txt diff --git a/kml/kmb_to_kml/kmb_to_kml.cpp b/libs/kml/kmb_to_kml/kmb_to_kml.cpp similarity index 100% rename from kml/kmb_to_kml/kmb_to_kml.cpp rename to libs/kml/kmb_to_kml/kmb_to_kml.cpp diff --git a/kml/kml_tests/CMakeLists.txt b/libs/kml/kml_tests/CMakeLists.txt similarity index 100% rename from kml/kml_tests/CMakeLists.txt rename to libs/kml/kml_tests/CMakeLists.txt diff --git a/kml/kml_tests/gpx_tests.cpp b/libs/kml/kml_tests/gpx_tests.cpp similarity index 100% rename from kml/kml_tests/gpx_tests.cpp rename to libs/kml/kml_tests/gpx_tests.cpp diff --git a/kml/kml_tests/minzoom_quadtree_tests.cpp b/libs/kml/kml_tests/minzoom_quadtree_tests.cpp similarity index 100% rename from kml/kml_tests/minzoom_quadtree_tests.cpp rename to libs/kml/kml_tests/minzoom_quadtree_tests.cpp diff --git a/kml/kml_tests/serdes_tests.cpp b/libs/kml/kml_tests/serdes_tests.cpp similarity index 100% rename from kml/kml_tests/serdes_tests.cpp rename to libs/kml/kml_tests/serdes_tests.cpp diff --git a/kml/kml_tests/tests_data.hpp b/libs/kml/kml_tests/tests_data.hpp similarity index 100% rename from kml/kml_tests/tests_data.hpp rename to libs/kml/kml_tests/tests_data.hpp diff --git a/kml/kml_to_kmb/CMakeLists.txt b/libs/kml/kml_to_kmb/CMakeLists.txt similarity index 100% rename from kml/kml_to_kmb/CMakeLists.txt rename to libs/kml/kml_to_kmb/CMakeLists.txt diff --git a/kml/kml_to_kmb/kml_to_kmb.cpp b/libs/kml/kml_to_kmb/kml_to_kmb.cpp similarity index 100% rename from kml/kml_to_kmb/kml_to_kmb.cpp rename to libs/kml/kml_to_kmb/kml_to_kmb.cpp diff --git a/kml/minzoom_quadtree.hpp b/libs/kml/minzoom_quadtree.hpp similarity index 100% rename from kml/minzoom_quadtree.hpp rename to libs/kml/minzoom_quadtree.hpp diff --git a/kml/pykmlib/CMakeLists.txt b/libs/kml/pykmlib/CMakeLists.txt similarity index 100% rename from kml/pykmlib/CMakeLists.txt rename to libs/kml/pykmlib/CMakeLists.txt diff --git a/kml/pykmlib/bindings.cpp b/libs/kml/pykmlib/bindings.cpp similarity index 100% rename from kml/pykmlib/bindings.cpp rename to libs/kml/pykmlib/bindings.cpp diff --git a/kml/pykmlib/bindings_test.py b/libs/kml/pykmlib/bindings_test.py similarity index 100% rename from kml/pykmlib/bindings_test.py rename to libs/kml/pykmlib/bindings_test.py diff --git a/kml/pykmlib/setup.py b/libs/kml/pykmlib/setup.py similarity index 100% rename from kml/pykmlib/setup.py rename to libs/kml/pykmlib/setup.py diff --git a/kml/serdes.cpp b/libs/kml/serdes.cpp similarity index 100% rename from kml/serdes.cpp rename to libs/kml/serdes.cpp diff --git a/kml/serdes.hpp b/libs/kml/serdes.hpp similarity index 100% rename from kml/serdes.hpp rename to libs/kml/serdes.hpp diff --git a/kml/serdes_binary.cpp b/libs/kml/serdes_binary.cpp similarity index 100% rename from kml/serdes_binary.cpp rename to libs/kml/serdes_binary.cpp diff --git a/kml/serdes_binary.hpp b/libs/kml/serdes_binary.hpp similarity index 100% rename from kml/serdes_binary.hpp rename to libs/kml/serdes_binary.hpp diff --git a/kml/serdes_binary_v8.hpp b/libs/kml/serdes_binary_v8.hpp similarity index 100% rename from kml/serdes_binary_v8.hpp rename to libs/kml/serdes_binary_v8.hpp diff --git a/kml/serdes_common.cpp b/libs/kml/serdes_common.cpp similarity index 100% rename from kml/serdes_common.cpp rename to libs/kml/serdes_common.cpp diff --git a/kml/serdes_common.hpp b/libs/kml/serdes_common.hpp similarity index 100% rename from kml/serdes_common.hpp rename to libs/kml/serdes_common.hpp diff --git a/kml/serdes_gpx.cpp b/libs/kml/serdes_gpx.cpp similarity index 100% rename from kml/serdes_gpx.cpp rename to libs/kml/serdes_gpx.cpp diff --git a/kml/serdes_gpx.hpp b/libs/kml/serdes_gpx.hpp similarity index 100% rename from kml/serdes_gpx.hpp rename to libs/kml/serdes_gpx.hpp diff --git a/kml/type_utils.cpp b/libs/kml/type_utils.cpp similarity index 100% rename from kml/type_utils.cpp rename to libs/kml/type_utils.cpp diff --git a/kml/type_utils.hpp b/libs/kml/type_utils.hpp similarity index 100% rename from kml/type_utils.hpp rename to libs/kml/type_utils.hpp diff --git a/kml/types.cpp b/libs/kml/types.cpp similarity index 100% rename from kml/types.cpp rename to libs/kml/types.cpp diff --git a/kml/types.hpp b/libs/kml/types.hpp similarity index 100% rename from kml/types.hpp rename to libs/kml/types.hpp diff --git a/kml/types_v3.hpp b/libs/kml/types_v3.hpp similarity index 100% rename from kml/types_v3.hpp rename to libs/kml/types_v3.hpp diff --git a/kml/types_v6.hpp b/libs/kml/types_v6.hpp similarity index 100% rename from kml/types_v6.hpp rename to libs/kml/types_v6.hpp diff --git a/kml/types_v7.hpp b/libs/kml/types_v7.hpp similarity index 100% rename from kml/types_v7.hpp rename to libs/kml/types_v7.hpp diff --git a/kml/types_v8.hpp b/libs/kml/types_v8.hpp similarity index 100% rename from kml/types_v8.hpp rename to libs/kml/types_v8.hpp diff --git a/kml/types_v8mm.hpp b/libs/kml/types_v8mm.hpp similarity index 100% rename from kml/types_v8mm.hpp rename to libs/kml/types_v8mm.hpp diff --git a/kml/types_v9.hpp b/libs/kml/types_v9.hpp similarity index 100% rename from kml/types_v9.hpp rename to libs/kml/types_v9.hpp diff --git a/kml/types_v9mm.hpp b/libs/kml/types_v9mm.hpp similarity index 100% rename from kml/types_v9mm.hpp rename to libs/kml/types_v9mm.hpp diff --git a/kml/visitors.hpp b/libs/kml/visitors.hpp similarity index 100% rename from kml/visitors.hpp rename to libs/kml/visitors.hpp diff --git a/map/CMakeLists.txt b/libs/map/CMakeLists.txt similarity index 100% rename from map/CMakeLists.txt rename to libs/map/CMakeLists.txt diff --git a/map/api_mark_point.cpp b/libs/map/api_mark_point.cpp similarity index 100% rename from map/api_mark_point.cpp rename to libs/map/api_mark_point.cpp diff --git a/map/api_mark_point.hpp b/libs/map/api_mark_point.hpp similarity index 100% rename from map/api_mark_point.hpp rename to libs/map/api_mark_point.hpp diff --git a/map/benchmark_tool/CMakeLists.txt b/libs/map/benchmark_tool/CMakeLists.txt similarity index 100% rename from map/benchmark_tool/CMakeLists.txt rename to libs/map/benchmark_tool/CMakeLists.txt diff --git a/map/benchmark_tool/api.cpp b/libs/map/benchmark_tool/api.cpp similarity index 100% rename from map/benchmark_tool/api.cpp rename to libs/map/benchmark_tool/api.cpp diff --git a/map/benchmark_tool/api.hpp b/libs/map/benchmark_tool/api.hpp similarity index 100% rename from map/benchmark_tool/api.hpp rename to libs/map/benchmark_tool/api.hpp diff --git a/map/benchmark_tool/features_loading.cpp b/libs/map/benchmark_tool/features_loading.cpp similarity index 100% rename from map/benchmark_tool/features_loading.cpp rename to libs/map/benchmark_tool/features_loading.cpp diff --git a/map/benchmark_tool/main.cpp b/libs/map/benchmark_tool/main.cpp similarity index 100% rename from map/benchmark_tool/main.cpp rename to libs/map/benchmark_tool/main.cpp diff --git a/map/benchmark_tools.cpp b/libs/map/benchmark_tools.cpp similarity index 100% rename from map/benchmark_tools.cpp rename to libs/map/benchmark_tools.cpp diff --git a/map/benchmark_tools.hpp b/libs/map/benchmark_tools.hpp similarity index 100% rename from map/benchmark_tools.hpp rename to libs/map/benchmark_tools.hpp diff --git a/map/bookmark.cpp b/libs/map/bookmark.cpp similarity index 100% rename from map/bookmark.cpp rename to libs/map/bookmark.cpp diff --git a/map/bookmark.hpp b/libs/map/bookmark.hpp similarity index 100% rename from map/bookmark.hpp rename to libs/map/bookmark.hpp diff --git a/map/bookmark_helpers.cpp b/libs/map/bookmark_helpers.cpp similarity index 100% rename from map/bookmark_helpers.cpp rename to libs/map/bookmark_helpers.cpp diff --git a/map/bookmark_helpers.hpp b/libs/map/bookmark_helpers.hpp similarity index 100% rename from map/bookmark_helpers.hpp rename to libs/map/bookmark_helpers.hpp diff --git a/map/bookmark_manager.cpp b/libs/map/bookmark_manager.cpp similarity index 100% rename from map/bookmark_manager.cpp rename to libs/map/bookmark_manager.cpp diff --git a/map/bookmark_manager.hpp b/libs/map/bookmark_manager.hpp similarity index 100% rename from map/bookmark_manager.hpp rename to libs/map/bookmark_manager.hpp diff --git a/map/bookmarks_search_params.hpp b/libs/map/bookmarks_search_params.hpp similarity index 100% rename from map/bookmarks_search_params.hpp rename to libs/map/bookmarks_search_params.hpp diff --git a/map/chart_generator.cpp b/libs/map/chart_generator.cpp similarity index 100% rename from map/chart_generator.cpp rename to libs/map/chart_generator.cpp diff --git a/map/chart_generator.hpp b/libs/map/chart_generator.hpp similarity index 100% rename from map/chart_generator.hpp rename to libs/map/chart_generator.hpp diff --git a/map/elevation_info.cpp b/libs/map/elevation_info.cpp similarity index 100% rename from map/elevation_info.cpp rename to libs/map/elevation_info.cpp diff --git a/map/elevation_info.hpp b/libs/map/elevation_info.hpp similarity index 100% rename from map/elevation_info.hpp rename to libs/map/elevation_info.hpp diff --git a/map/everywhere_search_callback.cpp b/libs/map/everywhere_search_callback.cpp similarity index 100% rename from map/everywhere_search_callback.cpp rename to libs/map/everywhere_search_callback.cpp diff --git a/map/everywhere_search_callback.hpp b/libs/map/everywhere_search_callback.hpp similarity index 100% rename from map/everywhere_search_callback.hpp rename to libs/map/everywhere_search_callback.hpp diff --git a/map/everywhere_search_params.hpp b/libs/map/everywhere_search_params.hpp similarity index 100% rename from map/everywhere_search_params.hpp rename to libs/map/everywhere_search_params.hpp diff --git a/map/extrapolation/extrapolator.cpp b/libs/map/extrapolation/extrapolator.cpp similarity index 100% rename from map/extrapolation/extrapolator.cpp rename to libs/map/extrapolation/extrapolator.cpp diff --git a/map/extrapolation/extrapolator.hpp b/libs/map/extrapolation/extrapolator.hpp similarity index 100% rename from map/extrapolation/extrapolator.hpp rename to libs/map/extrapolation/extrapolator.hpp diff --git a/map/extrapolation_benchmark/CMakeLists.txt b/libs/map/extrapolation_benchmark/CMakeLists.txt similarity index 100% rename from map/extrapolation_benchmark/CMakeLists.txt rename to libs/map/extrapolation_benchmark/CMakeLists.txt diff --git a/map/extrapolation_benchmark/extrapolation_benchmark.cpp b/libs/map/extrapolation_benchmark/extrapolation_benchmark.cpp similarity index 100% rename from map/extrapolation_benchmark/extrapolation_benchmark.cpp rename to libs/map/extrapolation_benchmark/extrapolation_benchmark.cpp diff --git a/map/features_fetcher.cpp b/libs/map/features_fetcher.cpp similarity index 100% rename from map/features_fetcher.cpp rename to libs/map/features_fetcher.cpp diff --git a/map/features_fetcher.hpp b/libs/map/features_fetcher.hpp similarity index 100% rename from map/features_fetcher.hpp rename to libs/map/features_fetcher.hpp diff --git a/map/framework.cpp b/libs/map/framework.cpp similarity index 100% rename from map/framework.cpp rename to libs/map/framework.cpp diff --git a/map/framework.hpp b/libs/map/framework.hpp similarity index 100% rename from map/framework.hpp rename to libs/map/framework.hpp diff --git a/map/framework_visualize.cpp b/libs/map/framework_visualize.cpp similarity index 100% rename from map/framework_visualize.cpp rename to libs/map/framework_visualize.cpp diff --git a/map/gps_track.cpp b/libs/map/gps_track.cpp similarity index 100% rename from map/gps_track.cpp rename to libs/map/gps_track.cpp diff --git a/map/gps_track.hpp b/libs/map/gps_track.hpp similarity index 100% rename from map/gps_track.hpp rename to libs/map/gps_track.hpp diff --git a/map/gps_track_collection.cpp b/libs/map/gps_track_collection.cpp similarity index 100% rename from map/gps_track_collection.cpp rename to libs/map/gps_track_collection.cpp diff --git a/map/gps_track_collection.hpp b/libs/map/gps_track_collection.hpp similarity index 100% rename from map/gps_track_collection.hpp rename to libs/map/gps_track_collection.hpp diff --git a/map/gps_track_filter.cpp b/libs/map/gps_track_filter.cpp similarity index 100% rename from map/gps_track_filter.cpp rename to libs/map/gps_track_filter.cpp diff --git a/map/gps_track_filter.hpp b/libs/map/gps_track_filter.hpp similarity index 100% rename from map/gps_track_filter.hpp rename to libs/map/gps_track_filter.hpp diff --git a/map/gps_track_storage.cpp b/libs/map/gps_track_storage.cpp similarity index 100% rename from map/gps_track_storage.cpp rename to libs/map/gps_track_storage.cpp diff --git a/map/gps_track_storage.hpp b/libs/map/gps_track_storage.hpp similarity index 100% rename from map/gps_track_storage.hpp rename to libs/map/gps_track_storage.hpp diff --git a/map/gps_tracker.cpp b/libs/map/gps_tracker.cpp similarity index 100% rename from map/gps_tracker.cpp rename to libs/map/gps_tracker.cpp diff --git a/map/gps_tracker.hpp b/libs/map/gps_tracker.hpp similarity index 100% rename from map/gps_tracker.hpp rename to libs/map/gps_tracker.hpp diff --git a/map/isolines_manager.cpp b/libs/map/isolines_manager.cpp similarity index 100% rename from map/isolines_manager.cpp rename to libs/map/isolines_manager.cpp diff --git a/map/isolines_manager.hpp b/libs/map/isolines_manager.hpp similarity index 100% rename from map/isolines_manager.hpp rename to libs/map/isolines_manager.hpp diff --git a/map/map_integration_tests/CMakeLists.txt b/libs/map/map_integration_tests/CMakeLists.txt similarity index 100% rename from map/map_integration_tests/CMakeLists.txt rename to libs/map/map_integration_tests/CMakeLists.txt diff --git a/map/map_integration_tests/interactive_search_test.cpp b/libs/map/map_integration_tests/interactive_search_test.cpp similarity index 100% rename from map/map_integration_tests/interactive_search_test.cpp rename to libs/map/map_integration_tests/interactive_search_test.cpp diff --git a/map/map_tests/CMakeLists.txt b/libs/map/map_tests/CMakeLists.txt similarity index 100% rename from map/map_tests/CMakeLists.txt rename to libs/map/map_tests/CMakeLists.txt diff --git a/map/map_tests/address_tests.cpp b/libs/map/map_tests/address_tests.cpp similarity index 100% rename from map/map_tests/address_tests.cpp rename to libs/map/map_tests/address_tests.cpp diff --git a/map/map_tests/bookmarks_test.cpp b/libs/map/map_tests/bookmarks_test.cpp similarity index 100% rename from map/map_tests/bookmarks_test.cpp rename to libs/map/map_tests/bookmarks_test.cpp diff --git a/map/map_tests/chart_generator_tests.cpp b/libs/map/map_tests/chart_generator_tests.cpp similarity index 100% rename from map/map_tests/chart_generator_tests.cpp rename to libs/map/map_tests/chart_generator_tests.cpp diff --git a/map/map_tests/check_mwms.cpp b/libs/map/map_tests/check_mwms.cpp similarity index 100% rename from map/map_tests/check_mwms.cpp rename to libs/map/map_tests/check_mwms.cpp diff --git a/map/map_tests/countries_names_tests.cpp b/libs/map/map_tests/countries_names_tests.cpp similarity index 100% rename from map/map_tests/countries_names_tests.cpp rename to libs/map/map_tests/countries_names_tests.cpp diff --git a/map/map_tests/elevation_info_tests.cpp b/libs/map/map_tests/elevation_info_tests.cpp similarity index 100% rename from map/map_tests/elevation_info_tests.cpp rename to libs/map/map_tests/elevation_info_tests.cpp diff --git a/map/map_tests/extrapolator_tests.cpp b/libs/map/map_tests/extrapolator_tests.cpp similarity index 100% rename from map/map_tests/extrapolator_tests.cpp rename to libs/map/map_tests/extrapolator_tests.cpp diff --git a/map/map_tests/feature_getters_tests.cpp b/libs/map/map_tests/feature_getters_tests.cpp similarity index 100% rename from map/map_tests/feature_getters_tests.cpp rename to libs/map/map_tests/feature_getters_tests.cpp diff --git a/map/map_tests/gps_track_collection_test.cpp b/libs/map/map_tests/gps_track_collection_test.cpp similarity index 100% rename from map/map_tests/gps_track_collection_test.cpp rename to libs/map/map_tests/gps_track_collection_test.cpp diff --git a/map/map_tests/gps_track_storage_test.cpp b/libs/map/map_tests/gps_track_storage_test.cpp similarity index 100% rename from map/map_tests/gps_track_storage_test.cpp rename to libs/map/map_tests/gps_track_storage_test.cpp diff --git a/map/map_tests/gps_track_test.cpp b/libs/map/map_tests/gps_track_test.cpp similarity index 100% rename from map/map_tests/gps_track_test.cpp rename to libs/map/map_tests/gps_track_test.cpp diff --git a/map/map_tests/kmz_unarchive_test.cpp b/libs/map/map_tests/kmz_unarchive_test.cpp similarity index 100% rename from map/map_tests/kmz_unarchive_test.cpp rename to libs/map/map_tests/kmz_unarchive_test.cpp diff --git a/map/map_tests/mwm_set_test.cpp b/libs/map/map_tests/mwm_set_test.cpp similarity index 100% rename from map/map_tests/mwm_set_test.cpp rename to libs/map/map_tests/mwm_set_test.cpp diff --git a/map/map_tests/mwm_url_tests.cpp b/libs/map/map_tests/mwm_url_tests.cpp similarity index 100% rename from map/map_tests/mwm_url_tests.cpp rename to libs/map/map_tests/mwm_url_tests.cpp diff --git a/map/map_tests/power_manager_tests.cpp b/libs/map/map_tests/power_manager_tests.cpp similarity index 100% rename from map/map_tests/power_manager_tests.cpp rename to libs/map/map_tests/power_manager_tests.cpp diff --git a/map/map_tests/search_api_tests.cpp b/libs/map/map_tests/search_api_tests.cpp similarity index 100% rename from map/map_tests/search_api_tests.cpp rename to libs/map/map_tests/search_api_tests.cpp diff --git a/map/map_tests/track_statistics_tests.cpp b/libs/map/map_tests/track_statistics_tests.cpp similarity index 100% rename from map/map_tests/track_statistics_tests.cpp rename to libs/map/map_tests/track_statistics_tests.cpp diff --git a/map/map_tests/transliteration_test.cpp b/libs/map/map_tests/transliteration_test.cpp similarity index 100% rename from map/map_tests/transliteration_test.cpp rename to libs/map/map_tests/transliteration_test.cpp diff --git a/map/mwm_tests/CMakeLists.txt b/libs/map/mwm_tests/CMakeLists.txt similarity index 100% rename from map/mwm_tests/CMakeLists.txt rename to libs/map/mwm_tests/CMakeLists.txt diff --git a/map/mwm_tests/multithread_mwm_test.cpp b/libs/map/mwm_tests/multithread_mwm_test.cpp similarity index 100% rename from map/mwm_tests/multithread_mwm_test.cpp rename to libs/map/mwm_tests/multithread_mwm_test.cpp diff --git a/map/mwm_tests/mwm_foreach_test.cpp b/libs/map/mwm_tests/mwm_foreach_test.cpp similarity index 100% rename from map/mwm_tests/mwm_foreach_test.cpp rename to libs/map/mwm_tests/mwm_foreach_test.cpp diff --git a/map/mwm_tests/mwm_index_test.cpp b/libs/map/mwm_tests/mwm_index_test.cpp similarity index 100% rename from map/mwm_tests/mwm_index_test.cpp rename to libs/map/mwm_tests/mwm_index_test.cpp diff --git a/map/mwm_tests/world_map_test.cpp b/libs/map/mwm_tests/world_map_test.cpp similarity index 100% rename from map/mwm_tests/world_map_test.cpp rename to libs/map/mwm_tests/world_map_test.cpp diff --git a/map/mwm_tree.hpp b/libs/map/mwm_tree.hpp similarity index 100% rename from map/mwm_tree.hpp rename to libs/map/mwm_tree.hpp diff --git a/map/mwm_url.cpp b/libs/map/mwm_url.cpp similarity index 100% rename from map/mwm_url.cpp rename to libs/map/mwm_url.cpp diff --git a/map/mwm_url.hpp b/libs/map/mwm_url.hpp similarity index 100% rename from map/mwm_url.hpp rename to libs/map/mwm_url.hpp diff --git a/map/place_page_info.cpp b/libs/map/place_page_info.cpp similarity index 100% rename from map/place_page_info.cpp rename to libs/map/place_page_info.cpp diff --git a/map/place_page_info.hpp b/libs/map/place_page_info.hpp similarity index 100% rename from map/place_page_info.hpp rename to libs/map/place_page_info.hpp diff --git a/map/position_provider.hpp b/libs/map/position_provider.hpp similarity index 100% rename from map/position_provider.hpp rename to libs/map/position_provider.hpp diff --git a/map/power_management/power_management_schemas.cpp b/libs/map/power_management/power_management_schemas.cpp similarity index 100% rename from map/power_management/power_management_schemas.cpp rename to libs/map/power_management/power_management_schemas.cpp diff --git a/map/power_management/power_management_schemas.hpp b/libs/map/power_management/power_management_schemas.hpp similarity index 100% rename from map/power_management/power_management_schemas.hpp rename to libs/map/power_management/power_management_schemas.hpp diff --git a/map/power_management/power_manager.cpp b/libs/map/power_management/power_manager.cpp similarity index 100% rename from map/power_management/power_manager.cpp rename to libs/map/power_management/power_manager.cpp diff --git a/map/power_management/power_manager.hpp b/libs/map/power_management/power_manager.hpp similarity index 100% rename from map/power_management/power_manager.hpp rename to libs/map/power_management/power_manager.hpp diff --git a/map/routing_manager.cpp b/libs/map/routing_manager.cpp similarity index 100% rename from map/routing_manager.cpp rename to libs/map/routing_manager.cpp diff --git a/map/routing_manager.hpp b/libs/map/routing_manager.hpp similarity index 100% rename from map/routing_manager.hpp rename to libs/map/routing_manager.hpp diff --git a/map/routing_mark.cpp b/libs/map/routing_mark.cpp similarity index 100% rename from map/routing_mark.cpp rename to libs/map/routing_mark.cpp diff --git a/map/routing_mark.hpp b/libs/map/routing_mark.hpp similarity index 100% rename from map/routing_mark.hpp rename to libs/map/routing_mark.hpp diff --git a/map/search_api.cpp b/libs/map/search_api.cpp similarity index 100% rename from map/search_api.cpp rename to libs/map/search_api.cpp diff --git a/map/search_api.hpp b/libs/map/search_api.hpp similarity index 100% rename from map/search_api.hpp rename to libs/map/search_api.hpp diff --git a/map/search_mark.cpp b/libs/map/search_mark.cpp similarity index 100% rename from map/search_mark.cpp rename to libs/map/search_mark.cpp diff --git a/map/search_mark.hpp b/libs/map/search_mark.hpp similarity index 100% rename from map/search_mark.hpp rename to libs/map/search_mark.hpp diff --git a/map/search_product_info.hpp b/libs/map/search_product_info.hpp similarity index 100% rename from map/search_product_info.hpp rename to libs/map/search_product_info.hpp diff --git a/map/style_tests/CMakeLists.txt b/libs/map/style_tests/CMakeLists.txt similarity index 100% rename from map/style_tests/CMakeLists.txt rename to libs/map/style_tests/CMakeLists.txt diff --git a/map/style_tests/classificator_tests.cpp b/libs/map/style_tests/classificator_tests.cpp similarity index 100% rename from map/style_tests/classificator_tests.cpp rename to libs/map/style_tests/classificator_tests.cpp diff --git a/map/style_tests/dashes_test.cpp b/libs/map/style_tests/dashes_test.cpp similarity index 100% rename from map/style_tests/dashes_test.cpp rename to libs/map/style_tests/dashes_test.cpp diff --git a/map/style_tests/helpers.hpp b/libs/map/style_tests/helpers.hpp similarity index 100% rename from map/style_tests/helpers.hpp rename to libs/map/style_tests/helpers.hpp diff --git a/map/style_tests/style_symbols_consistency_test.cpp b/libs/map/style_tests/style_symbols_consistency_test.cpp similarity index 100% rename from map/style_tests/style_symbols_consistency_test.cpp rename to libs/map/style_tests/style_symbols_consistency_test.cpp diff --git a/map/track.cpp b/libs/map/track.cpp similarity index 100% rename from map/track.cpp rename to libs/map/track.cpp diff --git a/map/track.hpp b/libs/map/track.hpp similarity index 100% rename from map/track.hpp rename to libs/map/track.hpp diff --git a/map/track_mark.cpp b/libs/map/track_mark.cpp similarity index 100% rename from map/track_mark.cpp rename to libs/map/track_mark.cpp diff --git a/map/track_mark.hpp b/libs/map/track_mark.hpp similarity index 100% rename from map/track_mark.hpp rename to libs/map/track_mark.hpp diff --git a/map/track_statistics.cpp b/libs/map/track_statistics.cpp similarity index 100% rename from map/track_statistics.cpp rename to libs/map/track_statistics.cpp diff --git a/map/track_statistics.hpp b/libs/map/track_statistics.hpp similarity index 100% rename from map/track_statistics.hpp rename to libs/map/track_statistics.hpp diff --git a/map/traffic_manager.cpp b/libs/map/traffic_manager.cpp similarity index 100% rename from map/traffic_manager.cpp rename to libs/map/traffic_manager.cpp diff --git a/map/traffic_manager.hpp b/libs/map/traffic_manager.hpp similarity index 100% rename from map/traffic_manager.hpp rename to libs/map/traffic_manager.hpp diff --git a/map/transit/transit_display.cpp b/libs/map/transit/transit_display.cpp similarity index 100% rename from map/transit/transit_display.cpp rename to libs/map/transit/transit_display.cpp diff --git a/map/transit/transit_display.hpp b/libs/map/transit/transit_display.hpp similarity index 100% rename from map/transit/transit_display.hpp rename to libs/map/transit/transit_display.hpp diff --git a/map/transit/transit_reader.cpp b/libs/map/transit/transit_reader.cpp similarity index 100% rename from map/transit/transit_reader.cpp rename to libs/map/transit/transit_reader.cpp diff --git a/map/transit/transit_reader.hpp b/libs/map/transit/transit_reader.hpp similarity index 100% rename from map/transit/transit_reader.hpp rename to libs/map/transit/transit_reader.hpp diff --git a/map/user_mark.cpp b/libs/map/user_mark.cpp similarity index 100% rename from map/user_mark.cpp rename to libs/map/user_mark.cpp diff --git a/map/user_mark.hpp b/libs/map/user_mark.hpp similarity index 100% rename from map/user_mark.hpp rename to libs/map/user_mark.hpp diff --git a/map/user_mark_id_storage.cpp b/libs/map/user_mark_id_storage.cpp similarity index 100% rename from map/user_mark_id_storage.cpp rename to libs/map/user_mark_id_storage.cpp diff --git a/map/user_mark_id_storage.hpp b/libs/map/user_mark_id_storage.hpp similarity index 100% rename from map/user_mark_id_storage.hpp rename to libs/map/user_mark_id_storage.hpp diff --git a/map/user_mark_layer.cpp b/libs/map/user_mark_layer.cpp similarity index 100% rename from map/user_mark_layer.cpp rename to libs/map/user_mark_layer.cpp diff --git a/map/user_mark_layer.hpp b/libs/map/user_mark_layer.hpp similarity index 100% rename from map/user_mark_layer.hpp rename to libs/map/user_mark_layer.hpp diff --git a/map/viewport_search_callback.cpp b/libs/map/viewport_search_callback.cpp similarity index 100% rename from map/viewport_search_callback.cpp rename to libs/map/viewport_search_callback.cpp diff --git a/map/viewport_search_callback.hpp b/libs/map/viewport_search_callback.hpp similarity index 100% rename from map/viewport_search_callback.hpp rename to libs/map/viewport_search_callback.hpp diff --git a/map/viewport_search_params.hpp b/libs/map/viewport_search_params.hpp similarity index 100% rename from map/viewport_search_params.hpp rename to libs/map/viewport_search_params.hpp diff --git a/generator/mwm_diff/CMakeLists.txt b/libs/mwm_diff/CMakeLists.txt similarity index 100% rename from generator/mwm_diff/CMakeLists.txt rename to libs/mwm_diff/CMakeLists.txt diff --git a/generator/mwm_diff/diff.cpp b/libs/mwm_diff/diff.cpp similarity index 99% rename from generator/mwm_diff/diff.cpp rename to libs/mwm_diff/diff.cpp index f6095ff16..32d7da9f6 100644 --- a/generator/mwm_diff/diff.cpp +++ b/libs/mwm_diff/diff.cpp @@ -1,4 +1,4 @@ -#include "generator/mwm_diff/diff.hpp" +#include "mwm_diff/diff.hpp" #include "coding/buffered_file_writer.hpp" #include "coding/file_reader.hpp" diff --git a/generator/mwm_diff/diff.hpp b/libs/mwm_diff/diff.hpp similarity index 100% rename from generator/mwm_diff/diff.hpp rename to libs/mwm_diff/diff.hpp diff --git a/generator/mwm_diff/mwm_diff_tests/CMakeLists.txt b/libs/mwm_diff/mwm_diff_tests/CMakeLists.txt similarity index 100% rename from generator/mwm_diff/mwm_diff_tests/CMakeLists.txt rename to libs/mwm_diff/mwm_diff_tests/CMakeLists.txt diff --git a/generator/mwm_diff/mwm_diff_tests/diff_tests.cpp b/libs/mwm_diff/mwm_diff_tests/diff_tests.cpp similarity index 98% rename from generator/mwm_diff/mwm_diff_tests/diff_tests.cpp rename to libs/mwm_diff/mwm_diff_tests/diff_tests.cpp index 708e2cbe5..01dbeabf7 100644 --- a/generator/mwm_diff/mwm_diff_tests/diff_tests.cpp +++ b/libs/mwm_diff/mwm_diff_tests/diff_tests.cpp @@ -1,6 +1,6 @@ #include "testing/testing.hpp" -#include "generator/mwm_diff/diff.hpp" +#include "mwm_diff/diff.hpp" #include "platform/platform.hpp" diff --git a/generator/mwm_diff/mwm_diff_tool/CMakeLists.txt b/libs/mwm_diff/mwm_diff_tool/CMakeLists.txt similarity index 100% rename from generator/mwm_diff/mwm_diff_tool/CMakeLists.txt rename to libs/mwm_diff/mwm_diff_tool/CMakeLists.txt diff --git a/generator/mwm_diff/mwm_diff_tool/mwm_diff_tool.cpp b/libs/mwm_diff/mwm_diff_tool/mwm_diff_tool.cpp similarity index 96% rename from generator/mwm_diff/mwm_diff_tool/mwm_diff_tool.cpp rename to libs/mwm_diff/mwm_diff_tool/mwm_diff_tool.cpp index e66fa61c1..507cc37bf 100644 --- a/generator/mwm_diff/mwm_diff_tool/mwm_diff_tool.cpp +++ b/libs/mwm_diff/mwm_diff_tool/mwm_diff_tool.cpp @@ -1,4 +1,4 @@ -#include "generator/mwm_diff/diff.hpp" +#include "mwm_diff/diff.hpp" #include "base/cancellable.hpp" diff --git a/platform/CMakeLists.txt b/libs/platform/CMakeLists.txt similarity index 98% rename from platform/CMakeLists.txt rename to libs/platform/CMakeLists.txt index 024fa4c02..2570745ed 100644 --- a/platform/CMakeLists.txt +++ b/libs/platform/CMakeLists.txt @@ -1,7 +1,7 @@ project(platform) set(SRC - ../private.h # To properly detect its changes with CMake. + ../../private.h # To properly detect its changes with CMake. battery_tracker.cpp battery_tracker.hpp chunks_download_strategy.cpp diff --git a/platform/background_downloader_ios.h b/libs/platform/background_downloader_ios.h similarity index 100% rename from platform/background_downloader_ios.h rename to libs/platform/background_downloader_ios.h diff --git a/platform/background_downloader_ios.mm b/libs/platform/background_downloader_ios.mm similarity index 100% rename from platform/background_downloader_ios.mm rename to libs/platform/background_downloader_ios.mm diff --git a/platform/battery_tracker.cpp b/libs/platform/battery_tracker.cpp similarity index 100% rename from platform/battery_tracker.cpp rename to libs/platform/battery_tracker.cpp diff --git a/platform/battery_tracker.hpp b/libs/platform/battery_tracker.hpp similarity index 100% rename from platform/battery_tracker.hpp rename to libs/platform/battery_tracker.hpp diff --git a/platform/chunks_download_strategy.cpp b/libs/platform/chunks_download_strategy.cpp similarity index 100% rename from platform/chunks_download_strategy.cpp rename to libs/platform/chunks_download_strategy.cpp diff --git a/platform/chunks_download_strategy.hpp b/libs/platform/chunks_download_strategy.hpp similarity index 100% rename from platform/chunks_download_strategy.hpp rename to libs/platform/chunks_download_strategy.hpp diff --git a/platform/constants.hpp b/libs/platform/constants.hpp similarity index 100% rename from platform/constants.hpp rename to libs/platform/constants.hpp diff --git a/platform/country_defines.cpp b/libs/platform/country_defines.cpp similarity index 100% rename from platform/country_defines.cpp rename to libs/platform/country_defines.cpp diff --git a/platform/country_defines.hpp b/libs/platform/country_defines.hpp similarity index 100% rename from platform/country_defines.hpp rename to libs/platform/country_defines.hpp diff --git a/platform/country_file.cpp b/libs/platform/country_file.cpp similarity index 100% rename from platform/country_file.cpp rename to libs/platform/country_file.cpp diff --git a/platform/country_file.hpp b/libs/platform/country_file.hpp similarity index 100% rename from platform/country_file.hpp rename to libs/platform/country_file.hpp diff --git a/platform/distance.cpp b/libs/platform/distance.cpp similarity index 100% rename from platform/distance.cpp rename to libs/platform/distance.cpp diff --git a/platform/distance.hpp b/libs/platform/distance.hpp similarity index 100% rename from platform/distance.hpp rename to libs/platform/distance.hpp diff --git a/platform/downloader_defines.hpp b/libs/platform/downloader_defines.hpp similarity index 100% rename from platform/downloader_defines.hpp rename to libs/platform/downloader_defines.hpp diff --git a/platform/downloader_utils.cpp b/libs/platform/downloader_utils.cpp similarity index 100% rename from platform/downloader_utils.cpp rename to libs/platform/downloader_utils.cpp diff --git a/platform/downloader_utils.hpp b/libs/platform/downloader_utils.hpp similarity index 100% rename from platform/downloader_utils.hpp rename to libs/platform/downloader_utils.hpp diff --git a/platform/duration.cpp b/libs/platform/duration.cpp similarity index 100% rename from platform/duration.cpp rename to libs/platform/duration.cpp diff --git a/platform/duration.hpp b/libs/platform/duration.hpp similarity index 100% rename from platform/duration.hpp rename to libs/platform/duration.hpp diff --git a/platform/get_text_by_id.cpp b/libs/platform/get_text_by_id.cpp similarity index 100% rename from platform/get_text_by_id.cpp rename to libs/platform/get_text_by_id.cpp diff --git a/platform/get_text_by_id.hpp b/libs/platform/get_text_by_id.hpp similarity index 100% rename from platform/get_text_by_id.hpp rename to libs/platform/get_text_by_id.hpp diff --git a/platform/gui_thread.hpp b/libs/platform/gui_thread.hpp similarity index 100% rename from platform/gui_thread.hpp rename to libs/platform/gui_thread.hpp diff --git a/platform/gui_thread_apple.mm b/libs/platform/gui_thread_apple.mm similarity index 100% rename from platform/gui_thread_apple.mm rename to libs/platform/gui_thread_apple.mm diff --git a/platform/gui_thread_qt.cpp b/libs/platform/gui_thread_qt.cpp similarity index 100% rename from platform/gui_thread_qt.cpp rename to libs/platform/gui_thread_qt.cpp diff --git a/platform/http_client.cpp b/libs/platform/http_client.cpp similarity index 100% rename from platform/http_client.cpp rename to libs/platform/http_client.cpp diff --git a/platform/http_client.hpp b/libs/platform/http_client.hpp similarity index 100% rename from platform/http_client.hpp rename to libs/platform/http_client.hpp diff --git a/platform/http_client_apple.mm b/libs/platform/http_client_apple.mm similarity index 100% rename from platform/http_client_apple.mm rename to libs/platform/http_client_apple.mm diff --git a/platform/http_client_curl.cpp b/libs/platform/http_client_curl.cpp similarity index 100% rename from platform/http_client_curl.cpp rename to libs/platform/http_client_curl.cpp diff --git a/platform/http_payload.cpp b/libs/platform/http_payload.cpp similarity index 100% rename from platform/http_payload.cpp rename to libs/platform/http_payload.cpp diff --git a/platform/http_payload.hpp b/libs/platform/http_payload.hpp similarity index 100% rename from platform/http_payload.hpp rename to libs/platform/http_payload.hpp diff --git a/platform/http_request.cpp b/libs/platform/http_request.cpp similarity index 100% rename from platform/http_request.cpp rename to libs/platform/http_request.cpp diff --git a/platform/http_request.hpp b/libs/platform/http_request.hpp similarity index 100% rename from platform/http_request.hpp rename to libs/platform/http_request.hpp diff --git a/platform/http_session_manager.h b/libs/platform/http_session_manager.h similarity index 100% rename from platform/http_session_manager.h rename to libs/platform/http_session_manager.h diff --git a/platform/http_session_manager.mm b/libs/platform/http_session_manager.mm similarity index 100% rename from platform/http_session_manager.mm rename to libs/platform/http_session_manager.mm diff --git a/platform/http_thread_apple.h b/libs/platform/http_thread_apple.h similarity index 100% rename from platform/http_thread_apple.h rename to libs/platform/http_thread_apple.h diff --git a/platform/http_thread_apple.mm b/libs/platform/http_thread_apple.mm similarity index 100% rename from platform/http_thread_apple.mm rename to libs/platform/http_thread_apple.mm diff --git a/platform/http_thread_callback.hpp b/libs/platform/http_thread_callback.hpp similarity index 100% rename from platform/http_thread_callback.hpp rename to libs/platform/http_thread_callback.hpp diff --git a/platform/http_thread_qt.cpp b/libs/platform/http_thread_qt.cpp similarity index 100% rename from platform/http_thread_qt.cpp rename to libs/platform/http_thread_qt.cpp diff --git a/platform/http_thread_qt.hpp b/libs/platform/http_thread_qt.hpp similarity index 100% rename from platform/http_thread_qt.hpp rename to libs/platform/http_thread_qt.hpp diff --git a/platform/http_uploader.hpp b/libs/platform/http_uploader.hpp similarity index 100% rename from platform/http_uploader.hpp rename to libs/platform/http_uploader.hpp diff --git a/platform/http_uploader_apple.mm b/libs/platform/http_uploader_apple.mm similarity index 100% rename from platform/http_uploader_apple.mm rename to libs/platform/http_uploader_apple.mm diff --git a/platform/http_uploader_background.hpp b/libs/platform/http_uploader_background.hpp similarity index 100% rename from platform/http_uploader_background.hpp rename to libs/platform/http_uploader_background.hpp diff --git a/platform/http_uploader_background.mm b/libs/platform/http_uploader_background.mm similarity index 100% rename from platform/http_uploader_background.mm rename to libs/platform/http_uploader_background.mm diff --git a/platform/http_uploader_background_dummy.cpp b/libs/platform/http_uploader_background_dummy.cpp similarity index 100% rename from platform/http_uploader_background_dummy.cpp rename to libs/platform/http_uploader_background_dummy.cpp diff --git a/platform/http_uploader_dummy.cpp b/libs/platform/http_uploader_dummy.cpp similarity index 100% rename from platform/http_uploader_dummy.cpp rename to libs/platform/http_uploader_dummy.cpp diff --git a/platform/languages.hpp b/libs/platform/languages.hpp similarity index 100% rename from platform/languages.hpp rename to libs/platform/languages.hpp diff --git a/platform/local_country_file.cpp b/libs/platform/local_country_file.cpp similarity index 100% rename from platform/local_country_file.cpp rename to libs/platform/local_country_file.cpp diff --git a/platform/local_country_file.hpp b/libs/platform/local_country_file.hpp similarity index 100% rename from platform/local_country_file.hpp rename to libs/platform/local_country_file.hpp diff --git a/platform/local_country_file_utils.cpp b/libs/platform/local_country_file_utils.cpp similarity index 100% rename from platform/local_country_file_utils.cpp rename to libs/platform/local_country_file_utils.cpp diff --git a/platform/local_country_file_utils.hpp b/libs/platform/local_country_file_utils.hpp similarity index 100% rename from platform/local_country_file_utils.hpp rename to libs/platform/local_country_file_utils.hpp diff --git a/platform/locale.hpp b/libs/platform/locale.hpp similarity index 100% rename from platform/locale.hpp rename to libs/platform/locale.hpp diff --git a/platform/locale.mm b/libs/platform/locale.mm similarity index 100% rename from platform/locale.mm rename to libs/platform/locale.mm diff --git a/platform/locale_std.cpp b/libs/platform/locale_std.cpp similarity index 100% rename from platform/locale_std.cpp rename to libs/platform/locale_std.cpp diff --git a/platform/localization.cpp b/libs/platform/localization.cpp similarity index 100% rename from platform/localization.cpp rename to libs/platform/localization.cpp diff --git a/platform/localization.hpp b/libs/platform/localization.hpp similarity index 100% rename from platform/localization.hpp rename to libs/platform/localization.hpp diff --git a/platform/localization.mm b/libs/platform/localization.mm similarity index 100% rename from platform/localization.mm rename to libs/platform/localization.mm diff --git a/platform/localization_dummy.cpp b/libs/platform/localization_dummy.cpp similarity index 100% rename from platform/localization_dummy.cpp rename to libs/platform/localization_dummy.cpp diff --git a/platform/location.hpp b/libs/platform/location.hpp similarity index 100% rename from platform/location.hpp rename to libs/platform/location.hpp diff --git a/platform/location_service/CMakeLists.txt b/libs/platform/location_service/CMakeLists.txt similarity index 100% rename from platform/location_service/CMakeLists.txt rename to libs/platform/location_service/CMakeLists.txt diff --git a/platform/location_service/apple_location_service.mm b/libs/platform/location_service/apple_location_service.mm similarity index 100% rename from platform/location_service/apple_location_service.mm rename to libs/platform/location_service/apple_location_service.mm diff --git a/platform/location_service/location_service.cpp b/libs/platform/location_service/location_service.cpp similarity index 100% rename from platform/location_service/location_service.cpp rename to libs/platform/location_service/location_service.cpp diff --git a/platform/location_service/location_service.hpp b/libs/platform/location_service/location_service.hpp similarity index 100% rename from platform/location_service/location_service.hpp rename to libs/platform/location_service/location_service.hpp diff --git a/platform/location_service/qt_location_service.cpp b/libs/platform/location_service/qt_location_service.cpp similarity index 100% rename from platform/location_service/qt_location_service.cpp rename to libs/platform/location_service/qt_location_service.cpp diff --git a/platform/location_service/qt_location_service.hpp b/libs/platform/location_service/qt_location_service.hpp similarity index 100% rename from platform/location_service/qt_location_service.hpp rename to libs/platform/location_service/qt_location_service.hpp diff --git a/platform/measurement_utils.cpp b/libs/platform/measurement_utils.cpp similarity index 100% rename from platform/measurement_utils.cpp rename to libs/platform/measurement_utils.cpp diff --git a/platform/measurement_utils.hpp b/libs/platform/measurement_utils.hpp similarity index 100% rename from platform/measurement_utils.hpp rename to libs/platform/measurement_utils.hpp diff --git a/platform/mwm_traits.cpp b/libs/platform/mwm_traits.cpp similarity index 100% rename from platform/mwm_traits.cpp rename to libs/platform/mwm_traits.cpp diff --git a/platform/mwm_traits.hpp b/libs/platform/mwm_traits.hpp similarity index 100% rename from platform/mwm_traits.hpp rename to libs/platform/mwm_traits.hpp diff --git a/platform/mwm_version.cpp b/libs/platform/mwm_version.cpp similarity index 100% rename from platform/mwm_version.cpp rename to libs/platform/mwm_version.cpp diff --git a/platform/mwm_version.hpp b/libs/platform/mwm_version.hpp similarity index 100% rename from platform/mwm_version.hpp rename to libs/platform/mwm_version.hpp diff --git a/platform/network_policy.hpp b/libs/platform/network_policy.hpp similarity index 100% rename from platform/network_policy.hpp rename to libs/platform/network_policy.hpp diff --git a/platform/network_policy_dummy.cpp b/libs/platform/network_policy_dummy.cpp similarity index 100% rename from platform/network_policy_dummy.cpp rename to libs/platform/network_policy_dummy.cpp diff --git a/platform/network_policy_ios.h b/libs/platform/network_policy_ios.h similarity index 100% rename from platform/network_policy_ios.h rename to libs/platform/network_policy_ios.h diff --git a/platform/network_policy_ios.mm b/libs/platform/network_policy_ios.mm similarity index 100% rename from platform/network_policy_ios.mm rename to libs/platform/network_policy_ios.mm diff --git a/platform/platform.cpp b/libs/platform/platform.cpp similarity index 100% rename from platform/platform.cpp rename to libs/platform/platform.cpp diff --git a/platform/platform.hpp b/libs/platform/platform.hpp similarity index 100% rename from platform/platform.hpp rename to libs/platform/platform.hpp diff --git a/platform/platform_android.cpp b/libs/platform/platform_android.cpp similarity index 100% rename from platform/platform_android.cpp rename to libs/platform/platform_android.cpp diff --git a/platform/platform_ios.h b/libs/platform/platform_ios.h similarity index 100% rename from platform/platform_ios.h rename to libs/platform/platform_ios.h diff --git a/platform/platform_ios.mm b/libs/platform/platform_ios.mm similarity index 100% rename from platform/platform_ios.mm rename to libs/platform/platform_ios.mm diff --git a/platform/platform_linux.cpp b/libs/platform/platform_linux.cpp similarity index 100% rename from platform/platform_linux.cpp rename to libs/platform/platform_linux.cpp diff --git a/platform/platform_mac.mm b/libs/platform/platform_mac.mm similarity index 100% rename from platform/platform_mac.mm rename to libs/platform/platform_mac.mm diff --git a/platform/platform_qt.cpp b/libs/platform/platform_qt.cpp similarity index 100% rename from platform/platform_qt.cpp rename to libs/platform/platform_qt.cpp diff --git a/platform/platform_qt_version.cpp.in b/libs/platform/platform_qt_version.cpp.in similarity index 100% rename from platform/platform_qt_version.cpp.in rename to libs/platform/platform_qt_version.cpp.in diff --git a/platform/platform_tests/CMakeLists.txt b/libs/platform/platform_tests/CMakeLists.txt similarity index 100% rename from platform/platform_tests/CMakeLists.txt rename to libs/platform/platform_tests/CMakeLists.txt diff --git a/platform/platform_tests/country_file_tests.cpp b/libs/platform/platform_tests/country_file_tests.cpp similarity index 100% rename from platform/platform_tests/country_file_tests.cpp rename to libs/platform/platform_tests/country_file_tests.cpp diff --git a/platform/platform_tests/distance_tests.cpp b/libs/platform/platform_tests/distance_tests.cpp similarity index 100% rename from platform/platform_tests/distance_tests.cpp rename to libs/platform/platform_tests/distance_tests.cpp diff --git a/platform/platform_tests/downloader_tests/downloader_test.cpp b/libs/platform/platform_tests/downloader_tests/downloader_test.cpp similarity index 100% rename from platform/platform_tests/downloader_tests/downloader_test.cpp rename to libs/platform/platform_tests/downloader_tests/downloader_test.cpp diff --git a/platform/platform_tests/downloader_utils_tests.cpp b/libs/platform/platform_tests/downloader_utils_tests.cpp similarity index 100% rename from platform/platform_tests/downloader_utils_tests.cpp rename to libs/platform/platform_tests/downloader_utils_tests.cpp diff --git a/platform/platform_tests/duration_tests.cpp b/libs/platform/platform_tests/duration_tests.cpp similarity index 100% rename from platform/platform_tests/duration_tests.cpp rename to libs/platform/platform_tests/duration_tests.cpp diff --git a/platform/platform_tests/get_text_by_id_tests.cpp b/libs/platform/platform_tests/get_text_by_id_tests.cpp similarity index 100% rename from platform/platform_tests/get_text_by_id_tests.cpp rename to libs/platform/platform_tests/get_text_by_id_tests.cpp diff --git a/platform/platform_tests/jansson_test.cpp b/libs/platform/platform_tests/jansson_test.cpp similarity index 100% rename from platform/platform_tests/jansson_test.cpp rename to libs/platform/platform_tests/jansson_test.cpp diff --git a/platform/platform_tests/language_test.cpp b/libs/platform/platform_tests/language_test.cpp similarity index 100% rename from platform/platform_tests/language_test.cpp rename to libs/platform/platform_tests/language_test.cpp diff --git a/platform/platform_tests/local_country_file_tests.cpp b/libs/platform/platform_tests/local_country_file_tests.cpp similarity index 100% rename from platform/platform_tests/local_country_file_tests.cpp rename to libs/platform/platform_tests/local_country_file_tests.cpp diff --git a/platform/platform_tests/location_test.cpp b/libs/platform/platform_tests/location_test.cpp similarity index 100% rename from platform/platform_tests/location_test.cpp rename to libs/platform/platform_tests/location_test.cpp diff --git a/platform/platform_tests/measurement_tests.cpp b/libs/platform/platform_tests/measurement_tests.cpp similarity index 100% rename from platform/platform_tests/measurement_tests.cpp rename to libs/platform/platform_tests/measurement_tests.cpp diff --git a/platform/platform_tests/meta_config_tests.cpp b/libs/platform/platform_tests/meta_config_tests.cpp similarity index 100% rename from platform/platform_tests/meta_config_tests.cpp rename to libs/platform/platform_tests/meta_config_tests.cpp diff --git a/platform/platform_tests/platform_test.cpp b/libs/platform/platform_tests/platform_test.cpp similarity index 100% rename from platform/platform_tests/platform_test.cpp rename to libs/platform/platform_tests/platform_test.cpp diff --git a/platform/platform_tests/products_tests.cpp b/libs/platform/platform_tests/products_tests.cpp similarity index 100% rename from platform/platform_tests/products_tests.cpp rename to libs/platform/platform_tests/products_tests.cpp diff --git a/platform/platform_tests/utm_mgrs_utils_tests.cpp b/libs/platform/platform_tests/utm_mgrs_utils_tests.cpp similarity index 100% rename from platform/platform_tests/utm_mgrs_utils_tests.cpp rename to libs/platform/platform_tests/utm_mgrs_utils_tests.cpp diff --git a/platform/platform_tests_support/CMakeLists.txt b/libs/platform/platform_tests_support/CMakeLists.txt similarity index 100% rename from platform/platform_tests_support/CMakeLists.txt rename to libs/platform/platform_tests_support/CMakeLists.txt diff --git a/platform/platform_tests_support/async_gui_thread.hpp b/libs/platform/platform_tests_support/async_gui_thread.hpp similarity index 100% rename from platform/platform_tests_support/async_gui_thread.hpp rename to libs/platform/platform_tests_support/async_gui_thread.hpp diff --git a/platform/platform_tests_support/helpers.hpp b/libs/platform/platform_tests_support/helpers.hpp similarity index 100% rename from platform/platform_tests_support/helpers.hpp rename to libs/platform/platform_tests_support/helpers.hpp diff --git a/platform/platform_tests_support/scoped_dir.cpp b/libs/platform/platform_tests_support/scoped_dir.cpp similarity index 100% rename from platform/platform_tests_support/scoped_dir.cpp rename to libs/platform/platform_tests_support/scoped_dir.cpp diff --git a/platform/platform_tests_support/scoped_dir.hpp b/libs/platform/platform_tests_support/scoped_dir.hpp similarity index 100% rename from platform/platform_tests_support/scoped_dir.hpp rename to libs/platform/platform_tests_support/scoped_dir.hpp diff --git a/platform/platform_tests_support/scoped_file.cpp b/libs/platform/platform_tests_support/scoped_file.cpp similarity index 100% rename from platform/platform_tests_support/scoped_file.cpp rename to libs/platform/platform_tests_support/scoped_file.cpp diff --git a/platform/platform_tests_support/scoped_file.hpp b/libs/platform/platform_tests_support/scoped_file.hpp similarity index 100% rename from platform/platform_tests_support/scoped_file.hpp rename to libs/platform/platform_tests_support/scoped_file.hpp diff --git a/platform/platform_tests_support/scoped_mwm.cpp b/libs/platform/platform_tests_support/scoped_mwm.cpp similarity index 100% rename from platform/platform_tests_support/scoped_mwm.cpp rename to libs/platform/platform_tests_support/scoped_mwm.cpp diff --git a/platform/platform_tests_support/scoped_mwm.hpp b/libs/platform/platform_tests_support/scoped_mwm.hpp similarity index 100% rename from platform/platform_tests_support/scoped_mwm.hpp rename to libs/platform/platform_tests_support/scoped_mwm.hpp diff --git a/platform/platform_tests_support/test_socket.cpp b/libs/platform/platform_tests_support/test_socket.cpp similarity index 100% rename from platform/platform_tests_support/test_socket.cpp rename to libs/platform/platform_tests_support/test_socket.cpp diff --git a/platform/platform_tests_support/test_socket.hpp b/libs/platform/platform_tests_support/test_socket.hpp similarity index 100% rename from platform/platform_tests_support/test_socket.hpp rename to libs/platform/platform_tests_support/test_socket.hpp diff --git a/platform/platform_tests_support/writable_dir_changer.cpp b/libs/platform/platform_tests_support/writable_dir_changer.cpp similarity index 100% rename from platform/platform_tests_support/writable_dir_changer.cpp rename to libs/platform/platform_tests_support/writable_dir_changer.cpp diff --git a/platform/platform_tests_support/writable_dir_changer.hpp b/libs/platform/platform_tests_support/writable_dir_changer.hpp similarity index 100% rename from platform/platform_tests_support/writable_dir_changer.hpp rename to libs/platform/platform_tests_support/writable_dir_changer.hpp diff --git a/platform/platform_unix_impl.cpp b/libs/platform/platform_unix_impl.cpp similarity index 100% rename from platform/platform_unix_impl.cpp rename to libs/platform/platform_unix_impl.cpp diff --git a/platform/platform_unix_impl.hpp b/libs/platform/platform_unix_impl.hpp similarity index 100% rename from platform/platform_unix_impl.hpp rename to libs/platform/platform_unix_impl.hpp diff --git a/platform/platform_win.cpp b/libs/platform/platform_win.cpp similarity index 100% rename from platform/platform_win.cpp rename to libs/platform/platform_win.cpp diff --git a/platform/preferred_languages.cpp b/libs/platform/preferred_languages.cpp similarity index 100% rename from platform/preferred_languages.cpp rename to libs/platform/preferred_languages.cpp diff --git a/platform/preferred_languages.hpp b/libs/platform/preferred_languages.hpp similarity index 100% rename from platform/preferred_languages.hpp rename to libs/platform/preferred_languages.hpp diff --git a/platform/products.cpp b/libs/platform/products.cpp similarity index 100% rename from platform/products.cpp rename to libs/platform/products.cpp diff --git a/platform/products.hpp b/libs/platform/products.hpp similarity index 100% rename from platform/products.hpp rename to libs/platform/products.hpp diff --git a/platform/remote_file.cpp b/libs/platform/remote_file.cpp similarity index 100% rename from platform/remote_file.cpp rename to libs/platform/remote_file.cpp diff --git a/platform/remote_file.hpp b/libs/platform/remote_file.hpp similarity index 100% rename from platform/remote_file.hpp rename to libs/platform/remote_file.hpp diff --git a/platform/safe_callback.hpp b/libs/platform/safe_callback.hpp similarity index 100% rename from platform/safe_callback.hpp rename to libs/platform/safe_callback.hpp diff --git a/platform/secure_storage.hpp b/libs/platform/secure_storage.hpp similarity index 100% rename from platform/secure_storage.hpp rename to libs/platform/secure_storage.hpp diff --git a/platform/secure_storage_dummy.cpp b/libs/platform/secure_storage_dummy.cpp similarity index 100% rename from platform/secure_storage_dummy.cpp rename to libs/platform/secure_storage_dummy.cpp diff --git a/platform/secure_storage_ios.mm b/libs/platform/secure_storage_ios.mm similarity index 100% rename from platform/secure_storage_ios.mm rename to libs/platform/secure_storage_ios.mm diff --git a/platform/secure_storage_qt.cpp b/libs/platform/secure_storage_qt.cpp similarity index 100% rename from platform/secure_storage_qt.cpp rename to libs/platform/secure_storage_qt.cpp diff --git a/platform/servers_list.cpp b/libs/platform/servers_list.cpp similarity index 100% rename from platform/servers_list.cpp rename to libs/platform/servers_list.cpp diff --git a/platform/servers_list.hpp b/libs/platform/servers_list.hpp similarity index 100% rename from platform/servers_list.hpp rename to libs/platform/servers_list.hpp diff --git a/platform/settings.cpp b/libs/platform/settings.cpp similarity index 100% rename from platform/settings.cpp rename to libs/platform/settings.cpp diff --git a/platform/settings.hpp b/libs/platform/settings.hpp similarity index 100% rename from platform/settings.hpp rename to libs/platform/settings.hpp diff --git a/platform/socket.hpp b/libs/platform/socket.hpp similarity index 100% rename from platform/socket.hpp rename to libs/platform/socket.hpp diff --git a/platform/socket_apple.mm b/libs/platform/socket_apple.mm similarity index 100% rename from platform/socket_apple.mm rename to libs/platform/socket_apple.mm diff --git a/platform/string_storage_base.cpp b/libs/platform/string_storage_base.cpp similarity index 100% rename from platform/string_storage_base.cpp rename to libs/platform/string_storage_base.cpp diff --git a/platform/string_storage_base.hpp b/libs/platform/string_storage_base.hpp similarity index 100% rename from platform/string_storage_base.hpp rename to libs/platform/string_storage_base.hpp diff --git a/platform/style_utils.hpp b/libs/platform/style_utils.hpp similarity index 100% rename from platform/style_utils.hpp rename to libs/platform/style_utils.hpp diff --git a/platform/trace.hpp b/libs/platform/trace.hpp similarity index 100% rename from platform/trace.hpp rename to libs/platform/trace.hpp diff --git a/platform/trace_android.cpp b/libs/platform/trace_android.cpp similarity index 100% rename from platform/trace_android.cpp rename to libs/platform/trace_android.cpp diff --git a/platform/utm_mgrs_utils.cpp b/libs/platform/utm_mgrs_utils.cpp similarity index 100% rename from platform/utm_mgrs_utils.cpp rename to libs/platform/utm_mgrs_utils.cpp diff --git a/platform/utm_mgrs_utils.hpp b/libs/platform/utm_mgrs_utils.hpp similarity index 100% rename from platform/utm_mgrs_utils.hpp rename to libs/platform/utm_mgrs_utils.hpp diff --git a/pyhelpers/CMakeLists.txt b/libs/pyhelpers/CMakeLists.txt similarity index 100% rename from pyhelpers/CMakeLists.txt rename to libs/pyhelpers/CMakeLists.txt diff --git a/pyhelpers/__init__.py b/libs/pyhelpers/__init__.py similarity index 100% rename from pyhelpers/__init__.py rename to libs/pyhelpers/__init__.py diff --git a/pyhelpers/module_version.hpp.in b/libs/pyhelpers/module_version.hpp.in similarity index 100% rename from pyhelpers/module_version.hpp.in rename to libs/pyhelpers/module_version.hpp.in diff --git a/pyhelpers/pair.hpp b/libs/pyhelpers/pair.hpp similarity index 100% rename from pyhelpers/pair.hpp rename to libs/pyhelpers/pair.hpp diff --git a/pyhelpers/setup.py b/libs/pyhelpers/setup.py similarity index 100% rename from pyhelpers/setup.py rename to libs/pyhelpers/setup.py diff --git a/pyhelpers/specs/build.sh b/libs/pyhelpers/specs/build.sh similarity index 100% rename from pyhelpers/specs/build.sh rename to libs/pyhelpers/specs/build.sh diff --git a/pyhelpers/specs/python35-mapsme-modules.spec b/libs/pyhelpers/specs/python35-mapsme-modules.spec similarity index 100% rename from pyhelpers/specs/python35-mapsme-modules.spec rename to libs/pyhelpers/specs/python35-mapsme-modules.spec diff --git a/pyhelpers/vector_list_conversion.hpp b/libs/pyhelpers/vector_list_conversion.hpp similarity index 100% rename from pyhelpers/vector_list_conversion.hpp rename to libs/pyhelpers/vector_list_conversion.hpp diff --git a/pyhelpers/vector_uint8.hpp b/libs/pyhelpers/vector_uint8.hpp similarity index 100% rename from pyhelpers/vector_uint8.hpp rename to libs/pyhelpers/vector_uint8.hpp diff --git a/qt_tstfrm/CMakeLists.txt b/libs/qt_tstfrm/CMakeLists.txt similarity index 100% rename from qt_tstfrm/CMakeLists.txt rename to libs/qt_tstfrm/CMakeLists.txt diff --git a/qt_tstfrm/test_main_loop.cpp b/libs/qt_tstfrm/test_main_loop.cpp similarity index 100% rename from qt_tstfrm/test_main_loop.cpp rename to libs/qt_tstfrm/test_main_loop.cpp diff --git a/qt_tstfrm/test_main_loop.hpp b/libs/qt_tstfrm/test_main_loop.hpp similarity index 100% rename from qt_tstfrm/test_main_loop.hpp rename to libs/qt_tstfrm/test_main_loop.hpp diff --git a/routing/CMakeLists.txt b/libs/routing/CMakeLists.txt similarity index 100% rename from routing/CMakeLists.txt rename to libs/routing/CMakeLists.txt diff --git a/routing/absent_regions_finder.cpp b/libs/routing/absent_regions_finder.cpp similarity index 100% rename from routing/absent_regions_finder.cpp rename to libs/routing/absent_regions_finder.cpp diff --git a/routing/absent_regions_finder.hpp b/libs/routing/absent_regions_finder.hpp similarity index 100% rename from routing/absent_regions_finder.hpp rename to libs/routing/absent_regions_finder.hpp diff --git a/routing/async_router.cpp b/libs/routing/async_router.cpp similarity index 100% rename from routing/async_router.cpp rename to libs/routing/async_router.cpp diff --git a/routing/async_router.hpp b/libs/routing/async_router.hpp similarity index 100% rename from routing/async_router.hpp rename to libs/routing/async_router.hpp diff --git a/routing/base/astar_algorithm.hpp b/libs/routing/base/astar_algorithm.hpp similarity index 100% rename from routing/base/astar_algorithm.hpp rename to libs/routing/base/astar_algorithm.hpp diff --git a/routing/base/astar_graph.hpp b/libs/routing/base/astar_graph.hpp similarity index 100% rename from routing/base/astar_graph.hpp rename to libs/routing/base/astar_graph.hpp diff --git a/routing/base/astar_progress.cpp b/libs/routing/base/astar_progress.cpp similarity index 100% rename from routing/base/astar_progress.cpp rename to libs/routing/base/astar_progress.cpp diff --git a/routing/base/astar_progress.hpp b/libs/routing/base/astar_progress.hpp similarity index 100% rename from routing/base/astar_progress.hpp rename to libs/routing/base/astar_progress.hpp diff --git a/routing/base/astar_vertex_data.hpp b/libs/routing/base/astar_vertex_data.hpp similarity index 100% rename from routing/base/astar_vertex_data.hpp rename to libs/routing/base/astar_vertex_data.hpp diff --git a/routing/base/astar_weight.hpp b/libs/routing/base/astar_weight.hpp similarity index 100% rename from routing/base/astar_weight.hpp rename to libs/routing/base/astar_weight.hpp diff --git a/routing/base/bfs.hpp b/libs/routing/base/bfs.hpp similarity index 100% rename from routing/base/bfs.hpp rename to libs/routing/base/bfs.hpp diff --git a/routing/base/followed_polyline.cpp b/libs/routing/base/followed_polyline.cpp similarity index 100% rename from routing/base/followed_polyline.cpp rename to libs/routing/base/followed_polyline.cpp diff --git a/routing/base/followed_polyline.hpp b/libs/routing/base/followed_polyline.hpp similarity index 100% rename from routing/base/followed_polyline.hpp rename to libs/routing/base/followed_polyline.hpp diff --git a/routing/base/routing_result.hpp b/libs/routing/base/routing_result.hpp similarity index 100% rename from routing/base/routing_result.hpp rename to libs/routing/base/routing_result.hpp diff --git a/routing/base/small_list.cpp b/libs/routing/base/small_list.cpp similarity index 100% rename from routing/base/small_list.cpp rename to libs/routing/base/small_list.cpp diff --git a/routing/base/small_list.hpp b/libs/routing/base/small_list.hpp similarity index 100% rename from routing/base/small_list.hpp rename to libs/routing/base/small_list.hpp diff --git a/routing/car_directions.cpp b/libs/routing/car_directions.cpp similarity index 100% rename from routing/car_directions.cpp rename to libs/routing/car_directions.cpp diff --git a/routing/car_directions.hpp b/libs/routing/car_directions.hpp similarity index 100% rename from routing/car_directions.hpp rename to libs/routing/car_directions.hpp diff --git a/routing/checkpoint_predictor.cpp b/libs/routing/checkpoint_predictor.cpp similarity index 100% rename from routing/checkpoint_predictor.cpp rename to libs/routing/checkpoint_predictor.cpp diff --git a/routing/checkpoint_predictor.hpp b/libs/routing/checkpoint_predictor.hpp similarity index 100% rename from routing/checkpoint_predictor.hpp rename to libs/routing/checkpoint_predictor.hpp diff --git a/routing/checkpoints.cpp b/libs/routing/checkpoints.cpp similarity index 100% rename from routing/checkpoints.cpp rename to libs/routing/checkpoints.cpp diff --git a/routing/checkpoints.hpp b/libs/routing/checkpoints.hpp similarity index 100% rename from routing/checkpoints.hpp rename to libs/routing/checkpoints.hpp diff --git a/routing/city_roads.cpp b/libs/routing/city_roads.cpp similarity index 100% rename from routing/city_roads.cpp rename to libs/routing/city_roads.cpp diff --git a/routing/city_roads.hpp b/libs/routing/city_roads.hpp similarity index 100% rename from routing/city_roads.hpp rename to libs/routing/city_roads.hpp diff --git a/routing/city_roads_serialization.hpp b/libs/routing/city_roads_serialization.hpp similarity index 100% rename from routing/city_roads_serialization.hpp rename to libs/routing/city_roads_serialization.hpp diff --git a/routing/coding.hpp b/libs/routing/coding.hpp similarity index 100% rename from routing/coding.hpp rename to libs/routing/coding.hpp diff --git a/routing/cross_border_graph.cpp b/libs/routing/cross_border_graph.cpp similarity index 100% rename from routing/cross_border_graph.cpp rename to libs/routing/cross_border_graph.cpp diff --git a/routing/cross_border_graph.hpp b/libs/routing/cross_border_graph.hpp similarity index 100% rename from routing/cross_border_graph.hpp rename to libs/routing/cross_border_graph.hpp diff --git a/routing/cross_mwm_connector.cpp b/libs/routing/cross_mwm_connector.cpp similarity index 100% rename from routing/cross_mwm_connector.cpp rename to libs/routing/cross_mwm_connector.cpp diff --git a/routing/cross_mwm_connector.hpp b/libs/routing/cross_mwm_connector.hpp similarity index 100% rename from routing/cross_mwm_connector.hpp rename to libs/routing/cross_mwm_connector.hpp diff --git a/routing/cross_mwm_connector_serialization.hpp b/libs/routing/cross_mwm_connector_serialization.hpp similarity index 100% rename from routing/cross_mwm_connector_serialization.hpp rename to libs/routing/cross_mwm_connector_serialization.hpp diff --git a/routing/cross_mwm_graph.cpp b/libs/routing/cross_mwm_graph.cpp similarity index 100% rename from routing/cross_mwm_graph.cpp rename to libs/routing/cross_mwm_graph.cpp diff --git a/routing/cross_mwm_graph.hpp b/libs/routing/cross_mwm_graph.hpp similarity index 100% rename from routing/cross_mwm_graph.hpp rename to libs/routing/cross_mwm_graph.hpp diff --git a/routing/cross_mwm_ids.hpp b/libs/routing/cross_mwm_ids.hpp similarity index 100% rename from routing/cross_mwm_ids.hpp rename to libs/routing/cross_mwm_ids.hpp diff --git a/routing/cross_mwm_index_graph.hpp b/libs/routing/cross_mwm_index_graph.hpp similarity index 100% rename from routing/cross_mwm_index_graph.hpp rename to libs/routing/cross_mwm_index_graph.hpp diff --git a/routing/data_source.hpp b/libs/routing/data_source.hpp similarity index 100% rename from routing/data_source.hpp rename to libs/routing/data_source.hpp diff --git a/routing/directions_engine.cpp b/libs/routing/directions_engine.cpp similarity index 100% rename from routing/directions_engine.cpp rename to libs/routing/directions_engine.cpp diff --git a/routing/directions_engine.hpp b/libs/routing/directions_engine.hpp similarity index 100% rename from routing/directions_engine.hpp rename to libs/routing/directions_engine.hpp diff --git a/routing/directions_engine_helpers.cpp b/libs/routing/directions_engine_helpers.cpp similarity index 100% rename from routing/directions_engine_helpers.cpp rename to libs/routing/directions_engine_helpers.cpp diff --git a/routing/directions_engine_helpers.hpp b/libs/routing/directions_engine_helpers.hpp similarity index 100% rename from routing/directions_engine_helpers.hpp rename to libs/routing/directions_engine_helpers.hpp diff --git a/routing/dummy_world_graph.hpp b/libs/routing/dummy_world_graph.hpp similarity index 100% rename from routing/dummy_world_graph.hpp rename to libs/routing/dummy_world_graph.hpp diff --git a/routing/edge_estimator.cpp b/libs/routing/edge_estimator.cpp similarity index 100% rename from routing/edge_estimator.cpp rename to libs/routing/edge_estimator.cpp diff --git a/routing/edge_estimator.hpp b/libs/routing/edge_estimator.hpp similarity index 100% rename from routing/edge_estimator.hpp rename to libs/routing/edge_estimator.hpp diff --git a/routing/fake_edges_container.hpp b/libs/routing/fake_edges_container.hpp similarity index 100% rename from routing/fake_edges_container.hpp rename to libs/routing/fake_edges_container.hpp diff --git a/routing/fake_ending.cpp b/libs/routing/fake_ending.cpp similarity index 100% rename from routing/fake_ending.cpp rename to libs/routing/fake_ending.cpp diff --git a/routing/fake_ending.hpp b/libs/routing/fake_ending.hpp similarity index 100% rename from routing/fake_ending.hpp rename to libs/routing/fake_ending.hpp diff --git a/routing/fake_feature_ids.hpp b/libs/routing/fake_feature_ids.hpp similarity index 100% rename from routing/fake_feature_ids.hpp rename to libs/routing/fake_feature_ids.hpp diff --git a/routing/fake_graph.cpp b/libs/routing/fake_graph.cpp similarity index 100% rename from routing/fake_graph.cpp rename to libs/routing/fake_graph.cpp diff --git a/routing/fake_graph.hpp b/libs/routing/fake_graph.hpp similarity index 100% rename from routing/fake_graph.hpp rename to libs/routing/fake_graph.hpp diff --git a/routing/fake_vertex.hpp b/libs/routing/fake_vertex.hpp similarity index 100% rename from routing/fake_vertex.hpp rename to libs/routing/fake_vertex.hpp diff --git a/routing/features_road_graph.cpp b/libs/routing/features_road_graph.cpp similarity index 100% rename from routing/features_road_graph.cpp rename to libs/routing/features_road_graph.cpp diff --git a/routing/features_road_graph.hpp b/libs/routing/features_road_graph.hpp similarity index 100% rename from routing/features_road_graph.hpp rename to libs/routing/features_road_graph.hpp diff --git a/routing/following_info.hpp b/libs/routing/following_info.hpp similarity index 100% rename from routing/following_info.hpp rename to libs/routing/following_info.hpp diff --git a/routing/geometry.cpp b/libs/routing/geometry.cpp similarity index 100% rename from routing/geometry.cpp rename to libs/routing/geometry.cpp diff --git a/routing/geometry.hpp b/libs/routing/geometry.hpp similarity index 100% rename from routing/geometry.hpp rename to libs/routing/geometry.hpp diff --git a/routing/guides_connections.cpp b/libs/routing/guides_connections.cpp similarity index 100% rename from routing/guides_connections.cpp rename to libs/routing/guides_connections.cpp diff --git a/routing/guides_connections.hpp b/libs/routing/guides_connections.hpp similarity index 100% rename from routing/guides_connections.hpp rename to libs/routing/guides_connections.hpp diff --git a/routing/guides_graph.cpp b/libs/routing/guides_graph.cpp similarity index 100% rename from routing/guides_graph.cpp rename to libs/routing/guides_graph.cpp diff --git a/routing/guides_graph.hpp b/libs/routing/guides_graph.hpp similarity index 100% rename from routing/guides_graph.hpp rename to libs/routing/guides_graph.hpp diff --git a/routing/index_graph.cpp b/libs/routing/index_graph.cpp similarity index 100% rename from routing/index_graph.cpp rename to libs/routing/index_graph.cpp diff --git a/routing/index_graph.hpp b/libs/routing/index_graph.hpp similarity index 100% rename from routing/index_graph.hpp rename to libs/routing/index_graph.hpp diff --git a/routing/index_graph_loader.cpp b/libs/routing/index_graph_loader.cpp similarity index 100% rename from routing/index_graph_loader.cpp rename to libs/routing/index_graph_loader.cpp diff --git a/routing/index_graph_loader.hpp b/libs/routing/index_graph_loader.hpp similarity index 100% rename from routing/index_graph_loader.hpp rename to libs/routing/index_graph_loader.hpp diff --git a/routing/index_graph_serialization.cpp b/libs/routing/index_graph_serialization.cpp similarity index 100% rename from routing/index_graph_serialization.cpp rename to libs/routing/index_graph_serialization.cpp diff --git a/routing/index_graph_serialization.hpp b/libs/routing/index_graph_serialization.hpp similarity index 100% rename from routing/index_graph_serialization.hpp rename to libs/routing/index_graph_serialization.hpp diff --git a/routing/index_graph_starter.cpp b/libs/routing/index_graph_starter.cpp similarity index 100% rename from routing/index_graph_starter.cpp rename to libs/routing/index_graph_starter.cpp diff --git a/routing/index_graph_starter.hpp b/libs/routing/index_graph_starter.hpp similarity index 100% rename from routing/index_graph_starter.hpp rename to libs/routing/index_graph_starter.hpp diff --git a/routing/index_graph_starter_joints.hpp b/libs/routing/index_graph_starter_joints.hpp similarity index 100% rename from routing/index_graph_starter_joints.hpp rename to libs/routing/index_graph_starter_joints.hpp diff --git a/routing/index_road_graph.cpp b/libs/routing/index_road_graph.cpp similarity index 100% rename from routing/index_road_graph.cpp rename to libs/routing/index_road_graph.cpp diff --git a/routing/index_road_graph.hpp b/libs/routing/index_road_graph.hpp similarity index 100% rename from routing/index_road_graph.hpp rename to libs/routing/index_road_graph.hpp diff --git a/routing/index_router.cpp b/libs/routing/index_router.cpp similarity index 100% rename from routing/index_router.cpp rename to libs/routing/index_router.cpp diff --git a/routing/index_router.hpp b/libs/routing/index_router.hpp similarity index 100% rename from routing/index_router.hpp rename to libs/routing/index_router.hpp diff --git a/routing/joint.cpp b/libs/routing/joint.cpp similarity index 100% rename from routing/joint.cpp rename to libs/routing/joint.cpp diff --git a/routing/joint.hpp b/libs/routing/joint.hpp similarity index 100% rename from routing/joint.hpp rename to libs/routing/joint.hpp diff --git a/routing/joint_index.cpp b/libs/routing/joint_index.cpp similarity index 100% rename from routing/joint_index.cpp rename to libs/routing/joint_index.cpp diff --git a/routing/joint_index.hpp b/libs/routing/joint_index.hpp similarity index 100% rename from routing/joint_index.hpp rename to libs/routing/joint_index.hpp diff --git a/routing/joint_segment.cpp b/libs/routing/joint_segment.cpp similarity index 100% rename from routing/joint_segment.cpp rename to libs/routing/joint_segment.cpp diff --git a/routing/joint_segment.hpp b/libs/routing/joint_segment.hpp similarity index 100% rename from routing/joint_segment.hpp rename to libs/routing/joint_segment.hpp diff --git a/routing/junction_visitor.cpp b/libs/routing/junction_visitor.cpp similarity index 100% rename from routing/junction_visitor.cpp rename to libs/routing/junction_visitor.cpp diff --git a/routing/junction_visitor.hpp b/libs/routing/junction_visitor.hpp similarity index 100% rename from routing/junction_visitor.hpp rename to libs/routing/junction_visitor.hpp diff --git a/routing/latlon_with_altitude.cpp b/libs/routing/latlon_with_altitude.cpp similarity index 100% rename from routing/latlon_with_altitude.cpp rename to libs/routing/latlon_with_altitude.cpp diff --git a/routing/latlon_with_altitude.hpp b/libs/routing/latlon_with_altitude.hpp similarity index 100% rename from routing/latlon_with_altitude.hpp rename to libs/routing/latlon_with_altitude.hpp diff --git a/routing/leaps_graph.cpp b/libs/routing/leaps_graph.cpp similarity index 100% rename from routing/leaps_graph.cpp rename to libs/routing/leaps_graph.cpp diff --git a/routing/leaps_graph.hpp b/libs/routing/leaps_graph.hpp similarity index 100% rename from routing/leaps_graph.hpp rename to libs/routing/leaps_graph.hpp diff --git a/routing/leaps_postprocessor.cpp b/libs/routing/leaps_postprocessor.cpp similarity index 100% rename from routing/leaps_postprocessor.cpp rename to libs/routing/leaps_postprocessor.cpp diff --git a/routing/leaps_postprocessor.hpp b/libs/routing/leaps_postprocessor.hpp similarity index 100% rename from routing/leaps_postprocessor.hpp rename to libs/routing/leaps_postprocessor.hpp diff --git a/routing/loaded_path_segment.hpp b/libs/routing/loaded_path_segment.hpp similarity index 100% rename from routing/loaded_path_segment.hpp rename to libs/routing/loaded_path_segment.hpp diff --git a/routing/maxspeeds.cpp b/libs/routing/maxspeeds.cpp similarity index 100% rename from routing/maxspeeds.cpp rename to libs/routing/maxspeeds.cpp diff --git a/routing/maxspeeds.hpp b/libs/routing/maxspeeds.hpp similarity index 100% rename from routing/maxspeeds.hpp rename to libs/routing/maxspeeds.hpp diff --git a/routing/maxspeeds_serialization.cpp b/libs/routing/maxspeeds_serialization.cpp similarity index 100% rename from routing/maxspeeds_serialization.cpp rename to libs/routing/maxspeeds_serialization.cpp diff --git a/routing/maxspeeds_serialization.hpp b/libs/routing/maxspeeds_serialization.hpp similarity index 100% rename from routing/maxspeeds_serialization.hpp rename to libs/routing/maxspeeds_serialization.hpp diff --git a/routing/mwm_hierarchy_handler.cpp b/libs/routing/mwm_hierarchy_handler.cpp similarity index 100% rename from routing/mwm_hierarchy_handler.cpp rename to libs/routing/mwm_hierarchy_handler.cpp diff --git a/routing/mwm_hierarchy_handler.hpp b/libs/routing/mwm_hierarchy_handler.hpp similarity index 100% rename from routing/mwm_hierarchy_handler.hpp rename to libs/routing/mwm_hierarchy_handler.hpp diff --git a/routing/nearest_edge_finder.cpp b/libs/routing/nearest_edge_finder.cpp similarity index 100% rename from routing/nearest_edge_finder.cpp rename to libs/routing/nearest_edge_finder.cpp diff --git a/routing/nearest_edge_finder.hpp b/libs/routing/nearest_edge_finder.hpp similarity index 100% rename from routing/nearest_edge_finder.hpp rename to libs/routing/nearest_edge_finder.hpp diff --git a/routing/opening_hours_serdes.cpp b/libs/routing/opening_hours_serdes.cpp similarity index 100% rename from routing/opening_hours_serdes.cpp rename to libs/routing/opening_hours_serdes.cpp diff --git a/routing/opening_hours_serdes.hpp b/libs/routing/opening_hours_serdes.hpp similarity index 100% rename from routing/opening_hours_serdes.hpp rename to libs/routing/opening_hours_serdes.hpp diff --git a/routing/pedestrian_directions.cpp b/libs/routing/pedestrian_directions.cpp similarity index 100% rename from routing/pedestrian_directions.cpp rename to libs/routing/pedestrian_directions.cpp diff --git a/routing/pedestrian_directions.hpp b/libs/routing/pedestrian_directions.hpp similarity index 100% rename from routing/pedestrian_directions.hpp rename to libs/routing/pedestrian_directions.hpp diff --git a/routing/position_accumulator.cpp b/libs/routing/position_accumulator.cpp similarity index 100% rename from routing/position_accumulator.cpp rename to libs/routing/position_accumulator.cpp diff --git a/routing/position_accumulator.hpp b/libs/routing/position_accumulator.hpp similarity index 100% rename from routing/position_accumulator.hpp rename to libs/routing/position_accumulator.hpp diff --git a/routing/regions_decl.hpp b/libs/routing/regions_decl.hpp similarity index 100% rename from routing/regions_decl.hpp rename to libs/routing/regions_decl.hpp diff --git a/routing/regions_router.cpp b/libs/routing/regions_router.cpp similarity index 100% rename from routing/regions_router.cpp rename to libs/routing/regions_router.cpp diff --git a/routing/regions_router.hpp b/libs/routing/regions_router.hpp similarity index 100% rename from routing/regions_router.hpp rename to libs/routing/regions_router.hpp diff --git a/routing/regions_sparse_graph.cpp b/libs/routing/regions_sparse_graph.cpp similarity index 100% rename from routing/regions_sparse_graph.cpp rename to libs/routing/regions_sparse_graph.cpp diff --git a/routing/regions_sparse_graph.hpp b/libs/routing/regions_sparse_graph.hpp similarity index 100% rename from routing/regions_sparse_graph.hpp rename to libs/routing/regions_sparse_graph.hpp diff --git a/routing/restriction_loader.cpp b/libs/routing/restriction_loader.cpp similarity index 100% rename from routing/restriction_loader.cpp rename to libs/routing/restriction_loader.cpp diff --git a/routing/restriction_loader.hpp b/libs/routing/restriction_loader.hpp similarity index 100% rename from routing/restriction_loader.hpp rename to libs/routing/restriction_loader.hpp diff --git a/routing/restrictions_serialization.cpp b/libs/routing/restrictions_serialization.cpp similarity index 100% rename from routing/restrictions_serialization.cpp rename to libs/routing/restrictions_serialization.cpp diff --git a/routing/restrictions_serialization.hpp b/libs/routing/restrictions_serialization.hpp similarity index 100% rename from routing/restrictions_serialization.hpp rename to libs/routing/restrictions_serialization.hpp diff --git a/routing/road_access.cpp b/libs/routing/road_access.cpp similarity index 100% rename from routing/road_access.cpp rename to libs/routing/road_access.cpp diff --git a/routing/road_access.hpp b/libs/routing/road_access.hpp similarity index 100% rename from routing/road_access.hpp rename to libs/routing/road_access.hpp diff --git a/routing/road_access_serialization.cpp b/libs/routing/road_access_serialization.cpp similarity index 100% rename from routing/road_access_serialization.cpp rename to libs/routing/road_access_serialization.cpp diff --git a/routing/road_access_serialization.hpp b/libs/routing/road_access_serialization.hpp similarity index 100% rename from routing/road_access_serialization.hpp rename to libs/routing/road_access_serialization.hpp diff --git a/routing/road_graph.cpp b/libs/routing/road_graph.cpp similarity index 100% rename from routing/road_graph.cpp rename to libs/routing/road_graph.cpp diff --git a/routing/road_graph.hpp b/libs/routing/road_graph.hpp similarity index 100% rename from routing/road_graph.hpp rename to libs/routing/road_graph.hpp diff --git a/routing/road_index.cpp b/libs/routing/road_index.cpp similarity index 100% rename from routing/road_index.cpp rename to libs/routing/road_index.cpp diff --git a/routing/road_index.hpp b/libs/routing/road_index.hpp similarity index 100% rename from routing/road_index.hpp rename to libs/routing/road_index.hpp diff --git a/routing/road_point.hpp b/libs/routing/road_point.hpp similarity index 100% rename from routing/road_point.hpp rename to libs/routing/road_point.hpp diff --git a/routing/route.cpp b/libs/routing/route.cpp similarity index 100% rename from routing/route.cpp rename to libs/routing/route.cpp diff --git a/routing/route.hpp b/libs/routing/route.hpp similarity index 100% rename from routing/route.hpp rename to libs/routing/route.hpp diff --git a/routing/route_point.hpp b/libs/routing/route_point.hpp similarity index 100% rename from routing/route_point.hpp rename to libs/routing/route_point.hpp diff --git a/routing/route_weight.cpp b/libs/routing/route_weight.cpp similarity index 100% rename from routing/route_weight.cpp rename to libs/routing/route_weight.cpp diff --git a/routing/route_weight.hpp b/libs/routing/route_weight.hpp similarity index 100% rename from routing/route_weight.hpp rename to libs/routing/route_weight.hpp diff --git a/routing/router.cpp b/libs/routing/router.cpp similarity index 100% rename from routing/router.cpp rename to libs/routing/router.cpp diff --git a/routing/router.hpp b/libs/routing/router.hpp similarity index 100% rename from routing/router.hpp rename to libs/routing/router.hpp diff --git a/routing/router_delegate.cpp b/libs/routing/router_delegate.cpp similarity index 100% rename from routing/router_delegate.cpp rename to libs/routing/router_delegate.cpp diff --git a/routing/router_delegate.hpp b/libs/routing/router_delegate.hpp similarity index 100% rename from routing/router_delegate.hpp rename to libs/routing/router_delegate.hpp diff --git a/routing/routes_builder/CMakeLists.txt b/libs/routing/routes_builder/CMakeLists.txt similarity index 100% rename from routing/routes_builder/CMakeLists.txt rename to libs/routing/routes_builder/CMakeLists.txt diff --git a/routing/routes_builder/data_source_storage.cpp b/libs/routing/routes_builder/data_source_storage.cpp similarity index 100% rename from routing/routes_builder/data_source_storage.cpp rename to libs/routing/routes_builder/data_source_storage.cpp diff --git a/routing/routes_builder/data_source_storage.hpp b/libs/routing/routes_builder/data_source_storage.hpp similarity index 100% rename from routing/routes_builder/data_source_storage.hpp rename to libs/routing/routes_builder/data_source_storage.hpp diff --git a/routing/routes_builder/routes_builder.cpp b/libs/routing/routes_builder/routes_builder.cpp similarity index 100% rename from routing/routes_builder/routes_builder.cpp rename to libs/routing/routes_builder/routes_builder.cpp diff --git a/routing/routes_builder/routes_builder.hpp b/libs/routing/routes_builder/routes_builder.hpp similarity index 100% rename from routing/routes_builder/routes_builder.hpp rename to libs/routing/routes_builder/routes_builder.hpp diff --git a/routing/routes_builder/routes_builder_tool/CMakeLists.txt b/libs/routing/routes_builder/routes_builder_tool/CMakeLists.txt similarity index 100% rename from routing/routes_builder/routes_builder_tool/CMakeLists.txt rename to libs/routing/routes_builder/routes_builder_tool/CMakeLists.txt diff --git a/routing/routes_builder/routes_builder_tool/routes_builder_tool.cpp b/libs/routing/routes_builder/routes_builder_tool/routes_builder_tool.cpp similarity index 100% rename from routing/routes_builder/routes_builder_tool/routes_builder_tool.cpp rename to libs/routing/routes_builder/routes_builder_tool/routes_builder_tool.cpp diff --git a/routing/routes_builder/routes_builder_tool/utils.cpp b/libs/routing/routes_builder/routes_builder_tool/utils.cpp similarity index 100% rename from routing/routes_builder/routes_builder_tool/utils.cpp rename to libs/routing/routes_builder/routes_builder_tool/utils.cpp diff --git a/routing/routes_builder/routes_builder_tool/utils.hpp b/libs/routing/routes_builder/routes_builder_tool/utils.hpp similarity index 100% rename from routing/routes_builder/routes_builder_tool/utils.hpp rename to libs/routing/routes_builder/routes_builder_tool/utils.hpp diff --git a/routing/routing_benchmarks/CMakeLists.txt b/libs/routing/routing_benchmarks/CMakeLists.txt similarity index 100% rename from routing/routing_benchmarks/CMakeLists.txt rename to libs/routing/routing_benchmarks/CMakeLists.txt diff --git a/routing/routing_benchmarks/bicycle_routing_tests.cpp b/libs/routing/routing_benchmarks/bicycle_routing_tests.cpp similarity index 100% rename from routing/routing_benchmarks/bicycle_routing_tests.cpp rename to libs/routing/routing_benchmarks/bicycle_routing_tests.cpp diff --git a/routing/routing_benchmarks/car_routing_tests.cpp b/libs/routing/routing_benchmarks/car_routing_tests.cpp similarity index 100% rename from routing/routing_benchmarks/car_routing_tests.cpp rename to libs/routing/routing_benchmarks/car_routing_tests.cpp diff --git a/routing/routing_benchmarks/helpers.cpp b/libs/routing/routing_benchmarks/helpers.cpp similarity index 100% rename from routing/routing_benchmarks/helpers.cpp rename to libs/routing/routing_benchmarks/helpers.cpp diff --git a/routing/routing_benchmarks/helpers.hpp b/libs/routing/routing_benchmarks/helpers.hpp similarity index 100% rename from routing/routing_benchmarks/helpers.hpp rename to libs/routing/routing_benchmarks/helpers.hpp diff --git a/routing/routing_benchmarks/pedestrian_routing_tests.cpp b/libs/routing/routing_benchmarks/pedestrian_routing_tests.cpp similarity index 100% rename from routing/routing_benchmarks/pedestrian_routing_tests.cpp rename to libs/routing/routing_benchmarks/pedestrian_routing_tests.cpp diff --git a/routing/routing_callbacks.hpp b/libs/routing/routing_callbacks.hpp similarity index 100% rename from routing/routing_callbacks.hpp rename to libs/routing/routing_callbacks.hpp diff --git a/routing/routing_consistency_tests/CMakeLists.txt b/libs/routing/routing_consistency_tests/CMakeLists.txt similarity index 100% rename from routing/routing_consistency_tests/CMakeLists.txt rename to libs/routing/routing_consistency_tests/CMakeLists.txt diff --git a/routing/routing_consistency_tests/routing_consistency_tests.cpp b/libs/routing/routing_consistency_tests/routing_consistency_tests.cpp similarity index 100% rename from routing/routing_consistency_tests/routing_consistency_tests.cpp rename to libs/routing/routing_consistency_tests/routing_consistency_tests.cpp diff --git a/routing/routing_exceptions.hpp b/libs/routing/routing_exceptions.hpp similarity index 100% rename from routing/routing_exceptions.hpp rename to libs/routing/routing_exceptions.hpp diff --git a/routing/routing_helpers.cpp b/libs/routing/routing_helpers.cpp similarity index 100% rename from routing/routing_helpers.cpp rename to libs/routing/routing_helpers.cpp diff --git a/routing/routing_helpers.hpp b/libs/routing/routing_helpers.hpp similarity index 100% rename from routing/routing_helpers.hpp rename to libs/routing/routing_helpers.hpp diff --git a/routing/routing_integration_tests/CMakeLists.txt b/libs/routing/routing_integration_tests/CMakeLists.txt similarity index 100% rename from routing/routing_integration_tests/CMakeLists.txt rename to libs/routing/routing_integration_tests/CMakeLists.txt diff --git a/routing/routing_integration_tests/absent_regions_finder_tests.cpp b/libs/routing/routing_integration_tests/absent_regions_finder_tests.cpp similarity index 100% rename from routing/routing_integration_tests/absent_regions_finder_tests.cpp rename to libs/routing/routing_integration_tests/absent_regions_finder_tests.cpp diff --git a/routing/routing_integration_tests/archival_reporter_tests.cpp b/libs/routing/routing_integration_tests/archival_reporter_tests.cpp similarity index 100% rename from routing/routing_integration_tests/archival_reporter_tests.cpp rename to libs/routing/routing_integration_tests/archival_reporter_tests.cpp diff --git a/routing/routing_integration_tests/bicycle_route_test.cpp b/libs/routing/routing_integration_tests/bicycle_route_test.cpp similarity index 100% rename from routing/routing_integration_tests/bicycle_route_test.cpp rename to libs/routing/routing_integration_tests/bicycle_route_test.cpp diff --git a/routing/routing_integration_tests/bicycle_turn_test.cpp b/libs/routing/routing_integration_tests/bicycle_turn_test.cpp similarity index 100% rename from routing/routing_integration_tests/bicycle_turn_test.cpp rename to libs/routing/routing_integration_tests/bicycle_turn_test.cpp diff --git a/routing/routing_integration_tests/concurrent_feature_parsing_test.cpp b/libs/routing/routing_integration_tests/concurrent_feature_parsing_test.cpp similarity index 100% rename from routing/routing_integration_tests/concurrent_feature_parsing_test.cpp rename to libs/routing/routing_integration_tests/concurrent_feature_parsing_test.cpp diff --git a/routing/routing_integration_tests/cross_country_routing_tests.cpp b/libs/routing/routing_integration_tests/cross_country_routing_tests.cpp similarity index 100% rename from routing/routing_integration_tests/cross_country_routing_tests.cpp rename to libs/routing/routing_integration_tests/cross_country_routing_tests.cpp diff --git a/routing/routing_integration_tests/get_altitude_test.cpp b/libs/routing/routing_integration_tests/get_altitude_test.cpp similarity index 100% rename from routing/routing_integration_tests/get_altitude_test.cpp rename to libs/routing/routing_integration_tests/get_altitude_test.cpp diff --git a/routing/routing_integration_tests/guides_tests.cpp b/libs/routing/routing_integration_tests/guides_tests.cpp similarity index 100% rename from routing/routing_integration_tests/guides_tests.cpp rename to libs/routing/routing_integration_tests/guides_tests.cpp diff --git a/routing/routing_integration_tests/pedestrian_route_test.cpp b/libs/routing/routing_integration_tests/pedestrian_route_test.cpp similarity index 100% rename from routing/routing_integration_tests/pedestrian_route_test.cpp rename to libs/routing/routing_integration_tests/pedestrian_route_test.cpp diff --git a/routing/routing_integration_tests/road_graph_tests.cpp b/libs/routing/routing_integration_tests/road_graph_tests.cpp similarity index 100% rename from routing/routing_integration_tests/road_graph_tests.cpp rename to libs/routing/routing_integration_tests/road_graph_tests.cpp diff --git a/routing/routing_integration_tests/roundabouts_tests.cpp b/libs/routing/routing_integration_tests/roundabouts_tests.cpp similarity index 100% rename from routing/routing_integration_tests/roundabouts_tests.cpp rename to libs/routing/routing_integration_tests/roundabouts_tests.cpp diff --git a/routing/routing_integration_tests/route_test.cpp b/libs/routing/routing_integration_tests/route_test.cpp similarity index 100% rename from routing/routing_integration_tests/route_test.cpp rename to libs/routing/routing_integration_tests/route_test.cpp diff --git a/routing/routing_integration_tests/routing_test_tools.cpp b/libs/routing/routing_integration_tests/routing_test_tools.cpp similarity index 100% rename from routing/routing_integration_tests/routing_test_tools.cpp rename to libs/routing/routing_integration_tests/routing_test_tools.cpp diff --git a/routing/routing_integration_tests/routing_test_tools.hpp b/libs/routing/routing_integration_tests/routing_test_tools.hpp similarity index 100% rename from routing/routing_integration_tests/routing_test_tools.hpp rename to libs/routing/routing_integration_tests/routing_test_tools.hpp diff --git a/routing/routing_integration_tests/small_routes.cpp b/libs/routing/routing_integration_tests/small_routes.cpp similarity index 100% rename from routing/routing_integration_tests/small_routes.cpp rename to libs/routing/routing_integration_tests/small_routes.cpp diff --git a/routing/routing_integration_tests/speed_camera_notifications_tests.cpp b/libs/routing/routing_integration_tests/speed_camera_notifications_tests.cpp similarity index 100% rename from routing/routing_integration_tests/speed_camera_notifications_tests.cpp rename to libs/routing/routing_integration_tests/speed_camera_notifications_tests.cpp diff --git a/routing/routing_integration_tests/street_names_test.cpp b/libs/routing/routing_integration_tests/street_names_test.cpp similarity index 100% rename from routing/routing_integration_tests/street_names_test.cpp rename to libs/routing/routing_integration_tests/street_names_test.cpp diff --git a/routing/routing_integration_tests/transit_route_test.cpp b/libs/routing/routing_integration_tests/transit_route_test.cpp similarity index 100% rename from routing/routing_integration_tests/transit_route_test.cpp rename to libs/routing/routing_integration_tests/transit_route_test.cpp diff --git a/routing/routing_integration_tests/turn_test.cpp b/libs/routing/routing_integration_tests/turn_test.cpp similarity index 100% rename from routing/routing_integration_tests/turn_test.cpp rename to libs/routing/routing_integration_tests/turn_test.cpp diff --git a/routing/routing_options.cpp b/libs/routing/routing_options.cpp similarity index 100% rename from routing/routing_options.cpp rename to libs/routing/routing_options.cpp diff --git a/routing/routing_options.hpp b/libs/routing/routing_options.hpp similarity index 100% rename from routing/routing_options.hpp rename to libs/routing/routing_options.hpp diff --git a/routing/routing_quality/CMakeLists.txt b/libs/routing/routing_quality/CMakeLists.txt similarity index 100% rename from routing/routing_quality/CMakeLists.txt rename to libs/routing/routing_quality/CMakeLists.txt diff --git a/routing/routing_quality/api/CMakeLists.txt b/libs/routing/routing_quality/api/CMakeLists.txt similarity index 100% rename from routing/routing_quality/api/CMakeLists.txt rename to libs/routing/routing_quality/api/CMakeLists.txt diff --git a/routing/routing_quality/api/api.cpp b/libs/routing/routing_quality/api/api.cpp similarity index 100% rename from routing/routing_quality/api/api.cpp rename to libs/routing/routing_quality/api/api.cpp diff --git a/routing/routing_quality/api/api.hpp b/libs/routing/routing_quality/api/api.hpp similarity index 100% rename from routing/routing_quality/api/api.hpp rename to libs/routing/routing_quality/api/api.hpp diff --git a/routing/routing_quality/api/google/google_api.cpp b/libs/routing/routing_quality/api/google/google_api.cpp similarity index 100% rename from routing/routing_quality/api/google/google_api.cpp rename to libs/routing/routing_quality/api/google/google_api.cpp diff --git a/routing/routing_quality/api/google/google_api.hpp b/libs/routing/routing_quality/api/google/google_api.hpp similarity index 100% rename from routing/routing_quality/api/google/google_api.hpp rename to libs/routing/routing_quality/api/google/google_api.hpp diff --git a/routing/routing_quality/api/google/types.cpp b/libs/routing/routing_quality/api/google/types.cpp similarity index 100% rename from routing/routing_quality/api/google/types.cpp rename to libs/routing/routing_quality/api/google/types.cpp diff --git a/routing/routing_quality/api/google/types.hpp b/libs/routing/routing_quality/api/google/types.hpp similarity index 100% rename from routing/routing_quality/api/google/types.hpp rename to libs/routing/routing_quality/api/google/types.hpp diff --git a/routing/routing_quality/api/mapbox/mapbox_api.cpp b/libs/routing/routing_quality/api/mapbox/mapbox_api.cpp similarity index 100% rename from routing/routing_quality/api/mapbox/mapbox_api.cpp rename to libs/routing/routing_quality/api/mapbox/mapbox_api.cpp diff --git a/routing/routing_quality/api/mapbox/mapbox_api.hpp b/libs/routing/routing_quality/api/mapbox/mapbox_api.hpp similarity index 100% rename from routing/routing_quality/api/mapbox/mapbox_api.hpp rename to libs/routing/routing_quality/api/mapbox/mapbox_api.hpp diff --git a/routing/routing_quality/api/mapbox/types.hpp b/libs/routing/routing_quality/api/mapbox/types.hpp similarity index 100% rename from routing/routing_quality/api/mapbox/types.hpp rename to libs/routing/routing_quality/api/mapbox/types.hpp diff --git a/routing/routing_quality/routing_quality_tests/CMakeLists.txt b/libs/routing/routing_quality/routing_quality_tests/CMakeLists.txt similarity index 100% rename from routing/routing_quality/routing_quality_tests/CMakeLists.txt rename to libs/routing/routing_quality/routing_quality_tests/CMakeLists.txt diff --git a/routing/routing_quality/routing_quality_tests/barriers_tests.cpp b/libs/routing/routing_quality/routing_quality_tests/barriers_tests.cpp similarity index 100% rename from routing/routing_quality/routing_quality_tests/barriers_tests.cpp rename to libs/routing/routing_quality/routing_quality_tests/barriers_tests.cpp diff --git a/routing/routing_quality/routing_quality_tests/bigger_roads_tests.cpp b/libs/routing/routing_quality/routing_quality_tests/bigger_roads_tests.cpp similarity index 100% rename from routing/routing_quality/routing_quality_tests/bigger_roads_tests.cpp rename to libs/routing/routing_quality/routing_quality_tests/bigger_roads_tests.cpp diff --git a/routing/routing_quality/routing_quality_tests/ferry_tests.cpp b/libs/routing/routing_quality/routing_quality_tests/ferry_tests.cpp similarity index 100% rename from routing/routing_quality/routing_quality_tests/ferry_tests.cpp rename to libs/routing/routing_quality/routing_quality_tests/ferry_tests.cpp diff --git a/routing/routing_quality/routing_quality_tests/is_built_tests.cpp b/libs/routing/routing_quality/routing_quality_tests/is_built_tests.cpp similarity index 100% rename from routing/routing_quality/routing_quality_tests/is_built_tests.cpp rename to libs/routing/routing_quality/routing_quality_tests/is_built_tests.cpp diff --git a/routing/routing_quality/routing_quality_tests/leaps_postprocessing_tests.cpp b/libs/routing/routing_quality/routing_quality_tests/leaps_postprocessing_tests.cpp similarity index 100% rename from routing/routing_quality/routing_quality_tests/leaps_postprocessing_tests.cpp rename to libs/routing/routing_quality/routing_quality_tests/leaps_postprocessing_tests.cpp diff --git a/routing/routing_quality/routing_quality_tests/passby_roads_tests.cpp b/libs/routing/routing_quality/routing_quality_tests/passby_roads_tests.cpp similarity index 100% rename from routing/routing_quality/routing_quality_tests/passby_roads_tests.cpp rename to libs/routing/routing_quality/routing_quality_tests/passby_roads_tests.cpp diff --git a/routing/routing_quality/routing_quality_tests/waypoints_tests.cpp b/libs/routing/routing_quality/routing_quality_tests/waypoints_tests.cpp similarity index 100% rename from routing/routing_quality/routing_quality_tests/waypoints_tests.cpp rename to libs/routing/routing_quality/routing_quality_tests/waypoints_tests.cpp diff --git a/routing/routing_quality/routing_quality_tool/CMakeLists.txt b/libs/routing/routing_quality/routing_quality_tool/CMakeLists.txt similarity index 100% rename from routing/routing_quality/routing_quality_tool/CMakeLists.txt rename to libs/routing/routing_quality/routing_quality_tool/CMakeLists.txt diff --git a/routing/routing_quality/routing_quality_tool/benchmark_results.cpp b/libs/routing/routing_quality/routing_quality_tool/benchmark_results.cpp similarity index 100% rename from routing/routing_quality/routing_quality_tool/benchmark_results.cpp rename to libs/routing/routing_quality/routing_quality_tool/benchmark_results.cpp diff --git a/routing/routing_quality/routing_quality_tool/benchmark_results.hpp b/libs/routing/routing_quality/routing_quality_tool/benchmark_results.hpp similarity index 100% rename from routing/routing_quality/routing_quality_tool/benchmark_results.hpp rename to libs/routing/routing_quality/routing_quality_tool/benchmark_results.hpp diff --git a/routing/routing_quality/routing_quality_tool/benchmark_stat.cpp b/libs/routing/routing_quality/routing_quality_tool/benchmark_stat.cpp similarity index 100% rename from routing/routing_quality/routing_quality_tool/benchmark_stat.cpp rename to libs/routing/routing_quality/routing_quality_tool/benchmark_stat.cpp diff --git a/routing/routing_quality/routing_quality_tool/benchmark_stat.hpp b/libs/routing/routing_quality/routing_quality_tool/benchmark_stat.hpp similarity index 100% rename from routing/routing_quality/routing_quality_tool/benchmark_stat.hpp rename to libs/routing/routing_quality/routing_quality_tool/benchmark_stat.hpp diff --git a/routing/routing_quality/routing_quality_tool/error_type_counter.cpp b/libs/routing/routing_quality/routing_quality_tool/error_type_counter.cpp similarity index 100% rename from routing/routing_quality/routing_quality_tool/error_type_counter.cpp rename to libs/routing/routing_quality/routing_quality_tool/error_type_counter.cpp diff --git a/routing/routing_quality/routing_quality_tool/error_type_counter.hpp b/libs/routing/routing_quality/routing_quality_tool/error_type_counter.hpp similarity index 100% rename from routing/routing_quality/routing_quality_tool/error_type_counter.hpp rename to libs/routing/routing_quality/routing_quality_tool/error_type_counter.hpp diff --git a/routing/routing_quality/routing_quality_tool/routing_quality_tool.cpp b/libs/routing/routing_quality/routing_quality_tool/routing_quality_tool.cpp similarity index 100% rename from routing/routing_quality/routing_quality_tool/routing_quality_tool.cpp rename to libs/routing/routing_quality/routing_quality_tool/routing_quality_tool.cpp diff --git a/routing/routing_quality/routing_quality_tool/utils.cpp b/libs/routing/routing_quality/routing_quality_tool/utils.cpp similarity index 100% rename from routing/routing_quality/routing_quality_tool/utils.cpp rename to libs/routing/routing_quality/routing_quality_tool/utils.cpp diff --git a/routing/routing_quality/routing_quality_tool/utils.hpp b/libs/routing/routing_quality/routing_quality_tool/utils.hpp similarity index 100% rename from routing/routing_quality/routing_quality_tool/utils.hpp rename to libs/routing/routing_quality/routing_quality_tool/utils.hpp diff --git a/routing/routing_quality/waypoints.cpp b/libs/routing/routing_quality/waypoints.cpp similarity index 100% rename from routing/routing_quality/waypoints.cpp rename to libs/routing/routing_quality/waypoints.cpp diff --git a/routing/routing_quality/waypoints.hpp b/libs/routing/routing_quality/waypoints.hpp similarity index 100% rename from routing/routing_quality/waypoints.hpp rename to libs/routing/routing_quality/waypoints.hpp diff --git a/routing/routing_result_graph.hpp b/libs/routing/routing_result_graph.hpp similarity index 100% rename from routing/routing_result_graph.hpp rename to libs/routing/routing_result_graph.hpp diff --git a/routing/routing_session.cpp b/libs/routing/routing_session.cpp similarity index 100% rename from routing/routing_session.cpp rename to libs/routing/routing_session.cpp diff --git a/routing/routing_session.hpp b/libs/routing/routing_session.hpp similarity index 100% rename from routing/routing_session.hpp rename to libs/routing/routing_session.hpp diff --git a/routing/routing_settings.cpp b/libs/routing/routing_settings.cpp similarity index 100% rename from routing/routing_settings.cpp rename to libs/routing/routing_settings.cpp diff --git a/routing/routing_settings.hpp b/libs/routing/routing_settings.hpp similarity index 100% rename from routing/routing_settings.hpp rename to libs/routing/routing_settings.hpp diff --git a/routing/routing_tests/CMakeLists.txt b/libs/routing/routing_tests/CMakeLists.txt similarity index 100% rename from routing/routing_tests/CMakeLists.txt rename to libs/routing/routing_tests/CMakeLists.txt diff --git a/routing/routing_tests/applying_traffic_test.cpp b/libs/routing/routing_tests/applying_traffic_test.cpp similarity index 100% rename from routing/routing_tests/applying_traffic_test.cpp rename to libs/routing/routing_tests/applying_traffic_test.cpp diff --git a/routing/routing_tests/astar_algorithm_test.cpp b/libs/routing/routing_tests/astar_algorithm_test.cpp similarity index 100% rename from routing/routing_tests/astar_algorithm_test.cpp rename to libs/routing/routing_tests/astar_algorithm_test.cpp diff --git a/routing/routing_tests/astar_progress_test.cpp b/libs/routing/routing_tests/astar_progress_test.cpp similarity index 100% rename from routing/routing_tests/astar_progress_test.cpp rename to libs/routing/routing_tests/astar_progress_test.cpp diff --git a/routing/routing_tests/astar_router_test.cpp b/libs/routing/routing_tests/astar_router_test.cpp similarity index 100% rename from routing/routing_tests/astar_router_test.cpp rename to libs/routing/routing_tests/astar_router_test.cpp diff --git a/routing/routing_tests/async_router_test.cpp b/libs/routing/routing_tests/async_router_test.cpp similarity index 100% rename from routing/routing_tests/async_router_test.cpp rename to libs/routing/routing_tests/async_router_test.cpp diff --git a/routing/routing_tests/bfs_tests.cpp b/libs/routing/routing_tests/bfs_tests.cpp similarity index 100% rename from routing/routing_tests/bfs_tests.cpp rename to libs/routing/routing_tests/bfs_tests.cpp diff --git a/routing/routing_tests/checkpoint_predictor_test.cpp b/libs/routing/routing_tests/checkpoint_predictor_test.cpp similarity index 100% rename from routing/routing_tests/checkpoint_predictor_test.cpp rename to libs/routing/routing_tests/checkpoint_predictor_test.cpp diff --git a/routing/routing_tests/coding_test.cpp b/libs/routing/routing_tests/coding_test.cpp similarity index 100% rename from routing/routing_tests/coding_test.cpp rename to libs/routing/routing_tests/coding_test.cpp diff --git a/routing/routing_tests/cross_border_graph_tests.cpp b/libs/routing/routing_tests/cross_border_graph_tests.cpp similarity index 100% rename from routing/routing_tests/cross_border_graph_tests.cpp rename to libs/routing/routing_tests/cross_border_graph_tests.cpp diff --git a/routing/routing_tests/cross_mwm_connector_test.cpp b/libs/routing/routing_tests/cross_mwm_connector_test.cpp similarity index 100% rename from routing/routing_tests/cross_mwm_connector_test.cpp rename to libs/routing/routing_tests/cross_mwm_connector_test.cpp diff --git a/routing/routing_tests/cumulative_restriction_test.cpp b/libs/routing/routing_tests/cumulative_restriction_test.cpp similarity index 100% rename from routing/routing_tests/cumulative_restriction_test.cpp rename to libs/routing/routing_tests/cumulative_restriction_test.cpp diff --git a/routing/routing_tests/edge_estimator_tests.cpp b/libs/routing/routing_tests/edge_estimator_tests.cpp similarity index 100% rename from routing/routing_tests/edge_estimator_tests.cpp rename to libs/routing/routing_tests/edge_estimator_tests.cpp diff --git a/routing/routing_tests/fake_graph_test.cpp b/libs/routing/routing_tests/fake_graph_test.cpp similarity index 100% rename from routing/routing_tests/fake_graph_test.cpp rename to libs/routing/routing_tests/fake_graph_test.cpp diff --git a/routing/routing_tests/followed_polyline_test.cpp b/libs/routing/routing_tests/followed_polyline_test.cpp similarity index 100% rename from routing/routing_tests/followed_polyline_test.cpp rename to libs/routing/routing_tests/followed_polyline_test.cpp diff --git a/routing/routing_tests/guides_tests.cpp b/libs/routing/routing_tests/guides_tests.cpp similarity index 100% rename from routing/routing_tests/guides_tests.cpp rename to libs/routing/routing_tests/guides_tests.cpp diff --git a/routing/routing_tests/index_graph_test.cpp b/libs/routing/routing_tests/index_graph_test.cpp similarity index 100% rename from routing/routing_tests/index_graph_test.cpp rename to libs/routing/routing_tests/index_graph_test.cpp diff --git a/routing/routing_tests/index_graph_tools.cpp b/libs/routing/routing_tests/index_graph_tools.cpp similarity index 100% rename from routing/routing_tests/index_graph_tools.cpp rename to libs/routing/routing_tests/index_graph_tools.cpp diff --git a/routing/routing_tests/index_graph_tools.hpp b/libs/routing/routing_tests/index_graph_tools.hpp similarity index 100% rename from routing/routing_tests/index_graph_tools.hpp rename to libs/routing/routing_tests/index_graph_tools.hpp diff --git a/routing/routing_tests/maxspeeds_tests.cpp b/libs/routing/routing_tests/maxspeeds_tests.cpp similarity index 100% rename from routing/routing_tests/maxspeeds_tests.cpp rename to libs/routing/routing_tests/maxspeeds_tests.cpp diff --git a/routing/routing_tests/mwm_hierarchy_test.cpp b/libs/routing/routing_tests/mwm_hierarchy_test.cpp similarity index 100% rename from routing/routing_tests/mwm_hierarchy_test.cpp rename to libs/routing/routing_tests/mwm_hierarchy_test.cpp diff --git a/routing/routing_tests/nearest_edge_finder_tests.cpp b/libs/routing/routing_tests/nearest_edge_finder_tests.cpp similarity index 100% rename from routing/routing_tests/nearest_edge_finder_tests.cpp rename to libs/routing/routing_tests/nearest_edge_finder_tests.cpp diff --git a/routing/routing_tests/opening_hours_serdes_tests.cpp b/libs/routing/routing_tests/opening_hours_serdes_tests.cpp similarity index 100% rename from routing/routing_tests/opening_hours_serdes_tests.cpp rename to libs/routing/routing_tests/opening_hours_serdes_tests.cpp diff --git a/routing/routing_tests/position_accumulator_tests.cpp b/libs/routing/routing_tests/position_accumulator_tests.cpp similarity index 100% rename from routing/routing_tests/position_accumulator_tests.cpp rename to libs/routing/routing_tests/position_accumulator_tests.cpp diff --git a/routing/routing_tests/restriction_test.cpp b/libs/routing/routing_tests/restriction_test.cpp similarity index 100% rename from routing/routing_tests/restriction_test.cpp rename to libs/routing/routing_tests/restriction_test.cpp diff --git a/routing/routing_tests/road_access_test.cpp b/libs/routing/routing_tests/road_access_test.cpp similarity index 100% rename from routing/routing_tests/road_access_test.cpp rename to libs/routing/routing_tests/road_access_test.cpp diff --git a/routing/routing_tests/road_graph_builder.cpp b/libs/routing/routing_tests/road_graph_builder.cpp similarity index 100% rename from routing/routing_tests/road_graph_builder.cpp rename to libs/routing/routing_tests/road_graph_builder.cpp diff --git a/routing/routing_tests/road_graph_builder.hpp b/libs/routing/routing_tests/road_graph_builder.hpp similarity index 100% rename from routing/routing_tests/road_graph_builder.hpp rename to libs/routing/routing_tests/road_graph_builder.hpp diff --git a/routing/routing_tests/road_graph_nearest_edges_test.cpp b/libs/routing/routing_tests/road_graph_nearest_edges_test.cpp similarity index 100% rename from routing/routing_tests/road_graph_nearest_edges_test.cpp rename to libs/routing/routing_tests/road_graph_nearest_edges_test.cpp diff --git a/routing/routing_tests/route_tests.cpp b/libs/routing/routing_tests/route_tests.cpp similarity index 100% rename from routing/routing_tests/route_tests.cpp rename to libs/routing/routing_tests/route_tests.cpp diff --git a/routing/routing_tests/routing_algorithm.cpp b/libs/routing/routing_tests/routing_algorithm.cpp similarity index 100% rename from routing/routing_tests/routing_algorithm.cpp rename to libs/routing/routing_tests/routing_algorithm.cpp diff --git a/routing/routing_tests/routing_algorithm.hpp b/libs/routing/routing_tests/routing_algorithm.hpp similarity index 100% rename from routing/routing_tests/routing_algorithm.hpp rename to libs/routing/routing_tests/routing_algorithm.hpp diff --git a/routing/routing_tests/routing_helpers_tests.cpp b/libs/routing/routing_tests/routing_helpers_tests.cpp similarity index 100% rename from routing/routing_tests/routing_helpers_tests.cpp rename to libs/routing/routing_tests/routing_helpers_tests.cpp diff --git a/routing/routing_tests/routing_options_tests.cpp b/libs/routing/routing_tests/routing_options_tests.cpp similarity index 100% rename from routing/routing_tests/routing_options_tests.cpp rename to libs/routing/routing_tests/routing_options_tests.cpp diff --git a/routing/routing_tests/routing_session_test.cpp b/libs/routing/routing_tests/routing_session_test.cpp similarity index 100% rename from routing/routing_tests/routing_session_test.cpp rename to libs/routing/routing_tests/routing_session_test.cpp diff --git a/routing/routing_tests/speed_cameras_tests.cpp b/libs/routing/routing_tests/speed_cameras_tests.cpp similarity index 100% rename from routing/routing_tests/speed_cameras_tests.cpp rename to libs/routing/routing_tests/speed_cameras_tests.cpp diff --git a/routing/routing_tests/tools.cpp b/libs/routing/routing_tests/tools.cpp similarity index 100% rename from routing/routing_tests/tools.cpp rename to libs/routing/routing_tests/tools.cpp diff --git a/routing/routing_tests/tools.hpp b/libs/routing/routing_tests/tools.hpp similarity index 100% rename from routing/routing_tests/tools.hpp rename to libs/routing/routing_tests/tools.hpp diff --git a/routing/routing_tests/turns_generator_test.cpp b/libs/routing/routing_tests/turns_generator_test.cpp similarity index 100% rename from routing/routing_tests/turns_generator_test.cpp rename to libs/routing/routing_tests/turns_generator_test.cpp diff --git a/routing/routing_tests/turns_sound_test.cpp b/libs/routing/routing_tests/turns_sound_test.cpp similarity index 100% rename from routing/routing_tests/turns_sound_test.cpp rename to libs/routing/routing_tests/turns_sound_test.cpp diff --git a/routing/routing_tests/turns_tts_text_tests.cpp b/libs/routing/routing_tests/turns_tts_text_tests.cpp similarity index 100% rename from routing/routing_tests/turns_tts_text_tests.cpp rename to libs/routing/routing_tests/turns_tts_text_tests.cpp diff --git a/routing/routing_tests/uturn_restriction_tests.cpp b/libs/routing/routing_tests/uturn_restriction_tests.cpp similarity index 100% rename from routing/routing_tests/uturn_restriction_tests.cpp rename to libs/routing/routing_tests/uturn_restriction_tests.cpp diff --git a/routing/routing_tests/world_graph_builder.cpp b/libs/routing/routing_tests/world_graph_builder.cpp similarity index 100% rename from routing/routing_tests/world_graph_builder.cpp rename to libs/routing/routing_tests/world_graph_builder.cpp diff --git a/routing/routing_tests/world_graph_builder.hpp b/libs/routing/routing_tests/world_graph_builder.hpp similarity index 100% rename from routing/routing_tests/world_graph_builder.hpp rename to libs/routing/routing_tests/world_graph_builder.hpp diff --git a/routing/ruler_router.cpp b/libs/routing/ruler_router.cpp similarity index 100% rename from routing/ruler_router.cpp rename to libs/routing/ruler_router.cpp diff --git a/routing/ruler_router.hpp b/libs/routing/ruler_router.hpp similarity index 100% rename from routing/ruler_router.hpp rename to libs/routing/ruler_router.hpp diff --git a/routing/segment.cpp b/libs/routing/segment.cpp similarity index 100% rename from routing/segment.cpp rename to libs/routing/segment.cpp diff --git a/routing/segment.hpp b/libs/routing/segment.hpp similarity index 100% rename from routing/segment.hpp rename to libs/routing/segment.hpp diff --git a/routing/segmented_route.cpp b/libs/routing/segmented_route.cpp similarity index 100% rename from routing/segmented_route.cpp rename to libs/routing/segmented_route.cpp diff --git a/routing/segmented_route.hpp b/libs/routing/segmented_route.hpp similarity index 100% rename from routing/segmented_route.hpp rename to libs/routing/segmented_route.hpp diff --git a/routing/single_vehicle_world_graph.cpp b/libs/routing/single_vehicle_world_graph.cpp similarity index 100% rename from routing/single_vehicle_world_graph.cpp rename to libs/routing/single_vehicle_world_graph.cpp diff --git a/routing/single_vehicle_world_graph.hpp b/libs/routing/single_vehicle_world_graph.hpp similarity index 100% rename from routing/single_vehicle_world_graph.hpp rename to libs/routing/single_vehicle_world_graph.hpp diff --git a/routing/speed_camera.cpp b/libs/routing/speed_camera.cpp similarity index 100% rename from routing/speed_camera.cpp rename to libs/routing/speed_camera.cpp diff --git a/routing/speed_camera.hpp b/libs/routing/speed_camera.hpp similarity index 100% rename from routing/speed_camera.hpp rename to libs/routing/speed_camera.hpp diff --git a/routing/speed_camera_manager.cpp b/libs/routing/speed_camera_manager.cpp similarity index 100% rename from routing/speed_camera_manager.cpp rename to libs/routing/speed_camera_manager.cpp diff --git a/routing/speed_camera_manager.hpp b/libs/routing/speed_camera_manager.hpp similarity index 100% rename from routing/speed_camera_manager.hpp rename to libs/routing/speed_camera_manager.hpp diff --git a/routing/speed_camera_prohibition.cpp b/libs/routing/speed_camera_prohibition.cpp similarity index 100% rename from routing/speed_camera_prohibition.cpp rename to libs/routing/speed_camera_prohibition.cpp diff --git a/routing/speed_camera_prohibition.hpp b/libs/routing/speed_camera_prohibition.hpp similarity index 100% rename from routing/speed_camera_prohibition.hpp rename to libs/routing/speed_camera_prohibition.hpp diff --git a/routing/speed_camera_ser_des.cpp b/libs/routing/speed_camera_ser_des.cpp similarity index 100% rename from routing/speed_camera_ser_des.cpp rename to libs/routing/speed_camera_ser_des.cpp diff --git a/routing/speed_camera_ser_des.hpp b/libs/routing/speed_camera_ser_des.hpp similarity index 100% rename from routing/speed_camera_ser_des.hpp rename to libs/routing/speed_camera_ser_des.hpp diff --git a/routing/traffic_stash.cpp b/libs/routing/traffic_stash.cpp similarity index 100% rename from routing/traffic_stash.cpp rename to libs/routing/traffic_stash.cpp diff --git a/routing/traffic_stash.hpp b/libs/routing/traffic_stash.hpp similarity index 100% rename from routing/traffic_stash.hpp rename to libs/routing/traffic_stash.hpp diff --git a/routing/transit_graph.cpp b/libs/routing/transit_graph.cpp similarity index 100% rename from routing/transit_graph.cpp rename to libs/routing/transit_graph.cpp diff --git a/routing/transit_graph.hpp b/libs/routing/transit_graph.hpp similarity index 100% rename from routing/transit_graph.hpp rename to libs/routing/transit_graph.hpp diff --git a/routing/transit_graph_loader.cpp b/libs/routing/transit_graph_loader.cpp similarity index 100% rename from routing/transit_graph_loader.cpp rename to libs/routing/transit_graph_loader.cpp diff --git a/routing/transit_graph_loader.hpp b/libs/routing/transit_graph_loader.hpp similarity index 100% rename from routing/transit_graph_loader.hpp rename to libs/routing/transit_graph_loader.hpp diff --git a/routing/transit_info.hpp b/libs/routing/transit_info.hpp similarity index 100% rename from routing/transit_info.hpp rename to libs/routing/transit_info.hpp diff --git a/routing/transit_world_graph.cpp b/libs/routing/transit_world_graph.cpp similarity index 100% rename from routing/transit_world_graph.cpp rename to libs/routing/transit_world_graph.cpp diff --git a/routing/transit_world_graph.hpp b/libs/routing/transit_world_graph.hpp similarity index 100% rename from routing/transit_world_graph.hpp rename to libs/routing/transit_world_graph.hpp diff --git a/routing/turn_candidate.hpp b/libs/routing/turn_candidate.hpp similarity index 100% rename from routing/turn_candidate.hpp rename to libs/routing/turn_candidate.hpp diff --git a/routing/turns.cpp b/libs/routing/turns.cpp similarity index 100% rename from routing/turns.cpp rename to libs/routing/turns.cpp diff --git a/routing/turns.hpp b/libs/routing/turns.hpp similarity index 100% rename from routing/turns.hpp rename to libs/routing/turns.hpp diff --git a/routing/turns_generator.cpp b/libs/routing/turns_generator.cpp similarity index 100% rename from routing/turns_generator.cpp rename to libs/routing/turns_generator.cpp diff --git a/routing/turns_generator.hpp b/libs/routing/turns_generator.hpp similarity index 100% rename from routing/turns_generator.hpp rename to libs/routing/turns_generator.hpp diff --git a/routing/turns_generator_utils.cpp b/libs/routing/turns_generator_utils.cpp similarity index 100% rename from routing/turns_generator_utils.cpp rename to libs/routing/turns_generator_utils.cpp diff --git a/routing/turns_generator_utils.hpp b/libs/routing/turns_generator_utils.hpp similarity index 100% rename from routing/turns_generator_utils.hpp rename to libs/routing/turns_generator_utils.hpp diff --git a/routing/turns_notification_manager.cpp b/libs/routing/turns_notification_manager.cpp similarity index 100% rename from routing/turns_notification_manager.cpp rename to libs/routing/turns_notification_manager.cpp diff --git a/routing/turns_notification_manager.hpp b/libs/routing/turns_notification_manager.hpp similarity index 100% rename from routing/turns_notification_manager.hpp rename to libs/routing/turns_notification_manager.hpp diff --git a/routing/turns_sound_settings.cpp b/libs/routing/turns_sound_settings.cpp similarity index 100% rename from routing/turns_sound_settings.cpp rename to libs/routing/turns_sound_settings.cpp diff --git a/routing/turns_sound_settings.hpp b/libs/routing/turns_sound_settings.hpp similarity index 100% rename from routing/turns_sound_settings.hpp rename to libs/routing/turns_sound_settings.hpp diff --git a/routing/turns_tts_text.cpp b/libs/routing/turns_tts_text.cpp similarity index 100% rename from routing/turns_tts_text.cpp rename to libs/routing/turns_tts_text.cpp diff --git a/routing/turns_tts_text.hpp b/libs/routing/turns_tts_text.hpp similarity index 100% rename from routing/turns_tts_text.hpp rename to libs/routing/turns_tts_text.hpp diff --git a/routing/turns_tts_text_i18n.cpp b/libs/routing/turns_tts_text_i18n.cpp similarity index 100% rename from routing/turns_tts_text_i18n.cpp rename to libs/routing/turns_tts_text_i18n.cpp diff --git a/routing/turns_tts_text_i18n.hpp b/libs/routing/turns_tts_text_i18n.hpp similarity index 100% rename from routing/turns_tts_text_i18n.hpp rename to libs/routing/turns_tts_text_i18n.hpp diff --git a/routing/vehicle_mask.cpp b/libs/routing/vehicle_mask.cpp similarity index 100% rename from routing/vehicle_mask.cpp rename to libs/routing/vehicle_mask.cpp diff --git a/routing/vehicle_mask.hpp b/libs/routing/vehicle_mask.hpp similarity index 100% rename from routing/vehicle_mask.hpp rename to libs/routing/vehicle_mask.hpp diff --git a/routing/world_graph.cpp b/libs/routing/world_graph.cpp similarity index 100% rename from routing/world_graph.cpp rename to libs/routing/world_graph.cpp diff --git a/routing/world_graph.hpp b/libs/routing/world_graph.hpp similarity index 100% rename from routing/world_graph.hpp rename to libs/routing/world_graph.hpp diff --git a/routing_common/CMakeLists.txt b/libs/routing_common/CMakeLists.txt similarity index 100% rename from routing_common/CMakeLists.txt rename to libs/routing_common/CMakeLists.txt diff --git a/routing_common/bicycle_model.cpp b/libs/routing_common/bicycle_model.cpp similarity index 100% rename from routing_common/bicycle_model.cpp rename to libs/routing_common/bicycle_model.cpp diff --git a/routing_common/bicycle_model.hpp b/libs/routing_common/bicycle_model.hpp similarity index 100% rename from routing_common/bicycle_model.hpp rename to libs/routing_common/bicycle_model.hpp diff --git a/routing_common/car_model.cpp b/libs/routing_common/car_model.cpp similarity index 100% rename from routing_common/car_model.cpp rename to libs/routing_common/car_model.cpp diff --git a/routing_common/car_model.hpp b/libs/routing_common/car_model.hpp similarity index 100% rename from routing_common/car_model.hpp rename to libs/routing_common/car_model.hpp diff --git a/routing_common/car_model_coefs.hpp b/libs/routing_common/car_model_coefs.hpp similarity index 100% rename from routing_common/car_model_coefs.hpp rename to libs/routing_common/car_model_coefs.hpp diff --git a/routing_common/maxspeed_conversion.cpp b/libs/routing_common/maxspeed_conversion.cpp similarity index 100% rename from routing_common/maxspeed_conversion.cpp rename to libs/routing_common/maxspeed_conversion.cpp diff --git a/routing_common/maxspeed_conversion.hpp b/libs/routing_common/maxspeed_conversion.hpp similarity index 100% rename from routing_common/maxspeed_conversion.hpp rename to libs/routing_common/maxspeed_conversion.hpp diff --git a/routing_common/num_mwm_id.hpp b/libs/routing_common/num_mwm_id.hpp similarity index 100% rename from routing_common/num_mwm_id.hpp rename to libs/routing_common/num_mwm_id.hpp diff --git a/routing_common/pedestrian_model.cpp b/libs/routing_common/pedestrian_model.cpp similarity index 100% rename from routing_common/pedestrian_model.cpp rename to libs/routing_common/pedestrian_model.cpp diff --git a/routing_common/pedestrian_model.hpp b/libs/routing_common/pedestrian_model.hpp similarity index 100% rename from routing_common/pedestrian_model.hpp rename to libs/routing_common/pedestrian_model.hpp diff --git a/routing_common/routing_common_tests/CMakeLists.txt b/libs/routing_common/routing_common_tests/CMakeLists.txt similarity index 100% rename from routing_common/routing_common_tests/CMakeLists.txt rename to libs/routing_common/routing_common_tests/CMakeLists.txt diff --git a/routing_common/routing_common_tests/bicycle_model_test.cpp b/libs/routing_common/routing_common_tests/bicycle_model_test.cpp similarity index 100% rename from routing_common/routing_common_tests/bicycle_model_test.cpp rename to libs/routing_common/routing_common_tests/bicycle_model_test.cpp diff --git a/routing_common/routing_common_tests/vehicle_model_for_country_test.cpp b/libs/routing_common/routing_common_tests/vehicle_model_for_country_test.cpp similarity index 100% rename from routing_common/routing_common_tests/vehicle_model_for_country_test.cpp rename to libs/routing_common/routing_common_tests/vehicle_model_for_country_test.cpp diff --git a/routing_common/routing_common_tests/vehicle_model_test.cpp b/libs/routing_common/routing_common_tests/vehicle_model_test.cpp similarity index 100% rename from routing_common/routing_common_tests/vehicle_model_test.cpp rename to libs/routing_common/routing_common_tests/vehicle_model_test.cpp diff --git a/routing_common/vehicle_model.cpp b/libs/routing_common/vehicle_model.cpp similarity index 100% rename from routing_common/vehicle_model.cpp rename to libs/routing_common/vehicle_model.cpp diff --git a/routing_common/vehicle_model.hpp b/libs/routing_common/vehicle_model.hpp similarity index 100% rename from routing_common/vehicle_model.hpp rename to libs/routing_common/vehicle_model.hpp diff --git a/search/CMakeLists.txt b/libs/search/CMakeLists.txt similarity index 100% rename from search/CMakeLists.txt rename to libs/search/CMakeLists.txt diff --git a/search/algos.hpp b/libs/search/algos.hpp similarity index 100% rename from search/algos.hpp rename to libs/search/algos.hpp diff --git a/search/approximate_string_match.cpp b/libs/search/approximate_string_match.cpp similarity index 100% rename from search/approximate_string_match.cpp rename to libs/search/approximate_string_match.cpp diff --git a/search/approximate_string_match.hpp b/libs/search/approximate_string_match.hpp similarity index 100% rename from search/approximate_string_match.hpp rename to libs/search/approximate_string_match.hpp diff --git a/search/base/inverted_list.hpp b/libs/search/base/inverted_list.hpp similarity index 100% rename from search/base/inverted_list.hpp rename to libs/search/base/inverted_list.hpp diff --git a/search/base/mem_search_index.hpp b/libs/search/base/mem_search_index.hpp similarity index 100% rename from search/base/mem_search_index.hpp rename to libs/search/base/mem_search_index.hpp diff --git a/search/base/text_index/dictionary.hpp b/libs/search/base/text_index/dictionary.hpp similarity index 100% rename from search/base/text_index/dictionary.hpp rename to libs/search/base/text_index/dictionary.hpp diff --git a/search/base/text_index/header.cpp b/libs/search/base/text_index/header.cpp similarity index 100% rename from search/base/text_index/header.cpp rename to libs/search/base/text_index/header.cpp diff --git a/search/base/text_index/header.hpp b/libs/search/base/text_index/header.hpp similarity index 100% rename from search/base/text_index/header.hpp rename to libs/search/base/text_index/header.hpp diff --git a/search/base/text_index/mem.cpp b/libs/search/base/text_index/mem.cpp similarity index 100% rename from search/base/text_index/mem.cpp rename to libs/search/base/text_index/mem.cpp diff --git a/search/base/text_index/mem.hpp b/libs/search/base/text_index/mem.hpp similarity index 100% rename from search/base/text_index/mem.hpp rename to libs/search/base/text_index/mem.hpp diff --git a/search/base/text_index/merger.cpp b/libs/search/base/text_index/merger.cpp similarity index 100% rename from search/base/text_index/merger.cpp rename to libs/search/base/text_index/merger.cpp diff --git a/search/base/text_index/merger.hpp b/libs/search/base/text_index/merger.hpp similarity index 100% rename from search/base/text_index/merger.hpp rename to libs/search/base/text_index/merger.hpp diff --git a/search/base/text_index/postings.hpp b/libs/search/base/text_index/postings.hpp similarity index 100% rename from search/base/text_index/postings.hpp rename to libs/search/base/text_index/postings.hpp diff --git a/search/base/text_index/reader.hpp b/libs/search/base/text_index/reader.hpp similarity index 100% rename from search/base/text_index/reader.hpp rename to libs/search/base/text_index/reader.hpp diff --git a/search/base/text_index/text_index.cpp b/libs/search/base/text_index/text_index.cpp similarity index 100% rename from search/base/text_index/text_index.cpp rename to libs/search/base/text_index/text_index.cpp diff --git a/search/base/text_index/text_index.hpp b/libs/search/base/text_index/text_index.hpp similarity index 100% rename from search/base/text_index/text_index.hpp rename to libs/search/base/text_index/text_index.hpp diff --git a/search/base/text_index/utils.hpp b/libs/search/base/text_index/utils.hpp similarity index 100% rename from search/base/text_index/utils.hpp rename to libs/search/base/text_index/utils.hpp diff --git a/search/bookmarks/data.cpp b/libs/search/bookmarks/data.cpp similarity index 100% rename from search/bookmarks/data.cpp rename to libs/search/bookmarks/data.cpp diff --git a/search/bookmarks/data.hpp b/libs/search/bookmarks/data.hpp similarity index 100% rename from search/bookmarks/data.hpp rename to libs/search/bookmarks/data.hpp diff --git a/search/bookmarks/processor.cpp b/libs/search/bookmarks/processor.cpp similarity index 100% rename from search/bookmarks/processor.cpp rename to libs/search/bookmarks/processor.cpp diff --git a/search/bookmarks/processor.hpp b/libs/search/bookmarks/processor.hpp similarity index 100% rename from search/bookmarks/processor.hpp rename to libs/search/bookmarks/processor.hpp diff --git a/search/bookmarks/results.hpp b/libs/search/bookmarks/results.hpp similarity index 100% rename from search/bookmarks/results.hpp rename to libs/search/bookmarks/results.hpp diff --git a/search/bookmarks/types.cpp b/libs/search/bookmarks/types.cpp similarity index 100% rename from search/bookmarks/types.cpp rename to libs/search/bookmarks/types.cpp diff --git a/search/bookmarks/types.hpp b/libs/search/bookmarks/types.hpp similarity index 100% rename from search/bookmarks/types.hpp rename to libs/search/bookmarks/types.hpp diff --git a/search/cancel_exception.hpp b/libs/search/cancel_exception.hpp similarity index 100% rename from search/cancel_exception.hpp rename to libs/search/cancel_exception.hpp diff --git a/search/categories_cache.cpp b/libs/search/categories_cache.cpp similarity index 100% rename from search/categories_cache.cpp rename to libs/search/categories_cache.cpp diff --git a/search/categories_cache.hpp b/libs/search/categories_cache.hpp similarity index 100% rename from search/categories_cache.hpp rename to libs/search/categories_cache.hpp diff --git a/search/categories_set.hpp b/libs/search/categories_set.hpp similarity index 100% rename from search/categories_set.hpp rename to libs/search/categories_set.hpp diff --git a/search/cbv.cpp b/libs/search/cbv.cpp similarity index 100% rename from search/cbv.cpp rename to libs/search/cbv.cpp diff --git a/search/cbv.hpp b/libs/search/cbv.hpp similarity index 100% rename from search/cbv.hpp rename to libs/search/cbv.hpp diff --git a/search/cities_boundaries_table.cpp b/libs/search/cities_boundaries_table.cpp similarity index 100% rename from search/cities_boundaries_table.cpp rename to libs/search/cities_boundaries_table.cpp diff --git a/search/cities_boundaries_table.hpp b/libs/search/cities_boundaries_table.hpp similarity index 100% rename from search/cities_boundaries_table.hpp rename to libs/search/cities_boundaries_table.hpp diff --git a/search/city_finder.cpp b/libs/search/city_finder.cpp similarity index 100% rename from search/city_finder.cpp rename to libs/search/city_finder.cpp diff --git a/search/city_finder.hpp b/libs/search/city_finder.hpp similarity index 100% rename from search/city_finder.hpp rename to libs/search/city_finder.hpp diff --git a/search/common.hpp b/libs/search/common.hpp similarity index 100% rename from search/common.hpp rename to libs/search/common.hpp diff --git a/search/cuisine_filter.cpp b/libs/search/cuisine_filter.cpp similarity index 100% rename from search/cuisine_filter.cpp rename to libs/search/cuisine_filter.cpp diff --git a/search/cuisine_filter.hpp b/libs/search/cuisine_filter.hpp similarity index 100% rename from search/cuisine_filter.hpp rename to libs/search/cuisine_filter.hpp diff --git a/search/displayed_categories.cpp b/libs/search/displayed_categories.cpp similarity index 100% rename from search/displayed_categories.cpp rename to libs/search/displayed_categories.cpp diff --git a/search/displayed_categories.hpp b/libs/search/displayed_categories.hpp similarity index 100% rename from search/displayed_categories.hpp rename to libs/search/displayed_categories.hpp diff --git a/search/doc_vec.cpp b/libs/search/doc_vec.cpp similarity index 100% rename from search/doc_vec.cpp rename to libs/search/doc_vec.cpp diff --git a/search/doc_vec.hpp b/libs/search/doc_vec.hpp similarity index 100% rename from search/doc_vec.hpp rename to libs/search/doc_vec.hpp diff --git a/search/downloader_search_callback.cpp b/libs/search/downloader_search_callback.cpp similarity index 100% rename from search/downloader_search_callback.cpp rename to libs/search/downloader_search_callback.cpp diff --git a/search/downloader_search_callback.hpp b/libs/search/downloader_search_callback.hpp similarity index 100% rename from search/downloader_search_callback.hpp rename to libs/search/downloader_search_callback.hpp diff --git a/search/dummy_rank_table.cpp b/libs/search/dummy_rank_table.cpp similarity index 100% rename from search/dummy_rank_table.cpp rename to libs/search/dummy_rank_table.cpp diff --git a/search/dummy_rank_table.hpp b/libs/search/dummy_rank_table.hpp similarity index 100% rename from search/dummy_rank_table.hpp rename to libs/search/dummy_rank_table.hpp diff --git a/search/editor_delegate.cpp b/libs/search/editor_delegate.cpp similarity index 100% rename from search/editor_delegate.cpp rename to libs/search/editor_delegate.cpp diff --git a/search/editor_delegate.hpp b/libs/search/editor_delegate.hpp similarity index 100% rename from search/editor_delegate.hpp rename to libs/search/editor_delegate.hpp diff --git a/search/emitter.hpp b/libs/search/emitter.hpp similarity index 100% rename from search/emitter.hpp rename to libs/search/emitter.hpp diff --git a/search/engine.cpp b/libs/search/engine.cpp similarity index 100% rename from search/engine.cpp rename to libs/search/engine.cpp diff --git a/search/engine.hpp b/libs/search/engine.hpp similarity index 100% rename from search/engine.hpp rename to libs/search/engine.hpp diff --git a/search/feature_loader.cpp b/libs/search/feature_loader.cpp similarity index 100% rename from search/feature_loader.cpp rename to libs/search/feature_loader.cpp diff --git a/search/feature_loader.hpp b/libs/search/feature_loader.hpp similarity index 100% rename from search/feature_loader.hpp rename to libs/search/feature_loader.hpp diff --git a/search/feature_offset_match.hpp b/libs/search/feature_offset_match.hpp similarity index 100% rename from search/feature_offset_match.hpp rename to libs/search/feature_offset_match.hpp diff --git a/search/features_filter.cpp b/libs/search/features_filter.cpp similarity index 100% rename from search/features_filter.cpp rename to libs/search/features_filter.cpp diff --git a/search/features_filter.hpp b/libs/search/features_filter.hpp similarity index 100% rename from search/features_filter.hpp rename to libs/search/features_filter.hpp diff --git a/search/features_layer.cpp b/libs/search/features_layer.cpp similarity index 100% rename from search/features_layer.cpp rename to libs/search/features_layer.cpp diff --git a/search/features_layer.hpp b/libs/search/features_layer.hpp similarity index 100% rename from search/features_layer.hpp rename to libs/search/features_layer.hpp diff --git a/search/features_layer_matcher.cpp b/libs/search/features_layer_matcher.cpp similarity index 100% rename from search/features_layer_matcher.cpp rename to libs/search/features_layer_matcher.cpp diff --git a/search/features_layer_matcher.hpp b/libs/search/features_layer_matcher.hpp similarity index 100% rename from search/features_layer_matcher.hpp rename to libs/search/features_layer_matcher.hpp diff --git a/search/features_layer_path_finder.cpp b/libs/search/features_layer_path_finder.cpp similarity index 100% rename from search/features_layer_path_finder.cpp rename to libs/search/features_layer_path_finder.cpp diff --git a/search/features_layer_path_finder.hpp b/libs/search/features_layer_path_finder.hpp similarity index 100% rename from search/features_layer_path_finder.hpp rename to libs/search/features_layer_path_finder.hpp diff --git a/search/filtering_params.hpp b/libs/search/filtering_params.hpp similarity index 100% rename from search/filtering_params.hpp rename to libs/search/filtering_params.hpp diff --git a/search/geocoder.cpp b/libs/search/geocoder.cpp similarity index 100% rename from search/geocoder.cpp rename to libs/search/geocoder.cpp diff --git a/search/geocoder.hpp b/libs/search/geocoder.hpp similarity index 100% rename from search/geocoder.hpp rename to libs/search/geocoder.hpp diff --git a/search/geocoder_context.cpp b/libs/search/geocoder_context.cpp similarity index 100% rename from search/geocoder_context.cpp rename to libs/search/geocoder_context.cpp diff --git a/search/geocoder_context.hpp b/libs/search/geocoder_context.hpp similarity index 100% rename from search/geocoder_context.hpp rename to libs/search/geocoder_context.hpp diff --git a/search/geocoder_locality.cpp b/libs/search/geocoder_locality.cpp similarity index 100% rename from search/geocoder_locality.cpp rename to libs/search/geocoder_locality.cpp diff --git a/search/geocoder_locality.hpp b/libs/search/geocoder_locality.hpp similarity index 100% rename from search/geocoder_locality.hpp rename to libs/search/geocoder_locality.hpp diff --git a/search/geometry_cache.cpp b/libs/search/geometry_cache.cpp similarity index 100% rename from search/geometry_cache.cpp rename to libs/search/geometry_cache.cpp diff --git a/search/geometry_cache.hpp b/libs/search/geometry_cache.hpp similarity index 100% rename from search/geometry_cache.hpp rename to libs/search/geometry_cache.hpp diff --git a/search/geometry_utils.cpp b/libs/search/geometry_utils.cpp similarity index 100% rename from search/geometry_utils.cpp rename to libs/search/geometry_utils.cpp diff --git a/search/geometry_utils.hpp b/libs/search/geometry_utils.hpp similarity index 100% rename from search/geometry_utils.hpp rename to libs/search/geometry_utils.hpp diff --git a/search/highlighting.cpp b/libs/search/highlighting.cpp similarity index 100% rename from search/highlighting.cpp rename to libs/search/highlighting.cpp diff --git a/search/highlighting.hpp b/libs/search/highlighting.hpp similarity index 100% rename from search/highlighting.hpp rename to libs/search/highlighting.hpp diff --git a/search/house_detector.cpp b/libs/search/house_detector.cpp similarity index 100% rename from search/house_detector.cpp rename to libs/search/house_detector.cpp diff --git a/search/house_detector.hpp b/libs/search/house_detector.hpp similarity index 100% rename from search/house_detector.hpp rename to libs/search/house_detector.hpp diff --git a/search/house_numbers_matcher.cpp b/libs/search/house_numbers_matcher.cpp similarity index 100% rename from search/house_numbers_matcher.cpp rename to libs/search/house_numbers_matcher.cpp diff --git a/search/house_numbers_matcher.hpp b/libs/search/house_numbers_matcher.hpp similarity index 100% rename from search/house_numbers_matcher.hpp rename to libs/search/house_numbers_matcher.hpp diff --git a/search/house_to_street_table.cpp b/libs/search/house_to_street_table.cpp similarity index 100% rename from search/house_to_street_table.cpp rename to libs/search/house_to_street_table.cpp diff --git a/search/house_to_street_table.hpp b/libs/search/house_to_street_table.hpp similarity index 100% rename from search/house_to_street_table.hpp rename to libs/search/house_to_street_table.hpp diff --git a/search/idf_map.cpp b/libs/search/idf_map.cpp similarity index 100% rename from search/idf_map.cpp rename to libs/search/idf_map.cpp diff --git a/search/idf_map.hpp b/libs/search/idf_map.hpp similarity index 100% rename from search/idf_map.hpp rename to libs/search/idf_map.hpp diff --git a/search/intermediate_result.cpp b/libs/search/intermediate_result.cpp similarity index 100% rename from search/intermediate_result.cpp rename to libs/search/intermediate_result.cpp diff --git a/search/intermediate_result.hpp b/libs/search/intermediate_result.hpp similarity index 100% rename from search/intermediate_result.hpp rename to libs/search/intermediate_result.hpp diff --git a/search/intersection_result.cpp b/libs/search/intersection_result.cpp similarity index 100% rename from search/intersection_result.cpp rename to libs/search/intersection_result.cpp diff --git a/search/intersection_result.hpp b/libs/search/intersection_result.hpp similarity index 100% rename from search/intersection_result.hpp rename to libs/search/intersection_result.hpp diff --git a/search/interval_set.hpp b/libs/search/interval_set.hpp similarity index 100% rename from search/interval_set.hpp rename to libs/search/interval_set.hpp diff --git a/search/keyword_lang_matcher.cpp b/libs/search/keyword_lang_matcher.cpp similarity index 100% rename from search/keyword_lang_matcher.cpp rename to libs/search/keyword_lang_matcher.cpp diff --git a/search/keyword_lang_matcher.hpp b/libs/search/keyword_lang_matcher.hpp similarity index 100% rename from search/keyword_lang_matcher.hpp rename to libs/search/keyword_lang_matcher.hpp diff --git a/search/keyword_matcher.cpp b/libs/search/keyword_matcher.cpp similarity index 100% rename from search/keyword_matcher.cpp rename to libs/search/keyword_matcher.cpp diff --git a/search/keyword_matcher.hpp b/libs/search/keyword_matcher.hpp similarity index 100% rename from search/keyword_matcher.hpp rename to libs/search/keyword_matcher.hpp diff --git a/search/latlon_match.cpp b/libs/search/latlon_match.cpp similarity index 100% rename from search/latlon_match.cpp rename to libs/search/latlon_match.cpp diff --git a/search/latlon_match.hpp b/libs/search/latlon_match.hpp similarity index 100% rename from search/latlon_match.hpp rename to libs/search/latlon_match.hpp diff --git a/search/lazy_centers_table.cpp b/libs/search/lazy_centers_table.cpp similarity index 100% rename from search/lazy_centers_table.cpp rename to libs/search/lazy_centers_table.cpp diff --git a/search/lazy_centers_table.hpp b/libs/search/lazy_centers_table.hpp similarity index 100% rename from search/lazy_centers_table.hpp rename to libs/search/lazy_centers_table.hpp diff --git a/search/localities_source.cpp b/libs/search/localities_source.cpp similarity index 100% rename from search/localities_source.cpp rename to libs/search/localities_source.cpp diff --git a/search/localities_source.hpp b/libs/search/localities_source.hpp similarity index 100% rename from search/localities_source.hpp rename to libs/search/localities_source.hpp diff --git a/search/locality_finder.cpp b/libs/search/locality_finder.cpp similarity index 100% rename from search/locality_finder.cpp rename to libs/search/locality_finder.cpp diff --git a/search/locality_finder.hpp b/libs/search/locality_finder.hpp similarity index 100% rename from search/locality_finder.hpp rename to libs/search/locality_finder.hpp diff --git a/search/locality_scorer.cpp b/libs/search/locality_scorer.cpp similarity index 100% rename from search/locality_scorer.cpp rename to libs/search/locality_scorer.cpp diff --git a/search/locality_scorer.hpp b/libs/search/locality_scorer.hpp similarity index 100% rename from search/locality_scorer.hpp rename to libs/search/locality_scorer.hpp diff --git a/search/mode.cpp b/libs/search/mode.cpp similarity index 100% rename from search/mode.cpp rename to libs/search/mode.cpp diff --git a/search/mode.hpp b/libs/search/mode.hpp similarity index 100% rename from search/mode.hpp rename to libs/search/mode.hpp diff --git a/search/model.cpp b/libs/search/model.cpp similarity index 100% rename from search/model.cpp rename to libs/search/model.cpp diff --git a/search/model.hpp b/libs/search/model.hpp similarity index 100% rename from search/model.hpp rename to libs/search/model.hpp diff --git a/search/mwm_context.cpp b/libs/search/mwm_context.cpp similarity index 100% rename from search/mwm_context.cpp rename to libs/search/mwm_context.cpp diff --git a/search/mwm_context.hpp b/libs/search/mwm_context.hpp similarity index 100% rename from search/mwm_context.hpp rename to libs/search/mwm_context.hpp diff --git a/search/nested_rects_cache.cpp b/libs/search/nested_rects_cache.cpp similarity index 100% rename from search/nested_rects_cache.cpp rename to libs/search/nested_rects_cache.cpp diff --git a/search/nested_rects_cache.hpp b/libs/search/nested_rects_cache.hpp similarity index 100% rename from search/nested_rects_cache.hpp rename to libs/search/nested_rects_cache.hpp diff --git a/search/point_rect_matcher.hpp b/libs/search/point_rect_matcher.hpp similarity index 100% rename from search/point_rect_matcher.hpp rename to libs/search/point_rect_matcher.hpp diff --git a/search/postcode_points.cpp b/libs/search/postcode_points.cpp similarity index 100% rename from search/postcode_points.cpp rename to libs/search/postcode_points.cpp diff --git a/search/postcode_points.hpp b/libs/search/postcode_points.hpp similarity index 100% rename from search/postcode_points.hpp rename to libs/search/postcode_points.hpp diff --git a/search/pre_ranker.cpp b/libs/search/pre_ranker.cpp similarity index 100% rename from search/pre_ranker.cpp rename to libs/search/pre_ranker.cpp diff --git a/search/pre_ranker.hpp b/libs/search/pre_ranker.hpp similarity index 100% rename from search/pre_ranker.hpp rename to libs/search/pre_ranker.hpp diff --git a/search/pre_ranking_info.cpp b/libs/search/pre_ranking_info.cpp similarity index 100% rename from search/pre_ranking_info.cpp rename to libs/search/pre_ranking_info.cpp diff --git a/search/pre_ranking_info.hpp b/libs/search/pre_ranking_info.hpp similarity index 100% rename from search/pre_ranking_info.hpp rename to libs/search/pre_ranking_info.hpp diff --git a/search/processor.cpp b/libs/search/processor.cpp similarity index 100% rename from search/processor.cpp rename to libs/search/processor.cpp diff --git a/search/processor.hpp b/libs/search/processor.hpp similarity index 100% rename from search/processor.hpp rename to libs/search/processor.hpp diff --git a/search/projection_on_street.cpp b/libs/search/projection_on_street.cpp similarity index 100% rename from search/projection_on_street.cpp rename to libs/search/projection_on_street.cpp diff --git a/search/projection_on_street.hpp b/libs/search/projection_on_street.hpp similarity index 100% rename from search/projection_on_street.hpp rename to libs/search/projection_on_street.hpp diff --git a/search/pysearch/CMakeLists.txt b/libs/search/pysearch/CMakeLists.txt similarity index 100% rename from search/pysearch/CMakeLists.txt rename to libs/search/pysearch/CMakeLists.txt diff --git a/search/pysearch/README.txt b/libs/search/pysearch/README.txt similarity index 100% rename from search/pysearch/README.txt rename to libs/search/pysearch/README.txt diff --git a/search/pysearch/bindings.cpp b/libs/search/pysearch/bindings.cpp similarity index 100% rename from search/pysearch/bindings.cpp rename to libs/search/pysearch/bindings.cpp diff --git a/search/pysearch/run_search_engine.py b/libs/search/pysearch/run_search_engine.py similarity index 100% rename from search/pysearch/run_search_engine.py rename to libs/search/pysearch/run_search_engine.py diff --git a/search/pysearch/run_search_server.py b/libs/search/pysearch/run_search_server.py similarity index 100% rename from search/pysearch/run_search_server.py rename to libs/search/pysearch/run_search_server.py diff --git a/search/pysearch/setup.py b/libs/search/pysearch/setup.py similarity index 100% rename from search/pysearch/setup.py rename to libs/search/pysearch/setup.py diff --git a/search/query_params.cpp b/libs/search/query_params.cpp similarity index 100% rename from search/query_params.cpp rename to libs/search/query_params.cpp diff --git a/search/query_params.hpp b/libs/search/query_params.hpp similarity index 100% rename from search/query_params.hpp rename to libs/search/query_params.hpp diff --git a/search/query_saver.cpp b/libs/search/query_saver.cpp similarity index 100% rename from search/query_saver.cpp rename to libs/search/query_saver.cpp diff --git a/search/query_saver.hpp b/libs/search/query_saver.hpp similarity index 100% rename from search/query_saver.hpp rename to libs/search/query_saver.hpp diff --git a/search/ranker.cpp b/libs/search/ranker.cpp similarity index 100% rename from search/ranker.cpp rename to libs/search/ranker.cpp diff --git a/search/ranker.hpp b/libs/search/ranker.hpp similarity index 100% rename from search/ranker.hpp rename to libs/search/ranker.hpp diff --git a/search/ranking_info.cpp b/libs/search/ranking_info.cpp similarity index 100% rename from search/ranking_info.cpp rename to libs/search/ranking_info.cpp diff --git a/search/ranking_info.hpp b/libs/search/ranking_info.hpp similarity index 100% rename from search/ranking_info.hpp rename to libs/search/ranking_info.hpp diff --git a/search/ranking_utils.cpp b/libs/search/ranking_utils.cpp similarity index 100% rename from search/ranking_utils.cpp rename to libs/search/ranking_utils.cpp diff --git a/search/ranking_utils.hpp b/libs/search/ranking_utils.hpp similarity index 100% rename from search/ranking_utils.hpp rename to libs/search/ranking_utils.hpp diff --git a/search/region_address_getter.cpp b/libs/search/region_address_getter.cpp similarity index 100% rename from search/region_address_getter.cpp rename to libs/search/region_address_getter.cpp diff --git a/search/region_address_getter.hpp b/libs/search/region_address_getter.hpp similarity index 100% rename from search/region_address_getter.hpp rename to libs/search/region_address_getter.hpp diff --git a/search/region_info_getter.cpp b/libs/search/region_info_getter.cpp similarity index 100% rename from search/region_info_getter.cpp rename to libs/search/region_info_getter.cpp diff --git a/search/region_info_getter.hpp b/libs/search/region_info_getter.hpp similarity index 100% rename from search/region_info_getter.hpp rename to libs/search/region_info_getter.hpp diff --git a/search/result.cpp b/libs/search/result.cpp similarity index 100% rename from search/result.cpp rename to libs/search/result.cpp diff --git a/search/result.hpp b/libs/search/result.hpp similarity index 100% rename from search/result.hpp rename to libs/search/result.hpp diff --git a/search/retrieval.cpp b/libs/search/retrieval.cpp similarity index 100% rename from search/retrieval.cpp rename to libs/search/retrieval.cpp diff --git a/search/retrieval.hpp b/libs/search/retrieval.hpp similarity index 100% rename from search/retrieval.hpp rename to libs/search/retrieval.hpp diff --git a/search/reverse_geocoder.cpp b/libs/search/reverse_geocoder.cpp similarity index 100% rename from search/reverse_geocoder.cpp rename to libs/search/reverse_geocoder.cpp diff --git a/search/reverse_geocoder.hpp b/libs/search/reverse_geocoder.hpp similarity index 100% rename from search/reverse_geocoder.hpp rename to libs/search/reverse_geocoder.hpp diff --git a/search/search_index_header.hpp b/libs/search/search_index_header.hpp similarity index 100% rename from search/search_index_header.hpp rename to libs/search/search_index_header.hpp diff --git a/search/search_index_values.hpp b/libs/search/search_index_values.hpp similarity index 100% rename from search/search_index_values.hpp rename to libs/search/search_index_values.hpp diff --git a/search/search_integration_tests/CMakeLists.txt b/libs/search/search_integration_tests/CMakeLists.txt similarity index 100% rename from search/search_integration_tests/CMakeLists.txt rename to libs/search/search_integration_tests/CMakeLists.txt diff --git a/search/search_integration_tests/downloader_search_test.cpp b/libs/search/search_integration_tests/downloader_search_test.cpp similarity index 100% rename from search/search_integration_tests/downloader_search_test.cpp rename to libs/search/search_integration_tests/downloader_search_test.cpp diff --git a/search/search_integration_tests/generate_tests.cpp b/libs/search/search_integration_tests/generate_tests.cpp similarity index 100% rename from search/search_integration_tests/generate_tests.cpp rename to libs/search/search_integration_tests/generate_tests.cpp diff --git a/search/search_integration_tests/postcode_points_tests.cpp b/libs/search/search_integration_tests/postcode_points_tests.cpp similarity index 100% rename from search/search_integration_tests/postcode_points_tests.cpp rename to libs/search/search_integration_tests/postcode_points_tests.cpp diff --git a/search/search_integration_tests/pre_ranker_test.cpp b/libs/search/search_integration_tests/pre_ranker_test.cpp similarity index 100% rename from search/search_integration_tests/pre_ranker_test.cpp rename to libs/search/search_integration_tests/pre_ranker_test.cpp diff --git a/search/search_integration_tests/processor_test.cpp b/libs/search/search_integration_tests/processor_test.cpp similarity index 100% rename from search/search_integration_tests/processor_test.cpp rename to libs/search/search_integration_tests/processor_test.cpp diff --git a/search/search_integration_tests/ranker_test.cpp b/libs/search/search_integration_tests/ranker_test.cpp similarity index 100% rename from search/search_integration_tests/ranker_test.cpp rename to libs/search/search_integration_tests/ranker_test.cpp diff --git a/search/search_integration_tests/search_edited_features_test.cpp b/libs/search/search_integration_tests/search_edited_features_test.cpp similarity index 100% rename from search/search_integration_tests/search_edited_features_test.cpp rename to libs/search/search_integration_tests/search_edited_features_test.cpp diff --git a/search/search_integration_tests/smoke_test.cpp b/libs/search/search_integration_tests/smoke_test.cpp similarity index 100% rename from search/search_integration_tests/smoke_test.cpp rename to libs/search/search_integration_tests/smoke_test.cpp diff --git a/search/search_integration_tests/tracer_tests.cpp b/libs/search/search_integration_tests/tracer_tests.cpp similarity index 100% rename from search/search_integration_tests/tracer_tests.cpp rename to libs/search/search_integration_tests/tracer_tests.cpp diff --git a/search/search_integration_tests/utils_test.cpp b/libs/search/search_integration_tests/utils_test.cpp similarity index 100% rename from search/search_integration_tests/utils_test.cpp rename to libs/search/search_integration_tests/utils_test.cpp diff --git a/search/search_params.cpp b/libs/search/search_params.cpp similarity index 100% rename from search/search_params.cpp rename to libs/search/search_params.cpp diff --git a/search/search_params.hpp b/libs/search/search_params.hpp similarity index 100% rename from search/search_params.hpp rename to libs/search/search_params.hpp diff --git a/search/search_quality/CMakeLists.txt b/libs/search/search_quality/CMakeLists.txt similarity index 100% rename from search/search_quality/CMakeLists.txt rename to libs/search/search_quality/CMakeLists.txt diff --git a/search/search_quality/README.txt b/libs/search/search_quality/README.txt similarity index 100% rename from search/search_quality/README.txt rename to libs/search/search_quality/README.txt diff --git a/search/search_quality/assessment_tool/CMakeLists.txt b/libs/search/search_quality/assessment_tool/CMakeLists.txt similarity index 100% rename from search/search_quality/assessment_tool/CMakeLists.txt rename to libs/search/search_quality/assessment_tool/CMakeLists.txt diff --git a/openlr/openlr_match_quality/openlr_assessment_tool/Info.plist b/libs/search/search_quality/assessment_tool/Info.plist similarity index 100% rename from openlr/openlr_match_quality/openlr_assessment_tool/Info.plist rename to libs/search/search_quality/assessment_tool/Info.plist diff --git a/search/search_quality/assessment_tool/assessment_tool.cpp b/libs/search/search_quality/assessment_tool/assessment_tool.cpp similarity index 100% rename from search/search_quality/assessment_tool/assessment_tool.cpp rename to libs/search/search_quality/assessment_tool/assessment_tool.cpp diff --git a/search/search_quality/assessment_tool/context.cpp b/libs/search/search_quality/assessment_tool/context.cpp similarity index 100% rename from search/search_quality/assessment_tool/context.cpp rename to libs/search/search_quality/assessment_tool/context.cpp diff --git a/search/search_quality/assessment_tool/context.hpp b/libs/search/search_quality/assessment_tool/context.hpp similarity index 100% rename from search/search_quality/assessment_tool/context.hpp rename to libs/search/search_quality/assessment_tool/context.hpp diff --git a/search/search_quality/assessment_tool/edits.cpp b/libs/search/search_quality/assessment_tool/edits.cpp similarity index 100% rename from search/search_quality/assessment_tool/edits.cpp rename to libs/search/search_quality/assessment_tool/edits.cpp diff --git a/search/search_quality/assessment_tool/edits.hpp b/libs/search/search_quality/assessment_tool/edits.hpp similarity index 100% rename from search/search_quality/assessment_tool/edits.hpp rename to libs/search/search_quality/assessment_tool/edits.hpp diff --git a/search/search_quality/assessment_tool/feature_info_dialog.cpp b/libs/search/search_quality/assessment_tool/feature_info_dialog.cpp similarity index 100% rename from search/search_quality/assessment_tool/feature_info_dialog.cpp rename to libs/search/search_quality/assessment_tool/feature_info_dialog.cpp diff --git a/search/search_quality/assessment_tool/feature_info_dialog.hpp b/libs/search/search_quality/assessment_tool/feature_info_dialog.hpp similarity index 100% rename from search/search_quality/assessment_tool/feature_info_dialog.hpp rename to libs/search/search_quality/assessment_tool/feature_info_dialog.hpp diff --git a/search/search_quality/assessment_tool/helpers.cpp b/libs/search/search_quality/assessment_tool/helpers.cpp similarity index 100% rename from search/search_quality/assessment_tool/helpers.cpp rename to libs/search/search_quality/assessment_tool/helpers.cpp diff --git a/search/search_quality/assessment_tool/helpers.hpp b/libs/search/search_quality/assessment_tool/helpers.hpp similarity index 100% rename from search/search_quality/assessment_tool/helpers.hpp rename to libs/search/search_quality/assessment_tool/helpers.hpp diff --git a/search/search_quality/assessment_tool/main_model.cpp b/libs/search/search_quality/assessment_tool/main_model.cpp similarity index 100% rename from search/search_quality/assessment_tool/main_model.cpp rename to libs/search/search_quality/assessment_tool/main_model.cpp diff --git a/search/search_quality/assessment_tool/main_model.hpp b/libs/search/search_quality/assessment_tool/main_model.hpp similarity index 100% rename from search/search_quality/assessment_tool/main_model.hpp rename to libs/search/search_quality/assessment_tool/main_model.hpp diff --git a/search/search_quality/assessment_tool/main_view.cpp b/libs/search/search_quality/assessment_tool/main_view.cpp similarity index 100% rename from search/search_quality/assessment_tool/main_view.cpp rename to libs/search/search_quality/assessment_tool/main_view.cpp diff --git a/search/search_quality/assessment_tool/main_view.hpp b/libs/search/search_quality/assessment_tool/main_view.hpp similarity index 100% rename from search/search_quality/assessment_tool/main_view.hpp rename to libs/search/search_quality/assessment_tool/main_view.hpp diff --git a/search/search_quality/assessment_tool/model.hpp b/libs/search/search_quality/assessment_tool/model.hpp similarity index 100% rename from search/search_quality/assessment_tool/model.hpp rename to libs/search/search_quality/assessment_tool/model.hpp diff --git a/search/search_quality/assessment_tool/result_view.cpp b/libs/search/search_quality/assessment_tool/result_view.cpp similarity index 100% rename from search/search_quality/assessment_tool/result_view.cpp rename to libs/search/search_quality/assessment_tool/result_view.cpp diff --git a/search/search_quality/assessment_tool/result_view.hpp b/libs/search/search_quality/assessment_tool/result_view.hpp similarity index 100% rename from search/search_quality/assessment_tool/result_view.hpp rename to libs/search/search_quality/assessment_tool/result_view.hpp diff --git a/search/search_quality/assessment_tool/results_view.cpp b/libs/search/search_quality/assessment_tool/results_view.cpp similarity index 100% rename from search/search_quality/assessment_tool/results_view.cpp rename to libs/search/search_quality/assessment_tool/results_view.cpp diff --git a/search/search_quality/assessment_tool/results_view.hpp b/libs/search/search_quality/assessment_tool/results_view.hpp similarity index 100% rename from search/search_quality/assessment_tool/results_view.hpp rename to libs/search/search_quality/assessment_tool/results_view.hpp diff --git a/search/search_quality/assessment_tool/sample_view.cpp b/libs/search/search_quality/assessment_tool/sample_view.cpp similarity index 100% rename from search/search_quality/assessment_tool/sample_view.cpp rename to libs/search/search_quality/assessment_tool/sample_view.cpp diff --git a/search/search_quality/assessment_tool/sample_view.hpp b/libs/search/search_quality/assessment_tool/sample_view.hpp similarity index 100% rename from search/search_quality/assessment_tool/sample_view.hpp rename to libs/search/search_quality/assessment_tool/sample_view.hpp diff --git a/search/search_quality/assessment_tool/samples_view.cpp b/libs/search/search_quality/assessment_tool/samples_view.cpp similarity index 100% rename from search/search_quality/assessment_tool/samples_view.cpp rename to libs/search/search_quality/assessment_tool/samples_view.cpp diff --git a/search/search_quality/assessment_tool/samples_view.hpp b/libs/search/search_quality/assessment_tool/samples_view.hpp similarity index 100% rename from search/search_quality/assessment_tool/samples_view.hpp rename to libs/search/search_quality/assessment_tool/samples_view.hpp diff --git a/search/search_quality/assessment_tool/search_request_runner.cpp b/libs/search/search_quality/assessment_tool/search_request_runner.cpp similarity index 100% rename from search/search_quality/assessment_tool/search_request_runner.cpp rename to libs/search/search_quality/assessment_tool/search_request_runner.cpp diff --git a/search/search_quality/assessment_tool/search_request_runner.hpp b/libs/search/search_quality/assessment_tool/search_request_runner.hpp similarity index 100% rename from search/search_quality/assessment_tool/search_request_runner.hpp rename to libs/search/search_quality/assessment_tool/search_request_runner.hpp diff --git a/search/search_quality/assessment_tool/view.hpp b/libs/search/search_quality/assessment_tool/view.hpp similarity index 100% rename from search/search_quality/assessment_tool/view.hpp rename to libs/search/search_quality/assessment_tool/view.hpp diff --git a/search/search_quality/clusterize-tag-values.lisp b/libs/search/search_quality/clusterize-tag-values.lisp similarity index 100% rename from search/search_quality/clusterize-tag-values.lisp rename to libs/search/search_quality/clusterize-tag-values.lisp diff --git a/search/search_quality/download-maps.sh b/libs/search/search_quality/download-maps.sh similarity index 100% rename from search/search_quality/download-maps.sh rename to libs/search/search_quality/download-maps.sh diff --git a/search/search_quality/features_collector_tool/CMakeLists.txt b/libs/search/search_quality/features_collector_tool/CMakeLists.txt similarity index 100% rename from search/search_quality/features_collector_tool/CMakeLists.txt rename to libs/search/search_quality/features_collector_tool/CMakeLists.txt diff --git a/search/search_quality/features_collector_tool/features_collector_tool.cpp b/libs/search/search_quality/features_collector_tool/features_collector_tool.cpp similarity index 100% rename from search/search_quality/features_collector_tool/features_collector_tool.cpp rename to libs/search/search_quality/features_collector_tool/features_collector_tool.cpp diff --git a/search/search_quality/gen-samples.lisp b/libs/search/search_quality/gen-samples.lisp similarity index 100% rename from search/search_quality/gen-samples.lisp rename to libs/search/search_quality/gen-samples.lisp diff --git a/search/search_quality/helpers.cpp b/libs/search/search_quality/helpers.cpp similarity index 100% rename from search/search_quality/helpers.cpp rename to libs/search/search_quality/helpers.cpp diff --git a/search/search_quality/helpers.hpp b/libs/search/search_quality/helpers.hpp similarity index 100% rename from search/search_quality/helpers.hpp rename to libs/search/search_quality/helpers.hpp diff --git a/search/search_quality/helpers_json.cpp b/libs/search/search_quality/helpers_json.cpp similarity index 100% rename from search/search_quality/helpers_json.cpp rename to libs/search/search_quality/helpers_json.cpp diff --git a/search/search_quality/helpers_json.hpp b/libs/search/search_quality/helpers_json.hpp similarity index 100% rename from search/search_quality/helpers_json.hpp rename to libs/search/search_quality/helpers_json.hpp diff --git a/search/search_quality/matcher.cpp b/libs/search/search_quality/matcher.cpp similarity index 100% rename from search/search_quality/matcher.cpp rename to libs/search/search_quality/matcher.cpp diff --git a/search/search_quality/matcher.hpp b/libs/search/search_quality/matcher.hpp similarity index 100% rename from search/search_quality/matcher.hpp rename to libs/search/search_quality/matcher.hpp diff --git a/search/search_quality/merge_samples.py b/libs/search/search_quality/merge_samples.py similarity index 100% rename from search/search_quality/merge_samples.py rename to libs/search/search_quality/merge_samples.py diff --git a/search/search_quality/sample.cpp b/libs/search/search_quality/sample.cpp similarity index 100% rename from search/search_quality/sample.cpp rename to libs/search/search_quality/sample.cpp diff --git a/search/search_quality/sample.hpp b/libs/search/search_quality/sample.hpp similarity index 100% rename from search/search_quality/sample.hpp rename to libs/search/search_quality/sample.hpp diff --git a/search/search_quality/samples_generation_tool/CMakeLists.txt b/libs/search/search_quality/samples_generation_tool/CMakeLists.txt similarity index 100% rename from search/search_quality/samples_generation_tool/CMakeLists.txt rename to libs/search/search_quality/samples_generation_tool/CMakeLists.txt diff --git a/search/search_quality/samples_generation_tool/samples_generation_tool.cpp b/libs/search/search_quality/samples_generation_tool/samples_generation_tool.cpp similarity index 100% rename from search/search_quality/samples_generation_tool/samples_generation_tool.cpp rename to libs/search/search_quality/samples_generation_tool/samples_generation_tool.cpp diff --git a/search/search_quality/scoring_model.py b/libs/search/search_quality/scoring_model.py similarity index 100% rename from search/search_quality/scoring_model.py rename to libs/search/search_quality/scoring_model.py diff --git a/search/search_quality/search_quality_tests/CMakeLists.txt b/libs/search/search_quality/search_quality_tests/CMakeLists.txt similarity index 100% rename from search/search_quality/search_quality_tests/CMakeLists.txt rename to libs/search/search_quality/search_quality_tests/CMakeLists.txt diff --git a/search/search_quality/search_quality_tests/benchmark_tests.cpp b/libs/search/search_quality/search_quality_tests/benchmark_tests.cpp similarity index 100% rename from search/search_quality/search_quality_tests/benchmark_tests.cpp rename to libs/search/search_quality/search_quality_tests/benchmark_tests.cpp diff --git a/search/search_quality/search_quality_tests/real_mwm_tests.cpp b/libs/search/search_quality/search_quality_tests/real_mwm_tests.cpp similarity index 100% rename from search/search_quality/search_quality_tests/real_mwm_tests.cpp rename to libs/search/search_quality/search_quality_tests/real_mwm_tests.cpp diff --git a/search/search_quality/search_quality_tests/sample_test.cpp b/libs/search/search_quality/search_quality_tests/sample_test.cpp similarity index 100% rename from search/search_quality/search_quality_tests/sample_test.cpp rename to libs/search/search_quality/search_quality_tests/sample_test.cpp diff --git a/search/search_quality/search_quality_tool/CMakeLists.txt b/libs/search/search_quality/search_quality_tool/CMakeLists.txt similarity index 100% rename from search/search_quality/search_quality_tool/CMakeLists.txt rename to libs/search/search_quality/search_quality_tool/CMakeLists.txt diff --git a/search/search_quality/search_quality_tool/queries.txt b/libs/search/search_quality/search_quality_tool/queries.txt similarity index 100% rename from search/search_quality/search_quality_tool/queries.txt rename to libs/search/search_quality/search_quality_tool/queries.txt diff --git a/search/search_quality/search_quality_tool/search_quality_tool.cpp b/libs/search/search_quality/search_quality_tool/search_quality_tool.cpp similarity index 100% rename from search/search_quality/search_quality_tool/search_quality_tool.cpp rename to libs/search/search_quality/search_quality_tool/search_quality_tool.cpp diff --git a/search/search_tests/CMakeLists.txt b/libs/search/search_tests/CMakeLists.txt similarity index 100% rename from search/search_tests/CMakeLists.txt rename to libs/search/search_tests/CMakeLists.txt diff --git a/search/search_tests/algos_tests.cpp b/libs/search/search_tests/algos_tests.cpp similarity index 100% rename from search/search_tests/algos_tests.cpp rename to libs/search/search_tests/algos_tests.cpp diff --git a/search/search_tests/bookmarks_processor_tests.cpp b/libs/search/search_tests/bookmarks_processor_tests.cpp similarity index 100% rename from search/search_tests/bookmarks_processor_tests.cpp rename to libs/search/search_tests/bookmarks_processor_tests.cpp diff --git a/search/search_tests/feature_offset_match_tests.cpp b/libs/search/search_tests/feature_offset_match_tests.cpp similarity index 100% rename from search/search_tests/feature_offset_match_tests.cpp rename to libs/search/search_tests/feature_offset_match_tests.cpp diff --git a/search/search_tests/highlighting_tests.cpp b/libs/search/search_tests/highlighting_tests.cpp similarity index 100% rename from search/search_tests/highlighting_tests.cpp rename to libs/search/search_tests/highlighting_tests.cpp diff --git a/search/search_tests/house_detector_tests.cpp b/libs/search/search_tests/house_detector_tests.cpp similarity index 100% rename from search/search_tests/house_detector_tests.cpp rename to libs/search/search_tests/house_detector_tests.cpp diff --git a/search/search_tests/house_numbers_matcher_test.cpp b/libs/search/search_tests/house_numbers_matcher_test.cpp similarity index 100% rename from search/search_tests/house_numbers_matcher_test.cpp rename to libs/search/search_tests/house_numbers_matcher_test.cpp diff --git a/search/search_tests/interval_set_test.cpp b/libs/search/search_tests/interval_set_test.cpp similarity index 100% rename from search/search_tests/interval_set_test.cpp rename to libs/search/search_tests/interval_set_test.cpp diff --git a/search/search_tests/keyword_lang_matcher_test.cpp b/libs/search/search_tests/keyword_lang_matcher_test.cpp similarity index 100% rename from search/search_tests/keyword_lang_matcher_test.cpp rename to libs/search/search_tests/keyword_lang_matcher_test.cpp diff --git a/search/search_tests/keyword_matcher_test.cpp b/libs/search/search_tests/keyword_matcher_test.cpp similarity index 100% rename from search/search_tests/keyword_matcher_test.cpp rename to libs/search/search_tests/keyword_matcher_test.cpp diff --git a/search/search_tests/latlon_match_test.cpp b/libs/search/search_tests/latlon_match_test.cpp similarity index 100% rename from search/search_tests/latlon_match_test.cpp rename to libs/search/search_tests/latlon_match_test.cpp diff --git a/search/search_tests/localities_source_tests.cpp b/libs/search/search_tests/localities_source_tests.cpp similarity index 100% rename from search/search_tests/localities_source_tests.cpp rename to libs/search/search_tests/localities_source_tests.cpp diff --git a/search/search_tests/locality_finder_test.cpp b/libs/search/search_tests/locality_finder_test.cpp similarity index 100% rename from search/search_tests/locality_finder_test.cpp rename to libs/search/search_tests/locality_finder_test.cpp diff --git a/search/search_tests/locality_scorer_test.cpp b/libs/search/search_tests/locality_scorer_test.cpp similarity index 100% rename from search/search_tests/locality_scorer_test.cpp rename to libs/search/search_tests/locality_scorer_test.cpp diff --git a/search/search_tests/locality_selector_test.cpp b/libs/search/search_tests/locality_selector_test.cpp similarity index 100% rename from search/search_tests/locality_selector_test.cpp rename to libs/search/search_tests/locality_selector_test.cpp diff --git a/search/search_tests/mem_search_index_tests.cpp b/libs/search/search_tests/mem_search_index_tests.cpp similarity index 100% rename from search/search_tests/mem_search_index_tests.cpp rename to libs/search/search_tests/mem_search_index_tests.cpp diff --git a/search/search_tests/point_rect_matcher_tests.cpp b/libs/search/search_tests/point_rect_matcher_tests.cpp similarity index 100% rename from search/search_tests/point_rect_matcher_tests.cpp rename to libs/search/search_tests/point_rect_matcher_tests.cpp diff --git a/search/search_tests/query_saver_tests.cpp b/libs/search/search_tests/query_saver_tests.cpp similarity index 100% rename from search/search_tests/query_saver_tests.cpp rename to libs/search/search_tests/query_saver_tests.cpp diff --git a/search/search_tests/ranking_tests.cpp b/libs/search/search_tests/ranking_tests.cpp similarity index 100% rename from search/search_tests/ranking_tests.cpp rename to libs/search/search_tests/ranking_tests.cpp diff --git a/search/search_tests/region_info_getter_tests.cpp b/libs/search/search_tests/region_info_getter_tests.cpp similarity index 100% rename from search/search_tests/region_info_getter_tests.cpp rename to libs/search/search_tests/region_info_getter_tests.cpp diff --git a/search/search_tests/results_tests.cpp b/libs/search/search_tests/results_tests.cpp similarity index 100% rename from search/search_tests/results_tests.cpp rename to libs/search/search_tests/results_tests.cpp diff --git a/search/search_tests/segment_tree_tests.cpp b/libs/search/search_tests/segment_tree_tests.cpp similarity index 100% rename from search/search_tests/segment_tree_tests.cpp rename to libs/search/search_tests/segment_tree_tests.cpp diff --git a/search/search_tests/string_match_test.cpp b/libs/search/search_tests/string_match_test.cpp similarity index 100% rename from search/search_tests/string_match_test.cpp rename to libs/search/search_tests/string_match_test.cpp diff --git a/search/search_tests/suggest_tests.cpp b/libs/search/search_tests/suggest_tests.cpp similarity index 100% rename from search/search_tests/suggest_tests.cpp rename to libs/search/search_tests/suggest_tests.cpp diff --git a/search/search_tests/text_index_tests.cpp b/libs/search/search_tests/text_index_tests.cpp similarity index 100% rename from search/search_tests/text_index_tests.cpp rename to libs/search/search_tests/text_index_tests.cpp diff --git a/search/search_tests/utm_mgrs_coords_match_test.cpp b/libs/search/search_tests/utm_mgrs_coords_match_test.cpp similarity index 100% rename from search/search_tests/utm_mgrs_coords_match_test.cpp rename to libs/search/search_tests/utm_mgrs_coords_match_test.cpp diff --git a/search/search_tests_support/CMakeLists.txt b/libs/search/search_tests_support/CMakeLists.txt similarity index 100% rename from search/search_tests_support/CMakeLists.txt rename to libs/search/search_tests_support/CMakeLists.txt diff --git a/search/search_tests_support/helpers.cpp b/libs/search/search_tests_support/helpers.cpp similarity index 100% rename from search/search_tests_support/helpers.cpp rename to libs/search/search_tests_support/helpers.cpp diff --git a/search/search_tests_support/helpers.hpp b/libs/search/search_tests_support/helpers.hpp similarity index 100% rename from search/search_tests_support/helpers.hpp rename to libs/search/search_tests_support/helpers.hpp diff --git a/search/search_tests_support/test_results_matching.cpp b/libs/search/search_tests_support/test_results_matching.cpp similarity index 100% rename from search/search_tests_support/test_results_matching.cpp rename to libs/search/search_tests_support/test_results_matching.cpp diff --git a/search/search_tests_support/test_results_matching.hpp b/libs/search/search_tests_support/test_results_matching.hpp similarity index 100% rename from search/search_tests_support/test_results_matching.hpp rename to libs/search/search_tests_support/test_results_matching.hpp diff --git a/search/search_tests_support/test_search_engine.cpp b/libs/search/search_tests_support/test_search_engine.cpp similarity index 100% rename from search/search_tests_support/test_search_engine.cpp rename to libs/search/search_tests_support/test_search_engine.cpp diff --git a/search/search_tests_support/test_search_engine.hpp b/libs/search/search_tests_support/test_search_engine.hpp similarity index 100% rename from search/search_tests_support/test_search_engine.hpp rename to libs/search/search_tests_support/test_search_engine.hpp diff --git a/search/search_tests_support/test_search_request.cpp b/libs/search/search_tests_support/test_search_request.cpp similarity index 100% rename from search/search_tests_support/test_search_request.cpp rename to libs/search/search_tests_support/test_search_request.cpp diff --git a/search/search_tests_support/test_search_request.hpp b/libs/search/search_tests_support/test_search_request.hpp similarity index 100% rename from search/search_tests_support/test_search_request.hpp rename to libs/search/search_tests_support/test_search_request.hpp diff --git a/search/search_tests_support/test_with_custom_mwms.hpp b/libs/search/search_tests_support/test_with_custom_mwms.hpp similarity index 100% rename from search/search_tests_support/test_with_custom_mwms.hpp rename to libs/search/search_tests_support/test_with_custom_mwms.hpp diff --git a/search/search_trie.hpp b/libs/search/search_trie.hpp similarity index 100% rename from search/search_trie.hpp rename to libs/search/search_trie.hpp diff --git a/search/segment_tree.cpp b/libs/search/segment_tree.cpp similarity index 100% rename from search/segment_tree.cpp rename to libs/search/segment_tree.cpp diff --git a/search/segment_tree.hpp b/libs/search/segment_tree.hpp similarity index 100% rename from search/segment_tree.hpp rename to libs/search/segment_tree.hpp diff --git a/search/stats_cache.hpp b/libs/search/stats_cache.hpp similarity index 100% rename from search/stats_cache.hpp rename to libs/search/stats_cache.hpp diff --git a/search/street_vicinity_loader.cpp b/libs/search/street_vicinity_loader.cpp similarity index 100% rename from search/street_vicinity_loader.cpp rename to libs/search/street_vicinity_loader.cpp diff --git a/search/street_vicinity_loader.hpp b/libs/search/street_vicinity_loader.hpp similarity index 100% rename from search/street_vicinity_loader.hpp rename to libs/search/street_vicinity_loader.hpp diff --git a/search/streets_matcher.cpp b/libs/search/streets_matcher.cpp similarity index 100% rename from search/streets_matcher.cpp rename to libs/search/streets_matcher.cpp diff --git a/search/streets_matcher.hpp b/libs/search/streets_matcher.hpp similarity index 100% rename from search/streets_matcher.hpp rename to libs/search/streets_matcher.hpp diff --git a/search/string_utils.cpp b/libs/search/string_utils.cpp similarity index 100% rename from search/string_utils.cpp rename to libs/search/string_utils.cpp diff --git a/search/string_utils.hpp b/libs/search/string_utils.hpp similarity index 100% rename from search/string_utils.hpp rename to libs/search/string_utils.hpp diff --git a/search/suggest.cpp b/libs/search/suggest.cpp similarity index 100% rename from search/suggest.cpp rename to libs/search/suggest.cpp diff --git a/search/suggest.hpp b/libs/search/suggest.hpp similarity index 100% rename from search/suggest.hpp rename to libs/search/suggest.hpp diff --git a/search/token_range.hpp b/libs/search/token_range.hpp similarity index 100% rename from search/token_range.hpp rename to libs/search/token_range.hpp diff --git a/search/token_slice.cpp b/libs/search/token_slice.cpp similarity index 100% rename from search/token_slice.cpp rename to libs/search/token_slice.cpp diff --git a/search/token_slice.hpp b/libs/search/token_slice.hpp similarity index 100% rename from search/token_slice.hpp rename to libs/search/token_slice.hpp diff --git a/search/tracer.cpp b/libs/search/tracer.cpp similarity index 100% rename from search/tracer.cpp rename to libs/search/tracer.cpp diff --git a/search/tracer.hpp b/libs/search/tracer.hpp similarity index 100% rename from search/tracer.hpp rename to libs/search/tracer.hpp diff --git a/search/types_skipper.cpp b/libs/search/types_skipper.cpp similarity index 100% rename from search/types_skipper.cpp rename to libs/search/types_skipper.cpp diff --git a/search/types_skipper.hpp b/libs/search/types_skipper.hpp similarity index 100% rename from search/types_skipper.hpp rename to libs/search/types_skipper.hpp diff --git a/search/utils.cpp b/libs/search/utils.cpp similarity index 100% rename from search/utils.cpp rename to libs/search/utils.cpp diff --git a/search/utils.hpp b/libs/search/utils.hpp similarity index 100% rename from search/utils.hpp rename to libs/search/utils.hpp diff --git a/search/utm_mgrs_coords_match.cpp b/libs/search/utm_mgrs_coords_match.cpp similarity index 100% rename from search/utm_mgrs_coords_match.cpp rename to libs/search/utm_mgrs_coords_match.cpp diff --git a/search/utm_mgrs_coords_match.hpp b/libs/search/utm_mgrs_coords_match.hpp similarity index 100% rename from search/utm_mgrs_coords_match.hpp rename to libs/search/utm_mgrs_coords_match.hpp diff --git a/shaders/.gitignore b/libs/shaders/.gitignore similarity index 100% rename from shaders/.gitignore rename to libs/shaders/.gitignore diff --git a/shaders/CMakeLists.txt b/libs/shaders/CMakeLists.txt similarity index 100% rename from shaders/CMakeLists.txt rename to libs/shaders/CMakeLists.txt diff --git a/shaders/GL/area.vsh.glsl b/libs/shaders/GL/area.vsh.glsl similarity index 100% rename from shaders/GL/area.vsh.glsl rename to libs/shaders/GL/area.vsh.glsl diff --git a/shaders/GL/area3d.vsh.glsl b/libs/shaders/GL/area3d.vsh.glsl similarity index 100% rename from shaders/GL/area3d.vsh.glsl rename to libs/shaders/GL/area3d.vsh.glsl diff --git a/shaders/GL/area3d_outline.vsh.glsl b/libs/shaders/GL/area3d_outline.vsh.glsl similarity index 100% rename from shaders/GL/area3d_outline.vsh.glsl rename to libs/shaders/GL/area3d_outline.vsh.glsl diff --git a/shaders/GL/arrow3d.fsh.glsl b/libs/shaders/GL/arrow3d.fsh.glsl similarity index 100% rename from shaders/GL/arrow3d.fsh.glsl rename to libs/shaders/GL/arrow3d.fsh.glsl diff --git a/shaders/GL/arrow3d.vsh.glsl b/libs/shaders/GL/arrow3d.vsh.glsl similarity index 100% rename from shaders/GL/arrow3d.vsh.glsl rename to libs/shaders/GL/arrow3d.vsh.glsl diff --git a/shaders/GL/arrow3d_outline.fsh.glsl b/libs/shaders/GL/arrow3d_outline.fsh.glsl similarity index 100% rename from shaders/GL/arrow3d_outline.fsh.glsl rename to libs/shaders/GL/arrow3d_outline.fsh.glsl diff --git a/shaders/GL/arrow3d_shadow.fsh.glsl b/libs/shaders/GL/arrow3d_shadow.fsh.glsl similarity index 100% rename from shaders/GL/arrow3d_shadow.fsh.glsl rename to libs/shaders/GL/arrow3d_shadow.fsh.glsl diff --git a/shaders/GL/arrow3d_shadow.vsh.glsl b/libs/shaders/GL/arrow3d_shadow.vsh.glsl similarity index 100% rename from shaders/GL/arrow3d_shadow.vsh.glsl rename to libs/shaders/GL/arrow3d_shadow.vsh.glsl diff --git a/shaders/GL/arrow3d_textured.fsh.glsl b/libs/shaders/GL/arrow3d_textured.fsh.glsl similarity index 100% rename from shaders/GL/arrow3d_textured.fsh.glsl rename to libs/shaders/GL/arrow3d_textured.fsh.glsl diff --git a/shaders/GL/arrow3d_textured.vsh.glsl b/libs/shaders/GL/arrow3d_textured.vsh.glsl similarity index 100% rename from shaders/GL/arrow3d_textured.vsh.glsl rename to libs/shaders/GL/arrow3d_textured.vsh.glsl diff --git a/shaders/GL/circle.fsh.glsl b/libs/shaders/GL/circle.fsh.glsl similarity index 100% rename from shaders/GL/circle.fsh.glsl rename to libs/shaders/GL/circle.fsh.glsl diff --git a/shaders/GL/circle.vsh.glsl b/libs/shaders/GL/circle.vsh.glsl similarity index 100% rename from shaders/GL/circle.vsh.glsl rename to libs/shaders/GL/circle.vsh.glsl diff --git a/shaders/GL/circle_point.fsh.glsl b/libs/shaders/GL/circle_point.fsh.glsl similarity index 100% rename from shaders/GL/circle_point.fsh.glsl rename to libs/shaders/GL/circle_point.fsh.glsl diff --git a/shaders/GL/circle_point.vsh.glsl b/libs/shaders/GL/circle_point.vsh.glsl similarity index 100% rename from shaders/GL/circle_point.vsh.glsl rename to libs/shaders/GL/circle_point.vsh.glsl diff --git a/shaders/GL/colored_symbol.fsh.glsl b/libs/shaders/GL/colored_symbol.fsh.glsl similarity index 100% rename from shaders/GL/colored_symbol.fsh.glsl rename to libs/shaders/GL/colored_symbol.fsh.glsl diff --git a/shaders/GL/colored_symbol.vsh.glsl b/libs/shaders/GL/colored_symbol.vsh.glsl similarity index 100% rename from shaders/GL/colored_symbol.vsh.glsl rename to libs/shaders/GL/colored_symbol.vsh.glsl diff --git a/shaders/GL/colored_symbol_billboard.vsh.glsl b/libs/shaders/GL/colored_symbol_billboard.vsh.glsl similarity index 100% rename from shaders/GL/colored_symbol_billboard.vsh.glsl rename to libs/shaders/GL/colored_symbol_billboard.vsh.glsl diff --git a/shaders/GL/dashed_line.fsh.glsl b/libs/shaders/GL/dashed_line.fsh.glsl similarity index 100% rename from shaders/GL/dashed_line.fsh.glsl rename to libs/shaders/GL/dashed_line.fsh.glsl diff --git a/shaders/GL/dashed_line.vsh.glsl b/libs/shaders/GL/dashed_line.vsh.glsl similarity index 100% rename from shaders/GL/dashed_line.vsh.glsl rename to libs/shaders/GL/dashed_line.vsh.glsl diff --git a/shaders/GL/debug_rect.fsh.glsl b/libs/shaders/GL/debug_rect.fsh.glsl similarity index 100% rename from shaders/GL/debug_rect.fsh.glsl rename to libs/shaders/GL/debug_rect.fsh.glsl diff --git a/shaders/GL/debug_rect.vsh.glsl b/libs/shaders/GL/debug_rect.vsh.glsl similarity index 100% rename from shaders/GL/debug_rect.vsh.glsl rename to libs/shaders/GL/debug_rect.vsh.glsl diff --git a/shaders/GL/hatching_area.fsh.glsl b/libs/shaders/GL/hatching_area.fsh.glsl similarity index 100% rename from shaders/GL/hatching_area.fsh.glsl rename to libs/shaders/GL/hatching_area.fsh.glsl diff --git a/shaders/GL/hatching_area.vsh.glsl b/libs/shaders/GL/hatching_area.vsh.glsl similarity index 100% rename from shaders/GL/hatching_area.vsh.glsl rename to libs/shaders/GL/hatching_area.vsh.glsl diff --git a/shaders/GL/imgui.fsh.glsl b/libs/shaders/GL/imgui.fsh.glsl similarity index 100% rename from shaders/GL/imgui.fsh.glsl rename to libs/shaders/GL/imgui.fsh.glsl diff --git a/shaders/GL/imgui.vsh.glsl b/libs/shaders/GL/imgui.vsh.glsl similarity index 100% rename from shaders/GL/imgui.vsh.glsl rename to libs/shaders/GL/imgui.vsh.glsl diff --git a/shaders/GL/line.fsh.glsl b/libs/shaders/GL/line.fsh.glsl similarity index 100% rename from shaders/GL/line.fsh.glsl rename to libs/shaders/GL/line.fsh.glsl diff --git a/shaders/GL/line.vsh.glsl b/libs/shaders/GL/line.vsh.glsl similarity index 100% rename from shaders/GL/line.vsh.glsl rename to libs/shaders/GL/line.vsh.glsl diff --git a/shaders/GL/masked_texturing.fsh.glsl b/libs/shaders/GL/masked_texturing.fsh.glsl similarity index 100% rename from shaders/GL/masked_texturing.fsh.glsl rename to libs/shaders/GL/masked_texturing.fsh.glsl diff --git a/shaders/GL/masked_texturing.vsh.glsl b/libs/shaders/GL/masked_texturing.vsh.glsl similarity index 100% rename from shaders/GL/masked_texturing.vsh.glsl rename to libs/shaders/GL/masked_texturing.vsh.glsl diff --git a/shaders/GL/masked_texturing_billboard.vsh.glsl b/libs/shaders/GL/masked_texturing_billboard.vsh.glsl similarity index 100% rename from shaders/GL/masked_texturing_billboard.vsh.glsl rename to libs/shaders/GL/masked_texturing_billboard.vsh.glsl diff --git a/shaders/GL/my_position.vsh.glsl b/libs/shaders/GL/my_position.vsh.glsl similarity index 100% rename from shaders/GL/my_position.vsh.glsl rename to libs/shaders/GL/my_position.vsh.glsl diff --git a/shaders/GL/path_symbol.vsh.glsl b/libs/shaders/GL/path_symbol.vsh.glsl similarity index 100% rename from shaders/GL/path_symbol.vsh.glsl rename to libs/shaders/GL/path_symbol.vsh.glsl diff --git a/shaders/GL/position_accuracy3d.vsh.glsl b/libs/shaders/GL/position_accuracy3d.vsh.glsl similarity index 100% rename from shaders/GL/position_accuracy3d.vsh.glsl rename to libs/shaders/GL/position_accuracy3d.vsh.glsl diff --git a/shaders/GL/route.fsh.glsl b/libs/shaders/GL/route.fsh.glsl similarity index 100% rename from shaders/GL/route.fsh.glsl rename to libs/shaders/GL/route.fsh.glsl diff --git a/shaders/GL/route.vsh.glsl b/libs/shaders/GL/route.vsh.glsl similarity index 100% rename from shaders/GL/route.vsh.glsl rename to libs/shaders/GL/route.vsh.glsl diff --git a/shaders/GL/route_arrow.fsh.glsl b/libs/shaders/GL/route_arrow.fsh.glsl similarity index 100% rename from shaders/GL/route_arrow.fsh.glsl rename to libs/shaders/GL/route_arrow.fsh.glsl diff --git a/shaders/GL/route_arrow.vsh.glsl b/libs/shaders/GL/route_arrow.vsh.glsl similarity index 100% rename from shaders/GL/route_arrow.vsh.glsl rename to libs/shaders/GL/route_arrow.vsh.glsl diff --git a/shaders/GL/route_dash.fsh.glsl b/libs/shaders/GL/route_dash.fsh.glsl similarity index 100% rename from shaders/GL/route_dash.fsh.glsl rename to libs/shaders/GL/route_dash.fsh.glsl diff --git a/shaders/GL/route_marker.fsh.glsl b/libs/shaders/GL/route_marker.fsh.glsl similarity index 100% rename from shaders/GL/route_marker.fsh.glsl rename to libs/shaders/GL/route_marker.fsh.glsl diff --git a/shaders/GL/route_marker.vsh.glsl b/libs/shaders/GL/route_marker.vsh.glsl similarity index 100% rename from shaders/GL/route_marker.vsh.glsl rename to libs/shaders/GL/route_marker.vsh.glsl diff --git a/shaders/GL/ruler.vsh.glsl b/libs/shaders/GL/ruler.vsh.glsl similarity index 100% rename from shaders/GL/ruler.vsh.glsl rename to libs/shaders/GL/ruler.vsh.glsl diff --git a/shaders/GL/screen_quad.vsh.glsl b/libs/shaders/GL/screen_quad.vsh.glsl similarity index 100% rename from shaders/GL/screen_quad.vsh.glsl rename to libs/shaders/GL/screen_quad.vsh.glsl diff --git a/shaders/GL/selection_line.fsh.glsl b/libs/shaders/GL/selection_line.fsh.glsl similarity index 100% rename from shaders/GL/selection_line.fsh.glsl rename to libs/shaders/GL/selection_line.fsh.glsl diff --git a/shaders/GL/selection_line.vsh.glsl b/libs/shaders/GL/selection_line.vsh.glsl similarity index 100% rename from shaders/GL/selection_line.vsh.glsl rename to libs/shaders/GL/selection_line.vsh.glsl diff --git a/shaders/GL/shader_index.txt b/libs/shaders/GL/shader_index.txt similarity index 100% rename from shaders/GL/shader_index.txt rename to libs/shaders/GL/shader_index.txt diff --git a/shaders/GL/shaders_lib.glsl b/libs/shaders/GL/shaders_lib.glsl similarity index 100% rename from shaders/GL/shaders_lib.glsl rename to libs/shaders/GL/shaders_lib.glsl diff --git a/shaders/GL/smaa_blending_weight.fsh.glsl b/libs/shaders/GL/smaa_blending_weight.fsh.glsl similarity index 100% rename from shaders/GL/smaa_blending_weight.fsh.glsl rename to libs/shaders/GL/smaa_blending_weight.fsh.glsl diff --git a/shaders/GL/smaa_blending_weight.vsh.glsl b/libs/shaders/GL/smaa_blending_weight.vsh.glsl similarity index 100% rename from shaders/GL/smaa_blending_weight.vsh.glsl rename to libs/shaders/GL/smaa_blending_weight.vsh.glsl diff --git a/shaders/GL/smaa_edges.fsh.glsl b/libs/shaders/GL/smaa_edges.fsh.glsl similarity index 100% rename from shaders/GL/smaa_edges.fsh.glsl rename to libs/shaders/GL/smaa_edges.fsh.glsl diff --git a/shaders/GL/smaa_edges.vsh.glsl b/libs/shaders/GL/smaa_edges.vsh.glsl similarity index 100% rename from shaders/GL/smaa_edges.vsh.glsl rename to libs/shaders/GL/smaa_edges.vsh.glsl diff --git a/shaders/GL/smaa_final.fsh.glsl b/libs/shaders/GL/smaa_final.fsh.glsl similarity index 100% rename from shaders/GL/smaa_final.fsh.glsl rename to libs/shaders/GL/smaa_final.fsh.glsl diff --git a/shaders/GL/smaa_final.vsh.glsl b/libs/shaders/GL/smaa_final.vsh.glsl similarity index 100% rename from shaders/GL/smaa_final.vsh.glsl rename to libs/shaders/GL/smaa_final.vsh.glsl diff --git a/shaders/GL/solid_color.fsh.glsl b/libs/shaders/GL/solid_color.fsh.glsl similarity index 100% rename from shaders/GL/solid_color.fsh.glsl rename to libs/shaders/GL/solid_color.fsh.glsl diff --git a/shaders/GL/text.fsh.glsl b/libs/shaders/GL/text.fsh.glsl similarity index 100% rename from shaders/GL/text.fsh.glsl rename to libs/shaders/GL/text.fsh.glsl diff --git a/shaders/GL/text.vsh.glsl b/libs/shaders/GL/text.vsh.glsl similarity index 100% rename from shaders/GL/text.vsh.glsl rename to libs/shaders/GL/text.vsh.glsl diff --git a/shaders/GL/text_billboard.vsh.glsl b/libs/shaders/GL/text_billboard.vsh.glsl similarity index 100% rename from shaders/GL/text_billboard.vsh.glsl rename to libs/shaders/GL/text_billboard.vsh.glsl diff --git a/shaders/GL/text_outlined.vsh.glsl b/libs/shaders/GL/text_outlined.vsh.glsl similarity index 100% rename from shaders/GL/text_outlined.vsh.glsl rename to libs/shaders/GL/text_outlined.vsh.glsl diff --git a/shaders/GL/text_outlined_billboard.vsh.glsl b/libs/shaders/GL/text_outlined_billboard.vsh.glsl similarity index 100% rename from shaders/GL/text_outlined_billboard.vsh.glsl rename to libs/shaders/GL/text_outlined_billboard.vsh.glsl diff --git a/shaders/GL/text_outlined_gui.vsh.glsl b/libs/shaders/GL/text_outlined_gui.vsh.glsl similarity index 100% rename from shaders/GL/text_outlined_gui.vsh.glsl rename to libs/shaders/GL/text_outlined_gui.vsh.glsl diff --git a/shaders/GL/texturing.fsh.glsl b/libs/shaders/GL/texturing.fsh.glsl similarity index 100% rename from shaders/GL/texturing.fsh.glsl rename to libs/shaders/GL/texturing.fsh.glsl diff --git a/shaders/GL/texturing.vsh.glsl b/libs/shaders/GL/texturing.vsh.glsl similarity index 100% rename from shaders/GL/texturing.vsh.glsl rename to libs/shaders/GL/texturing.vsh.glsl diff --git a/shaders/GL/texturing3d.fsh.glsl b/libs/shaders/GL/texturing3d.fsh.glsl similarity index 100% rename from shaders/GL/texturing3d.fsh.glsl rename to libs/shaders/GL/texturing3d.fsh.glsl diff --git a/shaders/GL/texturing_billboard.vsh.glsl b/libs/shaders/GL/texturing_billboard.vsh.glsl similarity index 100% rename from shaders/GL/texturing_billboard.vsh.glsl rename to libs/shaders/GL/texturing_billboard.vsh.glsl diff --git a/shaders/GL/texturing_gui.vsh.glsl b/libs/shaders/GL/texturing_gui.vsh.glsl similarity index 100% rename from shaders/GL/texturing_gui.vsh.glsl rename to libs/shaders/GL/texturing_gui.vsh.glsl diff --git a/shaders/GL/traffic.fsh.glsl b/libs/shaders/GL/traffic.fsh.glsl similarity index 100% rename from shaders/GL/traffic.fsh.glsl rename to libs/shaders/GL/traffic.fsh.glsl diff --git a/shaders/GL/traffic.vsh.glsl b/libs/shaders/GL/traffic.vsh.glsl similarity index 100% rename from shaders/GL/traffic.vsh.glsl rename to libs/shaders/GL/traffic.vsh.glsl diff --git a/shaders/GL/traffic_circle.fsh.glsl b/libs/shaders/GL/traffic_circle.fsh.glsl similarity index 100% rename from shaders/GL/traffic_circle.fsh.glsl rename to libs/shaders/GL/traffic_circle.fsh.glsl diff --git a/shaders/GL/traffic_circle.vsh.glsl b/libs/shaders/GL/traffic_circle.vsh.glsl similarity index 100% rename from shaders/GL/traffic_circle.vsh.glsl rename to libs/shaders/GL/traffic_circle.vsh.glsl diff --git a/shaders/GL/traffic_line.fsh.glsl b/libs/shaders/GL/traffic_line.fsh.glsl similarity index 100% rename from shaders/GL/traffic_line.fsh.glsl rename to libs/shaders/GL/traffic_line.fsh.glsl diff --git a/shaders/GL/traffic_line.vsh.glsl b/libs/shaders/GL/traffic_line.vsh.glsl similarity index 100% rename from shaders/GL/traffic_line.vsh.glsl rename to libs/shaders/GL/traffic_line.vsh.glsl diff --git a/shaders/GL/transit.fsh.glsl b/libs/shaders/GL/transit.fsh.glsl similarity index 100% rename from shaders/GL/transit.fsh.glsl rename to libs/shaders/GL/transit.fsh.glsl diff --git a/shaders/GL/transit.vsh.glsl b/libs/shaders/GL/transit.vsh.glsl similarity index 100% rename from shaders/GL/transit.vsh.glsl rename to libs/shaders/GL/transit.vsh.glsl diff --git a/shaders/GL/transit_circle.fsh.glsl b/libs/shaders/GL/transit_circle.fsh.glsl similarity index 100% rename from shaders/GL/transit_circle.fsh.glsl rename to libs/shaders/GL/transit_circle.fsh.glsl diff --git a/shaders/GL/transit_circle.vsh.glsl b/libs/shaders/GL/transit_circle.vsh.glsl similarity index 100% rename from shaders/GL/transit_circle.vsh.glsl rename to libs/shaders/GL/transit_circle.vsh.glsl diff --git a/shaders/GL/transit_marker.fsh.glsl b/libs/shaders/GL/transit_marker.fsh.glsl similarity index 100% rename from shaders/GL/transit_marker.fsh.glsl rename to libs/shaders/GL/transit_marker.fsh.glsl diff --git a/shaders/GL/transit_marker.vsh.glsl b/libs/shaders/GL/transit_marker.vsh.glsl similarity index 100% rename from shaders/GL/transit_marker.vsh.glsl rename to libs/shaders/GL/transit_marker.vsh.glsl diff --git a/shaders/GL/user_mark.fsh.glsl b/libs/shaders/GL/user_mark.fsh.glsl similarity index 100% rename from shaders/GL/user_mark.fsh.glsl rename to libs/shaders/GL/user_mark.fsh.glsl diff --git a/shaders/GL/user_mark.vsh.glsl b/libs/shaders/GL/user_mark.vsh.glsl similarity index 100% rename from shaders/GL/user_mark.vsh.glsl rename to libs/shaders/GL/user_mark.vsh.glsl diff --git a/shaders/GL/user_mark_billboard.vsh.glsl b/libs/shaders/GL/user_mark_billboard.vsh.glsl similarity index 100% rename from shaders/GL/user_mark_billboard.vsh.glsl rename to libs/shaders/GL/user_mark_billboard.vsh.glsl diff --git a/shaders/Metal/arrow3d.metal b/libs/shaders/Metal/arrow3d.metal similarity index 100% rename from shaders/Metal/arrow3d.metal rename to libs/shaders/Metal/arrow3d.metal diff --git a/shaders/Metal/debug_rect.metal b/libs/shaders/Metal/debug_rect.metal similarity index 100% rename from shaders/Metal/debug_rect.metal rename to libs/shaders/Metal/debug_rect.metal diff --git a/shaders/Metal/gui.metal b/libs/shaders/Metal/gui.metal similarity index 100% rename from shaders/Metal/gui.metal rename to libs/shaders/Metal/gui.metal diff --git a/shaders/Metal/imgui.metal b/libs/shaders/Metal/imgui.metal similarity index 100% rename from shaders/Metal/imgui.metal rename to libs/shaders/Metal/imgui.metal diff --git a/shaders/Metal/map.metal b/libs/shaders/Metal/map.metal similarity index 100% rename from shaders/Metal/map.metal rename to libs/shaders/Metal/map.metal diff --git a/shaders/Metal/route.metal b/libs/shaders/Metal/route.metal similarity index 100% rename from shaders/Metal/route.metal rename to libs/shaders/Metal/route.metal diff --git a/shaders/Metal/screen_quad.metal b/libs/shaders/Metal/screen_quad.metal similarity index 100% rename from shaders/Metal/screen_quad.metal rename to libs/shaders/Metal/screen_quad.metal diff --git a/shaders/Metal/shaders_lib.h b/libs/shaders/Metal/shaders_lib.h similarity index 100% rename from shaders/Metal/shaders_lib.h rename to libs/shaders/Metal/shaders_lib.h diff --git a/shaders/Metal/shaders_lib.metal b/libs/shaders/Metal/shaders_lib.metal similarity index 100% rename from shaders/Metal/shaders_lib.metal rename to libs/shaders/Metal/shaders_lib.metal diff --git a/shaders/Metal/shapes.metal b/libs/shaders/Metal/shapes.metal similarity index 100% rename from shaders/Metal/shapes.metal rename to libs/shaders/Metal/shapes.metal diff --git a/shaders/Metal/smaa.metal b/libs/shaders/Metal/smaa.metal similarity index 100% rename from shaders/Metal/smaa.metal rename to libs/shaders/Metal/smaa.metal diff --git a/shaders/Metal/system.metal b/libs/shaders/Metal/system.metal similarity index 100% rename from shaders/Metal/system.metal rename to libs/shaders/Metal/system.metal diff --git a/shaders/Metal/traffic.metal b/libs/shaders/Metal/traffic.metal similarity index 100% rename from shaders/Metal/traffic.metal rename to libs/shaders/Metal/traffic.metal diff --git a/shaders/Metal/transit.metal b/libs/shaders/Metal/transit.metal similarity index 100% rename from shaders/Metal/transit.metal rename to libs/shaders/Metal/transit.metal diff --git a/shaders/gl_program_info.hpp b/libs/shaders/gl_program_info.hpp similarity index 100% rename from shaders/gl_program_info.hpp rename to libs/shaders/gl_program_info.hpp diff --git a/shaders/gl_program_params.cpp b/libs/shaders/gl_program_params.cpp similarity index 100% rename from shaders/gl_program_params.cpp rename to libs/shaders/gl_program_params.cpp diff --git a/shaders/gl_program_params.hpp b/libs/shaders/gl_program_params.hpp similarity index 100% rename from shaders/gl_program_params.hpp rename to libs/shaders/gl_program_params.hpp diff --git a/shaders/gl_program_pool.cpp b/libs/shaders/gl_program_pool.cpp similarity index 100% rename from shaders/gl_program_pool.cpp rename to libs/shaders/gl_program_pool.cpp diff --git a/shaders/gl_program_pool.hpp b/libs/shaders/gl_program_pool.hpp similarity index 100% rename from shaders/gl_program_pool.hpp rename to libs/shaders/gl_program_pool.hpp diff --git a/shaders/gl_shaders_preprocessor.py b/libs/shaders/gl_shaders_preprocessor.py similarity index 100% rename from shaders/gl_shaders_preprocessor.py rename to libs/shaders/gl_shaders_preprocessor.py diff --git a/shaders/metal_program_params.hpp b/libs/shaders/metal_program_params.hpp similarity index 100% rename from shaders/metal_program_params.hpp rename to libs/shaders/metal_program_params.hpp diff --git a/shaders/metal_program_params.mm b/libs/shaders/metal_program_params.mm similarity index 100% rename from shaders/metal_program_params.mm rename to libs/shaders/metal_program_params.mm diff --git a/shaders/metal_program_pool.hpp b/libs/shaders/metal_program_pool.hpp similarity index 100% rename from shaders/metal_program_pool.hpp rename to libs/shaders/metal_program_pool.hpp diff --git a/shaders/metal_program_pool.mm b/libs/shaders/metal_program_pool.mm similarity index 100% rename from shaders/metal_program_pool.mm rename to libs/shaders/metal_program_pool.mm diff --git a/shaders/program_manager.cpp b/libs/shaders/program_manager.cpp similarity index 100% rename from shaders/program_manager.cpp rename to libs/shaders/program_manager.cpp diff --git a/shaders/program_manager.hpp b/libs/shaders/program_manager.hpp similarity index 100% rename from shaders/program_manager.hpp rename to libs/shaders/program_manager.hpp diff --git a/shaders/program_manager_metal.mm b/libs/shaders/program_manager_metal.mm similarity index 100% rename from shaders/program_manager_metal.mm rename to libs/shaders/program_manager_metal.mm diff --git a/shaders/program_params.cpp b/libs/shaders/program_params.cpp similarity index 100% rename from shaders/program_params.cpp rename to libs/shaders/program_params.cpp diff --git a/shaders/program_params.hpp b/libs/shaders/program_params.hpp similarity index 100% rename from shaders/program_params.hpp rename to libs/shaders/program_params.hpp diff --git a/shaders/program_pool.hpp b/libs/shaders/program_pool.hpp similarity index 100% rename from shaders/program_pool.hpp rename to libs/shaders/program_pool.hpp diff --git a/shaders/programs.hpp b/libs/shaders/programs.hpp similarity index 100% rename from shaders/programs.hpp rename to libs/shaders/programs.hpp diff --git a/shaders/shaders_tests/CMakeLists.txt b/libs/shaders/shaders_tests/CMakeLists.txt similarity index 100% rename from shaders/shaders_tests/CMakeLists.txt rename to libs/shaders/shaders_tests/CMakeLists.txt diff --git a/shaders/shaders_tests/gl_program_params_tests.cpp b/libs/shaders/shaders_tests/gl_program_params_tests.cpp similarity index 100% rename from shaders/shaders_tests/gl_program_params_tests.cpp rename to libs/shaders/shaders_tests/gl_program_params_tests.cpp diff --git a/shaders/shaders_tests/gl_shaders_desktop_compile_tests.cpp b/libs/shaders/shaders_tests/gl_shaders_desktop_compile_tests.cpp similarity index 100% rename from shaders/shaders_tests/gl_shaders_desktop_compile_tests.cpp rename to libs/shaders/shaders_tests/gl_shaders_desktop_compile_tests.cpp diff --git a/shaders/shaders_tests/gl_shaders_mobile_compile_test.cpp b/libs/shaders/shaders_tests/gl_shaders_mobile_compile_test.cpp similarity index 100% rename from shaders/shaders_tests/gl_shaders_mobile_compile_test.cpp rename to libs/shaders/shaders_tests/gl_shaders_mobile_compile_test.cpp diff --git a/shaders/vulkan_program_params.cpp b/libs/shaders/vulkan_program_params.cpp similarity index 100% rename from shaders/vulkan_program_params.cpp rename to libs/shaders/vulkan_program_params.cpp diff --git a/shaders/vulkan_program_params.hpp b/libs/shaders/vulkan_program_params.hpp similarity index 100% rename from shaders/vulkan_program_params.hpp rename to libs/shaders/vulkan_program_params.hpp diff --git a/shaders/vulkan_program_pool.cpp b/libs/shaders/vulkan_program_pool.cpp similarity index 100% rename from shaders/vulkan_program_pool.cpp rename to libs/shaders/vulkan_program_pool.cpp diff --git a/shaders/vulkan_program_pool.hpp b/libs/shaders/vulkan_program_pool.hpp similarity index 100% rename from shaders/vulkan_program_pool.hpp rename to libs/shaders/vulkan_program_pool.hpp diff --git a/shaders/vulkan_shaders_preprocessor.py b/libs/shaders/vulkan_shaders_preprocessor.py similarity index 100% rename from shaders/vulkan_shaders_preprocessor.py rename to libs/shaders/vulkan_shaders_preprocessor.py diff --git a/std/boost_container_hash.hpp b/libs/std/boost_container_hash.hpp similarity index 100% rename from std/boost_container_hash.hpp rename to libs/std/boost_container_hash.hpp diff --git a/std/boost_geometry.hpp b/libs/std/boost_geometry.hpp similarity index 100% rename from std/boost_geometry.hpp rename to libs/std/boost_geometry.hpp diff --git a/std/glm_gtx_rotate_vector.hpp b/libs/std/glm_gtx_rotate_vector.hpp similarity index 100% rename from std/glm_gtx_rotate_vector.hpp rename to libs/std/glm_gtx_rotate_vector.hpp diff --git a/std/target_os.hpp b/libs/std/target_os.hpp similarity index 100% rename from std/target_os.hpp rename to libs/std/target_os.hpp diff --git a/std/windows.hpp b/libs/std/windows.hpp similarity index 100% rename from std/windows.hpp rename to libs/std/windows.hpp diff --git a/storage/CMakeLists.txt b/libs/storage/CMakeLists.txt similarity index 100% rename from storage/CMakeLists.txt rename to libs/storage/CMakeLists.txt diff --git a/storage/background_downloading/downloader_adapter_ios.h b/libs/storage/background_downloading/downloader_adapter_ios.h similarity index 100% rename from storage/background_downloading/downloader_adapter_ios.h rename to libs/storage/background_downloading/downloader_adapter_ios.h diff --git a/storage/background_downloading/downloader_adapter_ios.mm b/libs/storage/background_downloading/downloader_adapter_ios.mm similarity index 100% rename from storage/background_downloading/downloader_adapter_ios.mm rename to libs/storage/background_downloading/downloader_adapter_ios.mm diff --git a/storage/background_downloading/downloader_queue.hpp b/libs/storage/background_downloading/downloader_queue.hpp similarity index 100% rename from storage/background_downloading/downloader_queue.hpp rename to libs/storage/background_downloading/downloader_queue.hpp diff --git a/storage/country.hpp b/libs/storage/country.hpp similarity index 100% rename from storage/country.hpp rename to libs/storage/country.hpp diff --git a/storage/country_decl.cpp b/libs/storage/country_decl.cpp similarity index 100% rename from storage/country_decl.cpp rename to libs/storage/country_decl.cpp diff --git a/storage/country_decl.hpp b/libs/storage/country_decl.hpp similarity index 100% rename from storage/country_decl.hpp rename to libs/storage/country_decl.hpp diff --git a/storage/country_info_getter.cpp b/libs/storage/country_info_getter.cpp similarity index 100% rename from storage/country_info_getter.cpp rename to libs/storage/country_info_getter.cpp diff --git a/storage/country_info_getter.hpp b/libs/storage/country_info_getter.hpp similarity index 100% rename from storage/country_info_getter.hpp rename to libs/storage/country_info_getter.hpp diff --git a/storage/country_info_reader_light.cpp b/libs/storage/country_info_reader_light.cpp similarity index 100% rename from storage/country_info_reader_light.cpp rename to libs/storage/country_info_reader_light.cpp diff --git a/storage/country_info_reader_light.hpp b/libs/storage/country_info_reader_light.hpp similarity index 100% rename from storage/country_info_reader_light.hpp rename to libs/storage/country_info_reader_light.hpp diff --git a/storage/country_name_getter.cpp b/libs/storage/country_name_getter.cpp similarity index 100% rename from storage/country_name_getter.cpp rename to libs/storage/country_name_getter.cpp diff --git a/storage/country_name_getter.hpp b/libs/storage/country_name_getter.hpp similarity index 100% rename from storage/country_name_getter.hpp rename to libs/storage/country_name_getter.hpp diff --git a/storage/country_parent_getter.cpp b/libs/storage/country_parent_getter.cpp similarity index 100% rename from storage/country_parent_getter.cpp rename to libs/storage/country_parent_getter.cpp diff --git a/storage/country_parent_getter.hpp b/libs/storage/country_parent_getter.hpp similarity index 100% rename from storage/country_parent_getter.hpp rename to libs/storage/country_parent_getter.hpp diff --git a/storage/country_tree.cpp b/libs/storage/country_tree.cpp similarity index 100% rename from storage/country_tree.cpp rename to libs/storage/country_tree.cpp diff --git a/storage/country_tree.hpp b/libs/storage/country_tree.hpp similarity index 100% rename from storage/country_tree.hpp rename to libs/storage/country_tree.hpp diff --git a/storage/country_tree_helpers.cpp b/libs/storage/country_tree_helpers.cpp similarity index 100% rename from storage/country_tree_helpers.cpp rename to libs/storage/country_tree_helpers.cpp diff --git a/storage/country_tree_helpers.hpp b/libs/storage/country_tree_helpers.hpp similarity index 100% rename from storage/country_tree_helpers.hpp rename to libs/storage/country_tree_helpers.hpp diff --git a/storage/diff_scheme/apply_diff.cpp b/libs/storage/diff_scheme/apply_diff.cpp similarity index 100% rename from storage/diff_scheme/apply_diff.cpp rename to libs/storage/diff_scheme/apply_diff.cpp diff --git a/storage/diff_scheme/apply_diff.hpp b/libs/storage/diff_scheme/apply_diff.hpp similarity index 93% rename from storage/diff_scheme/apply_diff.hpp rename to libs/storage/diff_scheme/apply_diff.hpp index fdca5b9eb..7b64c680c 100644 --- a/storage/diff_scheme/apply_diff.hpp +++ b/libs/storage/diff_scheme/apply_diff.hpp @@ -1,6 +1,6 @@ #pragma once -#include "generator/mwm_diff/diff.hpp" +#include "mwm_diff/diff.hpp" #include "storage/storage_defines.hpp" diff --git a/storage/diff_scheme/diff_scheme_loader.cpp b/libs/storage/diff_scheme/diff_scheme_loader.cpp similarity index 100% rename from storage/diff_scheme/diff_scheme_loader.cpp rename to libs/storage/diff_scheme/diff_scheme_loader.cpp diff --git a/storage/diff_scheme/diff_scheme_loader.hpp b/libs/storage/diff_scheme/diff_scheme_loader.hpp similarity index 100% rename from storage/diff_scheme/diff_scheme_loader.hpp rename to libs/storage/diff_scheme/diff_scheme_loader.hpp diff --git a/storage/diff_scheme/diff_types.hpp b/libs/storage/diff_scheme/diff_types.hpp similarity index 100% rename from storage/diff_scheme/diff_types.hpp rename to libs/storage/diff_scheme/diff_types.hpp diff --git a/storage/diff_scheme/diffs_data_source.cpp b/libs/storage/diff_scheme/diffs_data_source.cpp similarity index 100% rename from storage/diff_scheme/diffs_data_source.cpp rename to libs/storage/diff_scheme/diffs_data_source.cpp diff --git a/storage/diff_scheme/diffs_data_source.hpp b/libs/storage/diff_scheme/diffs_data_source.hpp similarity index 100% rename from storage/diff_scheme/diffs_data_source.hpp rename to libs/storage/diff_scheme/diffs_data_source.hpp diff --git a/storage/downloader.hpp b/libs/storage/downloader.hpp similarity index 100% rename from storage/downloader.hpp rename to libs/storage/downloader.hpp diff --git a/storage/downloader_queue_interface.hpp b/libs/storage/downloader_queue_interface.hpp similarity index 100% rename from storage/downloader_queue_interface.hpp rename to libs/storage/downloader_queue_interface.hpp diff --git a/storage/downloader_queue_universal.cpp b/libs/storage/downloader_queue_universal.cpp similarity index 100% rename from storage/downloader_queue_universal.cpp rename to libs/storage/downloader_queue_universal.cpp diff --git a/storage/downloader_queue_universal.hpp b/libs/storage/downloader_queue_universal.hpp similarity index 100% rename from storage/downloader_queue_universal.hpp rename to libs/storage/downloader_queue_universal.hpp diff --git a/storage/downloader_search_params.hpp b/libs/storage/downloader_search_params.hpp similarity index 100% rename from storage/downloader_search_params.hpp rename to libs/storage/downloader_search_params.hpp diff --git a/storage/downloading_policy.cpp b/libs/storage/downloading_policy.cpp similarity index 100% rename from storage/downloading_policy.cpp rename to libs/storage/downloading_policy.cpp diff --git a/storage/downloading_policy.hpp b/libs/storage/downloading_policy.hpp similarity index 100% rename from storage/downloading_policy.hpp rename to libs/storage/downloading_policy.hpp diff --git a/storage/http_map_files_downloader.cpp b/libs/storage/http_map_files_downloader.cpp similarity index 100% rename from storage/http_map_files_downloader.cpp rename to libs/storage/http_map_files_downloader.cpp diff --git a/storage/http_map_files_downloader.hpp b/libs/storage/http_map_files_downloader.hpp similarity index 100% rename from storage/http_map_files_downloader.hpp rename to libs/storage/http_map_files_downloader.hpp diff --git a/storage/map_files_downloader.cpp b/libs/storage/map_files_downloader.cpp similarity index 100% rename from storage/map_files_downloader.cpp rename to libs/storage/map_files_downloader.cpp diff --git a/storage/map_files_downloader.hpp b/libs/storage/map_files_downloader.hpp similarity index 100% rename from storage/map_files_downloader.hpp rename to libs/storage/map_files_downloader.hpp diff --git a/storage/map_files_downloader_with_ping.cpp b/libs/storage/map_files_downloader_with_ping.cpp similarity index 100% rename from storage/map_files_downloader_with_ping.cpp rename to libs/storage/map_files_downloader_with_ping.cpp diff --git a/storage/map_files_downloader_with_ping.hpp b/libs/storage/map_files_downloader_with_ping.hpp similarity index 100% rename from storage/map_files_downloader_with_ping.hpp rename to libs/storage/map_files_downloader_with_ping.hpp diff --git a/storage/pinger.cpp b/libs/storage/pinger.cpp similarity index 100% rename from storage/pinger.cpp rename to libs/storage/pinger.cpp diff --git a/storage/pinger.hpp b/libs/storage/pinger.hpp similarity index 100% rename from storage/pinger.hpp rename to libs/storage/pinger.hpp diff --git a/storage/queued_country.cpp b/libs/storage/queued_country.cpp similarity index 100% rename from storage/queued_country.cpp rename to libs/storage/queued_country.cpp diff --git a/storage/queued_country.hpp b/libs/storage/queued_country.hpp similarity index 100% rename from storage/queued_country.hpp rename to libs/storage/queued_country.hpp diff --git a/storage/routing_helpers.cpp b/libs/storage/routing_helpers.cpp similarity index 100% rename from storage/routing_helpers.cpp rename to libs/storage/routing_helpers.cpp diff --git a/storage/routing_helpers.hpp b/libs/storage/routing_helpers.hpp similarity index 100% rename from storage/routing_helpers.hpp rename to libs/storage/routing_helpers.hpp diff --git a/storage/storage.cpp b/libs/storage/storage.cpp similarity index 100% rename from storage/storage.cpp rename to libs/storage/storage.cpp diff --git a/storage/storage.hpp b/libs/storage/storage.hpp similarity index 100% rename from storage/storage.hpp rename to libs/storage/storage.hpp diff --git a/storage/storage_defines.cpp b/libs/storage/storage_defines.cpp similarity index 100% rename from storage/storage_defines.cpp rename to libs/storage/storage_defines.cpp diff --git a/storage/storage_defines.hpp b/libs/storage/storage_defines.hpp similarity index 100% rename from storage/storage_defines.hpp rename to libs/storage/storage_defines.hpp diff --git a/storage/storage_helpers.cpp b/libs/storage/storage_helpers.cpp similarity index 100% rename from storage/storage_helpers.cpp rename to libs/storage/storage_helpers.cpp diff --git a/storage/storage_helpers.hpp b/libs/storage/storage_helpers.hpp similarity index 100% rename from storage/storage_helpers.hpp rename to libs/storage/storage_helpers.hpp diff --git a/storage/storage_integration_tests/CMakeLists.txt b/libs/storage/storage_integration_tests/CMakeLists.txt similarity index 100% rename from storage/storage_integration_tests/CMakeLists.txt rename to libs/storage/storage_integration_tests/CMakeLists.txt diff --git a/storage/storage_integration_tests/download_calc_size_test.cpp b/libs/storage/storage_integration_tests/download_calc_size_test.cpp similarity index 100% rename from storage/storage_integration_tests/download_calc_size_test.cpp rename to libs/storage/storage_integration_tests/download_calc_size_test.cpp diff --git a/storage/storage_integration_tests/lightweight_matching_tests.cpp b/libs/storage/storage_integration_tests/lightweight_matching_tests.cpp similarity index 100% rename from storage/storage_integration_tests/lightweight_matching_tests.cpp rename to libs/storage/storage_integration_tests/lightweight_matching_tests.cpp diff --git a/storage/storage_integration_tests/storage_3levels_tests.cpp b/libs/storage/storage_integration_tests/storage_3levels_tests.cpp similarity index 100% rename from storage/storage_integration_tests/storage_3levels_tests.cpp rename to libs/storage/storage_integration_tests/storage_3levels_tests.cpp diff --git a/storage/storage_integration_tests/storage_downloading_tests.cpp b/libs/storage/storage_integration_tests/storage_downloading_tests.cpp similarity index 100% rename from storage/storage_integration_tests/storage_downloading_tests.cpp rename to libs/storage/storage_integration_tests/storage_downloading_tests.cpp diff --git a/storage/storage_integration_tests/storage_group_download_tests.cpp b/libs/storage/storage_integration_tests/storage_group_download_tests.cpp similarity index 100% rename from storage/storage_integration_tests/storage_group_download_tests.cpp rename to libs/storage/storage_integration_tests/storage_group_download_tests.cpp diff --git a/storage/storage_integration_tests/storage_http_tests.cpp b/libs/storage/storage_integration_tests/storage_http_tests.cpp similarity index 100% rename from storage/storage_integration_tests/storage_http_tests.cpp rename to libs/storage/storage_integration_tests/storage_http_tests.cpp diff --git a/storage/storage_integration_tests/storage_update_tests.cpp b/libs/storage/storage_integration_tests/storage_update_tests.cpp similarity index 100% rename from storage/storage_integration_tests/storage_update_tests.cpp rename to libs/storage/storage_integration_tests/storage_update_tests.cpp diff --git a/storage/storage_integration_tests/test_defines.cpp b/libs/storage/storage_integration_tests/test_defines.cpp similarity index 100% rename from storage/storage_integration_tests/test_defines.cpp rename to libs/storage/storage_integration_tests/test_defines.cpp diff --git a/storage/storage_integration_tests/test_defines.hpp b/libs/storage/storage_integration_tests/test_defines.hpp similarity index 100% rename from storage/storage_integration_tests/test_defines.hpp rename to libs/storage/storage_integration_tests/test_defines.hpp diff --git a/storage/storage_tests/CMakeLists.txt b/libs/storage/storage_tests/CMakeLists.txt similarity index 100% rename from storage/storage_tests/CMakeLists.txt rename to libs/storage/storage_tests/CMakeLists.txt diff --git a/storage/storage_tests/countries_tests.cpp b/libs/storage/storage_tests/countries_tests.cpp similarity index 100% rename from storage/storage_tests/countries_tests.cpp rename to libs/storage/storage_tests/countries_tests.cpp diff --git a/storage/storage_tests/country_info_getter_tests.cpp b/libs/storage/storage_tests/country_info_getter_tests.cpp similarity index 100% rename from storage/storage_tests/country_info_getter_tests.cpp rename to libs/storage/storage_tests/country_info_getter_tests.cpp diff --git a/storage/storage_tests/country_name_getter_tests.cpp b/libs/storage/storage_tests/country_name_getter_tests.cpp similarity index 100% rename from storage/storage_tests/country_name_getter_tests.cpp rename to libs/storage/storage_tests/country_name_getter_tests.cpp diff --git a/storage/storage_tests/downloader_tests.cpp b/libs/storage/storage_tests/downloader_tests.cpp similarity index 100% rename from storage/storage_tests/downloader_tests.cpp rename to libs/storage/storage_tests/downloader_tests.cpp diff --git a/storage/storage_tests/fake_map_files_downloader.cpp b/libs/storage/storage_tests/fake_map_files_downloader.cpp similarity index 100% rename from storage/storage_tests/fake_map_files_downloader.cpp rename to libs/storage/storage_tests/fake_map_files_downloader.cpp diff --git a/storage/storage_tests/fake_map_files_downloader.hpp b/libs/storage/storage_tests/fake_map_files_downloader.hpp similarity index 100% rename from storage/storage_tests/fake_map_files_downloader.hpp rename to libs/storage/storage_tests/fake_map_files_downloader.hpp diff --git a/storage/storage_tests/helpers.cpp b/libs/storage/storage_tests/helpers.cpp similarity index 100% rename from storage/storage_tests/helpers.cpp rename to libs/storage/storage_tests/helpers.cpp diff --git a/storage/storage_tests/helpers.hpp b/libs/storage/storage_tests/helpers.hpp similarity index 100% rename from storage/storage_tests/helpers.hpp rename to libs/storage/storage_tests/helpers.hpp diff --git a/storage/storage_tests/simple_tree_test.cpp b/libs/storage/storage_tests/simple_tree_test.cpp similarity index 100% rename from storage/storage_tests/simple_tree_test.cpp rename to libs/storage/storage_tests/simple_tree_test.cpp diff --git a/storage/storage_tests/storage_tests.cpp b/libs/storage/storage_tests/storage_tests.cpp similarity index 100% rename from storage/storage_tests/storage_tests.cpp rename to libs/storage/storage_tests/storage_tests.cpp diff --git a/storage/storage_tests/task_runner.cpp b/libs/storage/storage_tests/task_runner.cpp similarity index 100% rename from storage/storage_tests/task_runner.cpp rename to libs/storage/storage_tests/task_runner.cpp diff --git a/storage/storage_tests/task_runner.hpp b/libs/storage/storage_tests/task_runner.hpp similarity index 100% rename from storage/storage_tests/task_runner.hpp rename to libs/storage/storage_tests/task_runner.hpp diff --git a/storage/storage_tests/test_map_files_downloader.cpp b/libs/storage/storage_tests/test_map_files_downloader.cpp similarity index 100% rename from storage/storage_tests/test_map_files_downloader.cpp rename to libs/storage/storage_tests/test_map_files_downloader.cpp diff --git a/storage/storage_tests/test_map_files_downloader.hpp b/libs/storage/storage_tests/test_map_files_downloader.hpp similarity index 100% rename from storage/storage_tests/test_map_files_downloader.hpp rename to libs/storage/storage_tests/test_map_files_downloader.hpp diff --git a/testing/benchmark.hpp b/libs/testing/benchmark.hpp similarity index 100% rename from testing/benchmark.hpp rename to libs/testing/benchmark.hpp diff --git a/testing/testing.hpp b/libs/testing/testing.hpp similarity index 100% rename from testing/testing.hpp rename to libs/testing/testing.hpp diff --git a/testing/testingmain.cpp b/libs/testing/testingmain.cpp similarity index 100% rename from testing/testingmain.cpp rename to libs/testing/testingmain.cpp diff --git a/testing/testregister.hpp b/libs/testing/testregister.hpp similarity index 100% rename from testing/testregister.hpp rename to libs/testing/testregister.hpp diff --git a/tracking/CMakeLists.txt b/libs/tracking/CMakeLists.txt similarity index 100% rename from tracking/CMakeLists.txt rename to libs/tracking/CMakeLists.txt diff --git a/tracking/archival_file.cpp b/libs/tracking/archival_file.cpp similarity index 100% rename from tracking/archival_file.cpp rename to libs/tracking/archival_file.cpp diff --git a/tracking/archival_file.hpp b/libs/tracking/archival_file.hpp similarity index 100% rename from tracking/archival_file.hpp rename to libs/tracking/archival_file.hpp diff --git a/tracking/archival_manager.cpp b/libs/tracking/archival_manager.cpp similarity index 100% rename from tracking/archival_manager.cpp rename to libs/tracking/archival_manager.cpp diff --git a/tracking/archival_manager.hpp b/libs/tracking/archival_manager.hpp similarity index 100% rename from tracking/archival_manager.hpp rename to libs/tracking/archival_manager.hpp diff --git a/tracking/archival_reporter.cpp b/libs/tracking/archival_reporter.cpp similarity index 100% rename from tracking/archival_reporter.cpp rename to libs/tracking/archival_reporter.cpp diff --git a/tracking/archival_reporter.hpp b/libs/tracking/archival_reporter.hpp similarity index 100% rename from tracking/archival_reporter.hpp rename to libs/tracking/archival_reporter.hpp diff --git a/tracking/archive.cpp b/libs/tracking/archive.cpp similarity index 100% rename from tracking/archive.cpp rename to libs/tracking/archive.cpp diff --git a/tracking/archive.hpp b/libs/tracking/archive.hpp similarity index 100% rename from tracking/archive.hpp rename to libs/tracking/archive.hpp diff --git a/tracking/connection.cpp b/libs/tracking/connection.cpp similarity index 100% rename from tracking/connection.cpp rename to libs/tracking/connection.cpp diff --git a/tracking/connection.hpp b/libs/tracking/connection.hpp similarity index 100% rename from tracking/connection.hpp rename to libs/tracking/connection.hpp diff --git a/tracking/protocol.cpp b/libs/tracking/protocol.cpp similarity index 100% rename from tracking/protocol.cpp rename to libs/tracking/protocol.cpp diff --git a/tracking/protocol.hpp b/libs/tracking/protocol.hpp similarity index 100% rename from tracking/protocol.hpp rename to libs/tracking/protocol.hpp diff --git a/tracking/pytracking/CMakeLists.txt b/libs/tracking/pytracking/CMakeLists.txt similarity index 100% rename from tracking/pytracking/CMakeLists.txt rename to libs/tracking/pytracking/CMakeLists.txt diff --git a/tracking/pytracking/bindings.cpp b/libs/tracking/pytracking/bindings.cpp similarity index 100% rename from tracking/pytracking/bindings.cpp rename to libs/tracking/pytracking/bindings.cpp diff --git a/tracking/pytracking/setup.py b/libs/tracking/pytracking/setup.py similarity index 100% rename from tracking/pytracking/setup.py rename to libs/tracking/pytracking/setup.py diff --git a/tracking/reporter.cpp b/libs/tracking/reporter.cpp similarity index 100% rename from tracking/reporter.cpp rename to libs/tracking/reporter.cpp diff --git a/tracking/reporter.hpp b/libs/tracking/reporter.hpp similarity index 100% rename from tracking/reporter.hpp rename to libs/tracking/reporter.hpp diff --git a/tracking/tracking_fuzz_tests/CMakeLists.txt b/libs/tracking/tracking_fuzz_tests/CMakeLists.txt similarity index 100% rename from tracking/tracking_fuzz_tests/CMakeLists.txt rename to libs/tracking/tracking_fuzz_tests/CMakeLists.txt diff --git a/tracking/tracking_fuzz_tests/tracking_fuzz_tests.cpp b/libs/tracking/tracking_fuzz_tests/tracking_fuzz_tests.cpp similarity index 100% rename from tracking/tracking_fuzz_tests/tracking_fuzz_tests.cpp rename to libs/tracking/tracking_fuzz_tests/tracking_fuzz_tests.cpp diff --git a/tracking/tracking_tests/CMakeLists.txt b/libs/tracking/tracking_tests/CMakeLists.txt similarity index 100% rename from tracking/tracking_tests/CMakeLists.txt rename to libs/tracking/tracking_tests/CMakeLists.txt diff --git a/tracking/tracking_tests/archival_reporter_tests.cpp b/libs/tracking/tracking_tests/archival_reporter_tests.cpp similarity index 100% rename from tracking/tracking_tests/archival_reporter_tests.cpp rename to libs/tracking/tracking_tests/archival_reporter_tests.cpp diff --git a/tracking/tracking_tests/protocol_test.cpp b/libs/tracking/tracking_tests/protocol_test.cpp similarity index 100% rename from tracking/tracking_tests/protocol_test.cpp rename to libs/tracking/tracking_tests/protocol_test.cpp diff --git a/tracking/tracking_tests/reporter_test.cpp b/libs/tracking/tracking_tests/reporter_test.cpp similarity index 100% rename from tracking/tracking_tests/reporter_test.cpp rename to libs/tracking/tracking_tests/reporter_test.cpp diff --git a/traffic/CMakeLists.txt b/libs/traffic/CMakeLists.txt similarity index 100% rename from traffic/CMakeLists.txt rename to libs/traffic/CMakeLists.txt diff --git a/traffic/pytraffic/CMakeLists.txt b/libs/traffic/pytraffic/CMakeLists.txt similarity index 100% rename from traffic/pytraffic/CMakeLists.txt rename to libs/traffic/pytraffic/CMakeLists.txt diff --git a/traffic/pytraffic/bindings.cpp b/libs/traffic/pytraffic/bindings.cpp similarity index 100% rename from traffic/pytraffic/bindings.cpp rename to libs/traffic/pytraffic/bindings.cpp diff --git a/traffic/pytraffic/example.py b/libs/traffic/pytraffic/example.py similarity index 100% rename from traffic/pytraffic/example.py rename to libs/traffic/pytraffic/example.py diff --git a/traffic/pytraffic/setup.py b/libs/traffic/pytraffic/setup.py similarity index 100% rename from traffic/pytraffic/setup.py rename to libs/traffic/pytraffic/setup.py diff --git a/traffic/speed_groups.cpp b/libs/traffic/speed_groups.cpp similarity index 100% rename from traffic/speed_groups.cpp rename to libs/traffic/speed_groups.cpp diff --git a/traffic/speed_groups.hpp b/libs/traffic/speed_groups.hpp similarity index 100% rename from traffic/speed_groups.hpp rename to libs/traffic/speed_groups.hpp diff --git a/traffic/traffic_cache.cpp b/libs/traffic/traffic_cache.cpp similarity index 100% rename from traffic/traffic_cache.cpp rename to libs/traffic/traffic_cache.cpp diff --git a/traffic/traffic_cache.hpp b/libs/traffic/traffic_cache.hpp similarity index 100% rename from traffic/traffic_cache.hpp rename to libs/traffic/traffic_cache.hpp diff --git a/traffic/traffic_info.cpp b/libs/traffic/traffic_info.cpp similarity index 100% rename from traffic/traffic_info.cpp rename to libs/traffic/traffic_info.cpp diff --git a/traffic/traffic_info.hpp b/libs/traffic/traffic_info.hpp similarity index 100% rename from traffic/traffic_info.hpp rename to libs/traffic/traffic_info.hpp diff --git a/traffic/traffic_tests/CMakeLists.txt b/libs/traffic/traffic_tests/CMakeLists.txt similarity index 100% rename from traffic/traffic_tests/CMakeLists.txt rename to libs/traffic/traffic_tests/CMakeLists.txt diff --git a/traffic/traffic_tests/traffic_info_test.cpp b/libs/traffic/traffic_tests/traffic_info_test.cpp similarity index 100% rename from traffic/traffic_tests/traffic_info_test.cpp rename to libs/traffic/traffic_tests/traffic_info_test.cpp diff --git a/transit/CMakeLists.txt b/libs/transit/CMakeLists.txt similarity index 100% rename from transit/CMakeLists.txt rename to libs/transit/CMakeLists.txt diff --git a/transit/experimental/transit_data.cpp b/libs/transit/experimental/transit_data.cpp similarity index 100% rename from transit/experimental/transit_data.cpp rename to libs/transit/experimental/transit_data.cpp diff --git a/transit/experimental/transit_data.hpp b/libs/transit/experimental/transit_data.hpp similarity index 100% rename from transit/experimental/transit_data.hpp rename to libs/transit/experimental/transit_data.hpp diff --git a/transit/experimental/transit_types_experimental.cpp b/libs/transit/experimental/transit_types_experimental.cpp similarity index 100% rename from transit/experimental/transit_types_experimental.cpp rename to libs/transit/experimental/transit_types_experimental.cpp diff --git a/transit/experimental/transit_types_experimental.hpp b/libs/transit/experimental/transit_types_experimental.hpp similarity index 100% rename from transit/experimental/transit_types_experimental.hpp rename to libs/transit/experimental/transit_types_experimental.hpp diff --git a/transit/transit_display_info.hpp b/libs/transit/transit_display_info.hpp similarity index 100% rename from transit/transit_display_info.hpp rename to libs/transit/transit_display_info.hpp diff --git a/transit/transit_entities.hpp b/libs/transit/transit_entities.hpp similarity index 100% rename from transit/transit_entities.hpp rename to libs/transit/transit_entities.hpp diff --git a/transit/transit_experimental_tests/CMakeLists.txt b/libs/transit/transit_experimental_tests/CMakeLists.txt similarity index 100% rename from transit/transit_experimental_tests/CMakeLists.txt rename to libs/transit/transit_experimental_tests/CMakeLists.txt diff --git a/transit/transit_experimental_tests/parse_transit_from_json_tests.cpp b/libs/transit/transit_experimental_tests/parse_transit_from_json_tests.cpp similarity index 100% rename from transit/transit_experimental_tests/parse_transit_from_json_tests.cpp rename to libs/transit/transit_experimental_tests/parse_transit_from_json_tests.cpp diff --git a/transit/transit_experimental_tests/transit_serdes_tests.cpp b/libs/transit/transit_experimental_tests/transit_serdes_tests.cpp similarity index 100% rename from transit/transit_experimental_tests/transit_serdes_tests.cpp rename to libs/transit/transit_experimental_tests/transit_serdes_tests.cpp diff --git a/transit/transit_graph_data.cpp b/libs/transit/transit_graph_data.cpp similarity index 100% rename from transit/transit_graph_data.cpp rename to libs/transit/transit_graph_data.cpp diff --git a/transit/transit_graph_data.hpp b/libs/transit/transit_graph_data.hpp similarity index 100% rename from transit/transit_graph_data.hpp rename to libs/transit/transit_graph_data.hpp diff --git a/transit/transit_schedule.cpp b/libs/transit/transit_schedule.cpp similarity index 100% rename from transit/transit_schedule.cpp rename to libs/transit/transit_schedule.cpp diff --git a/transit/transit_schedule.hpp b/libs/transit/transit_schedule.hpp similarity index 100% rename from transit/transit_schedule.hpp rename to libs/transit/transit_schedule.hpp diff --git a/transit/transit_serdes.hpp b/libs/transit/transit_serdes.hpp similarity index 100% rename from transit/transit_serdes.hpp rename to libs/transit/transit_serdes.hpp diff --git a/transit/transit_tests/CMakeLists.txt b/libs/transit/transit_tests/CMakeLists.txt similarity index 100% rename from transit/transit_tests/CMakeLists.txt rename to libs/transit/transit_tests/CMakeLists.txt diff --git a/transit/transit_tests/transit_graph_test.cpp b/libs/transit/transit_tests/transit_graph_test.cpp similarity index 100% rename from transit/transit_tests/transit_graph_test.cpp rename to libs/transit/transit_tests/transit_graph_test.cpp diff --git a/transit/transit_tests/transit_json_parsing_test.cpp b/libs/transit/transit_tests/transit_json_parsing_test.cpp similarity index 100% rename from transit/transit_tests/transit_json_parsing_test.cpp rename to libs/transit/transit_tests/transit_json_parsing_test.cpp diff --git a/transit/transit_tests/transit_schedule_tests.cpp b/libs/transit/transit_tests/transit_schedule_tests.cpp similarity index 100% rename from transit/transit_tests/transit_schedule_tests.cpp rename to libs/transit/transit_tests/transit_schedule_tests.cpp diff --git a/transit/transit_tests/transit_test.cpp b/libs/transit/transit_tests/transit_test.cpp similarity index 100% rename from transit/transit_tests/transit_test.cpp rename to libs/transit/transit_tests/transit_test.cpp diff --git a/transit/transit_tests/transit_tools.hpp b/libs/transit/transit_tests/transit_tools.hpp similarity index 100% rename from transit/transit_tests/transit_tools.hpp rename to libs/transit/transit_tests/transit_tools.hpp diff --git a/transit/transit_types.cpp b/libs/transit/transit_types.cpp similarity index 100% rename from transit/transit_types.cpp rename to libs/transit/transit_types.cpp diff --git a/transit/transit_types.hpp b/libs/transit/transit_types.hpp similarity index 100% rename from transit/transit_types.hpp rename to libs/transit/transit_types.hpp diff --git a/transit/transit_version.cpp b/libs/transit/transit_version.cpp similarity index 100% rename from transit/transit_version.cpp rename to libs/transit/transit_version.cpp diff --git a/transit/transit_version.hpp b/libs/transit/transit_version.hpp similarity index 100% rename from transit/transit_version.hpp rename to libs/transit/transit_version.hpp diff --git a/transit/world_feed/CMakeLists.txt b/libs/transit/world_feed/CMakeLists.txt similarity index 100% rename from transit/world_feed/CMakeLists.txt rename to libs/transit/world_feed/CMakeLists.txt diff --git a/transit/world_feed/color_picker.cpp b/libs/transit/world_feed/color_picker.cpp similarity index 100% rename from transit/world_feed/color_picker.cpp rename to libs/transit/world_feed/color_picker.cpp diff --git a/transit/world_feed/color_picker.hpp b/libs/transit/world_feed/color_picker.hpp similarity index 100% rename from transit/world_feed/color_picker.hpp rename to libs/transit/world_feed/color_picker.hpp diff --git a/transit/world_feed/date_time_helpers.cpp b/libs/transit/world_feed/date_time_helpers.cpp similarity index 100% rename from transit/world_feed/date_time_helpers.cpp rename to libs/transit/world_feed/date_time_helpers.cpp diff --git a/transit/world_feed/date_time_helpers.hpp b/libs/transit/world_feed/date_time_helpers.hpp similarity index 100% rename from transit/world_feed/date_time_helpers.hpp rename to libs/transit/world_feed/date_time_helpers.hpp diff --git a/transit/world_feed/feed_helpers.cpp b/libs/transit/world_feed/feed_helpers.cpp similarity index 100% rename from transit/world_feed/feed_helpers.cpp rename to libs/transit/world_feed/feed_helpers.cpp diff --git a/transit/world_feed/feed_helpers.hpp b/libs/transit/world_feed/feed_helpers.hpp similarity index 100% rename from transit/world_feed/feed_helpers.hpp rename to libs/transit/world_feed/feed_helpers.hpp diff --git a/transit/world_feed/gtfs_converter/CMakeLists.txt b/libs/transit/world_feed/gtfs_converter/CMakeLists.txt similarity index 100% rename from transit/world_feed/gtfs_converter/CMakeLists.txt rename to libs/transit/world_feed/gtfs_converter/CMakeLists.txt diff --git a/transit/world_feed/gtfs_converter/gtfs_converter.cpp b/libs/transit/world_feed/gtfs_converter/gtfs_converter.cpp similarity index 100% rename from transit/world_feed/gtfs_converter/gtfs_converter.cpp rename to libs/transit/world_feed/gtfs_converter/gtfs_converter.cpp diff --git a/transit/world_feed/subway_converter.cpp b/libs/transit/world_feed/subway_converter.cpp similarity index 100% rename from transit/world_feed/subway_converter.cpp rename to libs/transit/world_feed/subway_converter.cpp diff --git a/transit/world_feed/subway_converter.hpp b/libs/transit/world_feed/subway_converter.hpp similarity index 100% rename from transit/world_feed/subway_converter.hpp rename to libs/transit/world_feed/subway_converter.hpp diff --git a/transit/world_feed/world_feed.cpp b/libs/transit/world_feed/world_feed.cpp similarity index 100% rename from transit/world_feed/world_feed.cpp rename to libs/transit/world_feed/world_feed.cpp diff --git a/transit/world_feed/world_feed.hpp b/libs/transit/world_feed/world_feed.hpp similarity index 100% rename from transit/world_feed/world_feed.hpp rename to libs/transit/world_feed/world_feed.hpp diff --git a/transit/world_feed/world_feed_integration_tests/CMakeLists.txt b/libs/transit/world_feed/world_feed_integration_tests/CMakeLists.txt similarity index 100% rename from transit/world_feed/world_feed_integration_tests/CMakeLists.txt rename to libs/transit/world_feed/world_feed_integration_tests/CMakeLists.txt diff --git a/transit/world_feed/world_feed_integration_tests/world_feed_integration_tests.cpp b/libs/transit/world_feed/world_feed_integration_tests/world_feed_integration_tests.cpp similarity index 100% rename from transit/world_feed/world_feed_integration_tests/world_feed_integration_tests.cpp rename to libs/transit/world_feed/world_feed_integration_tests/world_feed_integration_tests.cpp diff --git a/transit/world_feed/world_feed_tests/CMakeLists.txt b/libs/transit/world_feed/world_feed_tests/CMakeLists.txt similarity index 100% rename from transit/world_feed/world_feed_tests/CMakeLists.txt rename to libs/transit/world_feed/world_feed_tests/CMakeLists.txt diff --git a/transit/world_feed/world_feed_tests/subway_converter_tests.cpp b/libs/transit/world_feed/world_feed_tests/subway_converter_tests.cpp similarity index 100% rename from transit/world_feed/world_feed_tests/subway_converter_tests.cpp rename to libs/transit/world_feed/world_feed_tests/subway_converter_tests.cpp diff --git a/transit/world_feed/world_feed_tests/world_feed_tests.cpp b/libs/transit/world_feed/world_feed_tests/world_feed_tests.cpp similarity index 100% rename from transit/world_feed/world_feed_tests/world_feed_tests.cpp rename to libs/transit/world_feed/world_feed_tests/world_feed_tests.cpp diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt new file mode 100644 index 000000000..6a8e916f0 --- /dev/null +++ b/tools/CMakeLists.txt @@ -0,0 +1,11 @@ +add_subdirectory(openlr) +add_subdirectory(poly_borders) +add_subdirectory(track_analyzing) + +omim_add_tool_subdirectory(feature_list) +omim_add_tool_subdirectory(topography_generator) +omim_add_tool_subdirectory(track_generator) +if (NOT SKIP_QT_GUI) + omim_add_tool_subdirectory(skin_generator) +endif() + diff --git a/tools/ruby/category_consistency/check_consistency.rb b/tools/category_consistency/check_consistency.rb similarity index 100% rename from tools/ruby/category_consistency/check_consistency.rb rename to tools/category_consistency/check_consistency.rb diff --git a/tools/ruby/category_consistency/omim_parsers.rb b/tools/category_consistency/omim_parsers.rb similarity index 100% rename from tools/ruby/category_consistency/omim_parsers.rb rename to tools/category_consistency/omim_parsers.rb diff --git a/feature_list/CMakeLists.txt b/tools/feature_list/CMakeLists.txt similarity index 100% rename from feature_list/CMakeLists.txt rename to tools/feature_list/CMakeLists.txt diff --git a/feature_list/feature_list.cpp b/tools/feature_list/feature_list.cpp similarity index 100% rename from feature_list/feature_list.cpp rename to tools/feature_list/feature_list.cpp diff --git a/openlr/CMakeLists.txt b/tools/openlr/CMakeLists.txt similarity index 100% rename from openlr/CMakeLists.txt rename to tools/openlr/CMakeLists.txt diff --git a/openlr/cache_line_size.hpp b/tools/openlr/cache_line_size.hpp similarity index 100% rename from openlr/cache_line_size.hpp rename to tools/openlr/cache_line_size.hpp diff --git a/openlr/candidate_paths_getter.cpp b/tools/openlr/candidate_paths_getter.cpp similarity index 100% rename from openlr/candidate_paths_getter.cpp rename to tools/openlr/candidate_paths_getter.cpp diff --git a/openlr/candidate_paths_getter.hpp b/tools/openlr/candidate_paths_getter.hpp similarity index 100% rename from openlr/candidate_paths_getter.hpp rename to tools/openlr/candidate_paths_getter.hpp diff --git a/openlr/candidate_points_getter.cpp b/tools/openlr/candidate_points_getter.cpp similarity index 100% rename from openlr/candidate_points_getter.cpp rename to tools/openlr/candidate_points_getter.cpp diff --git a/openlr/candidate_points_getter.hpp b/tools/openlr/candidate_points_getter.hpp similarity index 100% rename from openlr/candidate_points_getter.hpp rename to tools/openlr/candidate_points_getter.hpp diff --git a/openlr/decoded_path.cpp b/tools/openlr/decoded_path.cpp similarity index 100% rename from openlr/decoded_path.cpp rename to tools/openlr/decoded_path.cpp diff --git a/openlr/decoded_path.hpp b/tools/openlr/decoded_path.hpp similarity index 100% rename from openlr/decoded_path.hpp rename to tools/openlr/decoded_path.hpp diff --git a/openlr/graph.cpp b/tools/openlr/graph.cpp similarity index 100% rename from openlr/graph.cpp rename to tools/openlr/graph.cpp diff --git a/openlr/graph.hpp b/tools/openlr/graph.hpp similarity index 100% rename from openlr/graph.hpp rename to tools/openlr/graph.hpp diff --git a/openlr/helpers.cpp b/tools/openlr/helpers.cpp similarity index 100% rename from openlr/helpers.cpp rename to tools/openlr/helpers.cpp diff --git a/openlr/helpers.hpp b/tools/openlr/helpers.hpp similarity index 100% rename from openlr/helpers.hpp rename to tools/openlr/helpers.hpp diff --git a/openlr/openlr_decoder.cpp b/tools/openlr/openlr_decoder.cpp similarity index 100% rename from openlr/openlr_decoder.cpp rename to tools/openlr/openlr_decoder.cpp diff --git a/openlr/openlr_decoder.hpp b/tools/openlr/openlr_decoder.hpp similarity index 100% rename from openlr/openlr_decoder.hpp rename to tools/openlr/openlr_decoder.hpp diff --git a/openlr/openlr_match_quality/CMakeLists.txt b/tools/openlr/openlr_match_quality/CMakeLists.txt similarity index 100% rename from openlr/openlr_match_quality/CMakeLists.txt rename to tools/openlr/openlr_match_quality/CMakeLists.txt diff --git a/openlr/openlr_match_quality/openlr_assessment_tool/CMakeLists.txt b/tools/openlr/openlr_match_quality/openlr_assessment_tool/CMakeLists.txt similarity index 100% rename from openlr/openlr_match_quality/openlr_assessment_tool/CMakeLists.txt rename to tools/openlr/openlr_match_quality/openlr_assessment_tool/CMakeLists.txt diff --git a/search/search_quality/assessment_tool/Info.plist b/tools/openlr/openlr_match_quality/openlr_assessment_tool/Info.plist similarity index 100% rename from search/search_quality/assessment_tool/Info.plist rename to tools/openlr/openlr_match_quality/openlr_assessment_tool/Info.plist diff --git a/openlr/openlr_match_quality/openlr_assessment_tool/main.cpp b/tools/openlr/openlr_match_quality/openlr_assessment_tool/main.cpp similarity index 100% rename from openlr/openlr_match_quality/openlr_assessment_tool/main.cpp rename to tools/openlr/openlr_match_quality/openlr_assessment_tool/main.cpp diff --git a/openlr/openlr_match_quality/openlr_assessment_tool/mainwindow.cpp b/tools/openlr/openlr_match_quality/openlr_assessment_tool/mainwindow.cpp similarity index 100% rename from openlr/openlr_match_quality/openlr_assessment_tool/mainwindow.cpp rename to tools/openlr/openlr_match_quality/openlr_assessment_tool/mainwindow.cpp diff --git a/openlr/openlr_match_quality/openlr_assessment_tool/mainwindow.hpp b/tools/openlr/openlr_match_quality/openlr_assessment_tool/mainwindow.hpp similarity index 100% rename from openlr/openlr_match_quality/openlr_assessment_tool/mainwindow.hpp rename to tools/openlr/openlr_match_quality/openlr_assessment_tool/mainwindow.hpp diff --git a/openlr/openlr_match_quality/openlr_assessment_tool/map_widget.cpp b/tools/openlr/openlr_match_quality/openlr_assessment_tool/map_widget.cpp similarity index 100% rename from openlr/openlr_match_quality/openlr_assessment_tool/map_widget.cpp rename to tools/openlr/openlr_match_quality/openlr_assessment_tool/map_widget.cpp diff --git a/openlr/openlr_match_quality/openlr_assessment_tool/map_widget.hpp b/tools/openlr/openlr_match_quality/openlr_assessment_tool/map_widget.hpp similarity index 100% rename from openlr/openlr_match_quality/openlr_assessment_tool/map_widget.hpp rename to tools/openlr/openlr_match_quality/openlr_assessment_tool/map_widget.hpp diff --git a/openlr/openlr_match_quality/openlr_assessment_tool/points_controller_delegate_base.hpp b/tools/openlr/openlr_match_quality/openlr_assessment_tool/points_controller_delegate_base.hpp similarity index 100% rename from openlr/openlr_match_quality/openlr_assessment_tool/points_controller_delegate_base.hpp rename to tools/openlr/openlr_match_quality/openlr_assessment_tool/points_controller_delegate_base.hpp diff --git a/openlr/openlr_match_quality/openlr_assessment_tool/segment_correspondence.cpp b/tools/openlr/openlr_match_quality/openlr_assessment_tool/segment_correspondence.cpp similarity index 100% rename from openlr/openlr_match_quality/openlr_assessment_tool/segment_correspondence.cpp rename to tools/openlr/openlr_match_quality/openlr_assessment_tool/segment_correspondence.cpp diff --git a/openlr/openlr_match_quality/openlr_assessment_tool/segment_correspondence.hpp b/tools/openlr/openlr_match_quality/openlr_assessment_tool/segment_correspondence.hpp similarity index 100% rename from openlr/openlr_match_quality/openlr_assessment_tool/segment_correspondence.hpp rename to tools/openlr/openlr_match_quality/openlr_assessment_tool/segment_correspondence.hpp diff --git a/openlr/openlr_match_quality/openlr_assessment_tool/traffic_drawer_delegate_base.hpp b/tools/openlr/openlr_match_quality/openlr_assessment_tool/traffic_drawer_delegate_base.hpp similarity index 100% rename from openlr/openlr_match_quality/openlr_assessment_tool/traffic_drawer_delegate_base.hpp rename to tools/openlr/openlr_match_quality/openlr_assessment_tool/traffic_drawer_delegate_base.hpp diff --git a/openlr/openlr_match_quality/openlr_assessment_tool/traffic_mode.cpp b/tools/openlr/openlr_match_quality/openlr_assessment_tool/traffic_mode.cpp similarity index 100% rename from openlr/openlr_match_quality/openlr_assessment_tool/traffic_mode.cpp rename to tools/openlr/openlr_match_quality/openlr_assessment_tool/traffic_mode.cpp diff --git a/openlr/openlr_match_quality/openlr_assessment_tool/traffic_mode.hpp b/tools/openlr/openlr_match_quality/openlr_assessment_tool/traffic_mode.hpp similarity index 100% rename from openlr/openlr_match_quality/openlr_assessment_tool/traffic_mode.hpp rename to tools/openlr/openlr_match_quality/openlr_assessment_tool/traffic_mode.hpp diff --git a/openlr/openlr_match_quality/openlr_assessment_tool/traffic_panel.cpp b/tools/openlr/openlr_match_quality/openlr_assessment_tool/traffic_panel.cpp similarity index 100% rename from openlr/openlr_match_quality/openlr_assessment_tool/traffic_panel.cpp rename to tools/openlr/openlr_match_quality/openlr_assessment_tool/traffic_panel.cpp diff --git a/openlr/openlr_match_quality/openlr_assessment_tool/traffic_panel.hpp b/tools/openlr/openlr_match_quality/openlr_assessment_tool/traffic_panel.hpp similarity index 100% rename from openlr/openlr_match_quality/openlr_assessment_tool/traffic_panel.hpp rename to tools/openlr/openlr_match_quality/openlr_assessment_tool/traffic_panel.hpp diff --git a/openlr/openlr_match_quality/openlr_assessment_tool/trafficmodeinitdlg.cpp b/tools/openlr/openlr_match_quality/openlr_assessment_tool/trafficmodeinitdlg.cpp similarity index 100% rename from openlr/openlr_match_quality/openlr_assessment_tool/trafficmodeinitdlg.cpp rename to tools/openlr/openlr_match_quality/openlr_assessment_tool/trafficmodeinitdlg.cpp diff --git a/openlr/openlr_match_quality/openlr_assessment_tool/trafficmodeinitdlg.h b/tools/openlr/openlr_match_quality/openlr_assessment_tool/trafficmodeinitdlg.h similarity index 100% rename from openlr/openlr_match_quality/openlr_assessment_tool/trafficmodeinitdlg.h rename to tools/openlr/openlr_match_quality/openlr_assessment_tool/trafficmodeinitdlg.h diff --git a/openlr/openlr_match_quality/openlr_assessment_tool/trafficmodeinitdlg.ui b/tools/openlr/openlr_match_quality/openlr_assessment_tool/trafficmodeinitdlg.ui similarity index 100% rename from openlr/openlr_match_quality/openlr_assessment_tool/trafficmodeinitdlg.ui rename to tools/openlr/openlr_match_quality/openlr_assessment_tool/trafficmodeinitdlg.ui diff --git a/openlr/openlr_model.cpp b/tools/openlr/openlr_model.cpp similarity index 100% rename from openlr/openlr_model.cpp rename to tools/openlr/openlr_model.cpp diff --git a/openlr/openlr_model.hpp b/tools/openlr/openlr_model.hpp similarity index 100% rename from openlr/openlr_model.hpp rename to tools/openlr/openlr_model.hpp diff --git a/openlr/openlr_model_xml.cpp b/tools/openlr/openlr_model_xml.cpp similarity index 100% rename from openlr/openlr_model_xml.cpp rename to tools/openlr/openlr_model_xml.cpp diff --git a/openlr/openlr_model_xml.hpp b/tools/openlr/openlr_model_xml.hpp similarity index 100% rename from openlr/openlr_model_xml.hpp rename to tools/openlr/openlr_model_xml.hpp diff --git a/openlr/openlr_stat/CMakeLists.txt b/tools/openlr/openlr_stat/CMakeLists.txt similarity index 100% rename from openlr/openlr_stat/CMakeLists.txt rename to tools/openlr/openlr_stat/CMakeLists.txt diff --git a/openlr/openlr_stat/openlr_stat.cpp b/tools/openlr/openlr_stat/openlr_stat.cpp similarity index 100% rename from openlr/openlr_stat/openlr_stat.cpp rename to tools/openlr/openlr_stat/openlr_stat.cpp diff --git a/openlr/openlr_tests/CMakeLists.txt b/tools/openlr/openlr_tests/CMakeLists.txt similarity index 100% rename from openlr/openlr_tests/CMakeLists.txt rename to tools/openlr/openlr_tests/CMakeLists.txt diff --git a/openlr/openlr_tests/decoded_path_test.cpp b/tools/openlr/openlr_tests/decoded_path_test.cpp similarity index 100% rename from openlr/openlr_tests/decoded_path_test.cpp rename to tools/openlr/openlr_tests/decoded_path_test.cpp diff --git a/openlr/paths_connector.cpp b/tools/openlr/paths_connector.cpp similarity index 100% rename from openlr/paths_connector.cpp rename to tools/openlr/paths_connector.cpp diff --git a/openlr/paths_connector.hpp b/tools/openlr/paths_connector.hpp similarity index 100% rename from openlr/paths_connector.hpp rename to tools/openlr/paths_connector.hpp diff --git a/openlr/road_info_getter.cpp b/tools/openlr/road_info_getter.cpp similarity index 100% rename from openlr/road_info_getter.cpp rename to tools/openlr/road_info_getter.cpp diff --git a/openlr/road_info_getter.hpp b/tools/openlr/road_info_getter.hpp similarity index 100% rename from openlr/road_info_getter.hpp rename to tools/openlr/road_info_getter.hpp diff --git a/openlr/router.cpp b/tools/openlr/router.cpp similarity index 100% rename from openlr/router.cpp rename to tools/openlr/router.cpp diff --git a/openlr/router.hpp b/tools/openlr/router.hpp similarity index 100% rename from openlr/router.hpp rename to tools/openlr/router.hpp diff --git a/openlr/score_candidate_paths_getter.cpp b/tools/openlr/score_candidate_paths_getter.cpp similarity index 100% rename from openlr/score_candidate_paths_getter.cpp rename to tools/openlr/score_candidate_paths_getter.cpp diff --git a/openlr/score_candidate_paths_getter.hpp b/tools/openlr/score_candidate_paths_getter.hpp similarity index 100% rename from openlr/score_candidate_paths_getter.hpp rename to tools/openlr/score_candidate_paths_getter.hpp diff --git a/openlr/score_candidate_points_getter.cpp b/tools/openlr/score_candidate_points_getter.cpp similarity index 100% rename from openlr/score_candidate_points_getter.cpp rename to tools/openlr/score_candidate_points_getter.cpp diff --git a/openlr/score_candidate_points_getter.hpp b/tools/openlr/score_candidate_points_getter.hpp similarity index 100% rename from openlr/score_candidate_points_getter.hpp rename to tools/openlr/score_candidate_points_getter.hpp diff --git a/openlr/score_paths_connector.cpp b/tools/openlr/score_paths_connector.cpp similarity index 100% rename from openlr/score_paths_connector.cpp rename to tools/openlr/score_paths_connector.cpp diff --git a/openlr/score_paths_connector.hpp b/tools/openlr/score_paths_connector.hpp similarity index 100% rename from openlr/score_paths_connector.hpp rename to tools/openlr/score_paths_connector.hpp diff --git a/openlr/score_types.hpp b/tools/openlr/score_types.hpp similarity index 100% rename from openlr/score_types.hpp rename to tools/openlr/score_types.hpp diff --git a/openlr/stats.hpp b/tools/openlr/stats.hpp similarity index 100% rename from openlr/stats.hpp rename to tools/openlr/stats.hpp diff --git a/openlr/way_point.hpp b/tools/openlr/way_point.hpp similarity index 100% rename from openlr/way_point.hpp rename to tools/openlr/way_point.hpp diff --git a/poly_borders/CMakeLists.txt b/tools/poly_borders/CMakeLists.txt similarity index 100% rename from poly_borders/CMakeLists.txt rename to tools/poly_borders/CMakeLists.txt diff --git a/poly_borders/borders_data.cpp b/tools/poly_borders/borders_data.cpp similarity index 100% rename from poly_borders/borders_data.cpp rename to tools/poly_borders/borders_data.cpp diff --git a/poly_borders/borders_data.hpp b/tools/poly_borders/borders_data.hpp similarity index 100% rename from poly_borders/borders_data.hpp rename to tools/poly_borders/borders_data.hpp diff --git a/poly_borders/help_structures.cpp b/tools/poly_borders/help_structures.cpp similarity index 100% rename from poly_borders/help_structures.cpp rename to tools/poly_borders/help_structures.cpp diff --git a/poly_borders/help_structures.hpp b/tools/poly_borders/help_structures.hpp similarity index 100% rename from poly_borders/help_structures.hpp rename to tools/poly_borders/help_structures.hpp diff --git a/poly_borders/poly_borders_tests/CMakeLists.txt b/tools/poly_borders/poly_borders_tests/CMakeLists.txt similarity index 100% rename from poly_borders/poly_borders_tests/CMakeLists.txt rename to tools/poly_borders/poly_borders_tests/CMakeLists.txt diff --git a/poly_borders/poly_borders_tests/mark_points_tests.cpp b/tools/poly_borders/poly_borders_tests/mark_points_tests.cpp similarity index 100% rename from poly_borders/poly_borders_tests/mark_points_tests.cpp rename to tools/poly_borders/poly_borders_tests/mark_points_tests.cpp diff --git a/poly_borders/poly_borders_tests/remove_empty_spaces_tests.cpp b/tools/poly_borders/poly_borders_tests/remove_empty_spaces_tests.cpp similarity index 100% rename from poly_borders/poly_borders_tests/remove_empty_spaces_tests.cpp rename to tools/poly_borders/poly_borders_tests/remove_empty_spaces_tests.cpp diff --git a/poly_borders/poly_borders_tests/tools.cpp b/tools/poly_borders/poly_borders_tests/tools.cpp similarity index 100% rename from poly_borders/poly_borders_tests/tools.cpp rename to tools/poly_borders/poly_borders_tests/tools.cpp diff --git a/poly_borders/poly_borders_tests/tools.hpp b/tools/poly_borders/poly_borders_tests/tools.hpp similarity index 100% rename from poly_borders/poly_borders_tests/tools.hpp rename to tools/poly_borders/poly_borders_tests/tools.hpp diff --git a/poly_borders/poly_borders_tool/CMakeLists.txt b/tools/poly_borders/poly_borders_tool/CMakeLists.txt similarity index 100% rename from poly_borders/poly_borders_tool/CMakeLists.txt rename to tools/poly_borders/poly_borders_tool/CMakeLists.txt diff --git a/poly_borders/poly_borders_tool/poly_borders_tool.cpp b/tools/poly_borders/poly_borders_tool/poly_borders_tool.cpp similarity index 100% rename from poly_borders/poly_borders_tool/poly_borders_tool.cpp rename to tools/poly_borders/poly_borders_tool/poly_borders_tool.cpp diff --git a/skin_generator/CMakeLists.txt b/tools/skin_generator/CMakeLists.txt similarity index 100% rename from skin_generator/CMakeLists.txt rename to tools/skin_generator/CMakeLists.txt diff --git a/skin_generator/generator.cpp b/tools/skin_generator/generator.cpp similarity index 100% rename from skin_generator/generator.cpp rename to tools/skin_generator/generator.cpp diff --git a/skin_generator/generator.hpp b/tools/skin_generator/generator.hpp similarity index 100% rename from skin_generator/generator.hpp rename to tools/skin_generator/generator.hpp diff --git a/skin_generator/main.cpp b/tools/skin_generator/main.cpp similarity index 100% rename from skin_generator/main.cpp rename to tools/skin_generator/main.cpp diff --git a/topography_generator/CMakeLists.txt b/tools/topography_generator/CMakeLists.txt similarity index 100% rename from topography_generator/CMakeLists.txt rename to tools/topography_generator/CMakeLists.txt diff --git a/topography_generator/filters_impl.cpp b/tools/topography_generator/filters_impl.cpp similarity index 100% rename from topography_generator/filters_impl.cpp rename to tools/topography_generator/filters_impl.cpp diff --git a/topography_generator/filters_impl.hpp b/tools/topography_generator/filters_impl.hpp similarity index 100% rename from topography_generator/filters_impl.hpp rename to tools/topography_generator/filters_impl.hpp diff --git a/topography_generator/generator.cpp b/tools/topography_generator/generator.cpp similarity index 100% rename from topography_generator/generator.cpp rename to tools/topography_generator/generator.cpp diff --git a/topography_generator/generator.hpp b/tools/topography_generator/generator.hpp similarity index 100% rename from topography_generator/generator.hpp rename to tools/topography_generator/generator.hpp diff --git a/topography_generator/isolines_profile.hpp b/tools/topography_generator/isolines_profile.hpp similarity index 100% rename from topography_generator/isolines_profile.hpp rename to tools/topography_generator/isolines_profile.hpp diff --git a/topography_generator/isolines_utils.hpp b/tools/topography_generator/isolines_utils.hpp similarity index 100% rename from topography_generator/isolines_utils.hpp rename to tools/topography_generator/isolines_utils.hpp diff --git a/topography_generator/main.cpp b/tools/topography_generator/main.cpp similarity index 100% rename from topography_generator/main.cpp rename to tools/topography_generator/main.cpp diff --git a/topography_generator/marching_squares/contours_builder.cpp b/tools/topography_generator/marching_squares/contours_builder.cpp similarity index 100% rename from topography_generator/marching_squares/contours_builder.cpp rename to tools/topography_generator/marching_squares/contours_builder.cpp diff --git a/topography_generator/marching_squares/contours_builder.hpp b/tools/topography_generator/marching_squares/contours_builder.hpp similarity index 100% rename from topography_generator/marching_squares/contours_builder.hpp rename to tools/topography_generator/marching_squares/contours_builder.hpp diff --git a/topography_generator/marching_squares/marching_squares.hpp b/tools/topography_generator/marching_squares/marching_squares.hpp similarity index 100% rename from topography_generator/marching_squares/marching_squares.hpp rename to tools/topography_generator/marching_squares/marching_squares.hpp diff --git a/topography_generator/marching_squares/square.hpp b/tools/topography_generator/marching_squares/square.hpp similarity index 100% rename from topography_generator/marching_squares/square.hpp rename to tools/topography_generator/marching_squares/square.hpp diff --git a/topography_generator/tile_filter.hpp b/tools/topography_generator/tile_filter.hpp similarity index 100% rename from topography_generator/tile_filter.hpp rename to tools/topography_generator/tile_filter.hpp diff --git a/topography_generator/utils/contours.hpp b/tools/topography_generator/utils/contours.hpp similarity index 100% rename from topography_generator/utils/contours.hpp rename to tools/topography_generator/utils/contours.hpp diff --git a/topography_generator/utils/contours_serdes.hpp b/tools/topography_generator/utils/contours_serdes.hpp similarity index 100% rename from topography_generator/utils/contours_serdes.hpp rename to tools/topography_generator/utils/contours_serdes.hpp diff --git a/topography_generator/utils/values_provider.hpp b/tools/topography_generator/utils/values_provider.hpp similarity index 100% rename from topography_generator/utils/values_provider.hpp rename to tools/topography_generator/utils/values_provider.hpp diff --git a/track_analyzing/CMakeLists.txt b/tools/track_analyzing/CMakeLists.txt similarity index 100% rename from track_analyzing/CMakeLists.txt rename to tools/track_analyzing/CMakeLists.txt diff --git a/track_analyzing/exceptions.hpp b/tools/track_analyzing/exceptions.hpp similarity index 100% rename from track_analyzing/exceptions.hpp rename to tools/track_analyzing/exceptions.hpp diff --git a/track_analyzing/log_parser.cpp b/tools/track_analyzing/log_parser.cpp similarity index 100% rename from track_analyzing/log_parser.cpp rename to tools/track_analyzing/log_parser.cpp diff --git a/track_analyzing/log_parser.hpp b/tools/track_analyzing/log_parser.hpp similarity index 100% rename from track_analyzing/log_parser.hpp rename to tools/track_analyzing/log_parser.hpp diff --git a/track_analyzing/serialization.hpp b/tools/track_analyzing/serialization.hpp similarity index 100% rename from track_analyzing/serialization.hpp rename to tools/track_analyzing/serialization.hpp diff --git a/track_analyzing/temporary_file.cpp b/tools/track_analyzing/temporary_file.cpp similarity index 100% rename from track_analyzing/temporary_file.cpp rename to tools/track_analyzing/temporary_file.cpp diff --git a/track_analyzing/temporary_file.hpp b/tools/track_analyzing/temporary_file.hpp similarity index 100% rename from track_analyzing/temporary_file.hpp rename to tools/track_analyzing/temporary_file.hpp diff --git a/track_analyzing/track.cpp b/tools/track_analyzing/track.cpp similarity index 100% rename from track_analyzing/track.cpp rename to tools/track_analyzing/track.cpp diff --git a/track_analyzing/track.hpp b/tools/track_analyzing/track.hpp similarity index 100% rename from track_analyzing/track.hpp rename to tools/track_analyzing/track.hpp diff --git a/track_analyzing/track_analyzer/CMakeLists.txt b/tools/track_analyzing/track_analyzer/CMakeLists.txt similarity index 100% rename from track_analyzing/track_analyzer/CMakeLists.txt rename to tools/track_analyzing/track_analyzer/CMakeLists.txt diff --git a/track_analyzing/track_analyzer/cmd_balance_csv.cpp b/tools/track_analyzing/track_analyzer/cmd_balance_csv.cpp similarity index 100% rename from track_analyzing/track_analyzer/cmd_balance_csv.cpp rename to tools/track_analyzing/track_analyzer/cmd_balance_csv.cpp diff --git a/track_analyzing/track_analyzer/cmd_balance_csv.hpp b/tools/track_analyzing/track_analyzer/cmd_balance_csv.hpp similarity index 100% rename from track_analyzing/track_analyzer/cmd_balance_csv.hpp rename to tools/track_analyzing/track_analyzer/cmd_balance_csv.hpp diff --git a/track_analyzing/track_analyzer/cmd_cpp_track.cpp b/tools/track_analyzing/track_analyzer/cmd_cpp_track.cpp similarity index 100% rename from track_analyzing/track_analyzer/cmd_cpp_track.cpp rename to tools/track_analyzing/track_analyzer/cmd_cpp_track.cpp diff --git a/track_analyzing/track_analyzer/cmd_gpx.cpp b/tools/track_analyzing/track_analyzer/cmd_gpx.cpp similarity index 100% rename from track_analyzing/track_analyzer/cmd_gpx.cpp rename to tools/track_analyzing/track_analyzer/cmd_gpx.cpp diff --git a/track_analyzing/track_analyzer/cmd_match.cpp b/tools/track_analyzing/track_analyzer/cmd_match.cpp similarity index 100% rename from track_analyzing/track_analyzer/cmd_match.cpp rename to tools/track_analyzing/track_analyzer/cmd_match.cpp diff --git a/track_analyzing/track_analyzer/cmd_table.cpp b/tools/track_analyzing/track_analyzer/cmd_table.cpp similarity index 100% rename from track_analyzing/track_analyzer/cmd_table.cpp rename to tools/track_analyzing/track_analyzer/cmd_table.cpp diff --git a/track_analyzing/track_analyzer/cmd_track.cpp b/tools/track_analyzing/track_analyzer/cmd_track.cpp similarity index 100% rename from track_analyzing/track_analyzer/cmd_track.cpp rename to tools/track_analyzing/track_analyzer/cmd_track.cpp diff --git a/track_analyzing/track_analyzer/cmd_tracks.cpp b/tools/track_analyzing/track_analyzer/cmd_tracks.cpp similarity index 100% rename from track_analyzing/track_analyzer/cmd_tracks.cpp rename to tools/track_analyzing/track_analyzer/cmd_tracks.cpp diff --git a/track_analyzing/track_analyzer/cmd_unmatched_tracks.cpp b/tools/track_analyzing/track_analyzer/cmd_unmatched_tracks.cpp similarity index 100% rename from track_analyzing/track_analyzer/cmd_unmatched_tracks.cpp rename to tools/track_analyzing/track_analyzer/cmd_unmatched_tracks.cpp diff --git a/track_analyzing/track_analyzer/crossroad_checker.cpp b/tools/track_analyzing/track_analyzer/crossroad_checker.cpp similarity index 100% rename from track_analyzing/track_analyzer/crossroad_checker.cpp rename to tools/track_analyzing/track_analyzer/crossroad_checker.cpp diff --git a/track_analyzing/track_analyzer/crossroad_checker.hpp b/tools/track_analyzing/track_analyzer/crossroad_checker.hpp similarity index 100% rename from track_analyzing/track_analyzer/crossroad_checker.hpp rename to tools/track_analyzing/track_analyzer/crossroad_checker.hpp diff --git a/track_analyzing/track_analyzer/track_analyzer.cpp b/tools/track_analyzing/track_analyzer/track_analyzer.cpp similarity index 100% rename from track_analyzing/track_analyzer/track_analyzer.cpp rename to tools/track_analyzing/track_analyzer/track_analyzer.cpp diff --git a/track_analyzing/track_analyzer/utils.cpp b/tools/track_analyzing/track_analyzer/utils.cpp similarity index 100% rename from track_analyzing/track_analyzer/utils.cpp rename to tools/track_analyzing/track_analyzer/utils.cpp diff --git a/track_analyzing/track_analyzer/utils.hpp b/tools/track_analyzing/track_analyzer/utils.hpp similarity index 100% rename from track_analyzing/track_analyzer/utils.hpp rename to tools/track_analyzing/track_analyzer/utils.hpp diff --git a/track_analyzing/track_analyzing_tests/CMakeLists.txt b/tools/track_analyzing/track_analyzing_tests/CMakeLists.txt similarity index 100% rename from track_analyzing/track_analyzing_tests/CMakeLists.txt rename to tools/track_analyzing/track_analyzing_tests/CMakeLists.txt diff --git a/track_analyzing/track_analyzing_tests/balance_tests.cpp b/tools/track_analyzing/track_analyzing_tests/balance_tests.cpp similarity index 100% rename from track_analyzing/track_analyzing_tests/balance_tests.cpp rename to tools/track_analyzing/track_analyzing_tests/balance_tests.cpp diff --git a/track_analyzing/track_analyzing_tests/statistics_tests.cpp b/tools/track_analyzing/track_analyzing_tests/statistics_tests.cpp similarity index 100% rename from track_analyzing/track_analyzing_tests/statistics_tests.cpp rename to tools/track_analyzing/track_analyzing_tests/statistics_tests.cpp diff --git a/track_analyzing/track_analyzing_tests/track_archive_reader_tests.cpp b/tools/track_analyzing/track_analyzing_tests/track_archive_reader_tests.cpp similarity index 100% rename from track_analyzing/track_analyzing_tests/track_archive_reader_tests.cpp rename to tools/track_analyzing/track_analyzing_tests/track_archive_reader_tests.cpp diff --git a/track_analyzing/track_archive_reader.cpp b/tools/track_analyzing/track_archive_reader.cpp similarity index 100% rename from track_analyzing/track_archive_reader.cpp rename to tools/track_analyzing/track_archive_reader.cpp diff --git a/track_analyzing/track_archive_reader.hpp b/tools/track_analyzing/track_archive_reader.hpp similarity index 100% rename from track_analyzing/track_archive_reader.hpp rename to tools/track_analyzing/track_archive_reader.hpp diff --git a/track_analyzing/track_matcher.cpp b/tools/track_analyzing/track_matcher.cpp similarity index 100% rename from track_analyzing/track_matcher.cpp rename to tools/track_analyzing/track_matcher.cpp diff --git a/track_analyzing/track_matcher.hpp b/tools/track_analyzing/track_matcher.hpp similarity index 100% rename from track_analyzing/track_matcher.hpp rename to tools/track_analyzing/track_matcher.hpp diff --git a/track_analyzing/utils.cpp b/tools/track_analyzing/utils.cpp similarity index 100% rename from track_analyzing/utils.cpp rename to tools/track_analyzing/utils.cpp diff --git a/track_analyzing/utils.hpp b/tools/track_analyzing/utils.hpp similarity index 100% rename from track_analyzing/utils.hpp rename to tools/track_analyzing/utils.hpp diff --git a/track_generator/CMakeLists.txt b/tools/track_generator/CMakeLists.txt similarity index 100% rename from track_generator/CMakeLists.txt rename to tools/track_generator/CMakeLists.txt diff --git a/track_generator/track_generator_tool.cpp b/tools/track_generator/track_generator_tool.cpp similarity index 100% rename from track_generator/track_generator_tool.cpp rename to tools/track_generator/track_generator_tool.cpp diff --git a/track_generator/utils.cpp b/tools/track_generator/utils.cpp similarity index 100% rename from track_generator/utils.cpp rename to tools/track_generator/utils.cpp diff --git a/track_generator/utils.hpp b/tools/track_generator/utils.hpp similarity index 100% rename from track_generator/utils.hpp rename to tools/track_generator/utils.hpp diff --git a/tools/unix/generate_symbols.sh b/tools/unix/generate_symbols.sh index b2a521112..68f247dd8 100755 --- a/tools/unix/generate_symbols.sh +++ b/tools/unix/generate_symbols.sh @@ -20,27 +20,16 @@ export PYTHONDONTWRITEBYTECODE=1 # Add env var to disable renderer on a display (renderer not working into a Github container) export QT_QPA_PLATFORM=offscreen +BINARY_NAME=skin_generator_tool OMIM_PATH="${OMIM_PATH:-$(cd "$(dirname "$0")/../.."; pwd)}" -OUT_PATH="$OMIM_PATH/out/release" -SKIN_GENERATOR="${SKIN_GENERATOR:-$OUT_PATH/skin_generator_tool}" +BUILD_DIR="$OMIM_PATH/build" +SKIN_GENERATOR="${SKIN_GENERATOR:-$BUILD_DIR/$BINARY_NAME}" DATA_PATH="$OMIM_PATH/data" -# If skin_generator does not exist then build it -if [ ! -f "$SKIN_GENERATOR" ]; -then - source "$OMIM_PATH/tools/autobuild/detect_cmake.sh" - # OS-specific parameters - if [ "$(uname -s)" == "Darwin" ]; then - PROCESSES=$(sysctl -n hw.ncpu) - else - PROCESSES=$(nproc) - fi - mkdir -p "$OUT_PATH" - pushd "$OUT_PATH" > /dev/null - "$CMAKE" "$OMIM_PATH" -DSKIP_TESTS:bool=true - make skin_generator_tool -j$PROCESSES - popd > /dev/null -fi +# cmake rebuilds skin generator binary if necessary. +cmake -S "$OMIM_PATH" -B "$BUILD_DIR" -G Ninja -DCMAKE_BUILD_TYPE=Release -DSKIP_TESTS:bool=true +cmake --build "$BUILD_DIR" --target "$BINARY_NAME" + # Helper function to build skin # Parameter $1 - style type (default) diff --git a/xcode/CoMaps.xcworkspace/contents.xcworkspacedata b/xcode/CoMaps.xcworkspace/contents.xcworkspacedata index 490f821db..292dc0328 100644 --- a/xcode/CoMaps.xcworkspace/contents.xcworkspacedata +++ b/xcode/CoMaps.xcworkspace/contents.xcworkspacedata @@ -11,17 +11,17 @@ location = "container:common.xcconfig"> + location = "group:../libs/std/target_os.hpp"> + location = "group:../libs/std/windows.hpp"> @@ -85,7 +85,7 @@ location = "container:tess2/tess2.xcodeproj"> + location = "container:vulkan_wrapper/vulkan_wrapper.xcodeproj"> + location = "container:shaders/shaders.xcodeproj"> @@ -158,7 +158,7 @@ location = "container:traffic/traffic.xcodeproj"> + location = "container:transit/transit.xcodeproj"> diff --git a/xcode/base/base.xcodeproj/project.pbxproj b/xcode/base/base.xcodeproj/project.pbxproj index 570062965..40683d11c 100644 --- a/xcode/base/base.xcodeproj/project.pbxproj +++ b/xcode/base/base.xcodeproj/project.pbxproj @@ -213,7 +213,7 @@ 39FD26E11CC65A0E00AFF551 /* threads_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = threads_test.cpp; sourceTree = ""; }; 39FD26E21CC65A0E00AFF551 /* timegm_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = timegm_test.cpp; sourceTree = ""; }; 39FD26E31CC65A0E00AFF551 /* timer_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = timer_test.cpp; sourceTree = ""; }; - 39FD27011CC65A2800AFF551 /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../testing/testingmain.cpp; sourceTree = ""; }; + 39FD27011CC65A2800AFF551 /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../../libs/testing/testingmain.cpp; sourceTree = ""; }; 39FD27071CC65A7100AFF551 /* base_tests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = base_tests.app; sourceTree = BUILT_PRODUCTS_DIR; }; 3D08987824810A0B00837783 /* linked_map.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = linked_map.hpp; sourceTree = ""; }; 3D08987A24810A1300837783 /* linked_map_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = linked_map_tests.cpp; sourceTree = ""; }; @@ -375,7 +375,7 @@ 39F995E220F55B8A0034F977 /* visitor_tests.cpp */, ); name = base_tests; - path = ../../base/base_tests; + path = ../../libs/base/base_tests; sourceTree = ""; }; 6753416E1A3F57BF00A0A8C3 = { @@ -500,7 +500,7 @@ 3D78157A1F3D89EC0068B6AC /* waiter.hpp */, ); name = base; - path = ../../base; + path = ../../libs/base; sourceTree = SOURCE_ROOT; }; 675345381A3F6F5E00A0A8C3 /* internal */ = { diff --git a/xcode/coding/coding.xcodeproj/project.pbxproj b/xcode/coding/coding.xcodeproj/project.pbxproj index 9e764a22f..e81c74dbd 100644 --- a/xcode/coding/coding.xcodeproj/project.pbxproj +++ b/xcode/coding/coding.xcodeproj/project.pbxproj @@ -185,7 +185,7 @@ 34A72A431DBE4989003D1F5F /* common-debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-debug.xcconfig"; path = "../common-debug.xcconfig"; sourceTree = ""; }; 34A72A441DBE4989003D1F5F /* common-release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-release.xcconfig"; path = "../common-release.xcconfig"; sourceTree = ""; }; 3949168F1BAC3A5F002A8C4F /* coding_tests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = coding_tests.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 3949171F1BAC3BE0002A8C4F /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../testing/testingmain.cpp; sourceTree = ""; }; + 3949171F1BAC3BE0002A8C4F /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../../libs/testing/testingmain.cpp; sourceTree = ""; }; 394917221BAC3C2F002A8C4F /* huffman.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = huffman.cpp; sourceTree = ""; }; 394917231BAC3C2F002A8C4F /* huffman.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = huffman.hpp; sourceTree = ""; }; 3954E00D233500E90007FDE4 /* files_container.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = files_container.hpp; sourceTree = ""; }; @@ -419,7 +419,7 @@ 395D1A91207BBBAC001164A5 /* zlib_test.cpp */, ); name = coding_tests; - path = ../../coding/coding_tests; + path = ../../libs/coding/coding_tests; sourceTree = ""; }; 670D04B21B0BA9050013A7AC /* internal */ = { @@ -545,7 +545,7 @@ 34A129D21DF99E43001B4531 /* zlib.hpp */, ); name = coding; - path = ../../coding; + path = ../../libs/coding; sourceTree = SOURCE_ROOT; }; /* End PBXGroup section */ diff --git a/xcode/common.xcconfig b/xcode/common.xcconfig index fe50da5b9..7edb7fa65 100644 --- a/xcode/common.xcconfig +++ b/xcode/common.xcconfig @@ -5,7 +5,7 @@ QT_PATH[arch=arm64] = /opt/homebrew/opt/qt@6 BOOST_ROOT = $(OMIM_ROOT)/3party/boost // jansson is included in many libs, and is also used in headers (leaks to other libs) -HEADER_SEARCH_PATHS = $(inherited) $(OMIM_ROOT) $(BOOST_ROOT) $(OMIM_ROOT)/3party/jansson $(OMIM_ROOT)/3party/jansson/jansson/src $(OMIM_ROOT)/3party/utfcpp/source +HEADER_SEARCH_PATHS = $(inherited) $(OMIM_ROOT) $(OMIM_ROOT)/libs $(BOOST_ROOT) $(OMIM_ROOT)/3party/jansson $(OMIM_ROOT)/3party/jansson/jansson/src $(OMIM_ROOT)/3party/utfcpp/source FRAMEWORK_SEARCH_PATHS[sdk=macosx*] = $(QT_PATH)/lib // Deployment target diff --git a/xcode/cppjansson/cppjansson.xcodeproj/project.pbxproj b/xcode/cppjansson/cppjansson.xcodeproj/project.pbxproj index 323906094..00b481101 100644 --- a/xcode/cppjansson/cppjansson.xcodeproj/project.pbxproj +++ b/xcode/cppjansson/cppjansson.xcodeproj/project.pbxproj @@ -77,7 +77,7 @@ 7168E916294CBB91005BA468 /* cppjansson.hpp */, ); name = cppjansson; - path = ../../cppjansson; + path = ../../libs/cppjansson; sourceTree = ""; }; 71D730FC294CC4B400F3EEC2 /* Frameworks */ = { diff --git a/xcode/descriptions/descriptions.xcodeproj/project.pbxproj b/xcode/descriptions/descriptions.xcodeproj/project.pbxproj index a882a0079..5823f24a5 100644 --- a/xcode/descriptions/descriptions.xcodeproj/project.pbxproj +++ b/xcode/descriptions/descriptions.xcodeproj/project.pbxproj @@ -63,7 +63,7 @@ B7A5517221CAFB2800789B7E /* serdes.hpp */, ); name = descriptions; - path = ../../descriptions; + path = ../../libs/descriptions; sourceTree = SOURCE_ROOT; }; /* End PBXGroup section */ diff --git a/xcode/drape/drape.xcodeproj/project.pbxproj b/xcode/drape/drape.xcodeproj/project.pbxproj index cbe56ddec..b84ad6270 100644 --- a/xcode/drape/drape.xcodeproj/project.pbxproj +++ b/xcode/drape/drape.xcodeproj/project.pbxproj @@ -481,7 +481,7 @@ 4577B24321F2034200864FAC /* vulkan */, ); name = drape; - path = ../../drape; + path = ../../libs/drape; sourceTree = SOURCE_ROOT; }; 6729A55C1A69213A007D5872 /* utils */ = { diff --git a/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj b/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj index 959a01117..9ccf76f38 100644 --- a/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj +++ b/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj @@ -617,7 +617,7 @@ 670947901BDF9BE1005014C0 /* visual_params.hpp */, ); name = drape_frontend; - path = ../../drape_frontend; + path = ../../libs/drape_frontend; sourceTree = ""; }; 670948051BDF9C0D005014C0 /* animation */ = { diff --git a/xcode/editor/editor.xcodeproj/project.pbxproj b/xcode/editor/editor.xcodeproj/project.pbxproj index afb5c320b..0b53cabfc 100644 --- a/xcode/editor/editor.xcodeproj/project.pbxproj +++ b/xcode/editor/editor.xcodeproj/project.pbxproj @@ -96,7 +96,7 @@ 3496ABD41DC2034900C5DDBA /* opening_hours_ui_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = opening_hours_ui_test.cpp; sourceTree = ""; }; 3496ABD61DC2034900C5DDBA /* ui2oh_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ui2oh_test.cpp; sourceTree = ""; }; 3496ABD81DC2034900C5DDBA /* xml_feature_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = xml_feature_test.cpp; sourceTree = ""; }; - 3496AC011DC2047D00C5DDBA /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../testing/testingmain.cpp; sourceTree = ""; }; + 3496AC011DC2047D00C5DDBA /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../../libs/testing/testingmain.cpp; sourceTree = ""; }; 3496AC041DC204B700C5DDBA /* editor.config */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = editor.config; path = ../../data/editor.config; sourceTree = ""; }; 34F5586E1DBF49B200A4FC11 /* common-debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-debug.xcconfig"; path = "../common-debug.xcconfig"; sourceTree = ""; }; 34F5586F1DBF49B200A4FC11 /* common-release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-release.xcconfig"; path = "../common-release.xcconfig"; sourceTree = ""; }; @@ -257,7 +257,7 @@ 34583BBE1C8854C100F94664 /* yes_no_unknown.hpp */, ); name = editor; - path = ../../editor; + path = ../../libs/editor; sourceTree = SOURCE_ROOT; }; 3496ABD01DC2032800C5DDBA /* editor_tests */ = { @@ -277,7 +277,7 @@ 3496ABD81DC2034900C5DDBA /* xml_feature_test.cpp */, ); name = editor_tests; - path = ../../editor/editor_tests; + path = ../../libs/editor/editor_tests; sourceTree = ""; }; 3496ABEA1DC2041800C5DDBA /* Frameworks */ = { @@ -313,7 +313,7 @@ 6715560D20BF01EE002BA3B4 /* helpers.hpp */, ); name = editor_tests_support; - path = ../../editor/editor_tests_support; + path = ../../libs/editor/editor_tests_support; sourceTree = ""; }; /* End PBXGroup section */ diff --git a/xcode/ge0/ge0.xcodeproj/project.pbxproj b/xcode/ge0/ge0.xcodeproj/project.pbxproj index 06a661d46..c38781da4 100644 --- a/xcode/ge0/ge0.xcodeproj/project.pbxproj +++ b/xcode/ge0/ge0.xcodeproj/project.pbxproj @@ -12,16 +12,16 @@ 391A145E23E0FC8400A448F4 /* libcoding.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 391A145D23E0FC8400A448F4 /* libcoding.a */; }; 391A146023E0FC8700A448F4 /* libbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 391A145F23E0FC8700A448F4 /* libbase.a */; }; 391A146623E0FC9A00A448F4 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 391A146523E0FC9A00A448F4 /* libz.tbd */; }; - 39C29BD023E19B3C009ECB47 /* parser.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 39C29BCC23E19B3C009ECB47 /* parser.hpp */; }; - 39C29BD123E19B3C009ECB47 /* parser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39C29BCD23E19B3C009ECB47 /* parser.cpp */; }; - 39C29BD223E19B3C009ECB47 /* url_generator.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 39C29BCE23E19B3C009ECB47 /* url_generator.hpp */; }; - 39C29BD323E19B3C009ECB47 /* url_generator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39C29BCF23E19B3C009ECB47 /* url_generator.cpp */; }; - AC3F14BF279C6D8C00AFEC02 /* geo_url_parser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AC3F14BA279C524D00AFEC02 /* geo_url_parser.cpp */; }; - AC3F14C0279C6D9500AFEC02 /* geo_url_parser.hpp in Headers */ = {isa = PBXBuildFile; fileRef = AC3F14B9279C524D00AFEC02 /* geo_url_parser.hpp */; }; AC3F14C2279C6DEB00AFEC02 /* geo_url_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AC3F14C1279C6DEB00AFEC02 /* geo_url_tests.cpp */; }; FACB76A526B8939C00810C9C /* testingmain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FACB76A426B8939C00810C9C /* testingmain.cpp */; }; FACB76A626B893A000810C9C /* url_generator_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FACB76A226B8937800810C9C /* url_generator_tests.cpp */; }; FACB76A726B893A300810C9C /* parser_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FACB76A326B8937800810C9C /* parser_tests.cpp */; }; + FAEE27C22E29B6AF00855F79 /* geo_url_parser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FAEE27BB2E29B6AF00855F79 /* geo_url_parser.cpp */; }; + FAEE27C52E29B6AF00855F79 /* parser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FAEE27BD2E29B6AF00855F79 /* parser.cpp */; }; + FAEE27C62E29B6AF00855F79 /* url_generator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FAEE27BF2E29B6AF00855F79 /* url_generator.cpp */; }; + FAEE27C72E29B6AF00855F79 /* geo_url_parser.hpp in Headers */ = {isa = PBXBuildFile; fileRef = FAEE27BA2E29B6AF00855F79 /* geo_url_parser.hpp */; }; + FAEE27C82E29B6AF00855F79 /* url_generator.hpp in Headers */ = {isa = PBXBuildFile; fileRef = FAEE27BE2E29B6AF00855F79 /* url_generator.hpp */; }; + FAEE27C92E29B6AF00855F79 /* parser.hpp in Headers */ = {isa = PBXBuildFile; fileRef = FAEE27BC2E29B6AF00855F79 /* parser.hpp */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -32,17 +32,18 @@ 391A145D23E0FC8400A448F4 /* libcoding.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libcoding.a; sourceTree = BUILT_PRODUCTS_DIR; }; 391A145F23E0FC8700A448F4 /* libbase.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libbase.a; sourceTree = BUILT_PRODUCTS_DIR; }; 391A146523E0FC9A00A448F4 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; - 39C29BCC23E19B3C009ECB47 /* parser.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = parser.hpp; path = ../../ge0/parser.hpp; sourceTree = ""; }; - 39C29BCD23E19B3C009ECB47 /* parser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = parser.cpp; path = ../../ge0/parser.cpp; sourceTree = ""; }; - 39C29BCE23E19B3C009ECB47 /* url_generator.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = url_generator.hpp; path = ../../ge0/url_generator.hpp; sourceTree = ""; }; - 39C29BCF23E19B3C009ECB47 /* url_generator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = url_generator.cpp; path = ../../ge0/url_generator.cpp; sourceTree = ""; }; 675347171A40577A00A0A8C3 /* libge0.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libge0.a; sourceTree = BUILT_PRODUCTS_DIR; }; - AC3F14B9279C524D00AFEC02 /* geo_url_parser.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = geo_url_parser.hpp; path = ../../ge0/geo_url_parser.hpp; sourceTree = ""; }; - AC3F14BA279C524D00AFEC02 /* geo_url_parser.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = geo_url_parser.cpp; path = ../../ge0/geo_url_parser.cpp; sourceTree = ""; }; AC3F14C1279C6DEB00AFEC02 /* geo_url_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = geo_url_tests.cpp; sourceTree = ""; }; FACB76A226B8937800810C9C /* url_generator_tests.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = url_generator_tests.cpp; sourceTree = ""; }; FACB76A326B8937800810C9C /* parser_tests.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = parser_tests.cpp; sourceTree = ""; }; - FACB76A426B8939C00810C9C /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../testing/testingmain.cpp; sourceTree = ""; }; + FACB76A426B8939C00810C9C /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../../libs/testing/testingmain.cpp; sourceTree = ""; }; + FAEE27B92E29B6AF00855F79 /* ge0.php */ = {isa = PBXFileReference; lastKnownFileType = text.script.php; path = ge0.php; sourceTree = ""; }; + FAEE27BA2E29B6AF00855F79 /* geo_url_parser.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = geo_url_parser.hpp; sourceTree = ""; }; + FAEE27BB2E29B6AF00855F79 /* geo_url_parser.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = geo_url_parser.cpp; sourceTree = ""; }; + FAEE27BC2E29B6AF00855F79 /* parser.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = parser.hpp; sourceTree = ""; }; + FAEE27BD2E29B6AF00855F79 /* parser.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = parser.cpp; sourceTree = ""; }; + FAEE27BE2E29B6AF00855F79 /* url_generator.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = url_generator.hpp; sourceTree = ""; }; + FAEE27BF2E29B6AF00855F79 /* url_generator.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = url_generator.cpp; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -82,13 +83,8 @@ 6753470E1A40577A00A0A8C3 = { isa = PBXGroup; children = ( - AC3F14BA279C524D00AFEC02 /* geo_url_parser.cpp */, - AC3F14B9279C524D00AFEC02 /* geo_url_parser.hpp */, + FAEE27C02E29B6AF00855F79 /* ge0 */, FACB76A026B8937800810C9C /* ge0_tests */, - 39C29BCD23E19B3C009ECB47 /* parser.cpp */, - 39C29BCC23E19B3C009ECB47 /* parser.hpp */, - 39C29BCF23E19B3C009ECB47 /* url_generator.cpp */, - 39C29BCE23E19B3C009ECB47 /* url_generator.hpp */, 34763F471DBE28F800D370CF /* common-debug.xcconfig */, 34763F481DBE28F800D370CF /* common-release.xcconfig */, 675347181A40577A00A0A8C3 /* Products */, @@ -116,9 +112,24 @@ FACB76A326B8937800810C9C /* parser_tests.cpp */, ); name = ge0_tests; - path = ../../ge0/ge0_tests; + path = ../../libs/ge0/ge0_tests; sourceTree = ""; }; + FAEE27C02E29B6AF00855F79 /* ge0 */ = { + isa = PBXGroup; + children = ( + FAEE27B92E29B6AF00855F79 /* ge0.php */, + FAEE27BA2E29B6AF00855F79 /* geo_url_parser.hpp */, + FAEE27BB2E29B6AF00855F79 /* geo_url_parser.cpp */, + FAEE27BC2E29B6AF00855F79 /* parser.hpp */, + FAEE27BD2E29B6AF00855F79 /* parser.cpp */, + FAEE27BE2E29B6AF00855F79 /* url_generator.hpp */, + FAEE27BF2E29B6AF00855F79 /* url_generator.cpp */, + ); + name = ge0; + path = ../../libs/ge0; + sourceTree = SOURCE_ROOT; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -126,9 +137,9 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 39C29BD223E19B3C009ECB47 /* url_generator.hpp in Headers */, - 39C29BD023E19B3C009ECB47 /* parser.hpp in Headers */, - AC3F14C0279C6D9500AFEC02 /* geo_url_parser.hpp in Headers */, + FAEE27C72E29B6AF00855F79 /* geo_url_parser.hpp in Headers */, + FAEE27C82E29B6AF00855F79 /* url_generator.hpp in Headers */, + FAEE27C92E29B6AF00855F79 /* parser.hpp in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -233,9 +244,9 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 39C29BD123E19B3C009ECB47 /* parser.cpp in Sources */, - AC3F14BF279C6D8C00AFEC02 /* geo_url_parser.cpp in Sources */, - 39C29BD323E19B3C009ECB47 /* url_generator.cpp in Sources */, + FAEE27C22E29B6AF00855F79 /* geo_url_parser.cpp in Sources */, + FAEE27C52E29B6AF00855F79 /* parser.cpp in Sources */, + FAEE27C62E29B6AF00855F79 /* url_generator.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/xcode/geometry/geometry.xcodeproj/project.pbxproj b/xcode/geometry/geometry.xcodeproj/project.pbxproj index d866bc612..504be4227 100644 --- a/xcode/geometry/geometry.xcodeproj/project.pbxproj +++ b/xcode/geometry/geometry.xcodeproj/project.pbxproj @@ -196,7 +196,7 @@ 670F293B1BA9D2E700F2ABF4 /* tree_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tree_test.cpp; sourceTree = ""; }; 670F293C1BA9D2E700F2ABF4 /* vector_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vector_test.cpp; sourceTree = ""; }; 670F295C1BA9D39A00F2ABF4 /* geometry_tests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = geometry_tests.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 670F297E1BA9D41E00F2ABF4 /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../testing/testingmain.cpp; sourceTree = ""; }; + 670F297E1BA9D41E00F2ABF4 /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../../libs/testing/testingmain.cpp; sourceTree = ""; }; 671C2D5422AFD904008B2B8B /* meter.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = meter.hpp; sourceTree = ""; }; 6741AA9E1BF35476002C974C /* latlon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = latlon.cpp; sourceTree = ""; }; 6741AA9F1BF35476002C974C /* latlon.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = latlon.hpp; sourceTree = ""; }; @@ -307,7 +307,7 @@ 670F293C1BA9D2E700F2ABF4 /* vector_test.cpp */, ); name = geometry_tests; - path = ../../geometry/geometry_tests; + path = ../../libs/geometry/geometry_tests; sourceTree = ""; }; 675344881A3F684600A0A8C3 = { @@ -403,7 +403,7 @@ 347F336F1C454205009758CC /* triangle2d.hpp */, ); name = geometry; - path = ../../geometry; + path = ../../libs/geometry; sourceTree = SOURCE_ROOT; }; 675344DA1A3F68E200A0A8C3 /* region2d */ = { diff --git a/xcode/indexer/indexer.xcodeproj/project.pbxproj b/xcode/indexer/indexer.xcodeproj/project.pbxproj index f11bdde32..b25f19f19 100644 --- a/xcode/indexer/indexer.xcodeproj/project.pbxproj +++ b/xcode/indexer/indexer.xcodeproj/project.pbxproj @@ -327,7 +327,7 @@ 670C61071AB065B100C38A8C /* sort_and_merge_intervals_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sort_and_merge_intervals_test.cpp; sourceTree = ""; }; 670C610A1AB065B100C38A8C /* test_type.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_type.cpp; sourceTree = ""; }; 670C610B1AB065B100C38A8C /* visibility_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = visibility_test.cpp; sourceTree = ""; }; - 670C611F1AB065E100C38A8C /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../testing/testingmain.cpp; sourceTree = ""; }; + 670C611F1AB065E100C38A8C /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../../libs/testing/testingmain.cpp; sourceTree = ""; }; 670C61251AB0661100C38A8C /* indexer_tests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = indexer_tests.app; sourceTree = BUILT_PRODUCTS_DIR; }; 670C61581AB0691900C38A8C /* features_offsets_table.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = features_offsets_table.cpp; sourceTree = ""; }; 670C61591AB0691900C38A8C /* features_offsets_table.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = features_offsets_table.hpp; sourceTree = ""; }; @@ -570,7 +570,7 @@ 3D452AF71EE6D9F5009EAB9B /* wheelchair_tests.cpp */, ); name = indexer_tests; - path = ../../indexer/indexer_tests; + path = ../../libs/indexer/indexer_tests; sourceTree = ""; }; 675340911A3F53CB00A0A8C3 = { @@ -740,7 +740,7 @@ FA7F9B82273F32680093EA08 /* validate_and_format_contacts.hpp */, ); name = indexer; - path = ../../indexer; + path = ../../libs/indexer; sourceTree = SOURCE_ROOT; }; /* End PBXGroup section */ diff --git a/xcode/kml/kml.xcodeproj/project.pbxproj b/xcode/kml/kml.xcodeproj/project.pbxproj index ce90a474a..428bc466d 100644 --- a/xcode/kml/kml.xcodeproj/project.pbxproj +++ b/xcode/kml/kml.xcodeproj/project.pbxproj @@ -56,7 +56,7 @@ 45E4559420584ABA00D9F45E /* types.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = types.hpp; sourceTree = ""; }; 45E455ED20584DCB00D9F45E /* kml_tests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = kml_tests.app; sourceTree = BUILT_PRODUCTS_DIR; }; 45E455FF20584DEF00D9F45E /* serdes_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = serdes_tests.cpp; sourceTree = ""; }; - 45E456122058508C00D9F45E /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../testing/testingmain.cpp; sourceTree = ""; }; + 45E456122058508C00D9F45E /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../../libs/testing/testingmain.cpp; sourceTree = ""; }; 464344F2294F952700984CB7 /* gpx_tests.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = gpx_tests.cpp; sourceTree = ""; }; 464BD0FB294546B20011955A /* serdes_gpx.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; path = serdes_gpx.cpp; sourceTree = ""; }; 464BD0FC294546B20011955A /* serdes_gpx.hpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.h; path = serdes_gpx.hpp; sourceTree = ""; }; @@ -158,7 +158,7 @@ 45E4559120584ABA00D9F45E /* visitors.hpp */, ); name = kml; - path = ../../kml; + path = ../../libs/kml; sourceTree = ""; }; 45E455EE20584DCC00D9F45E /* kml_tests */ = { @@ -171,7 +171,7 @@ 464344F2294F952700984CB7 /* gpx_tests.cpp */, ); name = kml_tests; - path = ../../kml/kml_tests; + path = ../../libs/kml/kml_tests; sourceTree = ""; }; 45E4560220584E1C00D9F45E /* Frameworks */ = { diff --git a/xcode/map/map.xcodeproj/project.pbxproj b/xcode/map/map.xcodeproj/project.pbxproj index 5c9d17a45..ab9cf0a4e 100644 --- a/xcode/map/map.xcodeproj/project.pbxproj +++ b/xcode/map/map.xcodeproj/project.pbxproj @@ -201,7 +201,7 @@ 674A29CE1B26FCFE001A525C /* kmz_unarchive_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = kmz_unarchive_test.cpp; sourceTree = ""; }; 674A29CF1B26FCFE001A525C /* mwm_url_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mwm_url_tests.cpp; sourceTree = ""; }; 674A29DF1B26FD1C001A525C /* map_tests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = map_tests.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 674A29EE1B26FD5F001A525C /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../testing/testingmain.cpp; sourceTree = ""; }; + 674A29EE1B26FD5F001A525C /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../../libs/testing/testingmain.cpp; sourceTree = ""; }; 674A2A351B27011A001A525C /* working_time_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = working_time_tests.cpp; sourceTree = ""; }; 674A2A371B2715FB001A525C /* osm_opening_hours.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = osm_opening_hours.hpp; sourceTree = ""; }; 674C385F1BFF3095000D603B /* user_mark.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = user_mark.cpp; sourceTree = ""; }; @@ -323,7 +323,7 @@ 3DA571EF20C19262007BDE27 /* interactive_search_test.cpp */, ); name = map_integration_tests; - path = ../../map/map_integration_tests; + path = ../../libs/map/map_integration_tests; sourceTree = ""; }; 3DEE1AD921EE03B400054A91 /* power_management */ = { @@ -362,7 +362,7 @@ ED85D1CF2D5F508700D8075D /* track_statistics_tests.cpp */, ); name = map_tests; - path = ../../map/map_tests; + path = ../../libs/map/map_tests; sourceTree = ""; }; 675345B21A4054AD00A0A8C3 = { @@ -466,7 +466,7 @@ 3D4E99811FB462B60025B48C /* viewport_search_params.hpp */, ); name = map; - path = ../../map; + path = ../../libs/map; sourceTree = ""; }; BB4E5F201FCC663700A77250 /* transit */ = { diff --git a/xcode/mwm_diff/mwm_diff.xcodeproj/project.pbxproj b/xcode/mwm_diff/mwm_diff.xcodeproj/project.pbxproj index a87855406..6786dee63 100644 --- a/xcode/mwm_diff/mwm_diff.xcodeproj/project.pbxproj +++ b/xcode/mwm_diff/mwm_diff.xcodeproj/project.pbxproj @@ -57,7 +57,7 @@ 4586D0E31F48139400DF9CE5 /* diff.hpp */, ); name = mwm_diff; - path = ../../generator/mwm_diff; + path = ../../libs/mwm_diff; sourceTree = ""; }; /* End PBXGroup section */ diff --git a/xcode/openlr/openlr.xcodeproj/project.pbxproj b/xcode/openlr/openlr.xcodeproj/project.pbxproj index fd0dd938d..042d8a175 100644 --- a/xcode/openlr/openlr.xcodeproj/project.pbxproj +++ b/xcode/openlr/openlr.xcodeproj/project.pbxproj @@ -147,7 +147,7 @@ 671E790F1E6A502200B2859B /* way_point.hpp */, ); name = openlr; - path = ../../openlr; + path = ../../tools/openlr; sourceTree = ""; }; /* End PBXGroup section */ diff --git a/xcode/platform/platform.xcodeproj/project.pbxproj b/xcode/platform/platform.xcodeproj/project.pbxproj index 367f3f85c..c32797c28 100644 --- a/xcode/platform/platform.xcodeproj/project.pbxproj +++ b/xcode/platform/platform.xcodeproj/project.pbxproj @@ -212,7 +212,7 @@ 675341061C58C4C9002CF0D9 /* location_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = location_test.cpp; sourceTree = ""; }; 675341071C58C4C9002CF0D9 /* measurement_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = measurement_tests.cpp; sourceTree = ""; }; 675341081C58C4C9002CF0D9 /* platform_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = platform_test.cpp; sourceTree = ""; }; - 675341141C58C4D8002CF0D9 /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../testing/testingmain.cpp; sourceTree = ""; }; + 675341141C58C4D8002CF0D9 /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../../libs/testing/testingmain.cpp; sourceTree = ""; }; 675343781A3F5CF500A0A8C3 /* libplatform.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libplatform.a; sourceTree = BUILT_PRODUCTS_DIR; }; 675343861A3F5D5900A0A8C3 /* location_service/apple_location_service.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = location_service/apple_location_service.mm; sourceTree = ""; }; 675343881A3F5D5900A0A8C3 /* chunks_download_strategy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = chunks_download_strategy.cpp; sourceTree = ""; }; @@ -339,7 +339,7 @@ 44CAB5F52A1F926800819330 /* utm_mgrs_utils_tests.cpp */, ); name = platform_tests; - path = ../../platform/platform_tests; + path = ../../libs/platform/platform_tests; sourceTree = ""; }; 675340E41C58C43A002CF0D9 /* platform_tests_support */ = { @@ -359,7 +359,7 @@ 67247FFC1C60BD6500EDE56A /* writable_dir_changer.hpp */, ); name = platform_tests_support; - path = ../../platform/platform_tests_support; + path = ../../libs/platform/platform_tests_support; sourceTree = ""; }; 6753436F1A3F5CF500A0A8C3 = { @@ -485,7 +485,7 @@ 44DC51072A1F91EA00B6562E /* utm_mgrs_utils.cpp */, ); name = platform; - path = ../../platform; + path = ../../libs/platform; sourceTree = SOURCE_ROOT; }; 678338A91C6DF4BD00FD6263 /* Resources */ = { diff --git a/xcode/routing/routing.xcodeproj/project.pbxproj b/xcode/routing/routing.xcodeproj/project.pbxproj index a928e110d..4271946c9 100644 --- a/xcode/routing/routing.xcodeproj/project.pbxproj +++ b/xcode/routing/routing.xcodeproj/project.pbxproj @@ -405,8 +405,8 @@ 567E9F731F5850460064CB96 /* bicycle_turn_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bicycle_turn_test.cpp; sourceTree = ""; }; 567E9F741F5850460064CB96 /* turn_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = turn_test.cpp; sourceTree = ""; }; 567E9F7A1F58506B0064CB96 /* street_names_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = street_names_test.cpp; sourceTree = ""; }; - 567F81922154D6FF0093C25B /* city_roads.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = city_roads.cpp; path = ../../routing/city_roads.cpp; sourceTree = ""; }; - 567F81932154D6FF0093C25B /* city_roads.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = city_roads.hpp; path = ../../routing/city_roads.hpp; sourceTree = ""; }; + 567F81922154D6FF0093C25B /* city_roads.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = city_roads.cpp; sourceTree = ""; }; + 567F81932154D6FF0093C25B /* city_roads.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = city_roads.hpp; sourceTree = ""; }; 568194731F03A32400450EC3 /* road_access_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = road_access_test.cpp; sourceTree = ""; }; 568194741F03A32400450EC3 /* routing_helpers_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = routing_helpers_tests.cpp; sourceTree = ""; }; 5694723F2418C8220013CD21 /* car_directions.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = car_directions.hpp; sourceTree = ""; }; @@ -462,7 +462,7 @@ 6742ACB51C68A0B1009CB89E /* turns_generator_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = turns_generator_test.cpp; sourceTree = ""; }; 6742ACB61C68A0B1009CB89E /* turns_sound_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = turns_sound_test.cpp; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.cpp; }; 6742ACB71C68A0B1009CB89E /* turns_tts_text_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = turns_tts_text_tests.cpp; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.cpp; }; - 6742ACDE1C68A13F009CB89E /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../testing/testingmain.cpp; sourceTree = ""; }; + 6742ACDE1C68A13F009CB89E /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../../libs/testing/testingmain.cpp; sourceTree = ""; }; 6742AD0E1C68A91B009CB89E /* routing_tests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = routing_tests.app; sourceTree = BUILT_PRODUCTS_DIR; }; 6742AD531C68BB14009CB89E /* classificator.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = classificator.txt; sourceTree = ""; }; 6742AD551C68C7C1009CB89E /* types.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = types.txt; sourceTree = ""; }; @@ -635,7 +635,7 @@ 440BE38422AFB31100C548FB /* world_graph_builder.hpp */, ); name = routing_tests; - path = ../../routing/routing_tests; + path = ../../libs/routing/routing_tests; sourceTree = ""; }; 6742AD511C68BAEE009CB89E /* Resources */ = { @@ -659,8 +659,6 @@ 675343EF1A3F640D00A0A8C3 = { isa = PBXGroup; children = ( - 567F81922154D6FF0093C25B /* city_roads.cpp */, - 567F81932154D6FF0093C25B /* city_roads.hpp */, 34F558351DBF2A2600A4FC11 /* common-debug.xcconfig */, 34F558361DBF2A2600A4FC11 /* common-release.xcconfig */, 675343FA1A3F640D00A0A8C3 /* routing */, @@ -688,178 +686,180 @@ 675343FA1A3F640D00A0A8C3 /* routing */ = { isa = PBXGroup; children = ( - 44642D2C29CDA44700F8813A /* ruler_router.cpp */, - 44642D2B29CDA44600F8813A /* ruler_router.hpp */, - ACAE44A327426EDB0054DD15 /* junction_visitor.cpp */, - D549BEBC25765CFB009131F2 /* absent_regions_finder.cpp */, D549BEBA25765CFA009131F2 /* absent_regions_finder.hpp */, + D549BEBC25765CFB009131F2 /* absent_regions_finder.cpp */, 44A95C6F225F6A4F00C22F4F /* astar_graph.hpp */, - 674F9BBA1B0A580E00704FFA /* async_router.cpp */, 674F9BBB1B0A580E00704FFA /* async_router.hpp */, + 674F9BBA1B0A580E00704FFA /* async_router.cpp */, 671F58BA1B874EA20032311E /* base */, - 569472402418C8220013CD21 /* car_directions.cpp */, 5694723F2418C8220013CD21 /* car_directions.hpp */, - 5670595B1F3AF97F0062672D /* checkpoint_predictor.cpp */, + 569472402418C8220013CD21 /* car_directions.cpp */, 5670595C1F3AF97F0062672D /* checkpoint_predictor.hpp */, - 0CF709351F05172200D5067E /* checkpoints.cpp */, + 5670595B1F3AF97F0062672D /* checkpoint_predictor.cpp */, 0C15B8011F02A61B0058E253 /* checkpoints.hpp */, + 0CF709351F05172200D5067E /* checkpoints.cpp */, + 567F81932154D6FF0093C25B /* city_roads.hpp */, + 567F81922154D6FF0093C25B /* city_roads.cpp */, 56473D72214825B4007E6FBA /* city_roads_serialization.hpp */, 0C62BFE51E8ADC3100055A79 /* coding.hpp */, - D57834BE2562ED5F0020A420 /* cross_border_graph.cpp */, D57834BF2562ED5F0020A420 /* cross_border_graph.hpp */, - 0C5F5D1D1E798B0400307B98 /* cross_mwm_connector_serialization.hpp */, - 0C5F5D1E1E798B0400307B98 /* cross_mwm_connector.cpp */, + D57834BE2562ED5F0020A420 /* cross_border_graph.cpp */, 0C5F5D1F1E798B0400307B98 /* cross_mwm_connector.hpp */, - 56C439241E93BF8C00998E29 /* cross_mwm_graph.cpp */, + 0C5F5D1E1E798B0400307B98 /* cross_mwm_connector.cpp */, + 0C5F5D1D1E798B0400307B98 /* cross_mwm_connector_serialization.hpp */, 56C439251E93BF8C00998E29 /* cross_mwm_graph.hpp */, + 56C439241E93BF8C00998E29 /* cross_mwm_graph.cpp */, 56FA20461FBF23A90045DE78 /* cross_mwm_ids.hpp */, 56CC5A361E3884960016AC46 /* cross_mwm_index_graph.hpp */, - D5C9497B2525C855001E45E2 /* directions_engine_helpers.cpp */, - D5C9497A2525C854001E45E2 /* directions_engine_helpers.hpp */, - D52EF20125260E1500DFEB57 /* directions_engine.cpp */, 670EE56E1B664796001E8064 /* directions_engine.hpp */, + D52EF20125260E1500DFEB57 /* directions_engine.cpp */, + D5C9497A2525C854001E45E2 /* directions_engine_helpers.hpp */, + D5C9497B2525C855001E45E2 /* directions_engine_helpers.cpp */, D549BEB825765CFA009131F2 /* dummy_world_graph.hpp */, - 0C5FEC521DDE191E0017688C /* edge_estimator.cpp */, 0C5FEC531DDE191E0017688C /* edge_estimator.hpp */, + 0C5FEC521DDE191E0017688C /* edge_estimator.cpp */, 40C227FD1F61C07C0046696C /* fake_edges_container.hpp */, - 40C645141F8D167E002E05A0 /* fake_ending.cpp */, 40C645151F8D167E002E05A0 /* fake_ending.hpp */, + 40C645141F8D167E002E05A0 /* fake_ending.cpp */, 40655E731F8BA46B0065305E /* fake_feature_ids.hpp */, - D51A9C13242E379C00F750F8 /* fake_graph.cpp */, 405F48E81F75231E005BA81A /* fake_graph.hpp */, + D51A9C13242E379C00F750F8 /* fake_graph.cpp */, 40576F771F7A788B000B593B /* fake_vertex.hpp */, - 674F9BBC1B0A580E00704FFA /* features_road_graph.cpp */, 674F9BBD1B0A580E00704FFA /* features_road_graph.hpp */, + 674F9BBC1B0A580E00704FFA /* features_road_graph.cpp */, 560A273A233BB18900B20E8F /* following_info.hpp */, - 0C5FEC561DDE192A0017688C /* geometry.cpp */, 0C5FEC571DDE192A0017688C /* geometry.hpp */, - D526BA76241FC5580076E0B0 /* guides_connections.cpp */, + 0C5FEC561DDE192A0017688C /* geometry.cpp */, D526BA77241FC5580076E0B0 /* guides_connections.hpp */, - D526BA75241FC5580076E0B0 /* guides_graph.cpp */, + D526BA76241FC5580076E0B0 /* guides_connections.cpp */, D526BA78241FC5580076E0B0 /* guides_graph.hpp */, - 0C090C7F1E4E274000D52AFD /* index_graph_loader.cpp */, - 0C090C801E4E274000D52AFD /* index_graph_loader.hpp */, - 0C08AA321DF83223004195DD /* index_graph_serialization.cpp */, - 0C08AA331DF83223004195DD /* index_graph_serialization.hpp */, - 4408A63921F1E7F0008171B8 /* index_graph_starter_joints.hpp */, - 0C0DF91F1DE898B70055A22F /* index_graph_starter.cpp */, - 0C0DF9201DE898B70055A22F /* index_graph_starter.hpp */, - 0C5FEC581DDE192A0017688C /* index_graph.cpp */, + D526BA75241FC5580076E0B0 /* guides_graph.cpp */, 0C5FEC591DDE192A0017688C /* index_graph.hpp */, - 0C5BC9CF1E28FD4E0071BFDD /* index_road_graph.cpp */, + 0C5FEC581DDE192A0017688C /* index_graph.cpp */, + 0C090C801E4E274000D52AFD /* index_graph_loader.hpp */, + 0C090C7F1E4E274000D52AFD /* index_graph_loader.cpp */, + 0C08AA331DF83223004195DD /* index_graph_serialization.hpp */, + 0C08AA321DF83223004195DD /* index_graph_serialization.cpp */, + 0C0DF9201DE898B70055A22F /* index_graph_starter.hpp */, + 0C0DF91F1DE898B70055A22F /* index_graph_starter.cpp */, + 4408A63921F1E7F0008171B8 /* index_graph_starter_joints.hpp */, 0C5BC9D01E28FD4E0071BFDD /* index_road_graph.hpp */, - 0C12ED211E5C822A0080D0F4 /* index_router.cpp */, + 0C5BC9CF1E28FD4E0071BFDD /* index_road_graph.cpp */, 0C12ED221E5C822A0080D0F4 /* index_router.hpp */, - 0C5FEC5A1DDE192A0017688C /* joint_index.cpp */, - 0C5FEC5B1DDE192A0017688C /* joint_index.hpp */, - 4408A63A21F1E7F0008171B8 /* joint_segment.cpp */, - 4408A63821F1E7F0008171B8 /* joint_segment.hpp */, - 0C5FEC5C1DDE192A0017688C /* joint.cpp */, + 0C12ED211E5C822A0080D0F4 /* index_router.cpp */, 0C5FEC5D1DDE192A0017688C /* joint.hpp */, + 0C5FEC5C1DDE192A0017688C /* joint.cpp */, + 0C5FEC5B1DDE192A0017688C /* joint_index.hpp */, + 0C5FEC5A1DDE192A0017688C /* joint_index.cpp */, + 4408A63821F1E7F0008171B8 /* joint_segment.hpp */, + 4408A63A21F1E7F0008171B8 /* joint_segment.cpp */, 56DAC2C72398F3C8000BC50D /* junction_visitor.hpp */, - 44F4EDC523A78C2D005254C4 /* latlon_with_altitude.cpp */, + ACAE44A327426EDB0054DD15 /* junction_visitor.cpp */, 44F4EDC623A78C2E005254C4 /* latlon_with_altitude.hpp */, - 4433A8E823993BD200E1350B /* leaps_graph.cpp */, + 44F4EDC523A78C2D005254C4 /* latlon_with_altitude.cpp */, 4433A8EA23993BD700E1350B /* leaps_graph.hpp */, - 4443DC3522789793000C8E32 /* leaps_postprocessor.cpp */, + 4433A8E823993BD200E1350B /* leaps_graph.cpp */, 4443DC3622789793000C8E32 /* leaps_postprocessor.hpp */, + 4443DC3522789793000C8E32 /* leaps_postprocessor.cpp */, 56099E251CC7C97D00A7772A /* loaded_path_segment.hpp */, - 56FEAA6D219E8A610073DF5F /* maxspeeds_serialization.cpp */, - 56FEAA6C219E8A600073DF5F /* maxspeeds_serialization.hpp */, - 5631B667219B125C009F47D4 /* maxspeeds.cpp */, 5631B668219B125C009F47D4 /* maxspeeds.hpp */, - D5481E4D24BF4F70008FB1D8 /* mwm_hierarchy_handler.cpp */, + 5631B667219B125C009F47D4 /* maxspeeds.cpp */, + 56FEAA6C219E8A600073DF5F /* maxspeeds_serialization.hpp */, + 56FEAA6D219E8A610073DF5F /* maxspeeds_serialization.cpp */, D5481E4C24BF4F70008FB1D8 /* mwm_hierarchy_handler.hpp */, - 670D049C1B0B4A970013A7AC /* nearest_edge_finder.cpp */, + D5481E4D24BF4F70008FB1D8 /* mwm_hierarchy_handler.cpp */, 670D049D1B0B4A970013A7AC /* nearest_edge_finder.hpp */, - 44B284C523F5A21300A3FBB7 /* opening_hours_serdes.cpp */, + 670D049C1B0B4A970013A7AC /* nearest_edge_finder.cpp */, 44B284C623F5A21300A3FBB7 /* opening_hours_serdes.hpp */, - 670EE56F1B664796001E8064 /* pedestrian_directions.cpp */, + 44B284C523F5A21300A3FBB7 /* opening_hours_serdes.cpp */, 670EE5701B664796001E8064 /* pedestrian_directions.hpp */, - 56CBED5422E9CE2600D51AF7 /* position_accumulator.cpp */, + 670EE56F1B664796001E8064 /* pedestrian_directions.cpp */, 56CBED5322E9CE2500D51AF7 /* position_accumulator.hpp */, - D549BEB925765CFA009131F2 /* regions_router.cpp */, + 56CBED5422E9CE2600D51AF7 /* position_accumulator.cpp */, D549BEB725765CFA009131F2 /* regions_router.hpp */, - D549BEBB25765CFA009131F2 /* regions_sparse_graph.cpp */, + D549BEB925765CFA009131F2 /* regions_router.cpp */, D549BEB625765CFA009131F2 /* regions_sparse_graph.hpp */, - 67C79B9F1E2CEE1400C40034 /* restriction_loader.cpp */, + D549BEBB25765CFA009131F2 /* regions_sparse_graph.cpp */, 67C79BA01E2CEE1400C40034 /* restriction_loader.hpp */, - 349D1CDE1E3F589900A878FD /* restrictions_serialization.cpp */, + 67C79B9F1E2CEE1400C40034 /* restriction_loader.cpp */, 349D1CDF1E3F589900A878FD /* restrictions_serialization.hpp */, - 4432C5B524067E6700C9E445 /* road_access_serialization.cpp */, - 5694CEC61EBA25F7004576D3 /* road_access_serialization.hpp */, - 5694CEC71EBA25F7004576D3 /* road_access.cpp */, + 349D1CDE1E3F589900A878FD /* restrictions_serialization.cpp */, 5694CEC81EBA25F7004576D3 /* road_access.hpp */, - 674F9BC41B0A580E00704FFA /* road_graph.cpp */, + 5694CEC71EBA25F7004576D3 /* road_access.cpp */, + 5694CEC61EBA25F7004576D3 /* road_access_serialization.hpp */, + 4432C5B524067E6700C9E445 /* road_access_serialization.cpp */, 674F9BC51B0A580E00704FFA /* road_graph.hpp */, - 0C5FEC661DDE193F0017688C /* road_index.cpp */, + 674F9BC41B0A580E00704FFA /* road_graph.cpp */, 0C5FEC671DDE193F0017688C /* road_index.hpp */, + 0C5FEC661DDE193F0017688C /* road_index.cpp */, 0C5FEC681DDE193F0017688C /* road_point.hpp */, - 0C8705041E0182F200BCAF71 /* route_point.hpp */, - 40A111CB1F2F6776005E6AD5 /* route_weight.cpp */, - 40A111CC1F2F6776005E6AD5 /* route_weight.hpp */, - 6753440D1A3F644F00A0A8C3 /* route.cpp */, 6753440E1A3F644F00A0A8C3 /* route.hpp */, - A1616E291B6B60AB003F078E /* router_delegate.cpp */, - A1616E2A1B6B60AB003F078E /* router_delegate.hpp */, - 670EE5711B664796001E8064 /* router.cpp */, + 6753440D1A3F644F00A0A8C3 /* route.cpp */, + 0C8705041E0182F200BCAF71 /* route_point.hpp */, + 40A111CC1F2F6776005E6AD5 /* route_weight.hpp */, + 40A111CB1F2F6776005E6AD5 /* route_weight.cpp */, 6753440F1A3F644F00A0A8C3 /* router.hpp */, + 670EE5711B664796001E8064 /* router.cpp */, + A1616E2A1B6B60AB003F078E /* router_delegate.hpp */, + A1616E291B6B60AB003F078E /* router_delegate.cpp */, 562BDE1F20D14860008EFF6F /* routing_callbacks.hpp */, 0C08AA381DF8329B004195DD /* routing_exceptions.hpp */, - 0C0DF9281DE898FF0055A22F /* routing_helpers.cpp */, 56EA2FD41D8FD8590083F01A /* routing_helpers.hpp */, - 44C56C0922296498006C2A1D /* routing_options.cpp */, + 0C0DF9281DE898FF0055A22F /* routing_helpers.cpp */, 44C56C0822296498006C2A1D /* routing_options.hpp */, + 44C56C0922296498006C2A1D /* routing_options.cpp */, 56099E261CC7C97D00A7772A /* routing_result_graph.hpp */, - 670EE55A1B6001E7001E8064 /* routing_session.cpp */, 670EE55B1B6001E7001E8064 /* routing_session.hpp */, - 0C45D7381F2F75500065C3ED /* routing_settings.cpp */, + 670EE55A1B6001E7001E8064 /* routing_session.cpp */, 670EE55C1B6001E7001E8064 /* routing_settings.hpp */, - 441CC8C523ACF42C008B9A49 /* segment.cpp */, + 0C45D7381F2F75500065C3ED /* routing_settings.cpp */, + 44642D2B29CDA44600F8813A /* ruler_router.hpp */, + 44642D2C29CDA44700F8813A /* ruler_router.cpp */, 0C470E6F1E0D4EB1005B824D /* segment.hpp */, - 0C81E1551F0258AA00DC66DF /* segmented_route.cpp */, + 441CC8C523ACF42C008B9A49 /* segment.cpp */, 0C81E1561F0258AA00DC66DF /* segmented_route.hpp */, - 40F7F3E31F7D246D0082D564 /* single_vehicle_world_graph.cpp */, + 0C81E1551F0258AA00DC66DF /* segmented_route.cpp */, 40F7F3E21F7D246C0082D564 /* single_vehicle_world_graph.hpp */, - F6C3A1B421AC298F0060EEC8 /* speed_camera_manager.cpp */, - F6C3A1B321AC298E0060EEC8 /* speed_camera_manager.hpp */, - 5610731A221ABF96008447B2 /* speed_camera_prohibition.cpp */, - 56107319221ABF96008447B2 /* speed_camera_prohibition.hpp */, - 44E5574B2136EED000B01439 /* speed_camera_ser_des.cpp */, - 44E557492136EEC800B01439 /* speed_camera_ser_des.hpp */, - 44AE4A10214FBB8D006321F5 /* speed_camera.cpp */, + 40F7F3E31F7D246D0082D564 /* single_vehicle_world_graph.cpp */, 44AE4A11214FBB8D006321F5 /* speed_camera.hpp */, - 0C81E1511F02589800DC66DF /* traffic_stash.cpp */, + 44AE4A10214FBB8D006321F5 /* speed_camera.cpp */, + F6C3A1B321AC298E0060EEC8 /* speed_camera_manager.hpp */, + F6C3A1B421AC298F0060EEC8 /* speed_camera_manager.cpp */, + 56107319221ABF96008447B2 /* speed_camera_prohibition.hpp */, + 5610731A221ABF96008447B2 /* speed_camera_prohibition.cpp */, + 44E557492136EEC800B01439 /* speed_camera_ser_des.hpp */, + 44E5574B2136EED000B01439 /* speed_camera_ser_des.cpp */, 0C81E1521F02589800DC66DF /* traffic_stash.hpp */, - 4065EA821F8260000094DEF3 /* transit_graph_loader.cpp */, - 4065EA831F8260000094DEF3 /* transit_graph_loader.hpp */, - 4081AD4D1F8E4C1C006CE8A5 /* transit_graph.cpp */, + 0C81E1511F02589800DC66DF /* traffic_stash.cpp */, 4065EA841F8260000094DEF3 /* transit_graph.hpp */, + 4081AD4D1F8E4C1C006CE8A5 /* transit_graph.cpp */, + 4065EA831F8260000094DEF3 /* transit_graph_loader.hpp */, + 4065EA821F8260000094DEF3 /* transit_graph_loader.cpp */, 40BEC0801F99FFD600E06CA4 /* transit_info.hpp */, - 4065EA7F1F824A6C0094DEF3 /* transit_world_graph.cpp */, 4065EA7E1F824A6C0094DEF3 /* transit_world_graph.hpp */, + 4065EA7F1F824A6C0094DEF3 /* transit_world_graph.cpp */, 56099E271CC7C97D00A7772A /* turn_candidate.hpp */, - 674F9BC61B0A580E00704FFA /* turns_generator.cpp */, - 674F9BC71B0A580E00704FFA /* turns_generator.hpp */, - AC53BEEF282BE95B00E6DE59 /* turns_generator_utils.cpp */, - AC53BEEE282BE95B00E6DE59 /* turns_generator_utils.hpp */, - 6741AA9A1BF35331002C974C /* turns_notification_manager.cpp */, - 6741AA9B1BF35331002C974C /* turns_notification_manager.hpp */, - 67C7D4251B4EB48F00FE41AA /* turns_sound_settings.cpp */, - 67C7D4261B4EB48F00FE41AA /* turns_sound_settings.hpp */, - 4652D9142BAA3C5600C71046 /* turns_tts_text_i18n.cpp */, - 4652D9152BAA3C5600C71046 /* turns_tts_text_i18n.hpp */, - 67AB92E11B7B3E6E00AB5194 /* turns_tts_text.cpp */, - 67AB92E21B7B3E6E00AB5194 /* turns_tts_text.hpp */, - 675344101A3F644F00A0A8C3 /* turns.cpp */, 675344111A3F644F00A0A8C3 /* turns.hpp */, - 5694CEC91EBA25F7004576D3 /* vehicle_mask.cpp */, + 675344101A3F644F00A0A8C3 /* turns.cpp */, + 674F9BC71B0A580E00704FFA /* turns_generator.hpp */, + 674F9BC61B0A580E00704FFA /* turns_generator.cpp */, + AC53BEEE282BE95B00E6DE59 /* turns_generator_utils.hpp */, + AC53BEEF282BE95B00E6DE59 /* turns_generator_utils.cpp */, + 6741AA9B1BF35331002C974C /* turns_notification_manager.hpp */, + 6741AA9A1BF35331002C974C /* turns_notification_manager.cpp */, + 67C7D4261B4EB48F00FE41AA /* turns_sound_settings.hpp */, + 67C7D4251B4EB48F00FE41AA /* turns_sound_settings.cpp */, + 67AB92E21B7B3E6E00AB5194 /* turns_tts_text.hpp */, + 67AB92E11B7B3E6E00AB5194 /* turns_tts_text.cpp */, + 4652D9152BAA3C5600C71046 /* turns_tts_text_i18n.hpp */, + 4652D9142BAA3C5600C71046 /* turns_tts_text_i18n.cpp */, 0C08AA361DF8324D004195DD /* vehicle_mask.hpp */, - 0C090C851E4E276700D52AFD /* world_graph.cpp */, + 5694CEC91EBA25F7004576D3 /* vehicle_mask.cpp */, 0C090C861E4E276700D52AFD /* world_graph.hpp */, + 0C090C851E4E276700D52AFD /* world_graph.cpp */, ); name = routing; - path = ../../routing; + path = ../../libs/routing; sourceTree = ""; }; 67BD35961C69F03E003AA26F /* routing_integration_tests */ = { @@ -881,7 +881,7 @@ 567E9F741F5850460064CB96 /* turn_test.cpp */, ); name = routing_integration_tests; - path = ../../routing/routing_integration_tests; + path = ../../libs/routing/routing_integration_tests; sourceTree = ""; }; /* End PBXGroup section */ diff --git a/xcode/routing_common/routing_common.xcodeproj/project.pbxproj b/xcode/routing_common/routing_common.xcodeproj/project.pbxproj index 2e8459964..473de0530 100644 --- a/xcode/routing_common/routing_common.xcodeproj/project.pbxproj +++ b/xcode/routing_common/routing_common.xcodeproj/project.pbxproj @@ -43,7 +43,7 @@ 671E78911E6A3C9C00B2859B /* common-release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-release.xcconfig"; path = "../common-release.xcconfig"; sourceTree = ""; }; 671E78961E6A3DA700B2859B /* routing_common_tests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = routing_common_tests.app; sourceTree = BUILT_PRODUCTS_DIR; }; 671E78AD1E6A3FDB00B2859B /* vehicle_model_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vehicle_model_test.cpp; sourceTree = ""; }; - 671E78AF1E6A3FEF00B2859B /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../testing/testingmain.cpp; sourceTree = ""; }; + 671E78AF1E6A3FEF00B2859B /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../../libs/testing/testingmain.cpp; sourceTree = ""; }; F6E4ECDF223AB60600C8A79A /* car_model_coefs.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = car_model_coefs.hpp; sourceTree = ""; }; /* End PBXFileReference section */ @@ -106,7 +106,7 @@ 671E78871E6A3C5D00B2859B /* vehicle_model.hpp */, ); name = routing_common; - path = ../../routing_common; + path = ../../libs/routing_common; sourceTree = ""; }; 671E78971E6A3DA800B2859B /* routing_common_tests */ = { @@ -117,7 +117,7 @@ 671E78AD1E6A3FDB00B2859B /* vehicle_model_test.cpp */, ); name = routing_common_tests; - path = ../../routing_common/routing_common_tests; + path = ../../libs/routing_common/routing_common_tests; sourceTree = ""; }; 671E78B41E6A404F00B2859B /* Frameworks */ = { diff --git a/xcode/search/search.xcodeproj/project.pbxproj b/xcode/search/search.xcodeproj/project.pbxproj index e6844bc38..b76f5403c 100644 --- a/xcode/search/search.xcodeproj/project.pbxproj +++ b/xcode/search/search.xcodeproj/project.pbxproj @@ -445,7 +445,7 @@ 671C62171AE9227C00076BD0 /* latlon_match_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = latlon_match_test.cpp; sourceTree = ""; }; 671C62181AE9227C00076BD0 /* locality_finder_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = locality_finder_test.cpp; sourceTree = ""; }; 671C621B1AE9227C00076BD0 /* string_match_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = string_match_test.cpp; sourceTree = ""; }; - 671C62241AE9229A00076BD0 /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../testing/testingmain.cpp; sourceTree = ""; }; + 671C62241AE9229A00076BD0 /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../../libs/testing/testingmain.cpp; sourceTree = ""; }; 675346B01A4055CF00A0A8C3 /* libsearch.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libsearch.a; sourceTree = BUILT_PRODUCTS_DIR; }; 675346BE1A40560D00A0A8C3 /* algos.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = algos.hpp; sourceTree = ""; }; 675346BF1A40560D00A0A8C3 /* approximate_string_match.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = approximate_string_match.cpp; sourceTree = ""; }; @@ -687,7 +687,7 @@ 405DB10620FF472300EE3824 /* utils_test.cpp */, ); name = search_integration_tests; - path = ../../search/search_integration_tests; + path = ../../libs/search/search_integration_tests; sourceTree = ""; }; 671C620D1AE9225100076BD0 /* search_tests */ = { @@ -720,7 +720,7 @@ 44CAB5F72A1F928200819330 /* utm_mgrs_coords_match_test.cpp */, ); name = search_tests; - path = ../../search/search_tests; + path = ../../libs/search/search_tests; sourceTree = ""; }; 675346A71A4055CF00A0A8C3 = { @@ -900,7 +900,7 @@ 44A871B92A1F917400A80D62 /* utm_mgrs_coords_match.hpp */, ); name = search; - path = ../../search; + path = ../../libs/search; sourceTree = ""; }; 6796248E1D10134200AE4E3C /* search_tests_support */ = { @@ -917,7 +917,7 @@ 39AEF84F1FB45DA100943FC9 /* test_with_custom_mwms.hpp */, ); name = search_tests_support; - path = ../../search/search_tests_support; + path = ../../libs/search/search_tests_support; sourceTree = ""; }; /* End PBXGroup section */ diff --git a/xcode/shaders/shaders.xcodeproj/project.pbxproj b/xcode/shaders/shaders.xcodeproj/project.pbxproj index bb0d72b42..e934328b2 100644 --- a/xcode/shaders/shaders.xcodeproj/project.pbxproj +++ b/xcode/shaders/shaders.xcodeproj/project.pbxproj @@ -154,7 +154,7 @@ 456660EC20E25AA90085E8C1 /* gl_program_params_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gl_program_params_tests.cpp; sourceTree = ""; }; 456660ED20E25AA90085E8C1 /* gl_shaders_desktop_compile_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gl_shaders_desktop_compile_tests.cpp; sourceTree = ""; }; 456660EE20E25AA90085E8C1 /* gl_shaders_mobile_compile_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gl_shaders_mobile_compile_test.cpp; sourceTree = ""; }; - 456660F220E25AD40085E8C1 /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../testing/testingmain.cpp; sourceTree = ""; }; + 456660F220E25AD40085E8C1 /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../../libs/testing/testingmain.cpp; sourceTree = ""; }; 456660F520E25E2E0085E8C1 /* libdrape.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libdrape.a; sourceTree = BUILT_PRODUCTS_DIR; }; 456660F820E25E4C0085E8C1 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; }; 456660FC20E25EDD0085E8C1 /* libexpat.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libexpat.a; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -163,8 +163,8 @@ 4566610220E25EEF0085E8C1 /* libcoding.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libcoding.a; sourceTree = BUILT_PRODUCTS_DIR; }; 4566610420E25EF70085E8C1 /* libplatform.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libplatform.a; sourceTree = BUILT_PRODUCTS_DIR; }; 4566610620E25F560085E8C1 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; - 4566610820E25F790085E8C1 /* test_main_loop.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = test_main_loop.hpp; path = ../../qt_tstfrm/test_main_loop.hpp; sourceTree = ""; }; - 4566610920E25F790085E8C1 /* test_main_loop.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = test_main_loop.cpp; path = ../../qt_tstfrm/test_main_loop.cpp; sourceTree = ""; }; + 4566610820E25F790085E8C1 /* test_main_loop.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = test_main_loop.hpp; path = ../../../libs/qt_tstfrm/test_main_loop.hpp; sourceTree = ""; }; + 4566610920E25F790085E8C1 /* test_main_loop.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = test_main_loop.cpp; path = ../../../libs/qt_tstfrm/test_main_loop.cpp; sourceTree = ""; }; 4577B28221F2088800864FAC /* vulkan_program_pool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vulkan_program_pool.cpp; sourceTree = ""; }; 4577B28321F2088800864FAC /* vulkan_program_params.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vulkan_program_params.cpp; sourceTree = ""; }; 4577B28421F2088800864FAC /* vulkan_program_params.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = vulkan_program_params.hpp; sourceTree = ""; }; @@ -266,7 +266,7 @@ 4577B28521F2088800864FAC /* vulkan_program_pool.hpp */, ); name = shaders; - path = ../../shaders; + path = ../../libs/shaders; sourceTree = ""; }; 4566608E20E2562C0085E8C1 /* GL */ = { @@ -362,7 +362,7 @@ 456660F220E25AD40085E8C1 /* testingmain.cpp */, ); name = shaders_tests; - path = ../../shaders/shaders_tests; + path = ../../libs/shaders/shaders_tests; sourceTree = ""; }; 456660F420E25E2E0085E8C1 /* Frameworks */ = { @@ -520,96 +520,96 @@ files = ( ); inputPaths = ( - "${SRCROOT}/../../shaders/GL/area.vsh.glsl", - "${SRCROOT}/../../shaders/GL/area3d.vsh.glsl", - "${SRCROOT}/../../shaders/GL/area3d_outline.vsh.glsl", - "${SRCROOT}/../../shaders/GL/arrow3d.fsh.glsl", - "${SRCROOT}/../../shaders/GL/arrow3d.vsh.glsl", - "${SRCROOT}/../../shaders/GL/arrow3d_outline.fsh.glsl", - "${SRCROOT}/../../shaders/GL/arrow3d_shadow.fsh.glsl", - "${SRCROOT}/../../shaders/GL/arrow3d_shadow.vsh.glsl", - "${SRCROOT}/../../shaders/GL/circle.fsh.glsl", - "${SRCROOT}/../../shaders/GL/circle.vsh.glsl", - "${SRCROOT}/../../shaders/GL/circle_point.fsh.glsl", - "${SRCROOT}/../../shaders/GL/circle_point.vsh.glsl", - "${SRCROOT}/../../shaders/GL/colored_symbol.fsh.glsl", - "${SRCROOT}/../../shaders/GL/colored_symbol.vsh.glsl", - "${SRCROOT}/../../shaders/GL/colored_symbol_billboard.vsh.glsl", - "${SRCROOT}/../../shaders/GL/dashed_line.fsh.glsl", - "${SRCROOT}/../../shaders/GL/dashed_line.vsh.glsl", - "${SRCROOT}/../../shaders/GL/debug_rect.fsh.glsl", - "${SRCROOT}/../../shaders/GL/debug_rect.vsh.glsl", - "${SRCROOT}/../../shaders/GL/hatching_area.fsh.glsl", - "${SRCROOT}/../../shaders/GL/hatching_area.vsh.glsl", - "${SRCROOT}/../../shaders/GL/line.fsh.glsl", - "${SRCROOT}/../../shaders/GL/line.vsh.glsl", - "${SRCROOT}/../../shaders/GL/masked_texturing.fsh.glsl", - "${SRCROOT}/../../shaders/GL/masked_texturing.vsh.glsl", - "${SRCROOT}/../../shaders/GL/masked_texturing_billboard.vsh.glsl", - "${SRCROOT}/../../shaders/GL/my_position.vsh.glsl", - "${SRCROOT}/../../shaders/GL/path_symbol.vsh.glsl", - "${SRCROOT}/../../shaders/GL/position_accuracy3d.vsh.glsl", - "${SRCROOT}/../../shaders/GL/route.fsh.glsl", - "${SRCROOT}/../../shaders/GL/route.vsh.glsl", - "${SRCROOT}/../../shaders/GL/route_arrow.fsh.glsl", - "${SRCROOT}/../../shaders/GL/route_arrow.vsh.glsl", - "${SRCROOT}/../../shaders/GL/route_dash.fsh.glsl", - "${SRCROOT}/../../shaders/GL/route_marker.fsh.glsl", - "${SRCROOT}/../../shaders/GL/route_marker.vsh.glsl", - "${SRCROOT}/../../shaders/GL/ruler.vsh.glsl", - "${SRCROOT}/../../shaders/GL/screen_quad.vsh.glsl", - "${SRCROOT}/../../shaders/GL/selection_line.fsh.glsl", - "${SRCROOT}/../../shaders/GL/selection_line.vsh.glsl", - "${SRCROOT}/../../shaders/GL/shader_index.txt", - "${SRCROOT}/../../shaders/GL/shaders_lib.glsl", - "${SRCROOT}/../../shaders/GL/smaa_blending_weight.fsh.glsl", - "${SRCROOT}/../../shaders/GL/smaa_blending_weight.vsh.glsl", - "${SRCROOT}/../../shaders/GL/smaa_edges.fsh.glsl", - "${SRCROOT}/../../shaders/GL/smaa_edges.vsh.glsl", - "${SRCROOT}/../../shaders/GL/smaa_final.fsh.glsl", - "${SRCROOT}/../../shaders/GL/smaa_final.vsh.glsl", - "${SRCROOT}/../../shaders/GL/solid_color.fsh.glsl", - "${SRCROOT}/../../shaders/GL/text.fsh.glsl", - "${SRCROOT}/../../shaders/GL/text.vsh.glsl", - "${SRCROOT}/../../shaders/GL/text_billboard.vsh.glsl", - "${SRCROOT}/../../shaders/GL/text_outlined.vsh.glsl", - "${SRCROOT}/../../shaders/GL/text_outlined_billboard.vsh.glsl", - "${SRCROOT}/../../shaders/GL/text_outlined_gui.vsh.glsl", - "${SRCROOT}/../../shaders/GL/texturing.fsh.glsl", - "${SRCROOT}/../../shaders/GL/texturing.vsh.glsl", - "${SRCROOT}/../../shaders/GL/texturing3d.fsh.glsl", - "${SRCROOT}/../../shaders/GL/texturing_billboard.vsh.glsl", - "${SRCROOT}/../../shaders/GL/texturing_gui.vsh.glsl", - "${SRCROOT}/../../shaders/GL/traffic.fsh.glsl", - "${SRCROOT}/../../shaders/GL/traffic.vsh.glsl", - "${SRCROOT}/../../shaders/GL/traffic_circle.fsh.glsl", - "${SRCROOT}/../../shaders/GL/traffic_circle.vsh.glsl", - "${SRCROOT}/../../shaders/GL/traffic_line.fsh.glsl", - "${SRCROOT}/../../shaders/GL/traffic_line.vsh.glsl", - "${SRCROOT}/../../shaders/GL/transit.fsh.glsl", - "${SRCROOT}/../../shaders/GL/transit.vsh.glsl", - "${SRCROOT}/../../shaders/GL/transit_circle.fsh.glsl", - "${SRCROOT}/../../shaders/GL/transit_circle.vsh.glsl", - "${SRCROOT}/../../shaders/GL/transit_marker.fsh.glsl", - "${SRCROOT}/../../shaders/GL/transit_marker.vsh.glsl", - "${SRCROOT}/../../shaders/GL/user_mark.fsh.glsl", - "${SRCROOT}/../../shaders/GL/user_mark.vsh.glsl", - "${SRCROOT}/../../shaders/GL/user_mark_billboard.vsh.glsl", - "${SRCROOT}/../../shaders/gl_shaders_preprocessor.py", - "$(SRCROOT)/../../shaders/GL/shader_index.txt", - "$(SRCROOT)/../../shaders/programs.hpp", - "$(SRCROOT)/../../shaders/GL/shaders_lib.glsl", + "${OMIM_ROOT}/libs/shaders/GL/area.vsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/area3d.vsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/area3d_outline.vsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/arrow3d.fsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/arrow3d.vsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/arrow3d_outline.fsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/arrow3d_shadow.fsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/arrow3d_shadow.vsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/circle.fsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/circle.vsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/circle_point.fsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/circle_point.vsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/colored_symbol.fsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/colored_symbol.vsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/colored_symbol_billboard.vsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/dashed_line.fsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/dashed_line.vsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/debug_rect.fsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/debug_rect.vsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/hatching_area.fsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/hatching_area.vsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/line.fsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/line.vsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/masked_texturing.fsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/masked_texturing.vsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/masked_texturing_billboard.vsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/my_position.vsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/path_symbol.vsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/position_accuracy3d.vsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/route.fsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/route.vsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/route_arrow.fsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/route_arrow.vsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/route_dash.fsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/route_marker.fsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/route_marker.vsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/ruler.vsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/screen_quad.vsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/selection_line.fsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/selection_line.vsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/shader_index.txt", + "${OMIM_ROOT}/libs/shaders/GL/shaders_lib.glsl", + "${OMIM_ROOT}/libs/shaders/GL/smaa_blending_weight.fsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/smaa_blending_weight.vsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/smaa_edges.fsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/smaa_edges.vsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/smaa_final.fsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/smaa_final.vsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/solid_color.fsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/text.fsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/text.vsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/text_billboard.vsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/text_outlined.vsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/text_outlined_billboard.vsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/text_outlined_gui.vsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/texturing.fsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/texturing.vsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/texturing3d.fsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/texturing_billboard.vsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/texturing_gui.vsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/traffic.fsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/traffic.vsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/traffic_circle.fsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/traffic_circle.vsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/traffic_line.fsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/traffic_line.vsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/transit.fsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/transit.vsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/transit_circle.fsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/transit_circle.vsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/transit_marker.fsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/transit_marker.vsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/user_mark.fsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/user_mark.vsh.glsl", + "${OMIM_ROOT}/libs/shaders/GL/user_mark_billboard.vsh.glsl", + "${OMIM_ROOT}/libs/shaders/gl_shaders_preprocessor.py", + "${OMIM_ROOT}/libs/shaders/GL/shader_index.txt", + "${OMIM_ROOT}/libs/shaders/programs.hpp", + "${OMIM_ROOT}/libs/shaders/GL/shaders_lib.glsl", ); name = "Run Script"; outputFileListPaths = ( ); outputPaths = ( - "$(SRCROOT)/../../shaders/gl_shaders.hpp", - "$(SRCROOT)/../../shaders/gl_shaders.cpp", + "${OMIM_ROOT}/libs/shaders/gl_shaders.hpp", + "${OMIM_ROOT}/libs/shaders/gl_shaders.cpp", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "# Without this check shaders library is always rebuilt in XCode 13.\n# See https://stackoverflow.com/a/69481200/1209392\nif [ $ACTION != \"indexbuild\" ]; then\npython3 ${SRCROOT}/../../shaders/gl_shaders_preprocessor.py ${SRCROOT}/../../shaders/GL shader_index.txt programs.hpp shaders_lib.glsl ${SRCROOT}/../../shaders gl_shaders\nfi\n"; + shellScript = "# Without this check shaders library is always rebuilt in XCode 13.\n# See https://stackoverflow.com/a/69481200/1209392\nif [ $ACTION != \"indexbuild\" ]; then\npython3 ${OMIM_ROOT}/libs/shaders/gl_shaders_preprocessor.py ${OMIM_ROOT}/libs/shaders/GL shader_index.txt programs.hpp shaders_lib.glsl ${OMIM_ROOT}/libs/shaders gl_shaders\nfi\n"; }; /* End PBXShellScriptBuildPhase section */ diff --git a/xcode/storage/storage.xcodeproj/project.pbxproj b/xcode/storage/storage.xcodeproj/project.pbxproj index 69cffabc9..f07cfa30b 100644 --- a/xcode/storage/storage.xcodeproj/project.pbxproj +++ b/xcode/storage/storage.xcodeproj/project.pbxproj @@ -186,7 +186,7 @@ 67247FCA1C60BA8A00EDE56A /* task_runner.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = task_runner.hpp; sourceTree = ""; }; 67247FCB1C60BA8A00EDE56A /* test_map_files_downloader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_map_files_downloader.cpp; sourceTree = ""; }; 67247FCC1C60BA8A00EDE56A /* test_map_files_downloader.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = test_map_files_downloader.hpp; sourceTree = ""; }; - 67247FD71C60BA9900EDE56A /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../testing/testingmain.cpp; sourceTree = ""; }; + 67247FD71C60BA9900EDE56A /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../../libs/testing/testingmain.cpp; sourceTree = ""; }; 6724800E1C60CE7300EDE56A /* storage_group_download_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = storage_group_download_tests.cpp; sourceTree = ""; }; 6724800F1C60CE7300EDE56A /* storage_http_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = storage_http_tests.cpp; sourceTree = ""; }; 6741251A1B4C05FA00A3E828 /* map_files_downloader.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = map_files_downloader.hpp; sourceTree = ""; }; @@ -293,7 +293,7 @@ 67247FD71C60BA9900EDE56A /* testingmain.cpp */, ); name = storage_tests; - path = ../../storage/storage_tests; + path = ../../libs/storage/storage_tests; sourceTree = ""; }; 672480071C60CE3D00EDE56A /* storage_integration_tests */ = { @@ -310,7 +310,7 @@ 56D8CB981CAC17A80003F420 /* test_defines.hpp */, ); name = storage_integration_tests; - path = ../../storage/storage_integration_tests; + path = ../../libs/storage/storage_integration_tests; sourceTree = ""; }; 675342D71A3F59EF00A0A8C3 = { @@ -390,7 +390,7 @@ 675343041A3F5A2600A0A8C3 /* storage.hpp */, ); name = storage; - path = ../../storage; + path = ../../libs/storage; sourceTree = ""; }; 676C83F81C6387D000DC9603 /* Resources */ = { diff --git a/xcode/tracking/tracking.xcodeproj/project.pbxproj b/xcode/tracking/tracking.xcodeproj/project.pbxproj index dfaaa6e4e..711d1aa11 100644 --- a/xcode/tracking/tracking.xcodeproj/project.pbxproj +++ b/xcode/tracking/tracking.xcodeproj/project.pbxproj @@ -49,7 +49,7 @@ 6772592B1DBA26FD00BF54EE /* protocol.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = protocol.cpp; sourceTree = ""; }; 6772592C1DBA26FD00BF54EE /* protocol.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = protocol.hpp; sourceTree = ""; }; 67A7144D1DC2524E005FF350 /* bindings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bindings.cpp; sourceTree = ""; }; - 67B6E7B71DB8BBA900745F8A /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../testing/testingmain.cpp; sourceTree = ""; }; + 67B6E7B71DB8BBA900745F8A /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../../libs/testing/testingmain.cpp; sourceTree = ""; }; 67EC0CB61DBE4A320021F484 /* protocol_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = protocol_test.cpp; sourceTree = ""; }; D5F7FFB52382CE0E00BF7B97 /* archival_reporter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = archival_reporter.cpp; sourceTree = ""; }; D5F7FFB62382CE0E00BF7B97 /* archive.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = archive.hpp; sourceTree = ""; }; @@ -140,7 +140,7 @@ 675E88631DB7AC9000F8EBDA /* reporter.hpp */, ); name = tracking; - path = ../../tracking; + path = ../../libs/tracking; sourceTree = ""; }; 675E88831DB7ACEA00F8EBDA /* tracking_tests */ = { @@ -152,7 +152,7 @@ 67B6E7B71DB8BBA900745F8A /* testingmain.cpp */, ); name = tracking_tests; - path = ../../tracking/tracking_tests; + path = ../../libs/tracking/tracking_tests; sourceTree = ""; }; 675E888D1DB7B03400F8EBDA /* Frameworks */ = { @@ -176,7 +176,7 @@ 67A7144D1DC2524E005FF350 /* bindings.cpp */, ); name = pytracking; - path = ../../tracking/pytracking; + path = ../../libs/tracking/pytracking; sourceTree = ""; }; /* End PBXGroup section */ diff --git a/xcode/traffic/traffic.xcodeproj/project.pbxproj b/xcode/traffic/traffic.xcodeproj/project.pbxproj index fcc9f7cac..f3f4b96a7 100644 --- a/xcode/traffic/traffic.xcodeproj/project.pbxproj +++ b/xcode/traffic/traffic.xcodeproj/project.pbxproj @@ -41,7 +41,7 @@ 67BECB5E1DDA44FD00FC4E99 /* traffic_info.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = traffic_info.hpp; sourceTree = ""; }; 67BECB671DDA466800FC4E99 /* traffic_tests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = traffic_tests.app; sourceTree = BUILT_PRODUCTS_DIR; }; 67BECB7F1DDA46A100FC4E99 /* traffic_info_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = traffic_info_test.cpp; sourceTree = ""; }; - 67BECB8A1DDA478800FC4E99 /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../testing/testingmain.cpp; sourceTree = ""; }; + 67BECB8A1DDA478800FC4E99 /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../../libs/testing/testingmain.cpp; sourceTree = ""; }; 67BECB941DDA4AC800FC4E99 /* bindings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bindings.cpp; sourceTree = ""; }; FAFD413F26BBE3FC00D1DE1B /* libbase.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libbase.a; sourceTree = BUILT_PRODUCTS_DIR; }; FAFD414126BBE3FC00D1DE1B /* libcoding.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libcoding.a; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -121,7 +121,7 @@ 67BECB5E1DDA44FD00FC4E99 /* traffic_info.hpp */, ); name = traffic; - path = ../../traffic; + path = ../../libs/traffic; sourceTree = ""; }; 67BECB7E1DDA467A00FC4E99 /* traffic_tests */ = { @@ -131,7 +131,7 @@ 67BECB7F1DDA46A100FC4E99 /* traffic_info_test.cpp */, ); name = traffic_tests; - path = ../../traffic/traffic_tests; + path = ../../libs/traffic/traffic_tests; sourceTree = ""; }; 67BECB831DDA474400FC4E99 /* Frameworks */ = { @@ -158,7 +158,7 @@ 67BECB941DDA4AC800FC4E99 /* bindings.cpp */, ); name = pytraffic; - path = ../../traffic/pytraffic; + path = ../../libs/traffic/pytraffic; sourceTree = ""; }; /* End PBXGroup section */ diff --git a/xcode/transit/transit.xcodeproj/project.pbxproj b/xcode/transit/transit.xcodeproj/project.pbxproj index 37dacb61c..8704a6b1a 100644 --- a/xcode/transit/transit.xcodeproj/project.pbxproj +++ b/xcode/transit/transit.xcodeproj/project.pbxproj @@ -93,7 +93,7 @@ D55B290624CACF9E000E2EBE /* transit_version.hpp */, ); name = transit; - path = ../../transit; + path = ../../libs/transit; sourceTree = ""; }; D56AD1D624CB02BF0057F2E0 /* experimental */ = {