More refactoring of both the card game controller and the card game models.