diff --git a/packages/functions-compat/package.json b/packages/functions-compat/package.json
index 484df1c5a70..e51aa90e791 100644
--- a/packages/functions-compat/package.json
+++ b/packages/functions-compat/package.json
@@ -4,20 +4,20 @@
   "description": "",
   "author": "Firebase <firebase-support@google.com> (https://firebase.google.com/)",
   "main": "dist/index.cjs.js",
-  "browser": "dist/index.esm2017.js",
-  "module": "dist/index.esm2017.js",
+  "browser": "dist/esm/index.esm2017.js",
+  "module": "dist/esm/index.esm2017.js",
   "exports": {
     ".": {
       "types": "./dist/src/index.d.ts",
       "node": {
         "require": "./dist/index.cjs.js",
-        "import": "./dist/index.esm2017.js"
+        "import": "./dist/esm/index.esm2017.js"
       },
       "browser": {
         "require": "./dist/index.cjs.js",
-        "import": "./dist/index.esm2017.js"
+        "import": "./dist/esm/index.esm2017.js"
       },
-      "default": "./dist/index.esm2017.js"
+      "default": "./dist/esm/index.esm2017.js"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/functions-compat/rollup.config.js b/packages/functions-compat/rollup.config.js
index 6ac98783eae..b85c7fa65c3 100644
--- a/packages/functions-compat/rollup.config.js
+++ b/packages/functions-compat/rollup.config.js
@@ -32,7 +32,7 @@ const buildPlugins = [
   json({ preferConst: true })
 ];
 
-const browserBuilds = [
+const builds = [
   {
     input: 'src/index.ts',
     output: {
@@ -40,13 +40,13 @@ const browserBuilds = [
       format: 'es',
       sourcemap: true
     },
-    plugins: buildPlugins,
+    plugins: [...buildPlugins, emitModulePackageFile()],
     external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
   },
   {
     input: 'src/index.ts',
     output: {
-      file: './dist/index.cjs.js',
+      file: pkg.main,
       format: 'cjs',
       sourcemap: true
     },
@@ -55,4 +55,4 @@ const browserBuilds = [
   }
 ];
 
-export default [...browserBuilds];
+export default builds;
diff --git a/packages/functions/package.json b/packages/functions/package.json
index 33cf52bfbb2..c739600b5ed 100644
--- a/packages/functions/package.json
+++ b/packages/functions/package.json
@@ -4,20 +4,20 @@
   "description": "",
   "author": "Firebase <firebase-support@google.com> (https://firebase.google.com/)",
   "main": "dist/index.cjs.js",
-  "browser": "dist/index.esm2017.js",
-  "module": "dist/index.esm2017.js",
+  "browser": "dist/esm/index.esm2017.js",
+  "module": "dist/esm/index.esm2017.js",
   "exports": {
     ".": {
       "types": "./dist/functions-public.d.ts",
       "node": {
-        "import": "./dist/index.esm2017.js",
+        "import": "./dist/esm/index.esm2017.js",
         "require": "./dist/index.cjs.js" 
       },
       "browser": {
         "require": "./dist/index.cjs.js",
-        "import": "./dist/index.esm2017.js"
+        "import": "./dist/esm/index.esm2017.js"
       },
-      "default": "./dist/index.esm2017.js"
+      "default": "./dist/esm/index.esm2017.js"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/functions/rollup.config.js b/packages/functions/rollup.config.js
index bb950655646..8d00f21d755 100644
--- a/packages/functions/rollup.config.js
+++ b/packages/functions/rollup.config.js
@@ -34,7 +34,7 @@ const buildPlugins = [
   json({ preferConst: true })
 ];
 
-const browserBuilds = [
+const builds = [
   {
     input: 'src/index.ts',
     output: {
@@ -45,13 +45,14 @@ const browserBuilds = [
     external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)),
     plugins: [
       ...buildPlugins,
-      replace(generateBuildTargetReplaceConfig('esm', 2017))
+      replace(generateBuildTargetReplaceConfig('esm', 2017)),
+      emitModulePackageFile()
     ]
   },
   {
     input: 'src/index.ts',
     output: {
-      file: './dist/index.cjs.js',
+      file: pkg.main,
       format: 'cjs',
       sourcemap: true
     },
@@ -63,4 +64,4 @@ const browserBuilds = [
   }
 ];
 
-export default [...browserBuilds];
+export default builds;