move daemon watcher into own package