diff --git a/app/javascript/packs/active_admin/print.scss b/app/javascript/packs/active_admin/print.scss
deleted file mode 100644
index 79ac0361c..000000000
--- a/app/javascript/packs/active_admin/print.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Active Admin Print Stylesheet */
-@import "~@activeadmin/activeadmin/src/scss/print";
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 19af05162..0809d9ac8 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -52,9 +52,7 @@
         text: "This is a new service – #{govuk_mail_to("test@mhclg.gov.uk", "give feedback or report a problem", subject: "Feedback about Lettings and Sales of Social Housing in England Data Collection")}".html_safe
       ) %>
 
-      <div role="navigation">
-        <%= content_for(:before_content) %>
-      </div>
+      <%= content_for(:before_content) %>
 
       <main class="govuk-main-wrapper" id="main-content" role="main">
         <% if flash.notice %>
diff --git a/app/views/layouts/organisations.html.erb b/app/views/layouts/organisations.html.erb
index ab71e2549..4be6b090b 100644
--- a/app/views/layouts/organisations.html.erb
+++ b/app/views/layouts/organisations.html.erb
@@ -1,10 +1,3 @@
-<% content_for :before_content do %>
-  <%= govuk_back_link(
-    text: 'Back',
-    href: :back,
-  ) %>
-<% end %>
-
 <% content_for :content do %>
   <h1 class="govuk-heading-l">
     Your organisation
diff --git a/app/javascript/channels/consumer.js b/app/webpacker/channels/consumer.js
similarity index 100%
rename from app/javascript/channels/consumer.js
rename to app/webpacker/channels/consumer.js
diff --git a/app/javascript/channels/index.js b/app/webpacker/channels/index.js
similarity index 100%
rename from app/javascript/channels/index.js
rename to app/webpacker/channels/index.js
diff --git a/app/javascript/controllers/application.js b/app/webpacker/controllers/application.js
similarity index 100%
rename from app/javascript/controllers/application.js
rename to app/webpacker/controllers/application.js
diff --git a/app/javascript/controllers/conditional_question_controller.js b/app/webpacker/controllers/conditional_question_controller.js
similarity index 100%
rename from app/javascript/controllers/conditional_question_controller.js
rename to app/webpacker/controllers/conditional_question_controller.js
diff --git a/app/javascript/controllers/index.js b/app/webpacker/controllers/index.js
similarity index 100%
rename from app/javascript/controllers/index.js
rename to app/webpacker/controllers/index.js
diff --git a/app/javascript/controllers/numeric_question_controller.js b/app/webpacker/controllers/numeric_question_controller.js
similarity index 100%
rename from app/javascript/controllers/numeric_question_controller.js
rename to app/webpacker/controllers/numeric_question_controller.js
diff --git a/app/javascript/controllers/soft_validations_controller.js b/app/webpacker/controllers/soft_validations_controller.js
similarity index 100%
rename from app/javascript/controllers/soft_validations_controller.js
rename to app/webpacker/controllers/soft_validations_controller.js
diff --git a/app/javascript/controllers/tasklist_controller.js b/app/webpacker/controllers/tasklist_controller.js
similarity index 100%
rename from app/javascript/controllers/tasklist_controller.js
rename to app/webpacker/controllers/tasklist_controller.js
diff --git a/app/javascript/packs/active_admin.js b/app/webpacker/packs/active_admin.js
similarity index 80%
rename from app/javascript/packs/active_admin.js
rename to app/webpacker/packs/active_admin.js
index 286b2e630..0f85eb617 100644
--- a/app/javascript/packs/active_admin.js
+++ b/app/webpacker/packs/active_admin.js
@@ -1,6 +1,6 @@
 // Load Active Admin's styles into Webpacker,
 // see `active_admin.scss` for customization.
-import "../stylesheets/active_admin";
+import "../styles/active_admin";
 
 import "@activeadmin/activeadmin";
 
diff --git a/app/javascript/packs/application.js b/app/webpacker/packs/application.js
similarity index 100%
rename from app/javascript/packs/application.js
rename to app/webpacker/packs/application.js
diff --git a/app/javascript/styles/_tab-navigation.scss b/app/webpacker/styles/_tab-navigation.scss
similarity index 100%
rename from app/javascript/styles/_tab-navigation.scss
rename to app/webpacker/styles/_tab-navigation.scss
diff --git a/app/javascript/styles/_task-list.scss b/app/webpacker/styles/_task-list.scss
similarity index 100%
rename from app/javascript/styles/_task-list.scss
rename to app/webpacker/styles/_task-list.scss
diff --git a/app/javascript/stylesheets/active_admin.scss b/app/webpacker/styles/active_admin.scss
similarity index 100%
rename from app/javascript/stylesheets/active_admin.scss
rename to app/webpacker/styles/active_admin.scss
diff --git a/app/javascript/styles/application.scss b/app/webpacker/styles/application.scss
similarity index 100%
rename from app/javascript/styles/application.scss
rename to app/webpacker/styles/application.scss
diff --git a/config/webpacker.yml b/config/webpacker.yml
index 0b2cfedde..449493752 100644
--- a/config/webpacker.yml
+++ b/config/webpacker.yml
@@ -1,7 +1,7 @@
 # Note: You must restart bin/webpack-dev-server for changes to take effect
 
 default: &default
-  source_path: app/javascript
+  source_path: app/webpacker
   source_entry_path: packs
   public_root_path: public
   public_output_path: packs