diff --git a/app/views/contact_us/contacts/new.html.erb b/app/views/contact_us/contacts/new.html.erb
index 9d959dc..645fa50 100644
--- a/app/views/contact_us/contacts/new.html.erb
+++ b/app/views/contact_us/contacts/new.html.erb
@@ -1,4 +1,4 @@
-<% javascript "contacts/new_contact.js" %>
+<% javascript "views/contacts/new_contact.js" %>
 
 <h1>
   <%= _("Contact Us") %>
diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb
index 4a62c51..201002d 100644
--- a/app/views/devise/passwords/new.html.erb
+++ b/app/views/devise/passwords/new.html.erb
@@ -1,4 +1,4 @@
-<% javascript "devise/passwords/new.js" %>
+<% javascript "views/devise/passwords/new.js" %>
 
 <% unless @user.errors[:email].empty? %>
   <p class="alert alert-error"><%= _('The email address you entered is not registered.') %></p>
diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
index 3b6bcf3..0b5e000 100644
--- a/app/views/devise/registrations/edit.html.erb
+++ b/app/views/devise/registrations/edit.html.erb
@@ -1,4 +1,4 @@
-<% javascript "devise/registrations/edit.js" %>
+<% javascript "views/devise/registrations/edit.js" %>
 
 <h1><%= _('Edit profile') %></h1>
 
diff --git a/app/views/layouts/_signin_signout.html.erb b/app/views/layouts/_signin_signout.html.erb
index 6a289a4..19a041f 100644
--- a/app/views/layouts/_signin_signout.html.erb
+++ b/app/views/layouts/_signin_signout.html.erb
@@ -40,7 +40,6 @@
   </div>
   <div id="header-register-form" class="modal" style="display:none">
     <div class="modal-body">
-      <% javascript "shared/register_form.js" %>
       <%= render :partial => "shared/register_form", locals: {extended: false} %>
     </div>
   </div>
diff --git a/app/views/orgs/shibboleth_ds.html.erb b/app/views/orgs/shibboleth_ds.html.erb
index 6c443dd..3c554e8 100644
--- a/app/views/orgs/shibboleth_ds.html.erb
+++ b/app/views/orgs/shibboleth_ds.html.erb
@@ -1,4 +1,4 @@
-<% javascript 'orgs/shibboleth_ds.js'%>
+<% javascript 'views/orgs/shibboleth_ds.js'%>
 
 <h1>Find your institution to sign in</h1>
 
diff --git a/app/views/phases/edit.html.erb b/app/views/phases/edit.html.erb
index 5a4c267..5e33227 100644
--- a/app/views/phases/edit.html.erb
+++ b/app/views/phases/edit.html.erb
@@ -1,7 +1,7 @@
 <%- model_class = Plan -%>
 <% javascript('plans.js') %>
-<% javascript('answers/status.js') %>
-<% javascript ('notes/index.js') %>
+<% javascript('views/answers/status.js') %>
+<% javascript ('views/notes/index.js') %>
 <!--
   editing plan details is handled through plan#show
   so if we come this way then we are editing a phase
diff --git a/app/views/plans/_plan_details.html.erb b/app/views/plans/_plan_details.html.erb
index a17d226..94db201 100644
--- a/app/views/plans/_plan_details.html.erb
+++ b/app/views/plans/_plan_details.html.erb
@@ -1,4 +1,4 @@
-<% javascript('plans/edit.js') %>
+<% javascript('views/plans/edit.js') %>
 
 <!-- Project title = default title is the template title plus date of creation -->
 <div class="dmp_details_body">
diff --git a/app/views/plans/index.html.erb b/app/views/plans/index.html.erb
index 9ab84c3..f6cc14f 100644
--- a/app/views/plans/index.html.erb
+++ b/app/views/plans/index.html.erb
@@ -1,5 +1,4 @@
-<% javascript "toolbar.js" %>
-<% javascript "plans/index.js" %>
+<% javascript "views/plans/index.js" %>
 
 <h1>
   <%= _('My plans') %>
diff --git a/app/views/plans/new.html.erb b/app/views/plans/new.html.erb
index 91cba2a..ffdf8f0 100644
--- a/app/views/plans/new.html.erb
+++ b/app/views/plans/new.html.erb
@@ -1,4 +1,4 @@
-<% javascript "plans/new.js" %>
+<% javascript "views/plans/new.js" %>
 
 <h1><%= _('Create a new plan') %></h1>
 
diff --git a/app/views/plans/public_index.html.erb b/app/views/plans/public_index.html.erb
index ad555d8..82eb849 100644
--- a/app/views/plans/public_index.html.erb
+++ b/app/views/plans/public_index.html.erb
@@ -1,5 +1,4 @@
 <%- model_class = Plan -%>
-<% javascript "toolbar.js" %>
 
 <h1>
   <%= raw _('Public DMPs') %>
diff --git a/app/views/plans/share.html.erb b/app/views/plans/share.html.erb
index 7657475..a697f76 100644
--- a/app/views/plans/share.html.erb
+++ b/app/views/plans/share.html.erb
@@ -1,5 +1,5 @@
 <%- model_class = Plan -%>
-<% javascript('plans/share.js') %>
+<% javascript('views/plans/share.js') %>
 <!-- render the project title -->
 <%= render :partial => "plan_title", locals: {plan: @plan} %>
 
diff --git a/app/views/shared/_export_links.html.erb b/app/views/shared/_export_links.html.erb
index 6908e62..9a861bd 100644
--- a/app/views/shared/_export_links.html.erb
+++ b/app/views/shared/_export_links.html.erb
@@ -1,4 +1,4 @@
-<% javascript("export_configure") %>
+<% javascript("dmproadmap/export_configure") %>
 <form method="get" action="<%= export_plan_path(plan) -%>" target="_blank" id="select-form-format">
   <%= label_tag(:format, _('Format')) %>
   <%= select_tag(:format, options_for_select(ExportedPlan::VALID_FORMATS, :pdf), class: 'export-format-selection') %>
diff --git a/config/application.rb b/config/application.rb
index b395a8d..9f55ee1 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -67,11 +67,11 @@
     config.assets.paths << Rails.root.join("lib", "assets", "videos")
     config.assets.precompile += %w(*.png *.jpg *.jpeg *.gif *ico)
     config.assets.precompile += %w(*mp4 *webm *ogg *ogv *swf)
-#    config.assets.precompile += %w(plans.js)   
 #    config.assets.precompile += %w(jquery.placeholder.js)
 #    config.assets.precompile += %w(jquery.tablesorter.js)
 #    config.assets.precompile += %w(dmproadmap/export_configure.js)
     config.assets.precompile += %w(admin.js)
+    config.assets.precompile += %w(plans.js)
      
     # Vendor CSS resources
     config.assets.precompile += %w(vendor/jquery-ui.min.css