Refactored set 1 cards into subpackage set1