Revert "Folds json_* utilities into json subfolder and adapts includes"

This reverts commit cd039c69c0a92a35889e3c875b8eb53cf07377bb.

include/engine/plugins/match.hpp

@@ -12,8 +12,8 @@
 #include "engine/routing_algorithms/map_matching.hpp"
 #include "util/coordinate_calculation.hpp"
 #include "util/integer_range.hpp"
-#include "util/json/logger.hpp"
-#include "util/json/util.hpp"
+#include "util/json_logger.hpp"
+#include "util/json_util.hpp"
 #include "util/string_util.hpp"
 
 #include <cstdlib>

include/engine/plugins/viaroute.hpp

@@ -8,11 +8,11 @@
 #include "engine/search_engine.hpp"
 #include "util/for_each_pair.hpp"
 #include "util/integer_range.hpp"
-#include "osrm/json_container.hpp"
-#include "util/json/renderer.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 <cstdlib>
 

include/engine/routing_algorithms/map_matching.hpp

@@ -5,7 +5,7 @@
 
 #include "util/coordinate_calculation.hpp"
 #include "engine/map_matching/hidden_markov_model.hpp"
-#include "util/json/logger.hpp"
+#include "util/json_logger.hpp"
 #include "util/matching_debug_info.hpp"
 
 #include <cstddef>