Lots of code refactoring, new (UrlSets) functionality implemented.