diff --git a/app/main/forms.py b/app/main/forms.py
index 185a581fa..aa46da166 100644
--- a/app/main/forms.py
+++ b/app/main/forms.py
@@ -256,7 +256,7 @@ def govuk_text_input_field_widget(self, field, type=None, param_extensions=None,
     merge_jsonlike(params, param_extensions)
 
     return Markup(
-        render_template('components/us_components/input/template.njk', params=params))
+        render_template('components/components/input/template.njk', params=params))
 
 
 class GovukTextInputField(StringField):
@@ -790,7 +790,7 @@ def govuk_radios_field_widget(self, field, param_extensions=None, **kwargs):
         merge_jsonlike(params, param_extensions)
 
     return Markup(
-        render_template('components/us_components/radios/template.njk', params=params))
+        render_template('components/components/radios/template.njk', params=params))
 
 
 class GovukCheckboxField(BooleanField):
@@ -847,7 +847,7 @@ class GovukTextareaField(TextAreaField):
             merge_jsonlike(params, param_extensions)
 
         return Markup(
-            render_template('components/us_components/textarea/template.njk', params=params))
+            render_template('components/components/textarea/template.njk', params=params))
 
 
 # based on work done by @richardjpope: https://github.com/richardjpope/recourse/blob/master/recourse/forms.py#L6
diff --git a/app/templates/components/banner.html b/app/templates/components/banner.html
index 6a552be24..e63e507b4 100644
--- a/app/templates/components/banner.html
+++ b/app/templates/components/banner.html
@@ -1,5 +1,5 @@
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/button/macro.njk" import govukButton %}
+{% from "components/components/button/macro.njk" import govukButton %}
 
 {% macro banner(body, type=None, with_tick=False, delete_button=None, subhead=None, context=None, action=None, id=None, thing=None) %}
   <div
diff --git a/app/templates/components/us_components/back-link/README.md b/app/templates/components/components/back-link/README.md
similarity index 100%
rename from app/templates/components/us_components/back-link/README.md
rename to app/templates/components/components/back-link/README.md
diff --git a/app/templates/components/us_components/back-link/_back-link.scss b/app/templates/components/components/back-link/_back-link.scss
similarity index 100%
rename from app/templates/components/us_components/back-link/_back-link.scss
rename to app/templates/components/components/back-link/_back-link.scss
diff --git a/app/templates/components/us_components/back-link/macro-options.json b/app/templates/components/components/back-link/macro-options.json
similarity index 100%
rename from app/templates/components/us_components/back-link/macro-options.json
rename to app/templates/components/components/back-link/macro-options.json
diff --git a/app/templates/components/us_components/back-link/macro.njk b/app/templates/components/components/back-link/macro.njk
similarity index 100%
rename from app/templates/components/us_components/back-link/macro.njk
rename to app/templates/components/components/back-link/macro.njk
diff --git a/app/templates/components/us_components/back-link/template.njk b/app/templates/components/components/back-link/template.njk
similarity index 100%
rename from app/templates/components/us_components/back-link/template.njk
rename to app/templates/components/components/back-link/template.njk
diff --git a/app/templates/components/us_components/button/README.md b/app/templates/components/components/button/README.md
similarity index 100%
rename from app/templates/components/us_components/button/README.md
rename to app/templates/components/components/button/README.md
diff --git a/app/templates/components/us_components/button/_button.scss b/app/templates/components/components/button/_button.scss
similarity index 100%
rename from app/templates/components/us_components/button/_button.scss
rename to app/templates/components/components/button/_button.scss
diff --git a/app/templates/components/us_components/button/macro-options.json b/app/templates/components/components/button/macro-options.json
similarity index 100%
rename from app/templates/components/us_components/button/macro-options.json
rename to app/templates/components/components/button/macro-options.json
diff --git a/app/templates/components/us_components/button/macro.njk b/app/templates/components/components/button/macro.njk
similarity index 100%
rename from app/templates/components/us_components/button/macro.njk
rename to app/templates/components/components/button/macro.njk
diff --git a/app/templates/components/us_components/button/template.njk b/app/templates/components/components/button/template.njk
similarity index 100%
rename from app/templates/components/us_components/button/template.njk
rename to app/templates/components/components/button/template.njk
diff --git a/app/templates/components/us_components/checkboxes/README.md b/app/templates/components/components/checkboxes/README.md
similarity index 100%
rename from app/templates/components/us_components/checkboxes/README.md
rename to app/templates/components/components/checkboxes/README.md
diff --git a/app/templates/components/us_components/checkboxes/_checkboxes.scss b/app/templates/components/components/checkboxes/_checkboxes.scss
similarity index 100%
rename from app/templates/components/us_components/checkboxes/_checkboxes.scss
rename to app/templates/components/components/checkboxes/_checkboxes.scss
diff --git a/app/templates/components/us_components/checkboxes/macro-options.json b/app/templates/components/components/checkboxes/macro-options.json
similarity index 100%
rename from app/templates/components/us_components/checkboxes/macro-options.json
rename to app/templates/components/components/checkboxes/macro-options.json
diff --git a/app/templates/components/us_components/checkboxes/macro.njk b/app/templates/components/components/checkboxes/macro.njk
similarity index 100%
rename from app/templates/components/us_components/checkboxes/macro.njk
rename to app/templates/components/components/checkboxes/macro.njk
diff --git a/app/templates/components/us_components/checkboxes/template.njk b/app/templates/components/components/checkboxes/template.njk
similarity index 100%
rename from app/templates/components/us_components/checkboxes/template.njk
rename to app/templates/components/components/checkboxes/template.njk
diff --git a/app/templates/components/us_components/details/README.md b/app/templates/components/components/details/README.md
similarity index 100%
rename from app/templates/components/us_components/details/README.md
rename to app/templates/components/components/details/README.md
diff --git a/app/templates/components/us_components/details/_details.scss b/app/templates/components/components/details/_details.scss
similarity index 100%
rename from app/templates/components/us_components/details/_details.scss
rename to app/templates/components/components/details/_details.scss
diff --git a/app/templates/components/us_components/details/macro-options.json b/app/templates/components/components/details/macro-options.json
similarity index 100%
rename from app/templates/components/us_components/details/macro-options.json
rename to app/templates/components/components/details/macro-options.json
diff --git a/app/templates/components/us_components/details/macro.njk b/app/templates/components/components/details/macro.njk
similarity index 100%
rename from app/templates/components/us_components/details/macro.njk
rename to app/templates/components/components/details/macro.njk
diff --git a/app/templates/components/us_components/details/template.njk b/app/templates/components/components/details/template.njk
similarity index 100%
rename from app/templates/components/us_components/details/template.njk
rename to app/templates/components/components/details/template.njk
diff --git a/app/templates/components/us_components/error-message/README.md b/app/templates/components/components/error-message/README.md
similarity index 100%
rename from app/templates/components/us_components/error-message/README.md
rename to app/templates/components/components/error-message/README.md
diff --git a/app/templates/components/us_components/error-message/_error-message.scss b/app/templates/components/components/error-message/_error-message.scss
similarity index 100%
rename from app/templates/components/us_components/error-message/_error-message.scss
rename to app/templates/components/components/error-message/_error-message.scss
diff --git a/app/templates/components/us_components/error-message/macro-options.json b/app/templates/components/components/error-message/macro-options.json
similarity index 100%
rename from app/templates/components/us_components/error-message/macro-options.json
rename to app/templates/components/components/error-message/macro-options.json
diff --git a/app/templates/components/us_components/error-message/macro.njk b/app/templates/components/components/error-message/macro.njk
similarity index 100%
rename from app/templates/components/us_components/error-message/macro.njk
rename to app/templates/components/components/error-message/macro.njk
diff --git a/app/templates/components/us_components/error-message/template.njk b/app/templates/components/components/error-message/template.njk
similarity index 100%
rename from app/templates/components/us_components/error-message/template.njk
rename to app/templates/components/components/error-message/template.njk
diff --git a/app/templates/components/us_components/fieldset/README.md b/app/templates/components/components/fieldset/README.md
similarity index 100%
rename from app/templates/components/us_components/fieldset/README.md
rename to app/templates/components/components/fieldset/README.md
diff --git a/app/templates/components/us_components/fieldset/_fieldset.scss b/app/templates/components/components/fieldset/_fieldset.scss
similarity index 100%
rename from app/templates/components/us_components/fieldset/_fieldset.scss
rename to app/templates/components/components/fieldset/_fieldset.scss
diff --git a/app/templates/components/us_components/fieldset/macro-options.json b/app/templates/components/components/fieldset/macro-options.json
similarity index 100%
rename from app/templates/components/us_components/fieldset/macro-options.json
rename to app/templates/components/components/fieldset/macro-options.json
diff --git a/app/templates/components/us_components/fieldset/macro.njk b/app/templates/components/components/fieldset/macro.njk
similarity index 100%
rename from app/templates/components/us_components/fieldset/macro.njk
rename to app/templates/components/components/fieldset/macro.njk
diff --git a/app/templates/components/us_components/fieldset/template.njk b/app/templates/components/components/fieldset/template.njk
similarity index 100%
rename from app/templates/components/us_components/fieldset/template.njk
rename to app/templates/components/components/fieldset/template.njk
diff --git a/app/templates/components/us_components/footer/README.md b/app/templates/components/components/footer/README.md
similarity index 100%
rename from app/templates/components/us_components/footer/README.md
rename to app/templates/components/components/footer/README.md
diff --git a/app/templates/components/us_components/footer/_footer.scss b/app/templates/components/components/footer/_footer.scss
similarity index 100%
rename from app/templates/components/us_components/footer/_footer.scss
rename to app/templates/components/components/footer/_footer.scss
diff --git a/app/templates/components/us_components/footer/macro-options.json b/app/templates/components/components/footer/macro-options.json
similarity index 100%
rename from app/templates/components/us_components/footer/macro-options.json
rename to app/templates/components/components/footer/macro-options.json
diff --git a/app/templates/components/us_components/footer/macro.njk b/app/templates/components/components/footer/macro.njk
similarity index 100%
rename from app/templates/components/us_components/footer/macro.njk
rename to app/templates/components/components/footer/macro.njk
diff --git a/app/templates/components/us_components/footer/template.njk b/app/templates/components/components/footer/template.njk
similarity index 100%
rename from app/templates/components/us_components/footer/template.njk
rename to app/templates/components/components/footer/template.njk
diff --git a/app/templates/components/us_components/header/README.md b/app/templates/components/components/header/README.md
similarity index 100%
rename from app/templates/components/us_components/header/README.md
rename to app/templates/components/components/header/README.md
diff --git a/app/templates/components/us_components/header/_header.scss b/app/templates/components/components/header/_header.scss
similarity index 100%
rename from app/templates/components/us_components/header/_header.scss
rename to app/templates/components/components/header/_header.scss
diff --git a/app/templates/components/us_components/header/macro-options.json b/app/templates/components/components/header/macro-options.json
similarity index 100%
rename from app/templates/components/us_components/header/macro-options.json
rename to app/templates/components/components/header/macro-options.json
diff --git a/app/templates/components/us_components/header/macro.njk b/app/templates/components/components/header/macro.njk
similarity index 100%
rename from app/templates/components/us_components/header/macro.njk
rename to app/templates/components/components/header/macro.njk
diff --git a/app/templates/components/us_components/header/template.njk b/app/templates/components/components/header/template.njk
similarity index 100%
rename from app/templates/components/us_components/header/template.njk
rename to app/templates/components/components/header/template.njk
diff --git a/app/templates/components/us_components/hint/README.md b/app/templates/components/components/hint/README.md
similarity index 100%
rename from app/templates/components/us_components/hint/README.md
rename to app/templates/components/components/hint/README.md
diff --git a/app/templates/components/us_components/hint/_hint.scss b/app/templates/components/components/hint/_hint.scss
similarity index 100%
rename from app/templates/components/us_components/hint/_hint.scss
rename to app/templates/components/components/hint/_hint.scss
diff --git a/app/templates/components/us_components/hint/macro-options.json b/app/templates/components/components/hint/macro-options.json
similarity index 100%
rename from app/templates/components/us_components/hint/macro-options.json
rename to app/templates/components/components/hint/macro-options.json
diff --git a/app/templates/components/us_components/hint/macro.njk b/app/templates/components/components/hint/macro.njk
similarity index 100%
rename from app/templates/components/us_components/hint/macro.njk
rename to app/templates/components/components/hint/macro.njk
diff --git a/app/templates/components/us_components/hint/template.njk b/app/templates/components/components/hint/template.njk
similarity index 100%
rename from app/templates/components/us_components/hint/template.njk
rename to app/templates/components/components/hint/template.njk
diff --git a/app/templates/components/us_components/input/README.md b/app/templates/components/components/input/README.md
similarity index 100%
rename from app/templates/components/us_components/input/README.md
rename to app/templates/components/components/input/README.md
diff --git a/app/templates/components/us_components/input/_input.scss b/app/templates/components/components/input/_input.scss
similarity index 100%
rename from app/templates/components/us_components/input/_input.scss
rename to app/templates/components/components/input/_input.scss
diff --git a/app/templates/components/us_components/input/macro-options.json b/app/templates/components/components/input/macro-options.json
similarity index 100%
rename from app/templates/components/us_components/input/macro-options.json
rename to app/templates/components/components/input/macro-options.json
diff --git a/app/templates/components/us_components/input/macro.njk b/app/templates/components/components/input/macro.njk
similarity index 100%
rename from app/templates/components/us_components/input/macro.njk
rename to app/templates/components/components/input/macro.njk
diff --git a/app/templates/components/us_components/input/template.njk b/app/templates/components/components/input/template.njk
similarity index 100%
rename from app/templates/components/us_components/input/template.njk
rename to app/templates/components/components/input/template.njk
diff --git a/app/templates/components/us_components/inset-text/README.md b/app/templates/components/components/inset-text/README.md
similarity index 100%
rename from app/templates/components/us_components/inset-text/README.md
rename to app/templates/components/components/inset-text/README.md
diff --git a/app/templates/components/us_components/inset-text/_inset-text.scss b/app/templates/components/components/inset-text/_inset-text.scss
similarity index 100%
rename from app/templates/components/us_components/inset-text/_inset-text.scss
rename to app/templates/components/components/inset-text/_inset-text.scss
diff --git a/app/templates/components/us_components/inset-text/macro-options.json b/app/templates/components/components/inset-text/macro-options.json
similarity index 100%
rename from app/templates/components/us_components/inset-text/macro-options.json
rename to app/templates/components/components/inset-text/macro-options.json
diff --git a/app/templates/components/us_components/inset-text/macro.njk b/app/templates/components/components/inset-text/macro.njk
similarity index 100%
rename from app/templates/components/us_components/inset-text/macro.njk
rename to app/templates/components/components/inset-text/macro.njk
diff --git a/app/templates/components/us_components/inset-text/template.njk b/app/templates/components/components/inset-text/template.njk
similarity index 100%
rename from app/templates/components/us_components/inset-text/template.njk
rename to app/templates/components/components/inset-text/template.njk
diff --git a/app/templates/components/us_components/label/README.md b/app/templates/components/components/label/README.md
similarity index 100%
rename from app/templates/components/us_components/label/README.md
rename to app/templates/components/components/label/README.md
diff --git a/app/templates/components/us_components/label/_label.scss b/app/templates/components/components/label/_label.scss
similarity index 100%
rename from app/templates/components/us_components/label/_label.scss
rename to app/templates/components/components/label/_label.scss
diff --git a/app/templates/components/us_components/label/macro-options.json b/app/templates/components/components/label/macro-options.json
similarity index 100%
rename from app/templates/components/us_components/label/macro-options.json
rename to app/templates/components/components/label/macro-options.json
diff --git a/app/templates/components/us_components/label/macro.njk b/app/templates/components/components/label/macro.njk
similarity index 100%
rename from app/templates/components/us_components/label/macro.njk
rename to app/templates/components/components/label/macro.njk
diff --git a/app/templates/components/us_components/label/template.njk b/app/templates/components/components/label/template.njk
similarity index 100%
rename from app/templates/components/us_components/label/template.njk
rename to app/templates/components/components/label/template.njk
diff --git a/app/templates/components/us_components/radio-label/README.md b/app/templates/components/components/radio-label/README.md
similarity index 100%
rename from app/templates/components/us_components/radio-label/README.md
rename to app/templates/components/components/radio-label/README.md
diff --git a/app/templates/components/us_components/radio-label/_label.scss b/app/templates/components/components/radio-label/_label.scss
similarity index 100%
rename from app/templates/components/us_components/radio-label/_label.scss
rename to app/templates/components/components/radio-label/_label.scss
diff --git a/app/templates/components/us_components/radio-label/macro-options.json b/app/templates/components/components/radio-label/macro-options.json
similarity index 100%
rename from app/templates/components/us_components/radio-label/macro-options.json
rename to app/templates/components/components/radio-label/macro-options.json
diff --git a/app/templates/components/us_components/radio-label/macro.njk b/app/templates/components/components/radio-label/macro.njk
similarity index 100%
rename from app/templates/components/us_components/radio-label/macro.njk
rename to app/templates/components/components/radio-label/macro.njk
diff --git a/app/templates/components/us_components/radio-label/template.njk b/app/templates/components/components/radio-label/template.njk
similarity index 100%
rename from app/templates/components/us_components/radio-label/template.njk
rename to app/templates/components/components/radio-label/template.njk
diff --git a/app/templates/components/us_components/radios/README.md b/app/templates/components/components/radios/README.md
similarity index 100%
rename from app/templates/components/us_components/radios/README.md
rename to app/templates/components/components/radios/README.md
diff --git a/app/templates/components/us_components/radios/_radios.scss b/app/templates/components/components/radios/_radios.scss
similarity index 100%
rename from app/templates/components/us_components/radios/_radios.scss
rename to app/templates/components/components/radios/_radios.scss
diff --git a/app/templates/components/us_components/radios/macro-options.json b/app/templates/components/components/radios/macro-options.json
similarity index 100%
rename from app/templates/components/us_components/radios/macro-options.json
rename to app/templates/components/components/radios/macro-options.json
diff --git a/app/templates/components/us_components/radios/macro.njk b/app/templates/components/components/radios/macro.njk
similarity index 100%
rename from app/templates/components/us_components/radios/macro.njk
rename to app/templates/components/components/radios/macro.njk
diff --git a/app/templates/components/us_components/radios/template.njk b/app/templates/components/components/radios/template.njk
similarity index 100%
rename from app/templates/components/us_components/radios/template.njk
rename to app/templates/components/components/radios/template.njk
diff --git a/app/templates/components/us_components/skip-link/README.md b/app/templates/components/components/skip-link/README.md
similarity index 100%
rename from app/templates/components/us_components/skip-link/README.md
rename to app/templates/components/components/skip-link/README.md
diff --git a/app/templates/components/us_components/skip-link/_skip-link.scss b/app/templates/components/components/skip-link/_skip-link.scss
similarity index 100%
rename from app/templates/components/us_components/skip-link/_skip-link.scss
rename to app/templates/components/components/skip-link/_skip-link.scss
diff --git a/app/templates/components/us_components/skip-link/macro-options.json b/app/templates/components/components/skip-link/macro-options.json
similarity index 100%
rename from app/templates/components/us_components/skip-link/macro-options.json
rename to app/templates/components/components/skip-link/macro-options.json
diff --git a/app/templates/components/us_components/skip-link/macro.njk b/app/templates/components/components/skip-link/macro.njk
similarity index 100%
rename from app/templates/components/us_components/skip-link/macro.njk
rename to app/templates/components/components/skip-link/macro.njk
diff --git a/app/templates/components/us_components/skip-link/template.njk b/app/templates/components/components/skip-link/template.njk
similarity index 100%
rename from app/templates/components/us_components/skip-link/template.njk
rename to app/templates/components/components/skip-link/template.njk
diff --git a/app/templates/components/us_components/textarea/README.md b/app/templates/components/components/textarea/README.md
similarity index 100%
rename from app/templates/components/us_components/textarea/README.md
rename to app/templates/components/components/textarea/README.md
diff --git a/app/templates/components/us_components/textarea/_textarea.scss b/app/templates/components/components/textarea/_textarea.scss
similarity index 100%
rename from app/templates/components/us_components/textarea/_textarea.scss
rename to app/templates/components/components/textarea/_textarea.scss
diff --git a/app/templates/components/us_components/textarea/macro-options.json b/app/templates/components/components/textarea/macro-options.json
similarity index 100%
rename from app/templates/components/us_components/textarea/macro-options.json
rename to app/templates/components/components/textarea/macro-options.json
diff --git a/app/templates/components/us_components/textarea/macro.njk b/app/templates/components/components/textarea/macro.njk
similarity index 100%
rename from app/templates/components/us_components/textarea/macro.njk
rename to app/templates/components/components/textarea/macro.njk
diff --git a/app/templates/components/us_components/textarea/template.njk b/app/templates/components/components/textarea/template.njk
similarity index 100%
rename from app/templates/components/us_components/textarea/template.njk
rename to app/templates/components/components/textarea/template.njk
diff --git a/app/templates/components/file-upload.html b/app/templates/components/file-upload.html
index d006fbd9e..6fdc70f04 100644
--- a/app/templates/components/file-upload.html
+++ b/app/templates/components/file-upload.html
@@ -1,4 +1,4 @@
-{% from "components/us_components/button/macro.njk" import govukButton %}
+{% from "components/components/button/macro.njk" import govukButton %}
 
 {% macro file_upload(
   field,
diff --git a/app/templates/components/list-entry.html b/app/templates/components/list-entry.html
index f96f88017..ac777484d 100644
--- a/app/templates/components/list-entry.html
+++ b/app/templates/components/list-entry.html
@@ -1,5 +1,5 @@
-{% from "components/us_components/fieldset/macro.njk" import govukFieldset %}
-{% from "components/us_components/error-message/macro.njk" import govukErrorMessage %}
+{% from "components/components/fieldset/macro.njk" import govukFieldset %}
+{% from "components/components/error-message/macro.njk" import govukErrorMessage %}
 
 {% macro list_entry(
   field,
diff --git a/app/templates/components/page-footer.html b/app/templates/components/page-footer.html
index 9e6fbaa5f..cb3c85eec 100644
--- a/app/templates/components/page-footer.html
+++ b/app/templates/components/page-footer.html
@@ -1,4 +1,4 @@
-{% from "components/us_components/button/macro.njk" import govukButton %}
+{% from "components/components/button/macro.njk" import govukButton %}
 
 {% macro page_footer(
   button_text=None,
diff --git a/app/templates/forms/fields/checkboxes/template.njk b/app/templates/forms/fields/checkboxes/template.njk
index 1d3fe69ee..3d8717acb 100644
--- a/app/templates/forms/fields/checkboxes/template.njk
+++ b/app/templates/forms/fields/checkboxes/template.njk
@@ -1,7 +1,7 @@
-{% from "components/us_components/error-message/macro.njk" import govukErrorMessage -%}
-{% from "components/us_components/fieldset/macro.njk" import govukFieldset %}
-{% from "components/us_components/hint/macro.njk" import govukHint %}
-{% from "components/us_components/radio-label/macro.njk" import usaRadioLabel %}
+{% from "components/components/error-message/macro.njk" import govukErrorMessage -%}
+{% from "components/components/fieldset/macro.njk" import govukFieldset %}
+{% from "components/components/hint/macro.njk" import govukHint %}
+{% from "components/components/radio-label/macro.njk" import usaRadioLabel %}
 
 
 {#- Copied from https://github.com/alphagov/govuk-frontend/blob/v2.13.0/src/components/checkboxes/template.njk
diff --git a/app/templates/main_template.html b/app/templates/main_template.html
index 9944d8306..02c9b3904 100644
--- a/app/templates/main_template.html
+++ b/app/templates/main_template.html
@@ -1,6 +1,6 @@
-{% from "./components/us_components/skip-link/macro.njk" import govukSkipLink -%}
-{% from "./components/us_components/header/macro.njk" import govukHeader -%}
-{% from "./components/us_components/footer/macro.njk" import govukFooter -%}
+{% from "./components/components/skip-link/macro.njk" import govukSkipLink -%}
+{% from "./components/components/header/macro.njk" import govukHeader -%}
+{% from "./components/components/footer/macro.njk" import govukFooter -%}
 {# specify absolute url for the static assets folder e.g. http://wwww.domain.com/assets #}
 {%- set assetUrl = assetUrl | default(assetPath) -%}
 <!DOCTYPE html>
diff --git a/app/templates/partials/templates/guidance-formatting-letters.html b/app/templates/partials/templates/guidance-formatting-letters.html
index 05bafcef9..aee15b433 100644
--- a/app/templates/partials/templates/guidance-formatting-letters.html
+++ b/app/templates/partials/templates/guidance-formatting-letters.html
@@ -1,4 +1,4 @@
-{% from "components/us_components/inset-text/macro.njk" import govukInsetText %}
+{% from "components/components/inset-text/macro.njk" import govukInsetText %}
 
 <h2 class="heading-medium">Formatting</h2>
 <p class="govuk-body">
diff --git a/app/templates/partials/templates/guidance-formatting.html b/app/templates/partials/templates/guidance-formatting.html
index ab13ae820..f3780f04e 100644
--- a/app/templates/partials/templates/guidance-formatting.html
+++ b/app/templates/partials/templates/guidance-formatting.html
@@ -1,4 +1,4 @@
-{% from "components/us_components/inset-text/macro.njk" import govukInsetText %}
+{% from "components/components/inset-text/macro.njk" import govukInsetText %}
 
 <h2 class="heading-medium">Formatting</h2>
 <p class="bottom-gutter-1-3">
diff --git a/app/templates/partials/templates/guidance-links.html b/app/templates/partials/templates/guidance-links.html
index 7eaab8869..ceb241c94 100644
--- a/app/templates/partials/templates/guidance-links.html
+++ b/app/templates/partials/templates/guidance-links.html
@@ -1,4 +1,4 @@
-{% from "components/us_components/inset-text/macro.njk" import govukInsetText %}
+{% from "components/components/inset-text/macro.njk" import govukInsetText %}
 
 <h2 class="font-body-lg">Links and URLs</h2>
 <p class="bottom-gutter-1-3">
diff --git a/app/templates/partials/templates/guidance-optional-content.html b/app/templates/partials/templates/guidance-optional-content.html
index 38ab34767..4748c4136 100644
--- a/app/templates/partials/templates/guidance-optional-content.html
+++ b/app/templates/partials/templates/guidance-optional-content.html
@@ -1,4 +1,4 @@
-{% from "components/us_components/inset-text/macro.njk" import govukInsetText %}
+{% from "components/components/inset-text/macro.njk" import govukInsetText %}
 
 <h2 class="font-body-lg">
   Optional content
diff --git a/app/templates/partials/templates/guidance-personalisation.html b/app/templates/partials/templates/guidance-personalisation.html
index f8ba56edc..5d9f18f14 100644
--- a/app/templates/partials/templates/guidance-personalisation.html
+++ b/app/templates/partials/templates/guidance-personalisation.html
@@ -1,4 +1,4 @@
-{% from "components/us_components/inset-text/macro.njk" import govukInsetText %}
+{% from "components/components/inset-text/macro.njk" import govukInsetText %}
 
 <h2 class="font-body-lg">
   Personalization
diff --git a/app/templates/partials/templates/guidance-send-a-document.html b/app/templates/partials/templates/guidance-send-a-document.html
index d3d78779b..140ec6b7a 100644
--- a/app/templates/partials/templates/guidance-send-a-document.html
+++ b/app/templates/partials/templates/guidance-send-a-document.html
@@ -1,4 +1,4 @@
-{% from "components/us_components/inset-text/macro.njk" import govukInsetText %}
+{% from "components/components/inset-text/macro.njk" import govukInsetText %}
 
 <h2 class="heading-medium">
   Send a document by email
diff --git a/app/templates/views/api/callbacks.html b/app/templates/views/api/callbacks.html
index fcabbaa74..f1f2a0ff8 100644
--- a/app/templates/views/api/callbacks.html
+++ b/app/templates/views/api/callbacks.html
@@ -2,7 +2,7 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/table.html" import mapping_table, row, text_field, edit_field, optional_text_field with context %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Callbacks
diff --git a/app/templates/views/api/callbacks/delivery-status-callback.html b/app/templates/views/api/callbacks/delivery-status-callback.html
index c2b5cc9fa..b99a80d95 100644
--- a/app/templates/views/api/callbacks/delivery-status-callback.html
+++ b/app/templates/views/api/callbacks/delivery-status-callback.html
@@ -2,7 +2,7 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Callbacks for delivery receipts
diff --git a/app/templates/views/api/callbacks/received-text-messages-callback.html b/app/templates/views/api/callbacks/received-text-messages-callback.html
index dbb80ddf5..405fb52cd 100644
--- a/app/templates/views/api/callbacks/received-text-messages-callback.html
+++ b/app/templates/views/api/callbacks/received-text-messages-callback.html
@@ -2,7 +2,7 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Callbacks for received text messages
diff --git a/app/templates/views/api/guest-list.html b/app/templates/views/api/guest-list.html
index 16385289d..d3a551a3c 100644
--- a/app/templates/views/api/guest-list.html
+++ b/app/templates/views/api/guest-list.html
@@ -5,7 +5,7 @@
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/list-entry.html" import list_entry %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Guest list
diff --git a/app/templates/views/api/keys.html b/app/templates/views/api/keys.html
index e08b78dbe..1e0c2edf7 100644
--- a/app/templates/views/api/keys.html
+++ b/app/templates/views/api/keys.html
@@ -1,8 +1,8 @@
 {% extends "withnav_template.html" %}
 {% from "components/table.html" import list_table, field, hidden_field_heading %}
 {% from "components/page-header.html" import page_header %}
-{% from "components/us_components/button/macro.njk" import govukButton %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/button/macro.njk" import govukButton %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   API keys
diff --git a/app/templates/views/api/keys/create.html b/app/templates/views/api/keys/create.html
index 56bf74b28..137f44a69 100644
--- a/app/templates/views/api/keys/create.html
+++ b/app/templates/views/api/keys/create.html
@@ -3,7 +3,7 @@
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/banner.html" import banner_wrapper %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Create an API key
diff --git a/app/templates/views/check/column-errors.html b/app/templates/views/check/column-errors.html
index 6fe749a53..444ffaa25 100644
--- a/app/templates/views/check/column-errors.html
+++ b/app/templates/views/check/column-errors.html
@@ -3,7 +3,7 @@
 {% from "components/radios.html" import radio_select %}
 {% from "components/table.html" import list_table, field, text_field, index_field, hidden_field_heading %}
 {% from "components/file-upload.html" import file_upload %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Error
diff --git a/app/templates/views/check/ok.html b/app/templates/views/check/ok.html
index 8f58a2204..87000e831 100644
--- a/app/templates/views/check/ok.html
+++ b/app/templates/views/check/ok.html
@@ -2,9 +2,9 @@
 {% from "components/banner.html" import banner_wrapper %}
 {% from "components/table.html" import list_table, field, text_field, index_field, hidden_field_heading %}
 {% from "components/page-header.html" import page_header %}
-{% from "components/us_components/button/macro.njk" import govukButton %}
-{% from "components/us_components/skip-link/macro.njk" import govukSkipLink %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/button/macro.njk" import govukButton %}
+{% from "components/components/skip-link/macro.njk" import govukSkipLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% set file_contents_header_id = 'file-preview' %}
 
diff --git a/app/templates/views/check/row-errors.html b/app/templates/views/check/row-errors.html
index e7154e2b6..1fe130bb7 100644
--- a/app/templates/views/check/row-errors.html
+++ b/app/templates/views/check/row-errors.html
@@ -3,7 +3,7 @@
 {% from "components/radios.html" import radio_select %}
 {% from "components/table.html" import mapping_table, row, field, text_field, index_field, hidden_field_heading %}
 {% from "components/file-upload.html" import file_upload %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Error
diff --git a/app/templates/views/choose-account.html b/app/templates/views/choose-account.html
index dce5ded21..37224a8f5 100644
--- a/app/templates/views/choose-account.html
+++ b/app/templates/views/choose-account.html
@@ -1,5 +1,5 @@
 {% extends "withoutnav_template.html" %}
-{% from "components/us_components/button/macro.njk" import govukButton %}
+{% from "components/components/button/macro.njk" import govukButton %}
 
 {% macro service_list(
   heading,
diff --git a/app/templates/views/conversations/conversation.html b/app/templates/views/conversations/conversation.html
index ba8827a20..47de4a56d 100644
--- a/app/templates/views/conversations/conversation.html
+++ b/app/templates/views/conversations/conversation.html
@@ -1,5 +1,5 @@
 {% from "components/ajax-block.html" import ajax_block %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% extends "withnav_template.html" %}
 
diff --git a/app/templates/views/dashboard/inbox.html b/app/templates/views/dashboard/inbox.html
index 1441e58a2..101372b45 100644
--- a/app/templates/views/dashboard/inbox.html
+++ b/app/templates/views/dashboard/inbox.html
@@ -1,7 +1,7 @@
 {% extends "withnav_template.html" %}
 {% from "components/ajax-block.html" import ajax_block %}
 {% from "components/page-header.html" import page_header %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Received text messages
diff --git a/app/templates/views/edit-email-template.html b/app/templates/views/edit-email-template.html
index 9dfa39669..09bd8731b 100644
--- a/app/templates/views/edit-email-template.html
+++ b/app/templates/views/edit-email-template.html
@@ -3,7 +3,7 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import sticky_page_footer %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   {{ heading_action }} email template
diff --git a/app/templates/views/edit-sms-template.html b/app/templates/views/edit-sms-template.html
index 2fa560397..f3be4980d 100644
--- a/app/templates/views/edit-sms-template.html
+++ b/app/templates/views/edit-sms-template.html
@@ -3,7 +3,7 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   {{ heading_action }} text message template
diff --git a/app/templates/views/edit-user-permissions.html b/app/templates/views/edit-user-permissions.html
index 2ba295ed8..f3cb74829 100644
--- a/app/templates/views/edit-user-permissions.html
+++ b/app/templates/views/edit-user-permissions.html
@@ -3,7 +3,7 @@
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
 {% from "components/banner.html" import banner %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   {{ user.name or user.email_localpart }}
diff --git a/app/templates/views/email-branding/manage-branding.html b/app/templates/views/email-branding/manage-branding.html
index 1009617e0..ffdac28c5 100644
--- a/app/templates/views/email-branding/manage-branding.html
+++ b/app/templates/views/email-branding/manage-branding.html
@@ -3,7 +3,7 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   {{ '{} email branding'.format('Update' if email_branding else 'Create')}}
diff --git a/app/templates/views/email-branding/select-branding.html b/app/templates/views/email-branding/select-branding.html
index d366d3f2b..37a31bf84 100644
--- a/app/templates/views/email-branding/select-branding.html
+++ b/app/templates/views/email-branding/select-branding.html
@@ -1,7 +1,7 @@
 {% extends "views/platform-admin/_base_template.html" %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/live-search.html" import live_search %}
-{% from "components/us_components/button/macro.njk" import govukButton %}
+{% from "components/components/button/macro.njk" import govukButton %}
 
 {% set page_title = "Email branding" %}
 
diff --git a/app/templates/views/email-not-received.html b/app/templates/views/email-not-received.html
index 9b43e7966..e5f8aa95e 100644
--- a/app/templates/views/email-not-received.html
+++ b/app/templates/views/email-not-received.html
@@ -1,5 +1,5 @@
 {% extends "withoutnav_template.html" %}
-{% from "components/us_components/button/macro.njk" import govukButton %}
+{% from "components/components/button/macro.njk" import govukButton %}
 
 {% block per_page_title %}
   Resend email link
diff --git a/app/templates/views/find-services/find-services-by-name.html b/app/templates/views/find-services/find-services-by-name.html
index 46b4cbc0a..0bfd7f3b5 100644
--- a/app/templates/views/find-services/find-services-by-name.html
+++ b/app/templates/views/find-services/find-services-by-name.html
@@ -1,7 +1,7 @@
 {% extends "views/platform-admin/_base_template.html" %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/button/macro.njk" import govukButton %}
+{% from "components/components/button/macro.njk" import govukButton %}
 
 {% block per_page_title %}
   Find services by name
diff --git a/app/templates/views/find-users/auth_type.html b/app/templates/views/find-users/auth_type.html
index d6c6e325d..1d95fdbf5 100644
--- a/app/templates/views/find-users/auth_type.html
+++ b/app/templates/views/find-users/auth_type.html
@@ -2,7 +2,7 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block per_page_title %}
   Set auth type for {{ user.name }}
diff --git a/app/templates/views/find-users/find-users-by-email.html b/app/templates/views/find-users/find-users-by-email.html
index 3e9e0a92d..2eb1bdbc4 100644
--- a/app/templates/views/find-users/find-users-by-email.html
+++ b/app/templates/views/find-users/find-users-by-email.html
@@ -1,7 +1,7 @@
 {% extends "views/platform-admin/_base_template.html" %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/button/macro.njk" import govukButton %}
+{% from "components/components/button/macro.njk" import govukButton %}
 
 {% block per_page_title %}
   Find users by email
diff --git a/app/templates/views/get-started.html b/app/templates/views/get-started.html
index 438325481..e1884f94c 100644
--- a/app/templates/views/get-started.html
+++ b/app/templates/views/get-started.html
@@ -1,7 +1,7 @@
 {% extends "content_template.html" %}
 {% from "components/table.html" import mapping_table, row, text_field, edit_field, field with context %}
 {% from "components/sub-navigation.html" import sub_navigation %}
-{% from "components/us_components/details/macro.njk" import govukDetails %}
+{% from "components/components/details/macro.njk" import govukDetails %}
 
 {% block per_page_title %}
   Get started
diff --git a/app/templates/views/invite-user.html b/app/templates/views/invite-user.html
index 4f75dec1d..7cc77011e 100644
--- a/app/templates/views/invite-user.html
+++ b/app/templates/views/invite-user.html
@@ -2,7 +2,7 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Invite a team member
diff --git a/app/templates/views/jobs/job.html b/app/templates/views/jobs/job.html
index 6b18a96ad..75e636683 100644
--- a/app/templates/views/jobs/job.html
+++ b/app/templates/views/jobs/job.html
@@ -3,7 +3,7 @@
 {% from "components/ajax-block.html" import ajax_block %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/page-header.html" import page_header %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   {{ job.original_file_name }}
diff --git a/app/templates/views/jobs/jobs.html b/app/templates/views/jobs/jobs.html
index 4ae847a5e..881a58a9b 100644
--- a/app/templates/views/jobs/jobs.html
+++ b/app/templates/views/jobs/jobs.html
@@ -1,6 +1,6 @@
 {% from "components/previous-next-navigation.html" import previous_next_navigation %}
 {% extends "withnav_template.html" %}
-{% from "components/us_components/button/macro.njk" import govukButton %}
+{% from "components/components/button/macro.njk" import govukButton %}
 
 {% block service_page_title %}
   Uploads
diff --git a/app/templates/views/manage-users.html b/app/templates/views/manage-users.html
index 0cd442548..3b4c050f3 100644
--- a/app/templates/views/manage-users.html
+++ b/app/templates/views/manage-users.html
@@ -1,7 +1,7 @@
 {% extends "withnav_template.html" %}
 {% from "components/tick-cross.html" import tick_cross %}
 {% from "components/live-search.html" import live_search %}
-{% from "components/us_components/button/macro.njk" import govukButton %}
+{% from "components/components/button/macro.njk" import govukButton %}
 
 {% block service_page_title %}
   Team members
diff --git a/app/templates/views/manage-users/confirm-edit-user-email.html b/app/templates/views/manage-users/confirm-edit-user-email.html
index 84f1fd60c..a62d28778 100644
--- a/app/templates/views/manage-users/confirm-edit-user-email.html
+++ b/app/templates/views/manage-users/confirm-edit-user-email.html
@@ -2,7 +2,7 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block per_page_title %}
   Confirm change of email address
diff --git a/app/templates/views/manage-users/confirm-edit-user-mobile-number.html b/app/templates/views/manage-users/confirm-edit-user-mobile-number.html
index b6a74c0fd..23d3a50b1 100644
--- a/app/templates/views/manage-users/confirm-edit-user-mobile-number.html
+++ b/app/templates/views/manage-users/confirm-edit-user-mobile-number.html
@@ -2,7 +2,7 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block per_page_title %}
   Confirm change of mobile number
diff --git a/app/templates/views/manage-users/edit-user-email.html b/app/templates/views/manage-users/edit-user-email.html
index 9bb67dd94..eea343657 100644
--- a/app/templates/views/manage-users/edit-user-email.html
+++ b/app/templates/views/manage-users/edit-user-email.html
@@ -2,7 +2,7 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block per_page_title %}
   Change team member’s email address
diff --git a/app/templates/views/manage-users/edit-user-mobile.html b/app/templates/views/manage-users/edit-user-mobile.html
index 20510c30d..4db6e65ff 100644
--- a/app/templates/views/manage-users/edit-user-mobile.html
+++ b/app/templates/views/manage-users/edit-user-mobile.html
@@ -2,7 +2,7 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block per_page_title %}
   Change team member’s mobile number
diff --git a/app/templates/views/notifications.html b/app/templates/views/notifications.html
index 3a38f8448..90c330dfe 100644
--- a/app/templates/views/notifications.html
+++ b/app/templates/views/notifications.html
@@ -3,7 +3,7 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/button/macro.njk" import govukButton %}
+{% from "components/components/button/macro.njk" import govukButton %}
 
 {% set page_title = (
   (99|message_count_label(message_type, suffix='')) | capitalize
diff --git a/app/templates/views/notifications/check.html b/app/templates/views/notifications/check.html
index cf18b9cbd..57fcaa862 100644
--- a/app/templates/views/notifications/check.html
+++ b/app/templates/views/notifications/check.html
@@ -1,8 +1,8 @@
 {% extends "withnav_template.html" %}
 {% from "components/banner.html" import banner_wrapper %}
 {% from "components/page-header.html" import page_header %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
-{% from "components/us_components/button/macro.njk" import govukButton %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/button/macro.njk" import govukButton %}
 
 {% block service_page_title %}
   {{ "Error" if error else "Preview of ‘{}’".format(template.name) }}
diff --git a/app/templates/views/notifications/notification.html b/app/templates/views/notifications/notification.html
index e05760e3e..81e501df8 100644
--- a/app/templates/views/notifications/notification.html
+++ b/app/templates/views/notifications/notification.html
@@ -3,7 +3,7 @@
 {% from "components/ajax-block.html" import ajax_block %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   {{ 1|message_count_label(template.template_type, suffix='') | capitalize }}
diff --git a/app/templates/views/organizations/add-gp-organization.html b/app/templates/views/organizations/add-gp-organization.html
index e9fce31f3..6a1400e4d 100644
--- a/app/templates/views/organizations/add-gp-organization.html
+++ b/app/templates/views/organizations/add-gp-organization.html
@@ -4,7 +4,7 @@
 {% from "components/radios.html" import radio, conditional_radio_panel %}
 {% from "components/select-input.html" import select_wrapper %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 
 {% block backLink %}
diff --git a/app/templates/views/organizations/add-nhs-local-organization.html b/app/templates/views/organizations/add-nhs-local-organization.html
index f918d01d2..1a1f771d1 100644
--- a/app/templates/views/organizations/add-nhs-local-organization.html
+++ b/app/templates/views/organizations/add-nhs-local-organization.html
@@ -3,7 +3,7 @@
 {% from "components/page-footer.html" import sticky_page_footer %}
 {% from "components/live-search.html" import live_search %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block per_page_title %}
   {{ page_title }}
diff --git a/app/templates/views/organizations/index.html b/app/templates/views/organizations/index.html
index d8811d00a..3126717b7 100644
--- a/app/templates/views/organizations/index.html
+++ b/app/templates/views/organizations/index.html
@@ -1,6 +1,6 @@
 {% extends "views/platform-admin/_base_template.html" %}
 {% from "components/live-search.html" import live_search %}
-{% from "components/us_components/button/macro.njk" import govukButton %}
+{% from "components/components/button/macro.njk" import govukButton %}
 
 {% block per_page_title %}
   Organizations
diff --git a/app/templates/views/organizations/organization/settings/edit-domains.html b/app/templates/views/organizations/organization/settings/edit-domains.html
index 4ed2b8562..c05aff56c 100644
--- a/app/templates/views/organizations/organization/settings/edit-domains.html
+++ b/app/templates/views/organizations/organization/settings/edit-domains.html
@@ -3,7 +3,7 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/list-entry.html" import list_entry %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block org_page_title %}
   Known email domains
diff --git a/app/templates/views/organizations/organization/settings/edit-go-live-notes.html b/app/templates/views/organizations/organization/settings/edit-go-live-notes.html
index 34e57aefe..50652a71d 100644
--- a/app/templates/views/organizations/organization/settings/edit-go-live-notes.html
+++ b/app/templates/views/organizations/organization/settings/edit-go-live-notes.html
@@ -3,7 +3,7 @@
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/textbox.html" import textbox %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block org_page_title %}
   Edit request to go live notes
diff --git a/app/templates/views/organizations/organization/settings/edit-name.html b/app/templates/views/organizations/organization/settings/edit-name.html
index d0225bd06..290f4dad3 100644
--- a/app/templates/views/organizations/organization/settings/edit-name.html
+++ b/app/templates/views/organizations/organization/settings/edit-name.html
@@ -2,7 +2,7 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block org_page_title %}
   Change organization name
diff --git a/app/templates/views/organizations/organization/settings/edit-organization-billing-details.html b/app/templates/views/organizations/organization/settings/edit-organization-billing-details.html
index 0bf799371..80c57ae9f 100644
--- a/app/templates/views/organizations/organization/settings/edit-organization-billing-details.html
+++ b/app/templates/views/organizations/organization/settings/edit-organization-billing-details.html
@@ -3,7 +3,7 @@
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
 {% from "components/textbox.html" import textbox %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block org_page_title %}
   Edit organization billing details
diff --git a/app/templates/views/organizations/organization/settings/edit-organization-notes.html b/app/templates/views/organizations/organization/settings/edit-organization-notes.html
index 871ecfc3d..58fc9d848 100644
--- a/app/templates/views/organizations/organization/settings/edit-organization-notes.html
+++ b/app/templates/views/organizations/organization/settings/edit-organization-notes.html
@@ -3,7 +3,7 @@
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
 {% from "components/textbox.html" import textbox %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block org_page_title %}
   Edit organization notes
diff --git a/app/templates/views/organizations/organization/settings/edit-type.html b/app/templates/views/organizations/organization/settings/edit-type.html
index a4af63e98..4f9ccb755 100644
--- a/app/templates/views/organizations/organization/settings/edit-type.html
+++ b/app/templates/views/organizations/organization/settings/edit-type.html
@@ -2,7 +2,7 @@
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block org_page_title %}
   Organization sector
diff --git a/app/templates/views/organizations/organization/settings/preview-email-branding.html b/app/templates/views/organizations/organization/settings/preview-email-branding.html
index 985c9ebd8..405405dd6 100644
--- a/app/templates/views/organizations/organization/settings/preview-email-branding.html
+++ b/app/templates/views/organizations/organization/settings/preview-email-branding.html
@@ -1,6 +1,6 @@
 {% extends "org_template.html" %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/button/macro.njk" import govukButton %}
+{% from "components/components/button/macro.njk" import govukButton %}
 {% from "components/branding-preview.html" import email_branding_preview %}
 
 {% block org_page_title %}
diff --git a/app/templates/views/organizations/organization/settings/set-email-branding.html b/app/templates/views/organizations/organization/settings/set-email-branding.html
index ad0cf6b03..2a4f0e9c7 100644
--- a/app/templates/views/organizations/organization/settings/set-email-branding.html
+++ b/app/templates/views/organizations/organization/settings/set-email-branding.html
@@ -3,7 +3,7 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/live-search.html" import live_search %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% set page_title = "Default email branding" %}
 
diff --git a/app/templates/views/organizations/organization/users/index.html b/app/templates/views/organizations/organization/users/index.html
index 84e444c93..2b78d7822 100644
--- a/app/templates/views/organizations/organization/users/index.html
+++ b/app/templates/views/organizations/organization/users/index.html
@@ -2,7 +2,7 @@
 {% from "components/table.html" import list_table, row, field, hidden_field_heading %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/live-search.html" import live_search %}
-{% from "components/us_components/button/macro.njk" import govukButton %}
+{% from "components/components/button/macro.njk" import govukButton %}
 
 {% block org_page_title %}
   Team members
diff --git a/app/templates/views/organizations/organization/users/invite-org-user.html b/app/templates/views/organizations/organization/users/invite-org-user.html
index 18030eb95..93244e2ee 100644
--- a/app/templates/views/organizations/organization/users/invite-org-user.html
+++ b/app/templates/views/organizations/organization/users/invite-org-user.html
@@ -3,7 +3,7 @@
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Invite a team member
diff --git a/app/templates/views/platform-admin/index.html b/app/templates/views/platform-admin/index.html
index 1aba84087..401f092aa 100644
--- a/app/templates/views/platform-admin/index.html
+++ b/app/templates/views/platform-admin/index.html
@@ -2,8 +2,8 @@
 {% from "components/big-number.html" import big_number_simple %}
 {% from "components/status-box.html" import status_box %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/details/macro.njk" import govukDetails %}
-{% from "components/us_components/button/macro.njk" import govukButton %}
+{% from "components/components/details/macro.njk" import govukDetails %}
+{% from "components/components/button/macro.njk" import govukButton %}
 
 {% block per_page_title %}
   Summary
diff --git a/app/templates/views/platform-admin/services.html b/app/templates/views/platform-admin/services.html
index e67e4b898..e3cd93f39 100644
--- a/app/templates/views/platform-admin/services.html
+++ b/app/templates/views/platform-admin/services.html
@@ -3,8 +3,8 @@
 {% from "components/big-number.html" import big_number, big_number_with_status %}
 {% from "components/table.html" import mapping_table, field, stats_fields, row_group, row, right_aligned_field_heading, hidden_field_heading, text_field %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/button/macro.njk" import govukButton %}
-{% from "components/us_components/details/macro.njk" import govukDetails %}
+{% from "components/components/button/macro.njk" import govukButton %}
+{% from "components/components/details/macro.njk" import govukDetails %}
 
 {% macro services_table(services, caption) %}
   {% call(item, row_number) mapping_table(
diff --git a/app/templates/views/pricing/index.html b/app/templates/views/pricing/index.html
index 5f8eb5a01..a41551abc 100644
--- a/app/templates/views/pricing/index.html
+++ b/app/templates/views/pricing/index.html
@@ -1,7 +1,7 @@
 {% from "components/content-metadata.html" import content_metadata %}
 {% from "components/table.html" import mapping_table, row, text_field, field, row_heading %}
 {% from "components/live-search.html" import live_search %}
-{% from "components/us_components/details/macro.njk" import govukDetails %}
+{% from "components/components/details/macro.njk" import govukDetails %}
 
 {% extends "content_template.html" %}
 
diff --git a/app/templates/views/providers/provider.html b/app/templates/views/providers/provider.html
index 838c9961d..bf5888205 100644
--- a/app/templates/views/providers/provider.html
+++ b/app/templates/views/providers/provider.html
@@ -2,7 +2,7 @@
 {% from "components/table.html" import list_table, field, text_field, link_field, right_aligned_field_heading, hidden_field_heading %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block per_page_title %}
   {{ provider_versions[0].display_name }}
diff --git a/app/templates/views/send-test.html b/app/templates/views/send-test.html
index 109c11405..002996fb6 100644
--- a/app/templates/views/send-test.html
+++ b/app/templates/views/send-test.html
@@ -2,7 +2,7 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   {{ page_title }}
diff --git a/app/templates/views/send.html b/app/templates/views/send.html
index f0dcbbc83..ed833b617 100644
--- a/app/templates/views/send.html
+++ b/app/templates/views/send.html
@@ -3,7 +3,7 @@
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/file-upload.html" import file_upload %}
 {% from "components/table.html" import list_table, text_field, index_field, index_field_heading %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Upload a list of {{ 999|recipient_count_label(template.template_type) }}
diff --git a/app/templates/views/service-settings/branding/email-branding-govuk-org.html b/app/templates/views/service-settings/branding/email-branding-govuk-org.html
index d8094a920..e4a2552e5 100644
--- a/app/templates/views/service-settings/branding/email-branding-govuk-org.html
+++ b/app/templates/views/service-settings/branding/email-branding-govuk-org.html
@@ -1,6 +1,6 @@
 {% extends "withnav_template.html" %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/page-header.html" import page_header %}
 
diff --git a/app/templates/views/service-settings/branding/email-branding-govuk.html b/app/templates/views/service-settings/branding/email-branding-govuk.html
index 53ea0d5ba..669b0f453 100644
--- a/app/templates/views/service-settings/branding/email-branding-govuk.html
+++ b/app/templates/views/service-settings/branding/email-branding-govuk.html
@@ -1,6 +1,6 @@
 {% extends "withnav_template.html" %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/branding-preview.html" import email_branding_preview %}
diff --git a/app/templates/views/service-settings/branding/email-branding-options.html b/app/templates/views/service-settings/branding/email-branding-options.html
index 40bc1ea50..329a15aae 100644
--- a/app/templates/views/service-settings/branding/email-branding-options.html
+++ b/app/templates/views/service-settings/branding/email-branding-options.html
@@ -5,7 +5,7 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 {% from "components/branding-preview.html" import email_branding_preview %}
 
 {% block service_page_title %}
diff --git a/app/templates/views/service-settings/branding/email-branding-organization.html b/app/templates/views/service-settings/branding/email-branding-organization.html
index d740fc67f..a1647aee8 100644
--- a/app/templates/views/service-settings/branding/email-branding-organization.html
+++ b/app/templates/views/service-settings/branding/email-branding-organization.html
@@ -1,6 +1,6 @@
 {% extends "withnav_template.html" %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/page-header.html" import page_header %}
 
diff --git a/app/templates/views/service-settings/branding/email-branding-something-else.html b/app/templates/views/service-settings/branding/email-branding-something-else.html
index 256f58037..1f9e07689 100644
--- a/app/templates/views/service-settings/branding/email-branding-something-else.html
+++ b/app/templates/views/service-settings/branding/email-branding-something-else.html
@@ -1,9 +1,9 @@
 {% extends "withnav_template.html" %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/textbox.html" import textbox %}
-{% from "components/us_components/textarea/macro.njk" import govukTextarea %}
+{% from "components/components/textarea/macro.njk" import govukTextarea %}
 
 {% block service_page_title %}
   Describe the branding you want
diff --git a/app/templates/views/service-settings/confirm.html b/app/templates/views/service-settings/confirm.html
index a2fe55709..4e919bcfc 100644
--- a/app/templates/views/service-settings/confirm.html
+++ b/app/templates/views/service-settings/confirm.html
@@ -2,7 +2,7 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   {{ heading }}
diff --git a/app/templates/views/service-settings/data-retention.html b/app/templates/views/service-settings/data-retention.html
index eed4d849f..50aee202a 100644
--- a/app/templates/views/service-settings/data-retention.html
+++ b/app/templates/views/service-settings/data-retention.html
@@ -1,6 +1,6 @@
 {% extends "withnav_template.html" %}
 {% from "components/table.html" import mapping_table, row_group, row, text_field, edit_field, field, boolean_field, list_table with context %}
-{% from "components/us_components/button/macro.njk" import govukButton %}
+{% from "components/components/button/macro.njk" import govukButton %}
 
 {% block service_page_title %}
   Data retention
diff --git a/app/templates/views/service-settings/data-retention/add.html b/app/templates/views/service-settings/data-retention/add.html
index fdccd220b..7dfa5e2b2 100644
--- a/app/templates/views/service-settings/data-retention/add.html
+++ b/app/templates/views/service-settings/data-retention/add.html
@@ -2,7 +2,7 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Set data retention
diff --git a/app/templates/views/service-settings/data-retention/edit.html b/app/templates/views/service-settings/data-retention/edit.html
index dacaa0415..754006c1b 100644
--- a/app/templates/views/service-settings/data-retention/edit.html
+++ b/app/templates/views/service-settings/data-retention/edit.html
@@ -2,7 +2,7 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Set data retention
diff --git a/app/templates/views/service-settings/edit-service-billing-details.html b/app/templates/views/service-settings/edit-service-billing-details.html
index e334a0b73..3f3934702 100644
--- a/app/templates/views/service-settings/edit-service-billing-details.html
+++ b/app/templates/views/service-settings/edit-service-billing-details.html
@@ -3,7 +3,7 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 {% from "components/textbox.html" import textbox %}
 
 {% block service_page_title %}
diff --git a/app/templates/views/service-settings/edit-service-notes.html b/app/templates/views/service-settings/edit-service-notes.html
index 2f7a231bc..c1346cba5 100644
--- a/app/templates/views/service-settings/edit-service-notes.html
+++ b/app/templates/views/service-settings/edit-service-notes.html
@@ -3,7 +3,7 @@
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
 {% from "components/textbox.html" import textbox %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Edit service notes
diff --git a/app/templates/views/service-settings/email-reply-to/_verify-updates.html b/app/templates/views/service-settings/email-reply-to/_verify-updates.html
index 8cc3b8680..164296313 100644
--- a/app/templates/views/service-settings/email-reply-to/_verify-updates.html
+++ b/app/templates/views/service-settings/email-reply-to/_verify-updates.html
@@ -1,7 +1,7 @@
 {% from "components/banner.html" import banner, banner_wrapper %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/button/macro.njk" import govukButton %}
+{% from "components/components/button/macro.njk" import govukButton %}
 
 <div class="ajax-block-container">
   {% if verification_status == "pending" %}
diff --git a/app/templates/views/service-settings/email-reply-to/add.html b/app/templates/views/service-settings/email-reply-to/add.html
index c4b68e12c..be3fde5ab 100644
--- a/app/templates/views/service-settings/email-reply-to/add.html
+++ b/app/templates/views/service-settings/email-reply-to/add.html
@@ -2,7 +2,7 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Add reply-to email address
diff --git a/app/templates/views/service-settings/email-reply-to/edit.html b/app/templates/views/service-settings/email-reply-to/edit.html
index 595029674..b813a0177 100644
--- a/app/templates/views/service-settings/email-reply-to/edit.html
+++ b/app/templates/views/service-settings/email-reply-to/edit.html
@@ -3,7 +3,7 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
  Change reply-to email address
diff --git a/app/templates/views/service-settings/email-reply-to/verify.html b/app/templates/views/service-settings/email-reply-to/verify.html
index 3da2aff17..92ad83194 100644
--- a/app/templates/views/service-settings/email-reply-to/verify.html
+++ b/app/templates/views/service-settings/email-reply-to/verify.html
@@ -3,7 +3,7 @@
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
 {% from "components/ajax-block.html" import ajax_block %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   {{ verb }} email reply-to address
diff --git a/app/templates/views/service-settings/email_reply_to.html b/app/templates/views/service-settings/email_reply_to.html
index 9421de261..f2a4b3b30 100644
--- a/app/templates/views/service-settings/email_reply_to.html
+++ b/app/templates/views/service-settings/email_reply_to.html
@@ -2,8 +2,8 @@
 {% from "components/copy-to-clipboard.html" import copy_to_clipboard %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/table.html" import row_group, row, text_field, edit_field, field, boolean_field, list_table with context %}
-{% from "components/us_components/button/macro.njk" import govukButton %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/button/macro.njk" import govukButton %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Reply-to email addresses
diff --git a/app/templates/views/service-settings/estimate-usage.html b/app/templates/views/service-settings/estimate-usage.html
index 4273b7f4b..39f1df80f 100644
--- a/app/templates/views/service-settings/estimate-usage.html
+++ b/app/templates/views/service-settings/estimate-usage.html
@@ -3,7 +3,7 @@
 {% from "components/form.html" import form_wrapper %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Tell us how many messages you expect to send
diff --git a/app/templates/views/service-settings/link-service-to-organization.html b/app/templates/views/service-settings/link-service-to-organization.html
index d18850593..cdb385d97 100644
--- a/app/templates/views/service-settings/link-service-to-organization.html
+++ b/app/templates/views/service-settings/link-service-to-organization.html
@@ -3,7 +3,7 @@
 {% from "components/page-footer.html" import sticky_page_footer %}
 {% from "components/live-search.html" import live_search %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% set page_title = "Link service to organization" %}
 
diff --git a/app/templates/views/service-settings/name-local.html b/app/templates/views/service-settings/name-local.html
index fd12955ca..a83b89a90 100644
--- a/app/templates/views/service-settings/name-local.html
+++ b/app/templates/views/service-settings/name-local.html
@@ -3,7 +3,7 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Change your service name
diff --git a/app/templates/views/service-settings/name.html b/app/templates/views/service-settings/name.html
index aace17194..9fa90b7b6 100644
--- a/app/templates/views/service-settings/name.html
+++ b/app/templates/views/service-settings/name.html
@@ -3,7 +3,7 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Change your service name
diff --git a/app/templates/views/service-settings/preview-email-branding.html b/app/templates/views/service-settings/preview-email-branding.html
index 02d99d45f..8251671ef 100644
--- a/app/templates/views/service-settings/preview-email-branding.html
+++ b/app/templates/views/service-settings/preview-email-branding.html
@@ -1,6 +1,6 @@
 {% extends "withnav_template.html" %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/button/macro.njk" import govukButton %}
+{% from "components/components/button/macro.njk" import govukButton %}
 {% from "components/branding-preview.html" import email_branding_preview %}
 
 {% block service_page_title %}
diff --git a/app/templates/views/service-settings/request-to-go-live.html b/app/templates/views/service-settings/request-to-go-live.html
index cf81b5c1d..c2acc4bff 100644
--- a/app/templates/views/service-settings/request-to-go-live.html
+++ b/app/templates/views/service-settings/request-to-go-live.html
@@ -3,7 +3,7 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/task-list.html" import task_list_wrapper, task_list_item %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Before you request to go live
diff --git a/app/templates/views/service-settings/send-files-by-email.html b/app/templates/views/service-settings/send-files-by-email.html
index 3df54b534..e19cb97d6 100644
--- a/app/templates/views/service-settings/send-files-by-email.html
+++ b/app/templates/views/service-settings/send-files-by-email.html
@@ -4,7 +4,7 @@
 {% from "components/radios.html" import radio %}
 {% from "components/select-input.html" import select_wrapper %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Send files by email
diff --git a/app/templates/views/service-settings/set-auth-type.html b/app/templates/views/service-settings/set-auth-type.html
index 98de8181f..1d07cf154 100644
--- a/app/templates/views/service-settings/set-auth-type.html
+++ b/app/templates/views/service-settings/set-auth-type.html
@@ -1,7 +1,7 @@
 {% extends "withnav_template.html" %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Sign-in method
diff --git a/app/templates/views/service-settings/set-email-branding.html b/app/templates/views/service-settings/set-email-branding.html
index 54074214d..6e635b36f 100644
--- a/app/templates/views/service-settings/set-email-branding.html
+++ b/app/templates/views/service-settings/set-email-branding.html
@@ -3,7 +3,7 @@
 {% from "components/page-footer.html" import page_footer, sticky_page_footer %}
 {% from "components/live-search.html" import live_search %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% set page_title = "Set email branding" %}
 
diff --git a/app/templates/views/service-settings/set-email.html b/app/templates/views/service-settings/set-email.html
index cfe9d3442..1dfebf9da 100644
--- a/app/templates/views/service-settings/set-email.html
+++ b/app/templates/views/service-settings/set-email.html
@@ -2,7 +2,7 @@
 {% from "components/form.html" import form_wrapper %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Send emails
diff --git a/app/templates/views/service-settings/set-free-sms-allowance.html b/app/templates/views/service-settings/set-free-sms-allowance.html
index dc2cc5808..51df92886 100644
--- a/app/templates/views/service-settings/set-free-sms-allowance.html
+++ b/app/templates/views/service-settings/set-free-sms-allowance.html
@@ -2,7 +2,7 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Free text message allowance
diff --git a/app/templates/views/service-settings/set-inbound-number.html b/app/templates/views/service-settings/set-inbound-number.html
index a8c08efae..9919a8e3c 100644
--- a/app/templates/views/service-settings/set-inbound-number.html
+++ b/app/templates/views/service-settings/set-inbound-number.html
@@ -2,7 +2,7 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import sticky_page_footer %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% set page_title = 'Set inbound number' %}
 
diff --git a/app/templates/views/service-settings/set-inbound-sms.html b/app/templates/views/service-settings/set-inbound-sms.html
index 14ed34dea..5341d81ff 100644
--- a/app/templates/views/service-settings/set-inbound-sms.html
+++ b/app/templates/views/service-settings/set-inbound-sms.html
@@ -1,7 +1,7 @@
 {% extends "withnav_template.html" %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Receive text messages
diff --git a/app/templates/views/service-settings/set-international-sms.html b/app/templates/views/service-settings/set-international-sms.html
index 8c98e8ed2..8d6c49580 100644
--- a/app/templates/views/service-settings/set-international-sms.html
+++ b/app/templates/views/service-settings/set-international-sms.html
@@ -2,7 +2,7 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Send international text messages
diff --git a/app/templates/views/service-settings/set-message-limit.html b/app/templates/views/service-settings/set-message-limit.html
index 5a74b1f0f..b5e101e47 100644
--- a/app/templates/views/service-settings/set-message-limit.html
+++ b/app/templates/views/service-settings/set-message-limit.html
@@ -2,7 +2,7 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Daily message limit
diff --git a/app/templates/views/service-settings/set-rate-limit.html b/app/templates/views/service-settings/set-rate-limit.html
index 2c0613691..e9fa1debf 100644
--- a/app/templates/views/service-settings/set-rate-limit.html
+++ b/app/templates/views/service-settings/set-rate-limit.html
@@ -2,7 +2,7 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Rate limit
diff --git a/app/templates/views/service-settings/set-service-setting.html b/app/templates/views/service-settings/set-service-setting.html
index d28efb8ef..a91996434 100644
--- a/app/templates/views/service-settings/set-service-setting.html
+++ b/app/templates/views/service-settings/set-service-setting.html
@@ -1,7 +1,7 @@
 {% extends "withnav_template.html" %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   {{ title }}
diff --git a/app/templates/views/service-settings/set-sms.html b/app/templates/views/service-settings/set-sms.html
index 102860fda..0d638abfd 100644
--- a/app/templates/views/service-settings/set-sms.html
+++ b/app/templates/views/service-settings/set-sms.html
@@ -2,7 +2,7 @@
 {% from "components/form.html" import form_wrapper %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Send text messages
diff --git a/app/templates/views/service-settings/sms-prefix.html b/app/templates/views/service-settings/sms-prefix.html
index 6c0596431..9e96aa3fd 100644
--- a/app/templates/views/service-settings/sms-prefix.html
+++ b/app/templates/views/service-settings/sms-prefix.html
@@ -2,7 +2,7 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Start text messages with service name
diff --git a/app/templates/views/service-settings/sms-sender/add.html b/app/templates/views/service-settings/sms-sender/add.html
index 0b0d71809..54ce60d91 100644
--- a/app/templates/views/service-settings/sms-sender/add.html
+++ b/app/templates/views/service-settings/sms-sender/add.html
@@ -2,7 +2,7 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Add text message sender
diff --git a/app/templates/views/service-settings/sms-sender/edit.html b/app/templates/views/service-settings/sms-sender/edit.html
index 3d8a825ad..b2a68c5fa 100644
--- a/app/templates/views/service-settings/sms-sender/edit.html
+++ b/app/templates/views/service-settings/sms-sender/edit.html
@@ -3,7 +3,7 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Change text message sender
diff --git a/app/templates/views/service-settings/sms-senders.html b/app/templates/views/service-settings/sms-senders.html
index 5db71b584..bde161a9a 100644
--- a/app/templates/views/service-settings/sms-senders.html
+++ b/app/templates/views/service-settings/sms-senders.html
@@ -2,8 +2,8 @@
 {% from "components/copy-to-clipboard.html" import copy_to_clipboard %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/table.html" import row_group, row, text_field, edit_field, field, boolean_field, list_table with context%}
-{% from "components/us_components/button/macro.njk" import govukButton %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/button/macro.njk" import govukButton %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Text message senders
diff --git a/app/templates/views/signedout.html b/app/templates/views/signedout.html
index 5e88f511a..d99268626 100644
--- a/app/templates/views/signedout.html
+++ b/app/templates/views/signedout.html
@@ -1,5 +1,5 @@
 {% extends "fullwidth_template.html" %}
-{% from "components/us_components/button/macro.njk" import govukButton %}
+{% from "components/components/button/macro.njk" import govukButton %}
 
 {% block meta %}
 <meta name="description"
diff --git a/app/templates/views/support/bat-phone.html b/app/templates/views/support/bat-phone.html
index 134313396..b5573415c 100644
--- a/app/templates/views/support/bat-phone.html
+++ b/app/templates/views/support/bat-phone.html
@@ -1,7 +1,7 @@
 {% extends "withoutnav_template.html" %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/page-header.html" import page_header %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block per_page_title %}
   Out of hours emergencies
diff --git a/app/templates/views/support/form.html b/app/templates/views/support/form.html
index 8eaa80184..89bfe494c 100644
--- a/app/templates/views/support/form.html
+++ b/app/templates/views/support/form.html
@@ -3,7 +3,7 @@
 {% from "components/page-footer.html" import sticky_page_footer %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block per_page_title %}
   {{ page_title }}
diff --git a/app/templates/views/support/public.html b/app/templates/views/support/public.html
index ebd0492bd..09d16ecc4 100644
--- a/app/templates/views/support/public.html
+++ b/app/templates/views/support/public.html
@@ -1,7 +1,7 @@
 {% extends "withoutnav_template.html" %}
 
 {% from "components/page-header.html" import page_header %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block per_page_title %}
   The Notify.gov service is for people who work in the government
diff --git a/app/templates/views/support/thanks.html b/app/templates/views/support/thanks.html
index b60e8cd24..52a6b5648 100644
--- a/app/templates/views/support/thanks.html
+++ b/app/templates/views/support/thanks.html
@@ -1,7 +1,7 @@
 {% extends "withoutnav_template.html" %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/page-header.html" import page_header %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block per_page_title %}
   Thanks for contacting us
diff --git a/app/templates/views/support/triage.html b/app/templates/views/support/triage.html
index 8445415d2..f8d9cb33a 100644
--- a/app/templates/views/support/triage.html
+++ b/app/templates/views/support/triage.html
@@ -2,7 +2,7 @@
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block per_page_title %}
   {{ page_title }}
diff --git a/app/templates/views/templates/action_blocked.html b/app/templates/views/templates/action_blocked.html
index 9585ac6f4..8ae33f2d9 100644
--- a/app/templates/views/templates/action_blocked.html
+++ b/app/templates/views/templates/action_blocked.html
@@ -1,7 +1,7 @@
 {% extends "withnav_template.html" %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   {{ notification_type.capitalize() }} are disabled
diff --git a/app/templates/views/templates/breaking-change.html b/app/templates/views/templates/breaking-change.html
index 4b801e81d..78aeafde0 100644
--- a/app/templates/views/templates/breaking-change.html
+++ b/app/templates/views/templates/breaking-change.html
@@ -4,7 +4,7 @@
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/list.html" import list_of_placeholders, list_of_code_snippets %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Confirm changes
diff --git a/app/templates/views/templates/choose-reply.html b/app/templates/views/templates/choose-reply.html
index 9e3f3d8db..526f2e277 100644
--- a/app/templates/views/templates/choose-reply.html
+++ b/app/templates/views/templates/choose-reply.html
@@ -1,6 +1,6 @@
 {% from "components/live-search.html" import live_search %}
 {% from "components/folder-path.html" import folder_path %}
-{% from "components/us_components/button/macro.njk" import govukButton %}
+{% from "components/components/button/macro.njk" import govukButton %}
 
 {% extends "withnav_template.html" %}
 
diff --git a/app/templates/views/templates/set-sender.html b/app/templates/views/templates/set-sender.html
index 82ed044be..b93b1aa98 100644
--- a/app/templates/views/templates/set-sender.html
+++ b/app/templates/views/templates/set-sender.html
@@ -1,7 +1,7 @@
 {% extends "withnav_template.html" %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   {{ sender_context.title }}
diff --git a/app/templates/views/templates/set-template-sender.html b/app/templates/views/templates/set-template-sender.html
index 2c97e160c..47cfba436 100644
--- a/app/templates/views/templates/set-template-sender.html
+++ b/app/templates/views/templates/set-template-sender.html
@@ -1,7 +1,7 @@
 {% extends "withnav_template.html" %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% set page_title = 'Set letter contact block' %}
 
diff --git a/app/templates/views/templates/start-tour.html b/app/templates/views/templates/start-tour.html
index bf0b92ff0..87b3cd591 100644
--- a/app/templates/views/templates/start-tour.html
+++ b/app/templates/views/templates/start-tour.html
@@ -1,5 +1,5 @@
 {% extends "withnav_template.html" %}
-{% from "components/us_components/button/macro.njk" import govukButton %}
+{% from "components/components/button/macro.njk" import govukButton %}
 
 {% block service_page_title %}
   {{ template.name }}
diff --git a/app/templates/views/templates/template.html b/app/templates/views/templates/template.html
index 7a7e3c83d..8dcaea899 100644
--- a/app/templates/views/templates/template.html
+++ b/app/templates/views/templates/template.html
@@ -3,7 +3,7 @@
 {% from "components/folder-path.html" import folder_path, page_title_folder_path %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/copy-to-clipboard.html" import copy_to_clipboard %}
-{% from "components/us_components/button/macro.njk" import govukButton %}
+{% from "components/components/button/macro.njk" import govukButton %}
 
 {% block service_page_title %}
   {{ page_title_folder_path(current_service.get_template_path(template._template)) }}
diff --git a/app/templates/views/two-factor-webauthn.html b/app/templates/views/two-factor-webauthn.html
index e0fcc3722..1c6055e92 100644
--- a/app/templates/views/two-factor-webauthn.html
+++ b/app/templates/views/two-factor-webauthn.html
@@ -1,9 +1,9 @@
 {% extends "withoutnav_template.html" %}
 {% from "components/page-header.html" import page_header %}
-{% from "components/us_components/button/macro.njk" import govukButton %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/button/macro.njk" import govukButton %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 {% from "components/webauthn-api-check.html" import webauthn_api_check %}
-{% from "components/us_components/error-message/macro.njk" import govukErrorMessage %}
+{% from "components/components/error-message/macro.njk" import govukErrorMessage %}
 
 {% set page_title = 'Get your security key' %}
 
diff --git a/app/templates/views/user-already-invited.html b/app/templates/views/user-already-invited.html
index 9b5a1046f..7471fad63 100644
--- a/app/templates/views/user-already-invited.html
+++ b/app/templates/views/user-already-invited.html
@@ -1,6 +1,6 @@
 {% extends "withnav_template.html" %}
 {% from "components/page-header.html" import page_header %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   This person has already received an invite
diff --git a/app/templates/views/user-already-team-member.html b/app/templates/views/user-already-team-member.html
index e3f08aba2..ebecae65e 100644
--- a/app/templates/views/user-already-team-member.html
+++ b/app/templates/views/user-already-team-member.html
@@ -1,6 +1,6 @@
 {% extends "withnav_template.html" %}
 {% from "components/page-header.html" import page_header %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   This person is already a team member
diff --git a/app/templates/views/user-profile/authenticate.html b/app/templates/views/user-profile/authenticate.html
index 24942ba28..b11459c42 100644
--- a/app/templates/views/user-profile/authenticate.html
+++ b/app/templates/views/user-profile/authenticate.html
@@ -2,7 +2,7 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block per_page_title %}
   Change your {{ thing }}
diff --git a/app/templates/views/user-profile/change-password.html b/app/templates/views/user-profile/change-password.html
index 596de379d..493541b6b 100644
--- a/app/templates/views/user-profile/change-password.html
+++ b/app/templates/views/user-profile/change-password.html
@@ -2,7 +2,7 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block per_page_title %}
   Change your password
diff --git a/app/templates/views/user-profile/change.html b/app/templates/views/user-profile/change.html
index 235d0df45..95294f615 100644
--- a/app/templates/views/user-profile/change.html
+++ b/app/templates/views/user-profile/change.html
@@ -2,7 +2,7 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block per_page_title %}
   Change your {{ thing }}
diff --git a/app/templates/views/user-profile/confirm.html b/app/templates/views/user-profile/confirm.html
index d54f84de8..cf3afa64d 100644
--- a/app/templates/views/user-profile/confirm.html
+++ b/app/templates/views/user-profile/confirm.html
@@ -2,7 +2,7 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block per_page_title %}
   Change your {{ thing }}
diff --git a/app/templates/views/user-profile/disable-platform-admin-view.html b/app/templates/views/user-profile/disable-platform-admin-view.html
index d17567362..d30e29232 100644
--- a/app/templates/views/user-profile/disable-platform-admin-view.html
+++ b/app/templates/views/user-profile/disable-platform-admin-view.html
@@ -1,7 +1,7 @@
 {% extends "withoutnav_template.html" %}
 {% from "components/form.html" import form_wrapper %}
 {% from "components/page-footer.html" import page_footer %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% set page_title = 'Use platform admin view' %}
 
diff --git a/app/templates/views/user-profile/manage-security-key.html b/app/templates/views/user-profile/manage-security-key.html
index cc2f8c008..be328f561 100644
--- a/app/templates/views/user-profile/manage-security-key.html
+++ b/app/templates/views/user-profile/manage-security-key.html
@@ -2,7 +2,7 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% set page_title = 'Manage ' + '‘' + security_key.name + '’' %}
 
diff --git a/app/templates/views/user-profile/security-keys.html b/app/templates/views/user-profile/security-keys.html
index 38f61180a..01a471ea0 100644
--- a/app/templates/views/user-profile/security-keys.html
+++ b/app/templates/views/user-profile/security-keys.html
@@ -1,10 +1,10 @@
 {% extends "withoutnav_template.html" %}
 {% from "components/page-header.html" import page_header %}
-{% from "components/us_components/button/macro.njk" import govukButton %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/button/macro.njk" import govukButton %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 {% from "components/table.html" import edit_field, mapping_table, row, field, row_heading %}
 {% from "components/webauthn-api-check.html" import webauthn_api_check %}
-{% from "components/us_components/error-message/macro.njk" import govukErrorMessage %}
+{% from "components/components/error-message/macro.njk" import govukErrorMessage %}
 
 {% set page_title = 'Security keys' %}
 {% set credentials = current_user.webauthn_credentials %}
diff --git a/app/templates/views/verification-not-received.html b/app/templates/views/verification-not-received.html
index 2c1e4efc2..d4d0fd8ef 100644
--- a/app/templates/views/verification-not-received.html
+++ b/app/templates/views/verification-not-received.html
@@ -1,5 +1,5 @@
 {% extends "withoutnav_template.html" %}
-{% from "components/us_components/button/macro.njk" import govukButton %}
+{% from "components/components/button/macro.njk" import govukButton %}
 
 {% block per_page_title %}
   Resend security code
diff --git a/tests/javascripts/templateFolderForm.test.js b/tests/javascripts/templateFolderForm.test.js
index b6e8215d5..35ff47802 100644
--- a/tests/javascripts/templateFolderForm.test.js
+++ b/tests/javascripts/templateFolderForm.test.js
@@ -220,7 +220,7 @@ describe('TemplateFolderForm', () => {
   });
 
   function getTemplateFolderCheckboxes () {
-    return templateFolderForm.querySelectorAll('input[type=checkbox]');
+    return templateFolderForm.querySelectorAll('label.usa-checkbox__label');
   };
 
   function getVisibleCounter () {
@@ -612,6 +612,7 @@ describe('TemplateFolderForm', () => {
       beforeEach(() => {
 
         visibleCounterText = getVisibleCounter().textContent.trim();
+        print(visibleCounterText);
         hiddenCounterText = getHiddenCounter().textContent.trim();
 
       });
@@ -624,7 +625,7 @@ describe('TemplateFolderForm', () => {
 
       test("the content of the counter should reflect the selection", () => {
 
-        expect(visibleCounterText).toEqual('selected');
+        expect(visibleCounterText).toEqual('1 template, 1 folder selected');
 
       });
 
@@ -865,7 +866,7 @@ describe('TemplateFolderForm', () => {
         helpers.triggerEvent(templateFolderCheckboxes[1], 'click');
         helpers.triggerEvent(templateFolderCheckboxes[2], 'click');
 
-        expect(visibleCounterText).toEqual('selected');
+        expect(visibleCounterText).toEqual('2 templates selected');
 
       });
 
@@ -885,7 +886,7 @@ describe('TemplateFolderForm', () => {
 
         helpers.triggerEvent(templateFolderCheckboxes[0], 'click');
 
-        expect(visibleCounterText).toEqual('selected');
+        expect(visibleCounterText).toEqual('1 folder selected');
 
       });