Move DiscoveryService package.
Moving classes
Refactor classes and update docs and style.