re-factor some of the folder-watch