Moved Payload classes to emitter module