Relocate Metrics classes