Move messages into own package.
wat