Refactoring the Message classes into its own module.