Reorganized routing a bit.