diff --git a/test/lib/decorate.js b/test/lib/decorate.js
index ec9e033..ce84cf1 100644
--- a/test/lib/decorate.js
+++ b/test/lib/decorate.js
@@ -5,7 +5,7 @@ const { decorate } = require('../../lib/decorate.js')
 
 const env = nunjucks.configure([
   './',
-  './node_modules/nhsuk-frontend/packages/components',
+  './node_modules/nhsuk-frontend/packages',
   './test/fixtures'
 ])
 env.addGlobal('decorate', decorate)
diff --git a/x-nhsuk/decorated/button/macro.njk b/x-nhsuk/decorated/button/macro.njk
index 61206fb..5c787b7 100644
--- a/x-nhsuk/decorated/button/macro.njk
+++ b/x-nhsuk/decorated/button/macro.njk
@@ -1,4 +1,4 @@
-{% from "button/macro.njk" import button as source -%}
+{% from "components/button/macro.njk" import button as source -%}
 {%- macro button(params) -%}
   {{- source(params) if params.href else source(decorate(params, params.decorate)) -}}
 {%- endmacro %}
diff --git a/x-nhsuk/decorated/checkboxes/macro.njk b/x-nhsuk/decorated/checkboxes/macro.njk
index e0e2671..027c467 100644
--- a/x-nhsuk/decorated/checkboxes/macro.njk
+++ b/x-nhsuk/decorated/checkboxes/macro.njk
@@ -1,4 +1,4 @@
-{% from "checkboxes/macro.njk" import checkboxes as source -%}
+{% from "components/checkboxes/macro.njk" import checkboxes as source -%}
 {%- macro checkboxes(params) -%}
   {{- source(decorate(params, params.decorate)) -}}
 {%- endmacro %}
diff --git a/x-nhsuk/decorated/date-input/macro.njk b/x-nhsuk/decorated/date-input/macro.njk
index 243dfc8..e6a9b22 100644
--- a/x-nhsuk/decorated/date-input/macro.njk
+++ b/x-nhsuk/decorated/date-input/macro.njk
@@ -1,4 +1,4 @@
-{% from "date-input/macro.njk" import dateInput as source -%}
+{% from "components/date-input/macro.njk" import dateInput as source -%}
 {%- macro dateInput(params) -%}
   {{- source(decorate(params, params.decorate, "dateInput")) -}}
 {%- endmacro %}
diff --git a/x-nhsuk/decorated/input/macro.njk b/x-nhsuk/decorated/input/macro.njk
index 1d2ff7a..ae9b1ed 100644
--- a/x-nhsuk/decorated/input/macro.njk
+++ b/x-nhsuk/decorated/input/macro.njk
@@ -1,4 +1,4 @@
-{% from "input/macro.njk" import input as source %}
+{% from "components/input/macro.njk" import input as source %}
 {%- macro input(params) -%}
   {{- source(decorate(params, params.decorate)) -}}
 {%- endmacro %}
diff --git a/x-nhsuk/decorated/radios/macro.njk b/x-nhsuk/decorated/radios/macro.njk
index 324ccb2..7bf8d25 100644
--- a/x-nhsuk/decorated/radios/macro.njk
+++ b/x-nhsuk/decorated/radios/macro.njk
@@ -1,4 +1,4 @@
-{% from "radios/macro.njk" import radios as source -%}
+{% from "components/radios/macro.njk" import radios as source -%}
 {%- macro radios(params) -%}
   {{- source(decorate(params, params.decorate)) -}}
 {%- endmacro %}
diff --git a/x-nhsuk/decorated/select/macro.njk b/x-nhsuk/decorated/select/macro.njk
index cf3d9cd..5bf452e 100644
--- a/x-nhsuk/decorated/select/macro.njk
+++ b/x-nhsuk/decorated/select/macro.njk
@@ -1,4 +1,4 @@
-{% from "select/macro.njk" import select as source -%}
+{% from "components/select/macro.njk" import select as source -%}
 {%- macro select(params) -%}
   {{- source(decorate(params, params.decorate)) -}}
 {%- endmacro %}
diff --git a/x-nhsuk/decorated/textarea/macro.njk b/x-nhsuk/decorated/textarea/macro.njk
index 306af64..dbfb461 100644
--- a/x-nhsuk/decorated/textarea/macro.njk
+++ b/x-nhsuk/decorated/textarea/macro.njk
@@ -1,4 +1,4 @@
-{% from "textarea/macro.njk" import textarea as source -%}
+{% from "components/textarea/macro.njk" import textarea as source -%}
 {%- macro textarea(params) -%}
   {{- source(decorate(params, params.decorate)) -}}
 {%- endmacro %}