pulls out metrics in separate classes
edits metrics usage to the new format
Merge pull request #2 from Valve/metrics_reorganization

Metrics reorganization