Parameterized Deck and Fixed Shuffle

Parameterized Deck to a Card type and compacted shuffle