Move PluginMetrics to API, Cleanup, Add custom graphs