Reorganized routing.