Revise Watcher
Improve remove event handling
Improve rename event handling