Fixed concurrency issues and added DirWatcher.stop.