Changed the file/folder watcher implementation