Organized config.xml file a bit