Added moving and renaming capability in watcher