Start refactor of messages into directives and views