diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
index e7aada2ed..5e2e495c5 100644
--- a/app/assets/config/manifest.js
+++ b/app/assets/config/manifest.js
@@ -6,10 +6,10 @@
 //= link capture.js
 //= link analyze.js
 //= link upload.js
-//= link jquery.flot.js
-//= link jquery.flot.crosshair.js
-//= link jquery.flot.threshold.js
-//= link d3.js
-//= link nv.d3.js
-//= link nv.d3.min.css
+//= link flot/jquery.flot.js
+//= link flot/jquery.flot.crosshair.js
+//= link flot/jquery.flot.threshold.js
+//= link d3/d3.js
+//= link nvd3/build/nv.d3.js
+//= link nvd3/build/nv.d3.min.css
 //= link api.js
\ No newline at end of file
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index d02b27c48..f8a5c067b 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -12,12 +12,15 @@
 //
 //= require jquery
 //= require jquery_ujs
-//= require jquery-steps.js
+//= require jquery.steps/dist/jquery-steps.js
 //= require bootstrap.min.js
 //= require basics.js
 //= require api.js
 //= require comment.js
-//= require moment.js
-//= require d3.js
-//= require nv.d3.js
-//= require spectral-workbench.js
\ No newline at end of file
+//= require flot/jquery.flot.js
+//= require flot/jquery.flot.crosshair.js
+//= require flot/jquery.flot.threshold.js
+//= require moment/moment.js
+//= require d3/d3.js
+//= require nvd3/build/nv.d3.js
+//= require spectral-workbench/dist/spectral-workbench.js
\ No newline at end of file
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index ecfce45a4..38185a041 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -10,11 +10,11 @@
  *
  *= require bootstrap.min.css
  *= require bootstrap-responsive.min.css
- *= require nv.d3.min.css
+ *= require nvd3/build/nv.d3.min.css
  *= require style
  *= require graph
  *= require comment
- *= require spectral-workbench
+ *= require spectral-workbench/dist/spectral-workbench
  *= require font-awesome
  *
  *= require_self
diff --git a/app/views/capture/index.html.erb b/app/views/capture/index.html.erb
index 1fa97eca3..afad31d06 100644
--- a/app/views/capture/index.html.erb
+++ b/app/views/capture/index.html.erb
@@ -1,10 +1,3 @@
-<%= javascript_include_tag "jquery.flot" %>
-<%= javascript_include_tag "jquery.flot.crosshair" %>
-<%= javascript_include_tag "jquery.flot.threshold" %>
-<%= javascript_include_tag "d3" %>
-<%= javascript_include_tag "nv.d3" %>
-
-
 <script src="https://cdn.temasys.io/adapterjs/0.15.x/adapter.min.js"></script>
 
 <% unless logged_in? %>
diff --git a/app/views/capture/index2.html.erb b/app/views/capture/index2.html.erb
index 5a147d5c2..0c27adc44 100644
--- a/app/views/capture/index2.html.erb
+++ b/app/views/capture/index2.html.erb
@@ -1,11 +1,4 @@
 <%= stylesheet_link_tag "new-capture" %>
-<%= javascript_include_tag "api" %>
-<%= javascript_include_tag "jquery.flot" %>
-<%= javascript_include_tag "jquery.flot.crosshair" %>
-<%= javascript_include_tag "jquery.flot.threshold" %>
-<%= javascript_include_tag "d3" %> 
-<%= javascript_include_tag "nv.d3" %>
-<%= stylesheet_link_tag "nv.d3.min" %>
 
   <link rel="apple-touch-icon" href="//spectralworkbench.org/images/spectral-workbench-256.png">
   <link rel="apple-touch-fa-precomposed" href="//spectralworkbench.org/images/spectral-workbench-256.png">
@@ -364,4 +357,3 @@
       });
     })
   </script>
-  
\ No newline at end of file
diff --git a/config/application.rb b/config/application.rb
index 7738d8d31..0e1ef2ff1 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -54,6 +54,8 @@ class Application < Rails::Application
 
     # Enable the asset pipeline
     config.assets.enabled = true
+    config.assets.paths << Rails.root.join("app", "assets", "fonts")
+    config.assets.paths << Rails.root.join("node_modules")
     config.assets.paths << Rails.root.join('public/lib')
 
     # pluralization options, but unneccessary due to:
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index 63ac07fef..23c914acc 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -10,6 +10,8 @@
   # Rails.application.config.assets.paths << Emoji.images_path
   # Version of your assets, change this if you want to expire all your assets
   config.assets.paths << Rails.root.join('public/lib')
+  config.assets.paths << Rails.root.join("node_modules")
+  config.assets.paths << Rails.root.join("app", "assets", "fonts")
   config.assets.precompile += ['capture.js', 'analyze.js']
 
   # Precompile additional assets.