Changed so that files validate to nsi-ext.xsd

Reordered to conform to schema ordering.