renamed a few files and fixed bug in the service discovery file which pointed to an incorrect discover class/package