Reorganized routing