Refactoring: introduced URL module

Change-Id: I99e4d8831ca770d643b2ba40de36205b7309a46f