Code Clean Up

Restructured the card/deck logic to work better in general and to
enable easier implementation of future features.