Refactor events and notifications
Merge pull request #450 from enspiral/refactor/events

Refactor/events