diff --git a/.babelrc b/.babelrc
index cc565ca3..ebfa0936 100644
--- a/.babelrc
+++ b/.babelrc
@@ -5,19 +5,19 @@
     }],
     ["stage-2"],
   ],
-  "plugins": [
-    ["module-resolver", {
-      "root": ["./src"]
-    }]
-  ],
   "env": {
     "production": {
-      "ignore": ".spec.js"
+      "ignore": ".spec.js",
+      "plugins": [
+        ["module-resolver", {
+          "root": ["./tmpsrc"]
+        }]
+      ],
     },
     "test": {
       "plugins": [
         ["module-resolver", {
-          "root": ["./src", "../../misc", "./generated"]
+          "root": ["./src", "./generated", "../../misc"]
         }]
       ]
     }
diff --git a/misc/generate-flow.js b/misc/generate-flow.js
index 8840ff08..3bb2cc6c 100644
--- a/misc/generate-flow.js
+++ b/misc/generate-flow.js
@@ -85,7 +85,7 @@ ${nsItems.map(({ name }) => `  ${name},`).join('\n')}
             /* eslint-disable indent */
 `import { ChainWrapper } from 'seq/ChainWrapper'
 
-import { ${name} } from 'core/${name}'
+import { ${name} } from '${namespace}/${name}'
 
 ChainWrapper.prototype.${name} = function(path, ...args) {
   return this._call(${name}, path, args)
diff --git a/packages/immutadot-lodash/package.json b/packages/immutadot-lodash/package.json
index bfe0942d..d239cdf2 100644
--- a/packages/immutadot-lodash/package.json
+++ b/packages/immutadot-lodash/package.json
@@ -17,8 +17,9 @@
   },
   "scripts": {
     "generate:flow": "node ../../misc/generate-flow.js",
-    "prebuild": "yarn generate:flow",
-    "build": "cross-env BABEL_ENV=production babel src generated -d .",
+    "prebuild": "yarn generate:flow && rm -rf tmpsrc && mkdir tmpsrc && cp -r src/* generated/* tmpsrc",
+    "build": "cross-env BABEL_ENV=production babel tmpsrc -d .",
+    "postbuild": "rm -rf tmpsrc",
     "prelint": "yarn generate:flow",
     "lint": "eslint src generated",
     "pretest": "lerna run --scope immutadot build && yarn generate:flow",
diff --git a/packages/immutadot/package.json b/packages/immutadot/package.json
index 20fe78b3..30c17e59 100644
--- a/packages/immutadot/package.json
+++ b/packages/immutadot/package.json
@@ -30,8 +30,9 @@
   },
   "scripts": {
     "generate:flow": "node ../../misc/generate-flow.js",
-    "prebuild": "yarn generate:flow",
-    "build": "cross-env BABEL_ENV=production babel src generated -d .",
+    "prebuild": "yarn generate:flow && rm -rf tmpsrc && mkdir tmpsrc && cp -r src/* generated/* tmpsrc",
+    "build": "cross-env BABEL_ENV=production babel tmpsrc -d .",
+    "postbuild": "rm -rf tmpsrc",
     "prelint": "yarn generate:flow",
     "lint": "eslint src generated",
     "pretest": "yarn generate:flow",