Reworked messages and channels to be in their own packages.