Reduce Message classes to a single class
Cleanup campfire adapter