module rewrite
Merge pull request #126 from jlambert121/module_rewrite

module rewrite