reorganization of classes to rightful places