reorganize butter.xml for 4.8 testing