improve FS watcher, use watchr now