Refactoring of DiscoveryLink

Ready for the next iteration review the bridge discovery process