Massive reformat of the xmls
So it has come to this.