URL refactoring