Slight reorganization of rule groups