diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js b/src/fmg-components/address-questions/address-questions.spec.js
similarity index 99%
rename from src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js
rename to src/fmg-components/address-questions/address-questions.spec.js
index 26a81341a..f0d508943 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js
+++ b/src/fmg-components/address-questions/address-questions.spec.js
@@ -1,5 +1,5 @@
 // Components
-import addressQuestions from "@/layouts/address-lookup/customer-questions/address-questions/address-questions";
+import addressQuestions from "@/fmg-components/address-questions/address-questions";
 import alert from "@/ux-components/alert/alert";
 
 // Supporting Files
diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue b/src/fmg-components/address-questions/address-questions.vue
similarity index 100%
rename from src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
rename to src/fmg-components/address-questions/address-questions.vue
diff --git a/src/layouts/address-lookup/customer-questions/customer-questions.vue b/src/layouts/address-lookup/customer-questions/customer-questions.vue
index 325f8c380..fcc70765a 100644
--- a/src/layouts/address-lookup/customer-questions/customer-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/customer-questions.vue
@@ -38,7 +38,7 @@
 </template>
 
 <script>
-import addressQuestions from "@/layouts/address-lookup/customer-questions/address-questions/address-questions";
+import addressQuestions from "@/fmg-components/address-questions/address-questions";
 import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
 import { defineRule } from "vee-validate";
 import { required } from "@/helpers/validation-rules";
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index ca286ef65..6fb92e2b8 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -65,7 +65,7 @@ import textLink from "@/ux-components/text-link/text-link";
 import textBlock from "@/digital-components/text-block/text-block";
 import modal from "@/digital-components/modal/modal";
 import alert from "@/ux-components/alert/alert";
-import addressQuestions from "@/layouts/address-lookup/customer-questions/address-questions/address-questions";
+import addressQuestions from "@/fmg-components/address-questions/address-questions";
 import vehicleProtectedQuestion from "@/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question";
 
 // Helpers
@@ -85,7 +85,6 @@ export default {
         return {
             internalModel: deepClone(this.modelValue),
             displayInvalidZipAlert: false,
-            addressQuestionsKey: 0,
             isModalOpened: false,
         };
     },