diff --git a/assets/src/scripts/d3-rendering/accessibility.spec.js b/assets/src/scripts/d3-rendering/accessibility.spec.js
index e9465cf9c641b93247b78163f27600d460298930..c97d7a2ae01e288d98d15f6a278574c56ecf2613 100644
--- a/assets/src/scripts/d3-rendering/accessibility.spec.js
+++ b/assets/src/scripts/d3-rendering/accessibility.spec.js
@@ -1,6 +1,8 @@
-import {addSVGAccessibility, addSROnlyTable} from 'd3render/accessibility';
 import {select} from 'd3-selection';
 
+import {addSVGAccessibility, addSROnlyTable} from './accessibility';
+
+
 describe('svgAccessibility tests', () => {
     describe('addAccessibility tests', () => {
 
diff --git a/assets/src/scripts/d3-rendering/alerts.spec.js b/assets/src/scripts/d3-rendering/alerts.spec.js
index 60c3b5421299312ccb728c6aa52986a92bc88316..d2b0aca42e48611933baa36d1a1d94ab199c096f 100644
--- a/assets/src/scripts/d3-rendering/alerts.spec.js
+++ b/assets/src/scripts/d3-rendering/alerts.spec.js
@@ -1,6 +1,6 @@
 import {select} from 'd3-selection';
 
-import {drawInfoAlert, drawErrorAlert, drawSuccessAlert, drawWarningAlert} from 'd3render/alerts';
+import {drawInfoAlert, drawErrorAlert, drawSuccessAlert, drawWarningAlert} from './alerts';
 
 describe('alerts module', () => {
     let container;
diff --git a/assets/src/scripts/d3-rendering/axes.spec.js b/assets/src/scripts/d3-rendering/axes.spec.js
index 400e4cdba916e0ab8d0b789a429fff7d733fb477..eeda4ba8298eb49e94b2bb8b646ae8b7bc3785a9 100644
--- a/assets/src/scripts/d3-rendering/axes.spec.js
+++ b/assets/src/scripts/d3-rendering/axes.spec.js
@@ -1,6 +1,6 @@
 import {select} from 'd3-selection';
 
-import {appendXAxis, appendYAxis, appendSecondaryYAxis, appendAxes} from 'd3render/axes';
+import {appendXAxis, appendYAxis, appendSecondaryYAxis, appendAxes} from './axes';
 
 describe('axes module', () => {
     let svg, layout;
diff --git a/assets/src/scripts/d3-rendering/cursor-slider.spec.js b/assets/src/scripts/d3-rendering/cursor-slider.spec.js
index 3edcced23d26f8b2369c1e2edb4593b7276a1d45..fc5f3533b00ff903dd7d10d0d4312657f96999c2 100644
--- a/assets/src/scripts/d3-rendering/cursor-slider.spec.js
+++ b/assets/src/scripts/d3-rendering/cursor-slider.spec.js
@@ -1,7 +1,7 @@
 import {scaleLinear} from 'd3-scale';
 import {select} from 'd3-selection';
 
-import {drawCursorSlider} from 'd3render/cursor-slider';
+import {drawCursorSlider} from './cursor-slider';
 
 describe('cursor-slider', () => {
     describe('drawCursorSlider', () => {
diff --git a/assets/src/scripts/d3-rendering/data-masks.spec.js b/assets/src/scripts/d3-rendering/data-masks.spec.js
index 5d1219716507f281b9c8684e327b85c4e47e7cfc..98d83552c2bd8ad468ba73288d549f678e66290c 100644
--- a/assets/src/scripts/d3-rendering/data-masks.spec.js
+++ b/assets/src/scripts/d3-rendering/data-masks.spec.js
@@ -1,6 +1,6 @@
 import {select} from 'd3-selection';
 
-import {renderMaskDefs} from 'd3render/data-masks';
+import {renderMaskDefs} from './data-masks';
 
 describe('d3-rendering/data-masks', () => {
    describe('renderMaskDefs', () => {
diff --git a/assets/src/scripts/d3-rendering/graph-tooltip.spec.js b/assets/src/scripts/d3-rendering/graph-tooltip.spec.js
index 679328ec6ac3bc4d8d55e065d91b5cc48780a4f0..afe4ad7a1d4b575982b1039b3e672dcdbec0ceac 100644
--- a/assets/src/scripts/d3-rendering/graph-tooltip.spec.js
+++ b/assets/src/scripts/d3-rendering/graph-tooltip.spec.js
@@ -1,7 +1,7 @@
 import {scaleLinear} from 'd3-scale';
 import {select} from 'd3-selection';
 
-import {drawFocusOverlay, drawFocusLine, drawFocusCircles} from 'd3render/graph-tooltip';
+import {drawFocusOverlay, drawFocusLine, drawFocusCircles} from './graph-tooltip';
 
 describe('graph-tooltip module', () => {
     let svg;
diff --git a/assets/src/scripts/d3-rendering/legend.js b/assets/src/scripts/d3-rendering/legend.js
index ef634e614d9cce1ca31c8f03102eb9634ad9ab07..1aa771e9c32a59cbc6a5cc150da2b34619ba2e4c 100644
--- a/assets/src/scripts/d3-rendering/legend.js
+++ b/assets/src/scripts/d3-rendering/legend.js
@@ -1,5 +1,5 @@
-import {mediaQuery} from 'ui/utils';
 import config from 'ui/config';
+import {mediaQuery} from 'ui/utils';
 
 const RECTANGLE_MARKER_WIDTH = 20;
 const RECTANGLE_MARKER_HEIGHT = 10;
diff --git a/assets/src/scripts/d3-rendering/legend.spec.js b/assets/src/scripts/d3-rendering/legend.spec.js
index e4ed05caf82af1275d23f6ffbcba283774dc4525..c9c374101471f9c1cf01f009ecc1d3a8b1589518 100644
--- a/assets/src/scripts/d3-rendering/legend.spec.js
+++ b/assets/src/scripts/d3-rendering/legend.spec.js
@@ -1,6 +1,7 @@
 import {select} from 'd3-selection';
-import {lineMarker, rectangleMarker, textOnlyMarker} from 'd3render/markers';
-import {drawSimpleLegend} from 'd3render/legend';
+
+import {drawSimpleLegend} from './legend';
+import {lineMarker, rectangleMarker, textOnlyMarker} from './markers';
 
 describe('Legend module', () => {
 
diff --git a/assets/src/scripts/d3-rendering/loading-indicator.spec.js b/assets/src/scripts/d3-rendering/loading-indicator.spec.js
index 751a693320d746687fe1c1c31995f5140eb6b727..94fba952a5a0f0d302c4da794eef8253ca3fa758 100644
--- a/assets/src/scripts/d3-rendering/loading-indicator.spec.js
+++ b/assets/src/scripts/d3-rendering/loading-indicator.spec.js
@@ -1,5 +1,6 @@
 import {select} from 'd3-selection';
-import {drawLoadingIndicator} from 'd3render/loading-indicator';
+
+import {drawLoadingIndicator} from './loading-indicator';
 
 describe('loading indicator', () => {
     let div;
diff --git a/assets/src/scripts/d3-rendering/markers.spec.js b/assets/src/scripts/d3-rendering/markers.spec.js
index 93fa1f6e9cae9db27edb0393954e320013d4bc8f..0c0aae3859ccc96be5b656fa97454887dda3b021 100644
--- a/assets/src/scripts/d3-rendering/markers.spec.js
+++ b/assets/src/scripts/d3-rendering/markers.spec.js
@@ -1,5 +1,6 @@
 import {select} from 'd3-selection';
-import {lineMarker, circleMarker, rectangleMarker, textOnlyMarker} from 'd3render/markers';
+
+import {lineMarker, circleMarker, rectangleMarker, textOnlyMarker} from './markers';
 
 describe('Markers module', () => {
 
diff --git a/assets/src/scripts/d3-rendering/tick-marks.spec.js b/assets/src/scripts/d3-rendering/tick-marks.spec.js
index 8c8c39e51e5a01c617bfe6060a299a198d39aea6..73b7b6a064184162a848582a769126334eb9ae5e 100644
--- a/assets/src/scripts/d3-rendering/tick-marks.spec.js
+++ b/assets/src/scripts/d3-rendering/tick-marks.spec.js
@@ -1,6 +1,6 @@
 import {DateTime} from 'luxon';
 
-import {generateTimeTicks} from 'd3render/tick-marks';
+import {generateTimeTicks} from './tick-marks';
 
 describe('generateTimeTicks', () => {
     const startTime = 1520538281000;
diff --git a/assets/src/scripts/tooltips.js b/assets/src/scripts/d3-rendering/tooltips.js
similarity index 91%
rename from assets/src/scripts/tooltips.js
rename to assets/src/scripts/d3-rendering/tooltips.js
index 2d2113dc1031d5aeedc63c9335cfc3e26b60dcc1..3f7bd5741320b5a3fbf5ca8ae3b0e4de9d492dfc 100644
--- a/assets/src/scripts/tooltips.js
+++ b/assets/src/scripts/d3-rendering/tooltips.js
@@ -7,7 +7,7 @@
  */
 
 // Required to initialize USWDS components after page load
-import components from '../../node_modules/uswds/src/js/components';
+import components from 'uswds/src/js/components';
 
 export const appendTooltip = function(elem, text) {
 	let tooltip = elem.append('div')
diff --git a/assets/src/scripts/tooltips.spec.js b/assets/src/scripts/d3-rendering/tooltips.spec.js
similarity index 91%
rename from assets/src/scripts/tooltips.spec.js
rename to assets/src/scripts/d3-rendering/tooltips.spec.js
index 8f498c5ac9b6e5f9a95977c11c03feec1f03b387..1d023ca48323dec08f0240b025756e1c9e47e52c 100644
--- a/assets/src/scripts/tooltips.spec.js
+++ b/assets/src/scripts/d3-rendering/tooltips.spec.js
@@ -1,8 +1,9 @@
 import {select} from 'd3-selection';
-import {appendTooltip} from 'ui/tooltips';
 
+import {appendTooltip} from './tooltips';
 
-describe('tooltips', () => {
+
+describe('d3-rendering/tooltips', () => {
 
     let testDiv;
     beforeEach(() => {
diff --git a/assets/src/scripts/index.spec.js b/assets/src/scripts/index.spec.js
index 382e85749517fd6adef5e1cf7d4ba59960c1b4a4..d94bc0b0c07f105651b5e9acad5b0a2a260391e2 100644
--- a/assets/src/scripts/index.spec.js
+++ b/assets/src/scripts/index.spec.js
@@ -12,7 +12,6 @@ import 'ui/polyfills';
 
 import 'ui/ajax.spec';
 import 'ui/schema.spec';
-import 'ui/tooltips.spec';
 import 'ui/utils.spec';
 
 import 'd3render/accessibility.spec';
@@ -25,6 +24,7 @@ import 'd3render/legend.spec';
 import 'd3render/loading-indicator.spec';
 import 'd3render/markers.spec';
 import 'd3render/tick-marks.spec';
+import 'd3render/tooltips.spec';
 
 import 'ui/leaflet-rendering/map.spec';
 import 'ui/leaflet-rendering/legend-control.spec';
diff --git a/assets/src/scripts/monitoring-location/components/hydrograph/parameters.js b/assets/src/scripts/monitoring-location/components/hydrograph/parameters.js
index 7c39e964bd027842eb7677f2bbff0aff1a5ef7a1..396668cfd63e794fdba0f0d5b446ff1146a871dc 100644
--- a/assets/src/scripts/monitoring-location/components/hydrograph/parameters.js
+++ b/assets/src/scripts/monitoring-location/components/hydrograph/parameters.js
@@ -2,7 +2,8 @@ import {line} from 'd3-shape';
 import {select} from 'd3-selection';
 
 import config from 'ui/config';
-import {appendTooltip} from 'ui/tooltips';
+
+import {appendTooltip} from 'd3render/tooltips';
 
 import {Actions} from 'ml/store/instantaneous-value-time-series-data';
 
diff --git a/assets/src/scripts/monitoring-location/components/map/flood-slider.js b/assets/src/scripts/monitoring-location/components/map/flood-slider.js
index 5a5cf1d98a9bbe4bc98e4ce14e1dd9bdddd6afa9..a3da2ed3b45376c432c969d258aa928ae8be061f 100644
--- a/assets/src/scripts/monitoring-location/components/map/flood-slider.js
+++ b/assets/src/scripts/monitoring-location/components/map/flood-slider.js
@@ -1,7 +1,8 @@
 import {createStructuredSelector} from 'reselect';
 
 import {link} from 'ui/lib/d3-redux';
-import {appendTooltip} from 'ui/tooltips';
+
+import {appendTooltip} from 'd3render/tooltips';
 
 import {getFloodStages, getFloodStageHeight, getFloodGageHeightStageIndex, hasFloodData} from 'ml/selectors/flood-data-selector';
 import {Actions} from 'ml/store/flood-inundation';