modify structure

modify dictionary structure, move attributes to a dictionary for key
'attributes'