Added Takeaway class. And changed message class to a module