diff --git a/components/src/components/atoms/BackdropSurface/BackdropSurface.tsx b/components/src/components/atoms/BackdropSurface/BackdropSurface.tsx
index ce42eb65..5ea42fa7 100644
--- a/components/src/components/atoms/BackdropSurface/BackdropSurface.tsx
+++ b/components/src/components/atoms/BackdropSurface/BackdropSurface.tsx
@@ -6,9 +6,9 @@ import { backdropSurface } from './styles.css'
 import type { BoxProps } from '../Box/Box'
 import { Box } from '../Box/Box'
 
-type Props = { $state: TransitionState['status'], $empty: boolean } & BoxProps
+export type BackdropSurfaceProps = { $state: TransitionState['status'], $empty: boolean } & BoxProps
 
-export const BackdropSurface = React.forwardRef<HTMLElement, Props>(
+export const BackdropSurface = React.forwardRef<HTMLElement, BackdropSurfaceProps>(
   ({ $empty, $state, ...props }, ref) => (
     <Box
       {...props}
diff --git a/components/src/components/atoms/BackdropSurface/index.ts b/components/src/components/atoms/BackdropSurface/index.ts
deleted file mode 100644
index dc2becb6..00000000
--- a/components/src/components/atoms/BackdropSurface/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { BackdropSurface } from './BackdropSurface'
diff --git a/components/src/components/atoms/Field/Field.tsx b/components/src/components/atoms/Field/Field.tsx
index d2de8a0e..88f67c4d 100644
--- a/components/src/components/atoms/Field/Field.tsx
+++ b/components/src/components/atoms/Field/Field.tsx
@@ -6,7 +6,7 @@ import type { Space } from '@/src/tokens'
 
 import type { ReactNodeNoStrings } from '../../../types'
 import { useFieldIds } from '../../../hooks'
-import { VisuallyHidden } from '../VisuallyHidden'
+import { VisuallyHidden } from '../VisuallyHidden/VisuallyHidden'
 import { Typography } from '../Typography/Typography'
 import type { BoxProps } from '../Box/Box'
 import { Box } from '../Box/Box'
diff --git a/components/src/components/atoms/FileInput/FileInput.tsx b/components/src/components/atoms/FileInput/FileInput.tsx
index c853fb33..ed1a1e16 100644
--- a/components/src/components/atoms/FileInput/FileInput.tsx
+++ b/components/src/components/atoms/FileInput/FileInput.tsx
@@ -2,7 +2,7 @@ import * as React from 'react'
 
 import type { ReactNodeNoStrings } from '../../../types'
 import { useFieldIds } from '../../../hooks'
-import { VisuallyHidden } from '../VisuallyHidden'
+import { VisuallyHidden } from '../VisuallyHidden/VisuallyHidden'
 import { validateAccept } from './utils'
 
 type Context = {
diff --git a/components/src/components/atoms/Spinner/Spinner.tsx b/components/src/components/atoms/Spinner/Spinner.tsx
index 689aaea9..942e5f91 100644
--- a/components/src/components/atoms/Spinner/Spinner.tsx
+++ b/components/src/components/atoms/Spinner/Spinner.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 
-import { VisuallyHidden } from '../VisuallyHidden'
+import { VisuallyHidden } from '../VisuallyHidden/VisuallyHidden'
 import * as styles from './styles.css'
 import type { BoxProps } from '../Box/Box'
 import { Box } from '../Box/Box'
diff --git a/components/src/components/atoms/VisuallyHidden/index.ts b/components/src/components/atoms/VisuallyHidden/index.ts
deleted file mode 100644
index a6be36e9..00000000
--- a/components/src/components/atoms/VisuallyHidden/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { VisuallyHidden } from './VisuallyHidden'
diff --git a/components/src/components/atoms/index.ts b/components/src/components/atoms/index.ts
index 6f3d35e6..cb009968 100644
--- a/components/src/components/atoms/index.ts
+++ b/components/src/components/atoms/index.ts
@@ -1,5 +1,5 @@
 export { Avatar, type AvatarProps } from './Avatar/Avatar'
-export { BackdropSurface } from './BackdropSurface'
+export { BackdropSurface } from './BackdropSurface/BackdropSurface'
 export { Banner, type BannerProps } from './Banner/Banner'
 export { Button, type ButtonProps } from './Button/Button'
 export { Card, CardDivider, type CardProps } from './Card/Card'
@@ -14,6 +14,6 @@ export { Skeleton, type SkeletonProps } from './Skeleton/Skeleton'
 export { Spinner, type SpinnerProps } from './Spinner/Spinner'
 export { Tag, type TagProps } from './Tag/Tag'
 export { Typography, type TypographyProps } from './Typography/Typography'
-export { VisuallyHidden } from './VisuallyHidden'
+export { VisuallyHidden } from './VisuallyHidden/VisuallyHidden'
 export { Box, type BoxProps } from './Box/Box'
 export { ThemeProvider, useTheme } from './ThemeProvider/ThemeProvider'
diff --git a/components/src/components/molecules/Backdrop/Backdrop.tsx b/components/src/components/molecules/Backdrop/Backdrop.tsx
index 5f17e771..b2d3c3df 100644
--- a/components/src/components/molecules/Backdrop/Backdrop.tsx
+++ b/components/src/components/molecules/Backdrop/Backdrop.tsx
@@ -4,7 +4,7 @@ import { useTransition } from 'react-transition-state'
 
 import { Portal } from '../../atoms/Portal/Portal'
 
-import { BackdropSurface } from '../../atoms/BackdropSurface'
+import { BackdropSurface } from '../../atoms/BackdropSurface/BackdropSurface'
 
 export type BackdropProps = {
   /** A function that renders the children nodes */
diff --git a/components/src/components/organisms/Toast/Toast.tsx b/components/src/components/organisms/Toast/Toast.tsx
index cd4bfa63..7888309d 100644
--- a/components/src/components/organisms/Toast/Toast.tsx
+++ b/components/src/components/organisms/Toast/Toast.tsx
@@ -108,7 +108,7 @@ const Draggable = () => (
 
 type NativeDivProps = React.HTMLAttributes<HTMLDivElement>
 
-type Props = {
+export type ToastProps = {
   onClose: () => void
   open: boolean
   msToShow?: number
@@ -137,7 +137,7 @@ const DesktopToast = ({
   state,
   children,
   ...props
-}: Props & InternalProps) => {
+}: ToastProps & InternalProps) => {
   return (
     <Container
       {...{
@@ -176,7 +176,7 @@ export const TouchToast = ({
   popped,
   setPopped,
   ...props
-}: Props &
+}: ToastProps &
 InternalProps & {
   popped: boolean
   setPopped: (popped: boolean) => void
@@ -311,7 +311,7 @@ InternalProps & {
   )
 }
 
-export const Toast: React.FC<Props> = ({
+export const Toast: React.FC<ToastProps> = ({
   onClose,
   open,
   msToShow = 8000,
diff --git a/components/src/components/organisms/Toast/index.ts b/components/src/components/organisms/Toast/index.ts
deleted file mode 100644
index 98fc83b3..00000000
--- a/components/src/components/organisms/Toast/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { Toast } from './Toast'
diff --git a/components/src/components/organisms/index.ts b/components/src/components/organisms/index.ts
index 33f8c436..414b7b3a 100644
--- a/components/src/components/organisms/index.ts
+++ b/components/src/components/organisms/index.ts
@@ -1,2 +1,2 @@
 export { Dialog, type DialogProps } from './Dialog/Dialog'
-export { Toast } from './Toast'
+export { Toast, type ToastProps } from './Toast/Toast'