diff --git a/xcode/routing/routing.xcodeproj/project.pbxproj b/xcode/routing/routing.xcodeproj/project.pbxproj
index e0e7fc3855..f2a09a4e50 100644
--- a/xcode/routing/routing.xcodeproj/project.pbxproj
+++ b/xcode/routing/routing.xcodeproj/project.pbxproj
@@ -35,8 +35,6 @@
 		674F9BD61B0A580E00704FFA /* turns_generator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 674F9BC61B0A580E00704FFA /* turns_generator.cpp */; };
 		674F9BD71B0A580E00704FFA /* turns_generator.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 674F9BC71B0A580E00704FFA /* turns_generator.hpp */; };
 		675344141A3F644F00A0A8C3 /* osrm_data_facade.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675344061A3F644F00A0A8C3 /* osrm_data_facade.hpp */; };
-		675344151A3F644F00A0A8C3 /* osrm_online_router.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675344071A3F644F00A0A8C3 /* osrm_online_router.cpp */; };
-		675344161A3F644F00A0A8C3 /* osrm_online_router.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675344081A3F644F00A0A8C3 /* osrm_online_router.hpp */; };
 		675344171A3F644F00A0A8C3 /* osrm_router.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675344091A3F644F00A0A8C3 /* osrm_router.cpp */; };
 		675344181A3F644F00A0A8C3 /* osrm_router.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6753440A1A3F644F00A0A8C3 /* osrm_router.hpp */; };
 		675344191A3F644F00A0A8C3 /* osrm2feature_map.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6753440B1A3F644F00A0A8C3 /* osrm2feature_map.cpp */; };
@@ -65,6 +63,9 @@
 		A120B3501B4A7C0A002F3808 /* routing_algorithm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A120B34C1B4A7C0A002F3808 /* routing_algorithm.cpp */; };
 		A120B3511B4A7C0A002F3808 /* routing_algorithm.hpp in Headers */ = {isa = PBXBuildFile; fileRef = A120B34D1B4A7C0A002F3808 /* routing_algorithm.hpp */; };
 		A120B3531B4A7C1C002F3808 /* astar_algorithm.hpp in Headers */ = {isa = PBXBuildFile; fileRef = A120B3521B4A7C1C002F3808 /* astar_algorithm.hpp */; };
+		A1616E2B1B6B60AB003F078E /* router_delegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A1616E291B6B60AB003F078E /* router_delegate.cpp */; };
+		A1616E2C1B6B60AB003F078E /* router_delegate.hpp in Headers */ = {isa = PBXBuildFile; fileRef = A1616E2A1B6B60AB003F078E /* router_delegate.hpp */; };
+		A1616E2E1B6B60B3003F078E /* astar_progress.hpp in Headers */ = {isa = PBXBuildFile; fileRef = A1616E2D1B6B60B3003F078E /* astar_progress.hpp */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -98,8 +99,6 @@
 		674F9BC71B0A580E00704FFA /* turns_generator.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = turns_generator.hpp; sourceTree = "<group>"; };
 		675343F81A3F640D00A0A8C3 /* librouting.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = librouting.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		675344061A3F644F00A0A8C3 /* osrm_data_facade.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = osrm_data_facade.hpp; sourceTree = "<group>"; };
-		675344071A3F644F00A0A8C3 /* osrm_online_router.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osrm_online_router.cpp; sourceTree = "<group>"; };
-		675344081A3F644F00A0A8C3 /* osrm_online_router.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = osrm_online_router.hpp; sourceTree = "<group>"; };
 		675344091A3F644F00A0A8C3 /* osrm_router.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osrm_router.cpp; sourceTree = "<group>"; };
 		6753440A1A3F644F00A0A8C3 /* osrm_router.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = osrm_router.hpp; sourceTree = "<group>"; };
 		6753440B1A3F644F00A0A8C3 /* osrm2feature_map.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osrm2feature_map.cpp; sourceTree = "<group>"; };
@@ -128,6 +127,9 @@
 		A120B34C1B4A7C0A002F3808 /* routing_algorithm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = routing_algorithm.cpp; sourceTree = "<group>"; };
 		A120B34D1B4A7C0A002F3808 /* routing_algorithm.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = routing_algorithm.hpp; sourceTree = "<group>"; };
 		A120B3521B4A7C1C002F3808 /* astar_algorithm.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = astar_algorithm.hpp; path = base/astar_algorithm.hpp; sourceTree = "<group>"; };
+		A1616E291B6B60AB003F078E /* router_delegate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = router_delegate.cpp; sourceTree = "<group>"; };
+		A1616E2A1B6B60AB003F078E /* router_delegate.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = router_delegate.hpp; sourceTree = "<group>"; };
+		A1616E2D1B6B60B3003F078E /* astar_progress.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = astar_progress.hpp; path = base/astar_progress.hpp; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -161,6 +163,9 @@
 		675343FA1A3F640D00A0A8C3 /* routing */ = {
 			isa = PBXGroup;
 			children = (
+				A1616E2D1B6B60B3003F078E /* astar_progress.hpp */,
+				A1616E291B6B60AB003F078E /* router_delegate.cpp */,
+				A1616E2A1B6B60AB003F078E /* router_delegate.hpp */,
 				670EE56E1B664796001E8064 /* directions_engine.hpp */,
 				670EE56F1B664796001E8064 /* pedestrian_directions.cpp */,
 				670EE5701B664796001E8064 /* pedestrian_directions.hpp */,
@@ -206,8 +211,6 @@
 				670C62111AC5A15700C38A8C /* routing_mapping.cpp */,
 				670C62121AC5A15700C38A8C /* routing_mapping.h */,
 				675344061A3F644F00A0A8C3 /* osrm_data_facade.hpp */,
-				675344071A3F644F00A0A8C3 /* osrm_online_router.cpp */,
-				675344081A3F644F00A0A8C3 /* osrm_online_router.hpp */,
 				675344091A3F644F00A0A8C3 /* osrm_router.cpp */,
 				6753440A1A3F644F00A0A8C3 /* osrm_router.hpp */,
 				6753440B1A3F644F00A0A8C3 /* osrm2feature_map.cpp */,
@@ -245,15 +248,16 @@
 				A120B3461B4A7BE5002F3808 /* cross_mwm_road_graph.hpp in Headers */,
 				670C62141AC5A15700C38A8C /* routing_mapping.h in Headers */,
 				6753441C1A3F644F00A0A8C3 /* route.hpp in Headers */,
+				A1616E2C1B6B60AB003F078E /* router_delegate.hpp in Headers */,
 				67C7D4301B4EB48F00FE41AA /* turns_sound.hpp in Headers */,
 				67C7D42E1B4EB48F00FE41AA /* turns_sound_settings.hpp in Headers */,
 				670EE55E1B6001E7001E8064 /* routing_session.hpp in Headers */,
 				670EE55F1B6001E7001E8064 /* routing_settings.hpp in Headers */,
-				675344161A3F644F00A0A8C3 /* osrm_online_router.hpp in Headers */,
 				67C7D42C1B4EB48F00FE41AA /* pedestrian_model.hpp in Headers */,
 				674F9BCD1B0A580E00704FFA /* features_road_graph.hpp in Headers */,
 				670EE5741B664796001E8064 /* pedestrian_directions.hpp in Headers */,
 				6753441D1A3F644F00A0A8C3 /* router.hpp in Headers */,
+				A1616E2E1B6B60B3003F078E /* astar_progress.hpp in Headers */,
 				670EE5721B664796001E8064 /* directions_engine.hpp in Headers */,
 				67C7D42A1B4EB48F00FE41AA /* car_model.hpp in Headers */,
 				670D049F1B0B4A970013A7AC /* nearest_edge_finder.hpp in Headers */,
@@ -322,7 +326,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				675344201A3F644F00A0A8C3 /* vehicle_model.cpp in Sources */,
-				675344151A3F644F00A0A8C3 /* osrm_online_router.cpp in Sources */,
+				A1616E2B1B6B60AB003F078E /* router_delegate.cpp in Sources */,
 				67C7D42B1B4EB48F00FE41AA /* pedestrian_model.cpp in Sources */,
 				A120B3471B4A7BE5002F3808 /* cross_mwm_router.cpp in Sources */,
 				670EE5731B664796001E8064 /* pedestrian_directions.cpp in Sources */,