Refactored UrlFactory

 No URLs are built in Url