Refactoring: move ModelEvent to model package