Core: router refactoring.