Refactored code to form event-bus
Merge branch 'action-mesh'