Merge "Revert "Move module utils to the module package.""