Commit No.11 XML restructuring and respective changes with the front end extraction