-refactor urls