diff --git a/src/applications/disability-benefits/686c-674-v2/README.md b/src/applications/686c-674/README.md similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/README.md rename to src/applications/686c-674/README.md diff --git a/src/applications/disability-benefits/686c-674-v2/actions/index.js b/src/applications/686c-674/actions/index.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/actions/index.js rename to src/applications/686c-674/actions/index.js diff --git a/src/applications/disability-benefits/686c-674-v2/analytics/helpers.js b/src/applications/686c-674/analytics/helpers.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/analytics/helpers.js rename to src/applications/686c-674/analytics/helpers.js diff --git a/src/applications/disability-benefits/686c-674-v2/app-entry.jsx b/src/applications/686c-674/app-entry.jsx similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/app-entry.jsx rename to src/applications/686c-674/app-entry.jsx diff --git a/src/applications/disability-benefits/686c-674-v2/components/AdditionalEvidence.jsx b/src/applications/686c-674/components/AdditionalEvidence.jsx similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/components/AdditionalEvidence.jsx rename to src/applications/686c-674/components/AdditionalEvidence.jsx diff --git a/src/applications/disability-benefits/686c-674-v2/components/CustomPreSubmitInfo.js b/src/applications/686c-674/components/CustomPreSubmitInfo.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/components/CustomPreSubmitInfo.js rename to src/applications/686c-674/components/CustomPreSubmitInfo.js diff --git a/src/applications/disability-benefits/686c-674-v2/components/CustomReviewFields.jsx b/src/applications/686c-674/components/CustomReviewFields.jsx similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/components/CustomReviewFields.jsx rename to src/applications/686c-674/components/CustomReviewFields.jsx diff --git a/src/applications/disability-benefits/686c-674-v2/components/GetFormHelp.jsx b/src/applications/686c-674/components/GetFormHelp.jsx similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/components/GetFormHelp.jsx rename to src/applications/686c-674/components/GetFormHelp.jsx diff --git a/src/applications/disability-benefits/686c-674-v2/components/IntroductionPageFormProcess.jsx b/src/applications/686c-674/components/IntroductionPageFormProcess.jsx similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/components/IntroductionPageFormProcess.jsx rename to src/applications/686c-674/components/IntroductionPageFormProcess.jsx diff --git a/src/applications/disability-benefits/686c-674-v2/components/IntroductionPageHeader.jsx b/src/applications/686c-674/components/IntroductionPageHeader.jsx similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/components/IntroductionPageHeader.jsx rename to src/applications/686c-674/components/IntroductionPageHeader.jsx diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/674/addStudentsArrayPages.js b/src/applications/686c-674/config/chapters/674/addStudentsArrayPages.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/674/addStudentsArrayPages.js rename to src/applications/686c-674/config/chapters/674/addStudentsArrayPages.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/674/helpers.jsx b/src/applications/686c-674/config/chapters/674/helpers.jsx similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/674/helpers.jsx rename to src/applications/686c-674/config/chapters/674/helpers.jsx diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/household-income/helpers.js b/src/applications/686c-674/config/chapters/household-income/helpers.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/household-income/helpers.js rename to src/applications/686c-674/config/chapters/household-income/helpers.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/household-income/householdIncome.js b/src/applications/686c-674/config/chapters/household-income/householdIncome.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/household-income/householdIncome.js rename to src/applications/686c-674/config/chapters/household-income/householdIncome.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/household-income/index.js b/src/applications/686c-674/config/chapters/household-income/index.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/household-income/index.js rename to src/applications/686c-674/config/chapters/household-income/index.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-a-spouse/add-spouse-additional-evidence/spouseAdditionalEvidence.js b/src/applications/686c-674/config/chapters/report-add-a-spouse/add-spouse-additional-evidence/spouseAdditionalEvidence.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-a-spouse/add-spouse-additional-evidence/spouseAdditionalEvidence.js rename to src/applications/686c-674/config/chapters/report-add-a-spouse/add-spouse-additional-evidence/spouseAdditionalEvidence.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-a-spouse/current-marriage-information/currentMarriageInformation.js b/src/applications/686c-674/config/chapters/report-add-a-spouse/current-marriage-information/currentMarriageInformation.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-a-spouse/current-marriage-information/currentMarriageInformation.js rename to src/applications/686c-674/config/chapters/report-add-a-spouse/current-marriage-information/currentMarriageInformation.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-a-spouse/current-marriage-information/currentMarriageInformationPartFive.js b/src/applications/686c-674/config/chapters/report-add-a-spouse/current-marriage-information/currentMarriageInformationPartFive.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-a-spouse/current-marriage-information/currentMarriageInformationPartFive.js rename to src/applications/686c-674/config/chapters/report-add-a-spouse/current-marriage-information/currentMarriageInformationPartFive.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-a-spouse/current-marriage-information/currentMarriageInformationPartFour.js b/src/applications/686c-674/config/chapters/report-add-a-spouse/current-marriage-information/currentMarriageInformationPartFour.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-a-spouse/current-marriage-information/currentMarriageInformationPartFour.js rename to src/applications/686c-674/config/chapters/report-add-a-spouse/current-marriage-information/currentMarriageInformationPartFour.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-a-spouse/current-marriage-information/currentMarriageInformationPartThree.js b/src/applications/686c-674/config/chapters/report-add-a-spouse/current-marriage-information/currentMarriageInformationPartThree.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-a-spouse/current-marriage-information/currentMarriageInformationPartThree.js rename to src/applications/686c-674/config/chapters/report-add-a-spouse/current-marriage-information/currentMarriageInformationPartThree.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-a-spouse/current-marriage-information/currentMarriageInformationPartTwo.js b/src/applications/686c-674/config/chapters/report-add-a-spouse/current-marriage-information/currentMarriageInformationPartTwo.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-a-spouse/current-marriage-information/currentMarriageInformationPartTwo.js rename to src/applications/686c-674/config/chapters/report-add-a-spouse/current-marriage-information/currentMarriageInformationPartTwo.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-a-spouse/current-marriage-information/helpers.jsx b/src/applications/686c-674/config/chapters/report-add-a-spouse/current-marriage-information/helpers.jsx similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-a-spouse/current-marriage-information/helpers.jsx rename to src/applications/686c-674/config/chapters/report-add-a-spouse/current-marriage-information/helpers.jsx diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-a-spouse/current-spouse-marriage-history-details/additionalQuestionsView.js b/src/applications/686c-674/config/chapters/report-add-a-spouse/current-spouse-marriage-history-details/additionalQuestionsView.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-a-spouse/current-spouse-marriage-history-details/additionalQuestionsView.js rename to src/applications/686c-674/config/chapters/report-add-a-spouse/current-spouse-marriage-history-details/additionalQuestionsView.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-a-spouse/does-live-with-spouse/doesLiveWithSpouse.js b/src/applications/686c-674/config/chapters/report-add-a-spouse/does-live-with-spouse/doesLiveWithSpouse.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-a-spouse/does-live-with-spouse/doesLiveWithSpouse.js rename to src/applications/686c-674/config/chapters/report-add-a-spouse/does-live-with-spouse/doesLiveWithSpouse.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-a-spouse/index.js b/src/applications/686c-674/config/chapters/report-add-a-spouse/index.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-a-spouse/index.js rename to src/applications/686c-674/config/chapters/report-add-a-spouse/index.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-a-spouse/spouse-information/spouseInformation.js b/src/applications/686c-674/config/chapters/report-add-a-spouse/spouse-information/spouseInformation.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-a-spouse/spouse-information/spouseInformation.js rename to src/applications/686c-674/config/chapters/report-add-a-spouse/spouse-information/spouseInformation.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-a-spouse/spouse-information/spouseInformationPartThree.js b/src/applications/686c-674/config/chapters/report-add-a-spouse/spouse-information/spouseInformationPartThree.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-a-spouse/spouse-information/spouseInformationPartThree.js rename to src/applications/686c-674/config/chapters/report-add-a-spouse/spouse-information/spouseInformationPartThree.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-a-spouse/spouse-information/spouseInformationPartTwo.js b/src/applications/686c-674/config/chapters/report-add-a-spouse/spouse-information/spouseInformationPartTwo.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-a-spouse/spouse-information/spouseInformationPartTwo.js rename to src/applications/686c-674/config/chapters/report-add-a-spouse/spouse-information/spouseInformationPartTwo.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-a-spouse/spouseMarriageHistoryArrayPages.js b/src/applications/686c-674/config/chapters/report-add-a-spouse/spouseMarriageHistoryArrayPages.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-a-spouse/spouseMarriageHistoryArrayPages.js rename to src/applications/686c-674/config/chapters/report-add-a-spouse/spouseMarriageHistoryArrayPages.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-a-spouse/veteran-marriage-history-details/veteranAdditionalQuestionsView.js b/src/applications/686c-674/config/chapters/report-add-a-spouse/veteran-marriage-history-details/veteranAdditionalQuestionsView.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-a-spouse/veteran-marriage-history-details/veteranAdditionalQuestionsView.js rename to src/applications/686c-674/config/chapters/report-add-a-spouse/veteran-marriage-history-details/veteranAdditionalQuestionsView.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-a-spouse/veteranMarriageHistoryArrayPages.js b/src/applications/686c-674/config/chapters/report-add-a-spouse/veteranMarriageHistoryArrayPages.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-a-spouse/veteranMarriageHistoryArrayPages.js rename to src/applications/686c-674/config/chapters/report-add-a-spouse/veteranMarriageHistoryArrayPages.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-child/additionalInformationPartOne.js b/src/applications/686c-674/config/chapters/report-add-child/additionalInformationPartOne.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-child/additionalInformationPartOne.js rename to src/applications/686c-674/config/chapters/report-add-child/additionalInformationPartOne.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-child/additionalInformationPartTwo.js b/src/applications/686c-674/config/chapters/report-add-child/additionalInformationPartTwo.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-child/additionalInformationPartTwo.js rename to src/applications/686c-674/config/chapters/report-add-child/additionalInformationPartTwo.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-child/childAddressPartOne.js b/src/applications/686c-674/config/chapters/report-add-child/childAddressPartOne.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-child/childAddressPartOne.js rename to src/applications/686c-674/config/chapters/report-add-child/childAddressPartOne.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-child/childAddressPartTwo.js b/src/applications/686c-674/config/chapters/report-add-child/childAddressPartTwo.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-child/childAddressPartTwo.js rename to src/applications/686c-674/config/chapters/report-add-child/childAddressPartTwo.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-child/config.js b/src/applications/686c-674/config/chapters/report-add-child/config.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-child/config.js rename to src/applications/686c-674/config/chapters/report-add-child/config.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-child/identification.js b/src/applications/686c-674/config/chapters/report-add-child/identification.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-child/identification.js rename to src/applications/686c-674/config/chapters/report-add-child/identification.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-child/index.js b/src/applications/686c-674/config/chapters/report-add-child/index.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-child/index.js rename to src/applications/686c-674/config/chapters/report-add-child/index.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-child/information.js b/src/applications/686c-674/config/chapters/report-add-child/information.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-child/information.js rename to src/applications/686c-674/config/chapters/report-add-child/information.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-child/intro.js b/src/applications/686c-674/config/chapters/report-add-child/intro.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-child/intro.js rename to src/applications/686c-674/config/chapters/report-add-child/intro.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-child/placeOfBirth.js b/src/applications/686c-674/config/chapters/report-add-child/placeOfBirth.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-child/placeOfBirth.js rename to src/applications/686c-674/config/chapters/report-add-child/placeOfBirth.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-child/relationship.js b/src/applications/686c-674/config/chapters/report-add-child/relationship.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-child/relationship.js rename to src/applications/686c-674/config/chapters/report-add-child/relationship.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-child/stepchild.js b/src/applications/686c-674/config/chapters/report-add-child/stepchild.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-child/stepchild.js rename to src/applications/686c-674/config/chapters/report-add-child/stepchild.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-child/summary.js b/src/applications/686c-674/config/chapters/report-add-child/summary.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/report-add-child/summary.js rename to src/applications/686c-674/config/chapters/report-add-child/summary.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/report-child-stopped-attending-school/removeChildStoppedAttendingSchoolArrayPages.js b/src/applications/686c-674/config/chapters/report-child-stopped-attending-school/removeChildStoppedAttendingSchoolArrayPages.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/report-child-stopped-attending-school/removeChildStoppedAttendingSchoolArrayPages.js rename to src/applications/686c-674/config/chapters/report-child-stopped-attending-school/removeChildStoppedAttendingSchoolArrayPages.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/report-dependent-death/deceasedDependentArrayPages.js b/src/applications/686c-674/config/chapters/report-dependent-death/deceasedDependentArrayPages.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/report-dependent-death/deceasedDependentArrayPages.js rename to src/applications/686c-674/config/chapters/report-dependent-death/deceasedDependentArrayPages.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/report-dependent-death/helpers.js b/src/applications/686c-674/config/chapters/report-dependent-death/helpers.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/report-dependent-death/helpers.js rename to src/applications/686c-674/config/chapters/report-dependent-death/helpers.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/report-divorce/former-spouse-information/formerSpouseInformation.js b/src/applications/686c-674/config/chapters/report-divorce/former-spouse-information/formerSpouseInformation.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/report-divorce/former-spouse-information/formerSpouseInformation.js rename to src/applications/686c-674/config/chapters/report-divorce/former-spouse-information/formerSpouseInformation.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/report-divorce/former-spouse-information/formerSpouseInformationPartThree.js b/src/applications/686c-674/config/chapters/report-divorce/former-spouse-information/formerSpouseInformationPartThree.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/report-divorce/former-spouse-information/formerSpouseInformationPartThree.js rename to src/applications/686c-674/config/chapters/report-divorce/former-spouse-information/formerSpouseInformationPartThree.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/report-divorce/former-spouse-information/formerSpouseInformationPartTwo.js b/src/applications/686c-674/config/chapters/report-divorce/former-spouse-information/formerSpouseInformationPartTwo.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/report-divorce/former-spouse-information/formerSpouseInformationPartTwo.js rename to src/applications/686c-674/config/chapters/report-divorce/former-spouse-information/formerSpouseInformationPartTwo.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/report-divorce/index.js b/src/applications/686c-674/config/chapters/report-divorce/index.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/report-divorce/index.js rename to src/applications/686c-674/config/chapters/report-divorce/index.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/report-marriage-of-child/removeMarriedChildArrayPages.js b/src/applications/686c-674/config/chapters/report-marriage-of-child/removeMarriedChildArrayPages.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/report-marriage-of-child/removeMarriedChildArrayPages.js rename to src/applications/686c-674/config/chapters/report-marriage-of-child/removeMarriedChildArrayPages.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/stepchild-no-longer-part-of-household/removeChildHouseholdArrayPages.js b/src/applications/686c-674/config/chapters/stepchild-no-longer-part-of-household/removeChildHouseholdArrayPages.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/stepchild-no-longer-part-of-household/removeChildHouseholdArrayPages.js rename to src/applications/686c-674/config/chapters/stepchild-no-longer-part-of-household/removeChildHouseholdArrayPages.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/taskWizard/index.js b/src/applications/686c-674/config/chapters/taskWizard/index.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/taskWizard/index.js rename to src/applications/686c-674/config/chapters/taskWizard/index.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/taskWizard/wizard/addDependentOptions.js b/src/applications/686c-674/config/chapters/taskWizard/wizard/addDependentOptions.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/taskWizard/wizard/addDependentOptions.js rename to src/applications/686c-674/config/chapters/taskWizard/wizard/addDependentOptions.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/taskWizard/wizard/addOrRemoveDependents.js b/src/applications/686c-674/config/chapters/taskWizard/wizard/addOrRemoveDependents.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/taskWizard/wizard/addOrRemoveDependents.js rename to src/applications/686c-674/config/chapters/taskWizard/wizard/addOrRemoveDependents.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/taskWizard/wizard/helpers.jsx b/src/applications/686c-674/config/chapters/taskWizard/wizard/helpers.jsx similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/taskWizard/wizard/helpers.jsx rename to src/applications/686c-674/config/chapters/taskWizard/wizard/helpers.jsx diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/taskWizard/wizard/removeDependentOptions.js b/src/applications/686c-674/config/chapters/taskWizard/wizard/removeDependentOptions.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/taskWizard/wizard/removeDependentOptions.js rename to src/applications/686c-674/config/chapters/taskWizard/wizard/removeDependentOptions.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/veteran-information/index.js b/src/applications/686c-674/config/chapters/veteran-information/index.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/veteran-information/index.js rename to src/applications/686c-674/config/chapters/veteran-information/index.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/veteran-information/veteran-address/veteran-address.js b/src/applications/686c-674/config/chapters/veteran-information/veteran-address/veteran-address.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/veteran-information/veteran-address/veteran-address.js rename to src/applications/686c-674/config/chapters/veteran-information/veteran-address/veteran-address.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/veteran-information/veteran-contact-information.js b/src/applications/686c-674/config/chapters/veteran-information/veteran-contact-information.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/veteran-information/veteran-contact-information.js rename to src/applications/686c-674/config/chapters/veteran-information/veteran-contact-information.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/veteran-information/veteran-information/VeteranInformationComponent.jsx b/src/applications/686c-674/config/chapters/veteran-information/veteran-information/VeteranInformationComponent.jsx similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/veteran-information/veteran-information/VeteranInformationComponent.jsx rename to src/applications/686c-674/config/chapters/veteran-information/veteran-information/VeteranInformationComponent.jsx diff --git a/src/applications/disability-benefits/686c-674-v2/config/chapters/veteran-information/veteran-information/veteran-information.js b/src/applications/686c-674/config/chapters/veteran-information/veteran-information/veteran-information.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/chapters/veteran-information/veteran-information/veteran-information.js rename to src/applications/686c-674/config/chapters/veteran-information/veteran-information/veteran-information.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/constants.js b/src/applications/686c-674/config/constants.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/constants.js rename to src/applications/686c-674/config/constants.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/form.js b/src/applications/686c-674/config/form.js similarity index 99% rename from src/applications/disability-benefits/686c-674-v2/config/form.js rename to src/applications/686c-674/config/form.js index 90e53556b71b..505fb92a846a 100644 --- a/src/applications/disability-benefits/686c-674-v2/config/form.js +++ b/src/applications/686c-674/config/form.js @@ -185,8 +185,6 @@ export const formConfig = { path: 'options-selection', uiSchema: addOrRemoveDependents.uiSchema, schema: addOrRemoveDependents.schema, - depends: () => - !window.location.pathname.includes('review-and-submit'), }, addDependentOptions: { hideHeaderRow: true, @@ -194,9 +192,7 @@ export const formConfig = { path: 'options-selection/add-dependents', uiSchema: addDependentOptions.uiSchema, schema: addDependentOptions.schema, - depends: form => - form?.['view:addOrRemoveDependents']?.add && - !window.location.pathname.includes('review-and-submit'), + depends: form => form?.['view:addOrRemoveDependents']?.add, }, removeDependentOptions: { hideHeaderRow: true, @@ -204,9 +200,7 @@ export const formConfig = { path: 'options-selection/remove-dependents', uiSchema: removeDependentOptions.uiSchema, schema: removeDependentOptions.schema, - depends: form => - form?.['view:addOrRemoveDependents']?.remove && - !window.location.pathname.includes('review-and-submit'), + depends: form => form?.['view:addOrRemoveDependents']?.remove, }, }, }, diff --git a/src/applications/disability-benefits/686c-674-v2/config/helpers.js b/src/applications/686c-674/config/helpers.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/helpers.js rename to src/applications/686c-674/config/helpers.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/location-schema.js b/src/applications/686c-674/config/location-schema.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/location-schema.js rename to src/applications/686c-674/config/location-schema.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/prefill-transformer.js b/src/applications/686c-674/config/prefill-transformer.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/prefill-transformer.js rename to src/applications/686c-674/config/prefill-transformer.js diff --git a/src/applications/disability-benefits/686c-674-v2/config/utilities.js b/src/applications/686c-674/config/utilities.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/config/utilities.js rename to src/applications/686c-674/config/utilities.js diff --git a/src/applications/disability-benefits/686c-674-v2/containers/App.jsx b/src/applications/686c-674/containers/App.jsx similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/containers/App.jsx rename to src/applications/686c-674/containers/App.jsx diff --git a/src/applications/disability-benefits/686c-674-v2/containers/ConfirmationPage.jsx b/src/applications/686c-674/containers/ConfirmationPage.jsx similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/containers/ConfirmationPage.jsx rename to src/applications/686c-674/containers/ConfirmationPage.jsx diff --git a/src/applications/disability-benefits/686c-674-v2/containers/IntroductionPage.jsx b/src/applications/686c-674/containers/IntroductionPage.jsx similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/containers/IntroductionPage.jsx rename to src/applications/686c-674/containers/IntroductionPage.jsx diff --git a/src/applications/disability-benefits/686c-674-v2/documentation/674.md b/src/applications/686c-674/documentation/674.md similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/documentation/674.md rename to src/applications/686c-674/documentation/674.md diff --git a/src/applications/disability-benefits/686c-674-v2/documentation/686c.md b/src/applications/686c-674/documentation/686c.md similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/documentation/686c.md rename to src/applications/686c-674/documentation/686c.md diff --git a/src/applications/disability-benefits/686c-674-v2/manifest.json b/src/applications/686c-674/manifest.json similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/manifest.json rename to src/applications/686c-674/manifest.json diff --git a/src/applications/disability-benefits/686c-674-v2/reducers/index.js b/src/applications/686c-674/reducers/index.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/reducers/index.js rename to src/applications/686c-674/reducers/index.js diff --git a/src/applications/disability-benefits/686c-674-v2/routes.jsx b/src/applications/686c-674/routes.jsx similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/routes.jsx rename to src/applications/686c-674/routes.jsx diff --git a/src/applications/disability-benefits/686c-674-v2/sass/new-686.scss b/src/applications/686c-674/sass/new-686.scss similarity index 89% rename from src/applications/disability-benefits/686c-674-v2/sass/new-686.scss rename to src/applications/686c-674/sass/new-686.scss index 7686cb314f85..af846ab346b4 100644 --- a/src/applications/disability-benefits/686c-674-v2/sass/new-686.scss +++ b/src/applications/686c-674/sass/new-686.scss @@ -1,10 +1,10 @@ @import "~@department-of-veterans-affairs/css-library/dist/tokens/scss/variables"; @import "~@department-of-veterans-affairs/css-library/dist/stylesheets/modules/m-process-list"; @import "~@department-of-veterans-affairs/css-library/dist/stylesheets/modules/m-form-process"; -@import "../../../../platform/forms/sass/m-schemaform"; +@import "../../../platform/forms/sass/m-schemaform"; @import "~@department-of-veterans-affairs/css-library/dist/stylesheets/modules/m-modal"; @import "~@department-of-veterans-affairs/css-library/dist/stylesheets/modules/m-omb-info"; -@import "../../../../platform/forms/sass/m-form-confirmation"; +@import "../../../platform/forms/sass/m-form-confirmation"; // a11y - Change gray box to white box with gray border. // Needed because when using a web component which diff --git a/src/applications/disability-benefits/686c-674-v2/tests/actions/index.unit.spec.js b/src/applications/686c-674/tests/actions/index.unit.spec.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/tests/actions/index.unit.spec.js rename to src/applications/686c-674/tests/actions/index.unit.spec.js diff --git a/src/applications/disability-benefits/686c-674-v2/tests/components/CustomReviewFields.unit.spec.js b/src/applications/686c-674/tests/components/CustomReviewFields.unit.spec.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/tests/components/CustomReviewFields.unit.spec.js rename to src/applications/686c-674/tests/components/CustomReviewFields.unit.spec.js diff --git a/src/applications/disability-benefits/686c-674-v2/tests/config/686taskWizard.unit.spec.jsx b/src/applications/686c-674/tests/config/686taskWizard.unit.spec.jsx similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/tests/config/686taskWizard.unit.spec.jsx rename to src/applications/686c-674/tests/config/686taskWizard.unit.spec.jsx diff --git a/src/applications/disability-benefits/686c-674-v2/tests/config/chapters/report-add-a-spouse/currentMarriageInformation.unit.spec.jsx b/src/applications/686c-674/tests/config/chapters/report-add-a-spouse/currentMarriageInformation.unit.spec.jsx similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/tests/config/chapters/report-add-a-spouse/currentMarriageInformation.unit.spec.jsx rename to src/applications/686c-674/tests/config/chapters/report-add-a-spouse/currentMarriageInformation.unit.spec.jsx diff --git a/src/applications/disability-benefits/686c-674-v2/tests/config/chapters/report-add-a-spouse/doesLiveWithSpouse.unit.spec.jsx b/src/applications/686c-674/tests/config/chapters/report-add-a-spouse/doesLiveWithSpouse.unit.spec.jsx similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/tests/config/chapters/report-add-a-spouse/doesLiveWithSpouse.unit.spec.jsx rename to src/applications/686c-674/tests/config/chapters/report-add-a-spouse/doesLiveWithSpouse.unit.spec.jsx diff --git a/src/applications/disability-benefits/686c-674-v2/tests/config/chapters/report-add-a-spouse/spouseMarriageHistoryArrayPages.unit.spec.js b/src/applications/686c-674/tests/config/chapters/report-add-a-spouse/spouseMarriageHistoryArrayPages.unit.spec.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/tests/config/chapters/report-add-a-spouse/spouseMarriageHistoryArrayPages.unit.spec.js rename to src/applications/686c-674/tests/config/chapters/report-add-a-spouse/spouseMarriageHistoryArrayPages.unit.spec.js diff --git a/src/applications/disability-benefits/686c-674-v2/tests/config/chapters/report-add-a-spouse/spouseNameInformation.unit.spec.jsx b/src/applications/686c-674/tests/config/chapters/report-add-a-spouse/spouseNameInformation.unit.spec.jsx similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/tests/config/chapters/report-add-a-spouse/spouseNameInformation.unit.spec.jsx rename to src/applications/686c-674/tests/config/chapters/report-add-a-spouse/spouseNameInformation.unit.spec.jsx diff --git a/src/applications/disability-benefits/686c-674-v2/tests/config/chapters/report-add-a-spouse/veteranMarriageHistoryArrayPages.unit.spec.js b/src/applications/686c-674/tests/config/chapters/report-add-a-spouse/veteranMarriageHistoryArrayPages.unit.spec.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/tests/config/chapters/report-add-a-spouse/veteranMarriageHistoryArrayPages.unit.spec.js rename to src/applications/686c-674/tests/config/chapters/report-add-a-spouse/veteranMarriageHistoryArrayPages.unit.spec.js diff --git a/src/applications/disability-benefits/686c-674-v2/tests/config/chapters/report-add-child/additionalInformationPartOne.unit.spec.js b/src/applications/686c-674/tests/config/chapters/report-add-child/additionalInformationPartOne.unit.spec.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/tests/config/chapters/report-add-child/additionalInformationPartOne.unit.spec.js rename to src/applications/686c-674/tests/config/chapters/report-add-child/additionalInformationPartOne.unit.spec.js diff --git a/src/applications/disability-benefits/686c-674-v2/tests/config/chapters/report-add-child/additionalInformationPartTwo.unit.spec.js b/src/applications/686c-674/tests/config/chapters/report-add-child/additionalInformationPartTwo.unit.spec.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/tests/config/chapters/report-add-child/additionalInformationPartTwo.unit.spec.js rename to src/applications/686c-674/tests/config/chapters/report-add-child/additionalInformationPartTwo.unit.spec.js diff --git a/src/applications/disability-benefits/686c-674-v2/tests/config/chapters/report-add-child/childAddressPartOne.unit.spec.js b/src/applications/686c-674/tests/config/chapters/report-add-child/childAddressPartOne.unit.spec.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/tests/config/chapters/report-add-child/childAddressPartOne.unit.spec.js rename to src/applications/686c-674/tests/config/chapters/report-add-child/childAddressPartOne.unit.spec.js diff --git a/src/applications/disability-benefits/686c-674-v2/tests/config/chapters/report-add-child/childAddressPartTwo.unit.spec.js b/src/applications/686c-674/tests/config/chapters/report-add-child/childAddressPartTwo.unit.spec.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/tests/config/chapters/report-add-child/childAddressPartTwo.unit.spec.js rename to src/applications/686c-674/tests/config/chapters/report-add-child/childAddressPartTwo.unit.spec.js diff --git a/src/applications/disability-benefits/686c-674-v2/tests/config/chapters/report-add-child/identification.unit.spec.js b/src/applications/686c-674/tests/config/chapters/report-add-child/identification.unit.spec.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/tests/config/chapters/report-add-child/identification.unit.spec.js rename to src/applications/686c-674/tests/config/chapters/report-add-child/identification.unit.spec.js diff --git a/src/applications/disability-benefits/686c-674-v2/tests/config/chapters/report-add-child/information.unit.spec.js b/src/applications/686c-674/tests/config/chapters/report-add-child/information.unit.spec.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/tests/config/chapters/report-add-child/information.unit.spec.js rename to src/applications/686c-674/tests/config/chapters/report-add-child/information.unit.spec.js diff --git a/src/applications/disability-benefits/686c-674-v2/tests/config/chapters/report-add-child/intro.unit.spec.js b/src/applications/686c-674/tests/config/chapters/report-add-child/intro.unit.spec.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/tests/config/chapters/report-add-child/intro.unit.spec.js rename to src/applications/686c-674/tests/config/chapters/report-add-child/intro.unit.spec.js diff --git a/src/applications/disability-benefits/686c-674-v2/tests/config/chapters/report-add-child/placeOfBirth.unit.spec.js b/src/applications/686c-674/tests/config/chapters/report-add-child/placeOfBirth.unit.spec.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/tests/config/chapters/report-add-child/placeOfBirth.unit.spec.js rename to src/applications/686c-674/tests/config/chapters/report-add-child/placeOfBirth.unit.spec.js diff --git a/src/applications/disability-benefits/686c-674-v2/tests/config/chapters/report-add-child/relationship.unit.spec.js b/src/applications/686c-674/tests/config/chapters/report-add-child/relationship.unit.spec.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/tests/config/chapters/report-add-child/relationship.unit.spec.js rename to src/applications/686c-674/tests/config/chapters/report-add-child/relationship.unit.spec.js diff --git a/src/applications/disability-benefits/686c-674-v2/tests/config/chapters/report-add-child/stepchild.unit.spec.js b/src/applications/686c-674/tests/config/chapters/report-add-child/stepchild.unit.spec.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/tests/config/chapters/report-add-child/stepchild.unit.spec.js rename to src/applications/686c-674/tests/config/chapters/report-add-child/stepchild.unit.spec.js diff --git a/src/applications/disability-benefits/686c-674-v2/tests/config/chapters/report-add-child/summary.unit.spec.js b/src/applications/686c-674/tests/config/chapters/report-add-child/summary.unit.spec.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/tests/config/chapters/report-add-child/summary.unit.spec.js rename to src/applications/686c-674/tests/config/chapters/report-add-child/summary.unit.spec.js diff --git a/src/applications/disability-benefits/686c-674-v2/tests/config/chapters/report-child-stopped-attending-school/removeChildStoppedAttendingSchoolArrayPages.unit.spec.js b/src/applications/686c-674/tests/config/chapters/report-child-stopped-attending-school/removeChildStoppedAttendingSchoolArrayPages.unit.spec.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/tests/config/chapters/report-child-stopped-attending-school/removeChildStoppedAttendingSchoolArrayPages.unit.spec.js rename to src/applications/686c-674/tests/config/chapters/report-child-stopped-attending-school/removeChildStoppedAttendingSchoolArrayPages.unit.spec.js diff --git a/src/applications/disability-benefits/686c-674-v2/tests/config/chapters/report-dependent-death/deceasedDependentsArray.unit.spec.js b/src/applications/686c-674/tests/config/chapters/report-dependent-death/deceasedDependentsArray.unit.spec.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/tests/config/chapters/report-dependent-death/deceasedDependentsArray.unit.spec.js rename to src/applications/686c-674/tests/config/chapters/report-dependent-death/deceasedDependentsArray.unit.spec.js diff --git a/src/applications/disability-benefits/686c-674-v2/tests/config/chapters/report-divorce/formerSpouseInformation.unit.spec.js b/src/applications/686c-674/tests/config/chapters/report-divorce/formerSpouseInformation.unit.spec.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/tests/config/chapters/report-divorce/formerSpouseInformation.unit.spec.js rename to src/applications/686c-674/tests/config/chapters/report-divorce/formerSpouseInformation.unit.spec.js diff --git a/src/applications/disability-benefits/686c-674-v2/tests/config/chapters/report-marriage-of-child/removeMarriedChildArrayPages.unit.spec.js b/src/applications/686c-674/tests/config/chapters/report-marriage-of-child/removeMarriedChildArrayPages.unit.spec.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/tests/config/chapters/report-marriage-of-child/removeMarriedChildArrayPages.unit.spec.js rename to src/applications/686c-674/tests/config/chapters/report-marriage-of-child/removeMarriedChildArrayPages.unit.spec.js diff --git a/src/applications/disability-benefits/686c-674-v2/tests/config/chapters/stepchild-no-longer-part-of-household/removeChildHouseholdArrayPages.unit.spec.js b/src/applications/686c-674/tests/config/chapters/stepchild-no-longer-part-of-household/removeChildHouseholdArrayPages.unit.spec.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/tests/config/chapters/stepchild-no-longer-part-of-household/removeChildHouseholdArrayPages.unit.spec.js rename to src/applications/686c-674/tests/config/chapters/stepchild-no-longer-part-of-household/removeChildHouseholdArrayPages.unit.spec.js diff --git a/src/applications/disability-benefits/686c-674-v2/tests/config/chapters/student-information/addStudentArrayPages.unit.spec.js b/src/applications/686c-674/tests/config/chapters/student-information/addStudentArrayPages.unit.spec.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/tests/config/chapters/student-information/addStudentArrayPages.unit.spec.js rename to src/applications/686c-674/tests/config/chapters/student-information/addStudentArrayPages.unit.spec.js diff --git a/src/applications/disability-benefits/686c-674-v2/tests/config/chapters/taskWizard/wizard/helpers.unit.spec.js b/src/applications/686c-674/tests/config/chapters/taskWizard/wizard/helpers.unit.spec.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/tests/config/chapters/taskWizard/wizard/helpers.unit.spec.js rename to src/applications/686c-674/tests/config/chapters/taskWizard/wizard/helpers.unit.spec.js diff --git a/src/applications/disability-benefits/686c-674-v2/tests/config/chapters/veteran-information/veteranAddress.unit.spec.jsx b/src/applications/686c-674/tests/config/chapters/veteran-information/veteranAddress.unit.spec.jsx similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/tests/config/chapters/veteran-information/veteranAddress.unit.spec.jsx rename to src/applications/686c-674/tests/config/chapters/veteran-information/veteranAddress.unit.spec.jsx diff --git a/src/applications/disability-benefits/686c-674-v2/tests/config/chapters/veteran-information/veteranInformation.unit.spec.jsx b/src/applications/686c-674/tests/config/chapters/veteran-information/veteranInformation.unit.spec.jsx similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/tests/config/chapters/veteran-information/veteranInformation.unit.spec.jsx rename to src/applications/686c-674/tests/config/chapters/veteran-information/veteranInformation.unit.spec.jsx diff --git a/src/applications/disability-benefits/686c-674-v2/tests/config/helpers.unit.spec.js b/src/applications/686c-674/tests/config/helpers.unit.spec.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/tests/config/helpers.unit.spec.js rename to src/applications/686c-674/tests/config/helpers.unit.spec.js diff --git a/src/applications/disability-benefits/686c-674-v2/tests/config/prefill-transformer.unit.spec.js b/src/applications/686c-674/tests/config/prefill-transformer.unit.spec.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/tests/config/prefill-transformer.unit.spec.js rename to src/applications/686c-674/tests/config/prefill-transformer.unit.spec.js diff --git a/src/applications/disability-benefits/686c-674-v2/tests/config/utilities.unit.spec.jsx b/src/applications/686c-674/tests/config/utilities.unit.spec.jsx similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/tests/config/utilities.unit.spec.jsx rename to src/applications/686c-674/tests/config/utilities.unit.spec.jsx diff --git a/src/applications/disability-benefits/686c-674-v2/tests/containers/confirmationPage.unit.spec.jsx b/src/applications/686c-674/tests/containers/confirmationPage.unit.spec.jsx similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/tests/containers/confirmationPage.unit.spec.jsx rename to src/applications/686c-674/tests/containers/confirmationPage.unit.spec.jsx diff --git a/src/applications/disability-benefits/686c-674-v2/tests/containers/introductionPage.unit.spec.jsx b/src/applications/686c-674/tests/containers/introductionPage.unit.spec.jsx similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/tests/containers/introductionPage.unit.spec.jsx rename to src/applications/686c-674/tests/containers/introductionPage.unit.spec.jsx diff --git a/src/applications/disability-benefits/686c-674-v2/tests/e2e/686C-674-ancilliary.cypress.spec.js b/src/applications/686c-674/tests/e2e/686C-674-ancilliary.cypress.spec.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/tests/e2e/686C-674-ancilliary.cypress.spec.js rename to src/applications/686c-674/tests/e2e/686C-674-ancilliary.cypress.spec.js diff --git a/src/applications/disability-benefits/686c-674-v2/tests/e2e/686C-674.cypress.spec.js b/src/applications/686c-674/tests/e2e/686C-674.cypress.spec.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/tests/e2e/686C-674.cypress.spec.js rename to src/applications/686c-674/tests/e2e/686C-674.cypress.spec.js diff --git a/src/applications/disability-benefits/686c-674-v2/tests/e2e/fixtures/add-child-add-674.json b/src/applications/686c-674/tests/e2e/fixtures/add-child-add-674.json similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/tests/e2e/fixtures/add-child-add-674.json rename to src/applications/686c-674/tests/e2e/fixtures/add-child-add-674.json diff --git a/src/applications/disability-benefits/686c-674-v2/tests/e2e/fixtures/add-child-report-divorce.json b/src/applications/686c-674/tests/e2e/fixtures/add-child-report-divorce.json similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/tests/e2e/fixtures/add-child-report-divorce.json rename to src/applications/686c-674/tests/e2e/fixtures/add-child-report-divorce.json diff --git a/src/applications/disability-benefits/686c-674-v2/tests/e2e/fixtures/ancilliary-flows.json b/src/applications/686c-674/tests/e2e/fixtures/ancilliary-flows.json similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/tests/e2e/fixtures/ancilliary-flows.json rename to src/applications/686c-674/tests/e2e/fixtures/ancilliary-flows.json diff --git a/src/applications/disability-benefits/686c-674-v2/tests/e2e/fixtures/spouse-child-all-fields.json b/src/applications/686c-674/tests/e2e/fixtures/spouse-child-all-fields.json similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/tests/e2e/fixtures/spouse-child-all-fields.json rename to src/applications/686c-674/tests/e2e/fixtures/spouse-child-all-fields.json diff --git a/src/applications/disability-benefits/686c-674-v2/tests/e2e/fixtures/spouse-report-divorce.json b/src/applications/686c-674/tests/e2e/fixtures/spouse-report-divorce.json similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/tests/e2e/fixtures/spouse-report-divorce.json rename to src/applications/686c-674/tests/e2e/fixtures/spouse-report-divorce.json diff --git a/src/applications/disability-benefits/686c-674-v2/tests/e2e/fixtures/va-file-number.json b/src/applications/686c-674/tests/e2e/fixtures/va-file-number.json similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/tests/e2e/fixtures/va-file-number.json rename to src/applications/686c-674/tests/e2e/fixtures/va-file-number.json diff --git a/src/applications/disability-benefits/686c-674-v2/tests/reducers/index.unit.spec.js b/src/applications/686c-674/tests/reducers/index.unit.spec.js similarity index 100% rename from src/applications/disability-benefits/686c-674-v2/tests/reducers/index.unit.spec.js rename to src/applications/686c-674/tests/reducers/index.unit.spec.js