Move Messaging to the messaging package and provide an extension of it for backwards compatibility