Refactor url generator.
Merge pull request #14 from 4teamwork/deif-refactor-url-generator

Refactor url generator.