Module refactor
Merge pull request #110 from lyncodev/module-refactor

Module refactor