Fixing module build to be more extensible.