Overhaul url module