Move watchr definition file to common