Move watcher out of repo-fs-store