Just put the Payloadclasses in its own folder