Update yaml structure.

        Now parsers can be nested, and there is a top-level parser (so we can
        get rid of the special-case 'name').