Move distribution and firmware values to correct place.

Gluon is announcing firmware details as part
of the software object and we like to announce a compatible
structure. Hence we should do so.

This fixes the gw is marked as legacy in graph problem, really!