Adding back M**Waveform.cpp files