diff --git a/src/common-components/questions-page-layout/questions-page-layout.spec.js b/src/common-components/layouts/questions-page-layout/questions-page-layout.spec.js
similarity index 98%
rename from src/common-components/questions-page-layout/questions-page-layout.spec.js
rename to src/common-components/layouts/questions-page-layout/questions-page-layout.spec.js
index b7e5446bb..72da3c9df 100644
--- a/src/common-components/questions-page-layout/questions-page-layout.spec.js
+++ b/src/common-components/layouts/questions-page-layout/questions-page-layout.spec.js
@@ -1,10 +1,10 @@
 // Components
-import questionsPageLayout from "@/common-components/questions-page-layout/questions-page-layout";
+import questionsPageLayout from "@/common-components/layouts/questions-page-layout/questions-page-layout";
 
 // Supporting Files
 import { shallowMount } from "@vue/test-utils";
 import { getMountOptions } from "@/helpers/unit-test-helper.js";
-import baseMixin from "../../mixins/base-mixin";
+import baseMixin from "../../../mixins/base-mixin";
 import vehicleQuestionsMixin from "@/mixins/vehicle-questions-mixin";
 
 // Mock our module for promises.
diff --git a/src/common-components/questions-page-layout/questions-page-layout.vue b/src/common-components/layouts/questions-page-layout/questions-page-layout.vue
similarity index 100%
rename from src/common-components/questions-page-layout/questions-page-layout.vue
rename to src/common-components/layouts/questions-page-layout/questions-page-layout.vue
diff --git a/src/layouts/capability-questions/capability-questions.vue b/src/layouts/capability-questions/capability-questions.vue
index 298752045..fcbf9d3f7 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/questions-page-layout/questions-page-layout";
+import questionsPageLayout from "@/common-components/layouts/questions-page-layout/questions-page-layout";
 
 // 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 fc44c1a98..b8caae7f3 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/questions-page-layout/questions-page-layout";
+import questionsPageLayout from "@/common-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 1704d46e8..6aa0fb7f8 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/questions-page-layout/questions-page-layout";
+import questionsPageLayout from "@/common-components/layouts/questions-page-layout/questions-page-layout";
 
 // Supporting Files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";