Refactor Messages into subproject