mv. aggregator method to relevant module - decouple from metrics.

Change-Id: I9209f58b047ff5a5d3200374adba317885ae7ffa
fix. refs to aggregator method.

Change-Id: I5dc72bbfb55dcd8f96beb5f68eff2df5d5fb4d25