urls refactor