Added waveforms. Reorganized folders