[EventDispatcher] Moved EventDispatcher aware events to separate baseclass