Reorginize Urls class logic.
Merge pull request #9 from yanivgal/UrlsClassChangeOfLogic

Reorginize Urls class logic.