Putting the Household and Organization layout refs back in package.xml