Moved *Dispatcher classes to own namespace