diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js b/src/common-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/common-components/address-questions/address-questions.spec.js
index 48a637aa..b72b4ef4 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js
+++ b/src/common-components/address-questions/address-questions.spec.js
@@ -1,6 +1,5 @@
 // Components
-import addressQuestions from "@/layouts/address-lookup/customer-questions/address-questions/address-questions";
-import alert from "@/ux-components/alert/alert";
+import addressQuestions from "@/common-components/address-questions/address-questions";
 
 // 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/common-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/common-components/address-questions/address-questions.vue
diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue
index 77ee771a..fc692200 100644
--- a/src/layouts/address-lookup/address-lookup.vue
+++ b/src/layouts/address-lookup/address-lookup.vue
@@ -61,9 +61,7 @@ import customerQuestions from "@/layouts/address-lookup/customer-questions/custo
 import alert from "@/ux-components/alert/alert";
 import textboxQuestion from "@/common-components/textbox-question/textbox-question";
 
-import { Form, defineRule } from "vee-validate";
-import { required, regex } from "@/helpers/validation-rules";
-import { errorMessages } from "@/constants/error-messages";
+import { Form } from "vee-validate";
 
 // Supporting files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
diff --git a/src/layouts/address-lookup/customer-questions/customer-questions.vue b/src/layouts/address-lookup/customer-questions/customer-questions.vue
index 683cbf94..57aeff5b 100644
--- a/src/layouts/address-lookup/customer-questions/customer-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/customer-questions.vue
@@ -25,7 +25,7 @@
 </template>
 
 <script>
-import addressQuestions from "@/layouts/address-lookup/customer-questions/address-questions/address-questions";
+import addressQuestions from "@/common-components/address-questions/address-questions";
 import textboxQuestion from "@/common-components/textbox-question/textbox-question";
 import { defineRule } from "vee-validate";
 import { required } from "@/helpers/validation-rules";