urls refactoring