refactor: doppler moved out of basespectrum, equivalencies rearranged