new structure of code.xml