Remove trigger and triggerHandler from event module
Add revamped trigger module