More reorganization: simplify dependencies, move graph-metrics into a system connection