Fixing module build to be more extensible.

Upgrades to module builds for release.