move & fix config.xml