Move service flows back to service_manager