Added ICardRepository interface and implementation

Minor renaming also