Modified Buyer and Attack, Moved Classes to Packages