[FEATURE] refactor api entities with entity wrapper classes

__Tasks:__

- [x] gather feedback for my changes
- [ ] submit changes to the documentation


__Informations:__

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes
| Tests pass?   | yes
| Fixed tickets | none
| Doc           | none
@alexander-schranz Have already seen the same method before, maybe extracting to an own method as well?