Ref #52, #54 Swapped order of elements, extra 'id' field

Changed ordering of `softwareName` and `manufacturerModelName` to conform to Cypress schema.