Move Spectrum classes to a different package