Refactoring some events to a better location.