Evaluate mapper refactoring

### Is your feature request related to a problem? Please describe.

Currently the mappers are hierarchically structured. A composition approach would be cleaner and better reusable.

### Describe the solution you'd like

Evaluate a new architecture and whether breaking changes are required or would be more efficient
