restructure metrics