Move all watchers to be in the yaml file.

Less boilerplate for watchers.