Light refactoring
Uri -> Url classes renaming.