diff --git a/packages/components/src/base/Backdrop/Backdrop.tsx b/packages/components/src/base/Backdrop/Backdrop.tsx
new file mode 100644
index 000000000..c3cbae9bb
--- /dev/null
+++ b/packages/components/src/base/Backdrop/Backdrop.tsx
@@ -0,0 +1,5 @@
+import { Backdrop as MuiBackdrop, type BackdropProps as MuiBackdropProps } from '@mui/material';
+
+export function Backdrop(props: MuiBackdropProps): JSX.Element {
+  return <MuiBackdrop {...props} />;
+}
diff --git a/packages/components/src/base/Backdrop/index.tsx b/packages/components/src/base/Backdrop/index.tsx
new file mode 100644
index 000000000..6103ea807
--- /dev/null
+++ b/packages/components/src/base/Backdrop/index.tsx
@@ -0,0 +1 @@
+export { Backdrop } from './Backdrop';
diff --git a/packages/components/src/base/Dialog/Dialog.tsx b/packages/components/src/base/Dialog/Dialog.tsx
new file mode 100644
index 000000000..38259222e
--- /dev/null
+++ b/packages/components/src/base/Dialog/Dialog.tsx
@@ -0,0 +1,5 @@
+import { Dialog as MuiDialog, type DialogProps as MuiDialogProps } from '@mui/material';
+
+export function Dialog(props: MuiDialogProps): JSX.Element {
+  return <MuiDialog {...props} />;
+}
diff --git a/packages/components/src/base/Dialog/backdrop.tsx b/packages/components/src/base/Dialog/backdrop.tsx
deleted file mode 100644
index eeb79167d..000000000
--- a/packages/components/src/base/Dialog/backdrop.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import { Backdrop as MuiBackdrop, type BackdropProps } from '@mui/material';
-
-export function Backdrop(props: BackdropProps): JSX.Element {
-  return <MuiBackdrop {...props} />;
-}
diff --git a/packages/components/src/base/Dialog/dialog.tsx b/packages/components/src/base/Dialog/dialog.tsx
deleted file mode 100644
index 5c17a709a..000000000
--- a/packages/components/src/base/Dialog/dialog.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import { Dialog as MuiDialog, type DialogProps } from '@mui/material';
-
-export function Dialog(props: DialogProps): JSX.Element {
-  return <MuiDialog {...props} />;
-}
diff --git a/packages/components/src/base/Dialog/dialogactions.tsx b/packages/components/src/base/Dialog/dialogactions.tsx
deleted file mode 100644
index 6330759d9..000000000
--- a/packages/components/src/base/Dialog/dialogactions.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import { DialogActions as MuiDialogActions, type DialogActionsProps } from '@mui/material';
-
-export function DialogActions(props: DialogActionsProps): JSX.Element {
-  return <MuiDialogActions {...props} />;
-}
diff --git a/packages/components/src/base/Dialog/dialogcontent.tsx b/packages/components/src/base/Dialog/dialogcontent.tsx
deleted file mode 100644
index 56c85514d..000000000
--- a/packages/components/src/base/Dialog/dialogcontent.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import { DialogContent as MuiDialogContent, type DialogContentProps } from '@mui/material';
-
-export function DialogContent(props: DialogContentProps): JSX.Element {
-  return <MuiDialogContent {...props} />;
-}
diff --git a/packages/components/src/base/Dialog/dialogcontenttext.tsx b/packages/components/src/base/Dialog/dialogcontenttext.tsx
deleted file mode 100644
index 8c3bb177c..000000000
--- a/packages/components/src/base/Dialog/dialogcontenttext.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-import {
-  DialogContentText as MuiDialogContentText,
-  type DialogContentTextProps
-} from '@mui/material';
-
-export function DialogContentText(props: DialogContentTextProps): JSX.Element {
-  return <MuiDialogContentText {...props} />;
-}
diff --git a/packages/components/src/base/Dialog/dialogtitle.tsx b/packages/components/src/base/Dialog/dialogtitle.tsx
deleted file mode 100644
index 4f33e5f63..000000000
--- a/packages/components/src/base/Dialog/dialogtitle.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import { DialogTitle as MuiDialogTitle, type DialogTitleProps } from '@mui/material';
-
-export function DialogTitle(props: DialogTitleProps): JSX.Element {
-  return <MuiDialogTitle {...props} />;
-}
diff --git a/packages/components/src/base/Dialog/index.tsx b/packages/components/src/base/Dialog/index.tsx
index cdcd894e0..991d7e30f 100644
--- a/packages/components/src/base/Dialog/index.tsx
+++ b/packages/components/src/base/Dialog/index.tsx
@@ -1,6 +1 @@
-export { Backdrop } from './backdrop';
-export { Dialog } from './dialog';
-export { DialogActions } from './dialogactions';
-export { DialogContent } from './dialogcontent';
-export { DialogContentText } from './dialogcontenttext';
-export { DialogTitle } from './dialogtitle';
+export { Dialog } from './Dialog';
diff --git a/packages/components/src/base/DialogActions/DialogActions.tsx b/packages/components/src/base/DialogActions/DialogActions.tsx
new file mode 100644
index 000000000..cc95397de
--- /dev/null
+++ b/packages/components/src/base/DialogActions/DialogActions.tsx
@@ -0,0 +1,8 @@
+import {
+  DialogActions as MuiDialogActions,
+  type DialogActionsProps as MuiDialogActionsProps
+} from '@mui/material';
+
+export function DialogActions(props: MuiDialogActionsProps): JSX.Element {
+  return <MuiDialogActions {...props} />;
+}
diff --git a/packages/components/src/base/DialogActions/index.tsx b/packages/components/src/base/DialogActions/index.tsx
new file mode 100644
index 000000000..22faeee0a
--- /dev/null
+++ b/packages/components/src/base/DialogActions/index.tsx
@@ -0,0 +1 @@
+export { DialogActions } from './DialogActions';
diff --git a/packages/components/src/base/DialogContent/DialogContent.tsx b/packages/components/src/base/DialogContent/DialogContent.tsx
new file mode 100644
index 000000000..47ab641d7
--- /dev/null
+++ b/packages/components/src/base/DialogContent/DialogContent.tsx
@@ -0,0 +1,8 @@
+import {
+  DialogContent as MuiDialogContent,
+  type DialogContentProps as MuiDialogContentProps
+} from '@mui/material';
+
+export function DialogContent(props: MuiDialogContentProps): JSX.Element {
+  return <MuiDialogContent {...props} />;
+}
diff --git a/packages/components/src/base/DialogContent/index.tsx b/packages/components/src/base/DialogContent/index.tsx
new file mode 100644
index 000000000..65d0bee83
--- /dev/null
+++ b/packages/components/src/base/DialogContent/index.tsx
@@ -0,0 +1 @@
+export { DialogContent } from './DialogContent';
diff --git a/packages/components/src/base/DialogContentText/DialogContentText.tsx b/packages/components/src/base/DialogContentText/DialogContentText.tsx
new file mode 100644
index 000000000..d66760d0f
--- /dev/null
+++ b/packages/components/src/base/DialogContentText/DialogContentText.tsx
@@ -0,0 +1,8 @@
+import {
+  DialogContentText as MuiDialogContentText,
+  type DialogContentTextProps as MuiDialogContentTextProps
+} from '@mui/material';
+
+export function DialogContentText(props: MuiDialogContentTextProps): JSX.Element {
+  return <MuiDialogContentText {...props} />;
+}
diff --git a/packages/components/src/base/DialogContentText/index.tsx b/packages/components/src/base/DialogContentText/index.tsx
new file mode 100644
index 000000000..e6f2363b0
--- /dev/null
+++ b/packages/components/src/base/DialogContentText/index.tsx
@@ -0,0 +1 @@
+export { DialogContentText } from './DialogContentText';
diff --git a/packages/components/src/base/DialogTitle/DialogTitle.tsx b/packages/components/src/base/DialogTitle/DialogTitle.tsx
new file mode 100644
index 000000000..8f2ad2ff9
--- /dev/null
+++ b/packages/components/src/base/DialogTitle/DialogTitle.tsx
@@ -0,0 +1,8 @@
+import {
+  DialogTitle as MuiDialogTitle,
+  type DialogTitleProps as MuiDialogTitleProps
+} from '@mui/material';
+
+export function DialogTitle(props: MuiDialogTitleProps): JSX.Element {
+  return <MuiDialogTitle {...props} />;
+}
diff --git a/packages/components/src/base/DialogTitle/index.tsx b/packages/components/src/base/DialogTitle/index.tsx
new file mode 100644
index 000000000..361724e29
--- /dev/null
+++ b/packages/components/src/base/DialogTitle/index.tsx
@@ -0,0 +1 @@
+export { DialogTitle } from './DialogTitle';
diff --git a/packages/components/src/custom/ChartDialog/ChartDialog.tsx b/packages/components/src/custom/ChartDialog/ChartDialog.tsx
index 4681455bb..8ec919361 100644
--- a/packages/components/src/custom/ChartDialog/ChartDialog.tsx
+++ b/packages/components/src/custom/ChartDialog/ChartDialog.tsx
@@ -1,5 +1,7 @@
 import React from 'react';
-import { DialogActions, DialogContent, DialogContentText } from '../../base/Dialog';
+import { DialogActions } from '../../base/DialogActions';
+import { DialogContent } from '../../base/DialogContent';
+import { DialogContentText } from '../../base/DialogContentText';
 import { StyledDialog, StyledDialogTitle } from '../Dialog';
 
 interface ChartDialogProps {
diff --git a/packages/components/src/custom/Dialog/StyledDialog.tsx b/packages/components/src/custom/Dialog/StyledDialog.tsx
index eacc7e9b0..a5d073d0b 100644
--- a/packages/components/src/custom/Dialog/StyledDialog.tsx
+++ b/packages/components/src/custom/Dialog/StyledDialog.tsx
@@ -1,5 +1,6 @@
 import { type DialogProps } from '@mui/material';
-import { Dialog, DialogTitle } from '../../base/Dialog';
+import { Dialog } from '../../base/Dialog';
+import { DialogTitle } from '../../base/DialogTitle';
 
 type StyledDialogProps = {
   open: boolean;
diff --git a/packages/components/src/custom/Dialog/StyledDialogActions.tsx b/packages/components/src/custom/Dialog/StyledDialogActions.tsx
index bf70d2996..6f059ef92 100644
--- a/packages/components/src/custom/Dialog/StyledDialogActions.tsx
+++ b/packages/components/src/custom/Dialog/StyledDialogActions.tsx
@@ -1,11 +1,11 @@
 import React from 'react';
-import { DialogActions } from '../../base/Dialog';
+import { DialogActions } from '../../base/DialogActions';
 
-interface DialogActionsProps {
+interface StyledDialogActionsProps {
   children: React.ReactNode;
 }
 
-function StyledDialogActions({ children, ...props }: DialogActionsProps): JSX.Element {
+function StyledDialogActions({ children, ...props }: StyledDialogActionsProps): JSX.Element {
   return <DialogActions {...props}>{children}</DialogActions>;
 }
 
diff --git a/packages/components/src/custom/Dialog/StyledDialogContent.tsx b/packages/components/src/custom/Dialog/StyledDialogContent.tsx
index 5c5a0b858..2be3e88d7 100644
--- a/packages/components/src/custom/Dialog/StyledDialogContent.tsx
+++ b/packages/components/src/custom/Dialog/StyledDialogContent.tsx
@@ -1,11 +1,11 @@
 import React from 'react';
-import { DialogContent } from '../../base/Dialog';
+import { DialogContent } from '../../base/DialogContent';
 
-interface DialogContentProps {
+interface StyledDialogContentProps {
   children: React.ReactNode;
 }
 
-function StyledDialogContent({ children, ...props }: DialogContentProps): JSX.Element {
+function StyledDialogContent({ children, ...props }: StyledDialogContentProps): JSX.Element {
   return <DialogContent {...props}>{children}</DialogContent>;
 }
 
diff --git a/packages/components/src/custom/Dialog/StyledDialogTitle.tsx b/packages/components/src/custom/Dialog/StyledDialogTitle.tsx
index 64e8774e5..5a965f45e 100644
--- a/packages/components/src/custom/Dialog/StyledDialogTitle.tsx
+++ b/packages/components/src/custom/Dialog/StyledDialogTitle.tsx
@@ -1,12 +1,12 @@
 import React from 'react';
-import { DialogTitle } from '../../base/Dialog';
+import { DialogTitle } from '../../base/DialogTitle';
 import { Typography } from '../../base/Typography';
 
-interface DialogTitleProps {
+interface StyledDialogTitleProps {
   children: React.ReactNode;
 }
 
-function StyledDialogTitle({ children, ...props }: DialogTitleProps): JSX.Element {
+function StyledDialogTitle({ children, ...props }: StyledDialogTitleProps): JSX.Element {
   return (
     <DialogTitle
       sx={{
diff --git a/packages/components/src/custom/Dialog/index.tsx b/packages/components/src/custom/Dialog/index.tsx
index 171028176..4ebeaeef5 100644
--- a/packages/components/src/custom/Dialog/index.tsx
+++ b/packages/components/src/custom/Dialog/index.tsx
@@ -1,6 +1,4 @@
-import StyledDialog from './StyledDialog';
-import StyledDialogActions from './StyledDialogActions';
-import StyledDialogContent from './StyledDialogContent';
-import StyledDialogTitle from './StyledDialogTitle';
-
-export { StyledDialog, StyledDialogActions, StyledDialogContent, StyledDialogTitle };
+export { default as StyledDialog } from './StyledDialog';
+export { default as StyledDialogActions } from './StyledDialogActions';
+export { default as StyledDialogContent } from './StyledDialogContent';
+export { default as StyledDialogTitle } from './StyledDialogTitle';
diff --git a/packages/components/src/custom/index.tsx b/packages/components/src/custom/index.tsx
index f396a194a..6a07dba88 100644
--- a/packages/components/src/custom/index.tsx
+++ b/packages/components/src/custom/index.tsx
@@ -1,16 +1,8 @@
 // import { ErrorBoundary, withErrorBoundary, withSuppressedErrorBoundary } from './ErrorBoundary';
-import { StyledDialog, StyledDialogActions, StyledDialogContent } from './Dialog';
 import { useWindowDimensions } from './Helpers/Dimension';
 import { useNotificationHandler } from './Helpers/Notification';
 import { StyledTooltip } from './Tooltip';
 
 export { StyledChartDialog } from './ChartDialog';
 export { StyledSearchBar } from './StyledSearchBar';
-export {
-  StyledDialog,
-  StyledDialogActions,
-  StyledDialogContent,
-  StyledTooltip,
-  useNotificationHandler,
-  useWindowDimensions
-};
+export { StyledTooltip, useNotificationHandler, useWindowDimensions };
diff --git a/packages/components/src/index.tsx b/packages/components/src/index.tsx
index 7a5800239..d88998d17 100644
--- a/packages/components/src/index.tsx
+++ b/packages/components/src/index.tsx
@@ -4,6 +4,7 @@ export * from './base/AccordionDetails';
 export * from './base/AccordionSummary';
 export * from './base/AppBar';
 export * from './base/Avatar';
+export * from './base/Backdrop';
 export * from './base/Box';
 export * from './base/Button';
 export * from './base/ButtonGroup';
@@ -17,6 +18,10 @@ export * from './base/Chip';
 export * from './base/ClickAwayListener';
 export * from './base/Container';
 export * from './base/Dialog';
+export * from './base/DialogActions';
+export * from './base/DialogContent';
+export * from './base/DialogContentText';
+export * from './base/DialogTitle';
 export * from './base/Divider';
 export * from './base/Drawer';
 export * from './base/Form';
@@ -47,6 +52,7 @@ export {
   type CustomColumn,
   type CustomColumnVisibilityControlProps
 } from './custom/CustomColumnVisibilityControl';
+export * from './custom/Dialog';
 export {
   default as ResponsiveDataTable,
   type Column,