refactoring sip/address and change GenericUri to Uri