diff --git a/backstop_data/bitmaps_reference/ds-vr-test__foundations_address-output_example-address-output_0_document_0_desktop.png b/backstop_data/bitmaps_reference/ds-vr-test__components_address-output_example-address-output_0_document_0_desktop.png
similarity index 100%
rename from backstop_data/bitmaps_reference/ds-vr-test__foundations_address-output_example-address-output_0_document_0_desktop.png
rename to backstop_data/bitmaps_reference/ds-vr-test__components_address-output_example-address-output_0_document_0_desktop.png
diff --git a/backstop_data/bitmaps_reference/ds-vr-test__foundations_address-output_example-address-output_0_document_1_tablet.png b/backstop_data/bitmaps_reference/ds-vr-test__components_address-output_example-address-output_0_document_1_tablet.png
similarity index 100%
rename from backstop_data/bitmaps_reference/ds-vr-test__foundations_address-output_example-address-output_0_document_1_tablet.png
rename to backstop_data/bitmaps_reference/ds-vr-test__components_address-output_example-address-output_0_document_1_tablet.png
diff --git a/backstop_data/bitmaps_reference/ds-vr-test__foundations_address-output_example-address-output_0_document_2_mobile.png b/backstop_data/bitmaps_reference/ds-vr-test__components_address-output_example-address-output_0_document_2_mobile.png
similarity index 100%
rename from backstop_data/bitmaps_reference/ds-vr-test__foundations_address-output_example-address-output_0_document_2_mobile.png
rename to backstop_data/bitmaps_reference/ds-vr-test__components_address-output_example-address-output_0_document_2_mobile.png
diff --git a/backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-bare-list_0_document_0_desktop.png b/backstop_data/bitmaps_reference/ds-vr-test__components_list_example-bare-list_0_document_0_desktop.png
similarity index 100%
rename from backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-bare-list_0_document_0_desktop.png
rename to backstop_data/bitmaps_reference/ds-vr-test__components_list_example-bare-list_0_document_0_desktop.png
diff --git a/backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-bare-list_0_document_1_tablet.png b/backstop_data/bitmaps_reference/ds-vr-test__components_list_example-bare-list_0_document_1_tablet.png
similarity index 100%
rename from backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-bare-list_0_document_1_tablet.png
rename to backstop_data/bitmaps_reference/ds-vr-test__components_list_example-bare-list_0_document_1_tablet.png
diff --git a/backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-bare-list_0_document_2_mobile.png b/backstop_data/bitmaps_reference/ds-vr-test__components_list_example-bare-list_0_document_2_mobile.png
similarity index 100%
rename from backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-bare-list_0_document_2_mobile.png
rename to backstop_data/bitmaps_reference/ds-vr-test__components_list_example-bare-list_0_document_2_mobile.png
diff --git a/backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-bulleted-list_0_document_0_desktop.png b/backstop_data/bitmaps_reference/ds-vr-test__components_list_example-bulleted-list_0_document_0_desktop.png
similarity index 100%
rename from backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-bulleted-list_0_document_0_desktop.png
rename to backstop_data/bitmaps_reference/ds-vr-test__components_list_example-bulleted-list_0_document_0_desktop.png
diff --git a/backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-bulleted-list_0_document_1_tablet.png b/backstop_data/bitmaps_reference/ds-vr-test__components_list_example-bulleted-list_0_document_1_tablet.png
similarity index 100%
rename from backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-bulleted-list_0_document_1_tablet.png
rename to backstop_data/bitmaps_reference/ds-vr-test__components_list_example-bulleted-list_0_document_1_tablet.png
diff --git a/backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-bulleted-list_0_document_2_mobile.png b/backstop_data/bitmaps_reference/ds-vr-test__components_list_example-bulleted-list_0_document_2_mobile.png
similarity index 100%
rename from backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-bulleted-list_0_document_2_mobile.png
rename to backstop_data/bitmaps_reference/ds-vr-test__components_list_example-bulleted-list_0_document_2_mobile.png
diff --git a/backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-dashed-list_0_document_0_desktop.png b/backstop_data/bitmaps_reference/ds-vr-test__components_list_example-dashed-list_0_document_0_desktop.png
similarity index 100%
rename from backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-dashed-list_0_document_0_desktop.png
rename to backstop_data/bitmaps_reference/ds-vr-test__components_list_example-dashed-list_0_document_0_desktop.png
diff --git a/backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-dashed-list_0_document_1_tablet.png b/backstop_data/bitmaps_reference/ds-vr-test__components_list_example-dashed-list_0_document_1_tablet.png
similarity index 100%
rename from backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-dashed-list_0_document_1_tablet.png
rename to backstop_data/bitmaps_reference/ds-vr-test__components_list_example-dashed-list_0_document_1_tablet.png
diff --git a/backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-dashed-list_0_document_2_mobile.png b/backstop_data/bitmaps_reference/ds-vr-test__components_list_example-dashed-list_0_document_2_mobile.png
similarity index 100%
rename from backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-dashed-list_0_document_2_mobile.png
rename to backstop_data/bitmaps_reference/ds-vr-test__components_list_example-dashed-list_0_document_2_mobile.png
diff --git a/backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-inline-list-with-social-icon-prefix_0_document_0_desktop.png b/backstop_data/bitmaps_reference/ds-vr-test__components_list_example-inline-list-with-social-icon-prefix_0_document_0_desktop.png
similarity index 100%
rename from backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-inline-list-with-social-icon-prefix_0_document_0_desktop.png
rename to backstop_data/bitmaps_reference/ds-vr-test__components_list_example-inline-list-with-social-icon-prefix_0_document_0_desktop.png
diff --git a/backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-inline-list-with-social-icon-prefix_0_document_1_tablet.png b/backstop_data/bitmaps_reference/ds-vr-test__components_list_example-inline-list-with-social-icon-prefix_0_document_1_tablet.png
similarity index 100%
rename from backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-inline-list-with-social-icon-prefix_0_document_1_tablet.png
rename to backstop_data/bitmaps_reference/ds-vr-test__components_list_example-inline-list-with-social-icon-prefix_0_document_1_tablet.png
diff --git a/backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-inline-list-with-social-icon-prefix_0_document_2_mobile.png b/backstop_data/bitmaps_reference/ds-vr-test__components_list_example-inline-list-with-social-icon-prefix_0_document_2_mobile.png
similarity index 100%
rename from backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-inline-list-with-social-icon-prefix_0_document_2_mobile.png
rename to backstop_data/bitmaps_reference/ds-vr-test__components_list_example-inline-list-with-social-icon-prefix_0_document_2_mobile.png
diff --git a/backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-inline-list_0_document_0_desktop.png b/backstop_data/bitmaps_reference/ds-vr-test__components_list_example-inline-list_0_document_0_desktop.png
similarity index 100%
rename from backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-inline-list_0_document_0_desktop.png
rename to backstop_data/bitmaps_reference/ds-vr-test__components_list_example-inline-list_0_document_0_desktop.png
diff --git a/backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-inline-list_0_document_1_tablet.png b/backstop_data/bitmaps_reference/ds-vr-test__components_list_example-inline-list_0_document_1_tablet.png
similarity index 100%
rename from backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-inline-list_0_document_1_tablet.png
rename to backstop_data/bitmaps_reference/ds-vr-test__components_list_example-inline-list_0_document_1_tablet.png
diff --git a/backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-inline-list_0_document_2_mobile.png b/backstop_data/bitmaps_reference/ds-vr-test__components_list_example-inline-list_0_document_2_mobile.png
similarity index 100%
rename from backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-inline-list_0_document_2_mobile.png
rename to backstop_data/bitmaps_reference/ds-vr-test__components_list_example-inline-list_0_document_2_mobile.png
diff --git a/backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-list-with-icon-prefix_0_document_0_desktop.png b/backstop_data/bitmaps_reference/ds-vr-test__components_list_example-list-with-icon-prefix_0_document_0_desktop.png
similarity index 100%
rename from backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-list-with-icon-prefix_0_document_0_desktop.png
rename to backstop_data/bitmaps_reference/ds-vr-test__components_list_example-list-with-icon-prefix_0_document_0_desktop.png
diff --git a/backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-list-with-icon-prefix_0_document_1_tablet.png b/backstop_data/bitmaps_reference/ds-vr-test__components_list_example-list-with-icon-prefix_0_document_1_tablet.png
similarity index 100%
rename from backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-list-with-icon-prefix_0_document_1_tablet.png
rename to backstop_data/bitmaps_reference/ds-vr-test__components_list_example-list-with-icon-prefix_0_document_1_tablet.png
diff --git a/backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-list-with-icon-prefix_0_document_2_mobile.png b/backstop_data/bitmaps_reference/ds-vr-test__components_list_example-list-with-icon-prefix_0_document_2_mobile.png
similarity index 100%
rename from backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-list-with-icon-prefix_0_document_2_mobile.png
rename to backstop_data/bitmaps_reference/ds-vr-test__components_list_example-list-with-icon-prefix_0_document_2_mobile.png
diff --git a/backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-list-with-icon-suffix_0_document_0_desktop.png b/backstop_data/bitmaps_reference/ds-vr-test__components_list_example-list-with-icon-suffix_0_document_0_desktop.png
similarity index 100%
rename from backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-list-with-icon-suffix_0_document_0_desktop.png
rename to backstop_data/bitmaps_reference/ds-vr-test__components_list_example-list-with-icon-suffix_0_document_0_desktop.png
diff --git a/backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-list-with-icon-suffix_0_document_1_tablet.png b/backstop_data/bitmaps_reference/ds-vr-test__components_list_example-list-with-icon-suffix_0_document_1_tablet.png
similarity index 100%
rename from backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-list-with-icon-suffix_0_document_1_tablet.png
rename to backstop_data/bitmaps_reference/ds-vr-test__components_list_example-list-with-icon-suffix_0_document_1_tablet.png
diff --git a/backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-list-with-icon-suffix_0_document_2_mobile.png b/backstop_data/bitmaps_reference/ds-vr-test__components_list_example-list-with-icon-suffix_0_document_2_mobile.png
similarity index 100%
rename from backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-list-with-icon-suffix_0_document_2_mobile.png
rename to backstop_data/bitmaps_reference/ds-vr-test__components_list_example-list-with-icon-suffix_0_document_2_mobile.png
diff --git a/backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-nested-list_0_document_0_desktop.png b/backstop_data/bitmaps_reference/ds-vr-test__components_list_example-nested-list_0_document_0_desktop.png
similarity index 100%
rename from backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-nested-list_0_document_0_desktop.png
rename to backstop_data/bitmaps_reference/ds-vr-test__components_list_example-nested-list_0_document_0_desktop.png
diff --git a/backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-nested-list_0_document_1_tablet.png b/backstop_data/bitmaps_reference/ds-vr-test__components_list_example-nested-list_0_document_1_tablet.png
similarity index 100%
rename from backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-nested-list_0_document_1_tablet.png
rename to backstop_data/bitmaps_reference/ds-vr-test__components_list_example-nested-list_0_document_1_tablet.png
diff --git a/backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-nested-list_0_document_2_mobile.png b/backstop_data/bitmaps_reference/ds-vr-test__components_list_example-nested-list_0_document_2_mobile.png
similarity index 100%
rename from backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-nested-list_0_document_2_mobile.png
rename to backstop_data/bitmaps_reference/ds-vr-test__components_list_example-nested-list_0_document_2_mobile.png
diff --git a/backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-numbered-list_0_document_0_desktop.png b/backstop_data/bitmaps_reference/ds-vr-test__components_list_example-numbered-list_0_document_0_desktop.png
similarity index 100%
rename from backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-numbered-list_0_document_0_desktop.png
rename to backstop_data/bitmaps_reference/ds-vr-test__components_list_example-numbered-list_0_document_0_desktop.png
diff --git a/backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-numbered-list_0_document_1_tablet.png b/backstop_data/bitmaps_reference/ds-vr-test__components_list_example-numbered-list_0_document_1_tablet.png
similarity index 100%
rename from backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-numbered-list_0_document_1_tablet.png
rename to backstop_data/bitmaps_reference/ds-vr-test__components_list_example-numbered-list_0_document_1_tablet.png
diff --git a/backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-numbered-list_0_document_2_mobile.png b/backstop_data/bitmaps_reference/ds-vr-test__components_list_example-numbered-list_0_document_2_mobile.png
similarity index 100%
rename from backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-numbered-list_0_document_2_mobile.png
rename to backstop_data/bitmaps_reference/ds-vr-test__components_list_example-numbered-list_0_document_2_mobile.png
diff --git a/backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-prefixed-list_0_document_0_desktop.png b/backstop_data/bitmaps_reference/ds-vr-test__components_list_example-prefixed-list_0_document_0_desktop.png
similarity index 100%
rename from backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-prefixed-list_0_document_0_desktop.png
rename to backstop_data/bitmaps_reference/ds-vr-test__components_list_example-prefixed-list_0_document_0_desktop.png
diff --git a/backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-prefixed-list_0_document_1_tablet.png b/backstop_data/bitmaps_reference/ds-vr-test__components_list_example-prefixed-list_0_document_1_tablet.png
similarity index 100%
rename from backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-prefixed-list_0_document_1_tablet.png
rename to backstop_data/bitmaps_reference/ds-vr-test__components_list_example-prefixed-list_0_document_1_tablet.png
diff --git a/backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-prefixed-list_0_document_2_mobile.png b/backstop_data/bitmaps_reference/ds-vr-test__components_list_example-prefixed-list_0_document_2_mobile.png
similarity index 100%
rename from backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-prefixed-list_0_document_2_mobile.png
rename to backstop_data/bitmaps_reference/ds-vr-test__components_list_example-prefixed-list_0_document_2_mobile.png
diff --git a/backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-suffixed-list_0_document_0_desktop.png b/backstop_data/bitmaps_reference/ds-vr-test__components_list_example-suffixed-list_0_document_0_desktop.png
similarity index 100%
rename from backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-suffixed-list_0_document_0_desktop.png
rename to backstop_data/bitmaps_reference/ds-vr-test__components_list_example-suffixed-list_0_document_0_desktop.png
diff --git a/backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-suffixed-list_0_document_1_tablet.png b/backstop_data/bitmaps_reference/ds-vr-test__components_list_example-suffixed-list_0_document_1_tablet.png
similarity index 100%
rename from backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-suffixed-list_0_document_1_tablet.png
rename to backstop_data/bitmaps_reference/ds-vr-test__components_list_example-suffixed-list_0_document_1_tablet.png
diff --git a/backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-suffixed-list_0_document_2_mobile.png b/backstop_data/bitmaps_reference/ds-vr-test__components_list_example-suffixed-list_0_document_2_mobile.png
similarity index 100%
rename from backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-suffixed-list_0_document_2_mobile.png
rename to backstop_data/bitmaps_reference/ds-vr-test__components_list_example-suffixed-list_0_document_2_mobile.png
diff --git a/backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-summary-list_0_document_0_desktop.png b/backstop_data/bitmaps_reference/ds-vr-test__components_list_example-summary-list_0_document_0_desktop.png
similarity index 100%
rename from backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-summary-list_0_document_0_desktop.png
rename to backstop_data/bitmaps_reference/ds-vr-test__components_list_example-summary-list_0_document_0_desktop.png
diff --git a/backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-summary-list_0_document_1_tablet.png b/backstop_data/bitmaps_reference/ds-vr-test__components_list_example-summary-list_0_document_1_tablet.png
similarity index 100%
rename from backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-summary-list_0_document_1_tablet.png
rename to backstop_data/bitmaps_reference/ds-vr-test__components_list_example-summary-list_0_document_1_tablet.png
diff --git a/backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-summary-list_0_document_2_mobile.png b/backstop_data/bitmaps_reference/ds-vr-test__components_list_example-summary-list_0_document_2_mobile.png
similarity index 100%
rename from backstop_data/bitmaps_reference/ds-vr-test__foundations_lists_example-summary-list_0_document_2_mobile.png
rename to backstop_data/bitmaps_reference/ds-vr-test__components_list_example-summary-list_0_document_2_mobile.png
diff --git a/backstop_data/bitmaps_reference/ds-vr-test__foundations_quote_example-quote_0_document_0_desktop.png b/backstop_data/bitmaps_reference/ds-vr-test__components_quote_example-quote_0_document_0_desktop.png
similarity index 100%
rename from backstop_data/bitmaps_reference/ds-vr-test__foundations_quote_example-quote_0_document_0_desktop.png
rename to backstop_data/bitmaps_reference/ds-vr-test__components_quote_example-quote_0_document_0_desktop.png
diff --git a/backstop_data/bitmaps_reference/ds-vr-test__foundations_quote_example-quote_0_document_1_tablet.png b/backstop_data/bitmaps_reference/ds-vr-test__components_quote_example-quote_0_document_1_tablet.png
similarity index 100%
rename from backstop_data/bitmaps_reference/ds-vr-test__foundations_quote_example-quote_0_document_1_tablet.png
rename to backstop_data/bitmaps_reference/ds-vr-test__components_quote_example-quote_0_document_1_tablet.png
diff --git a/backstop_data/bitmaps_reference/ds-vr-test__foundations_quote_example-quote_0_document_2_mobile.png b/backstop_data/bitmaps_reference/ds-vr-test__components_quote_example-quote_0_document_2_mobile.png
similarity index 100%
rename from backstop_data/bitmaps_reference/ds-vr-test__foundations_quote_example-quote_0_document_2_mobile.png
rename to backstop_data/bitmaps_reference/ds-vr-test__components_quote_example-quote_0_document_2_mobile.png
diff --git a/backstop_data/bitmaps_reference/ds-vr-test__foundations_text-indent_example-text-indent_0_document_0_desktop.png b/backstop_data/bitmaps_reference/ds-vr-test__components_text-indent_example-text-indent_0_document_0_desktop.png
similarity index 100%
rename from backstop_data/bitmaps_reference/ds-vr-test__foundations_text-indent_example-text-indent_0_document_0_desktop.png
rename to backstop_data/bitmaps_reference/ds-vr-test__components_text-indent_example-text-indent_0_document_0_desktop.png
diff --git a/backstop_data/bitmaps_reference/ds-vr-test__foundations_text-indent_example-text-indent_0_document_1_tablet.png b/backstop_data/bitmaps_reference/ds-vr-test__components_text-indent_example-text-indent_0_document_1_tablet.png
similarity index 100%
rename from backstop_data/bitmaps_reference/ds-vr-test__foundations_text-indent_example-text-indent_0_document_1_tablet.png
rename to backstop_data/bitmaps_reference/ds-vr-test__components_text-indent_example-text-indent_0_document_1_tablet.png
diff --git a/backstop_data/bitmaps_reference/ds-vr-test__foundations_text-indent_example-text-indent_0_document_2_mobile.png b/backstop_data/bitmaps_reference/ds-vr-test__components_text-indent_example-text-indent_0_document_2_mobile.png
similarity index 100%
rename from backstop_data/bitmaps_reference/ds-vr-test__foundations_text-indent_example-text-indent_0_document_2_mobile.png
rename to backstop_data/bitmaps_reference/ds-vr-test__components_text-indent_example-text-indent_0_document_2_mobile.png
diff --git a/src/foundations/address-output/example-address-output.njk b/src/components/address-output/example-address-output.njk
similarity index 100%
rename from src/foundations/address-output/example-address-output.njk
rename to src/components/address-output/example-address-output.njk
diff --git a/src/foundations/lists/example-bare-list.njk b/src/components/list/example-bare-list.njk
similarity index 100%
rename from src/foundations/lists/example-bare-list.njk
rename to src/components/list/example-bare-list.njk
diff --git a/src/foundations/lists/example-bulleted-list.njk b/src/components/list/example-bulleted-list.njk
similarity index 100%
rename from src/foundations/lists/example-bulleted-list.njk
rename to src/components/list/example-bulleted-list.njk
diff --git a/src/foundations/lists/example-dashed-list.njk b/src/components/list/example-dashed-list.njk
similarity index 100%
rename from src/foundations/lists/example-dashed-list.njk
rename to src/components/list/example-dashed-list.njk
diff --git a/src/foundations/lists/example-inline-list-with-social-icon-prefix.njk b/src/components/list/example-inline-list-with-social-icon-prefix.njk
similarity index 100%
rename from src/foundations/lists/example-inline-list-with-social-icon-prefix.njk
rename to src/components/list/example-inline-list-with-social-icon-prefix.njk
diff --git a/src/foundations/lists/example-inline-list.njk b/src/components/list/example-inline-list.njk
similarity index 100%
rename from src/foundations/lists/example-inline-list.njk
rename to src/components/list/example-inline-list.njk
diff --git a/src/foundations/lists/example-list-with-icon-prefix.njk b/src/components/list/example-list-with-icon-prefix.njk
similarity index 100%
rename from src/foundations/lists/example-list-with-icon-prefix.njk
rename to src/components/list/example-list-with-icon-prefix.njk
diff --git a/src/foundations/lists/example-list-with-icon-suffix.njk b/src/components/list/example-list-with-icon-suffix.njk
similarity index 100%
rename from src/foundations/lists/example-list-with-icon-suffix.njk
rename to src/components/list/example-list-with-icon-suffix.njk
diff --git a/src/foundations/lists/example-nested-list.njk b/src/components/list/example-nested-list.njk
similarity index 100%
rename from src/foundations/lists/example-nested-list.njk
rename to src/components/list/example-nested-list.njk
diff --git a/src/foundations/lists/example-numbered-list.njk b/src/components/list/example-numbered-list.njk
similarity index 100%
rename from src/foundations/lists/example-numbered-list.njk
rename to src/components/list/example-numbered-list.njk
diff --git a/src/foundations/lists/example-prefixed-list.njk b/src/components/list/example-prefixed-list.njk
similarity index 100%
rename from src/foundations/lists/example-prefixed-list.njk
rename to src/components/list/example-prefixed-list.njk
diff --git a/src/foundations/lists/example-suffixed-list.njk b/src/components/list/example-suffixed-list.njk
similarity index 100%
rename from src/foundations/lists/example-suffixed-list.njk
rename to src/components/list/example-suffixed-list.njk
diff --git a/src/foundations/lists/example-summary-list.njk b/src/components/list/example-summary-list.njk
similarity index 100%
rename from src/foundations/lists/example-summary-list.njk
rename to src/components/list/example-summary-list.njk
diff --git a/src/foundations/quote/example-quote.njk b/src/components/quote/example-quote.njk
similarity index 100%
rename from src/foundations/quote/example-quote.njk
rename to src/components/quote/example-quote.njk
diff --git a/src/foundations/text-indent/example-text-indent.njk b/src/components/text-indent/example-text-indent.njk
similarity index 100%
rename from src/foundations/text-indent/example-text-indent.njk
rename to src/components/text-indent/example-text-indent.njk
diff --git a/src/components/helpers/_grid.scss b/src/foundations/grid/_grid.scss
similarity index 100%
rename from src/components/helpers/_grid.scss
rename to src/foundations/grid/_grid.scss
diff --git a/src/foundations/grid/example-grid-12.njk b/src/foundations/grid/example-grid-12.njk
index 5cabaa16d5..5418fc1acb 100644
--- a/src/foundations/grid/example-grid-12.njk
+++ b/src/foundations/grid/example-grid-12.njk
@@ -2,7 +2,7 @@
 layout: layouts/example
 ---
 
-{% from "components/helpers/grid.njk" import dsExampleGrid %}
+{% from "foundations/grid/grid.njk" import dsExampleGrid %}
 
 {{
     dsExampleGrid({
diff --git a/src/foundations/grid/example-grid-7-4.njk b/src/foundations/grid/example-grid-7-4.njk
index 4343985963..4a1eb68448 100644
--- a/src/foundations/grid/example-grid-7-4.njk
+++ b/src/foundations/grid/example-grid-7-4.njk
@@ -2,7 +2,7 @@
 layout: layouts/example
 ---
 
-{% from "components/helpers/grid.njk" import dsExampleGrid %}
+{% from "foundations/grid/grid.njk" import dsExampleGrid %}
 
 {{
     dsExampleGrid({
diff --git a/src/foundations/grid/example-grid-8.njk b/src/foundations/grid/example-grid-8.njk
index b7b9921af0..49b023c2d0 100644
--- a/src/foundations/grid/example-grid-8.njk
+++ b/src/foundations/grid/example-grid-8.njk
@@ -2,7 +2,7 @@
 layout: layouts/example
 ---
 
-{% from "components/helpers/grid.njk" import dsExampleGrid %}
+{% from "foundations/grid/grid.njk" import dsExampleGrid %}
 
 {{
     dsExampleGrid({
diff --git a/src/foundations/grid/example-grid-combo.njk b/src/foundations/grid/example-grid-combo.njk
index d7932c1e1e..d88c24b947 100644
--- a/src/foundations/grid/example-grid-combo.njk
+++ b/src/foundations/grid/example-grid-combo.njk
@@ -2,7 +2,7 @@
 layout: layouts/example
 ---
 
-{% from "components/helpers/grid.njk" import dsExampleGrid %}
+{% from "foundations/grid/grid.njk" import dsExampleGrid %}
 
 {{
     dsExampleGrid({
diff --git a/src/components/helpers/grid.njk b/src/foundations/grid/grid.njk
similarity index 100%
rename from src/components/helpers/grid.njk
rename to src/foundations/grid/grid.njk
diff --git a/src/scss/main.scss b/src/scss/main.scss
index d33c1d5c6f..6521b21671 100644
--- a/src/scss/main.scss
+++ b/src/scss/main.scss
@@ -27,7 +27,6 @@
 @import '../components/fieldset/fieldset';
 @import '../components/footer/footer';
 @import '../components/header/header';
-@import '../components/helpers/grid';
 @import '../components/hero/hero';
 @import '../components/icon/icon';
 @import '../components/image/image';
@@ -60,6 +59,7 @@
 @import '../components/timeline/timeline';
 @import '../components/upload/upload';
 @import '../components/video/video';
+@import '../foundations/grid/grid';
 @import 'utilities/index';
 @import 'utilities/highlight';