Restructuring of Java Spring configuration xml.