[watcher][refactor] organizes watcher to be a bit more legit
[watcher][increment] improves error handling