Refactored Messaging into model/view