Migrate to watch module to support detecting new files