adding utils and changes to file watcher