renaming more things
removing old things
renaming the spectrum optimization