diff --git a/change/@fluentui-react-dialog-66c4df04-b1d2-4abd-99fc-d6053ebdfe08.json b/change/@fluentui-react-dialog-66c4df04-b1d2-4abd-99fc-d6053ebdfe08.json
new file mode 100644
index 00000000000000..00a07c8719941d
--- /dev/null
+++ b/change/@fluentui-react-dialog-66c4df04-b1d2-4abd-99fc-d6053ebdfe08.json
@@ -0,0 +1,7 @@
+{
+  "type": "none",
+  "comment": "chore: Migrate to new package structure.",
+  "packageName": "@fluentui/react-dialog",
+  "email": "tristan.watanabe@gmail.com",
+  "dependentChangeType": "none"
+}
diff --git a/packages/react-components/react-dialog/.npmignore b/packages/react-components/react-dialog/.npmignore
index 52d2a7273a151d..f7ce568a6dbf7c 100644
--- a/packages/react-components/react-dialog/.npmignore
+++ b/packages/react-components/react-dialog/.npmignore
@@ -3,10 +3,11 @@
 bundle-size/
 config/
 coverage/
-e2e/
+docs/
 etc/
 node_modules/
 src/
+stories/
 dist/types/
 temp/
 __fixtures__
@@ -16,7 +17,7 @@ __tests__
 *.api.json
 *.log
 *.spec.*
-*.stories.*
+*.cy.*
 *.test.*
 *.yml
 
diff --git a/packages/react-components/react-dialog/.storybook/main.js b/packages/react-components/react-dialog/.storybook/main.js
index f57cfd09509e78..26536b61b387f6 100644
--- a/packages/react-components/react-dialog/.storybook/main.js
+++ b/packages/react-components/react-dialog/.storybook/main.js
@@ -2,7 +2,7 @@ const rootMain = require('../../../../.storybook/main');
 
 module.exports = /** @type {Omit<import('../../../../.storybook/main'), 'typescript'|'babel'>} */ ({
   ...rootMain,
-  stories: [...rootMain.stories, '../src/**/*.stories.mdx', '../src/**/index.stories.@(ts|tsx)'],
+  stories: [...rootMain.stories, '../stories/**/*.stories.mdx', '../stories/**/index.stories.@(ts|tsx)'],
   addons: [...rootMain.addons],
   webpackFinal: (config, options) => {
     const localConfig = { ...rootMain.webpackFinal(config, options) };
diff --git a/packages/react-components/react-dialog/.storybook/tsconfig.json b/packages/react-components/react-dialog/.storybook/tsconfig.json
index f9f60e1234ed49..ea89218a3d916f 100644
--- a/packages/react-components/react-dialog/.storybook/tsconfig.json
+++ b/packages/react-components/react-dialog/.storybook/tsconfig.json
@@ -6,5 +6,5 @@
     "checkJs": true,
     "types": ["static-assets", "environment", "storybook__addons"]
   },
-  "include": ["../src/**/*.stories.ts", "../src/**/*.stories.tsx", "*.js"]
+  "include": ["../stories/**/*.stories.ts", "../stories/**/*.stories.tsx", "*.js"]
 }
diff --git a/packages/react-components/react-dialog/Spec.md b/packages/react-components/react-dialog/docs/Spec.md
similarity index 100%
rename from packages/react-components/react-dialog/Spec.md
rename to packages/react-components/react-dialog/docs/Spec.md
diff --git a/packages/react-components/react-dialog/assets/AlertDialogKeyboardInteraction.png b/packages/react-components/react-dialog/docs/assets/AlertDialogKeyboardInteraction.png
similarity index 100%
rename from packages/react-components/react-dialog/assets/AlertDialogKeyboardInteraction.png
rename to packages/react-components/react-dialog/docs/assets/AlertDialogKeyboardInteraction.png
diff --git a/packages/react-components/react-dialog/assets/AlertDialogMouseInteraction.png b/packages/react-components/react-dialog/docs/assets/AlertDialogMouseInteraction.png
similarity index 100%
rename from packages/react-components/react-dialog/assets/AlertDialogMouseInteraction.png
rename to packages/react-components/react-dialog/docs/assets/AlertDialogMouseInteraction.png
diff --git a/packages/react-components/react-dialog/assets/ModalDialogKeyboardInteraction.png b/packages/react-components/react-dialog/docs/assets/ModalDialogKeyboardInteraction.png
similarity index 100%
rename from packages/react-components/react-dialog/assets/ModalDialogKeyboardInteraction.png
rename to packages/react-components/react-dialog/docs/assets/ModalDialogKeyboardInteraction.png
diff --git a/packages/react-components/react-dialog/assets/ModalDialogMouseInteraction.png b/packages/react-components/react-dialog/docs/assets/ModalDialogMouseInteraction.png
similarity index 100%
rename from packages/react-components/react-dialog/assets/ModalDialogMouseInteraction.png
rename to packages/react-components/react-dialog/docs/assets/ModalDialogMouseInteraction.png
diff --git a/packages/react-components/react-dialog/assets/NonModalDialogKeyboardInteraction.png b/packages/react-components/react-dialog/docs/assets/NonModalDialogKeyboardInteraction.png
similarity index 100%
rename from packages/react-components/react-dialog/assets/NonModalDialogKeyboardInteraction.png
rename to packages/react-components/react-dialog/docs/assets/NonModalDialogKeyboardInteraction.png
diff --git a/packages/react-components/react-dialog/assets/NonModalDialogMouseInteraction.png b/packages/react-components/react-dialog/docs/assets/NonModalDialogMouseInteraction.png
similarity index 100%
rename from packages/react-components/react-dialog/assets/NonModalDialogMouseInteraction.png
rename to packages/react-components/react-dialog/docs/assets/NonModalDialogMouseInteraction.png
diff --git a/packages/react-components/react-dialog/e2e/Dialog.e2e.tsx b/packages/react-components/react-dialog/src/components/Dialog/Dialog.cy.tsx
similarity index 99%
rename from packages/react-components/react-dialog/e2e/Dialog.e2e.tsx
rename to packages/react-components/react-dialog/src/components/Dialog/Dialog.cy.tsx
index 25fd99b5fab4c9..58e6e924f5b665 100644
--- a/packages/react-components/react-dialog/e2e/Dialog.e2e.tsx
+++ b/packages/react-components/react-dialog/src/components/Dialog/Dialog.cy.tsx
@@ -30,7 +30,7 @@ import {
   dialogTriggerCloseId,
   dialogTriggerCloseSelector,
   dialogTriggerOpenSelector,
-} from './selectors';
+} from '../../testing/selectors';
 
 const mount = (element: JSX.Element) => mountBase(<FluentProvider theme={teamsLightTheme}>{element}</FluentProvider>);
 
@@ -179,6 +179,7 @@ describe('Dialog', () => {
         }
       }, [open]);
       return (
+        //eslint-disable-next-line react/jsx-no-bind
         <Dialog open={open} onOpenChange={(event, data) => setOpen(data.open)}>
           <DialogTrigger disableButtonEnhancement>
             <Button>Open dialog</Button>
diff --git a/packages/react-components/react-dialog/src/components/Dialog/Dialog.test.tsx b/packages/react-components/react-dialog/src/components/Dialog/Dialog.test.tsx
index 373159e55c1083..2247dd3e6d3736 100644
--- a/packages/react-components/react-dialog/src/components/Dialog/Dialog.test.tsx
+++ b/packages/react-components/react-dialog/src/components/Dialog/Dialog.test.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
 import { render } from '@testing-library/react';
 import { Dialog } from './Dialog';
 import { DialogProps } from './Dialog.types';
-import { isConformant } from '../../common/isConformant';
+import { isConformant } from '../../testing/isConformant';
 
 describe('Dialog', () => {
   isConformant<DialogProps>({
diff --git a/packages/react-components/react-dialog/src/components/DialogActions/DialogActions.test.tsx b/packages/react-components/react-dialog/src/components/DialogActions/DialogActions.test.tsx
index 89a77753a12e08..d9ea91db679c29 100644
--- a/packages/react-components/react-dialog/src/components/DialogActions/DialogActions.test.tsx
+++ b/packages/react-components/react-dialog/src/components/DialogActions/DialogActions.test.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { render } from '@testing-library/react';
 import { DialogActions } from './DialogActions';
-import { isConformant } from '../../common/isConformant';
+import { isConformant } from '../../testing/isConformant';
 import { DialogActionsProps } from './DialogActions.types';
 
 describe('DialogActions', () => {
diff --git a/packages/react-components/react-dialog/src/components/DialogBody/DialogBody.test.tsx b/packages/react-components/react-dialog/src/components/DialogBody/DialogBody.test.tsx
index e1c6430ad9efe5..c0315df4b4e6d0 100644
--- a/packages/react-components/react-dialog/src/components/DialogBody/DialogBody.test.tsx
+++ b/packages/react-components/react-dialog/src/components/DialogBody/DialogBody.test.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { render } from '@testing-library/react';
 import { DialogBody } from './DialogBody';
-import { isConformant } from '../../common/isConformant';
+import { isConformant } from '../../testing/isConformant';
 import type { DialogBodyProps } from './DialogBody.types';
 
 describe('DialogBody', () => {
diff --git a/packages/react-components/react-dialog/src/components/DialogContent/DialogContent.test.tsx b/packages/react-components/react-dialog/src/components/DialogContent/DialogContent.test.tsx
index 6ebbb8f1efd354..bb6f46eb478ab5 100644
--- a/packages/react-components/react-dialog/src/components/DialogContent/DialogContent.test.tsx
+++ b/packages/react-components/react-dialog/src/components/DialogContent/DialogContent.test.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { render } from '@testing-library/react';
 import { DialogContent } from './DialogContent';
-import { isConformant } from '../../common/isConformant';
+import { isConformant } from '../../testing/isConformant';
 
 describe('DialogContent', () => {
   isConformant({
diff --git a/packages/react-components/react-dialog/src/components/DialogSurface/DialogSurface.test.tsx b/packages/react-components/react-dialog/src/components/DialogSurface/DialogSurface.test.tsx
index a760b44114c80b..ed5e71e72e5ace 100644
--- a/packages/react-components/react-dialog/src/components/DialogSurface/DialogSurface.test.tsx
+++ b/packages/react-components/react-dialog/src/components/DialogSurface/DialogSurface.test.tsx
@@ -2,9 +2,9 @@ import * as React from 'react';
 import { render } from '@testing-library/react';
 import { DialogSurface } from './DialogSurface';
 import { resetIdsForTests } from '@fluentui/react-utilities';
-import { isConformant } from '../../common/isConformant';
+import { isConformant } from '../../testing/isConformant';
 import type { DialogSurfaceProps } from './DialogSurface.types';
-import { mockUseDialogContext } from '../../contexts/dialogContext.mock';
+import { mockUseDialogContext } from '../../testing/mockUseDialogContext';
 
 jest.mock('../../contexts/dialogContext.ts');
 
diff --git a/packages/react-components/react-dialog/e2e/DialogTitle.e2e.tsx b/packages/react-components/react-dialog/src/components/DialogTitle/DialogTitle.cy.tsx
similarity index 99%
rename from packages/react-components/react-dialog/e2e/DialogTitle.e2e.tsx
rename to packages/react-components/react-dialog/src/components/DialogTitle/DialogTitle.cy.tsx
index 5e4384383b077b..0a5c99ad75cd54 100644
--- a/packages/react-components/react-dialog/e2e/DialogTitle.e2e.tsx
+++ b/packages/react-components/react-dialog/src/components/DialogTitle/DialogTitle.cy.tsx
@@ -14,7 +14,7 @@ import {
   DialogTrigger,
 } from '@fluentui/react-dialog';
 import { Button } from '@fluentui/react-components';
-import { dialogActionSelector, dialogTriggerOpenSelector } from './selectors';
+import { dialogActionSelector, dialogTriggerOpenSelector } from '../../testing/selectors';
 
 const mount = (element: JSX.Element) => mountBase(<FluentProvider theme={teamsLightTheme}>{element}</FluentProvider>);
 
diff --git a/packages/react-components/react-dialog/src/components/DialogTitle/DialogTitle.test.tsx b/packages/react-components/react-dialog/src/components/DialogTitle/DialogTitle.test.tsx
index 987312d38817e9..96eed0d3c92fb6 100644
--- a/packages/react-components/react-dialog/src/components/DialogTitle/DialogTitle.test.tsx
+++ b/packages/react-components/react-dialog/src/components/DialogTitle/DialogTitle.test.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { render } from '@testing-library/react';
 import { DialogTitle } from './DialogTitle';
-import { isConformant } from '../../common/isConformant';
+import { isConformant } from '../../testing/isConformant';
 import type { DialogTitleProps } from './DialogTitle.types';
 
 describe('DialogTitle', () => {
diff --git a/packages/react-components/react-dialog/src/components/DialogTrigger/DialogTrigger.test.tsx b/packages/react-components/react-dialog/src/components/DialogTrigger/DialogTrigger.test.tsx
index 9d49031ea4ceac..15a2654afcc6d8 100644
--- a/packages/react-components/react-dialog/src/components/DialogTrigger/DialogTrigger.test.tsx
+++ b/packages/react-components/react-dialog/src/components/DialogTrigger/DialogTrigger.test.tsx
@@ -2,8 +2,8 @@ import * as React from 'react';
 import { DialogTrigger } from './DialogTrigger';
 import * as renderer from 'react-test-renderer';
 import { createEvent, fireEvent, render } from '@testing-library/react';
-import { isConformant } from '../../common/isConformant';
-import { mockUseDialogContext } from '../../contexts/dialogContext.mock';
+import { isConformant } from '../../testing/isConformant';
+import { mockUseDialogContext } from '../../testing/mockUseDialogContext';
 import { Enter } from '@fluentui/keyboard-keys';
 import { DialogTriggerProps } from './DialogTrigger.types';
 
diff --git a/packages/react-components/react-dialog/src/common/isConformant.ts b/packages/react-components/react-dialog/src/testing/isConformant.ts
similarity index 100%
rename from packages/react-components/react-dialog/src/common/isConformant.ts
rename to packages/react-components/react-dialog/src/testing/isConformant.ts
diff --git a/packages/react-components/react-dialog/src/contexts/dialogContext.mock.ts b/packages/react-components/react-dialog/src/testing/mockUseDialogContext.ts
similarity index 84%
rename from packages/react-components/react-dialog/src/contexts/dialogContext.mock.ts
rename to packages/react-components/react-dialog/src/testing/mockUseDialogContext.ts
index 598bda64a332a7..e6059dd6d46e40 100644
--- a/packages/react-components/react-dialog/src/contexts/dialogContext.mock.ts
+++ b/packages/react-components/react-dialog/src/testing/mockUseDialogContext.ts
@@ -1,5 +1,5 @@
-import { useDialogContext_unstable } from './dialogContext';
-import type { DialogContextValue } from './dialogContext';
+import { useDialogContext_unstable } from '../contexts/dialogContext';
+import type { DialogContextValue } from '../contexts/dialogContext';
 
 /**
  * A test utility to mock the useDialogContext_unstable hook that relies on context selector
diff --git a/packages/react-components/react-dialog/e2e/selectors.ts b/packages/react-components/react-dialog/src/testing/selectors.ts
similarity index 100%
rename from packages/react-components/react-dialog/e2e/selectors.ts
rename to packages/react-components/react-dialog/src/testing/selectors.ts
diff --git a/packages/react-components/react-dialog/src/stories/Dialog/DialogA11y.md b/packages/react-components/react-dialog/stories/Dialog/DialogA11y.md
similarity index 100%
rename from packages/react-components/react-dialog/src/stories/Dialog/DialogA11y.md
rename to packages/react-components/react-dialog/stories/Dialog/DialogA11y.md
diff --git a/packages/react-components/react-dialog/src/stories/Dialog/DialogAlert.md b/packages/react-components/react-dialog/stories/Dialog/DialogAlert.md
similarity index 100%
rename from packages/react-components/react-dialog/src/stories/Dialog/DialogAlert.md
rename to packages/react-components/react-dialog/stories/Dialog/DialogAlert.md
diff --git a/packages/react-components/react-dialog/src/stories/Dialog/DialogAlert.stories.tsx b/packages/react-components/react-dialog/stories/Dialog/DialogAlert.stories.tsx
similarity index 100%
rename from packages/react-components/react-dialog/src/stories/Dialog/DialogAlert.stories.tsx
rename to packages/react-components/react-dialog/stories/Dialog/DialogAlert.stories.tsx
diff --git a/packages/react-components/react-dialog/src/stories/Dialog/DialogBestPractices.md b/packages/react-components/react-dialog/stories/Dialog/DialogBestPractices.md
similarity index 100%
rename from packages/react-components/react-dialog/src/stories/Dialog/DialogBestPractices.md
rename to packages/react-components/react-dialog/stories/Dialog/DialogBestPractices.md
diff --git a/packages/react-components/react-dialog/src/stories/Dialog/DialogChangeFocus.stories.tsx b/packages/react-components/react-dialog/stories/Dialog/DialogChangeFocus.stories.tsx
similarity index 100%
rename from packages/react-components/react-dialog/src/stories/Dialog/DialogChangeFocus.stories.tsx
rename to packages/react-components/react-dialog/stories/Dialog/DialogChangeFocus.stories.tsx
diff --git a/packages/react-components/react-dialog/src/stories/Dialog/DialogControllingOpenAndClose.md b/packages/react-components/react-dialog/stories/Dialog/DialogControllingOpenAndClose.md
similarity index 100%
rename from packages/react-components/react-dialog/src/stories/Dialog/DialogControllingOpenAndClose.md
rename to packages/react-components/react-dialog/stories/Dialog/DialogControllingOpenAndClose.md
diff --git a/packages/react-components/react-dialog/src/stories/Dialog/DialogControllingOpenAndClose.stories.tsx b/packages/react-components/react-dialog/stories/Dialog/DialogControllingOpenAndClose.stories.tsx
similarity index 100%
rename from packages/react-components/react-dialog/src/stories/Dialog/DialogControllingOpenAndClose.stories.tsx
rename to packages/react-components/react-dialog/stories/Dialog/DialogControllingOpenAndClose.stories.tsx
diff --git a/packages/react-components/react-dialog/src/stories/Dialog/DialogCustomTrigger.md b/packages/react-components/react-dialog/stories/Dialog/DialogCustomTrigger.md
similarity index 100%
rename from packages/react-components/react-dialog/src/stories/Dialog/DialogCustomTrigger.md
rename to packages/react-components/react-dialog/stories/Dialog/DialogCustomTrigger.md
diff --git a/packages/react-components/react-dialog/src/stories/Dialog/DialogCustomTrigger.stories.tsx b/packages/react-components/react-dialog/stories/Dialog/DialogCustomTrigger.stories.tsx
similarity index 100%
rename from packages/react-components/react-dialog/src/stories/Dialog/DialogCustomTrigger.stories.tsx
rename to packages/react-components/react-dialog/stories/Dialog/DialogCustomTrigger.stories.tsx
diff --git a/packages/react-components/react-dialog/src/stories/Dialog/DialogDefault.stories.tsx b/packages/react-components/react-dialog/stories/Dialog/DialogDefault.stories.tsx
similarity index 100%
rename from packages/react-components/react-dialog/src/stories/Dialog/DialogDefault.stories.tsx
rename to packages/react-components/react-dialog/stories/Dialog/DialogDefault.stories.tsx
diff --git a/packages/react-components/react-dialog/src/stories/Dialog/DialogDescription.md b/packages/react-components/react-dialog/stories/Dialog/DialogDescription.md
similarity index 100%
rename from packages/react-components/react-dialog/src/stories/Dialog/DialogDescription.md
rename to packages/react-components/react-dialog/stories/Dialog/DialogDescription.md
diff --git a/packages/react-components/react-dialog/src/stories/Dialog/DialogNoFocusableElement.md b/packages/react-components/react-dialog/stories/Dialog/DialogNoFocusableElement.md
similarity index 100%
rename from packages/react-components/react-dialog/src/stories/Dialog/DialogNoFocusableElement.md
rename to packages/react-components/react-dialog/stories/Dialog/DialogNoFocusableElement.md
diff --git a/packages/react-components/react-dialog/src/stories/Dialog/DialogNoFocusableElement.stories.tsx b/packages/react-components/react-dialog/stories/Dialog/DialogNoFocusableElement.stories.tsx
similarity index 100%
rename from packages/react-components/react-dialog/src/stories/Dialog/DialogNoFocusableElement.stories.tsx
rename to packages/react-components/react-dialog/stories/Dialog/DialogNoFocusableElement.stories.tsx
diff --git a/packages/react-components/react-dialog/src/stories/Dialog/DialogNonModal.md b/packages/react-components/react-dialog/stories/Dialog/DialogNonModal.md
similarity index 100%
rename from packages/react-components/react-dialog/src/stories/Dialog/DialogNonModal.md
rename to packages/react-components/react-dialog/stories/Dialog/DialogNonModal.md
diff --git a/packages/react-components/react-dialog/src/stories/Dialog/DialogNonModal.stories.tsx b/packages/react-components/react-dialog/stories/Dialog/DialogNonModal.stories.tsx
similarity index 100%
rename from packages/react-components/react-dialog/src/stories/Dialog/DialogNonModal.stories.tsx
rename to packages/react-components/react-dialog/stories/Dialog/DialogNonModal.stories.tsx
diff --git a/packages/react-components/react-dialog/src/stories/Dialog/DialogScrollingLongContent.stories.tsx b/packages/react-components/react-dialog/stories/Dialog/DialogScrollingLongContent.stories.tsx
similarity index 100%
rename from packages/react-components/react-dialog/src/stories/Dialog/DialogScrollingLongContent.stories.tsx
rename to packages/react-components/react-dialog/stories/Dialog/DialogScrollingLongContent.stories.tsx
diff --git a/packages/react-components/react-dialog/src/stories/Dialog/DialogTitleCustomAction.md b/packages/react-components/react-dialog/stories/Dialog/DialogTitleCustomAction.md
similarity index 100%
rename from packages/react-components/react-dialog/src/stories/Dialog/DialogTitleCustomAction.md
rename to packages/react-components/react-dialog/stories/Dialog/DialogTitleCustomAction.md
diff --git a/packages/react-components/react-dialog/src/stories/Dialog/DialogTitleCustomAction.stories.tsx b/packages/react-components/react-dialog/stories/Dialog/DialogTitleCustomAction.stories.tsx
similarity index 100%
rename from packages/react-components/react-dialog/src/stories/Dialog/DialogTitleCustomAction.stories.tsx
rename to packages/react-components/react-dialog/stories/Dialog/DialogTitleCustomAction.stories.tsx
diff --git a/packages/react-components/react-dialog/src/stories/Dialog/DialogTitleNoAction.md b/packages/react-components/react-dialog/stories/Dialog/DialogTitleNoAction.md
similarity index 100%
rename from packages/react-components/react-dialog/src/stories/Dialog/DialogTitleNoAction.md
rename to packages/react-components/react-dialog/stories/Dialog/DialogTitleNoAction.md
diff --git a/packages/react-components/react-dialog/src/stories/Dialog/DialogTitleNoAction.stories.tsx b/packages/react-components/react-dialog/stories/Dialog/DialogTitleNoAction.stories.tsx
similarity index 100%
rename from packages/react-components/react-dialog/src/stories/Dialog/DialogTitleNoAction.stories.tsx
rename to packages/react-components/react-dialog/stories/Dialog/DialogTitleNoAction.stories.tsx
diff --git a/packages/react-components/react-dialog/src/stories/Dialog/DialogTriggerOutsideDialog.md b/packages/react-components/react-dialog/stories/Dialog/DialogTriggerOutsideDialog.md
similarity index 100%
rename from packages/react-components/react-dialog/src/stories/Dialog/DialogTriggerOutsideDialog.md
rename to packages/react-components/react-dialog/stories/Dialog/DialogTriggerOutsideDialog.md
diff --git a/packages/react-components/react-dialog/src/stories/Dialog/DialogTriggerOutsideDialog.stories.tsx b/packages/react-components/react-dialog/stories/Dialog/DialogTriggerOutsideDialog.stories.tsx
similarity index 100%
rename from packages/react-components/react-dialog/src/stories/Dialog/DialogTriggerOutsideDialog.stories.tsx
rename to packages/react-components/react-dialog/stories/Dialog/DialogTriggerOutsideDialog.stories.tsx
diff --git a/packages/react-components/react-dialog/src/stories/Dialog/DialogWithForm.md b/packages/react-components/react-dialog/stories/Dialog/DialogWithForm.md
similarity index 100%
rename from packages/react-components/react-dialog/src/stories/Dialog/DialogWithForm.md
rename to packages/react-components/react-dialog/stories/Dialog/DialogWithForm.md
diff --git a/packages/react-components/react-dialog/src/stories/Dialog/DialogWithForm.stories.tsx b/packages/react-components/react-dialog/stories/Dialog/DialogWithForm.stories.tsx
similarity index 100%
rename from packages/react-components/react-dialog/src/stories/Dialog/DialogWithForm.stories.tsx
rename to packages/react-components/react-dialog/stories/Dialog/DialogWithForm.stories.tsx
diff --git a/packages/react-components/react-dialog/src/stories/Dialog/index.stories.tsx b/packages/react-components/react-dialog/stories/Dialog/index.stories.tsx
similarity index 100%
rename from packages/react-components/react-dialog/src/stories/Dialog/index.stories.tsx
rename to packages/react-components/react-dialog/stories/Dialog/index.stories.tsx
diff --git a/packages/react-components/react-dialog/e2e/tsconfig.json b/packages/react-components/react-dialog/tsconfig.cy.json
similarity index 70%
rename from packages/react-components/react-dialog/e2e/tsconfig.json
rename to packages/react-components/react-dialog/tsconfig.cy.json
index f6b23b30d510ba..93a140885851da 100644
--- a/packages/react-components/react-dialog/e2e/tsconfig.json
+++ b/packages/react-components/react-dialog/tsconfig.cy.json
@@ -1,9 +1,9 @@
 {
-  "extends": "../tsconfig.json",
+  "extends": "./tsconfig.json",
   "compilerOptions": {
     "isolatedModules": false,
     "types": ["node", "cypress", "cypress-storybook/cypress", "cypress-real-events"],
     "lib": ["ES2019", "dom"]
   },
-  "include": ["**/*.ts", "**/*.tsx"]
+  "include": ["**/*.cy.ts", "**/*.cy.tsx"]
 }
diff --git a/packages/react-components/react-dialog/tsconfig.json b/packages/react-components/react-dialog/tsconfig.json
index 9087bac77cc8d7..1317f81620ca5e 100644
--- a/packages/react-components/react-dialog/tsconfig.json
+++ b/packages/react-components/react-dialog/tsconfig.json
@@ -22,7 +22,7 @@
       "path": "./.storybook/tsconfig.json"
     },
     {
-      "path": "./e2e/tsconfig.json"
+      "path": "./tsconfig.cy.json"
     }
   ]
 }
diff --git a/packages/react-components/react-dialog/tsconfig.lib.json b/packages/react-components/react-dialog/tsconfig.lib.json
index bcc4a3662a199a..e17f808c039339 100644
--- a/packages/react-components/react-dialog/tsconfig.lib.json
+++ b/packages/react-components/react-dialog/tsconfig.lib.json
@@ -10,15 +10,15 @@
     "types": ["static-assets", "environment"]
   },
   "exclude": [
-    "./src/common/**",
+    "./src/testing/**",
     "**/*.spec.ts",
     "**/*.spec.tsx",
-    "**/*.mock.ts",
-    "**/*.mock.tsx",
     "**/*.test.ts",
     "**/*.test.tsx",
     "**/*.stories.ts",
-    "**/*.stories.tsx"
+    "**/*.stories.tsx",
+    "**/*.cy.ts",
+    "**/*.cy.tsx"
   ],
   "include": ["./src/**/*.ts", "./src/**/*.tsx"]
 }
diff --git a/packages/react-components/react-dialog/tsconfig.spec.json b/packages/react-components/react-dialog/tsconfig.spec.json
index fcfa452ca28755..0e881941843de8 100644
--- a/packages/react-components/react-dialog/tsconfig.spec.json
+++ b/packages/react-components/react-dialog/tsconfig.spec.json
@@ -7,11 +7,11 @@
   },
   "include": [
     "**/*.spec.ts",
-    "**/*.mock.ts",
-    "**/*.mock.tsx",
     "**/*.spec.tsx",
     "**/*.test.ts",
     "**/*.test.tsx",
-    "**/*.d.ts"
+    "**/*.d.ts",
+    "./src/testing/**/*.ts",
+    "./src/testing/**/*.tsx"
   ]
 }