Metrics reorganization

I've reorganized metrics.