major reoganization of classes