diff --git a/packages/fxa-settings/src/components/App/index.tsx b/packages/fxa-settings/src/components/App/index.tsx
index 57b6cfa8152..026c8c8066b 100644
--- a/packages/fxa-settings/src/components/App/index.tsx
+++ b/packages/fxa-settings/src/components/App/index.tsx
@@ -53,12 +53,12 @@ import Legal from '../../pages/Legal';
 import LegalPrivacy from '../../pages/Legal/Privacy';
 import LegalTerms from '../../pages/Legal/Terms';
 import ThirdPartyAuthCallback from '../../pages/PostVerify/ThirdPartyAuthCallback';
-import ResetPasswordContainer from '../../pages/ResetPasswordRedesign/ResetPassword/container';
-import ConfirmResetPasswordContainer from '../../pages/ResetPasswordRedesign/ConfirmResetPassword/container';
-import CompleteResetPasswordContainer from '../../pages/ResetPasswordRedesign/CompleteResetPassword/container';
-import AccountRecoveryConfirmKeyContainer from '../../pages/ResetPasswordRedesign/AccountRecoveryConfirmKey/container';
-import ResetPasswordConfirmed from '../../pages/ResetPasswordRedesign/ResetPasswordConfirmed';
-import ResetPasswordWithRecoveryKeyVerified from '../../pages/ResetPasswordRedesign/ResetPasswordWithRecoveryKeyVerified';
+import ResetPasswordContainer from '../../pages/ResetPassword/ResetPassword/container';
+import ConfirmResetPasswordContainer from '../../pages/ResetPassword/ConfirmResetPassword/container';
+import CompleteResetPasswordContainer from '../../pages/ResetPassword/CompleteResetPassword/container';
+import AccountRecoveryConfirmKeyContainer from '../../pages/ResetPassword/AccountRecoveryConfirmKey/container';
+import ResetPasswordConfirmed from '../../pages/ResetPassword/ResetPasswordConfirmed';
+import ResetPasswordWithRecoveryKeyVerified from '../../pages/ResetPassword/ResetPasswordWithRecoveryKeyVerified';
 import CompleteSigninContainer from '../../pages/Signin/CompleteSignin/container';
 import SigninContainer from '../../pages/Signin/container';
 import ReportSigninContainer from '../../pages/Signin/ReportSignin/container';
diff --git a/packages/fxa-settings/src/pages/ResetPasswordRedesign/AccountRecoveryConfirmKey/container.tsx b/packages/fxa-settings/src/pages/ResetPassword/AccountRecoveryConfirmKey/container.tsx
similarity index 100%
rename from packages/fxa-settings/src/pages/ResetPasswordRedesign/AccountRecoveryConfirmKey/container.tsx
rename to packages/fxa-settings/src/pages/ResetPassword/AccountRecoveryConfirmKey/container.tsx
diff --git a/packages/fxa-settings/src/pages/ResetPasswordRedesign/AccountRecoveryConfirmKey/en.ftl b/packages/fxa-settings/src/pages/ResetPassword/AccountRecoveryConfirmKey/en.ftl
similarity index 100%
rename from packages/fxa-settings/src/pages/ResetPasswordRedesign/AccountRecoveryConfirmKey/en.ftl
rename to packages/fxa-settings/src/pages/ResetPassword/AccountRecoveryConfirmKey/en.ftl
diff --git a/packages/fxa-settings/src/pages/ResetPasswordRedesign/AccountRecoveryConfirmKey/gql.ts b/packages/fxa-settings/src/pages/ResetPassword/AccountRecoveryConfirmKey/gql.ts
similarity index 100%
rename from packages/fxa-settings/src/pages/ResetPasswordRedesign/AccountRecoveryConfirmKey/gql.ts
rename to packages/fxa-settings/src/pages/ResetPassword/AccountRecoveryConfirmKey/gql.ts
diff --git a/packages/fxa-settings/src/pages/ResetPasswordRedesign/AccountRecoveryConfirmKey/index.stories.tsx b/packages/fxa-settings/src/pages/ResetPassword/AccountRecoveryConfirmKey/index.stories.tsx
similarity index 89%
rename from packages/fxa-settings/src/pages/ResetPasswordRedesign/AccountRecoveryConfirmKey/index.stories.tsx
rename to packages/fxa-settings/src/pages/ResetPassword/AccountRecoveryConfirmKey/index.stories.tsx
index d6c56a43bb2..ef8eca8d441 100644
--- a/packages/fxa-settings/src/pages/ResetPasswordRedesign/AccountRecoveryConfirmKey/index.stories.tsx
+++ b/packages/fxa-settings/src/pages/ResetPassword/AccountRecoveryConfirmKey/index.stories.tsx
@@ -9,7 +9,7 @@ import { withLocalization } from 'fxa-react/lib/storybooks';
 import { Subject } from './mocks';
 
 export default {
-  title: 'Pages/ResetPasswordRedesign/AccountRecoveryConfirmKey',
+  title: 'Pages/ResetPassword/AccountRecoveryConfirmKey',
   component: AccountRecoveryConfirmKey,
   decorators: [withLocalization],
 } as Meta;
diff --git a/packages/fxa-settings/src/pages/ResetPasswordRedesign/AccountRecoveryConfirmKey/index.test.tsx b/packages/fxa-settings/src/pages/ResetPassword/AccountRecoveryConfirmKey/index.test.tsx
similarity index 100%
rename from packages/fxa-settings/src/pages/ResetPasswordRedesign/AccountRecoveryConfirmKey/index.test.tsx
rename to packages/fxa-settings/src/pages/ResetPassword/AccountRecoveryConfirmKey/index.test.tsx
diff --git a/packages/fxa-settings/src/pages/ResetPasswordRedesign/AccountRecoveryConfirmKey/index.tsx b/packages/fxa-settings/src/pages/ResetPassword/AccountRecoveryConfirmKey/index.tsx
similarity index 100%
rename from packages/fxa-settings/src/pages/ResetPasswordRedesign/AccountRecoveryConfirmKey/index.tsx
rename to packages/fxa-settings/src/pages/ResetPassword/AccountRecoveryConfirmKey/index.tsx
diff --git a/packages/fxa-settings/src/pages/ResetPasswordRedesign/AccountRecoveryConfirmKey/interfaces.ts b/packages/fxa-settings/src/pages/ResetPassword/AccountRecoveryConfirmKey/interfaces.ts
similarity index 100%
rename from packages/fxa-settings/src/pages/ResetPasswordRedesign/AccountRecoveryConfirmKey/interfaces.ts
rename to packages/fxa-settings/src/pages/ResetPassword/AccountRecoveryConfirmKey/interfaces.ts
diff --git a/packages/fxa-settings/src/pages/ResetPasswordRedesign/AccountRecoveryConfirmKey/mocks.tsx b/packages/fxa-settings/src/pages/ResetPassword/AccountRecoveryConfirmKey/mocks.tsx
similarity index 100%
rename from packages/fxa-settings/src/pages/ResetPasswordRedesign/AccountRecoveryConfirmKey/mocks.tsx
rename to packages/fxa-settings/src/pages/ResetPassword/AccountRecoveryConfirmKey/mocks.tsx
diff --git a/packages/fxa-settings/src/pages/ResetPasswordRedesign/CompleteResetPassword/container.tsx b/packages/fxa-settings/src/pages/ResetPassword/CompleteResetPassword/container.tsx
similarity index 100%
rename from packages/fxa-settings/src/pages/ResetPasswordRedesign/CompleteResetPassword/container.tsx
rename to packages/fxa-settings/src/pages/ResetPassword/CompleteResetPassword/container.tsx
diff --git a/packages/fxa-settings/src/pages/ResetPasswordRedesign/CompleteResetPassword/en.ftl b/packages/fxa-settings/src/pages/ResetPassword/CompleteResetPassword/en.ftl
similarity index 100%
rename from packages/fxa-settings/src/pages/ResetPasswordRedesign/CompleteResetPassword/en.ftl
rename to packages/fxa-settings/src/pages/ResetPassword/CompleteResetPassword/en.ftl
diff --git a/packages/fxa-settings/src/pages/ResetPasswordRedesign/CompleteResetPassword/index.stories.tsx b/packages/fxa-settings/src/pages/ResetPassword/CompleteResetPassword/index.stories.tsx
similarity index 92%
rename from packages/fxa-settings/src/pages/ResetPasswordRedesign/CompleteResetPassword/index.stories.tsx
rename to packages/fxa-settings/src/pages/ResetPassword/CompleteResetPassword/index.stories.tsx
index 19808f6d39a..241d285e477 100644
--- a/packages/fxa-settings/src/pages/ResetPasswordRedesign/CompleteResetPassword/index.stories.tsx
+++ b/packages/fxa-settings/src/pages/ResetPassword/CompleteResetPassword/index.stories.tsx
@@ -9,7 +9,7 @@ import { Subject } from './mocks';
 import CompleteResetPassword from '.';
 
 export default {
-  title: 'Pages/ResetPasswordRedesign/CompleteResetPassword',
+  title: 'Pages/ResetPassword/CompleteResetPassword',
   component: CompleteResetPassword,
   decorators: [withLocalization],
 } as Meta;
diff --git a/packages/fxa-settings/src/pages/ResetPasswordRedesign/CompleteResetPassword/index.test.tsx b/packages/fxa-settings/src/pages/ResetPassword/CompleteResetPassword/index.test.tsx
similarity index 100%
rename from packages/fxa-settings/src/pages/ResetPasswordRedesign/CompleteResetPassword/index.test.tsx
rename to packages/fxa-settings/src/pages/ResetPassword/CompleteResetPassword/index.test.tsx
diff --git a/packages/fxa-settings/src/pages/ResetPasswordRedesign/CompleteResetPassword/index.tsx b/packages/fxa-settings/src/pages/ResetPassword/CompleteResetPassword/index.tsx
similarity index 100%
rename from packages/fxa-settings/src/pages/ResetPasswordRedesign/CompleteResetPassword/index.tsx
rename to packages/fxa-settings/src/pages/ResetPassword/CompleteResetPassword/index.tsx
diff --git a/packages/fxa-settings/src/pages/ResetPasswordRedesign/CompleteResetPassword/interfaces.ts b/packages/fxa-settings/src/pages/ResetPassword/CompleteResetPassword/interfaces.ts
similarity index 100%
rename from packages/fxa-settings/src/pages/ResetPasswordRedesign/CompleteResetPassword/interfaces.ts
rename to packages/fxa-settings/src/pages/ResetPassword/CompleteResetPassword/interfaces.ts
diff --git a/packages/fxa-settings/src/pages/ResetPasswordRedesign/CompleteResetPassword/mocks.tsx b/packages/fxa-settings/src/pages/ResetPassword/CompleteResetPassword/mocks.tsx
similarity index 100%
rename from packages/fxa-settings/src/pages/ResetPasswordRedesign/CompleteResetPassword/mocks.tsx
rename to packages/fxa-settings/src/pages/ResetPassword/CompleteResetPassword/mocks.tsx
diff --git a/packages/fxa-settings/src/pages/ResetPasswordRedesign/ConfirmResetPassword/container.tsx b/packages/fxa-settings/src/pages/ResetPassword/ConfirmResetPassword/container.tsx
similarity index 100%
rename from packages/fxa-settings/src/pages/ResetPasswordRedesign/ConfirmResetPassword/container.tsx
rename to packages/fxa-settings/src/pages/ResetPassword/ConfirmResetPassword/container.tsx
diff --git a/packages/fxa-settings/src/pages/ResetPasswordRedesign/ConfirmResetPassword/en.ftl b/packages/fxa-settings/src/pages/ResetPassword/ConfirmResetPassword/en.ftl
similarity index 100%
rename from packages/fxa-settings/src/pages/ResetPasswordRedesign/ConfirmResetPassword/en.ftl
rename to packages/fxa-settings/src/pages/ResetPassword/ConfirmResetPassword/en.ftl
diff --git a/packages/fxa-settings/src/pages/ResetPasswordRedesign/ConfirmResetPassword/index.stories.tsx b/packages/fxa-settings/src/pages/ResetPassword/ConfirmResetPassword/index.stories.tsx
similarity index 90%
rename from packages/fxa-settings/src/pages/ResetPasswordRedesign/ConfirmResetPassword/index.stories.tsx
rename to packages/fxa-settings/src/pages/ResetPassword/ConfirmResetPassword/index.stories.tsx
index 336672ab9cd..3d2ba976996 100644
--- a/packages/fxa-settings/src/pages/ResetPasswordRedesign/ConfirmResetPassword/index.stories.tsx
+++ b/packages/fxa-settings/src/pages/ResetPassword/ConfirmResetPassword/index.stories.tsx
@@ -9,7 +9,7 @@ import ConfirmResetPassword from '.';
 import { Subject } from './mocks';
 
 export default {
-  title: 'Pages/ResetPasswordRedesign/ConfirmResetPassword',
+  title: 'Pages/ResetPassword/ConfirmResetPassword',
   component: ConfirmResetPassword,
   decorators: [withLocalization],
 } as Meta;
diff --git a/packages/fxa-settings/src/pages/ResetPasswordRedesign/ConfirmResetPassword/index.test.tsx b/packages/fxa-settings/src/pages/ResetPassword/ConfirmResetPassword/index.test.tsx
similarity index 99%
rename from packages/fxa-settings/src/pages/ResetPasswordRedesign/ConfirmResetPassword/index.test.tsx
rename to packages/fxa-settings/src/pages/ResetPassword/ConfirmResetPassword/index.test.tsx
index f9485658e00..18cc4242fb3 100644
--- a/packages/fxa-settings/src/pages/ResetPasswordRedesign/ConfirmResetPassword/index.test.tsx
+++ b/packages/fxa-settings/src/pages/ResetPassword/ConfirmResetPassword/index.test.tsx
@@ -136,7 +136,6 @@ describe('ConfirmResetPassword', () => {
     expect(mockResendCode).toHaveBeenCalledTimes(1);
   });
 
-
   it('handles Use different account link', async () => {
     let hardNavigateSpy: jest.SpyInstance;
     hardNavigateSpy = jest
diff --git a/packages/fxa-settings/src/pages/ResetPasswordRedesign/ConfirmResetPassword/index.tsx b/packages/fxa-settings/src/pages/ResetPassword/ConfirmResetPassword/index.tsx
similarity index 100%
rename from packages/fxa-settings/src/pages/ResetPasswordRedesign/ConfirmResetPassword/index.tsx
rename to packages/fxa-settings/src/pages/ResetPassword/ConfirmResetPassword/index.tsx
diff --git a/packages/fxa-settings/src/pages/ResetPasswordRedesign/ConfirmResetPassword/interfaces.ts b/packages/fxa-settings/src/pages/ResetPassword/ConfirmResetPassword/interfaces.ts
similarity index 100%
rename from packages/fxa-settings/src/pages/ResetPasswordRedesign/ConfirmResetPassword/interfaces.ts
rename to packages/fxa-settings/src/pages/ResetPassword/ConfirmResetPassword/interfaces.ts
diff --git a/packages/fxa-settings/src/pages/ResetPasswordRedesign/ConfirmResetPassword/mocks.tsx b/packages/fxa-settings/src/pages/ResetPassword/ConfirmResetPassword/mocks.tsx
similarity index 100%
rename from packages/fxa-settings/src/pages/ResetPasswordRedesign/ConfirmResetPassword/mocks.tsx
rename to packages/fxa-settings/src/pages/ResetPassword/ConfirmResetPassword/mocks.tsx
diff --git a/packages/fxa-settings/src/pages/ResetPasswordRedesign/ResetPassword/container.tsx b/packages/fxa-settings/src/pages/ResetPassword/ResetPassword/container.tsx
similarity index 100%
rename from packages/fxa-settings/src/pages/ResetPasswordRedesign/ResetPassword/container.tsx
rename to packages/fxa-settings/src/pages/ResetPassword/ResetPassword/container.tsx
diff --git a/packages/fxa-settings/src/pages/ResetPasswordRedesign/ResetPassword/en.ftl b/packages/fxa-settings/src/pages/ResetPassword/ResetPassword/en.ftl
similarity index 100%
rename from packages/fxa-settings/src/pages/ResetPasswordRedesign/ResetPassword/en.ftl
rename to packages/fxa-settings/src/pages/ResetPassword/ResetPassword/en.ftl
diff --git a/packages/fxa-settings/src/pages/ResetPasswordRedesign/ResetPassword/index.stories.tsx b/packages/fxa-settings/src/pages/ResetPassword/ResetPassword/index.stories.tsx
similarity index 90%
rename from packages/fxa-settings/src/pages/ResetPasswordRedesign/ResetPassword/index.stories.tsx
rename to packages/fxa-settings/src/pages/ResetPassword/ResetPassword/index.stories.tsx
index 7547ba333e2..1dff3564a1a 100644
--- a/packages/fxa-settings/src/pages/ResetPasswordRedesign/ResetPassword/index.stories.tsx
+++ b/packages/fxa-settings/src/pages/ResetPassword/ResetPassword/index.stories.tsx
@@ -9,7 +9,7 @@ import { withLocalization } from 'fxa-react/lib/storybooks';
 import { Subject } from './mocks';
 
 export default {
-  title: 'Pages/ResetPasswordRedesign/ResetPassword',
+  title: 'Pages/ResetPassword/ResetPassword',
   component: ResetPassword,
   decorators: [withLocalization],
 } as Meta;
diff --git a/packages/fxa-settings/src/pages/ResetPasswordRedesign/ResetPassword/index.test.tsx b/packages/fxa-settings/src/pages/ResetPassword/ResetPassword/index.test.tsx
similarity index 100%
rename from packages/fxa-settings/src/pages/ResetPasswordRedesign/ResetPassword/index.test.tsx
rename to packages/fxa-settings/src/pages/ResetPassword/ResetPassword/index.test.tsx
diff --git a/packages/fxa-settings/src/pages/ResetPasswordRedesign/ResetPassword/index.tsx b/packages/fxa-settings/src/pages/ResetPassword/ResetPassword/index.tsx
similarity index 100%
rename from packages/fxa-settings/src/pages/ResetPasswordRedesign/ResetPassword/index.tsx
rename to packages/fxa-settings/src/pages/ResetPassword/ResetPassword/index.tsx
diff --git a/packages/fxa-settings/src/pages/ResetPasswordRedesign/ResetPassword/interfaces.ts b/packages/fxa-settings/src/pages/ResetPassword/ResetPassword/interfaces.ts
similarity index 100%
rename from packages/fxa-settings/src/pages/ResetPasswordRedesign/ResetPassword/interfaces.ts
rename to packages/fxa-settings/src/pages/ResetPassword/ResetPassword/interfaces.ts
diff --git a/packages/fxa-settings/src/pages/ResetPasswordRedesign/ResetPassword/mocks.tsx b/packages/fxa-settings/src/pages/ResetPassword/ResetPassword/mocks.tsx
similarity index 100%
rename from packages/fxa-settings/src/pages/ResetPasswordRedesign/ResetPassword/mocks.tsx
rename to packages/fxa-settings/src/pages/ResetPassword/ResetPassword/mocks.tsx
diff --git a/packages/fxa-settings/src/pages/ResetPasswordRedesign/ResetPasswordConfirmed/index.stories.tsx b/packages/fxa-settings/src/pages/ResetPassword/ResetPasswordConfirmed/index.stories.tsx
similarity index 100%
rename from packages/fxa-settings/src/pages/ResetPasswordRedesign/ResetPasswordConfirmed/index.stories.tsx
rename to packages/fxa-settings/src/pages/ResetPassword/ResetPasswordConfirmed/index.stories.tsx
diff --git a/packages/fxa-settings/src/pages/ResetPasswordRedesign/ResetPasswordConfirmed/index.test.tsx b/packages/fxa-settings/src/pages/ResetPassword/ResetPasswordConfirmed/index.test.tsx
similarity index 100%
rename from packages/fxa-settings/src/pages/ResetPasswordRedesign/ResetPasswordConfirmed/index.test.tsx
rename to packages/fxa-settings/src/pages/ResetPassword/ResetPasswordConfirmed/index.test.tsx
diff --git a/packages/fxa-settings/src/pages/ResetPasswordRedesign/ResetPasswordConfirmed/index.tsx b/packages/fxa-settings/src/pages/ResetPassword/ResetPasswordConfirmed/index.tsx
similarity index 100%
rename from packages/fxa-settings/src/pages/ResetPasswordRedesign/ResetPasswordConfirmed/index.tsx
rename to packages/fxa-settings/src/pages/ResetPassword/ResetPasswordConfirmed/index.tsx
diff --git a/packages/fxa-settings/src/pages/ResetPasswordRedesign/ResetPasswordConfirmed/interfaces.ts b/packages/fxa-settings/src/pages/ResetPassword/ResetPasswordConfirmed/interfaces.ts
similarity index 100%
rename from packages/fxa-settings/src/pages/ResetPasswordRedesign/ResetPasswordConfirmed/interfaces.ts
rename to packages/fxa-settings/src/pages/ResetPassword/ResetPasswordConfirmed/interfaces.ts
diff --git a/packages/fxa-settings/src/pages/ResetPasswordRedesign/ResetPasswordWithRecoveryKeyVerified/en.ftl b/packages/fxa-settings/src/pages/ResetPassword/ResetPasswordWithRecoveryKeyVerified/en.ftl
similarity index 100%
rename from packages/fxa-settings/src/pages/ResetPasswordRedesign/ResetPasswordWithRecoveryKeyVerified/en.ftl
rename to packages/fxa-settings/src/pages/ResetPassword/ResetPasswordWithRecoveryKeyVerified/en.ftl
diff --git a/packages/fxa-settings/src/pages/ResetPasswordRedesign/ResetPasswordWithRecoveryKeyVerified/index.stories.tsx b/packages/fxa-settings/src/pages/ResetPassword/ResetPasswordWithRecoveryKeyVerified/index.stories.tsx
similarity index 100%
rename from packages/fxa-settings/src/pages/ResetPasswordRedesign/ResetPasswordWithRecoveryKeyVerified/index.stories.tsx
rename to packages/fxa-settings/src/pages/ResetPassword/ResetPasswordWithRecoveryKeyVerified/index.stories.tsx
diff --git a/packages/fxa-settings/src/pages/ResetPasswordRedesign/ResetPasswordWithRecoveryKeyVerified/index.test.tsx b/packages/fxa-settings/src/pages/ResetPassword/ResetPasswordWithRecoveryKeyVerified/index.test.tsx
similarity index 100%
rename from packages/fxa-settings/src/pages/ResetPasswordRedesign/ResetPasswordWithRecoveryKeyVerified/index.test.tsx
rename to packages/fxa-settings/src/pages/ResetPassword/ResetPasswordWithRecoveryKeyVerified/index.test.tsx
diff --git a/packages/fxa-settings/src/pages/ResetPasswordRedesign/ResetPasswordWithRecoveryKeyVerified/index.tsx b/packages/fxa-settings/src/pages/ResetPassword/ResetPasswordWithRecoveryKeyVerified/index.tsx
similarity index 100%
rename from packages/fxa-settings/src/pages/ResetPasswordRedesign/ResetPasswordWithRecoveryKeyVerified/index.tsx
rename to packages/fxa-settings/src/pages/ResetPassword/ResetPasswordWithRecoveryKeyVerified/index.tsx
diff --git a/packages/fxa-settings/src/pages/ResetPasswordRedesign/ResetPasswordWithRecoveryKeyVerified/interfaces.ts b/packages/fxa-settings/src/pages/ResetPassword/ResetPasswordWithRecoveryKeyVerified/interfaces.ts
similarity index 100%
rename from packages/fxa-settings/src/pages/ResetPasswordRedesign/ResetPasswordWithRecoveryKeyVerified/interfaces.ts
rename to packages/fxa-settings/src/pages/ResetPassword/ResetPasswordWithRecoveryKeyVerified/interfaces.ts
diff --git a/packages/fxa-settings/src/pages/ResetPasswordRedesign/ResetPasswordWithRecoveryKeyVerified/mocks.tsx b/packages/fxa-settings/src/pages/ResetPassword/ResetPasswordWithRecoveryKeyVerified/mocks.tsx
similarity index 100%
rename from packages/fxa-settings/src/pages/ResetPasswordRedesign/ResetPasswordWithRecoveryKeyVerified/mocks.tsx
rename to packages/fxa-settings/src/pages/ResetPassword/ResetPasswordWithRecoveryKeyVerified/mocks.tsx