Routes refactoring.