Big refactoring: repackaging, changing name, merging UrlBuilder and LinkBuilder functionality (so LinkBuilder uses UrlBuilder).