Convert message into module and include in takeaway
Adjust classes due to changes to Message as module