Renamed Watcher namespaces; made file-watcher testable.