[enh] URL refactoring