Metric structure

Updates structure of metric files
Merge pull request #1 from Michon-BS/master

Metric structure