watch directory rename and delete too

separate watchers for files and directories allows the filter pattern
for files to apply without hiding directory changes as it does with only
one