diff --git a/src/DataTable/DataTable.svelte b/src/DataTable/DataTable.svelte
index 2ca983ca..ce232db9 100644
--- a/src/DataTable/DataTable.svelte
+++ b/src/DataTable/DataTable.svelte
@@ -109,8 +109,8 @@
   import { createEventDispatcher, setContext } from "svelte";
   import { writable, derived } from "svelte/store";
   import ChevronRight16 from "../icons/ChevronRight16.svelte";
-  import { InlineCheckbox } from "../Checkbox";
-  import { RadioButton } from "../RadioButton";
+  import InlineCheckbox from "../Checkbox/InlineCheckbox.svelte";
+  import RadioButton from "../RadioButton/RadioButton.svelte";
   import Table from "./Table.svelte";
   import TableBody from "./TableBody.svelte";
   import TableCell from "./TableCell.svelte";
diff --git a/src/DataTable/ToolbarBatchActions.svelte b/src/DataTable/ToolbarBatchActions.svelte
index edc0169c..eaee6f82 100644
--- a/src/DataTable/ToolbarBatchActions.svelte
+++ b/src/DataTable/ToolbarBatchActions.svelte
@@ -7,7 +7,7 @@
     `${totalSelected} item${totalSelected === 1 ? "" : "s"} selected`;
 
   import { onMount, getContext } from "svelte";
-  import { Button } from "../Button";
+  import Button from "../Button/Button.svelte";
 
   let batchSelectedIds = [];
 
diff --git a/src/DataTable/ToolbarMenu.svelte b/src/DataTable/ToolbarMenu.svelte
index 236ab948..1dfbc27b 100644
--- a/src/DataTable/ToolbarMenu.svelte
+++ b/src/DataTable/ToolbarMenu.svelte
@@ -3,7 +3,7 @@
 
   import { getContext } from "svelte";
   import Settings16 from "../icons/Settings16.svelte";
-  import { OverflowMenu } from "../OverflowMenu";
+  import OverflowMenu from "../OverflowMenu/OverflowMenu.svelte";
 
   const ctx = getContext("Toolbar");
 
diff --git a/src/DataTable/ToolbarMenuItem.svelte b/src/DataTable/ToolbarMenuItem.svelte
index f9d7c657..2133b084 100644
--- a/src/DataTable/ToolbarMenuItem.svelte
+++ b/src/DataTable/ToolbarMenuItem.svelte
@@ -1,7 +1,7 @@
 <script>
   /** @extends {"../OverflowMenu/OverflowMenuItem.svelte"} OverflowMenuItemProps */
 
-  import { OverflowMenuItem } from "../OverflowMenu";
+  import OverflowMenuItem from "../OverflowMenu/OverflowMenuItem.svelte";
 </script>
 
 <OverflowMenuItem {...$$restProps} on:click on:keydown>
diff --git a/src/FileUploader/FileUploaderSkeleton.svelte b/src/FileUploader/FileUploaderSkeleton.svelte
index e561744a..56d547db 100644
--- a/src/FileUploader/FileUploaderSkeleton.svelte
+++ b/src/FileUploader/FileUploaderSkeleton.svelte
@@ -1,6 +1,6 @@
 <script>
-  import { ButtonSkeleton } from "../Button";
-  import { SkeletonText } from "../SkeletonText";
+  import ButtonSkeleton from "../Button/ButtonSkeleton.svelte";
+  import SkeletonText from "../SkeletonText/SkeletonText.svelte";
 </script>
 
 <!-- svelte-ignore a11y-mouse-events-have-key-events -->
diff --git a/src/FileUploader/Filename.svelte b/src/FileUploader/Filename.svelte
index de09f0a6..4e351c03 100644
--- a/src/FileUploader/Filename.svelte
+++ b/src/FileUploader/Filename.svelte
@@ -14,7 +14,7 @@
   import Close16 from "../icons/Close16.svelte";
   import CheckmarkFilled16 from "../icons/CheckmarkFilled16.svelte";
   import WarningFilled16 from "../icons/WarningFilled16.svelte";
-  import { Loading } from "../Loading";
+  import Loading from "../Loading/Loading.svelte";
 </script>
 
 {#if status === "uploading"}