Metric structure

Updates structure of metric files