reorder the entity sauertypes a bit