Moved the message classes to their intended receivers
Fixed Namespace resolution