Move to filewatcher gem