move metrics under scaffolding