Reconfigure routing to be more nested