diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
index ff4e3680a..e1d6e089d 100644
--- a/app/assets/config/manifest.js
+++ b/app/assets/config/manifest.js
@@ -3,4 +3,3 @@
 //= link legacy_layout.css
 //= link application.js
 //= link legacy_layout.js
-//= link password-strength-indicator.js
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 3bd41fcf6..325bdc298 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -1,4 +1,4 @@
 //= require govuk_publishing_components/dependencies
 //= require govuk_publishing_components/all_components
-//= require password-strength-indicator
+//= require_tree ./modules
 //= require rails-ujs
diff --git a/app/assets/javascripts/modules/chosen.js b/app/assets/javascripts/legacy/modules/chosen.js
similarity index 100%
rename from app/assets/javascripts/modules/chosen.js
rename to app/assets/javascripts/legacy/modules/chosen.js
diff --git a/app/assets/javascripts/modules/dropdown_filter.js b/app/assets/javascripts/legacy/modules/dropdown_filter.js
similarity index 100%
rename from app/assets/javascripts/modules/dropdown_filter.js
rename to app/assets/javascripts/legacy/modules/dropdown_filter.js
diff --git a/app/assets/javascripts/legacy_layout.js b/app/assets/javascripts/legacy_layout.js
index 4cb8c28bd..517f999f0 100644
--- a/app/assets/javascripts/legacy_layout.js
+++ b/app/assets/javascripts/legacy_layout.js
@@ -1,3 +1,3 @@
 //= require chosen.jquery
-//= require_directory ./modules
+//= require_directory ./legacy/modules
 //= require zeroclipboard
diff --git a/app/assets/javascripts/password-strength-indicator.js b/app/assets/javascripts/modules/password-strength-indicator.js
similarity index 100%
rename from app/assets/javascripts/password-strength-indicator.js
rename to app/assets/javascripts/modules/password-strength-indicator.js
diff --git a/app/assets/stylesheets/_admin.scss b/app/assets/stylesheets/legacy/_admin.scss
similarity index 100%
rename from app/assets/stylesheets/_admin.scss
rename to app/assets/stylesheets/legacy/_admin.scss
diff --git a/app/assets/stylesheets/_bootstrap_chosen.scss b/app/assets/stylesheets/legacy/_bootstrap_chosen.scss
similarity index 100%
rename from app/assets/stylesheets/_bootstrap_chosen.scss
rename to app/assets/stylesheets/legacy/_bootstrap_chosen.scss
diff --git a/app/assets/stylesheets/_filters.scss b/app/assets/stylesheets/legacy/_filters.scss
similarity index 100%
rename from app/assets/stylesheets/_filters.scss
rename to app/assets/stylesheets/legacy/_filters.scss
diff --git a/app/assets/stylesheets/_thin_form.scss b/app/assets/stylesheets/legacy/_thin_form.scss
similarity index 100%
rename from app/assets/stylesheets/_thin_form.scss
rename to app/assets/stylesheets/legacy/_thin_form.scss
diff --git a/app/assets/stylesheets/legacy_layout.scss b/app/assets/stylesheets/legacy_layout.scss
index 16ef039f7..9ec297016 100644
--- a/app/assets/stylesheets/legacy_layout.scss
+++ b/app/assets/stylesheets/legacy_layout.scss
@@ -1,7 +1,7 @@
 @import "govuk_admin_template";
 @import "chosen";
 
-@import "bootstrap_chosen";
-@import "filters";
-@import "admin";
-@import "thin_form";
+@import "legacy/bootstrap_chosen";
+@import "legacy/filters";
+@import "legacy/admin";
+@import "legacy/thin_form";