Fixed Scanner null pointer on line 178 (no currentMetricData)
and Moved metrics that are still under development (i.e., event-based metrics)
into new branch = mth.