rearranging ximera.cls has improvements