Moved Spectrum class out of core