Convert existing uri usage to use new uri module