diff --git a/src/common-components/base-input-button/base-input-button.spec.js b/src/digital-components/base-input-button/base-input-button.spec.js
similarity index 100%
rename from src/common-components/base-input-button/base-input-button.spec.js
rename to src/digital-components/base-input-button/base-input-button.spec.js
diff --git a/src/common-components/base-input-button/base-input-button.vue b/src/digital-components/base-input-button/base-input-button.vue
similarity index 98%
rename from src/common-components/base-input-button/base-input-button.vue
rename to src/digital-components/base-input-button/base-input-button.vue
index 5cc7d3836..e9b5e6411 100644
--- a/src/common-components/base-input-button/base-input-button.vue
+++ b/src/digital-components/base-input-button/base-input-button.vue
@@ -33,7 +33,7 @@ import {
     handleButtonComponentFocus,
     handleInputComponentBlur,
 } from "@/helpers/button-question-focus-helper";
-import { inputButtonProps } from "@/common-components/base-input-button/button-functionality-props";
+import { inputButtonProps } from "@/digital-components/base-input-button/button-functionality-props";
 
 export default {
     name: "base-input-button",
diff --git a/src/common-components/base-input-button/button-functionality-props.js b/src/digital-components/base-input-button/button-functionality-props.js
similarity index 100%
rename from src/common-components/base-input-button/button-functionality-props.js
rename to src/digital-components/base-input-button/button-functionality-props.js
diff --git a/src/common-components/button-question/button-question.spec.js b/src/digital-components/button-question/button-question.spec.js
similarity index 99%
rename from src/common-components/button-question/button-question.spec.js
rename to src/digital-components/button-question/button-question.spec.js
index eb2308ca0..e9e1d70a4 100644
--- a/src/common-components/button-question/button-question.spec.js
+++ b/src/digital-components/button-question/button-question.spec.js
@@ -1,5 +1,5 @@
 import { shallowMount, mount } from "@vue/test-utils";
-import buttonQuestion from "@/common-components/button-question/button-question";
+import buttonQuestion from "./button-question";
 import { getMountOptions } from "@/helpers/unit-test-helper.js";
 
 describe("buttonQuestion.vue", () => {
diff --git a/src/common-components/button-question/button-question.vue b/src/digital-components/button-question/button-question.vue
similarity index 96%
rename from src/common-components/button-question/button-question.vue
rename to src/digital-components/button-question/button-question.vue
index 646b244be..661e3ace1 100644
--- a/src/common-components/button-question/button-question.vue
+++ b/src/digital-components/button-question/button-question.vue
@@ -74,10 +74,10 @@
 </template>
 
 <script>
-import listButton from "@/ux-components/list-button/list-button";
-import listButtonHorizontal from "@/ux-components/list-button-horizontal/list-button-horizontal";
-import listCard from "@/ux-components/list-card/list-card";
-import radio from "@/ux-components/radio/radio";
+import listButton from "@/fmg-components/ux-components/list-button/list-button";
+import listButtonHorizontal from "@/fmg-components/ux-components/list-button-horizontal/list-button-horizontal";
+import listCard from "@/fmg-components/ux-components/list-card/list-card";
+import radio from "@/fmg-components/ux-components/radio/radio";
 import { ErrorMessage } from "vee-validate";
 
 export default {
diff --git a/src/common-components/date-picker/date-picker-spec.js1 b/src/digital-components/date-picker/date-picker-spec.js1
similarity index 100%
rename from src/common-components/date-picker/date-picker-spec.js1
rename to src/digital-components/date-picker/date-picker-spec.js1
diff --git a/src/common-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue
similarity index 100%
rename from src/common-components/date-picker/date-picker.vue
rename to src/digital-components/date-picker/date-picker.vue
diff --git a/src/common-components/dropdown-question/dropdown-question.spec.js b/src/digital-components/dropdown-question/dropdown-question.spec.js
similarity index 100%
rename from src/common-components/dropdown-question/dropdown-question.spec.js
rename to src/digital-components/dropdown-question/dropdown-question.spec.js
diff --git a/src/common-components/dropdown-question/dropdown-question.vue b/src/digital-components/dropdown-question/dropdown-question.vue
similarity index 100%
rename from src/common-components/dropdown-question/dropdown-question.vue
rename to src/digital-components/dropdown-question/dropdown-question.vue
diff --git a/src/common-components/modal/modal.spec.js b/src/digital-components/modal/modal.spec.js
similarity index 100%
rename from src/common-components/modal/modal.spec.js
rename to src/digital-components/modal/modal.spec.js
diff --git a/src/common-components/modal/modal.vue b/src/digital-components/modal/modal.vue
similarity index 98%
rename from src/common-components/modal/modal.vue
rename to src/digital-components/modal/modal.vue
index 7de269644..71f026020 100644
--- a/src/common-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -42,7 +42,7 @@
 </template>
 
 <script>
-import buttonMain from "@/ux-components/button-main/button-main";
+import buttonMain from "@/fmg-components/ux-components/button-main/button-main";
 
 export default {
     name: "modal",
diff --git a/src/common-components/question-chain/question-chain.spec.js b/src/digital-components/question-chain/question-chain.spec.js
similarity index 99%
rename from src/common-components/question-chain/question-chain.spec.js
rename to src/digital-components/question-chain/question-chain.spec.js
index 8288f351c..2444fd22d 100644
--- a/src/common-components/question-chain/question-chain.spec.js
+++ b/src/digital-components/question-chain/question-chain.spec.js
@@ -1,5 +1,5 @@
 import { shallowMount } from "@vue/test-utils";
-import questionChain from "@/common-components/question-chain/question-chain.vue";
+import questionChain from "./question-chain.vue";
 import { getMountOptions } from "@/helpers/unit-test-helper.js";
 import { nextTick } from "vue";
 
diff --git a/src/common-components/question-chain/question-chain.vue b/src/digital-components/question-chain/question-chain.vue
similarity index 98%
rename from src/common-components/question-chain/question-chain.vue
rename to src/digital-components/question-chain/question-chain.vue
index bf68a4363..d72cec9c8 100644
--- a/src/common-components/question-chain/question-chain.vue
+++ b/src/digital-components/question-chain/question-chain.vue
@@ -17,7 +17,7 @@
 </template>
 
 <script>
-import buttonQuestion from "@/common-components/button-question/button-question";
+import buttonQuestion from "@/digital-components/button-question/button-question";
 import { useValidateForm } from "vee-validate";
 
 export default {
@@ -82,7 +82,7 @@ export default {
     },
     methods: {
         handleAnswer(question, returnedAnswer) {
-            /* 
+            /*
                 returnedAnswer example format:
                 "1|answer|DD11132|Yes"
             */
diff --git a/src/common-components/text-block/text-block.spec.js b/src/digital-components/text-block/text-block.spec.js
similarity index 100%
rename from src/common-components/text-block/text-block.spec.js
rename to src/digital-components/text-block/text-block.spec.js
diff --git a/src/common-components/text-block/text-block.vue b/src/digital-components/text-block/text-block.vue
similarity index 100%
rename from src/common-components/text-block/text-block.vue
rename to src/digital-components/text-block/text-block.vue
diff --git a/src/common-components/textbox-question/textbox-question.spec.js b/src/digital-components/textbox-question/textbox-question.spec.js
similarity index 100%
rename from src/common-components/textbox-question/textbox-question.spec.js
rename to src/digital-components/textbox-question/textbox-question.spec.js
diff --git a/src/common-components/textbox-question/textbox-question.vue b/src/digital-components/textbox-question/textbox-question.vue
similarity index 100%
rename from src/common-components/textbox-question/textbox-question.vue
rename to src/digital-components/textbox-question/textbox-question.vue
diff --git a/src/common-components/funnel-footer/funnel-footer.spec.js b/src/fmg-components/funnel-footer/funnel-footer.spec.js
similarity index 100%
rename from src/common-components/funnel-footer/funnel-footer.spec.js
rename to src/fmg-components/funnel-footer/funnel-footer.spec.js
diff --git a/src/common-components/funnel-footer/funnel-footer.vue b/src/fmg-components/funnel-footer/funnel-footer.vue
similarity index 95%
rename from src/common-components/funnel-footer/funnel-footer.vue
rename to src/fmg-components/funnel-footer/funnel-footer.vue
index 2a6119681..b5cf16002 100644
--- a/src/common-components/funnel-footer/funnel-footer.vue
+++ b/src/fmg-components/funnel-footer/funnel-footer.vue
@@ -29,8 +29,8 @@
 </template>
 
 <script>
-import textLink from "@/ux-components/text-link/text-link";
-import buttonMain from "@/ux-components/button-main/button-main";
+import textLink from "@/fmg-components/ux-components/text-link/text-link";
+import buttonMain from "@/fmg-components/ux-components/button-main/button-main";
 
 export default {
     name: "funnelFooter",
diff --git a/src/common-components/funnel-header/funnel-header.spec.js b/src/fmg-components/funnel-header/funnel-header.spec.js
similarity index 100%
rename from src/common-components/funnel-header/funnel-header.spec.js
rename to src/fmg-components/funnel-header/funnel-header.spec.js
diff --git a/src/common-components/funnel-header/funnel-header.vue b/src/fmg-components/funnel-header/funnel-header.vue
similarity index 93%
rename from src/common-components/funnel-header/funnel-header.vue
rename to src/fmg-components/funnel-header/funnel-header.vue
index f952b94a8..593989e6e 100644
--- a/src/common-components/funnel-header/funnel-header.vue
+++ b/src/fmg-components/funnel-header/funnel-header.vue
@@ -16,10 +16,10 @@
 </template>
 
 <script>
-import alert from "@/ux-components/alert/alert";
+import alert from "@/fmg-components/ux-components/alert/alert";
 import eventBus from "@/helpers/event-bus/event-bus";
 import { globalEvents } from "@/constants/events";
-import menuModal from "@/common-components/funnel-header/menu-modal/menu-modal";
+import menuModal from "@/fmg-components/funnel-header/menu-modal/menu-modal";
 
 export default {
     name: "funnel-header",
diff --git a/src/common-components/funnel-header/menu-modal/menu-modal.spec.js b/src/fmg-components/funnel-header/menu-modal/menu-modal.spec.js
similarity index 100%
rename from src/common-components/funnel-header/menu-modal/menu-modal.spec.js
rename to src/fmg-components/funnel-header/menu-modal/menu-modal.spec.js
diff --git a/src/common-components/funnel-header/menu-modal/menu-modal.vue b/src/fmg-components/funnel-header/menu-modal/menu-modal.vue
similarity index 98%
rename from src/common-components/funnel-header/menu-modal/menu-modal.vue
rename to src/fmg-components/funnel-header/menu-modal/menu-modal.vue
index fd0c96cb8..3b9bbf26c 100644
--- a/src/common-components/funnel-header/menu-modal/menu-modal.vue
+++ b/src/fmg-components/funnel-header/menu-modal/menu-modal.vue
@@ -78,7 +78,7 @@
 </template>
 
 <script>
-import textLink from "@/ux-components/text-link/text-link";
+import textLink from "@/fmg-components/ux-components/text-link/text-link";
 export default {
     name: "menuModal",
     data() {
diff --git a/src/common-components/funnel-sub-header/button-back/button-back.spec.js b/src/fmg-components/funnel-sub-header/button-back/button-back.spec.js
similarity index 100%
rename from src/common-components/funnel-sub-header/button-back/button-back.spec.js
rename to src/fmg-components/funnel-sub-header/button-back/button-back.spec.js
diff --git a/src/common-components/funnel-sub-header/button-back/button-back.vue b/src/fmg-components/funnel-sub-header/button-back/button-back.vue
similarity index 100%
rename from src/common-components/funnel-sub-header/button-back/button-back.vue
rename to src/fmg-components/funnel-sub-header/button-back/button-back.vue
diff --git a/src/common-components/funnel-sub-header/funnel-sub-header.spec.js b/src/fmg-components/funnel-sub-header/funnel-sub-header.spec.js
similarity index 100%
rename from src/common-components/funnel-sub-header/funnel-sub-header.spec.js
rename to src/fmg-components/funnel-sub-header/funnel-sub-header.spec.js
diff --git a/src/common-components/funnel-sub-header/funnel-sub-header.vue b/src/fmg-components/funnel-sub-header/funnel-sub-header.vue
similarity index 95%
rename from src/common-components/funnel-sub-header/funnel-sub-header.vue
rename to src/fmg-components/funnel-sub-header/funnel-sub-header.vue
index 356dc50c1..a5cdf5c0b 100644
--- a/src/common-components/funnel-sub-header/funnel-sub-header.vue
+++ b/src/fmg-components/funnel-sub-header/funnel-sub-header.vue
@@ -25,7 +25,7 @@
 </template>
 
 <script>
-import buttonBack from "@/common-components/funnel-sub-header/button-back/button-back";
+import buttonBack from "@/fmg-components/funnel-sub-header/button-back/button-back";
 
 export default {
     name: "FunnelSubHeader",
diff --git a/src/common-components/layouts/questions-page-layout/questions-page-layout.spec.js b/src/fmg-components/layouts/questions-page-layout/questions-page-layout.spec.js
similarity index 98%
rename from src/common-components/layouts/questions-page-layout/questions-page-layout.spec.js
rename to src/fmg-components/layouts/questions-page-layout/questions-page-layout.spec.js
index 72da3c9df..38b0f3d16 100644
--- a/src/common-components/layouts/questions-page-layout/questions-page-layout.spec.js
+++ b/src/fmg-components/layouts/questions-page-layout/questions-page-layout.spec.js
@@ -1,5 +1,5 @@
 // Components
-import questionsPageLayout from "@/common-components/layouts/questions-page-layout/questions-page-layout";
+import questionsPageLayout from "./questions-page-layout";
 
 // Supporting Files
 import { shallowMount } from "@vue/test-utils";
diff --git a/src/common-components/layouts/questions-page-layout/questions-page-layout.vue b/src/fmg-components/layouts/questions-page-layout/questions-page-layout.vue
similarity index 85%
rename from src/common-components/layouts/questions-page-layout/questions-page-layout.vue
rename to src/fmg-components/layouts/questions-page-layout/questions-page-layout.vue
index 1ab40a7b0..8d78fee3f 100644
--- a/src/common-components/layouts/questions-page-layout/questions-page-layout.vue
+++ b/src/fmg-components/layouts/questions-page-layout/questions-page-layout.vue
@@ -35,13 +35,13 @@
 
 <script>
 // Components
-import funnelHeader from "@/common-components/funnel-header/funnel-header";
-import vehicleBanner from "@/common-components/vehicle-banner/vehicle-banner";
-import alert from "@/ux-components/alert/alert";
-import questionChain from "@/common-components/question-chain/question-chain";
-import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
-import funnelFooter from "@/common-components/funnel-footer/funnel-footer";
-import loadingModal from "@/common-components/loading-modal/loading-modal.vue";
+import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
+import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
+import alert from "@/fmg-components/ux-components/alert/alert";
+import questionChain from "@/digital-components/question-chain/question-chain";
+import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
+import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
+import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue";
 
 export default {
     name: "questions-page",
diff --git a/src/common-components/loading-modal/loading-modal.spec.js b/src/fmg-components/loading-modal/loading-modal.spec.js
similarity index 100%
rename from src/common-components/loading-modal/loading-modal.spec.js
rename to src/fmg-components/loading-modal/loading-modal.spec.js
diff --git a/src/common-components/loading-modal/loading-modal.vue b/src/fmg-components/loading-modal/loading-modal.vue
similarity index 100%
rename from src/common-components/loading-modal/loading-modal.vue
rename to src/fmg-components/loading-modal/loading-modal.vue
diff --git a/src/ux-components/alert/alert.spec.js b/src/fmg-components/ux-components/alert/alert.spec.js
similarity index 100%
rename from src/ux-components/alert/alert.spec.js
rename to src/fmg-components/ux-components/alert/alert.spec.js
diff --git a/src/ux-components/alert/alert.vue b/src/fmg-components/ux-components/alert/alert.vue
similarity index 100%
rename from src/ux-components/alert/alert.vue
rename to src/fmg-components/ux-components/alert/alert.vue
diff --git a/src/ux-components/button-main/button-main.spec.js b/src/fmg-components/ux-components/button-main/button-main.spec.js
similarity index 100%
rename from src/ux-components/button-main/button-main.spec.js
rename to src/fmg-components/ux-components/button-main/button-main.spec.js
diff --git a/src/ux-components/button-main/button-main.vue b/src/fmg-components/ux-components/button-main/button-main.vue
similarity index 98%
rename from src/ux-components/button-main/button-main.vue
rename to src/fmg-components/ux-components/button-main/button-main.vue
index 18d7427c2..26be0f184 100644
--- a/src/ux-components/button-main/button-main.vue
+++ b/src/fmg-components/ux-components/button-main/button-main.vue
@@ -17,7 +17,7 @@
 </template>
 
 <script>
-import loader from "@/ux-components/loader/loader";
+import loader from "@/fmg-components/ux-components/loader/loader";
 
 export default {
     name: "buttonMain",
diff --git a/src/ux-components/checkbox/checkbox.spec.js b/src/fmg-components/ux-components/checkbox/checkbox.spec.js
similarity index 100%
rename from src/ux-components/checkbox/checkbox.spec.js
rename to src/fmg-components/ux-components/checkbox/checkbox.spec.js
diff --git a/src/ux-components/checkbox/checkbox.vue b/src/fmg-components/ux-components/checkbox/checkbox.vue
similarity index 100%
rename from src/ux-components/checkbox/checkbox.vue
rename to src/fmg-components/ux-components/checkbox/checkbox.vue
diff --git a/src/ux-components/list-button-horizontal/list-button-horizontal.spec.js b/src/fmg-components/ux-components/list-button-horizontal/list-button-horizontal.spec.js
similarity index 100%
rename from src/ux-components/list-button-horizontal/list-button-horizontal.spec.js
rename to src/fmg-components/ux-components/list-button-horizontal/list-button-horizontal.spec.js
diff --git a/src/ux-components/list-button-horizontal/list-button-horizontal.vue b/src/fmg-components/ux-components/list-button-horizontal/list-button-horizontal.vue
similarity index 98%
rename from src/ux-components/list-button-horizontal/list-button-horizontal.vue
rename to src/fmg-components/ux-components/list-button-horizontal/list-button-horizontal.vue
index e2c8a73c8..0776ffcac 100644
--- a/src/ux-components/list-button-horizontal/list-button-horizontal.vue
+++ b/src/fmg-components/ux-components/list-button-horizontal/list-button-horizontal.vue
@@ -22,7 +22,7 @@
 </template>
 
 <script>
-import baseInputButton from "@/common-components/base-input-button/base-input-button";
+import baseInputButton from "@/digital-components/base-input-button/base-input-button";
 import inputButtonWrapperMixin from "@/mixins/input-button-wrapper-mixin";
 
 export default {
diff --git a/src/ux-components/list-button/list-button.spec.js b/src/fmg-components/ux-components/list-button/list-button.spec.js
similarity index 100%
rename from src/ux-components/list-button/list-button.spec.js
rename to src/fmg-components/ux-components/list-button/list-button.spec.js
diff --git a/src/ux-components/list-button/list-button.vue b/src/fmg-components/ux-components/list-button/list-button.vue
similarity index 95%
rename from src/ux-components/list-button/list-button.vue
rename to src/fmg-components/ux-components/list-button/list-button.vue
index 33df5568a..0e2383c07 100644
--- a/src/ux-components/list-button/list-button.vue
+++ b/src/fmg-components/ux-components/list-button/list-button.vue
@@ -23,8 +23,8 @@
 </template>
 
 <script>
-import loader from "@/ux-components/loader/loader";
-import baseInputButton from "@/common-components/base-input-button/base-input-button";
+import loader from "@/fmg-components/ux-components/loader/loader";
+import baseInputButton from "@/digital-components/base-input-button/base-input-button";
 import inputButtonWrapperMixin from "@/mixins/input-button-wrapper-mixin";
 
 export default {
diff --git a/src/ux-components/list-card/list-card.spec.js b/src/fmg-components/ux-components/list-card/list-card.spec.js
similarity index 100%
rename from src/ux-components/list-card/list-card.spec.js
rename to src/fmg-components/ux-components/list-card/list-card.spec.js
diff --git a/src/ux-components/list-card/list-card.vue b/src/fmg-components/ux-components/list-card/list-card.vue
similarity index 98%
rename from src/ux-components/list-card/list-card.vue
rename to src/fmg-components/ux-components/list-card/list-card.vue
index ed70705c9..7755249ab 100644
--- a/src/ux-components/list-card/list-card.vue
+++ b/src/fmg-components/ux-components/list-card/list-card.vue
@@ -31,7 +31,7 @@
 </template>
 
 <script>
-import baseInputButton from "@/common-components/base-input-button/base-input-button";
+import baseInputButton from "@/digital-components/base-input-button/base-input-button";
 import inputButtonWrapperMixin from "@/mixins/input-button-wrapper-mixin";
 
 export default {
diff --git a/src/ux-components/loader/loader.spec.js b/src/fmg-components/ux-components/loader/loader.spec.js
similarity index 100%
rename from src/ux-components/loader/loader.spec.js
rename to src/fmg-components/ux-components/loader/loader.spec.js
diff --git a/src/ux-components/loader/loader.vue b/src/fmg-components/ux-components/loader/loader.vue
similarity index 97%
rename from src/ux-components/loader/loader.vue
rename to src/fmg-components/ux-components/loader/loader.vue
index daea9c511..8698c27fc 100644
--- a/src/ux-components/loader/loader.vue
+++ b/src/fmg-components/ux-components/loader/loader.vue
@@ -42,7 +42,7 @@ export default {
     //Spinner basics
     &:after {
         content: "";
-        mask: url(../../assets/img/icons/spinner.svg);
+        mask: url(../../../assets/img/icons/spinner.svg);
         mask-size: cover;
         position: relative;
         width: 1rem;
diff --git a/src/ux-components/radio/radio.spec.js b/src/fmg-components/ux-components/radio/radio.spec.js
similarity index 100%
rename from src/ux-components/radio/radio.spec.js
rename to src/fmg-components/ux-components/radio/radio.spec.js
diff --git a/src/ux-components/radio/radio.vue b/src/fmg-components/ux-components/radio/radio.vue
similarity index 95%
rename from src/ux-components/radio/radio.vue
rename to src/fmg-components/ux-components/radio/radio.vue
index 73c919a44..6a63ee3d5 100644
--- a/src/ux-components/radio/radio.vue
+++ b/src/fmg-components/ux-components/radio/radio.vue
@@ -12,7 +12,7 @@
 </template>
 
 <script>
-import baseInputButton from "@/common-components/base-input-button/base-input-button";
+import baseInputButton from "@/digital-components/base-input-button/base-input-button";
 import inputButtonWrapperMixin from "@/mixins/input-button-wrapper-mixin";
 
 export default {
diff --git a/src/ux-components/text-link/text-link.spec.js b/src/fmg-components/ux-components/text-link/text-link.spec.js
similarity index 100%
rename from src/ux-components/text-link/text-link.spec.js
rename to src/fmg-components/ux-components/text-link/text-link.spec.js
diff --git a/src/ux-components/text-link/text-link.vue b/src/fmg-components/ux-components/text-link/text-link.vue
similarity index 100%
rename from src/ux-components/text-link/text-link.vue
rename to src/fmg-components/ux-components/text-link/text-link.vue
diff --git a/src/common-components/vehicle-banner/vehicle-banner.spec.js b/src/fmg-components/vehicle-banner/vehicle-banner.spec.js
similarity index 100%
rename from src/common-components/vehicle-banner/vehicle-banner.spec.js
rename to src/fmg-components/vehicle-banner/vehicle-banner.spec.js
diff --git a/src/common-components/vehicle-banner/vehicle-banner.vue b/src/fmg-components/vehicle-banner/vehicle-banner.vue
similarity index 100%
rename from src/common-components/vehicle-banner/vehicle-banner.vue
rename to src/fmg-components/vehicle-banner/vehicle-banner.vue
diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue
index 0eb130eba..4599a017b 100644
--- a/src/layouts/address-lookup/address-lookup.vue
+++ b/src/layouts/address-lookup/address-lookup.vue
@@ -81,13 +81,13 @@
 
 <script>
 // Components
-import funnelHeader from "@/common-components/funnel-header/funnel-header";
-import funnelFooter from "@/common-components/funnel-footer/funnel-footer";
-import vehicleBanner from "@/common-components/vehicle-banner/vehicle-banner";
-import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
+import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
+import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
+import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
+import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
 import customerQuestions from "@/layouts/address-lookup/customer-questions/customer-questions";
-import alert from "@/ux-components/alert/alert";
-import textboxQuestion from "@/common-components/textbox-question/textbox-question";
+import alert from "@/fmg-components/ux-components/alert/alert";
+import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
 
 import { Form, defineRule } from "vee-validate";
 import { required, regex } from "@/helpers/validation-rules";
diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js
index c8d24c57e..0ab14d352 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js
@@ -1,6 +1,6 @@
 // Components
 import addressQuestions from "@/layouts/address-lookup/customer-questions/address-questions/address-questions";
-import alert from "@/ux-components/alert/alert";
+import alert from "@/fmg-components/ux-components/alert/alert";
 
 // Supporting Files
 import { mount, shallowMount } from "@vue/test-utils";
diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
index 060ee806b..f93112eed 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
@@ -71,9 +71,9 @@
 </template>
 
 <script>
-import textboxQuestion from "@/common-components/textbox-question/textbox-question";
-import dropdownQuestion from "@/common-components/dropdown-question/dropdown-question";
-import alert from "@/ux-components/alert/alert";
+import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
+import dropdownQuestion from "@/digital-components/dropdown-question/dropdown-question";
+import alert from "@/fmg-components/ux-components/alert/alert";
 import { applicationConfig } from "@/constants/application-config.js";
 import { defineRule } from "vee-validate";
 import { required, regex } from "@/helpers/validation-rules";
diff --git a/src/layouts/address-lookup/customer-questions/customer-questions.vue b/src/layouts/address-lookup/customer-questions/customer-questions.vue
index d10812df2..5c8ee6b4e 100644
--- a/src/layouts/address-lookup/customer-questions/customer-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/customer-questions.vue
@@ -42,12 +42,12 @@
 
 <script>
 import addressQuestions from "@/layouts/address-lookup/customer-questions/address-questions/address-questions";
-import textboxQuestion from "@/common-components/textbox-question/textbox-question";
+import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
 import { defineRule } from "vee-validate";
 import { required } from "@/helpers/validation-rules";
 import { regex } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
-import textBlock from "@/common-components/text-block/text-block";
+import textBlock from "@/digital-components/text-block/text-block";
 
 // DEFINE VALIDATION RULES
 defineRule("first-name-required", required(errorMessages.FIRST_NAME_REQUIRED));
diff --git a/src/layouts/address-vehicles/address-vehicles-question/address-vehicles-question.vue b/src/layouts/address-vehicles/address-vehicles-question/address-vehicles-question.vue
index 9611965d8..4afb07c52 100644
--- a/src/layouts/address-vehicles/address-vehicles-question/address-vehicles-question.vue
+++ b/src/layouts/address-vehicles/address-vehicles-question/address-vehicles-question.vue
@@ -21,8 +21,8 @@
 </template>
 
 <script>
-import buttonQuestion from "@/common-components/button-question/button-question";
-import alert from "@/ux-components/alert/alert";
+import buttonQuestion from "@/digital-components/button-question/button-question";
+import alert from "@/fmg-components/ux-components/alert/alert";
 
 // Supporting files
 import { getDamageString } from "@/helpers/damage-helper";
diff --git a/src/layouts/address-vehicles/address-vehicles.vue b/src/layouts/address-vehicles/address-vehicles.vue
index 4babd7a33..da59d2e5b 100644
--- a/src/layouts/address-vehicles/address-vehicles.vue
+++ b/src/layouts/address-vehicles/address-vehicles.vue
@@ -46,11 +46,11 @@
 
 <script>
 // Components
-import funnelHeader from "@/common-components/funnel-header/funnel-header";
-import funnelFooter from "@/common-components/funnel-footer/funnel-footer";
-import vehicleBanner from "@/common-components/vehicle-banner/vehicle-banner";
-import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
-import alert from "@/ux-components/alert/alert";
+import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
+import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
+import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
+import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
+import alert from "@/fmg-components/ux-components/alert/alert";
 import addressVehiclesQuestion from "@/layouts/address-vehicles/address-vehicles-question/address-vehicles-question";
 
 // Supporting files
diff --git a/src/layouts/capability-questions/capability-questions.vue b/src/layouts/capability-questions/capability-questions.vue
index d67f73838..5456b816c 100644
--- a/src/layouts/capability-questions/capability-questions.vue
+++ b/src/layouts/capability-questions/capability-questions.vue
@@ -16,7 +16,7 @@
 
 <script>
 // Components
-import questionsPageLayout from "@/common-components/layouts/questions-page-layout/questions-page-layout";
+import questionsPageLayout from "@/fmg-components/layouts/questions-page-layout/questions-page-layout";
 
 // Supporting Files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index 9d7dedd04..df9adcf17 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -84,15 +84,15 @@
 
 <script>
 // Components
-import funnelHeader from "@/common-components/funnel-header/funnel-header";
-import funnelFooter from "@/common-components/funnel-footer/funnel-footer";
-import vehicleBanner from "@/common-components/vehicle-banner/vehicle-banner";
-import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
-import buttonQuestion from "@/common-components/button-question/button-question";
-import alert from "@/ux-components/alert/alert";
-import textboxQuestion from "@/common-components/textbox-question/textbox-question";
-import textBlock from "@/common-components/text-block/text-block";
-import loadingModal from "@/common-components/loading-modal/loading-modal.vue";
+import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
+import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
+import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
+import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
+import buttonQuestion from "@/digital-components/button-question/button-question";
+import alert from "@/fmg-components/ux-components/alert/alert";
+import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
+import textBlock from "@/digital-components/text-block/text-block";
+import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue";
 
 //Supporting Files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue
index 159d89260..ee2573fa3 100644
--- a/src/layouts/license-plate-lookup/license-plate-lookup.vue
+++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue
@@ -91,13 +91,13 @@
 
 <script>
 // Components
-import funnelHeader from "@/common-components/funnel-header/funnel-header";
-import funnelFooter from "@/common-components/funnel-footer/funnel-footer";
-import vehicleBanner from "@/common-components/vehicle-banner/vehicle-banner";
-import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
-import alert from "@/ux-components/alert/alert";
-import textboxQuestion from "@/common-components/textbox-question/textbox-question";
-import textBlock from "@/common-components/text-block/text-block";
+import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
+import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
+import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
+import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
+import alert from "@/fmg-components/ux-components/alert/alert";
+import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
+import textBlock from "@/digital-components/text-block/text-block";
 
 // Supporting files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
diff --git a/src/layouts/molding-questions/molding-questions.vue b/src/layouts/molding-questions/molding-questions.vue
index b89feb5a9..ee1b33a9f 100644
--- a/src/layouts/molding-questions/molding-questions.vue
+++ b/src/layouts/molding-questions/molding-questions.vue
@@ -16,7 +16,7 @@
 
 <script>
 // Components
-import questionsPageLayout from "@/common-components/layouts/questions-page-layout/questions-page-layout";
+import questionsPageLayout from "@/fmg-components/layouts/questions-page-layout/questions-page-layout";
 
 // Supporting Files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
diff --git a/src/layouts/part-questions/part-questions.vue b/src/layouts/part-questions/part-questions.vue
index 76ea36869..b94c92e1d 100644
--- a/src/layouts/part-questions/part-questions.vue
+++ b/src/layouts/part-questions/part-questions.vue
@@ -16,7 +16,7 @@
 
 <script>
 // Components
-import questionsPageLayout from "@/common-components/layouts/questions-page-layout/questions-page-layout";
+import questionsPageLayout from "@/fmg-components/layouts/questions-page-layout/questions-page-layout";
 
 // Supporting Files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
diff --git a/src/layouts/quote/cash-or-insurance-question/cash-or-insurance-question.vue b/src/layouts/quote/cash-or-insurance-question/cash-or-insurance-question.vue
index 3b420f6a8..6f6fd5c55 100644
--- a/src/layouts/quote/cash-or-insurance-question/cash-or-insurance-question.vue
+++ b/src/layouts/quote/cash-or-insurance-question/cash-or-insurance-question.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import buttonQuestion from "@/common-components/button-question/button-question";
+import buttonQuestion from "@/digital-components/button-question/button-question";
 
 const cashAnswer = "CashAnswer";
 const insuranceAnswer = "InsuranceAnswer";
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 6ce61a7b0..b02714ffa 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -1,3 +1,4 @@
+digital
 <template>
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
         <div class="page-container-grouped-styles quote">
@@ -46,15 +47,15 @@
 
 <script>
 // Components
-import funnelHeader from "@/common-components/funnel-header/funnel-header";
-import funnelFooter from "@/common-components/funnel-footer/funnel-footer";
-import vehicleBanner from "@/common-components/vehicle-banner/vehicle-banner";
-import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
+import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
+import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
+import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
+import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
 import cashOrInsuranceQuestion from "./cash-or-insurance-question/cash-or-insurance-question";
 import servicePackageQuestion from "./service-package-question/service-package-question";
-import textBlock from "@/common-components/text-block/text-block";
-import modal from "@/common-components/modal/modal";
-import loadingModal from "@/common-components/loading-modal/loading-modal.vue";
+import textBlock from "@/digital-components/text-block/text-block";
+import modal from "@/digital-components/modal/modal";
+import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue";
 import baseMixin from "@/mixins/base-mixin.js";
 import vehicleQuestionsMixin from "../../mixins/vehicle-questions-mixin";
 import { settleAllPromises } from "@/helpers/layout-helper";
diff --git a/src/layouts/quote/service-package-question/service-package-question.vue b/src/layouts/quote/service-package-question/service-package-question.vue
index 1d9235374..4f543064c 100644
--- a/src/layouts/quote/service-package-question/service-package-question.vue
+++ b/src/layouts/quote/service-package-question/service-package-question.vue
@@ -10,7 +10,7 @@
 </template>
 
 <script>
-import buttonQuestion from "@/common-components/button-question/button-question";
+import buttonQuestion from "@/digital-components/button-question/button-question";
 import baseMixin from "@/mixins/base-mixin.js";
 import { processIfStatements } from "@/helpers/cms-content-helper";
 import { damageLocationsSelected as glassLocations } from "@/constants/damage-locations-selected";
diff --git a/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue b/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue
index 74bed2c5e..3828801cc 100644
--- a/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue
+++ b/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue
@@ -51,8 +51,8 @@
 </template>
 
 <script>
-import baseInputButton from "@/common-components/base-input-button/base-input-button";
-import textLink from "@/ux-components/text-link/text-link";
+import baseInputButton from "@/digital-components/base-input-button/base-input-button";
+import textLink from "@/fmg-components/ux-components/text-link/text-link";
 import inputButtonWrapperMixin from "@/mixins/input-button-wrapper-mixin";
 import {
     getLinkDisplayTextFromCopy,
diff --git a/src/layouts/reveal/reveal.vue b/src/layouts/reveal/reveal.vue
index 03ddf382d..b416b5318 100644
--- a/src/layouts/reveal/reveal.vue
+++ b/src/layouts/reveal/reveal.vue
@@ -11,8 +11,8 @@
 
 <script>
 // Components
-import funnelHeader from "@/common-components/funnel-header/funnel-header";
-import funnelFooter from "@/common-components/funnel-footer/funnel-footer";
+import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
+import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
 
 // Supporting Files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index f853727a5..e29ebdb5e 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -1,3 +1,4 @@
+fmg
 <template>
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
         <div class="page-container-grouped-styles">
@@ -14,9 +15,9 @@
 
 <script>
 // Components
-import funnelHeader from "@/common-components/funnel-header/funnel-header";
-import funnelFooter from "@/common-components/funnel-footer/funnel-footer";
-import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
+import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
+import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
+import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
 import { Form } from "vee-validate";
 
 // Supporting files
diff --git a/src/layouts/vehicle-damage/damage-location-question/damage-location-question.vue b/src/layouts/vehicle-damage/damage-location-question/damage-location-question.vue
index d1743ac00..67881b382 100644
--- a/src/layouts/vehicle-damage/damage-location-question/damage-location-question.vue
+++ b/src/layouts/vehicle-damage/damage-location-question/damage-location-question.vue
@@ -13,7 +13,7 @@
 </template>
 
 <script>
-import buttonQuestion from "@/common-components/button-question/button-question";
+import buttonQuestion from "@/digital-components/button-question/button-question";
 import store from "@/store";
 import { defineRule } from "vee-validate";
 import { required } from "@/helpers/validation-rules";
diff --git a/src/layouts/vehicle-damage/replace-options-question/replace-options-question.vue b/src/layouts/vehicle-damage/replace-options-question/replace-options-question.vue
index 12347cdf6..850ef568b 100644
--- a/src/layouts/vehicle-damage/replace-options-question/replace-options-question.vue
+++ b/src/layouts/vehicle-damage/replace-options-question/replace-options-question.vue
@@ -21,7 +21,7 @@
 </template>
 
 <script>
-import buttonQuestion from "@/common-components/button-question/button-question";
+import buttonQuestion from "@/digital-components/button-question/button-question";
 import store from "@/store";
 
 export default {
diff --git a/src/layouts/vehicle-damage/side-door-options/side-door-options.vue b/src/layouts/vehicle-damage/side-door-options/side-door-options.vue
index b645c1ecd..bc4b5fdd9 100644
--- a/src/layouts/vehicle-damage/side-door-options/side-door-options.vue
+++ b/src/layouts/vehicle-damage/side-door-options/side-door-options.vue
@@ -40,8 +40,8 @@
 </template>
 
 <script>
-import buttonQuestion from "@/common-components/button-question/button-question";
-import replaceOptionsQuestion from "@/layouts/vehicle-damage/replace-options-question/replace-options-question";
+import buttonQuestion from "@/digital-components/button-question/button-question";
+import replaceOptionsQuestion from "../replace-options-question/replace-options-question";
 import store from "@/store";
 import { defineRule } from "vee-validate";
 import { required } from "@/helpers/validation-rules";
diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index 7446d4cd0..39c6845c2 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -1,3 +1,4 @@
+fmg
 <template>
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
         <div class="page-container-grouped-styles">
@@ -58,15 +59,15 @@
 
 <script>
 // Components
-import funnelHeader from "@/common-components/funnel-header/funnel-header";
-import funnelFooter from "@/common-components/funnel-footer/funnel-footer";
-import vehicleBanner from "@/common-components/vehicle-banner/vehicle-banner";
-import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
+import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
+import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
+import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
+import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
 import sideDoorOptions from "@/layouts/vehicle-damage/side-door-options/side-door-options";
 import damageLocationQuestion from "@/layouts/vehicle-damage/damage-location-question/damage-location-question";
 import windshieldOptions from "@/layouts/vehicle-damage/windshield-options/windshield-options";
 import replaceOptionsQuestion from "@/layouts/vehicle-damage/replace-options-question/replace-options-question";
-import alert from "@/ux-components/alert/alert";
+import alert from "@/fmg-components/ux-components/alert/alert";
 
 // Supporting files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
diff --git a/src/layouts/vehicle-damage/windshield-options/windshield-chip-count-question/windshield-chip-count-question.vue b/src/layouts/vehicle-damage/windshield-options/windshield-chip-count-question/windshield-chip-count-question.vue
index 48b813f2d..1f5602111 100644
--- a/src/layouts/vehicle-damage/windshield-options/windshield-chip-count-question/windshield-chip-count-question.vue
+++ b/src/layouts/vehicle-damage/windshield-options/windshield-chip-count-question/windshield-chip-count-question.vue
@@ -15,7 +15,7 @@
 </template>
 
 <script>
-import buttonQuestion from "@/common-components/button-question/button-question";
+import buttonQuestion from "@/digital-components/button-question/button-question";
 
 export default {
     name: "windshieldOptions",
diff --git a/src/layouts/vehicle-damage/windshield-options/windshield-damage-type-question/windshield-damage-type-question.vue b/src/layouts/vehicle-damage/windshield-options/windshield-damage-type-question/windshield-damage-type-question.vue
index 01e146080..e6775b241 100644
--- a/src/layouts/vehicle-damage/windshield-options/windshield-damage-type-question/windshield-damage-type-question.vue
+++ b/src/layouts/vehicle-damage/windshield-options/windshield-damage-type-question/windshield-damage-type-question.vue
@@ -15,7 +15,7 @@
 </template>
 
 <script>
-import buttonQuestion from "@/common-components/button-question/button-question";
+import buttonQuestion from "@/digital-components/button-question/button-question";
 
 export default {
     name: "windshieldDamageTypeQuestion",
diff --git a/src/layouts/vehicle-damage/windshield-options/windshield-options.vue b/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
index b878e5380..44250f860 100644
--- a/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
+++ b/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
@@ -42,7 +42,7 @@
 import windshieldDamageTypeQuestion from "@/layouts/vehicle-damage/windshield-options/windshield-damage-type-question/windshield-damage-type-question";
 import windshieldChipCountQuestion from "@/layouts/vehicle-damage/windshield-options/windshield-chip-count-question/windshield-chip-count-question";
 import replaceOptionsQuestion from "@/layouts/vehicle-damage/replace-options-question/replace-options-question";
-import alert from "@/ux-components/alert/alert";
+import alert from "@/fmg-components/ux-components/alert/alert";
 
 import { defineRule } from "vee-validate";
 import { required } from "@/helpers/validation-rules";
diff --git a/src/layouts/vehicle-make/make-question/make-question.vue b/src/layouts/vehicle-make/make-question/make-question.vue
index 55edc05ce..2d3551c53 100644
--- a/src/layouts/vehicle-make/make-question/make-question.vue
+++ b/src/layouts/vehicle-make/make-question/make-question.vue
@@ -12,7 +12,7 @@
 </template>
 
 <script>
-import buttonQuestion from "@/common-components/button-question/button-question";
+import buttonQuestion from "@/digital-components/button-question/button-question";
 // Supporting files
 import store from "@/store";
 import { storeActions } from "@/constants/store-actions.js";
diff --git a/src/layouts/vehicle-make/vehicle-make.vue b/src/layouts/vehicle-make/vehicle-make.vue
index 6babfa443..a50440e35 100644
--- a/src/layouts/vehicle-make/vehicle-make.vue
+++ b/src/layouts/vehicle-make/vehicle-make.vue
@@ -23,9 +23,9 @@
 <script>
 // Components
 import makeQuestion from "@/layouts/vehicle-make/make-question/make-question";
-import funnelHeader from "@/common-components/funnel-header/funnel-header";
-import vehicleBanner from "@/common-components/vehicle-banner/vehicle-banner";
-import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
+import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
+import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
+import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
 // Supporting files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
diff --git a/src/layouts/vehicle-model/model-question/model-question.vue b/src/layouts/vehicle-model/model-question/model-question.vue
index a236e50ef..5ca926abc 100644
--- a/src/layouts/vehicle-model/model-question/model-question.vue
+++ b/src/layouts/vehicle-model/model-question/model-question.vue
@@ -12,7 +12,7 @@
 </template>
 
 <script>
-import buttonQuestion from "@/common-components/button-question/button-question";
+import buttonQuestion from "@/digital-components/button-question/button-question";
 // Supporting files
 import store from "@/store";
 import { storeActions } from "@/constants/store-actions.js";
diff --git a/src/layouts/vehicle-model/vehicle-model.vue b/src/layouts/vehicle-model/vehicle-model.vue
index 2ef0fc573..d15c170c6 100644
--- a/src/layouts/vehicle-model/vehicle-model.vue
+++ b/src/layouts/vehicle-model/vehicle-model.vue
@@ -23,9 +23,9 @@
 <script>
 // Components
 import modelQuestion from "@/layouts/vehicle-model/model-question/model-question";
-import funnelHeader from "@/common-components/funnel-header/funnel-header";
-import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
-import vehicleBanner from "@/common-components/vehicle-banner/vehicle-banner";
+import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
+import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
+import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
 // Supporting files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { storeMutations } from "@/constants/store-mutations";
diff --git a/src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue b/src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue
index 65730f695..a6f5e3f0a 100644
--- a/src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue
+++ b/src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue
@@ -37,7 +37,7 @@
 
 <script>
 // Components
-import buttonQuestion from "@/common-components/button-question/button-question";
+import buttonQuestion from "@/digital-components/button-question/button-question";
 
 // Supporting files
 import { getTintImage } from "@/constants/tint-mapper";
diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue
index 1c35f96fa..b4036ffa1 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.vue
+++ b/src/layouts/vehicle-parts/vehicle-parts.vue
@@ -45,12 +45,12 @@
 <script>
 // Components
 import glassPartQuestion from "@/layouts/vehicle-parts/glass-part-question/glass-part-question";
-import funnelHeader from "@/common-components/funnel-header/funnel-header";
-import vehicleBanner from "@/common-components/vehicle-banner/vehicle-banner";
-import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
-import funnelFooter from "@/common-components/funnel-footer/funnel-footer";
-import alert from "@/ux-components/alert/alert";
-import loadingModal from "@/common-components/loading-modal/loading-modal.vue";
+import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
+import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
+import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
+import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
+import alert from "@/fmg-components/ux-components/alert/alert";
+import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue";
 // Supporting Files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
diff --git a/src/layouts/vehicle-style/style-question/style-question.vue b/src/layouts/vehicle-style/style-question/style-question.vue
index 934360323..0bfd00f7c 100644
--- a/src/layouts/vehicle-style/style-question/style-question.vue
+++ b/src/layouts/vehicle-style/style-question/style-question.vue
@@ -12,7 +12,7 @@
 </template>
 
 <script>
-import buttonQuestion from "@/common-components/button-question/button-question";
+import buttonQuestion from "@/digital-components/button-question/button-question";
 // Supporting files
 import store from "@/store";
 import { storeActions } from "@/constants/store-actions.js";
diff --git a/src/layouts/vehicle-style/vehicle-style.vue b/src/layouts/vehicle-style/vehicle-style.vue
index 23766f3e2..2d2a4a534 100644
--- a/src/layouts/vehicle-style/vehicle-style.vue
+++ b/src/layouts/vehicle-style/vehicle-style.vue
@@ -24,9 +24,9 @@
 // Components
 import baseMixin from "@/mixins/base-mixin.js";
 import styleQuestion from "@/layouts/vehicle-style/style-question/style-question";
-import funnelHeader from "@/common-components/funnel-header/funnel-header";
-import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
-import vehicleBanner from "@/common-components/vehicle-banner/vehicle-banner";
+import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
+import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
+import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
 
 // Supporting files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
diff --git a/src/layouts/vehicle-year/vehicle-year.vue b/src/layouts/vehicle-year/vehicle-year.vue
index f8a53ed5c..5b166151a 100644
--- a/src/layouts/vehicle-year/vehicle-year.vue
+++ b/src/layouts/vehicle-year/vehicle-year.vue
@@ -20,9 +20,9 @@
 <script>
 // Components
 import yearQuestion from "@/layouts/vehicle-year/year-question/year-question";
-import funnelHeader from "@/common-components/funnel-header/funnel-header";
-import vehicleBanner from "@/common-components/vehicle-banner/vehicle-banner";
-import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
+import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
+import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
+import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
 
 // Supporting files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
diff --git a/src/layouts/vehicle-year/year-question/year-question.vue b/src/layouts/vehicle-year/year-question/year-question.vue
index e4a36b401..6d8110216 100644
--- a/src/layouts/vehicle-year/year-question/year-question.vue
+++ b/src/layouts/vehicle-year/year-question/year-question.vue
@@ -12,7 +12,7 @@
 </template>
 
 <script>
-import buttonQuestion from "@/common-components/button-question/button-question";
+import buttonQuestion from "@/digital-components/button-question/button-question";
 // Supporting files
 import { storeActions } from "@/constants/store-actions.js";
 import baseMixin from "@/mixins/base-mixin.js";
diff --git a/src/layouts/vin-lookup/vin-information/vin-information.vue b/src/layouts/vin-lookup/vin-information/vin-information.vue
index 9571cb5eb..dd1d068e0 100644
--- a/src/layouts/vin-lookup/vin-information/vin-information.vue
+++ b/src/layouts/vin-lookup/vin-information/vin-information.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import textLink from "@/ux-components/text-link/text-link";
+import textLink from "@/fmg-components/ux-components/text-link/text-link";
 //Supporting files
 import { settleAllPromises } from "@/helpers/layout-helper";
 export default {
diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index 990fd0658..849f19b74 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -1,3 +1,4 @@
+fmg
 <template>
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
         <div class="page-container-grouped-styles">
@@ -109,15 +110,15 @@
 
 <script>
 // Components
-import funnelHeader from "@/common-components/funnel-header/funnel-header";
-import funnelFooter from "@/common-components/funnel-footer/funnel-footer";
-import vehicleBanner from "@/common-components/vehicle-banner/vehicle-banner";
-import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
-import alert from "@/ux-components/alert/alert";
-import textboxQuestion from "@/common-components/textbox-question/textbox-question";
+import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
+import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
+import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
+import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
+import alert from "@/fmg-components/ux-components/alert/alert";
+import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
 import vinInformation from "@/layouts/vin-lookup/vin-information/vin-information";
-import textBlock from "@/common-components/text-block/text-block";
-import loadingModal from "@/common-components/loading-modal/loading-modal.vue";
+import textBlock from "@/digital-components/text-block/text-block";
+import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue";
 
 // Supporting files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
diff --git a/src/mixins/input-button-wrapper-mixin.js b/src/mixins/input-button-wrapper-mixin.js
index 1d34d6520..286c3f21c 100644
--- a/src/mixins/input-button-wrapper-mixin.js
+++ b/src/mixins/input-button-wrapper-mixin.js
@@ -1,4 +1,4 @@
-import { inputButtonProps } from "@/common-components/base-input-button/button-functionality-props";
+import { inputButtonProps } from "@/digital-components/base-input-button/button-functionality-props";
 
 export default {
     model: {
diff --git a/src/mixins/input-button-wrapper-mixin.spec.js b/src/mixins/input-button-wrapper-mixin.spec.js
index c0028ddab..63595fb62 100644
--- a/src/mixins/input-button-wrapper-mixin.spec.js
+++ b/src/mixins/input-button-wrapper-mixin.spec.js
@@ -1,10 +1,10 @@
 import { mount } from "@vue/test-utils";
-import baseInputButton from "@/common-components/base-input-button/base-input-button";
+import baseInputButton from "@/digital-components/base-input-button/base-input-button";
 import inputButtonWrapperMixin from "@/mixins/input-button-wrapper-mixin";
-import listButtonHorizontal from "@/ux-components/list-button-horizontal/list-button-horizontal";
-import listButton from "@/ux-components/list-button/list-button";
-import listCard from "@/ux-components/list-card/list-card";
-import radio from "@/ux-components/radio/radio";
+import listButtonHorizontal from "@/fmg-components/ux-components/list-button-horizontal/list-button-horizontal";
+import listButton from "@/fmg-components/ux-components/list-button/list-button";
+import listCard from "@/fmg-components/ux-components/list-card/list-card";
+import radio from "@/fmg-components/ux-components/radio/radio";
 
 describe("input-button-wrapper-mixin", () => {
     describe("mouse clicks", () => {
diff --git a/src/router/index.js b/src/router/index.js
index 30fc8583b..a183e5895 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -30,7 +30,7 @@ import { applicationConfig } from "../constants/application-config";
 
 // Components
 import quote from "@/layouts/quote/quote.vue";
-import datePicker from "@/common-components/date-picker/date-picker.vue";
+import datePicker from "@/digital-components/date-picker/date-picker.vue";
 
 const routes = [
     {