From bfc6c9b89dcbdd42b87720a66d75f242f97edb54 Mon Sep 17 00:00:00 2001 From: Patrick Niklaus Date: Sat, 2 Jan 2016 13:55:06 +0100 Subject: [PATCH] Move files in src/ include/ --- algorithms/bfs_components.hpp | 174 ------------ data_structures/lru_cache.hpp | 97 ------- data_structures/static_kdtree.hpp | 260 ------------------ data_structures/upper_bound.hpp | 77 ------ .../contractor}/contractor.hpp | 0 .../contractor}/contractor_options.hpp | 0 .../contractor}/crc32_processor.hpp | 0 .../contractor}/processing_chain.hpp | 0 .../contractor}/query_edge.hpp | 0 .../datastore}/shared_memory_factory.hpp | 0 .../engine/datafacade}/datafacade_base.hpp | 0 .../datafacade}/internal_datafacade.hpp | 0 .../engine/datafacade}/shared_barriers.hpp | 0 .../engine/datafacade}/shared_datafacade.hpp | 0 .../engine/datafacade}/shared_datatype.hpp | 0 .../descriptors}/description_factory.hpp | 0 .../engine/descriptors}/descriptor_base.hpp | 0 .../engine/descriptors}/gpx_descriptor.hpp | 0 .../engine/descriptors}/json_descriptor.hpp | 0 .../engine}/douglas_peucker.hpp | 0 .../engine}/geospatial_query.hpp | 0 .../engine}/internal_route_result.hpp | 0 .../engine/map_matching}/bayes_classifier.hpp | 0 .../map_matching}/hidden_markov_model.hpp | 0 .../engine}/object_encoder.hpp | 0 {library => include/engine}/osrm_impl.hpp | 0 .../engine}/phantom_node.hpp | 0 .../engine/plugins}/distance_table.hpp | 0 .../engine/plugins}/hello_world.hpp | 0 {plugins => include/engine/plugins}/match.hpp | 0 .../engine/plugins}/nearest.hpp | 0 .../engine/plugins}/plugin_base.hpp | 0 .../engine/plugins}/timestamp.hpp | 0 {plugins => include/engine/plugins}/trip.hpp | 0 .../engine/plugins}/viaroute.hpp | 0 .../engine}/polyline_compressor.hpp | 0 .../engine}/polyline_formatter.hpp | 0 .../engine}/route_name_extraction.hpp | 0 .../routing_algorithms}/alternative_path.hpp | 0 .../direct_shortest_path.hpp | 0 .../routing_algorithms}/many_to_many.hpp | 0 .../routing_algorithms}/map_matching.hpp | 0 .../routing_algorithms}/routing_base.hpp | 0 .../routing_algorithms}/shortest_path.hpp | 0 .../engine}/search_engine.hpp | 0 .../engine}/search_engine_data.hpp | 0 .../engine}/segment_information.hpp | 0 .../engine/trip}/trip_brute_force.hpp | 0 .../engine/trip}/trip_farthest_insertion.hpp | 0 .../engine/trip}/trip_nearest_neighbour.hpp | 0 .../engine/trip}/trip_tabu_search.hpp | 0 .../extractor}/compressed_edge_container.hpp | 0 .../extractor}/edge_based_graph_factory.hpp | 0 .../extractor}/edge_based_node.hpp | 0 .../extractor}/external_memory_node.hpp | 0 .../extractor}/extraction_containers.hpp | 0 .../extraction_helper_functions.hpp | 0 .../extractor}/extraction_node.hpp | 0 .../extractor}/extraction_way.hpp | 0 .../extractor}/extractor.hpp | 0 .../extractor}/extractor_callbacks.hpp | 0 .../extractor}/extractor_options.hpp | 0 .../first_and_last_segment_of_way.hpp | 0 .../extractor}/graph_compressor.hpp | 0 .../extractor}/import_edge.hpp | 0 .../extractor}/internal_extractor_edge.hpp | 0 .../extractor}/node_id.hpp | 0 .../extractor}/original_edge_data.hpp | 0 .../extractor}/query_node.hpp | 0 .../extractor}/raster_source.hpp | 0 .../extractor}/restriction.hpp | 0 .../extractor}/restriction_map.hpp | 0 .../extractor}/restriction_parser.hpp | 0 .../extractor}/scripting_environment.hpp | 0 .../extractor}/speed_profile.hpp | 0 .../extractor}/tarjan_scc.hpp | 0 .../extractor}/travel_mode.hpp | 0 .../extractor}/turn_instructions.hpp | 0 {server => include/server}/api_grammar.hpp | 0 {server => include/server}/connection.hpp | 0 .../server}/http/compression_type.hpp | 0 {server => include/server}/http/header.hpp | 0 {server => include/server}/http/reply.hpp | 0 {server => include/server}/http/request.hpp | 0 .../server}/request_handler.hpp | 0 {server => include/server}/request_parser.hpp | 0 {server => include/server}/server.hpp | 0 {util => include/util}/bearing.hpp | 0 .../util}/binary_heap.hpp | 0 {util => include/util}/cast.hpp | 0 {util => include/util}/compute_angle.hpp | 0 {util => include/util}/container.hpp | 0 .../util}/coordinate_calculation.hpp | 0 {util => include/util}/datastore_options.hpp | 0 .../util}/deallocating_vector.hpp | 0 {util => include/util}/debug_geometry.hpp | 0 {util => include/util}/dist_table_wrapper.hpp | 0 .../util}/dynamic_graph.hpp | 0 {util => include/util}/fingerprint.hpp | 0 .../util}/fingerprint_impl.hpp.in | 0 .../util}/fixed_point_number.hpp | 0 {util => include/util}/floating_point.hpp | 0 {util => include/util}/graph_loader.hpp | 0 {util => include/util}/graph_utils.hpp | 0 .../util}/hilbert_value.hpp | 0 {util => include/util}/ini_file.hpp | 0 {util => include/util}/integer_range.hpp | 0 .../util}/iso_8601_duration_parser.hpp | 0 {util => include/util}/json_logger.hpp | 0 {util => include/util}/json_renderer.hpp | 0 {util => include/util}/json_util.hpp | 0 {util => include/util}/lua_util.hpp | 0 {util => include/util}/make_unique.hpp | 0 .../util}/matching_debug_info.hpp | 0 .../util}/matrix_graph_wrapper.hpp | 0 {util => include/util}/mercator.hpp | 0 .../util}/node_based_graph.hpp | 0 {util => include/util}/osrm_exception.hpp | 0 {data_structures => include/util}/percent.hpp | 0 {util => include/util}/range_algorithms.hpp | 0 .../util}/range_table.hpp | 0 .../util}/rectangle.hpp | 0 {util => include/util}/routed_options.hpp | 0 .../util}/shared_memory_vector_wrapper.hpp | 0 {util => include/util}/simple_logger.hpp | 0 .../util}/static_graph.hpp | 0 .../util}/static_rtree.hpp | 0 {util => include/util}/std_hash.hpp | 0 {util => include/util}/string_util.hpp | 0 {util => include/util}/timing_util.hpp | 0 {data_structures => include/util}/tribool.hpp | 0 {util => include/util}/trigonometry_table.hpp | 0 typedefs.h => include/util/typedefs.hpp | 0 {util => include/util}/version.hpp.in | 0 {util => include/util}/xml_renderer.hpp | 0 .../util}/xor_fast_hash.hpp | 0 .../util}/xor_fast_hash_storage.hpp | 0 .../benchmarks}/static_rtree.cpp | 0 .../contractor}/contractor_options.cpp | 0 .../contractor}/processing_chain.cpp | 0 .../descriptors}/description_factory.cpp | 0 .../engine}/douglas_peucker.cpp | 0 {library => src/engine}/osrm_impl.cpp | 0 .../engine}/phantom_node.cpp | 0 .../engine}/polyline_compressor.cpp | 0 .../engine}/polyline_formatter.cpp | 0 .../engine}/route_parameters.cpp | 0 .../engine}/search_engine_data.cpp | 0 .../extractor}/compressed_edge_container.cpp | 0 .../extractor}/edge_based_graph_factory.cpp | 0 .../extractor}/external_memory_node.cpp | 0 .../extractor}/extraction_containers.cpp | 0 {extractor => src/extractor}/extractor.cpp | 0 .../extractor}/extractor_callbacks.cpp | 0 .../extractor}/extractor_options.cpp | 0 .../extractor}/graph_compressor.cpp | 0 .../extractor}/import_edge.cpp | 0 .../extractor}/raster_source.cpp | 0 .../extractor}/restriction_map.cpp | 0 .../extractor}/restriction_parser.cpp | 0 .../extractor}/scripting_environment.cpp | 0 {server => src/server}/connection.cpp | 0 {server => src/server}/http/reply.cpp | 0 {server => src/server}/request_handler.cpp | 0 {server => src/server}/request_parser.cpp | 0 {tools => src/tools}/.gitignore | 0 {tools => src/tools}/check-hsgr.cpp | 0 {tools => src/tools}/components.cpp | 0 prepare.cpp => src/tools/contract.cpp | 0 datastore.cpp => src/tools/datastore.cpp | 0 extract.cpp => src/tools/extract.cpp | 0 {tools => src/tools}/io-benchmark.cpp | 0 routed.cpp => src/tools/routed.cpp | 0 {tools => src/tools}/simpleclient.cpp | 0 {tools => src/tools}/springclean.cpp | 0 {tools => src/tools}/unlock_all_mutexes.cpp | 0 {util => src/util}/compute_angle.cpp | 0 {data_structures => src/util}/coordinate.cpp | 0 .../util}/coordinate_calculation.cpp | 0 {util => src/util}/fingerprint.cpp | 0 .../util}/hilbert_value.cpp | 0 {util => src/util}/mercator.cpp | 0 {util => src/util}/osrm_exception.cpp | 0 {util => src/util}/simple_logger.cpp | 0 184 files changed, 608 deletions(-) delete mode 100644 algorithms/bfs_components.hpp delete mode 100644 data_structures/lru_cache.hpp delete mode 100644 data_structures/static_kdtree.hpp delete mode 100644 data_structures/upper_bound.hpp rename {contractor => include/contractor}/contractor.hpp (100%) rename {contractor => include/contractor}/contractor_options.hpp (100%) rename {algorithms => include/contractor}/crc32_processor.hpp (100%) rename {contractor => include/contractor}/processing_chain.hpp (100%) rename {data_structures => include/contractor}/query_edge.hpp (100%) rename {data_structures => include/datastore}/shared_memory_factory.hpp (100%) rename {server/data_structures => include/engine/datafacade}/datafacade_base.hpp (100%) rename {server/data_structures => include/engine/datafacade}/internal_datafacade.hpp (100%) rename {server/data_structures => include/engine/datafacade}/shared_barriers.hpp (100%) rename {server/data_structures => include/engine/datafacade}/shared_datafacade.hpp (100%) rename {server/data_structures => include/engine/datafacade}/shared_datatype.hpp (100%) rename {descriptors => include/engine/descriptors}/description_factory.hpp (100%) rename {descriptors => include/engine/descriptors}/descriptor_base.hpp (100%) rename {descriptors => include/engine/descriptors}/gpx_descriptor.hpp (100%) rename {descriptors => include/engine/descriptors}/json_descriptor.hpp (100%) rename {algorithms => include/engine}/douglas_peucker.hpp (100%) rename {algorithms => include/engine}/geospatial_query.hpp (100%) rename {data_structures => include/engine}/internal_route_result.hpp (100%) rename {algorithms => include/engine/map_matching}/bayes_classifier.hpp (100%) rename {data_structures => include/engine/map_matching}/hidden_markov_model.hpp (100%) rename {algorithms => include/engine}/object_encoder.hpp (100%) rename {library => include/engine}/osrm_impl.hpp (100%) rename {data_structures => include/engine}/phantom_node.hpp (100%) rename {plugins => include/engine/plugins}/distance_table.hpp (100%) rename {plugins => include/engine/plugins}/hello_world.hpp (100%) rename {plugins => include/engine/plugins}/match.hpp (100%) rename {plugins => include/engine/plugins}/nearest.hpp (100%) rename {plugins => include/engine/plugins}/plugin_base.hpp (100%) rename {plugins => include/engine/plugins}/timestamp.hpp (100%) rename {plugins => include/engine/plugins}/trip.hpp (100%) rename {plugins => include/engine/plugins}/viaroute.hpp (100%) rename {algorithms => include/engine}/polyline_compressor.hpp (100%) rename {algorithms => include/engine}/polyline_formatter.hpp (100%) rename {algorithms => include/engine}/route_name_extraction.hpp (100%) rename {routing_algorithms => include/engine/routing_algorithms}/alternative_path.hpp (100%) rename {routing_algorithms => include/engine/routing_algorithms}/direct_shortest_path.hpp (100%) rename {routing_algorithms => include/engine/routing_algorithms}/many_to_many.hpp (100%) rename {routing_algorithms => include/engine/routing_algorithms}/map_matching.hpp (100%) rename {routing_algorithms => include/engine/routing_algorithms}/routing_base.hpp (100%) rename {routing_algorithms => include/engine/routing_algorithms}/shortest_path.hpp (100%) rename {data_structures => include/engine}/search_engine.hpp (100%) rename {data_structures => include/engine}/search_engine_data.hpp (100%) rename {data_structures => include/engine}/segment_information.hpp (100%) rename {algorithms => include/engine/trip}/trip_brute_force.hpp (100%) rename {algorithms => include/engine/trip}/trip_farthest_insertion.hpp (100%) rename {algorithms => include/engine/trip}/trip_nearest_neighbour.hpp (100%) rename {algorithms => include/engine/trip}/trip_tabu_search.hpp (100%) rename {data_structures => include/extractor}/compressed_edge_container.hpp (100%) rename {extractor => include/extractor}/edge_based_graph_factory.hpp (100%) rename {data_structures => include/extractor}/edge_based_node.hpp (100%) rename {data_structures => include/extractor}/external_memory_node.hpp (100%) rename {extractor => include/extractor}/extraction_containers.hpp (100%) rename {extractor => include/extractor}/extraction_helper_functions.hpp (100%) rename {extractor => include/extractor}/extraction_node.hpp (100%) rename {extractor => include/extractor}/extraction_way.hpp (100%) rename {extractor => include/extractor}/extractor.hpp (100%) rename {extractor => include/extractor}/extractor_callbacks.hpp (100%) rename {extractor => include/extractor}/extractor_options.hpp (100%) rename {extractor => include/extractor}/first_and_last_segment_of_way.hpp (100%) rename {algorithms => include/extractor}/graph_compressor.hpp (100%) rename {data_structures => include/extractor}/import_edge.hpp (100%) rename {extractor => include/extractor}/internal_extractor_edge.hpp (100%) rename {data_structures => include/extractor}/node_id.hpp (100%) rename {data_structures => include/extractor}/original_edge_data.hpp (100%) rename {data_structures => include/extractor}/query_node.hpp (100%) rename {data_structures => include/extractor}/raster_source.hpp (100%) rename {data_structures => include/extractor}/restriction.hpp (100%) rename {data_structures => include/extractor}/restriction_map.hpp (100%) rename {extractor => include/extractor}/restriction_parser.hpp (100%) rename {extractor => include/extractor}/scripting_environment.hpp (100%) rename {extractor => include/extractor}/speed_profile.hpp (100%) rename {algorithms => include/extractor}/tarjan_scc.hpp (100%) rename {data_structures => include/extractor}/travel_mode.hpp (100%) rename {data_structures => include/extractor}/turn_instructions.hpp (100%) rename {server => include/server}/api_grammar.hpp (100%) rename {server => include/server}/connection.hpp (100%) rename {server => include/server}/http/compression_type.hpp (100%) rename {server => include/server}/http/header.hpp (100%) rename {server => include/server}/http/reply.hpp (100%) rename {server => include/server}/http/request.hpp (100%) rename {server => include/server}/request_handler.hpp (100%) rename {server => include/server}/request_parser.hpp (100%) rename {server => include/server}/server.hpp (100%) rename {util => include/util}/bearing.hpp (100%) rename {data_structures => include/util}/binary_heap.hpp (100%) rename {util => include/util}/cast.hpp (100%) rename {util => include/util}/compute_angle.hpp (100%) rename {util => include/util}/container.hpp (100%) rename {algorithms => include/util}/coordinate_calculation.hpp (100%) rename {util => include/util}/datastore_options.hpp (100%) rename {data_structures => include/util}/deallocating_vector.hpp (100%) rename {util => include/util}/debug_geometry.hpp (100%) rename {util => include/util}/dist_table_wrapper.hpp (100%) rename {data_structures => include/util}/dynamic_graph.hpp (100%) rename {util => include/util}/fingerprint.hpp (100%) rename {util => include/util}/fingerprint_impl.hpp.in (100%) rename {data_structures => include/util}/fixed_point_number.hpp (100%) rename {util => include/util}/floating_point.hpp (100%) rename {util => include/util}/graph_loader.hpp (100%) rename {util => include/util}/graph_utils.hpp (100%) rename {data_structures => include/util}/hilbert_value.hpp (100%) rename {util => include/util}/ini_file.hpp (100%) rename {util => include/util}/integer_range.hpp (100%) rename {util => include/util}/iso_8601_duration_parser.hpp (100%) rename {util => include/util}/json_logger.hpp (100%) rename {util => include/util}/json_renderer.hpp (100%) rename {util => include/util}/json_util.hpp (100%) rename {util => include/util}/lua_util.hpp (100%) rename {util => include/util}/make_unique.hpp (100%) rename {util => include/util}/matching_debug_info.hpp (100%) rename {data_structures => include/util}/matrix_graph_wrapper.hpp (100%) rename {util => include/util}/mercator.hpp (100%) rename {data_structures => include/util}/node_based_graph.hpp (100%) rename {util => include/util}/osrm_exception.hpp (100%) rename {data_structures => include/util}/percent.hpp (100%) rename {util => include/util}/range_algorithms.hpp (100%) rename {data_structures => include/util}/range_table.hpp (100%) rename {data_structures => include/util}/rectangle.hpp (100%) rename {util => include/util}/routed_options.hpp (100%) rename {data_structures => include/util}/shared_memory_vector_wrapper.hpp (100%) rename {util => include/util}/simple_logger.hpp (100%) rename {data_structures => include/util}/static_graph.hpp (100%) rename {data_structures => include/util}/static_rtree.hpp (100%) rename {util => include/util}/std_hash.hpp (100%) rename {util => include/util}/string_util.hpp (100%) rename {util => include/util}/timing_util.hpp (100%) rename {data_structures => include/util}/tribool.hpp (100%) rename {util => include/util}/trigonometry_table.hpp (100%) rename typedefs.h => include/util/typedefs.hpp (100%) rename {util => include/util}/version.hpp.in (100%) rename {util => include/util}/xml_renderer.hpp (100%) rename {data_structures => include/util}/xor_fast_hash.hpp (100%) rename {data_structures => include/util}/xor_fast_hash_storage.hpp (100%) rename {benchmarks => src/benchmarks}/static_rtree.cpp (100%) rename {contractor => src/contractor}/contractor_options.cpp (100%) rename {contractor => src/contractor}/processing_chain.cpp (100%) rename {descriptors => src/engine/descriptors}/description_factory.cpp (100%) rename {algorithms => src/engine}/douglas_peucker.cpp (100%) rename {library => src/engine}/osrm_impl.cpp (100%) rename {data_structures => src/engine}/phantom_node.cpp (100%) rename {algorithms => src/engine}/polyline_compressor.cpp (100%) rename {algorithms => src/engine}/polyline_formatter.cpp (100%) rename {data_structures => src/engine}/route_parameters.cpp (100%) rename {data_structures => src/engine}/search_engine_data.cpp (100%) rename {data_structures => src/extractor}/compressed_edge_container.cpp (100%) rename {extractor => src/extractor}/edge_based_graph_factory.cpp (100%) rename {data_structures => src/extractor}/external_memory_node.cpp (100%) rename {extractor => src/extractor}/extraction_containers.cpp (100%) rename {extractor => src/extractor}/extractor.cpp (100%) rename {extractor => src/extractor}/extractor_callbacks.cpp (100%) rename {extractor => src/extractor}/extractor_options.cpp (100%) rename {algorithms => src/extractor}/graph_compressor.cpp (100%) rename {data_structures => src/extractor}/import_edge.cpp (100%) rename {data_structures => src/extractor}/raster_source.cpp (100%) rename {data_structures => src/extractor}/restriction_map.cpp (100%) rename {extractor => src/extractor}/restriction_parser.cpp (100%) rename {extractor => src/extractor}/scripting_environment.cpp (100%) rename {server => src/server}/connection.cpp (100%) rename {server => src/server}/http/reply.cpp (100%) rename {server => src/server}/request_handler.cpp (100%) rename {server => src/server}/request_parser.cpp (100%) rename {tools => src/tools}/.gitignore (100%) rename {tools => src/tools}/check-hsgr.cpp (100%) rename {tools => src/tools}/components.cpp (100%) rename prepare.cpp => src/tools/contract.cpp (100%) rename datastore.cpp => src/tools/datastore.cpp (100%) rename extract.cpp => src/tools/extract.cpp (100%) rename {tools => src/tools}/io-benchmark.cpp (100%) rename routed.cpp => src/tools/routed.cpp (100%) rename {tools => src/tools}/simpleclient.cpp (100%) rename {tools => src/tools}/springclean.cpp (100%) rename {tools => src/tools}/unlock_all_mutexes.cpp (100%) rename {util => src/util}/compute_angle.cpp (100%) rename {data_structures => src/util}/coordinate.cpp (100%) rename {algorithms => src/util}/coordinate_calculation.cpp (100%) rename {util => src/util}/fingerprint.cpp (100%) rename {data_structures => src/util}/hilbert_value.cpp (100%) rename {util => src/util}/mercator.cpp (100%) rename {util => src/util}/osrm_exception.cpp (100%) rename {util => src/util}/simple_logger.cpp (100%) diff --git a/algorithms/bfs_components.hpp b/algorithms/bfs_components.hpp deleted file mode 100644 index b3f536401..000000000 --- a/algorithms/bfs_components.hpp +++ /dev/null @@ -1,174 +0,0 @@ -/* - -Copyright (c) 2015, Project OSRM contributors -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - -Redistributions of source code must retain the above copyright notice, this list -of conditions and the following disclaimer. -Redistributions in binary form must reproduce the above copyright notice, this -list of conditions and the following disclaimer in the documentation and/or -other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ - -#ifndef BFS_COMPONENTS_HPP_ -#define BFS_COMPONENTS_HPP_ - -#include "../typedefs.h" -#include "../data_structures/restriction_map.hpp" - -#include -#include - -// Explores the components of the given graph while respecting turn restrictions -// and barriers. -template class BFSComponentExplorer -{ - public: - BFSComponentExplorer(const GraphT &dynamic_graph, - const RestrictionMap &restrictions, - const std::unordered_set &barrier_nodes) - : m_graph(dynamic_graph), m_restriction_map(restrictions), m_barrier_nodes(barrier_nodes) - { - BOOST_ASSERT(m_graph.GetNumberOfNodes() > 0); - } - - /*! - * Returns the size of the component that the node belongs to. - */ - unsigned int GetComponentSize(const NodeID node) const - { - BOOST_ASSERT(node < m_component_index_list.size()); - - return m_component_index_size[m_component_index_list[node]]; - } - - unsigned int GetNumberOfComponents() { return m_component_index_size.size(); } - - /*! - * Computes the component sizes. - */ - void run() - { - std::queue> bfs_queue; - unsigned current_component = 0; - - BOOST_ASSERT(m_component_index_list.empty()); - BOOST_ASSERT(m_component_index_size.empty()); - - unsigned num_nodes = m_graph.GetNumberOfNodes(); - - m_component_index_list.resize(num_nodes, std::numeric_limits::max()); - - BOOST_ASSERT(num_nodes > 0); - - // put unexplorered node with parent pointer into queue - for (NodeID node = 0; node < num_nodes; ++node) - { - if (std::numeric_limits::max() == m_component_index_list[node]) - { - unsigned size = ExploreComponent(bfs_queue, node, current_component); - - // push size into vector - m_component_index_size.emplace_back(size); - ++current_component; - } - } - } - - private: - /*! - * Explores the current component that starts at node using BFS. - */ - unsigned ExploreComponent(std::queue> &bfs_queue, - NodeID node, - unsigned current_component) - { - /* - Graphical representation of variables: - - u v w - *---------->*---------->* - e2 - */ - - bfs_queue.emplace(node, node); - // mark node as read - m_component_index_list[node] = current_component; - - unsigned current_component_size = 1; - - while (!bfs_queue.empty()) - { - // fetch element from BFS queue - std::pair current_queue_item = bfs_queue.front(); - bfs_queue.pop(); - - const NodeID v = current_queue_item.first; // current node - const NodeID u = current_queue_item.second; // parent - // increment size counter of current component - ++current_component_size; - if (m_barrier_nodes.find(v) != m_barrier_nodes.end()) - { - continue; - } - const NodeID to_node_of_only_restriction = - m_restriction_map.CheckForEmanatingIsOnlyTurn(u, v); - - for (auto e2 : m_graph.GetAdjacentEdgeRange(v)) - { - const NodeID w = m_graph.GetTarget(e2); - - if (to_node_of_only_restriction != std::numeric_limits::max() && - w != to_node_of_only_restriction) - { - // At an only_-restriction but not at the right turn - continue; - } - - if (u != w) - { - // only add an edge if turn is not a U-turn except - // when it is at the end of a dead-end street. - if (!m_restriction_map.CheckIfTurnIsRestricted(u, v, w)) - { - // only add an edge if turn is not prohibited - if (std::numeric_limits::max() == m_component_index_list[w]) - { - // insert next (node, parent) only if w has - // not yet been explored - // mark node as read - m_component_index_list[w] = current_component; - bfs_queue.emplace(w, v); - } - } - } - } - } - - return current_component_size; - } - - std::vector m_component_index_list; - std::vector m_component_index_size; - - const GraphT &m_graph; - const RestrictionMap &m_restriction_map; - const std::unordered_set &m_barrier_nodes; -}; - -#endif // BFS_COMPONENTS_HPP_ diff --git a/data_structures/lru_cache.hpp b/data_structures/lru_cache.hpp deleted file mode 100644 index 155ab1ef4..000000000 --- a/data_structures/lru_cache.hpp +++ /dev/null @@ -1,97 +0,0 @@ -/* - -Copyright (c) 2014, Project OSRM contributors -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - -Redistributions of source code must retain the above copyright notice, this list -of conditions and the following disclaimer. -Redistributions in binary form must reproduce the above copyright notice, this -list of conditions and the following disclaimer in the documentation and/or -other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ - -#ifndef LRUCACHE_HPP -#define LRUCACHE_HPP - -#include -#include - -template class LRUCache -{ - private: - struct CacheEntry - { - CacheEntry(KeyT k, ValueT v) : key(k), value(v) {} - KeyT key; - ValueT value; - }; - unsigned capacity; - std::list itemsInCache; - std::unordered_map::iterator> positionMap; - - public: - explicit LRUCache(unsigned c) : capacity(c) {} - - bool Holds(KeyT key) - { - if (positionMap.find(key) != positionMap.end()) - { - return true; - } - return false; - } - - void Insert(const KeyT key, ValueT &value) - { - itemsInCache.push_front(CacheEntry(key, value)); - positionMap.insert(std::make_pair(key, itemsInCache.begin())); - if (itemsInCache.size() > capacity) - { - positionMap.erase(itemsInCache.back().key); - itemsInCache.pop_back(); - } - } - - void Insert(const KeyT key, ValueT value) - { - itemsInCache.push_front(CacheEntry(key, value)); - positionMap.insert(std::make_pair(key, itemsInCache.begin())); - if (itemsInCache.size() > capacity) - { - positionMap.erase(itemsInCache.back().key); - itemsInCache.pop_back(); - } - } - - bool Fetch(const KeyT key, ValueT &result) - { - if (Holds(key)) - { - CacheEntry e = *(positionMap.find(key)->second); - result = e.value; - - // move to front - itemsInCache.splice(itemsInCache.begin(), itemsInCache, positionMap.find(key)->second); - positionMap.find(key)->second = itemsInCache.begin(); - return true; - } - return false; - } - unsigned Size() const { return itemsInCache.size(); } -}; -#endif // LRUCACHE_HPP diff --git a/data_structures/static_kdtree.hpp b/data_structures/static_kdtree.hpp deleted file mode 100644 index 1e65dc844..000000000 --- a/data_structures/static_kdtree.hpp +++ /dev/null @@ -1,260 +0,0 @@ -/* - -Copyright (c) 2013, Project OSRM contributors -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - -Redistributions of source code must retain the above copyright notice, this list -of conditions and the following disclaimer. -Redistributions in binary form must reproduce the above copyright notice, this -list of conditions and the following disclaimer in the documentation and/or -other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ - -// KD Tree coded by Christian Vetter, Monav Project - -#ifndef STATICKDTREE_HPP -#define STATICKDTREE_HPP - -#include -#include -#include -#include -#include - -namespace KDTree -{ - -#define KDTREE_BASESIZE (8) - -template class BoundingBox -{ - public: - BoundingBox() - { - for (unsigned dim = 0; dim < k; ++dim) - { - min[dim] = std::numeric_limits::min(); - max[dim] = std::numeric_limits::max(); - } - } - - T min[k]; - T max[k]; -}; - -struct NoData -{ -}; - -template class EuclidianMetric -{ - public: - double operator()(const T left[k], const T right[k]) - { - double result = 0; - for (unsigned i = 0; i < k; ++i) - { - double temp = (double)left[i] - (double)right[i]; - result += temp * temp; - } - return result; - } - - double operator()(const BoundingBox &box, const T point[k]) - { - T nearest[k]; - for (unsigned dim = 0; dim < k; ++dim) - { - if (point[dim] < box.min[dim]) - nearest[dim] = box.min[dim]; - else if (point[dim] > box.max[dim]) - nearest[dim] = box.max[dim]; - else - nearest[dim] = point[dim]; - } - return operator()(point, nearest); - } -}; - -template > -class StaticKDTree -{ - public: - struct InputPoint - { - T coordinates[k]; - Data data; - bool operator==(const InputPoint &right) - { - for (int i = 0; i < k; i++) - { - if (coordinates[i] != right.coordinates[i]) - return false; - } - return true; - } - }; - - explicit StaticKDTree(std::vector *points) - { - BOOST_ASSERT(k > 0); - BOOST_ASSERT(points->size() > 0); - size = points->size(); - kdtree = new InputPoint[size]; - for (Iterator i = 0; i != size; ++i) - { - kdtree[i] = points->at(i); - for (unsigned dim = 0; dim < k; ++dim) - { - if (kdtree[i].coordinates[dim] < boundingBox.min[dim]) - boundingBox.min[dim] = kdtree[i].coordinates[dim]; - if (kdtree[i].coordinates[dim] > boundingBox.max[dim]) - boundingBox.max[dim] = kdtree[i].coordinates[dim]; - } - } - std::stack s; - s.push(Tree(0, size, 0)); - while (!s.empty()) - { - Tree tree = s.top(); - s.pop(); - - if (tree.right - tree.left < KDTREE_BASESIZE) - continue; - - Iterator middle = tree.left + (tree.right - tree.left) / 2; - std::nth_element(kdtree + tree.left, kdtree + middle, kdtree + tree.right, - Less(tree.dimension)); - s.push(Tree(tree.left, middle, (tree.dimension + 1) % k)); - s.push(Tree(middle + 1, tree.right, (tree.dimension + 1) % k)); - } - } - - ~StaticKDTree() { delete[] kdtree; } - - bool NearestNeighbor(InputPoint *result, const InputPoint &point) - { - Metric distance; - bool found = false; - double nearestDistance = std::numeric_limits::max(); - std::stack s; - s.push(NNTree(0, size, 0, boundingBox)); - while (!s.empty()) - { - NNTree tree = s.top(); - s.pop(); - - if (distance(tree.box, point.coordinates) >= nearestDistance) - continue; - - if (tree.right - tree.left < KDTREE_BASESIZE) - { - for (unsigned i = tree.left; i < tree.right; i++) - { - double newDistance = distance(kdtree[i].coordinates, point.coordinates); - if (newDistance < nearestDistance) - { - nearestDistance = newDistance; - *result = kdtree[i]; - found = true; - } - } - continue; - } - - Iterator middle = tree.left + (tree.right - tree.left) / 2; - - double newDistance = distance(kdtree[middle].coordinates, point.coordinates); - if (newDistance < nearestDistance) - { - nearestDistance = newDistance; - *result = kdtree[middle]; - found = true; - } - - Less comperator(tree.dimension); - if (!comperator(point, kdtree[middle])) - { - NNTree first(middle + 1, tree.right, (tree.dimension + 1) % k, tree.box); - NNTree second(tree.left, middle, (tree.dimension + 1) % k, tree.box); - first.box.min[tree.dimension] = kdtree[middle].coordinates[tree.dimension]; - second.box.max[tree.dimension] = kdtree[middle].coordinates[tree.dimension]; - s.push(second); - s.push(first); - } - else - { - NNTree first(middle + 1, tree.right, (tree.dimension + 1) % k, tree.box); - NNTree second(tree.left, middle, (tree.dimension + 1) % k, tree.box); - first.box.min[tree.dimension] = kdtree[middle].coordinates[tree.dimension]; - second.box.max[tree.dimension] = kdtree[middle].coordinates[tree.dimension]; - s.push(first); - s.push(second); - } - } - return found; - } - - private: - using Iterator = unsigned; - struct Tree - { - Iterator left; - Iterator right; - unsigned dimension; - Tree() {} - Tree(Iterator l, Iterator r, unsigned d) : left(l), right(r), dimension(d) {} - }; - struct NNTree - { - Iterator left; - Iterator right; - unsigned dimension; - BoundingBox box; - NNTree() {} - NNTree(Iterator l, Iterator r, unsigned d, const BoundingBox &b) - : left(l), right(r), dimension(d), box(b) - { - } - }; - class Less - { - public: - explicit Less(unsigned d) - { - dimension = d; - BOOST_ASSERT(dimension < k); - } - - bool operator()(const InputPoint &left, const InputPoint &right) - { - BOOST_ASSERT(dimension < k); - return left.coordinates[dimension] < right.coordinates[dimension]; - } - - private: - unsigned dimension; - }; - - BoundingBox boundingBox; - InputPoint *kdtree; - Iterator size; -}; -} - -#endif // STATICKDTREE_HPP diff --git a/data_structures/upper_bound.hpp b/data_structures/upper_bound.hpp deleted file mode 100644 index 80695f2c5..000000000 --- a/data_structures/upper_bound.hpp +++ /dev/null @@ -1,77 +0,0 @@ -/* - -Copyright (c) 2015, Project OSRM contributors -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - -Redistributions of source code must retain the above copyright notice, this list -of conditions and the following disclaimer. -Redistributions in binary form must reproduce the above copyright notice, this -list of conditions and the following disclaimer in the documentation and/or -other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ - -#ifndef LOWER_BOUND_HPP -#define LOWER_BOUND_HPP - -#include -#include -#include -#include - -// max pq holds k elements -// insert if key is smaller than max -// if size > k then remove element -// get() always yields a bound to the k smallest element in the stream - -template class upper_bound -{ - private: - using parameter_type = - typename std::conditional::value, key_type, key_type &>::type; - - public: - upper_bound() = delete; - upper_bound(std::size_t size) : size(size) {} - - key_type get() const - { - if (queue.size() < size) - { - return std::numeric_limits::max(); - } - return queue.top(); - } - - void insert(const parameter_type key) - { - if (key < get()) - { - queue.emplace(key); - while (queue.size() > size) - { - queue.pop(); - } - } - } - - private: - std::priority_queue, std::less> queue; - const std::size_t size; -}; - -#endif // LOWER_BOUND_HPP diff --git a/contractor/contractor.hpp b/include/contractor/contractor.hpp similarity index 100% rename from contractor/contractor.hpp rename to include/contractor/contractor.hpp diff --git a/contractor/contractor_options.hpp b/include/contractor/contractor_options.hpp similarity index 100% rename from contractor/contractor_options.hpp rename to include/contractor/contractor_options.hpp diff --git a/algorithms/crc32_processor.hpp b/include/contractor/crc32_processor.hpp similarity index 100% rename from algorithms/crc32_processor.hpp rename to include/contractor/crc32_processor.hpp diff --git a/contractor/processing_chain.hpp b/include/contractor/processing_chain.hpp similarity index 100% rename from contractor/processing_chain.hpp rename to include/contractor/processing_chain.hpp diff --git a/data_structures/query_edge.hpp b/include/contractor/query_edge.hpp similarity index 100% rename from data_structures/query_edge.hpp rename to include/contractor/query_edge.hpp diff --git a/data_structures/shared_memory_factory.hpp b/include/datastore/shared_memory_factory.hpp similarity index 100% rename from data_structures/shared_memory_factory.hpp rename to include/datastore/shared_memory_factory.hpp diff --git a/server/data_structures/datafacade_base.hpp b/include/engine/datafacade/datafacade_base.hpp similarity index 100% rename from server/data_structures/datafacade_base.hpp rename to include/engine/datafacade/datafacade_base.hpp diff --git a/server/data_structures/internal_datafacade.hpp b/include/engine/datafacade/internal_datafacade.hpp similarity index 100% rename from server/data_structures/internal_datafacade.hpp rename to include/engine/datafacade/internal_datafacade.hpp diff --git a/server/data_structures/shared_barriers.hpp b/include/engine/datafacade/shared_barriers.hpp similarity index 100% rename from server/data_structures/shared_barriers.hpp rename to include/engine/datafacade/shared_barriers.hpp diff --git a/server/data_structures/shared_datafacade.hpp b/include/engine/datafacade/shared_datafacade.hpp similarity index 100% rename from server/data_structures/shared_datafacade.hpp rename to include/engine/datafacade/shared_datafacade.hpp diff --git a/server/data_structures/shared_datatype.hpp b/include/engine/datafacade/shared_datatype.hpp similarity index 100% rename from server/data_structures/shared_datatype.hpp rename to include/engine/datafacade/shared_datatype.hpp diff --git a/descriptors/description_factory.hpp b/include/engine/descriptors/description_factory.hpp similarity index 100% rename from descriptors/description_factory.hpp rename to include/engine/descriptors/description_factory.hpp diff --git a/descriptors/descriptor_base.hpp b/include/engine/descriptors/descriptor_base.hpp similarity index 100% rename from descriptors/descriptor_base.hpp rename to include/engine/descriptors/descriptor_base.hpp diff --git a/descriptors/gpx_descriptor.hpp b/include/engine/descriptors/gpx_descriptor.hpp similarity index 100% rename from descriptors/gpx_descriptor.hpp rename to include/engine/descriptors/gpx_descriptor.hpp diff --git a/descriptors/json_descriptor.hpp b/include/engine/descriptors/json_descriptor.hpp similarity index 100% rename from descriptors/json_descriptor.hpp rename to include/engine/descriptors/json_descriptor.hpp diff --git a/algorithms/douglas_peucker.hpp b/include/engine/douglas_peucker.hpp similarity index 100% rename from algorithms/douglas_peucker.hpp rename to include/engine/douglas_peucker.hpp diff --git a/algorithms/geospatial_query.hpp b/include/engine/geospatial_query.hpp similarity index 100% rename from algorithms/geospatial_query.hpp rename to include/engine/geospatial_query.hpp diff --git a/data_structures/internal_route_result.hpp b/include/engine/internal_route_result.hpp similarity index 100% rename from data_structures/internal_route_result.hpp rename to include/engine/internal_route_result.hpp diff --git a/algorithms/bayes_classifier.hpp b/include/engine/map_matching/bayes_classifier.hpp similarity index 100% rename from algorithms/bayes_classifier.hpp rename to include/engine/map_matching/bayes_classifier.hpp diff --git a/data_structures/hidden_markov_model.hpp b/include/engine/map_matching/hidden_markov_model.hpp similarity index 100% rename from data_structures/hidden_markov_model.hpp rename to include/engine/map_matching/hidden_markov_model.hpp diff --git a/algorithms/object_encoder.hpp b/include/engine/object_encoder.hpp similarity index 100% rename from algorithms/object_encoder.hpp rename to include/engine/object_encoder.hpp diff --git a/library/osrm_impl.hpp b/include/engine/osrm_impl.hpp similarity index 100% rename from library/osrm_impl.hpp rename to include/engine/osrm_impl.hpp diff --git a/data_structures/phantom_node.hpp b/include/engine/phantom_node.hpp similarity index 100% rename from data_structures/phantom_node.hpp rename to include/engine/phantom_node.hpp diff --git a/plugins/distance_table.hpp b/include/engine/plugins/distance_table.hpp similarity index 100% rename from plugins/distance_table.hpp rename to include/engine/plugins/distance_table.hpp diff --git a/plugins/hello_world.hpp b/include/engine/plugins/hello_world.hpp similarity index 100% rename from plugins/hello_world.hpp rename to include/engine/plugins/hello_world.hpp diff --git a/plugins/match.hpp b/include/engine/plugins/match.hpp similarity index 100% rename from plugins/match.hpp rename to include/engine/plugins/match.hpp diff --git a/plugins/nearest.hpp b/include/engine/plugins/nearest.hpp similarity index 100% rename from plugins/nearest.hpp rename to include/engine/plugins/nearest.hpp diff --git a/plugins/plugin_base.hpp b/include/engine/plugins/plugin_base.hpp similarity index 100% rename from plugins/plugin_base.hpp rename to include/engine/plugins/plugin_base.hpp diff --git a/plugins/timestamp.hpp b/include/engine/plugins/timestamp.hpp similarity index 100% rename from plugins/timestamp.hpp rename to include/engine/plugins/timestamp.hpp diff --git a/plugins/trip.hpp b/include/engine/plugins/trip.hpp similarity index 100% rename from plugins/trip.hpp rename to include/engine/plugins/trip.hpp diff --git a/plugins/viaroute.hpp b/include/engine/plugins/viaroute.hpp similarity index 100% rename from plugins/viaroute.hpp rename to include/engine/plugins/viaroute.hpp diff --git a/algorithms/polyline_compressor.hpp b/include/engine/polyline_compressor.hpp similarity index 100% rename from algorithms/polyline_compressor.hpp rename to include/engine/polyline_compressor.hpp diff --git a/algorithms/polyline_formatter.hpp b/include/engine/polyline_formatter.hpp similarity index 100% rename from algorithms/polyline_formatter.hpp rename to include/engine/polyline_formatter.hpp diff --git a/algorithms/route_name_extraction.hpp b/include/engine/route_name_extraction.hpp similarity index 100% rename from algorithms/route_name_extraction.hpp rename to include/engine/route_name_extraction.hpp diff --git a/routing_algorithms/alternative_path.hpp b/include/engine/routing_algorithms/alternative_path.hpp similarity index 100% rename from routing_algorithms/alternative_path.hpp rename to include/engine/routing_algorithms/alternative_path.hpp diff --git a/routing_algorithms/direct_shortest_path.hpp b/include/engine/routing_algorithms/direct_shortest_path.hpp similarity index 100% rename from routing_algorithms/direct_shortest_path.hpp rename to include/engine/routing_algorithms/direct_shortest_path.hpp diff --git a/routing_algorithms/many_to_many.hpp b/include/engine/routing_algorithms/many_to_many.hpp similarity index 100% rename from routing_algorithms/many_to_many.hpp rename to include/engine/routing_algorithms/many_to_many.hpp diff --git a/routing_algorithms/map_matching.hpp b/include/engine/routing_algorithms/map_matching.hpp similarity index 100% rename from routing_algorithms/map_matching.hpp rename to include/engine/routing_algorithms/map_matching.hpp diff --git a/routing_algorithms/routing_base.hpp b/include/engine/routing_algorithms/routing_base.hpp similarity index 100% rename from routing_algorithms/routing_base.hpp rename to include/engine/routing_algorithms/routing_base.hpp diff --git a/routing_algorithms/shortest_path.hpp b/include/engine/routing_algorithms/shortest_path.hpp similarity index 100% rename from routing_algorithms/shortest_path.hpp rename to include/engine/routing_algorithms/shortest_path.hpp diff --git a/data_structures/search_engine.hpp b/include/engine/search_engine.hpp similarity index 100% rename from data_structures/search_engine.hpp rename to include/engine/search_engine.hpp diff --git a/data_structures/search_engine_data.hpp b/include/engine/search_engine_data.hpp similarity index 100% rename from data_structures/search_engine_data.hpp rename to include/engine/search_engine_data.hpp diff --git a/data_structures/segment_information.hpp b/include/engine/segment_information.hpp similarity index 100% rename from data_structures/segment_information.hpp rename to include/engine/segment_information.hpp diff --git a/algorithms/trip_brute_force.hpp b/include/engine/trip/trip_brute_force.hpp similarity index 100% rename from algorithms/trip_brute_force.hpp rename to include/engine/trip/trip_brute_force.hpp diff --git a/algorithms/trip_farthest_insertion.hpp b/include/engine/trip/trip_farthest_insertion.hpp similarity index 100% rename from algorithms/trip_farthest_insertion.hpp rename to include/engine/trip/trip_farthest_insertion.hpp diff --git a/algorithms/trip_nearest_neighbour.hpp b/include/engine/trip/trip_nearest_neighbour.hpp similarity index 100% rename from algorithms/trip_nearest_neighbour.hpp rename to include/engine/trip/trip_nearest_neighbour.hpp diff --git a/algorithms/trip_tabu_search.hpp b/include/engine/trip/trip_tabu_search.hpp similarity index 100% rename from algorithms/trip_tabu_search.hpp rename to include/engine/trip/trip_tabu_search.hpp diff --git a/data_structures/compressed_edge_container.hpp b/include/extractor/compressed_edge_container.hpp similarity index 100% rename from data_structures/compressed_edge_container.hpp rename to include/extractor/compressed_edge_container.hpp diff --git a/extractor/edge_based_graph_factory.hpp b/include/extractor/edge_based_graph_factory.hpp similarity index 100% rename from extractor/edge_based_graph_factory.hpp rename to include/extractor/edge_based_graph_factory.hpp diff --git a/data_structures/edge_based_node.hpp b/include/extractor/edge_based_node.hpp similarity index 100% rename from data_structures/edge_based_node.hpp rename to include/extractor/edge_based_node.hpp diff --git a/data_structures/external_memory_node.hpp b/include/extractor/external_memory_node.hpp similarity index 100% rename from data_structures/external_memory_node.hpp rename to include/extractor/external_memory_node.hpp diff --git a/extractor/extraction_containers.hpp b/include/extractor/extraction_containers.hpp similarity index 100% rename from extractor/extraction_containers.hpp rename to include/extractor/extraction_containers.hpp diff --git a/extractor/extraction_helper_functions.hpp b/include/extractor/extraction_helper_functions.hpp similarity index 100% rename from extractor/extraction_helper_functions.hpp rename to include/extractor/extraction_helper_functions.hpp diff --git a/extractor/extraction_node.hpp b/include/extractor/extraction_node.hpp similarity index 100% rename from extractor/extraction_node.hpp rename to include/extractor/extraction_node.hpp diff --git a/extractor/extraction_way.hpp b/include/extractor/extraction_way.hpp similarity index 100% rename from extractor/extraction_way.hpp rename to include/extractor/extraction_way.hpp diff --git a/extractor/extractor.hpp b/include/extractor/extractor.hpp similarity index 100% rename from extractor/extractor.hpp rename to include/extractor/extractor.hpp diff --git a/extractor/extractor_callbacks.hpp b/include/extractor/extractor_callbacks.hpp similarity index 100% rename from extractor/extractor_callbacks.hpp rename to include/extractor/extractor_callbacks.hpp diff --git a/extractor/extractor_options.hpp b/include/extractor/extractor_options.hpp similarity index 100% rename from extractor/extractor_options.hpp rename to include/extractor/extractor_options.hpp diff --git a/extractor/first_and_last_segment_of_way.hpp b/include/extractor/first_and_last_segment_of_way.hpp similarity index 100% rename from extractor/first_and_last_segment_of_way.hpp rename to include/extractor/first_and_last_segment_of_way.hpp diff --git a/algorithms/graph_compressor.hpp b/include/extractor/graph_compressor.hpp similarity index 100% rename from algorithms/graph_compressor.hpp rename to include/extractor/graph_compressor.hpp diff --git a/data_structures/import_edge.hpp b/include/extractor/import_edge.hpp similarity index 100% rename from data_structures/import_edge.hpp rename to include/extractor/import_edge.hpp diff --git a/extractor/internal_extractor_edge.hpp b/include/extractor/internal_extractor_edge.hpp similarity index 100% rename from extractor/internal_extractor_edge.hpp rename to include/extractor/internal_extractor_edge.hpp diff --git a/data_structures/node_id.hpp b/include/extractor/node_id.hpp similarity index 100% rename from data_structures/node_id.hpp rename to include/extractor/node_id.hpp diff --git a/data_structures/original_edge_data.hpp b/include/extractor/original_edge_data.hpp similarity index 100% rename from data_structures/original_edge_data.hpp rename to include/extractor/original_edge_data.hpp diff --git a/data_structures/query_node.hpp b/include/extractor/query_node.hpp similarity index 100% rename from data_structures/query_node.hpp rename to include/extractor/query_node.hpp diff --git a/data_structures/raster_source.hpp b/include/extractor/raster_source.hpp similarity index 100% rename from data_structures/raster_source.hpp rename to include/extractor/raster_source.hpp diff --git a/data_structures/restriction.hpp b/include/extractor/restriction.hpp similarity index 100% rename from data_structures/restriction.hpp rename to include/extractor/restriction.hpp diff --git a/data_structures/restriction_map.hpp b/include/extractor/restriction_map.hpp similarity index 100% rename from data_structures/restriction_map.hpp rename to include/extractor/restriction_map.hpp diff --git a/extractor/restriction_parser.hpp b/include/extractor/restriction_parser.hpp similarity index 100% rename from extractor/restriction_parser.hpp rename to include/extractor/restriction_parser.hpp diff --git a/extractor/scripting_environment.hpp b/include/extractor/scripting_environment.hpp similarity index 100% rename from extractor/scripting_environment.hpp rename to include/extractor/scripting_environment.hpp diff --git a/extractor/speed_profile.hpp b/include/extractor/speed_profile.hpp similarity index 100% rename from extractor/speed_profile.hpp rename to include/extractor/speed_profile.hpp diff --git a/algorithms/tarjan_scc.hpp b/include/extractor/tarjan_scc.hpp similarity index 100% rename from algorithms/tarjan_scc.hpp rename to include/extractor/tarjan_scc.hpp diff --git a/data_structures/travel_mode.hpp b/include/extractor/travel_mode.hpp similarity index 100% rename from data_structures/travel_mode.hpp rename to include/extractor/travel_mode.hpp diff --git a/data_structures/turn_instructions.hpp b/include/extractor/turn_instructions.hpp similarity index 100% rename from data_structures/turn_instructions.hpp rename to include/extractor/turn_instructions.hpp diff --git a/server/api_grammar.hpp b/include/server/api_grammar.hpp similarity index 100% rename from server/api_grammar.hpp rename to include/server/api_grammar.hpp diff --git a/server/connection.hpp b/include/server/connection.hpp similarity index 100% rename from server/connection.hpp rename to include/server/connection.hpp diff --git a/server/http/compression_type.hpp b/include/server/http/compression_type.hpp similarity index 100% rename from server/http/compression_type.hpp rename to include/server/http/compression_type.hpp diff --git a/server/http/header.hpp b/include/server/http/header.hpp similarity index 100% rename from server/http/header.hpp rename to include/server/http/header.hpp diff --git a/server/http/reply.hpp b/include/server/http/reply.hpp similarity index 100% rename from server/http/reply.hpp rename to include/server/http/reply.hpp diff --git a/server/http/request.hpp b/include/server/http/request.hpp similarity index 100% rename from server/http/request.hpp rename to include/server/http/request.hpp diff --git a/server/request_handler.hpp b/include/server/request_handler.hpp similarity index 100% rename from server/request_handler.hpp rename to include/server/request_handler.hpp diff --git a/server/request_parser.hpp b/include/server/request_parser.hpp similarity index 100% rename from server/request_parser.hpp rename to include/server/request_parser.hpp diff --git a/server/server.hpp b/include/server/server.hpp similarity index 100% rename from server/server.hpp rename to include/server/server.hpp diff --git a/util/bearing.hpp b/include/util/bearing.hpp similarity index 100% rename from util/bearing.hpp rename to include/util/bearing.hpp diff --git a/data_structures/binary_heap.hpp b/include/util/binary_heap.hpp similarity index 100% rename from data_structures/binary_heap.hpp rename to include/util/binary_heap.hpp diff --git a/util/cast.hpp b/include/util/cast.hpp similarity index 100% rename from util/cast.hpp rename to include/util/cast.hpp diff --git a/util/compute_angle.hpp b/include/util/compute_angle.hpp similarity index 100% rename from util/compute_angle.hpp rename to include/util/compute_angle.hpp diff --git a/util/container.hpp b/include/util/container.hpp similarity index 100% rename from util/container.hpp rename to include/util/container.hpp diff --git a/algorithms/coordinate_calculation.hpp b/include/util/coordinate_calculation.hpp similarity index 100% rename from algorithms/coordinate_calculation.hpp rename to include/util/coordinate_calculation.hpp diff --git a/util/datastore_options.hpp b/include/util/datastore_options.hpp similarity index 100% rename from util/datastore_options.hpp rename to include/util/datastore_options.hpp diff --git a/data_structures/deallocating_vector.hpp b/include/util/deallocating_vector.hpp similarity index 100% rename from data_structures/deallocating_vector.hpp rename to include/util/deallocating_vector.hpp diff --git a/util/debug_geometry.hpp b/include/util/debug_geometry.hpp similarity index 100% rename from util/debug_geometry.hpp rename to include/util/debug_geometry.hpp diff --git a/util/dist_table_wrapper.hpp b/include/util/dist_table_wrapper.hpp similarity index 100% rename from util/dist_table_wrapper.hpp rename to include/util/dist_table_wrapper.hpp diff --git a/data_structures/dynamic_graph.hpp b/include/util/dynamic_graph.hpp similarity index 100% rename from data_structures/dynamic_graph.hpp rename to include/util/dynamic_graph.hpp diff --git a/util/fingerprint.hpp b/include/util/fingerprint.hpp similarity index 100% rename from util/fingerprint.hpp rename to include/util/fingerprint.hpp diff --git a/util/fingerprint_impl.hpp.in b/include/util/fingerprint_impl.hpp.in similarity index 100% rename from util/fingerprint_impl.hpp.in rename to include/util/fingerprint_impl.hpp.in diff --git a/data_structures/fixed_point_number.hpp b/include/util/fixed_point_number.hpp similarity index 100% rename from data_structures/fixed_point_number.hpp rename to include/util/fixed_point_number.hpp diff --git a/util/floating_point.hpp b/include/util/floating_point.hpp similarity index 100% rename from util/floating_point.hpp rename to include/util/floating_point.hpp diff --git a/util/graph_loader.hpp b/include/util/graph_loader.hpp similarity index 100% rename from util/graph_loader.hpp rename to include/util/graph_loader.hpp diff --git a/util/graph_utils.hpp b/include/util/graph_utils.hpp similarity index 100% rename from util/graph_utils.hpp rename to include/util/graph_utils.hpp diff --git a/data_structures/hilbert_value.hpp b/include/util/hilbert_value.hpp similarity index 100% rename from data_structures/hilbert_value.hpp rename to include/util/hilbert_value.hpp diff --git a/util/ini_file.hpp b/include/util/ini_file.hpp similarity index 100% rename from util/ini_file.hpp rename to include/util/ini_file.hpp diff --git a/util/integer_range.hpp b/include/util/integer_range.hpp similarity index 100% rename from util/integer_range.hpp rename to include/util/integer_range.hpp diff --git a/util/iso_8601_duration_parser.hpp b/include/util/iso_8601_duration_parser.hpp similarity index 100% rename from util/iso_8601_duration_parser.hpp rename to include/util/iso_8601_duration_parser.hpp diff --git a/util/json_logger.hpp b/include/util/json_logger.hpp similarity index 100% rename from util/json_logger.hpp rename to include/util/json_logger.hpp diff --git a/util/json_renderer.hpp b/include/util/json_renderer.hpp similarity index 100% rename from util/json_renderer.hpp rename to include/util/json_renderer.hpp diff --git a/util/json_util.hpp b/include/util/json_util.hpp similarity index 100% rename from util/json_util.hpp rename to include/util/json_util.hpp diff --git a/util/lua_util.hpp b/include/util/lua_util.hpp similarity index 100% rename from util/lua_util.hpp rename to include/util/lua_util.hpp diff --git a/util/make_unique.hpp b/include/util/make_unique.hpp similarity index 100% rename from util/make_unique.hpp rename to include/util/make_unique.hpp diff --git a/util/matching_debug_info.hpp b/include/util/matching_debug_info.hpp similarity index 100% rename from util/matching_debug_info.hpp rename to include/util/matching_debug_info.hpp diff --git a/data_structures/matrix_graph_wrapper.hpp b/include/util/matrix_graph_wrapper.hpp similarity index 100% rename from data_structures/matrix_graph_wrapper.hpp rename to include/util/matrix_graph_wrapper.hpp diff --git a/util/mercator.hpp b/include/util/mercator.hpp similarity index 100% rename from util/mercator.hpp rename to include/util/mercator.hpp diff --git a/data_structures/node_based_graph.hpp b/include/util/node_based_graph.hpp similarity index 100% rename from data_structures/node_based_graph.hpp rename to include/util/node_based_graph.hpp diff --git a/util/osrm_exception.hpp b/include/util/osrm_exception.hpp similarity index 100% rename from util/osrm_exception.hpp rename to include/util/osrm_exception.hpp diff --git a/data_structures/percent.hpp b/include/util/percent.hpp similarity index 100% rename from data_structures/percent.hpp rename to include/util/percent.hpp diff --git a/util/range_algorithms.hpp b/include/util/range_algorithms.hpp similarity index 100% rename from util/range_algorithms.hpp rename to include/util/range_algorithms.hpp diff --git a/data_structures/range_table.hpp b/include/util/range_table.hpp similarity index 100% rename from data_structures/range_table.hpp rename to include/util/range_table.hpp diff --git a/data_structures/rectangle.hpp b/include/util/rectangle.hpp similarity index 100% rename from data_structures/rectangle.hpp rename to include/util/rectangle.hpp diff --git a/util/routed_options.hpp b/include/util/routed_options.hpp similarity index 100% rename from util/routed_options.hpp rename to include/util/routed_options.hpp diff --git a/data_structures/shared_memory_vector_wrapper.hpp b/include/util/shared_memory_vector_wrapper.hpp similarity index 100% rename from data_structures/shared_memory_vector_wrapper.hpp rename to include/util/shared_memory_vector_wrapper.hpp diff --git a/util/simple_logger.hpp b/include/util/simple_logger.hpp similarity index 100% rename from util/simple_logger.hpp rename to include/util/simple_logger.hpp diff --git a/data_structures/static_graph.hpp b/include/util/static_graph.hpp similarity index 100% rename from data_structures/static_graph.hpp rename to include/util/static_graph.hpp diff --git a/data_structures/static_rtree.hpp b/include/util/static_rtree.hpp similarity index 100% rename from data_structures/static_rtree.hpp rename to include/util/static_rtree.hpp diff --git a/util/std_hash.hpp b/include/util/std_hash.hpp similarity index 100% rename from util/std_hash.hpp rename to include/util/std_hash.hpp diff --git a/util/string_util.hpp b/include/util/string_util.hpp similarity index 100% rename from util/string_util.hpp rename to include/util/string_util.hpp diff --git a/util/timing_util.hpp b/include/util/timing_util.hpp similarity index 100% rename from util/timing_util.hpp rename to include/util/timing_util.hpp diff --git a/data_structures/tribool.hpp b/include/util/tribool.hpp similarity index 100% rename from data_structures/tribool.hpp rename to include/util/tribool.hpp diff --git a/util/trigonometry_table.hpp b/include/util/trigonometry_table.hpp similarity index 100% rename from util/trigonometry_table.hpp rename to include/util/trigonometry_table.hpp diff --git a/typedefs.h b/include/util/typedefs.hpp similarity index 100% rename from typedefs.h rename to include/util/typedefs.hpp diff --git a/util/version.hpp.in b/include/util/version.hpp.in similarity index 100% rename from util/version.hpp.in rename to include/util/version.hpp.in diff --git a/util/xml_renderer.hpp b/include/util/xml_renderer.hpp similarity index 100% rename from util/xml_renderer.hpp rename to include/util/xml_renderer.hpp diff --git a/data_structures/xor_fast_hash.hpp b/include/util/xor_fast_hash.hpp similarity index 100% rename from data_structures/xor_fast_hash.hpp rename to include/util/xor_fast_hash.hpp diff --git a/data_structures/xor_fast_hash_storage.hpp b/include/util/xor_fast_hash_storage.hpp similarity index 100% rename from data_structures/xor_fast_hash_storage.hpp rename to include/util/xor_fast_hash_storage.hpp diff --git a/benchmarks/static_rtree.cpp b/src/benchmarks/static_rtree.cpp similarity index 100% rename from benchmarks/static_rtree.cpp rename to src/benchmarks/static_rtree.cpp diff --git a/contractor/contractor_options.cpp b/src/contractor/contractor_options.cpp similarity index 100% rename from contractor/contractor_options.cpp rename to src/contractor/contractor_options.cpp diff --git a/contractor/processing_chain.cpp b/src/contractor/processing_chain.cpp similarity index 100% rename from contractor/processing_chain.cpp rename to src/contractor/processing_chain.cpp diff --git a/descriptors/description_factory.cpp b/src/engine/descriptors/description_factory.cpp similarity index 100% rename from descriptors/description_factory.cpp rename to src/engine/descriptors/description_factory.cpp diff --git a/algorithms/douglas_peucker.cpp b/src/engine/douglas_peucker.cpp similarity index 100% rename from algorithms/douglas_peucker.cpp rename to src/engine/douglas_peucker.cpp diff --git a/library/osrm_impl.cpp b/src/engine/osrm_impl.cpp similarity index 100% rename from library/osrm_impl.cpp rename to src/engine/osrm_impl.cpp diff --git a/data_structures/phantom_node.cpp b/src/engine/phantom_node.cpp similarity index 100% rename from data_structures/phantom_node.cpp rename to src/engine/phantom_node.cpp diff --git a/algorithms/polyline_compressor.cpp b/src/engine/polyline_compressor.cpp similarity index 100% rename from algorithms/polyline_compressor.cpp rename to src/engine/polyline_compressor.cpp diff --git a/algorithms/polyline_formatter.cpp b/src/engine/polyline_formatter.cpp similarity index 100% rename from algorithms/polyline_formatter.cpp rename to src/engine/polyline_formatter.cpp diff --git a/data_structures/route_parameters.cpp b/src/engine/route_parameters.cpp similarity index 100% rename from data_structures/route_parameters.cpp rename to src/engine/route_parameters.cpp diff --git a/data_structures/search_engine_data.cpp b/src/engine/search_engine_data.cpp similarity index 100% rename from data_structures/search_engine_data.cpp rename to src/engine/search_engine_data.cpp diff --git a/data_structures/compressed_edge_container.cpp b/src/extractor/compressed_edge_container.cpp similarity index 100% rename from data_structures/compressed_edge_container.cpp rename to src/extractor/compressed_edge_container.cpp diff --git a/extractor/edge_based_graph_factory.cpp b/src/extractor/edge_based_graph_factory.cpp similarity index 100% rename from extractor/edge_based_graph_factory.cpp rename to src/extractor/edge_based_graph_factory.cpp diff --git a/data_structures/external_memory_node.cpp b/src/extractor/external_memory_node.cpp similarity index 100% rename from data_structures/external_memory_node.cpp rename to src/extractor/external_memory_node.cpp diff --git a/extractor/extraction_containers.cpp b/src/extractor/extraction_containers.cpp similarity index 100% rename from extractor/extraction_containers.cpp rename to src/extractor/extraction_containers.cpp diff --git a/extractor/extractor.cpp b/src/extractor/extractor.cpp similarity index 100% rename from extractor/extractor.cpp rename to src/extractor/extractor.cpp diff --git a/extractor/extractor_callbacks.cpp b/src/extractor/extractor_callbacks.cpp similarity index 100% rename from extractor/extractor_callbacks.cpp rename to src/extractor/extractor_callbacks.cpp diff --git a/extractor/extractor_options.cpp b/src/extractor/extractor_options.cpp similarity index 100% rename from extractor/extractor_options.cpp rename to src/extractor/extractor_options.cpp diff --git a/algorithms/graph_compressor.cpp b/src/extractor/graph_compressor.cpp similarity index 100% rename from algorithms/graph_compressor.cpp rename to src/extractor/graph_compressor.cpp diff --git a/data_structures/import_edge.cpp b/src/extractor/import_edge.cpp similarity index 100% rename from data_structures/import_edge.cpp rename to src/extractor/import_edge.cpp diff --git a/data_structures/raster_source.cpp b/src/extractor/raster_source.cpp similarity index 100% rename from data_structures/raster_source.cpp rename to src/extractor/raster_source.cpp diff --git a/data_structures/restriction_map.cpp b/src/extractor/restriction_map.cpp similarity index 100% rename from data_structures/restriction_map.cpp rename to src/extractor/restriction_map.cpp diff --git a/extractor/restriction_parser.cpp b/src/extractor/restriction_parser.cpp similarity index 100% rename from extractor/restriction_parser.cpp rename to src/extractor/restriction_parser.cpp diff --git a/extractor/scripting_environment.cpp b/src/extractor/scripting_environment.cpp similarity index 100% rename from extractor/scripting_environment.cpp rename to src/extractor/scripting_environment.cpp diff --git a/server/connection.cpp b/src/server/connection.cpp similarity index 100% rename from server/connection.cpp rename to src/server/connection.cpp diff --git a/server/http/reply.cpp b/src/server/http/reply.cpp similarity index 100% rename from server/http/reply.cpp rename to src/server/http/reply.cpp diff --git a/server/request_handler.cpp b/src/server/request_handler.cpp similarity index 100% rename from server/request_handler.cpp rename to src/server/request_handler.cpp diff --git a/server/request_parser.cpp b/src/server/request_parser.cpp similarity index 100% rename from server/request_parser.cpp rename to src/server/request_parser.cpp diff --git a/tools/.gitignore b/src/tools/.gitignore similarity index 100% rename from tools/.gitignore rename to src/tools/.gitignore diff --git a/tools/check-hsgr.cpp b/src/tools/check-hsgr.cpp similarity index 100% rename from tools/check-hsgr.cpp rename to src/tools/check-hsgr.cpp diff --git a/tools/components.cpp b/src/tools/components.cpp similarity index 100% rename from tools/components.cpp rename to src/tools/components.cpp diff --git a/prepare.cpp b/src/tools/contract.cpp similarity index 100% rename from prepare.cpp rename to src/tools/contract.cpp diff --git a/datastore.cpp b/src/tools/datastore.cpp similarity index 100% rename from datastore.cpp rename to src/tools/datastore.cpp diff --git a/extract.cpp b/src/tools/extract.cpp similarity index 100% rename from extract.cpp rename to src/tools/extract.cpp diff --git a/tools/io-benchmark.cpp b/src/tools/io-benchmark.cpp similarity index 100% rename from tools/io-benchmark.cpp rename to src/tools/io-benchmark.cpp diff --git a/routed.cpp b/src/tools/routed.cpp similarity index 100% rename from routed.cpp rename to src/tools/routed.cpp diff --git a/tools/simpleclient.cpp b/src/tools/simpleclient.cpp similarity index 100% rename from tools/simpleclient.cpp rename to src/tools/simpleclient.cpp diff --git a/tools/springclean.cpp b/src/tools/springclean.cpp similarity index 100% rename from tools/springclean.cpp rename to src/tools/springclean.cpp diff --git a/tools/unlock_all_mutexes.cpp b/src/tools/unlock_all_mutexes.cpp similarity index 100% rename from tools/unlock_all_mutexes.cpp rename to src/tools/unlock_all_mutexes.cpp diff --git a/util/compute_angle.cpp b/src/util/compute_angle.cpp similarity index 100% rename from util/compute_angle.cpp rename to src/util/compute_angle.cpp diff --git a/data_structures/coordinate.cpp b/src/util/coordinate.cpp similarity index 100% rename from data_structures/coordinate.cpp rename to src/util/coordinate.cpp diff --git a/algorithms/coordinate_calculation.cpp b/src/util/coordinate_calculation.cpp similarity index 100% rename from algorithms/coordinate_calculation.cpp rename to src/util/coordinate_calculation.cpp diff --git a/util/fingerprint.cpp b/src/util/fingerprint.cpp similarity index 100% rename from util/fingerprint.cpp rename to src/util/fingerprint.cpp diff --git a/data_structures/hilbert_value.cpp b/src/util/hilbert_value.cpp similarity index 100% rename from data_structures/hilbert_value.cpp rename to src/util/hilbert_value.cpp diff --git a/util/mercator.cpp b/src/util/mercator.cpp similarity index 100% rename from util/mercator.cpp rename to src/util/mercator.cpp diff --git a/util/osrm_exception.cpp b/src/util/osrm_exception.cpp similarity index 100% rename from util/osrm_exception.cpp rename to src/util/osrm_exception.cpp diff --git a/util/simple_logger.cpp b/src/util/simple_logger.cpp similarity index 100% rename from util/simple_logger.cpp rename to src/util/simple_logger.cpp