Cleanup and Splitup huge container (e.g. Maps, Requests)

[jacksbox]

This components / containers should be split up in smaller parts which are easier to handle