Fix inadvertent packaging change in modules