more reorganization of classes