Update Filewatcher Behaviour to match Read

Move checks for once/stop file into ReadAllFromDisk so watch events also
observe files.