Some cleanup and adding xpd.xml.