Routes refactoring