Repackaged Deck classes. Updated Unit tests.