Move to package metric-class