Nesting fields to avoid bookeeping

No need to explicitly name nested structures, we can use embedding.