watcher-refactor > Refactor watchers to allow multiple watchers and intr...

...oduce some general improvements.