Move watchdog to client directory