modulize xml files for #4