Restructure and add Config XML