refactored the various watcher related modules to use a common "watcher-" prefix so its a bit more obvious they are related