Major cleanup and move old stuff to attic to make room for new stuff