More reorg of classes.