Offer class in entity/ and model/ refactored