Move routing to RoutingService