Merge pull request #62 from qinshihu/refactor/module-architecture