file organization and add xml files