Updated MetricsLite
Refactor packages & adjust formatting