diff --git a/include/contractor/contractor.hpp b/include/contractor/contractor.hpp
index 07a21dc50..4ae4fcc4b 100644
--- a/include/contractor/contractor.hpp
+++ b/include/contractor/contractor.hpp
@@ -28,17 +28,17 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef CONTRACTOR_HPP
 #define CONTRACTOR_HPP
 
-#include "../data_structures/binary_heap.hpp"
-#include "../data_structures/deallocating_vector.hpp"
-#include "../data_structures/dynamic_graph.hpp"
-#include "../data_structures/percent.hpp"
-#include "../data_structures/query_edge.hpp"
-#include "../data_structures/xor_fast_hash.hpp"
-#include "../data_structures/xor_fast_hash_storage.hpp"
-#include "../util/integer_range.hpp"
-#include "../util/simple_logger.hpp"
-#include "../util/timing_util.hpp"
-#include "../typedefs.h"
+#include "util/binary_heap.hpp"
+#include "util/deallocating_vector.hpp"
+#include "util/dynamic_graph.hpp"
+#include "util/percent.hpp"
+#include "contractor/query_edge.hpp"
+#include "util/xor_fast_hash.hpp"
+#include "util/xor_fast_hash_storage.hpp"
+#include "util/integer_range.hpp"
+#include "util/simple_logger.hpp"
+#include "util/timing_util.hpp"
+#include "util/typedefs.hpp"
 
 #include <boost/assert.hpp>
 
diff --git a/include/contractor/processing_chain.hpp b/include/contractor/processing_chain.hpp
index 0eb65553d..e303a6fc6 100644
--- a/include/contractor/processing_chain.hpp
+++ b/include/contractor/processing_chain.hpp
@@ -28,12 +28,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef PROCESSING_CHAIN_HPP
 #define PROCESSING_CHAIN_HPP
 
-#include "contractor.hpp"
-#include "contractor_options.hpp"
-#include "../data_structures/query_edge.hpp"
-#include "../data_structures/static_graph.hpp"
-#include "../data_structures/deallocating_vector.hpp"
-#include "../data_structures/node_based_graph.hpp"
+#include "contractor/contractor.hpp"
+#include "contractor/contractor_options.hpp"
+#include "contractor/query_edge.hpp"
+#include "util/static_graph.hpp"
+#include "util/deallocating_vector.hpp"
+#include "util/node_based_graph.hpp"
 
 struct SpeedProfileProperties;
 struct EdgeBasedNode;
diff --git a/include/contractor/query_edge.hpp b/include/contractor/query_edge.hpp
index 1c4af03d9..86d5d63a8 100644
--- a/include/contractor/query_edge.hpp
+++ b/include/contractor/query_edge.hpp
@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef QUERYEDGE_HPP
 #define QUERYEDGE_HPP
 
-#include "../typedefs.h"
+#include "util/typedefs.hpp"
 
 #include <tuple>
 
diff --git a/include/datastore/shared_memory_factory.hpp b/include/datastore/shared_memory_factory.hpp
index 7d92eaaa5..c88fc725e 100644
--- a/include/datastore/shared_memory_factory.hpp
+++ b/include/datastore/shared_memory_factory.hpp
@@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef SHARED_MEMORY_FACTORY_HPP
 #define SHARED_MEMORY_FACTORY_HPP
 
-#include "../util/osrm_exception.hpp"
-#include "../util/simple_logger.hpp"
+#include "util/osrm_exception.hpp"
+#include "util/simple_logger.hpp"
 
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>
diff --git a/include/engine/datafacade/datafacade_base.hpp b/include/engine/datafacade/datafacade_base.hpp
index 5c5c52296..a0d1f0e98 100644
--- a/include/engine/datafacade/datafacade_base.hpp
+++ b/include/engine/datafacade/datafacade_base.hpp
@@ -30,16 +30,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 // Exposes all data access interfaces to the algorithms via base class ptr
 
-#include "../../data_structures/edge_based_node.hpp"
-#include "../../data_structures/external_memory_node.hpp"
-#include "../../data_structures/phantom_node.hpp"
-#include "../../data_structures/turn_instructions.hpp"
-#include "../../util/integer_range.hpp"
-#include "../../util/osrm_exception.hpp"
-#include "../../util/string_util.hpp"
-#include "../../typedefs.h"
+#include "extractor/edge_based_node.hpp"
+#include "extractor/external_memory_node.hpp"
+#include "engine/phantom_node.hpp"
+#include "extractor/turn_instructions.hpp"
+#include "util/integer_range.hpp"
+#include "util/osrm_exception.hpp"
+#include "util/string_util.hpp"
+#include "util/typedefs.hpp"
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 
 #include <string>
 #include <boost/optional.hpp>
diff --git a/include/engine/datafacade/internal_datafacade.hpp b/include/engine/datafacade/internal_datafacade.hpp
index a2f74e587..82bbe30e2 100644
--- a/include/engine/datafacade/internal_datafacade.hpp
+++ b/include/engine/datafacade/internal_datafacade.hpp
@@ -30,20 +30,20 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 // implements all data storage when shared memory is _NOT_ used
 
-#include "datafacade_base.hpp"
+#include "engine/datafacade/datafacade_base.hpp"
 
-#include "../../algorithms/geospatial_query.hpp"
-#include "../../data_structures/original_edge_data.hpp"
-#include "../../data_structures/query_node.hpp"
-#include "../../data_structures/query_edge.hpp"
-#include "../../data_structures/shared_memory_vector_wrapper.hpp"
-#include "../../data_structures/static_graph.hpp"
-#include "../../data_structures/static_rtree.hpp"
-#include "../../data_structures/range_table.hpp"
-#include "../../util/graph_loader.hpp"
-#include "../../util/simple_logger.hpp"
+#include "engine/geospatial_query.hpp"
+#include "extractor/original_edge_data.hpp"
+#include "extractor/query_node.hpp"
+#include "contractor/query_edge.hpp"
+#include "util/shared_memory_vector_wrapper.hpp"
+#include "util/static_graph.hpp"
+#include "util/static_rtree.hpp"
+#include "util/range_table.hpp"
+#include "util/graph_loader.hpp"
+#include "util/simple_logger.hpp"
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 
 #include <boost/thread.hpp>
 
diff --git a/include/engine/datafacade/shared_datafacade.hpp b/include/engine/datafacade/shared_datafacade.hpp
index 024a8948f..dc7938cd5 100644
--- a/include/engine/datafacade/shared_datafacade.hpp
+++ b/include/engine/datafacade/shared_datafacade.hpp
@@ -30,15 +30,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 // implements all data storage when shared memory _IS_ used
 
-#include "datafacade_base.hpp"
-#include "shared_datatype.hpp"
+#include "engine/datafacade/datafacade_base.hpp"
+#include "engine/datafacade/shared_datatype.hpp"
 
-#include "../../algorithms/geospatial_query.hpp"
-#include "../../data_structures/range_table.hpp"
-#include "../../data_structures/static_graph.hpp"
-#include "../../data_structures/static_rtree.hpp"
-#include "../../util/make_unique.hpp"
-#include "../../util/simple_logger.hpp"
+#include "engine/geospatial_query.hpp"
+#include "util/range_table.hpp"
+#include "util/static_graph.hpp"
+#include "util/static_rtree.hpp"
+#include "util/make_unique.hpp"
+#include "util/simple_logger.hpp"
 
 #include <boost/thread.hpp>
 
diff --git a/include/engine/datafacade/shared_datatype.hpp b/include/engine/datafacade/shared_datatype.hpp
index c0ad7d45b..f012073e4 100644
--- a/include/engine/datafacade/shared_datatype.hpp
+++ b/include/engine/datafacade/shared_datatype.hpp
@@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef SHARED_DATA_TYPE_HPP
 #define SHARED_DATA_TYPE_HPP
 
-#include "../../util/osrm_exception.hpp"
-#include "../../util/simple_logger.hpp"
+#include "util/osrm_exception.hpp"
+#include "util/simple_logger.hpp"
 
 #include <cstdint>
 
diff --git a/include/engine/descriptors/description_factory.hpp b/include/engine/descriptors/description_factory.hpp
index 985f9c1c5..0e3dc2413 100644
--- a/include/engine/descriptors/description_factory.hpp
+++ b/include/engine/descriptors/description_factory.hpp
@@ -28,15 +28,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef DESCRIPTION_FACTORY_HPP
 #define DESCRIPTION_FACTORY_HPP
 
-#include "../algorithms/douglas_peucker.hpp"
-#include "../data_structures/phantom_node.hpp"
-#include "../data_structures/segment_information.hpp"
-#include "../data_structures/turn_instructions.hpp"
+#include "engine/douglas_peucker.hpp"
+#include "engine/phantom_node.hpp"
+#include "engine/segment_information.hpp"
+#include "extractor/turn_instructions.hpp"
 
 #include <boost/assert.hpp>
 
-#include <osrm/coordinate.hpp>
-#include <osrm/json_container.hpp>
+#include "osrm/coordinate.hpp"
+#include "osrm/json_container.hpp"
 
 #include <cmath>
 
diff --git a/include/engine/descriptors/descriptor_base.hpp b/include/engine/descriptors/descriptor_base.hpp
index e85ea902f..41511a082 100644
--- a/include/engine/descriptors/descriptor_base.hpp
+++ b/include/engine/descriptors/descriptor_base.hpp
@@ -28,14 +28,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef DESCRIPTOR_BASE_HPP
 #define DESCRIPTOR_BASE_HPP
 
-#include "../algorithms/coordinate_calculation.hpp"
-#include "../data_structures/internal_route_result.hpp"
-#include "../data_structures/phantom_node.hpp"
-#include "../typedefs.h"
+#include "util/coordinate_calculation.hpp"
+#include "engine/internal_route_result.hpp"
+#include "engine/phantom_node.hpp"
+#include "util/typedefs.hpp"
 
 #include <boost/assert.hpp>
 
-#include <osrm/json_container.hpp>
+#include "osrm/json_container.hpp"
 
 #include <string>
 #include <unordered_map>
diff --git a/include/engine/descriptors/gpx_descriptor.hpp b/include/engine/descriptors/gpx_descriptor.hpp
index fb4c5b9de..dd7506625 100644
--- a/include/engine/descriptors/gpx_descriptor.hpp
+++ b/include/engine/descriptors/gpx_descriptor.hpp
@@ -28,10 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef GPX_DESCRIPTOR_HPP
 #define GPX_DESCRIPTOR_HPP
 
-#include "descriptor_base.hpp"
-#include "../util/xml_renderer.hpp"
+#include "engine/descriptors/descriptor_base.hpp"
+#include "util/xml_renderer.hpp"
 
-#include <osrm/json_container.hpp>
+#include "osrm/json_container.hpp"
 
 #include <iostream>
 
diff --git a/include/engine/descriptors/json_descriptor.hpp b/include/engine/descriptors/json_descriptor.hpp
index a4344d9bb..0e9e629a6 100644
--- a/include/engine/descriptors/json_descriptor.hpp
+++ b/include/engine/descriptors/json_descriptor.hpp
@@ -28,21 +28,21 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef JSON_DESCRIPTOR_HPP
 #define JSON_DESCRIPTOR_HPP
 
-#include "descriptor_base.hpp"
-#include "description_factory.hpp"
-#include "../algorithms/object_encoder.hpp"
-#include "../algorithms/route_name_extraction.hpp"
-#include "../data_structures/segment_information.hpp"
-#include "../data_structures/turn_instructions.hpp"
-#include "../util/bearing.hpp"
-#include "../util/cast.hpp"
-#include "../util/integer_range.hpp"
-#include "../util/json_renderer.hpp"
-#include "../util/simple_logger.hpp"
-#include "../util/string_util.hpp"
-#include "../util/timing_util.hpp"
+#include "engine/descriptors/descriptor_base.hpp"
+#include "engine/descriptors/description_factory.hpp"
+#include "engine/object_encoder.hpp"
+#include "engine/route_name_extraction.hpp"
+#include "engine/segment_information.hpp"
+#include "extractor/turn_instructions.hpp"
+#include "util/bearing.hpp"
+#include "util/cast.hpp"
+#include "util/integer_range.hpp"
+#include "util/json_renderer.hpp"
+#include "util/simple_logger.hpp"
+#include "util/string_util.hpp"
+#include "util/timing_util.hpp"
 
-#include <osrm/json_container.hpp>
+#include "osrm/json_container.hpp"
 
 #include <limits>
 #include <algorithm>
diff --git a/include/engine/douglas_peucker.hpp b/include/engine/douglas_peucker.hpp
index da02982f3..7ef6bd6c2 100644
--- a/include/engine/douglas_peucker.hpp
+++ b/include/engine/douglas_peucker.hpp
@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef DOUGLAS_PEUCKER_HPP_
 #define DOUGLAS_PEUCKER_HPP_
 
-#include "../data_structures/segment_information.hpp"
+#include "engine/segment_information.hpp"
 
 #include <array>
 #include <stack>
diff --git a/include/engine/geospatial_query.hpp b/include/engine/geospatial_query.hpp
index 96b4fc5a2..05105554e 100644
--- a/include/engine/geospatial_query.hpp
+++ b/include/engine/geospatial_query.hpp
@@ -1,12 +1,12 @@
 #ifndef GEOSPATIAL_QUERY_HPP
 #define GEOSPATIAL_QUERY_HPP
 
-#include "coordinate_calculation.hpp"
-#include "../typedefs.h"
-#include "../data_structures/phantom_node.hpp"
-#include "../util/bearing.hpp"
+#include "util/coordinate_calculation.hpp"
+#include "util/typedefs.hpp"
+#include "engine/phantom_node.hpp"
+#include "util/bearing.hpp"
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 
 #include <vector>
 #include <memory>
diff --git a/include/engine/internal_route_result.hpp b/include/engine/internal_route_result.hpp
index 068b63a80..be8dec223 100644
--- a/include/engine/internal_route_result.hpp
+++ b/include/engine/internal_route_result.hpp
@@ -28,12 +28,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef RAW_ROUTE_DATA_H
 #define RAW_ROUTE_DATA_H
 
-#include "../data_structures/phantom_node.hpp"
-#include "../data_structures/travel_mode.hpp"
-#include "../data_structures/turn_instructions.hpp"
-#include "../typedefs.h"
+#include "engine/phantom_node.hpp"
+#include "extractor/travel_mode.hpp"
+#include "extractor/turn_instructions.hpp"
+#include "util/typedefs.hpp"
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 
 #include <vector>
 
diff --git a/include/engine/map_matching/hidden_markov_model.hpp b/include/engine/map_matching/hidden_markov_model.hpp
index e3efcea08..d6e79a6eb 100644
--- a/include/engine/map_matching/hidden_markov_model.hpp
+++ b/include/engine/map_matching/hidden_markov_model.hpp
@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef HIDDEN_MARKOV_MODEL
 #define HIDDEN_MARKOV_MODEL
 
-#include "../util/integer_range.hpp"
+#include "util/integer_range.hpp"
 
 #include <boost/assert.hpp>
 
diff --git a/include/engine/osrm_impl.hpp b/include/engine/osrm_impl.hpp
index c223449e4..b6c8928d2 100644
--- a/include/engine/osrm_impl.hpp
+++ b/include/engine/osrm_impl.hpp
@@ -31,11 +31,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 class BasePlugin;
 struct RouteParameters;
 
-#include "../data_structures/query_edge.hpp"
+#include "contractor/query_edge.hpp"
 
-#include <osrm/json_container.hpp>
-#include <osrm/libosrm_config.hpp>
-#include <osrm/osrm.hpp>
+#include "osrm/json_container.hpp"
+#include "osrm/libosrm_config.hpp"
+#include "osrm/osrm.hpp"
 
 #include <memory>
 #include <unordered_map>
diff --git a/include/engine/phantom_node.hpp b/include/engine/phantom_node.hpp
index b12c4feb6..f2255e35e 100644
--- a/include/engine/phantom_node.hpp
+++ b/include/engine/phantom_node.hpp
@@ -28,10 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef PHANTOM_NODES_H
 #define PHANTOM_NODES_H
 
-#include "travel_mode.hpp"
-#include "../typedefs.h"
+#include "extractor/travel_mode.hpp"
+#include "util/typedefs.hpp"
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 
 #include <iostream>
 #include <utility>
diff --git a/include/engine/plugins/distance_table.hpp b/include/engine/plugins/distance_table.hpp
index c4ed250c8..8009e6818 100644
--- a/include/engine/plugins/distance_table.hpp
+++ b/include/engine/plugins/distance_table.hpp
@@ -28,18 +28,18 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef DISTANCE_TABLE_HPP
 #define DISTANCE_TABLE_HPP
 
-#include "plugin_base.hpp"
+#include "engine/plugins/plugin_base.hpp"
 
-#include "../algorithms/object_encoder.hpp"
-#include "../data_structures/query_edge.hpp"
-#include "../data_structures/search_engine.hpp"
-#include "../descriptors/descriptor_base.hpp"
-#include "../util/json_renderer.hpp"
-#include "../util/make_unique.hpp"
-#include "../util/string_util.hpp"
-#include "../util/timing_util.hpp"
+#include "engine/object_encoder.hpp"
+#include "contractor/query_edge.hpp"
+#include "engine/search_engine.hpp"
+#include "engine/descriptors/descriptor_base.hpp"
+#include "util/json_renderer.hpp"
+#include "util/make_unique.hpp"
+#include "util/string_util.hpp"
+#include "util/timing_util.hpp"
 
-#include <osrm/json_container.hpp>
+#include "osrm/json_container.hpp"
 
 #include <cstdlib>
 
diff --git a/include/engine/plugins/hello_world.hpp b/include/engine/plugins/hello_world.hpp
index 512fb07e0..ac6aa53d9 100644
--- a/include/engine/plugins/hello_world.hpp
+++ b/include/engine/plugins/hello_world.hpp
@@ -28,11 +28,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef HELLO_WORLD_HPP
 #define HELLO_WORLD_HPP
 
-#include "plugin_base.hpp"
+#include "engine/plugins/plugin_base.hpp"
 
-#include "../util/json_renderer.hpp"
+#include "util/json_renderer.hpp"
 
-#include <osrm/json_container.hpp>
+#include "osrm/json_container.hpp"
 
 #include <string>
 
diff --git a/include/engine/plugins/match.hpp b/include/engine/plugins/match.hpp
index f1769562f..64da87856 100644
--- a/include/engine/plugins/match.hpp
+++ b/include/engine/plugins/match.hpp
@@ -28,19 +28,19 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef MATCH_HPP
 #define MATCH_HPP
 
-#include "plugin_base.hpp"
+#include "engine/plugins/plugin_base.hpp"
 
-#include "../algorithms/bayes_classifier.hpp"
-#include "../algorithms/object_encoder.hpp"
-#include "../data_structures/search_engine.hpp"
-#include "../descriptors/descriptor_base.hpp"
-#include "../descriptors/json_descriptor.hpp"
-#include "../routing_algorithms/map_matching.hpp"
-#include "../util/compute_angle.hpp"
-#include "../util/integer_range.hpp"
-#include "../util/json_logger.hpp"
-#include "../util/json_util.hpp"
-#include "../util/string_util.hpp"
+#include "engine/map_matching/bayes_classifier.hpp"
+#include "engine/object_encoder.hpp"
+#include "engine/search_engine.hpp"
+#include "engine/descriptors/descriptor_base.hpp"
+#include "engine/descriptors/json_descriptor.hpp"
+#include "engine/routing_algorithms/map_matching.hpp"
+#include "util/compute_angle.hpp"
+#include "util/integer_range.hpp"
+#include "util/json_logger.hpp"
+#include "util/json_util.hpp"
+#include "util/string_util.hpp"
 
 #include <cstdlib>
 
diff --git a/include/engine/plugins/nearest.hpp b/include/engine/plugins/nearest.hpp
index 245981981..1fc66efec 100644
--- a/include/engine/plugins/nearest.hpp
+++ b/include/engine/plugins/nearest.hpp
@@ -28,13 +28,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef NEAREST_HPP
 #define NEAREST_HPP
 
-#include "plugin_base.hpp"
+#include "engine/plugins/plugin_base.hpp"
 
-#include "../data_structures/phantom_node.hpp"
-#include "../util/integer_range.hpp"
-#include "../util/json_renderer.hpp"
+#include "engine/phantom_node.hpp"
+#include "util/integer_range.hpp"
+#include "util/json_renderer.hpp"
 
-#include <osrm/json_container.hpp>
+#include "osrm/json_container.hpp"
 
 #include <string>
 
diff --git a/include/engine/plugins/plugin_base.hpp b/include/engine/plugins/plugin_base.hpp
index a05785a37..b623aa1f4 100644
--- a/include/engine/plugins/plugin_base.hpp
+++ b/include/engine/plugins/plugin_base.hpp
@@ -28,11 +28,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef BASE_PLUGIN_HPP
 #define BASE_PLUGIN_HPP
 
-#include "../data_structures/phantom_node.hpp"
+#include "engine/phantom_node.hpp"
 
-#include <osrm/coordinate.hpp>
-#include <osrm/json_container.hpp>
-#include <osrm/route_parameters.hpp>
+#include "osrm/coordinate.hpp"
+#include "osrm/json_container.hpp"
+#include "osrm/route_parameters.hpp"
 
 #include <algorithm>
 #include <string>
diff --git a/include/engine/plugins/timestamp.hpp b/include/engine/plugins/timestamp.hpp
index 899ef4670..0b1ef0772 100644
--- a/include/engine/plugins/timestamp.hpp
+++ b/include/engine/plugins/timestamp.hpp
@@ -28,11 +28,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef TIMESTAMP_PLUGIN_H
 #define TIMESTAMP_PLUGIN_H
 
-#include "plugin_base.hpp"
+#include "engine/plugins/plugin_base.hpp"
 
-#include "../util/json_renderer.hpp"
+#include "util/json_renderer.hpp"
 
-#include <osrm/json_container.hpp>
+#include "osrm/json_container.hpp"
 
 #include <string>
 
diff --git a/include/engine/plugins/trip.hpp b/include/engine/plugins/trip.hpp
index a69e25e77..7ca1e663b 100644
--- a/include/engine/plugins/trip.hpp
+++ b/include/engine/plugins/trip.hpp
@@ -28,25 +28,25 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef TRIP_HPP
 #define TRIP_HPP
 
-#include "plugin_base.hpp"
+#include "engine/plugins/plugin_base.hpp"
 
-#include "../algorithms/object_encoder.hpp"
-#include "../algorithms/tarjan_scc.hpp"
-#include "../algorithms/trip_nearest_neighbour.hpp"
-#include "../algorithms/trip_farthest_insertion.hpp"
-#include "../algorithms/trip_brute_force.hpp"
-#include "../data_structures/search_engine.hpp"
-#include "../data_structures/matrix_graph_wrapper.hpp" // wrapper to use tarjan
+#include "engine/object_encoder.hpp"
+#include "extractor/tarjan_scc.hpp"
+#include "engine/trip/trip_nearest_neighbour.hpp"
+#include "engine/trip/trip_farthest_insertion.hpp"
+#include "engine/trip/trip_brute_force.hpp"
+#include "engine/search_engine.hpp"
+#include "util/matrix_graph_wrapper.hpp" // wrapper to use tarjan
                                                        // scc on dist table
-#include "../descriptors/descriptor_base.hpp"          // to make json output
-#include "../descriptors/json_descriptor.hpp"          // to make json output
-#include "../util/make_unique.hpp"
-#include "../util/timing_util.hpp"        // to time runtime
-//#include "../util/simple_logger.hpp"      // for logging output
-#include "../util/dist_table_wrapper.hpp" // to access the dist
+#include "engine/descriptors/descriptor_base.hpp"          // to make json output
+#include "engine/descriptors/json_descriptor.hpp"          // to make json output
+#include "util/make_unique.hpp"
+#include "util/timing_util.hpp"        // to time runtime
+//#include "util/simple_logger.hpp"      // for logging output
+#include "util/dist_table_wrapper.hpp" // to access the dist
                                           // table more easily
 
-#include <osrm/json_container.hpp>
+#include "osrm/json_container.hpp"
 #include <boost/assert.hpp>
 
 #include <cstdlib>
diff --git a/include/engine/plugins/viaroute.hpp b/include/engine/plugins/viaroute.hpp
index f9a6737da..43e8728c3 100644
--- a/include/engine/plugins/viaroute.hpp
+++ b/include/engine/plugins/viaroute.hpp
@@ -28,20 +28,20 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef VIA_ROUTE_HPP
 #define VIA_ROUTE_HPP
 
-#include "plugin_base.hpp"
+#include "engine/plugins/plugin_base.hpp"
 
-#include "../algorithms/object_encoder.hpp"
-#include "../data_structures/search_engine.hpp"
-#include "../descriptors/descriptor_base.hpp"
-#include "../descriptors/gpx_descriptor.hpp"
-#include "../descriptors/json_descriptor.hpp"
-#include "../util/integer_range.hpp"
-#include "../util/json_renderer.hpp"
-#include "../util/make_unique.hpp"
-#include "../util/simple_logger.hpp"
-#include "../util/timing_util.hpp"
+#include "engine/object_encoder.hpp"
+#include "engine/search_engine.hpp"
+#include "engine/descriptors/descriptor_base.hpp"
+#include "engine/descriptors/gpx_descriptor.hpp"
+#include "engine/descriptors/json_descriptor.hpp"
+#include "util/integer_range.hpp"
+#include "util/json_renderer.hpp"
+#include "util/make_unique.hpp"
+#include "util/simple_logger.hpp"
+#include "util/timing_util.hpp"
 
-#include <osrm/json_container.hpp>
+#include "osrm/json_container.hpp"
 
 #include <cstdlib>
 
diff --git a/include/engine/polyline_compressor.hpp b/include/engine/polyline_compressor.hpp
index a148200ca..f4c449156 100644
--- a/include/engine/polyline_compressor.hpp
+++ b/include/engine/polyline_compressor.hpp
@@ -30,7 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 struct SegmentInformation;
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 
 #include <string>
 #include <vector>
diff --git a/include/engine/polyline_formatter.hpp b/include/engine/polyline_formatter.hpp
index 68cc70293..9f7c60eef 100644
--- a/include/engine/polyline_formatter.hpp
+++ b/include/engine/polyline_formatter.hpp
@@ -30,7 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 struct SegmentInformation;
 
-#include <osrm/json_container.hpp>
+#include "osrm/json_container.hpp"
 
 #include <string>
 #include <vector>
diff --git a/include/engine/routing_algorithms/alternative_path.hpp b/include/engine/routing_algorithms/alternative_path.hpp
index 59b772edb..78f7a172b 100644
--- a/include/engine/routing_algorithms/alternative_path.hpp
+++ b/include/engine/routing_algorithms/alternative_path.hpp
@@ -28,10 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef ALTERNATIVE_PATH_ROUTING_HPP
 #define ALTERNATIVE_PATH_ROUTING_HPP
 
-#include "routing_base.hpp"
-#include "../data_structures/search_engine_data.hpp"
-#include "../util/integer_range.hpp"
-#include "../util/container.hpp"
+#include "engine/routing_algorithms/routing_base.hpp"
+#include "engine/search_engine_data.hpp"
+#include "util/integer_range.hpp"
+#include "util/container.hpp"
 
 #include <boost/assert.hpp>
 
diff --git a/include/engine/routing_algorithms/direct_shortest_path.hpp b/include/engine/routing_algorithms/direct_shortest_path.hpp
index 2237d682a..3209423dd 100644
--- a/include/engine/routing_algorithms/direct_shortest_path.hpp
+++ b/include/engine/routing_algorithms/direct_shortest_path.hpp
@@ -31,11 +31,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <boost/assert.hpp>
 #include <iterator>
 
-#include "routing_base.hpp"
-#include "../data_structures/search_engine_data.hpp"
-#include "../util/integer_range.hpp"
-#include "../util/timing_util.hpp"
-#include "../typedefs.h"
+#include "engine/routing_algorithms/routing_base.hpp"
+#include "engine/search_engine_data.hpp"
+#include "util/integer_range.hpp"
+#include "util/timing_util.hpp"
+#include "util/typedefs.hpp"
 
 /// This is a striped down version of the general shortest path algorithm.
 /// The general algorithm always computes two queries for each leg. This is only
diff --git a/include/engine/routing_algorithms/many_to_many.hpp b/include/engine/routing_algorithms/many_to_many.hpp
index c5dfb7ca5..e9d804a2d 100644
--- a/include/engine/routing_algorithms/many_to_many.hpp
+++ b/include/engine/routing_algorithms/many_to_many.hpp
@@ -28,9 +28,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef MANY_TO_MANY_ROUTING_HPP
 #define MANY_TO_MANY_ROUTING_HPP
 
-#include "routing_base.hpp"
-#include "../data_structures/search_engine_data.hpp"
-#include "../typedefs.h"
+#include "engine/routing_algorithms/routing_base.hpp"
+#include "engine/search_engine_data.hpp"
+#include "util/typedefs.hpp"
 
 #include <boost/assert.hpp>
 
diff --git a/include/engine/routing_algorithms/map_matching.hpp b/include/engine/routing_algorithms/map_matching.hpp
index 430682d92..9afc2653a 100644
--- a/include/engine/routing_algorithms/map_matching.hpp
+++ b/include/engine/routing_algorithms/map_matching.hpp
@@ -28,12 +28,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef MAP_MATCHING_HPP
 #define MAP_MATCHING_HPP
 
-#include "routing_base.hpp"
+#include "engine/routing_algorithms/routing_base.hpp"
 
-#include "../algorithms/coordinate_calculation.hpp"
-#include "../data_structures/hidden_markov_model.hpp"
-#include "../util/json_logger.hpp"
-#include "../util/matching_debug_info.hpp"
+#include "util/coordinate_calculation.hpp"
+#include "engine/map_matching/hidden_markov_model.hpp"
+#include "util/json_logger.hpp"
+#include "util/matching_debug_info.hpp"
 
 #include <cstddef>
 
diff --git a/include/engine/routing_algorithms/routing_base.hpp b/include/engine/routing_algorithms/routing_base.hpp
index ecbc07e35..14c5b9c0a 100644
--- a/include/engine/routing_algorithms/routing_base.hpp
+++ b/include/engine/routing_algorithms/routing_base.hpp
@@ -28,10 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef ROUTING_BASE_HPP
 #define ROUTING_BASE_HPP
 
-#include "../algorithms/coordinate_calculation.hpp"
-#include "../data_structures/internal_route_result.hpp"
-#include "../data_structures/search_engine_data.hpp"
-#include "../data_structures/turn_instructions.hpp"
+#include "util/coordinate_calculation.hpp"
+#include "engine/internal_route_result.hpp"
+#include "engine/search_engine_data.hpp"
+#include "extractor/turn_instructions.hpp"
 
 #include <boost/assert.hpp>
 
diff --git a/include/engine/routing_algorithms/shortest_path.hpp b/include/engine/routing_algorithms/shortest_path.hpp
index 601e39460..cedeca83a 100644
--- a/include/engine/routing_algorithms/shortest_path.hpp
+++ b/include/engine/routing_algorithms/shortest_path.hpp
@@ -28,12 +28,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef SHORTEST_PATH_HPP
 #define SHORTEST_PATH_HPP
 
-#include "../typedefs.h"
+#include "util/typedefs.hpp"
 
-#include "routing_base.hpp"
+#include "engine/routing_algorithms/routing_base.hpp"
 
-#include "../data_structures/search_engine_data.hpp"
-#include "../util/integer_range.hpp"
+#include "engine/search_engine_data.hpp"
+#include "util/integer_range.hpp"
 
 #include <boost/assert.hpp>
 
diff --git a/include/engine/search_engine.hpp b/include/engine/search_engine.hpp
index 5af734e77..8efc9d211 100644
--- a/include/engine/search_engine.hpp
+++ b/include/engine/search_engine.hpp
@@ -28,12 +28,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef SEARCH_ENGINE_HPP
 #define SEARCH_ENGINE_HPP
 
-#include "search_engine_data.hpp"
-#include "../routing_algorithms/alternative_path.hpp"
-#include "../routing_algorithms/many_to_many.hpp"
-#include "../routing_algorithms/map_matching.hpp"
-#include "../routing_algorithms/shortest_path.hpp"
-#include "../routing_algorithms/direct_shortest_path.hpp"
+#include "engine/search_engine_data.hpp"
+#include "engine/routing_algorithms/alternative_path.hpp"
+#include "engine/routing_algorithms/many_to_many.hpp"
+#include "engine/routing_algorithms/map_matching.hpp"
+#include "engine/routing_algorithms/shortest_path.hpp"
+#include "engine/routing_algorithms/direct_shortest_path.hpp"
 
 #include <type_traits>
 
diff --git a/include/engine/search_engine_data.hpp b/include/engine/search_engine_data.hpp
index 8c1c1619e..191447865 100644
--- a/include/engine/search_engine_data.hpp
+++ b/include/engine/search_engine_data.hpp
@@ -30,8 +30,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <boost/thread/tss.hpp>
 
-#include "../typedefs.h"
-#include "binary_heap.hpp"
+#include "util/typedefs.hpp"
+#include "util/binary_heap.hpp"
 
 struct HeapData
 {
diff --git a/include/engine/segment_information.hpp b/include/engine/segment_information.hpp
index d9cdc8160..725358b50 100644
--- a/include/engine/segment_information.hpp
+++ b/include/engine/segment_information.hpp
@@ -28,12 +28,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef SEGMENT_INFORMATION_HPP
 #define SEGMENT_INFORMATION_HPP
 
-#include "turn_instructions.hpp"
+#include "extractor/turn_instructions.hpp"
 
-#include "../data_structures/travel_mode.hpp"
-#include "../typedefs.h"
+#include "extractor/travel_mode.hpp"
+#include "util/typedefs.hpp"
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 #include <utility>
 
 // Struct fits everything in one cache line
diff --git a/include/engine/trip/trip_brute_force.hpp b/include/engine/trip/trip_brute_force.hpp
index 601971cf7..5203deea8 100644
--- a/include/engine/trip/trip_brute_force.hpp
+++ b/include/engine/trip/trip_brute_force.hpp
@@ -28,11 +28,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef TRIP_BRUTE_FORCE_HPP
 #define TRIP_BRUTE_FORCE_HPP
 
-#include "../data_structures/search_engine.hpp"
-#include "../util/dist_table_wrapper.hpp"
-#include "../util/simple_logger.hpp"
+#include "engine/search_engine.hpp"
+#include "util/dist_table_wrapper.hpp"
+#include "util/simple_logger.hpp"
 
-#include <osrm/json_container.hpp>
+#include "osrm/json_container.hpp"
 
 #include <cstdlib>
 #include <algorithm>
diff --git a/include/engine/trip/trip_farthest_insertion.hpp b/include/engine/trip/trip_farthest_insertion.hpp
index 91f0aa417..13f301235 100644
--- a/include/engine/trip/trip_farthest_insertion.hpp
+++ b/include/engine/trip/trip_farthest_insertion.hpp
@@ -28,10 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef TRIP_FARTHEST_INSERTION_HPP
 #define TRIP_FARTHEST_INSERTION_HPP
 
-#include "../data_structures/search_engine.hpp"
-#include "../util/dist_table_wrapper.hpp"
+#include "engine/search_engine.hpp"
+#include "util/dist_table_wrapper.hpp"
 
-#include <osrm/json_container.hpp>
+#include "osrm/json_container.hpp"
 #include <boost/assert.hpp>
 
 #include <cstdlib>
diff --git a/include/engine/trip/trip_nearest_neighbour.hpp b/include/engine/trip/trip_nearest_neighbour.hpp
index 0ae179284..e931bcda7 100644
--- a/include/engine/trip/trip_nearest_neighbour.hpp
+++ b/include/engine/trip/trip_nearest_neighbour.hpp
@@ -28,11 +28,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef TRIP_NEAREST_NEIGHBOUR_HPP
 #define TRIP_NEAREST_NEIGHBOUR_HPP
 
-#include "../data_structures/search_engine.hpp"
-#include "../util/simple_logger.hpp"
-#include "../util/dist_table_wrapper.hpp"
+#include "engine/search_engine.hpp"
+#include "util/simple_logger.hpp"
+#include "util/dist_table_wrapper.hpp"
 
-#include <osrm/json_container.hpp>
+#include "osrm/json_container.hpp"
 
 #include <cstdlib>
 #include <algorithm>
diff --git a/include/engine/trip/trip_tabu_search.hpp b/include/engine/trip/trip_tabu_search.hpp
index 32f50fc59..988d0a668 100644
--- a/include/engine/trip/trip_tabu_search.hpp
+++ b/include/engine/trip/trip_tabu_search.hpp
@@ -28,10 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef TRIP_BRUTE_FORCE_HPP
 #define TRIP_BRUTE_FORCE_HPP
 
-#include "../data_structures/search_engine.hpp"
-#include "../util/simple_logger.hpp"
+#include "engine/search_engine.hpp"
+#include "util/simple_logger.hpp"
 
-#include <osrm/json_container.hpp>
+#include "osrm/json_container.hpp"
 
 #include <cstdlib>
 #include <algorithm>
diff --git a/include/extractor/compressed_edge_container.hpp b/include/extractor/compressed_edge_container.hpp
index 5d94ee6de..afae26f7d 100644
--- a/include/extractor/compressed_edge_container.hpp
+++ b/include/extractor/compressed_edge_container.hpp
@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef GEOMETRY_COMPRESSOR_HPP_
 #define GEOMETRY_COMPRESSOR_HPP_
 
-#include "../typedefs.h"
+#include "util/typedefs.hpp"
 
 #include <unordered_map>
 
diff --git a/include/extractor/edge_based_graph_factory.hpp b/include/extractor/edge_based_graph_factory.hpp
index 997c7ea8e..56344c018 100644
--- a/include/extractor/edge_based_graph_factory.hpp
+++ b/include/extractor/edge_based_graph_factory.hpp
@@ -30,16 +30,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef EDGE_BASED_GRAPH_FACTORY_HPP_
 #define EDGE_BASED_GRAPH_FACTORY_HPP_
 
-#include "speed_profile.hpp"
-#include "../typedefs.h"
-#include "../data_structures/compressed_edge_container.hpp"
-#include "../data_structures/deallocating_vector.hpp"
-#include "../data_structures/edge_based_node.hpp"
-#include "../data_structures/original_edge_data.hpp"
-#include "../data_structures/query_node.hpp"
-#include "../data_structures/turn_instructions.hpp"
-#include "../data_structures/node_based_graph.hpp"
-#include "../data_structures/restriction_map.hpp"
+#include "extractor/speed_profile.hpp"
+#include "util/typedefs.hpp"
+#include "extractor/compressed_edge_container.hpp"
+#include "util/deallocating_vector.hpp"
+#include "extractor/edge_based_node.hpp"
+#include "extractor/original_edge_data.hpp"
+#include "extractor/query_node.hpp"
+#include "extractor/turn_instructions.hpp"
+#include "util/node_based_graph.hpp"
+#include "extractor/restriction_map.hpp"
 
 #include <algorithm>
 #include <iosfwd>
diff --git a/include/extractor/edge_based_node.hpp b/include/extractor/edge_based_node.hpp
index 8efbf0175..cc09ed2a0 100644
--- a/include/extractor/edge_based_node.hpp
+++ b/include/extractor/edge_based_node.hpp
@@ -28,12 +28,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef EDGE_BASED_NODE_HPP
 #define EDGE_BASED_NODE_HPP
 
-#include "../data_structures/travel_mode.hpp"
-#include "../typedefs.h"
+#include "extractor/travel_mode.hpp"
+#include "util/typedefs.hpp"
 
 #include <boost/assert.hpp>
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 
 #include <limits>
 
diff --git a/include/extractor/external_memory_node.hpp b/include/extractor/external_memory_node.hpp
index a48d1a13a..ac56d2393 100644
--- a/include/extractor/external_memory_node.hpp
+++ b/include/extractor/external_memory_node.hpp
@@ -28,9 +28,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef EXTERNAL_MEMORY_NODE_HPP_
 #define EXTERNAL_MEMORY_NODE_HPP_
 
-#include "query_node.hpp"
+#include "extractor/query_node.hpp"
 
-#include "../typedefs.h"
+#include "util/typedefs.hpp"
 
 struct ExternalMemoryNode : QueryNode
 {
diff --git a/include/extractor/extraction_containers.hpp b/include/extractor/extraction_containers.hpp
index 541ad3537..f8a330edb 100644
--- a/include/extractor/extraction_containers.hpp
+++ b/include/extractor/extraction_containers.hpp
@@ -28,11 +28,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef EXTRACTION_CONTAINERS_HPP
 #define EXTRACTION_CONTAINERS_HPP
 
-#include "internal_extractor_edge.hpp"
-#include "first_and_last_segment_of_way.hpp"
-#include "scripting_environment.hpp"
-#include "../data_structures/external_memory_node.hpp"
-#include "../data_structures/restriction.hpp"
+#include "extractor/internal_extractor_edge.hpp"
+#include "extractor/first_and_last_segment_of_way.hpp"
+#include "extractor/scripting_environment.hpp"
+#include "extractor/external_memory_node.hpp"
+#include "extractor/restriction.hpp"
 
 #include <stxxl/vector>
 #include <unordered_map>
diff --git a/include/extractor/extraction_helper_functions.hpp b/include/extractor/extraction_helper_functions.hpp
index 69ab456af..2b266d75f 100644
--- a/include/extractor/extraction_helper_functions.hpp
+++ b/include/extractor/extraction_helper_functions.hpp
@@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef EXTRACTION_HELPER_FUNCTIONS_HPP
 #define EXTRACTION_HELPER_FUNCTIONS_HPP
 
-#include "../util/cast.hpp"
-#include "../util/iso_8601_duration_parser.hpp"
+#include "util/cast.hpp"
+#include "util/iso_8601_duration_parser.hpp"
 
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string_regex.hpp>
diff --git a/include/extractor/extraction_way.hpp b/include/extractor/extraction_way.hpp
index 094c10a54..c88588ef1 100644
--- a/include/extractor/extraction_way.hpp
+++ b/include/extractor/extraction_way.hpp
@@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef EXTRACTION_WAY_HPP
 #define EXTRACTION_WAY_HPP
 
-#include "../data_structures/travel_mode.hpp"
-#include "../typedefs.h"
+#include "extractor/travel_mode.hpp"
+#include "util/typedefs.hpp"
 
 #include <string>
 #include <vector>
diff --git a/include/extractor/extractor.hpp b/include/extractor/extractor.hpp
index c147f1961..45a4ee8db 100644
--- a/include/extractor/extractor.hpp
+++ b/include/extractor/extractor.hpp
@@ -28,9 +28,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef EXTRACTOR_HPP
 #define EXTRACTOR_HPP
 
-#include "extractor_options.hpp"
-#include "edge_based_graph_factory.hpp"
-#include "../algorithms/graph_compressor.hpp"
+#include "extractor/extractor_options.hpp"
+#include "extractor/edge_based_graph_factory.hpp"
+#include "extractor/graph_compressor.hpp"
 
 class extractor
 {
diff --git a/include/extractor/extractor_callbacks.hpp b/include/extractor/extractor_callbacks.hpp
index 0026b6fb0..808119be5 100644
--- a/include/extractor/extractor_callbacks.hpp
+++ b/include/extractor/extractor_callbacks.hpp
@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef EXTRACTOR_CALLBACKS_HPP
 #define EXTRACTOR_CALLBACKS_HPP
 
-#include "../typedefs.h"
+#include "util/typedefs.hpp"
 #include <boost/optional/optional_fwd.hpp>
 
 #include <string>
diff --git a/include/extractor/first_and_last_segment_of_way.hpp b/include/extractor/first_and_last_segment_of_way.hpp
index ead8b4c5c..55a096f45 100644
--- a/include/extractor/first_and_last_segment_of_way.hpp
+++ b/include/extractor/first_and_last_segment_of_way.hpp
@@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef FIRST_AND_LAST_SEGMENT_OF_WAY_HPP
 #define FIRST_AND_LAST_SEGMENT_OF_WAY_HPP
 
-#include "../data_structures/external_memory_node.hpp"
-#include "../typedefs.h"
+#include "extractor/external_memory_node.hpp"
+#include "util/typedefs.hpp"
 
 #include <limits>
 #include <string>
diff --git a/include/extractor/graph_compressor.hpp b/include/extractor/graph_compressor.hpp
index 8096a92d6..7ddcd1402 100644
--- a/include/extractor/graph_compressor.hpp
+++ b/include/extractor/graph_compressor.hpp
@@ -27,10 +27,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef GEOMETRY_COMPRESSOR_HPP
 #define GEOMETRY_COMPRESSOR_HPP
 
-#include "../typedefs.h"
+#include "util/typedefs.hpp"
 
-#include "../extractor/speed_profile.hpp"
-#include "../data_structures/node_based_graph.hpp"
+#include "extractor/speed_profile.hpp"
+#include "util/node_based_graph.hpp"
 
 #include <memory>
 #include <unordered_set>
diff --git a/include/extractor/import_edge.hpp b/include/extractor/import_edge.hpp
index 449ded2a1..f436502c1 100644
--- a/include/extractor/import_edge.hpp
+++ b/include/extractor/import_edge.hpp
@@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef IMPORT_EDGE_HPP
 #define IMPORT_EDGE_HPP
 
-#include "../data_structures/travel_mode.hpp"
-#include "../typedefs.h"
+#include "extractor/travel_mode.hpp"
+#include "util/typedefs.hpp"
 
 struct NodeBasedEdge
 {
diff --git a/include/extractor/internal_extractor_edge.hpp b/include/extractor/internal_extractor_edge.hpp
index 0df6e8cb8..546bb32dc 100644
--- a/include/extractor/internal_extractor_edge.hpp
+++ b/include/extractor/internal_extractor_edge.hpp
@@ -28,13 +28,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef INTERNAL_EXTRACTOR_EDGE_HPP
 #define INTERNAL_EXTRACTOR_EDGE_HPP
 
-#include "../typedefs.h"
-#include "../data_structures/travel_mode.hpp"
-#include "../data_structures/import_edge.hpp"
+#include "util/typedefs.hpp"
+#include "extractor/travel_mode.hpp"
+#include "extractor/import_edge.hpp"
 
 #include <boost/assert.hpp>
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 #include <utility>
 
 struct InternalExtractorEdge
diff --git a/include/extractor/node_id.hpp b/include/extractor/node_id.hpp
index 0671a4d9d..b17de3829 100644
--- a/include/extractor/node_id.hpp
+++ b/include/extractor/node_id.hpp
@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef NODE_ID_HPP
 #define NODE_ID_HPP
 
-#include "../typedefs.h"
+#include "util/typedefs.hpp"
 
 struct Cmp
 {
diff --git a/include/extractor/original_edge_data.hpp b/include/extractor/original_edge_data.hpp
index cbbc1b276..b2009f69b 100644
--- a/include/extractor/original_edge_data.hpp
+++ b/include/extractor/original_edge_data.hpp
@@ -28,9 +28,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef ORIGINAL_EDGE_DATA_HPP
 #define ORIGINAL_EDGE_DATA_HPP
 
-#include "travel_mode.hpp"
-#include "turn_instructions.hpp"
-#include "../typedefs.h"
+#include "extractor/travel_mode.hpp"
+#include "extractor/turn_instructions.hpp"
+#include "util/typedefs.hpp"
 
 #include <limits>
 
diff --git a/include/extractor/query_node.hpp b/include/extractor/query_node.hpp
index 0f32a536f..2c956262e 100644
--- a/include/extractor/query_node.hpp
+++ b/include/extractor/query_node.hpp
@@ -28,11 +28,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef QUERY_NODE_HPP
 #define QUERY_NODE_HPP
 
-#include "../typedefs.h"
+#include "util/typedefs.hpp"
 
 #include <boost/assert.hpp>
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 
 #include <limits>
 
diff --git a/include/extractor/raster_source.hpp b/include/extractor/raster_source.hpp
index 86c859639..d5bdc3937 100644
--- a/include/extractor/raster_source.hpp
+++ b/include/extractor/raster_source.hpp
@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef RASTER_SOURCE_HPP
 #define RASTER_SOURCE_HPP
 
-#include "../util/osrm_exception.hpp"
+#include "util/osrm_exception.hpp"
 
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>
diff --git a/include/extractor/restriction.hpp b/include/extractor/restriction.hpp
index ecab4f921..4cfeccd1d 100644
--- a/include/extractor/restriction.hpp
+++ b/include/extractor/restriction.hpp
@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef RESTRICTION_HPP
 #define RESTRICTION_HPP
 
-#include "../typedefs.h"
+#include "util/typedefs.hpp"
 
 #include <limits>
 
diff --git a/include/extractor/restriction_map.hpp b/include/extractor/restriction_map.hpp
index dbca35651..64d65b873 100644
--- a/include/extractor/restriction_map.hpp
+++ b/include/extractor/restriction_map.hpp
@@ -28,9 +28,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef RESTRICTION_MAP_HPP
 #define RESTRICTION_MAP_HPP
 
-#include "restriction.hpp"
-#include "../util/std_hash.hpp"
-#include "../typedefs.h"
+#include "extractor/restriction.hpp"
+#include "util/std_hash.hpp"
+#include "util/typedefs.hpp"
 
 #include <boost/assert.hpp>
 
diff --git a/include/extractor/restriction_parser.hpp b/include/extractor/restriction_parser.hpp
index 11f94ee21..3d19bb9ff 100644
--- a/include/extractor/restriction_parser.hpp
+++ b/include/extractor/restriction_parser.hpp
@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef RESTRICTION_PARSER_HPP
 #define RESTRICTION_PARSER_HPP
 
-#include "../data_structures/restriction.hpp"
+#include "extractor/restriction.hpp"
 
 #include <boost/optional/optional.hpp>
 
diff --git a/include/extractor/tarjan_scc.hpp b/include/extractor/tarjan_scc.hpp
index 59077322d..ad829d167 100644
--- a/include/extractor/tarjan_scc.hpp
+++ b/include/extractor/tarjan_scc.hpp
@@ -28,18 +28,18 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef TARJAN_SCC_HPP
 #define TARJAN_SCC_HPP
 
-#include "../typedefs.h"
-#include "../data_structures/deallocating_vector.hpp"
-#include "../data_structures/import_edge.hpp"
-#include "../data_structures/query_node.hpp"
-#include "../data_structures/percent.hpp"
+#include "util/typedefs.hpp"
+#include "util/deallocating_vector.hpp"
+#include "extractor/import_edge.hpp"
+#include "extractor/query_node.hpp"
+#include "util/percent.hpp"
 
-#include "../util/integer_range.hpp"
-#include "../util/simple_logger.hpp"
-#include "../util/std_hash.hpp"
-#include "../util/timing_util.hpp"
+#include "util/integer_range.hpp"
+#include "util/simple_logger.hpp"
+#include "util/std_hash.hpp"
+#include "util/timing_util.hpp"
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 #include <boost/assert.hpp>
 #include <cstdint>
 
diff --git a/include/osrm/route_parameters.hpp b/include/osrm/route_parameters.hpp
index 6d2dda719..700c55807 100644
--- a/include/osrm/route_parameters.hpp
+++ b/include/osrm/route_parameters.hpp
@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef ROUTE_PARAMETERS_HPP
 #define ROUTE_PARAMETERS_HPP
 
-#include <osrm/coordinate.hpp>
+#include "coordinate.hpp"
 
 #include <boost/fusion/container/vector/vector_fwd.hpp>
 #include <boost/spirit/include/qi.hpp>
diff --git a/include/server/connection.hpp b/include/server/connection.hpp
index aa6fd0544..315800d1a 100644
--- a/include/server/connection.hpp
+++ b/include/server/connection.hpp
@@ -28,10 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef CONNECTION_HPP
 #define CONNECTION_HPP
 
-#include "http/compression_type.hpp"
-#include "http/reply.hpp"
-#include "http/request.hpp"
-#include "request_parser.hpp"
+#include "server/http/compression_type.hpp"
+#include "server/http/reply.hpp"
+#include "server/http/request.hpp"
+#include "server/request_parser.hpp"
 
 #include <boost/array.hpp>
 #include <boost/asio.hpp>
diff --git a/include/server/http/reply.hpp b/include/server/http/reply.hpp
index 733818c2c..7689e5ed2 100644
--- a/include/server/http/reply.hpp
+++ b/include/server/http/reply.hpp
@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef REPLY_HPP
 #define REPLY_HPP
 
-#include "header.hpp"
+#include "server/http/header.hpp"
 
 #include <boost/asio.hpp>
 
diff --git a/include/server/request_parser.hpp b/include/server/request_parser.hpp
index 3724613a7..920876dcf 100644
--- a/include/server/request_parser.hpp
+++ b/include/server/request_parser.hpp
@@ -28,9 +28,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef REQUEST_PARSER_HPP
 #define REQUEST_PARSER_HPP
 
-#include "http/compression_type.hpp"
-#include "http/header.hpp"
-#include "../data_structures/tribool.hpp"
+#include "server/http/compression_type.hpp"
+#include "server/http/header.hpp"
+#include "util/tribool.hpp"
 
 #include <tuple>
 
diff --git a/include/server/server.hpp b/include/server/server.hpp
index 80fae9704..48ac2686a 100644
--- a/include/server/server.hpp
+++ b/include/server/server.hpp
@@ -28,11 +28,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef SERVER_HPP
 #define SERVER_HPP
 
-#include "connection.hpp"
-#include "request_handler.hpp"
+#include "server/connection.hpp"
+#include "server/request_handler.hpp"
 
-#include "../util/integer_range.hpp"
-#include "../util/simple_logger.hpp"
+#include "util/integer_range.hpp"
+#include "util/simple_logger.hpp"
 
 #include <boost/asio.hpp>
 #include <boost/bind.hpp>
diff --git a/include/util/datastore_options.hpp b/include/util/datastore_options.hpp
index 4a8320c77..ccb909f14 100644
--- a/include/util/datastore_options.hpp
+++ b/include/util/datastore_options.hpp
@@ -29,9 +29,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define DATASTORE_OPTIONS_HPP
 
 #include "util/version.hpp"
-#include "ini_file.hpp"
-#include "osrm_exception.hpp"
-#include "simple_logger.hpp"
+#include "util/ini_file.hpp"
+#include "util/osrm_exception.hpp"
+#include "util/simple_logger.hpp"
 
 #include <boost/any.hpp>
 #include <boost/filesystem.hpp>
diff --git a/include/util/deallocating_vector.hpp b/include/util/deallocating_vector.hpp
index 72cb0816c..c98bd3174 100644
--- a/include/util/deallocating_vector.hpp
+++ b/include/util/deallocating_vector.hpp
@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef DEALLOCATING_VECTOR_HPP
 #define DEALLOCATING_VECTOR_HPP
 
-#include "../util/integer_range.hpp"
+#include "util/integer_range.hpp"
 
 #include <boost/iterator/iterator_facade.hpp>
 
diff --git a/include/util/debug_geometry.hpp b/include/util/debug_geometry.hpp
index daa7e1074..bf2b26bce 100644
--- a/include/util/debug_geometry.hpp
+++ b/include/util/debug_geometry.hpp
@@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef DEBUG_GEOMETRY_H
 #define DEBUG_GEOMETRY_H
 
-#include "../contractor/contractor_options.hpp"
-#include "../data_structures/query_node.hpp"
+#include "contractor/contractor_options.hpp"
+#include "extractor/query_node.hpp"
 
 #ifndef DEBUG_GEOMETRY
 
@@ -57,8 +57,8 @@ inline void DEBUG_TURNS_STOP() {}
 #include <iomanip>
 #include <iostream>
 
-#include "../include/osrm/coordinate.hpp"
-#include "../algorithms/coordinate_calculation.hpp"
+#include "util/coordinate.hpp"
+#include "util/coordinate_calculation.hpp"
 
 boost::filesystem::ofstream debug_geometry_file;
 bool dg_output_debug_geometry = false;
diff --git a/include/util/dynamic_graph.hpp b/include/util/dynamic_graph.hpp
index 4f63c02d4..c0cf2bb4d 100644
--- a/include/util/dynamic_graph.hpp
+++ b/include/util/dynamic_graph.hpp
@@ -28,9 +28,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef DYNAMICGRAPH_HPP
 #define DYNAMICGRAPH_HPP
 
-#include "deallocating_vector.hpp"
-#include "../util/integer_range.hpp"
-#include "../typedefs.h"
+#include "util/deallocating_vector.hpp"
+#include "util/integer_range.hpp"
+#include "util/typedefs.hpp"
 
 #include <boost/assert.hpp>
 
diff --git a/include/util/graph_loader.hpp b/include/util/graph_loader.hpp
index 6ddd0ebcb..b720a9bdf 100644
--- a/include/util/graph_loader.hpp
+++ b/include/util/graph_loader.hpp
@@ -28,14 +28,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef GRAPH_LOADER_HPP
 #define GRAPH_LOADER_HPP
 
-#include "fingerprint.hpp"
-#include "osrm_exception.hpp"
-#include "simple_logger.hpp"
-#include "../data_structures/external_memory_node.hpp"
-#include "../data_structures/import_edge.hpp"
-#include "../data_structures/query_node.hpp"
-#include "../data_structures/restriction.hpp"
-#include "../typedefs.h"
+#include "util/fingerprint.hpp"
+#include "util/osrm_exception.hpp"
+#include "util/simple_logger.hpp"
+#include "extractor/external_memory_node.hpp"
+#include "extractor/import_edge.hpp"
+#include "extractor/query_node.hpp"
+#include "extractor/restriction.hpp"
+#include "util/typedefs.hpp"
 
 #include <boost/assert.hpp>
 #include <boost/filesystem.hpp>
diff --git a/include/util/graph_utils.hpp b/include/util/graph_utils.hpp
index 9af8dbc07..d9d2fc46e 100644
--- a/include/util/graph_utils.hpp
+++ b/include/util/graph_utils.hpp
@@ -1,7 +1,7 @@
 #ifndef GRAPH_UTILS_HPP
 #define GRAPH_UTILS_HPP
 
-#include "../typedefs.h"
+#include "util/typedefs.hpp"
 
 #include <boost/assert.hpp>
 #include <vector>
diff --git a/include/util/json_logger.hpp b/include/util/json_logger.hpp
index 8726f78d9..dbef457e6 100644
--- a/include/util/json_logger.hpp
+++ b/include/util/json_logger.hpp
@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef JSON_LOGGER_HPP
 #define JSON_LOGGER_HPP
 
-#include <osrm/json_container.hpp>
+#include "osrm/json_container.hpp"
 
 #include <boost/thread/tss.hpp>
 
diff --git a/include/util/json_renderer.hpp b/include/util/json_renderer.hpp
index 09d7bb251..d44d507fa 100644
--- a/include/util/json_renderer.hpp
+++ b/include/util/json_renderer.hpp
@@ -31,10 +31,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef JSON_RENDERER_HPP
 #define JSON_RENDERER_HPP
 
-#include "cast.hpp"
-#include "string_util.hpp"
+#include "util/cast.hpp"
+#include "util/string_util.hpp"
 
-#include <osrm/json_container.hpp>
+#include "osrm/json_container.hpp"
 
 namespace osrm
 {
diff --git a/include/util/json_util.hpp b/include/util/json_util.hpp
index bfb8a8bc4..0804f0a6f 100644
--- a/include/util/json_util.hpp
+++ b/include/util/json_util.hpp
@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef JSON_UTIL_HPP
 #define JSON_UTIL_HPP
 
-#include <osrm/json_container.hpp>
+#include "osrm/json_container.hpp"
 
 #include <cmath>
 #include <limits>
diff --git a/include/util/matching_debug_info.hpp b/include/util/matching_debug_info.hpp
index 28bc6ee3f..a21c8f6bc 100644
--- a/include/util/matching_debug_info.hpp
+++ b/include/util/matching_debug_info.hpp
@@ -28,11 +28,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef MATCHING_DEBUG_INFO_HPP
 #define MATCHING_DEBUG_INFO_HPP
 
-#include "json_logger.hpp"
-#include "json_util.hpp"
-#include "../data_structures/hidden_markov_model.hpp"
+#include "util/json_logger.hpp"
+#include "util/json_util.hpp"
+#include "engine/map_matching/hidden_markov_model.hpp"
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 
 // Provides the debug interface for introspection tools
 struct MatchingDebugInfo
diff --git a/include/util/matrix_graph_wrapper.hpp b/include/util/matrix_graph_wrapper.hpp
index f8b3e65bb..3439d6f2b 100644
--- a/include/util/matrix_graph_wrapper.hpp
+++ b/include/util/matrix_graph_wrapper.hpp
@@ -32,7 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <cstddef>
 #include <iterator>
 
-#include "../typedefs.h"
+#include "util/typedefs.hpp"
 
 // This Wrapper provides all methods that are needed for TarjanSCC, when the graph is given in a
 // matrix representation (e.g. as output from a distance table call)
diff --git a/include/util/node_based_graph.hpp b/include/util/node_based_graph.hpp
index e58cfceb4..42b53d626 100644
--- a/include/util/node_based_graph.hpp
+++ b/include/util/node_based_graph.hpp
@@ -28,9 +28,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef NODE_BASED_GRAPH_HPP
 #define NODE_BASED_GRAPH_HPP
 
-#include "dynamic_graph.hpp"
-#include "import_edge.hpp"
-#include "../util/graph_utils.hpp"
+#include "util/dynamic_graph.hpp"
+#include "extractor/import_edge.hpp"
+#include "util/graph_utils.hpp"
 
 #include <tbb/parallel_sort.h>
 
diff --git a/include/util/range_table.hpp b/include/util/range_table.hpp
index e750c90a7..6de3debfd 100644
--- a/include/util/range_table.hpp
+++ b/include/util/range_table.hpp
@@ -28,9 +28,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef RANGE_TABLE_HPP
 #define RANGE_TABLE_HPP
 
-#include "../util/integer_range.hpp"
-#include "shared_memory_factory.hpp"
-#include "shared_memory_vector_wrapper.hpp"
+#include "util/integer_range.hpp"
+#include "datastore/shared_memory_factory.hpp"
+#include "util/shared_memory_vector_wrapper.hpp"
 
 #include <fstream>
 #include <array>
diff --git a/include/util/rectangle.hpp b/include/util/rectangle.hpp
index 7f6704a9b..f4dd5280d 100644
--- a/include/util/rectangle.hpp
+++ b/include/util/rectangle.hpp
@@ -28,11 +28,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef RECTANGLE_HPP
 #define RECTANGLE_HPP
 
-#include "../algorithms/coordinate_calculation.hpp"
+#include "util/coordinate_calculation.hpp"
 
 #include <boost/assert.hpp>
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 
 #include <algorithm>
 #include <cstdint>
diff --git a/include/util/routed_options.hpp b/include/util/routed_options.hpp
index bfe8e5c36..6edcefb72 100644
--- a/include/util/routed_options.hpp
+++ b/include/util/routed_options.hpp
@@ -29,9 +29,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define ROUTED_OPTIONS_HPP
 
 #include "util/version.hpp"
-#include "ini_file.hpp"
-#include "osrm_exception.hpp"
-#include "simple_logger.hpp"
+#include "util/ini_file.hpp"
+#include "util/osrm_exception.hpp"
+#include "util/simple_logger.hpp"
 
 #include <boost/any.hpp>
 #include <boost/program_options.hpp>
diff --git a/include/util/static_graph.hpp b/include/util/static_graph.hpp
index 3b8f92738..a2fd47333 100644
--- a/include/util/static_graph.hpp
+++ b/include/util/static_graph.hpp
@@ -28,10 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef STATIC_GRAPH_HPP
 #define STATIC_GRAPH_HPP
 
-#include "percent.hpp"
-#include "shared_memory_vector_wrapper.hpp"
-#include "../util/integer_range.hpp"
-#include "../typedefs.h"
+#include "util/percent.hpp"
+#include "util/shared_memory_vector_wrapper.hpp"
+#include "util/integer_range.hpp"
+#include "util/typedefs.hpp"
 
 #include <boost/assert.hpp>
 
diff --git a/include/util/static_rtree.hpp b/include/util/static_rtree.hpp
index 6bc367824..8483142e8 100644
--- a/include/util/static_rtree.hpp
+++ b/include/util/static_rtree.hpp
@@ -28,19 +28,19 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef STATIC_RTREE_HPP
 #define STATIC_RTREE_HPP
 
-#include "deallocating_vector.hpp"
-#include "hilbert_value.hpp"
-#include "rectangle.hpp"
-#include "shared_memory_factory.hpp"
-#include "shared_memory_vector_wrapper.hpp"
+#include "util/deallocating_vector.hpp"
+#include "util/hilbert_value.hpp"
+#include "util/rectangle.hpp"
+#include "datastore/shared_memory_factory.hpp"
+#include "util/shared_memory_vector_wrapper.hpp"
 
-#include "../util/bearing.hpp"
-#include "../util/integer_range.hpp"
-#include "../util/mercator.hpp"
-#include "../util/osrm_exception.hpp"
-#include "../typedefs.h"
+#include "util/bearing.hpp"
+#include "util/integer_range.hpp"
+#include "util/mercator.hpp"
+#include "util/osrm_exception.hpp"
+#include "util/typedefs.hpp"
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 
 #include <boost/assert.hpp>
 #include <boost/filesystem.hpp>
diff --git a/include/util/trigonometry_table.hpp b/include/util/trigonometry_table.hpp
index 234a94e56..463dbbecd 100644
--- a/include/util/trigonometry_table.hpp
+++ b/include/util/trigonometry_table.hpp
@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef TRIGONOMETRY_TABLE_HPP
 #define TRIGONOMETRY_TABLE_HPP
 
-#include "../typedefs.h"
+#include "util/typedefs.hpp"
 #include <cmath>
 
 #include <limits>
diff --git a/include/util/typedefs.hpp b/include/util/typedefs.hpp
index dc77f39c7..efc15965f 100644
--- a/include/util/typedefs.hpp
+++ b/include/util/typedefs.hpp
@@ -29,7 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define TYPEDEFS_H
 
 #include <limits>
-#include <osrm/strong_typedef.hpp>
+#include "osrm/strong_typedef.hpp"
 #include <cstddef>
 
 // Necessary workaround for Windows as VS doesn't implement C99
diff --git a/include/util/xml_renderer.hpp b/include/util/xml_renderer.hpp
index 44f7c2d9f..ffd155de8 100644
--- a/include/util/xml_renderer.hpp
+++ b/include/util/xml_renderer.hpp
@@ -28,9 +28,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef XML_RENDERER_HPP
 #define XML_RENDERER_HPP
 
-#include "cast.hpp"
+#include "util/cast.hpp"
 
-#include <osrm/json_container.hpp>
+#include "osrm/json_container.hpp"
 
 namespace osrm
 {
diff --git a/include/util/xor_fast_hash_storage.hpp b/include/util/xor_fast_hash_storage.hpp
index ff65717a3..f56ff7cb1 100644
--- a/include/util/xor_fast_hash_storage.hpp
+++ b/include/util/xor_fast_hash_storage.hpp
@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef XOR_FAST_HASH_STORAGE_HPP
 #define XOR_FAST_HASH_STORAGE_HPP
 
-#include "xor_fast_hash.hpp"
+#include "util/xor_fast_hash.hpp"
 
 #include <limits>
 #include <vector>
diff --git a/src/benchmarks/static_rtree.cpp b/src/benchmarks/static_rtree.cpp
index ebe055cce..26b1badcb 100644
--- a/src/benchmarks/static_rtree.cpp
+++ b/src/benchmarks/static_rtree.cpp
@@ -25,13 +25,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "../data_structures/query_node.hpp"
-#include "../data_structures/static_rtree.hpp"
-#include "../data_structures/edge_based_node.hpp"
-#include "../algorithms/geospatial_query.hpp"
-#include "../util/timing_util.hpp"
+#include "extractor/query_node.hpp"
+#include "util/static_rtree.hpp"
+#include "extractor/edge_based_node.hpp"
+#include "engine/geospatial_query.hpp"
+#include "util/timing_util.hpp"
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 
 #include <random>
 #include <iostream>
diff --git a/src/contractor/contractor_options.cpp b/src/contractor/contractor_options.cpp
index d48346563..aa9a328c4 100644
--- a/src/contractor/contractor_options.cpp
+++ b/src/contractor/contractor_options.cpp
@@ -25,10 +25,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "contractor_options.hpp"
+#include "contractor/contractor_options.hpp"
 
 #include "util/version.hpp"
-#include "../util/simple_logger.hpp"
+#include "util/simple_logger.hpp"
 
 #include <boost/filesystem.hpp>
 #include <boost/program_options.hpp>
diff --git a/src/contractor/processing_chain.cpp b/src/contractor/processing_chain.cpp
index 2bd535093..d0d7d508d 100644
--- a/src/contractor/processing_chain.cpp
+++ b/src/contractor/processing_chain.cpp
@@ -25,22 +25,22 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "processing_chain.hpp"
-#include "contractor.hpp"
+#include "contractor/processing_chain.hpp"
+#include "contractor/contractor.hpp"
 
-#include "contractor.hpp"
+#include "contractor/contractor.hpp"
 
-#include "../data_structures/deallocating_vector.hpp"
+#include "util/deallocating_vector.hpp"
 
-#include "../algorithms/crc32_processor.hpp"
-#include "../util/graph_loader.hpp"
-#include "../util/integer_range.hpp"
-#include "../util/lua_util.hpp"
-#include "../util/osrm_exception.hpp"
-#include "../util/simple_logger.hpp"
-#include "../util/string_util.hpp"
-#include "../util/timing_util.hpp"
-#include "../typedefs.h"
+#include "contractor/crc32_processor.hpp"
+#include "util/graph_loader.hpp"
+#include "util/integer_range.hpp"
+#include "util/lua_util.hpp"
+#include "util/osrm_exception.hpp"
+#include "util/simple_logger.hpp"
+#include "util/string_util.hpp"
+#include "util/timing_util.hpp"
+#include "util/typedefs.hpp"
 
 #include <fast-cpp-csv-parser/csv.h>
 
@@ -55,7 +55,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <thread>
 #include <vector>
 
-#include "../util/debug_geometry.hpp"
+#include "util/debug_geometry.hpp"
 
 Prepare::~Prepare() {}
 
diff --git a/src/engine/descriptors/description_factory.cpp b/src/engine/descriptors/description_factory.cpp
index 5086e0d17..a645987aa 100644
--- a/src/engine/descriptors/description_factory.cpp
+++ b/src/engine/descriptors/description_factory.cpp
@@ -25,15 +25,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "description_factory.hpp"
+#include "engine/descriptors/description_factory.hpp"
 
-#include "../algorithms/polyline_formatter.hpp"
-#include "../algorithms/coordinate_calculation.hpp"
-#include "../data_structures/internal_route_result.hpp"
-#include "../data_structures/turn_instructions.hpp"
-#include "../util/container.hpp"
-#include "../util/integer_range.hpp"
-#include "../typedefs.h"
+#include "engine/polyline_formatter.hpp"
+#include "util/coordinate_calculation.hpp"
+#include "engine/internal_route_result.hpp"
+#include "extractor/turn_instructions.hpp"
+#include "util/container.hpp"
+#include "util/integer_range.hpp"
+#include "util/typedefs.hpp"
 
 DescriptionFactory::DescriptionFactory() : entire_length(0) { via_indices.push_back(0); }
 
diff --git a/src/engine/douglas_peucker.cpp b/src/engine/douglas_peucker.cpp
index 280c90fa8..e95a1497b 100644
--- a/src/engine/douglas_peucker.cpp
+++ b/src/engine/douglas_peucker.cpp
@@ -25,12 +25,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "douglas_peucker.hpp"
+#include "engine/douglas_peucker.hpp"
 
-#include "../data_structures/segment_information.hpp"
+#include "engine/segment_information.hpp"
 
 #include <boost/assert.hpp>
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 
 #include <cmath>
 #include <algorithm>
diff --git a/src/engine/osrm_impl.cpp b/src/engine/osrm_impl.cpp
index 3f5b62b19..04cc4a2e1 100644
--- a/src/engine/osrm_impl.cpp
+++ b/src/engine/osrm_impl.cpp
@@ -33,30 +33,30 @@ class named_mutex;
 }
 }
 
-#include "osrm_impl.hpp"
+#include "engine/osrm_impl.hpp"
 
-#include "../plugins/distance_table.hpp"
-#include "../plugins/hello_world.hpp"
-#include "../plugins/nearest.hpp"
-#include "../plugins/timestamp.hpp"
-#include "../plugins/trip.hpp"
-#include "../plugins/viaroute.hpp"
-#include "../plugins/match.hpp"
-#include "../server/data_structures/datafacade_base.hpp"
-#include "../server/data_structures/internal_datafacade.hpp"
-#include "../server/data_structures/shared_barriers.hpp"
-#include "../server/data_structures/shared_datafacade.hpp"
-#include "../util/make_unique.hpp"
-#include "../util/routed_options.hpp"
-#include "../util/simple_logger.hpp"
+#include "engine/plugins/distance_table.hpp"
+#include "engine/plugins/hello_world.hpp"
+#include "engine/plugins/nearest.hpp"
+#include "engine/plugins/timestamp.hpp"
+#include "engine/plugins/trip.hpp"
+#include "engine/plugins/viaroute.hpp"
+#include "engine/plugins/match.hpp"
+#include "engine/datafacade/datafacade_base.hpp"
+#include "engine/datafacade/internal_datafacade.hpp"
+#include "engine/datafacade/shared_barriers.hpp"
+#include "engine/datafacade/shared_datafacade.hpp"
+#include "util/make_unique.hpp"
+#include "util/routed_options.hpp"
+#include "util/simple_logger.hpp"
 
 #include <boost/assert.hpp>
 #include <boost/interprocess/sync/named_condition.hpp>
 #include <boost/interprocess/sync/scoped_lock.hpp>
 
-#include <osrm/route_parameters.hpp>
-#include <osrm/libosrm_config.hpp>
-#include <osrm/osrm.hpp>
+#include "osrm/route_parameters.hpp"
+#include "osrm/libosrm_config.hpp"
+#include "osrm/osrm.hpp"
 
 #include <algorithm>
 #include <fstream>
diff --git a/src/engine/phantom_node.cpp b/src/engine/phantom_node.cpp
index 95c5bbb4a..bb1a7f383 100644
--- a/src/engine/phantom_node.cpp
+++ b/src/engine/phantom_node.cpp
@@ -25,12 +25,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "phantom_node.hpp"
+#include "engine/phantom_node.hpp"
 
-#include "../typedefs.h"
-#include "travel_mode.hpp"
+#include "util/typedefs.hpp"
+#include "extractor/travel_mode.hpp"
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 
 #include <limits>
 
diff --git a/src/engine/polyline_compressor.cpp b/src/engine/polyline_compressor.cpp
index 0db75dcc6..56e6ca24e 100644
--- a/src/engine/polyline_compressor.cpp
+++ b/src/engine/polyline_compressor.cpp
@@ -25,10 +25,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "polyline_compressor.hpp"
-#include "../data_structures/segment_information.hpp"
+#include "engine/polyline_compressor.hpp"
+#include "engine/segment_information.hpp"
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 
 std::string PolylineCompressor::encode_vector(std::vector<int> &numbers) const
 {
diff --git a/src/engine/polyline_formatter.cpp b/src/engine/polyline_formatter.cpp
index 670a6121f..4b6ac48fb 100644
--- a/src/engine/polyline_formatter.cpp
+++ b/src/engine/polyline_formatter.cpp
@@ -25,12 +25,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "polyline_formatter.hpp"
+#include "engine/polyline_formatter.hpp"
 
-#include "polyline_compressor.hpp"
-#include "../data_structures/segment_information.hpp"
+#include "engine/polyline_compressor.hpp"
+#include "engine/segment_information.hpp"
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 
 osrm::json::String
 PolylineFormatter::printEncodedString(const std::vector<SegmentInformation> &polyline) const
diff --git a/src/engine/route_parameters.cpp b/src/engine/route_parameters.cpp
index 61789bbb4..f75324520 100644
--- a/src/engine/route_parameters.cpp
+++ b/src/engine/route_parameters.cpp
@@ -30,9 +30,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <boost/fusion/include/at_c.hpp>
 #include <boost/spirit/include/qi.hpp>
 
-#include <osrm/route_parameters.hpp>
+#include "osrm/route_parameters.hpp"
 
-#include "../algorithms/polyline_compressor.hpp"
+#include "engine/polyline_compressor.hpp"
 
 RouteParameters::RouteParameters()
     : zoom_level(18), print_instructions(false), alternate_route(true), geometry(true),
diff --git a/src/engine/search_engine_data.cpp b/src/engine/search_engine_data.cpp
index 3282a0ccb..321d814b1 100644
--- a/src/engine/search_engine_data.cpp
+++ b/src/engine/search_engine_data.cpp
@@ -25,9 +25,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "search_engine_data.hpp"
+#include "engine/search_engine_data.hpp"
 
-#include "binary_heap.hpp"
+#include "util/binary_heap.hpp"
 
 void SearchEngineData::InitializeOrClearFirstThreadLocalStorage(const unsigned number_of_nodes)
 {
diff --git a/src/extractor/compressed_edge_container.cpp b/src/extractor/compressed_edge_container.cpp
index da916cee7..ee155d458 100644
--- a/src/extractor/compressed_edge_container.cpp
+++ b/src/extractor/compressed_edge_container.cpp
@@ -25,8 +25,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "compressed_edge_container.hpp"
-#include "../util/simple_logger.hpp"
+#include "extractor/compressed_edge_container.hpp"
+#include "util/simple_logger.hpp"
 
 #include <boost/assert.hpp>
 #include <boost/filesystem.hpp>
diff --git a/src/extractor/edge_based_graph_factory.cpp b/src/extractor/edge_based_graph_factory.cpp
index f0c083d2d..682773a94 100644
--- a/src/extractor/edge_based_graph_factory.cpp
+++ b/src/extractor/edge_based_graph_factory.cpp
@@ -25,17 +25,17 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "edge_based_graph_factory.hpp"
-#include "../algorithms/coordinate_calculation.hpp"
-#include "../data_structures/percent.hpp"
-#include "../util/compute_angle.hpp"
-#include "../util/integer_range.hpp"
-#include "../util/lua_util.hpp"
-#include "../util/simple_logger.hpp"
-#include "../util/timing_util.hpp"
-#include "../util/osrm_exception.hpp"
+#include "extractor/edge_based_graph_factory.hpp"
+#include "util/coordinate_calculation.hpp"
+#include "util/percent.hpp"
+#include "util/compute_angle.hpp"
+#include "util/integer_range.hpp"
+#include "util/lua_util.hpp"
+#include "util/simple_logger.hpp"
+#include "util/timing_util.hpp"
+#include "util/osrm_exception.hpp"
 
-#include "../util/debug_geometry.hpp"
+#include "util/debug_geometry.hpp"
 
 #include <boost/assert.hpp>
 
diff --git a/src/extractor/external_memory_node.cpp b/src/extractor/external_memory_node.cpp
index d144f52a9..ebafbd2b7 100644
--- a/src/extractor/external_memory_node.cpp
+++ b/src/extractor/external_memory_node.cpp
@@ -25,8 +25,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "external_memory_node.hpp"
-#include "query_node.hpp"
+#include "extractor/external_memory_node.hpp"
+#include "extractor/query_node.hpp"
 
 #include <limits>
 
diff --git a/src/extractor/extraction_containers.cpp b/src/extractor/extraction_containers.cpp
index 48a626b1c..9592b9eba 100644
--- a/src/extractor/extraction_containers.cpp
+++ b/src/extractor/extraction_containers.cpp
@@ -25,18 +25,18 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "extraction_containers.hpp"
-#include "extraction_way.hpp"
+#include "extractor/extraction_containers.hpp"
+#include "extractor/extraction_way.hpp"
 
-#include "../algorithms/coordinate_calculation.hpp"
-#include "../data_structures/node_id.hpp"
-#include "../data_structures/range_table.hpp"
+#include "util/coordinate_calculation.hpp"
+#include "extractor/node_id.hpp"
+#include "util/range_table.hpp"
 
-#include "../util/osrm_exception.hpp"
-#include "../util/simple_logger.hpp"
-#include "../util/timing_util.hpp"
-#include "../util/fingerprint.hpp"
-#include "../util/lua_util.hpp"
+#include "util/osrm_exception.hpp"
+#include "util/simple_logger.hpp"
+#include "util/timing_util.hpp"
+#include "util/fingerprint.hpp"
+#include "util/lua_util.hpp"
 
 #include <boost/assert.hpp>
 #include <boost/filesystem.hpp>
diff --git a/src/extractor/extractor.cpp b/src/extractor/extractor.cpp
index f442efe31..6a2a1609d 100644
--- a/src/extractor/extractor.cpp
+++ b/src/extractor/extractor.cpp
@@ -25,31 +25,31 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "extractor.hpp"
+#include "extractor/extractor.hpp"
 
-#include "extraction_containers.hpp"
-#include "extraction_node.hpp"
-#include "extraction_way.hpp"
-#include "extractor_callbacks.hpp"
-#include "restriction_parser.hpp"
-#include "scripting_environment.hpp"
+#include "extractor/extraction_containers.hpp"
+#include "extractor/extraction_node.hpp"
+#include "extractor/extraction_way.hpp"
+#include "extractor/extractor_callbacks.hpp"
+#include "extractor/restriction_parser.hpp"
+#include "extractor/scripting_environment.hpp"
 
-#include "../data_structures/raster_source.hpp"
-#include "../util/make_unique.hpp"
-#include "../util/simple_logger.hpp"
-#include "../util/timing_util.hpp"
-#include "../util/lua_util.hpp"
-#include "../util/graph_loader.hpp"
+#include "extractor/raster_source.hpp"
+#include "util/make_unique.hpp"
+#include "util/simple_logger.hpp"
+#include "util/timing_util.hpp"
+#include "util/lua_util.hpp"
+#include "util/graph_loader.hpp"
 
-#include "../typedefs.h"
+#include "util/typedefs.hpp"
 
-#include "../data_structures/static_graph.hpp"
-#include "../data_structures/static_rtree.hpp"
-#include "../data_structures/restriction_map.hpp"
-#include "../data_structures/compressed_edge_container.hpp"
+#include "util/static_graph.hpp"
+#include "util/static_rtree.hpp"
+#include "extractor/restriction_map.hpp"
+#include "extractor/compressed_edge_container.hpp"
 
-#include "../algorithms/tarjan_scc.hpp"
-#include "../algorithms/crc32_processor.hpp"
+#include "extractor/tarjan_scc.hpp"
+#include "contractor/crc32_processor.hpp"
 
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>
diff --git a/src/extractor/extractor_callbacks.cpp b/src/extractor/extractor_callbacks.cpp
index 2eb1a9b46..013b20966 100644
--- a/src/extractor/extractor_callbacks.cpp
+++ b/src/extractor/extractor_callbacks.cpp
@@ -25,21 +25,21 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "extractor_callbacks.hpp"
-#include "extraction_containers.hpp"
-#include "extraction_node.hpp"
-#include "extraction_way.hpp"
+#include "extractor/extractor_callbacks.hpp"
+#include "extractor/extraction_containers.hpp"
+#include "extractor/extraction_node.hpp"
+#include "extractor/extraction_way.hpp"
 
-#include "../data_structures/external_memory_node.hpp"
-#include "../data_structures/restriction.hpp"
-#include "../util/container.hpp"
-#include "../util/simple_logger.hpp"
+#include "extractor/external_memory_node.hpp"
+#include "extractor/restriction.hpp"
+#include "util/container.hpp"
+#include "util/simple_logger.hpp"
 
 #include <boost/optional/optional.hpp>
 
 #include <osmium/osm.hpp>
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 
 #include <limits>
 #include <string>
diff --git a/src/extractor/extractor_options.cpp b/src/extractor/extractor_options.cpp
index b607dca95..2e0bc32b4 100644
--- a/src/extractor/extractor_options.cpp
+++ b/src/extractor/extractor_options.cpp
@@ -25,11 +25,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "extractor_options.hpp"
+#include "extractor/extractor_options.hpp"
 
 #include "util/version.hpp"
-#include "../util/ini_file.hpp"
-#include "../util/simple_logger.hpp"
+#include "util/ini_file.hpp"
+#include "util/simple_logger.hpp"
 
 #include <boost/filesystem.hpp>
 #include <boost/program_options.hpp>
diff --git a/src/extractor/graph_compressor.cpp b/src/extractor/graph_compressor.cpp
index f3b5f8dd9..c9e1d5b76 100644
--- a/src/extractor/graph_compressor.cpp
+++ b/src/extractor/graph_compressor.cpp
@@ -1,12 +1,12 @@
-#include "graph_compressor.hpp"
+#include "extractor/graph_compressor.hpp"
 
-#include "../data_structures/compressed_edge_container.hpp"
-#include "../data_structures/dynamic_graph.hpp"
-#include "../data_structures/node_based_graph.hpp"
-#include "../data_structures/restriction_map.hpp"
-#include "../data_structures/percent.hpp"
+#include "extractor/compressed_edge_container.hpp"
+#include "util/dynamic_graph.hpp"
+#include "util/node_based_graph.hpp"
+#include "extractor/restriction_map.hpp"
+#include "util/percent.hpp"
 
-#include "../util/simple_logger.hpp"
+#include "util/simple_logger.hpp"
 
 GraphCompressor::GraphCompressor(SpeedProfileProperties speed_profile)
     : speed_profile(std::move(speed_profile))
diff --git a/src/extractor/import_edge.cpp b/src/extractor/import_edge.cpp
index bf2829d4e..36c409cbe 100644
--- a/src/extractor/import_edge.cpp
+++ b/src/extractor/import_edge.cpp
@@ -25,10 +25,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "import_edge.hpp"
+#include "extractor/import_edge.hpp"
 
-#include "travel_mode.hpp"
-#include "../typedefs.h"
+#include "extractor/travel_mode.hpp"
+#include "util/typedefs.hpp"
 
 bool NodeBasedEdge::operator<(const NodeBasedEdge &other) const
 {
diff --git a/src/extractor/raster_source.cpp b/src/extractor/raster_source.cpp
index 9e880a218..b5f9665a6 100644
--- a/src/extractor/raster_source.cpp
+++ b/src/extractor/raster_source.cpp
@@ -25,12 +25,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "raster_source.hpp"
+#include "extractor/raster_source.hpp"
 
-#include "../util/simple_logger.hpp"
-#include "../util/timing_util.hpp"
+#include "util/simple_logger.hpp"
+#include "util/timing_util.hpp"
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 
 #include <cmath>
 
diff --git a/src/extractor/restriction_map.cpp b/src/extractor/restriction_map.cpp
index eb685be80..b92fc707e 100644
--- a/src/extractor/restriction_map.cpp
+++ b/src/extractor/restriction_map.cpp
@@ -25,7 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "restriction_map.hpp"
+#include "extractor/restriction_map.hpp"
 
 RestrictionMap::RestrictionMap(const std::vector<TurnRestriction> &restriction_list) : m_count(0)
 {
diff --git a/src/extractor/restriction_parser.cpp b/src/extractor/restriction_parser.cpp
index 6a54cde20..e3c1e3f14 100644
--- a/src/extractor/restriction_parser.cpp
+++ b/src/extractor/restriction_parser.cpp
@@ -25,13 +25,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "restriction_parser.hpp"
-#include "extraction_way.hpp"
+#include "extractor/restriction_parser.hpp"
+#include "extractor/extraction_way.hpp"
 
-#include "../data_structures/external_memory_node.hpp"
-#include "../util/lua_util.hpp"
-#include "../util/osrm_exception.hpp"
-#include "../util/simple_logger.hpp"
+#include "extractor/external_memory_node.hpp"
+#include "util/lua_util.hpp"
+#include "util/osrm_exception.hpp"
+#include "util/simple_logger.hpp"
 
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/regex.hpp>
diff --git a/src/extractor/scripting_environment.cpp b/src/extractor/scripting_environment.cpp
index 9653ca049..df8cb92ce 100644
--- a/src/extractor/scripting_environment.cpp
+++ b/src/extractor/scripting_environment.cpp
@@ -25,18 +25,18 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "scripting_environment.hpp"
+#include "extractor/scripting_environment.hpp"
 
-#include "extraction_helper_functions.hpp"
-#include "extraction_node.hpp"
-#include "extraction_way.hpp"
-#include "internal_extractor_edge.hpp"
-#include "../data_structures/external_memory_node.hpp"
-#include "../data_structures/raster_source.hpp"
-#include "../util/lua_util.hpp"
-#include "../util/osrm_exception.hpp"
-#include "../util/simple_logger.hpp"
-#include "../typedefs.h"
+#include "extractor/extraction_helper_functions.hpp"
+#include "extractor/extraction_node.hpp"
+#include "extractor/extraction_way.hpp"
+#include "extractor/internal_extractor_edge.hpp"
+#include "extractor/external_memory_node.hpp"
+#include "extractor/raster_source.hpp"
+#include "util/lua_util.hpp"
+#include "util/osrm_exception.hpp"
+#include "util/simple_logger.hpp"
+#include "util/typedefs.hpp"
 
 #include <luabind/tag_function.hpp>
 #include <luabind/operator.hpp>
diff --git a/src/server/connection.cpp b/src/server/connection.cpp
index dbf85fd2a..ddfac1c74 100644
--- a/src/server/connection.cpp
+++ b/src/server/connection.cpp
@@ -25,9 +25,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "connection.hpp"
-#include "request_handler.hpp"
-#include "request_parser.hpp"
+#include "server/connection.hpp"
+#include "server/request_handler.hpp"
+#include "server/request_parser.hpp"
 
 #include <boost/assert.hpp>
 #include <boost/bind.hpp>
diff --git a/src/server/http/reply.cpp b/src/server/http/reply.cpp
index a3d3d9624..39957add8 100644
--- a/src/server/http/reply.cpp
+++ b/src/server/http/reply.cpp
@@ -25,7 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "reply.hpp"
+#include "server/http/reply.hpp"
 
 #include <string>
 
diff --git a/src/server/request_handler.cpp b/src/server/request_handler.cpp
index 54f039502..a506df671 100644
--- a/src/server/request_handler.cpp
+++ b/src/server/request_handler.cpp
@@ -25,21 +25,21 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "request_handler.hpp"
+#include "server/request_handler.hpp"
 
-#include "api_grammar.hpp"
-#include "http/reply.hpp"
-#include "http/request.hpp"
+#include "server/api_grammar.hpp"
+#include "server/http/reply.hpp"
+#include "server/http/request.hpp"
 
-#include "../util/json_renderer.hpp"
-#include "../util/simple_logger.hpp"
-#include "../util/string_util.hpp"
-#include "../util/xml_renderer.hpp"
-#include "../typedefs.h"
+#include "util/json_renderer.hpp"
+#include "util/simple_logger.hpp"
+#include "util/string_util.hpp"
+#include "util/xml_renderer.hpp"
+#include "util/typedefs.hpp"
 
-#include <osrm/route_parameters.hpp>
-#include <osrm/json_container.hpp>
-#include <osrm/osrm.hpp>
+#include "osrm/route_parameters.hpp"
+#include "osrm/json_container.hpp"
+#include "osrm/osrm.hpp"
 
 #include <ctime>
 
diff --git a/src/server/request_parser.cpp b/src/server/request_parser.cpp
index b52d730d9..83cebb1af 100644
--- a/src/server/request_parser.cpp
+++ b/src/server/request_parser.cpp
@@ -25,13 +25,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "request_parser.hpp"
+#include "server/request_parser.hpp"
 
-#include "http/compression_type.hpp"
-#include "http/header.hpp"
-#include "http/request.hpp"
+#include "server/http/compression_type.hpp"
+#include "server/http/header.hpp"
+#include "server/http/request.hpp"
 
-#include "../data_structures/tribool.hpp"
+#include "util/tribool.hpp"
 
 #include <boost/algorithm/string/predicate.hpp>
 
diff --git a/src/tools/check-hsgr.cpp b/src/tools/check-hsgr.cpp
index 2418a473f..0dc8310b3 100644
--- a/src/tools/check-hsgr.cpp
+++ b/src/tools/check-hsgr.cpp
@@ -24,13 +24,13 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
-#include "../data_structures/percent.hpp"
-#include "../data_structures/query_edge.hpp"
-#include "../data_structures/static_graph.hpp"
-#include "../util/integer_range.hpp"
-#include "../util/graph_loader.hpp"
-#include "../util/simple_logger.hpp"
-#include "../util/osrm_exception.hpp"
+#include "util/percent.hpp"
+#include "contractor/query_edge.hpp"
+#include "util/static_graph.hpp"
+#include "util/integer_range.hpp"
+#include "util/graph_loader.hpp"
+#include "util/simple_logger.hpp"
+#include "util/osrm_exception.hpp"
 
 #include <boost/assert.hpp>
 #include <boost/filesystem.hpp>
diff --git a/src/tools/components.cpp b/src/tools/components.cpp
index db0e52685..7634d9d8e 100644
--- a/src/tools/components.cpp
+++ b/src/tools/components.cpp
@@ -25,16 +25,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "../typedefs.h"
-#include "../algorithms/tarjan_scc.hpp"
-#include "../algorithms/coordinate_calculation.hpp"
-#include "../data_structures/dynamic_graph.hpp"
-#include "../data_structures/static_graph.hpp"
-#include "../util/fingerprint.hpp"
-#include "../util/graph_loader.hpp"
-#include "../util/make_unique.hpp"
-#include "../util/osrm_exception.hpp"
-#include "../util/simple_logger.hpp"
+#include "util/typedefs.hpp"
+#include "extractor/tarjan_scc.hpp"
+#include "util/coordinate_calculation.hpp"
+#include "util/dynamic_graph.hpp"
+#include "util/static_graph.hpp"
+#include "util/fingerprint.hpp"
+#include "util/graph_loader.hpp"
+#include "util/make_unique.hpp"
+#include "util/osrm_exception.hpp"
+#include "util/simple_logger.hpp"
 
 #include <boost/filesystem.hpp>
 
@@ -46,7 +46,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <gdal/ogrsf_frmts.h>
 #endif
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 
 #include <fstream>
 #include <memory>
diff --git a/src/tools/datastore.cpp b/src/tools/datastore.cpp
index 504dd3d44..42b600aa4 100644
--- a/src/tools/datastore.cpp
+++ b/src/tools/datastore.cpp
@@ -25,26 +25,26 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "data_structures/original_edge_data.hpp"
-#include "data_structures/range_table.hpp"
-#include "data_structures/query_edge.hpp"
-#include "data_structures/query_node.hpp"
-#include "data_structures/shared_memory_factory.hpp"
-#include "data_structures/shared_memory_vector_wrapper.hpp"
-#include "data_structures/static_graph.hpp"
-#include "data_structures/static_rtree.hpp"
-#include "data_structures/travel_mode.hpp"
-#include "data_structures/turn_instructions.hpp"
-#include "server/data_structures/datafacade_base.hpp"
-#include "server/data_structures/shared_datatype.hpp"
-#include "server/data_structures/shared_barriers.hpp"
+#include "extractor/original_edge_data.hpp"
+#include "util/range_table.hpp"
+#include "contractor/query_edge.hpp"
+#include "extractor/query_node.hpp"
+#include "datastore/shared_memory_factory.hpp"
+#include "util/shared_memory_vector_wrapper.hpp"
+#include "util/static_graph.hpp"
+#include "util/static_rtree.hpp"
+#include "extractor/travel_mode.hpp"
+#include "extractor/turn_instructions.hpp"
+#include "engine/datafacade/datafacade_base.hpp"
+#include "engine/datafacade/shared_datatype.hpp"
+#include "engine/datafacade/shared_barriers.hpp"
 #include "util/datastore_options.hpp"
 #include "util/simple_logger.hpp"
 #include "util/osrm_exception.hpp"
 #include "util/fingerprint.hpp"
-#include "typedefs.h"
+#include "util/typedefs.hpp"
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 
 using RTreeLeaf = BaseDataFacade<QueryEdge::EdgeData>::RTreeLeaf;
 using RTreeNode = StaticRTree<RTreeLeaf, ShM<FixedPointCoordinate, true>::vector, true>::TreeNode;
diff --git a/src/tools/io-benchmark.cpp b/src/tools/io-benchmark.cpp
index 41e41b2b1..2de94c61b 100644
--- a/src/tools/io-benchmark.cpp
+++ b/src/tools/io-benchmark.cpp
@@ -26,9 +26,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include "util/version.hpp"
-#include "../util/osrm_exception.hpp"
-#include "../util/simple_logger.hpp"
-#include "../util/timing_util.hpp"
+#include "util/osrm_exception.hpp"
+#include "util/simple_logger.hpp"
+#include "util/timing_util.hpp"
 
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>
diff --git a/src/tools/routed.cpp b/src/tools/routed.cpp
index b4404c12e..4d1325549 100644
--- a/src/tools/routed.cpp
+++ b/src/tools/routed.cpp
@@ -30,8 +30,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "util/routed_options.hpp"
 #include "util/simple_logger.hpp"
 
-#include <osrm/osrm.hpp>
-#include <osrm/libosrm_config.hpp>
+#include "osrm/osrm.hpp"
+#include "osrm/libosrm_config.hpp"
 
 #ifdef __linux__
 #include <sys/mman.h>
diff --git a/src/tools/simpleclient.cpp b/src/tools/simpleclient.cpp
index 17058a641..aa3aa262e 100644
--- a/src/tools/simpleclient.cpp
+++ b/src/tools/simpleclient.cpp
@@ -26,14 +26,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include "util/version.hpp"
-#include "../util/json_renderer.hpp"
-#include "../util/routed_options.hpp"
-#include "../util/simple_logger.hpp"
+#include "util/json_renderer.hpp"
+#include "util/routed_options.hpp"
+#include "util/simple_logger.hpp"
 
-#include <osrm/json_container.hpp>
-#include <osrm/libosrm_config.hpp>
-#include <osrm/route_parameters.hpp>
-#include <osrm/osrm.hpp>
+#include "osrm/json_container.hpp"
+#include "osrm/libosrm_config.hpp"
+#include "osrm/route_parameters.hpp"
+#include "osrm/osrm.hpp"
 
 #include <string>
 
diff --git a/src/tools/springclean.cpp b/src/tools/springclean.cpp
index 18e5711f9..296d96e5c 100644
--- a/src/tools/springclean.cpp
+++ b/src/tools/springclean.cpp
@@ -27,10 +27,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <cstdio>
 
-#include "../data_structures/shared_memory_factory.hpp"
-#include "../server/data_structures/shared_datatype.hpp"
+#include "datastore/shared_memory_factory.hpp"
+#include "engine/datafacade/shared_datatype.hpp"
 #include "util/version.hpp"
-#include "../util/simple_logger.hpp"
+#include "util/simple_logger.hpp"
 
 void delete_region(const SharedDataType region)
 {
diff --git a/src/tools/unlock_all_mutexes.cpp b/src/tools/unlock_all_mutexes.cpp
index 953254ba8..3b4c9b072 100644
--- a/src/tools/unlock_all_mutexes.cpp
+++ b/src/tools/unlock_all_mutexes.cpp
@@ -26,8 +26,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include "util/version.hpp"
-#include "../util/simple_logger.hpp"
-#include "../server/data_structures/shared_barriers.hpp"
+#include "util/simple_logger.hpp"
+#include "engine/datafacade/shared_barriers.hpp"
 
 #include <iostream>
 
diff --git a/src/util/compute_angle.cpp b/src/util/compute_angle.cpp
index 8cd8aa441..b821d7958 100644
--- a/src/util/compute_angle.cpp
+++ b/src/util/compute_angle.cpp
@@ -25,12 +25,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "compute_angle.hpp"
+#include "util/compute_angle.hpp"
 
-#include "trigonometry_table.hpp"
-#include "../util/mercator.hpp"
+#include "util/trigonometry_table.hpp"
+#include "util/mercator.hpp"
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 
 #include <cmath>
 
diff --git a/src/util/coordinate.cpp b/src/util/coordinate.cpp
index 208f3eb07..63f81aadb 100644
--- a/src/util/coordinate.cpp
+++ b/src/util/coordinate.cpp
@@ -25,12 +25,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "../algorithms/coordinate_calculation.hpp"
+#include "util/coordinate_calculation.hpp"
 
 #ifndef NDEBUG
-#include "../util/simple_logger.hpp"
+#include "util/simple_logger.hpp"
 #endif
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 
 #ifndef NDEBUG
 #include <bitset>
diff --git a/src/util/coordinate_calculation.cpp b/src/util/coordinate_calculation.cpp
index ff7626e90..54ebaf947 100644
--- a/src/util/coordinate_calculation.cpp
+++ b/src/util/coordinate_calculation.cpp
@@ -25,14 +25,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "coordinate_calculation.hpp"
+#include "util/coordinate_calculation.hpp"
 
-#include "../util/mercator.hpp"
-#include "../util/string_util.hpp"
+#include "util/mercator.hpp"
+#include "util/string_util.hpp"
 
 #include <boost/assert.hpp>
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 
 #include <cmath>
 
diff --git a/src/util/hilbert_value.cpp b/src/util/hilbert_value.cpp
index d0d61e60a..d65354030 100644
--- a/src/util/hilbert_value.cpp
+++ b/src/util/hilbert_value.cpp
@@ -25,9 +25,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "hilbert_value.hpp"
+#include "util/hilbert_value.hpp"
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 
 uint64_t HilbertCode::operator()(const FixedPointCoordinate &current_coordinate) const
 {
diff --git a/src/util/mercator.cpp b/src/util/mercator.cpp
index 0ccd99981..239441aa6 100644
--- a/src/util/mercator.cpp
+++ b/src/util/mercator.cpp
@@ -25,7 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "mercator.hpp"
+#include "util/mercator.hpp"
 
 #include <cmath>
 
diff --git a/src/util/osrm_exception.cpp b/src/util/osrm_exception.cpp
index 9738b8e36..9715cac72 100644
--- a/src/util/osrm_exception.cpp
+++ b/src/util/osrm_exception.cpp
@@ -25,7 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "osrm_exception.hpp"
+#include "util/osrm_exception.hpp"
 
 namespace osrm
 {
diff --git a/src/util/simple_logger.cpp b/src/util/simple_logger.cpp
index e3f4f8ed0..362dce638 100644
--- a/src/util/simple_logger.cpp
+++ b/src/util/simple_logger.cpp
@@ -25,7 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "simple_logger.hpp"
+#include "util/simple_logger.hpp"
 #ifdef _MSC_VER
 #include <io.h>
 #define isatty _isatty
diff --git a/unit_tests/engine/douglas_peucker.cpp b/unit_tests/engine/douglas_peucker.cpp
index 8a3920976..519e90da4 100644
--- a/unit_tests/engine/douglas_peucker.cpp
+++ b/unit_tests/engine/douglas_peucker.cpp
@@ -25,8 +25,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "../../algorithms/douglas_peucker.hpp"
-#include "../../data_structures/segment_information.hpp"
+#include "engine/douglas_peucker.hpp"
+#include "engine/segment_information.hpp"
 
 #include <boost/test/unit_test.hpp>
 #include <boost/test/test_case_template.hpp>
diff --git a/unit_tests/engine/geometry_string.cpp b/unit_tests/engine/geometry_string.cpp
index ab9f35755..7b2dd3ccb 100644
--- a/unit_tests/engine/geometry_string.cpp
+++ b/unit_tests/engine/geometry_string.cpp
@@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <boost/test/floating_point_comparison.hpp>
 #include <boost/test/unit_test.hpp>
 
-#include "../../algorithms/polyline_compressor.hpp"
-#include "../../algorithms/coordinate_calculation.hpp"
+#include "engine/polyline_compressor.hpp"
+#include "util/coordinate_calculation.hpp"
 
 #include <osrm/coordinate.hpp>
 
diff --git a/unit_tests/extractor/compressed_edge_container.cpp b/unit_tests/extractor/compressed_edge_container.cpp
index 12d9d3f4b..4a83f0402 100644
--- a/unit_tests/extractor/compressed_edge_container.cpp
+++ b/unit_tests/extractor/compressed_edge_container.cpp
@@ -1,5 +1,5 @@
-#include "../../data_structures/compressed_edge_container.hpp"
-#include "../../typedefs.h"
+#include "extractor/compressed_edge_container.hpp"
+#include "util/typedefs.hpp"
 
 #include <boost/test/unit_test.hpp>
 #include <boost/test/test_case_template.hpp>
diff --git a/unit_tests/extractor/graph_compressor.cpp b/unit_tests/extractor/graph_compressor.cpp
index a3407c04d..07e3b7ef7 100644
--- a/unit_tests/extractor/graph_compressor.cpp
+++ b/unit_tests/extractor/graph_compressor.cpp
@@ -1,9 +1,9 @@
-#include "../../algorithms/graph_compressor.hpp"
-#include "../../data_structures/compressed_edge_container.hpp"
-#include "../../data_structures/restriction_map.hpp"
-#include "../../data_structures/node_based_graph.hpp"
-#include "../../extractor/speed_profile.hpp"
-#include "../../typedefs.h"
+#include "extractor/graph_compressor.hpp"
+#include "extractor/compressed_edge_container.hpp"
+#include "extractor/restriction_map.hpp"
+#include "util/node_based_graph.hpp"
+#include "extractor/speed_profile.hpp"
+#include "util/typedefs.hpp"
 
 #include <boost/test/unit_test.hpp>
 #include <boost/test/test_case_template.hpp>
diff --git a/unit_tests/extractor/raster_source.cpp b/unit_tests/extractor/raster_source.cpp
index 691cba108..0406676b9 100644
--- a/unit_tests/extractor/raster_source.cpp
+++ b/unit_tests/extractor/raster_source.cpp
@@ -25,9 +25,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "../../data_structures/raster_source.hpp"
-#include "../../typedefs.h"
-#include "../../util/osrm_exception.hpp"
+#include "extractor/raster_source.hpp"
+#include "util/typedefs.hpp"
+#include "util/osrm_exception.hpp"
 
 #include <osrm/coordinate.hpp>
 
diff --git a/unit_tests/util/bearing.cpp b/unit_tests/util/bearing.cpp
index f0866de33..93d3eb313 100644
--- a/unit_tests/util/bearing.cpp
+++ b/unit_tests/util/bearing.cpp
@@ -25,8 +25,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "../../util/bearing.hpp"
-#include "../../typedefs.h"
+#include "util/bearing.hpp"
+#include "util/typedefs.hpp"
 
 #include <boost/functional/hash.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/unit_tests/util/binary_heap.cpp b/unit_tests/util/binary_heap.cpp
index ee22a1fbb..6b7cf64ff 100644
--- a/unit_tests/util/binary_heap.cpp
+++ b/unit_tests/util/binary_heap.cpp
@@ -25,8 +25,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "../../data_structures/binary_heap.hpp"
-#include "../../typedefs.h"
+#include "util/binary_heap.hpp"
+#include "util/typedefs.hpp"
 
 #include <boost/test/unit_test.hpp>
 #include <boost/test/test_case_template.hpp>
diff --git a/unit_tests/util/coordinate.cpp b/unit_tests/util/coordinate.cpp
index e8209763e..f153175ab 100644
--- a/unit_tests/util/coordinate.cpp
+++ b/unit_tests/util/coordinate.cpp
@@ -27,7 +27,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <boost/test/unit_test.hpp>
 
-#include "../../algorithms/coordinate_calculation.hpp"
+#include "util/coordinate_calculation.hpp"
 
 #include <osrm/coordinate.hpp>
 
diff --git a/unit_tests/util/duration_parsing.cpp b/unit_tests/util/duration_parsing.cpp
index e3035dce7..d0599106a 100644
--- a/unit_tests/util/duration_parsing.cpp
+++ b/unit_tests/util/duration_parsing.cpp
@@ -25,7 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "../../extractor/extraction_helper_functions.hpp"
+#include "extractor/extraction_helper_functions.hpp"
 
 #include <boost/test/unit_test.hpp>
 #include <boost/test/test_case_template.hpp>
diff --git a/unit_tests/util/dynamic_graph.cpp b/unit_tests/util/dynamic_graph.cpp
index df8eb21b1..585d2e471 100644
--- a/unit_tests/util/dynamic_graph.cpp
+++ b/unit_tests/util/dynamic_graph.cpp
@@ -25,8 +25,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "../../data_structures/dynamic_graph.hpp"
-#include "../../typedefs.h"
+#include "util/dynamic_graph.hpp"
+#include "util/typedefs.hpp"
 
 #include <boost/test/unit_test.hpp>
 #include <boost/test/test_case_template.hpp>
diff --git a/unit_tests/util/range_table.cpp b/unit_tests/util/range_table.cpp
index 065840ba1..8d30a0876 100644
--- a/unit_tests/util/range_table.cpp
+++ b/unit_tests/util/range_table.cpp
@@ -25,8 +25,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "../../data_structures/range_table.hpp"
-#include "../../typedefs.h"
+#include "util/range_table.hpp"
+#include "util/typedefs.hpp"
 
 #include <boost/test/unit_test.hpp>
 #include <boost/test/test_case_template.hpp>
diff --git a/unit_tests/util/static_graph.cpp b/unit_tests/util/static_graph.cpp
index ddadd7fdb..21c034be2 100644
--- a/unit_tests/util/static_graph.cpp
+++ b/unit_tests/util/static_graph.cpp
@@ -25,8 +25,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "../../data_structures/static_graph.hpp"
-#include "../../typedefs.h"
+#include "util/static_graph.hpp"
+#include "util/typedefs.hpp"
 
 #include <boost/test/unit_test.hpp>
 #include <boost/test/test_case_template.hpp>
diff --git a/unit_tests/util/static_rtree.cpp b/unit_tests/util/static_rtree.cpp
index 2539d5ffb..33c9eed74 100644
--- a/unit_tests/util/static_rtree.cpp
+++ b/unit_tests/util/static_rtree.cpp
@@ -25,13 +25,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "../../algorithms/coordinate_calculation.hpp"
-#include "../../algorithms/geospatial_query.hpp"
-#include "../../data_structures/static_rtree.hpp"
-#include "../../data_structures/query_node.hpp"
-#include "../../data_structures/edge_based_node.hpp"
-#include "../../util/floating_point.hpp"
-#include "../../typedefs.h"
+#include "util/coordinate_calculation.hpp"
+#include "engine/geospatial_query.hpp"
+#include "util/static_rtree.hpp"
+#include "extractor/query_node.hpp"
+#include "extractor/edge_based_node.hpp"
+#include "util/floating_point.hpp"
+#include "util/typedefs.hpp"
 
 #include <boost/functional/hash.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/unit_tests/util/string_util.cpp b/unit_tests/util/string_util.cpp
index cf82eba5b..9ec734aeb 100644
--- a/unit_tests/util/string_util.cpp
+++ b/unit_tests/util/string_util.cpp
@@ -25,7 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "../../util/string_util.hpp"
+#include "util/string_util.hpp"
 
 #include <boost/test/unit_test.hpp>
 #include <boost/test/test_case_template.hpp>