diff --git a/src/stories/ButtonGroup.stories.ts b/src/lib/components/ButtonGroup/ButtonGroup.stories.ts
similarity index 93%
rename from src/stories/ButtonGroup.stories.ts
rename to src/lib/components/ButtonGroup/ButtonGroup.stories.ts
index cb1c67729..0995529ad 100644
--- a/src/stories/ButtonGroup.stories.ts
+++ b/src/lib/components/ButtonGroup/ButtonGroup.stories.ts
@@ -1,6 +1,6 @@
 import type { Meta, StoryObj } from '@storybook/svelte';
 
-import ButtonGroup from '$lib/components/ButtonGroup.svelte';
+import ButtonGroup from './ButtonGroup.svelte';
 
 // More on how to set up stories at: https://storybook.js.org/docs/7.0/svelte/writing-stories/introduction
 const meta: Meta<ButtonGroup> = {
diff --git a/src/lib/components/ButtonGroup.svelte b/src/lib/components/ButtonGroup/ButtonGroup.svelte
similarity index 100%
rename from src/lib/components/ButtonGroup.svelte
rename to src/lib/components/ButtonGroup/ButtonGroup.svelte
diff --git a/src/lib/components/ButtonGroup/index.ts b/src/lib/components/ButtonGroup/index.ts
new file mode 100644
index 000000000..9f89ee01d
--- /dev/null
+++ b/src/lib/components/ButtonGroup/index.ts
@@ -0,0 +1,2 @@
+import ButtonGroup from './ButtonGroup.svelte';
+export default ButtonGroup;
diff --git a/src/lib/components/Dialog.svelte b/src/lib/components/Dialog.svelte
index 1e88505e9..d2b86152d 100644
--- a/src/lib/components/Dialog.svelte
+++ b/src/lib/components/Dialog.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import ButtonGroup from './ButtonGroup.svelte';
+	import { ButtonGroup } from '$lib/components';
 	import Modal from './Modal.svelte';
 
 	export let title: string;
diff --git a/src/lib/components/index.ts b/src/lib/components/index.ts
index 521f20b4a..dc8c45486 100644
--- a/src/lib/components/index.ts
+++ b/src/lib/components/index.ts
@@ -4,7 +4,7 @@ export { default as Breadcrumbs } from './Breadcrumbs.svelte';
 export { default as CodeViewer } from './CodeViewer';
 export { default as CommandPalette } from './CommandPalette';
 export { default as Modal } from './Modal.svelte';
-export { default as ButtonGroup } from './ButtonGroup.svelte';
+export { default as ButtonGroup } from './ButtonGroup';
 export { default as Dialog } from './Dialog.svelte';
 export { default as Tooltip } from './Tooltip.svelte';
 export { default as Button } from './Button';