Refactor listeners. Do not push service manager and use listener aggreagte
Merge pull request #21 from veewee/feature-cleanup-listeners

Refactor listeners.