Revise xml file directory structure