diff --git a/src/constants/application-config.js b/src/constants/application-config.js
index a03e5f010..788de3fd7 100644
--- a/src/constants/application-config.js
+++ b/src/constants/application-config.js
@@ -6,6 +6,7 @@ const applicationConfig = {
     COOKIE_PATH: "/",
     CURRENT_ENVIRONMENT: process.env.VUE_APP_CURRENT_ENVIRONMENT, // "Localhost", "Dev", "QA", and "Prod"
     HERITAGE_FUNNEL: process.env.VUE_APP_HERITAGE_FUNNEL,
+    SAFELITE_HOP: process.env.VUE_APP_SAFELITE_HOP,
     APPLICATION_NAME: "FixMyGlass",
     ANALYTICS_APPLICATION_NAME: "FixMyGlassNextGen",
     APPLICATION_ABBREVIATION: "fmg",
diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index 7b89b7e57..4cc75f701 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -46,9 +46,7 @@
 </template>
 
 <script>
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
 import analyticsMixin from "@/mixins/analytics-mixin";
-import router from "@/router/index.js";
 import modalButtonMain from "@/digital-components/modal/ux-components/modal-button-main/modal-button-main";
 import { Modal } from "bootstrap";
 import { useForm } from "vee-validate";
@@ -91,11 +89,7 @@ export default {
             const validationResult = await this.validate();
             if (validationResult.valid) {
                 if (analyticsMixin.methods.sessionExpired()) {
-                    analyticsMixin.methods.initSession();
-                    router.push({
-                        path: "/",
-                        query: { fmgPage: fmgPageValues.RETURN_USER },
-                    });
+                    this.$router.sendToReturnUser();
                 } else {
                     this.$emit("footer-button-event");
                 }
diff --git a/src/fmg-components/nav-bar/nav-bar.vue b/src/fmg-components/nav-bar/nav-bar.vue
index eaf37047c..aed1edb19 100644
--- a/src/fmg-components/nav-bar/nav-bar.vue
+++ b/src/fmg-components/nav-bar/nav-bar.vue
@@ -45,9 +45,7 @@
 <script>
 import textLink from "@/ux-components/text-link/text-link";
 import buttonMain from "@/ux-components/button-main/button-main";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
 import analyticsMixin from "@/mixins/analytics-mixin";
-import router from "@/router/index.js";
 
 export default {
     name: "navbar",
@@ -113,12 +111,7 @@ export default {
             }
         },
         routeReturnUser() {
-            analyticsMixin.methods.initSession();
-
-            router.push({
-                path: "/",
-                query: { fmgPage: fmgPageValues.RETURN_USER },
-            });
+            this.$router.sendToReturnUser();
         },
     },
 };
diff --git a/src/global-methods.js b/src/global-methods.js
index 784ba6782..e90843bdc 100644
--- a/src/global-methods.js
+++ b/src/global-methods.js
@@ -1,7 +1,7 @@
 import axios from "axios";
 import analyticsMixIn from "@/mixins/analytics-mixin.js";
 import baseMixin from "@/mixins/base-mixin.js";
-import router from "@/router/a-rewrite";
+import router from "@/router";
 import store from "@/store";
 
 import { applicationConfig } from "@/constants/application-config.js";
diff --git a/src/helpers/heritage-integration/navigation-helper.js b/src/helpers/heritage-integration/navigation-helper.js
index 2fc557a16..ca547b980 100644
--- a/src/helpers/heritage-integration/navigation-helper.js
+++ b/src/helpers/heritage-integration/navigation-helper.js
@@ -1,11 +1,7 @@
 import { queryStrings } from "@/constants/query-strings";
 import { getQuerystringParameter } from "@/helpers/querystring-helper";
-import { externalUrls } from "@/router/router-constants/externalUrl-values";
-import { lazyLoadComponent } from "@/router/dynamic-routing/component-loader.js";
 import { saveSession } from "@/helpers/heritage-integration/order-helper.js";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
 import { storeActions } from "@/constants/store-actions.js";
-import { settleAllPromises } from "@/helpers/layout-helper";
 import experimentMixin from "@/mixins/experiment-mixin";
 import { experimentSettings } from "@/constants/experiments";
 import { includesWindshieldReplacement } from "@/helpers/damage-helper";
@@ -13,103 +9,9 @@ import { applicationConfig } from "@/constants/application-config.js";
 import store from "@/store";
 import router from "@/router";
 
-export async function getPageToRouteExistingOrderTo(toRoute = {}) {
-    const fmgQueryPage = toRoute.query[queryStrings.FMG_PAGE];
-    const hasFmgQueryPage = !!fmgQueryPage;
-
-    if (hasFmgQueryPage) {
-        return await getDirectNavigation(toRoute);
-    } else {
-        return await getImplicitNavigation(toRoute);
-    }
-}
-
-/*
- * Send the user to the specified page, except in specific scenarios.
- */
-export async function getDirectNavigation(toRoute) {
-    const fmgPageValue = toRoute.query[queryStrings.FMG_PAGE];
-
-    // Verified insurance users need to be routed around some pages.  Same goes for C&C unverified 6 digit referrals
-    // vehicle -> vehicle-damage
-    // quote -> vin-lookup/estimate
-    // insurance-company -> vin-lookup/estimate
-    if (
-        store.getters.payment?.insuranceCoverage?.isVerified ||
-        store.getters.order?.referralNumber?.length === 6
-    ) {
-        if (fmgPageValue === fmgPageValues.VEHICLE) {
-            return fmgPageValues.VEHICLE_DAMAGE;
-        }
-
-        if (fmgPageValue === fmgPageValues.QUOTE) {
-            const skipVin = await skipVinLookup();
-
-            if (skipVin || !store.getters.vehicle?.vin) {
-                return fmgPageValues.ESTIMATE;
-            } else {
-                return fmgPageValues.VIN_LOOKUP;
-            }
-        }
-    }
-
-    // Otherwise, respect navigation from query string.
-    return fmgPageValue;
-}
-
-/*
- * Determine which page in the flow the user should be sent to, based on their current order.
- * General strategy: run through pages in reverse order, and select first where prerequisites are valid.
- * QUOTE is the latest page to send to.
- */
-export async function getImplicitNavigation(toRoute) {
-    const vehicleDamageComponent = await getLazyLoadedComponent(fmgPageValues.VEHICLE_DAMAGE);
-    const estimateComponent = await getLazyLoadedComponent(fmgPageValues.ESTIMATE);
-    const vinLookupComponent = await getLazyLoadedComponent(fmgPageValues.VIN_LOOKUP);
-    const partQuestionsComponent = await getLazyLoadedComponent(fmgPageValues.PART_QUESTIONS);
-    const vehiclePartsComponent = await getLazyLoadedComponent(fmgPageValues.VEHICLE_PARTS);
-    const moldingQuestionsComponent = await getLazyLoadedComponent(fmgPageValues.MOLDING_QUESTIONS);
-    const capabilityQuestionsComponent = await getLazyLoadedComponent(
-        fmgPageValues.CAPABILITY_QUESTIONS
-    );
-    const quoteComponent = await getLazyLoadedComponent(fmgPageValues.QUOTE);
-
-    const skipVin = await skipVinLookup();
-
-    if (store.getters.order.payment.insuranceCoverage?.isVerified) {
-        return fmgPageValues.HERITAGE;
-    }
-
-    if (quoteComponent.methods.arePagePrerequisitesValid()) {
-        // Do not send to quote if verified insurance user.
-        if (store.getters.requiresVerifiedRedirecting) {
-            return fmgPageValues.HERITAGE;
-        } else {
-            return fmgPageValues.QUOTE;
-        }
-    } else if (capabilityQuestionsComponent.methods.arePagePrerequisitesValid()) {
-        return fmgPageValues.CAPABILITY_QUESTIONS;
-    } else if (moldingQuestionsComponent.methods.arePagePrerequisitesValid()) {
-        return fmgPageValues.MOLDING_QUESTIONS;
-    } else if (vehiclePartsComponent.methods.arePagePrerequisitesValid()) {
-        return fmgPageValues.VEHICLE_PARTS;
-    } else if (partQuestionsComponent.methods.arePagePrerequisitesValid()) {
-        return fmgPageValues.PART_QUESTIONS;
-    } else if (vinLookupComponent.methods.arePagePrerequisitesValid() && !skipVin) {
-        return fmgPageValues.VIN_LOOKUP;
-    } else if (estimateComponent.methods.arePagePrerequisitesValid()) {
-        return fmgPageValues.ESTIMATE;
-    } else if (vehicleDamageComponent.methods.arePagePrerequisitesValid()) {
-        return fmgPageValues.VEHICLE_DAMAGE;
-    } else {
-        return fmgPageValues.VEHICLE;
-    }
-}
-
 /*
     Used to navigate to the heritage funnel with the correct query string and url.
 */
-
 export async function navigateToHeritageFunnel({ shouldSaveSession, pageNameToLog, navType }) {
     const log = getQuerystringParameter(queryStrings.LOG);
     if (log === "true") {
@@ -191,7 +93,3 @@ export async function skipVinLookupNotRepair() {
         experimentMixin.methods.hasSettingEqualTo(experimentSettings.SUPPRESS_VIN_CAPTURE, "true")
     );
 }
-
-async function getLazyLoadedComponent(pageName) {
-    return (await lazyLoadComponent(pageName)()).default;
-}
diff --git a/src/helpers/unit-test-helper.js b/src/helpers/unit-test-helper.js
index 7c3c9ed4e..540f607b0 100644
--- a/src/helpers/unit-test-helper.js
+++ b/src/helpers/unit-test-helper.js
@@ -1,8 +1,7 @@
 import { storeActions } from "@/constants/store-actions";
 import { storeMutations } from "@/constants/store-mutations.js";
-import { navigationScenarios } from "@/router/router-constants/navigation-scenarios.js";
+import { navigationScenarios } from "@/router/constants/navigation-scenarios.js";
 import { vehicleCategories } from "@/constants/vehicle-categories.js";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
 import { cookieNames } from "@/constants/cookie-names";
 import { Form } from "vee-validate";
 import baseMixin from "@/mixins/base-mixin";
@@ -19,7 +18,6 @@ import {
     ValueToLogTypes,
 } from "@/constants/analytics";
 import { queryStrings } from "@/constants/query-strings";
-import { routerParams } from "@/router/router-constants/router-params";
 
 // Common methods
 export function getMountOptions(mockData) {
@@ -60,7 +58,6 @@ export function getMountOptions(mockData) {
     mocks.storeMutations = storeMutations;
     mocks.navigationScenarios = navigationScenarios;
     mocks.vehicleCategories = vehicleCategories;
-    mocks.fmgPageValues = fmgPageValues;
     mocks.analyticsPageEvents = analyticsPageEvents;
     mocks.GaCategories = GaCategories;
     mocks.GaActions = GaActions;
@@ -68,7 +65,6 @@ export function getMountOptions(mockData) {
     mocks.GaEvents = GaEvents;
     mocks.ValueToLogTypes = ValueToLogTypes;
     mocks.queryStrings = queryStrings;
-    mocks.routerParams = routerParams;
 
     // Mock $store and $router when accessing this.$store/$router
     mocks.$store = mockData.store;
diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue
index 6a82ea26c..91aed6f1a 100644
--- a/src/layouts/address-lookup/address-lookup.vue
+++ b/src/layouts/address-lookup/address-lookup.vue
@@ -118,12 +118,11 @@ import { errorMessages } from "@/constants/error-messages";
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import { storeActions } from "@/constants/store-actions";
-import { routerParams } from "@/router/router-constants/router-params";
 import { getDamageString, isGlassAvailableForCarId } from "@/helpers/damage-helper";
 import baseMixin from "@/mixins/base-mixin.js";
 import store from "@/store";
 import vinPagesMixin from "@/mixins/vin-pages-mixin";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import { routeData } from "@/router/constants/routes";
 
 // DEFINE VALIDATION RULES - Note: Additional rules are defined in Customer Questions and Address Questions components
 defineRule("service-zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
@@ -412,7 +411,7 @@ export default {
             await this.dispatchStoreAction(
                 storeActions.SAVE_PAGE_DATA,
                 {
-                    page: fmgPageValues.EMAIL_SMS_PAGES,
+                    page: routeData.SERVICE_ZIP.name,
                     data: { emailOrSmsValue: this.customerQuestions.emailOrSms },
                 },
                 false
diff --git a/src/layouts/address-vehicles/address-vehicles.vue b/src/layouts/address-vehicles/address-vehicles.vue
index e094f6147..baffb70a6 100644
--- a/src/layouts/address-vehicles/address-vehicles.vue
+++ b/src/layouts/address-vehicles/address-vehicles.vue
@@ -60,7 +60,7 @@ import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import store from "@/store";
 import { storeActions } from "@/constants/store-actions";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import { routeData } from "@/router/constants/routes";
 import { errorMessages } from "@/constants/error-messages";
 import { required } from "@/helpers/validation-rules";
 import { Form, defineRule } from "vee-validate";
@@ -71,7 +71,6 @@ import {
     getRouterLinkRouteFromCopy,
     getRouterLinkDisplayTextFromCopy,
 } from "@/helpers/cms-content-helper";
-import { routerParams } from "@/router/router-constants/router-params";
 import vinPagesMixin from "@/mixins/vin-pages-mixin";
 
 // DEFINE VALIDATION RULES
@@ -144,7 +143,7 @@ export default {
             return mappedData;
         },
         VehiclesFromApi() {
-            return store.getters.pageData(fmgPageValues.ADDRESS_VEHICLES);
+            return store.getters.pageData(routeData.ADDRESS_VEHICLES.name);
         },
         selectedVehicle() {
             return this.VehiclesForQuestions.find(({ vin }) => vin === this.selectedVehicleVin);
@@ -159,7 +158,7 @@ export default {
             if (
                 store.getters.order.vehicle.carId &&
                 store.getters.order.serviceLocation.zipCode &&
-                store.getters.pageData(fmgPageValues.ADDRESS_VEHICLES)
+                store.getters.pageData(routeData.ADDRESS_VEHICLES.name)
             ) {
                 return true;
             }
diff --git a/src/layouts/capability-questions/capability-questions.vue b/src/layouts/capability-questions/capability-questions.vue
index e04f0f18e..c4f5df92c 100644
--- a/src/layouts/capability-questions/capability-questions.vue
+++ b/src/layouts/capability-questions/capability-questions.vue
@@ -32,7 +32,7 @@ import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import store from "@/store";
 import { storeActions } from "@/constants/store-actions";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import { routeData } from "@/router/constants/routes";
 import { Form, defineRule } from "vee-validate";
 import { required } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
@@ -97,7 +97,7 @@ export default {
             return this.getCmsContent("AdditionalPartsQuestionsAlert", "BodyText");
         },
         partsOrQuestionsData() {
-            return this.$store.getters.pageData(fmgPageValues.CAPABILITY_QUESTIONS)
+            return this.$store.getters.pageData(routeData.CAPABILITY_QUESTIONS.name)
                 .partsOrQuestions;
         },
     },
@@ -107,7 +107,7 @@ export default {
     methods: {
         arePagePrerequisitesValid() {
             const capabilityQuestionsPageData = store.getters.pageData(
-                fmgPageValues.CAPABILITY_QUESTIONS
+                routeData.CAPABILITY_QUESTIONS.name
             );
             return (
                 // has capabilityQuestions array and has glassName not null
diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index 66d1544d9..811cd1a86 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -62,7 +62,7 @@ import { saveSession } from "@/helpers/heritage-integration/order-helper.js";
 import baseMixin from "@/mixins/base-mixin.js";
 import { queryStrings } from "@/constants/query-strings";
 import { nextTick } from "vue";
-import { consumeQueryFromStash } from "@/router/a-rewrite/methods/helpers/querystring-stash";
+import { consumeQueryFromStash } from "@/router/methods/helpers/querystring-stash";
 
 // Define Validation Rules
 defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue
index 673116965..cab786b4a 100644
--- a/src/layouts/license-plate-lookup/license-plate-lookup.vue
+++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue
@@ -112,14 +112,13 @@ import { settleAllPromises } from "@/helpers/layout-helper";
 import { storeActions } from "@/constants/store-actions";
 import { errorMessages } from "@/constants/error-messages";
 import { getDamageString, isGlassAvailableForCarId } from "@/helpers/damage-helper";
-import { routerParams } from "@/router/router-constants/router-params";
 import { required, regex } from "@/helpers/validation-rules";
 import { Form, defineRule } from "vee-validate";
 import baseMixin from "@/mixins/base-mixin.js";
 import store from "@/store";
 import vinPagesMixin from "@/mixins/vin-pages-mixin";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
-import { consumeQueryFromStash } from "@/router/a-rewrite/methods/helpers/querystring-stash";
+import { routeData } from "@/router/constants/routes";
+import { consumeQueryFromStash } from "@/router/methods/helpers/querystring-stash";
 import { queryStrings } from "@/constants/query-strings";
 
 // DEFINE VALIDATION RULES
@@ -367,7 +366,7 @@ export default {
             await this.dispatchStoreAction(
                 storeActions.SAVE_PAGE_DATA,
                 {
-                    page: fmgPageValues.EMAIL_SMS_PAGES,
+                    page: routeData.SERVICE_ZIP.name,
                     data: { emailOrSmsValue: this.emailOrSms },
                 },
                 false
diff --git a/src/layouts/molding-questions/molding-questions.vue b/src/layouts/molding-questions/molding-questions.vue
index 82b1e1619..a7f4900de 100644
--- a/src/layouts/molding-questions/molding-questions.vue
+++ b/src/layouts/molding-questions/molding-questions.vue
@@ -32,7 +32,7 @@ import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import store from "@/store";
 import { storeActions } from "@/constants/store-actions";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import { routeData } from "@/router/constants/routes";
 import { Form, defineRule } from "vee-validate";
 import { required } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
@@ -112,7 +112,7 @@ export default {
             return this.getCmsContent("AdditionalPartsQuestionsAlert", "BodyText");
         },
         partsOrQuestionsData() {
-            return this.$store.getters.pageData(fmgPageValues.MOLDING_QUESTIONS).partsOrQuestions;
+            return this.$store.getters.pageData(routeData.MOLDING_QUESTIONS.name).partsOrQuestions;
         },
     },
     mounted() {
@@ -121,7 +121,7 @@ export default {
     methods: {
         arePagePrerequisitesValid() {
             const moldingQuestionsFromPageData = store.getters.pageData(
-                fmgPageValues.MOLDING_QUESTIONS
+                routeData.MOLDING_QUESTIONS.name
             );
             return (
                 // has childPartQuestions array and has glassName not null
diff --git a/src/layouts/part-questions/part-questions.vue b/src/layouts/part-questions/part-questions.vue
index 89568fa37..5456d868f 100644
--- a/src/layouts/part-questions/part-questions.vue
+++ b/src/layouts/part-questions/part-questions.vue
@@ -32,7 +32,7 @@ import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import store from "@/store";
 import { storeActions } from "@/constants/store-actions";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import { routeData } from "@/router/constants/routes";
 import { Form, defineRule } from "vee-validate";
 import { required } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
@@ -114,7 +114,7 @@ export default {
             return this.getCmsContent("AlertPartsQuestions", "BodyText");
         },
         partsOrQuestionsData() {
-            return this.$store.getters.pageData(fmgPageValues.PART_QUESTIONS).partsOrQuestions;
+            return this.$store.getters.pageData(routeData.PART_QUESTIONS.name).partsOrQuestions;
         },
     },
     mounted() {
@@ -122,7 +122,7 @@ export default {
     },
     methods: {
         arePagePrerequisitesValid() {
-            const partQuestionsFromPageData = store.getters.pageData(fmgPageValues.PART_QUESTIONS);
+            const partQuestionsFromPageData = store.getters.pageData(routeData.PART_QUESTIONS.name);
             return (
                 // has .partQuestions array and has glassName not null
                 partQuestionsFromPageData?.partsOrQuestions?.some((part) => part?.glassName) &&
diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index 51a3ffd5d..e2debfe4a 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -147,7 +147,6 @@ import {
     getNewlyInactivatedPromos,
 } from "@/helpers/promotions-helper";
 import { queryStrings } from "@/constants/query-strings";
-import { routerParams } from "@/router/router-constants/router-params";
 import { getQuerystringParameter } from "@/helpers/querystring-helper";
 import { deepClone } from "@/helpers/object-helper";
 
@@ -168,7 +167,7 @@ import {
     getSubTotal,
     getSalesTax,
 } from "@/helpers/pricing-helper.js";
-import { consumeQueryFromStash } from "@/router/a-rewrite/methods/helpers/querystring-stash";
+import { consumeQueryFromStash } from "@/router/methods/helpers/querystring-stash";
 
 defineRule("payment-method-required", required(errorMessages.OPTION_REQUIRED));
 defineRule("recal-ack-required", required(errorMessages.RECAL_ACK_REQUIRED));
diff --git a/src/layouts/payment-pia-return/payment-pia-return.vue b/src/layouts/payment-pia-return/payment-pia-return.vue
index b39726948..b1ec2b120 100644
--- a/src/layouts/payment-pia-return/payment-pia-return.vue
+++ b/src/layouts/payment-pia-return/payment-pia-return.vue
@@ -13,7 +13,6 @@ import store from "@/store";
 import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue";
 import { Form } from "vee-validate";
 import { paymentMethods } from "@/constants/payment-method-constants";
-import { routerParams } from "@/router/router-constants/router-params";
 import baseMixin from "@/mixins/base-mixin.js";
 import {
     getDisplayAmountDue,
diff --git a/src/layouts/payment/payment.vue b/src/layouts/payment/payment.vue
index f2bdb6733..40d772dbb 100644
--- a/src/layouts/payment/payment.vue
+++ b/src/layouts/payment/payment.vue
@@ -213,7 +213,6 @@ import alert from "@/ux-components/alert/alert";
 
 import { storeActions } from "@/constants/store-actions";
 import store from "@/store";
-import { externalUrls } from "@/router/router-constants/externalUrl-values";
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import { applicationConfig } from "@/constants/application-config";
@@ -231,7 +230,6 @@ import { getQuerystringParameter } from "@/helpers/querystring-helper";
 import { deepClone } from "@/helpers/object-helper";
 import { submitWorkOrder } from "@/helpers/heritage-integration/order-helper.js";
 import iframeResize from "../../../node_modules/iframe-resizer/js/iframeResizer.js";
-import { routerParams } from "@/router/router-constants/router-params";
 import { coverageStatus } from "@/constants/insurance";
 import { getBoolFromString } from "@/helpers/boolean-helper.js";
 import {
@@ -245,7 +243,7 @@ export default {
     name: "payment",
     data() {
         return {
-            checkoutUrl: externalUrls.SAFELITE_HOP,
+            checkoutUrl: applicationConfig.SAFELITE_HOP,
             piaResponseUrl: applicationConfig.PIA_RESPONSE_URL,
             piaCancelUrl: applicationConfig.PIA_CANCEL_URL,
             piaErrorUrl: applicationConfig.PIA_ERROR_URL,
@@ -693,9 +691,7 @@ export default {
                 console.log("error: response from submit work order(payment pg):" + error.message);
                 this.$router.navigateWithoutSaving(
                     this.navigationScenarios.PIA_ERROR,
-                    this.pageName,
-                    {},
-                    { [routerParams.DISPLAY_PIA_ALERT]: true }
+                    this.pageName
                 );
                 this.$refs.loadingModal.isModalVisible = false;
                 return;
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index c095d00be..a31719dbd 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -168,8 +168,8 @@ import {
     getDeviceIdValue,
 } from "@/helpers/heritage-integration/cookie-helper";
 import { showFmgLoadingModal } from "@/helpers/loading-modal-helper";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
-import { consumeQueryFromStash } from "@/router/a-rewrite/methods/helpers/querystring-stash";
+import { routeData } from "@/router/constants/routes";
+import { consumeQueryFromStash } from "@/router/methods/helpers/querystring-stash";
 import { storeMutations } from "@/constants/store-mutations";
 
 defineRule("option-required", required(errorMessages.OPTION_REQUIRED));
@@ -283,7 +283,7 @@ export default {
         const emailFromStore = store.getters.order.customer.emailAddress;
         const isEmailInStoreOnPageLoad = emailFromStore?.length > 0;
         const isPopupSkipped =
-            store.getters.pageData(fmgPageValues.QUOTE)?.saveProgressPopupSkipped === true;
+            store.getters.pageData(routeData.QUOTE.name)?.saveProgressPopupSkipped === true;
         const showSaveProgressPopup = !(isEmailInStoreOnPageLoad || isPopupSkipped);
         const showSaveProgressModal = isEmailInStoreOnPageLoad ? false : true;
         const shouldSkipToInsurance =
@@ -685,7 +685,7 @@ export default {
             await this.dispatchStoreAction(
                 storeActions.SAVE_PAGE_DATA,
                 {
-                    page: fmgPageValues.QUOTE,
+                    page: routeData.QUOTE.name,
                     data: { saveProgressPopupSkipped: true },
                 },
                 false
diff --git a/src/layouts/service-zip/service-zip.vue b/src/layouts/service-zip/service-zip.vue
index 6e0bccda6..819fa4273 100644
--- a/src/layouts/service-zip/service-zip.vue
+++ b/src/layouts/service-zip/service-zip.vue
@@ -95,8 +95,8 @@ import vinPagesMixin from "@/mixins/vin-pages-mixin";
 import { saveSession } from "@/helpers/heritage-integration/order-helper.js";
 import baseMixin from "@/mixins/base-mixin.js";
 import { queryStrings } from "@/constants/query-strings";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
-import { consumeQueryFromStash } from "@/router/a-rewrite/methods/helpers/querystring-stash";
+import { routeData } from "@/router/constants/routes";
+import { consumeQueryFromStash } from "@/router/methods/helpers/querystring-stash";
 
 // Define Validation Rules
 defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
@@ -243,7 +243,7 @@ export default {
             await this.dispatchStoreAction(
                 storeActions.SAVE_PAGE_DATA,
                 {
-                    page: fmgPageValues.EMAIL_SMS_PAGES,
+                    page: routeData.SERVICE_ZIP.name,
                     data: { emailOrSmsValue: this.emailOrSms },
                 },
                 false
diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index 488ad1eb4..1106f7324 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -97,7 +97,6 @@ import { errorMessages } from "@/constants/error-messages";
 import { damageLocationsCms } from "@/constants/damage-locations-cms.js";
 import { damageLocationsSelected } from "@/constants/damage-locations-selected.js";
 import { getFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
-import { routerParams } from "@/router/router-constants/router-params";
 
 import store from "@/store";
 import baseMixin from "@/mixins/base-mixin";
diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue
index 4298b74cb..fcea707eb 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.vue
+++ b/src/layouts/vehicle-parts/vehicle-parts.vue
@@ -69,7 +69,7 @@ import saveProgressModalQuestion from "@/fmg-components/save-progress-modal-ques
 // Supporting Files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import { routeData } from "@/router/constants/routes";
 import { Form } from "vee-validate";
 import store from "@/store";
 import vehicleQuestionsMixin from "@/mixins/vehicle-questions-mixin";
@@ -162,7 +162,7 @@ export default {
         },
 
         PartsFromApi() {
-            return this.$store.getters.pageData(fmgPageValues.VEHICLE_PARTS);
+            return this.$store.getters.pageData(routeData.VEHICLE_PARTS.name);
         },
 
         RefPrefix() {
@@ -172,7 +172,7 @@ export default {
     methods: {
         arePagePrerequisitesValid() {
             // Check if isRepair is populated and if the pageData we need is here (Parts data)
-            const vehiclePartsFromPageData = store.getters.pageData(fmgPageValues.VEHICLE_PARTS);
+            const vehiclePartsFromPageData = store.getters.pageData(routeData.VEHICLE_PARTS.name);
             return (
                 store.getters.damage.isRepair != null &&
                 vehiclePartsFromPageData?.partsOrQuestions?.some((part) => part?.glassName)
diff --git a/src/layouts/vehicle/vehicle.vue b/src/layouts/vehicle/vehicle.vue
index 8686be85b..174c76530 100644
--- a/src/layouts/vehicle/vehicle.vue
+++ b/src/layouts/vehicle/vehicle.vue
@@ -113,7 +113,7 @@ import { getQuerystringParameter } from "@/helpers/querystring-helper";
 import {
     consumeQueryFromStash,
     peekQueryFromStash,
-} from "@/router/a-rewrite/methods/helpers/querystring-stash";
+} from "@/router/methods/helpers/querystring-stash";
 
 //define validation rules
 defineRule("year-required", required(errorMessages.YEAR_REQUIRED));
diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index 277e176f5..05f6fdbd7 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -155,12 +155,11 @@ import {
 import { required, regex } from "@/helpers/validation-rules";
 import { Form, defineRule } from "vee-validate";
 import { getFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
-import { routerParams } from "@/router/router-constants/router-params";
 import baseMixin from "@/mixins/base-mixin.js";
 import store from "@/store";
 import vinPagesMixin from "@/mixins/vin-pages-mixin";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
-import { consumeQueryFromStash } from "@/router/a-rewrite/methods/helpers/querystring-stash";
+import { routeData } from "@/router/constants/routes";
+import { consumeQueryFromStash } from "@/router/methods/helpers/querystring-stash";
 import { queryStrings } from "@/constants/query-strings";
 
 // DEFINE VALIDATION RULES
@@ -391,7 +390,7 @@ export default {
                 await this.dispatchStoreAction(
                     storeActions.SAVE_PAGE_DATA,
                     {
-                        page: fmgPageValues.EMAIL_SMS_PAGES,
+                        page: routeData.SERVICE_ZIP.name,
                         data: { emailOrSmsValue: this.emailOrSms },
                     },
                     false
@@ -454,7 +453,7 @@ export default {
                 await this.dispatchStoreAction(
                     storeActions.SAVE_PAGE_DATA,
                     {
-                        page: fmgPageValues.EMAIL_SMS_PAGES,
+                        page: routeData.SERVICE_ZIP.name,
                         data: { emailOrSmsValue: this.emailOrSms },
                     },
                     false
diff --git a/src/main.js b/src/main.js
index 5b823125b..5d655db85 100644
--- a/src/main.js
+++ b/src/main.js
@@ -2,7 +2,7 @@ import { createApp } from "vue";
 import LoadScript from "vue-plugin-load-script";
 import Maska from "maska";
 import App from "./App.vue";
-import router from "./router/a-rewrite";
+import router from "@/router";
 import store from "@/store";
 import baseMixin from "@/mixins/base-mixin.js";
 import analyticsMixin from "@/mixins/analytics-mixin.js";
diff --git a/src/mixins/analytics-mixin.js b/src/mixins/analytics-mixin.js
index b1df7156c..05baa9b0b 100644
--- a/src/mixins/analytics-mixin.js
+++ b/src/mixins/analytics-mixin.js
@@ -27,8 +27,7 @@ import store from "@/store";
 import baseMixin from "@/mixins/base-mixin";
 import { applicationConfig } from "../constants/application-config";
 import { getFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
-import router from "@/router/index.js";
+import { routeData } from "@/router/constants/routes";
 import { getQuerystringParameter } from "@/helpers/querystring-helper";
 import { Variables } from "../constants/analytics";
 
@@ -45,7 +44,7 @@ export default {
             const submittedOrder = baseMixin.methods.getSubmittedOrder();
             const hasSubmittedOrder = baseMixin.methods.hasSubmittedOrder();
             const hasSubmittedOrderAtConfirmationPage =
-                hasSubmittedOrder && currentPageName?.toLowerCase() == fmgPageValues.CONFIRMATION;
+                hasSubmittedOrder && currentPageName?.toLowerCase() == routeData.CONFIRMATION.name;
 
             const refSequenceNum = hasSubmittedOrderAtConfirmationPage
                 ? submittedOrder.referralSequenceNumber
diff --git a/src/mixins/base-mixin.js b/src/mixins/base-mixin.js
index e39908a8f..3dfca7dbf 100644
--- a/src/mixins/base-mixin.js
+++ b/src/mixins/base-mixin.js
@@ -2,9 +2,8 @@ import store from "@/store";
 import { storeActions } from "@/constants/store-actions.js";
 import { storeMutations } from "@/constants/store-mutations.js";
 import { sessionStorageKeyConstants } from "@/constants/session-storage.js";
-import { navigationScenarios } from "@/router/a-rewrite/constants/navigation-scenarios";
+import { navigationScenarios } from "@/router/constants/navigation-scenarios";
 import { vehicleCategories } from "@/constants/vehicle-categories.js";
-import { routerParams } from "@/router/router-constants/router-params";
 import { queryStrings } from "@/constants/query-strings";
 import { dynamicStrings } from "@/constants/dynamic-strings";
 import { partTypeStrings } from "../constants/part-type-strings";
@@ -235,9 +234,6 @@ export default {
         vehicleCategories() {
             return vehicleCategories;
         },
-        routerParams() {
-            return routerParams;
-        },
         queryStrings() {
             return queryStrings;
         },
diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js
index ab39462ce..c8d6a554f 100644
--- a/src/mixins/vehicle-questions-mixin.js
+++ b/src/mixins/vehicle-questions-mixin.js
@@ -1,6 +1,6 @@
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import { routeData } from "@/router/constants/routes";
 import { storeMutations } from "@/constants/store-mutations.js";
-import { navigationScenarios } from "../router/router-constants/navigation-scenarios";
+import { navigationScenarios } from "@/router/constants/navigation-scenarios";
 import { storeActions } from "@/constants/store-actions";
 import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
 import baseMixin from "@/mixins/base-mixin.js";
@@ -53,11 +53,11 @@ export default {
         },
         comparePageIndices(currentPage, fmgPage) {
             const orderedVehicleQuestionPages = [
-                fmgPageValues.PART_QUESTIONS,
-                fmgPageValues.VEHICLE_PARTS,
-                fmgPageValues.MOLDING_QUESTIONS,
-                fmgPageValues.CAPABILITY_QUESTIONS,
-                fmgPageValues.QUOTE,
+                routeData.PART_QUESTIONS.name,
+                routeData.VEHICLE_PARTS.name,
+                routeData.MOLDING_QUESTIONS.name,
+                routeData.CAPABILITY_QUESTIONS.name,
+                routeData.QUOTE.name,
             ];
 
             return (
@@ -369,7 +369,7 @@ export default {
 
             if (
                 hasPartQuestions &&
-                this.currentPageComesBeforePage(currentPage, fmgPageValues.PART_QUESTIONS)
+                this.currentPageComesBeforePage(currentPage, routeData.PART_QUESTIONS.name)
             ) {
                 self.$router.navigateWithPageData(
                     self.navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
@@ -378,7 +378,7 @@ export default {
                 );
             } else if (
                 hasGlassLocationWithMultipleParts &&
-                this.currentPageComesBeforePage(currentPage, fmgPageValues.VEHICLE_PARTS)
+                this.currentPageComesBeforePage(currentPage, routeData.VEHICLE_PARTS.name)
             ) {
                 // if multiple parts on any glass
                 // go to vehicle-parts page and pass the partsData
@@ -389,7 +389,7 @@ export default {
                 );
             } else if (
                 hasChildPartQuestions &&
-                this.currentPageComesBeforePage(currentPage, fmgPageValues.MOLDING_QUESTIONS)
+                this.currentPageComesBeforePage(currentPage, routeData.MOLDING_QUESTIONS.name)
             ) {
                 // if any childpart questions
                 // go to molding-questions page and pass the partsData
@@ -400,7 +400,7 @@ export default {
                 );
             } else if (
                 hasCapabilityQuestions &&
-                this.currentPageComesBeforePage(currentPage, fmgPageValues.CAPABILITY_QUESTIONS)
+                this.currentPageComesBeforePage(currentPage, routeData.CAPABILITY_QUESTIONS.name)
             ) {
                 // if has capability questions
                 // go to capability-questions page and pass the partsData
@@ -479,14 +479,14 @@ export default {
             const self = vm ?? this;
             const currentPage = self.pageName;
             const pageDataCapabilityQuestions = self.$store.getters.pageData(
-                fmgPageValues.CAPABILITY_QUESTIONS
+                routeData.CAPABILITY_QUESTIONS.name
             );
             const pageDataMoldingQuestions = self.$store.getters.pageData(
-                fmgPageValues.MOLDING_QUESTIONS
+                routeData.MOLDING_QUESTIONS.name
             );
-            const pageDataVehicleParts = self.$store.getters.pageData(fmgPageValues.VEHICLE_PARTS);
+            const pageDataVehicleParts = self.$store.getters.pageData(routeData.VEHICLE_PARTS.name);
             const pageDataPartQuestions = self.$store.getters.pageData(
-                fmgPageValues.PART_QUESTIONS
+                routeData.PART_QUESTIONS.name
             );
 
             const allPartsOrQuestions = [
@@ -510,23 +510,23 @@ export default {
 
             if (
                 hasCapabilityQuestions &&
-                this.currentPageComesAfterPage(currentPage, fmgPageValues.CAPABILITY_QUESTIONS)
+                this.currentPageComesAfterPage(currentPage, routeData.CAPABILITY_QUESTIONS.name)
             ) {
                 backNavigationScenario = navigationScenarios.CLICKED_BACK_WITH_CAPABILITY_QUESTIONS;
             } else if (
                 hasChildPartQuestions &&
-                this.currentPageComesAfterPage(currentPage, fmgPageValues.MOLDING_QUESTIONS)
+                this.currentPageComesAfterPage(currentPage, routeData.MOLDING_QUESTIONS.name)
             ) {
                 backNavigationScenario = navigationScenarios.CLICKED_BACK_WITH_MOLDING_QUESTIONS;
             } else if (
                 hasGlassLocationWithMultipleParts &&
-                this.currentPageComesAfterPage(currentPage, fmgPageValues.VEHICLE_PARTS)
+                this.currentPageComesAfterPage(currentPage, routeData.VEHICLE_PARTS.name)
             ) {
                 backNavigationScenario =
                     navigationScenarios.CLICKED_BACK_WITH_MULTIPLE_PARTS_TO_CHOOSE;
             } else if (
                 hasPartQuestions &&
-                this.currentPageComesAfterPage(currentPage, fmgPageValues.PART_QUESTIONS)
+                this.currentPageComesAfterPage(currentPage, routeData.PART_QUESTIONS.name)
             ) {
                 backNavigationScenario = navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS;
             }
diff --git a/src/router/a-rewrite/index.js b/src/router/a-rewrite/index.js
deleted file mode 100644
index 37bd5aa0d..000000000
--- a/src/router/a-rewrite/index.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import { routes } from "@/router/a-rewrite/methods/routes";
-import { afterEach } from "@/router/a-rewrite/methods/after-each";
-import { beforeEach } from "@/router/a-rewrite/methods/before-each";
-import { bailout } from "@/router/a-rewrite/methods/error";
-import {
-    navigateWithoutSaving,
-    navigateWithSaving,
-    navigateWithPageData,
-    navigateAndForceTopLevelNavigation,
-} from "@/router/a-rewrite/methods/navigate";
-import { navigateToExternalUrl } from "@/router/a-rewrite/methods/navigate-external";
-import { createWebHistory, createRouter } from "vue-router";
-import { ROUTE_PREFIX_FULL } from "@/router/a-rewrite/constants/route-prefix";
-
-const router = createRouter({
-    history: createWebHistory(ROUTE_PREFIX_FULL),
-    routes,
-    // Scroll to top on navigation.
-    scrollBehavior(to, from, savedPosition) {
-        return { top: 0 };
-    },
-});
-
-// Set guards
-router.afterEach(async (to, from) => afterEach(to, from));
-router.beforeEach(async (to, from) => beforeEach(to, from));
-
-// Bind methods for external use
-router.navigateWithSaving = navigateWithSaving;
-router.navigateWithoutSaving = navigateWithoutSaving;
-router.navigateWithPageData = navigateWithPageData;
-router.navigateAndForceTopLevelNavigation = navigateAndForceTopLevelNavigation;
-
-router.bailout = bailout;
-
-router.navigateToExternalUrl = navigateToExternalUrl;
-
-export default router;
diff --git a/src/router/a-rewrite/constants/auto-route-table.js b/src/router/constants/auto-route-table.js
similarity index 100%
rename from src/router/a-rewrite/constants/auto-route-table.js
rename to src/router/constants/auto-route-table.js
diff --git a/src/router/a-rewrite/constants/externalUrl-values.js b/src/router/constants/externalUrl-values.js
similarity index 100%
rename from src/router/a-rewrite/constants/externalUrl-values.js
rename to src/router/constants/externalUrl-values.js
diff --git a/src/router/a-rewrite/constants/navigation-scenarios.js b/src/router/constants/navigation-scenarios.js
similarity index 100%
rename from src/router/a-rewrite/constants/navigation-scenarios.js
rename to src/router/constants/navigation-scenarios.js
diff --git a/src/router/a-rewrite/constants/route-prefix.js b/src/router/constants/route-prefix.js
similarity index 100%
rename from src/router/a-rewrite/constants/route-prefix.js
rename to src/router/constants/route-prefix.js
diff --git a/src/router/a-rewrite/constants/routes.js b/src/router/constants/routes.js
similarity index 100%
rename from src/router/a-rewrite/constants/routes.js
rename to src/router/constants/routes.js
diff --git a/src/router/a-rewrite/constants/routing-table.js b/src/router/constants/routing-table.js
similarity index 99%
rename from src/router/a-rewrite/constants/routing-table.js
rename to src/router/constants/routing-table.js
index 10ee7ae90..4b7286741 100644
--- a/src/router/a-rewrite/constants/routing-table.js
+++ b/src/router/constants/routing-table.js
@@ -1,7 +1,7 @@
-import { routeData } from "@/router/a-rewrite/constants/routes";
-import { navigationScenarios } from "@/router/a-rewrite/constants/navigation-scenarios";
+import { routeData } from "@/router/constants/routes";
+import { navigationScenarios } from "@/router/constants/navigation-scenarios";
 import store from "@/store";
-import { paymentMethods } from "../../../constants/payment-method-constants";
+import { paymentMethods } from "@/constants/payment-method-constants";
 
 // Get as function to live-evaluate filters
 const routingTable = function () {
diff --git a/src/router/dynamic-routing/component-loader.js b/src/router/dynamic-routing/component-loader.js
deleted file mode 100644
index 5e25fb2ce..000000000
--- a/src/router/dynamic-routing/component-loader.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export function lazyLoadComponent(componentName) {
-    return () => import(`@/layouts/${componentName}/${componentName}.vue`); // /src/layouts/folder/component.vue
-}
diff --git a/src/router/index.js b/src/router/index.js
index eddc14e16..cd842c5cb 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,936 +1,41 @@
-// Supporting files
+import { routes } from "@/router/methods/routes";
+import { afterEach } from "@/router/methods/after-each";
+import { beforeEach } from "@/router/methods/before-each";
+import { bailout } from "@/router/methods/error";
+import {
+    navigateWithoutSaving,
+    navigateWithSaving,
+    navigateWithPageData,
+    navigateAndForceTopLevelNavigation,
+} from "@/router/methods/navigate";
+import { navigateToExternalUrl } from "@/router/methods/navigate-external";
+import { sendToReturnUser } from "@/router/methods/send-to-return-user";
 import { createWebHistory, createRouter } from "vue-router";
-import { storeActions } from "@/constants/store-actions";
-import { storeMutations } from "../constants/store-mutations";
-import { sessionStorageKeyConstants } from "@/constants/session-storage.js";
-import { lazyLoadComponent } from "@/router/dynamic-routing/component-loader.js";
-import { routingTable } from "@/router/router-constants/routing-table.js";
-import { globalEvents, globalEventTypes } from "@/constants/events";
-import { queryStrings } from "@/constants/query-strings";
-import { getQuerystringParameter, buildQuerystringObject } from "@/helpers/querystring-helper";
-import { getDeviceIdValue } from "@/helpers/heritage-integration/cookie-helper";
-import { showFmgLoadingModal } from "@/helpers/loading-modal-helper";
-import { fmgPageValues, funnelStartPageName } from "@/router/router-constants/fmgPage-values";
-import { externalParameterStatus } from "@/constants/external-parameters";
-
-// Heritage integration
-import { isSavedSessionStillActive } from "@/helpers/heritage-integration/session-helper";
-import {
-    updateOrCreateFunnelCookie,
-    getFunnelCookie,
-    updateSessionIdCookie,
-    deleteFunnelCookie,
-    getAffiliateCookies,
-    setupAdvertiserTracking,
-} from "@/helpers/heritage-integration/cookie-helper";
-import { loadSessionIfPresent, saveSession } from "@/helpers/heritage-integration/order-helper";
-import {
-    getPageToRouteExistingOrderTo,
-    navigateToHeritageFunnel,
-    getImplicitNavigation,
-} from "@/helpers/heritage-integration/navigation-helper";
-
-import baseMixin from "@/mixins/base-mixin";
-import eventBus from "@/helpers/event-bus/event-bus";
-import store from "@/store";
-import analyticsMixin from "@/mixins/analytics-mixin";
-import { experimentTriggers } from "../constants/experiments";
-import { applicationConfig } from "../constants/application-config";
-import { shouldStripPromoQueryString } from "@/helpers/promotions-helper";
-import bailout from "@/layouts/bailout/bailout";
-import { nextTick } from "vue";
-import { getBoolFromString } from "@/helpers/boolean-helper";
-
-const routes = [
-    {
-        path: "/bailout",
-        name: "bailout",
-        component: bailout,
-    },
-    {
-        path: "/",
-        name: "root",
-        async beforeEnter(to, from, next) {
-            // If we have no query string, or we don't have the FmgPage query string.
-            try {
-                log("------------- router index.js beforeEnter start -----------------");
-                log(" --to: ", to);
-                log(" --cookie: ", getFunnelCookie());
-                log(` --from.redirectedFrom:>${JSON.stringify(from.redirectedFrom)}<`, "");
-
-                await analyticsMixin.methods.validateSession();
-                var fromHeritage = getQuerystringParameter(queryStrings.FROM_HERITAGE);
-                var offerQuote = getQuerystringParameter(queryStrings.OFFER_QUOTE);
-                log(" --offerQuote: ", offerQuote);
-                // after session is validated, remove the fromHeritage querystring if it exists so session expiration works
-                if (to.query) {
-                    delete to.query[queryStrings.FROM_HERITAGE];
-                }
-                //remove offerquote querystring if it exists
-                if (offerQuote) {
-                    delete to.query[queryStrings.OFFER_QUOTE];
-                }
-
-                if (getFunnelCookie()?.SuppressConceptFunnel) {
-                    log(" --go to heritage suppressConceptFunnel: ");
-                    await navigateToHeritageFunnel({ shouldSaveSession: false });
-                    return next(false);
-                }
-
-                // If the saved session has timed out, clear the session, execute 404 logic.
-                if (getFunnelCookie() !== null && !isSavedSessionStillActive()) {
-                    log(" --save session timeout go to start");
-
-                    const errorPayload = {
-                        cause: "expired session",
-                        currentPage: from?.query?.fmgPage,
-                        nextPage: to?.query?.fmgPage,
-                    };
-
-                    await baseMixin.methods.dispatchStoreAction(storeActions.RESET_STATE);
-                    deleteFunnelCookie();
-                    GoToFunnelStartOn404(next, errorPayload);
-                    return;
-                }
-
-                const fromReturnUser = from?.name === fmgPageValues.RETURN_USER;
-                const fromContentSite = getQuerystringParameter(queryStrings.START_TYPE) === "fmg";
-                const toReturnUserPage = to.query?.fmgPage === fmgPageValues.RETURN_USER;
-                log(" --fromReturnUser ", fromReturnUser);
-                log(" --to.query.fmgPage ", to.query?.fmgPage);
-
-                // Intercept all navigation if a submitted order exists in storage
-                if (
-                    window.sessionStorage.getItem(sessionStorageKeyConstants.SUBMITTED_STATE) !==
-                    null
-                ) {
-                    if (to.query.fmgPage !== funnelStartPageName) {
-                        to.query.fmgPage = fmgPageValues.CONFIRMATION;
-                        log(
-                            ` --has ${sessionStorageKeyConstants.SUBMITTED_STATE} go to confirmation`
-                        );
-                    }
-                }
-                // On entering the funnel "fresh", read cookie information, decide what to do next.
-                else if (from.redirectedFrom === undefined || fromReturnUser) {
-                    // if entering the funnel from the content site, check and see if there is already a vehicle year in vuex.
-                    // if so, send them to return-user page.
-                    if (
-                        fromContentSite &&
-                        !toReturnUserPage &&
-                        store.getters.order.vehicle?.year > 0
-                    ) {
-                        log(" --from content site navigate to return user");
-                        var qso = {
-                            fmgPage: fmgPageValues.RETURN_USER,
-                        };
-
-                        const newQueryString = buildQuerystringObject(qso, true);
-                        log(" -- returnUser add querystring: " + JSON.stringify(newQueryString));
-
-                        router.push({
-                            path: "/",
-                            query: Object.assign({}, newQueryString),
-                        });
-                        return;
-                    }
-
-                    // clear the saveSessionPromise - if it exists in the vuex store but a new instance was created
-                    //   the saveSessionPromise will no longer point to a valid promise
-                    log(" --clear promise");
-                    baseMixin.methods.dispatchStoreAction(storeActions.RESET_SAVE_SESSION_PROMISE);
-
-                    if (!to.query.fmgPage?.startsWith("payment")) {
-                        //payment pages used to return from safelitehop so exclude here
-                        // Remove the parameter after quote release
-
-                        // for testing end to end locally, see if there is a referralNumber on the querystring
-                        // that could have changed in heritage and then stick it in the store and then update the cookie
-                        // so load-session runs properly. this can be removed when heritage goes away
-                        const referralNumber = getQuerystringParameter(
-                            queryStrings.REFERRAL_NUMBER
-                        );
-                        const parentAccount = getQuerystringParameter(queryStrings.PARENT_ACCOUNT);
-                        const correlationId = getQuerystringParameter(queryStrings.CORRELATION_ID);
-                        if (referralNumber) {
-                            store.commit(storeMutations.UPDATE_REFERRAL_NUMBER, referralNumber);
-                            store.commit(storeMutations.UPDATE_PARENT_ACCT_NUMBER, parentAccount);
-                            store.commit(
-                                storeMutations.UPDATE_REFERRAL_CORRELATION_ID,
-                                correlationId
-                            );
-                            log(" --update cookie");
-                            updateOrCreateFunnelCookie();
-                        }
-
-                        //Affiliate Cookies
-                        const affiliateCookies = getAffiliateCookies();
-                        if (affiliateCookies != null && affiliateCookies.length > 0) {
-                            store.commit(storeMutations.UPDATE_AFFILIATE_COOKIES, affiliateCookies);
-                        }
-                        setupAdvertiserTracking();
-                        log(" --load session start");
-                        const loadSessionResponse = await loadSessionIfPresent(
-                            to.query.isInsurance != null
-                                ? to.query.isInsurance == "true"
-                                    ? true
-                                    : false
-                                : null,
-                            to.query.fmgPage
-                        );
-                        log(" --load session end");
-
-                        //Update external parameter state but not when returning from heritage
-                        if (!to.query.fmgPage?.startsWith("service-location") && !fromReturnUser) {
-                            updateExternalParameterState();
-                        }
-
-                        //Update CASH tab when return from heritage and have offerQuote param
-                        if (offerQuote === "true" && fromHeritage === "true") {
-                            store.commit(storeMutations.UPDATE_IS_INSURANCE, false);
-                        }
-
-                        // clear part related state because heritage selected a new vehicle
-                        if (
-                            to.query.fmgPage === fmgPageValues.VEHICLE &&
-                            getBoolFromString(getFunnelCookie()?.HasDelayedClaimRegistration) &&
-                            !fromReturnUser
-                        ) {
-                            store.commit(storeMutations.RESET_GLASS_PARTS_STATE);
-                        }
-
-                        // if coming from the return user page, clear the destination page so implicit navigation runs
-                        log(" --to.query ", JSON.stringify(to.query));
-                        if (fromReturnUser && to.query) {
-                            log(" --clear to.query");
-                            delete to.query[queryStrings.FMG_PAGE];
-
-                            //to.query[queryStrings.FMG_PAGE] = "";
-                            log(" --to.query cleared ", JSON.stringify(to.query));
-                        }
-
-                        const pageToRedirectTo = await getPageToRouteExistingOrderTo(to);
-                        log(" --pageToRedirectTo ", JSON.stringify(pageToRedirectTo));
-
-                        // This logic may determine that the user should be sent to heritage -- if so, do that here.
-                        if (pageToRedirectTo === fmgPageValues.HERITAGE) {
-                            // prettier-ignore
-                            log(" --go to heritage pageToRedirectTo ", JSON.stringify(pageToRedirectTo));
-                            await navigateToHeritageFunnel({ shouldSaveSession: false });
-                            return next(false);
-                        }
-
-                        // Assign our fmgPage so it will load normally like the other pages.
-                        to.query.fmgPage = pageToRedirectTo;
-                        log(" --assign to: ", JSON.stringify(pageToRedirectTo));
-                    }
-                }
-
-                // Reroute around pages that should not be available.
-
-                // Exception 1: Integrated Users should not see vehicle or quote pages.
-                if (
-                    store.getters.payment?.insuranceCoverage?.isVerified ||
-                    store.getters.order?.referralNumber?.length === 6
-                ) {
-                    if (to.query.fmgPage === fmgPageValues.VEHICLE) {
-                        to.query.fmgPage = fmgPageValues.VEHICLE_DAMAGE;
-                    } else if (
-                        to.query.fmgPage === fmgPageValues.QUOTE ||
-                        to.query.fmgPage === fmgPageValues.INSURANCE_COMPANY
-                    ) {
-                        log(" --block quote page for integrated clients - go to heritage");
-                        // Push to heritage if going to quote & integrated.
-                        await navigateToHeritageFunnel({ shouldSaveSession: false });
-                        return next(false);
-                    }
-                }
-
-                await runExperiments(to.query.fmgPage);
-
-                //Affiliate Cookies
-                const affiliateCookies = getAffiliateCookies();
-                if (affiliateCookies != null && affiliateCookies.length > 0) {
-                    store.commit(storeMutations.UPDATE_AFFILIATE_COOKIES, affiliateCookies);
-                }
-                setupAdvertiserTracking();
-                // Process funnel cookie.
-                updateOrCreateFunnelCookie();
-
-                // If we already have our route, go to it.
-                if (router.hasRoute(to.query.fmgPage)) {
-                    // Since our route is already in scope, we can grab the component from it and call the arePagePrerequisitesValid function.
-                    let component = router
-                        .getRoutes()
-                        .filter((x) => x.name === to.query.fmgPage)[0].components;
-
-                    // If the component hasn't been loaded fully, load it before we check prerequisites.
-                    if (component.default.methods === undefined) {
-                        component = await component.default();
-                    }
-
-                    if (!arePagePrerequisitesValid(component)) {
-                        console.log("Page prereq error: " + component.default.name);
-
-                        if (to.query.fmgPage === fmgPageValues.PAYMENT) {
-                            await store.getters.applicationUser.saveSessionPromise;
-                            window.location = applicationConfig.PIA_CANCEL_URL;
-                            return;
-                        }
-
-                        const errorPayload = {
-                            cause: "invalid page prerequisites for page",
-                            currentPage: from?.query?.fmgPage,
-                            nextPage: to?.query?.fmgPage,
-                        };
-
-                        GoToFunnelStartOn404(next, errorPayload);
-                        return;
-                    }
-
-                    log(" --has route:", to.query.fmgPage);
-                    return next({ name: to.query.fmgPage, query: to.query, params: to.params });
-                }
-
-                if (!isExistingFmgPageName(to.query.fmgPage)) {
-                    const errorPayload = {
-                        cause: "invalid page name",
-                        currentPage: from?.query?.fmgPage,
-                        nextPage: to?.query?.fmgPage,
-                    };
-
-                    GoToFunnelStartOn404(next, errorPayload);
-                    return;
-                }
-
-                // Get route info for the given url. Names will have a 1:1 relationship with names in the Cms.
-                const routeData = GetRouteInfoFromPageName(to.query.fmgPage);
-                log("--routeData:", routeData);
-
-                // Add our dynamic route.
-                router.addRoute({
-                    path: routeData[0].path, // Always the same path, because we control it with query strings.
-                    name: routeData[0].name,
-                    component: routeData[0].component,
-                });
-
-                // Call the next components arePagePrerequisitesValid method before load.
-                // If it returns false, use the 404 logic.
-                const nextComponent = await router
-                    .getRoutes()
-                    .filter((x) => x.name === routeData[0].name)[0]
-                    .components.default();
-
-                if (!arePagePrerequisitesValid(nextComponent)) {
-                    // prettier-ignore
-                    console.log("Page Prereqs not valid for next component: " + nextComponent.default.name);
-
-                    const errorPayload = {
-                        cause: "invalid page prerequisites for page",
-                        currentPage: from?.query?.fmgPage,
-                        nextPage: to?.query?.fmgPage,
-                    };
-
-                    GoToFunnelStartOn404(next, errorPayload);
-                    return;
-                }
-
-                log("------------- router index.js beforeEnter end -----------------");
-
-                // Assign current query string parameters, as well as our fmgPage one.
-                next({
-                    name: routeData[0].name,
-                    query: Object.assign(to.query, { fmgPage: routeData[0].name }),
-                    params: to.params,
-                });
-            } catch (error) {
-                global.$logger.logError(`Routing ${error.stack}`);
-
-                if (to.query?.fmgPage === funnelStartPageName) {
-                    deleteFunnelCookie();
-                    await baseMixin.methods.dispatchStoreAction(storeActions.RESET_STATE);
-                }
-
-                console.log(new Date() + " Exception in beforeEnter:" + JSON.stringify(error));
-
-                // If we don't have a route, go to our 404 page.
-                const errorPayload = {
-                    cause: "uncaught error in beforeEnter",
-                    currentPage: from?.query?.fmgPage,
-                    nextPage: to?.query?.fmgPage,
-                    fullError: error,
-                    errorStack: error?.stack,
-                };
-
-                GoToFunnelStartOn404(next, errorPayload);
-                return;
-            }
-        },
-    },
-];
+import { ROUTE_PREFIX_FULL } from "@/router/constants/route-prefix";
 
 const router = createRouter({
-    history: createWebHistory("/fmg/"),
+    history: createWebHistory(ROUTE_PREFIX_FULL),
     routes,
-    //Cause "page" to begin at the top when route chanages.
+    // Scroll to top on navigation.
     scrollBehavior(to, from, savedPosition) {
-        // always scroll to top
         return { top: 0 };
     },
 });
 
-//---------------------------------------------------------- Router Functions ----------------------------------------------------------
+// Set guards
+router.afterEach(async (to, from) => afterEach(to, from));
+router.beforeEach(async (to, from) => beforeEach(to, from));
 
-router.beforeEach(async (to, from, next) => {
-    log("------------- router index.js beforeEach start -----------------");
-    // set lastNavigationPage here to capture state before API calls for analytics.
-    // use current page url query string name when to.name is "root" (due to unresolved navigation in beforeEach)
-    router.lastNavigationPage = to.name == "root" ? analyticsMixin.methods.getPageName() : to.name;
+// Bind methods for external use
+router.navigateWithSaving = navigateWithSaving;
+router.navigateWithoutSaving = navigateWithoutSaving;
+router.navigateWithPageData = navigateWithPageData;
+router.navigateAndForceTopLevelNavigation = navigateAndForceTopLevelNavigation;
 
-    const fromQueryPage = from.query?.fmgPage;
-    if (fromQueryPage === undefined) {
-        showFmgLoadingModal(true);
-    }
+router.bailout = bailout;
 
-    const toQueryPage = to.query?.fmgPage;
-    const notToPIAReturn = toQueryPage != fmgPageValues.PAYMENT_PIA_RETURN;
-    const isInIframe = window !== window.top;
+router.navigateToExternalUrl = navigateToExternalUrl;
 
-    if (store.getters.externalParameterState?.isExternalParameter) {
-        // Check if alert event is on the bus
-        const alertEvent = eventBus.readEventFromBus(
-            globalEvents.Categories.GLOBAL_ALERT,
-            globalEvents.SubCategories.PAGE_NOT_FOUND
-        );
-        //Uknown alerts most likely were added by a failed api call in global-methods
-        const unknownAlertEvent = eventBus.readEventFromBus(
-            globalEvents.Categories.GLOBAL_ALERT,
-            globalEvents.SubCategories.UNKNOWN_ERROR
-        );
-        // If alert event is on the bus, then display the alert
-        if (alertEvent !== undefined || unknownAlertEvent !== undefined) {
-            store.commit(
-                storeMutations.UPDATE_IS_EXTERNAL_PARAMETER,
-                externalParameterStatus.INACTIVE
-            );
-        }
-    }
-    // fromPaymentToConfirmation workaround for navigating from an iframe but
-    // isInIframe evaluates to false for some reason when navigating from payment to confirmation
-    const fromPaymentToConfirmation =
-        fromQueryPage === fmgPageValues.PAYMENT && toQueryPage === fmgPageValues.CONFIRMATION;
-
-    if ((isInIframe && notToPIAReturn) || fromPaymentToConfirmation) {
-        const newUrl = `${window.top.location.origin}${to.href}`;
-        window.top.location.href = newUrl;
-        next(false);
-
-        // Refresh page if navigating to self to prevent locking.
-        // For now only carved out for vehicle; all modals are opened through anchor tags at the moment,
-        // which also self navigate, but relied on the page remaining the same on self-navigation.
-    } else if (toQueryPage === fromQueryPage && toQueryPage === getRedirectedStartPage()) {
-        router.go(0);
-        next(false);
-    } else {
-        next();
-    }
-    log("------------- router index.js beforeEach end -----------------");
-});
-
-router.afterEach(async (to, from) => {
-    // Update lastPageVisited in the store
-    store.commit(storeMutations.UPDATE_LAST_PAGE_VISITED, to.name);
-
-    // If saving on navigation is requested, check for saved SessionId or EmailAddress to determine if saving is appropriate
-    if (getBoolFromString(window.history.state.isSavingNavigation)) {
-        if (
-            store.getters.applicationUser.savedSessionId ||
-            store.getters.order.customer?.emailAddress
-        ) {
-            await saveSession({ pageNameToLog: to.query.fmgPage });
-        }
-    }
-
-    // Push page view to GA
-    analyticsMixin.methods.pushPageViewToGA();
-
-    // Push experiments to Data Layer
-    analyticsMixin.methods.pushExperimentsToDataLayer();
-
-    // Push current order status to Data Layer
-    analyticsMixin.methods.pushOrderToDataLayer();
-
-    if (to.query.fmgPage == fmgPageValues.CONFIRMATION) {
-        //Push Ecommerce Cart to Data Layer
-        analyticsMixin.methods.pushECommerceCartToDataLayer();
-
-        //Push Product Array to Data Layer
-        analyticsMixin.methods.pushProductArrayToDataLayer();
-
-        //Push Commission Junction Gtm Data To Data Layer
-        analyticsMixin.methods.pushCommissionJunctionGtmDataToDataLayer();
-    }
-});
-
-router.navigateWithoutSaving = (
-    scenario,
-    currentRoute,
-    optionalQuery = {},
-    optionalParams = {},
-    optionalPageData = {}
-) => {
-    navigate(scenario, currentRoute, false, optionalQuery, optionalParams, optionalPageData);
-};
-
-router.navigateWithSaving = (
-    scenario,
-    currentRoute,
-    optionalQuery = {},
-    optionalParams = {},
-    optionalPageData = {}
-) => {
-    navigate(scenario, currentRoute, true, optionalQuery, optionalParams, optionalPageData);
-};
-
-router.navigateToExternalUrl = (url, optionalQuery = {}) => {
-    log("------------- router navigateToExternalUrl -----------------");
-    log("url:", url);
-    navigateToUrl(url, optionalQuery);
-};
-
-router.navigateError = (errorPayload = null) => {
-    DisplayPageError(errorPayload);
-};
-
-//Use this navigation when you need to call next() explicitly. beforeRouteEnter is a good example.
-router.overrideNavigation = (
-    scenario,
-    currentRoute,
-    next,
-    isSavingNavigation,
-    optionalQuery = {},
-    optionalParams = {},
-    optionalPageData
-) => {
-    log("------------- router overrideNavigation -----------------");
-    log("scenario:", scenario);
-    log("currentRoute:", currentRoute);
-    log("isSavingNavigation:", isSavingNavigation);
-    log("optionalQuery:", optionalQuery);
-    log("optionalParams:", optionalParams);
-    log("optionalPageData:", optionalPageData);
-    navigate(
-        scenario,
-        currentRoute,
-        isSavingNavigation,
-        optionalQuery,
-        optionalParams,
-        optionalPageData
-    );
-    next();
-};
-
-router.getNextPage = () => nextPageName;
-
-// PRIVATE VARIABLES
-
-var nextPageName;
-
-// PRIVATE FUNCTIONS
-
-// Navigate to the next route, depending on the scenario.
-async function navigate(
-    scenario,
-    currentRoute,
-    isSavingNavigation,
-    optionalQuery = {},
-    optionalParams = {},
-    optionalPageData = {}
-) {
-    if (!scenario) {
-        console.error("No scenario provided. Please review the routing table.");
-        return;
-    }
-
-    // Match our maps up and navigate if we have a destination.
-    const matchingScenarioMap = getNavigationMap(scenario, currentRoute);
-    const destinationFmgPageValue = matchingScenarioMap.destinationFmgPageValue;
-
-    if (destinationFmgPageValue !== undefined) {
-        // We're always pushing the same path, just changing query strings. Make sure our optional query strings get combined with our fmgPage one.
-
-        nextPageName = destinationFmgPageValue;
-
-        // Update page data to the store for next page if provided. Otherwise, keep existing page data or set to empty object
-        const existingPageDataForPage = store.getters.pageData(destinationFmgPageValue);
-        baseMixin.methods.savePageDataToStore(
-            destinationFmgPageValue,
-            Object.keys(optionalPageData).length > 0
-                ? optionalPageData
-                : (existingPageDataForPage ?? {})
-        );
-
-        optionalParams.isSavingNavigation = isSavingNavigation;
-
-        // add querystring params to the route. if they are already in the store then no need to add them
-        var queryStringsObject = {
-            fmgPage: destinationFmgPageValue,
-        };
-
-        const hasZip = getQuerystringParameter(queryStrings.ZIP_CODE);
-        const zip = getQuerystringParameter(queryStrings.ZIP_CODE);
-        const promo = getQuerystringParameter(queryStrings.PROMO);
-        const pageError = getQuerystringParameter(queryStrings.PAGE_ERROR);
-        const logQs = getQuerystringParameter(queryStrings.LOG);
-        baseMixin.methods.dispatchStoreAction(storeActions.SAVE_LOGGING_OPTION, logQs, false);
-
-        log("------------- router index.js navigate start -----------------");
-        log(" --scenario: ", scenario);
-        log(" --isSavingNavigation: ", isSavingNavigation);
-        log(" --optionalQuery: ", optionalQuery);
-        log(" --optionalParams: ", optionalParams);
-        log(" --optionalPageData: ", optionalPageData);
-        log(" --nextPageName: ", nextPageName);
-
-        if (
-            hasZip &&
-            (store.getters.order.serviceLocation.zipCode === undefined ||
-                store.getters.order.serviceLocation.zipCode == null) &&
-            (store.getters.order.vehicle.registration.zipCode === undefined ||
-                store.getters.order.vehicle.registration.zipCode == null)
-        ) {
-            queryStringsObject[queryStrings.ZIP_CODE] = zip;
-        }
-
-        if (promo && !shouldStripPromoQueryString(currentRoute.query.fmgPage)) {
-            queryStringsObject[queryStrings.PROMO] = promo;
-        }
-
-        if (pageError) {
-            queryStringsObject[queryStrings.PAGE_ERROR] = pageError;
-        }
-
-        if (logQs) {
-            queryStringsObject[queryStrings.LOG] = logQs;
-        }
-
-        log(" querystrings: ", queryStringsObject);
-        log("------------- router index.js navigate end -----------------");
-
-        router.push({
-            name: "root",
-            query: Object.assign(optionalQuery, queryStringsObject),
-            state: optionalParams,
-        });
-    } else if (matchingScenarioMap.destinationUrl !== undefined) {
-        navigateToUrl(matchingScenarioMap.destinationUrl, optionalQuery);
-    }
-}
-
-// Get navigation map depending on the scenario and the current 'page' you're on.
-function getNavigationMap(scenario, currentRoute) {
-    const fmgPageValue = currentRoute.query.fmgPage;
-    log("------------- router index.js getNavigationMap start -----------------");
-    log("fmgPage: " + fmgPageValue + " scenario: " + scenario, "");
-    log("------------- router index.js getNavigationMap end -----------------");
-    const matchedQueryValue = routingTable(store)
-        .filter(
-            (item) =>
-                item.fmgPageValue === fmgPageValue &&
-                item.maps.filter((map) => map.scenario === scenario).length > 0
-        )
-        .map((m) => m.maps.filter((map) => map.scenario === scenario))[0]
-        .filter((x) => x.filter === true || x.filter === undefined);
-
-    return matchedQueryValue[0];
-}
-
-function log(message, data) {
-    const log = getQuerystringParameter(queryStrings.LOG);
-    baseMixin.methods.dispatchStoreAction(storeActions.SAVE_LOGGING_OPTION, log, false);
-
-    data = data ?? "";
-    const outData = typeof data === "object" ? JSON.stringify(data) : data;
-
-    if (log === "true" || store.getters.applicationUser.loggingOption) {
-        console.log(new Date() + message + outData);
-    }
-}
-
-//---------------------------------------------------------- Private Functions ----------------------------------------------------------
-
-// Navigate to an external url.
-function navigateToUrl(url, optionalQuery = {}) {
-    // possibly show some loading screen in the future here.
-    var externalUrl = new URL(url);
-
-    for (const queryKey in optionalQuery) {
-        externalUrl.searchParams.append(queryKey, optionalQuery[queryKey]);
-    }
-
-    window.location.assign(externalUrl);
-}
-
-// Get route information by page name.
-// This will no longer reach out to the Cms. There is a 1:1 relationship between page names and route names and layouts.
-function GetRouteInfoFromPageName(pageName) {
-    // check if pagename is a valid route/component
-    if (!isExistingFmgPageName(pageName)) {
-        return [];
-    }
-
-    const routeData = [
-        {
-            path: "/",
-            name: pageName,
-            component: lazyLoadComponent(pageName),
-        },
-    ];
-
-    return routeData;
-}
-
-// Go to our start page on a 404.
-function GoToFunnelStartOn404(next, errorPayload = null) {
-    if (errorPayload !== null) {
-        errorPayload.type = "GoToFunnelStartOn404";
-        analyticsMixin.methods.pushPageErrorToDataLayer(errorPayload);
-
-        console.log(
-            "%cGoToFunnelStartOn404()... errorPayload",
-            "color: white; background-color: blue; padding: 5px;",
-            errorPayload
-        );
-    }
-
-    // Put item on the bus
-    eventBus.addEventToBus(
-        globalEvents.Categories.GLOBAL_ALERT,
-        globalEvents.SubCategories.PAGE_NOT_FOUND,
-        {
-            isDismissible: true,
-            messageCopy: "You can get a quote by starting on this page.",
-            messageHeadline: "We're sorry, something went wrong.",
-            type: globalEventTypes.Danger,
-        }
-    );
-
-    next({
-        path: "/",
-        query: { fmgPage: funnelStartPageName },
-    });
-}
-
-async function DisplayPageError(errorPayload = null) {
-    console.log("%c running DisplayPageError()... ", "font-size: 20px; color: purple;");
-
-    if (errorPayload !== null) {
-        errorPayload.type = "DisplayPageError";
-        analyticsMixin.methods.pushPageErrorToDataLayer(errorPayload);
-    } else {
-        // very cautiously to avoid additional errors:
-        var currentPage = "";
-        try {
-            currentPage = getQuerystringParameter(queryStrings.FMG_PAGE);
-        } catch (e) {
-            // pass
-        }
-        errorPayload = {
-            type: "DisplayPageError",
-            cause: "Unknown page error",
-            currentPage: currentPage,
-        };
-        analyticsMixin.methods.pushPageErrorToDataLayer(errorPayload);
-    }
-
-    // Put item on the bus
-    eventBus.addEventToBus(
-        globalEvents.Categories.GLOBAL_ALERT,
-        globalEvents.SubCategories.UNKNOWN_ERROR,
-        {
-            isDismissible: true,
-            messageCopy: "",
-            messageHeadline: "We're sorry, something went wrong.",
-            type: globalEventTypes.Danger,
-        }
-    );
-    if (
-        store.getters.externalParameterState?.isExternalParameter == externalParameterStatus.ACTIVE
-    ) {
-        store.commit(storeMutations.UPDATE_IS_EXTERNAL_PARAMETER, externalParameterStatus.INACTIVE);
-    }
-    baseMixin.methods.dispatchStoreAction(storeActions.RESET_SAVE_SESSION_PROMISE);
-    const pageError = getQuerystringParameter(queryStrings.PAGE_ERROR);
-
-    // we use the pageError querystring as a counter to how many times a user has experienced an error and been routed here.
-    // once they receive more than 1 pageerrors, we'll reset their state to hopefully correct any issues they may be having.
-    var navPage = fmgPageValues.VEHICLE;
-    if (store.getters.payment?.insuranceCoverage?.isVerified) {
-        navPage = fmgPageValues.VEHICLE_DAMAGE;
-    }
-
-    if (pageError) {
-        var errorCount = Number(pageError);
-        if (errorCount > 1) {
-            deleteFunnelCookie();
-            await baseMixin.methods.dispatchStoreAction(storeActions.RESET_STATE);
-
-            router.push({
-                path: "/",
-                query: { fmgPage: navPage },
-            });
-        } else {
-            errorCount++;
-            router.push({
-                path: "/",
-                query: { fmgPage: navPage, pageError: errorCount },
-            });
-        }
-    } else {
-        router.push({
-            path: "/",
-            query: { fmgPage: navPage, pageError: "1" },
-        });
-    }
-}
-
-function isExistingFmgPageName(pageName) {
-    const names = Object.values(fmgPageValues);
-
-    return names.some((name) => name === pageName);
-}
-
-// Checks arePagePrerequisitesValid on the component passed in.
-function arePagePrerequisitesValid(component) {
-    return component.default.methods.arePagePrerequisitesValid();
-}
-
-// Run SiteEntry and PageEntry triggers for experiments
-async function runExperiments(nextPage) {
-    if (!store.getters.applicationUser.triggeredSiteEntry) {
-        await baseMixin.methods.dispatchStoreActionWithLogging(
-            storeActions.RUN_EXPERIMENTS_FOR_TRIGGER,
-            {
-                deviceId: getDeviceIdValue(),
-                triggerEvent: experimentTriggers.SITE_ENTRY,
-                triggerValue: applicationConfig.SITE_ENTRY_TRIGGER_VALUE,
-            },
-            nextPage
-        );
-    }
-
-    await baseMixin.methods.dispatchStoreActionWithLogging(
-        storeActions.RUN_EXPERIMENTS_FOR_TRIGGER,
-        {
-            deviceId: getDeviceIdValue(),
-            triggerEvent: experimentTriggers.PAGE_ENTRY,
-            triggerValue: nextPage,
-        },
-        nextPage
-    );
-}
-
-function getRedirectedStartPage() {
-    if (store.getters.payment?.insuranceCoverage?.isVerified) {
-        return fmgPageValues.VEHICLE_DAMAGE;
-    } else {
-        return funnelStartPageName;
-    }
-}
-
-function updateExternalParameterState() {
-    const externalParameterYear = getQuerystringParameter(queryStrings.VEHICLE_YEAR);
-    const externalParameterMake = getQuerystringParameter(queryStrings.VEHICLE_MAKE);
-    const externalParameterModel = getQuerystringParameter(queryStrings.VEHICLE_MODEL);
-    const externalParameterStyle = getQuerystringParameter(queryStrings.VEHICLE_STYLE);
-    const externalParameterDamage = getQuerystringParameter(queryStrings.VEHICLE_DAMAGE);
-    const externalParameterZipCode = getQuerystringParameter(queryStrings.SERVICE_ZIP);
-    const externalParameterEmail = getQuerystringParameter(queryStrings.EMAIL);
-    const externalParameterIsInsurance = getQuerystringParameter(queryStrings.IS_INSURANCE);
-    const externalParameterVinSelection = getQuerystringParameter(queryStrings.VIN_SELECTION);
-    const externalParameterServicePackage = getQuerystringParameter(queryStrings.SERVICE_PACKAGE);
-    const externalParameterNumberOfChips = getQuerystringParameter(queryStrings.NUMBER_OF_CHIPS);
-    const externalParameterSource = getQuerystringParameter(queryStrings.EXPERIMENTS);
-    const externalParameterPhoneNumber = getQuerystringParameter(queryStrings.PHONE_NUMBER);
-    if (
-        externalParameterYear &&
-        externalParameterMake &&
-        externalParameterModel &&
-        externalParameterStyle
-    ) {
-        resetStoreForExternalParameter();
-        store.commit(storeMutations.UPDATE_IS_EXTERNAL_PARAMETER, externalParameterStatus.ACTIVE);
-        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_YEAR, externalParameterYear);
-        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_MAKE, externalParameterMake);
-        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_MODEL, externalParameterModel);
-        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_STYLE, externalParameterStyle);
-    }
-    if (
-        externalParameterDamage &&
-        (externalParameterDamage.toUpperCase() != "WINDSHIELDREPAIR" ||
-            externalParameterNumberOfChips?.length > 0)
-    ) {
-        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_DAMAGE_TYPE, externalParameterDamage);
-        if (externalParameterDamage.toUpperCase() == "WINDSHIELDREPLACE") {
-            store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_IS_REPAIR, false);
-            store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_NUMBER_OF_CHIPS, null);
-        } else if (externalParameterDamage.toUpperCase() == "WINDSHIELDREPAIR") {
-            store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_IS_REPAIR, true);
-            store.commit(
-                storeMutations.UPDATE_EXTERNAL_PARAMETER_NUMBER_OF_CHIPS,
-                externalParameterNumberOfChips
-            );
-        }
-    }
-    if (externalParameterZipCode) {
-        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_ZIP_CODE, externalParameterZipCode);
-    }
-    if (externalParameterEmail) {
-        store.commit(
-            storeMutations.UPDATE_EXTERNAL_PARAMETER_EMAIL_ADDRESS,
-            externalParameterEmail
-        );
-    }
-    if (externalParameterIsInsurance?.toUpperCase() == "TRUE") {
-        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_IS_INSURANCE, true);
-        store.commit(
-            storeMutations.UPDATE_EXTERNAL_PARAMETER_SERVICE_PACKAGE,
-            externalParameterServicePackage?.toLowerCase()
-        );
-    }
-    if (externalParameterDamage?.toUpperCase() != "WINDSHIELDREPAIR") {
-        store.commit(
-            storeMutations.UPDATE_EXTERNAL_PARAMETER_VIN_SELECTION,
-            externalParameterVinSelection
-        );
-    }
-    if (externalParameterSource) {
-        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_SOURCE, externalParameterSource);
-    }
-    if (externalParameterPhoneNumber) {
-        store.commit(
-            storeMutations.UPDATE_EXTERNAL_PARAMETER_PHONE_NUMBER,
-            externalParameterPhoneNumber
-        );
-    }
-}
-
-// if there is an existing external parameter state then they have already been through from an external source(LeadGen) and
-// are returning.  clear out prior related things that need to be selected again like parts and damage type.
-function resetStoreForExternalParameter() {
-    if (
-        store.getters.externalParameterState?.isExternalParameter ==
-        externalParameterStatus.INACTIVE
-    ) {
-        store.dispatch(storeActions.RESET_VEHICLE_STATE_AND_DEPENDENCIES);
-        store.dispatch(storeActions.SAVE_SERVICE_ZIP_CODE_INFO, {
-            state: null,
-            zipCode: null,
-            zipCodeCtu: null,
-        });
-        store.dispatch(storeActions.SAVE_EMAIL, null);
-        store.dispatch(storeActions.RESET_DAMAGE_STATE_AND_DEPENDENCIES);
-    }
-}
+router.sendToReturnUser = sendToReturnUser;
 
 export default router;
diff --git a/src/router/a-rewrite/methods/after-each.js b/src/router/methods/after-each.js
similarity index 100%
rename from src/router/a-rewrite/methods/after-each.js
rename to src/router/methods/after-each.js
diff --git a/src/router/a-rewrite/methods/before-each.js b/src/router/methods/before-each.js
similarity index 86%
rename from src/router/a-rewrite/methods/before-each.js
rename to src/router/methods/before-each.js
index 05264ed3c..dae53b583 100644
--- a/src/router/a-rewrite/methods/before-each.js
+++ b/src/router/methods/before-each.js
@@ -7,12 +7,12 @@ import {
 import { loadSessionIfPresent } from "@/helpers/heritage-integration/order-helper";
 import { isSavedSessionStillActive } from "@/helpers/heritage-integration/session-helper";
 import analyticsMixin from "@/mixins/analytics-mixin";
-import { routeData, FUNNEL_START_PAGE } from "@/router/a-rewrite/constants/routes";
-import { consumeQueryFromStash } from "@/router/a-rewrite/methods/helpers/querystring-stash";
-import { runExperiments } from "@/router/a-rewrite/methods/helpers/run-experiments";
+import { routeData, FUNNEL_START_PAGE } from "@/router/constants/routes";
+import { consumeQueryFromStash } from "@/router/methods/helpers/querystring-stash";
+import { runExperiments } from "@/router/methods/helpers/run-experiments";
 
-import { bailout } from "@/router/a-rewrite/methods/error";
-import { checkPagePrerequisites } from "@/router/a-rewrite/methods/page-prerequisites";
+import { bailout } from "@/router/methods/error";
+import { checkPagePrerequisites } from "@/router/methods/page-prerequisites";
 
 export async function beforeEach(to, from) {
     try {
diff --git a/src/router/a-rewrite/methods/error.js b/src/router/methods/error.js
similarity index 78%
rename from src/router/a-rewrite/methods/error.js
rename to src/router/methods/error.js
index 3c50c1768..f9f20c19d 100644
--- a/src/router/a-rewrite/methods/error.js
+++ b/src/router/methods/error.js
@@ -1,6 +1,6 @@
 import analyticsMixin from "@/mixins/analytics-mixin";
-import { routeData } from "@/router/a-rewrite/constants/routes";
-import router from "@/router/a-rewrite";
+import { routeData } from "@/router/constants/routes";
+import router from "@/router";
 
 export async function bailout(errorPayload, forceRestart = false) {
     analyticsMixin.methods.pushPageErrorToDataLayer(errorPayload);
diff --git a/src/router/a-rewrite/methods/get-route.js b/src/router/methods/get-route.js
similarity index 71%
rename from src/router/a-rewrite/methods/get-route.js
rename to src/router/methods/get-route.js
index ead89eb5b..9c6e84c0c 100644
--- a/src/router/a-rewrite/methods/get-route.js
+++ b/src/router/methods/get-route.js
@@ -1,4 +1,4 @@
-import router from "@/router/a-rewrite";
+import router from "@/router";
 
 export function getRoute(pageName) {
     return router.getRoutes().find((r) => r.name === pageName);
diff --git a/src/router/a-rewrite/methods/helpers/build-manual-url.js b/src/router/methods/helpers/build-manual-url.js
similarity index 88%
rename from src/router/a-rewrite/methods/helpers/build-manual-url.js
rename to src/router/methods/helpers/build-manual-url.js
index 260b41257..a1638601b 100644
--- a/src/router/a-rewrite/methods/helpers/build-manual-url.js
+++ b/src/router/methods/helpers/build-manual-url.js
@@ -1,4 +1,4 @@
-import { ROUTE_PREFIX_TRIMMED } from "@/router/a-rewrite/constants/route-prefix";
+import { ROUTE_PREFIX_TRIMMED } from "@/router/constants/route-prefix";
 
 export function buildManualUrl(nextPage) {
     const queries = nextPage.params;
diff --git a/src/router/a-rewrite/methods/helpers/consume-referral-info.js b/src/router/methods/helpers/consume-referral-info.js
similarity index 100%
rename from src/router/a-rewrite/methods/helpers/consume-referral-info.js
rename to src/router/methods/helpers/consume-referral-info.js
diff --git a/src/router/a-rewrite/methods/helpers/create-route.js b/src/router/methods/helpers/create-route.js
similarity index 87%
rename from src/router/a-rewrite/methods/helpers/create-route.js
rename to src/router/methods/helpers/create-route.js
index a1535f3c8..32410e3b3 100644
--- a/src/router/a-rewrite/methods/helpers/create-route.js
+++ b/src/router/methods/helpers/create-route.js
@@ -1,5 +1,5 @@
-import { lazyLoadComponent } from "@/router/a-rewrite/methods/helpers/lazy-load-component";
-import { routeData } from "@/router/a-rewrite/constants/routes";
+import { lazyLoadComponent } from "@/router/methods/helpers/lazy-load-component";
+import { routeData } from "@/router/constants/routes";
 
 export function createRoute(routeDatum, beforeEnter = async (to, from) => undefined) {
     return {
diff --git a/src/router/a-rewrite/methods/helpers/get-destination.js b/src/router/methods/helpers/get-destination.js
similarity index 85%
rename from src/router/a-rewrite/methods/helpers/get-destination.js
rename to src/router/methods/helpers/get-destination.js
index cd04ddaad..e123afcb1 100644
--- a/src/router/a-rewrite/methods/helpers/get-destination.js
+++ b/src/router/methods/helpers/get-destination.js
@@ -1,4 +1,4 @@
-import { routingTable } from "@/router/a-rewrite/constants/routing-table";
+import { routingTable } from "@/router/constants/routing-table";
 
 export function getDestination(sourcePageName, navigationScenario) {
     const table = routingTable();
diff --git a/src/router/a-rewrite/methods/helpers/initialize-from-querystrings.js b/src/router/methods/helpers/initialize-from-querystrings.js
similarity index 100%
rename from src/router/a-rewrite/methods/helpers/initialize-from-querystrings.js
rename to src/router/methods/helpers/initialize-from-querystrings.js
diff --git a/src/router/a-rewrite/methods/helpers/lazy-load-component.js b/src/router/methods/helpers/lazy-load-component.js
similarity index 100%
rename from src/router/a-rewrite/methods/helpers/lazy-load-component.js
rename to src/router/methods/helpers/lazy-load-component.js
diff --git a/src/router/a-rewrite/methods/helpers/querystring-stash.js b/src/router/methods/helpers/querystring-stash.js
similarity index 100%
rename from src/router/a-rewrite/methods/helpers/querystring-stash.js
rename to src/router/methods/helpers/querystring-stash.js
diff --git a/src/router/a-rewrite/methods/helpers/requires-verified-redirect.js b/src/router/methods/helpers/requires-verified-redirect.js
similarity index 100%
rename from src/router/a-rewrite/methods/helpers/requires-verified-redirect.js
rename to src/router/methods/helpers/requires-verified-redirect.js
diff --git a/src/router/a-rewrite/methods/helpers/run-experiments.js b/src/router/methods/helpers/run-experiments.js
similarity index 100%
rename from src/router/a-rewrite/methods/helpers/run-experiments.js
rename to src/router/methods/helpers/run-experiments.js
diff --git a/src/router/a-rewrite/methods/helpers/save-page-data.js b/src/router/methods/helpers/save-page-data.js
similarity index 100%
rename from src/router/a-rewrite/methods/helpers/save-page-data.js
rename to src/router/methods/helpers/save-page-data.js
diff --git a/src/router/a-rewrite/methods/navigate-external.js b/src/router/methods/navigate-external.js
similarity index 100%
rename from src/router/a-rewrite/methods/navigate-external.js
rename to src/router/methods/navigate-external.js
diff --git a/src/router/a-rewrite/methods/navigate.js b/src/router/methods/navigate.js
similarity index 79%
rename from src/router/a-rewrite/methods/navigate.js
rename to src/router/methods/navigate.js
index ca8de4784..7df947560 100644
--- a/src/router/a-rewrite/methods/navigate.js
+++ b/src/router/methods/navigate.js
@@ -1,18 +1,12 @@
 import { saveSession } from "@/helpers/heritage-integration/order-helper";
-import { buildManualUrl } from "@/router/a-rewrite/methods/helpers/build-manual-url";
-import { getDestination } from "@/router/a-rewrite/methods/helpers/get-destination";
-import { savePageData } from "@/router/a-rewrite/methods/helpers/save-page-data";
-import router from "@/router/a-rewrite";
+import { buildManualUrl } from "@/router/methods/helpers/build-manual-url";
+import { getDestination } from "@/router/methods/helpers/get-destination";
+import { savePageData } from "@/router/methods/helpers/save-page-data";
+import router from "@/router";
 
-import { bailout } from "@/router/a-rewrite/methods/error";
+import { bailout } from "@/router/methods/error";
 
 async function navigate(scenario, currentPageName, withSaving = false, forceTopLevelNav = false) {
-    console.log(`Navigate:\n
-        - scenario: ${scenario}\n
-        - currentPage: ${currentPageName}\n
-        - withSaving: ${withSaving}\n
-        - forceTopLevelNav: ${forceTopLevelNav}`);
-    
     // Check to see if calling page is same as current page.
     // If not, cancel navigation before it begins.
     const callingRoute = currentPageName;
diff --git a/src/router/a-rewrite/methods/page-prerequisites.js b/src/router/methods/page-prerequisites.js
similarity index 87%
rename from src/router/a-rewrite/methods/page-prerequisites.js
rename to src/router/methods/page-prerequisites.js
index 581ab0354..8a6538eff 100644
--- a/src/router/a-rewrite/methods/page-prerequisites.js
+++ b/src/router/methods/page-prerequisites.js
@@ -1,4 +1,4 @@
-import { getRoute } from "@/router/a-rewrite/methods/get-route";
+import { getRoute } from "@/router/methods/get-route";
 
 export async function checkPagePrerequisites(pageName) {
     const route = getRoute(pageName);
diff --git a/src/router/a-rewrite/methods/route-logic/auto-route.js b/src/router/methods/route-logic/auto-route.js
similarity index 65%
rename from src/router/a-rewrite/methods/route-logic/auto-route.js
rename to src/router/methods/route-logic/auto-route.js
index a6d55e4fa..228f80483 100644
--- a/src/router/a-rewrite/methods/route-logic/auto-route.js
+++ b/src/router/methods/route-logic/auto-route.js
@@ -1,6 +1,6 @@
-import { autoRouteTable } from "@/router/a-rewrite/constants/auto-route-table";
-import { FUNNEL_START_PAGE } from "@/router/a-rewrite/constants/routes";
-import { checkPagePrerequisites } from "@/router/a-rewrite/methods/page-prerequisites";
+import { autoRouteTable } from "@/router/constants/auto-route-table";
+import { FUNNEL_START_PAGE } from "@/router/constants/routes";
+import { checkPagePrerequisites } from "@/router/methods/page-prerequisites";
 
 export async function autoRouteBeforeEnter(to, from) {
     for (let i = 0; i < autoRouteTable.length; i++) {
diff --git a/src/router/a-rewrite/methods/route-logic/error.js b/src/router/methods/route-logic/error.js
similarity index 92%
rename from src/router/a-rewrite/methods/route-logic/error.js
rename to src/router/methods/route-logic/error.js
index c4bdeb6d5..8707a65d9 100644
--- a/src/router/a-rewrite/methods/route-logic/error.js
+++ b/src/router/methods/route-logic/error.js
@@ -2,8 +2,8 @@ import { globalEvents, globalEventTypes } from "@/constants/events";
 import { storeActions } from "@/constants/store-actions";
 import eventBus from "@/helpers/event-bus/event-bus";
 import baseMixin from "@/mixins/base-mixin";
-import router from "@/router/a-rewrite";
-import { routeData, FUNNEL_START_PAGE } from "@/router/a-rewrite/constants/routes";
+import router from "@/router";
+import { routeData, FUNNEL_START_PAGE } from "@/router/constants/routes";
 import store from "@/store";
 
 export async function errorBeforeEnter(to, from) {
diff --git a/src/router/a-rewrite/methods/route-logic/heritage.js b/src/router/methods/route-logic/heritage.js
similarity index 100%
rename from src/router/a-rewrite/methods/route-logic/heritage.js
rename to src/router/methods/route-logic/heritage.js
diff --git a/src/router/a-rewrite/methods/route-logic/insurance-company.js b/src/router/methods/route-logic/insurance-company.js
similarity index 54%
rename from src/router/a-rewrite/methods/route-logic/insurance-company.js
rename to src/router/methods/route-logic/insurance-company.js
index 18d961854..d3c69b908 100644
--- a/src/router/a-rewrite/methods/route-logic/insurance-company.js
+++ b/src/router/methods/route-logic/insurance-company.js
@@ -1,5 +1,5 @@
-import { routeData } from "@/router/a-rewrite/constants/routes";
-import { isVerifiedInsurance } from "@/router/a-rewrite/methods/helpers/requires-verified-redirect";
+import { routeData } from "@/router/constants/routes";
+import { isVerifiedInsurance } from "@/router/methods/helpers/requires-verified-redirect";
 
 export async function insuranceCompanyBeforeEnter(to, from) {
     if (isVerifiedInsurance()) {
diff --git a/src/router/a-rewrite/methods/route-logic/landing.js b/src/router/methods/route-logic/landing.js
similarity index 69%
rename from src/router/a-rewrite/methods/route-logic/landing.js
rename to src/router/methods/route-logic/landing.js
index b71d7a9db..b50f321c1 100644
--- a/src/router/a-rewrite/methods/route-logic/landing.js
+++ b/src/router/methods/route-logic/landing.js
@@ -1,8 +1,8 @@
-import router from "@/router/a-rewrite";
-import { routeData } from "@/router/a-rewrite/constants/routes";
-import { consumeReferralQuerystrings } from "@/router/a-rewrite/methods/helpers/consume-referral-info";
-import { initializeFromQueryStrings } from "@/router/a-rewrite/methods/helpers/initialize-from-querystrings";
-import { stashAllQueries } from "@/router/a-rewrite/methods/helpers/querystring-stash";
+import router from "@/router";
+import { routeData } from "@/router/constants/routes";
+import { consumeReferralQuerystrings } from "@/router/methods/helpers/consume-referral-info";
+import { initializeFromQueryStrings } from "@/router/methods/helpers/initialize-from-querystrings";
+import { stashAllQueries } from "@/router/methods/helpers/querystring-stash";
 import store from "@/store";
 
 export async function landingBeforeEnter(to, from) {
diff --git a/src/router/a-rewrite/methods/route-logic/load-session.js b/src/router/methods/route-logic/load-session.js
similarity index 82%
rename from src/router/a-rewrite/methods/route-logic/load-session.js
rename to src/router/methods/route-logic/load-session.js
index c70eb28d6..9265ed543 100644
--- a/src/router/a-rewrite/methods/route-logic/load-session.js
+++ b/src/router/methods/route-logic/load-session.js
@@ -1,5 +1,5 @@
 import { loadSessionIfPresent } from "@/helpers/heritage-integration/order-helper";
-import { routeData } from "@/router/a-rewrite/constants/routes";
+import { routeData } from "@/router/constants/routes";
 
 export async function loadSessionBeforeEnter(to, from) {
     const loadSessionResponse = await loadSessionIfPresent(false, to.name);
diff --git a/src/router/a-rewrite/methods/route-logic/quote.js b/src/router/methods/route-logic/quote.js
similarity index 75%
rename from src/router/a-rewrite/methods/route-logic/quote.js
rename to src/router/methods/route-logic/quote.js
index 9771b9bbb..a74e95577 100644
--- a/src/router/a-rewrite/methods/route-logic/quote.js
+++ b/src/router/methods/route-logic/quote.js
@@ -1,7 +1,7 @@
 import { queryStrings } from "@/constants/query-strings";
 import { storeMutations } from "@/constants/store-mutations";
-import { routeData } from "@/router/a-rewrite/constants/routes";
-import { isVerifiedInsurance } from "@/router/a-rewrite/methods/helpers/requires-verified-redirect";
+import { routeData } from "@/router/constants/routes";
+import { isVerifiedInsurance } from "@/router/methods/helpers/requires-verified-redirect";
 import store from "@/store";
 
 export async function quoteBeforeEnter(to, from) {
diff --git a/src/router/a-rewrite/methods/route-logic/restart.js b/src/router/methods/route-logic/restart.js
similarity index 84%
rename from src/router/a-rewrite/methods/route-logic/restart.js
rename to src/router/methods/route-logic/restart.js
index 4589999e0..015c997a0 100644
--- a/src/router/a-rewrite/methods/route-logic/restart.js
+++ b/src/router/methods/route-logic/restart.js
@@ -1,7 +1,7 @@
 import { storeActions } from "@/constants/store-actions";
 import { deleteFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
-import router from "@/router/a-rewrite";
-import { FUNNEL_START_PAGE } from "@/router/a-rewrite/constants/routes";
+import router from "@/router";
+import { FUNNEL_START_PAGE } from "@/router/constants/routes";
 import store from "@/store";
 
 export async function restartBeforeEnter(to, from) {
diff --git a/src/router/a-rewrite/methods/route-logic/vehicle.js b/src/router/methods/route-logic/vehicle.js
similarity index 81%
rename from src/router/a-rewrite/methods/route-logic/vehicle.js
rename to src/router/methods/route-logic/vehicle.js
index ed241d7de..e1da282d0 100644
--- a/src/router/a-rewrite/methods/route-logic/vehicle.js
+++ b/src/router/methods/route-logic/vehicle.js
@@ -1,8 +1,8 @@
 import { storeMutations } from "@/constants/store-mutations";
 import { getBoolFromString } from "@/helpers/boolean-helper";
 import { getFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
-import { routeData } from "@/router/a-rewrite/constants/routes";
-import { isVerifiedInsurance } from "@/router/a-rewrite/methods/helpers/requires-verified-redirect";
+import { routeData } from "@/router/constants/routes";
+import { isVerifiedInsurance } from "@/router/methods/helpers/requires-verified-redirect";
 import store from "@/store";
 
 export async function vehicleBeforeEnter(to, from) {
diff --git a/src/router/a-rewrite/methods/routes.js b/src/router/methods/routes.js
similarity index 60%
rename from src/router/a-rewrite/methods/routes.js
rename to src/router/methods/routes.js
index 5cbc8e94e..0911b78dd 100644
--- a/src/router/a-rewrite/methods/routes.js
+++ b/src/router/methods/routes.js
@@ -1,15 +1,15 @@
-import { createRoute, createVirtualRoute } from "@/router/a-rewrite/methods/helpers/create-route";
-import { routeData } from "@/router/a-rewrite/constants/routes";
+import { createRoute, createVirtualRoute } from "@/router/methods/helpers/create-route";
+import { routeData } from "@/router/constants/routes";
 
-import { vehicleBeforeEnter } from "@/router/a-rewrite/methods/route-logic/vehicle";
-import { quoteBeforeEnter } from "@/router/a-rewrite/methods/route-logic/quote";
-import { insuranceCompanyBeforeEnter } from "@/router/a-rewrite/methods/route-logic/insurance-company";
-import { landingBeforeEnter } from "@/router/a-rewrite/methods/route-logic/landing";
-import { heritageBeforeEnter } from "@/router/a-rewrite/methods/route-logic/heritage";
-import { loadSessionBeforeEnter } from "@/router/a-rewrite/methods/route-logic/load-session";
-import { autoRouteBeforeEnter } from "@/router/a-rewrite/methods/route-logic/auto-route";
-import { errorBeforeEnter } from "@/router/a-rewrite/methods/route-logic/error";
-import { restartBeforeEnter } from "@/router/a-rewrite/methods/route-logic/restart";
+import { vehicleBeforeEnter } from "@/router/methods/route-logic/vehicle";
+import { quoteBeforeEnter } from "@/router/methods/route-logic/quote";
+import { insuranceCompanyBeforeEnter } from "@/router/methods/route-logic/insurance-company";
+import { landingBeforeEnter } from "@/router/methods/route-logic/landing";
+import { heritageBeforeEnter } from "@/router/methods/route-logic/heritage";
+import { loadSessionBeforeEnter } from "@/router/methods/route-logic/load-session";
+import { autoRouteBeforeEnter } from "@/router/methods/route-logic/auto-route";
+import { errorBeforeEnter } from "@/router/methods/route-logic/error";
+import { restartBeforeEnter } from "@/router/methods/route-logic/restart";
 
 export const routes = [
     // Non-virtual pages.
diff --git a/src/router/methods/send-to-return-user.js b/src/router/methods/send-to-return-user.js
new file mode 100644
index 000000000..f1f864cb1
--- /dev/null
+++ b/src/router/methods/send-to-return-user.js
@@ -0,0 +1,11 @@
+import analyticsMixin from "@/mixins/analytics-mixin";
+import router from "@/router";
+import { routeData } from "@/router/constants/routes";
+
+export function sendToReturnUser() {
+    analyticsMixin.methods.initSession();
+
+    router.push({
+        name: routeData.RETURN_USER.name,
+    });
+}
diff --git a/src/router/router-constants/externalUrl-values.js b/src/router/router-constants/externalUrl-values.js
deleted file mode 100644
index 5516095c4..000000000
--- a/src/router/router-constants/externalUrl-values.js
+++ /dev/null
@@ -1,6 +0,0 @@
-const externalUrls = {
-    HERITAGE_FUNNEL: process.env.VUE_APP_HERITAGE_FUNNEL,
-    SAFELITE_HOP: process.env.VUE_APP_SAFELITE_HOP,
-};
-
-export { externalUrls };
diff --git a/src/router/router-constants/fmgPage-values.js b/src/router/router-constants/fmgPage-values.js
deleted file mode 100644
index 1cba0414b..000000000
--- a/src/router/router-constants/fmgPage-values.js
+++ /dev/null
@@ -1,32 +0,0 @@
-const fmgPageValues = {
-    VEHICLE: "vehicle",
-    VEHICLE_DAMAGE: "vehicle-damage",
-    ADDRESS_LOOKUP: "address-lookup",
-    VIN_LOOKUP: "vin-lookup",
-    VEHICLE_PARTS: "vehicle-parts",
-    PART_QUESTIONS: "part-questions",
-    MOLDING_QUESTIONS: "molding-questions",
-    CAPABILITY_QUESTIONS: "capability-questions",
-    LICENSE_PLATE_LOOKUP: "license-plate-lookup",
-    ESTIMATE: "estimate",
-    SERVICE_ZIP: "service-zip",
-    ADDRESS_VEHICLES: "address-vehicles",
-    QUOTE: "quote",
-    INSURANCE_COMPANY: "insurance-company",
-    INSURANCE_DETAILS: "insurance-details",
-    SERVICE_LOCATION: "service-location",
-    HERITAGE: "heritage",
-    SCHEDULE: "schedule",
-    CUSTOMER_DETAILS: "customer-details",
-    PAYMENT_METHOD: "payment-method",
-    PAYMENT: "payment",
-    PAYMENT_PIA_RETURN: "payment-pia-return",
-    CONFIRMATION: "confirmation",
-    RETURN_USER: "return-user",
-    EMAIL_SMS_PAGES: "email-or-sms-related-pages",
-};
-
-const funnelStartPageName = fmgPageValues.VEHICLE;
-const returnUserPageName = fmgPageValues.RETURN_USER;
-
-export { fmgPageValues, funnelStartPageName, returnUserPageName };
diff --git a/src/router/router-constants/navigation-scenarios.js b/src/router/router-constants/navigation-scenarios.js
deleted file mode 100644
index 56a40926a..000000000
--- a/src/router/router-constants/navigation-scenarios.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * We want to name these to describe the scenario rather than what page(s) they're used on.
- *
- * Naming convention: [PAST_TENSE_VERB]_[DESCRIPTOR_OF_STATE]
- * ex: Rather than "HAS_PART_QUESTIONS", we might name the
- *     scenario "CLICKED_FORWARD_WITH_PART_QUESTIONS"
- */
-
-const navigationScenarios = {
-    // General
-    CLICKED_BACK: "CLICKED_BACK",
-    CLICKED_FORWARD: "CLICKED_FORWARD",
-    CLICKED_FORWARD_WITH_CASH: "CLICKED_FORWARD_WITH_CASH",
-    CLICKED_FORWARD_WITH_INSURANCE: "CLICKED_FORWARD_WITH_INSURANCE",
-
-    // Vin selection
-    CLICKED_BACK_WITH_VIN: "CLICKED_BACK_WITH_VIN",
-    CLICKED_BACK_WITH_SKIP_VIN: "CLICKED_BACK_WITH_SKIP_VIN",
-    CLICKED_FORWARD_WITH_VIN: "CLICKED_FORWARD_WITH_VIN",
-    CLICKED_FORWARD_WITH_REPAIR_AND_VERIFIED_INSURANCE:
-        "CLICKED_FORWARD_WITH_REPAIR_AND_VERIFIED_INSURANCE",
-    CLICKED_FORWARD_WITH_REPLACE_AND_VERIFIED_INSURANCE:
-        "CLICKED_FORWARD_WITH_REPLACE_AND_VERIFIED_INSURANCE",
-    CLICKED_FORWARD_WITHOUT_VIN: "CLICKED_FORWARD_WITHOUT_VIN",
-    CLICKED_FORWARD_WITH_SKIP_VIN: "CLICKED_FORWARD_WITH_SKIP_VIN",
-    CLICKED_FORWARD_WITH_MULTIPLE_VEHICLES: "CLICKED_FORWARD_WITH_MULTIPLE_VEHICLES",
-    SELECTED_VIN_WITH_MISMATCHED_GLASS: "SELECTED_VIN_WITH_MISMATCHED_GLASS",
-    SELECTED_MANUAL_VIN: "SELECTED_MANUAL_VIN",
-    SELECTED_LICENSE_PLATE: "SELECTED_LICENSE_PLATE",
-    SELECTED_HOME_ADDRESS: "SELECTED_HOME_ADDRESS",
-    SELECTED_NO_VIN: "SELECTED_NO_VIN",
-    CLICKED_FORWARD_WITH_NO_QUESTIONS: "CLICKED_FORWARD_WITH_NO_QUESTIONS",
-    CLICKED_VIN_RETRY: "CLICKED_VIN_RETRY",
-
-    // Part selection
-    CLICKED_FORWARD_WITH_PART_QUESTIONS: "CLICKED_FORWARD_WITH_PART_QUESTIONS",
-    CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE: "CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE",
-    CLICKED_FORWARD_WITH_MOLDING_QUESTIONS: "CLICKED_FORWARD_WITH_MOLDING_QUESTIONS",
-    CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS: "CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS",
-    CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS: "CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS",
-    CLICKED_BACK_WITH_PART_QUESTIONS: "CLICKED_BACK_WITH_PART_QUESTIONS",
-    CLICKED_BACK_WITH_MULTIPLE_PARTS_TO_CHOOSE: "CLICKED_BACK_WITH_MULTIPLE_PARTS_TO_CHOOSE",
-    CLICKED_BACK_WITH_MOLDING_QUESTIONS: "CLICKED_BACK_WITH_MOLDING_QUESTIONS",
-    CLICKED_BACK_WITH_CAPABILITY_QUESTIONS: "CLICKED_BACK_WITH_CAPABILITY_QUESTIONS",
-    CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS: "CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS",
-    CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS: "CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS",
-
-    // Schedule
-    CLICKED_CHANGE_LOCATION: "CLICKED_CHANGE_LOCATION",
-
-    // Payment
-    CLICKED_INSURANCE: "CLICKED_INSURANCE",
-    CLICKED_PAY_NOW: "CLICKED_PAY_NOW",
-    PIA_ERROR: "PIA_ERROR",
-    PIA_CC_ERROR: "PIA_CC_ERROR",
-    PIA_SUCCESS: "PIA_SUCCESS",
-};
-
-export { navigationScenarios };
diff --git a/src/router/router-constants/router-params.js b/src/router/router-constants/router-params.js
deleted file mode 100644
index ae7b88283..000000000
--- a/src/router/router-constants/router-params.js
+++ /dev/null
@@ -1,6 +0,0 @@
-const routerParams = {
-    DISPLAY_VEHICLE_CHANGE_ALERT: "displayVehicleChangeAlert",
-    DISPLAY_PIA_ALERT: "displayPiaAlert",
-};
-
-export { routerParams };
diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js
deleted file mode 100644
index 8891e7cff..000000000
--- a/src/router/router-constants/routing-table.js
+++ /dev/null
@@ -1,546 +0,0 @@
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
-import { navigationScenarios } from "@/router/router-constants/navigation-scenarios";
-
-// Get store from router/index.js instead of importing it here to get updated values
-const routingTable = function (store) {
-    return [
-        {
-            fmgPageValue: fmgPageValues.VEHICLE,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
-                },
-            ],
-        },
-
-        {
-            fmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_VIN,
-                    destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITHOUT_VIN,
-                    destinationFmgPageValue: fmgPageValues.ESTIMATE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_SKIP_VIN,
-                    destinationFmgPageValue: fmgPageValues.SERVICE_ZIP,
-                },
-                {
-                    scenario:
-                        navigationScenarios.CLICKED_FORWARD_WITH_REPAIR_AND_VERIFIED_INSURANCE,
-                    destinationFmgPageValue: fmgPageValues.SERVICE_ZIP,
-                },
-                {
-                    scenario:
-                        navigationScenarios.CLICKED_FORWARD_WITH_REPLACE_AND_VERIFIED_INSURANCE,
-                    destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.VIN_LOOKUP,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationFmgPageValue: fmgPageValues.ESTIMATE,
-                },
-                {
-                    scenario: navigationScenarios.SELECTED_VIN_WITH_MISMATCHED_GLASS,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_VIN,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.PART_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.QUOTE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_VIN_RETRY,
-                    destinationFmgPageValue: fmgPageValues.ESTIMATE,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.LICENSE_PLATE_LOOKUP,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationFmgPageValue: fmgPageValues.ESTIMATE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.PART_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.QUOTE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_VIN_RETRY,
-                    destinationFmgPageValue: fmgPageValues.ESTIMATE,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.ADDRESS_LOOKUP,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationFmgPageValue: fmgPageValues.ESTIMATE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_VEHICLES,
-                    destinationFmgPageValue: fmgPageValues.ADDRESS_VEHICLES,
-                },
-                {
-                    scenario: navigationScenarios.SELECTED_VIN_WITH_MISMATCHED_GLASS,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.PART_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.QUOTE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_VIN_RETRY,
-                    destinationFmgPageValue: fmgPageValues.ESTIMATE,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.ADDRESS_VEHICLES,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationFmgPageValue: fmgPageValues.ADDRESS_LOOKUP,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.PART_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.QUOTE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_VIN_RETRY,
-                    destinationFmgPageValue: fmgPageValues.ESTIMATE,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.ESTIMATE,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
-                },
-                {
-                    scenario: navigationScenarios.SELECTED_MANUAL_VIN,
-                    destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
-                },
-                {
-                    scenario: navigationScenarios.SELECTED_LICENSE_PLATE,
-                    destinationFmgPageValue: fmgPageValues.LICENSE_PLATE_LOOKUP,
-                },
-                {
-                    scenario: navigationScenarios.SELECTED_HOME_ADDRESS,
-                    destinationFmgPageValue: fmgPageValues.ADDRESS_LOOKUP,
-                },
-                {
-                    scenario: navigationScenarios.SELECTED_NO_VIN,
-                    destinationFmgPageValue: fmgPageValues.SERVICE_ZIP,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.SERVICE_ZIP,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationFmgPageValue: fmgPageValues.ESTIMATE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_SKIP_VIN,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.QUOTE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.PART_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.QUOTE,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.PART_QUESTIONS,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.SERVICE_ZIP,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.QUOTE,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.VEHICLE_PARTS,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.PART_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.SERVICE_ZIP,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.QUOTE,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.SERVICE_ZIP,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.PART_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.QUOTE,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.SERVICE_ZIP,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.PART_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_MOLDING_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.QUOTE,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.QUOTE,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.SERVICE_ZIP,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.PART_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_MOLDING_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_CAPABILITY_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CASH,
-                    destinationFmgPageValue: fmgPageValues.SERVICE_LOCATION,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_INSURANCE,
-                    destinationFmgPageValue: fmgPageValues.INSURANCE_COMPANY,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.INSURANCE_COMPANY,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationFmgPageValue: fmgPageValues.QUOTE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD,
-                    destinationFmgPageValue: fmgPageValues.INSURANCE_DETAILS,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.SERVICE_LOCATION,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationFmgPageValue: fmgPageValues.QUOTE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD,
-                    destinationFmgPageValue: fmgPageValues.SCHEDULE,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.SCHEDULE,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationFmgPageValue: fmgPageValues.SERVICE_LOCATION,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD,
-                    destinationFmgPageValue: fmgPageValues.CUSTOMER_DETAILS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_CHANGE_LOCATION,
-                    destinationFmgPageValue: fmgPageValues.SERVICE_LOCATION,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.CUSTOMER_DETAILS,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationFmgPageValue: fmgPageValues.SCHEDULE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD,
-                    destinationFmgPageValue: fmgPageValues.PAYMENT_METHOD,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_PAY_NOW,
-                    destinationFmgPageValue: fmgPageValues.PAYMENT_METHOD,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.PAYMENT_METHOD,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationFmgPageValue: fmgPageValues.CUSTOMER_DETAILS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD,
-                    destinationFmgPageValue: fmgPageValues.CONFIRMATION,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_PAY_NOW,
-                    destinationFmgPageValue: fmgPageValues.PAYMENT,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_INSURANCE,
-                    destinationFmgPageValue: fmgPageValues.INSURANCE_COMPANY,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.PAYMENT,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationFmgPageValue: fmgPageValues.PAYMENT_METHOD,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD,
-                    destinationFmgPageValue: fmgPageValues.CONFIRMATION,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.PAYMENT_PIA_RETURN,
-            maps: [
-                {
-                    scenario: navigationScenarios.PIA_ERROR,
-                    destinationFmgPageValue: fmgPageValues.PAYMENT_METHOD,
-                },
-                {
-                    scenario: navigationScenarios.PIA_CC_ERROR,
-                    destinationFmgPageValue: fmgPageValues.PAYMENT,
-                },
-                {
-                    scenario: navigationScenarios.PIA_SUCCESS,
-                    destinationFmgPageValue: fmgPageValues.CONFIRMATION,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.CONFIRMATION,
-        },
-        // The destination page for return user does not matter.  the router will invoke implicit navigation
-        {
-            fmgPageValue: fmgPageValues.RETURN_USER,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE,
-                },
-            ],
-        },
-    ];
-};
-
-export { routingTable };
diff --git a/src/store/index.js b/src/store/index.js
index 468a9e9eb..e3cb7ca2c 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -10,7 +10,7 @@ import { applicationConfig } from "@/constants/application-config";
 import { experimentTriggers } from "@/constants/experiments";
 import { damageLocationsSelected } from "@/constants/damage-locations-selected";
 import { singleWindshieldCarIds } from "@/constants/single-windshield-carids";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import { routeData } from "@/router/constants/routes";
 import { deleteFunnelCookie } from "@/helpers/heritage-integration/cookie-helper.js";
 import { deepEqual } from "@/helpers/object-helper";
 import baseMixin from "@/mixins/base-mixin.js";
@@ -599,10 +599,10 @@ export const mutations = {
         state.order.damage.partQuestionAnswers = null;
         state.order.damage.moldingQuestionAnswers = null;
         state.order.damage.capabilityQuestionAnswers = null;
-        state.applicationUser.pageData[fmgPageValues.PART_QUESTIONS] = null;
-        state.applicationUser.pageData[fmgPageValues.VEHICLE_PARTS] = null;
-        state.applicationUser.pageData[fmgPageValues.MOLDING_QUESTIONS] = null;
-        state.applicationUser.pageData[fmgPageValues.CAPABILITY_QUESTIONS] = null;
+        state.applicationUser.pageData[routeData.PART_QUESTIONS.name] = null;
+        state.applicationUser.pageData[routeData.VEHICLE_PARTS.name] = null;
+        state.applicationUser.pageData[routeData.MOLDING_QUESTIONS.name] = null;
+        state.applicationUser.pageData[routeData.CAPABILITY_QUESTIONS.name] = null;
     },
     resetSchedule(state) {
         state.order.schedule.date = null;
@@ -666,10 +666,10 @@ export const mutations = {
         state.order.isRecalAckOptIn = sessionInformation.order.isRecalAckOptIn;
 
         if (state.order.vehicle.vin !== sessionInformation.order.vehicle?.vin) {
-            state.applicationUser.pageData[fmgPageValues.PART_QUESTIONS] = null;
-            state.applicationUser.pageData[fmgPageValues.VEHICLE_PARTS] = null;
-            state.applicationUser.pageData[fmgPageValues.MOLDING_QUESTIONS] = null;
-            state.applicationUser.pageData[fmgPageValues.CAPABILITY_QUESTIONS] = null;
+            state.applicationUser.pageData[routeData.PART_QUESTIONS.name] = null;
+            state.applicationUser.pageData[routeData.VEHICLE_PARTS.name] = null;
+            state.applicationUser.pageData[routeData.MOLDING_QUESTIONS.name] = null;
+            state.applicationUser.pageData[routeData.CAPABILITY_QUESTIONS.name] = null;
         }
 
         state.order.vehicle = Object.assign(state.order.vehicle, {
@@ -1065,7 +1065,7 @@ export const getters = {
         // if we're here, then we have both email and phone so get the value from pageData to reflect what they entered on the page.
         // if they didn't enter anything on the page default to email
         return (
-            state.applicationUser.pageData[fmgPageValues.EMAIL_SMS_PAGES]?.emailOrSmsValue ??
+            state.applicationUser.pageData[routeData.SERVICE_ZIP.name]?.emailOrSmsValue ??
             state.order.customer.emailAddress
         );
     },
@@ -1989,7 +1989,7 @@ export const actions = {
 
     getPartFromCapabilityQuestionAnswer(context, { payload, pageNameToLog }) {
         const glassLocation = payload;
-        const pageData = context.getters.pageData(fmgPageValues.CAPABILITY_QUESTIONS);
+        const pageData = context.getters.pageData(routeData.CAPABILITY_QUESTIONS.name);
 
         const part = pageData.partsOrQuestions.find((x) => x.glassLocation === glassLocation)
             .parts[0];
@@ -2627,15 +2627,15 @@ export const actions = {
             context.commit(storeMutations.UPDATE_MOLDING_QUESTION_ANSWERS, null);
             context.commit(storeMutations.UPDATE_CAPABILITY_QUESTION_ANSWERS, null);
             context.commit(storeMutations.UPDATE_PAGE_DATA, {
-                page: fmgPageValues.VEHICLE_PARTS,
+                page: routeData.VEHICLE_PARTS.name,
                 data: null,
             });
             context.commit(storeMutations.UPDATE_PAGE_DATA, {
-                page: fmgPageValues.MOLDING_QUESTIONS,
+                page: routeData.MOLDING_QUESTIONS.name,
                 data: null,
             });
             context.commit(storeMutations.UPDATE_PAGE_DATA, {
-                page: fmgPageValues.CAPABILITY_QUESTIONS,
+                page: routeData.CAPABILITY_QUESTIONS.name,
                 data: null,
             });
         }
@@ -2646,8 +2646,8 @@ export const actions = {
 
     resetMoldingAndCapabilityQuestionAnswersIfNeeded(context, matchedParts) {
         const partsOrQuestionsDataToCompareWith =
-            context.getters.pageData(fmgPageValues.MOLDING_QUESTIONS)?.partsOrQuestions ??
-            context.getters.pageData(fmgPageValues.CAPABILITY_QUESTIONS)?.partsOrQuestions ??
+            context.getters.pageData(routeData.MOLDING_QUESTIONS.name)?.partsOrQuestions ??
+            context.getters.pageData(routeData.CAPABILITY_QUESTIONS.name)?.partsOrQuestions ??
             [];
 
         function getAllPartNumbers(partsOrQuestions) {
@@ -2676,11 +2676,11 @@ export const actions = {
             context.commit(storeMutations.UPDATE_MOLDING_QUESTION_ANSWERS, null);
             context.commit(storeMutations.UPDATE_CAPABILITY_QUESTION_ANSWERS, null);
             context.commit(storeMutations.UPDATE_PAGE_DATA, {
-                page: fmgPageValues.MOLDING_QUESTIONS,
+                page: routeData.MOLDING_QUESTIONS.name,
                 data: null,
             });
             context.commit(storeMutations.UPDATE_PAGE_DATA, {
-                page: fmgPageValues.CAPABILITY_QUESTIONS,
+                page: routeData.CAPABILITY_QUESTIONS.name,
                 data: null,
             });
         }
@@ -2708,7 +2708,7 @@ export const actions = {
             context.commit(storeMutations.UPDATE_SUPPORTING_ITEMS, null);
             context.commit(storeMutations.UPDATE_CAPABILITY_QUESTION_ANSWERS, null);
             context.commit(storeMutations.UPDATE_PAGE_DATA, {
-                page: fmgPageValues.CAPABILITY_QUESTIONS,
+                page: routeData.CAPABILITY_QUESTIONS.name,
                 data: null,
             });
         }