Split intersection analysis and guidance code

Intersection analysis occupy in osrm::extractor::intersection namespace
and guidance code osrm::guidance

src/extractor/extractor_callbacks.cpp

@@ -5,7 +5,7 @@
 #include "extractor/profile_properties.hpp"
 #include "extractor/query_node.hpp"
 #include "extractor/restriction.hpp"
-#include "guidance/road_classification.hpp"
+#include "extractor/road_classification.hpp"
 
 #include "util/for_each_pair.hpp"
 #include "util/guidance/turn_lanes.hpp"
@@ -29,13 +29,9 @@ namespace osrm
 {
 namespace extractor
 {
-
-using TurnLaneDescription = guidance::TurnLaneDescription;
-namespace TurnLaneType = guidance::TurnLaneType;
-
 ExtractorCallbacks::ExtractorCallbacks(ExtractionContainers &extraction_containers_,
                                        std::unordered_map<std::string, ClassData> &classes_map,
-                                       guidance::LaneDescriptionMap &lane_description_map,
+                                       LaneDescriptionMap &lane_description_map,
                                        const ProfileProperties &properties)
     : external_memory(extraction_containers_), classes_map(classes_map),
       lane_description_map(lane_description_map),
@@ -260,9 +256,9 @@ void ExtractorCallbacks::ProcessWay(const osmium::Way &input_way, const Extracti
         for (auto iter = tokens.begin(); iter != tokens.end(); ++iter)
         {
             tokenizer inner_tokens(*iter, inner_sep);
-            guidance::TurnLaneType::Mask lane_mask = inner_tokens.begin() == inner_tokens.end()
-                                                         ? TurnLaneType::none
-                                                         : TurnLaneType::empty;
+            TurnLaneType::Mask lane_mask = inner_tokens.begin() == inner_tokens.end()
+                                               ? TurnLaneType::none
+                                               : TurnLaneType::empty;
             for (auto token_itr = inner_tokens.begin(); token_itr != inner_tokens.end();
                  ++token_itr)
             {