New organization for scalameter.