Moved discoveryservice.java from internal to md.discovery dir.