Added temporary metrics and environmental metrics
Rearrange files