Move EventDispatcher class to a separate namespace