diff --git a/packages/react-button/src/Button.stories.tsx b/packages/react-button/src/Button.stories.tsx
index bcb21da38d869..5643a6aca8045 100644
--- a/packages/react-button/src/Button.stories.tsx
+++ b/packages/react-button/src/Button.stories.tsx
@@ -1,8 +1,8 @@
 import * as React from 'react';
-import { Button, ButtonProps } from './index';
+import { Button, ButtonProps } from './components/Button';
 import { Playground } from './Playground';
 import { PlaygroundProps } from './Playground.types';
-import { buttonBaseProps } from './ButtonBaseProps';
+import { buttonBaseProps } from './buttonBaseProps';
 
 // TODO: this is here while waiting for react-icons to merge
 const SVGIcon = () => (
diff --git a/packages/react-button/src/ButtonBaseProps.tsx b/packages/react-button/src/ButtonBaseProps.tsx
deleted file mode 100644
index ffb058f65f222..0000000000000
--- a/packages/react-button/src/ButtonBaseProps.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { PropDefinition } from './Playground.types';
-import { ButtonProps } from './index';
-
-type ExampleProps = { iconOnly?: string };
-
-export const buttonBaseProps: PropDefinition<ButtonProps & ExampleProps>[] = [
-  { propName: 'content', propType: 'string', defaultValue: 'This is a button', dependsOnProps: ['~iconOnly'] },
-  { propName: 'disabled', propType: 'boolean' },
-  { propName: 'icon', propType: 'boolean' },
-  { propName: 'iconOnly', propType: 'boolean', dependsOnProps: ['icon'] },
-  {
-    propName: 'iconPosition',
-    propType: ['before', 'after'],
-    defaultValue: 'before',
-    dependsOnProps: ['icon', '~iconOnly'],
-  },
-  { propName: 'primary', propType: 'boolean', dependsOnProps: ['~subtle', '~transparent'] },
-  { propName: 'size', propType: ['small', 'medium', 'large'], defaultValue: 'medium' },
-  { propName: 'subtle', propType: 'boolean', dependsOnProps: ['~primary', '~transparent'] },
-  { propName: 'transparent', propType: 'boolean', dependsOnProps: ['~primary', '~subtle'] },
-];
diff --git a/packages/react-button/src/CompoundButton.stories.tsx b/packages/react-button/src/CompoundButton.stories.tsx
index 11b502bd423b6..5a8dcb49df880 100644
--- a/packages/react-button/src/CompoundButton.stories.tsx
+++ b/packages/react-button/src/CompoundButton.stories.tsx
@@ -1,8 +1,8 @@
 import * as React from 'react';
-import { CompoundButton, CompoundButtonProps } from './index';
-import { buttonBaseProps } from './ButtonBaseProps';
+import { CompoundButton, CompoundButtonProps } from './components/CompoundButton';
 import { Playground } from './Playground';
 import { PlaygroundProps, PropDefinition } from './Playground.types';
+import { buttonBaseProps } from './buttonBaseProps';
 
 type ExampleProps = { iconOnly?: string };
 
diff --git a/packages/react-button/src/MenuButton.stories.tsx b/packages/react-button/src/MenuButton.stories.tsx
index 1ff90b780b9f1..9a664c4cc7944 100644
--- a/packages/react-button/src/MenuButton.stories.tsx
+++ b/packages/react-button/src/MenuButton.stories.tsx
@@ -1,9 +1,9 @@
 import * as React from 'react';
-import { MenuButton, MenuButtonProps } from './index';
 import { Menu, MenuItem, MenuList, MenuProps, MenuTrigger } from '@fluentui/react-menu';
-import { buttonBaseProps } from './ButtonBaseProps';
+import { MenuButton, MenuButtonProps } from './components/MenuButton';
 import { Playground } from './Playground';
 import { PlaygroundProps } from './Playground.types';
+import { buttonBaseProps } from './buttonBaseProps';
 
 const ExampleMenu = (props: MenuButtonProps): JSX.Element => (
   <Menu>
diff --git a/packages/react-button/src/ToggleButton.stories.tsx b/packages/react-button/src/ToggleButton.stories.tsx
index 7757ed8a18729..0f0877412873f 100644
--- a/packages/react-button/src/ToggleButton.stories.tsx
+++ b/packages/react-button/src/ToggleButton.stories.tsx
@@ -1,9 +1,9 @@
 import * as React from 'react';
-import { ToggleButton, ToggleButtonProps } from './index';
 import { useBoolean } from '@fluentui/react-utilities';
-import { buttonBaseProps } from './ButtonBaseProps';
+import { ToggleButton, ToggleButtonProps } from './components/ToggleButton';
 import { Playground } from './Playground';
 import { PlaygroundProps, PropDefinition } from './Playground.types';
+import { buttonBaseProps } from './buttonBaseProps';
 
 export const ToggleButtonPlayground = () => {
   const [checked, { setTrue: setTrueChecked, setFalse: setFalseChecked, toggle: toggleChecked }] = useBoolean(false);