Moved UPNP code into Discovery Class