diff --git a/generator/generator_tests/check_mwms.cpp b/generator/generator_tests/check_mwms.cpp
index 3d5b9f1a92..b4771110ba 100644
--- a/generator/generator_tests/check_mwms.cpp
+++ b/generator/generator_tests/check_mwms.cpp
@@ -1,13 +1,13 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../../map/feature_vec_model.hpp"
+#include "map/feature_vec_model.hpp"
 
-#include "../../indexer/data_header.hpp"
-#include "../../indexer/interval_index.hpp"
+#include "indexer/data_header.hpp"
+#include "indexer/interval_index.hpp"
 
-#include "../../platform/platform.hpp"
+#include "platform/platform.hpp"
 
-#include "../../base/logging.hpp"
+#include "base/logging.hpp"
 
 
 UNIT_TEST(CheckMWM_LoadAll)
diff --git a/generator/generator_tests/classificator_tests.cpp b/generator/generator_tests/classificator_tests.cpp
index abe95cc757..feafe281fb 100644
--- a/generator/generator_tests/classificator_tests.cpp
+++ b/generator/generator_tests/classificator_tests.cpp
@@ -1,11 +1,11 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../../indexer/classificator.hpp"
-#include "../../indexer/classificator_loader.hpp"
-#include "../../indexer/feature_visibility.hpp"
-#include "../../indexer/feature_data.hpp"
+#include "indexer/classificator.hpp"
+#include "indexer/classificator_loader.hpp"
+#include "indexer/feature_visibility.hpp"
+#include "indexer/feature_data.hpp"
 
-#include "../../base/logging.hpp"
+#include "base/logging.hpp"
 
 
 namespace
diff --git a/generator/generator_tests/coasts_test.cpp b/generator/generator_tests/coasts_test.cpp
index bb36d88f75..532af6f892 100644
--- a/generator/generator_tests/coasts_test.cpp
+++ b/generator/generator_tests/coasts_test.cpp
@@ -1,16 +1,16 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../feature_builder.hpp"
-#include "../feature_sorter.hpp"
-#include "../feature_generator.hpp"
+#include "generator/feature_builder.hpp"
+#include "generator/feature_sorter.hpp"
+#include "generator/feature_generator.hpp"
 
-#include "../../indexer/mercator.hpp"
-#include "../../indexer/cell_id.hpp"
-#include "../../indexer/scales.hpp"
+#include "indexer/mercator.hpp"
+#include "indexer/cell_id.hpp"
+#include "indexer/scales.hpp"
 
-#include "../../geometry/cellid.hpp"
+#include "geometry/cellid.hpp"
 
-#include "../../base/logging.hpp"
+#include "base/logging.hpp"
 
 
 namespace
diff --git a/generator/generator_tests/feature_builder_test.cpp b/generator/generator_tests/feature_builder_test.cpp
index bbcb783253..2d19331cbc 100644
--- a/generator/generator_tests/feature_builder_test.cpp
+++ b/generator/generator_tests/feature_builder_test.cpp
@@ -1,10 +1,10 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../feature_builder.hpp"
+#include "generator/feature_builder.hpp"
 
-#include "../../indexer/feature_visibility.hpp"
-#include "../../indexer/classificator_loader.hpp"
-#include "../../indexer/classificator.hpp"
+#include "indexer/feature_visibility.hpp"
+#include "indexer/classificator_loader.hpp"
+#include "indexer/classificator.hpp"
 
 
 namespace
diff --git a/generator/generator_tests/feature_merger_test.cpp b/generator/generator_tests/feature_merger_test.cpp
index a3bc7b8385..c43c080898 100644
--- a/generator/generator_tests/feature_merger_test.cpp
+++ b/generator/generator_tests/feature_merger_test.cpp
@@ -1,6 +1,6 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../feature_merger.hpp"
+#include "generator/feature_merger.hpp"
 
 
 namespace
diff --git a/generator/generator_tests/metadata_test.cpp b/generator/generator_tests/metadata_test.cpp
index 63cd62a23b..d9df452f19 100644
--- a/generator/generator_tests/metadata_test.cpp
+++ b/generator/generator_tests/metadata_test.cpp
@@ -1,10 +1,10 @@
-#include "../../testing/testing.hpp"
-#include "../../base/logging.hpp"
+#include "testing/testing.hpp"
+#include "base/logging.hpp"
 
-#include "../../indexer/classificator_loader.hpp"
-#include "../../generator/osm2meta.hpp"
-#include "../../coding/writer.hpp"
-#include "../../coding/reader.hpp"
+#include "indexer/classificator_loader.hpp"
+#include "generator/osm2meta.hpp"
+#include "coding/writer.hpp"
+#include "coding/reader.hpp"
 
 UNIT_TEST(Metadata_ValidateAndFormat_stars)
 {
diff --git a/generator/generator_tests/osm_id_test.cpp b/generator/generator_tests/osm_id_test.cpp
index d684da3cd1..dd4741258c 100644
--- a/generator/generator_tests/osm_id_test.cpp
+++ b/generator/generator_tests/osm_id_test.cpp
@@ -1,9 +1,9 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../osm_id.hpp"
-#include "../feature_builder.hpp"
+#include "generator/osm_id.hpp"
+#include "generator/feature_builder.hpp"
 
-#include "../../base/logging.hpp"
+#include "base/logging.hpp"
 
 using namespace osm;
 
diff --git a/generator/generator_tests/osm_parser_test.cpp b/generator/generator_tests/osm_parser_test.cpp
index 0bd29e072b..1873de375b 100644
--- a/generator/generator_tests/osm_parser_test.cpp
+++ b/generator/generator_tests/osm_parser_test.cpp
@@ -1,12 +1,12 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../osm_xml_parser.hpp"
-#include "../borders_generator.hpp"
+#include "generator/osm_xml_parser.hpp"
+#include "generator/borders_generator.hpp"
 
-#include "../../coding/reader.hpp"
-#include "../../coding/parse_xml.hpp"
-#include "../../coding/file_reader.hpp"
-#include "../../coding/file_writer.hpp"
+#include "coding/reader.hpp"
+#include "coding/parse_xml.hpp"
+#include "coding/file_reader.hpp"
+#include "coding/file_writer.hpp"
 
 using namespace osm;
 
diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp
index fd3f19281a..77221cadaa 100644
--- a/generator/generator_tests/osm_type_test.cpp
+++ b/generator/generator_tests/osm_type_test.cpp
@@ -1,15 +1,15 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../xml_element.hpp"
-#include "../osm2type.hpp"
+#include "generator/xml_element.hpp"
+#include "generator/osm2type.hpp"
 
-#include "../../routing/vehicle_model.hpp"
+#include "routing/vehicle_model.hpp"
 
-#include "../../indexer/feature_data.hpp"
-#include "../../indexer/classificator.hpp"
-#include "../../indexer/classificator_loader.hpp"
+#include "indexer/feature_data.hpp"
+#include "indexer/classificator.hpp"
+#include "indexer/classificator_loader.hpp"
 
-#include "../../std/iostream.hpp"
+#include "std/iostream.hpp"
 
 
 namespace
diff --git a/generator/generator_tests/tesselator_test.cpp b/generator/generator_tests/tesselator_test.cpp
index 30dea69273..86f235714f 100644
--- a/generator/generator_tests/tesselator_test.cpp
+++ b/generator/generator_tests/tesselator_test.cpp
@@ -1,8 +1,8 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../tesselator.hpp"
+#include "generator/tesselator.hpp"
 
-#include "../../base/logging.hpp"
+#include "base/logging.hpp"
 
 
 namespace
diff --git a/generator/generator_tests/triangles_tree_coding_test.cpp b/generator/generator_tests/triangles_tree_coding_test.cpp
index 2f7fee60fe..dd90fbe992 100644
--- a/generator/generator_tests/triangles_tree_coding_test.cpp
+++ b/generator/generator_tests/triangles_tree_coding_test.cpp
@@ -1,14 +1,14 @@
-#include "../tesselator.hpp"
+#include "generator/tesselator.hpp"
 
-#include "../../indexer/geometry_serialization.hpp"
-#include "../../indexer/mercator.hpp"
-#include "../../indexer/point_to_int64.hpp"
-#include "../../indexer/coding_params.hpp"
+#include "indexer/geometry_serialization.hpp"
+#include "indexer/mercator.hpp"
+#include "indexer/point_to_int64.hpp"
+#include "indexer/coding_params.hpp"
 
-#include "../../coding/reader.hpp"
-#include "../../coding/writer.hpp"
+#include "coding/reader.hpp"
+#include "coding/writer.hpp"
 
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
 
 namespace
diff --git a/generator/generator_tool/generator_tool.cpp b/generator/generator_tool/generator_tool.cpp
index 233d8f22e3..060ac0e275 100644
--- a/generator/generator_tool/generator_tool.cpp
+++ b/generator/generator_tool/generator_tool.cpp
@@ -1,34 +1,34 @@
-#include "../feature_generator.hpp"
-#include "../feature_sorter.hpp"
-#include "../update_generator.hpp"
-#include "../borders_generator.hpp"
-#include "../borders_loader.hpp"
-#include "../dumper.hpp"
-#include "../statistics.hpp"
-#include "../unpack_mwm.hpp"
-#include "../generate_info.hpp"
-#include "../check_model.hpp"
-#include "../routing_generator.hpp"
-#include "../osm_source.hpp"
+#include "generator/feature_generator.hpp"
+#include "generator/feature_sorter.hpp"
+#include "generator/update_generator.hpp"
+#include "generator/borders_generator.hpp"
+#include "generator/borders_loader.hpp"
+#include "generator/dumper.hpp"
+#include "generator/statistics.hpp"
+#include "generator/unpack_mwm.hpp"
+#include "generator/generate_info.hpp"
+#include "generator/check_model.hpp"
+#include "generator/routing_generator.hpp"
+#include "generator/osm_source.hpp"
 
-#include "../../indexer/drawing_rules.hpp"
-#include "../../indexer/classificator_loader.hpp"
-#include "../../indexer/classificator.hpp"
-#include "../../indexer/data_header.hpp"
-#include "../../indexer/features_vector.hpp"
-#include "../../indexer/index_builder.hpp"
-#include "../../indexer/search_index_builder.hpp"
+#include "indexer/drawing_rules.hpp"
+#include "indexer/classificator_loader.hpp"
+#include "indexer/classificator.hpp"
+#include "indexer/data_header.hpp"
+#include "indexer/features_vector.hpp"
+#include "indexer/index_builder.hpp"
+#include "indexer/search_index_builder.hpp"
 
-#include "../../defines.hpp"
+#include "defines.hpp"
 
-#include "../../platform/platform.hpp"
+#include "platform/platform.hpp"
 
-#include "../../3party/gflags/src/gflags/gflags.h"
+#include "3party/gflags/src/gflags/gflags.h"
 
-#include "../../std/iostream.hpp"
-#include "../../std/fstream.hpp"
-#include "../../std/iomanip.hpp"
-#include "../../std/numeric.hpp"
+#include "std/iostream.hpp"
+#include "std/fstream.hpp"
+#include "std/iomanip.hpp"
+#include "std/numeric.hpp"
 
 DEFINE_bool(generate_update, false,
               "If specified, update.maps file will be generated from cells in the data path");
diff --git a/generator/kml_parser.cpp b/generator/kml_parser.cpp
index b39bc1da6b..2fd2f5b28f 100644
--- a/generator/kml_parser.cpp
+++ b/generator/kml_parser.cpp
@@ -1,21 +1,21 @@
-#include "generator/kml_parser.hpp"
-#include "generator/feature_sorter.hpp"
+#include "generator/generator/kml_parser.hpp"
+#include "generator/generator/feature_sorter.hpp"
 
-#include "base/string_utils.hpp"
-#include "base/logging.hpp"
+#include "generator/base/string_utils.hpp"
+#include "generator/base/logging.hpp"
 
-#include "coding/parse_xml.hpp"
-#include "coding/file_reader.hpp"
+#include "generator/coding/parse_xml.hpp"
+#include "generator/coding/file_reader.hpp"
 
-#include "geometry/rect2d.hpp"
-#include "geometry/cellid.hpp"
+#include "generator/geometry/rect2d.hpp"
+#include "generator/geometry/cellid.hpp"
 
-#include "indexer/cell_id.hpp"
-#include "indexer/mercator.hpp"
-#include "indexer/feature.hpp"
-#include "indexer/covering.hpp"
+#include "generator/indexer/cell_id.hpp"
+#include "generator/indexer/mercator.hpp"
+#include "generator/indexer/feature.hpp"
+#include "generator/indexer/covering.hpp"
 
-#include "std/fstream.hpp"
+#include "generator/std/fstream.hpp"
 
 #define MIN_SIMPLIFIED_POINTS_COUNT 4
 
diff --git a/generator/kml_parser.hpp b/generator/kml_parser.hpp
index 5f9a40c764..45b8c813da 100644
--- a/generator/kml_parser.hpp
+++ b/generator/kml_parser.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "std/string.hpp"
+#include "generator/std/string.hpp"
 
 class PolygonsContainerT;
 
diff --git a/generator/osm2meta.cpp b/generator/osm2meta.cpp
index c6afb392f2..59bea11b58 100644
--- a/generator/osm2meta.cpp
+++ b/generator/osm2meta.cpp
@@ -1 +1 @@
-#include "generator/osm2meta.hpp"
+#include "generator/generator/osm2meta.hpp"