Moving Routes from Server to RouteMatcher