RealWaveDataCollector and WavesWatcher refactored to inject waves stream into collector