Move address data to its own element

In the full XML example, the address data is nested within a data element with the name of "address," but in the JSON example, it is nested under a data element with "name" as name.

This change moves the address data to an "address" data element.

This brings up something (which I'll outline in my hyperdescribe spec), but in the JSON variant, a data element MUST NOT have both a @value and @data attribute.