Refactor messages to separate file