* Fix: refactored Payload to have its own package

* Fix: fixed comment

* Fix: fixed wrong comment

* Fix: reverted some changes to keep the PR as small as possible

* Refactor: refactored Data to GenericDataPayload

* Fix: fixed last refactor issues

Co-authored-by: Hans Moog <hm@mkjc.net>