Some more re-organizing.