Moved all "Offer" classes to their own subpackage

This was done for better separation of Action and OfferAction
implementations
Removed incomplete merge fragment.