Dispatcher reorganization and documentation