diff --git a/CMakeLists.txt b/CMakeLists.txt
index 008a947c0..f6863b3da 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -126,6 +126,7 @@ configure_file(
 )
 file(GLOB UtilGlob src/util/*.cpp src/util/*/*.cpp)
 file(GLOB ExtractorGlob src/extractor/*.cpp src/extractor/*/*.cpp)
+file(GLOB GuidanceGlob src/guidance/*.cpp)
 file(GLOB PartitionerGlob src/partitioner/*.cpp)
 file(GLOB CustomizerGlob src/customize/*.cpp)
 file(GLOB ContractorGlob src/contractor/*.cpp)
@@ -137,6 +138,7 @@ file(GLOB ErrorcodesGlob src/osrm/errorcodes.cpp)
 
 add_library(UTIL OBJECT ${UtilGlob})
 add_library(EXTRACTOR OBJECT ${ExtractorGlob})
+add_library(GUIDANCE OBJECT ${GuidanceGlob})
 add_library(PARTITIONER OBJECT ${PartitionerGlob})
 add_library(CUSTOMIZER OBJECT ${CustomizerGlob})
 add_library(CONTRACTOR OBJECT ${ContractorGlob})
@@ -155,7 +157,7 @@ add_executable(osrm-routed src/tools/routed.cpp $<TARGET_OBJECTS:SERVER> $<TARGE
 add_executable(osrm-datastore src/tools/store.cpp $<TARGET_OBJECTS:UTIL>)
 add_library(osrm src/osrm/osrm.cpp $<TARGET_OBJECTS:ENGINE> $<TARGET_OBJECTS:UTIL> $<TARGET_OBJECTS:STORAGE>)
 add_library(osrm_contract src/osrm/contractor.cpp $<TARGET_OBJECTS:CONTRACTOR> $<TARGET_OBJECTS:UTIL>)
-add_library(osrm_extract src/osrm/extractor.cpp $<TARGET_OBJECTS:EXTRACTOR> $<TARGET_OBJECTS:UTIL>)
+add_library(osrm_extract src/osrm/extractor.cpp $<TARGET_OBJECTS:GUIDANCE> $<TARGET_OBJECTS:EXTRACTOR> $<TARGET_OBJECTS:UTIL>)
 add_library(osrm_partition src/osrm/partitioner.cpp $<TARGET_OBJECTS:PARTITIONER> $<TARGET_OBJECTS:UTIL>)
 add_library(osrm_customize src/osrm/customizer.cpp $<TARGET_OBJECTS:CUSTOMIZER> $<TARGET_OBJECTS:UTIL>)
 add_library(osrm_update $<TARGET_OBJECTS:UPDATER> $<TARGET_OBJECTS:UTIL>)
diff --git a/include/engine/api/json_factory.hpp b/include/engine/api/json_factory.hpp
index 6317b3694..627a59ead 100644
--- a/include/engine/api/json_factory.hpp
+++ b/include/engine/api/json_factory.hpp
@@ -1,8 +1,8 @@
 #ifndef ENGINE_RESPONSE_OBJECTS_HPP_
 #define ENGINE_RESPONSE_OBJECTS_HPP_
 
-#include "extractor/guidance/turn_instruction.hpp"
 #include "extractor/travel_mode.hpp"
+#include "guidance/turn_instruction.hpp"
 #include "engine/guidance/leg_geometry.hpp"
 #include "engine/guidance/route.hpp"
 #include "engine/guidance/route_leg.hpp"
diff --git a/include/engine/datafacade/contiguous_internalmem_datafacade.hpp b/include/engine/datafacade/contiguous_internalmem_datafacade.hpp
index 0090aabe3..0f42fec6a 100644
--- a/include/engine/datafacade/contiguous_internalmem_datafacade.hpp
+++ b/include/engine/datafacade/contiguous_internalmem_datafacade.hpp
@@ -13,14 +13,14 @@
 
 #include "extractor/datasources.hpp"
 #include "extractor/edge_based_node.hpp"
-#include "extractor/guidance/turn_instruction.hpp"
-#include "extractor/guidance/turn_lane_types.hpp"
 #include "extractor/intersection_bearings_container.hpp"
 #include "extractor/node_data_container.hpp"
 #include "extractor/packed_osm_ids.hpp"
 #include "extractor/profile_properties.hpp"
 #include "extractor/segment_data_container.hpp"
 #include "extractor/turn_data_container.hpp"
+#include "guidance/turn_instruction.hpp"
+#include "guidance/turn_lane_types.hpp"
 
 #include "contractor/query_graph.hpp"
 
diff --git a/include/engine/datafacade/datafacade_base.hpp b/include/engine/datafacade/datafacade_base.hpp
index 029b1dd60..45e82dd11 100644
--- a/include/engine/datafacade/datafacade_base.hpp
+++ b/include/engine/datafacade/datafacade_base.hpp
@@ -10,11 +10,11 @@
 
 #include "extractor/class_data.hpp"
 #include "extractor/edge_based_node_segment.hpp"
-#include "extractor/guidance/turn_instruction.hpp"
-#include "extractor/guidance/turn_lane_types.hpp"
 #include "extractor/original_edge_data.hpp"
 #include "extractor/query_node.hpp"
 #include "extractor/travel_mode.hpp"
+#include "guidance/turn_instruction.hpp"
+#include "guidance/turn_lane_types.hpp"
 
 #include "util/exception.hpp"
 #include "util/guidance/bearing_class.hpp"
diff --git a/include/engine/guidance/assemble_geometry.hpp b/include/engine/guidance/assemble_geometry.hpp
index 637e108c9..affc5f503 100644
--- a/include/engine/guidance/assemble_geometry.hpp
+++ b/include/engine/guidance/assemble_geometry.hpp
@@ -1,8 +1,8 @@
 #ifndef ENGINE_GUIDANCE_ASSEMBLE_GEOMETRY_HPP
 #define ENGINE_GUIDANCE_ASSEMBLE_GEOMETRY_HPP
 
-#include "extractor/guidance/turn_instruction.hpp"
 #include "extractor/travel_mode.hpp"
+#include "guidance/turn_instruction.hpp"
 #include "engine/datafacade/datafacade_base.hpp"
 #include "engine/guidance/leg_geometry.hpp"
 #include "engine/guidance/route_step.hpp"
diff --git a/include/engine/guidance/assemble_steps.hpp b/include/engine/guidance/assemble_steps.hpp
index f07d5f0df..a26ed55d3 100644
--- a/include/engine/guidance/assemble_steps.hpp
+++ b/include/engine/guidance/assemble_steps.hpp
@@ -1,9 +1,9 @@
 #ifndef ENGINE_GUIDANCE_ASSEMBLE_STEPS_HPP_
 #define ENGINE_GUIDANCE_ASSEMBLE_STEPS_HPP_
 
-#include "extractor/guidance/turn_instruction.hpp"
-#include "extractor/guidance/turn_lane_types.hpp"
 #include "extractor/travel_mode.hpp"
+#include "guidance/turn_instruction.hpp"
+#include "guidance/turn_lane_types.hpp"
 #include "engine/datafacade/datafacade_base.hpp"
 #include "engine/guidance/leg_geometry.hpp"
 #include "engine/guidance/route_step.hpp"
diff --git a/include/engine/guidance/collapsing_utility.hpp b/include/engine/guidance/collapsing_utility.hpp
index 84535d0ac..b6593a8dc 100644
--- a/include/engine/guidance/collapsing_utility.hpp
+++ b/include/engine/guidance/collapsing_utility.hpp
@@ -1,7 +1,7 @@
 #ifndef OSRM_ENGINE_GUIDANCE_COLLAPSING_UTILITY_HPP_
 #define OSRM_ENGINE_GUIDANCE_COLLAPSING_UTILITY_HPP_
 
-#include "extractor/guidance/turn_instruction.hpp"
+#include "guidance/turn_instruction.hpp"
 #include "engine/guidance/route_step.hpp"
 #include "util/attributes.hpp"
 #include "util/bearing.hpp"
diff --git a/include/engine/guidance/postprocessing_toolkit.hpp b/include/engine/guidance/postprocessing_toolkit.hpp
index 1d16568d4..24f485fc1 100644
--- a/include/engine/guidance/postprocessing_toolkit.hpp
+++ b/include/engine/guidance/postprocessing_toolkit.hpp
@@ -1,7 +1,7 @@
 #ifndef OSRM_ENGINE_GUIDANCE_POSTPROCESSING_TOOLKIT_HPP_
 #define OSRM_ENGINE_GUIDANCE_POSTPROCESSING_TOOLKIT_HPP_
 
-#include "extractor/guidance/turn_instruction.hpp"
+#include "guidance/turn_instruction.hpp"
 #include "engine/guidance/route_step.hpp"
 
 #include <iterator>
diff --git a/include/engine/guidance/route_step.hpp b/include/engine/guidance/route_step.hpp
index 635444a2b..0c56b4992 100644
--- a/include/engine/guidance/route_step.hpp
+++ b/include/engine/guidance/route_step.hpp
@@ -7,7 +7,7 @@
 #include "util/guidance/bearing_class.hpp"
 #include "util/guidance/entry_class.hpp"
 
-#include "extractor/guidance/turn_lane_types.hpp"
+#include "guidance/turn_lane_types.hpp"
 #include "util/guidance/turn_lanes.hpp"
 
 #include <cstddef>
diff --git a/include/engine/guidance/step_maneuver.hpp b/include/engine/guidance/step_maneuver.hpp
index 982a60b9e..963c28536 100644
--- a/include/engine/guidance/step_maneuver.hpp
+++ b/include/engine/guidance/step_maneuver.hpp
@@ -1,7 +1,7 @@
 #ifndef ENGINE_GUIDANCE_STEP_MANEUVER_HPP
 #define ENGINE_GUIDANCE_STEP_MANEUVER_HPP
 
-#include "extractor/guidance/turn_instruction.hpp"
+#include "guidance/turn_instruction.hpp"
 #include "util/coordinate.hpp"
 
 #include <cstdint>
diff --git a/include/engine/internal_route_result.hpp b/include/engine/internal_route_result.hpp
index 87c673bc3..7bf2412f4 100644
--- a/include/engine/internal_route_result.hpp
+++ b/include/engine/internal_route_result.hpp
@@ -2,8 +2,8 @@
 #define RAW_ROUTE_DATA_H
 
 #include "extractor/class_data.hpp"
-#include "extractor/guidance/turn_instruction.hpp"
 #include "extractor/travel_mode.hpp"
+#include "guidance/turn_instruction.hpp"
 
 #include "engine/phantom_node.hpp"
 
diff --git a/include/engine/routing_algorithms/routing_base.hpp b/include/engine/routing_algorithms/routing_base.hpp
index 3f50e7387..8ca0ba390 100644
--- a/include/engine/routing_algorithms/routing_base.hpp
+++ b/include/engine/routing_algorithms/routing_base.hpp
@@ -1,7 +1,7 @@
 #ifndef OSRM_ENGINE_ROUTING_BASE_HPP
 #define OSRM_ENGINE_ROUTING_BASE_HPP
 
-#include "extractor/guidance/turn_instruction.hpp"
+#include "guidance/turn_instruction.hpp"
 
 #include "engine/algorithm.hpp"
 #include "engine/datafacade.hpp"
diff --git a/include/extractor/edge_based_graph_factory.hpp b/include/extractor/edge_based_graph_factory.hpp
index 37c0e39c4..0bbd645db 100644
--- a/include/extractor/edge_based_graph_factory.hpp
+++ b/include/extractor/edge_based_graph_factory.hpp
@@ -8,15 +8,15 @@
 #include "extractor/edge_based_edge.hpp"
 #include "extractor/edge_based_node_segment.hpp"
 #include "extractor/extraction_turn.hpp"
-#include "extractor/guidance/turn_analysis.hpp"
-#include "extractor/guidance/turn_instruction.hpp"
-#include "extractor/guidance/turn_lane_types.hpp"
 #include "extractor/nbg_to_ebg.hpp"
 #include "extractor/node_data_container.hpp"
 #include "extractor/original_edge_data.hpp"
 #include "extractor/query_node.hpp"
 #include "extractor/restriction_index.hpp"
 #include "extractor/way_restriction_map.hpp"
+#include "guidance/turn_analysis.hpp"
+#include "guidance/turn_instruction.hpp"
+#include "guidance/turn_lane_types.hpp"
 
 #include "util/concurrent_id_map.hpp"
 #include "util/deallocating_vector.hpp"
diff --git a/include/extractor/extraction_helper_functions.hpp b/include/extractor/extraction_helper_functions.hpp
index b03a3c032..63e550e89 100644
--- a/include/extractor/extraction_helper_functions.hpp
+++ b/include/extractor/extraction_helper_functions.hpp
@@ -12,7 +12,7 @@
 #include <limits>
 #include <string>
 
-#include "extractor/guidance/parsing_toolkit.hpp"
+#include "guidance/parsing_toolkit.hpp"
 
 namespace osrm
 {
diff --git a/include/extractor/extraction_turn.hpp b/include/extractor/extraction_turn.hpp
index 24624f489..59cf8181e 100644
--- a/include/extractor/extraction_turn.hpp
+++ b/include/extractor/extraction_turn.hpp
@@ -3,7 +3,7 @@
 
 #include <boost/numeric/conversion/cast.hpp>
 
-#include <extractor/guidance/intersection.hpp>
+#include <guidance/intersection.hpp>
 
 #include <cstdint>
 
diff --git a/include/extractor/extraction_way.hpp b/include/extractor/extraction_way.hpp
index 29e07d0d3..e8ca04a63 100644
--- a/include/extractor/extraction_way.hpp
+++ b/include/extractor/extraction_way.hpp
@@ -1,8 +1,8 @@
 #ifndef EXTRACTION_WAY_HPP
 #define EXTRACTION_WAY_HPP
 
-#include "extractor/guidance/road_classification.hpp"
 #include "extractor/travel_mode.hpp"
+#include "guidance/road_classification.hpp"
 #include "util/guidance/turn_lanes.hpp"
 #include "util/typedefs.hpp"
 
diff --git a/include/extractor/extractor_callbacks.hpp b/include/extractor/extractor_callbacks.hpp
index fb4f599b1..5fd32692c 100644
--- a/include/extractor/extractor_callbacks.hpp
+++ b/include/extractor/extractor_callbacks.hpp
@@ -2,7 +2,7 @@
 #define EXTRACTOR_CALLBACKS_HPP
 
 #include "extractor/class_data.hpp"
-#include "extractor/guidance/turn_lane_types.hpp"
+#include "guidance/turn_lane_types.hpp"
 #include "util/typedefs.hpp"
 
 #include <boost/functional/hash.hpp>
diff --git a/include/extractor/files.hpp b/include/extractor/files.hpp
index f6d6e5f12..27ee54843 100644
--- a/include/extractor/files.hpp
+++ b/include/extractor/files.hpp
@@ -2,11 +2,11 @@
 #define OSRM_EXTRACTOR_FILES_HPP
 
 #include "extractor/edge_based_edge.hpp"
-#include "extractor/guidance/turn_lane_types.hpp"
 #include "extractor/node_data_container.hpp"
 #include "extractor/profile_properties.hpp"
 #include "extractor/serialization.hpp"
 #include "extractor/turn_data_container.hpp"
+#include "guidance/turn_lane_types.hpp"
 
 #include "util/coordinate.hpp"
 #include "util/guidance/bearing_class.hpp"
diff --git a/include/extractor/geojson_debug_policies.hpp b/include/extractor/geojson_debug_policies.hpp
index 693214e0d..a0ccaf4a0 100644
--- a/include/extractor/geojson_debug_policies.hpp
+++ b/include/extractor/geojson_debug_policies.hpp
@@ -10,8 +10,8 @@
 #include "util/node_based_graph.hpp"
 #include "util/typedefs.hpp"
 
-#include "extractor/guidance/coordinate_extractor.hpp"
-#include "extractor/guidance/intersection.hpp"
+#include "guidance/coordinate_extractor.hpp"
+#include "guidance/intersection.hpp"
 #include "util/coordinate.hpp"
 #include "util/geojson_debug_policy_toolkit.hpp"
 
diff --git a/include/extractor/internal_extractor_edge.hpp b/include/extractor/internal_extractor_edge.hpp
index 67a38dd23..a8144f759 100644
--- a/include/extractor/internal_extractor_edge.hpp
+++ b/include/extractor/internal_extractor_edge.hpp
@@ -1,10 +1,10 @@
 #ifndef INTERNAL_EXTRACTOR_EDGE_HPP
 #define INTERNAL_EXTRACTOR_EDGE_HPP
 
-#include "extractor/guidance/road_classification.hpp"
-#include "extractor/guidance/turn_lane_types.hpp"
 #include "extractor/node_based_edge.hpp"
 #include "extractor/travel_mode.hpp"
+#include "guidance/road_classification.hpp"
+#include "guidance/turn_lane_types.hpp"
 #include "osrm/coordinate.hpp"
 #include "util/typedefs.hpp"
 
diff --git a/include/extractor/intersection/intersection_analysis.hpp b/include/extractor/intersection/intersection_analysis.hpp
index 09121f2b4..b387b542d 100644
--- a/include/extractor/intersection/intersection_analysis.hpp
+++ b/include/extractor/intersection/intersection_analysis.hpp
@@ -2,10 +2,10 @@
 #define OSRM_EXTRACTOR_INTERSECTION_INTERSECTION_ANALYSIS_HPP
 
 #include "extractor/compressed_edge_container.hpp"
-#include "extractor/guidance/mergable_road_detector.hpp"
-#include "extractor/guidance/turn_lane_types.hpp"
 #include "extractor/intersection/intersection_edge.hpp"
 #include "extractor/restriction_index.hpp"
+#include "guidance/mergable_road_detector.hpp"
+#include "guidance/turn_lane_types.hpp"
 
 #include "util/coordinate.hpp"
 #include "util/node_based_graph.hpp"
diff --git a/include/extractor/node_based_edge.hpp b/include/extractor/node_based_edge.hpp
index 5f2d6d94a..335ecae7b 100644
--- a/include/extractor/node_based_edge.hpp
+++ b/include/extractor/node_based_edge.hpp
@@ -8,7 +8,7 @@
 #include "extractor/travel_mode.hpp"
 #include "util/typedefs.hpp"
 
-#include "extractor/guidance/road_classification.hpp"
+#include "guidance/road_classification.hpp"
 
 namespace osrm
 {
diff --git a/include/extractor/original_edge_data.hpp b/include/extractor/original_edge_data.hpp
index 02a353d8e..33c5d8db4 100644
--- a/include/extractor/original_edge_data.hpp
+++ b/include/extractor/original_edge_data.hpp
@@ -1,8 +1,8 @@
 #ifndef ORIGINAL_EDGE_DATA_HPP
 #define ORIGINAL_EDGE_DATA_HPP
 
-#include "extractor/guidance/turn_instruction.hpp"
 #include "extractor/travel_mode.hpp"
+#include "guidance/turn_instruction.hpp"
 #include "util/guidance/turn_bearing.hpp"
 #include "util/typedefs.hpp"
 
diff --git a/include/extractor/scripting_environment.hpp b/include/extractor/scripting_environment.hpp
index e5ceb0786..00cdaa8af 100644
--- a/include/extractor/scripting_environment.hpp
+++ b/include/extractor/scripting_environment.hpp
@@ -1,10 +1,10 @@
 #ifndef SCRIPTING_ENVIRONMENT_HPP
 #define SCRIPTING_ENVIRONMENT_HPP
 
-#include "extractor/guidance/turn_lane_types.hpp"
 #include "extractor/internal_extractor_edge.hpp"
 #include "extractor/profile_properties.hpp"
 #include "extractor/restriction.hpp"
+#include "guidance/turn_lane_types.hpp"
 
 #include <osmium/memory/buffer.hpp>
 
diff --git a/include/extractor/turn_data_container.hpp b/include/extractor/turn_data_container.hpp
index cca5ea28e..1545097e6 100644
--- a/include/extractor/turn_data_container.hpp
+++ b/include/extractor/turn_data_container.hpp
@@ -1,8 +1,8 @@
 #ifndef OSRM_EXTRACTOR_TURN_DATA_CONTAINER_HPP
 #define OSRM_EXTRACTOR_TURN_DATA_CONTAINER_HPP
 
-#include "extractor/guidance/turn_instruction.hpp"
 #include "extractor/travel_mode.hpp"
+#include "guidance/turn_instruction.hpp"
 
 #include "storage/io_fwd.hpp"
 #include "storage/shared_memory_ownership.hpp"
diff --git a/include/extractor/guidance/constants.hpp b/include/guidance/constants.hpp
similarity index 100%
rename from include/extractor/guidance/constants.hpp
rename to include/guidance/constants.hpp
diff --git a/include/extractor/guidance/coordinate_extractor.hpp b/include/guidance/coordinate_extractor.hpp
similarity index 100%
rename from include/extractor/guidance/coordinate_extractor.hpp
rename to include/guidance/coordinate_extractor.hpp
diff --git a/include/extractor/guidance/driveway_handler.hpp b/include/guidance/driveway_handler.hpp
similarity index 96%
rename from include/extractor/guidance/driveway_handler.hpp
rename to include/guidance/driveway_handler.hpp
index be43e7bc8..84e22c4d6 100644
--- a/include/extractor/guidance/driveway_handler.hpp
+++ b/include/guidance/driveway_handler.hpp
@@ -1,7 +1,7 @@
 #ifndef OSRM_EXTRACTOR_GUIDANCE_DRIVEWAY_HANDLER_HPP
 #define OSRM_EXTRACTOR_GUIDANCE_DRIVEWAY_HANDLER_HPP
 
-#include "extractor/guidance/intersection_handler.hpp"
+#include "guidance/intersection_handler.hpp"
 
 namespace osrm
 {
diff --git a/include/extractor/guidance/have_identical_names.hpp b/include/guidance/have_identical_names.hpp
similarity index 94%
rename from include/extractor/guidance/have_identical_names.hpp
rename to include/guidance/have_identical_names.hpp
index ec8f619dd..9d69a5521 100644
--- a/include/extractor/guidance/have_identical_names.hpp
+++ b/include/guidance/have_identical_names.hpp
@@ -1,7 +1,7 @@
 #ifndef OSRM_EXTRACTOR_GUIDANCE_HAVE_IDENTICAL_NAMES_HPP_
 #define OSRM_EXTRACTOR_GUIDANCE_HAVE_IDENTICAL_NAMES_HPP_
 
-#include "extractor/guidance/constants.hpp"
+#include "guidance/constants.hpp"
 #include "extractor/suffix_table.hpp"
 #include "util/name_table.hpp"
 
diff --git a/include/extractor/guidance/intersection.hpp b/include/guidance/intersection.hpp
similarity index 99%
rename from include/extractor/guidance/intersection.hpp
rename to include/guidance/intersection.hpp
index d4e5967e7..087a6c277 100644
--- a/include/extractor/guidance/intersection.hpp
+++ b/include/guidance/intersection.hpp
@@ -13,7 +13,7 @@
 #include "util/node_based_graph.hpp"
 #include "util/typedefs.hpp" // EdgeID
 
-#include "extractor/guidance/turn_instruction.hpp"
+#include "guidance/turn_instruction.hpp"
 
 #include <boost/range/algorithm/count_if.hpp>
 #include <boost/range/algorithm/find_if.hpp>
diff --git a/include/extractor/guidance/intersection_handler.hpp b/include/guidance/intersection_handler.hpp
similarity index 99%
rename from include/extractor/guidance/intersection_handler.hpp
rename to include/guidance/intersection_handler.hpp
index 10df4ed69..ab206c4e6 100644
--- a/include/extractor/guidance/intersection_handler.hpp
+++ b/include/guidance/intersection_handler.hpp
@@ -1,11 +1,11 @@
 #ifndef OSRM_EXTRACTOR_GUIDANCE_INTERSECTION_HANDLER_HPP_
 #define OSRM_EXTRACTOR_GUIDANCE_INTERSECTION_HANDLER_HPP_
 
-#include "extractor/guidance/intersection.hpp"
-#include "extractor/guidance/node_based_graph_walker.hpp"
 #include "extractor/intersection/intersection_analysis.hpp"
 #include "extractor/query_node.hpp"
 #include "extractor/suffix_table.hpp"
+#include "guidance/intersection.hpp"
+#include "guidance/node_based_graph_walker.hpp"
 
 #include "util/coordinate_calculation.hpp"
 #include "util/guidance/name_announcements.hpp"
diff --git a/include/extractor/guidance/is_through_street.hpp b/include/guidance/is_through_street.hpp
similarity index 95%
rename from include/extractor/guidance/is_through_street.hpp
rename to include/guidance/is_through_street.hpp
index c3ee4d183..3e9d6b861 100644
--- a/include/extractor/guidance/is_through_street.hpp
+++ b/include/guidance/is_through_street.hpp
@@ -1,7 +1,7 @@
 #ifndef OSRM_EXTRACTOR_GUIDANCE_IS_THROUGH_STREET_HPP_
 #define OSRM_EXTRACTOR_GUIDANCE_IS_THROUGH_STREET_HPP_
 
-#include "extractor/guidance/constants.hpp"
+#include "guidance/constants.hpp"
 #include "extractor/suffix_table.hpp"
 #include "util/guidance/name_announcements.hpp"
 
@@ -60,4 +60,4 @@ inline bool isThroughStreet(const std::size_t index,
 } // namespace extractor
 } // namespace osrm
 
-#endif /*OSRM_EXTRACTOR_GUIDANCE_IS_THROUGH_STREET_HPP_*/
\ No newline at end of file
+#endif /*OSRM_EXTRACTOR_GUIDANCE_IS_THROUGH_STREET_HPP_*/
diff --git a/include/extractor/guidance/mergable_road_detector.hpp b/include/guidance/mergable_road_detector.hpp
similarity index 97%
rename from include/extractor/guidance/mergable_road_detector.hpp
rename to include/guidance/mergable_road_detector.hpp
index 657327960..89c7ade56 100644
--- a/include/extractor/guidance/mergable_road_detector.hpp
+++ b/include/guidance/mergable_road_detector.hpp
@@ -2,11 +2,11 @@
 #define OSRM_EXTRACTOR_GUIDANCE_MERGEABLE_ROADS
 
 #include "extractor/compressed_edge_container.hpp"
-#include "extractor/guidance/coordinate_extractor.hpp"
-#include "extractor/guidance/have_identical_names.hpp"
-#include "extractor/guidance/intersection.hpp"
-#include "extractor/guidance/turn_lane_types.hpp"
 #include "extractor/restriction_index.hpp"
+#include "guidance/have_identical_names.hpp"
+#include "guidance/coordinate_extractor.hpp"
+#include "guidance/intersection.hpp"
+#include "guidance/turn_lane_types.hpp"
 #include "util/coordinate.hpp"
 #include "util/node_based_graph.hpp"
 #include "util/typedefs.hpp"
diff --git a/include/extractor/guidance/motorway_handler.hpp b/include/guidance/motorway_handler.hpp
similarity index 93%
rename from include/extractor/guidance/motorway_handler.hpp
rename to include/guidance/motorway_handler.hpp
index 60494fc8a..c8bf5a113 100644
--- a/include/extractor/guidance/motorway_handler.hpp
+++ b/include/guidance/motorway_handler.hpp
@@ -1,10 +1,10 @@
 #ifndef OSRM_EXTRACTOR_GUIDANCE_MOTORWAY_HANDLER_HPP_
 #define OSRM_EXTRACTOR_GUIDANCE_MOTORWAY_HANDLER_HPP_
 
-#include "extractor/guidance/intersection.hpp"
-#include "extractor/guidance/intersection_handler.hpp"
-#include "extractor/guidance/is_through_street.hpp"
 #include "extractor/query_node.hpp"
+#include "guidance/intersection.hpp"
+#include "guidance/intersection_handler.hpp"
+#include "guidance/is_through_street.hpp"
 
 #include "util/attributes.hpp"
 #include "util/name_table.hpp"
diff --git a/include/extractor/guidance/node_based_graph_walker.hpp b/include/guidance/node_based_graph_walker.hpp
similarity index 98%
rename from include/extractor/guidance/node_based_graph_walker.hpp
rename to include/guidance/node_based_graph_walker.hpp
index 4f1f8d131..6fc112a45 100644
--- a/include/extractor/guidance/node_based_graph_walker.hpp
+++ b/include/guidance/node_based_graph_walker.hpp
@@ -1,10 +1,10 @@
 #ifndef OSRM_EXTRACTOR_GUIDANCE_NODE_BASED_GRAPH_WALKER
 #define OSRM_EXTRACTOR_GUIDANCE_NODE_BASED_GRAPH_WALKER
 
-#include "extractor/guidance/constants.hpp"
-#include "extractor/guidance/coordinate_extractor.hpp"
-#include "extractor/guidance/turn_lane_data.hpp"
 #include "extractor/intersection/intersection_analysis.hpp"
+#include "guidance/constants.hpp"
+#include "guidance/coordinate_extractor.hpp"
+#include "guidance/turn_lane_data.hpp"
 #include "util/coordinate.hpp"
 #include "util/coordinate_calculation.hpp"
 #include "util/node_based_graph.hpp"
diff --git a/include/extractor/guidance/parsing_toolkit.hpp b/include/guidance/parsing_toolkit.hpp
similarity index 100%
rename from include/extractor/guidance/parsing_toolkit.hpp
rename to include/guidance/parsing_toolkit.hpp
diff --git a/include/extractor/guidance/road_classification.hpp b/include/guidance/road_classification.hpp
similarity index 99%
rename from include/extractor/guidance/road_classification.hpp
rename to include/guidance/road_classification.hpp
index 2f24fc6ce..24273e81a 100644
--- a/include/extractor/guidance/road_classification.hpp
+++ b/include/guidance/road_classification.hpp
@@ -6,7 +6,7 @@
 #include <cstdlib>
 #include <string>
 
-#include "extractor/guidance/constants.hpp"
+#include "guidance/constants.hpp"
 
 namespace osrm
 {
diff --git a/include/extractor/guidance/roundabout_handler.hpp b/include/guidance/roundabout_handler.hpp
similarity index 92%
rename from include/extractor/guidance/roundabout_handler.hpp
rename to include/guidance/roundabout_handler.hpp
index 1a7cc96c4..bd375fdd5 100644
--- a/include/extractor/guidance/roundabout_handler.hpp
+++ b/include/guidance/roundabout_handler.hpp
@@ -2,12 +2,12 @@
 #define OSRM_EXTRACTOR_GUIDANCE_ROUNDABOUT_HANDLER_HPP_
 
 #include "extractor/compressed_edge_container.hpp"
-#include "extractor/guidance/coordinate_extractor.hpp"
-#include "extractor/guidance/intersection.hpp"
-#include "extractor/guidance/intersection_handler.hpp"
-#include "extractor/guidance/is_through_street.hpp"
-#include "extractor/guidance/roundabout_type.hpp"
 #include "extractor/query_node.hpp"
+#include "guidance/coordinate_extractor.hpp"
+#include "guidance/intersection.hpp"
+#include "guidance/intersection_handler.hpp"
+#include "guidance/roundabout_type.hpp"
+#include "guidance/is_through_street.hpp"
 
 #include "util/name_table.hpp"
 #include "util/node_based_graph.hpp"
diff --git a/include/extractor/guidance/roundabout_type.hpp b/include/guidance/roundabout_type.hpp
similarity index 100%
rename from include/extractor/guidance/roundabout_type.hpp
rename to include/guidance/roundabout_type.hpp
diff --git a/include/extractor/guidance/segregated_intersection_classification.hpp b/include/guidance/segregated_intersection_classification.hpp
similarity index 100%
rename from include/extractor/guidance/segregated_intersection_classification.hpp
rename to include/guidance/segregated_intersection_classification.hpp
diff --git a/include/extractor/guidance/sliproad_handler.hpp b/include/guidance/sliproad_handler.hpp
similarity index 95%
rename from include/extractor/guidance/sliproad_handler.hpp
rename to include/guidance/sliproad_handler.hpp
index 9bbaf691d..66a505b07 100644
--- a/include/extractor/guidance/sliproad_handler.hpp
+++ b/include/guidance/sliproad_handler.hpp
@@ -1,10 +1,10 @@
 #ifndef OSRM_EXTRACTOR_GUIDANCE_SLIPROAD_HANDLER_HPP_
 #define OSRM_EXTRACTOR_GUIDANCE_SLIPROAD_HANDLER_HPP_
 
-#include "extractor/guidance/intersection.hpp"
-#include "extractor/guidance/intersection_handler.hpp"
-#include "extractor/guidance/is_through_street.hpp"
 #include "extractor/query_node.hpp"
+#include "guidance/intersection.hpp"
+#include "guidance/intersection_handler.hpp"
+#include "guidance/is_through_street.hpp"
 
 #include "util/name_table.hpp"
 #include "util/node_based_graph.hpp"
diff --git a/include/extractor/guidance/statistics_handler.hpp b/include/guidance/statistics_handler.hpp
similarity index 96%
rename from include/extractor/guidance/statistics_handler.hpp
rename to include/guidance/statistics_handler.hpp
index 735f53ad5..602b0398f 100644
--- a/include/extractor/guidance/statistics_handler.hpp
+++ b/include/guidance/statistics_handler.hpp
@@ -1,9 +1,9 @@
 #ifndef OSRM_EXTRACTOR_GUIDANCE_STATISTICS_HANDLER_HPP_
 #define OSRM_EXTRACTOR_GUIDANCE_STATISTICS_HANDLER_HPP_
 
-#include "extractor/guidance/intersection.hpp"
-#include "extractor/guidance/intersection_handler.hpp"
-#include "extractor/guidance/turn_instruction.hpp"
+#include "guidance/intersection.hpp"
+#include "guidance/intersection_handler.hpp"
+#include "guidance/turn_instruction.hpp"
 
 #include "util/log.hpp"
 
diff --git a/include/extractor/guidance/suppress_mode_handler.hpp b/include/guidance/suppress_mode_handler.hpp
similarity index 92%
rename from include/extractor/guidance/suppress_mode_handler.hpp
rename to include/guidance/suppress_mode_handler.hpp
index a99061c79..3d7eb9516 100644
--- a/include/extractor/guidance/suppress_mode_handler.hpp
+++ b/include/guidance/suppress_mode_handler.hpp
@@ -1,10 +1,10 @@
 #ifndef OSRM_EXTRACTOR_GUIDANCE_SUPPRESS_MODE_HANDLER_HPP_
 #define OSRM_EXTRACTOR_GUIDANCE_SUPPRESS_MODE_HANDLER_HPP_
 
-#include "extractor/guidance/constants.hpp"
-#include "extractor/guidance/intersection.hpp"
-#include "extractor/guidance/intersection_handler.hpp"
 #include "extractor/travel_mode.hpp"
+#include "guidance/constants.hpp"
+#include "guidance/intersection.hpp"
+#include "guidance/intersection_handler.hpp"
 #include "util/node_based_graph.hpp"
 
 namespace osrm
diff --git a/include/extractor/guidance/turn_analysis.hpp b/include/guidance/turn_analysis.hpp
similarity index 84%
rename from include/extractor/guidance/turn_analysis.hpp
rename to include/guidance/turn_analysis.hpp
index e9c637cba..3cc02c70a 100644
--- a/include/extractor/guidance/turn_analysis.hpp
+++ b/include/guidance/turn_analysis.hpp
@@ -2,18 +2,18 @@
 #define OSRM_EXTRACTOR_TURN_ANALYSIS
 
 #include "extractor/compressed_edge_container.hpp"
-#include "extractor/guidance/driveway_handler.hpp"
-#include "extractor/guidance/intersection.hpp"
-#include "extractor/guidance/motorway_handler.hpp"
-#include "extractor/guidance/roundabout_handler.hpp"
-#include "extractor/guidance/sliproad_handler.hpp"
-#include "extractor/guidance/statistics_handler.hpp"
-#include "extractor/guidance/suppress_mode_handler.hpp"
-#include "extractor/guidance/turn_classification.hpp"
-#include "extractor/guidance/turn_handler.hpp"
 #include "extractor/query_node.hpp"
 #include "extractor/restriction_index.hpp"
 #include "extractor/suffix_table.hpp"
+#include "guidance/driveway_handler.hpp"
+#include "guidance/intersection.hpp"
+#include "guidance/motorway_handler.hpp"
+#include "guidance/roundabout_handler.hpp"
+#include "guidance/sliproad_handler.hpp"
+#include "guidance/statistics_handler.hpp"
+#include "guidance/suppress_mode_handler.hpp"
+#include "guidance/turn_classification.hpp"
+#include "guidance/turn_handler.hpp"
 
 #include "util/attributes.hpp"
 #include "util/name_table.hpp"
diff --git a/include/extractor/guidance/turn_classification.hpp b/include/guidance/turn_classification.hpp
similarity index 92%
rename from include/extractor/guidance/turn_classification.hpp
rename to include/guidance/turn_classification.hpp
index e530c430b..30c2610f3 100644
--- a/include/extractor/guidance/turn_classification.hpp
+++ b/include/guidance/turn_classification.hpp
@@ -1,7 +1,7 @@
 #ifndef OSRM_GUIDANCE_TURN_CLASSIFICATION_HPP_
 #define OSRM_GUIDANCE_TURN_CLASSIFICATION_HPP_
 
-#include "extractor/guidance/intersection.hpp"
+#include "guidance/intersection.hpp"
 
 #include "util/coordinate.hpp"
 #include "util/guidance/bearing_class.hpp"
diff --git a/include/extractor/guidance/turn_discovery.hpp b/include/guidance/turn_discovery.hpp
similarity index 93%
rename from include/extractor/guidance/turn_discovery.hpp
rename to include/guidance/turn_discovery.hpp
index cd0892871..592d3783d 100644
--- a/include/extractor/guidance/turn_discovery.hpp
+++ b/include/guidance/turn_discovery.hpp
@@ -1,9 +1,9 @@
 #ifndef OSRM_EXTRACTOR_GUIDANCE_TURN_DISCOVERY_HPP_
 #define OSRM_EXTRACTOR_GUIDANCE_TURN_DISCOVERY_HPP_
 
-#include "extractor/guidance/intersection.hpp"
-#include "extractor/guidance/turn_lane_data.hpp"
 #include "extractor/restriction_index.hpp"
+#include "guidance/intersection.hpp"
+#include "guidance/turn_lane_data.hpp"
 #include "util/typedefs.hpp"
 
 #include <unordered_set>
diff --git a/include/extractor/guidance/turn_handler.hpp b/include/guidance/turn_handler.hpp
similarity index 96%
rename from include/extractor/guidance/turn_handler.hpp
rename to include/guidance/turn_handler.hpp
index 63c2adcce..15606d79d 100644
--- a/include/extractor/guidance/turn_handler.hpp
+++ b/include/guidance/turn_handler.hpp
@@ -1,10 +1,10 @@
 #ifndef OSRM_EXTRACTOR_GUIDANCE_TURN_HANDLER_HPP_
 #define OSRM_EXTRACTOR_GUIDANCE_TURN_HANDLER_HPP_
 
-#include "extractor/guidance/intersection.hpp"
-#include "extractor/guidance/intersection_handler.hpp"
-#include "extractor/guidance/is_through_street.hpp"
 #include "extractor/query_node.hpp"
+#include "guidance/intersection.hpp"
+#include "guidance/intersection_handler.hpp"
+#include "guidance/is_through_street.hpp"
 
 #include "util/attributes.hpp"
 #include "util/name_table.hpp"
diff --git a/include/extractor/guidance/turn_instruction.hpp b/include/guidance/turn_instruction.hpp
similarity index 99%
rename from include/extractor/guidance/turn_instruction.hpp
rename to include/guidance/turn_instruction.hpp
index 3647c8092..8ab8d4055 100644
--- a/include/extractor/guidance/turn_instruction.hpp
+++ b/include/guidance/turn_instruction.hpp
@@ -4,7 +4,7 @@
 #include <algorithm>
 #include <cstdint>
 
-#include "extractor/guidance/roundabout_type.hpp"
+#include "guidance/roundabout_type.hpp"
 #include "util/attributes.hpp"
 #include "util/typedefs.hpp"
 
diff --git a/include/extractor/guidance/turn_lane_augmentation.hpp b/include/guidance/turn_lane_augmentation.hpp
similarity index 85%
rename from include/extractor/guidance/turn_lane_augmentation.hpp
rename to include/guidance/turn_lane_augmentation.hpp
index 186593904..8e8f174a3 100644
--- a/include/extractor/guidance/turn_lane_augmentation.hpp
+++ b/include/guidance/turn_lane_augmentation.hpp
@@ -1,8 +1,8 @@
 #ifndef OSRM_EXTRACTOR_GUIDANCE_TURN_LANE_AUGMENTATION_HPP_
 #define OSRM_EXTRACTOR_GUIDANCE_TURN_LANE_AUGMENTATION_HPP_
 
-#include "extractor/guidance/intersection.hpp"
-#include "extractor/guidance/turn_lane_data.hpp"
+#include "guidance/intersection.hpp"
+#include "guidance/turn_lane_data.hpp"
 #include "util/attributes.hpp"
 
 namespace osrm
diff --git a/include/extractor/guidance/turn_lane_data.hpp b/include/guidance/turn_lane_data.hpp
similarity index 96%
rename from include/extractor/guidance/turn_lane_data.hpp
rename to include/guidance/turn_lane_data.hpp
index 01f68a73b..3b4dee492 100644
--- a/include/extractor/guidance/turn_lane_data.hpp
+++ b/include/guidance/turn_lane_data.hpp
@@ -1,7 +1,7 @@
 #ifndef OSRM_EXTRACTOR_GUIDANCE_TURN_LANE_DATA_HPP_
 #define OSRM_EXTRACTOR_GUIDANCE_TURN_LANE_DATA_HPP_
 
-#include "extractor/guidance/turn_lane_types.hpp"
+#include "guidance/turn_lane_types.hpp"
 #include "util/attributes.hpp"
 #include "util/typedefs.hpp"
 #include <vector>
diff --git a/include/extractor/guidance/turn_lane_handler.hpp b/include/guidance/turn_lane_handler.hpp
similarity index 97%
rename from include/extractor/guidance/turn_lane_handler.hpp
rename to include/guidance/turn_lane_handler.hpp
index c1e1fd760..fe4a0fd7b 100644
--- a/include/extractor/guidance/turn_lane_handler.hpp
+++ b/include/guidance/turn_lane_handler.hpp
@@ -1,11 +1,11 @@
 #ifndef OSRM_EXTRACTOR_GUIDANCE_TURN_LANE_HANDLER_HPP_
 #define OSRM_EXTRACTOR_GUIDANCE_TURN_LANE_HANDLER_HPP_
 
-#include "extractor/guidance/intersection.hpp"
-#include "extractor/guidance/turn_analysis.hpp"
-#include "extractor/guidance/turn_lane_data.hpp"
-#include "extractor/guidance/turn_lane_types.hpp"
 #include "extractor/query_node.hpp"
+#include "guidance/intersection.hpp"
+#include "guidance/turn_analysis.hpp"
+#include "guidance/turn_lane_data.hpp"
+#include "guidance/turn_lane_types.hpp"
 
 #include "util/attributes.hpp"
 #include "util/guidance/turn_lanes.hpp"
diff --git a/include/extractor/guidance/turn_lane_matcher.hpp b/include/guidance/turn_lane_matcher.hpp
similarity index 93%
rename from include/extractor/guidance/turn_lane_matcher.hpp
rename to include/guidance/turn_lane_matcher.hpp
index 78c2dceb9..324564f03 100644
--- a/include/extractor/guidance/turn_lane_matcher.hpp
+++ b/include/guidance/turn_lane_matcher.hpp
@@ -1,9 +1,9 @@
 #ifndef OSRM_EXTRACTOR_GUIDANCE_TURN_LANE_MATCHER_HPP_
 #define OSRM_EXTRACTOR_GUIDANCE_TURN_LANE_MATCHER_HPP_
 
-#include "extractor/guidance/intersection.hpp"
-#include "extractor/guidance/turn_instruction.hpp"
-#include "extractor/guidance/turn_lane_data.hpp"
+#include "guidance/intersection.hpp"
+#include "guidance/turn_instruction.hpp"
+#include "guidance/turn_lane_data.hpp"
 
 #include "util/attributes.hpp"
 #include "util/guidance/turn_lanes.hpp"
diff --git a/include/extractor/guidance/turn_lane_types.hpp b/include/guidance/turn_lane_types.hpp
similarity index 100%
rename from include/extractor/guidance/turn_lane_types.hpp
rename to include/guidance/turn_lane_types.hpp
diff --git a/include/util/debug.hpp b/include/util/debug.hpp
index 5b32c104f..55b3bae4f 100644
--- a/include/util/debug.hpp
+++ b/include/util/debug.hpp
@@ -1,10 +1,10 @@
 #ifndef OSRM_ENGINE_GUIDANCE_DEBUG_HPP_
 #define OSRM_ENGINE_GUIDANCE_DEBUG_HPP_
 
-#include "extractor/guidance/intersection.hpp"
-#include "extractor/guidance/turn_lane_data.hpp"
 #include "extractor/node_data_container.hpp"
 #include "extractor/query_node.hpp"
+#include "guidance/intersection.hpp"
+#include "guidance/turn_lane_data.hpp"
 #include "engine/guidance/route_step.hpp"
 #include "util/node_based_graph.hpp"
 #include "util/typedefs.hpp"
diff --git a/include/util/node_based_graph.hpp b/include/util/node_based_graph.hpp
index fa12db3b8..8f23161d0 100644
--- a/include/util/node_based_graph.hpp
+++ b/include/util/node_based_graph.hpp
@@ -2,9 +2,9 @@
 #define NODE_BASED_GRAPH_HPP
 
 #include "extractor/class_data.hpp"
-#include "extractor/guidance/road_classification.hpp"
 #include "extractor/node_based_edge.hpp"
 #include "extractor/node_data_container.hpp"
+#include "guidance/road_classification.hpp"
 #include "util/dynamic_graph.hpp"
 #include "util/graph_utils.hpp"
 
diff --git a/src/engine/api/json_factory.cpp b/src/engine/api/json_factory.cpp
index ea0e24873..e583ea89d 100644
--- a/src/engine/api/json_factory.cpp
+++ b/src/engine/api/json_factory.cpp
@@ -1,5 +1,5 @@
-#include "extractor/guidance/turn_instruction.hpp"
 #include "extractor/travel_mode.hpp"
+#include "guidance/turn_instruction.hpp"
 
 #include "engine/api/json_factory.hpp"
 #include "engine/hint.hpp"
diff --git a/src/engine/guidance/collapse_scenario_detection.cpp b/src/engine/guidance/collapse_scenario_detection.cpp
index 562b75e5e..85878333c 100644
--- a/src/engine/guidance/collapse_scenario_detection.cpp
+++ b/src/engine/guidance/collapse_scenario_detection.cpp
@@ -1,5 +1,5 @@
 #include "engine/guidance/collapse_scenario_detection.hpp"
-#include "extractor/guidance/constants.hpp"
+#include "guidance/constants.hpp"
 #include "util/bearing.hpp"
 
 #include <numeric>
diff --git a/src/engine/guidance/collapse_turns.cpp b/src/engine/guidance/collapse_turns.cpp
index 96eeb6470..bb00677e1 100644
--- a/src/engine/guidance/collapse_turns.cpp
+++ b/src/engine/guidance/collapse_turns.cpp
@@ -1,6 +1,6 @@
 #include "engine/guidance/collapse_turns.hpp"
-#include "extractor/guidance/constants.hpp"
-#include "extractor/guidance/turn_instruction.hpp"
+#include "guidance/constants.hpp"
+#include "guidance/turn_instruction.hpp"
 #include "engine/guidance/collapse_scenario_detection.hpp"
 #include "engine/guidance/collapsing_utility.hpp"
 #include "util/bearing.hpp"
diff --git a/src/engine/guidance/lane_processing.cpp b/src/engine/guidance/lane_processing.cpp
index 4294d9e12..6e1fe768a 100644
--- a/src/engine/guidance/lane_processing.cpp
+++ b/src/engine/guidance/lane_processing.cpp
@@ -1,7 +1,7 @@
 #include "util/for_each_pair.hpp"
 #include "util/group_by.hpp"
 
-#include "extractor/guidance/turn_instruction.hpp"
+#include "guidance/turn_instruction.hpp"
 #include "engine/guidance/collapsing_utility.hpp"
 
 #include <algorithm>
diff --git a/src/engine/guidance/post_processing.cpp b/src/engine/guidance/post_processing.cpp
index b2b5249eb..f66edfe82 100644
--- a/src/engine/guidance/post_processing.cpp
+++ b/src/engine/guidance/post_processing.cpp
@@ -1,6 +1,6 @@
 #include "engine/guidance/post_processing.hpp"
-#include "extractor/guidance/constants.hpp"
-#include "extractor/guidance/turn_instruction.hpp"
+#include "guidance/constants.hpp"
+#include "guidance/turn_instruction.hpp"
 
 #include "engine/guidance/assemble_steps.hpp"
 #include "engine/guidance/lane_processing.hpp"
diff --git a/src/engine/plugins/tile.cpp b/src/engine/plugins/tile.cpp
index 965882c45..c92b2e9cc 100644
--- a/src/engine/plugins/tile.cpp
+++ b/src/engine/plugins/tile.cpp
@@ -1,4 +1,4 @@
-#include "extractor/guidance/turn_instruction.hpp"
+#include "guidance/turn_instruction.hpp"
 
 #include "engine/plugins/plugin_base.hpp"
 #include "engine/plugins/tile.hpp"
diff --git a/src/extractor/edge_based_graph_factory.cpp b/src/extractor/edge_based_graph_factory.cpp
index 7f7165f3f..b38c5cb65 100644
--- a/src/extractor/edge_based_graph_factory.cpp
+++ b/src/extractor/edge_based_graph_factory.cpp
@@ -2,10 +2,10 @@
 #include "extractor/conditional_turn_penalty.hpp"
 #include "extractor/edge_based_edge.hpp"
 #include "extractor/files.hpp"
-#include "extractor/guidance/turn_analysis.hpp"
-#include "extractor/guidance/turn_lane_handler.hpp"
 #include "extractor/scripting_environment.hpp"
 #include "extractor/suffix_table.hpp"
+#include "guidance/turn_analysis.hpp"
+#include "guidance/turn_lane_handler.hpp"
 
 #include "extractor/intersection/intersection_analysis.hpp"
 
diff --git a/src/extractor/extractor.cpp b/src/extractor/extractor.cpp
index b505be38b..8bd7814a2 100644
--- a/src/extractor/extractor.cpp
+++ b/src/extractor/extractor.cpp
@@ -13,7 +13,7 @@
 #include "extractor/restriction_parser.hpp"
 #include "extractor/scripting_environment.hpp"
 
-#include "extractor/guidance/segregated_intersection_classification.hpp"
+#include "guidance/segregated_intersection_classification.hpp"
 
 #include "storage/io.hpp"
 
diff --git a/src/extractor/extractor_callbacks.cpp b/src/extractor/extractor_callbacks.cpp
index da08048e3..ccb7daeae 100644
--- a/src/extractor/extractor_callbacks.cpp
+++ b/src/extractor/extractor_callbacks.cpp
@@ -2,10 +2,10 @@
 #include "extractor/extraction_containers.hpp"
 #include "extractor/extraction_node.hpp"
 #include "extractor/extraction_way.hpp"
-#include "extractor/guidance/road_classification.hpp"
 #include "extractor/profile_properties.hpp"
 #include "extractor/query_node.hpp"
 #include "extractor/restriction.hpp"
+#include "guidance/road_classification.hpp"
 
 #include "util/for_each_pair.hpp"
 #include "util/guidance/turn_lanes.hpp"
diff --git a/src/extractor/graph_compressor.cpp b/src/extractor/graph_compressor.cpp
index 3b147b515..8f61b6222 100644
--- a/src/extractor/graph_compressor.cpp
+++ b/src/extractor/graph_compressor.cpp
@@ -2,9 +2,9 @@
 
 #include "extractor/compressed_edge_container.hpp"
 #include "extractor/extraction_turn.hpp"
-#include "extractor/guidance/intersection.hpp"
 #include "extractor/restriction.hpp"
 #include "extractor/restriction_compressor.hpp"
+#include "guidance/intersection.hpp"
 
 #include "util/dynamic_graph.hpp"
 #include "util/node_based_graph.hpp"
diff --git a/src/extractor/intersection/intersection_analysis.cpp b/src/extractor/intersection/intersection_analysis.cpp
index a4c3e5275..7442c108a 100644
--- a/src/extractor/intersection/intersection_analysis.cpp
+++ b/src/extractor/intersection/intersection_analysis.cpp
@@ -4,7 +4,7 @@
 #include "util/bearing.hpp"
 #include "util/coordinate_calculation.hpp"
 
-#include "extractor/guidance/coordinate_extractor.hpp"
+#include "guidance/coordinate_extractor.hpp"
 
 #include <boost/optional/optional_io.hpp>
 
diff --git a/src/extractor/guidance/coordinate_extractor.cpp b/src/guidance/coordinate_extractor.cpp
similarity index 99%
rename from src/extractor/guidance/coordinate_extractor.cpp
rename to src/guidance/coordinate_extractor.cpp
index 85a368f35..9ce694dd8 100644
--- a/src/extractor/guidance/coordinate_extractor.cpp
+++ b/src/guidance/coordinate_extractor.cpp
@@ -1,5 +1,5 @@
-#include "extractor/guidance/coordinate_extractor.hpp"
-#include "extractor/guidance/constants.hpp"
+#include "guidance/coordinate_extractor.hpp"
+#include "guidance/constants.hpp"
 
 #include <algorithm>
 #include <cstddef>
diff --git a/src/extractor/guidance/driveway_handler.cpp b/src/guidance/driveway_handler.cpp
similarity index 98%
rename from src/extractor/guidance/driveway_handler.cpp
rename to src/guidance/driveway_handler.cpp
index 75d064256..80db5ecf6 100644
--- a/src/extractor/guidance/driveway_handler.cpp
+++ b/src/guidance/driveway_handler.cpp
@@ -1,4 +1,4 @@
-#include "extractor/guidance/driveway_handler.hpp"
+#include "guidance/driveway_handler.hpp"
 
 #include "util/assert.hpp"
 
diff --git a/src/extractor/guidance/intersection.cpp b/src/guidance/intersection.cpp
similarity index 98%
rename from src/extractor/guidance/intersection.cpp
rename to src/guidance/intersection.cpp
index 65179604c..1cf0ebedb 100644
--- a/src/extractor/guidance/intersection.cpp
+++ b/src/guidance/intersection.cpp
@@ -1,4 +1,4 @@
-#include "extractor/guidance/intersection.hpp"
+#include "guidance/intersection.hpp"
 
 #include <limits>
 #include <string>
diff --git a/src/extractor/guidance/intersection_handler.cpp b/src/guidance/intersection_handler.cpp
similarity index 99%
rename from src/extractor/guidance/intersection_handler.cpp
rename to src/guidance/intersection_handler.cpp
index c8f25b285..05698fe61 100644
--- a/src/extractor/guidance/intersection_handler.cpp
+++ b/src/guidance/intersection_handler.cpp
@@ -1,6 +1,6 @@
-#include "extractor/guidance/intersection_handler.hpp"
-#include "extractor/guidance/constants.hpp"
+#include "guidance/intersection_handler.hpp"
 #include "extractor/intersection/intersection_analysis.hpp"
+#include "guidance/constants.hpp"
 
 #include "util/coordinate_calculation.hpp"
 #include "util/guidance/name_announcements.hpp"
diff --git a/src/extractor/guidance/mergable_road_detector.cpp b/src/guidance/mergable_road_detector.cpp
similarity index 99%
rename from src/extractor/guidance/mergable_road_detector.cpp
rename to src/guidance/mergable_road_detector.cpp
index 381123b29..62a004778 100644
--- a/src/extractor/guidance/mergable_road_detector.cpp
+++ b/src/guidance/mergable_road_detector.cpp
@@ -1,9 +1,9 @@
-#include "extractor/guidance/mergable_road_detector.hpp"
-#include "extractor/guidance/constants.hpp"
-#include "extractor/guidance/node_based_graph_walker.hpp"
+#include "guidance/mergable_road_detector.hpp"
 #include "extractor/intersection/intersection_analysis.hpp"
 #include "extractor/query_node.hpp"
 #include "extractor/suffix_table.hpp"
+#include "guidance/constants.hpp"
+#include "guidance/node_based_graph_walker.hpp"
 
 #include "util/bearing.hpp"
 #include "util/coordinate_calculation.hpp"
diff --git a/src/extractor/guidance/motorway_handler.cpp b/src/guidance/motorway_handler.cpp
similarity index 99%
rename from src/extractor/guidance/motorway_handler.cpp
rename to src/guidance/motorway_handler.cpp
index d75881c93..17fddfe84 100644
--- a/src/extractor/guidance/motorway_handler.cpp
+++ b/src/guidance/motorway_handler.cpp
@@ -1,6 +1,6 @@
-#include "extractor/guidance/motorway_handler.hpp"
-#include "extractor/guidance/constants.hpp"
-#include "extractor/guidance/road_classification.hpp"
+#include "guidance/motorway_handler.hpp"
+#include "guidance/constants.hpp"
+#include "guidance/road_classification.hpp"
 
 #include "util/assert.hpp"
 #include "util/bearing.hpp"
diff --git a/src/extractor/guidance/node_based_graph_walker.cpp b/src/guidance/node_based_graph_walker.cpp
similarity index 99%
rename from src/extractor/guidance/node_based_graph_walker.cpp
rename to src/guidance/node_based_graph_walker.cpp
index cc4d88f7b..907584cf9 100644
--- a/src/extractor/guidance/node_based_graph_walker.cpp
+++ b/src/guidance/node_based_graph_walker.cpp
@@ -1,4 +1,4 @@
-#include "extractor/guidance/node_based_graph_walker.hpp"
+#include "guidance/node_based_graph_walker.hpp"
 #include "extractor/intersection/intersection_analysis.hpp"
 #include "util/bearing.hpp"
 #include "util/coordinate_calculation.hpp"
diff --git a/src/extractor/guidance/roundabout_handler.cpp b/src/guidance/roundabout_handler.cpp
similarity index 99%
rename from src/extractor/guidance/roundabout_handler.cpp
rename to src/guidance/roundabout_handler.cpp
index 2c1a07624..93bfb8d30 100644
--- a/src/extractor/guidance/roundabout_handler.cpp
+++ b/src/guidance/roundabout_handler.cpp
@@ -1,5 +1,5 @@
-#include "extractor/guidance/roundabout_handler.hpp"
-#include "extractor/guidance/constants.hpp"
+#include "guidance/roundabout_handler.hpp"
+#include "guidance/constants.hpp"
 
 #include "util/assert.hpp"
 #include "util/bearing.hpp"
diff --git a/src/extractor/guidance/segregated_intersection_classification.cpp b/src/guidance/segregated_intersection_classification.cpp
similarity index 98%
rename from src/extractor/guidance/segregated_intersection_classification.cpp
rename to src/guidance/segregated_intersection_classification.cpp
index 5b95820b9..2a9aa5eff 100644
--- a/src/extractor/guidance/segregated_intersection_classification.cpp
+++ b/src/guidance/segregated_intersection_classification.cpp
@@ -1,6 +1,6 @@
-#include "extractor/guidance/segregated_intersection_classification.hpp"
-#include "extractor/guidance/coordinate_extractor.hpp"
+#include "guidance/segregated_intersection_classification.hpp"
 #include "extractor/node_based_graph_factory.hpp"
+#include "guidance/coordinate_extractor.hpp"
 
 #include "util/coordinate_calculation.hpp"
 #include "util/name_table.hpp"
diff --git a/src/extractor/guidance/sliproad_handler.cpp b/src/guidance/sliproad_handler.cpp
similarity index 99%
rename from src/extractor/guidance/sliproad_handler.cpp
rename to src/guidance/sliproad_handler.cpp
index ed9d59f49..254978b75 100644
--- a/src/extractor/guidance/sliproad_handler.cpp
+++ b/src/guidance/sliproad_handler.cpp
@@ -1,5 +1,5 @@
-#include "extractor/guidance/sliproad_handler.hpp"
-#include "extractor/guidance/constants.hpp"
+#include "guidance/sliproad_handler.hpp"
+#include "guidance/constants.hpp"
 #include "util/assert.hpp"
 #include "util/bearing.hpp"
 #include "util/coordinate_calculation.hpp"
diff --git a/src/extractor/guidance/suppress_mode_handler.cpp b/src/guidance/suppress_mode_handler.cpp
similarity index 98%
rename from src/extractor/guidance/suppress_mode_handler.cpp
rename to src/guidance/suppress_mode_handler.cpp
index 09b336291..6c1de12de 100644
--- a/src/extractor/guidance/suppress_mode_handler.cpp
+++ b/src/guidance/suppress_mode_handler.cpp
@@ -1,4 +1,4 @@
-#include "extractor/guidance/suppress_mode_handler.hpp"
+#include "guidance/suppress_mode_handler.hpp"
 #include "extractor/travel_mode.hpp"
 
 #include <algorithm>
diff --git a/src/extractor/guidance/turn_analysis.cpp b/src/guidance/turn_analysis.cpp
similarity index 98%
rename from src/extractor/guidance/turn_analysis.cpp
rename to src/guidance/turn_analysis.cpp
index 8d1cb0669..1335df5b3 100644
--- a/src/extractor/guidance/turn_analysis.cpp
+++ b/src/guidance/turn_analysis.cpp
@@ -1,6 +1,6 @@
-#include "extractor/guidance/turn_analysis.hpp"
-#include "extractor/guidance/constants.hpp"
-#include "extractor/guidance/road_classification.hpp"
+#include "guidance/turn_analysis.hpp"
+#include "guidance/constants.hpp"
+#include "guidance/road_classification.hpp"
 
 #include "util/coordinate.hpp"
 #include "util/coordinate_calculation.hpp"
diff --git a/src/extractor/guidance/turn_classification.cpp b/src/guidance/turn_classification.cpp
similarity index 98%
rename from src/extractor/guidance/turn_classification.cpp
rename to src/guidance/turn_classification.cpp
index e15737752..3f01e18cb 100644
--- a/src/extractor/guidance/turn_classification.cpp
+++ b/src/guidance/turn_classification.cpp
@@ -1,4 +1,4 @@
-#include "extractor/guidance/turn_classification.hpp"
+#include "guidance/turn_classification.hpp"
 
 #include <algorithm>
 #include <cstddef>
diff --git a/src/extractor/guidance/turn_discovery.cpp b/src/guidance/turn_discovery.cpp
similarity index 97%
rename from src/extractor/guidance/turn_discovery.cpp
rename to src/guidance/turn_discovery.cpp
index 9f53c70c5..5138d6ceb 100644
--- a/src/extractor/guidance/turn_discovery.cpp
+++ b/src/guidance/turn_discovery.cpp
@@ -1,7 +1,7 @@
-#include "extractor/guidance/turn_discovery.hpp"
-#include "extractor/guidance/constants.hpp"
-#include "extractor/guidance/coordinate_extractor.hpp"
+#include "guidance/turn_discovery.hpp"
 #include "extractor/intersection/intersection_analysis.hpp"
+#include "guidance/constants.hpp"
+#include "guidance/coordinate_extractor.hpp"
 #include "util/bearing.hpp"
 #include "util/coordinate_calculation.hpp"
 
diff --git a/src/extractor/guidance/turn_handler.cpp b/src/guidance/turn_handler.cpp
similarity index 99%
rename from src/extractor/guidance/turn_handler.cpp
rename to src/guidance/turn_handler.cpp
index 27b55404c..a33119322 100644
--- a/src/extractor/guidance/turn_handler.cpp
+++ b/src/guidance/turn_handler.cpp
@@ -1,5 +1,5 @@
-#include "extractor/guidance/turn_handler.hpp"
-#include "extractor/guidance/constants.hpp"
+#include "guidance/turn_handler.hpp"
+#include "guidance/constants.hpp"
 
 #include "util/bearing.hpp"
 #include "util/guidance/name_announcements.hpp"
diff --git a/src/extractor/guidance/turn_lane_augmentation.cpp b/src/guidance/turn_lane_augmentation.cpp
similarity index 99%
rename from src/extractor/guidance/turn_lane_augmentation.cpp
rename to src/guidance/turn_lane_augmentation.cpp
index f31cf91ff..0b79ed51c 100644
--- a/src/extractor/guidance/turn_lane_augmentation.cpp
+++ b/src/guidance/turn_lane_augmentation.cpp
@@ -1,5 +1,5 @@
-#include "extractor/guidance/turn_lane_augmentation.hpp"
-#include "extractor/guidance/turn_lane_types.hpp"
+#include "guidance/turn_lane_augmentation.hpp"
+#include "guidance/turn_lane_types.hpp"
 #include "util/log.hpp"
 
 #include <algorithm>
diff --git a/src/extractor/guidance/turn_lane_data.cpp b/src/guidance/turn_lane_data.cpp
similarity index 99%
rename from src/extractor/guidance/turn_lane_data.cpp
rename to src/guidance/turn_lane_data.cpp
index 0b94bcbc1..2d4071695 100644
--- a/src/extractor/guidance/turn_lane_data.cpp
+++ b/src/guidance/turn_lane_data.cpp
@@ -1,4 +1,4 @@
-#include "extractor/guidance/turn_lane_data.hpp"
+#include "guidance/turn_lane_data.hpp"
 #include "util/guidance/turn_lanes.hpp"
 
 #include <boost/numeric/conversion/cast.hpp>
diff --git a/src/extractor/guidance/turn_lane_handler.cpp b/src/guidance/turn_lane_handler.cpp
similarity index 99%
rename from src/extractor/guidance/turn_lane_handler.cpp
rename to src/guidance/turn_lane_handler.cpp
index 2110a3650..6b6febf69 100644
--- a/src/extractor/guidance/turn_lane_handler.cpp
+++ b/src/guidance/turn_lane_handler.cpp
@@ -1,9 +1,9 @@
-#include "extractor/guidance/turn_lane_handler.hpp"
-#include "extractor/guidance/constants.hpp"
-#include "extractor/guidance/turn_discovery.hpp"
-#include "extractor/guidance/turn_lane_augmentation.hpp"
-#include "extractor/guidance/turn_lane_matcher.hpp"
+#include "guidance/turn_lane_handler.hpp"
 #include "extractor/intersection/intersection_analysis.hpp"
+#include "guidance/constants.hpp"
+#include "guidance/turn_discovery.hpp"
+#include "guidance/turn_lane_augmentation.hpp"
+#include "guidance/turn_lane_matcher.hpp"
 #include "util/bearing.hpp"
 #include "util/log.hpp"
 #include "util/typedefs.hpp"
diff --git a/src/extractor/guidance/turn_lane_matcher.cpp b/src/guidance/turn_lane_matcher.cpp
similarity index 99%
rename from src/extractor/guidance/turn_lane_matcher.cpp
rename to src/guidance/turn_lane_matcher.cpp
index eaac18b55..9a93376cd 100644
--- a/src/extractor/guidance/turn_lane_matcher.cpp
+++ b/src/guidance/turn_lane_matcher.cpp
@@ -1,4 +1,4 @@
-#include "extractor/guidance/turn_lane_matcher.hpp"
+#include "guidance/turn_lane_matcher.hpp"
 #include "util/bearing.hpp"
 
 #include <boost/assert.hpp>
diff --git a/src/storage/storage.cpp b/src/storage/storage.cpp
index 70d93551b..a32185b04 100644
--- a/src/storage/storage.cpp
+++ b/src/storage/storage.cpp
@@ -17,12 +17,12 @@
 #include "extractor/edge_based_edge.hpp"
 #include "extractor/edge_based_node.hpp"
 #include "extractor/files.hpp"
-#include "extractor/guidance/turn_instruction.hpp"
 #include "extractor/original_edge_data.hpp"
 #include "extractor/packed_osm_ids.hpp"
 #include "extractor/profile_properties.hpp"
 #include "extractor/query_node.hpp"
 #include "extractor/travel_mode.hpp"
+#include "guidance/turn_instruction.hpp"
 
 #include "partitioner/cell_storage.hpp"
 #include "partitioner/edge_based_graph_reader.hpp"
diff --git a/unit_tests/CMakeLists.txt b/unit_tests/CMakeLists.txt
index a152bdc6c..649c9c808 100644
--- a/unit_tests/CMakeLists.txt
+++ b/unit_tests/CMakeLists.txt
@@ -68,7 +68,7 @@ add_executable(contractor-tests
 add_executable(extractor-tests
 	EXCLUDE_FROM_ALL
 	${ExtractorTestsSources}
-	$<TARGET_OBJECTS:EXTRACTOR> $<TARGET_OBJECTS:UTIL>)
+	$<TARGET_OBJECTS:EXTRACTOR> $<TARGET_OBJECTS:GUIDANCE> $<TARGET_OBJECTS:UTIL>)
 
 add_executable(partitioner-tests
 	EXCLUDE_FROM_ALL
diff --git a/unit_tests/engine/json_factory.cpp b/unit_tests/engine/json_factory.cpp
index 5cefcbaf9..594ebdafb 100644
--- a/unit_tests/engine/json_factory.cpp
+++ b/unit_tests/engine/json_factory.cpp
@@ -1,5 +1,5 @@
 #include "engine/api/json_factory.hpp"
-#include "extractor/guidance/turn_instruction.hpp"
+#include "guidance/turn_instruction.hpp"
 
 #include <boost/test/test_case_template.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/unit_tests/mocks/mock_datafacade.hpp b/unit_tests/mocks/mock_datafacade.hpp
index 2d92972bb..f4006f90a 100644
--- a/unit_tests/mocks/mock_datafacade.hpp
+++ b/unit_tests/mocks/mock_datafacade.hpp
@@ -5,9 +5,9 @@
 
 #include "contractor/query_edge.hpp"
 #include "extractor/class_data.hpp"
-#include "extractor/guidance/turn_instruction.hpp"
-#include "extractor/guidance/turn_lane_types.hpp"
 #include "extractor/travel_mode.hpp"
+#include "guidance/turn_instruction.hpp"
+#include "guidance/turn_lane_types.hpp"
 
 #include "engine/algorithm.hpp"
 #include "engine/datafacade/algorithm_datafacade.hpp"