Reorg XML
Work on Webinterface