Moved watchdog service into separate bundle