Added modular classes for deck and cards