Simplified CardDeck proj renaming etc