69 files changed, 377 insertions, 333 deletions

diff --git a/3party/3party.pro b/3party/3party.pro
index e58611705e..27584e3b46 100644
--- a/3party/3party.pro
+++ b/3party/3party.pro
@@ -4,11 +4,7 @@ TEMPLATE = subdirs
 
 SUBDIRS = expat freetype fribidi zlib bzip2 jansson protobuf tomcrypt
 
-!iphonesimulator-g++42 {
-  !iphonedevice-g++42 {
-    !bada-simulator {
-      SUBDIRS += gflags \
-                 sgitess
-      }
-   }
+!iphone*:!bada* {
+  SUBDIRS += gflags \
+             sgitess
 }
diff --git a/bada_sloynik/Sloynik/.badaprj b/bada/Sloynik/.badaprj
index e8a76d2432..e8a76d2432 100644
--- a/bada_sloynik/Sloynik/.badaprj
+++ b/bada/Sloynik/.badaprj
diff --git a/bada_sloynik/Sloynik/.cproject b/bada/Sloynik/.cproject
index 1f4b5ee188..1f4b5ee188 100644
--- a/bada_sloynik/Sloynik/.cproject
+++ b/bada/Sloynik/.cproject
diff --git a/bada_sloynik/Sloynik/.project b/bada/Sloynik/.project
index d292382d93..d292382d93 100644
--- a/bada_sloynik/Sloynik/.project
+++ b/bada/Sloynik/.project
diff --git a/bada_sloynik/Sloynik/Home/index.dup.idx b/bada/Sloynik/Home/index.dup.idx
index d12130b440..d12130b440 100644
--- a/bada_sloynik/Sloynik/Home/index.dup.idx
+++ b/bada/Sloynik/Home/index.dup.idx
diff --git a/bada_sloynik/Sloynik/Home/index.stamp.idx b/bada/Sloynik/Home/index.stamp.idx
index d55fe85ee9..d55fe85ee9 100644
--- a/bada_sloynik/Sloynik/Home/index.stamp.idx
+++ b/bada/Sloynik/Home/index.stamp.idx
diff --git a/bada_sloynik/Sloynik/Home/index.uni.idx b/bada/Sloynik/Home/index.uni.idx
index 29f42f0ee1..29f42f0ee1 100644
--- a/bada_sloynik/Sloynik/Home/index.uni.idx
+++ b/bada/Sloynik/Home/index.uni.idx
diff --git a/bada_sloynik/Sloynik/Home/wordnet.slf b/bada/Sloynik/Home/wordnet.slf
index 0c94ae6f20..0c94ae6f20 100644
--- a/bada_sloynik/Sloynik/Home/wordnet.slf
+++ b/bada/Sloynik/Home/wordnet.slf
diff --git a/bada_sloynik/Sloynik/Icons/Sloynik.png b/bada/Sloynik/Icons/Sloynik.png
index 3a220c0fcd..3a220c0fcd 100644
--- a/bada_sloynik/Sloynik/Icons/Sloynik.png
+++ b/bada/Sloynik/Icons/Sloynik.png
diff --git a/bada_sloynik/Sloynik/Res/480x800/IDF_SEARCHFORM.xml b/bada/Sloynik/Res/480x800/IDF_SEARCHFORM.xml
index 9b3c397be8..9b3c397be8 100644
--- a/bada_sloynik/Sloynik/Res/480x800/IDF_SEARCHFORM.xml
+++ b/bada/Sloynik/Res/480x800/IDF_SEARCHFORM.xml
diff --git a/bada_sloynik/Sloynik/Res/eng-GB.xml b/bada/Sloynik/Res/eng-GB.xml
index 4f8989f0c5..4f8989f0c5 100644
--- a/bada_sloynik/Sloynik/Res/eng-GB.xml
+++ b/bada/Sloynik/Res/eng-GB.xml
diff --git a/bada_sloynik/Sloynik/application.xml b/bada/Sloynik/application.xml
index dcf88f9dd1..dcf88f9dd1 100644
--- a/bada_sloynik/Sloynik/application.xml
+++ b/bada/Sloynik/application.xml
diff --git a/bada_sloynik/Sloynik/inc/ArticleForm.h b/bada/Sloynik/inc/ArticleForm.h
index 2d7fb0ed2f..2d7fb0ed2f 100644
--- a/bada_sloynik/Sloynik/inc/ArticleForm.h
+++ b/bada/Sloynik/inc/ArticleForm.h
diff --git a/bada_sloynik/Sloynik/inc/SearchForm.h b/bada/Sloynik/inc/SearchForm.h
index a28e58ef18..a28e58ef18 100644
--- a/bada_sloynik/Sloynik/inc/SearchForm.h
+++ b/bada/Sloynik/inc/SearchForm.h
diff --git a/bada_sloynik/Sloynik/inc/Sloynik.h b/bada/Sloynik/inc/Sloynik.h
index 132b3bdfb6..132b3bdfb6 100644
--- a/bada_sloynik/Sloynik/inc/Sloynik.h
+++ b/bada/Sloynik/inc/Sloynik.h
diff --git a/bada_sloynik/Sloynik/manifest.xml b/bada/Sloynik/manifest.xml
index 8284453a98..8284453a98 100644
--- a/bada_sloynik/Sloynik/manifest.xml
+++ b/bada/Sloynik/manifest.xml
diff --git a/bada_sloynik/Sloynik/src/ArticleForm.cpp b/bada/Sloynik/src/ArticleForm.cpp
index 30dd84f7e0..30dd84f7e0 100644
--- a/bada_sloynik/Sloynik/src/ArticleForm.cpp
+++ b/bada/Sloynik/src/ArticleForm.cpp
diff --git a/bada_sloynik/Sloynik/src/SearchForm.cpp b/bada/Sloynik/src/SearchForm.cpp
index 705559c937..705559c937 100644
--- a/bada_sloynik/Sloynik/src/SearchForm.cpp
+++ b/bada/Sloynik/src/SearchForm.cpp
diff --git a/bada_sloynik/Sloynik/src/Sloynik.cpp b/bada/Sloynik/src/Sloynik.cpp
index d87912f0a1..d87912f0a1 100644
--- a/bada_sloynik/Sloynik/src/Sloynik.cpp
+++ b/bada/Sloynik/src/Sloynik.cpp
diff --git a/bada_sloynik/Sloynik/src/SloynikEntry.cpp b/bada/Sloynik/src/SloynikEntry.cpp
index f100f5c01c..f100f5c01c 100644
--- a/bada_sloynik/Sloynik/src/SloynikEntry.cpp
+++ b/bada/Sloynik/src/SloynikEntry.cpp
diff --git a/bada_sloynik/releases/bada_challenge_2010/Sloynik_Simulator-Debug.zip b/bada/releases/bada_challenge_2010/Sloynik_Simulator-Debug.zip
index 2016db4ea9..2016db4ea9 100644
--- a/bada_sloynik/releases/bada_challenge_2010/Sloynik_Simulator-Debug.zip
+++ b/bada/releases/bada_challenge_2010/Sloynik_Simulator-Debug.zip
diff --git a/data/03_jomolhari-id-a3d.ttf b/data/03_jomolhari-id-a3d.ttf
index b5d63ade40..b5d63ade40 100755..100644
--- a/data/03_jomolhari-id-a3d.ttf
+++ b/data/03_jomolhari-id-a3d.ttf
diff --git a/indexer/classif_routine.cpp b/generator/classif_routine.cpp
index 5b5397912d..dd9a6248e7 100644
--- a/indexer/classif_routine.cpp
+++ b/generator/classif_routine.cpp
@@ -1,30 +1,22 @@
 #include "classif_routine.hpp"
-#include "classificator.hpp"
-#include "drawing_rules.hpp"
+#include "osm2type.hpp"
 
-#include "../indexer/osm2type.hpp"
-#include "../indexer/scales.hpp"
+#include "../indexer/classificator.hpp"
+#include "../indexer/drawing_rules.hpp"
 
-#include "../coding/reader.hpp"
+//#include "../indexer/scales.hpp"
 
-#include "../base/logging.hpp"
+//#include "../coding/reader.hpp"
 
-#include "../std/stdio.hpp"
+//#include "../base/logging.hpp"
 
-#include "../base/start_mem_debug.hpp"
+//#include "../std/stdio.hpp"
+
+//#include "../base/start_mem_debug.hpp"
 
 
 namespace classificator
 {
-  void Read(string const & rules, string const & classificator, string const & visibility)
-  {
-    drule::ReadRules(rules.c_str());
-    if (!classif().ReadClassificator(classificator.c_str()))
-      MYTHROW(Reader::OpenException, ("drawing rules or classificator file"));
-
-    (void)classif().ReadVisibility(visibility.c_str());
-  }
-
   void parse_osm_types(int start, int end, string const & path)
   {
     for (int i = start; i <= end; ++i)
diff --git a/generator/classif_routine.hpp b/generator/classif_routine.hpp
new file mode 100644
index 0000000000..0dc158a783
--- /dev/null
+++ b/generator/classif_routine.hpp
@@ -0,0 +1,9 @@
+#pragma once
+
+#include "../std/string.hpp"
+
+namespace classificator
+{
+  void GenerateAndWrite(string const & dir);
+  void PrepareForFeatureGeneration();
+}
diff --git a/indexer/indexer_tool/data_cache_file.hpp b/generator/data_cache_file.hpp
index 54a71fdb36..086b70804b 100644
--- a/indexer/indexer_tool/data_cache_file.hpp
+++ b/generator/data_cache_file.hpp
@@ -1,19 +1,19 @@
 #pragma once
 
-#include "../../indexer/file_reader_stream.hpp"
-#include "../../indexer/file_writer_stream.hpp"
-#include "../../indexer/osm_decl.hpp"
+#include "../indexer/file_reader_stream.hpp"
+#include "../indexer/file_writer_stream.hpp"
+#include "../indexer/osm_decl.hpp"
 
-#include "../../coding/file_reader.hpp"
-#include "../../coding/file_writer.hpp"
+#include "../coding/file_reader.hpp"
+#include "../coding/file_writer.hpp"
 
-#include "../../base/logging.hpp"
+#include "../base/logging.hpp"
 
-#include "../../std/utility.hpp"
-#include "../../std/vector.hpp"
-#include "../../std/algorithm.hpp"
-#include "../../std/limits.hpp"
-#include "../../std/exception.hpp"
+#include "../std/utility.hpp"
+#include "../std/vector.hpp"
+#include "../std/algorithm.hpp"
+#include "../std/limits.hpp"
+#include "../std/exception.hpp"
 
 
 /// Classes for reading and writing any data in file with map of offsets for
diff --git a/indexer/indexer_tool/data_generator.cpp b/generator/data_generator.cpp
index aaf7a37281..b02fd9551c 100644
--- a/indexer/indexer_tool/data_generator.cpp
+++ b/generator/data_generator.cpp
@@ -2,14 +2,14 @@
 #include "data_cache_file.hpp"
 #include "first_pass_parser.hpp"
 
-#include "../../indexer/osm_decl.hpp"
+#include "../indexer/osm_decl.hpp"
 
-#include "../../base/std_serialization.hpp"
-#include "../../base/logging.hpp"
+#include "../base/std_serialization.hpp"
+#include "../base/logging.hpp"
 
-#include "../../std/bind.hpp"
+#include "../std/bind.hpp"
 
-#include "../../base/start_mem_debug.hpp"
+#include "../base/start_mem_debug.hpp"
 
 
 namespace data
diff --git a/indexer/indexer_tool/data_generator.hpp b/generator/data_generator.hpp
index f31dd08189..c836c9feed 100644
--- a/indexer/indexer_tool/data_generator.hpp
+++ b/generator/data_generator.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../std/string.hpp"
+#include "../std/string.hpp"
 
 namespace data
 {
diff --git a/indexer/indexer_tool/feature_bucketer.hpp b/generator/feature_bucketer.hpp
index 34de0e8d80..786421c438 100644
--- a/indexer/indexer_tool/feature_bucketer.hpp
+++ b/generator/feature_bucketer.hpp
@@ -2,15 +2,15 @@
 
 #include "world_map_generator.hpp"
 
-#include "../../base/base.hpp"
+#include "../base/base.hpp"
 
-#include "../../coding/file_writer.hpp"
+#include "../coding/file_writer.hpp"
 
-#include "../../geometry/rect2d.hpp"
+#include "../geometry/rect2d.hpp"
 
-#include "../../indexer/feature.hpp"
+#include "../indexer/feature.hpp"
 
-#include "../../std/string.hpp"
+#include "../std/string.hpp"
 
 namespace feature
 {
diff --git a/indexer/indexer_tool/feature_generator.cpp b/generator/feature_generator.cpp
index c14c3b3b1b..4d38c84a46 100644
--- a/indexer/indexer_tool/feature_generator.cpp
+++ b/generator/feature_generator.cpp
@@ -4,21 +4,21 @@
 #include "osm_element.hpp"
 #include "polygonizer.hpp"
 
-#include "../../defines.hpp"
+#include "../defines.hpp"
 
-#include "../../indexer/data_header.hpp"
-#include "../../indexer/osm_decl.hpp"
-#include "../../indexer/mercator.hpp"
-#include "../../indexer/cell_id.hpp"
+#include "../indexer/data_header.hpp"
+#include "../indexer/osm_decl.hpp"
+#include "../indexer/mercator.hpp"
+#include "../indexer/cell_id.hpp"
 
-#include "../../coding/varint.hpp"
+#include "../coding/varint.hpp"
 
-#include "../../base/assert.hpp"
-#include "../../base/logging.hpp"
-#include "../../base/stl_add.hpp"
+#include "../base/assert.hpp"
+#include "../base/logging.hpp"
+#include "../base/stl_add.hpp"
 
-#include "../../std/bind.hpp"
-#include "../../std/unordered_map.hpp"
+#include "../std/bind.hpp"
+#include "../std/unordered_map.hpp"
 
 
 namespace feature
diff --git a/indexer/indexer_tool/feature_generator.hpp b/generator/feature_generator.hpp
index 2aec7d6991..802aae8598 100644
--- a/indexer/indexer_tool/feature_generator.hpp
+++ b/generator/feature_generator.hpp
@@ -1,13 +1,13 @@
 #pragma once
 
-#include "../../indexer/osm_decl.hpp"
+#include "../indexer/osm_decl.hpp"
 
-#include "../../geometry/rect2d.hpp"
+#include "../geometry/rect2d.hpp"
 
-#include "../../coding/file_container.hpp"
+#include "../coding/file_container.hpp"
 
-#include "../../std/vector.hpp"
-#include "../../std/string.hpp"
+#include "../std/vector.hpp"
+#include "../std/string.hpp"
 
 class FeatureBuilder1;
 
diff --git a/indexer/feature_merger.cpp b/generator/feature_merger.cpp
index b4ecbf82fc..b4ecbf82fc 100644
--- a/indexer/feature_merger.cpp
+++ b/generator/feature_merger.cpp
diff --git a/indexer/feature_merger.hpp b/generator/feature_merger.hpp
index b64d2b8fd2..103c43bad5 100644
--- a/indexer/feature_merger.hpp
+++ b/generator/feature_merger.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "feature.hpp"
+#include "../indexer/feature.hpp"
 
 class FeatureBuilder1Merger : public FeatureBuilder1
 {
diff --git a/indexer/indexer_tool/feature_sorter.cpp b/generator/feature_sorter.cpp
index 54dfa2a0e7..467da10d09 100644
--- a/indexer/indexer_tool/feature_sorter.cpp
+++ b/generator/feature_sorter.cpp
@@ -1,25 +1,25 @@
 #include "feature_sorter.hpp"
 #include "feature_generator.hpp"
 
-#include "../../defines.hpp"
+#include "../defines.hpp"
 
-#include "../../indexer/data_header.hpp"
-#include "../../indexer/feature_processor.hpp"
-#include "../../indexer/feature_visibility.hpp"
-#include "../../indexer/feature_impl.hpp"
-#include "../../indexer/geometry_serialization.hpp"
-#include "../../indexer/tesselator.hpp"
+#include "../indexer/data_header.hpp"
+#include "../indexer/feature_processor.hpp"
+#include "../indexer/feature_visibility.hpp"
+#include "../indexer/feature_impl.hpp"
+#include "../indexer/geometry_serialization.hpp"
+#include "../indexer/tesselator.hpp"
 
-#include "../../geometry/polygon.hpp"
+#include "../geometry/polygon.hpp"
 
-#include "../../platform/platform.hpp"
+#include "../platform/platform.hpp"
 
-#include "../../coding/file_container.hpp"
+#include "../coding/file_container.hpp"
 
-#include "../../base/string_utils.hpp"
-#include "../../base/logging.hpp"
+#include "../base/string_utils.hpp"
+#include "../base/logging.hpp"
 
-#include "../../base/start_mem_debug.hpp"
+#include "../base/start_mem_debug.hpp"
 
 
 namespace
diff --git a/indexer/indexer_tool/feature_sorter.hpp b/generator/feature_sorter.hpp
index 95f8241df8..5f111f91eb 100644
--- a/indexer/indexer_tool/feature_sorter.hpp
+++ b/generator/feature_sorter.hpp
@@ -1,13 +1,13 @@
 #pragma once
 
-#include "../../geometry/point2d.hpp"
-#include "../../geometry/simplification.hpp"
-#include "../../geometry/distance.hpp"
+#include "../geometry/point2d.hpp"
+#include "../geometry/simplification.hpp"
+#include "../geometry/distance.hpp"
 
-#include "../../indexer/scales.hpp"
+#include "../indexer/scales.hpp"
 
-#include "../../std/string.hpp"
-#include "../../std/vector.hpp"
+#include "../std/string.hpp"
+#include "../std/vector.hpp"
 
 namespace feature
 {
diff --git a/indexer/indexer_tool/first_pass_parser.hpp b/generator/first_pass_parser.hpp
index 1b24ff994a..cbea6fac04 100644
--- a/indexer/indexer_tool/first_pass_parser.hpp
+++ b/generator/first_pass_parser.hpp
@@ -1,10 +1,11 @@
 #pragma once
 
-#include "../../indexer/xml_element.hpp"
-#include "../../indexer/osm_decl.hpp"
-#include "../../indexer/mercator.hpp"
+#include "xml_element.hpp"
 
-#include "../../base/string_utils.hpp"
+#include "../indexer/osm_decl.hpp"
+#include "../indexer/mercator.hpp"
+
+#include "../base/string_utils.hpp"
 
 
 template <class THolder>
diff --git a/generator/generator.pro b/generator/generator.pro
new file mode 100644
index 0000000000..d6b3122152
--- /dev/null
+++ b/generator/generator.pro
@@ -0,0 +1,44 @@
+# Library to use in Generator Tool
+
+TARGET = generator
+TEMPLATE = lib
+CONFIG += staticlib
+
+ROOT_DIR = ..
+DEPENDENCIES = indexer geometry coding base expat
+
+include($$ROOT_DIR/common.pri)
+
+QT += core
+
+SOURCES += \
+    feature_merger.cpp \
+    xml_element.cpp \
+    data_generator.cpp \
+    feature_generator.cpp \
+    feature_sorter.cpp \
+    update_generator.cpp \
+    grid_generator.cpp \
+    statistics.cpp \
+    kml_parser.cpp \
+    osm2type.cpp \
+    classif_routine.cpp \
+
+HEADERS += \
+    feature_merger.hpp \
+    xml_element.hpp \
+    feature_bucketer.hpp \
+    osm_element.hpp \
+    data_generator.hpp \
+    feature_generator.hpp \
+    first_pass_parser.hpp \
+    data_cache_file.hpp \
+    feature_sorter.hpp \
+    update_generator.hpp \
+    grid_generator.hpp \
+    statistics.hpp \
+    kml_parser.hpp \
+    polygonizer.hpp \
+    world_map_generator.hpp \
+    osm2type.hpp \
+    classif_routine.hpp \
diff --git a/indexer/indexer_tests/feature_bucketer_test.cpp b/generator/generator_tests/feature_bucketer_test.cpp
index 7c449dca3f..eee746f76c 100644
--- a/indexer/indexer_tests/feature_bucketer_test.cpp
+++ b/generator/generator_tests/feature_bucketer_test.cpp
@@ -1,12 +1,12 @@
-#include "feature_routine.hpp"
-
 #include "../../testing/testing.hpp"
 
-#include "../indexer_tool/feature_bucketer.hpp"
+#include "../feature_bucketer.hpp"
+
+#include "../../indexer/feature.hpp"
+#include "../../indexer/mercator.hpp"
+#include "../../indexer/cell_id.hpp"
 
-#include "../feature.hpp"
-#include "../mercator.hpp"
-#include "../cell_id.hpp"
+#include "../../indexer/indexer_tests/feature_routine.hpp"
 
 #include "../../base/stl_add.hpp"
 
diff --git a/generator/generator_tests/generator_tests.pro b/generator/generator_tests/generator_tests.pro
new file mode 100644
index 0000000000..a9df30da98
--- /dev/null
+++ b/generator/generator_tests/generator_tests.pro
@@ -0,0 +1,23 @@
+TARGET = generator_tests
+CONFIG += console
+CONFIG -= app_bundle
+TEMPLATE = app
+
+ROOT_DIR = ../..
+DEPENDENCIES = map generator indexer platform geometry coding base expat sgitess
+
+include($$ROOT_DIR/common.pri)
+
+QT *= core
+
+win32-g++ {
+  LIBS += -lpthread
+}
+
+HEADERS += \
+    ../../indexer/indexer_tests/feature_routine.hpp \
+
+SOURCES += \
+    ../../testing/testingmain.cpp \
+    ../../indexer/indexer_tests/feature_routine.cpp \
+    feature_bucketer_test.cpp \
diff --git a/indexer/indexer_tool/indexer_tool.cpp b/generator/generator_tool/generator_tool.cpp
index cf491d974a..a8734bbba0 100644
--- a/indexer/indexer_tool/indexer_tool.cpp
+++ b/generator/generator_tool/generator_tool.cpp
@@ -1,16 +1,17 @@
-#include "data_generator.hpp"
-#include "feature_generator.hpp"
-#include "feature_sorter.hpp"
-#include "update_generator.hpp"
-#include "feature_bucketer.hpp"
-#include "grid_generator.hpp"
-#include "statistics.hpp"
-
+#include "../data_generator.hpp"
+#include "../feature_generator.hpp"
+#include "../feature_sorter.hpp"
+#include "../update_generator.hpp"
+#include "../feature_bucketer.hpp"
+#include "../grid_generator.hpp"
+#include "../statistics.hpp"
 #include "../classif_routine.hpp"
-#include "../features_vector.hpp"
-#include "../index_builder.hpp"
-#include "../osm_decl.hpp"
-#include "../data_header.hpp"
+
+#include "../../indexer/features_vector.hpp"
+#include "../../indexer/index_builder.hpp"
+#include "../../indexer/osm_decl.hpp"
+#include "../../indexer/data_header.hpp"
+#include "../../indexer/classificator_loader.hpp"
 
 #include "../../defines.hpp"
 
diff --git a/generator/generator_tool/generator_tool.pro b/generator/generator_tool/generator_tool.pro
new file mode 100644
index 0000000000..460772d87f
--- /dev/null
+++ b/generator/generator_tool/generator_tool.pro
@@ -0,0 +1,22 @@
+# Generator binary
+
+ROOT_DIR = ../..
+DEPENDENCIES = map storage generator indexer platform geometry coding base gflags expat sgitess version
+
+include($$ROOT_DIR/common.pri)
+
+CONFIG += console
+CONFIG -= app_bundle
+TEMPLATE = app
+
+# needed for Platform::WorkingDir()
+QT += core
+
+win32 {
+  LIBS += -lShell32
+}
+
+SOURCES += \
+    generator_tool.cpp \
+
+HEADERS += \
diff --git a/indexer/indexer_tool/grid_generator.cpp b/generator/grid_generator.cpp
index 0f4f6c5df0..b3f3e9ade2 100644
--- a/indexer/indexer_tool/grid_generator.cpp
+++ b/generator/grid_generator.cpp
@@ -1,9 +1,9 @@
 #include "grid_generator.hpp"
 
-#include "../../base/logging.hpp"
+#include "../base/logging.hpp"
 
-#include "../../indexer/cell_id.hpp"
-#include "../../indexer/mercator.hpp"
+#include "../indexer/cell_id.hpp"
+#include "../indexer/mercator.hpp"
 
 // tags used for grid drawing
 #define GRIDKEY "mapswithme"
diff --git a/indexer/indexer_tool/grid_generator.hpp b/generator/grid_generator.hpp
index 3255f8667c..a1bdc31e45 100644
--- a/indexer/indexer_tool/grid_generator.hpp
+++ b/generator/grid_generator.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../std/iostream.hpp"
+#include "../std/iostream.hpp"
 
 namespace grid
 {
diff --git a/indexer/indexer_tool/kml_parser.cpp b/generator/kml_parser.cpp
index b4c92bd868..55f4402354 100644
--- a/indexer/indexer_tool/kml_parser.cpp
+++ b/generator/kml_parser.cpp
@@ -1,21 +1,21 @@
 #include "kml_parser.hpp"
 #include "feature_sorter.hpp"
 
-#include "../../base/string_utils.hpp"
-#include "../../base/logging.hpp"
+#include "../base/string_utils.hpp"
+#include "../base/logging.hpp"
 
-#include "../../coding/parse_xml.hpp"
-#include "../../coding/file_reader.hpp"
+#include "../coding/parse_xml.hpp"
+#include "../coding/file_reader.hpp"
 
-#include "../../geometry/rect2d.hpp"
-#include "../../geometry/cellid.hpp"
+#include "../geometry/rect2d.hpp"
+#include "../geometry/cellid.hpp"
 
-#include "../../indexer/cell_id.hpp"
-#include "../../indexer/mercator.hpp"
-#include "../../indexer/feature.hpp"
-#include "../../indexer/covering.hpp"
+#include "../indexer/cell_id.hpp"
+#include "../indexer/mercator.hpp"
+#include "../indexer/feature.hpp"
+#include "../indexer/covering.hpp"
 
-#include "../../std/fstream.hpp"
+#include "../std/fstream.hpp"
 
 #define POLYGONS_FILE "polygons.lst"
 #define BORDERS_DIR "borders/"
diff --git a/indexer/indexer_tool/kml_parser.hpp b/generator/kml_parser.hpp
index e09bd1e813..25a0e9d5da 100644
--- a/indexer/indexer_tool/kml_parser.hpp
+++ b/generator/kml_parser.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "../../geometry/region2d.hpp"
-#include "../../geometry/tree4d.hpp"
+#include "../geometry/region2d.hpp"
+#include "../geometry/tree4d.hpp"
 
-#include "../../std/string.hpp"
+#include "../std/string.hpp"
 
 
 namespace kml
diff --git a/indexer/osm2type.cpp b/generator/osm2type.cpp
index 453ae749d6..16513a69d6 100644
--- a/indexer/osm2type.cpp
+++ b/generator/osm2type.cpp
@@ -1,9 +1,10 @@
 #include "osm2type.hpp"
-#include "classificator.hpp"
-#include "drawing_rules.hpp"
-#include "feature_visibility.hpp"
 #include "xml_element.hpp"
 
+#include "../indexer/classificator.hpp"
+#include "../indexer/drawing_rules.hpp"
+#include "../indexer/feature_visibility.hpp"
+
 #include "../coding/parse_xml.hpp"
 #include "../coding/file_reader.hpp"
 
diff --git a/indexer/osm2type.hpp b/generator/osm2type.hpp
index 6a2449c29d..6a2449c29d 100644
--- a/indexer/osm2type.hpp
+++ b/generator/osm2type.hpp
diff --git a/indexer/indexer_tool/osm_element.hpp b/generator/osm_element.hpp
index a55abcf622..4a213946f7 100644
--- a/indexer/indexer_tool/osm_element.hpp
+++ b/generator/osm_element.hpp
@@ -1,21 +1,22 @@
 #pragma once
 
-#include "../../indexer/feature.hpp"
-#include "../../indexer/osm2type.hpp"
-#include "../../indexer/xml_element.hpp"
-#include "../../indexer/osm_decl.hpp"
-#include "../../indexer/feature_visibility.hpp"
-
-#include "../../base/string_utils.hpp"
-#include "../../base/logging.hpp"
-#include "../../base/stl_add.hpp"
-
-#include "../../std/unordered_map.hpp"
-#include "../../std/list.hpp"
-#include "../../std/set.hpp"
-#include "../../std/vector.hpp"
-
-#include "../../base/start_mem_debug.hpp"
+#include "osm2type.hpp"
+#include "xml_element.hpp"
+
+#include "../indexer/feature.hpp"
+#include "../indexer/osm_decl.hpp"
+#include "../indexer/feature_visibility.hpp"
+
+#include "../base/string_utils.hpp"
+#include "../base/logging.hpp"
+#include "../base/stl_add.hpp"
+
+#include "../std/unordered_map.hpp"
+#include "../std/list.hpp"
+#include "../std/set.hpp"
+#include "../std/vector.hpp"
+
+#include "../base/start_mem_debug.hpp"
 
 
 /// @param  TEmitter  Feature accumulating policy
diff --git a/indexer/indexer_tool/polygonizer.hpp b/generator/polygonizer.hpp
index a56b58e217..8ce1963780 100644
--- a/indexer/indexer_tool/polygonizer.hpp
+++ b/generator/polygonizer.hpp
@@ -1,16 +1,17 @@
 #pragma once
 #include "kml_parser.hpp"
 #include "world_map_generator.hpp"
-#include "../../indexer/feature.hpp"
-#include "../../indexer/feature_visibility.hpp"
-#include "../../indexer/cell_id.hpp"
-#include "../../geometry/rect2d.hpp"
-#include "../../coding/file_writer.hpp"
-#include "../../base/base.hpp"
-#include "../../base/buffer_vector.hpp"
-#include "../../base/macros.hpp"
-#include "../../std/scoped_ptr.hpp"
-#include "../../std/string.hpp"
+
+#include "../indexer/feature.hpp"
+#include "../indexer/feature_visibility.hpp"
+#include "../indexer/cell_id.hpp"
+#include "../geometry/rect2d.hpp"
+#include "../coding/file_writer.hpp"
+#include "../base/base.hpp"
+#include "../base/buffer_vector.hpp"
+#include "../base/macros.hpp"
+#include "../std/scoped_ptr.hpp"
+#include "../std/string.hpp"
 
 #ifndef PARALLEL_POLYGONIZER
 #define PARALLEL_POLYGONIZER 1
diff --git a/indexer/indexer_tool/statistics.cpp b/generator/statistics.cpp
index f78dec736b..84c99ea74a 100644
--- a/indexer/indexer_tool/statistics.cpp
+++ b/generator/statistics.cpp
@@ -1,16 +1,16 @@
-#include "../../base/SRC_FIRST.hpp"
+#include "../base/SRC_FIRST.hpp"
 
 #include "statistics.hpp"
 
-#include "../feature_processor.hpp"
-#include "../classificator.hpp"
-#include "../feature_impl.hpp"
+#include "../indexer/feature_processor.hpp"
+#include "../indexer/classificator.hpp"
+#include "../indexer/feature_impl.hpp"
 
-#include "../../base/string_utils.hpp"
+#include "../base/string_utils.hpp"
 
-#include "../../std/iostream.hpp"
+#include "../std/iostream.hpp"
 
-#include "../../base/start_mem_debug.hpp"
+#include "../base/start_mem_debug.hpp"
 
 
 namespace stats
diff --git a/indexer/indexer_tool/statistics.hpp b/generator/statistics.hpp
index ec199e865a..a4a73c03c1 100644
--- a/indexer/indexer_tool/statistics.hpp
+++ b/generator/statistics.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "../feature.hpp"
+#include "../indexer/feature.hpp"
 
-#include "../../std/map.hpp"
+#include "../std/map.hpp"
 
 
 namespace stats
diff --git a/indexer/indexer_tool/update_generator.cpp b/generator/update_generator.cpp
index d54fecd42e..59f9e54213 100644
--- a/indexer/indexer_tool/update_generator.cpp
+++ b/generator/update_generator.cpp
@@ -1,21 +1,21 @@
 #include "update_generator.hpp"
 
-#include "../../coding/file_writer.hpp"
+#include "../coding/file_writer.hpp"
 
-#include "../../geometry/cellid.hpp"
+#include "../geometry/cellid.hpp"
 
-#include "../../platform/platform.hpp"
+#include "../platform/platform.hpp"
 
-#include "../../storage/country.hpp"
-#include "../../defines.hpp"
+#include "../storage/country.hpp"
+#include "../defines.hpp"
 
-#include "../../base/string_utils.hpp"
-#include "../../base/logging.hpp"
-#include "../../base/macros.hpp"
+#include "../base/string_utils.hpp"
+#include "../base/logging.hpp"
+#include "../base/macros.hpp"
 
-#include "../../std/target_os.hpp"
-#include "../../std/fstream.hpp"
-#include "../../std/iterator.hpp"
+#include "../std/target_os.hpp"
+#include "../std/fstream.hpp"
+#include "../std/iterator.hpp"
 
 using namespace storage;
 
diff --git a/indexer/indexer_tool/update_generator.hpp b/generator/update_generator.hpp
index bc7a0f8c63..d7dad18ccb 100644
--- a/indexer/indexer_tool/update_generator.hpp
+++ b/generator/update_generator.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../std/string.hpp"
+#include "../std/string.hpp"
 
 namespace update
 {
diff --git a/indexer/indexer_tool/world_map_generator.hpp b/generator/world_map_generator.hpp
index 582d2d73dd..27ad626acd 100644
--- a/indexer/indexer_tool/world_map_generator.hpp
+++ b/generator/world_map_generator.hpp
@@ -1,20 +1,21 @@
 #pragma once
 
-#include "../../base/logging.hpp"
+#include "feature_merger.hpp"
 
-#include "../../defines.hpp"
+#include "../defines.hpp"
 
-#include "../../indexer/classificator.hpp"
-#include "../../indexer/feature.hpp"
-#include "../../indexer/feature_merger.hpp"
-#include "../../indexer/feature_visibility.hpp"
-#include "../../indexer/point_to_int64.hpp"
+#include "../base/logging.hpp"
 
-#include "../../std/map.hpp"
-#include "../../std/vector.hpp"
-#include "../../std/iostream.hpp"
-#include "../../std/scoped_ptr.hpp"
-#include "../../std/unordered_map.hpp"
+#include "../indexer/classificator.hpp"
+#include "../indexer/feature.hpp"
+#include "../indexer/feature_visibility.hpp"
+#include "../indexer/point_to_int64.hpp"
+
+#include "../std/map.hpp"
+#include "../std/vector.hpp"
+#include "../std/iostream.hpp"
+#include "../std/scoped_ptr.hpp"
+#include "../std/unordered_map.hpp"
 
 
 namespace m2
diff --git a/indexer/xml_element.cpp b/generator/xml_element.cpp
index 0a92750f6d..0a92750f6d 100644
--- a/indexer/xml_element.cpp
+++ b/generator/xml_element.cpp
diff --git a/indexer/xml_element.hpp b/generator/xml_element.hpp
index 966c0943bf..966c0943bf 100644
--- a/indexer/xml_element.hpp
+++ b/generator/xml_element.hpp
diff --git a/indexer/classificator_loader.cpp b/indexer/classificator_loader.cpp
new file mode 100644
index 0000000000..09bad4ad78
--- /dev/null
+++ b/indexer/classificator_loader.cpp
@@ -0,0 +1,17 @@
+#include "classificator_loader.hpp"
+#include "classificator.hpp"
+#include "drawing_rules.hpp"
+
+#include "../coding/reader.hpp"
+
+namespace classificator
+{
+  void Read(string const & rules, string const & classificator, string const & visibility)
+  {
+    drule::ReadRules(rules.c_str());
+    if (!classif().ReadClassificator(classificator.c_str()))
+      MYTHROW(Reader::OpenException, ("drawing rules or classificator file"));
+
+    (void)classif().ReadVisibility(visibility.c_str());
+  }
+}
diff --git a/indexer/classif_routine.hpp b/indexer/classificator_loader.hpp
index 2995963830..412e8a1d29 100644
--- a/indexer/classif_routine.hpp
+++ b/indexer/classificator_loader.hpp
@@ -5,6 +5,4 @@
 namespace classificator
 {
   void Read(string const & rules, string const & classificator, string const & visibility);
-  void GenerateAndWrite(string const & dir);
-  void PrepareForFeatureGeneration();
 }
diff --git a/indexer/indexer.pro b/indexer/indexer.pro
index 1ff0c3d763..6680c2fb95 100644
--- a/indexer/indexer.pro
+++ b/indexer/indexer.pro
@@ -11,58 +11,52 @@ include($$ROOT_DIR/common.pri)
 
 
 SOURCES += \
-  osm2type.cpp \
-  classificator.cpp \
-  drawing_rules.cpp \
-  drawing_rule_def.cpp \
-  scales.cpp \
-  osm_decl.cpp \
-  feature.cpp \
-  classif_routine.cpp \
-  xml_element.cpp \
-  scale_index.cpp \
-  covering.cpp \
-  point_to_int64.cpp \
-  mercator.cpp \
-  index_builder.cpp \
-  feature_visibility.cpp \
-  data_header.cpp \
-  geometry_coding.cpp \
-  geometry_serialization.cpp \
-  tesselator.cpp \
-  feature_merger.cpp \
+    classificator.cpp \
+    drawing_rules.cpp \
+    drawing_rule_def.cpp \
+    scales.cpp \
+    osm_decl.cpp \
+    feature.cpp \
+    classificator_loader.cpp \
+    scale_index.cpp \
+    covering.cpp \
+    point_to_int64.cpp \
+    mercator.cpp \
+    index_builder.cpp \
+    feature_visibility.cpp \
+    data_header.cpp \
+    geometry_coding.cpp \
+    geometry_serialization.cpp \
+    tesselator.cpp \
 
 HEADERS += \
-  feature.hpp \
-  cell_coverer.hpp \
-  cell_id.hpp \
-  osm2type.hpp \
-  classificator.hpp \
-  drawing_rules.hpp \
-  drawing_rule_def.hpp \
-  features_vector.hpp \
-  scale_index.hpp \
-  scale_index_builder.hpp \
-  index.hpp \
-  index_builder.hpp \
-  scales.hpp \
-  osm_decl.hpp \
-  classif_routine.hpp \
-  xml_element.hpp \
-  interval_index.hpp \
-  interval_index_builder.hpp \
-  covering.hpp \
-  mercator.hpp \
-  feature_processor.hpp \
-  file_reader_stream.hpp \
-  file_writer_stream.hpp \
-  feature_visibility.hpp \
-  data_header.hpp \
-  tree_structure.hpp \
-  feature_impl.hpp \
-  geometry_coding.hpp \
-  geometry_serialization.hpp \
-  point_to_int64.hpp \
-  tesselator.hpp \
-  tesselator_decl.hpp \
-  feature_merger.hpp \
+    feature.hpp \
+    cell_coverer.hpp \
+    cell_id.hpp \
+    classificator.hpp \
+    drawing_rules.hpp \
+    drawing_rule_def.hpp \
+    features_vector.hpp \
+    scale_index.hpp \
+    scale_index_builder.hpp \
+    index.hpp \
+    index_builder.hpp \
+    scales.hpp \
+    osm_decl.hpp \
+    classificator_loader.hpp \
+    interval_index.hpp \
+    interval_index_builder.hpp \
+    covering.hpp \
+    mercator.hpp \
+    feature_processor.hpp \
+    file_reader_stream.hpp \
+    file_writer_stream.hpp \
+    feature_visibility.hpp \
+    data_header.hpp \
+    tree_structure.hpp \
+    feature_impl.hpp \
+    geometry_coding.hpp \
+    geometry_serialization.hpp \
+    point_to_int64.hpp \
+    tesselator.hpp \
+    tesselator_decl.hpp \
diff --git a/indexer/indexer_tests/feature_routine.cpp b/indexer/indexer_tests/feature_routine.cpp
index 791f32bb54..70fa93c5ad 100644
--- a/indexer/indexer_tests/feature_routine.cpp
+++ b/indexer/indexer_tests/feature_routine.cpp
@@ -4,7 +4,7 @@
 
 #include "../../defines.hpp"    // just for file extensions
 
-#include "../geometry_serialization.hpp"
+#include "../../indexer/geometry_serialization.hpp"
 
 #include "../../coding/file_writer.hpp"
 
diff --git a/indexer/indexer_tests/feature_routine.hpp b/indexer/indexer_tests/feature_routine.hpp
index 2f90c80a10..6d8c939e6f 100644
--- a/indexer/indexer_tests/feature_routine.hpp
+++ b/indexer/indexer_tests/feature_routine.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../feature.hpp"
+#include "../../indexer/feature.hpp"
 
 void FeatureBuilder2Feature(FeatureBuilder2 & fb, FeatureType & f);
 void Feature2FeatureBuilder(FeatureType const & f, FeatureBuilder2 & fb);
diff --git a/indexer/indexer_tests/feature_test.cpp b/indexer/indexer_tests/feature_test.cpp
index 90629e6ce6..7b7f6a7420 100644
--- a/indexer/indexer_tests/feature_test.cpp
+++ b/indexer/indexer_tests/feature_test.cpp
@@ -5,7 +5,7 @@
 #include "../feature.hpp"
 #include "../cell_id.hpp"
 #include "../classificator.hpp"
-#include "../classif_routine.hpp"
+#include "../classificator_loader.hpp"
 
 #include "../../platform/platform.hpp"
 
diff --git a/indexer/indexer_tests/index_builder_test.cpp b/indexer/indexer_tests/index_builder_test.cpp
index a4a7c87027..e1e28568df 100644
--- a/indexer/indexer_tests/index_builder_test.cpp
+++ b/indexer/indexer_tests/index_builder_test.cpp
@@ -2,7 +2,7 @@
 
 #include "../index.hpp"
 #include "../index_builder.hpp"
-#include "../classif_routine.hpp"
+#include "../classificator_loader.hpp"
 #include "../features_vector.hpp"
 #include "../../defines.hpp"
 #include "../../platform/platform.hpp"
diff --git a/indexer/indexer_tests/indexer_tests.pro b/indexer/indexer_tests/indexer_tests.pro
index 7d7901a84d..af97138df0 100644
--- a/indexer/indexer_tests/indexer_tests.pro
+++ b/indexer/indexer_tests/indexer_tests.pro
@@ -19,22 +19,21 @@ win32-g++ {
 }
 
 HEADERS += \
-  feature_routine.hpp
+    feature_routine.hpp \
 
 SOURCES += \
-  ../../testing/testingmain.cpp \
-  cell_covering_visualize_test.cpp \
-  cell_id_test.cpp \
-  cell_coverer_test.cpp \
-  test_type.cpp \
-  index_builder_test.cpp \
-  index_test.cpp \
-  interval_index_test.cpp \
-  point_to_int64_test.cpp \
-  mercator_test.cpp \
-  sort_and_merge_intervals_test.cpp \
-  feature_test.cpp \
-  feature_bucketer_test.cpp \
-  feature_routine.cpp \
-  geometry_coding_test.cpp \
-  triangles_tree_coding_test.cpp \
+    ../../testing/testingmain.cpp \
+    cell_covering_visualize_test.cpp \
+    cell_id_test.cpp \
+    cell_coverer_test.cpp \
+    test_type.cpp \
+    index_builder_test.cpp \
+    index_test.cpp \
+    interval_index_test.cpp \
+    point_to_int64_test.cpp \
+    mercator_test.cpp \
+    sort_and_merge_intervals_test.cpp \
+    feature_test.cpp \
+    geometry_coding_test.cpp \
+    triangles_tree_coding_test.cpp \
+    feature_routine.cpp \
diff --git a/indexer/indexer_tool/indexer_tool.pro b/indexer/indexer_tool/indexer_tool.pro
deleted file mode 100644
index 80aace0aec..0000000000
--- a/indexer/indexer_tool/indexer_tool.pro
+++ /dev/null
@@ -1,42 +0,0 @@
-# Indexer binary
-
-ROOT_DIR = ../..
-DEPENDENCIES = map storage indexer platform geometry coding base gflags expat sgitess version
-
-include($$ROOT_DIR/common.pri)
-
-CONFIG += console
-CONFIG -= app_bundle
-TEMPLATE = app
-
-# needed for Platform::WorkingDir()
-QT += core
-
-win32 {
-  LIBS += -lShell32
-}
-
-SOURCES += \
-  indexer_tool.cpp \
-  data_generator.cpp \
-  feature_generator.cpp \
-  feature_sorter.cpp \
-  update_generator.cpp \
-  grid_generator.cpp \
-  statistics.cpp \
-  kml_parser.cpp \
-
-HEADERS += \
-  osm_element.hpp \
-  data_generator.hpp \
-  feature_generator.hpp \
-  first_pass_parser.hpp \
-  data_cache_file.hpp \
-  feature_sorter.hpp \
-  update_generator.hpp \
-  feature_bucketer.hpp \
-  grid_generator.hpp \
-  statistics.hpp \
-  kml_parser.hpp \
-  polygonizer.hpp \
-  world_map_generator.hpp \
diff --git a/map/feature_vec_model.cpp b/map/feature_vec_model.cpp
index 5e55f54acf..8d2b93ac13 100644
--- a/map/feature_vec_model.cpp
+++ b/map/feature_vec_model.cpp
@@ -6,8 +6,7 @@
 
 #include "../indexer/cell_coverer.hpp"
 #include "../indexer/scales.hpp"
-#include "../indexer/classif_routine.hpp"
-#include "../indexer/classificator.hpp"
+#include "../indexer/classificator_loader.hpp"
 
 #include "../base/logging.hpp"
 
diff --git a/map/map.pro b/map/map.pro
index 52feab98a2..a5604755e0 100644
--- a/map/map.pro
+++ b/map/map.pro
@@ -34,13 +34,7 @@ SOURCES += \
     information_display.cpp \
     settings.cpp \
 
-!iphonesimulator-g++42 {
-  !iphonedevice-g++42 {
-    !bada-simulator {
-      !bada-device {
-        HEADERS += qgl_render_context.hpp
-        SOURCES += qgl_render_context.cpp
-      }
-    }
-  }
+!iphone*:!bada* {
+  HEADERS += qgl_render_context.hpp
+  SOURCES += qgl_render_context.cpp
 }
diff --git a/omim.pro b/omim.pro
index f204ad36ca..0bdf19aa4a 100644
--- a/omim.pro
+++ b/omim.pro
@@ -6,7 +6,7 @@ CONFIG += ordered
 HEADERS += defines.hpp
 
 # desktop projects
-win32|macx|unix {
+!iphone*:!bada* {
 SUBDIRS = 3party \
           base base/base_tests \
           coding coding/coding_tests \
@@ -19,15 +19,15 @@ SUBDIRS = 3party \
           storage storage/storage_tests \
           map \
           map/map_tests \
-          indexer/indexer_tool \
+          generator \
+          generator/generator_tests \
+          generator/generator_tool \
           qt_tstfrm \
           indexer/indexer_tests \
           yg/yg_tests \
           qt
-}
-
-# libraries which are used on iphone and bada
-iphonesimulator-g++42|iphonedevice-g++42 {
+} else {
+  # libraries which are used on iphone and bada
   SUBDIRS = 3party \
             base \
             coding \
diff --git a/omim_light.pro b/omim_light.pro
index 78a31bc53f..88a740f819 100644
--- a/omim_light.pro
+++ b/omim_light.pro
@@ -17,14 +17,13 @@ SUBDIRS = \
           qt_tstfrm \
           indexer/indexer_tests \
           map/map_tests \
-          indexer/indexer_tool \
+          generator \
+          generator/generator_tests \
+          generator/generator_tool \
           yg/yg_tests \
           qt
-}
-
-# libraries which are used on iphone and bada
-iphonesimulator-g++42|iphonedevice-g++42 |
-bada-simulator|bada-device {
+} else {
+  # libraries which are used on iphone and bada
   message = "Please use omim.pro for iphone builds"
 }
 
diff --git a/yg/yg.pro b/yg/yg.pro
index 8d82d791a4..2bcf0b47fb 100644
--- a/yg/yg.pro
+++ b/yg/yg.pro
@@ -12,14 +12,8 @@ INCLUDEPATH += $$ROOT_DIR/3party/freetype/include $$ROOT_DIR/3party/agg
 
 include($$ROOT_DIR/common.pri)
 
-!iphonesimulator-g++42 {
-  !iphonedevice-g++42 {
-    !bada-simulator {
-      !bada-device {
-        DEPENDENCIES += platform
-      }
-    }
-  }
+!iphone*:!bada* {
+  DEPENDENCIES += platform
 }
 
 SOURCES += \