Routing refactoring for 2.0-RC2