Reorganize.
This is a start of our metrics infra.