Re order properties so that they validate against the XSD