Reorganized the metrics section