minor changes to data structure
Dispatcher and module hierarchy
Dispatcher and module hierarchy