diff --git a/CMakeLists.txt b/CMakeLists.txt
index d22c7e86d7..1f6ae7c7e0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -390,6 +390,7 @@ add_subdirectory(routing_common)
 add_subdirectory(search)
 add_subdirectory(tracking)
 add_subdirectory(traffic)
+add_subdirectory(transit)
 add_subdirectory(partners_api)
 add_subdirectory(local_ads)
 add_subdirectory(ugc)
diff --git a/android/jni/CMakeLists.txt b/android/jni/CMakeLists.txt
index be397d549c..c421a95b58 100644
--- a/android/jni/CMakeLists.txt
+++ b/android/jni/CMakeLists.txt
@@ -105,6 +105,7 @@ target_link_libraries(
   routing
   traffic
   routing_common
+  transit
   drape_frontend
   search
   storage
diff --git a/generator/generator_tests/CMakeLists.txt b/generator/generator_tests/CMakeLists.txt
index ca06c008e6..3375b1cdc4 100644
--- a/generator/generator_tests/CMakeLists.txt
+++ b/generator/generator_tests/CMakeLists.txt
@@ -42,6 +42,7 @@ omim_link_libraries(
   drape
   traffic
   routing_common
+  transit
   editor
   platform
   geometry
diff --git a/generator/generator_tests/generator_tests.pro b/generator/generator_tests/generator_tests.pro
index ac7aaa4498..46f78f3377 100644
--- a/generator/generator_tests/generator_tests.pro
+++ b/generator/generator_tests/generator_tests.pro
@@ -5,9 +5,9 @@ TEMPLATE = app
 
 ROOT_DIR = ../..
 DEPENDENCIES = generator_tests_support platform_tests_support generator drape_frontend routing \
-               search storage ugc indexer drape map traffic routing_common platform editor geometry \
+               search storage ugc indexer drape map traffic routing_common transit platform editor \
                coding base freetype expat jansson protobuf osrm stats_client \
-               minizip succinct pugixml tess2 gflags oauthcpp stb_image sdf_image icu
+               geometry minizip succinct pugixml tess2 gflags oauthcpp stb_image sdf_image icu
 
 include($$ROOT_DIR/common.pri)
 
@@ -51,6 +51,5 @@ SOURCES += \
     srtm_parser_test.cpp \
     tag_admixer_test.cpp \
     tesselator_test.cpp \
-    transit_tools.hpp \
     triangles_tree_coding_test.cpp \
     ugc_test.cpp \
diff --git a/generator/generator_tool/CMakeLists.txt b/generator/generator_tool/CMakeLists.txt
index 607ab802af..9f304ec107 100644
--- a/generator/generator_tool/CMakeLists.txt
+++ b/generator/generator_tool/CMakeLists.txt
@@ -12,6 +12,7 @@ omim_link_libraries(
   routing
   traffic
   routing_common
+  transit
   ugc
   search
   storage
diff --git a/generator/generator_tool/generator_tool.pro b/generator/generator_tool/generator_tool.pro
index 3bd25e091c..c786854b4c 100644
--- a/generator/generator_tool/generator_tool.pro
+++ b/generator/generator_tool/generator_tool.pro
@@ -2,9 +2,9 @@
 
 ROOT_DIR = ../..
 
-DEPENDENCIES = generator routing traffic routing_common search storage indexer editor mwm_diff ugc \
-               platform geometry coding base freetype expat jansson protobuf osrm stats_client \
-               minizip succinct pugixml tess2 gflags oauthcpp icu
+DEPENDENCIES = generator routing traffic routing_common transit search storage indexer editor \
+               mwm_diff ugc platform geometry coding base freetype expat jansson protobuf osrm \
+               stats_client minizip succinct pugixml tess2 gflags oauthcpp icu
 include($$ROOT_DIR/common.pri)
 
 INCLUDEPATH *= $$ROOT_DIR/3party/gflags/src \
diff --git a/generator/routing_index_generator.cpp b/generator/routing_index_generator.cpp
index a68f47c460..468089bec9 100644
--- a/generator/routing_index_generator.cpp
+++ b/generator/routing_index_generator.cpp
@@ -16,8 +16,9 @@
 #include "routing_common/bicycle_model.hpp"
 #include "routing_common/car_model.hpp"
 #include "routing_common/pedestrian_model.hpp"
-#include "routing_common/transit_graph_data.hpp"
-#include "routing_common/transit_serdes.hpp"
+
+#include "transit/transit_graph_data.hpp"
+#include "transit/transit_serdes.hpp"
 
 #include "indexer/coding_params.hpp"
 #include "indexer/data_header.hpp"
diff --git a/generator/srtm_coverage_checker/srtm_coverage_checker.pro b/generator/srtm_coverage_checker/srtm_coverage_checker.pro
index a5ed578f3b..38925a6529 100644
--- a/generator/srtm_coverage_checker/srtm_coverage_checker.pro
+++ b/generator/srtm_coverage_checker/srtm_coverage_checker.pro
@@ -12,7 +12,8 @@ DEPENDENCIES = generator map routing routing_common search storage ugc indexer p
 
 include($$ROOT_DIR/common.pri)
 
-INCLUDEPATH *= $$ROOT_DIR/3party/gflags/src
+INCLUDEPATH *= $$ROOT_DIR/3party/gflags/src \
+               $$ROOT_DIR/3party/jansson/src \
 
 QT *= core
 
diff --git a/generator/transit_generator.cpp b/generator/transit_generator.cpp
index 1dbb29e904..db2a11267f 100644
--- a/generator/transit_generator.cpp
+++ b/generator/transit_generator.cpp
@@ -8,11 +8,11 @@
 #include "routing/routing_exceptions.hpp"
 #include "routing/vehicle_mask.hpp"
 
-#include "routing_common/transit_types.hpp"
-
 #include "storage/country_info_getter.hpp"
 #include "storage/routing_helpers.hpp"
 
+#include "transit/transit_types.hpp"
+
 #include "indexer/mwm_set.hpp"
 
 #include "geometry/point2d.hpp"
diff --git a/generator/transit_generator.hpp b/generator/transit_generator.hpp
index 2870c26ac3..79d8604847 100644
--- a/generator/transit_generator.hpp
+++ b/generator/transit_generator.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "routing_common/transit_graph_data.hpp"
+#include "transit/transit_graph_data.hpp"
 
 #include "storage/index.hpp"
 
diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj
index 9fa92fa379..838f4cc9cc 100644
--- a/iphone/Maps/Maps.xcodeproj/project.pbxproj
+++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj
@@ -923,6 +923,7 @@
 		4A7D89C81B2EBF3B00AC843E /* resources-xxhdpi_dark in Resources */ = {isa = PBXBuildFile; fileRef = 4A7D89C41B2EBF3B00AC843E /* resources-xxhdpi_dark */; };
 		5605022F1B6211E100169CAD /* sound-strings in Resources */ = {isa = PBXBuildFile; fileRef = 5605022E1B6211E100169CAD /* sound-strings */; };
 		56C74C391C74A3BC00B71B9F /* MWMInputEmailValidator.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34ABA62F1C2D58F300FE1BEC /* MWMInputEmailValidator.mm */; };
+		56EE14D11FE804550036F20C /* libtransit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56EE14D21FE804550036F20C /* libtransit.a */; };
 		671182E11C7F0DD400CB8177 /* countries_obsolete.txt in Resources */ = {isa = PBXBuildFile; fileRef = 671182DE1C7F0DD400CB8177 /* countries_obsolete.txt */; };
 		671182E21C7F0DD400CB8177 /* packed_polygons_obsolete.bin in Resources */ = {isa = PBXBuildFile; fileRef = 671182DF1C7F0DD400CB8177 /* packed_polygons_obsolete.bin */; };
 		671182E31C7F0DD400CB8177 /* WorldCoasts_obsolete.mwm in Resources */ = {isa = PBXBuildFile; fileRef = 671182E01C7F0DD400CB8177 /* WorldCoasts_obsolete.mwm */; };
@@ -2505,6 +2506,7 @@
 		4A7D89C31B2EBF3B00AC843E /* resources-xhdpi_dark */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-xhdpi_dark"; path = "../../data/resources-xhdpi_dark"; sourceTree = "<group>"; };
 		4A7D89C41B2EBF3B00AC843E /* resources-xxhdpi_dark */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-xxhdpi_dark"; path = "../../data/resources-xxhdpi_dark"; sourceTree = "<group>"; };
 		5605022E1B6211E100169CAD /* sound-strings */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "sound-strings"; path = "../../data/sound-strings"; sourceTree = "<group>"; };
+		56EE14D21FE804550036F20C /* libtransit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libtransit.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		671182DE1C7F0DD400CB8177 /* countries_obsolete.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = countries_obsolete.txt; path = ../../data/countries_obsolete.txt; sourceTree = "<group>"; };
 		671182DF1C7F0DD400CB8177 /* packed_polygons_obsolete.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = packed_polygons_obsolete.bin; path = ../../data/packed_polygons_obsolete.bin; sourceTree = "<group>"; };
 		671182E01C7F0DD400CB8177 /* WorldCoasts_obsolete.mwm */ = {isa = PBXFileReference; lastKnownFileType = file; name = WorldCoasts_obsolete.mwm; path = ../../data/WorldCoasts_obsolete.mwm; sourceTree = "<group>"; };
@@ -2997,6 +2999,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				56EE14D11FE804550036F20C /* libtransit.a in Frameworks */,
 				345E8F4E1F83984500A826CC /* GoogleSignIn.framework in Frameworks */,
 				345E8F4F1F83984500A826CC /* GoogleSignInDependencies.framework in Frameworks */,
 				4586D0E71F4813AB00DF9CE5 /* libmwm_diff.a in Frameworks */,
@@ -3201,6 +3204,7 @@
 		29B97323FDCFA39411CA2CEA /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				56EE14D21FE804550036F20C /* libtransit.a */,
 				4586D0E61F4813AB00DF9CE5 /* libmwm_diff.a */,
 				4586D0C31F48121A00DF9CE5 /* libbsdiff.a */,
 				F6F8E3C41EF8469700F2DE8F /* libugc.a */,
@@ -8056,7 +8060,6 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				BUNDLE_IDENTIFIER = com.mapswithme.full;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = N9X2A789QT;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
diff --git a/map/map_tests/CMakeLists.txt b/map/map_tests/CMakeLists.txt
index 472a6d5e6f..661288b733 100644
--- a/map/map_tests/CMakeLists.txt
+++ b/map/map_tests/CMakeLists.txt
@@ -35,6 +35,7 @@ omim_link_libraries(
   routing
   traffic
   routing_common
+  transit
   search
   storage
   tracking
diff --git a/map/map_tests/map_tests.pro b/map/map_tests/map_tests.pro
index 86678f6b76..1285b3973c 100644
--- a/map/map_tests/map_tests.pro
+++ b/map/map_tests/map_tests.pro
@@ -7,7 +7,7 @@ TEMPLATE = app
 
 ROOT_DIR = ../..
 DEPENDENCIES = search_tests_support generator_tests_support indexer_tests_support generator \
-               map drape_frontend routing traffic routing_common search storage tracking drape \
+               map drape_frontend routing traffic routing_common transit search storage tracking drape \
                ugc indexer partners_api local_ads platform editor mwm_diff bsdiff geometry coding base \
                freetype expat protobuf jansson osrm stats_client minizip succinct pugixml \
                stats_client tess2 stb_image sdf_image icu agg
diff --git a/map/transit/transit_reader.cpp b/map/transit/transit_reader.cpp
index 78f6e724fa..2b9d844dde 100644
--- a/map/transit/transit_reader.cpp
+++ b/map/transit/transit_reader.cpp
@@ -1,6 +1,6 @@
 #include "map/transit/transit_reader.hpp"
 
-#include "routing_common/transit_graph_data.hpp"
+#include "transit/transit_graph_data.hpp"
 
 #include "indexer/drawing_rules.hpp"
 #include "indexer/drules_include.hpp"
diff --git a/map/transit/transit_reader.hpp b/map/transit/transit_reader.hpp
index ddc615d588..d8129fcd3d 100644
--- a/map/transit/transit_reader.hpp
+++ b/map/transit/transit_reader.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "routing_common/transit_types.hpp"
+#include "transit/transit_types.hpp"
 
 #include "indexer/feature_decl.hpp"
 #include "indexer/index.hpp"
diff --git a/omim.pro b/omim.pro
index a8e8699281..41cfe9cb0c 100644
--- a/omim.pro
+++ b/omim.pro
@@ -27,7 +27,7 @@ CONFIG(map_designer_standalone) {
   CONFIG += map_designer
 }
 
-SUBDIRS = 3party base coding geometry editor ugc indexer routing routing_common search openlr
+SUBDIRS = 3party base coding geometry editor ugc indexer routing routing_common transit search openlr
 
 !CONFIG(osrm) {
   SUBDIRS *= platform stats storage map
@@ -123,7 +123,7 @@ SUBDIRS = 3party base coding geometry editor ugc indexer routing routing_common
     # Designer Tool package includes style tests
     style_tests.subdir = map/style_tests
     style_tests.depends = 3party base coding geometry editor platform storage indexer search map \
-                          routing_common drape drape_frontend
+                          routing_common transit drape drape_frontend
     SUBDIRS *= style_tests
   }
 
@@ -238,6 +238,10 @@ SUBDIRS = 3party base coding geometry editor ugc indexer routing routing_common
     search_quality_tests.depends = $$MapDepLibs search_quality search_tests_support
     SUBDIRS *= search_quality_tests
 
+    transit_tests.subdir = transit/transit_tests
+    transit_tests.depends = $$MapDepLibs
+    SUBDIRS *= transit_tests
+
     generator_tests.subdir = generator/generator_tests
     generator_tests.depends = $$MapDepLibs routing generator
     SUBDIRS *= generator_tests
diff --git a/openlr/openlr_match_quality/openlr_assessment_tool/CMakeLists.txt b/openlr/openlr_match_quality/openlr_assessment_tool/CMakeLists.txt
index 4dcb92ea26..f5d9a5bbc4 100644
--- a/openlr/openlr_match_quality/openlr_assessment_tool/CMakeLists.txt
+++ b/openlr/openlr_match_quality/openlr_assessment_tool/CMakeLists.txt
@@ -44,6 +44,7 @@ omim_link_libraries(
   tracking
   traffic
   routing_common
+  transit
   ugc
   indexer
   drape
diff --git a/qt/CMakeLists.txt b/qt/CMakeLists.txt
index ec503e62e9..ef7c31320b 100644
--- a/qt/CMakeLists.txt
+++ b/qt/CMakeLists.txt
@@ -76,6 +76,7 @@ omim_link_libraries(
   tracking
   traffic
   routing_common
+  transit
   ugc
   indexer
   drape
diff --git a/qt/qt.pro b/qt/qt.pro
index 00b9cfeeba..bfd2e03065 100644
--- a/qt/qt.pro
+++ b/qt/qt.pro
@@ -2,8 +2,8 @@
 ROOT_DIR = ..
 
 DEPENDENCIES = qt_common map drape_frontend openlr routing search storage tracking traffic \
-               routing_common ugc indexer drape partners_api local_ads platform editor mwm_diff \
-               bsdiff geometry coding base freetype expat gflags jansson protobuf osrm \
+               routing_common transit ugc indexer drape partners_api local_ads platform editor \
+               mwm_diff bsdiff geometry coding base freetype expat gflags jansson protobuf osrm \
                stats_client minizip succinct pugixml oauthcpp stb_image sdf_image icu
 
 DEPENDENCIES += opening_hours \
diff --git a/routing/cross_mwm_connector_serialization.hpp b/routing/cross_mwm_connector_serialization.hpp
index b1a61c5ac8..a19b4b0461 100644
--- a/routing/cross_mwm_connector_serialization.hpp
+++ b/routing/cross_mwm_connector_serialization.hpp
@@ -6,7 +6,7 @@
 #include "routing/routing_exceptions.hpp"
 #include "routing/vehicle_mask.hpp"
 
-#include "routing_common/transit_types.hpp"
+#include "transit/transit_types.hpp"
 
 #include "indexer/coding_params.hpp"
 #include "indexer/geometry_serialization.hpp"
diff --git a/routing/cross_mwm_ids.hpp b/routing/cross_mwm_ids.hpp
index 49c0085bd0..742cb0f73d 100644
--- a/routing/cross_mwm_ids.hpp
+++ b/routing/cross_mwm_ids.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "routing_common/transit_types.hpp"
+#include "transit/transit_types.hpp"
 
 #include "base/newtype.hpp"
 #include "base/osm_id.hpp"
diff --git a/routing/index_router.cpp b/routing/index_router.cpp
index b243199c75..90d773ee41 100644
--- a/routing/index_router.cpp
+++ b/routing/index_router.cpp
@@ -25,7 +25,8 @@
 #include "routing_common/bicycle_model.hpp"
 #include "routing_common/car_model.hpp"
 #include "routing_common/pedestrian_model.hpp"
-#include "routing_common/transit_speed_limits.hpp"
+
+#include "transit/transit_speed_limits.hpp"
 
 #include "indexer/feature_altitude.hpp"
 
diff --git a/routing/routing_consistency_tests/CMakeLists.txt b/routing/routing_consistency_tests/CMakeLists.txt
index 43eacf0c74..1e3bb63767 100644
--- a/routing/routing_consistency_tests/CMakeLists.txt
+++ b/routing/routing_consistency_tests/CMakeLists.txt
@@ -20,6 +20,7 @@ omim_link_libraries(
   routing
   traffic
   routing_common
+  transit
   search
   storage
   mwm_diff
diff --git a/routing/routing_consistency_tests/routing_consistency_tests.pro b/routing/routing_consistency_tests/routing_consistency_tests.pro
index eb9f55a26e..5e728eb939 100644
--- a/routing/routing_consistency_tests/routing_consistency_tests.pro
+++ b/routing/routing_consistency_tests/routing_consistency_tests.pro
@@ -7,11 +7,14 @@ CONFIG -= app_bundle
 TEMPLATE = app
 
 ROOT_DIR = ../..
-DEPENDENCIES = map routing traffic routing_common search storage mwm_diff indexer platform editor geometry coding \
-               base osrm jansson protobuf bsdiff succinct stats_client generator gflags pugixml icu agg
+DEPENDENCIES = map routing traffic routing_common transit search storage mwm_diff indexer platform \
+               editor geometry coding base osrm jansson protobuf bsdiff succinct stats_client \
+               generator gflags pugixml icu agg
 
 include($$ROOT_DIR/common.pri)
 
+INCLUDEPATH += $$ROOT_DIR/3party/jansson/src
+
 QT *= core
 
 !iphone*:!android*:!tizen:!macx-* {
diff --git a/routing/routing_integration_tests/CMakeLists.txt b/routing/routing_integration_tests/CMakeLists.txt
index 2fab80bf02..f01dbc587d 100644
--- a/routing/routing_integration_tests/CMakeLists.txt
+++ b/routing/routing_integration_tests/CMakeLists.txt
@@ -36,6 +36,7 @@ omim_link_libraries(
   editor
   traffic
   routing_common
+  transit
   platform
   oauthcpp
   geometry
diff --git a/routing/routing_integration_tests/routing_integration_tests.pro b/routing/routing_integration_tests/routing_integration_tests.pro
index d633acc6a6..4f0b747e8c 100644
--- a/routing/routing_integration_tests/routing_integration_tests.pro
+++ b/routing/routing_integration_tests/routing_integration_tests.pro
@@ -11,8 +11,9 @@ CONFIG -= app_bundle
 TEMPLATE = app
 
 ROOT_DIR = ../..
-DEPENDENCIES = map routing traffic routing_common search storage mwm_diff ugc indexer platform editor geometry \
-               coding base osrm jansson protobuf bsdiff succinct stats_client pugixml icu agg
+DEPENDENCIES = map routing traffic routing_common transit search storage mwm_diff ugc indexer \
+               platform editor geometry coding base osrm jansson protobuf bsdiff succinct \
+               stats_client pugixml icu agg
 
 DEPENDENCIES += opening_hours
 
@@ -24,6 +25,8 @@ macx-*: LIBS *= "-framework IOKit" "-framework SystemConfiguration"
 
 include($$ROOT_DIR/common.pri)
 
+INCLUDEPATH += $$ROOT_DIR/3party/jansson/src
+
 QT *= core
 
 SOURCES += \
diff --git a/routing/routing_tests/CMakeLists.txt b/routing/routing_tests/CMakeLists.txt
index b1352b3485..7a60a3a97e 100644
--- a/routing/routing_tests/CMakeLists.txt
+++ b/routing/routing_tests/CMakeLists.txt
@@ -46,6 +46,7 @@ omim_link_libraries(
   editor
   traffic
   routing_common
+  transit
   platform
   oauthcpp
   geometry
diff --git a/routing/routing_tests/index_graph_tools.hpp b/routing/routing_tests/index_graph_tools.hpp
index 58a7e24f6c..856db5b2ea 100644
--- a/routing/routing_tests/index_graph_tools.hpp
+++ b/routing/routing_tests/index_graph_tools.hpp
@@ -16,10 +16,11 @@
 #include "routing/base/astar_algorithm.hpp"
 
 #include "routing_common/num_mwm_id.hpp"
-#include "routing_common/transit_types.hpp"
 
 #include "traffic/traffic_info.hpp"
 
+#include "transit/transit_types.hpp"
+
 #include "indexer/classificator_loader.hpp"
 
 #include "geometry/point2d.hpp"
diff --git a/routing/routing_tests/routing_tests.pro b/routing/routing_tests/routing_tests.pro
index 6d06460800..e288168021 100644
--- a/routing/routing_tests/routing_tests.pro
+++ b/routing/routing_tests/routing_tests.pro
@@ -6,8 +6,9 @@ CONFIG -= app_bundle
 TEMPLATE = app
 
 ROOT_DIR = ../..
-DEPENDENCIES = routing routing_common indexer platform_tests_support platform editor geometry coding base \
-               osrm protobuf succinct jansson stats_client map traffic pugixml stats_client icu agg
+DEPENDENCIES = routing routing_common transit indexer platform_tests_support platform editor \
+               geometry coding base osrm protobuf succinct jansson stats_client map traffic pugixml \
+               stats_client icu agg
 
 macx-*: LIBS *= "-framework IOKit" "-framework SystemConfiguration"
 
diff --git a/routing/transit_graph.hpp b/routing/transit_graph.hpp
index 741afc0e47..9a7f45ef02 100644
--- a/routing/transit_graph.hpp
+++ b/routing/transit_graph.hpp
@@ -8,8 +8,8 @@
 #include "routing/route_weight.hpp"
 #include "routing/segment.hpp"
 
-#include "routing_common/transit_graph_data.hpp"
-#include "routing_common/transit_types.hpp"
+#include "transit/transit_graph_data.hpp"
+#include "transit/transit_types.hpp"
 
 #include <cstdint>
 #include <map>
diff --git a/routing/transit_graph_loader.cpp b/routing/transit_graph_loader.cpp
index 5f237e798d..722f9db6a0 100644
--- a/routing/transit_graph_loader.cpp
+++ b/routing/transit_graph_loader.cpp
@@ -3,9 +3,9 @@
 #include "routing/fake_ending.hpp"
 #include "routing/routing_exceptions.hpp"
 
-#include "routing_common/transit_graph_data.hpp"
-#include "routing_common/transit_serdes.hpp"
-#include "routing_common/transit_types.hpp"
+#include "transit/transit_graph_data.hpp"
+#include "transit/transit_serdes.hpp"
+#include "transit/transit_types.hpp"
 
 #include "indexer/mwm_set.hpp"
 
diff --git a/routing/transit_info.hpp b/routing/transit_info.hpp
index 4e7587622b..7393f04410 100644
--- a/routing/transit_info.hpp
+++ b/routing/transit_info.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "routing_common/transit_types.hpp"
+#include "transit/transit_types.hpp"
 
 #include "base/assert.hpp"
 
diff --git a/routing/transit_world_graph.hpp b/routing/transit_world_graph.hpp
index 241daaddc0..99494912cc 100644
--- a/routing/transit_world_graph.hpp
+++ b/routing/transit_world_graph.hpp
@@ -11,7 +11,8 @@
 #include "routing/world_graph.hpp"
 
 #include "routing_common/num_mwm_id.hpp"
-#include "routing_common/transit_types.hpp"
+
+#include "transit/transit_types.hpp"
 
 #include "geometry/point2d.hpp"
 
diff --git a/routing_common/CMakeLists.txt b/routing_common/CMakeLists.txt
index be1e559629..ed8a97686c 100644
--- a/routing_common/CMakeLists.txt
+++ b/routing_common/CMakeLists.txt
@@ -13,12 +13,6 @@ set(
   num_mwm_id.hpp
   pedestrian_model.cpp
   pedestrian_model.hpp
-  transit_graph_data.cpp
-  transit_graph_data.hpp
-  transit_serdes.hpp
-  transit_speed_limits.hpp
-  transit_types.cpp
-  transit_types.hpp
   vehicle_model.cpp
   vehicle_model.hpp
 )
diff --git a/routing_common/routing_common.pro b/routing_common/routing_common.pro
index b26cc8a8dc..3b198b4247 100644
--- a/routing_common/routing_common.pro
+++ b/routing_common/routing_common.pro
@@ -16,18 +16,11 @@ SOURCES += \
     bicycle_model.cpp \
     car_model.cpp \
     pedestrian_model.cpp \
-    transit_graph_data.cpp \
-    transit_types.cpp \
     vehicle_model.cpp \
 
-
 HEADERS += \
     bicycle_model.hpp \
     car_model.hpp \
     num_mwm_id.hpp \
     pedestrian_model.hpp \
-    transit_graph_data.hpp \
-    transit_serdes.hpp \
-    transit_speed_limits.hpp \
-    transit_types.hpp \
     vehicle_model.hpp \
diff --git a/routing_common/routing_common_tests/CMakeLists.txt b/routing_common/routing_common_tests/CMakeLists.txt
index 970cf4117a..a10adfd163 100644
--- a/routing_common/routing_common_tests/CMakeLists.txt
+++ b/routing_common/routing_common_tests/CMakeLists.txt
@@ -2,10 +2,6 @@ project(routing_common_tests)
 
 set(
   SRC
-  transit_graph_test.cpp
-  transit_json_parsing_test.cpp
-  transit_test.cpp
-  transit_tools.hpp
   vehicle_model_for_country_test.cpp
   vehicle_model_test.cpp
 )
@@ -15,26 +11,21 @@ omim_add_test(${PROJECT_NAME} ${SRC})
 omim_link_libraries(
   ${PROJECT_NAME}
   indexer
-  platform_tests_support
   editor
-  traffic
   routing_common
   platform
   oauthcpp
   geometry
   coding
   base
-  osrm
   protobuf
   succinct
   opening_hours
   jansson
   stats_client
-  map
   pugixml
   stats_client
   icu
-  agg
   ${LIBZ}
 )
 
diff --git a/routing_common/routing_common_tests/routing_common_tests.pro b/routing_common/routing_common_tests/routing_common_tests.pro
index fa5e32f67f..d22e0964bf 100644
--- a/routing_common/routing_common_tests/routing_common_tests.pro
+++ b/routing_common/routing_common_tests/routing_common_tests.pro
@@ -6,13 +6,15 @@ CONFIG -= app_bundle
 TEMPLATE = app
 
 ROOT_DIR = ../..
-DEPENDENCIES = routing_common indexer platform_tests_support platform editor geometry coding base \
-               osrm protobuf succinct jansson stats_client map traffic pugixml stats_client icu agg
+DEPENDENCIES = routing_common indexer platform editor geometry coding base \
+               protobuf succinct jansson stats_client pugixml stats_client icu
 
 macx-*: LIBS *= "-framework IOKit" "-framework SystemConfiguration"
 
 include($$ROOT_DIR/common.pri)
 
+INCLUDEPATH += $$ROOT_DIR/3party/jansson/src
+
 QT *= core
 
 HEADERS += \
@@ -20,9 +22,5 @@ HEADERS += \
 
 SOURCES += \
   ../../testing/testingmain.cpp \
-  transit_graph_test.cpp \
-  transit_json_parsing_test.cpp \
-  transit_test.cpp
-  transit_test.cpp \
   vehicle_model_for_country_test.cpp \
   vehicle_model_test.cpp \
diff --git a/search/search_quality/assessment_tool/CMakeLists.txt b/search/search_quality/assessment_tool/CMakeLists.txt
index faad856967..2b6b47a101 100644
--- a/search/search_quality/assessment_tool/CMakeLists.txt
+++ b/search/search_quality/assessment_tool/CMakeLists.txt
@@ -47,6 +47,7 @@ omim_link_libraries(
   tracking
   traffic
   routing_common
+  transit
   ugc
   indexer
   drape
diff --git a/storage/storage_integration_tests/CMakeLists.txt b/storage/storage_integration_tests/CMakeLists.txt
index b0fb971a2a..5ce409ea3f 100644
--- a/storage/storage_integration_tests/CMakeLists.txt
+++ b/storage/storage_integration_tests/CMakeLists.txt
@@ -23,6 +23,7 @@ omim_link_libraries(
   drape_frontend
   routing
   routing_common
+  transit
   search
   storage
   tracking
diff --git a/storage/storage_integration_tests/storage_integration_tests.pro b/storage/storage_integration_tests/storage_integration_tests.pro
index 0f2ce01fdf..70ad3c0cad 100644
--- a/storage/storage_integration_tests/storage_integration_tests.pro
+++ b/storage/storage_integration_tests/storage_integration_tests.pro
@@ -6,7 +6,7 @@ CONFIG -= app_bundle
 TEMPLATE = app
 
 ROOT_DIR = ../..
-DEPENDENCIES = map drape_frontend routing search storage tracking traffic routing_common ugc \
+DEPENDENCIES = map drape_frontend routing search storage tracking traffic routing_common transit ugc \
                indexer drape partners_api local_ads platform_tests_support platform editor \
                mwm_diff bsdiff opening_hours geometry coding base freetype expat jansson protobuf \
                osrm stats_client minizip succinct pugixml oauthcpp stb_image sdf_image icu agg
diff --git a/traffic/traffic_tests/traffic_tests.pro b/traffic/traffic_tests/traffic_tests.pro
index 6a52312689..1b18ffe541 100644
--- a/traffic/traffic_tests/traffic_tests.pro
+++ b/traffic/traffic_tests/traffic_tests.pro
@@ -5,13 +5,12 @@ TEMPLATE = app
 
 ROOT_DIR = ../..
 
-INCLUDEPATH *= $$ROOT_DIR/3party/jansson/src
-
 DEPENDENCIES = traffic routing_common indexer platform_tests_support platform coding geometry base stats_client protobuf icu
 
 include($$ROOT_DIR/common.pri)
 
 DEFINES *= OMIM_UNIT_TEST_WITH_QT_EVENT_LOOP
+INCLUDEPATH *= $$ROOT_DIR/3party/jansson/src
 
 QT *= core
 
diff --git a/transit/CMakeLists.txt b/transit/CMakeLists.txt
new file mode 100644
index 0000000000..6dd7c1c773
--- /dev/null
+++ b/transit/CMakeLists.txt
@@ -0,0 +1,18 @@
+project(transit)
+
+include_directories(
+  ${OMIM_ROOT}/3party/jansson/src
+)
+
+set(
+  SRC
+  transit_graph_data.cpp
+  transit_graph_data.hpp
+  transit_serdes.hpp
+  transit_speed_limits.hpp
+  transit_types.cpp
+  transit_types.hpp
+)
+
+add_library(${PROJECT_NAME} ${SRC})
+omim_add_test_subdirectory(transit_tests)
diff --git a/transit/transit.pro b/transit/transit.pro
new file mode 100644
index 0000000000..3b3e91fd6f
--- /dev/null
+++ b/transit/transit.pro
@@ -0,0 +1,21 @@
+# A higher level routing project used to avoid cyclic dependencies.
+TARGET = transit
+TEMPLATE = lib
+CONFIG += staticlib warn_on c++11
+
+ROOT_DIR = ..
+
+include($$ROOT_DIR/common.pri)
+
+DEFINES *= BOOST_ERROR_CODE_HEADER_ONLY
+INCLUDEPATH += $$ROOT_DIR/3party/jansson/src
+
+SOURCES += \
+    transit_graph_data.cpp \
+    transit_types.cpp \
+
+HEADERS += \
+    transit_graph_data.hpp \
+    transit_serdes.hpp \
+    transit_speed_limits.hpp \
+    transit_types.hpp \
diff --git a/routing_common/transit_graph_data.cpp b/transit/transit_graph_data.cpp
similarity index 99%
rename from routing_common/transit_graph_data.cpp
rename to transit/transit_graph_data.cpp
index 99d8d8405a..753d78b07f 100644
--- a/routing_common/transit_graph_data.cpp
+++ b/transit/transit_graph_data.cpp
@@ -1,6 +1,6 @@
-#include "routing_common/transit_graph_data.hpp"
+#include "transit/transit_graph_data.hpp"
 
-#include "routing_common/transit_serdes.hpp"
+#include "transit/transit_serdes.hpp"
 
 #include "base/assert.hpp"
 #include "base/checked_cast.hpp"
diff --git a/routing_common/transit_graph_data.hpp b/transit/transit_graph_data.hpp
similarity index 99%
rename from routing_common/transit_graph_data.hpp
rename to transit/transit_graph_data.hpp
index 897cf37e29..6f013bf256 100644
--- a/routing_common/transit_graph_data.hpp
+++ b/transit/transit_graph_data.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "routing_common/transit_types.hpp"
+#include "transit/transit_types.hpp"
 
 #include "geometry/point2d.hpp"
 #include "geometry/region2d.hpp"
diff --git a/routing_common/transit_serdes.hpp b/transit/transit_serdes.hpp
similarity index 99%
rename from routing_common/transit_serdes.hpp
rename to transit/transit_serdes.hpp
index 890993a7ad..c46039a2e0 100644
--- a/routing_common/transit_serdes.hpp
+++ b/transit/transit_serdes.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "routing_common/transit_types.hpp"
+#include "transit/transit_types.hpp"
 
 #include "indexer/geometry_coding.hpp"
 
diff --git a/routing_common/transit_speed_limits.hpp b/transit/transit_speed_limits.hpp
similarity index 100%
rename from routing_common/transit_speed_limits.hpp
rename to transit/transit_speed_limits.hpp
diff --git a/transit/transit_tests/CMakeLists.txt b/transit/transit_tests/CMakeLists.txt
new file mode 100644
index 0000000000..cd91b26a72
--- /dev/null
+++ b/transit/transit_tests/CMakeLists.txt
@@ -0,0 +1,26 @@
+project(transit_tests)
+
+set(
+  SRC
+  transit_graph_test.cpp
+  transit_json_parsing_test.cpp
+  transit_test.cpp
+  transit_tools.hpp
+)
+
+omim_add_test(${PROJECT_NAME} ${SRC})
+
+omim_link_libraries(
+  ${PROJECT_NAME}
+  indexer
+  transit
+  platform
+  geometry
+  coding
+  base
+  jansson
+  stats_client
+  ${LIBZ}
+)
+
+link_qt5_core(${PROJECT_NAME})
diff --git a/routing_common/routing_common_tests/transit_graph_test.cpp b/transit/transit_tests/transit_graph_test.cpp
similarity index 99%
rename from routing_common/routing_common_tests/transit_graph_test.cpp
rename to transit/transit_tests/transit_graph_test.cpp
index 67e7aec12e..5aae5243cd 100644
--- a/routing_common/routing_common_tests/transit_graph_test.cpp
+++ b/transit/transit_tests/transit_graph_test.cpp
@@ -1,9 +1,9 @@
 #include "testing/testing.hpp"
 
-#include "routing_common/routing_common_tests/transit_tools.hpp"
+#include "transit/transit_tests/transit_tools.hpp"
 
-#include "routing_common/transit_graph_data.hpp"
-#include "routing_common/transit_types.hpp"
+#include "transit/transit_graph_data.hpp"
+#include "transit/transit_types.hpp"
 
 #include "base/stl_add.hpp"
 
diff --git a/routing_common/routing_common_tests/transit_json_parsing_test.cpp b/transit/transit_tests/transit_json_parsing_test.cpp
similarity index 98%
rename from routing_common/routing_common_tests/transit_json_parsing_test.cpp
rename to transit/transit_tests/transit_json_parsing_test.cpp
index df86224d96..8d5377b082 100644
--- a/routing_common/routing_common_tests/transit_json_parsing_test.cpp
+++ b/transit/transit_tests/transit_json_parsing_test.cpp
@@ -1,9 +1,9 @@
 #include "testing/testing.hpp"
 
-#include "routing_common/routing_common_tests/transit_tools.hpp"
+#include "transit/transit_tests/transit_tools.hpp"
 
-#include "routing_common/transit_graph_data.hpp"
-#include "routing_common/transit_types.hpp"
+#include "transit/transit_graph_data.hpp"
+#include "transit/transit_types.hpp"
 
 #include "base/assert.hpp"
 #include "base/stl_add.hpp"
diff --git a/routing_common/routing_common_tests/transit_test.cpp b/transit/transit_tests/transit_test.cpp
similarity index 99%
rename from routing_common/routing_common_tests/transit_test.cpp
rename to transit/transit_tests/transit_test.cpp
index 7cb211bdb2..01df23c846 100644
--- a/routing_common/routing_common_tests/transit_test.cpp
+++ b/transit/transit_tests/transit_test.cpp
@@ -1,11 +1,11 @@
 #include "testing/testing.hpp"
 
+#include "transit/transit_serdes.hpp"
+#include "transit/transit_types.hpp"
+
 #include "coding/reader.hpp"
 #include "coding/writer.hpp"
 
-#include "routing_common/transit_serdes.hpp"
-#include "routing_common/transit_types.hpp"
-
 #include <algorithm>
 #include <cstdint>
 #include <vector>
diff --git a/transit/transit_tests/transit_tests.pro b/transit/transit_tests/transit_tests.pro
new file mode 100644
index 0000000000..1d899472e0
--- /dev/null
+++ b/transit/transit_tests/transit_tests.pro
@@ -0,0 +1,26 @@
+# Routing common lib unit tests
+
+TARGET = transit_tests
+CONFIG += console warn_on
+CONFIG -= app_bundle
+TEMPLATE = app
+
+ROOT_DIR = ../..
+DEPENDENCIES = transit indexer platform geometry coding base \
+               jansson stats_client
+
+macx-*: LIBS *= "-framework IOKit" "-framework SystemConfiguration"
+
+include($$ROOT_DIR/common.pri)
+INCLUDEPATH *= $$ROOT_DIR/3party/jansson/src
+
+QT *= core
+
+HEADERS += \
+  transit_tools.hpp \
+
+SOURCES += \
+  ../../testing/testingmain.cpp \
+  transit_graph_test.cpp \
+  transit_json_parsing_test.cpp \
+  transit_test.cpp \
diff --git a/routing_common/routing_common_tests/transit_tools.hpp b/transit/transit_tests/transit_tools.hpp
similarity index 100%
rename from routing_common/routing_common_tests/transit_tools.hpp
rename to transit/transit_tests/transit_tools.hpp
diff --git a/routing_common/transit_types.cpp b/transit/transit_types.cpp
similarity index 99%
rename from routing_common/transit_types.cpp
rename to transit/transit_types.cpp
index dade26a2a8..063ebe1d4a 100644
--- a/routing_common/transit_types.cpp
+++ b/transit/transit_types.cpp
@@ -1,6 +1,6 @@
-#include "routing_common/transit_types.hpp"
+#include "transit/transit_types.hpp"
 
-#include "routing_common/transit_serdes.hpp"
+#include "transit/transit_serdes.hpp"
 
 #include "base/string_utils.hpp"
 
diff --git a/routing_common/transit_types.hpp b/transit/transit_types.hpp
similarity index 100%
rename from routing_common/transit_types.hpp
rename to transit/transit_types.hpp
diff --git a/xcode/generator_tool/generator_tool.xcodeproj/project.pbxproj b/xcode/generator_tool/generator_tool.xcodeproj/project.pbxproj
index 142616db9b..b7226a17b9 100644
--- a/xcode/generator_tool/generator_tool.xcodeproj/project.pbxproj
+++ b/xcode/generator_tool/generator_tool.xcodeproj/project.pbxproj
@@ -31,6 +31,8 @@
 		562147291F6AA37E002D2214 /* libmwm_diff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 562147281F6AA37E002D2214 /* libmwm_diff.a */; };
 		562D42941FD8460500A995F3 /* libugc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 562D42951FD8460500A995F3 /* libugc.a */; };
 		562D42961FD8463700A995F3 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 670E7BC61EF992F600A8E9ED /* libsqlite3.tbd */; };
+		56EE14CD1FE803EA0036F20C /* libtransit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56EE14CE1FE803EA0036F20C /* libtransit.a */; };
+		56EE14CF1FE803FE0036F20C /* libtransit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56EE14D01FE803FE0036F20C /* libtransit.a */; };
 		670E7BBC1EF9832200A8E9ED /* libicu.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 670E7BBB1EF9832200A8E9ED /* libicu.a */; };
 		670E7BBE1EF9839C00A8E9ED /* librouting_common.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 670E7BBD1EF9839C00A8E9ED /* librouting_common.a */; };
 		670E7BC01EF983A400A8E9ED /* libtraffic.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 670E7BBF1EF983A400A8E9ED /* libtraffic.a */; };
@@ -206,6 +208,8 @@
 		562147261F6AA36A002D2214 /* libbsdiff.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbsdiff.a; path = ../bsdiff/build/Debug/libbsdiff.a; sourceTree = "<group>"; };
 		562147281F6AA37E002D2214 /* libmwm_diff.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmwm_diff.a; path = "../../../../Library/Developer/Xcode/DerivedData/omim-gsfdicnjgjjbizhdmwedavcucpok/Build/Products/Debug/libmwm_diff.a"; sourceTree = "<group>"; };
 		562D42951FD8460500A995F3 /* libugc.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libugc.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		56EE14CE1FE803EA0036F20C /* libtransit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libtransit.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		56EE14D01FE803FE0036F20C /* libtransit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libtransit.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		670E7BBB1EF9832200A8E9ED /* libicu.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libicu.a; path = "../../../../Library/Developer/Xcode/DerivedData/omim-gzleizqujktwggdwiejzkgjrsgvp/Build/Products/Debug/libicu.a"; sourceTree = "<group>"; };
 		670E7BBD1EF9839C00A8E9ED /* librouting_common.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = librouting_common.a; path = "../../../../Library/Developer/Xcode/DerivedData/omim-gzleizqujktwggdwiejzkgjrsgvp/Build/Products/Debug/librouting_common.a"; sourceTree = "<group>"; };
 		670E7BBF1EF983A400A8E9ED /* libtraffic.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtraffic.a; path = "../../../../Library/Developer/Xcode/DerivedData/omim-gzleizqujktwggdwiejzkgjrsgvp/Build/Products/Debug/libtraffic.a"; sourceTree = "<group>"; };
@@ -281,6 +285,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				56EE14CF1FE803FE0036F20C /* libtransit.a in Frameworks */,
 				670E7BC71EF992F600A8E9ED /* libsqlite3.tbd in Frameworks */,
 				670E7BC31EF9853C00A8E9ED /* librouting_common.a in Frameworks */,
 				670E7BC21EF9853500A8E9ED /* libicu.a in Frameworks */,
@@ -343,6 +348,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				56EE14CD1FE803EA0036F20C /* libtransit.a in Frameworks */,
 				562D42961FD8463700A995F3 /* libsqlite3.tbd in Frameworks */,
 				562D42941FD8460500A995F3 /* libugc.a in Frameworks */,
 				562147291F6AA37E002D2214 /* libmwm_diff.a in Frameworks */,
@@ -433,6 +439,8 @@
 		34F558551DBF3CD800A4FC11 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				56EE14D01FE803FE0036F20C /* libtransit.a */,
+				56EE14CE1FE803EA0036F20C /* libtransit.a */,
 				562D42951FD8460500A995F3 /* libugc.a */,
 				562147281F6AA37E002D2214 /* libmwm_diff.a */,
 				562147261F6AA36A002D2214 /* libbsdiff.a */,
diff --git a/xcode/map/map.xcodeproj/project.pbxproj b/xcode/map/map.xcodeproj/project.pbxproj
index 57609953c2..ff199ca1de 100644
--- a/xcode/map/map.xcodeproj/project.pbxproj
+++ b/xcode/map/map.xcodeproj/project.pbxproj
@@ -48,6 +48,9 @@
 		45F6EE9D1FB1C77600019892 /* search_api.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 45F6EE9A1FB1C77500019892 /* search_api.hpp */; };
 		45F6EE9E1FB1C77600019892 /* mwm_tree.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 45F6EE9B1FB1C77500019892 /* mwm_tree.hpp */; };
 		45F6EE9F1FB1C77600019892 /* search_api.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 45F6EE9C1FB1C77500019892 /* search_api.cpp */; };
+		56EE14D31FE80E900036F20C /* libtransit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56EE14D41FE80E900036F20C /* libtransit.a */; };
+		56EE14D51FE80EBD0036F20C /* libmwm_diff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56EE14D61FE80EBD0036F20C /* libmwm_diff.a */; };
+		56EE14D71FE80F290036F20C /* libbsdiff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56EE14D81FE80F290036F20C /* libbsdiff.a */; };
 		670E39401C46C5C700E9C0A6 /* gps_tracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670E393E1C46C5C700E9C0A6 /* gps_tracker.cpp */; };
 		670E39411C46C5C700E9C0A6 /* gps_tracker.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670E393F1C46C5C700E9C0A6 /* gps_tracker.hpp */; };
 		674231CB1DF984F600913FEB /* libtraffic.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674231CA1DF984F600913FEB /* libtraffic.a */; };
@@ -200,6 +203,9 @@
 		45F6EE9A1FB1C77500019892 /* search_api.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = search_api.hpp; sourceTree = "<group>"; };
 		45F6EE9B1FB1C77500019892 /* mwm_tree.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = mwm_tree.hpp; sourceTree = "<group>"; };
 		45F6EE9C1FB1C77500019892 /* search_api.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = search_api.cpp; sourceTree = "<group>"; };
+		56EE14D41FE80E900036F20C /* libtransit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libtransit.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		56EE14D61FE80EBD0036F20C /* libmwm_diff.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libmwm_diff.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		56EE14D81FE80F290036F20C /* libbsdiff.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libbsdiff.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		670E393E1C46C5C700E9C0A6 /* gps_tracker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gps_tracker.cpp; sourceTree = "<group>"; };
 		670E393F1C46C5C700E9C0A6 /* gps_tracker.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = gps_tracker.hpp; sourceTree = "<group>"; };
 		674231CA1DF984F600913FEB /* libtraffic.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtraffic.a; path = "../../../omim-build/xcode/Debug/libtraffic.a"; sourceTree = "<group>"; };
@@ -316,6 +322,9 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				56EE14D71FE80F290036F20C /* libbsdiff.a in Frameworks */,
+				56EE14D51FE80EBD0036F20C /* libmwm_diff.a in Frameworks */,
+				56EE14D31FE80E900036F20C /* libtransit.a in Frameworks */,
 				3D0AEAFC1FBB0FF400AD042B /* libgenerator_tests_support.a in Frameworks */,
 				3D0AEAFD1FBB0FF400AD042B /* libindexer_tests_support.a in Frameworks */,
 				3D0AEAFE1FBB0FF400AD042B /* libsearch_tests_support.a in Frameworks */,
@@ -373,6 +382,9 @@
 		34DDA17E1DBE5DF40088A609 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				56EE14D81FE80F290036F20C /* libbsdiff.a */,
+				56EE14D61FE80EBD0036F20C /* libmwm_diff.a */,
+				56EE14D41FE80E900036F20C /* libtransit.a */,
 				3D0AEAFF1FBB0FF400AD042B /* libgenerator_tests_support.a */,
 				3D0AEB001FBB0FF400AD042B /* libindexer_tests_support.a */,
 				3D0AEB011FBB0FF400AD042B /* libsearch_tests_support.a */,
diff --git a/xcode/omim.xcworkspace/contents.xcworkspacedata b/xcode/omim.xcworkspace/contents.xcworkspacedata
index db715ff6d6..81d61428c8 100644
--- a/xcode/omim.xcworkspace/contents.xcworkspacedata
+++ b/xcode/omim.xcworkspace/contents.xcworkspacedata
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Workspace
    version = "1.0">
+   <FileRef
+      location = "group:transit/transit.xcodeproj">
+   </FileRef>
    <FileRef
       location = "container:common-debug.xcconfig">
    </FileRef>
diff --git a/xcode/routing/routing.xcodeproj/project.pbxproj b/xcode/routing/routing.xcodeproj/project.pbxproj
index dfe125ee33..e5fb95e28a 100644
--- a/xcode/routing/routing.xcodeproj/project.pbxproj
+++ b/xcode/routing/routing.xcodeproj/project.pbxproj
@@ -122,6 +122,7 @@
 		56CC5A371E3884960016AC46 /* cross_mwm_index_graph.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56CC5A361E3884960016AC46 /* cross_mwm_index_graph.hpp */; };
 		56EA2FD51D8FD8590083F01A /* routing_helpers.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56EA2FD41D8FD8590083F01A /* routing_helpers.hpp */; };
 		56ED7DBD1F69425700B67156 /* turn_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 567E9F741F5850460064CB96 /* turn_test.cpp */; };
+		56EE14DB1FE812FC0036F20C /* libtransit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56EE14DC1FE812FC0036F20C /* libtransit.a */; };
 		56F0D7341D896A5300045886 /* libmap.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67BD35DE1C69F198003AA26F /* libmap.a */; };
 		56F0D7391D896A5300045886 /* libstorage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67BD35D41C69F155003AA26F /* libstorage.a */; };
 		56F0D73A1D896A5300045886 /* librouting.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 675343F81A3F640D00A0A8C3 /* librouting.a */; };
@@ -419,6 +420,7 @@
 		56CA63061F61206700E6681B /* road_graph_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = road_graph_tests.cpp; sourceTree = "<group>"; };
 		56CC5A361E3884960016AC46 /* cross_mwm_index_graph.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = cross_mwm_index_graph.hpp; sourceTree = "<group>"; };
 		56EA2FD41D8FD8590083F01A /* routing_helpers.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = routing_helpers.hpp; sourceTree = "<group>"; };
+		56EE14DC1FE812FC0036F20C /* libtransit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libtransit.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		56F0D75F1D896A5300045886 /* routing_benchmarks.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = routing_benchmarks.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		56FA20461FBF23A90045DE78 /* cross_mwm_ids.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = cross_mwm_ids.hpp; sourceTree = "<group>"; };
 		670B84BE1A9381D900CE4492 /* cross_routing_context.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cross_routing_context.cpp; sourceTree = "<group>"; };
@@ -617,6 +619,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				56EE14DB1FE812FC0036F20C /* libtransit.a in Frameworks */,
 				567E9F811F5853370064CB96 /* libtraffic.a in Frameworks */,
 				567E9F7F1F58530D0064CB96 /* librouting_common.a in Frameworks */,
 				567E9F7D1F5852C00064CB96 /* libicu.a in Frameworks */,
@@ -659,6 +662,7 @@
 		56F0D7611D896DAF00045886 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				56EE14DC1FE812FC0036F20C /* libtransit.a */,
 				567E9F801F5853370064CB96 /* libtraffic.a */,
 				408B55BF1FD953F100F4E78B /* libbsdiff.a */,
 				408B55C01FD9540F00F4E78B /* libmwm_diff.a */,
diff --git a/xcode/routing_common/routing_common.xcodeproj/project.pbxproj b/xcode/routing_common/routing_common.xcodeproj/project.pbxproj
index 4ba093d351..8183a3efdd 100644
--- a/xcode/routing_common/routing_common.xcodeproj/project.pbxproj
+++ b/xcode/routing_common/routing_common.xcodeproj/project.pbxproj
@@ -8,18 +8,9 @@
 
 /* Begin PBXBuildFile section */
 		40FF45D01F388EF80046BD40 /* vehicle_model_for_country_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40FF45CF1F388EF80046BD40 /* vehicle_model_for_country_test.cpp */; };
-		562D42921FD83FE100A995F3 /* transit_graph_data.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 562D42901FD83FE000A995F3 /* transit_graph_data.hpp */; };
-		562D42931FD83FE100A995F3 /* transit_graph_data.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 562D42911FD83FE100A995F3 /* transit_graph_data.cpp */; };
-		562D429A1FD84E5C00A995F3 /* transit_tools.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 562D42971FD84E5B00A995F3 /* transit_tools.hpp */; };
-		562D429B1FD84E5C00A995F3 /* transit_graph_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 562D42981FD84E5B00A995F3 /* transit_graph_test.cpp */; };
-		562D429C1FD84E5C00A995F3 /* transit_json_parsing_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 562D42991FD84E5C00A995F3 /* transit_json_parsing_test.cpp */; };
 		5647A4511F72BEB600DE1125 /* libicu.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5647A4521F72BEB600DE1125 /* libicu.a */; };
-		5667C1DD1F751F2700C6B31B /* transit_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5647A4531F72BF2B00DE1125 /* transit_test.cpp */; };
 		56D0E47D1F8E335D0084B18C /* num_mwm_id.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56D0E47C1F8E335D0084B18C /* num_mwm_id.hpp */; };
-		56E2EDA61F7E3F8A0092E9C2 /* transit_serdes.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56E2EDA31F7E3F890092E9C2 /* transit_serdes.hpp */; };
-		56E2EDA81F7E3F8A0092E9C2 /* transit_types.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56E2EDA51F7E3F8A0092E9C2 /* transit_types.cpp */; };
-		56E41D881F72B42F00E28E2D /* transit_types.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56E41D861F72B42F00E28E2D /* transit_types.hpp */; };
-		56E6E7401F95D5690022CBD3 /* transit_speed_limits.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56E6E73F1F95D5690022CBD3 /* transit_speed_limits.hpp */; };
+		56EE14D91FE80FA30036F20C /* libtransit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56EE14DA1FE80FA30036F20C /* libtransit.a */; };
 		671E78881E6A3C5D00B2859B /* bicycle_model.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671E78801E6A3C5D00B2859B /* bicycle_model.cpp */; };
 		671E78891E6A3C5D00B2859B /* bicycle_model.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 671E78811E6A3C5D00B2859B /* bicycle_model.hpp */; };
 		671E788A1E6A3C5D00B2859B /* car_model.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671E78821E6A3C5D00B2859B /* car_model.cpp */; };
@@ -48,19 +39,10 @@
 
 /* Begin PBXFileReference section */
 		40FF45CF1F388EF80046BD40 /* vehicle_model_for_country_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vehicle_model_for_country_test.cpp; sourceTree = "<group>"; };
-		562D42901FD83FE000A995F3 /* transit_graph_data.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = transit_graph_data.hpp; sourceTree = "<group>"; };
-		562D42911FD83FE100A995F3 /* transit_graph_data.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = transit_graph_data.cpp; sourceTree = "<group>"; };
-		562D42971FD84E5B00A995F3 /* transit_tools.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = transit_tools.hpp; sourceTree = "<group>"; };
-		562D42981FD84E5B00A995F3 /* transit_graph_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = transit_graph_test.cpp; sourceTree = "<group>"; };
-		562D42991FD84E5C00A995F3 /* transit_json_parsing_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = transit_json_parsing_test.cpp; sourceTree = "<group>"; };
 		5647A4521F72BEB600DE1125 /* libicu.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libicu.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		5647A4531F72BF2B00DE1125 /* transit_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = transit_test.cpp; sourceTree = "<group>"; };
 		5667C1DE1F751F4200C6B31B /* routing_common.pro */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = routing_common.pro; sourceTree = "<group>"; };
 		56D0E47C1F8E335D0084B18C /* num_mwm_id.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = num_mwm_id.hpp; sourceTree = "<group>"; };
-		56E2EDA31F7E3F890092E9C2 /* transit_serdes.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = transit_serdes.hpp; sourceTree = "<group>"; };
-		56E2EDA51F7E3F8A0092E9C2 /* transit_types.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = transit_types.cpp; sourceTree = "<group>"; };
-		56E41D861F72B42F00E28E2D /* transit_types.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = transit_types.hpp; sourceTree = "<group>"; };
-		56E6E73F1F95D5690022CBD3 /* transit_speed_limits.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = transit_speed_limits.hpp; sourceTree = "<group>"; };
+		56EE14DA1FE80FA30036F20C /* libtransit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libtransit.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		671E78721E6A3BE200B2859B /* librouting_common.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = librouting_common.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		671E78801E6A3C5D00B2859B /* bicycle_model.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bicycle_model.cpp; sourceTree = "<group>"; };
 		671E78811E6A3C5D00B2859B /* bicycle_model.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = bicycle_model.hpp; sourceTree = "<group>"; };
@@ -103,6 +85,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				56EE14D91FE80FA30036F20C /* libtransit.a in Frameworks */,
 				5647A4511F72BEB600DE1125 /* libicu.a in Frameworks */,
 				671E78D11E6A414B00B2859B /* libopening_hours.a in Frameworks */,
 				671E78CF1E6A414600B2859B /* libjansson.a in Frameworks */,
@@ -148,14 +131,8 @@
 		671E78741E6A3BE200B2859B /* routing_common */ = {
 			isa = PBXGroup;
 			children = (
-				562D42911FD83FE100A995F3 /* transit_graph_data.cpp */,
-				562D42901FD83FE000A995F3 /* transit_graph_data.hpp */,
-				56E6E73F1F95D5690022CBD3 /* transit_speed_limits.hpp */,
 				56D0E47C1F8E335D0084B18C /* num_mwm_id.hpp */,
-				56E2EDA31F7E3F890092E9C2 /* transit_serdes.hpp */,
-				56E2EDA51F7E3F8A0092E9C2 /* transit_types.cpp */,
 				5667C1DE1F751F4200C6B31B /* routing_common.pro */,
-				56E41D861F72B42F00E28E2D /* transit_types.hpp */,
 				671E78801E6A3C5D00B2859B /* bicycle_model.cpp */,
 				671E78811E6A3C5D00B2859B /* bicycle_model.hpp */,
 				671E78821E6A3C5D00B2859B /* car_model.cpp */,
@@ -172,10 +149,6 @@
 		671E78971E6A3DA800B2859B /* routing_common_tests */ = {
 			isa = PBXGroup;
 			children = (
-				562D42981FD84E5B00A995F3 /* transit_graph_test.cpp */,
-				562D42991FD84E5C00A995F3 /* transit_json_parsing_test.cpp */,
-				562D42971FD84E5B00A995F3 /* transit_tools.hpp */,
-				5647A4531F72BF2B00DE1125 /* transit_test.cpp */,
 				40FF45CF1F388EF80046BD40 /* vehicle_model_for_country_test.cpp */,
 				671E78AF1E6A3FEF00B2859B /* testingmain.cpp */,
 				671E78AD1E6A3FDB00B2859B /* vehicle_model_test.cpp */,
@@ -187,6 +160,7 @@
 		671E78B41E6A404F00B2859B /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				56EE14DA1FE80FA30036F20C /* libtransit.a */,
 				5647A4521F72BEB600DE1125 /* libicu.a */,
 				671E78D01E6A414B00B2859B /* libopening_hours.a */,
 				671E78CE1E6A414600B2859B /* libjansson.a */,
@@ -215,11 +189,6 @@
 			files = (
 				56D0E47D1F8E335D0084B18C /* num_mwm_id.hpp in Headers */,
 				671E788D1E6A3C5D00B2859B /* pedestrian_model.hpp in Headers */,
-				56E41D881F72B42F00E28E2D /* transit_types.hpp in Headers */,
-				56E2EDA61F7E3F8A0092E9C2 /* transit_serdes.hpp in Headers */,
-				562D429A1FD84E5C00A995F3 /* transit_tools.hpp in Headers */,
-				56E6E7401F95D5690022CBD3 /* transit_speed_limits.hpp in Headers */,
-				562D42921FD83FE100A995F3 /* transit_graph_data.hpp in Headers */,
 				671E78891E6A3C5D00B2859B /* bicycle_model.hpp in Headers */,
 				671E788B1E6A3C5D00B2859B /* car_model.hpp in Headers */,
 				671E788F1E6A3C5D00B2859B /* vehicle_model.hpp in Headers */,
@@ -316,12 +285,8 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				56E2EDA81F7E3F8A0092E9C2 /* transit_types.cpp in Sources */,
-				562D42931FD83FE100A995F3 /* transit_graph_data.cpp in Sources */,
-				562D429C1FD84E5C00A995F3 /* transit_json_parsing_test.cpp in Sources */,
 				671E788A1E6A3C5D00B2859B /* car_model.cpp in Sources */,
 				671E78881E6A3C5D00B2859B /* bicycle_model.cpp in Sources */,
-				562D429B1FD84E5C00A995F3 /* transit_graph_test.cpp in Sources */,
 				671E788E1E6A3C5D00B2859B /* vehicle_model.cpp in Sources */,
 				40FF45D01F388EF80046BD40 /* vehicle_model_for_country_test.cpp in Sources */,
 				671E788C1E6A3C5D00B2859B /* pedestrian_model.cpp in Sources */,
@@ -332,7 +297,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				5667C1DD1F751F2700C6B31B /* transit_test.cpp in Sources */,
 				671E78B21E6A3FF900B2859B /* vehicle_model_test.cpp in Sources */,
 				671E78B11E6A3FF400B2859B /* testingmain.cpp in Sources */,
 			);
diff --git a/xcode/storage/storage.xcodeproj/project.pbxproj b/xcode/storage/storage.xcodeproj/project.pbxproj
index 1564e8ed0f..eb26468e5a 100644
--- a/xcode/storage/storage.xcodeproj/project.pbxproj
+++ b/xcode/storage/storage.xcodeproj/project.pbxproj
@@ -25,6 +25,8 @@
 		56D0E4811F8E40340084B18C /* routing_helpers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56D0E47F1F8E40340084B18C /* routing_helpers.cpp */; };
 		56D8CB991CAC17A80003F420 /* test_defines.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56D8CB971CAC17A80003F420 /* test_defines.cpp */; };
 		56D8CB9A1CAC17A80003F420 /* test_defines.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56D8CB981CAC17A80003F420 /* test_defines.hpp */; };
+		56EE14DF1FE813D00036F20C /* libmwm_diff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56EE14E01FE813D00036F20C /* libmwm_diff.a */; };
+		56EE14E11FE813FC0036F20C /* libbsdiff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56EE14E21FE813FC0036F20C /* libbsdiff.a */; };
 		671182CE1C7E06B400CB8177 /* storage_3levels_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671182CC1C7E069C00CB8177 /* storage_3levels_tests.cpp */; };
 		671182D21C7F0D5D00CB8177 /* WorldCoasts_obsolete.mwm in Resources */ = {isa = PBXBuildFile; fileRef = 671182D11C7F0D5400CB8177 /* WorldCoasts_obsolete.mwm */; };
 		671182D31C7F0D5D00CB8177 /* WorldCoasts_obsolete.mwm in Resources */ = {isa = PBXBuildFile; fileRef = 671182D11C7F0D5400CB8177 /* WorldCoasts_obsolete.mwm */; };
@@ -200,6 +202,9 @@
 		56D0E47F1F8E40340084B18C /* routing_helpers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = routing_helpers.cpp; sourceTree = "<group>"; };
 		56D8CB971CAC17A80003F420 /* test_defines.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_defines.cpp; sourceTree = "<group>"; };
 		56D8CB981CAC17A80003F420 /* test_defines.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = test_defines.hpp; sourceTree = "<group>"; };
+		56EE14DE1FE813BC0036F20C /* libtransit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libtransit.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		56EE14E01FE813D00036F20C /* libmwm_diff.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libmwm_diff.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		56EE14E21FE813FC0036F20C /* libbsdiff.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libbsdiff.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		671182CC1C7E069C00CB8177 /* storage_3levels_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = storage_3levels_tests.cpp; sourceTree = "<group>"; };
 		671182CF1C7F0D5400CB8177 /* countries_obsolete.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = countries_obsolete.txt; sourceTree = "<group>"; };
 		671182D01C7F0D5400CB8177 /* packed_polygons_obsolete.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; path = packed_polygons_obsolete.bin; sourceTree = "<group>"; };
@@ -319,6 +324,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				56EE14E11FE813FC0036F20C /* libbsdiff.a in Frameworks */,
+				56EE14DF1FE813D00036F20C /* libmwm_diff.a in Frameworks */,
 				F66D569A1EAE36510081E883 /* librouting_common.a in Frameworks */,
 				F66D56981EAE36280081E883 /* libicu.a in Frameworks */,
 				3462FDB31DC1E68C00906FD7 /* libtess2.a in Frameworks */,
@@ -404,6 +411,9 @@
 		34F5584C1DBF327C00A4FC11 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				56EE14E21FE813FC0036F20C /* libbsdiff.a */,
+				56EE14E01FE813D00036F20C /* libmwm_diff.a */,
+				56EE14DE1FE813BC0036F20C /* libtransit.a */,
 				F66D56AB1EAE38150081E883 /* liblocal_ads.a */,
 				F66D56A91EAE38030081E883 /* libtraffic.a */,
 				F66D56A71EAE37F90081E883 /* librouting_common.a */,
diff --git a/xcode/transit/transit.xcodeproj/project.pbxproj b/xcode/transit/transit.xcodeproj/project.pbxproj
new file mode 100644
index 0000000000..1a8952b774
--- /dev/null
+++ b/xcode/transit/transit.xcodeproj/project.pbxproj
@@ -0,0 +1,218 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 48;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		562DDBDC1FE8EA0A0091F566 /* transit_graph_data.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 562DDBD81FE8EA080091F566 /* transit_graph_data.cpp */; };
+		562DDBDD1FE8EA0A0091F566 /* transit_graph_data.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 562DDBD91FE8EA080091F566 /* transit_graph_data.hpp */; };
+		562DDBDE1FE8EA0A0091F566 /* transit_speed_limits.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 562DDBDA1FE8EA090091F566 /* transit_speed_limits.hpp */; };
+		562DDBDF1FE8EA0A0091F566 /* transit_serdes.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 562DDBDB1FE8EA0A0091F566 /* transit_serdes.hpp */; };
+		56EE14CB1FE7F2900036F20C /* transit_types.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56EE14C91FE7F2900036F20C /* transit_types.cpp */; };
+		56EE14CC1FE7F2900036F20C /* transit_types.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56EE14CA1FE7F2900036F20C /* transit_types.hpp */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		562DDBD81FE8EA080091F566 /* transit_graph_data.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = transit_graph_data.cpp; sourceTree = "<group>"; };
+		562DDBD91FE8EA080091F566 /* transit_graph_data.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = transit_graph_data.hpp; sourceTree = "<group>"; };
+		562DDBDA1FE8EA090091F566 /* transit_speed_limits.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = transit_speed_limits.hpp; sourceTree = "<group>"; };
+		562DDBDB1FE8EA0A0091F566 /* transit_serdes.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = transit_serdes.hpp; sourceTree = "<group>"; };
+		56D7F2F41FE7F0F200D99E62 /* libtransit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libtransit.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		56EE14C71FE7F1FF0036F20C /* common-debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = "common-debug.xcconfig"; path = "../common-debug.xcconfig"; sourceTree = "<group>"; };
+		56EE14C81FE7F20A0036F20C /* common-release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = "common-release.xcconfig"; path = "../common-release.xcconfig"; sourceTree = "<group>"; };
+		56EE14C91FE7F2900036F20C /* transit_types.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = transit_types.cpp; sourceTree = "<group>"; };
+		56EE14CA1FE7F2900036F20C /* transit_types.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = transit_types.hpp; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		56D7F2F11FE7F0F200D99E62 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		56D7F2EB1FE7F0F200D99E62 = {
+			isa = PBXGroup;
+			children = (
+				56EE14C81FE7F20A0036F20C /* common-release.xcconfig */,
+				56EE14C71FE7F1FF0036F20C /* common-debug.xcconfig */,
+				56D7F2F61FE7F0F200D99E62 /* transit */,
+				56D7F2F51FE7F0F200D99E62 /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		56D7F2F51FE7F0F200D99E62 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				56D7F2F41FE7F0F200D99E62 /* libtransit.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		56D7F2F61FE7F0F200D99E62 /* transit */ = {
+			isa = PBXGroup;
+			children = (
+				562DDBD81FE8EA080091F566 /* transit_graph_data.cpp */,
+				562DDBD91FE8EA080091F566 /* transit_graph_data.hpp */,
+				562DDBDB1FE8EA0A0091F566 /* transit_serdes.hpp */,
+				562DDBDA1FE8EA090091F566 /* transit_speed_limits.hpp */,
+				56EE14C91FE7F2900036F20C /* transit_types.cpp */,
+				56EE14CA1FE7F2900036F20C /* transit_types.hpp */,
+			);
+			name = transit;
+			path = ../../transit;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXHeadersBuildPhase section */
+		56D7F2F21FE7F0F200D99E62 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				56EE14CC1FE7F2900036F20C /* transit_types.hpp in Headers */,
+				562DDBDD1FE8EA0A0091F566 /* transit_graph_data.hpp in Headers */,
+				562DDBDF1FE8EA0A0091F566 /* transit_serdes.hpp in Headers */,
+				562DDBDE1FE8EA0A0091F566 /* transit_speed_limits.hpp in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXHeadersBuildPhase section */
+
+/* Begin PBXNativeTarget section */
+		56D7F2F31FE7F0F200D99E62 /* transit */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 56D7F2FF1FE7F0F200D99E62 /* Build configuration list for PBXNativeTarget "transit" */;
+			buildPhases = (
+				56D7F2F01FE7F0F200D99E62 /* Sources */,
+				56D7F2F11FE7F0F200D99E62 /* Frameworks */,
+				56D7F2F21FE7F0F200D99E62 /* Headers */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = transit;
+			productName = transit;
+			productReference = 56D7F2F41FE7F0F200D99E62 /* libtransit.a */;
+			productType = "com.apple.product-type.library.static";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		56D7F2EC1FE7F0F200D99E62 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0920;
+				ORGANIZATIONNAME = Maps.Me;
+				TargetAttributes = {
+					56D7F2F31FE7F0F200D99E62 = {
+						CreatedOnToolsVersion = 9.2;
+						ProvisioningStyle = Automatic;
+					};
+				};
+			};
+			buildConfigurationList = 56D7F2EF1FE7F0F200D99E62 /* Build configuration list for PBXProject "transit" */;
+			compatibilityVersion = "Xcode 8.0";
+			developmentRegion = en;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = 56D7F2EB1FE7F0F200D99E62;
+			productRefGroup = 56D7F2F51FE7F0F200D99E62 /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				56D7F2F31FE7F0F200D99E62 /* transit */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXSourcesBuildPhase section */
+		56D7F2F01FE7F0F200D99E62 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				562DDBDC1FE8EA0A0091F566 /* transit_graph_data.cpp in Sources */,
+				56EE14CB1FE7F2900036F20C /* transit_types.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		56D7F2FD1FE7F0F200D99E62 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 56EE14C71FE7F1FF0036F20C /* common-debug.xcconfig */;
+			buildSettings = {
+			};
+			name = Debug;
+		};
+		56D7F2FE1FE7F0F200D99E62 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 56EE14C81FE7F20A0036F20C /* common-release.xcconfig */;
+			buildSettings = {
+			};
+			name = Release;
+		};
+		56D7F3001FE7F0F200D99E62 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				EXECUTABLE_PREFIX = lib;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(OMIM_ROOT)",
+					"$(BOOST_ROOT)",
+					"$(OMIM_ROOT)/3party/jansson/src",
+				);
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		56D7F3011FE7F0F200D99E62 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				EXECUTABLE_PREFIX = lib;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(OMIM_ROOT)",
+					"$(BOOST_ROOT)",
+					"$(OMIM_ROOT)/3party/jansson/src",
+				);
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		56D7F2EF1FE7F0F200D99E62 /* Build configuration list for PBXProject "transit" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				56D7F2FD1FE7F0F200D99E62 /* Debug */,
+				56D7F2FE1FE7F0F200D99E62 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		56D7F2FF1FE7F0F200D99E62 /* Build configuration list for PBXNativeTarget "transit" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				56D7F3001FE7F0F200D99E62 /* Debug */,
+				56D7F3011FE7F0F200D99E62 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 56D7F2EC1FE7F0F200D99E62 /* Project object */;
+}