diff --git a/Makefile b/Makefile
index b60cee752a..c4d4315bc4 100644
--- a/Makefile
+++ b/Makefile
@@ -30,14 +30,14 @@ watch: clean
 	make clean-lib
 	BABEL_ENV=development ./node_modules/.bin/gulp watch
 
-lint:
-	./node_modules/.bin/eslint scripts $(SOURCES) *.js --format=codeframe --rulesdir="./eslint_rules"
-
 flow:
 	./node_modules/.bin/flow check --strip-root
 
+lint:
+	./node_modules/.bin/eslint scripts $(SOURCES) *.js --format=codeframe --rulesdir="./scripts/eslint_rules"
+
 fix:
-	./node_modules/.bin/eslint scripts $(SOURCES) *.js --format=codeframe --fix --rulesdir="./eslint_rules"
+	./node_modules/.bin/eslint scripts $(SOURCES) *.js --format=codeframe --fix --rulesdir="./scripts/eslint_rules"
 
 clean: test-clean
 	rm -rf packages/babel-polyfill/browser*
diff --git a/package.json b/package.json
index f809e74e91..7d270abe75 100644
--- a/package.json
+++ b/package.json
@@ -77,7 +77,7 @@
   },
   "lint-staged": {
     "*.js": [
-      "eslint --format=codeframe --rulesdir='./eslint_rules'"
+      "eslint --format=codeframe --rulesdir='./scripts/eslint_rules'"
     ]
   }
 }
diff --git a/eslint_rules/no-undefined-identifier.js b/scripts/eslint_rules/no-undefined-identifier.js
similarity index 100%
rename from eslint_rules/no-undefined-identifier.js
rename to scripts/eslint_rules/no-undefined-identifier.js