Adapt to new module pattern
Merge pull request #22 from Ceasar/kyle-adopt-module-output

Adapt to new module pattern