Refactoring
Refactoring names + watchdog/agent communication + jmx to stop watchdog