Clean up message type definitions. Remove extra class layer for message type.
Clean up message type definitions. Remove extra class layer for message type.

flamingcowtv/funstraw,flamingcowtv/funstraw,flamingcowtv/funstraw