diff --git a/config/plugins/visualizations/nvd3/nvd3_bar_stacked/config/nvd3_bar_stacked.xml b/config/plugins/visualizations/nvd3/nvd3_bar_stacked/config/nvd3_bar_stacked.xml
index 4786c0117ba..40665342aab 100644
--- a/config/plugins/visualizations/nvd3/nvd3_bar_stacked/config/nvd3_bar_stacked.xml
+++ b/config/plugins/visualizations/nvd3/nvd3_bar_stacked/config/nvd3_bar_stacked.xml
@@ -4,9 +4,9 @@
     <macros>
         <import>../../nvd3_bar/config/nvd3_shared.xml</import>
     </macros>
-    <description>Renders a stacked bar diagram using NVD3 hosted at http://www.nvd3.org.</description>
+    <description>Renders a scatter plot using NVD3 hosted at http://www.nvd3.org.</description>
     <expand macro="data"/>
-    <entry_point entry_point_type="chart" src="static/nvd3bar.js"></entry_point>
+    <entry_point entry_point_type="chart" src="../nvd3_bar/static/nvd3.js" css="../nvd3_bar/static/nvd3.css" func="nvd3_bar_stacked"/>
     <specs>
         <expand macro="specs"/>
         <use_panels>no</use_panels>
diff --git a/config/plugins/visualizations/nvd3_histogram/config/nvd3_histogram.xml b/config/plugins/visualizations/nvd3/nvd3_histogram/config/nvd3_histogram.xml
similarity index 86%
rename from config/plugins/visualizations/nvd3_histogram/config/nvd3_histogram.xml
rename to config/plugins/visualizations/nvd3/nvd3_histogram/config/nvd3_histogram.xml
index 3c4eaa6a810..8afed3d054b 100644
--- a/config/plugins/visualizations/nvd3_histogram/config/nvd3_histogram.xml
+++ b/config/plugins/visualizations/nvd3/nvd3_histogram/config/nvd3_histogram.xml
@@ -6,7 +6,7 @@
     </macros>
     <description>Uses the R-based `charts` tool to derive a histogram and displays it as regular or stacked bar diagram using NVD3 hosted at http://www.nvd3.org.</description>
     <expand macro="data"/>
-    <entry_point entry_point_type="chart" src="static/nvd3bar.js"></entry_point>
+    <entry_point entry_point_type="chart" src="../nvd3_bar/static/nvd3.js" css="../nvd3_bar/static/nvd3.css" func="nvd3_histogram"/>
     <specs>
         <expand macro="specs"/>
         <use_panels>no</use_panels>
diff --git a/config/plugins/visualizations/nvd3_histogram/static/logo.png b/config/plugins/visualizations/nvd3/nvd3_histogram/static/logo.png
similarity index 100%
rename from config/plugins/visualizations/nvd3_histogram/static/logo.png
rename to config/plugins/visualizations/nvd3/nvd3_histogram/static/logo.png
diff --git a/config/plugins/visualizations/nvd3_histogram_discrete/config/nvd3_histogram_discrete.xml b/config/plugins/visualizations/nvd3/nvd3_histogram_discrete/config/nvd3_histogram_discrete.xml
similarity index 86%
rename from config/plugins/visualizations/nvd3_histogram_discrete/config/nvd3_histogram_discrete.xml
rename to config/plugins/visualizations/nvd3/nvd3_histogram_discrete/config/nvd3_histogram_discrete.xml
index 66475db139a..3af59570d4b 100644
--- a/config/plugins/visualizations/nvd3_histogram_discrete/config/nvd3_histogram_discrete.xml
+++ b/config/plugins/visualizations/nvd3/nvd3_histogram_discrete/config/nvd3_histogram_discrete.xml
@@ -6,7 +6,7 @@
     </macros>
     <description>Uses the R-based `charts` tool to derive a histogram for discrete data e.g. text labels. The result is displayed as regular or stacked bar diagram using NVD3 hosted at http://www.nvd3.org.</description>
     <expand macro="data"/>
-    <entry_point entry_point_type="chart" src="static/nvd3bar.js"></entry_point>
+    <entry_point entry_point_type="chart" src="../nvd3_bar/static/nvd3.js" css="../nvd3_bar/static/nvd3.css" func="nvd3_histogram_discrete"/>
     <specs>
         <expand macro="specs"/>
         <use_panels>no</use_panels>
diff --git a/config/plugins/visualizations/nvd3_histogram_discrete/static/logo.png b/config/plugins/visualizations/nvd3/nvd3_histogram_discrete/static/logo.png
similarity index 100%
rename from config/plugins/visualizations/nvd3_histogram_discrete/static/logo.png
rename to config/plugins/visualizations/nvd3/nvd3_histogram_discrete/static/logo.png
diff --git a/config/plugins/visualizations/nvd3_horizontal/config/nvd3_horizontal.xml b/config/plugins/visualizations/nvd3/nvd3_horizontal/config/nvd3_horizontal.xml
similarity index 82%
rename from config/plugins/visualizations/nvd3_horizontal/config/nvd3_horizontal.xml
rename to config/plugins/visualizations/nvd3/nvd3_horizontal/config/nvd3_horizontal.xml
index 1520990ee37..d2b9203efee 100644
--- a/config/plugins/visualizations/nvd3_horizontal/config/nvd3_horizontal.xml
+++ b/config/plugins/visualizations/nvd3/nvd3_horizontal/config/nvd3_horizontal.xml
@@ -6,7 +6,7 @@
     </macros>
     <description>Renders a horizontal bar diagram using NVD3 hosted at http://www.nvd3.org.</description>
     <expand macro="data"/>
-    <entry_point entry_point_type="chart" src="static/nvd3bar.js"></entry_point>
+    <entry_point entry_point_type="chart" src="../nvd3_bar/static/nvd3.js" css="../nvd3_bar/static/nvd3.css" func="nvd3_horizontal"/>
     <specs>
         <expand macro="specs"/>
         <zoomable>true</zoomable>
diff --git a/config/plugins/visualizations/nvd3_horizontal/static/logo.png b/config/plugins/visualizations/nvd3/nvd3_horizontal/static/logo.png
similarity index 100%
rename from config/plugins/visualizations/nvd3_horizontal/static/logo.png
rename to config/plugins/visualizations/nvd3/nvd3_horizontal/static/logo.png
diff --git a/config/plugins/visualizations/nvd3_horizontal_stacked/config/nvd3_horizontal_stacked.xml b/config/plugins/visualizations/nvd3/nvd3_horizontal_stacked/config/nvd3_horizontal_stacked.xml
similarity index 82%
rename from config/plugins/visualizations/nvd3_horizontal_stacked/config/nvd3_horizontal_stacked.xml
rename to config/plugins/visualizations/nvd3/nvd3_horizontal_stacked/config/nvd3_horizontal_stacked.xml
index 655b18e2901..791a0e30e6c 100644
--- a/config/plugins/visualizations/nvd3_horizontal_stacked/config/nvd3_horizontal_stacked.xml
+++ b/config/plugins/visualizations/nvd3/nvd3_horizontal_stacked/config/nvd3_horizontal_stacked.xml
@@ -6,7 +6,7 @@
     </macros>
     <description>Renders a stacked horizontal bar diagram using NVD3 hosted at http://www.nvd3.org.</description>
     <expand macro="data"/>
-    <entry_point entry_point_type="chart" src="static/nvd3bar.js"></entry_point>
+    <entry_point entry_point_type="chart" src="../nvd3_bar/static/nvd3.js" css="../nvd3_bar/static/nvd3.css" func="nvd3_horizontal_stacked"/>
     <specs>
         <expand macro="specs"/>
         <use_panels>no</use_panels>
diff --git a/config/plugins/visualizations/nvd3_horizontal_stacked/static/logo.png b/config/plugins/visualizations/nvd3/nvd3_horizontal_stacked/static/logo.png
similarity index 100%
rename from config/plugins/visualizations/nvd3_horizontal_stacked/static/logo.png
rename to config/plugins/visualizations/nvd3/nvd3_horizontal_stacked/static/logo.png
diff --git a/config/plugins/visualizations/nvd3_line/config/nvd3_line.xml b/config/plugins/visualizations/nvd3/nvd3_line/config/nvd3_line.xml
similarity index 83%
rename from config/plugins/visualizations/nvd3_line/config/nvd3_line.xml
rename to config/plugins/visualizations/nvd3/nvd3_line/config/nvd3_line.xml
index dbba2d79ce9..879ed9e667b 100644
--- a/config/plugins/visualizations/nvd3_line/config/nvd3_line.xml
+++ b/config/plugins/visualizations/nvd3/nvd3_line/config/nvd3_line.xml
@@ -6,7 +6,7 @@
     </macros>
     <description>Renders a line chart using NVD3 hosted at http://www.nvd3.org.</description>
     <expand macro="data"/>
-    <entry_point entry_point_type="chart" src="static/nvd3bar.js"></entry_point>
+    <entry_point entry_point_type="chart" src="../nvd3_bar/static/nvd3.js" css="../nvd3_bar/static/nvd3.css" func="nvd3_line"/>
     <specs>
         <expand macro="specs"/>
         <zoomable>true</zoomable>
diff --git a/config/plugins/visualizations/nvd3_line/static/logo.png b/config/plugins/visualizations/nvd3/nvd3_line/static/logo.png
similarity index 100%
rename from config/plugins/visualizations/nvd3_line/static/logo.png
rename to config/plugins/visualizations/nvd3/nvd3_line/static/logo.png
diff --git a/config/plugins/visualizations/nvd3_line_focus/config/nvd3_line_focus.xml b/config/plugins/visualizations/nvd3/nvd3_line_focus/config/nvd3_line_focus.xml
similarity index 82%
rename from config/plugins/visualizations/nvd3_line_focus/config/nvd3_line_focus.xml
rename to config/plugins/visualizations/nvd3/nvd3_line_focus/config/nvd3_line_focus.xml
index ee23e40391d..83aee80ff26 100644
--- a/config/plugins/visualizations/nvd3_line_focus/config/nvd3_line_focus.xml
+++ b/config/plugins/visualizations/nvd3/nvd3_line_focus/config/nvd3_line_focus.xml
@@ -6,7 +6,7 @@
     </macros>
     <description>Renders a line chart with focus using NVD3 hosted at http://www.nvd3.org.</description>
     <expand macro="data"/>
-    <entry_point entry_point_type="chart" src="static/nvd3bar.js"></entry_point>
+    <entry_point entry_point_type="chart" src="../nvd3_bar/static/nvd3.js" css="../nvd3_bar/static/nvd3.css" func="nvd3_line_focus"/>
     <specs>
         <expand macro="specs"/>
         <zoomable>native</zoomable>
diff --git a/config/plugins/visualizations/nvd3_line_focus/static/logo.png b/config/plugins/visualizations/nvd3/nvd3_line_focus/static/logo.png
similarity index 100%
rename from config/plugins/visualizations/nvd3_line_focus/static/logo.png
rename to config/plugins/visualizations/nvd3/nvd3_line_focus/static/logo.png
diff --git a/config/plugins/visualizations/nvd3_pie/config/nvd3_pie.xml b/config/plugins/visualizations/nvd3/nvd3_pie/config/nvd3_pie.xml
similarity index 97%
rename from config/plugins/visualizations/nvd3_pie/config/nvd3_pie.xml
rename to config/plugins/visualizations/nvd3/nvd3_pie/config/nvd3_pie.xml
index 8cc0ca0e4d2..0e2635205b8 100644
--- a/config/plugins/visualizations/nvd3_pie/config/nvd3_pie.xml
+++ b/config/plugins/visualizations/nvd3/nvd3_pie/config/nvd3_pie.xml
@@ -6,7 +6,7 @@
     </macros>
     <description>Renders a pie chart using NVD3 hosted at http://www.nvd3.org.</description>
     <expand macro="data"/>
-    <entry_point entry_point_type="chart" src="static/nvd3bar.js"></entry_point>
+    <entry_point entry_point_type="chart" src="../nvd3_bar/static/nvd3.js" css="../nvd3_bar/static/nvd3.css" func="nvd3_pie"/>
     <specs>
         <expand macro="specs"/>
         <use_panels>yes</use_panels>
diff --git a/config/plugins/visualizations/nvd3_pie/static/logo.png b/config/plugins/visualizations/nvd3/nvd3_pie/static/logo.png
similarity index 100%
rename from config/plugins/visualizations/nvd3_pie/static/logo.png
rename to config/plugins/visualizations/nvd3/nvd3_pie/static/logo.png
diff --git a/config/plugins/visualizations/nvd3_scatter/config/nvd3_scatter.xml b/config/plugins/visualizations/nvd3/nvd3_scatter/config/nvd3_scatter.xml
similarity index 100%
rename from config/plugins/visualizations/nvd3_scatter/config/nvd3_scatter.xml
rename to config/plugins/visualizations/nvd3/nvd3_scatter/config/nvd3_scatter.xml
diff --git a/config/plugins/visualizations/nvd3_scatter/static/logo.png b/config/plugins/visualizations/nvd3/nvd3_scatter/static/logo.png
similarity index 100%
rename from config/plugins/visualizations/nvd3_scatter/static/logo.png
rename to config/plugins/visualizations/nvd3/nvd3_scatter/static/logo.png
diff --git a/config/plugins/visualizations/nvd3_stackedarea/config/nvd3_stackedarea.xml b/config/plugins/visualizations/nvd3/nvd3_stackedarea/config/nvd3_stackedarea.xml
similarity index 82%
rename from config/plugins/visualizations/nvd3_stackedarea/config/nvd3_stackedarea.xml
rename to config/plugins/visualizations/nvd3/nvd3_stackedarea/config/nvd3_stackedarea.xml
index 936c388d29d..f561576c59b 100644
--- a/config/plugins/visualizations/nvd3_stackedarea/config/nvd3_stackedarea.xml
+++ b/config/plugins/visualizations/nvd3/nvd3_stackedarea/config/nvd3_stackedarea.xml
@@ -6,7 +6,7 @@
     </macros>
     <description>Renders a stacked area using NVD3 hosted at http://www.nvd3.org.</description>
     <expand macro="data"/>
-    <entry_point entry_point_type="chart" src="static/nvd3bar.js"></entry_point>
+    <entry_point entry_point_type="chart" src="../nvd3_bar/static/nvd3.js" css="../nvd3_bar/static/nvd3.css" func="nvd3_stackedarea"/>
     <specs>
         <expand macro="specs"/>
         <use_panels>no</use_panels>
diff --git a/config/plugins/visualizations/nvd3_stackedarea/static/logo.png b/config/plugins/visualizations/nvd3/nvd3_stackedarea/static/logo.png
similarity index 100%
rename from config/plugins/visualizations/nvd3_stackedarea/static/logo.png
rename to config/plugins/visualizations/nvd3/nvd3_stackedarea/static/logo.png
diff --git a/config/plugins/visualizations/nvd3_stackedarea_full/config/nvd3_stackedarea_full.xml b/config/plugins/visualizations/nvd3/nvd3_stackedarea_full/config/nvd3_stackedarea_full.xml
similarity index 82%
rename from config/plugins/visualizations/nvd3_stackedarea_full/config/nvd3_stackedarea_full.xml
rename to config/plugins/visualizations/nvd3/nvd3_stackedarea_full/config/nvd3_stackedarea_full.xml
index aca9a9ff0e0..a9e27ffd7bc 100644
--- a/config/plugins/visualizations/nvd3_stackedarea_full/config/nvd3_stackedarea_full.xml
+++ b/config/plugins/visualizations/nvd3/nvd3_stackedarea_full/config/nvd3_stackedarea_full.xml
@@ -6,7 +6,7 @@
     </macros>
     <description>Renders an expanded stacked area using NVD3 hosted at http://www.nvd3.org.</description>
     <expand macro="data"/>
-    <entry_point entry_point_type="chart" src="static/nvd3bar.js"></entry_point>
+    <entry_point entry_point_type="chart" src="../nvd3_bar/static/nvd3.js" css="../nvd3_bar/static/nvd3.css" func="nvd3_stackedarea_full"/>
     <specs>
         <expand macro="specs"/>
         <use_panels>no</use_panels>
diff --git a/config/plugins/visualizations/nvd3_stackedarea_full/static/logo.png b/config/plugins/visualizations/nvd3/nvd3_stackedarea_full/static/logo.png
similarity index 100%
rename from config/plugins/visualizations/nvd3_stackedarea_full/static/logo.png
rename to config/plugins/visualizations/nvd3/nvd3_stackedarea_full/static/logo.png
diff --git a/config/plugins/visualizations/nvd3_stackedarea_stream/config/nvd3_stackedarea_stream.xml b/config/plugins/visualizations/nvd3/nvd3_stackedarea_stream/config/nvd3_stackedarea_stream.xml
similarity index 81%
rename from config/plugins/visualizations/nvd3_stackedarea_stream/config/nvd3_stackedarea_stream.xml
rename to config/plugins/visualizations/nvd3/nvd3_stackedarea_stream/config/nvd3_stackedarea_stream.xml
index 82b9856df1c..22405ab09b9 100644
--- a/config/plugins/visualizations/nvd3_stackedarea_stream/config/nvd3_stackedarea_stream.xml
+++ b/config/plugins/visualizations/nvd3/nvd3_stackedarea_stream/config/nvd3_stackedarea_stream.xml
@@ -6,7 +6,7 @@
     </macros>
     <description>Renders a stream chart using NVD3 hosted at http://www.nvd3.org.</description>
     <expand macro="data"/>
-    <entry_point entry_point_type="chart" src="static/nvd3bar.js"></entry_point>
+    <entry_point entry_point_type="chart" src="../nvd3_bar/static/nvd3.js" css="../nvd3_bar/static/nvd3.css" func="nvd3_stackedarea_stream"/>
     <specs>
         <expand macro="specs"/>
         <use_panels>no</use_panels>
diff --git a/config/plugins/visualizations/nvd3_stackedarea_stream/static/logo.png b/config/plugins/visualizations/nvd3/nvd3_stackedarea_stream/static/logo.png
similarity index 100%
rename from config/plugins/visualizations/nvd3_stackedarea_stream/static/logo.png
rename to config/plugins/visualizations/nvd3/nvd3_stackedarea_stream/static/logo.png