reorganised xml files