Changed location of the DataWatcher class.