diff --git a/change/@fluentui-react-avatar-c3167dd3-8b29-43f9-b555-d92a98a2b323.json b/change/@fluentui-react-avatar-c3167dd3-8b29-43f9-b555-d92a98a2b323.json
new file mode 100644
index 00000000000000..0904caf50e0d4e
--- /dev/null
+++ b/change/@fluentui-react-avatar-c3167dd3-8b29-43f9-b555-d92a98a2b323.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "chore: Migrate to new package structure.",
+  "packageName": "@fluentui/react-avatar",
+  "email": "tristan.watanabe@gmail.com",
+  "dependentChangeType": "patch"
+}
diff --git a/packages/react-components/react-avatar-context/.npmignore b/packages/react-components/react-avatar-context/.npmignore
index 52d2a7273a151d..f7ce568a6dbf7c 100644
--- a/packages/react-components/react-avatar-context/.npmignore
+++ b/packages/react-components/react-avatar-context/.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-avatar-context/Spec.md b/packages/react-components/react-avatar-context/docs/Spec.md
similarity index 100%
rename from packages/react-components/react-avatar-context/Spec.md
rename to packages/react-components/react-avatar-context/docs/Spec.md
diff --git a/packages/react-components/react-avatar/.npmignore b/packages/react-components/react-avatar/.npmignore
index 52d2a7273a151d..f7ce568a6dbf7c 100644
--- a/packages/react-components/react-avatar/.npmignore
+++ b/packages/react-components/react-avatar/.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-avatar/.storybook/main.js b/packages/react-components/react-avatar/.storybook/main.js
index f57cfd09509e78..26536b61b387f6 100644
--- a/packages/react-components/react-avatar/.storybook/main.js
+++ b/packages/react-components/react-avatar/.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-avatar/.storybook/tsconfig.json b/packages/react-components/react-avatar/.storybook/tsconfig.json
index f9f60e1234ed49..ea89218a3d916f 100644
--- a/packages/react-components/react-avatar/.storybook/tsconfig.json
+++ b/packages/react-components/react-avatar/.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-avatar/MIGRATION.md b/packages/react-components/react-avatar/docs/MIGRATION.md
similarity index 100%
rename from packages/react-components/react-avatar/MIGRATION.md
rename to packages/react-components/react-avatar/docs/MIGRATION.md
diff --git a/packages/react-components/react-avatar/SPEC-AvatarGroup.md b/packages/react-components/react-avatar/docs/SPEC-AvatarGroup.md
similarity index 100%
rename from packages/react-components/react-avatar/SPEC-AvatarGroup.md
rename to packages/react-components/react-avatar/docs/SPEC-AvatarGroup.md
diff --git a/packages/react-components/react-avatar/SPEC.md b/packages/react-components/react-avatar/docs/SPEC.md
similarity index 100%
rename from packages/react-components/react-avatar/SPEC.md
rename to packages/react-components/react-avatar/docs/SPEC.md
diff --git a/packages/react-components/react-avatar/src/components/Avatar/Avatar.test.tsx b/packages/react-components/react-avatar/src/components/Avatar/Avatar.test.tsx
index 474c44c74226e5..48410a73500aca 100644
--- a/packages/react-components/react-avatar/src/components/Avatar/Avatar.test.tsx
+++ b/packages/react-components/react-avatar/src/components/Avatar/Avatar.test.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { isConformant } from '../../common/isConformant';
+import { isConformant } from '../../testing/isConformant';
 import { Avatar } from './Avatar';
 import { render, screen } from '@testing-library/react';
 import { avatarClassNames } from './useAvatarStyles';
diff --git a/packages/react-components/react-avatar/e2e/AvatarGroup.e2e.tsx b/packages/react-components/react-avatar/src/components/AvatarGroup/AvatarGroup.cy.tsx
similarity index 100%
rename from packages/react-components/react-avatar/e2e/AvatarGroup.e2e.tsx
rename to packages/react-components/react-avatar/src/components/AvatarGroup/AvatarGroup.cy.tsx
diff --git a/packages/react-components/react-avatar/src/components/AvatarGroup/AvatarGroup.test.tsx b/packages/react-components/react-avatar/src/components/AvatarGroup/AvatarGroup.test.tsx
index f6f5649da8a3d4..7587dfd9258f45 100644
--- a/packages/react-components/react-avatar/src/components/AvatarGroup/AvatarGroup.test.tsx
+++ b/packages/react-components/react-avatar/src/components/AvatarGroup/AvatarGroup.test.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { AvatarGroup } from './AvatarGroup';
 import { AvatarGroupItem } from '../AvatarGroupItem';
-import { isConformant } from '../../common/isConformant';
+import { isConformant } from '../../testing/isConformant';
 import { AvatarGroupPopover } from '../AvatarGroupPopover/AvatarGroupPopover';
 import { render, screen } from '@testing-library/react';
 
diff --git a/packages/react-components/react-avatar/src/components/AvatarGroupItem/AvatarGroupItem.test.tsx b/packages/react-components/react-avatar/src/components/AvatarGroupItem/AvatarGroupItem.test.tsx
index 6523ef66e20f07..a1508433484bc7 100644
--- a/packages/react-components/react-avatar/src/components/AvatarGroupItem/AvatarGroupItem.test.tsx
+++ b/packages/react-components/react-avatar/src/components/AvatarGroupItem/AvatarGroupItem.test.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import { AvatarGroupItem } from './AvatarGroupItem';
 import { AvatarGroupContext } from '../../contexts';
-import { isConformant } from '../../common/isConformant';
+import { isConformant } from '../../testing/isConformant';
 
 const testId = 'testId';
 
diff --git a/packages/react-components/react-avatar/src/components/AvatarGroupPopover/AvatarGroupPopover.test.tsx b/packages/react-components/react-avatar/src/components/AvatarGroupPopover/AvatarGroupPopover.test.tsx
index 11715190809a1e..003ae62a5c3a11 100644
--- a/packages/react-components/react-avatar/src/components/AvatarGroupPopover/AvatarGroupPopover.test.tsx
+++ b/packages/react-components/react-avatar/src/components/AvatarGroupPopover/AvatarGroupPopover.test.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
 import { AvatarGroupItem } from '../AvatarGroupItem/AvatarGroupItem';
 import { AvatarGroupPopover } from './AvatarGroupPopover';
 import { avatarGroupPopoverClassNames } from './useAvatarGroupPopoverStyles';
-import { isConformant } from '../../common/isConformant';
+import { isConformant } from '../../testing/isConformant';
 import { render, RenderResult, screen } from '@testing-library/react';
 
 // testing-library's queryByRole function doesn't look inside portals
diff --git a/packages/react-components/react-avatar/src/common/isConformant.ts b/packages/react-components/react-avatar/src/testing/isConformant.ts
similarity index 100%
rename from packages/react-components/react-avatar/src/common/isConformant.ts
rename to packages/react-components/react-avatar/src/testing/isConformant.ts
diff --git a/packages/react-components/react-avatar/src/stories/Avatar/AvatarActive.stories.tsx b/packages/react-components/react-avatar/stories/Avatar/AvatarActive.stories.tsx
similarity index 100%
rename from packages/react-components/react-avatar/src/stories/Avatar/AvatarActive.stories.tsx
rename to packages/react-components/react-avatar/stories/Avatar/AvatarActive.stories.tsx
diff --git a/packages/react-components/react-avatar/src/stories/Avatar/AvatarActiveAppearance.stories.tsx b/packages/react-components/react-avatar/stories/Avatar/AvatarActiveAppearance.stories.tsx
similarity index 100%
rename from packages/react-components/react-avatar/src/stories/Avatar/AvatarActiveAppearance.stories.tsx
rename to packages/react-components/react-avatar/stories/Avatar/AvatarActiveAppearance.stories.tsx
diff --git a/packages/react-components/react-avatar/src/stories/Avatar/AvatarBadge.stories.tsx b/packages/react-components/react-avatar/stories/Avatar/AvatarBadge.stories.tsx
similarity index 100%
rename from packages/react-components/react-avatar/src/stories/Avatar/AvatarBadge.stories.tsx
rename to packages/react-components/react-avatar/stories/Avatar/AvatarBadge.stories.tsx
diff --git a/packages/react-components/react-avatar/src/stories/Avatar/AvatarColorBrand.stories.tsx b/packages/react-components/react-avatar/stories/Avatar/AvatarColorBrand.stories.tsx
similarity index 100%
rename from packages/react-components/react-avatar/src/stories/Avatar/AvatarColorBrand.stories.tsx
rename to packages/react-components/react-avatar/stories/Avatar/AvatarColorBrand.stories.tsx
diff --git a/packages/react-components/react-avatar/src/stories/Avatar/AvatarColorColorful.stories.tsx b/packages/react-components/react-avatar/stories/Avatar/AvatarColorColorful.stories.tsx
similarity index 100%
rename from packages/react-components/react-avatar/src/stories/Avatar/AvatarColorColorful.stories.tsx
rename to packages/react-components/react-avatar/stories/Avatar/AvatarColorColorful.stories.tsx
diff --git a/packages/react-components/react-avatar/src/stories/Avatar/AvatarColorPalette.stories.tsx b/packages/react-components/react-avatar/stories/Avatar/AvatarColorPalette.stories.tsx
similarity index 100%
rename from packages/react-components/react-avatar/src/stories/Avatar/AvatarColorPalette.stories.tsx
rename to packages/react-components/react-avatar/stories/Avatar/AvatarColorPalette.stories.tsx
diff --git a/packages/react-components/react-avatar/src/stories/Avatar/AvatarDefault.stories.tsx b/packages/react-components/react-avatar/stories/Avatar/AvatarDefault.stories.tsx
similarity index 100%
rename from packages/react-components/react-avatar/src/stories/Avatar/AvatarDefault.stories.tsx
rename to packages/react-components/react-avatar/stories/Avatar/AvatarDefault.stories.tsx
diff --git a/packages/react-components/react-avatar/src/stories/Avatar/AvatarDescription.md b/packages/react-components/react-avatar/stories/Avatar/AvatarDescription.md
similarity index 100%
rename from packages/react-components/react-avatar/src/stories/Avatar/AvatarDescription.md
rename to packages/react-components/react-avatar/stories/Avatar/AvatarDescription.md
diff --git a/packages/react-components/react-avatar/src/stories/Avatar/AvatarIcon.stories.tsx b/packages/react-components/react-avatar/stories/Avatar/AvatarIcon.stories.tsx
similarity index 100%
rename from packages/react-components/react-avatar/src/stories/Avatar/AvatarIcon.stories.tsx
rename to packages/react-components/react-avatar/stories/Avatar/AvatarIcon.stories.tsx
diff --git a/packages/react-components/react-avatar/src/stories/Avatar/AvatarImage.stories.tsx b/packages/react-components/react-avatar/stories/Avatar/AvatarImage.stories.tsx
similarity index 100%
rename from packages/react-components/react-avatar/src/stories/Avatar/AvatarImage.stories.tsx
rename to packages/react-components/react-avatar/stories/Avatar/AvatarImage.stories.tsx
diff --git a/packages/react-components/react-avatar/src/stories/Avatar/AvatarInitials.stories.tsx b/packages/react-components/react-avatar/stories/Avatar/AvatarInitials.stories.tsx
similarity index 100%
rename from packages/react-components/react-avatar/src/stories/Avatar/AvatarInitials.stories.tsx
rename to packages/react-components/react-avatar/stories/Avatar/AvatarInitials.stories.tsx
diff --git a/packages/react-components/react-avatar/src/stories/Avatar/AvatarName.stories.tsx b/packages/react-components/react-avatar/stories/Avatar/AvatarName.stories.tsx
similarity index 100%
rename from packages/react-components/react-avatar/src/stories/Avatar/AvatarName.stories.tsx
rename to packages/react-components/react-avatar/stories/Avatar/AvatarName.stories.tsx
diff --git a/packages/react-components/react-avatar/src/stories/Avatar/AvatarSize.stories.tsx b/packages/react-components/react-avatar/stories/Avatar/AvatarSize.stories.tsx
similarity index 100%
rename from packages/react-components/react-avatar/src/stories/Avatar/AvatarSize.stories.tsx
rename to packages/react-components/react-avatar/stories/Avatar/AvatarSize.stories.tsx
diff --git a/packages/react-components/react-avatar/src/stories/Avatar/AvatarSquare.stories.tsx b/packages/react-components/react-avatar/stories/Avatar/AvatarSquare.stories.tsx
similarity index 100%
rename from packages/react-components/react-avatar/src/stories/Avatar/AvatarSquare.stories.tsx
rename to packages/react-components/react-avatar/stories/Avatar/AvatarSquare.stories.tsx
diff --git a/packages/react-components/react-avatar/src/stories/Avatar/index.stories.tsx b/packages/react-components/react-avatar/stories/Avatar/index.stories.tsx
similarity index 100%
rename from packages/react-components/react-avatar/src/stories/Avatar/index.stories.tsx
rename to packages/react-components/react-avatar/stories/Avatar/index.stories.tsx
diff --git a/packages/react-components/react-avatar/src/stories/AvatarGroup/AvatarGroupBestPractices.md b/packages/react-components/react-avatar/stories/AvatarGroup/AvatarGroupBestPractices.md
similarity index 100%
rename from packages/react-components/react-avatar/src/stories/AvatarGroup/AvatarGroupBestPractices.md
rename to packages/react-components/react-avatar/stories/AvatarGroup/AvatarGroupBestPractices.md
diff --git a/packages/react-components/react-avatar/src/stories/AvatarGroup/AvatarGroupDefault.stories.tsx b/packages/react-components/react-avatar/stories/AvatarGroup/AvatarGroupDefault.stories.tsx
similarity index 100%
rename from packages/react-components/react-avatar/src/stories/AvatarGroup/AvatarGroupDefault.stories.tsx
rename to packages/react-components/react-avatar/stories/AvatarGroup/AvatarGroupDefault.stories.tsx
diff --git a/packages/react-components/react-avatar/src/stories/AvatarGroup/AvatarGroupDescription.md b/packages/react-components/react-avatar/stories/AvatarGroup/AvatarGroupDescription.md
similarity index 100%
rename from packages/react-components/react-avatar/src/stories/AvatarGroup/AvatarGroupDescription.md
rename to packages/react-components/react-avatar/stories/AvatarGroup/AvatarGroupDescription.md
diff --git a/packages/react-components/react-avatar/src/stories/AvatarGroup/AvatarGroupIndicator.stories.tsx b/packages/react-components/react-avatar/stories/AvatarGroup/AvatarGroupIndicator.stories.tsx
similarity index 100%
rename from packages/react-components/react-avatar/src/stories/AvatarGroup/AvatarGroupIndicator.stories.tsx
rename to packages/react-components/react-avatar/stories/AvatarGroup/AvatarGroupIndicator.stories.tsx
diff --git a/packages/react-components/react-avatar/src/stories/AvatarGroup/AvatarGroupLayout.stories.tsx b/packages/react-components/react-avatar/stories/AvatarGroup/AvatarGroupLayout.stories.tsx
similarity index 100%
rename from packages/react-components/react-avatar/src/stories/AvatarGroup/AvatarGroupLayout.stories.tsx
rename to packages/react-components/react-avatar/stories/AvatarGroup/AvatarGroupLayout.stories.tsx
diff --git a/packages/react-components/react-avatar/src/stories/AvatarGroup/AvatarGroupSizePie.stories.tsx b/packages/react-components/react-avatar/stories/AvatarGroup/AvatarGroupSizePie.stories.tsx
similarity index 100%
rename from packages/react-components/react-avatar/src/stories/AvatarGroup/AvatarGroupSizePie.stories.tsx
rename to packages/react-components/react-avatar/stories/AvatarGroup/AvatarGroupSizePie.stories.tsx
diff --git a/packages/react-components/react-avatar/src/stories/AvatarGroup/AvatarGroupSizeSpread.stories.tsx b/packages/react-components/react-avatar/stories/AvatarGroup/AvatarGroupSizeSpread.stories.tsx
similarity index 100%
rename from packages/react-components/react-avatar/src/stories/AvatarGroup/AvatarGroupSizeSpread.stories.tsx
rename to packages/react-components/react-avatar/stories/AvatarGroup/AvatarGroupSizeSpread.stories.tsx
diff --git a/packages/react-components/react-avatar/src/stories/AvatarGroup/AvatarGroupSizeStack.stories.tsx b/packages/react-components/react-avatar/stories/AvatarGroup/AvatarGroupSizeStack.stories.tsx
similarity index 100%
rename from packages/react-components/react-avatar/src/stories/AvatarGroup/AvatarGroupSizeStack.stories.tsx
rename to packages/react-components/react-avatar/stories/AvatarGroup/AvatarGroupSizeStack.stories.tsx
diff --git a/packages/react-components/react-avatar/src/stories/AvatarGroup/index.stories.tsx b/packages/react-components/react-avatar/stories/AvatarGroup/index.stories.tsx
similarity index 100%
rename from packages/react-components/react-avatar/src/stories/AvatarGroup/index.stories.tsx
rename to packages/react-components/react-avatar/stories/AvatarGroup/index.stories.tsx
diff --git a/packages/react-components/react-avatar/e2e/tsconfig.json b/packages/react-components/react-avatar/tsconfig.cy.json
similarity index 70%
rename from packages/react-components/react-avatar/e2e/tsconfig.json
rename to packages/react-components/react-avatar/tsconfig.cy.json
index f6b23b30d510ba..93a140885851da 100644
--- a/packages/react-components/react-avatar/e2e/tsconfig.json
+++ b/packages/react-components/react-avatar/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-avatar/tsconfig.json b/packages/react-components/react-avatar/tsconfig.json
index 9087bac77cc8d7..1317f81620ca5e 100644
--- a/packages/react-components/react-avatar/tsconfig.json
+++ b/packages/react-components/react-avatar/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-avatar/tsconfig.lib.json b/packages/react-components/react-avatar/tsconfig.lib.json
index 7f94e04299ed85..e17f808c039339 100644
--- a/packages/react-components/react-avatar/tsconfig.lib.json
+++ b/packages/react-components/react-avatar/tsconfig.lib.json
@@ -10,13 +10,15 @@
     "types": ["static-assets", "environment"]
   },
   "exclude": [
-    "./src/common/**",
+    "./src/testing/**",
     "**/*.spec.ts",
     "**/*.spec.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-avatar/tsconfig.spec.json b/packages/react-components/react-avatar/tsconfig.spec.json
index 469fcba4d7ba75..911456fe4b4d91 100644
--- a/packages/react-components/react-avatar/tsconfig.spec.json
+++ b/packages/react-components/react-avatar/tsconfig.spec.json
@@ -5,5 +5,13 @@
     "outDir": "dist",
     "types": ["jest", "node"]
   },
-  "include": ["**/*.spec.ts", "**/*.spec.tsx", "**/*.test.ts", "**/*.test.tsx", "**/*.d.ts"]
+  "include": [
+    "**/*.spec.ts",
+    "**/*.spec.tsx",
+    "**/*.test.ts",
+    "**/*.test.tsx",
+    "**/*.d.ts",
+    "./src/testing/**/*.ts",
+    "./src/testing/**/*.tsx"
+  ]
 }