Merge pull request #12 from stbenjam/refactor
fixes #9060, #8175 - refactor module and support dispatch router
Merge pull request #12 from stbenjam/refactor
fixes #9060, #8175 - refactor module and support dispatch router