diff --git a/lib/cli-engine.js b/lib/cli-engine.js
index aa0f5521c0b..b0856bd8d7c 100644
--- a/lib/cli-engine.js
+++ b/lib/cli-engine.js
@@ -22,7 +22,7 @@ const fs = require("fs"),
     IgnoredPaths = require("./ignored-paths"),
     Config = require("./config"),
     LintResultCache = require("./util/lint-result-cache"),
-    globUtil = require("./util/glob-util"),
+    globUtil = require("./util/glob-utils"),
     validator = require("./config/config-validator"),
     hash = require("./util/hash"),
     ModuleResolver = require("./util/module-resolver"),
diff --git a/lib/code-path-analysis/code-path-analyzer.js b/lib/code-path-analysis/code-path-analyzer.js
index f4a7fee7fcd..b81e212e7f4 100644
--- a/lib/code-path-analysis/code-path-analyzer.js
+++ b/lib/code-path-analysis/code-path-analyzer.js
@@ -14,7 +14,7 @@ const assert = require("assert"),
     CodePathSegment = require("./code-path-segment"),
     IdGenerator = require("./id-generator"),
     debug = require("./debug-helpers"),
-    astUtils = require("../ast-utils");
+    astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Helpers
diff --git a/lib/config/config-initializer.js b/lib/config/config-initializer.js
index 4273abae56d..a80506a5556 100644
--- a/lib/config/config-initializer.js
+++ b/lib/config/config-initializer.js
@@ -16,9 +16,9 @@ const util = require("util"),
     autoconfig = require("./autoconfig.js"),
     ConfigFile = require("./config-file"),
     ConfigOps = require("./config-ops"),
-    getSourceCodeOfFiles = require("../util/source-code-util").getSourceCodeOfFiles,
+    getSourceCodeOfFiles = require("../util/source-code-utils").getSourceCodeOfFiles,
     ModuleResolver = require("../util/module-resolver"),
-    npmUtil = require("../util/npm-util"),
+    npmUtil = require("../util/npm-utils"),
     recConfig = require("../../conf/eslint-recommended"),
     log = require("../util/logging");
 
diff --git a/lib/ignored-paths.js b/lib/ignored-paths.js
index 4ef15ae7581..152f176b7e6 100644
--- a/lib/ignored-paths.js
+++ b/lib/ignored-paths.js
@@ -12,7 +12,7 @@
 const fs = require("fs"),
     path = require("path"),
     ignore = require("ignore"),
-    pathUtil = require("./util/path-util");
+    pathUtil = require("./util/path-utils");
 
 const debug = require("debug")("eslint:ignored-paths");
 
diff --git a/lib/linter.js b/lib/linter.js
index a6b5a540894..8f7bdf9e4c7 100644
--- a/lib/linter.js
+++ b/lib/linter.js
@@ -25,7 +25,7 @@ const eslintScope = require("eslint-scope"),
     createReportTranslator = require("./report-translator"),
     Rules = require("./rules"),
     timing = require("./util/timing"),
-    astUtils = require("./ast-utils"),
+    astUtils = require("./util/ast-utils"),
     pkg = require("../package.json"),
     SourceCodeFixer = require("./util/source-code-fixer");
 
diff --git a/lib/rules/array-bracket-newline.js b/lib/rules/array-bracket-newline.js
index e1904057265..e8f7c502ef4 100644
--- a/lib/rules/array-bracket-newline.js
+++ b/lib/rules/array-bracket-newline.js
@@ -5,7 +5,7 @@
 
 "use strict";
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/array-bracket-spacing.js b/lib/rules/array-bracket-spacing.js
index c64ff3dc27e..f46c3978dfa 100644
--- a/lib/rules/array-bracket-spacing.js
+++ b/lib/rules/array-bracket-spacing.js
@@ -4,7 +4,7 @@
  */
 "use strict";
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/array-callback-return.js b/lib/rules/array-callback-return.js
index 2375dcba9b1..4d374cf2240 100644
--- a/lib/rules/array-callback-return.js
+++ b/lib/rules/array-callback-return.js
@@ -11,7 +11,7 @@
 
 const lodash = require("lodash");
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Helpers
diff --git a/lib/rules/array-element-newline.js b/lib/rules/array-element-newline.js
index b437c6932bc..c4caf8c71c0 100644
--- a/lib/rules/array-element-newline.js
+++ b/lib/rules/array-element-newline.js
@@ -5,7 +5,7 @@
 
 "use strict";
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/arrow-body-style.js b/lib/rules/arrow-body-style.js
index 49feb0670e6..92068c75c42 100644
--- a/lib/rules/arrow-body-style.js
+++ b/lib/rules/arrow-body-style.js
@@ -8,7 +8,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/arrow-parens.js b/lib/rules/arrow-parens.js
index 8cabb7f90f2..7a6ef6f8bed 100644
--- a/lib/rules/arrow-parens.js
+++ b/lib/rules/arrow-parens.js
@@ -8,7 +8,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/arrow-spacing.js b/lib/rules/arrow-spacing.js
index 52f8fcab97a..a1db18fc910 100644
--- a/lib/rules/arrow-spacing.js
+++ b/lib/rules/arrow-spacing.js
@@ -8,7 +8,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/block-spacing.js b/lib/rules/block-spacing.js
index 536381362a0..838c2c7016b 100644
--- a/lib/rules/block-spacing.js
+++ b/lib/rules/block-spacing.js
@@ -5,7 +5,7 @@
 
 "use strict";
 
-const util = require("../ast-utils");
+const util = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/brace-style.js b/lib/rules/brace-style.js
index e2cbafe2192..236a01096ab 100644
--- a/lib/rules/brace-style.js
+++ b/lib/rules/brace-style.js
@@ -5,7 +5,7 @@
 
 "use strict";
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/capitalized-comments.js b/lib/rules/capitalized-comments.js
index c98a4464acb..8fabde287cc 100644
--- a/lib/rules/capitalized-comments.js
+++ b/lib/rules/capitalized-comments.js
@@ -9,7 +9,7 @@
 //------------------------------------------------------------------------------
 
 const LETTER_PATTERN = require("../util/patterns/letters");
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Helpers
diff --git a/lib/rules/comma-dangle.js b/lib/rules/comma-dangle.js
index 50de7b59b22..9bc6c3fa8cc 100644
--- a/lib/rules/comma-dangle.js
+++ b/lib/rules/comma-dangle.js
@@ -10,7 +10,7 @@
 //------------------------------------------------------------------------------
 
 const lodash = require("lodash");
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Helpers
diff --git a/lib/rules/comma-spacing.js b/lib/rules/comma-spacing.js
index 2a48e54d51c..d3f82b3a4b9 100644
--- a/lib/rules/comma-spacing.js
+++ b/lib/rules/comma-spacing.js
@@ -4,7 +4,7 @@
  */
 "use strict";
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/comma-style.js b/lib/rules/comma-style.js
index aac667f73b3..bd98d7acc8e 100644
--- a/lib/rules/comma-style.js
+++ b/lib/rules/comma-style.js
@@ -5,7 +5,7 @@
 
 "use strict";
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/complexity.js b/lib/rules/complexity.js
index 0b864413659..f2519459524 100644
--- a/lib/rules/complexity.js
+++ b/lib/rules/complexity.js
@@ -12,7 +12,7 @@
 
 const lodash = require("lodash");
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/computed-property-spacing.js b/lib/rules/computed-property-spacing.js
index 51334a2ab4d..060b2c5b40d 100644
--- a/lib/rules/computed-property-spacing.js
+++ b/lib/rules/computed-property-spacing.js
@@ -4,7 +4,7 @@
  */
 "use strict";
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/consistent-return.js b/lib/rules/consistent-return.js
index c86b1717ef0..6185d094fb5 100644
--- a/lib/rules/consistent-return.js
+++ b/lib/rules/consistent-return.js
@@ -10,7 +10,7 @@
 
 const lodash = require("lodash");
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Helpers
diff --git a/lib/rules/curly.js b/lib/rules/curly.js
index 07d991b31a4..ad8da821c1c 100644
--- a/lib/rules/curly.js
+++ b/lib/rules/curly.js
@@ -8,7 +8,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/dot-location.js b/lib/rules/dot-location.js
index 7ff8ca65ae4..34d2d4eaab8 100644
--- a/lib/rules/dot-location.js
+++ b/lib/rules/dot-location.js
@@ -5,7 +5,7 @@
 
 "use strict";
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/dot-notation.js b/lib/rules/dot-notation.js
index c381661d41f..a7062df8a5b 100644
--- a/lib/rules/dot-notation.js
+++ b/lib/rules/dot-notation.js
@@ -8,7 +8,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/eqeqeq.js b/lib/rules/eqeqeq.js
index ec9d0a78218..2c5e9ae9e4f 100644
--- a/lib/rules/eqeqeq.js
+++ b/lib/rules/eqeqeq.js
@@ -9,7 +9,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/func-call-spacing.js b/lib/rules/func-call-spacing.js
index b13613cf809..83142bae8ca 100644
--- a/lib/rules/func-call-spacing.js
+++ b/lib/rules/func-call-spacing.js
@@ -9,7 +9,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/func-name-matching.js b/lib/rules/func-name-matching.js
index b717995967f..d66f630fcce 100644
--- a/lib/rules/func-name-matching.js
+++ b/lib/rules/func-name-matching.js
@@ -9,7 +9,7 @@
 // Requirements
 //--------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 const esutils = require("esutils");
 
 //--------------------------------------------------------------------------
diff --git a/lib/rules/func-names.js b/lib/rules/func-names.js
index 722f276c1d2..500b95a1c6f 100644
--- a/lib/rules/func-names.js
+++ b/lib/rules/func-names.js
@@ -9,7 +9,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 /**
  * Checks whether or not a given variable is a function name.
diff --git a/lib/rules/function-paren-newline.js b/lib/rules/function-paren-newline.js
index 7e4f2792cff..c483e40da9d 100644
--- a/lib/rules/function-paren-newline.js
+++ b/lib/rules/function-paren-newline.js
@@ -8,7 +8,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/getter-return.js b/lib/rules/getter-return.js
index fe40e5f099d..8fd9f1599ce 100644
--- a/lib/rules/getter-return.js
+++ b/lib/rules/getter-return.js
@@ -9,7 +9,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Helpers
diff --git a/lib/rules/indent-legacy.js b/lib/rules/indent-legacy.js
index dc6d1689e47..e6dc92163b0 100644
--- a/lib/rules/indent-legacy.js
+++ b/lib/rules/indent-legacy.js
@@ -12,7 +12,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/indent.js b/lib/rules/indent.js
index d3793bbbba7..716167d2cbd 100644
--- a/lib/rules/indent.js
+++ b/lib/rules/indent.js
@@ -13,7 +13,7 @@
 //------------------------------------------------------------------------------
 
 const lodash = require("lodash");
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 const createTree = require("functional-red-black-tree");
 
 //------------------------------------------------------------------------------
diff --git a/lib/rules/jsx-quotes.js b/lib/rules/jsx-quotes.js
index 54ec481a80d..3dd9567d737 100644
--- a/lib/rules/jsx-quotes.js
+++ b/lib/rules/jsx-quotes.js
@@ -9,7 +9,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Constants
diff --git a/lib/rules/key-spacing.js b/lib/rules/key-spacing.js
index e5242ff5b31..75578b2c747 100644
--- a/lib/rules/key-spacing.js
+++ b/lib/rules/key-spacing.js
@@ -8,7 +8,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Helpers
diff --git a/lib/rules/keyword-spacing.js b/lib/rules/keyword-spacing.js
index a2ce79ab5ae..2a66779e7aa 100644
--- a/lib/rules/keyword-spacing.js
+++ b/lib/rules/keyword-spacing.js
@@ -9,7 +9,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils"),
+const astUtils = require("../util/ast-utils"),
     keywords = require("../util/keywords");
 
 //------------------------------------------------------------------------------
diff --git a/lib/rules/line-comment-position.js b/lib/rules/line-comment-position.js
index ebdb024f6e4..99aea02b8f3 100644
--- a/lib/rules/line-comment-position.js
+++ b/lib/rules/line-comment-position.js
@@ -4,7 +4,7 @@
  */
 "use strict";
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/linebreak-style.js b/lib/rules/linebreak-style.js
index d5a170f7308..cd432dbcca1 100644
--- a/lib/rules/linebreak-style.js
+++ b/lib/rules/linebreak-style.js
@@ -9,7 +9,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/lines-around-comment.js b/lib/rules/lines-around-comment.js
index 5d98473be1c..67fd2032b3e 100644
--- a/lib/rules/lines-around-comment.js
+++ b/lib/rules/lines-around-comment.js
@@ -9,7 +9,7 @@
 //------------------------------------------------------------------------------
 
 const lodash = require("lodash"),
-    astUtils = require("../ast-utils");
+    astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Helpers
diff --git a/lib/rules/lines-around-directive.js b/lib/rules/lines-around-directive.js
index 3ba3ab5bb33..e8d613a41f0 100644
--- a/lib/rules/lines-around-directive.js
+++ b/lib/rules/lines-around-directive.js
@@ -6,7 +6,7 @@
 
 "use strict";
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/lines-between-class-members.js b/lib/rules/lines-between-class-members.js
index 252984da5ad..8d4e6dd8c18 100644
--- a/lib/rules/lines-between-class-members.js
+++ b/lib/rules/lines-between-class-members.js
@@ -4,7 +4,7 @@
  */
 "use strict";
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/max-lines-per-function.js b/lib/rules/max-lines-per-function.js
index b40c7ee88c0..ccf6304e4b2 100644
--- a/lib/rules/max-lines-per-function.js
+++ b/lib/rules/max-lines-per-function.js
@@ -8,7 +8,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Constants
diff --git a/lib/rules/max-lines.js b/lib/rules/max-lines.js
index 9bb4420edc0..e3fccb31484 100644
--- a/lib/rules/max-lines.js
+++ b/lib/rules/max-lines.js
@@ -9,7 +9,7 @@
 //------------------------------------------------------------------------------
 
 const lodash = require("lodash");
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/max-params.js b/lib/rules/max-params.js
index d7c22c52741..43c649ee811 100644
--- a/lib/rules/max-params.js
+++ b/lib/rules/max-params.js
@@ -11,7 +11,7 @@
 
 const lodash = require("lodash");
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/max-statements-per-line.js b/lib/rules/max-statements-per-line.js
index a6776bdea99..566f04ab53b 100644
--- a/lib/rules/max-statements-per-line.js
+++ b/lib/rules/max-statements-per-line.js
@@ -8,7 +8,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/max-statements.js b/lib/rules/max-statements.js
index faa0d5d8445..8501fd688fb 100644
--- a/lib/rules/max-statements.js
+++ b/lib/rules/max-statements.js
@@ -11,7 +11,7 @@
 
 const lodash = require("lodash");
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/multiline-comment-style.js b/lib/rules/multiline-comment-style.js
index 4da9a619fce..5dd39e00a77 100644
--- a/lib/rules/multiline-comment-style.js
+++ b/lib/rules/multiline-comment-style.js
@@ -4,7 +4,7 @@
  */
 "use strict";
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/multiline-ternary.js b/lib/rules/multiline-ternary.js
index 10cf269fb18..6a22a1113c1 100644
--- a/lib/rules/multiline-ternary.js
+++ b/lib/rules/multiline-ternary.js
@@ -5,7 +5,7 @@
 
 "use strict";
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/new-parens.js b/lib/rules/new-parens.js
index abf2e032b77..fab302000c9 100644
--- a/lib/rules/new-parens.js
+++ b/lib/rules/new-parens.js
@@ -9,7 +9,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Helpers
diff --git a/lib/rules/newline-after-var.js b/lib/rules/newline-after-var.js
index b11d9d9952e..62ccb3db29e 100644
--- a/lib/rules/newline-after-var.js
+++ b/lib/rules/newline-after-var.js
@@ -10,7 +10,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/newline-per-chained-call.js b/lib/rules/newline-per-chained-call.js
index 9691da44e01..2adcdfe45a6 100644
--- a/lib/rules/newline-per-chained-call.js
+++ b/lib/rules/newline-per-chained-call.js
@@ -6,7 +6,7 @@
 
 "use strict";
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/no-alert.js b/lib/rules/no-alert.js
index 69d419da1c5..1c08460f340 100644
--- a/lib/rules/no-alert.js
+++ b/lib/rules/no-alert.js
@@ -8,7 +8,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const getPropertyName = require("../ast-utils").getStaticPropertyName;
+const getPropertyName = require("../util/ast-utils").getStaticPropertyName;
 
 //------------------------------------------------------------------------------
 // Helpers
diff --git a/lib/rules/no-catch-shadow.js b/lib/rules/no-catch-shadow.js
index e1e24e0ef85..f749490f31e 100644
--- a/lib/rules/no-catch-shadow.js
+++ b/lib/rules/no-catch-shadow.js
@@ -10,7 +10,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/no-class-assign.js b/lib/rules/no-class-assign.js
index 58dddd6a684..9b28d40d4a3 100644
--- a/lib/rules/no-class-assign.js
+++ b/lib/rules/no-class-assign.js
@@ -5,7 +5,7 @@
 
 "use strict";
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/no-cond-assign.js b/lib/rules/no-cond-assign.js
index 4c7b5722d69..caf9563e952 100644
--- a/lib/rules/no-cond-assign.js
+++ b/lib/rules/no-cond-assign.js
@@ -4,7 +4,7 @@
  */
 "use strict";
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 const NODE_DESCRIPTIONS = {
     DoWhileStatement: "a 'do...while' statement",
diff --git a/lib/rules/no-confusing-arrow.js b/lib/rules/no-confusing-arrow.js
index 297e3b14808..503174e9a67 100644
--- a/lib/rules/no-confusing-arrow.js
+++ b/lib/rules/no-confusing-arrow.js
@@ -6,7 +6,7 @@
 
 "use strict";
 
-const astUtils = require("../ast-utils.js");
+const astUtils = require("../util/ast-utils.js");
 
 //------------------------------------------------------------------------------
 // Helpers
diff --git a/lib/rules/no-console.js b/lib/rules/no-console.js
index fd5c33a8e79..5fb3a159be8 100644
--- a/lib/rules/no-console.js
+++ b/lib/rules/no-console.js
@@ -9,7 +9,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/no-const-assign.js b/lib/rules/no-const-assign.js
index 043fe05df72..3188bd34d3b 100644
--- a/lib/rules/no-const-assign.js
+++ b/lib/rules/no-const-assign.js
@@ -5,7 +5,7 @@
 
 "use strict";
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/no-dupe-keys.js b/lib/rules/no-dupe-keys.js
index 577710c65d5..31493bd048d 100644
--- a/lib/rules/no-dupe-keys.js
+++ b/lib/rules/no-dupe-keys.js
@@ -9,7 +9,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Helpers
diff --git a/lib/rules/no-else-return.js b/lib/rules/no-else-return.js
index 5e58acfe058..1000fa807ac 100644
--- a/lib/rules/no-else-return.js
+++ b/lib/rules/no-else-return.js
@@ -9,7 +9,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 const FixTracker = require("../util/fix-tracker");
 
 //------------------------------------------------------------------------------
diff --git a/lib/rules/no-empty-function.js b/lib/rules/no-empty-function.js
index d9948cd4a33..c8039314ab0 100644
--- a/lib/rules/no-empty-function.js
+++ b/lib/rules/no-empty-function.js
@@ -9,7 +9,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Helpers
diff --git a/lib/rules/no-empty.js b/lib/rules/no-empty.js
index a598d40f8ca..2f4c258a26f 100644
--- a/lib/rules/no-empty.js
+++ b/lib/rules/no-empty.js
@@ -8,7 +8,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/no-eval.js b/lib/rules/no-eval.js
index 68ed086a3d9..c3ea87d466d 100644
--- a/lib/rules/no-eval.js
+++ b/lib/rules/no-eval.js
@@ -9,7 +9,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Helpers
diff --git a/lib/rules/no-ex-assign.js b/lib/rules/no-ex-assign.js
index feace415e50..1c7beccf89e 100644
--- a/lib/rules/no-ex-assign.js
+++ b/lib/rules/no-ex-assign.js
@@ -5,7 +5,7 @@
 
 "use strict";
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/no-extend-native.js b/lib/rules/no-extend-native.js
index 3ba13090a67..a1bf49f1325 100644
--- a/lib/rules/no-extend-native.js
+++ b/lib/rules/no-extend-native.js
@@ -9,7 +9,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 const globals = require("globals");
 
 //------------------------------------------------------------------------------
diff --git a/lib/rules/no-extra-bind.js b/lib/rules/no-extra-bind.js
index 8d901808fd6..b8376adfc11 100644
--- a/lib/rules/no-extra-bind.js
+++ b/lib/rules/no-extra-bind.js
@@ -8,7 +8,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/no-extra-boolean-cast.js b/lib/rules/no-extra-boolean-cast.js
index 38191361715..5eac6b53fe4 100644
--- a/lib/rules/no-extra-boolean-cast.js
+++ b/lib/rules/no-extra-boolean-cast.js
@@ -9,7 +9,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/no-extra-label.js b/lib/rules/no-extra-label.js
index 73a3fea9c96..9310e90f71e 100644
--- a/lib/rules/no-extra-label.js
+++ b/lib/rules/no-extra-label.js
@@ -9,7 +9,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/no-extra-parens.js b/lib/rules/no-extra-parens.js
index 3d4ee19e880..814cf0faf04 100644
--- a/lib/rules/no-extra-parens.js
+++ b/lib/rules/no-extra-parens.js
@@ -8,7 +8,7 @@
 // Rule Definition
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils.js");
+const astUtils = require("../util/ast-utils.js");
 
 module.exports = {
     meta: {
diff --git a/lib/rules/no-extra-semi.js b/lib/rules/no-extra-semi.js
index a0741088589..4d40b5e1538 100644
--- a/lib/rules/no-extra-semi.js
+++ b/lib/rules/no-extra-semi.js
@@ -10,7 +10,7 @@
 //------------------------------------------------------------------------------
 
 const FixTracker = require("../util/fix-tracker");
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/no-floating-decimal.js b/lib/rules/no-floating-decimal.js
index da8c4791237..a62846cc10f 100644
--- a/lib/rules/no-floating-decimal.js
+++ b/lib/rules/no-floating-decimal.js
@@ -9,7 +9,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/no-func-assign.js b/lib/rules/no-func-assign.js
index a0a17f36979..029f6a9d7d1 100644
--- a/lib/rules/no-func-assign.js
+++ b/lib/rules/no-func-assign.js
@@ -5,7 +5,7 @@
 
 "use strict";
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/no-implicit-coercion.js b/lib/rules/no-implicit-coercion.js
index 1dd4d431d72..3bfe3f0d3a2 100644
--- a/lib/rules/no-implicit-coercion.js
+++ b/lib/rules/no-implicit-coercion.js
@@ -5,7 +5,7 @@
 
 "use strict";
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Helpers
diff --git a/lib/rules/no-inline-comments.js b/lib/rules/no-inline-comments.js
index 85a0d383169..2fb21909229 100644
--- a/lib/rules/no-inline-comments.js
+++ b/lib/rules/no-inline-comments.js
@@ -4,7 +4,7 @@
  */
 "use strict";
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/no-invalid-this.js b/lib/rules/no-invalid-this.js
index a04673be867..480deebc14c 100644
--- a/lib/rules/no-invalid-this.js
+++ b/lib/rules/no-invalid-this.js
@@ -9,7 +9,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/no-irregular-whitespace.js b/lib/rules/no-irregular-whitespace.js
index 7f9adc10ab3..729f829a1f7 100644
--- a/lib/rules/no-irregular-whitespace.js
+++ b/lib/rules/no-irregular-whitespace.js
@@ -10,7 +10,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Constants
diff --git a/lib/rules/no-label-var.js b/lib/rules/no-label-var.js
index a880abfcabb..3f5aba4fc1e 100644
--- a/lib/rules/no-label-var.js
+++ b/lib/rules/no-label-var.js
@@ -9,7 +9,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/no-labels.js b/lib/rules/no-labels.js
index e09bb7b6eef..bd6ec57a350 100644
--- a/lib/rules/no-labels.js
+++ b/lib/rules/no-labels.js
@@ -8,7 +8,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/no-mixed-operators.js b/lib/rules/no-mixed-operators.js
index 0df42259db8..d4ead20062d 100644
--- a/lib/rules/no-mixed-operators.js
+++ b/lib/rules/no-mixed-operators.js
@@ -9,7 +9,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils.js");
+const astUtils = require("../util/ast-utils.js");
 
 //------------------------------------------------------------------------------
 // Helpers
diff --git a/lib/rules/no-multi-spaces.js b/lib/rules/no-multi-spaces.js
index d0ca097ad67..41bcd4fb611 100644
--- a/lib/rules/no-multi-spaces.js
+++ b/lib/rules/no-multi-spaces.js
@@ -5,7 +5,7 @@
 
 "use strict";
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/no-multi-str.js b/lib/rules/no-multi-str.js
index 2b97c261e0f..ee0aaaa4c0c 100644
--- a/lib/rules/no-multi-str.js
+++ b/lib/rules/no-multi-str.js
@@ -9,7 +9,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/no-regex-spaces.js b/lib/rules/no-regex-spaces.js
index a50692a4c3d..089e0602865 100644
--- a/lib/rules/no-regex-spaces.js
+++ b/lib/rules/no-regex-spaces.js
@@ -5,7 +5,7 @@
 
 "use strict";
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/no-restricted-properties.js b/lib/rules/no-restricted-properties.js
index 71cc83c65a4..c0f1cfb6d38 100644
--- a/lib/rules/no-restricted-properties.js
+++ b/lib/rules/no-restricted-properties.js
@@ -5,7 +5,7 @@
 
 "use strict";
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/no-return-assign.js b/lib/rules/no-return-assign.js
index ca96da9f2fa..519f9e0d039 100644
--- a/lib/rules/no-return-assign.js
+++ b/lib/rules/no-return-assign.js
@@ -8,7 +8,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Helpers
diff --git a/lib/rules/no-return-await.js b/lib/rules/no-return-await.js
index fc3373d3c41..5f531a18310 100644
--- a/lib/rules/no-return-await.js
+++ b/lib/rules/no-return-await.js
@@ -4,7 +4,7 @@
  */
 "use strict";
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/no-self-assign.js b/lib/rules/no-self-assign.js
index 5b65ea4f9af..87d1f2ff4f7 100644
--- a/lib/rules/no-self-assign.js
+++ b/lib/rules/no-self-assign.js
@@ -9,7 +9,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Helpers
diff --git a/lib/rules/no-sequences.js b/lib/rules/no-sequences.js
index 8eaf55572b3..e74943d8109 100644
--- a/lib/rules/no-sequences.js
+++ b/lib/rules/no-sequences.js
@@ -9,7 +9,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/no-shadow.js b/lib/rules/no-shadow.js
index 17ca1291d32..955fc05e582 100644
--- a/lib/rules/no-shadow.js
+++ b/lib/rules/no-shadow.js
@@ -9,7 +9,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/no-this-before-super.js b/lib/rules/no-this-before-super.js
index 944a3235290..8a489879edd 100644
--- a/lib/rules/no-this-before-super.js
+++ b/lib/rules/no-this-before-super.js
@@ -9,7 +9,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Helpers
diff --git a/lib/rules/no-throw-literal.js b/lib/rules/no-throw-literal.js
index b080578bf2f..301354b6b2c 100644
--- a/lib/rules/no-throw-literal.js
+++ b/lib/rules/no-throw-literal.js
@@ -5,7 +5,7 @@
 
 "use strict";
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/no-trailing-spaces.js b/lib/rules/no-trailing-spaces.js
index 4d70c3b5cd2..cca7af2aac3 100644
--- a/lib/rules/no-trailing-spaces.js
+++ b/lib/rules/no-trailing-spaces.js
@@ -8,7 +8,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/no-undef-init.js b/lib/rules/no-undef-init.js
index 2e0ab246299..f00b05d4ff0 100644
--- a/lib/rules/no-undef-init.js
+++ b/lib/rules/no-undef-init.js
@@ -5,7 +5,7 @@
 
 "use strict";
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/no-unexpected-multiline.js b/lib/rules/no-unexpected-multiline.js
index 51ba7cfa75d..181a00b2d0d 100644
--- a/lib/rules/no-unexpected-multiline.js
+++ b/lib/rules/no-unexpected-multiline.js
@@ -8,7 +8,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/no-unmodified-loop-condition.js b/lib/rules/no-unmodified-loop-condition.js
index a02366badf4..fecd8ba5cca 100644
--- a/lib/rules/no-unmodified-loop-condition.js
+++ b/lib/rules/no-unmodified-loop-condition.js
@@ -10,7 +10,7 @@
 //------------------------------------------------------------------------------
 
 const Traverser = require("../util/traverser"),
-    astUtils = require("../ast-utils");
+    astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Helpers
diff --git a/lib/rules/no-unneeded-ternary.js b/lib/rules/no-unneeded-ternary.js
index b56ad038a49..6b58b018da0 100644
--- a/lib/rules/no-unneeded-ternary.js
+++ b/lib/rules/no-unneeded-ternary.js
@@ -5,7 +5,7 @@
 
 "use strict";
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 // Operators that always result in a boolean value
 const BOOLEAN_OPERATORS = new Set(["==", "===", "!=", "!==", ">", ">=", "<", "<=", "in", "instanceof"]);
diff --git a/lib/rules/no-unsafe-negation.js b/lib/rules/no-unsafe-negation.js
index 5dc39f183bc..b04f80106c6 100644
--- a/lib/rules/no-unsafe-negation.js
+++ b/lib/rules/no-unsafe-negation.js
@@ -9,7 +9,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Helpers
diff --git a/lib/rules/no-unused-vars.js b/lib/rules/no-unused-vars.js
index 0d5194bc8dc..fff3e33d923 100644
--- a/lib/rules/no-unused-vars.js
+++ b/lib/rules/no-unused-vars.js
@@ -10,7 +10,7 @@
 //------------------------------------------------------------------------------
 
 const lodash = require("lodash");
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/no-useless-call.js b/lib/rules/no-useless-call.js
index 925c9f79a99..0778b374f4f 100644
--- a/lib/rules/no-useless-call.js
+++ b/lib/rules/no-useless-call.js
@@ -5,7 +5,7 @@
 
 "use strict";
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Helpers
diff --git a/lib/rules/no-useless-computed-key.js b/lib/rules/no-useless-computed-key.js
index 07573075e1a..189f50853c8 100644
--- a/lib/rules/no-useless-computed-key.js
+++ b/lib/rules/no-useless-computed-key.js
@@ -8,7 +8,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/no-useless-concat.js b/lib/rules/no-useless-concat.js
index a9ac7868436..e8e36aa1c1a 100644
--- a/lib/rules/no-useless-concat.js
+++ b/lib/rules/no-useless-concat.js
@@ -8,7 +8,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Helpers
diff --git a/lib/rules/no-useless-escape.js b/lib/rules/no-useless-escape.js
index 2ddab78543b..7f4b87ed92c 100644
--- a/lib/rules/no-useless-escape.js
+++ b/lib/rules/no-useless-escape.js
@@ -5,7 +5,7 @@
 
 "use strict";
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/no-useless-return.js b/lib/rules/no-useless-return.js
index 731ca4dff4c..b5b8ebc32a1 100644
--- a/lib/rules/no-useless-return.js
+++ b/lib/rules/no-useless-return.js
@@ -8,7 +8,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils"),
+const astUtils = require("../util/ast-utils"),
     FixTracker = require("../util/fix-tracker");
 
 //------------------------------------------------------------------------------
diff --git a/lib/rules/no-var.js b/lib/rules/no-var.js
index 5ca868e65a7..2c32a023dc9 100644
--- a/lib/rules/no-var.js
+++ b/lib/rules/no-var.js
@@ -9,7 +9,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Helpers
diff --git a/lib/rules/no-warning-comments.js b/lib/rules/no-warning-comments.js
index 4e05cc41140..5ff76e3a391 100644
--- a/lib/rules/no-warning-comments.js
+++ b/lib/rules/no-warning-comments.js
@@ -5,7 +5,7 @@
 
 "use strict";
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/no-whitespace-before-property.js b/lib/rules/no-whitespace-before-property.js
index fc4c25f8497..4b71a9ec17d 100644
--- a/lib/rules/no-whitespace-before-property.js
+++ b/lib/rules/no-whitespace-before-property.js
@@ -8,7 +8,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/object-curly-newline.js b/lib/rules/object-curly-newline.js
index e979b5ffe0e..494e78cff4a 100644
--- a/lib/rules/object-curly-newline.js
+++ b/lib/rules/object-curly-newline.js
@@ -9,7 +9,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 const lodash = require("lodash");
 
 //------------------------------------------------------------------------------
diff --git a/lib/rules/object-curly-spacing.js b/lib/rules/object-curly-spacing.js
index b37d6fd90f3..e7c847a6a95 100644
--- a/lib/rules/object-curly-spacing.js
+++ b/lib/rules/object-curly-spacing.js
@@ -4,7 +4,7 @@
  */
 "use strict";
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/object-shorthand.js b/lib/rules/object-shorthand.js
index 71a320a0e65..21f039f8b6e 100644
--- a/lib/rules/object-shorthand.js
+++ b/lib/rules/object-shorthand.js
@@ -17,7 +17,7 @@ const OPTIONS = {
 //------------------------------------------------------------------------------
 // Requirements
 //------------------------------------------------------------------------------
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/operator-assignment.js b/lib/rules/operator-assignment.js
index ad516bbfc4c..8e4b7025eda 100644
--- a/lib/rules/operator-assignment.js
+++ b/lib/rules/operator-assignment.js
@@ -8,7 +8,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Helpers
diff --git a/lib/rules/operator-linebreak.js b/lib/rules/operator-linebreak.js
index 558258b27df..be2709a1bda 100644
--- a/lib/rules/operator-linebreak.js
+++ b/lib/rules/operator-linebreak.js
@@ -9,7 +9,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/padding-line-between-statements.js b/lib/rules/padding-line-between-statements.js
index 1ecd8df69d9..f571e1e2e33 100644
--- a/lib/rules/padding-line-between-statements.js
+++ b/lib/rules/padding-line-between-statements.js
@@ -9,7 +9,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Helpers
diff --git a/lib/rules/prefer-const.js b/lib/rules/prefer-const.js
index a70c9855406..774fcf06437 100644
--- a/lib/rules/prefer-const.js
+++ b/lib/rules/prefer-const.js
@@ -5,7 +5,7 @@
 
 "use strict";
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Helpers
diff --git a/lib/rules/prefer-object-spread.js b/lib/rules/prefer-object-spread.js
index 3df16b7aeed..8e54de2496a 100644
--- a/lib/rules/prefer-object-spread.js
+++ b/lib/rules/prefer-object-spread.js
@@ -12,7 +12,7 @@ const {
     isOpeningParenToken,
     isClosingParenToken,
     isParenthesised
-} = require("../ast-utils");
+} = require("../util/ast-utils");
 
 const ANY_SPACE = /\s/;
 
diff --git a/lib/rules/prefer-promise-reject-errors.js b/lib/rules/prefer-promise-reject-errors.js
index f92bd58d2e6..e3d298a743c 100644
--- a/lib/rules/prefer-promise-reject-errors.js
+++ b/lib/rules/prefer-promise-reject-errors.js
@@ -4,7 +4,7 @@
  */
 "use strict";
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/prefer-spread.js b/lib/rules/prefer-spread.js
index 62cfb28e7e2..9bf69c80f7b 100644
--- a/lib/rules/prefer-spread.js
+++ b/lib/rules/prefer-spread.js
@@ -5,7 +5,7 @@
 
 "use strict";
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Helpers
diff --git a/lib/rules/prefer-template.js b/lib/rules/prefer-template.js
index 14c419942b8..0471d61caef 100644
--- a/lib/rules/prefer-template.js
+++ b/lib/rules/prefer-template.js
@@ -9,7 +9,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Helpers
diff --git a/lib/rules/quotes.js b/lib/rules/quotes.js
index 78794e72bf0..8dd61c3e371 100644
--- a/lib/rules/quotes.js
+++ b/lib/rules/quotes.js
@@ -9,7 +9,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Constants
diff --git a/lib/rules/radix.js b/lib/rules/radix.js
index 7e116a6fbf9..f71220beb4e 100644
--- a/lib/rules/radix.js
+++ b/lib/rules/radix.js
@@ -9,7 +9,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Helpers
diff --git a/lib/rules/require-await.js b/lib/rules/require-await.js
index 5517cf8672b..de39f372fd6 100644
--- a/lib/rules/require-await.js
+++ b/lib/rules/require-await.js
@@ -9,7 +9,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Helpers
diff --git a/lib/rules/semi-spacing.js b/lib/rules/semi-spacing.js
index 07af993764a..cde93abf370 100644
--- a/lib/rules/semi-spacing.js
+++ b/lib/rules/semi-spacing.js
@@ -5,7 +5,7 @@
 
 "use strict";
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/semi-style.js b/lib/rules/semi-style.js
index de65928136b..34899bb5444 100644
--- a/lib/rules/semi-style.js
+++ b/lib/rules/semi-style.js
@@ -9,7 +9,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/semi.js b/lib/rules/semi.js
index 33a214db7c9..129d106414d 100644
--- a/lib/rules/semi.js
+++ b/lib/rules/semi.js
@@ -9,7 +9,7 @@
 //------------------------------------------------------------------------------
 
 const FixTracker = require("../util/fix-tracker");
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/sort-keys.js b/lib/rules/sort-keys.js
index 85bfe56d576..6e538f73291 100644
--- a/lib/rules/sort-keys.js
+++ b/lib/rules/sort-keys.js
@@ -9,7 +9,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils"),
+const astUtils = require("../util/ast-utils"),
     naturalCompare = require("natural-compare");
 
 //------------------------------------------------------------------------------
diff --git a/lib/rules/space-before-blocks.js b/lib/rules/space-before-blocks.js
index 2b82066d727..4f22ae6b653 100644
--- a/lib/rules/space-before-blocks.js
+++ b/lib/rules/space-before-blocks.js
@@ -5,7 +5,7 @@
 
 "use strict";
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/space-before-function-paren.js b/lib/rules/space-before-function-paren.js
index 51f6cc43262..81697d64f1f 100644
--- a/lib/rules/space-before-function-paren.js
+++ b/lib/rules/space-before-function-paren.js
@@ -8,7 +8,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/space-in-parens.js b/lib/rules/space-in-parens.js
index 7e315c44862..aa137438034 100644
--- a/lib/rules/space-in-parens.js
+++ b/lib/rules/space-in-parens.js
@@ -4,7 +4,7 @@
  */
 "use strict";
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/space-unary-ops.js b/lib/rules/space-unary-ops.js
index 6fbcc15c040..6fe25443c13 100644
--- a/lib/rules/space-unary-ops.js
+++ b/lib/rules/space-unary-ops.js
@@ -8,7 +8,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/spaced-comment.js b/lib/rules/spaced-comment.js
index 3a76c0c2600..6fbe2aac790 100644
--- a/lib/rules/spaced-comment.js
+++ b/lib/rules/spaced-comment.js
@@ -5,7 +5,7 @@
 "use strict";
 
 const lodash = require("lodash");
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Helpers
diff --git a/lib/rules/strict.js b/lib/rules/strict.js
index 633a8b323da..8b5757738de 100644
--- a/lib/rules/strict.js
+++ b/lib/rules/strict.js
@@ -9,7 +9,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Helpers
diff --git a/lib/rules/switch-colon-spacing.js b/lib/rules/switch-colon-spacing.js
index cf19df6ed4a..23dfff6133d 100644
--- a/lib/rules/switch-colon-spacing.js
+++ b/lib/rules/switch-colon-spacing.js
@@ -9,7 +9,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/symbol-description.js b/lib/rules/symbol-description.js
index 95c1a1deb5d..271012b5429 100644
--- a/lib/rules/symbol-description.js
+++ b/lib/rules/symbol-description.js
@@ -9,7 +9,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/template-curly-spacing.js b/lib/rules/template-curly-spacing.js
index 707ea76a360..6702d730cd3 100644
--- a/lib/rules/template-curly-spacing.js
+++ b/lib/rules/template-curly-spacing.js
@@ -9,7 +9,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Helpers
diff --git a/lib/rules/wrap-iife.js b/lib/rules/wrap-iife.js
index a21bf21634c..d006d30a004 100644
--- a/lib/rules/wrap-iife.js
+++ b/lib/rules/wrap-iife.js
@@ -9,7 +9,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
diff --git a/lib/rules/yoda.js b/lib/rules/yoda.js
index 7f3bc6115b9..35368dd4df9 100644
--- a/lib/rules/yoda.js
+++ b/lib/rules/yoda.js
@@ -8,7 +8,7 @@
 // Requirements
 //--------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //--------------------------------------------------------------------------
 // Helpers
diff --git a/lib/token-store/index.js b/lib/token-store/index.js
index 1446b9ff025..d59a0bba03b 100644
--- a/lib/token-store/index.js
+++ b/lib/token-store/index.js
@@ -13,7 +13,7 @@ const cursors = require("./cursors");
 const ForwardTokenCursor = require("./forward-token-cursor");
 const PaddedTokenCursor = require("./padded-token-cursor");
 const utils = require("./utils");
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Helpers
diff --git a/lib/ast-utils.js b/lib/util/ast-utils.js
similarity index 100%
rename from lib/ast-utils.js
rename to lib/util/ast-utils.js
diff --git a/lib/util/fix-tracker.js b/lib/util/fix-tracker.js
index 067070df001..3c9bf63d257 100644
--- a/lib/util/fix-tracker.js
+++ b/lib/util/fix-tracker.js
@@ -8,7 +8,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const astUtils = require("../ast-utils");
+const astUtils = require("../util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Public Interface
diff --git a/lib/util/glob-util.js b/lib/util/glob-utils.js
similarity index 98%
rename from lib/util/glob-util.js
rename to lib/util/glob-utils.js
index 9d5d7e5aa7c..5bb3baa9120 100644
--- a/lib/util/glob-util.js
+++ b/lib/util/glob-utils.js
@@ -13,10 +13,10 @@ const lodash = require("lodash"),
     path = require("path"),
     GlobSync = require("./glob"),
 
-    pathUtil = require("./path-util"),
+    pathUtil = require("./path-utils"),
     IgnoredPaths = require("../ignored-paths");
 
-const debug = require("debug")("eslint:glob-util");
+const debug = require("debug")("eslint:glob-utils");
 
 //------------------------------------------------------------------------------
 // Helpers
@@ -194,7 +194,7 @@ function listFilesToProcess(globPatterns, providedOptions) {
     );
 
     /*
-     * The test "should use default options if none are provided" (source-code-util.js) checks that 'module.exports.resolveFileGlobPatterns' was called.
+     * The test "should use default options if none are provided" (source-code-utils.js) checks that 'module.exports.resolveFileGlobPatterns' was called.
      * So it cannot use the local function "resolveFileGlobPatterns".
      */
     const resolvedGlobPatterns = module.exports.resolveFileGlobPatterns(globPatterns, options);
diff --git a/lib/util/naming.js b/lib/util/naming.js
index a5d6b9d7977..d9172296181 100644
--- a/lib/util/naming.js
+++ b/lib/util/naming.js
@@ -7,7 +7,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const pathUtil = require("../util/path-util");
+const pathUtil = require("../util/path-utils");
 
 //------------------------------------------------------------------------------
 // Private
diff --git a/lib/util/npm-util.js b/lib/util/npm-utils.js
similarity index 100%
rename from lib/util/npm-util.js
rename to lib/util/npm-utils.js
diff --git a/lib/util/path-util.js b/lib/util/path-utils.js
similarity index 100%
rename from lib/util/path-util.js
rename to lib/util/path-utils.js
diff --git a/lib/util/source-code-util.js b/lib/util/source-code-utils.js
similarity index 97%
rename from lib/util/source-code-util.js
rename to lib/util/source-code-utils.js
index 66d91cd21e6..2baa34899a3 100644
--- a/lib/util/source-code-util.js
+++ b/lib/util/source-code-utils.js
@@ -10,10 +10,10 @@
 //------------------------------------------------------------------------------
 
 const CLIEngine = require("../cli-engine"),
-    globUtil = require("./glob-util"),
+    globUtil = require("./glob-utils"),
     baseDefaultOptions = require("../../conf/default-cli-options");
 
-const debug = require("debug")("eslint:source-code-util");
+const debug = require("debug")("eslint:source-code-utils");
 
 //------------------------------------------------------------------------------
 // Helpers
diff --git a/lib/util/source-code.js b/lib/util/source-code.js
index d34151995ce..dd45f6112ad 100644
--- a/lib/util/source-code.js
+++ b/lib/util/source-code.js
@@ -10,7 +10,7 @@
 
 const TokenStore = require("../token-store"),
     Traverser = require("./traverser"),
-    astUtils = require("../ast-utils"),
+    astUtils = require("../util/ast-utils"),
     lodash = require("lodash");
 
 //------------------------------------------------------------------------------
diff --git a/tests/lib/ast-utils.js b/tests/lib/ast-utils.js
index c728b8457d5..972882a1219 100644
--- a/tests/lib/ast-utils.js
+++ b/tests/lib/ast-utils.js
@@ -11,7 +11,7 @@
 
 const assert = require("chai").assert,
     espree = require("espree"),
-    astUtils = require("../../lib/ast-utils"),
+    astUtils = require("../../lib/util/ast-utils"),
     Linter = require("../../lib/linter"),
     SourceCode = require("../../lib/util/source-code");
 
diff --git a/tests/lib/config/autoconfig.js b/tests/lib/config/autoconfig.js
index fb8e12e94ee..dd059f5d159 100644
--- a/tests/lib/config/autoconfig.js
+++ b/tests/lib/config/autoconfig.js
@@ -11,7 +11,7 @@
 
 const assert = require("chai").assert,
     autoconfig = require("../../../lib/config/autoconfig"),
-    sourceCodeUtil = require("../../../lib/util/source-code-util"),
+    sourceCodeUtil = require("../../../lib/util/source-code-utils"),
     baseDefaultOptions = require("../../../conf/default-cli-options");
 
 const defaultOptions = Object.assign({}, baseDefaultOptions, { cwd: process.cwd() });
diff --git a/tests/lib/config/config-initializer.js b/tests/lib/config/config-initializer.js
index 91cc6476bf8..de70ac1565f 100644
--- a/tests/lib/config/config-initializer.js
+++ b/tests/lib/config/config-initializer.js
@@ -16,7 +16,7 @@ const assert = require("chai").assert,
     sinon = require("sinon"),
     sh = require("shelljs"),
     autoconfig = require("../../../lib/config/autoconfig"),
-    npmUtil = require("../../../lib/util/npm-util");
+    npmUtil = require("../../../lib/util/npm-utils");
 
 const originalDir = process.cwd();
 const proxyquire = require("proxyquire").noPreserveCache();
diff --git a/tests/lib/util/glob-util.js b/tests/lib/util/glob-util.js
index afa7d3f7093..cbe60b5676b 100644
--- a/tests/lib/util/glob-util.js
+++ b/tests/lib/util/glob-util.js
@@ -12,7 +12,7 @@ const assert = require("chai").assert,
     path = require("path"),
     os = require("os"),
     sh = require("shelljs"),
-    globUtil = require("../../../lib/util/glob-util"),
+    globUtil = require("../../../lib/util/glob-utils"),
     fs = require("fs");
 
 //------------------------------------------------------------------------------
diff --git a/tests/lib/util/npm-util.js b/tests/lib/util/npm-util.js
index b0237c464fd..01dc1f02581 100644
--- a/tests/lib/util/npm-util.js
+++ b/tests/lib/util/npm-util.js
@@ -11,7 +11,7 @@
 const assert = require("chai").assert,
     spawn = require("cross-spawn"),
     sinon = require("sinon"),
-    npmUtil = require("../../../lib/util/npm-util"),
+    npmUtil = require("../../../lib/util/npm-utils"),
     log = require("../../../lib/util/logging"),
     mockFs = require("mock-fs");
 
diff --git a/tests/lib/util/path-util.js b/tests/lib/util/path-util.js
index bfb6efa5cdb..c5022cd2079 100644
--- a/tests/lib/util/path-util.js
+++ b/tests/lib/util/path-util.js
@@ -11,7 +11,7 @@
 const path = require("path"),
     assert = require("chai").assert,
     sinon = require("sinon"),
-    pathUtil = require("../../../lib/util/path-util");
+    pathUtil = require("../../../lib/util/path-utils");
 
 //------------------------------------------------------------------------------
 // Tests
diff --git a/tests/lib/util/source-code-util.js b/tests/lib/util/source-code-util.js
index 1a406e5d330..6b9ca7d1893 100644
--- a/tests/lib/util/source-code-util.js
+++ b/tests/lib/util/source-code-util.js
@@ -15,7 +15,7 @@ const path = require("path"),
     assert = require("chai").assert,
     sinon = require("sinon"),
     sh = require("shelljs"),
-    globUtil = require("../../../lib/util/glob-util"),
+    globUtil = require("../../../lib/util/glob-utils"),
     SourceCode = require("../../../lib/util/source-code");
 
 const proxyquire = require("proxyquire").noCallThru().noPreserveCache();
@@ -63,7 +63,7 @@ describe("SourceCodeUtil", () => {
     });
 
     beforeEach(() => {
-        getSourceCodeOfFiles = proxyquire("../../../lib/util/source-code-util", requireStubs).getSourceCodeOfFiles;
+        getSourceCodeOfFiles = proxyquire("../../../lib/util/source-code-utils", requireStubs).getSourceCodeOfFiles;
     });
 
     afterEach(() => {
diff --git a/tests/lib/util/source-code.js b/tests/lib/util/source-code.js
index 9d7adac0476..66517652248 100644
--- a/tests/lib/util/source-code.js
+++ b/tests/lib/util/source-code.js
@@ -16,7 +16,7 @@ const fs = require("fs"),
     leche = require("leche"),
     Linter = require("../../../lib/linter"),
     SourceCode = require("../../../lib/util/source-code"),
-    astUtils = require("../../../lib/ast-utils");
+    astUtils = require("../../../lib/util/ast-utils");
 
 //------------------------------------------------------------------------------
 // Helpers