migrating internal to use fs.watch where possible