Move event handlers to separate module
Merge branch 'createEventModule' into dev