Move events helper class to commons
move events handler to commons lib