reorg and saving for deck builder