diff --git a/packages/tradershub/src/components/Base/index.ts b/packages/tradershub/src/components/Base/index.ts
deleted file mode 100644
index 52ccf03d4863..000000000000
--- a/packages/tradershub/src/components/Base/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './Clipboard';
-export * from './Tooltip';
diff --git a/packages/tradershub/src/components/Base/Clipboard/Clipboard.tsx b/packages/tradershub/src/components/Clipboard/Clipboard.tsx
similarity index 92%
rename from packages/tradershub/src/components/Base/Clipboard/Clipboard.tsx
rename to packages/tradershub/src/components/Clipboard/Clipboard.tsx
index 8e1d7f2df641..7b00439068d3 100644
--- a/packages/tradershub/src/components/Base/Clipboard/Clipboard.tsx
+++ b/packages/tradershub/src/components/Clipboard/Clipboard.tsx
@@ -1,8 +1,8 @@
 import React, { useEffect, useRef, useState } from 'react';
 import { useCopyToClipboard, useHover } from 'usehooks-ts';
 import { Button, useBreakpoint } from '@deriv/quill-design';
-import ClipboardIcon from '../../../public/images/clipboard.svg';
-import CheckmarkCircle from '../../../public/images/ic-checkmark-circle.svg';
+import ClipboardIcon from '../../public/images/clipboard.svg';
+import CheckmarkCircle from '../../public/images/ic-checkmark-circle.svg';
 import { Tooltip } from '../Tooltip';
 
 type TClipboardProps = {
diff --git a/packages/tradershub/src/components/Base/Clipboard/index.ts b/packages/tradershub/src/components/Clipboard/index.ts
similarity index 100%
rename from packages/tradershub/src/components/Base/Clipboard/index.ts
rename to packages/tradershub/src/components/Clipboard/index.ts
diff --git a/packages/tradershub/src/components/Base/Tooltip/Tooltip.classnames.ts b/packages/tradershub/src/components/Tooltip/Tooltip.classnames.ts
similarity index 100%
rename from packages/tradershub/src/components/Base/Tooltip/Tooltip.classnames.ts
rename to packages/tradershub/src/components/Tooltip/Tooltip.classnames.ts
diff --git a/packages/tradershub/src/components/Base/Tooltip/Tooltip.tsx b/packages/tradershub/src/components/Tooltip/Tooltip.tsx
similarity index 100%
rename from packages/tradershub/src/components/Base/Tooltip/Tooltip.tsx
rename to packages/tradershub/src/components/Tooltip/Tooltip.tsx
diff --git a/packages/tradershub/src/components/Base/Tooltip/index.ts b/packages/tradershub/src/components/Tooltip/index.ts
similarity index 100%
rename from packages/tradershub/src/components/Base/Tooltip/index.ts
rename to packages/tradershub/src/components/Tooltip/index.ts
diff --git a/packages/tradershub/src/components/index.ts b/packages/tradershub/src/components/index.ts
index 3ddba4d949a0..3b64d48d609b 100644
--- a/packages/tradershub/src/components/index.ts
+++ b/packages/tradershub/src/components/index.ts
@@ -1,7 +1,7 @@
 export * from './ActionScreen';
-export * from './Base';
 export * from './ButtonGroup';
 export * from './ButtonGroup';
+export * from './Clipboard';
 export * from './ContentSwitcher';
 export * from './CurrencySwitcher';
 export * from './Dialog';
@@ -10,6 +10,7 @@ export * from './Modal';
 export * from './ModalStepWrapper';
 export * from './OptionsAndMultipliersSection';
 export * from './StaticLink';
+export * from './Tooltip';
 export * from './TotalAssets';
 export * from './TradingAccountCard';
 export * from './TradingAccountsList';
diff --git a/packages/tradershub/src/features/cfd/screens/MT5TradeScreen/MT5TradeDetailsItem/MT5TradeDetailsItem.tsx b/packages/tradershub/src/features/cfd/screens/MT5TradeScreen/MT5TradeDetailsItem/MT5TradeDetailsItem.tsx
index c34ddbe7ff48..14b91ee92aa7 100644
--- a/packages/tradershub/src/features/cfd/screens/MT5TradeScreen/MT5TradeDetailsItem/MT5TradeDetailsItem.tsx
+++ b/packages/tradershub/src/features/cfd/screens/MT5TradeScreen/MT5TradeDetailsItem/MT5TradeDetailsItem.tsx
@@ -1,7 +1,7 @@
 import React, { FC, useRef } from 'react';
 import { useHover } from 'usehooks-ts';
 import { qtMerge, Text, useBreakpoint } from '@deriv/quill-design';
-import { Clipboard, Tooltip } from '../../../../../components/Base';
+import { Clipboard, Tooltip } from '../../../../../components';
 import EditIcon from '../../../../../public/images/ic-edit.svg';
 
 type TMT5TradeDetailsItemProps = {