diff --git a/src/extractors/generic/content/extract-best-node.js b/src/extractors/generic/content/extract-best-node.js
index e531cf99..10138124 100644
--- a/src/extractors/generic/content/extract-best-node.js
+++ b/src/extractors/generic/content/extract-best-node.js
@@ -1,7 +1,7 @@
 import {
   scoreContent,
   findTopCandidate,
-} from './utils/scoring'
+} from './scoring'
 import {
   stripUnlikelyCandidates,
   convertToParagraphs,
diff --git a/src/extractors/generic/content/utils/scoring/add-score.js b/src/extractors/generic/content/scoring/add-score.js
similarity index 100%
rename from src/extractors/generic/content/utils/scoring/add-score.js
rename to src/extractors/generic/content/scoring/add-score.js
diff --git a/src/extractors/generic/content/utils/scoring/add-score.test.js b/src/extractors/generic/content/scoring/add-score.test.js
similarity index 100%
rename from src/extractors/generic/content/utils/scoring/add-score.test.js
rename to src/extractors/generic/content/scoring/add-score.test.js
diff --git a/src/extractors/generic/content/utils/scoring/add-to-parent.js b/src/extractors/generic/content/scoring/add-to-parent.js
similarity index 100%
rename from src/extractors/generic/content/utils/scoring/add-to-parent.js
rename to src/extractors/generic/content/scoring/add-to-parent.js
diff --git a/src/extractors/generic/content/utils/scoring/add-to-parent.test.js b/src/extractors/generic/content/scoring/add-to-parent.test.js
similarity index 100%
rename from src/extractors/generic/content/utils/scoring/add-to-parent.test.js
rename to src/extractors/generic/content/scoring/add-to-parent.test.js
diff --git a/src/extractors/generic/content/utils/constants.js b/src/extractors/generic/content/scoring/constants.js
similarity index 100%
rename from src/extractors/generic/content/utils/constants.js
rename to src/extractors/generic/content/scoring/constants.js
diff --git a/src/extractors/generic/content/utils/scoring/find-top-candidate.js b/src/extractors/generic/content/scoring/find-top-candidate.js
similarity index 98%
rename from src/extractors/generic/content/utils/scoring/find-top-candidate.js
rename to src/extractors/generic/content/scoring/find-top-candidate.js
index cb7065bf..fef60946 100644
--- a/src/extractors/generic/content/utils/scoring/find-top-candidate.js
+++ b/src/extractors/generic/content/scoring/find-top-candidate.js
@@ -1,4 +1,4 @@
-import { NON_TOP_CANDIDATE_TAGS_RE } from '../constants'
+import { NON_TOP_CANDIDATE_TAGS_RE } from './constants'
 import { getScore } from './index'
 import {
   textLength,
diff --git a/src/extractors/generic/content/utils/scoring/find-top-candidate.test.js b/src/extractors/generic/content/scoring/find-top-candidate.test.js
similarity index 100%
rename from src/extractors/generic/content/utils/scoring/find-top-candidate.test.js
rename to src/extractors/generic/content/scoring/find-top-candidate.test.js
diff --git a/src/extractors/generic/content/utils/fixtures/html.js b/src/extractors/generic/content/scoring/fixtures/get-weight.js
similarity index 100%
rename from src/extractors/generic/content/utils/fixtures/html.js
rename to src/extractors/generic/content/scoring/fixtures/get-weight.js
diff --git a/src/extractors/generic/content/utils/scoring/fixtures/html.js b/src/extractors/generic/content/scoring/fixtures/html.js
similarity index 100%
rename from src/extractors/generic/content/utils/scoring/fixtures/html.js
rename to src/extractors/generic/content/scoring/fixtures/html.js
diff --git a/src/extractors/generic/content/utils/scoring/get-or-init-score.js b/src/extractors/generic/content/scoring/get-or-init-score.js
similarity index 100%
rename from src/extractors/generic/content/utils/scoring/get-or-init-score.js
rename to src/extractors/generic/content/scoring/get-or-init-score.js
diff --git a/src/extractors/generic/content/utils/scoring/get-or-init-score.test.js b/src/extractors/generic/content/scoring/get-or-init-score.test.js
similarity index 100%
rename from src/extractors/generic/content/utils/scoring/get-or-init-score.test.js
rename to src/extractors/generic/content/scoring/get-or-init-score.test.js
diff --git a/src/extractors/generic/content/utils/scoring/get-score.js b/src/extractors/generic/content/scoring/get-score.js
similarity index 100%
rename from src/extractors/generic/content/utils/scoring/get-score.js
rename to src/extractors/generic/content/scoring/get-score.js
diff --git a/src/extractors/generic/content/utils/scoring/get-score.test.js b/src/extractors/generic/content/scoring/get-score.test.js
similarity index 100%
rename from src/extractors/generic/content/utils/scoring/get-score.test.js
rename to src/extractors/generic/content/scoring/get-score.test.js
diff --git a/src/extractors/generic/content/utils/scoring/get-weight.js b/src/extractors/generic/content/scoring/get-weight.js
similarity index 98%
rename from src/extractors/generic/content/utils/scoring/get-weight.js
rename to src/extractors/generic/content/scoring/get-weight.js
index 55966d7f..4f187a86 100644
--- a/src/extractors/generic/content/utils/scoring/get-weight.js
+++ b/src/extractors/generic/content/scoring/get-weight.js
@@ -3,7 +3,7 @@ import {
   POSITIVE_SCORE_RE,
   PHOTO_HINTS_RE,
   READABILITY_ASSET,
-} from '../constants'
+} from './constants'
 
 
 // Get the score of a node based on its className and id.
diff --git a/src/extractors/generic/content/utils/scoring/get-weight.test.js b/src/extractors/generic/content/scoring/get-weight.test.js
similarity index 97%
rename from src/extractors/generic/content/utils/scoring/get-weight.test.js
rename to src/extractors/generic/content/scoring/get-weight.test.js
index 98116c90..74a42422 100644
--- a/src/extractors/generic/content/utils/scoring/get-weight.test.js
+++ b/src/extractors/generic/content/scoring/get-weight.test.js
@@ -1,7 +1,7 @@
 import assert from 'assert'
 import cheerio from 'cheerio'
 
-import HTML from '../fixtures/html'
+import HTML from './fixtures/get-weight'
 import {
   getWeight
 } from './index'
diff --git a/src/extractors/generic/content/utils/scoring/index.js b/src/extractors/generic/content/scoring/index.js
similarity index 100%
rename from src/extractors/generic/content/utils/scoring/index.js
rename to src/extractors/generic/content/scoring/index.js
diff --git a/src/extractors/generic/content/utils/scoring/score-commas.js b/src/extractors/generic/content/scoring/score-commas.js
similarity index 100%
rename from src/extractors/generic/content/utils/scoring/score-commas.js
rename to src/extractors/generic/content/scoring/score-commas.js
diff --git a/src/extractors/generic/content/utils/scoring/score-commas.test.js b/src/extractors/generic/content/scoring/score-commas.test.js
similarity index 100%
rename from src/extractors/generic/content/utils/scoring/score-commas.test.js
rename to src/extractors/generic/content/scoring/score-commas.test.js
diff --git a/src/extractors/generic/content/utils/scoring/score-content.js b/src/extractors/generic/content/scoring/score-content.js
similarity index 98%
rename from src/extractors/generic/content/utils/scoring/score-content.js
rename to src/extractors/generic/content/scoring/score-content.js
index cbffc9bf..250512f1 100644
--- a/src/extractors/generic/content/utils/scoring/score-content.js
+++ b/src/extractors/generic/content/scoring/score-content.js
@@ -1,4 +1,4 @@
-import { HNEWS_CONTENT_SELECTORS } from '../constants'
+import { HNEWS_CONTENT_SELECTORS } from './constants'
 
 import {
   scoreNode,
diff --git a/src/extractors/generic/content/utils/scoring/score-content.test.js b/src/extractors/generic/content/scoring/score-content.test.js
similarity index 100%
rename from src/extractors/generic/content/utils/scoring/score-content.test.js
rename to src/extractors/generic/content/scoring/score-content.test.js
diff --git a/src/extractors/generic/content/utils/scoring/score-length.js b/src/extractors/generic/content/scoring/score-length.js
similarity index 100%
rename from src/extractors/generic/content/utils/scoring/score-length.js
rename to src/extractors/generic/content/scoring/score-length.js
diff --git a/src/extractors/generic/content/utils/scoring/score-length.test.js b/src/extractors/generic/content/scoring/score-length.test.js
similarity index 100%
rename from src/extractors/generic/content/utils/scoring/score-length.test.js
rename to src/extractors/generic/content/scoring/score-length.test.js
diff --git a/src/extractors/generic/content/utils/scoring/score-node.js b/src/extractors/generic/content/scoring/score-node.js
similarity index 97%
rename from src/extractors/generic/content/utils/scoring/score-node.js
rename to src/extractors/generic/content/scoring/score-node.js
index 7ddd92d5..f3ec9a24 100644
--- a/src/extractors/generic/content/utils/scoring/score-node.js
+++ b/src/extractors/generic/content/scoring/score-node.js
@@ -3,7 +3,7 @@ import {
   PARAGRAPH_SCORE_TAGS,
   CHILD_CONTENT_TAGS,
   BAD_TAGS,
-} from '../constants'
+} from './constants'
 
 // Score an individual node. Has some smarts for paragraphs, otherwise
 // just scores based on tag.
diff --git a/src/extractors/generic/content/utils/scoring/score-node.test.js b/src/extractors/generic/content/scoring/score-node.test.js
similarity index 100%
rename from src/extractors/generic/content/utils/scoring/score-node.test.js
rename to src/extractors/generic/content/scoring/score-node.test.js
diff --git a/src/extractors/generic/content/utils/scoring/score-paragraph.js b/src/extractors/generic/content/scoring/score-paragraph.js
similarity index 100%
rename from src/extractors/generic/content/utils/scoring/score-paragraph.js
rename to src/extractors/generic/content/scoring/score-paragraph.js
diff --git a/src/extractors/generic/content/utils/scoring/score-paragraph.test.js b/src/extractors/generic/content/scoring/score-paragraph.test.js
similarity index 100%
rename from src/extractors/generic/content/utils/scoring/score-paragraph.test.js
rename to src/extractors/generic/content/scoring/score-paragraph.test.js
diff --git a/src/extractors/generic/content/utils/scoring/set-score.js b/src/extractors/generic/content/scoring/set-score.js
similarity index 100%
rename from src/extractors/generic/content/utils/scoring/set-score.js
rename to src/extractors/generic/content/scoring/set-score.js
diff --git a/src/extractors/generic/content/utils/scoring/set-score.test.js b/src/extractors/generic/content/scoring/set-score.test.js
similarity index 100%
rename from src/extractors/generic/content/utils/scoring/set-score.test.js
rename to src/extractors/generic/content/scoring/set-score.test.js
diff --git a/src/extractors/generic/content/utils/dom/index.js b/src/extractors/generic/content/utils/dom/index.js
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/extractors/generic/content/utils/index.js b/src/extractors/generic/content/utils/index.js
deleted file mode 100644
index da66d0de..00000000
--- a/src/extractors/generic/content/utils/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// DOM manipulation
-export * from './dom'
-
-// Scoring
-export * from './scoring'
diff --git a/src/extractors/generic/lead-image-url/score-image.js b/src/extractors/generic/lead-image-url/score-image.js
index f03b24e2..c55ae028 100644
--- a/src/extractors/generic/lead-image-url/score-image.js
+++ b/src/extractors/generic/lead-image-url/score-image.js
@@ -5,7 +5,7 @@ import {
   JPG_RE,
 } from './constants'
 
-import { PHOTO_HINTS_RE } from '../content/utils/constants'
+import { PHOTO_HINTS_RE } from '../content/scoring/constants'
 
 // Scores image urls based on a variety of heuristics.
 export function scoreImageUrl(url) {
diff --git a/src/utils/dom/clean-headers.js b/src/utils/dom/clean-headers.js
index c5e1ba5b..bc7d5f58 100644
--- a/src/utils/dom/clean-headers.js
+++ b/src/utils/dom/clean-headers.js
@@ -1,6 +1,6 @@
 import { HEADER_TAG_LIST } from './constants'
 import { normalizeSpaces } from '../text'
-import { getWeight } from 'extractors/generic/content/utils/scoring'
+import { getWeight } from 'extractors/generic/content/scoring'
 
 export default function cleanHeaders($article, $, title='') {
   $(HEADER_TAG_LIST, $article).each((index, header) => {
diff --git a/src/utils/dom/clean-tags.js b/src/utils/dom/clean-tags.js
index 20d8f1b0..3c461457 100644
--- a/src/utils/dom/clean-tags.js
+++ b/src/utils/dom/clean-tags.js
@@ -4,7 +4,7 @@ import {
   setScore,
   getOrInitScore,
   scoreCommas,
-} from 'extractors/generic/content/utils/scoring'
+} from 'extractors/generic/content/scoring'
 
 import { normalizeSpaces } from '../text'