Reworked msgs structure to map.
Merge branch 'api-cleanup' of github.com:code-iai/asimov into api-cleanup