Reverted changes for CardSuit and renamed CardTypeEnum to FaceCardFactory