Splitting watcher and controller out into separate repos