Rearranged config.xml