xml structure aligned

Hi Ralf, I did as proposed, and hopefully in the right way :-)