Move Account subclass attributes in JSON to sub-object