Refactoring: Move ModelEvent to model package