core.xml.in.in becames core.xml.in. Also change it to the new format