yet more re-organization