guitar-package: Router refactoring.