Rework module package to fix issues #3