Moved Emitter to emitter package & created new payload classes