Cleaning up in the eventstore package and added event for EmailSaga