Adds refactored Deck and Card classes