Restructuring classes Deck and Card