restructured config.xml files