Move from plain dicts to objects

- hope this documents a better better what is going on, and it hopefully will facilitate changes.

Signed-off-by: Stefan Marr <git@stefan-marr.de>